diff --git a/discovery/readme.txt b/discovery/readme.txt deleted file mode 100644 index 28c4d2e1f..000000000 --- a/discovery/readme.txt +++ /dev/null @@ -1,4 +0,0 @@ -The "discovery" folder holds the DSDP-TM Discovery Component. -It depends on Eclipse Platform and Eclipse Modeling Framework (EMF). -All these CVS modules should be named "org.eclipse.tm.discovery.*". -See http://www.eclipse.org/dsdp/tm diff --git a/releng/org.eclipse.rse.build/.cvsignore b/releng/org.eclipse.rse.build/.cvsignore deleted file mode 100644 index f8b5b8240..000000000 --- a/releng/org.eclipse.rse.build/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -go.rb diff --git a/releng/org.eclipse.rse.build/.project b/releng/org.eclipse.rse.build/.project deleted file mode 100644 index a594b49dd..000000000 --- a/releng/org.eclipse.rse.build/.project +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<projectDescription> - <name>org.eclipse.rse.build</name> - <comment></comment> - <projects> - </projects> - <buildSpec> - </buildSpec> - <natures> - </natures> -</projectDescription> diff --git a/releng/org.eclipse.rse.build/README_build.txt b/releng/org.eclipse.rse.build/README_build.txt deleted file mode 100644 index 2db2e153d..000000000 --- a/releng/org.eclipse.rse.build/README_build.txt +++ /dev/null @@ -1,78 +0,0 @@ -Instructions for building TM and RSE ------------------------------------- - -1. Set up the build workspace ------------------------------ -ssh build.eclipse.org -cd /shared/dsdp/tm/ -mkdir ws2_user -cd ws2_user -ln -s `pws` $HOME/ws_30x -ln -s /home/data/httpd/download.eclipse.org/dsdp/tm $HOME/downloads-tm -cp -R ../ws_30x/IBMJava2-ppc-142 . -wget -O setup.sh "http://dev.eclipse.org/viewcvs/index.cgi/org.eclipse.tm.rse/releng/org.eclipse.rse.build/setup.sh?rev=HEAD&cvsroot=DSDP_Project&content-type=text/plain" -chmod a+x setup.sh -./setup.sh - - -2. Do an N-build ----------------- -cd $HOME/ws_30x -./doit_nightly.sh - - -3. Do an I-build ----------------- -On a local client PC, install Eclipse Platform Releng.Tools -Have all TM plugins in the workspace (import tm-all-committer.psf) -Synchronize CVS Workspace to HEAD -Review all incoming changes -Right-click > Team > Release... -Select Mapfile "org.eclipse.rse.build" -Press next ... tag and commit the Mapfiles -ssh build.eclipse.org -cd ws_30x -./doit_irsbuild.sh I -When build worked ok, tag org.eclipse.rse.build: e.g. I20070605-1200 - -3a) Do an S-build ------------------ -Just like I-build, but also update - org.eclipse.rse.build/template/buildNotes.php -ssh build.eclipse.org -cd ws_30x -./doit_irsbuild.sh S 2.0RC3 - -3b) Promote an S-build to official ----------------------------------- -After testing the "invisible" S-build: -ssh build.eclipse.org -cd ws_30x/publish/S-2.0RC3* -mv package.count.orig package.count - -3c) Promote an S-build to Europa --------------------------------- -After S-build has been prepared (on signedUpdates) -On local Eclipse client, checkout Europa projects according to - http://wiki.eclipse.org/Europa_Build -Open file - org.eclipse.europa.tools/build-home/features-dsdp-tm.xml -ssh build.eclipse.org -cd downloads-tm/updates/milestones -rm -rf features.prev plugins.prev -mv features features.prev -mv plugins plugins.prev -cp -R ../../signedUpdates/features . -cp -R ../../signedUpdates/plugins . -cd bin -./mkTestUpdates.sh -From the shell where the build is ongoing, copy & Paste the - version numbers of the features listed in feature-dsdp-tm.xml - into features-dsdp-tm.xml -Commit features-dsdp-tm.xml - - -ssh build.eclipse.org - - - diff --git a/releng/org.eclipse.rse.build/about.html b/releng/org.eclipse.rse.build/about.html deleted file mode 100644 index d4cc693f9..000000000 --- a/releng/org.eclipse.rse.build/about.html +++ /dev/null @@ -1,28 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" - "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml"> -<head> -<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/> -<title>About</title> -</head> -<body lang="EN-US"> -<h2>About This Content</h2> - -<p>June 5, 2007</p> -<h3>License</h3> - -<p>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 <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>. -For purposes of the EPL, "Program" will mean the Content.</p> - -<p>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 <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p> - -</body> -</html>
\ No newline at end of file diff --git a/releng/org.eclipse.rse.build/archive/.cvsignore b/releng/org.eclipse.rse.build/archive/.cvsignore deleted file mode 100644 index a17291e0f..000000000 --- a/releng/org.eclipse.rse.build/archive/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -drops diff --git a/releng/org.eclipse.rse.build/archive/build_types.html b/releng/org.eclipse.rse.build/archive/build_types.html deleted file mode 100644 index 131c40e84..000000000 --- a/releng/org.eclipse.rse.build/archive/build_types.html +++ /dev/null @@ -1,84 +0,0 @@ -<!doctype html public "-//w3c//dtd html 4.0 transitional//en"> -<html> -<head> -<title>Eclipse Corner</title> -<link rel="stylesheet" href="http://www.eclipse.org/default_style.css"> -<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> -</head> -<body text="#000000" bgcolor="#ffffff" link="#0000ee" vlink="#551a8b" alink="#ff0000"> -<table border=0 cellspacing=5 cellpadding=2 width="100%" > - <tr> - <td align=left valign=top colspan="2" bgcolor="#0080c0"><b><font face="Arial,Helvetica" color="#ffffff">Eclipse - Project Build Types</font></b></td> - </tr> - <tr> - <td align=right valign=top><img src="http://www.eclipse.org/images/Adarrow.gif" border=0 height=16 width=16></td> - <td> - <p><b><font face="arial,helvetica,geneva" size="-1">Releases</font></b> - <br> - <font size="-1" face="arial,helvetica,geneva">Releases are builds - that have been declared major releases by the development team - for example - "R1.0". Releases are the right builds for people who want to - be on a stable, tested release, and don't need the latest greatest features - and improvements. Release builds always have an "R" at the beginning - of the name i.e. R1.0, R2.0 etc. Non-release builds are named according to the - date of the build - for example 20060427 is the build from April 27, 2006.</font><br> - </p> - </td> - </tr> - <tr> - <td align=right valign=top><img src="http://www.eclipse.org/images/Adarrow.gif" border=0 height=16 width=16></td> - <td><b><font face="arial,helvetica,geneva" size="-1">Stable Builds</font></b> - <br> - <font size="-1" face="arial,helvetica,geneva"> Stable builds are integration - builds that have been found to be stable enough for most people to use. - They are promoted from integration build to stable build by the architecture - team after they have been used for a few days and deemed reasonably stable. - The latest stable build is the right build for people who want to stay up - to date with what is going on in the latest development stream, and don't - mind putting up with a few problems n in order to get the latest greatest - features and bug fixes. The latest stable build is the one the development - team likes people to be using, because of the valuable and timely feedback. - </font></td> - </tr> - <tr> - <td align=right valign=top><img src="http://www.eclipse.org/images/Adarrow.gif" border=0 height=16 width=16></td> - <td> - <p><b><font face="arial,helvetica,geneva" size="-1">Integration Builds</font></b> - <br> - <font size="-1" face="arial,helvetica,geneva"> Periodically, component - teams version off their work in what they believe is a stable, consistent - state, and they update the build configuration to indicate that the next - integration build should take this version of the component. Integration - builds are built from these stable component versions that have been specified - by each component team as the best version available. Integration builds - may be promoted to stable builds after a few days of testing. Integration - builds are built whenever new stable component versions are released into - the build.</font></p> - </td> - </tr> - <tr> - <td align=right valign=top><img src="http://www.eclipse.org/images/Adarrow.gif" border=0 height=16 width=16></td> - <td><b><font face="arial,helvetica,geneva" size="-1">Nightly Builds</font></b> - <br> - <font size="-1" face="arial,helvetica,geneva"> Nightly builds are produced - every night from whatever has been released into the HEAD stream of the - CVS repository. They are completely untested and will almost always have - major problems. Many will not work at all. These drops are normally only - useful to developers actually working on the Eclipse Project.</font></td> - </tr> - <tr> - <td align=right valign=top><img src="http://www.eclipse.org/images/Adarrow.gif" border=0 height=16 width=16></td> - <td><b><font face="arial,helvetica,geneva" size="-1">Maintenance Builds</font></b> - <br> - <font size="-1" face="arial,helvetica,geneva"> Maintenance builds are produced - periodically to incorporate fixes into an existing release. They are typically - built from tagged plug-in and feature pojects in a maintenance stream of the CVS - repository (i.e. R1_0_maintenance). Maintenance builds are promoted to a minor - or service release (i.e. R1.1 or R1.0.1) after development teams have deemed one - to be stable following one or more test-fix pass cycles.</font></td> - </tr> -</table> -<h3> </h3> -</body> -</html> diff --git a/releng/org.eclipse.rse.build/archive/dlconfig.txt b/releng/org.eclipse.rse.build/archive/dlconfig.txt deleted file mode 100644 index dd682ba91..000000000 --- a/releng/org.eclipse.rse.build/archive/dlconfig.txt +++ /dev/null @@ -1,2 +0,0 @@ -dropPrefix[]=R&dropPrefix[]=S& -dropType[]=Archived Release&dropType[]=Archived Stable Build& diff --git a/releng/org.eclipse.rse.build/archive/index.php b/releng/org.eclipse.rse.build/archive/index.php deleted file mode 100644 index 1414801a0..000000000 --- a/releng/org.eclipse.rse.build/archive/index.php +++ /dev/null @@ -1,230 +0,0 @@ -<html><head> -<link rel="stylesheet" href="http://www.eclipse.org/default_style.css"> -<title>Target Management Project Archived Downloads</title></head> -<body> - -<table border=0 cellspacing=5 cellpadding=2 width="100%" > - <tr> - <td align=left width="72%"> <font class=indextop>Target Management project<br/>archived downloads</font> - <br> - <font class=indexsub>archived downloads from the dsdp-tm project</font><br> -</td> - <td width="28%"><img src="http://www.eclipse.org/images/Idea.jpg" height=86 width=120></td> - </tr> - -</table> -<table border=0 cellspacing=5 cellpadding=2 width="100%" > - - <tr> - <td align=LEFT valign=TOP colspan="2" bgcolor="#0080C0"><b><font color="#FFFFFF" face="Arial,Helvetica">Archived Downloads</font></b></td> - </tr> - - <tr> <td> <p>On this -page you can find the archived -<a href="build_types.html">builds</a> for the Remote System Explorer (RSE), -provided by the -<a href="http://www.eclipse.org/dsdp/tm/">Target Management</a> project. -Archived builds consist of older releases and not propagated to Eclipse mirrors. -<!-- -To get started run the program and go through the -user and developer documentation provided in the online help system. ---> -To get started, see the build notes provided with each drop, run the -program and go through the online user and developer documentation, -or take a look at the project's online -<a href="http://www.eclipse.org/dsdp/tm/tutorial/index.php">getting started</a> -pages. - -If you have problems downloading the drops, contact the -<font face="arial,helvetica,geneva" size="-1"><a href="mailto:webmaster@eclipse.org">webmaster</a></font>. -If you have problems installing or getting the workbench to run, -check out the -<a href="http://wiki.eclipse.org/TM_and_RSE_FAQ">Target Management FAQ</a>, -or try posting a question to the -<a href="http://www.eclipse.org/newsgroups">newsgroup</a>, -<a href="news://news.eclipse.org/eclipse.dsdp.tm">eclipse.dsdp.tm</a>. -All downloads are provided under the terms and conditions of the -<a href="http://www.eclipse.org/legal/epl/notice.php">Eclipse.org -Software User Agreement</a> unless otherwise specified. </p> - -<p> -Current builds are available -<a href="http://download.eclipse.org/dsdp/tm/downloads/index.php">here</a>. -For information about different kinds of builds look -<a href="build_types.html" target="_top">here</a>. -</p> - -<p/> -</td></tr> - - <tr> - <td align=LEFT valign=TOP colspan="2" bgcolor="#0080C0"><b><font color="#FFFFFF" face="Arial,Helvetica">Archived - Downloads</font></b></td> - </tr> - </table> - <?php - $fileHandle = fopen("dlconfig.txt", "r"); - while (!feof($fileHandle)) { - $aLine = fgets($fileHandle, 4096); - parse_str($aLine); - } - fclose($fileHandle); - - for ($i = 0; $i < count($dropType); $i++) { - $typeToPrefix[$dropType[$i]] = $dropPrefix[$i]; - } - - $aDirectory = dir("drops"); - while ($anEntry = $aDirectory->read()) { - - // Short cut because we know aDirectory only contains other directories. - if ($anEntry != "." && $anEntry!="..") { - $aDropDirectory = dir("drops/".$anEntry); - $fileCount = 0; - while ($aDropEntry = $aDropDirectory->read()) { - if (stristr($aDropEntry, ".zip") || stristr($aDropEntry, ".tar")) { - // Count the files in the directory - $fileCount = $fileCount + 1; - } - } - //See http://at2.php.net/manual/en/class.dir.php - $aDropDirectory->close(); - // Read the count file - $countFile = "drops/".$anEntry."/package.count"; - $indexFile = "drops/".$anEntry."/index.php"; - if (file_exists($countFile) && file_exists($indexFile)) { - $anArray = file($countFile); - - // If a match - process the directory - if ($anArray[0] == $fileCount) { - $parts = explode("-", $anEntry); - if (count($parts) == 2) { - - //N-builds and I-builds - $datePart = $parts[0]; - $timePart = $parts[1]; - $buildtype = substr($datePart, 0, 1); - $buckets[$buildtype][] = $anEntry; - - $year = substr($datePart, 1, 4); - $month = substr($datePart, 5, 2); - $day = substr($datePart, 7, 2); - $hour = substr($timePart,0,2); - $minute = substr($timePart,2,2); - $timeStamp = mktime($hour, $minute, 0, $month, $day, $year); - - $timeStamps[$anEntry] = date("D, j M Y -- H:i (O)", $timeStamp); - - if ($timeStamp > $latestTimeStamp[$buildtype]) { - $latestTimeStamp[$buildtype] = $timeStamp; - $latestFile[$buildtype] = $anEntry; - } - - } else if (count($parts) == 3) { - - //S-builds and R-builds - $buckets[$parts[0]][] = $anEntry; - - $timePart = $parts[2]; - $year = substr($timePart, 0, 4); - $month = substr($timePart, 4, 2); - $day = substr($timePart, 6, 2); - $hour = substr($timePart,8,2); - $minute = substr($timePart,10,2); - $timeStamp = mktime($hour, $minute, 0, $month, $day, $year); - - $timeStamps[$anEntry] = date("D, j M Y -- H:i (O)", $timeStamp); - - if ($timeStamp > $latestTimeStamp[$parts[0]]) { - $latestTimeStamp[$parts[0]] = $timeStamp; - $latestFile[$parts[0]] = $anEntry; - } - } - } - } - } - } - $aDirectory->close(); - ?> - -<table width="100%" cellspacing=0 cellpadding=3 align=center> -<td align=left> -<TABLE width="100%" CELLSPACING=0 CELLPADDING=3> -<tr> - <td width=\"30%\"><b>Build Type</b></td> - <td><b>Build Name</b></td> - <td><b>Build Date</b></td> -</tr> - -<?php - foreach($dropType as $value) { - $prefix=$typeToPrefix[$value]; - $fileName = $latestFile[$prefix]; - echo "<tr> - <td width=\"30%\">$value</td>"; - - $parts = explode("-", $fileName); - if (count($parts) == 2) { - $buildName=$fileName; - } else { - $buildName=$parts[1]; - } - - // Uncomment the line below if we need click through licenses. - // echo "<td><a href=license.php?license=drops/$fileName>$buildName</a></td>"; - - // Comment the line below if we need click through licenses. - echo "<td><a href=\"drops/$fileName/index.php\">$buildName</a></td>"; - - echo "<td>$timeStamps[$fileName]</td>"; - echo "</tr>"; - } -?> -</table> -</table> - -<?php - foreach($dropType as $value) { - $prefix=$typeToPrefix[$value]; - echo " - <table width=\"100%\" cellspacing=0 cellpadding=3 align=center> - <tr bgcolor=\"#999999\"> - <td align=left width=\"30%\"><b><a name=\"$value\"><font color=\"#FFFFFF\" face=\"Arial,Helvetica\">$value"; - echo "s</font></b></a></td> - </TR> - <TR> - <td align=left> - <TABLE width=\"100%\" CELLSPACING=0 CELLPADDING=3> - <tr> - <td width=\"30%\"><b>Build Name</b></td> - <td><b>Build Date</b></td> - </tr>"; - - $aBucket = $buckets[$prefix]; - if (isset($aBucket)) { - rsort($aBucket); - foreach($aBucket as $innerValue) { - $parts = explode("-", $innerValue); - if (count($parts) == 2) { - $buildName=$innerValue; - } else { - $buildName=$parts[1]; - } - echo "<tr>"; - - // Uncomment the line below if we need click through licenses. - // echo "<td><a href=\"license.php?license=drops/$innerValue\">$buildName</a></td>"; - - // Comment the line below if we need click through licenses. - echo "<td><a href=\"drops/$innerValue/index.php\">$buildName</a></td>"; - - echo "<td>$timeStamps[$innerValue]</td> - </tr>"; - } - } - echo "</table></table> "; - } -?> - - -</body></html> diff --git a/releng/org.eclipse.rse.build/bin/batch_sign.sh b/releng/org.eclipse.rse.build/bin/batch_sign.sh deleted file mode 100755 index 900d5d691..000000000 --- a/releng/org.eclipse.rse.build/bin/batch_sign.sh +++ /dev/null @@ -1,86 +0,0 @@ -#!/bin/sh -#******************************************************************************* -# Copyright (c) 2006 Wind River Systems, Inc. -# All rights reserved. This program and 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 -#******************************************************************************* -#:# -#:# Script to sign all ZIP files in a directory -#:# -#:# Usage: -#:# batch_sign.sh {directory} -#:# Examples: -#:# batch_sign.sh publish/S-1.0M5-200611100500 - -#nothing we do should be hidden from the world -umask 22 - -#Use Java5 on build.eclipse.org -#export PATH=/shared/dsdp/tm/ibm-java2-ppc64-50/bin:$PATH -#export PATH=/shared/webtools/apps/IBMJava2-ppc64-142/bin:$PATH -export PATH=/shared/webtools/apps/IBMJava2-ppc-142/bin:$PATH - -curdir=`pwd` - -#Get parameters -dirToSign=$1 -usage=0 -if [ "$dirToSign" = "" ]; then - usage=1 -elif [ ! -d "$dirToSign" ]; then - usage=1 -fi -if [ $usage = 1 ]; then - grep '^#:#' $0 | grep -v grep | sed -e 's,^#:#,,' - exit 0 -fi - -#sign the zipfiles -cd "$dirToSign" -RDIR=`pwd` -mkdir -p signed -nameToSign=`basename $RDIR` -ZIPS=`ls *.zip *.jar` -STAGING=/home/data/httpd/download-staging.priv/dsdp/tm -STDIR=${STAGING}/${nameToSign} -mkdir -p ${STDIR} -cp ${ZIPS} ${STDIR} -cd ${STDIR} -mkdir out -for x in $ZIPS ; do - sign $x nomail ${STDIR}/out -done -echo "Waiting for signature..." -sleep 300 -TRIES=20 -MISSING="$ZIPS" -while [ "$MISSING" != "" -a ${TRIES} -gt 0 ]; do - MISSING_NEW="" - sleep 60 - for x in $MISSING ; do - if [ -f ${STDIR}/out/$x ]; then - echo "Done: TRIES=${TRIES}, $x" - cp -f ${STDIR}/out/$x ${RDIR}/signed/$x - chmod ugo+r ${RDIR}/signed/$x - else - MISSING_NEW="${MISSING_NEW} $x" - fi - done - echo "Signed: TRIES=${TRIES}, Missing ${MISSING_NEW}" - MISSING="${MISSING_NEW}" - TRIES=`expr $TRIES - 1` -done -rm -rf ${STDIR} - -cd "$curdir" -if [ "$MISSING" != "" ]; then - echo "batch_sign failed: ${MISSING}" - exit 1 -fi -echo "batch_sign complete" -exit 0 diff --git a/releng/org.eclipse.rse.build/bin/doit_irsbuild.sh b/releng/org.eclipse.rse.build/bin/doit_irsbuild.sh deleted file mode 100755 index 7d5dcc997..000000000 --- a/releng/org.eclipse.rse.build/bin/doit_irsbuild.sh +++ /dev/null @@ -1,153 +0,0 @@ -#!/bin/sh -#******************************************************************************* -# Copyright (c) 2006, 2008 Wind River Systems, Inc. -# All rights reserved. This program and 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 -#******************************************************************************* -#:# -#:# Bootstrapping script to perform S-builds and R-builds on build.eclipse.org -#:# Will build based on HEAD of all mapfiles, and update the testPatchUpdates as well -#:# -#:# Usage: -#:# doit_irsbuild.sh {buildType} [buildId] [maptag] -#:# Examples: -#:# doit_irsbuild.sh R 1.0 -#:# doit_irsbuild.sh S 1.0M5 S1_0M5 -#:# doit_irsbuild.sh I - -#nothing we do should be hidden from the world -umask 22 - -curdir=`pwd` -cd `dirname $0` -mydir=`pwd` -echo ${mydir} - -#Use Java5 on build.eclipse.org -#export PATH=/shared/dsdp/tm/ibm-java2-ppc64-50/bin:$PATH -#export PATH=/shared/webtools/apps/IBMJava2-ppc64-142/bin:$PATH -#export PATH=/shared/webtools/apps/IBMJava2-ppc-142/bin:$PATH -export PATH=${HOME}/ws_30x/IBMJava2-ppc-142/bin:$PATH - -#Get parameters -mapTag=HEAD -buildType=$1 -buildId=$2 -case x$buildType in - xP|xN|xI|xS) ok=1 ;; - xM|xR) mapTag=R3_0_maintenance ; ok=1 ;; - *) ok=0 ;; -esac -if [ "$3" != "" ]; then - mapTag=$3 -fi -if [ $ok != 1 ]; then - grep '^#:#' $0 | grep -v grep | sed -e 's,^#:#,,' - cd ${curdir} - exit 0 -fi - -#Remove old logs and builds -echo "Removing old logs and builds..." -cd $HOME/ws_30x -#rm log-*.txt -if [ -d working/build ]; then - rm -rf working/build -fi -if [ -d working/package ]; then - rm -rf working/package -fi - -#Do the main job -echo "Updating builder from CVS..." -cd org.eclipse.rse.build -stamp=`date +'%Y%m%d-%H%M'` -CHANGES=`cvs -nq update -r ${mapTag} | head -1` -if [ "${CHANGES}" = "" ]; then - echo "Build ${buildType}${buildId} : ${mapTag} : ${stamp}" - echo "Build canceled, no mapfile or config changed in org.eclipse.rse.build." - exit 0 -fi -log=$HOME/ws_30x/log-${buildType}$stamp.txt -touch $log -#cvs -q update -RPd >> $log 2>&1 -cvs -q update -r ${mapTag} -RPd >> $log 2>&1 -daystamp=`date +'%Y%m%d*%H'` - -echo "Running the builder..." -./nightly.sh ${mapTag} ${buildType} ${buildId} >> $log 2>&1 -tail -30 $log - -#update the main download and archive pages: build.eclipse.org only -if [ -d /home/data/httpd/archive.eclipse.org/dsdp/tm/downloads ]; then - cd /home/data/httpd/archive.eclipse.org/dsdp/tm/downloads - cvs -q update -RPd >> $log 2>&1 - chgrp dsdp-tmadmin * CVS/* 2>/dev/null - cd /home/data/httpd/download.eclipse.org/dsdp/tm/downloads - cvs -q update -RPd >> $log 2>&1 - chgrp dsdp-tmadmin * CVS/* - - #Fixup permissions and group id on download.eclpse.org (just to be safe) - echo "Fixup: chgrp -R dsdp-tmadmin drops/${buildType}*${daystamp}*" - chgrp -R dsdp-tmadmin drops/${buildType}*${daystamp}* - chmod -R g+w drops/${buildType}*${daystamp}* -fi - -#Check the publishing -cd $HOME/ws_30x/publish -DIRS=`ls -dt ${buildType}*${daystamp}* | head -1 2>/dev/null` -cd ${DIRS} -FILES=`ls RSE-SDK-*.zip 2>/dev/null` -echo "FILES=$FILES" -if [ -f package.count -a "$FILES" != "" ]; then - echo "package.count found, release seems ok" - if [ ${buildType} = S -o ${buildType} = R ]; then - #hide the release for now until it is tested - #mirrors will still pick it up - mv package.count package.count.orig - #DO_SIGN=1 - fi - - if [ "$DO_SIGN" = "1" ]; then - #sign the zipfiles - ${mydir}/batch_sign.sh `pwd` - fi - - if [ ${buildType} = N -a -d ../N.latest ]; then - #update the doc server - rm -f ../N.latest/RSE-*.zip - rm -f ../N.latest/TM-*.zip - cp -f RSE-SDK-*.zip ../N.latest/RSE-SDK-latest.zip - cp -f TM-discovery-*.zip ../N.latest/TM-discovery-latest.zip - cp -f RSE-remotecdt-*.zip ../N.latest/RSE-remotecdt-latest.zip - chgrp dsdp-tmadmin ../N.latest/*.zip - chmod g+w ../N.latest/*.zip - if [ -d /shared/dsdp/public_html/tm/downloads/drops/N.latest ]; then - cp -f ../N.latest/* /shared/dsdp/public_html/tm/downloads/drops/N.latest/ - chmod -R g+w /shared/dsdp/public_html/tm/downloads/drops - fi - fi - - if [ ${buildType} != N ]; then - #Update the testPatchUpdates site - echo "Refreshing update site" - cd $HOME/downloads-tm/testPatchUpdates/bin - cvs update - ./mkTestUpdates.sh - #Update the signedPatchUpdates site - echo "Refreshing signedPatchUpdates site" - cd $HOME/downloads-tm/signedPatchUpdates/bin - cvs update - ./mkTestUpdates.sh - fi - - cd "$curdir" -else - echo "package.count missing, release seems failed" -fi -chgrp dsdp-tm-rse $log diff --git a/releng/org.eclipse.rse.build/bin/doit_nightly.sh b/releng/org.eclipse.rse.build/bin/doit_nightly.sh deleted file mode 100755 index d0f9d6ff3..000000000 --- a/releng/org.eclipse.rse.build/bin/doit_nightly.sh +++ /dev/null @@ -1,87 +0,0 @@ -#!/bin/sh -#******************************************************************************* -# Copyright (c) 2006 Wind River Systems, Inc. -# All rights reserved. This program and 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 -#******************************************************************************* -#Bootstrapping script to perform N-builds on build.eclipse.org - -#nothing we do should be hidden from the world -umask 22 - -#Use Java5 on build.eclipse.org -#export PATH=/shared/dsdp/tm/ibm-java2-ppc64-50/bin:$PATH -#export PATH=/shared/webtools/apps/IBMJava2-ppc64-142/bin:$PATH -#export PATH=/shared/webtools/apps/IBMJava2-ppc-142/bin:$PATH -export PATH=${HOME}/ws_30x/IBMJava2-ppc-142/bin:$PATH - -curdir=`pwd` - -#Remove old logs and builds -echo "Removing old logs and builds..." -cd $HOME/ws_30x -rm log-N*.txt -if [ -d working/build ]; then - rm -rf working/build -fi -if [ -d working/package ]; then - rm -rf working/package -fi - -#Do the main job -echo "Updating builder from CVS..." -cd org.eclipse.rse.build -stamp=`date +'%Y%m%d-%H%M'` -log=$HOME/ws_30x/log-N$stamp.txt -touch $log -cvs -q update -RPd >> $log 2>&1 -daystamp=`date +'%Y%m%d-%H'` - -echo "Running the builder..." -./nightly.sh >> $log 2>&1 -tail -30 $log - -#update the main download and archive pages: build.eclipse.org only -if [ -d /home/data/httpd/archive.eclipse.org/dsdp/tm/downloads ]; then - cd /home/data/httpd/archive.eclipse.org/dsdp/tm/downloads - cvs -q update -RPd >> $log 2>&1 - chgrp dsdp-tmadmin * CVS/* 2>/dev/null - cd /home/data/httpd/download.eclipse.org/dsdp/tm/downloads - cvs -q update -RPd >> $log 2>&1 - chgrp dsdp-tmadmin * CVS/* 2>/dev/null - - #Fixup permissions and group id on download.eclpse.org (just to be safe) - chgrp -R dsdp-tmadmin drops/${buildType}*${daystamp}* 2>/dev/null - chmod -R g+w drops/${buildType}*${daystamp}* 2>/dev/null -fi - -#Copy latest SDK in order to give access to DOC server -cd $HOME/ws_30x/publish -if [ -d N.latest ]; then - FILES=`ls -t N${daystamp}*/RSE-SDK-N${daystamp}*.zip | head -1 2>/dev/null` - echo "FILES=$FILES" - if [ "$FILES" != "" ]; then - rm N.latest/RSE-SDK-N*.zip 2>/dev/null - cd `dirname ${FILES}` - cp -f RSE-SDK-N*.zip ../N.latest/RSE-SDK-latest.zip - cp -f TM-discovery-*.zip ../N.latest/TM-discovery-latest.zip - cp -f RSE-remotecdt-*.zip ../N.latest/RSE-remotecdt-latest.zip - cd ../N.latest - chgrp dsdp-tmadmin *.zip - chmod g+w *.zip - if [ -d /shared/dsdp/public_html/tm/downloads/drops/N.latest ]; then - cp -f * /shared/dsdp/public_html/tm/downloads/drops/N.latest/ - chmod -R g+w /shared/dsdp/public_html/tm/downloads/drops - fi - fi -fi - -#Cleanup old nightly builds (leave only last 5 in place) -cd $HOME/ws_30x/publish -ls -d N200* | sort | head -n-5 | xargs rm -rf - diff --git a/releng/org.eclipse.rse.build/bin/make_signed.sh b/releng/org.eclipse.rse.build/bin/make_signed.sh deleted file mode 100755 index f885c585f..000000000 --- a/releng/org.eclipse.rse.build/bin/make_signed.sh +++ /dev/null @@ -1,84 +0,0 @@ -#!/bin/sh - -curdir=`pwd` -cd `dirname $0` -mydir=`pwd` -cd "${curdir}" - -SIGNED_JAR_SOURCE=${mydir}/eclipse_ext/tm -OUTPUT=${curdir}/output.$$ -RESULT=${curdir}/result.$$ -TMP=${curdir}/tmp.$$ - -if [ ! -d ${SIGNED_JAR_SOURCE}/server ]; then - mkdir ${SIGNED_JAR_SOURCE}/server - cd ${SIGNED_JAR_SOURCE}/server - unzip ${curdir}/rseserver-*-signed.zip -fi -cd "${curdir}" - -if [ ! -d ${TMP} ]; then - mkdir -p ${TMP} -fi -if [ ! -d ${OUTPUT} ]; then - mkdir -p ${OUTPUT} -fi -if [ ! -d ${RESULT} ]; then - mkdir -p ${RESULT} -fi -for zip in `ls *.zip *.tar` ; do - cd ${TMP} - case ${zip} in - *.zip) unzip -q ${curdir}/${zip} ;; - *.tar) tar xf ${curdir}/${zip} ;; - esac - case ${zip} in - rseserver*) SIGNED_JARS=${SIGNED_JAR_SOURCE}/server ;; - *) SIGNED_JARS=${SIGNED_JAR_SOURCE} ;; - esac - REF=`find . -name 'epl-v10.html'` - FILES=`find . -name '*.jar' -o -name 'META-INF'` - for f in ${FILES} ; do - printf "${f}: " - if [ -f ${SIGNED_JARS}/${f} ]; then - cp -f ${SIGNED_JARS}/${f} ./${f} - touch -r ${REF} ./${f} - echo "signed" - elif [ -d ${SIGNED_JARS}/${f} ]; then - cp -Rf ${SIGNED_JARS}/${f}/* ${f} - touch -r ${REF} ${f}/* - echo "signed" - else - echo "." - fi - done - ##cp ${curdir}/${zip} ${OUTPUT} - case ${zip} in - *.zip) zip -r -o -q ${OUTPUT}/${zip} * ;; - *.tar) tar cfv ${OUTPUT}/${zip} * ; touch -r ${REF} ${OUTPUT}/${zip}; - esac - rm -rf * - cd ${RESULT} - case ${zip} in - rseserver*) mkdir ${zip} ; cd ${zip} ; - case ${zip} in - *.zip) unzip -q -o ${OUTPUT}/${zip} ;; - *.tar) tar xf ${OUTPUT}/${zip} ;; - esac - ;; - *) unzip -q -o ${OUTPUT}/${zip} ;; - esac -done -rm -rf ${TMP} - -echo "--------------------------------------" -echo "DONE" -echo "--------------------------------------" -cd "${curdir}" -echo "MAIN:---------------------------------" -diff -r ${RESULT} ${SIGNED_JAR_SOURCE} -for f in `ls rseserver-*.zip rseserver-*.tar` ; do - echo "${f}:-----------------------------------" - diff -r -b ${RESULT}/${f} ${SIGNED_JAR_SOURCE}/server -done - diff --git a/releng/org.eclipse.rse.build/bin/update_global_cvs_tags.sh b/releng/org.eclipse.rse.build/bin/update_global_cvs_tags.sh deleted file mode 100755 index 23ef1be89..000000000 --- a/releng/org.eclipse.rse.build/bin/update_global_cvs_tags.sh +++ /dev/null @@ -1,53 +0,0 @@ -#!/bin/sh -#******************************************************************************* -# Copyright (c) 2007, 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: -# Martin Oberhuber (Wind River) - initial API and implementation -#******************************************************************************* -# -# This script can be used to apply a release tag or branch tag globally -# to those files of the TM CVS Repository that are usually not seen. It -# needs to run from command-line because under Eclipse, these top-level -# modules and files would require checking out the entire TM module tree; -# from commandline, this works with checking out the top-level directories -# only. -# -# These files are named "readme.txt" in the top-level CVS modules, and -# contribute to the tags shown in the Eclipse CVS Repository Explorer -# when expanding the "Branches" or the "Tags" node. -# -# Before running this script, customize the "cvs tag" commands below. -# -curdir=`pwd` -CVSROOT=:ext:moberhuber@dev.eclipse.org:/cvsroot/dsdp -export CVSROOT -TOPMODULES="\ - org.eclipse.tm.rse \ - org.eclipse.tm.rse/doc \ - org.eclipse.tm.rse/examples \ - org.eclipse.tm.rse/features \ - org.eclipse.tm.rse/plugins \ - org.eclipse.tm.rse/releng \ - org.eclipse.tm.rse/tests \ - org.eclipse.tm.core \ - org.eclipse.tm.core/discovery \ - org.eclipse.tm.core/terminal \ - org.eclipse.tm.core/wince \ -" -### org.eclipse.tm.core/thirdparty \ -cvs co -l $TOPMODULES -##exit 0 -for topmod in $TOPMODULES ; do - cd $topmod - #cvs update -l -r R1_0 . - #cvs tag -b R1_0_maintenance readme.txt - #cvs tag -d v20060630 readme.txt - cvs update -l -A . - cvs tag R3_0_1 - cd $curdir -done diff --git a/releng/org.eclipse.rse.build/bootstrap.sh b/releng/org.eclipse.rse.build/bootstrap.sh deleted file mode 100644 index e31c8cb34..000000000 --- a/releng/org.eclipse.rse.build/bootstrap.sh +++ /dev/null @@ -1,242 +0,0 @@ -#!/bin/sh -#******************************************************************************* -# Copyright (c) 2005, 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) - Adapt for TM / RSE -#******************************************************************************* -# User specific environment and startup programs -umask 002 - -BASE_PATH=.:/bin:/usr/bin:/usr/bin/X11:/usr/local/bin:/usr/bin:/usr/X11R6/bin -LD_LIBRARY_PATH=. -BASH_ENV=$HOME/.bashrc -USERNAME=`whoami` -xhost +$HOSTNAME -DISPLAY=:0.0 -CVS_RSH=ssh -ulimit -c unlimited -export CVS_RSH USERNAME BASH_ENV LD_LIBRARY_PATH DISPLAY - -proc=$$ - -curdir=`pwd` -cd `dirname $0` -mydir=`pwd` - -#notification list -recipients= - -#sets skip.performance.tests Ant property -skipPerf="" - -#sets skip.tests Ant property -skipTest="" - -#sets sign Ant property -sign="" - -tagMaps="" - -#sets fetchTag="HEAD" for nightly builds if required -tag="" - -#Basebuilder for Eclipse 3.2.1 maintenance -#buildProjectTags=v20060529 -buildProjectTags=r321_v20060830 - -#updateSite property setting -updateSite="" - -#flag indicating whether or not mail should be sent to indicate build has started -mail="" - -#flag used to build based on changes in map files -compareMaps="" - -#buildId - build name -buildId="" - -#buildLabel - name parsed in php scripts <buildType>-<buildId>-<datestamp> -buildLabel="" - -# tag for build contribution project containing .map files -mapVersionTag=HEAD - -# directory in which to export builder projects -#builderDir=/builds/eclipsebuilder -builderDir=$mydir/../working/build - -# buildtype determines whether map file tags are used as entered or are replaced with HEAD -buildType=N - -# directory where to copy build -#postingDirectory=/builds/transfer/files/master/downloads/drops -postingDirectory=$mydir/../publish - - -# flag to indicate if test build -testBuild="" - -# path to javadoc executable -javadoc="" - -# value used in buildLabel and for text replacement in index.php template file -builddate=`date +%Y%m%d` -buildtime=`date +%H%M` -timestamp=$builddate$buildtime - - -# process command line arguments -usage="usage: $0 [-notify emailaddresses][-test][-buildDirectory directory][-buildId name][-buildLabel directory name][-tagMapFiles][-mapVersionTag tag][-builderTag tag][-bootclasspath path][-compareMaps][-skipPerf] [-skipTest][-updateSite site][-sign] M|N|I|S|R" - -if [ $# -lt 1 ] -then - echo >&2 "$usage" - exit 1 -fi - -while [ $# -gt 0 ] -do - case "$1" in - -buildId) buildId="$2"; shift;; - -buildLabel) buildLabel="$2"; shift;; - -mapVersionTag) mapVersionTag="$2"; shift;; - -tagMapFiles) tagMaps="-DtagMaps=true";; - -skipPerf) skipPerf="-Dskip.performance.tests=true";; - -skipTest) skipTest="-Dskip.tests=true";; - -buildDirectory) builderDir="$2"; shift;; - -notify) recipients="$2"; shift;; - -test) postingDirectory="/builds/transfer/files/bogus/downloads/drops";testBuild="-Dtest=true";; - -builderTag) buildProjectTags="$2"; shift;; - -compareMaps) compareMaps="-DcompareMaps=true";; - -updateSite) updateSite="-DupdateSite=$2";shift;; - -sign) sign="-Dsign=true";; - -*) - echo >&2 $usage - exit 1;; - *) break;; # terminate while loop - esac - shift -done - -# After the above the build type is left in $1. -buildType=$1 - -# Set default buildId and buildLabel if none explicitly set -if [ "$buildId" = "" ] -then - buildId=$buildType$builddate-$buildtime -fi - -if [ "$buildLabel" = "" ] -then - buildLabel=$buildId -fi - -#Set the tag to HEAD for Nightly builds -if [ "$buildType" = "N" ] -then - tag="-DfetchTag=HEAD" - versionQualifier="-DforceContextQualifier=$buildId" -fi - -# tag for eclipseInternalBuildTools on ottcvs1 -internalToolsTag=$buildProjectTags - -# tag for exporting org.eclipse.releng.basebuilder -baseBuilderTag=$buildProjectTags - -# tag for exporting the custom builder -customBuilderTag=$buildProjectTags - -if [ -e $builderDir ] -then - builderDir=$builderDir$timestamp -fi - -# directory where features and plugins will be compiled -buildDirectory=$builderDir/src - -mkdir -p $builderDir -cd $builderDir - -#check out org.eclipse.releng.basebuilder -cvs -d :pserver:anonymous@dev.eclipse.org:/cvsroot/eclipse co -r $baseBuilderTag org.eclipse.releng.basebuilder - -#check out org.eclipse.rse.build -cvs -d :pserver:anonymous@dev.eclipse.org:/cvsroot/dsdp co -r $customBuilderTag org.eclipse.tm.rse/releng/org.eclipse.rse.build -if [ "$tagMaps" == "-DtagMaps=true" ]; then - cvs -d moberhuber@dev.eclipse.org:/cvsroot/dsdp rtag -r $customBuilderTag v$buildId org.eclipse.tm.rse/releng/org.eclipse.rse.build -fi - -if [ "$HOSTNAME" == "utils" ] -then - #Running on build.eclipse.org - java15_home=/shared/dsdp/tm/ibm-java2-ppc64-50 - #java14_home=/shared/webtools/apps/IBMJava2-ppc64-142 - java14_home=/shared/webtools/apps/IBMJava2-ppc-142 - javadoc="-Djavadoc15=$java15_home/bin/javadoc" - PATH=$java15_home/jre/bin:$PATH;export PATH -elif [ "$HOSTNAME" == "parser.takefive.co.at" ] -then - #Running on parser - java15_home=/opt/jdk1.5.0_06 - java14_home=/opt/j2sdk1.4.2_12 - javadoc="-Djavadoc15=$java15_home/bin/javadoc" - PATH=$java15_home/jre/bin:$PATH;export PATH -fi - -mkdir -p $postingDirectory/$buildLabel -chmod -R 755 $builderDir - -#default value of the bootclasspath attribute used in ant javac calls. -bootclasspath="$java14_home/jre/lib/rt.jar:$java14_home/jre/lib/jsse.jar" -bootclasspath_15="$java15_home/jre/lib/rt.jar" - -cd $builderDir/org.eclipse.rse.build - -echo buildId=$buildId >> monitor.properties -echo timestamp=$timestamp >> monitor.properties -echo buildLabel=$buildLabel >> monitor.properties -echo recipients=$recipients >> monitor.properties -echo log=$postingDirectory/$buildLabel/index.php >> monitor.properties - -#the base command used to run AntRunner headless -antRunner="`which java` -Xmx500m -jar ../org.eclipse.releng.basebuilder/plugins/org.eclipse.equinox.launcher.jar -Dosgi.os=linux -Dosgi.ws=gtk -Dosgi.arch=ppc -application org.eclipse.ant.core.antRunner" - -#clean drop directories -# $antRunner -buildfile eclipse/helper.xml cleanSites - -echo recipients=$recipients -echo postingDirectory=$postingDirectory -echo builderTag=$buildProjectTags -echo buildDirectory=$buildDirectory -echo bootclasspath=$bootclasspath -echo bootclasspath_15=$bootclasspath_15 - -#full command with args -buildCommand="$antRunner -q -buildfile buildAll.xml $mail $testBuild $compareMaps -DmapVersionTag=$mapVersionTag -DpostingDirectory=$postingDirectory -Dbootclasspath=$bootclasspath -DbuildType=$buildType -D$buildType=true -DbuildId=$buildId -Dbuildid=$buildId -DbuildLabel=$buildLabel -Dtimestamp=$timestamp -DmapCvsRoot=:ext:sdimitro@dev.eclipse.org:/cvsroot/eclipse $skipPerf $skipTest $tagMaps -DJ2SE-1.5=$bootclasspath_15 -DJ2SE-1.4=$bootclasspath -DCDC-1.0/Foundation-1.0=$bootclasspath_foundation -DlogExtension=.xml $javadoc $updateSite $sign -DgenerateFeatureVersionSuffix=true -Djava15-home=$builderDir/jdk/linuxppc/ibm-java2-ppc-50/jre -listener org.eclipse.releng.build.listeners.EclipseBuildListener" - -#capture command used to run the build -echo $buildCommand>command.txt - -#run the build -$buildCommand -retCode=$? - -if [ $retCode != 0 ] -then - echo "Build failed (error code $retCode)." - exit -1 -fi - -#clean up -rm -rf $builderDir - - diff --git a/releng/org.eclipse.rse.build/build.pl b/releng/org.eclipse.rse.build/build.pl deleted file mode 100644 index e54e492d4..000000000 --- a/releng/org.eclipse.rse.build/build.pl +++ /dev/null @@ -1,99 +0,0 @@ -#!/usr/bin/perl - -# Build script for Remote System Explorer -# Authors: Dave Dykstal, Kushal Munir -# java and cvs have to be in the path - -use warnings; -use File::Spec; - -sub ask($$) { - my ($question, $default, $message, $ans); - ($question, $default) = @_; - $message = "${question} (default is ${default}): "; - print STDERR $message; - $ans = <STDIN>; - chomp $ans; - $ans = $ans ? $ans : $default; - return $ans; -} - -sub makeAbsolute($) { - my $path = File::Spec->canonpath($_[0]); - if (!File::Spec->file_name_is_absolute($path)) { - $current = `pwd`; - chomp($current); - $path = File::Spec->catdir($current, $path); - $path = File::Spec->canonpath($path); - } - return $path; -} - -# $eclipse is the location of the basic PDE and plugins to compile against -# This should include the org.eclipse.pde.build project -$eclipse = "../eclipse"; - -# $basebuilder" is the location of the Eclipse Releng basebuilder -# This can also be set to ${eclipse} -$basebuilder = "../org.eclipse.releng.basebuilder"; - -# $builder is the location of the custom build scripts customTargets.xml and build.properties -# (i.e. the contents of org.eclipse.rse.build) -$builder = "."; - -# $working is where the build is actually done, does not need to exist -$working = "../working"; - -# make these absolute paths -$eclipse = makeAbsolute($eclipse); -$basebuilder = makeAbsolute($basebuilder); -$builder = makeAbsolute($builder); -$working = makeAbsolute($working); -$plugins = File::Spec->catdir($basebuilder, "plugins"); -$pdeBuildGlob = File::Spec->catdir($plugins, "org.eclipse.pde.build*"); - -# Find the base build scripts: genericTargets.xml and build.xml -@candidates = glob($pdeBuildGlob); -$n = @candidates; -if ($n == 0) { - die("PDE Build was not found."); -} -if ($n > 1) { - die("Too many versions of PDE Build were found."); -} -$pdeBuild = $candidates[0]; - -$buildDirectory = "$working/build"; -$packageDirectory = "$working/package"; -$publishDirectory = "$working/publish"; - -$tag = ask("Enter tag to fetch from CVS", "HEAD"); -$buildType = ask("Enter build type (P=Personal, N=Nightly, I=Integration, S=Stable)", "P"); -($sec, $minute, $hour, $mday, $mon, $year) = localtime(); -$mydstamp = sprintf("%4.4d%2.2d%2.2d", $year + 1900, ($mon + 1), $mday); -$mytstamp = sprintf("%2.2d%2.2d", $hour, $minute, $sec); -$timeStamp = "${mydstamp}-${mytstamp}"; -$buildId = $buildType . $timeStamp; -$buildId = ask("Enter the build id", $buildType . $timeStamp); - -$incantation = "java -cp ${basebuilder}/plugins/org.eclipse.equinox.launcher.jar org.eclipse.core.launcher.Main "; -$incantation .= "-application org.eclipse.ant.core.antRunner "; -$incantation .= "-buildfile ${pdeBuild}/scripts/build.xml "; -$incantation .= "-DbuildDirectory=${buildDirectory} "; -$incantation .= "-DpackageDirectory=${packageDirectory} "; -$incantation .= "-DpublishDirectory=${publishDirectory} "; -$incantation .= "-Dbuilder=${builder} "; -$incantation .= "-DbaseLocation=${eclipse} "; -$incantation .= "-DbuildType=${buildType} "; -$incantation .= "-DbuildId=${buildId} "; -$incantation .= "-DmapVersionTag=${tag} "; -$incantation .= "-Dmydstamp=${mydstamp} "; -$incantation .= "-Dmytstamp=${mytstamp} "; -if ($buildType =~ "N") { - $incantation .= "-DforceContextQualifier=${buildId} "; - $incantation .= "-DfetchTag=HEAD "; -} - -print("${incantation}\n"); - -system($incantation);
\ No newline at end of file diff --git a/releng/org.eclipse.rse.build/build.properties b/releng/org.eclipse.rse.build/build.properties deleted file mode 100644 index 6adf854b5..000000000 --- a/releng/org.eclipse.rse.build/build.properties +++ /dev/null @@ -1,53 +0,0 @@ -############################################################################### -# Copyright (c) 2001, 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: -# IBM Corporation - initial API and implementation -# Martin Oberhuber (Wind River) - Fix bug 153655 incorrect source features -############################################################################### -outputUpdateJars=true -archivePrefix=eclipse -collectingFolder=${archivePrefix} -buildType=P -buildId=unknown -buildLabel=${buildId} -mapVersionTag=HEAD - -#this is set to the tag from the map file unless forced here -#forceContextQualifier=vYYYYMMDD - -#adds checksum suffix to directory names -generateFeatureVersionSuffix=true - -##Packager -collPlace=eclipse -collBase=. -# configs=linux,gtk,ppc & *,*,* -archivesFormat =\ -linux, gtk, ppc-zip &\ - *,*,*-zip -# bootclasspath=${java.home}/lib/rt.jar:${java.home}/lib/jsse.jar -baseos=linux -basews=gtk -basearch=ppc -#runPackager=true -### We do not build individual source bundles yet because Eclipse 3.3 dont understand it -#individualSourceBundles=true - -#Compiler options -javacFailOnError=false -javacDebugInfo=on -#javacVerbose=true -#compilerArg=-enableJavadoc -#This fixes a problem with the IBM 1.5 VM, see bug 158358 -compilerArg=-inlineJSR -enableJavadoc -warn:+javadoc - -zipargs= -tarargs=--owner=0 --group=0 - -#Runtime libs - needed for headless build of Apache Commons Net -#J2SE-1.2=../jres/1.2.2/lib/rt.jar diff --git a/releng/org.eclipse.rse.build/build.rb b/releng/org.eclipse.rse.build/build.rb deleted file mode 100644 index 9965ab0cb..000000000 --- a/releng/org.eclipse.rse.build/build.rb +++ /dev/null @@ -1,79 +0,0 @@ -#!/usr/bin/ruby
-# Build script for Remote System Explorer
-# Author: Dave Dykstal, Kushal Munir
-# Prerequisites:
-# written in ruby
-# java and cvs have to be in the path
-
-require "ftools"
-
-def ask(question, default)
- message = "#{question} (default is #{default}): "
- STDERR.print message
- answer = readline().strip
- answer = answer.empty? ? default : answer
- return answer
-end
-
-# "eclipse" is the location of the basic PDE and plugins to compile against
-# This should include the org.eclipse.pde.build project
-eclipse = "../eclipse"
-
-# "basebuilder" is the location of the Eclipse Releng basebuilder
-# This can be set to #{eclipse}
-basebuilder = "../org.eclipse.releng.basebuilder"
-
-# "builder" is the location of the custom build scripts customTargets.xml and build.properties
-# (i.e. the contents of org.eclipse.rse.build)
-builder = "."
-
-# "working" is where the build is actually done, does not need to exist
-working = "../working"
-
-# make these absolute paths
-eclipse = File.expand_path(eclipse)
-basebuilder = File.expand_path(basebuilder)
-builder = File.expand_path(builder)
-working = File.expand_path(working)
-
-# Find the base build scripts: genericTargets.xml and build.xml
-candidates = Dir["#{basebuilder}/plugins/org.eclipse.pde.build*"]
-if (candidates.size == 0) then
- raise("PDE Build was not found.")
-end
-if (candidates.size > 1) then
- raise("Too many versions of PDE Build were found.")
-end
-pdeBuild = candidates[0]
-
-buildDirectory = "#{working}/build"
-packageDirectory = "#{working}/package"
-publishDirectory = "#{working}/publish"
-
-tag = ask("Enter tag to fetch from CVS", "HEAD")
-buildType = ask("Enter build type (P=Personal, N=Nightly, I=Integration, S=Stable)", "P")
-mydstamp = Time.now.strftime("%Y%m%d")
-mytstamp = Time.now.strftime("%H%M")
-buildId = ask("Enter the build id", buildType + mydstamp + "-" + mydstamp)
-
-command = "java -cp #{basebuilder}/plugins/org.eclipse.equinox.launcher.jar org.eclipse.core.launcher.Main "
-command += "-application org.eclipse.ant.core.antRunner "
-command += "-buildfile #{pdeBuild}/scripts/build.xml "
-command += "-DbuildDirectory=#{buildDirectory} "
-command += "-DpackageDirectory=#{packageDirectory} "
-command += "-DpublishDirectory=#{publishDirectory} "
-command += "-Dbuilder=#{builder} "
-command += "-DbaseLocation=#{eclipse} "
-command += "-DbuildType=#{buildType} "
-command += "-DbuildId=#{buildId} "
-command += "-DmapVersionTag=#{tag} "
-command += "-Dmydstamp=#{mydstamp} "
-command += "-Dmytstamp=#{mytstamp} "
-if ("#{buildType}" == "N") then
- command += "-DforceContextQualifier=#{buildId} "
- command += "-DfetchTag=HEAD "
-end
-
-puts(command)
-
-system(command)
\ No newline at end of file diff --git a/releng/org.eclipse.rse.build/customTargets.xml b/releng/org.eclipse.rse.build/customTargets.xml deleted file mode 100644 index 0e0195af0..000000000 --- a/releng/org.eclipse.rse.build/customTargets.xml +++ /dev/null @@ -1,652 +0,0 @@ -<project name="Build specific targets and properties" default="noDefault"> - - <!-- ===================================================================== --> - <!-- Run a given ${target} on all elements being built --> - <!-- Add one <ant> task for each top level element being built. --> - <!-- ===================================================================== --> - <target name="allElements"> - <ant antfile="${genericTargets}" target="${target}"> - <property name="type" value="feature" /> - <property name="id" value="org.eclipse.rse.core" /> - </ant> - <ant antfile="${genericTargets}" target="${target}"> - <property name="type" value="feature" /> - <property name="id" value="org.eclipse.rse.dstore" /> - </ant> - <ant antfile="${genericTargets}" target="${target}"> - <property name="type" value="feature" /> - <property name="id" value="org.eclipse.rse.ftp" /> - </ant> - <ant antfile="${genericTargets}" target="${target}"> - <property name="type" value="feature" /> - <property name="id" value="org.eclipse.rse.local" /> - </ant> - <ant antfile="${genericTargets}" target="${target}"> - <property name="type" value="feature" /> - <property name="id" value="org.eclipse.rse.ssh" /> - </ant> - <ant antfile="${genericTargets}" target="${target}"> - <property name="type" value="feature" /> - <property name="id" value="org.eclipse.rse.telnet" /> - </ant> - <ant antfile="${genericTargets}" target="${target}"> - <property name="type" value="feature" /> - <property name="id" value="org.eclipse.rse.sdk" /> - </ant> - <ant antfile="${genericTargets}" target="${target}"> - <property name="type" value="feature" /> - <property name="id" value="org.eclipse.rse.useractions" /> - </ant> - <ant antfile="${genericTargets}" target="${target}"> - <property name="type" value="feature" /> - <property name="id" value="org.eclipse.rse.remotecdt" /> - </ant> - <ant antfile="${genericTargets}" target="${target}"> - <property name="type" value="feature" /> - <property name="id" value="org.eclipse.rse.wince" /> - </ant> - <ant antfile="${genericTargets}" target="${target}"> - <property name="type" value="feature" /> - <property name="id" value="org.eclipse.rse.examples" /> - </ant> - <ant antfile="${genericTargets}" target="${target}"> - <property name="type" value="feature" /> - <property name="id" value="org.eclipse.rse.tests" /> - </ant> - <ant antfile="${genericTargets}" target="${target}"> - <property name="type" value="feature" /> - <property name="id" value="org.eclipse.tm.discovery" /> - </ant> - <ant antfile="${genericTargets}" target="${target}"> - <property name="type" value="feature" /> - <property name="id" value="org.eclipse.tm.terminal.sdk" /> - </ant> - <ant antfile="${genericTargets}" target="${target}"> - <property name="type" value="feature" /> - <property name="id" value="org.eclipse.rse.terminals" /> - </ant> - </target> - - <!-- ===================================================================== --> - <!-- Targets to assemble the built elements for particular configurations --> - <!-- These generally call the generated assemble scripts (named in --> - <!-- ${assembleScriptName}) but may also add pre and post processing --> - <!-- Add one target for each root element and each configuration --> - <!-- ===================================================================== --> - - <target name="assemble.org.eclipse.rse.core"> - <property name="archiveName" value="RSE-runtime-core-${buildId}.zip"/> - <ant antfile="${assembleScriptName}" dir="${buildDirectory}"/> - <antcall target="unpackUpdateJarsForPackaging" /> - </target> - - <target name="assemble.org.eclipse.rse.dstore"> - <property name="archiveName" value="RSE-runtime-dstore-${buildId}.zip"/> - <ant antfile="${assembleScriptName}" dir="${buildDirectory}"/> - <antcall target="unpackUpdateJarsForPackaging" /> - </target> - - <target name="assemble.org.eclipse.rse.ftp"> - <property name="archiveName" value="RSE-runtime-ftp-${buildId}.zip"/> - <property name="copyOrbit" value="true"/> - <ant antfile="${assembleScriptName}" dir="${buildDirectory}"/> - <antcall target="unpackUpdateJarsForPackaging" /> - </target> - - <target name="assemble.org.eclipse.rse.local"> - <property name="archiveName" value="RSE-runtime-local-${buildId}.zip"/> - <ant antfile="${assembleScriptName}" dir="${buildDirectory}"/> - <antcall target="unpackUpdateJarsForPackaging" /> - </target> - - <target name="assemble.org.eclipse.rse.ssh"> - <property name="archiveName" value="RSE-runtime-ssh-${buildId}.zip"/> - <ant antfile="${assembleScriptName}" dir="${buildDirectory}"/> - <antcall target="unpackUpdateJarsForPackaging" /> - </target> - - <target name="assemble.org.eclipse.rse.telnet"> - <property name="archiveName" value="RSE-runtime-telnet-${buildId}.zip"/> - <property name="copyOrbit" value="true"/> - <ant antfile="${assembleScriptName}" dir="${buildDirectory}"/> - <antcall target="unpackUpdateJarsForPackaging" /> - </target> - - <target name="assemble.org.eclipse.rse.sdk"> - <property name="archiveName" value="RSE-SDK-${buildId}.zip"/> - <property name="copyOrbit" value="true"/> - <property name="copyOrbitSrc" value="true"/> - <ant antfile="${assembleScriptName}" dir="${buildDirectory}"/> - <antcall target="unpackUpdateJarsForPackaging" /> - </target> - - <target name="assemble.org.eclipse.rse.useractions"> - <property name="archiveName" value="RSE-useractions-${buildId}.zip"/> - <ant antfile="${assembleScriptName}" dir="${buildDirectory}"/> - <antcall target="unpackUpdateJarsForPackaging" /> - </target> - - <target name="assemble.org.eclipse.rse.examples"> - <property name="archiveName" value="RSE-examples-${buildId}.zip"/> - <ant antfile="${assembleScriptName}" dir="${buildDirectory}"/> - <antcall target="unpackUpdateJarsForPackaging" /> - </target> - - <target name="assemble.org.eclipse.rse.remotecdt"> - <property name="archiveName" value="RSE-remotecdt-${buildId}.zip"/> - <ant antfile="${assembleScriptName}" dir="${buildDirectory}"/> - <antcall target="unpackUpdateJarsForPackaging" /> - </target> - - <target name="assemble.org.eclipse.rse.wince"> - <property name="archiveName" value="RSE-wince-incubation-${buildId}.zip"/> - <ant antfile="${assembleScriptName}" dir="${buildDirectory}"/> - <antcall target="unpackUpdateJarsForPackaging" /> - </target> - - <target name="assemble.org.eclipse.rse.tests"> - <property name="archiveName" value="RSE-tests-${buildId}.zip"/> - <ant antfile="${assembleScriptName}" dir="${buildDirectory}"/> - <antcall target="unpackUpdateJarsForPackaging" /> - </target> - - <target name="assemble.org.eclipse.tm.discovery"> - <property name="archiveName" value="TM-discovery-${buildId}.zip"/> - <ant antfile="${assembleScriptName}" dir="${buildDirectory}"/> - <antcall target="unpackUpdateJarsForPackaging" /> - </target> - - <target name="assemble.org.eclipse.tm.terminal.sdk"> - <property name="archiveName" value="TM-terminal-${buildId}.zip"/> - <ant antfile="${assembleScriptName}" dir="${buildDirectory}"/> - <antcall target="unpackUpdateJarsForPackaging" /> - </target> - - <target name="assemble.org.eclipse.rse.terminals"> - <property name="archiveName" value="RSE-terminals-incubation-${buildId}.zip"/> - <ant antfile="${assembleScriptName}" dir="${buildDirectory}"/> - <antcall target="unpackUpdateJarsForPackaging" /> - </target> - - <target name="unpackUpdateJarsForPackaging" depends="myInit"> - <property name="tmpsite" value="${buildDirectory}/tmpsite" /> - <mkdir dir="${tmpsite}/new/eclipse/features" /> - <mkdir dir="${tmpsite}/new/eclipse/plugins" /> - <exec executable="unzip" dir="${buildDirectory}/${buildLabel}"> - <arg line="-q ${archiveName} -d ${tmpsite}" /> - </exec> - <property name="orbitDest" value="${tmpsite}/eclipse"/> - <antcall target="copyOrbitBundlesToUpdateSite"/> - <copy todir="${buildUpdateSitePath}"> - <fileset dir="${tmpsite}/eclipse"/> - </copy> - - <unpackUpdateJars site="${tmpsite}/eclipse" output="${tmpsite}/new/eclipse"/> - <antcall target="packageLicenseFiles"/> - <zip destfile="${buildDirectory}/${buildLabel}/${archiveName}" - basedir="${tmpsite}/new" - /> - <delete dir="${tmpsite}"/> - </target> - - <target name="copyOrbitBundlesToUpdateSite" depends="copyOrbit,copyOrbitSrc"> - </target> - - <target name="copyOrbit" if="copyOrbit"> - <copy todir="${orbitDest}/plugins"> - <fileset dir="${buildDirectory}/plugins"> - <include name="org.apache.commons.net_*.jar"/> - <include name="org.apache.oro_*.jar"/> - </fileset> - </copy> - </target> - - <target name="copyOrbitSrc" if="copyOrbitSrc"> - <copy todir="${orbitDest}/plugins"> - <fileset dir="${buildDirectory}/plugins"> - <include name="org.apache.commons.net.source_*.jar"/> - <include name="org.apache.oro.source_*.jar"/> - </fileset> - </copy> - </target> - - <target name="packageLicenseFiles"> - <copy file="${builder}/template/epl-v10.html" todir="${tmpsite}/new/eclipse"/> - <copy file="${builder}/template/notice.html" todir="${tmpsite}/new/eclipse"/> - </target> - - <!-- ===================================================================== --> - <!-- Place the map files into the "maps" directory, specify version tags --> - <!-- ===================================================================== --> - <target name="getMapFiles"> - <copy todir="${buildDirectory}/maps"> - <fileset dir="${builder}/maps" includes="*.map" /> - </copy> - <replace dir="${buildDirectory}/maps" token="@tag@" value="${mapVersionTag}"> - <include name="*.map"/> - </replace> - </target> - - <!-- ===================================================================== --> - <!-- Steps to do before setup --> - <!-- ===================================================================== --> - <target name="preSetup" depends="myInit"> - <echo message="builder = ${builder}"/> - <echo message="builderDirectory = ${builderDirectory}"/> - <echo message="buildProperties = ${buildProperties}"/> - <echo message="customTargets = ${customTargets}"/> - <echo message="genericTargets = ${genericTargets}"/> - <echo message="buildId = ${buildId}"/> - <echo message="buildName = ${buildName}"/> - <echo message="buildType = ${buildType}"/> - <echo message="buildLabel = ${buildLabel}"/> - <echo message="tstamp = ${mydstamp}-${mytstamp} of ${dateLong}"/> - <echo message="archivePrefix = ${archivePrefix}"/> - <echo message="collectingFolder = ${collectingFolder}"/> - </target> - - <target name="myInit"> - <tstamp> - <format property="dateLong" pattern="MMM d, yyyy"/> - </tstamp> - <property name="messagefile" value="message.in"/> - <property name="xxmailto" value="dsdp-tm-cvs-commit@eclipse.org"/> - <property name="mailto" value="martin.oberhuber@windriver.com"/> - <property name="remotedir" value="moberhuber@dev.eclipse.org:downloads-tm/downloads/drops"/> - <condition property="doNBuild"> - <equals arg1="${fetchTag}" arg2="HEAD"/> - </condition> - <condition property="doUpload"> - <equals arg1="${publishDirectory}" arg2=""/> - </condition> - <condition property="doCopy"> - <not><equals arg1="${publishDirectory}" arg2=""/></not> - </condition> - <condition property="dropDir" value="${buildType}-${buildId}-${mydstamp}${mytstamp}" else="${buildId}"> - <or> - <equals arg1="${buildType}" arg2="S"/> - <equals arg1="${buildType}" arg2="R"/> - <and> - <equals arg1="${buildType}" arg2="M"/> - <not><matches pattern="M[0-9-]*" string="${buildId}"/></not> - </and> - </or> - </condition> - <property name="buildUpdateSitePath" value="${packageDirectory}/${dropDir}/updates"/> - </target> - - <!-- ===================================================================== --> - <!-- Steps to do after setup but before starting the build proper --> - <!-- ===================================================================== --> - <target name="postSetup"> - </target> - - <!-- ===================================================================== --> - <!-- Steps to do before fetching the build elements --> - <!-- ===================================================================== --> - <target name="preFetchOrbitBundles" depends="myInit" if="doNBuild"> - <!-- fetch Orbit stuff first in order to ensure we get --> - <!-- the latest released version even in case of an N-build --> - <!-- - <ant antfile="${genericTargets}" target="fetchElement"> - <property name="type" value="plugin" /> - <property name="id" value="org.apache.commons.net" /> - </ant> - --> - <mkdir dir="${buildDirectory}/plugins"/> - <eclipse.fetch - elements="plugin@org.apache.oro" - buildDirectory="${buildDirectory}" - directory="${buildDirectory}/directory.txt" - fetchTag="" - configInfo="*,*,*" - baseLocation="${baseLocation}" - /> - <!-- Run generated fetch script --> - <ant antfile="${buildDirectory}/fetch_org.apache.oro.xml"> - <property name="featureOnly" value="true"/> - <property name="featureAndPlugins" value="true"/> - </ant> - <eclipse.fetch - elements="plugin@org.apache.commons.net" - buildDirectory="${buildDirectory}" - directory="${buildDirectory}/directory.txt" - fetchTag="" - configInfo="*,*,*" - baseLocation="${baseLocation}" - /> - <!-- Run generated fetch script --> - <ant antfile="${buildDirectory}/fetch_org.apache.commons.net.xml"> - <property name="featureOnly" value="true"/> - <property name="featureAndPlugins" value="true"/> - </ant> - </target> - - <target name="preFetchOrbitSource" depends="myInit"> - <!-- fetch Orbit stuff since I'm not sure how to get sources --> - <mkdir dir="${buildDirectory}/plugins"/> - <eclipse.fetch - elements="plugin@org.apache.oro.source" - buildDirectory="${buildDirectory}" - directory="${buildDirectory}/directory.txt" - fetchTag="" - configInfo="*,*,*" - baseLocation="${baseLocation}" - /> - <!-- Run generated fetch script --> - <ant antfile="${buildDirectory}/fetch_org.apache.oro.source.xml"> - <property name="featureOnly" value="true"/> - <property name="featureAndPlugins" value="true"/> - </ant> - <eclipse.fetch - elements="plugin@org.apache.commons.net.source" - buildDirectory="${buildDirectory}" - directory="${buildDirectory}/directory.txt" - fetchTag="" - configInfo="*,*,*" - baseLocation="${baseLocation}" - /> - <!-- Run generated fetch script --> - <ant antfile="${buildDirectory}/fetch_org.apache.commons.net.source.xml"> - <property name="featureOnly" value="true"/> - <property name="featureAndPlugins" value="true"/> - </ant> - </target> - - <target name="preFetch" depends="preFetchOrbitBundles,preFetchOrbitSource"> - </target> - - <!-- ===================================================================== --> - <!-- Steps to do after fetching the build elements --> - <!-- ===================================================================== --> - <target name="postFetch"> - </target> - - <!-- ===================================================================== --> - <!-- Steps to do before generating the build scripts. --> - <!-- ===================================================================== --> - <target name="preGenerate"> - </target> - - <!-- ===================================================================== --> - <!-- Steps to do after generating the build scripts. --> - <!-- ===================================================================== --> - <target name="postGenerate"> - </target> - - <!-- ===================================================================== --> - <!-- Steps to do before running the build.xmls for the elements being built. --> - <!-- ===================================================================== --> - <target name="preProcess"> - <condition property="buildIdForMappings" value="${buildId} (${mydstamp}-${mytstamp})" else="${buildId}"> - <or> - <equals arg1="${buildType}" arg2="S"/> - <equals arg1="${buildType}" arg2="R"/> - </or> - </condition> - <replace dir="${buildDirectory}/plugins" value="${buildIdForMappings}" token="@build@"> - <include name="**/about.mappings" /> - </replace> - </target> - - <!-- ===================================================================== --> - <!-- Steps to do after running the build.xmls for the elements being built. --> - <!-- ===================================================================== --> - <target name="postProcess"> - <antcall target="allElements"> - <param name="target" value="gatherLogs" /> - </antcall> - </target> - - <!-- ===================================================================== --> - <!-- Steps to do before running assemble. --> - <!-- ===================================================================== --> - <target name="preAssemble"> - <antcall target="serverruntime" /> - <antcall target="hideServerStuff" /> - <antcall target="allElements"> - <param name="target" value="gatherSources" /> - </antcall> - </target> - - <!-- ===================================================================== --> - <!-- Steps to do after running assemble. --> - <!-- ===================================================================== --> - <target name="postAssemble"> - <antcall target="revealServerStuff" /> - </target> - - <!-- ===================================================================== --> - <!-- Steps to do before running package. --> - <!-- ===================================================================== --> - <target name="prePackage"> - <echo message="builder - all - customTargets.xml - prePackage"/> - <!-- TODO? --> - </target> - - <!-- ===================================================================== --> - <!-- Steps to do after running package. --> - <!-- ===================================================================== --> - <target name="postPackage"> - <echo message="builder - all - customTargets.xml - postPackage"/> - <!-- TODO? --> - </target> - - <!-- ===================================================================== --> - <!-- Steps to do after the build is done. --> - <!-- ===================================================================== --> - <target name="postBuild" depends="myInit"> - <mkdir dir="${packageDirectory}/${dropDir}" /> - <move todir="${packageDirectory}/${dropDir}"> - <fileset dir="${buildDirectory}/${buildLabel}" includes="RSE-*.zip,TM-*.zip"/> - </move> - <move todir="${packageDirectory}/${dropDir}"> - <fileset dir="${buildDirectory}/${buildLabel}" includes="rseserver-*"/> - </move> - <copy todir="${packageDirectory}/${dropDir}" file="${buildDirectory}/directory.txt"/> - <!-- Create and analyze the compilelog.txt file --> - <concat destfile="${packageDirectory}/${dropDir}/compilelog.txt"> - <fileset dir="${buildDirectory}/plugins" includes="**/*.bin.log"/> - </concat> - <loadfile property="compileLog" srcFile="${packageDirectory}/${dropDir}/compilelog.txt"/> - <condition property="hasErrors"> - <contains string="${compileLog}" substring=" ERROR"/> - </condition> - <!-- Create the index.php file --> - <copy todir="${packageDirectory}/${dropDir}"> - <fileset dir="${builder}/template/" includes="*.php,*.gif,package.count"/> - </copy> - <condition property="buildTypeLong" value="Private"><equals arg1="${buildType}" arg2="P"/></condition> - <condition property="buildTypeLong" value="Nightly"><equals arg1="${buildType}" arg2="N"/></condition> - <condition property="buildTypeLong" value="Integration"><equals arg1="${buildType}" arg2="I"/></condition> - <condition property="buildTypeLong" value="Stable"><equals arg1="${buildType}" arg2="S"/></condition> - <condition property="buildTypeLong" value="Release"><equals arg1="${buildType}" arg2="R"/></condition> - <condition property="buildTypeLong" value="Maintenance"><equals arg1="${buildType}" arg2="M"/></condition> - <replace file="${packageDirectory}/${dropDir}/index.php"> - <replacefilter token="@buildTypeLong@" value="${buildTypeLong}"/> - <replacefilter token="@dateLong@" value="${dateLong}"/> - <replacefilter token="@dropDir@" value="${dropDir}"/> - <replacefilter token="@buildId@" value="${buildId}"/> - </replace> - <replace file="${packageDirectory}/${dropDir}/buildNotes.php"> - <replacefilter token="@dateLong@" value="${dateLong}"/> - <replacefilter token="@buildId@" value="${buildId}"/> - </replace> - <antcall target="publish"/> - </target> - - <!-- ===================================================================== --> - <!-- Steps to do to test the build results --> - <!-- ===================================================================== --> - <target name="test"> - </target> - - <!-- ===================================================================== --> - <!-- Steps to do to publish the build results --> - <!-- ===================================================================== --> - <target name="publish" if="doPublish"> - <antcall target="publishCopy"/> - <antcall target="publishUpload"/> - <antcall target="mail"/> - </target> - - <target name="publishCopy" depends="myInit" if="doCopy" unless="hasErrors"> - <mkdir dir="${publishDirectory}/${dropDir}" /> - <copy todir="${publishDirectory}/${dropDir}"> - <fileset dir="${packageDirectory}/${dropDir}" includes="*.zip,*.tar,*.php,*.txt,*.gif,package.count" /> - </copy> - </target> - - <target name="publishUpload" depends="myInit" if="doUpload" unless="hasErrors"> - <exec dir="${packageDirectory}" executable="scp"> - <arg line="-r ${dropDir} ${remotedir}"/> - </exec> - </target> - - <target name="mail" depends="myInit"> - <antcall target="mailPass"/> - <antcall target="mailFail"/> - </target> - - <target name="mailPass" unless="hasErrors"> - <copy file="${builder}/${messagefile}" tofile="${buildDirectory}/message.txt" overwrite="true"/> - <replace file="${buildDirectory}/message.txt"> - <replacefilter token="@dropDir@" value="${dropDir}"/> - </replace> - <mail subject="RSE Build ${buildId} completed" - tolist="${mailto}" from="martin.oberhuber@windriver.com"> - <message src="${buildDirectory}/message.txt"/> - </mail> - </target> - - <target name="mailFail" if="hasErrors"> - <mail subject="RSE Build ${buildId} failed" - tolist="${mailto}" from="martin.oberhuber@windriver.com"> - <message src="${packageDirectory}/${dropDir}/compilelog.txt"/> - </mail> - </target> - - <!-- ===================================================================== --> - <!-- Default target --> - <!-- ===================================================================== --> - <target name="noDefault"> - <echo message="You must specify a target when invoking this file" /> - </target> - - <!-- ===================================================================== - Specialized targets to build the server runtime. - ===================================================================== --> - - <target name="serverruntime"> - - <property name="working" value="${buildDirectory}/${buildLabel}/rseserver"/> - <mkdir dir="${working}" /> - <mkdir dir="${working}/jars" /> - - <copy todir="${working}"> - <fileset dir="${buildDirectory}/plugins/org.eclipse.rse.services.dstore/serverruntime" includes="**" /> - </copy> - - <copy todir="${working}/jars"> - <fileset dir="${buildDirectory}/plugins/org.eclipse.dstore.core" includes="dstore_core.jar" /> - <fileset dir="${buildDirectory}/plugins/org.eclipse.dstore.extra" includes="dstore_extra_server.jar" /> - <fileset dir="${buildDirectory}/plugins/org.eclipse.rse.services" includes="clientserver.jar" /> - <fileset dir="${buildDirectory}/plugins/org.eclipse.rse.services.dstore" includes="dstore_miners.jar" /> - </copy> - - <antcall target="rseserver-os-tar"> - <param name="os" value="unix"/> - <param name="eol" value="lf"/> - </antcall> - <antcall target="rseserver-os-tar"> - <param name="os" value="macosx"/> - <param name="eol" value="lf"/> - </antcall> - <antcall target="rseserver-os-tar"> - <param name="os" value="linux"/> - <param name="eol" value="lf"/> - </antcall> - <antcall target="rseserver-os-zip"> - <param name="os" value="windows"/> - <param name="eol" value="crlf"/> - </antcall> - - <delete dir="${working}" /> - - </target> - - <target name="rseserver-os-tar" depends="rseserver-os-collect"> - <tar destfile="${buildDirectory}/${buildLabel}/rseserver-${buildId}-${os}.tar"> - <tarfileset dir="${working}/collector" mode="755" includes="*.pl,*.sh" /> - <tarfileset dir="${working}/collector" mode="644" excludes="*.pl,*.sh" /> - </tar> - <delete dir="${working}/collector" /> - </target> - <target name="rseserver-os-zip" depends="rseserver-os-collect"> - <zip destfile="${buildDirectory}/${buildLabel}/rseserver-${buildId}-${os}.zip" basedir="${working}/collector" includes="*"/> - <delete dir="${working}/collector" /> - </target> - - <target name="rseserver-os-collect"> - <mkdir dir="${working}/collector" /> - <copy todir="${working}/collector"> - <fileset dir="${working}/scripts/${os}" includes="*"/> - <fileset dir="${working}/data" includes="*"/> - </copy> - <replace file="${working}/collector/build.dat"> - <replacefilter token="@build@" value="${buildId}"/> - <replacefilter token="@version@" value="${mapVersionTag}"/> - </replace> - <fixcrlf srcdir="${working}/collector" eol="${eol}" eof="asis" includes="*"/> - <copy todir="${working}/collector"> - <fileset dir="${working}/jars" includes="*"/> - <fileset dir="${builder}/template" includes="notice.html,epl-v10.html" /> - </copy> - </target> - - <!-- ===================================================================== - Specialized targets hide/reveal the server stuff so it doesn't get packaged - in the client. - ===================================================================== --> - - <target name="hideServerStuff"> - <mkdir dir="${buildDirectory}/hidden"/> - <move todir="${buildDirectory}/hidden"> - <fileset dir="${buildDirectory}/plugins"> - <include name="**/clientserver.jar"/> - <include name="**/dstore_core.jar"/> - <include name="**/dstore_extra_server.jar"/> - <include name="**/dstore_miners.jar"/> - <include name="**/clientserversrc.zip"/> - <include name="**/dstore_coresrc.zip"/> - <include name="**/dstore_extra_serversrc.zip"/> - <include name="**/dstore_minerssrc.zip"/> - </fileset> - </move> - </target> - - <target name="revealServerStuff"> - <move todir="${buildDirectory}/plugins"> - <fileset dir="${buildDirectory}/hidden" includes="**" /> - </move> - <delete dir="${buildDirectory}/hidden"/> - </target> - - <!-- ===================================================================== --> - <!-- Zip the docs --> - <!-- ===================================================================== --> - <target name="zipDoc"> - <zip destfile="${buildDirectory}\plugins\${docPluginID}\doc.zip" filesonly="false" defaultexcludes="true"> - <fileset dir="${buildDirectory}\plugins\${docPluginID}" defaultexcludes="true"> - <include name="**/*.gif" /> - <include name="**/*.html" /> - <include name="**/*.htm" /> - <include name="**/*.GIF" /> - <include name="**/*.HTML" /> - <include name="**/*.HTM" /> - <include name="**/*.css" /> - </fileset> - </zip> - </target> - -</project> diff --git a/releng/org.eclipse.rse.build/downloads/.cvsignore b/releng/org.eclipse.rse.build/downloads/.cvsignore deleted file mode 100644 index a17291e0f..000000000 --- a/releng/org.eclipse.rse.build/downloads/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -drops diff --git a/releng/org.eclipse.rse.build/downloads/build_types.html b/releng/org.eclipse.rse.build/downloads/build_types.html deleted file mode 100644 index 131c40e84..000000000 --- a/releng/org.eclipse.rse.build/downloads/build_types.html +++ /dev/null @@ -1,84 +0,0 @@ -<!doctype html public "-//w3c//dtd html 4.0 transitional//en"> -<html> -<head> -<title>Eclipse Corner</title> -<link rel="stylesheet" href="http://www.eclipse.org/default_style.css"> -<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> -</head> -<body text="#000000" bgcolor="#ffffff" link="#0000ee" vlink="#551a8b" alink="#ff0000"> -<table border=0 cellspacing=5 cellpadding=2 width="100%" > - <tr> - <td align=left valign=top colspan="2" bgcolor="#0080c0"><b><font face="Arial,Helvetica" color="#ffffff">Eclipse - Project Build Types</font></b></td> - </tr> - <tr> - <td align=right valign=top><img src="http://www.eclipse.org/images/Adarrow.gif" border=0 height=16 width=16></td> - <td> - <p><b><font face="arial,helvetica,geneva" size="-1">Releases</font></b> - <br> - <font size="-1" face="arial,helvetica,geneva">Releases are builds - that have been declared major releases by the development team - for example - "R1.0". Releases are the right builds for people who want to - be on a stable, tested release, and don't need the latest greatest features - and improvements. Release builds always have an "R" at the beginning - of the name i.e. R1.0, R2.0 etc. Non-release builds are named according to the - date of the build - for example 20060427 is the build from April 27, 2006.</font><br> - </p> - </td> - </tr> - <tr> - <td align=right valign=top><img src="http://www.eclipse.org/images/Adarrow.gif" border=0 height=16 width=16></td> - <td><b><font face="arial,helvetica,geneva" size="-1">Stable Builds</font></b> - <br> - <font size="-1" face="arial,helvetica,geneva"> Stable builds are integration - builds that have been found to be stable enough for most people to use. - They are promoted from integration build to stable build by the architecture - team after they have been used for a few days and deemed reasonably stable. - The latest stable build is the right build for people who want to stay up - to date with what is going on in the latest development stream, and don't - mind putting up with a few problems n in order to get the latest greatest - features and bug fixes. The latest stable build is the one the development - team likes people to be using, because of the valuable and timely feedback. - </font></td> - </tr> - <tr> - <td align=right valign=top><img src="http://www.eclipse.org/images/Adarrow.gif" border=0 height=16 width=16></td> - <td> - <p><b><font face="arial,helvetica,geneva" size="-1">Integration Builds</font></b> - <br> - <font size="-1" face="arial,helvetica,geneva"> Periodically, component - teams version off their work in what they believe is a stable, consistent - state, and they update the build configuration to indicate that the next - integration build should take this version of the component. Integration - builds are built from these stable component versions that have been specified - by each component team as the best version available. Integration builds - may be promoted to stable builds after a few days of testing. Integration - builds are built whenever new stable component versions are released into - the build.</font></p> - </td> - </tr> - <tr> - <td align=right valign=top><img src="http://www.eclipse.org/images/Adarrow.gif" border=0 height=16 width=16></td> - <td><b><font face="arial,helvetica,geneva" size="-1">Nightly Builds</font></b> - <br> - <font size="-1" face="arial,helvetica,geneva"> Nightly builds are produced - every night from whatever has been released into the HEAD stream of the - CVS repository. They are completely untested and will almost always have - major problems. Many will not work at all. These drops are normally only - useful to developers actually working on the Eclipse Project.</font></td> - </tr> - <tr> - <td align=right valign=top><img src="http://www.eclipse.org/images/Adarrow.gif" border=0 height=16 width=16></td> - <td><b><font face="arial,helvetica,geneva" size="-1">Maintenance Builds</font></b> - <br> - <font size="-1" face="arial,helvetica,geneva"> Maintenance builds are produced - periodically to incorporate fixes into an existing release. They are typically - built from tagged plug-in and feature pojects in a maintenance stream of the CVS - repository (i.e. R1_0_maintenance). Maintenance builds are promoted to a minor - or service release (i.e. R1.1 or R1.0.1) after development teams have deemed one - to be stable following one or more test-fix pass cycles.</font></td> - </tr> -</table> -<h3> </h3> -</body> -</html> diff --git a/releng/org.eclipse.rse.build/downloads/dlconfig.txt b/releng/org.eclipse.rse.build/downloads/dlconfig.txt deleted file mode 100644 index 0f89252ae..000000000 --- a/releng/org.eclipse.rse.build/downloads/dlconfig.txt +++ /dev/null @@ -1,2 +0,0 @@ -dropPrefix[]=R&dropPrefix[]=S&dropPrefix[]=I&dropPrefix[]=N&dropPrefix[]=M& -dropType[]=Latest Release&dropType[]=3.1 Stream Stable Build&dropType[]=3.1 Stream Integration Build&dropType[]=3.1 Stream Nightly Build&dropType[]=3.0.x Stream Maintenance Build& diff --git a/releng/org.eclipse.rse.build/downloads/index.php b/releng/org.eclipse.rse.build/downloads/index.php deleted file mode 100644 index 5e2117d4d..000000000 --- a/releng/org.eclipse.rse.build/downloads/index.php +++ /dev/null @@ -1,242 +0,0 @@ -<html><head> -<link rel="stylesheet" href="http://www.eclipse.org/default_style.css"> -<title>Target Management Project RSE Downloads</title></head> -<body> - -<table border=0 cellspacing=5 cellpadding=2 width="100%" > - <tr> - <td align=left width="72%"> <font class=indextop>Target Management project<br/>RSE downloads</font> - <br> - <font class=indexsub>latest downloads from the dsdp-tm project</font><br> -</td> - <td width="28%"><img src="http://www.eclipse.org/images/Idea.jpg" height=86 width=120></td> - </tr> - -</table> -<table border=0 cellspacing=5 cellpadding=2 width="100%" > - - <tr> - <td align=LEFT valign=TOP colspan="2" bgcolor="#0080C0"><b><font color="#FFFFFF" face="Arial,Helvetica">Download Information</font></b></td> - </tr> - - <tr> <td> <p>On this -page you can find the latest -<a href="build_types.html">builds</a> for the Remote System Explorer (RSE), -provided by the -<a href="http://www.eclipse.org/dsdp/tm/">Target Management</a> project. -<!-- -To get started run the program and go through the -user and developer documentation provided in the online help system. ---> -To get started, see the build notes provided with each drop, run the -program and go through the online user and developer documentation, -or take a look at the project's online -<a href="http://www.eclipse.org/dsdp/tm/tutorial/index.php">getting started</a> -pages. - -If you have problems downloading the drops, contact the -<font face="arial,helvetica,geneva" size="-1"><a href="mailto:webmaster@eclipse.org">webmaster</a></font>. -If you have problems installing or getting the workbench to run, -check out the -<a href="http://wiki.eclipse.org/TM_and_RSE_FAQ">Target Management FAQ</a>, -or try posting a question to the -<a href="http://www.eclipse.org/newsgroups">newsgroup</a>, -<a href="news://news.eclipse.org/eclipse.dsdp.tm">eclipse.dsdp.tm</a>. -All downloads are provided under the terms and conditions of the -<a href="http://www.eclipse.org/legal/epl/notice.php">Eclipse.org -Software User Agreement</a> unless otherwise specified. </p> - -<p> -<b>Other eclipse.org project</b> downloads are available -<a href="http://www.eclipse.org/downloads/index.php">here</a>.<br/> -If you just want the latest drops (no dstore server), you can also get them from the -<a href="http://download.eclipse.org/dsdp/tm/updates/3.0">TM 3.0 update site</a>.</p> - -<p> -For information about different kinds of builds look -<a href="build_types.html" target="_top">here</a>. - -<img src="http://www.eclipse.org/images/new.gif"> -For access to archived builds, look -<a href="http://archive.eclipse.org/dsdp/tm/downloads/index.php" target="_top">here</a>. -</p> - -<p/> -<!-- -<p>Builds can also be installed via Update Manager, from an existing installation of Eclipse, by following these -<a href="http://download.eclipse.org/dsdp/tm/downloads/updates/index.php" target="_self">steps</a>. -</p> ---> -</td></tr> - - <tr> - <td align=LEFT valign=TOP colspan="2" bgcolor="#0080C0"><b><font color="#FFFFFF" face="Arial,Helvetica">Latest - Downloads</font></b></td> - </tr> - </table> - <?php - $fileHandle = fopen("dlconfig.txt", "r"); - while (!feof($fileHandle)) { - $aLine = fgets($fileHandle, 4096); - parse_str($aLine); - } - fclose($fileHandle); - - for ($i = 0; $i < count($dropType); $i++) { - $typeToPrefix[$dropType[$i]] = $dropPrefix[$i]; - } - - $aDirectory = dir("drops"); - while ($anEntry = $aDirectory->read()) { - - // Short cut because we know aDirectory only contains other directories. - if ($anEntry != "." && $anEntry!="..") { - $aDropDirectory = dir("drops/".$anEntry); - $fileCount = 0; - while ($aDropEntry = $aDropDirectory->read()) { - if (stristr($aDropEntry, ".zip") || stristr($aDropEntry, ".tar")) { - // Count the files in the directory - $fileCount = $fileCount + 1; - } - } - //See http://at2.php.net/manual/en/class.dir.php - $aDropDirectory->close(); - // Read the count file - $countFile = "drops/".$anEntry."/package.count"; - $indexFile = "drops/".$anEntry."/index.php"; - if (file_exists($countFile) && file_exists($indexFile)) { - $anArray = file($countFile); - - // If a match - process the directory - if ($anArray[0] == $fileCount) { - $parts = explode("-", $anEntry); - if (count($parts) == 2) { - - //N-builds and I-builds - $datePart = $parts[0]; - $timePart = $parts[1]; - $buildtype = substr($datePart, 0, 1); - $buckets[$buildtype][] = $anEntry; - - $year = substr($datePart, 1, 4); - $month = substr($datePart, 5, 2); - $day = substr($datePart, 7, 2); - $hour = substr($timePart,0,2); - $minute = substr($timePart,2,2); - $timeStamp = mktime($hour, $minute, 0, $month, $day, $year); - - $timeStamps[$anEntry] = date("D, j M Y -- H:i (O)", $timeStamp); - - if ($timeStamp > $latestTimeStamp[$buildtype]) { - $latestTimeStamp[$buildtype] = $timeStamp; - $latestFile[$buildtype] = $anEntry; - } - - } else if (count($parts) == 3) { - - //S-builds and R-builds - $buckets[$parts[0]][] = $anEntry; - - $timePart = $parts[2]; - $year = substr($timePart, 0, 4); - $month = substr($timePart, 4, 2); - $day = substr($timePart, 6, 2); - $hour = substr($timePart,8,2); - $minute = substr($timePart,10,2); - $timeStamp = mktime($hour, $minute, 0, $month, $day, $year); - - $timeStamps[$anEntry] = date("D, j M Y -- H:i (O)", $timeStamp); - - if ($timeStamp > $latestTimeStamp[$parts[0]]) { - $latestTimeStamp[$parts[0]] = $timeStamp; - $latestFile[$parts[0]] = $anEntry; - } - } - } - } - } - } - $aDirectory->close(); - ?> - -<table width="100%" cellspacing=0 cellpadding=3 align=center> -<td align=left> -<TABLE width="100%" CELLSPACING=0 CELLPADDING=3> -<tr> - <td width=\"30%\"><b>Build Type</b></td> - <td><b>Build Name</b></td> - <td><b>Build Date</b></td> -</tr> - -<?php - foreach($dropType as $value) { - $prefix=$typeToPrefix[$value]; - $fileName = $latestFile[$prefix]; - echo "<tr> - <td width=\"30%\">$value</td>"; - - $parts = explode("-", $fileName); - if (count($parts) == 2) { - $buildName=$fileName; - } else { - $buildName=$parts[1]; - } - - // Uncomment the line below if we need click through licenses. - // echo "<td><a href=license.php?license=drops/$fileName>$buildName</a></td>"; - - // Comment the line below if we need click through licenses. - echo "<td><a href=\"drops/$fileName/index.php\">$buildName</a></td>"; - - echo "<td>$timeStamps[$fileName]</td>"; - echo "</tr>"; - } -?> -</table> -</table> - -<?php - foreach($dropType as $value) { - $prefix=$typeToPrefix[$value]; - echo " - <table width=\"100%\" cellspacing=0 cellpadding=3 align=center> - <tr bgcolor=\"#999999\"> - <td align=left width=\"30%\"><b><a name=\"$value\"><font color=\"#FFFFFF\" face=\"Arial,Helvetica\">$value"; - echo "s</font></b></a></td> - </TR> - <TR> - <td align=left> - <TABLE width=\"100%\" CELLSPACING=0 CELLPADDING=3> - <tr> - <td width=\"30%\"><b>Build Name</b></td> - <td><b>Build Date</b></td> - </tr>"; - - $aBucket = $buckets[$prefix]; - if (isset($aBucket)) { - rsort($aBucket); - foreach($aBucket as $innerValue) { - $parts = explode("-", $innerValue); - if (count($parts) == 2) { - $buildName=$innerValue; - } else { - $buildName=$parts[1]; - } - echo "<tr>"; - - // Uncomment the line below if we need click through licenses. - // echo "<td><a href=\"license.php?license=drops/$innerValue\">$buildName</a></td>"; - - // Comment the line below if we need click through licenses. - echo "<td><a href=\"drops/$innerValue/index.php\">$buildName</a></td>"; - - echo "<td>$timeStamps[$innerValue]</td> - </tr>"; - } - } - echo "</table></table> "; - } -?> - - -</body></html> diff --git a/releng/org.eclipse.rse.build/fetchBuilder.pl b/releng/org.eclipse.rse.build/fetchBuilder.pl deleted file mode 100755 index eddadec9f..000000000 --- a/releng/org.eclipse.rse.build/fetchBuilder.pl +++ /dev/null @@ -1,20 +0,0 @@ -#!/usr/bin/perl -use warnings; - -print STDERR "Which tag do you want to fetch? (default is HEAD): "; -$answer = <STDIN>; -chomp($answer); -$tag = $answer ? $answer : "HEAD"; - -$incantation = "cvs "; -$incantation .= '-d :pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp '; -$incantation .= "checkout "; -$incantation .= "-r ${tag} "; -$incantation .= "-d builder "; -$incantation .= "org.eclipse.tm.rse/releng/org.eclipse.rse.build "; - -print($incantation); -system($incantation); - -print("\n"); -print("Builder has been fetched and is in the builder subdirectory\n"); diff --git a/releng/org.eclipse.rse.build/go.sh b/releng/org.eclipse.rse.build/go.sh deleted file mode 100755 index a54100dcc..000000000 --- a/releng/org.eclipse.rse.build/go.sh +++ /dev/null @@ -1,66 +0,0 @@ -#!/bin/sh -#******************************************************************************* -# Copyright (c) 2006 Wind River Systems, Inc. -# All rights reserved. This program and 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 -#******************************************************************************* -# go.sh -- build script like nightly build but for testing stuff without -# fetch in a local workspace -# -# Prerequisites: -# - Eclipse 3.2 installed or linked from ../eclipse -# - org.eclipse.releng.basebuilder checked out to ../org.eclipse.releng.basebuilder -# -#author: martin oberhuber - -curdir=`pwd` -cd `dirname $0` -mydir=`pwd` - -# pathes: see build.rb for reference -cd "$mydir/../eclipse" ; eclipse=`pwd` -cd "$mydir/../org.eclipse.releng.basebuilder" ; basebuilder=`pwd` -cd "$mydir/../working" ; working=`pwd` -cd "$mydir/../publish" ; publishDirectory=`pwd` -cd "$mydir" ; builder=`pwd` - -# Find the base build scripts: genericTargets.xml and build.xml -pdeBuild="${basebuilder}/plugins/org.eclipse.pde.build" -buildDirectory="${working}/build" -packageDirectory="${working}/package" - -tag="HEAD" -buildType="N" -mydstamp=`date +'%Y%m%d'` -mytstamp=`date +'%H%M'` -timestamp="${mydstamp}-${mytstamp}" -buildId="${buildType}${timestamp}" -rm -rf "${buildDirectory}" - -command="java -cp ${basebuilder}/plugins/org.eclipse.equinox.launcher.jar org.eclipse.core.launcher.Main " -command="$command -application org.eclipse.ant.core.antRunner " -command="$command -buildfile ${pdeBuild}/scripts/build.xml " -command="$command -DbuildDirectory=${buildDirectory} " -command="$command -DpackageDirectory=${packageDirectory} " -command="$command -DpublishDirectory=${publishDirectory} " -command="$command -Dbuilder=${builder} " -command="$command -DbaseLocation=${eclipse} " -command="$command -DbuildType=${buildType} " -command="$command -DbuildId=${buildId} " -command="$command -DmapVersionTag=${tag} " -command="$command -DdoPublish=true " -command="$command -DforceContextQualifier=${buildId} " -command="$command -DfetchTag=HEAD " -command="$command -DskipFetch " -command="$command -Dmydstamp=${mydstamp} " -command="$command -Dmytstamp=${mytstamp} " -#command="$command -DJ2SE-1.2=../jres/1.2.2/lib/rt.jar " -#command="$command postBuild " - -echo "$command" -exec $command diff --git a/releng/org.eclipse.rse.build/maps/discovery.map b/releng/org.eclipse.rse.build/maps/discovery.map deleted file mode 100644 index 5c596b495..000000000 --- a/releng/org.eclipse.rse.build/maps/discovery.map +++ /dev/null @@ -1,10 +0,0 @@ -feature@org.eclipse.tm.discovery=v20080530,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/discovery/org.eclipse.tm.discovery-feature -plugin@org.eclipse.rse.discovery=v20080402,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/discovery/org.eclipse.rse.discovery -plugin@org.eclipse.tm.discovery.doc.isv=v20080406,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/discovery/org.eclipse.tm.discovery.doc.isv -plugin@org.eclipse.tm.discovery.engine=v20080331,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/discovery/org.eclipse.tm.discovery.engine -plugin@org.eclipse.tm.discovery.model=v20080331,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/discovery/org.eclipse.tm.discovery.model -plugin@org.eclipse.tm.discovery.model.edit=v20080522,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/discovery/org.eclipse.tm.discovery.model.edit -plugin@org.eclipse.tm.discovery.protocol.dnssd=v20080331,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/discovery/org.eclipse.tm.discovery.protocol.dnssd -plugin@org.eclipse.tm.discovery.transport.udp=v20080331,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/discovery/org.eclipse.tm.discovery.transport.udp -plugin@org.eclipse.tm.discovery.view=v20080522,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/discovery/org.eclipse.tm.discovery.view -plugin@org.eclipse.tm.discovery.wizard=v20080529,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/discovery/org.eclipse.tm.discovery.wizard
\ No newline at end of file diff --git a/releng/org.eclipse.rse.build/maps/rse.map b/releng/org.eclipse.rse.build/maps/rse.map deleted file mode 100644 index f8670b67b..000000000 --- a/releng/org.eclipse.rse.build/maps/rse.map +++ /dev/null @@ -1,67 +0,0 @@ -!*************** PROJECT CONTRIBUTION ******************************************************** -!*** Project's plugins, features and fragments -feature@org.eclipse.rse=v200811110900,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/features/org.eclipse.rse-feature -feature@org.eclipse.rse.core=v200811110900,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/features/org.eclipse.rse.core-feature -feature@org.eclipse.rse.dstore=v200811111850,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/features/org.eclipse.rse.dstore-feature -feature@org.eclipse.rse.examples=v20080604,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/examples/org.eclipse.rse.examples-feature -feature@org.eclipse.rse.ftp=v200809171630,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/features/org.eclipse.rse.ftp-feature -feature@org.eclipse.rse.local=v20080710,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/features/org.eclipse.rse.local-feature -feature@org.eclipse.rse.remotecdt=v200809041200,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/features/org.eclipse.rse.remotecdt-feature -!!feature@org.eclipse.rse.remotecdt.wrapper=v20080609a,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/features/org.eclipse.rse.remotecdt.wrapper-feature -feature@org.eclipse.rse.sdk=v200811110900,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/features/org.eclipse.rse.sdk-feature -feature@org.eclipse.rse.ssh=v20080714,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/features/org.eclipse.rse.ssh-feature -feature@org.eclipse.rse.telnet=v200809181500,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/features/org.eclipse.rse.telnet-feature -feature@org.eclipse.rse.terminals=v200809041200,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/features/org.eclipse.rse.terminals-feature -feature@org.eclipse.rse.tests=v200809041200,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/tests/org.eclipse.rse.tests-feature -feature@org.eclipse.rse.useractions=v200809231600,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/features/org.eclipse.rse.useractions-feature -!!feature@org.eclipse.rse.useractions.wrapper=v20080609a,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/features/org.eclipse.rse.useractions.wrapper-feature -!!feature@org.eclipse.tm.releng.master=v20080609,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/releng/org.eclipse.tm.releng.master-feature -plugin@org.eclipse.dstore.core=v200809110140,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.dstore.core -plugin@org.eclipse.dstore.doc.isv=v200809041200,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/doc/org.eclipse.dstore.doc.isv -plugin@org.eclipse.dstore.extra=v20080406,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.dstore.extra -plugin@org.eclipse.rse=v20080529,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse -plugin@org.eclipse.rse.connectorservice.dstore=v200809181500,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.connectorservice.dstore -plugin@org.eclipse.rse.connectorservice.local=v20080604,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.connectorservice.local -plugin@org.eclipse.rse.connectorservice.ssh=v20080604,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.connectorservice.ssh -plugin@org.eclipse.rse.connectorservice.telnet=v20080604,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.connectorservice.telnet -plugin@org.eclipse.rse.core=v200811110900,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.core -plugin@org.eclipse.rse.doc.isv=v200809041200,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/doc/org.eclipse.rse.doc.isv -plugin@org.eclipse.rse.doc.user=v200809041200,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/doc/org.eclipse.rse.doc.user -plugin@org.eclipse.rse.dstore.security=v20080609,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.dstore.security -plugin@org.eclipse.rse.efs=v200809041200,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.efs -plugin@org.eclipse.rse.efs.ui=v20080606,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.efs.ui -plugin@org.eclipse.rse.examples.daytime=v20080604,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/examples/org.eclipse.rse.examples.daytime -plugin@org.eclipse.rse.examples.tutorial=v20080604,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/examples/org.eclipse.rse.examples.tutorial -plugin@org.eclipse.rse.files.ui=v200811260038,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.files.ui -plugin@org.eclipse.rse.importexport=v20080604,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.importexport -plugin@org.eclipse.rse.processes.ui=v20080714,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.processes.ui -plugin@org.eclipse.rse.remotecdt=v200808191815,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/examples/org.eclipse.rse.remotecdt -plugin@org.eclipse.rse.sdk=v20080529,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.sdk -plugin@org.eclipse.rse.services.dstore=v200811111850,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.services.dstore -plugin@org.eclipse.rse.services.files.ftp=v200808191815,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.services.files.ftp -plugin@org.eclipse.rse.services.local=v20080710,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.services.local -plugin@org.eclipse.rse.services.ssh=v20080714,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.services.ssh -plugin@org.eclipse.rse.services.telnet=v20080604,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.services.telnet -plugin@org.eclipse.rse.services=v200809091230,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.services -plugin@org.eclipse.rse.shells.ui=v20080710,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.shells.ui -plugin@org.eclipse.rse.subsystems.files.core=v200809041200,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.files.core -plugin@org.eclipse.rse.subsystems.files.dstore=v200811261300,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.files.dstore -plugin@org.eclipse.rse.subsystems.files.ftp=v20080609,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.files.ftp -plugin@org.eclipse.rse.subsystems.files.local=v20080604,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.files.local -plugin@org.eclipse.rse.subsystems.files.ssh=v20080604,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.files.ssh -plugin@org.eclipse.rse.subsystems.processes.core=v20080529,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.processes.core -plugin@org.eclipse.rse.subsystems.processes.dstore=v20080604,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.processes.dstore -plugin@org.eclipse.rse.subsystems.processes.local=v20080604,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.processes.local -plugin@org.eclipse.rse.subsystems.processes.shell.linux=v20080714,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.processes.shell.linux -plugin@org.eclipse.rse.subsystems.shells.core=v20080604,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.shells.core -plugin@org.eclipse.rse.subsystems.shells.dstore=v20080604,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.shells.dstore -plugin@org.eclipse.rse.subsystems.shells.local=v20080604,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.shells.local -plugin@org.eclipse.rse.subsystems.shells.ssh=v20080604,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.shells.ssh -plugin@org.eclipse.rse.subsystems.shells.telnet=v20080604,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.shells.telnet -plugin@org.eclipse.rse.subsystems.terminals.core=v20080714,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.terminals.core -plugin@org.eclipse.rse.subsystems.terminals.ssh=v20080604,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.terminals.ssh -plugin@org.eclipse.rse.terminals.ui=v200809161200,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.terminals.ui -plugin@org.eclipse.rse.tests=v20080825,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/tests/org.eclipse.rse.tests -plugin@org.eclipse.rse.tests.framework=v20080604,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/tests/org.eclipse.rse.tests.framework -plugin@org.eclipse.rse.ui=v200811260038,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.ui -plugin@org.eclipse.rse.useractions=v200809110140,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.useractions
\ No newline at end of file diff --git a/releng/org.eclipse.rse.build/maps/terminal.map b/releng/org.eclipse.rse.build/maps/terminal.map deleted file mode 100644 index 26998232b..000000000 --- a/releng/org.eclipse.rse.build/maps/terminal.map +++ /dev/null @@ -1,13 +0,0 @@ -feature@org.eclipse.tm.terminal=v200807281235,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal-feature -feature@org.eclipse.tm.terminal.sdk=v200811110900,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal.sdk-feature -feature@org.eclipse.tm.terminal.serial=v20080715,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal.serial-feature -feature@org.eclipse.tm.terminal.ssh=v200811110900,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal.ssh-feature -feature@org.eclipse.tm.terminal.telnet=v20080715,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal.telnet-feature -feature@org.eclipse.tm.terminal.test=v20080530,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal.test-feature -feature@org.eclipse.tm.terminal.view=v20080715,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal.view-feature -plugin@org.eclipse.tm.terminal=v200807281235,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal -plugin@org.eclipse.tm.terminal.serial=v20080715,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal.serial -plugin@org.eclipse.tm.terminal.ssh=v200811110900,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal.ssh -plugin@org.eclipse.tm.terminal.telnet=v20080715,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal.telnet -plugin@org.eclipse.tm.terminal.test=v20080610,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal.test -plugin@org.eclipse.tm.terminal.view=v20080715,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal.view
\ No newline at end of file diff --git a/releng/org.eclipse.rse.build/maps/testdrivers.map b/releng/org.eclipse.rse.build/maps/testdrivers.map deleted file mode 100644 index 6ef4354c7..000000000 --- a/releng/org.eclipse.rse.build/maps/testdrivers.map +++ /dev/null @@ -1,6 +0,0 @@ -!*************** PROJECT CONTRIBUTION ******************************************************** - -!*** Special entries from eclipse - -plugin@org.eclipse.test=v20071108,:pserver:anonymous@dev.eclipse.org:/cvsroot/eclipse, -fragment@org.eclipse.ant.optional.junit=v20070530,:pserver:anonymous@dev.eclipse.org:/cvsroot/eclipse, diff --git a/releng/org.eclipse.rse.build/maps/tmcore.map b/releng/org.eclipse.rse.build/maps/tmcore.map deleted file mode 100644 index 6434edc51..000000000 --- a/releng/org.eclipse.rse.build/maps/tmcore.map +++ /dev/null @@ -1,7 +0,0 @@ -plugin@org.apache.commons.net,1.4.1=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20080807152315/bundles/org.apache.commons.net_1.4.1.v200803071935.jar -plugin@org.apache.commons.net.source,1.4.1=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20080807152315/bundles/org.apache.commons.net.source_1.4.1.v200803071935.jar -plugin@org.apache.oro,2.0.8=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20080807152315/bundles/org.apache.oro_2.0.8.v200803061811.jar -plugin@org.apache.oro.source,2.0.8=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20080807152315/bundles/org.apache.oro.source_2.0.8.v200803061811.jar - -! plugin@org.apache.commons.net=v200803061811,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.orbit/org.apache.commons.net -! plugin@org.apache.oro=v200803061811,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.orbit/org.apache.oro
\ No newline at end of file diff --git a/releng/org.eclipse.rse.build/maps/wince.map b/releng/org.eclipse.rse.build/maps/wince.map deleted file mode 100644 index 29f0b8450..000000000 --- a/releng/org.eclipse.rse.build/maps/wince.map +++ /dev/null @@ -1,6 +0,0 @@ -feature@org.eclipse.rse.wince=v20080626,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/wince/org.eclipse.rse.wince-feature -!! feature@org.eclipse.rse.wince.wrapper=v20080609a,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/features/org.eclipse.rse.wince.wrapper-feature -plugin@org.eclipse.rse.subsystems.wince=v20080626,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/wince/org.eclipse.rse.subsystems.wince -plugin@org.eclipse.tm.rapi=v20080606,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/wince/org.eclipse.tm.rapi -plugin@org.eclipse.tm.rapi.examples=v20080522,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/wince/org.eclipse.tm.rapi.examples -plugin@org.eclipse.tm.rapi.tests=v20080522,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/wince/org.eclipse.tm.rapi.tests
\ No newline at end of file diff --git a/releng/org.eclipse.rse.build/message.in b/releng/org.eclipse.rse.build/message.in deleted file mode 100644 index e807f6032..000000000 --- a/releng/org.eclipse.rse.build/message.in +++ /dev/null @@ -1,6 +0,0 @@ -The build is available at - - http://download.eclipse.org/dsdp/tm/downloads/drops/@dropDir@ - -Cheers, -the RSE nightly build... diff --git a/releng/org.eclipse.rse.build/monitor.properties b/releng/org.eclipse.rse.build/monitor.properties deleted file mode 100755 index e6047a91f..000000000 --- a/releng/org.eclipse.rse.build/monitor.properties +++ /dev/null @@ -1,29 +0,0 @@ -############################################################################### -# Copyright (c) 2005, 2006 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 -############################################################################### -# properties file used by the class org.eclipse.releng.build.listeners.EclipseBuildListener - -#prefix added to subject line of build related email messages -buildSubjectPrefix=[RSE-build] - -#email information for sending build failure notices -host=localhost -sender=moberhuber@eclipse.org - -#the http Url to Eclipse drop directories -httpUrl=http://download.eclipse.org/dsdp/tm/downloads/drops - -#the ftp Url to Eclipse drop directories -#ftpUrl=ftp://download.eclipse.org - -#use comma separated list for recipients -#build log name.This file is copied into drop directory until files.count file updated with correct number of zip files -#additional information added a build time by build shell script -#buildid, timestamp, buildLabel, email notification list, buildlog location diff --git a/releng/org.eclipse.rse.build/nightly.sh b/releng/org.eclipse.rse.build/nightly.sh deleted file mode 100755 index a6244be1b..000000000 --- a/releng/org.eclipse.rse.build/nightly.sh +++ /dev/null @@ -1,83 +0,0 @@ -#!/bin/sh -#******************************************************************************* -# Copyright (c) 2006 Wind River Systems, Inc. -# All rights reserved. This program and 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 -#******************************************************************************* -#nightly build for RSE - to be executed on build.eclipse.org -# -# Usage: -# nightly.sh [mapVersionTag] [buildType] [buildId] -# Examples: -# nightly.sh HEAD I -# nightly.sh HEAD S 1.0RC3 -# -# Prerequisites: -# - Eclipse 3.2 installed or linked from ../eclipse -# - org.eclipse.releng.basebuilder checked out to ../org.eclipse.releng.basebuilder -# -#author: martin oberhuber - -curdir=`pwd` -cd `dirname $0` -mydir=`pwd` - -# pathes: see build.rb for reference -cd "$mydir/../eclipse" ; eclipse=`pwd` -cd "$mydir/../org.eclipse.releng.basebuilder" ; basebuilder=`pwd` -cd "$mydir/../working" ; working=`pwd` -cd "$mydir/../publish" ; publishDirectory=`pwd` -cd "$mydir" ; builder=`pwd` - -# Find the base build scripts: genericTargets.xml and build.xml -cd "${basebuilder}/plugins" -pdeBuild=`ls -d org.eclipse.pde.build* | sort | tail -1` -cd "${builder}" -pdeBuild="${basebuilder}/plugins/${pdeBuild}" -buildDirectory="${working}/build" -packageDirectory="${working}/package" - -tag="HEAD" -if [ "$1" != "" ]; then - tag="$1" -fi -buildType="N" -if [ "$2" != "" ]; then - buildType="$2" -fi -mydstamp=`date +'%Y%m%d'` -mytstamp=`date +'%H%M'` -timestamp="${mydstamp}-${mytstamp}" -buildId="${buildType}${timestamp}" -if [ "$3" != "" ]; then - buildId="$3" -fi -rm -rf "${buildDirectory}" - -command="java -cp ${basebuilder}/plugins/org.eclipse.equinox.launcher.jar org.eclipse.core.launcher.Main " -command="$command -application org.eclipse.ant.core.antRunner " -command="$command -buildfile ${pdeBuild}/scripts/build.xml " -command="$command -DbuildDirectory=${buildDirectory} " -command="$command -DpackageDirectory=${packageDirectory} " -command="$command -DpublishDirectory=${publishDirectory} " -command="$command -Dbuilder=${builder} " -command="$command -DbaseLocation=${eclipse} " -command="$command -DbuildType=${buildType} " -command="$command -DbuildId=${buildId} " -command="$command -DmapVersionTag=${tag} " -command="$command -Dmydstamp=${mydstamp} " -command="$command -Dmytstamp=${mytstamp} " -if [ "$buildType" = "N" ]; then - command="$command -DforceContextQualifier=${buildId} " - command="$command -DfetchTag=HEAD " -fi -command="$command -DdoPublish=true " -#command="$command postBuild " - -echo "$command" -exec $command diff --git a/releng/org.eclipse.rse.build/setup.sh b/releng/org.eclipse.rse.build/setup.sh deleted file mode 100755 index 8ec678a09..000000000 --- a/releng/org.eclipse.rse.build/setup.sh +++ /dev/null @@ -1,279 +0,0 @@ -#!/bin/sh -#******************************************************************************* -# Copyright (c) 2006, 2008 Wind River Systems, Inc. -# All rights reserved. This program and 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 -#******************************************************************************* -# -# setup.sh : Set up an environment for building TM / RSE -# Works on build.eclipse.org -- may need to be adjusted -# for other hosts. -# -# This must be run in $HOME/ws_30x in order for the mkTestUpdateSite.sh -# script to find the published packages -# -# Bootstrapping: Get this script by -# export CVSROOT=:pserver:anonymous@dev.eclipse.org:/cvsroot/dsdp -# cvs co -r R3_0_maintenance org.eclipse.tm.rse/releng/org.eclipse.rse.build -# sh org.eclipse.tm.rse/releng/org.eclipse.rse.build/setup.sh -# -# - OR - -# -# wget -O setup.sh "http://dev.eclipse.org/viewcvs/index.cgi/org.eclipse.tm.rse/releng/org.eclipse.rse.build/setup.sh?rev=HEAD&cvsroot=DSDP_Project&content-type=text/plain" -# sh setup.sh -# ./doit_ibuild.sh -# cd testPatchUpdates/bin -# mkTestUpdates.sh - -curdir=`pwd` - -uname_s=`uname -s` -uname_m=`uname -m` -case ${uname_s}${uname_m} in - Linuxppc*) ep_arch=linux-gtk-ppc - cdt_arch=linux.ppc - ;; - Linuxx86_64*) ep_arch=linux-gtk-x86_64 - cdt_arch=linux.x86_64 - ;; - Linuxx86*) ep_arch=linux-gtk - cdt_arch=linux.x86 - ;; -esac - -# prepare the base Eclipse installation in folder "eclipse" -ep_rel=R -ep_ver=3.4 -ep_date=200806172000 -P2_disabled=false -P2_no_dropins=false -if [ ! -f eclipse/plugins/org.eclipse.swt_3.4.0.v3448f.jar ]; then - curdir2=`pwd` - if [ ! -d eclipse -o -h eclipse ]; then - if [ -d eclipse-${ep_ver}-${ep_arch} ]; then - rm -rf eclipse-${ep_ver}-${ep_arch} - fi - mkdir eclipse-${ep_ver}-${ep_arch} - cd eclipse-${ep_ver}-${ep_arch} - else - rm -rf eclipse - fi - # Eclipse SDK: Need the SDK so we can link into docs - echo "Getting Eclipse SDK..." - wget "http://download.eclipse.org/eclipse/downloads/drops/${ep_rel}-${ep_ver}-${ep_date}/eclipse-SDK-${ep_ver}-${ep_arch}.tar.gz" - tar xfvz eclipse-SDK-${ep_ver}-${ep_arch}.tar.gz - rm eclipse-SDK-${ep_ver}-${ep_arch}.tar.gz - if ${P2_disabled} ; then - # Remove P2 due to https://bugs.eclipse.org/bugs/show_bug.cgi?id=225537 - # See http://wiki.eclipse.org/Equinox_p2_Removal - rm -rf eclipse/configuration/* eclipse/configuration/.settings - cp ../eclipse-3.3-linux-gtk-ppc/eclipse/configuration/config.ini eclipse/configuration - cp -f ../eclipse-3.3-linux-gtk-ppc/eclipse/eclipse.ini eclipse/ - rm -rf eclipse/features/org.eclipse.equinox.p2.user.ui* - rm -f eclipse/plugins/org.eclipse.equinox.p2.* - rm -rf eclipse/p2 - # </Remove P2> - fi - cd "${curdir2}" - if [ ! -d eclipse -o -h eclipse ]; then - if [ -e eclipse ]; then - rm eclipse - fi - ln -s eclipse-${ep_ver}-${ep_arch}/eclipse eclipse - fi -fi -if [ ! -f eclipse/startup.jar ]; then - curdir2=`pwd` - cd eclipse/plugins - if [ -h ../startup.jar ]; then - rm ../startup.jar - fi - LAUNCHER=`ls org.eclipse.equinox.launcher_*.jar | sort | tail -1` - if [ "${LAUNCHER}" != "" ]; then - echo "eclipse LAUNCHER=${LAUNCHER}" - ln -s plugins/${LAUNCHER} ../startup.jar - else - echo "Eclipse: NO startup.jar LAUNCHER FOUND!" - fi - cd ${curdir2} -fi - -if ${P2_no_dropins} ; then - #P2 disabled? - DROPIN=. - DROPUP=. -else - #P2 enabled - DROPIN=eclipse/dropins - DROPUP=../.. -fi - -# EMF 2.4.1 -EMFBRANCH=2.4.1 -EMFREL=R -EMFDATE=200808251517 -EMFVER=2.4.1 -if [ ! -f ${DROPIN}/eclipse/plugins/org.eclipse.emf.doc_${EMFVER}.v${EMFDATE}.jar ]; then - # Need EMF 2.4 SDK for Service Discovery ISV Docs Backlinks - echo "Getting EMF SDK..." - cd ${DROPIN} - wget "http://download.eclipse.org/modeling/emf/emf/downloads/drops/${EMFBRANCH}/${EMFREL}${EMFDATE}/emf-sdo-xsd-SDK-${EMFVER}.zip" - unzip -o emf-sdo-xsd-SDK-${EMFVER}.zip - rm emf-sdo-xsd-SDK-${EMFVER}.zip - cd ${DROPUP} -fi -if [ ! -f eclipse/plugins/org.junit_3.8.2.v20080602-1318/junit.jar ]; then - # Eclipse Test Framework - echo "Getting Eclipse Test Framework..." - wget "http://download.eclipse.org/eclipse/downloads/drops/${ep_rel}-${ep_ver}-${ep_date}/eclipse-test-framework-${ep_ver}.zip" - unzip -o eclipse-test-framework-${ep_ver}.zip - rm eclipse-test-framework-${ep_ver}.zip -fi -if [ ! -f ${DROPIN}/eclipse/plugins/gnu.io.rxtx_2.1.7.4_v20071016.jar ]; then - echo "Getting RXTX..." - cd ${DROPIN} - wget "http://rxtx.qbang.org/eclipse/downloads/RXTX-SDK-I20071016-1945.zip" - unzip -o RXTX-SDK-I20071016-1945.zip - rm RXTX-SDK-I20071016-1945.zip - cd ${DROPUP} -fi - -# CDT Runtime -#CDTREL=5.0.0 -#CDTVER=200806171202 -#CDTNAME=cdt-master-5.0.0.zip -#CDTLOC=releases/ganymede/dist/${CDTNAME} -CDTREL=5.0.1 -CDTVER=200808290803 -CDTNAME=cdt-master-${CDTREL}-I${CDTVER}.zip -CDTLOC=builds/${CDTREL}/I.I${CDTVER}/${CDTNAME} -if [ ! -f eclipse/plugins/org.eclipse.cdt.core_${CDTREL}.${CDTVER}.jar ]; then - echo "Getting CDT Runtime..." - wget "http://download.eclipse.org/tools/cdt/${CDTLOC}" - CDTTMP=`pwd`/tmp.$$ - mkdir ${CDTTMP} - cd ${CDTTMP} - unzip ../${CDTNAME} - cd .. - #java -jar eclipse/startup.jar \ - java -jar eclipse/plugins/org.eclipse.equinox.launcher_1.0.*.jar \ - -application org.eclipse.update.core.standaloneUpdate \ - -command install \ - -from file://${CDTTMP} \ - -featureId org.eclipse.cdt.platform \ - -version ${CDTREL}.${CDTVER} - java -jar eclipse/plugins/org.eclipse.equinox.launcher_1.0.*.jar \ - -application org.eclipse.update.core.standaloneUpdate \ - -command install \ - -from file://${CDTTMP} \ - -featureId org.eclipse.cdt \ - -version ${CDTREL}.${CDTVER} - rm -rf ${CDTTMP} - rm ${CDTNAME} -fi - -# checkout the basebuilder -baseBuilderTag=RC2_34 -if [ ! -f org.eclipse.releng.basebuilder/plugins/org.eclipse.pde.core_3.4.0.v20080515-2000.jar \ - -o ! -f org.eclipse.releng.basebuilder/plugins/org.eclipse.pde.build_3.4.0.v20080522/pdebuild.jar \ - -o ! -f org.eclipse.releng.basebuilder/plugins/org.eclipse.equinox.p2.metadata.generator_1.0.0.v20080523-0001.jar ]; then - if [ -d org.eclipse.releng.basebuilder ]; then - echo "Re-getting basebuilder from CVS..." - rm -rf org.eclipse.releng.basebuilder - else - echo "Getting basebuilder from CVS..." - fi - cvs -Q -d :pserver:anonymous@dev.eclipse.org:/cvsroot/eclipse co -r ${baseBuilderTag} org.eclipse.releng.basebuilder -fi -if [ ! -f org.eclipse.releng.basebuilder/startup.jar ]; then - curdir2=`pwd` - cd org.eclipse.releng.basebuilder/plugins - if [ -h ../startup.jar ]; then - rm ../startup.jar - fi - LAUNCHER=`ls org.eclipse.equinox.launcher*.jar | sort | tail -1` - if [ "${LAUNCHER}" != "" ]; then - echo "basebuilder: LAUNCHER=${LAUNCHER}" - ln -s plugins/${LAUNCHER} ../startup.jar - else - echo "basebuilder: NO LAUNCHER FOUND" - fi - cd ${curdir2} -fi - -# checkout the RSE builder -if [ -f org.eclipse.rse.build/CVS/Entries ]; then - echo "Updating org.eclipse.rse.build from CVS" - cd org.eclipse.rse.build - cvs -q update -r R3_0_maintenance -dPR - cd .. -else - if [ -d org.eclipse.rse.build ]; then - echo "Re-getting org.eclipse.rse.build from CVS" - rm -rf org.eclipse.rse.build - else - echo "Getting org.eclipse.rse.build from CVS" - fi - cvs -q -d :pserver:anonymous@dev.eclipse.org:/cvsroot/dsdp co -r R3_0_maintenance -Rd org.eclipse.rse.build org.eclipse.tm.rse/releng/org.eclipse.rse.build -fi - -# prepare directories for the build -echo "Preparing directories and symbolic links..." -if [ ! -d working/package ]; then - mkdir -p working/package -fi -if [ ! -d working/build ]; then - mkdir -p working/build -fi -if [ ! -d publish ]; then - D=/home/data/httpd/download.eclipse.org/dsdp/tm/downloads/drops - if [ -d ${D} ]; then ln -s ${D} publish; else mkdir publish; fi -fi -if [ ! -d testPatchUpdates ]; then - D=/home/data/httpd/download.eclipse.org/dsdp/tm/testPatchUpdates - if [ -d ${D} ]; then ln -s ${D} testPatchUpdates; else mkdir testPatchUpdates; fi -fi -if [ ! -d updates ]; then - D=/home/data/httpd/download.eclipse.org/dsdp/tm/updates - if [ -d ${D} ]; then ln -s ${D} updates; else mkdir updates; fi -fi -if [ ! -d staging ]; then - D=/home/data/httpd/download-staging.priv/dsdp/tm - if [ -d ${D} ]; then ln -s ${D} staging; else mkdir staging; fi -fi - -# create symlinks as needed -if [ ! -h doit_irsbuild.sh ]; then - ln -s org.eclipse.rse.build/bin/doit_irsbuild.sh . -fi -if [ ! -h doit_nightly.sh ]; then - ln -s org.eclipse.rse.build/bin/doit_nightly.sh . -fi -if [ ! -h setup.sh ]; then - if [ -f setup.sh ]; then rm -f setup.sh; fi - ln -s org.eclipse.rse.build/setup.sh . -fi -chmod a+x doit_irsbuild.sh doit_nightly.sh -cd org.eclipse.rse.build -chmod a+x build.pl build.rb go.sh nightly.sh setup.sh -cd .. - -echo "Your build environment is now created." -echo "" -echo "Run \"./doit_irsbuild.sh I\" to create an I-build." -echo "" -echo "Test the testPatchUpdates, then copy them to updates:" -echo "cd updates" -echo "rm -rf plugins features" -echo "cp -R ../testPatchUpdates/plugins ." -echo "cp -R ../testPatchUpdates/features ." -echo "cd bin" -echo "cvs update" -echo "./mkTestUpdates.sh" - -exit 0 diff --git a/releng/org.eclipse.rse.build/template/.cvsignore b/releng/org.eclipse.rse.build/template/.cvsignore deleted file mode 100644 index cba5080f0..000000000 --- a/releng/org.eclipse.rse.build/template/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -buildNotes.php.html -index.php.html diff --git a/releng/org.eclipse.rse.build/template/FAIL.gif b/releng/org.eclipse.rse.build/template/FAIL.gif Binary files differdeleted file mode 100755 index 28bba6610..000000000 --- a/releng/org.eclipse.rse.build/template/FAIL.gif +++ /dev/null diff --git a/releng/org.eclipse.rse.build/template/OK.gif b/releng/org.eclipse.rse.build/template/OK.gif Binary files differdeleted file mode 100755 index 689e5234f..000000000 --- a/releng/org.eclipse.rse.build/template/OK.gif +++ /dev/null diff --git a/releng/org.eclipse.rse.build/template/buildNotes.php b/releng/org.eclipse.rse.build/template/buildNotes.php deleted file mode 100755 index 77636b02b..000000000 --- a/releng/org.eclipse.rse.build/template/buildNotes.php +++ /dev/null @@ -1,210 +0,0 @@ -<!doctype html public "-//w3c//dtd html 4.0 transitional//en"> -<html> -<head> -<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> -<link rel="stylesheet" href="http://www.eclipse.org/default_style.css" type="text/css"> -<title>Build Notes for TM @buildId@</title> -</head> - -<body> -<table border="0" cellspacing="5" cellpadding="2" width="100%"> - <tr> - <td align="LEFT" width="80%"> - <p><b><font class=indextop>Build Notes for TM @buildId@</font></b><br> - @dateLong@ </p> - </td> - </tr> -</table> -<table border="0" cellspacing="5" cellpadding="2" width="100%"> - <tr> - <td align="LEFT" valign="TOP" colspan="3" bgcolor="#0080C0"><b> - <font face="Arial,Helvetica" color="#FFFFFF">New and Noteworthy</font></b></td> - </tr> -</table> -<table><tbody><tr><td> -<ul> -<li>TM @buildId@ <b>requires Eclipse 3.3 or later for the SSH component</b>. - Other components may work with earlier Eclipse versions, but these have not been tested. - Platform Runtime is the minimum requirement for core RSE and Terminal. - Discovery needs EMF, and the RemoteCDT integration needs CDT.<br> - <b>Building</b> the RSE SSH service requires <b>Eclipse 3.4</b> or later for the fix - of <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=224799">bug 224799</a>; - the fix also requires 3.4 at runtime, but the code contains a backward - compatibility fallback to also run on Eclipse 3.3 if that particular fix - is not required.</li> -<li>Highlights of Bugs fixed since <a href="http://download.eclipse.org/dsdp/tm/downloads/drops/R-3.0.1-200809181400/buildNotes.php">TM 3.0.1</a>: -<ul> - <li><b>Performance</b> of the RSE Save Job was drastically improved for certain situations involving property sets - before the fix, the context menu could be frozen for up to 30 seconds in user actions - [<a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=254842">254842</a>]</li> - <li><b>Symbolic Link Handling</b> for dstore was fixed, especially for remote search - [<a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=250458">250458</a>] - [<a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=251713">251713</a>] - [<a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=251744">251744</a>]</li> - <li><b>Offline Mode</b> is now better supported - [<a href="https://bugs.eclipse.org/bugs/buglist.cgi?query_format=advanced&short_desc_type=allwordssubstr&short_desc=offline&classification=DSDP&product=Target+Management&component=RSE&target_milestone=3.0.2&bug_status=RESOLVED&bug_status=VERIFIED&bug_status=CLOSED&cmdtype=doit">query</a>]</li> - <li><b>RSE Useractions</b> received some important fixes - [<a href="https://bugs.eclipse.org/bugs/buglist.cgi?query_format=advanced&short_desc_type=allwordssubstr&short_desc=useraction&classification=DSDP&product=Target+Management&component=RSE&target_milestone=3.0.2&bug_status=RESOLVED&bug_status=VERIFIED&bug_status=CLOSED&cmdtype=doit">query</a>]</li> -</ul></li> -<li>At least 27 bugs were fixed in total: Use - <!-- <a href="https://bugs.eclipse.org/bugs/buglist.cgi?query_format=advanced&classification=DSDP&product=Target+Management&component=Core&component=RSE&component=Terminal&bug_status=RESOLVED&bug_status=VERIFIED&bug_status=CLOSED&resolution=FIXED&resolution=WONTFIX&resolution=WORKSFORME&chfieldfrom=2008-06-20&chfieldto=2008-09-17&chfield=resolution&cmdtype=doit&negate0=1&field0-0-0=target_milestone&type0-0-0=substring&value0-0-0=2.0&field0-0-1=target_milestone&type0-0-1=regexp&value0-0-1=3.0%20M%5B345%5D"> --> - <a href="https://bugs.eclipse.org/bugs/buglist.cgi?query_format=advanced&classification=DSDP&product=Target+Management&component=Core&component=RSE&component=Terminal&target_milestone=3.0.2&bug_status=RESOLVED&bug_status=VERIFIED&bug_status=CLOSED&resolution=FIXED&resolution=WONTFIX&resolution=WORKSFORME&cmdtype=doit"> - this query</a> to show the list of bugs fixed since <!-- the last milestone, --> - <a href="http://download.eclipse.org/dsdp/tm/downloads/drops/R-3.0.1-200809181400/"> - TM 3.0.1</a> - [<a href="http://download.eclipse.org/dsdp/tm/downloads/drops/R-3.0.1-200809181400/buildNotes.php">build notes</a>].</li> -<li>For details on checkins, see - <a href="http://www.eclipse.org/dsdp/tm/searchcvs.php">TM SearchCVS</a>, the - <a href="http://download.eclipse.org/dsdp/tm/downloads/drops/N-changelog/index.html"> - RSE CVS changelog</a>, and the - <a href="http://download.eclipse.org/dsdp/tm/downloads/drops/N-changelog/core/index.html"> - TM Core CVS changelog</a>.</li> -<li>For other questions, please check the - <a href="http://wiki.eclipse.org/TM_and_RSE_FAQ">TM and RSE FAQ</a> - as well as the - <a href="http://wiki.eclipse.org/TM_3.0_Known_Issues_and_Workarounds"> - TM 3.0 Known Issues and Workarounds</a>.</li> -</ul> -</td></tr></tbody></table> - -<table border="0" cellspacing="5" cellpadding="2" width="100%"> - <tr> - <td align="LEFT" valign="TOP" colspan="3" bgcolor="#0080C0"><b> - <font face="Arial,Helvetica" color="#FFFFFF">Getting Started</font></b></td> - </tr> -</table> -<table><tbody><tr><td> -<p>The RSE User Documentation now has a -<a href="http://dsdp.eclipse.org/help/latest/index.jsp?topic=/org.eclipse.rse.doc.user/gettingstarted/g_start.html"> -Tutorial</a> that guides you through installation, first steps, -connection setup and important tasks.</p> -<p> -If you want to know more about future directions of the Target Management -Project, developer documents, architecture or how to get involved,<br/> -the online -<a href="http://www.eclipse.org/dsdp/tm/tutorial/index.php">Getting Started page</a> -as well as the -<a href="http://wiki.eclipse.org/TM_and_RSE_FAQ">TM and RSE FAQ</a> -are the best places for you to get started. -</p> -</td></tr></tbody></table> - -<table border="0" cellspacing="5" cellpadding="2" width="100%"> - <tr> - <td align="LEFT" valign="TOP" colspan="3" bgcolor="#0080C0"><b> - <font face="Arial,Helvetica" color="#FFFFFF">API Status</font></b></td> - </tr> -</table> -<table><tbody><tr><td> -<p>No API changes are allowed in the TM 3.0.x maintenance stream. -Therefore, <b>TM 3.0.x is fully upward and backward compatible with TM 3.0</b>, -and can be fully exchanged for TM 3.0 in any product based on it. -Take care of API specification updates though, where the TM 3.0.x API Docs -have been updated to add clarifications or missing information compared -to 3.0.</p> - -<p>For the upcoming TM 3.1 release, only backward compatible API changes -are planned, especially in order to support improved componentization -and UI/Non-UI splitting. -In the interest of improving the code base, though, please -take care of API marked as <b>@deprecated</b> in the Javadoc. -Such API is prime candidate to be removed in the future. -Also, observe the API Tooling tags such as <b>@noextend</b> and -<b>@noimplement</b>. -</p> -</td></tr></tbody></table> - -<table border="0" cellspacing="5" cellpadding="2" width="100%"> - <tr> - <td align="LEFT" valign="TOP" colspan="3" bgcolor="#808080"><b> - <font face="Arial,Helvetica" color="#FFFFFF">API Specification Updates since TM 3.0</font></b></td> - </tr> -</table> -<table><tbody><tr><td> -The following lists amendments to API specifications that are worth noticing. -More information can be found in the associated bugzilla items. - -<ul> -<li>TM @buildId@ API Specification Updates -<ul> - <li>None.</li> -</ul></li> -<li>TM 3.0.1 API Specification Updates -<ul> -<li><b><a href="http://dsdp.eclipse.org/help/latest/topic/org.eclipse.rse.doc.isv/reference/api/org/eclipse/rse/services/files/IFileService.html#createFolder(java.lang.String,%20java.lang.String,%20org.eclipse.core.runtime.IProgressMonitor)"> - IFileService#createFolder()</a></b> - now specifies that parent folders <i>may</i> be created by - the implementation. Note that this clarification required additional code in - FileServiceSubSystem in order to make <tt> - <a href="http://dsdp.eclipse.org/help/latest/topic/org.eclipse.rse.doc.isv/reference/api/org/eclipse/rse/subsystems/files/core/subsystems/IRemoteFileSubSystem.html#createFolder(org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFile,%20org.eclipse.core.runtime.IProgressMonitor)"> - IRemoteFileSubSystem.createFolder()</a></tt> and <tt> - <a href="http://dsdp.eclipse.org/help/latest/topic/org.eclipse.rse.doc.isv/reference/api/org/eclipse/rse/subsystems/files/core/subsystems/IRemoteFileSubSystem.html#createFolders(org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFile,%20org.eclipse.core.runtime.IProgressMonitor)"> - IRemoteFileSubSystem.createFolders()</a></tt> - behave as expected for both parent folders created or not.<br/> - Service implementations that need to be compatible with both TM 3.0 and TM 3.0.1 <b><i>should</i></b> - create parent folders in the file service. Subsystem clients that need to be compatible with both - TM 3.0 and TM 3.0.1 <b><i>should not</i></b> expect that parent folders are created - [<a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=234026">234026</a>].</li> -</ul> -</li> -</ul> - -Use - <!-- - <a href="https://bugs.eclipse.org/bugs/buglist.cgi?query_format=advanced&short_desc_type=allwordssubstr&short_desc=%5Bapi&classification=DSDP&product=Target+Management&component=Core&component=RSE&component=Terminal&bug_status=RESOLVED&bug_status=VERIFIED&bug_status=CLOSED&resolution=FIXED&resolution=WORKSFORME&chfieldfrom=2008-06-20&chfieldto=2008-09-20&chfield=resolution&cmdtype=doit"> - --> - <a href="https://bugs.eclipse.org/bugs/buglist.cgi?query_format=advanced&short_desc_type=allwordssubstr&short_desc=%5Bapi&classification=DSDP&product=Target+Management&component=Core&component=RSE&component=Terminal&bug_status=RESOLVED&bug_status=VERIFIED&bug_status=CLOSED&resolution=FIXED&resolution=WORKSFORME&target_milestone=3.0.1&cmdtype=doit"> - this query</a> to show the full list of API related updates since TM 3.0 - <!-- - , and - <a href="https://bugs.eclipse.org/bugs/buglist.cgi?query_format=advanced&short_desc_type=allwordssubstr&short_desc=%5Bapi%5D&classification=DSDP&product=Target+Management&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&cmdtype=doit"> - this query</a> to show the list of additional API changes proposed for TM 3.0 - --> - . -</td></tr></tbody></table> - -<table border="0" cellspacing="5" cellpadding="2" width="100%"> - <tr> - <td align="LEFT" valign="TOP" colspan="3" bgcolor="#0080C0"><b> - <font face="Arial,Helvetica" color="#FFFFFF">Known Problems and Workarounds</font></b></td> - </tr> -</table> -<table><tbody><tr><td> -The following critical or major bugs are currently known. -We'll strive to fix these as soon as possible. -<ul> - <li><a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=247059">bug 247059</a> - maj - [dstore] RSE AIX:SSL Connections work with EXPIRED certificate</li> - <li><a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=245260">bug 245260</a> - maj - Different user's connections on a single ftp host are mapped to the same temp files cache</li> - <li><a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=244070">bug 244070</a> - maj - [dstore] DStoreHostShell#exit() does not terminate child processes</li> - <li><a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=238156">bug 238156</a> - maj - Export/Import Connection doesn't create default filters for the specified connection</li> - <li><a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=236443">bug 236443</a> - maj - [releng] Using P2 to install "remotecdt" only from update site creates an unusable installation</li> - <li><a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=226564">bug 226564</a> - maj - [efs] Deadlock while starting dirty workspace - <li><a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=222380">bug 222380</a> - maj - [persistence][migration][team] Subsystem association is lost when creating connection with an installation that does not have subsystem impl</li> - <li><a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=218387">bug 218387</a> - maj - [efs] Eclipse hangs on startup of a Workspace with a large efs-shared file system on a slow connection</li> - <li><a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=208185">bug 208185</a> - maj - [terminal][serial] terminal can hang the UI when text is entered while the backend side is not reading characters</li> - <li><a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=198395">bug 198395</a> - maj - [dstore] Can connect to DStore with expired password</li> -</ul> -<!-- -<p>No major or critical bugs are known at the time of release. ---> -Use -<a href="https://bugs.eclipse.org/bugs/buglist.cgi?query_format=advanced&classification=DSDP&product=Target+Management&bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&bug_severity=blocker&bug_severity=critical&bug_severity=major&cmdtype=doit">this query</a> -for an up-to-date list of major or critical bugs.</p> - -<p>The -<a href="http://wiki.eclipse.org/TM_3.0_Known_Issues_and_Workarounds"> -TM 3.0 Known Issues and Workarounds</a> Wiki page gives an up-to-date list -of the most frequent and obvious problems, and describes workarounds for them.<br/> -If you have other questions regarding TM or RSE, please check the -<a href="http://wiki.eclipse.org/TM_and_RSE_FAQ">TM and RSE FAQ</a> -</p> - -<p>Click -<a href="https://bugs.eclipse.org/bugs/report.cgi?x_axis_field=bug_severity&y_axis_field=op_sys&z_axis_field=&query_format=report-table&classification=DSDP&product=Target+Management&bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&format=table&action=wrap">here</a> -for a complete up-to-date bugzilla status report, or -<a href="https://bugs.eclipse.org/bugs/report.cgi?x_axis_field=bug_severity&y_axis_field=op_sys&z_axis_field=&query_format=report-table&classification=DSDP&product=Target+Management&bug_status=RESOLVED&bug_status=VERIFIED&bug_status=CLOSED&format=table&action=wrap">here</a> -for a report on bugs fixed so far. -</p> -</td></tr></tbody></table> - -</body> -</html> diff --git a/releng/org.eclipse.rse.build/template/buildNotesGenerated.html b/releng/org.eclipse.rse.build/template/buildNotesGenerated.html deleted file mode 100644 index a14db454b..000000000 --- a/releng/org.eclipse.rse.build/template/buildNotesGenerated.html +++ /dev/null @@ -1,19 +0,0 @@ -<p>I - -<p>Integration Build (December 13, 2006, 9:39 a.m.)</p> - <p>Problem reports updated</p> - <p> - </p> - -<p>Integration Build (December 06, 2006, 8:08 p.m.)</p> - <p>Problem reports updated</p> - <p> - </p> - -<p>Integration Build (November 29, 2006, 11:12 a.m.)</p> - <p>Problem reports updated</p> - <p> - </p>ntegration Build (November 28, 2006, 2:03 p.m.)</p> -<p>Problem reports updated</p> -<p> -</p> diff --git a/releng/org.eclipse.rse.build/template/egg.gif b/releng/org.eclipse.rse.build/template/egg.gif Binary files differdeleted file mode 100644 index 62e22f0ad..000000000 --- a/releng/org.eclipse.rse.build/template/egg.gif +++ /dev/null diff --git a/releng/org.eclipse.rse.build/template/epl-v10.html b/releng/org.eclipse.rse.build/template/epl-v10.html deleted file mode 100644 index 9321f4082..000000000 --- a/releng/org.eclipse.rse.build/template/epl-v10.html +++ /dev/null @@ -1,256 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml"><head> - - - - -<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>Eclipse Public License - Version 1.0</title> - -<style type="text/css"> - body { - size: 8.5in 11.0in; - margin: 0.25in 0.5in 0.25in 0.5in; - tab-interval: 0.5in; - } - p { - margin-left: auto; - margin-top: 0.5em; - margin-bottom: 0.5em; - } - p.list { - margin-left: 0.5in; - margin-top: 0.05em; - margin-bottom: 0.05em; - } - </style></head><body lang="EN-US"> - -<p align="center"><b>Eclipse Public License - v 1.0</b></p> - -<p>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.</p> - -<p><b>1. DEFINITIONS</b></p> - -<p>"Contribution" means:</p> - -<p class="list">a) in the case of the initial Contributor, the initial -code and documentation distributed under this Agreement, and</p> -<p class="list">b) in the case of each subsequent Contributor:</p> -<p class="list">i) changes to the Program, and</p> -<p class="list">ii) additions to the Program;</p> -<p class="list">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.</p> - -<p>"Contributor" means any person or entity that distributes -the Program.</p> - -<p>"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.</p> - -<p>"Program" means the Contributions distributed in accordance -with this Agreement.</p> - -<p>"Recipient" means anyone who receives the Program under -this Agreement, including all Contributors.</p> - -<p><b>2. GRANT OF RIGHTS</b></p> - -<p class="list">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.</p> - -<p class="list">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.</p> - -<p class="list">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.</p> - -<p class="list">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.</p> - -<p><b>3. REQUIREMENTS</b></p> - -<p>A Contributor may choose to distribute the Program in object code -form under its own license agreement, provided that:</p> - -<p class="list">a) it complies with the terms and conditions of this -Agreement; and</p> - -<p class="list">b) its license agreement:</p> - -<p class="list">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;</p> - -<p class="list">ii) effectively excludes on behalf of all Contributors -all liability for damages, including direct, indirect, special, -incidental and consequential damages, such as lost profits;</p> - -<p class="list">iii) states that any provisions which differ from this -Agreement are offered by that Contributor alone and not by any other -party; and</p> - -<p class="list">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.</p> - -<p>When the Program is made available in source code form:</p> - -<p class="list">a) it must be made available under this Agreement; and</p> - -<p class="list">b) a copy of this Agreement must be included with each -copy of the Program.</p> - -<p>Contributors may not remove or alter any copyright notices contained -within the Program.</p> - -<p>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.</p> - -<p><b>4. COMMERCIAL DISTRIBUTION</b></p> - -<p>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.</p> - -<p>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.</p> - -<p><b>5. NO WARRANTY</b></p> - -<p>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.</p> - -<p><b>6. DISCLAIMER OF LIABILITY</b></p> - -<p>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.</p> - -<p><b>7. GENERAL</b></p> - -<p>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.</p> - -<p>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.</p> - -<p>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.</p> - -<p>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.</p> - -<p>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.</p> - -</body></html>
\ No newline at end of file diff --git a/releng/org.eclipse.rse.build/template/index.php b/releng/org.eclipse.rse.build/template/index.php deleted file mode 100755 index 6b6863c4d..000000000 --- a/releng/org.eclipse.rse.build/template/index.php +++ /dev/null @@ -1,337 +0,0 @@ -<!doctype html public "-//w3c//dtd html 4.0 transitional//en"> -<html> - -<head> -<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> -<link rel="stylesheet" href="http://www.eclipse.org/default_style.css" type="text/css"> -<title>DSDP-TM @buildTypeLong@ Build: @buildId@</title> -</head> - -<body> -<table border="0" cellspacing="5" cellpadding="2" width="100%"> - <tr> - <td align="LEFT" width="80%"> - <p><b><font class=indextop>TM @buildTypeLong@ Build: @buildId@</font></b><br> - @dateLong@ </p> - <p>These downloads are provided under the - <a href="http://www.eclipse.org/legal/epl/notice.php">Eclipse.org Software - User Agreement</a>.</p> - - <p><font size="+1"><strong> -<!-- - <a href="buildNotes.php">New and Noteworthy / Build Notes</a> ---> - <p><a href="http://www.eclipse.org/dsdp/tm/development/relnotes/3.0/tm-news-3.0.html">TM 3.0 New and Noteworthy</a></p> - <p><a href="http://www.eclipse.org/dsdp/tm/development/relnotes/3.0/readme_tm_3.0.html">TM 3.0.1 Readme / Release Notes</a></p> - <p><a href="buildNotes.php">Build Notes</a></p> - </strong></font></p> - - <!-- <p>To get started, see the <a href="buildNotes.php">build notes</a>.<br> - --> - To view the map file entries for this build, click - <a href="directory.txt">here</a>.<br> - To view the compile logs for this build, click - <a href="compilelog.txt">here</a>.</p> -<!-- - <p>To view the build notes for this build click <a - href="buildNotes.php">here</a>.<br> - To view the test results for this build, click - <a href="testResults.php">here</a>.<br> ---> - </td> -<!-- - <td width="28%"><img src="http://www.eclipse.org/images/Idea.jpg" height=86 width=120></td> ---> - </tr> -</table> -<table border="0" cellspacing="5" cellpadding="2" width="100%"> - <tr> - <td align="LEFT" valign="TOP" colspan="3" bgcolor="#0080C0"><b> - <font face="Arial,Helvetica" color="#FFFFFF">Requirements</font></b></td> - </tr> -</table> -<table> - <tbody> - <tr><td><b>TM @buildId@ requires - <a href="http://archive.eclipse.org/eclipse/downloads/"> - Eclipse 3.3</a> or later for the SSH component; the SSH encoding fix - (<a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=224799">bug 224799</a>) - requires <a href="http://download.eclipse.org/eclipse/downloads/">Eclipse 3.4</a> - or later. - </b></td></tr> - <tr><td> - Other components may work with earlier Eclipse versions, but these have not been tested.<br/> - For core RSE and TM-Terminal, the - <a href="http://archive.eclipse.org/eclipse/downloads/drops/R-3.3-200706251500/index.php#PlatformRuntime"> - Eclipse Platform Runtime Binary</a> is sufficient. Of course you can also use the popular - <a href="http://archive.eclipse.org/eclipse/downloads/drops/R-3.3-200706251500/index.php#EclipseSDK">SDK</a>. - </td></tr> - <tr><td> - Prerequisites for the remotecdt and discovery add-ons (CDT, EMF) can be retrieved from the - <a href="http://download.eclipse.org/releases/europa/">Europa Discovery Site</a>. - </td></tr> -<!-- - <tr><td> - Earlier versions (e.g. Eclipse 3.2.x, Eclipse 3.3M5) will <b>not</b> work! - </td></tr> ---> - </tbody> -</table> -</table> - -<table border="0" cellspacing="5" cellpadding="2" width="100%"> - <tr><td colspan="2"> </td></tr> -</table> -<table border="0" cellspacing="5" cellpadding="2" width="100%"> - <tr> - <td align="LEFT" valign="TOP" colspan="3" bgcolor="#0080C0"><b> - <font face="Arial,Helvetica" color="#FFFFFF">SDK (includes client runtime, user and ISV documentation, and source)</font></b></td> - </tr> -</table> -<table border="0" cellspacing="2" cellpadding="0" width="100%"> - <tr> - <td align="RIGHT" valign="TOP" width="7%"> - <div align="left"> - <b>Status</b></div> - </td> - <td width="30%"><b>Platform</b></td> - <td width="63%"><b>Download</b></td> - <tr><td><div align=left><img src = "OK.gif" width=19 height=23></div></td> - <td>All</td> - <td><a href="http://www.eclipse.org/downloads/download.php?file=/dsdp/tm/downloads/drops/@dropDir@/RSE-SDK-@buildId@.zip">RSE-SDK-@buildId@.zip</a></td> - </tr> -</table> - -<table border="0" cellspacing="5" cellpadding="2" width="100%"> - <tr><td colspan="2"> </td></tr> -</table> -<table border="0" cellspacing="5" cellpadding="2" width="100%"> - <tr> - <td align="LEFT" valign="TOP" colspan="3" bgcolor="#808080"><b> - <font face="Arial,Helvetica" color="#FFFFFF">Stand-alone Offerings, Integrations and Add-ons</font></b> - </td> - </tr> -</table> -<table border="0" cellspacing="2" cellpadding="0" width="100%"> - <tr> - <td align="RIGHT" valign="TOP" width="7%"> - <div align="left"><b>Status</b></div> - </td> - <td width="7%"><b>Platform</b></td> - <td width="23%"><b>Download</b></td> - <td width="63%"><b>Notes</b></td> - </tr> - <tr><td><div align=left><img src = "OK.gif" width=19 height=23></div></td> - <td>All</td> - <td><a href="http://www.eclipse.org/downloads/download.php?file=/dsdp/tm/downloads/drops/@dropDir@/TM-terminal-@buildId@.zip">TM-terminal-@buildId@.zip</a></td> - <td> - A stand-alone ANSI / vt102 terminal emulator widget and view (with minor - <a href="http://dev.eclipse.org/viewcvs/index.cgi/org.eclipse.tm.core/terminal/org.eclipse.tm.terminal/README.txt?revision=1.4&root=DSDP_Project&view=markup"> - limitations</a>). Includes pluggable connectors - for serial line (through RXTX, see the - <a href="http://dev.eclipse.org/viewcvs/index.cgi/org.eclipse.tm.core/terminal/org.eclipse.tm.terminal.serial/README.txt?revision=1.5&root=DSDP_Project&view=markup"> - installation notes</a>), ssh and telnet. Includes Source. - </td> - </tr> - <tr><td><div align=left><img src = "OK.gif" width=19 height=23></div></td> - <td>All</td> - <td><a href="http://www.eclipse.org/downloads/download.php?file=/dsdp/tm/downloads/drops/@dropDir@/TM-discovery-@buildId@.zip">TM-discovery-@buildId@.zip</a></td> - <td><small> </small><br/> - An API and DNS-SD / Zeroconf based - implementation for remote network service discovery. - Runs stand-alone or integrated with RSE. - Requires EMF 2.2.0 or later. Includes Source. - </td> - </tr> - <tr><td><div align=left><img src = "OK.gif" width=19 height=23></div></td> - <td>All</td> - <td><a href="http://www.eclipse.org/downloads/download.php?file=/dsdp/tm/downloads/drops/@dropDir@/RSE-remotecdt-@buildId@.zip">RSE-remotecdt-@buildId@.zip</a></td> - <td><small> </small><br/> - A Launch Configuration for running and debugging C/C++ - programs on a remote host through RSE-provided shell - and file services, and gdbserver. Requires CDT 3.0 or later. - Includes Source. - </td> - </tr> - <tr><td><div align=left><img src = "OK.gif" width=19 height=23></div></td> - <td>All</td> - <td><a href="http://www.eclipse.org/downloads/download.php?file=/dsdp/tm/downloads/drops/@dropDir@/RSE-examples-@buildId@.zip">RSE-examples-@buildId@.zip</a></td> - <td><small> </small><br/> - Tutorial code and example projects for developing against RSE SDK. - Includes Source. - </td> - </tr> - <tr><td><div align=left><img src = "OK.gif" width=19 height=23></div></td> - <td>All</td> - <td><a href="http://www.eclipse.org/downloads/download.php?file=/dsdp/tm/downloads/drops/@dropDir@/RSE-useractions-@buildId@.zip">RSE-useractions-@buildId@.zip</a></td> - <td><small> </small><br/> - Additional Framework for user-defined actions and compile commands. - Includes Source. - </td> - </tr> -</table> - -<table border="0" cellspacing="5" cellpadding="2" width="100%"> - <tr><td colspan="2"> </td></tr> -</table> -<table border="0" cellspacing="5" cellpadding="2" width="100%"> - <tr> - <td align="LEFT" valign="TOP" colspan="3" bgcolor="#808080"><b> - <font face="Arial,Helvetica" color="#FFFFFF">Add-ons in Incubation</font></b> - </td> - </tr> - <tr> - <td>Add-ons in - <a href="http://www.eclipse.org/projects/what-is-incubation.php"> - Incubation</a> state provide new features, but have - not yet hardened their APIs through public review such that there could be - a promise to keep them stable over releases. These add-ons have a 0.x version - number, and are provided for early adopters. Note that these features may - already be very mature in terms of features provided, but not yet in terms - of the APIs provided.</td> - </tr> -</table> -<table border="0" cellspacing="2" cellpadding="0" width="100%"> - <tr> - <td align="RIGHT" valign="TOP" width="7%"> - <div align="left"><b>Status</b></div> - </td> - <td width="7%"><b>Platform</b></td> - <td width="23%"><b>Download</b></td> - <td width="63%"><b>Notes</b></td> - </tr> - <tr><td><div align=left><img src = "OK.gif" width=19 height=23></div></td> - <td>All <img src="egg.gif" width=20 height=20></td> - <td><a href="http://www.eclipse.org/downloads/download.php?file=/dsdp/tm/downloads/drops/@dropDir@/RSE-wince-incubation-@buildId@.zip">RSE-wince-incubation-@buildId@.zip</a></td> - <td><small> </small><br/> - RSE Services for accessing Windows CE devices via Microsoft RAPI2. - Provides a File subsystem for transparent remote file access. - Requires Microsoft RAPI libraries installed. - Includes Source. - </td> - </tr> - <tr><td><div align=left><img src = "OK.gif" width=19 height=23></div></td> - <td>All <img src="egg.gif" width=20 height=20></td> - <td><a href="http://www.eclipse.org/downloads/download.php?file=/dsdp/tm/downloads/drops/@dropDir@/RSE-terminals-incubation-@buildId@.zip">RSE-terminals-incubation-@buildId@.zip</a></td> - <td><small> </small><br/> - Integration of the TM Terminal Widget into RSE, such that an SSH Terminals - Subsystem is provided to show a tabbed view of Terminals similar to the - Remote Command View. This component is already included in the RSE-SDK - download. It requires RSE core runtime and RSE ssh installed. - </td> - </tr> -</table> - -<table border="0" cellspacing="5" cellpadding="2" width="100%"> - <tr><td colspan="2"> </td></tr> -</table> -<table border="0" cellspacing="5" cellpadding="2" width="100%"> - <tr> - <td align="LEFT" valign="TOP" colspan="3" bgcolor="#0080C0"><b> - <font face="Arial,Helvetica" color="#FFFFFF">DStore Server Runtime</font></b></td> - </tr> -</table> -<table border="0" cellspacing="2" cellpadding="0" width="100%"> - <tr> - <td align="RIGHT" valign="TOP" width="7%"> - <div align="left"><b>Status</b></div></td> - <td width="30%"><b>Platform</b></td> - <td width="63%"><b>Download</b></td></tr> - <tr><td><div align=left><img src = "OK.gif" width=19 height=23></div></td> - <td>Windows (<a href="http://www.eclipse.org/dsdp/tm/development/plan.php#OperatingEnvironments">Supported Versions</a>)</td> - <td><a href="http://www.eclipse.org/downloads/download.php?file=/dsdp/tm/downloads/drops/@dropDir@/rseserver-@buildId@-windows.zip">rseserver-@buildId@-windows.zip</a></td></tr> - <tr><td><div align=left><img src = "OK.gif" width=19 height=23></div></td> - <td>Linux (<a href="http://www.eclipse.org/dsdp/tm/development/plan.php#OperatingEnvironments">Supported Versions</a>)</td> - <td><a href="http://www.eclipse.org/downloads/download.php?file=/dsdp/tm/downloads/drops/@dropDir@/rseserver-@buildId@-linux.tar">rseserver-@buildId@-linux.tar</a></td></tr> - <tr><td><div align=left><img src = "OK.gif" width=19 height=23></div></td> - <td>Other Unix (<a href="http://www.eclipse.org/dsdp/tm/development/plan.php#OperatingEnvironments">Supported Versions</a>)</td> - <td><a href="http://www.eclipse.org/downloads/download.php?file=/dsdp/tm/downloads/drops/@dropDir@/rseserver-@buildId@-unix.tar">rseserver-@buildId@-unix.tar</a></td></tr> - <tr><td><div align=left><img src = "OK.gif" width=19 height=23></div></td> - <td>Mac OS X (<a href="http://www.eclipse.org/dsdp/tm/development/plan.php#OperatingEnvironments"><i>Experimental</i></a>)</td> - <td><a href="http://www.eclipse.org/downloads/download.php?file=/dsdp/tm/downloads/drops/@dropDir@/rseserver-@buildId@-macosx.tar">rseserver-@buildId@-macosx.tar</a></td></tr> -</table> -<table border="0" cellspacing="5" cellpadding="2" width="100%"> - <tr><td colspan="2"> </td></tr> -</table> - -<table border="0" cellspacing="5" cellpadding="2" width="100%"> - <tr> - <td align="LEFT" valign="TOP" colspan="3" bgcolor="#808080"><b> - <font face="Arial,Helvetica" color="#FFFFFF">Client Runtime Binaries</font></b></td> - </tr> - <tr> - <td>The runtime binaries do not include source and developer documentation, - and they are available in a more fine-grained packaging for re-use in - other products.<br/> - <b>RSE-runtime-core is required</b>, and includes the user documentation. - All other runtime packages are optional.</td> - </tr> -</table> -<table border="0" cellspacing="2" cellpadding="0" width="100%"> - <tr> - <td align="RIGHT" valign="TOP" width="7%"> - <div align="left"><b>Status</b></div> - </td> - <td width="30%"><b>Platform</b></td> - <td width="63%"><b>Download</b></td></tr> - <tr><td><div align=left><img src = "OK.gif" width=19 height=23></div></td> - <td>All</td> - <td><a href="http://www.eclipse.org/downloads/download.php?file=/dsdp/tm/downloads/drops/@dropDir@/RSE-runtime-core-@buildId@.zip">RSE-runtime-core-@buildId@.zip</a></td></tr> - <tr><td><div align=left><img src = "OK.gif" width=19 height=23></div></td> - <td>All</td> - <td><a href="http://www.eclipse.org/downloads/download.php?file=/dsdp/tm/downloads/drops/@dropDir@/RSE-runtime-dstore-@buildId@.zip">RSE-runtime-dstore-@buildId@.zip</a></td></tr> - <tr><td><div align=left><img src = "OK.gif" width=19 height=23></div></td> - <td>All</td> - <td><a href="http://www.eclipse.org/downloads/download.php?file=/dsdp/tm/downloads/drops/@dropDir@/RSE-runtime-ftp-@buildId@.zip">RSE-runtime-ftp-@buildId@.zip</a></td></tr> - <tr><td><div align=left><img src = "OK.gif" width=19 height=23></div></td> - <td>All</td> - <td><a href="http://www.eclipse.org/downloads/download.php?file=/dsdp/tm/downloads/drops/@dropDir@/RSE-runtime-local-@buildId@.zip">RSE-runtime-local-@buildId@.zip</a></td></tr> - <tr><td><div align=left><img src = "OK.gif" width=19 height=23></div></td> - <td>All</td> - <td><a href="http://www.eclipse.org/downloads/download.php?file=/dsdp/tm/downloads/drops/@dropDir@/RSE-runtime-ssh-@buildId@.zip">RSE-runtime-ssh-@buildId@.zip</a></td></tr> - <tr><td><div align=left><img src = "OK.gif" width=19 height=23></div></td> - <td>All</td> - <td><a href="http://www.eclipse.org/downloads/download.php?file=/dsdp/tm/downloads/drops/@dropDir@/RSE-runtime-telnet-@buildId@.zip">RSE-runtime-telnet-@buildId@.zip</a> (<i>Experimental</i>)</td></tr> -</table> - -<table border="0" cellspacing="5" cellpadding="2" width="100%"> - <tr><td colspan="2"> </td></tr> -</table> -<table border="0" cellspacing="5" cellpadding="2" width="100%"> - <tr> - <td align="LEFT" valign="TOP" colspan="3" bgcolor="#808080"><b> - <font face="Arial,Helvetica" color="#FFFFFF">JUnit Plugin Tests</font></b></td> - </tr> - <tr> - <td>The RSE test suite requires the JUnit plug-in, which is included in the - <a href="http://archive.eclipse.org/eclipse/downloads/drops/R-3.3-200706251500/index.php#EclipseSDK"> - Eclipse SDK</a> or available as<br/> - <a href="http://archive.eclipse.org/eclipse/downloads/drops/R-3.3-200706251500/index.php#JUnitPlugin"> - eclipse-test-framework download</a> for users of the Eclipse Platform Runtime Binary. - </td> - </tr> -</table> - - - -<table border="0" cellspacing="2" cellpadding="0" width="100%"> - <tr> - <td align="RIGHT" valign="TOP" width="7%"> - <div align="left"> - <b>Status</b></div> - </td> - <td width="30%"><b>Platform</b></td> - <td width="63%"><b>Download</b></td> - </tr> - <tr><td><div align=left><img src = "OK.gif" width=19 height=23></div></td> - <td>All</td> - <td><a href="http://www.eclipse.org/downloads/download.php?file=/dsdp/tm/downloads/drops/@dropDir@/RSE-tests-@buildId@.zip">RSE-tests-@buildId@.zip</a></td> - </tr> -</table> -<table border="0" cellspacing="5" cellpadding="2" width="100%"> - <tr><td colspan="2"> </td></tr> -</table> - -<p> </p> -</body> -</html> diff --git a/releng/org.eclipse.rse.build/template/notice.html b/releng/org.eclipse.rse.build/template/notice.html deleted file mode 100644 index c6af966b6..000000000 --- a/releng/org.eclipse.rse.build/template/notice.html +++ /dev/null @@ -1,79 +0,0 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"> -<html> -<head> -<meta http-equiv=Content-Type content="text/html; charset=iso-8859-1"> -<title>Eclipse.org Software User Agreement</title> -</head> - -<body lang="EN-US" link=blue vlink=purple> -<h2>Eclipse Foundation Software User Agreement</h2> -<p>March 17, 2005</p> - -<h3>Usage Of Content</h3> - -<p>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.</p> - -<h3>Applicable Licenses</h3> - -<p>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 <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>. - For purposes of the EPL, "Program" will mean the Content.</p> - -<p>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").</p> - -<ul> - <li>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").</li> - <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java™ ARchive) in a directory named "plugins".</li> - <li>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.</li> - <li>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.</li> -</ul> - -<p>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:</p> - -<ul> - <li>The top-level (root) directory</li> - <li>Plug-in and Fragment directories</li> - <li>Inside Plug-ins and Fragments packaged as JARs</li> - <li>Sub-directories of the directory named "src" of certain Plug-ins</li> - <li>Feature directories</li> -</ul> - -<p>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.</p> - -<p>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):</p> - -<ul> - <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li> - <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li> - <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li> - <li>IBM Public License 1.0 (available at <a href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</a>)</li> - <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li> - <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li> -</ul> - -<p>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.</p> - -<h3>Cryptography</h3> - -<p>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.</p> - -<small>Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.</small> -</body> -</html> diff --git a/releng/org.eclipse.rse.build/template/package.count b/releng/org.eclipse.rse.build/template/package.count deleted file mode 100755 index d6b24041c..000000000 --- a/releng/org.eclipse.rse.build/template/package.count +++ /dev/null @@ -1 +0,0 @@ -19 diff --git a/releng/org.eclipse.rse.releng.infocenter/.project b/releng/org.eclipse.rse.releng.infocenter/.project deleted file mode 100644 index 3e151d5c4..000000000 --- a/releng/org.eclipse.rse.releng.infocenter/.project +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<projectDescription> - <name>org.eclipse.rse.releng.infocenter</name> - <comment></comment> - <projects> - </projects> - <buildSpec> - </buildSpec> - <natures> - </natures> -</projectDescription> diff --git a/releng/org.eclipse.rse.releng.infocenter/about.html b/releng/org.eclipse.rse.releng.infocenter/about.html deleted file mode 100644 index d4cc693f9..000000000 --- a/releng/org.eclipse.rse.releng.infocenter/about.html +++ /dev/null @@ -1,28 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" - "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml"> -<head> -<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/> -<title>About</title> -</head> -<body lang="EN-US"> -<h2>About This Content</h2> - -<p>June 5, 2007</p> -<h3>License</h3> - -<p>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 <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>. -For purposes of the EPL, "Program" will mean the Content.</p> - -<p>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 <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p> - -</body> -</html>
\ No newline at end of file diff --git a/releng/org.eclipse.rse.releng.infocenter/doit_nightly.sh b/releng/org.eclipse.rse.releng.infocenter/doit_nightly.sh deleted file mode 100755 index ab7d18a58..000000000 --- a/releng/org.eclipse.rse.releng.infocenter/doit_nightly.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/sh -#******************************************************************************* -# Copyright (c) 2006 Wind River Systems, Inc. -# All rights reserved. This program and 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 -#******************************************************************************* - -#Find out the IHOME - it's the parent of my own directory ($IHOME/bin) -curdir=`pwd` -cd `dirname $0` -mydir=`pwd` -cd .. -IHOME=`pwd` -export IHOME - -#Update scripts - prerequisite: IHOME is infocenter home -umask 022 -cd "$IHOME/bin" -cvs -q update -d -chmod a+x *.sh - -#Update the infocenter -./update.sh diff --git a/releng/org.eclipse.rse.releng.infocenter/infocenter.sh b/releng/org.eclipse.rse.releng.infocenter/infocenter.sh deleted file mode 100755 index fd7dce0f3..000000000 --- a/releng/org.eclipse.rse.releng.infocenter/infocenter.sh +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/sh -#******************************************************************************* -# Copyright (c) 2006 Wind River Systems, Inc. -# All rights reserved. This program and 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 -#******************************************************************************* -umask 022 - -PATH=/opt/j2sdk1.4.2_12/bin:$PATH -export PATH - -EHOME=/home/infocenter/eclipse3.2/eclipse -if [ "$IHOME" = "" ]; then - IHOME=/home/infocenter/latest -fi - -if [ "$1" = "" -o "$1" = "help" ]; then - echo "Usage: infocenter.sh [start|shutdown|addSite -from dir|apply]" - exit 1 -fi - -java \ - -classpath $EHOME/plugins/org.eclipse.help.base_3.2.0.v20060601.jar \ - org.eclipse.help.standalone.Infocenter \ - -command $* \ - -eclipsehome $EHOME \ - -data $IHOME/workspace \ - -port 27127 \ - -nl en -locales en \ - -configuration file://$IHOME/config - diff --git a/releng/org.eclipse.rse.releng.infocenter/readme.txt b/releng/org.eclipse.rse.releng.infocenter/readme.txt deleted file mode 100644 index 27799ef28..000000000 --- a/releng/org.eclipse.rse.releng.infocenter/readme.txt +++ /dev/null @@ -1,31 +0,0 @@ -DSDP Project Infocenter ------------------------ - -This project contains scripts needed to run the Eclipse headless infocenter -application, serving latest online help from dsdp.eclipse.org. - -The scripts are written to run by cron job, as user "infocenter", on dsdp.eclipse.org. - -This project can be checked out with - cvs -d :pserver:anonymous@dev.eclipse.org:/cvsroot/dsdp \ - co -d bin org.eclipse.tm.rse/releng/org.eclipse.tm.rse.releng.infocenter - -Prerequisites: -* Eclipse 3.2 installed at /home/infocenter/eclipse3.2/eclipse -* Infocenter home (IHOME) at /home/infocenter/latest - - Scripts checked out at $IHOME/bin - - Deployable doc plugins at $IHOME/deploy -* Cronjob created to execute doit_nightly.sh - ssh dsdp.eclipse.org -l infocenter - crontab -e - #Run the doc update at 2:00 every weekday - 0 2 * * 1-5 /home/infocenter/latest/bin/doit_nightly.sh - -Other infocenter administration commands: - infocenter.sh shutdown - infocenter.sh start & - -For more documentation on infocenter, see -http://help.eclipse.org/help32/index.jsp?topic=/org.eclipse.platform.doc.isv/guide/ua_help_setup_infocenter.htm - --- Martin Oberhuber, 20-Jul-2006
\ No newline at end of file diff --git a/releng/org.eclipse.rse.updatesite/.cvsignore b/releng/org.eclipse.rse.updatesite/.cvsignore deleted file mode 100644 index 51689449b..000000000 --- a/releng/org.eclipse.rse.updatesite/.cvsignore +++ /dev/null @@ -1,6 +0,0 @@ -features -plugins -interim -milestones -digest.zip -site-europa.xml diff --git a/releng/org.eclipse.rse.updatesite/.project b/releng/org.eclipse.rse.updatesite/.project deleted file mode 100644 index fc8928ebd..000000000 --- a/releng/org.eclipse.rse.updatesite/.project +++ /dev/null @@ -1,17 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<projectDescription> - <name>org.eclipse.rse.updatesite</name> - <comment></comment> - <projects> - </projects> - <buildSpec> - <buildCommand> - <name>org.eclipse.pde.UpdateSiteBuilder</name> - <arguments> - </arguments> - </buildCommand> - </buildSpec> - <natures> - <nature>org.eclipse.pde.UpdateSiteNature</nature> - </natures> -</projectDescription> diff --git a/releng/org.eclipse.rse.updatesite/bin/.cvsignore b/releng/org.eclipse.rse.updatesite/bin/.cvsignore deleted file mode 100644 index 3f0ee91c7..000000000 --- a/releng/org.eclipse.rse.updatesite/bin/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -pack200.stamp diff --git a/releng/org.eclipse.rse.updatesite/bin/mkTestUpdates.sh b/releng/org.eclipse.rse.updatesite/bin/mkTestUpdates.sh deleted file mode 100755 index b25021385..000000000 --- a/releng/org.eclipse.rse.updatesite/bin/mkTestUpdates.sh +++ /dev/null @@ -1,401 +0,0 @@ -#!/bin/sh -#******************************************************************************* -# Copyright (c) 2006, 2008 Wind River Systems, Inc. -# All rights reserved. This program and 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 -#******************************************************************************* -# Convert normal "site.xml" to "testPatchUpdates" -# -# Prerequisites: -# - Eclipse 3.3Mx installed in $HOME/ws_30x/eclipse -# - Java5 in the PATH or in /shared/dsdp/tm/ibm-java2-ppc64-50 - -curdir=`pwd` -cd `dirname $0` -mydir=`pwd` - -umask 022 - -#Use Java5 on build.eclipse.org - need JRE for pack200 -export PATH=/shared/dsdp/tm/ibm-java2-ppc64-50/jre/bin:/shared/dsdp/tm/ibm-java2-ppc64-50/bin:$PATH -basebuilder=${HOME}/ws_30x/org.eclipse.releng.basebuilder - -# patch site.xml -cd .. -SITE=`pwd` -if [ -f index.html.new ]; then - rm -f index.html.new -fi -if [ -f site.xml.new ]; then - rm -f site.xml.new -fi -if [ -f web/site.xsl.new ]; then - rm -f web/site.xsl.new -fi - -# get newest plugins and features: to be done manually on real update site -TPVERSION="Target Management" -TYPE=none -SITEDIR=`basename ${SITE}` -case ${SITEDIR} in - test*Updates) TYPE=test ;; - signed*Updates) TYPE=testSigned ;; - *milestones) TYPE=milestone ;; - *interim) TYPE=interim ;; - *) TYPE=unknown ;; -esac -if [ ${TYPE} = test ]; then - echo "Working on test patch update site" - TPTYPE="3.0.2 Test Patch" - TPVERSION="${TPVERSION} ${TPTYPE}" - REL=`ls $HOME/ws_30x/working/package | sort | tail -1` - if [ "$REL" != "" ]; then - echo "Checking new Updates from $REL" - DIR="$HOME/ws_30x/working/package/$REL/updates" - if [ -d "$DIR/features" ]; then - echo "Copying new plugins and features from $DIR" - rm -rf features - rm -rf plugins - cp -R $DIR/features . - cp -R $DIR/plugins . - fi - fi - rm index.html site.xml web/site.xsl - cvs -q update -dPR - sed -e "s,/dsdp/tm/updates/2.0,/dsdp/tm/${SITEDIR},g" \ - -e "s,Project 2.0 Update,Project ${TPTYPE} Update,g" \ - index.html > index.html.new - mv -f index.html.new index.html - sed -e "s,/dsdp/tm/updates/2.0,/dsdp/tm/${SITEDIR},g" \ - -e "s,Project 2.0 Update,Project ${TPTYPE} Update,g" \ - -e '/<!-- BEGIN_2_0 -->/,/<!-- END_2_0_4 -->/d' \ - -e '/<!-- BEGIN_3_0 -->/,/<!-- END_3_0_1 -->/d' \ - site.xml > site.xml.new - mv -f site.xml.new site.xml - sed -e "s,Project 2.0 Update,Project ${TPTYPE} Update,g" \ - web/site.xsl > web/site.xsl.new - mv -f web/site.xsl.new web/site.xsl - echo "Conditioning the site... $SITE" - #java -Dorg.eclipse.update.jarprocessor.pack200=$mydir \ - #java -jar $HOME/ws_30x/eclipse/startup.jar \ - java \ - -jar ${basebuilder}/plugins/org.eclipse.equinox.launcher.jar \ - -application org.eclipse.update.core.siteOptimizer \ - -jarProcessor -outputDir $SITE \ - -processAll -repack $SITE - #java -Dorg.eclipse.update.jarprocessor.pack200=$mydir \ - # $HOME/ws_30x/jarprocessor/jarprocessor.jar \ - # -outputDir $SITE -processAll -repack $SITE -elif [ ${TYPE} = testSigned ]; then - echo "Working on signed patch update site" - TPTYPE="3.0.2 Signed Test Patch" - TPVERSION="${TPVERSION} ${TPTYPE}" - echo "Signing jars from test patch update site (expecting conditioned jars)..." - STAGING=/home/data/httpd/download-staging.priv/dsdp/tm - stamp=`date +'%Y%m%d-%H%M'` - if [ -d ${STAGING} -a -d ${SITE}/../testPatchUpdates ]; then - #get jars from testPatchUpdates, sign them and put them here - mkdir ${SITE}/features.${stamp} - mkdir -p ${STAGING}/updates.${stamp}/features - cp -R ${SITE}/../testPatchUpdates/features/*.jar ${STAGING}/updates.${stamp}/features - cd ${STAGING}/updates.${stamp}/features - for x in `ls *.jar`; do - result=`jarsigner -verify ${x} | head -1` - if [ "$result" != "jar verified." ]; then - # do not sign Orbit bundles again since they are signed already - echo "signing feature: ${x}" - sign ${x} nomail >/dev/null - fi - done - TRIES=10 - while [ $TRIES -gt 0 ]; do - sleep 30 - echo "TRIES to go: ${TRIES}" - for x in `ls *.jar | grep -v '^temp[_.]'`; do - result=`jarsigner -verify ${x} | head -1` - if [ "$result" = "jar verified." ]; then - echo "${result}: ${x}" - cp ${x} ${SITE}/features.${stamp} - rm ${x} - else - echo "-pending- ${x} : ${result}" | head -1 - sleep 30 - fi - done - FILES=`ls 2>/dev/null` - if [ "$FILES" = "" ]; then - TRIES=0 - ok=1 - else - echo "--> FILES is $FILES" - TRIES=`expr $TRIES - 1` - ok=0 - fi - done - if [ "$ok" = "1" ]; then - rmdir ${STAGING}/updates.${stamp}/features - mkdir ${SITE}/plugins.${stamp} - mkdir -p ${STAGING}/updates.${stamp}/plugins - cp ${SITE}/../testPatchUpdates/plugins/*.jar ${STAGING}/updates.${stamp}/plugins - cd ${STAGING}/updates.${stamp}/plugins - for x in `ls *.jar`; do - result=`jarsigner -verify ${x} | head -1` - if [ "$result" != "jar verified." ]; then - # do not sign Orbit bundles again since they are signed already - echo "signing plugin: ${x}" - sign ${x} nomail >/dev/null - fi - done - TRIES=10 - while [ $TRIES -gt 0 ]; do - sleep 30 - echo "TRIES to go: ${TRIES}" - for x in `ls *.jar | grep -v '^temp[_.]'`; do - result=`jarsigner -verify ${x} | head -1` - if [ "$result" = "jar verified." ]; then - echo "${result}: ${x}" - cp ${x} ${SITE}/plugins.${stamp} - rm ${x} - else - echo "-pending- ${x} : ${result}" | head -1 - sleep 30 - fi - done - FILES=`ls 2>/dev/null` - if [ "$FILES" = "" ]; then - TRIES=0 - ok=1 - else - echo "--> FILES is $FILES" - TRIES=`expr $TRIES - 1` - ok=0 - fi - done - fi - if [ "$ok" = "1" ]; then - cd ${SITE} - rmdir ${STAGING}/updates.${stamp}/plugins - rmdir ${STAGING}/updates.${stamp} - #mv features features.old.${stamp} - #mv plugins plugins.old.${stamp} - rm -rf features plugins - mv features.${stamp} features - mv plugins.${stamp} plugins - else - echo "Something went wrong during staging and signing." - echo "Keeping existing update site intact." - exit 1 - fi - else - echo "staging or testPatchUpdates not found:" - echo "please fix your pathes" - exit 1 - fi - rm index.html site.xml web/site.xsl - cvs -q update -dPR - sed -e "s,/dsdp/tm/updates/2.0,/dsdp/tm/${SITEDIR},g" \ - -e "s,Project 2.0 Update,Project ${TPTYPE} Update,g" \ - index.html > index.html.new - mv -f index.html.new index.html - sed -e "s,/dsdp/tm/updates/2.0,/dsdp/tm/${SITEDIR},g" \ - -e "s,Project 2.0 Update,Project ${TPTYPE} Update,g" \ - -e '/<!-- BEGIN_2_0 -->/,/<!-- END_2_0_4 -->/d' \ - -e '/<!-- BEGIN_3_0 -->/,/<!-- END_3_0_1 -->/d' \ - site.xml > site.xml.new - mv -f site.xml.new site.xml - sed -e "s,Project 2.0 Update,Project ${TPTYPE} Update,g" \ - web/site.xsl > web/site.xsl.new - mv -f web/site.xsl.new web/site.xsl - ## CHECK VERSION CORRECTNESS for 2.0.1 - echo "VERIFYING VERSION CORRECNESS: Features" - ls features | grep -v '_[123]\.0\.0\.v' | sort > f1.$$.txt - ls ../updates/3.0/features | sort > f2.$$.txt - echo "wc old-features:" - wc f1.$$.txt - diff f1.$$.txt f2.$$.txt | grep -v '^[>]' - echo "VERIFYING VERSION CORRECNESS: Plugins" - ls plugins | grep -v '_[123]\.0\.0\.v' | sort > p1.$$.txt - ls ../updates/3.0/plugins | sort > p2.$$.txt - echo "wc old-plugins:" - wc p1.$$.txt - diff p1.$$.txt p2.$$.txt | grep -v '^[>]' - rm f1.$$.txt f2.$$.txt p1.$$.txt p2.$$.txt -elif [ ${TYPE} = milestone ]; then - echo "Working on milestone update site" - TPTYPE="3.0 Milestone" - TPVERSION="${TPVERSION} ${TPTYPE}" - echo "Expect that you copied your features and plugins yourself" - stamp=`date +'%Y%m%d-%H%M'` - rm index.html site.xml web/site.xsl - cvs -q update -dPR - sed -e "s,/dsdp/tm/updates/2.0,/dsdp/tm/updates/${SITEDIR},g" \ - -e "s,Project 2.0 Update,Project ${TPTYPE} Update,g" \ - -e '\,</h1>,a\ -This site contains Target Management Milestones (I-, S- and M- builds) which are \ -being contributed to the Ganymede coordinated release train (Eclipse 3.4.x).' \ - index.html > index.html.new - mv -f index.html.new index.html - ## keep 3.0.x features in site.xml - ## -e '/<!-- BEGIN_2_0_1 -->/,/<!-- END_2_0_4 -->/d' \ - sed -e "s,/dsdp/tm/updates/2.0,/dsdp/tm/updates/${SITEDIR},g" \ - -e "s,Project 2.0 Update,Project ${TPTYPE} Update,g" \ - -e '/<!-- BEGIN_2_0 -->/,/<!-- END_2_0_4 -->/d' \ - -e '/<!-- BEGIN_3_1 -->/,/<!-- END_3_1 -->/d' \ - site.xml > site.xml.new - mv -f site.xml.new site.xml - sed -e "s,Project 2.0 Update,Project ${TPTYPE} Update,g" \ - web/site.xsl > web/site.xsl.new - mv -f web/site.xsl.new web/site.xsl -elif [ ${TYPE} = interim ]; then - echo "Working on interim update site" - TPTYPE="3.0 Interim" - TPVERSION="${TPVERSION} ${TPTYPE}" - echo "Expect that you copied your features and plugins yourself" - stamp=`date +'%Y%m%d-%H%M'` - rm index.html site.xml web/site.xsl - cvs -q update -dPR - sed -e "s,/dsdp/tm/updates/2.0,/dsdp/tm/updates/${SITEDIR},g" \ - -e "s,Project 2.0 Update,Project ${TPTYPE} Update,g" \ - -e '\,</h1>,a\ -This site contains Target Management Interim Maintenance builds (I-, S-, and M-builds) in order \ -to test them before going live.' \ - index.html > index.html.new - mv -f index.html.new index.html - ## keep 2.0.x features in site.xml - ## -e '/<!-- BEGIN_2_0_1 -->/,/<!-- END_2_0_4 -->/d' \ - sed -e "s,/dsdp/tm/updates/2.0,/dsdp/tm/updates/${SITEDIR},g" \ - -e "s,Project 2.0 Update,Project ${TPTYPE} Update,g" \ - -e '/<!-- BEGIN_2_0_5 -->/,/<!-- END_2_0_5 -->/d' \ - site.xml > site.xml.new - mv -f site.xml.new site.xml - sed -e "s,Project 2.0 Update,Project ${TPTYPE} Update,g" \ - web/site.xsl > web/site.xsl.new - mv -f web/site.xsl.new web/site.xsl -elif [ `basename $SITE` = 3.0 ]; then - echo "Working on 3.0 update site" - TPTYPE="3.0" - TPVERSION="${TPVERSION} ${TPTYPE}" - TYPE=official - echo "Expect that you copied your features and plugins yourself" - stamp=`date +'%Y%m%d-%H%M'` - rm index.html site.xml web/site.xsl - cvs -q update -dPR - sed -e "s,/dsdp/tm/updates/2.0,/dsdp/tm/updates/${SITEDIR},g" \ - -e "s,Project 2.0 Update,Project ${TPTYPE} Update,g" \ - -e '\,</h1>,a\ -This site contains Target Management 3.0 Releases and Updates (R- builds) which are \ -being contributed to the Ganymede coordinated release train (Eclipse 3.4).' \ - index.html > index.html.new - mv -f index.html.new index.html - ## dont keep 2.0.x features in site.xml - sed -e "s,/dsdp/tm/updates/2.0,/dsdp/tm/updates/${SITEDIR},g" \ - -e "s,Project 2.0 Update,Project ${TPTYPE} Update,g" \ - -e '/<!-- BEGIN_2_0 -->/,/<!-- END_2_0_4 -->/d' \ - site.xml > site.xml.new1 - sed -e '/<!-- BEGIN_3_0_2 -->/,/<!-- END_3_0_2 -->/d' \ - site.xml.new1 > site.xml.new2 - sed -e '/<!-- BEGIN_3_1 -->/,/<!-- END_3_1 -->/d' \ - site.xml.new2 > site.xml.new - mv -f site.xml.new site.xml - rm site.xml.new1 site.xml.new2 - sed -e "s,Project 2.0 Update,Project ${TPTYPE} Update,g" \ - web/site.xsl > web/site.xsl.new - mv -f web/site.xsl.new web/site.xsl -else - echo "Working on official update site" - TYPE=official - echo "Expect that you copied your features and plugins yourself" - stamp=`date +'%Y%m%d-%H%M'` - rm index.html site.xml web/site.xsl - cvs -q update -dPR - sed -e '/<!-- BEGIN_2_0_5 -->/,/<!-- END_2_0_5 -->/d' \ - site.xml > site.xml.new1 - sed -e '/<!-- BEGIN_3_0_2 -->/,/<!-- END_3_0_2 -->/d' \ - site.xml.new1 > site.xml.new2 - sed -e '/<!-- BEGIN_3_1 -->/,/<!-- END_3_1 -->/d' \ - site.xml.new2 > site.xml.new - mv -f site.xml.new site.xml - rm site.xml.new1 site.xml.new2 -fi -FEATURES=`grep 'features/[^ ]*\.qualifier\.jar' site.xml | sed -e 's,^[^"]*"features/\([^0-9]*[0-9][0-9.]*\).*$,\1,g'` -for feature in $FEATURES ; do - #list newest ones first - TAG=`ls -t features/${feature}*.jar | head -1 | sed -e 's,[^0-9]*[0-9][0-9]*\.[0-9]*\.[0-9]*\.\([^.]*\).jar,\1,'` - if [ "$TAG" != "" ]; then - echo "$feature : $TAG" - sed -e "/$feature/s/qualifier/$TAG/g" site.xml > site.xml.new - mv -f site.xml.new site.xml - fi -done -#Create Europa version of site.xml -if [ -f site-europa.xml ]; then - rm -rf site-europa.xml -fi -sed -e '/!EUROPA_ONLY!/d' site.xml > site-europa.xml - -#Get rid of Europa comments completely in order to avoid SAX exception -#in comment when the feature qualifier extends to -- -awk 'BEGIN {doit=1} - /-- !EUROPA_ONLY!/ {doit=0} - { if(doit==1) print; } - /!EUROPA_ONLY! --/ {doit=1}' site.xml > site.xml.tmp -mv -f site.xml.tmp site.xml - -# optimize the site -# see http://wiki.eclipse.org/Platform-releng-faq -case ${TYPE} in test*) - echo "Packing the site... $SITE" - # Workaround for downgrading effort of pack200 to avoid VM bug - # See https://bugs.eclipse.org/bugs/show_bug.cgi?id=154069 - #java -Dorg.eclipse.update.jarprocessor.pack200=$mydir \ - #java -jar $HOME/ws_30x/eclipse/startup.jar \ - java -jar ${basebuilder}/plugins/org.eclipse.equinox.launcher.jar \ - -application org.eclipse.update.core.siteOptimizer \ - -jarProcessor -outputDir $SITE \ - -processAll -pack $SITE - #java -Dorg.eclipse.update.jarprocessor.pack200=$mydir \ - # $HOME/ws_30x/jarprocessor/jarprocessor.jar \ - # -outputDir $SITE -processAll -pack $SITE - ;; -esac - -#Create the digest -echo "Creating digest..." -#java -jar $HOME/ws_30x/eclipse/startup.jar \ -java -jar ${basebuilder}/plugins/org.eclipse.equinox.launcher.jar \ - -application org.eclipse.update.core.siteOptimizer \ - -digestBuilder -digestOutputDir=$SITE \ - -siteXML=$SITE/site-europa.xml - -##if false ; then -#Create P2 metadata -echo "Creating P2 metadata..." -#Always create from scratch -cd ${SITE} -for x in content.xml content.jar content.jar.pack.gz artifacts.xml artifacts.jar artifacts.jar.pack.gz ; do - if [ -f $x ]; then rm -f $x; fi -done -java -jar ${basebuilder}/plugins/org.eclipse.equinox.launcher.jar \ - -application org.eclipse.equinox.p2.metadata.generator.EclipseGenerator \ - -updateSite ${SITE}/ \ - -site file:${SITE}/site.xml \ - -metadataRepository file:${SITE}/ \ - -metadataRepositoryName "${TPVERSION} Update Site" \ - -artifactRepository file:${SITE}/ \ - -artifactRepositoryName "${TPVERSION} Artifacts" \ - -compress \ - -reusePack200Files \ - -noDefaultIUs \ - -vmargs -Xmx256M -##fi - -cd $SITE -chgrp -R dsdp-tmadmin . -chmod -R g+w . -chmod -R a+r . -cd $curdir diff --git a/releng/org.eclipse.rse.updatesite/bin/pack200 b/releng/org.eclipse.rse.updatesite/bin/pack200 deleted file mode 100755 index 1bdf59749..000000000 --- a/releng/org.eclipse.rse.updatesite/bin/pack200 +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/sh -# -# Workaround for downgrading effort of pack200 to avoid VM bug -# See https://bugs.eclipse.org/bugs/show_bug.cgi?id=154069 -# -curdir=`pwd` -cd `dirname $0` -mydir=`pwd` -cd "$curdir" - -rm "$mydir/pack200.stamp" -touch "$mydir/pack200.stamp" -date >> "$mydir/pack200.stamp" -echo "pack200 -E4 $*" >> "$mydir/pack200.stamp" -pack200 -E4 $* diff --git a/releng/org.eclipse.rse.updatesite/bin/sign.sh b/releng/org.eclipse.rse.updatesite/bin/sign.sh deleted file mode 100755 index 204140e4b..000000000 --- a/releng/org.eclipse.rse.updatesite/bin/sign.sh +++ /dev/null @@ -1,119 +0,0 @@ -#!/bin/sh -#******************************************************************************* -# Copyright (c) 2007 Wind River Systems, Inc. -# All rights reserved. This program and 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 -#******************************************************************************* -# Sign a list of files on build.eclipse.org -# -# Usage: -# sign.sh a.jar featurs/b.jar `ls plugins/*.jar` -# -# Prerequisites: -# - Eclipse 3.3Mx installed in $HOME/ws_30x/eclipse -# - Java5 in the PATH or in /shared/dsdp/tm/ibm-java2-ppc64-50 - -curdir=`pwd` -cd `dirname $0` -mydir=`pwd` - -umask 022 - -#Use Java5 on build.eclipse.org - need JRE for pack200 -export PATH=/shared/dsdp/tm/ibm-java2-ppc64-50/jre/bin:/shared/dsdp/tm/ibm-java2-ppc64-50/bin:$PATH -basebuilder=${HOME}/ws_30x/org.eclipse.releng.basebuilder - -FILES=$* - -# Work on update site -cd .. -SITE=`pwd` - -STAGING=/home/data/httpd/download-staging.priv/dsdp/tm -stamp=`date +'%Y%m%d-%H%M'` -WORKDIR=${STAGING}/${stamp} -mkdir -p ${WORKDIR} -REALFILES="" -NAMES="" -echo "Bock ma's" -for file in ${FILES}; do - echo "file: ${file}" - cd ${SITE} - if [ -f ${file} ]; then - name=`basename ${file}` - echo "signing: ${name}" - NAMES="${NAMES} ${name}" - REALFILES="${REALFILES} ${file}" - cp ${file} ${WORKDIR} - cd ${WORKDIR} - sign ${name} nomail >/dev/null - fi -done -mkdir ${WORKDIR}/done -cd ${WORKDIR} -TRIES=10 -while [ $TRIES -gt 0 ]; do - sleep 30 - anyleft=0 - echo "TRIES to go: ${TRIES}" - for x in ${NAMES} ; do - if [ -f ${x} ]; then - anyleft=1 - result=`jarsigner -verify ${x}` - if [ "$result" = "jar verified." ]; then - echo "${result}: ${x}" - mv ${x} ${WORKDIR}/done/${x} - else - echo "-pending- ${x} : ${result}" | head -1 - sleep 30 - fi - fi - done - if [ "${anyleft}" = "0" ]; then - TRIES=0 - ok=1 - else - echo "--> left:" - ls - TRIES=`expr $TRIES - 1` - ok=0 - fi -done -if [ "$ok" = "1" ]; then - cd ${SITE} - echo "Signed, ok, packing: ${REALFILES}" - for x in ${REALFILES} ; do - name=`basename ${x}` - #cp -f ${WORKDIR}/done/${name} ${x} - echo "signed, packing: ${x}" - java -jar ${basebuilder}/plugins/org.eclipse.equinox.launcher.jar \ - -application org.eclipse.update.core.siteOptimizer \ - -jarProcessor -outputDir `dirname ${x}` \ - -pack ${WORKDIR}/done/${name} - done - rm -rf ${WORKDIR} -else - echo "Something went wrong during staging and signing." - echo "Keeping existing update site intact." - rm -rf ${WORKDIR} - exit 1 -fi - -#Create the digest -echo "Creating digest..." -#java -jar $HOME/ws_30x/eclipse/startup.jar \ -java -jar ${basebuilder}/plugins/org.eclipse.equinox.launcher.jar \ - -application org.eclipse.update.core.siteOptimizer \ - -digestBuilder -digestOutputDir=$SITE \ - -siteXML=$SITE/site.xml - -cd $SITE -chgrp -R dsdp-tmadmin . -chmod -R g+w . -chmod -R a+r . -cd $curdir diff --git a/releng/org.eclipse.rse.updatesite/bin/stageMilestones.sh b/releng/org.eclipse.rse.updatesite/bin/stageMilestones.sh deleted file mode 100755 index 0f81c167e..000000000 --- a/releng/org.eclipse.rse.updatesite/bin/stageMilestones.sh +++ /dev/null @@ -1,67 +0,0 @@ -#******************************************************************************* -# Copyright (c) 2007, 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: -# Martin Oberhuber (Wind River) - initial API and implementation -#******************************************************************************* -#!/bin/sh -curdir=`pwd` -cd `dirname $0` -mydir=`pwd` - -umask 022 - -#Use Java5 on build.eclipse.org - need JRE for pack200 -export PATH=/shared/dsdp/tm/ibm-java2-ppc64-50/jre/bin:/shared/dsdp/tm/ibm-java2-ppc64-50/bin:$PATH -basebuilder=${HOME}/ws_30x/org.eclipse.releng.basebuilder - -# patch site.xml -cd .. -SITE=`pwd` - -# get newest plugins and features: to be done manually on real update site -if [ `basename $SITE` != milestones ]; then - echo "Must run on milestones update site" - cd "$curdir" - exit 1 -fi - -# store away previous version -echo "Storing away old versions" -if [ -d features.sav ]; then - rm -rf features.sav -fi -if [ -d plugins.sav ]; then - rm -rf plugins.sav -fi -mkdir features.sav -mkdir plugins.sav -mv features/*_2.0.1.v* features.sav -mv features/*_1.0.1.v* features.sav -mv plugins/*_2.0.1.v* plugins.sav -mv plugins/*_1.0.1.v* plugins.sav - -# copy new version -echo "Copying new versions" -cp ../../signedPatchUpdates/features/*_2.0.1.v* features -cp ../../signedPatchUpdates/features/*_1.0.1.v* features -cp ../../signedPatchUpdates/plugins/*_2.0.1.v* plugins -cp ../../signedPatchUpdates/plugins/*_1.0.1.v* plugins - -# diff, to be safe -ls features.sav | sort > f1.$$.txt -ls plugins.sav | sort > p1.$$.txt -ls features | grep '_[12]\.0\.1\.v' | sort > f2.$$.txt -ls plugins | grep '_[12]\.0\.1\.v' | sort > p2.$$.txt -echo "Plugins diff:" -diff p1.$$.txt p2.$$.txt -echo "Features diff:" -diff f1.$$.txt f2.$$.txt -rm f1.$$.txt f2.$$.txt p1.$$.txt p2.$$.txt - -cd "$curdir" -exit 0
\ No newline at end of file diff --git a/releng/org.eclipse.rse.updatesite/index.html b/releng/org.eclipse.rse.updatesite/index.html deleted file mode 100644 index 0bfdcea12..000000000 --- a/releng/org.eclipse.rse.updatesite/index.html +++ /dev/null @@ -1,82 +0,0 @@ -<html> -<head> -<title>Target Management Project 2.0 Updates</title> -<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> -<style>@import url("web/site.css");</style> -<script type="text/javascript"> - var returnval = 0; - var stylesheet, xmlFile, cache, doc; - function init(){ - // NSCP 7.1+ / Mozilla 1.4.1+ / Safari - // Use the standard DOM Level 2 technique, if it is supported - if (document.implementation && document.implementation.createDocument) { - xmlFile = document.implementation.createDocument("", "", null); - stylesheet = document.implementation.createDocument("", "", null); - if (xmlFile.load){ - xmlFile.load("site.xml"); - stylesheet.load("web/site.xsl"); - } else { - alert("Document could not be loaded by browser."); - } - xmlFile.addEventListener("load", transform, false); - stylesheet.addEventListener("load", transform, false); - } - //IE 6.0+ solution - else if (window.ActiveXObject) { - xmlFile = new ActiveXObject("msxml2.DOMDocument.3.0"); - xmlFile.async = false; - xmlFile.load("site.xml"); - stylesheet = new ActiveXObject("msxml2.FreeThreadedDOMDocument.3.0"); - stylesheet.async = false; - stylesheet.load("web/site.xsl"); - cache = new ActiveXObject("msxml2.XSLTemplate.3.0"); - cache.stylesheet = stylesheet; - transformData(); - } - } - // separate transformation function for IE 6.0+ - function transformData(){ - var processor = cache.createProcessor(); - processor.input = xmlFile; - processor.transform(); - data.innerHTML = processor.output; - } - // separate transformation function for NSCP 7.1+ and Mozilla 1.4.1+ - function transform(){ - returnval+=1; - if (returnval==2){ - var processor = new XSLTProcessor(); - processor.importStylesheet(stylesheet); - doc = processor.transformToDocument(xmlFile); - document.getElementById("data").innerHTML = doc.documentElement.innerHTML; - } - } -</script> -</head> -<body onload="init();"> - <div align="right" width="230"> - <a href="http://www.eclipse.org/dsdp/tm/images/RSESample.gif"> - <img src="http://www.eclipse.org/dsdp/tm/images/RSESample_4x.gif" alt="[RSE Sample Screenshot]" border="0" width="230" height="165" title="RSE Sample Screenshot" /> - </a> - </div> - - <h1 class="title">Target Management Project 2.0 Updates</h1> - <h2>Just getting started?</h2> - <p><b>See <a href="http://www.eclipse.org/dsdp/tm/tutorial/">http://www.eclipse.org/dsdp/tm/tutorial/</a></b></p> - <hr/> - <p>For getting the software on this site, you need to use the Eclipse - <a href="http://help.eclipse.org/help33/index.jsp?topic=/org.eclipse.platform.doc.user/tasks/tasks-34.htm"> - Update Manager</a> (choose <i>Help > Software Updates > Find and Install</i> - in Eclipse 3.3 or later).<br/> - Define a new remote update site named "Target Management Updates", - and specify</p> - <p><code> http://download.eclipse.org/dsdp/tm/updates/2.0/</code></p> - <p>as the URL to use. - See <a href="http://help.eclipse.org/help33/index.jsp?topic=/org.eclipse.platform.doc.user/tasks/tasks-34.htm"> - Eclipse Help</a> for general information about using Update Manager.</p> - <p>If you do not have Eclipse installed yet, better use the - <a href="http://download.eclipse.org/dsdp/tm/downloads/">downloads from this site</a>.</p> -<!--[insert static HTML here]--> -<div id="data"><!-- this is where the transformed data goes --></div> -</body> -</html> diff --git a/releng/org.eclipse.rse.updatesite/site.xml b/releng/org.eclipse.rse.updatesite/site.xml deleted file mode 100644 index bd9a8d91a..000000000 --- a/releng/org.eclipse.rse.updatesite/site.xml +++ /dev/null @@ -1,462 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<site pack200="true" - mirrorsURL="http://www.eclipse.org/downloads/download.php?file=/dsdp/tm/updates/2.0/site.xml&format=xml&protocol=http" - digestURL="http://download.eclipse.org/dsdp/tm/updates/2.0/"> -<!-- was disabled due to bug 163406 digestURL="http://download.eclipse.org/dsdp/tm/updates/2.0/" --> - <description url="http://download.eclipse.org/dsdp/tm/updates/2.0/"> - This is the Target Management Project 2.0 Update Site. - </description> -<!-- BEGIN_2_0 --> - <feature url="features/org.eclipse.rse.sdk_2.0.0.v20070609-7J--E7ZoHIP4RfkXykCt2OjoBujq.jar" id="org.eclipse.rse.sdk" version="2.0.0.v20070609-7J--E7ZoHIP4RfkXykCt2OjoBujq"> - <category name="TM and RSE 2.0"/> - </feature> - <feature url="features/org.eclipse.rse_2.0.0.v20070609-7D--8mJIOQ6RwTkIMtp8OQKB.jar" id="org.eclipse.rse" version="2.0.0.v20070609-7D--8mJIOQ6RwTkIMtp8OQKB"> - <category name="TM and RSE 2.0"/> - </feature> - <feature url="features/org.eclipse.rse.examples_2.0.0.v20070609-6--9oA55P5M7Q.jar" id="org.eclipse.rse.examples" version="2.0.0.v20070609-6--9oA55P5M7Q"> - <category name="TM and RSE 2.0"/> - </feature> - <feature url="features/org.eclipse.rse.remotecdt_2.0.0.v20070609-4--8s733G3E3G.jar" id="org.eclipse.rse.remotecdt" version="2.0.0.v20070609-4--8s733G3E3G"> - <category name="TM and RSE 2.0"/> - </feature> - <feature url="features/org.eclipse.tm.discovery_2.0.0.v20070611-7J--E8McIJNJCPr.jar" id="org.eclipse.tm.discovery" version="2.0.0.v20070611-7J--E8McIJNJCPr"> - <category name="TM and RSE 2.0"/> - </feature> - <feature url="features/org.eclipse.tm.terminal.sdk_1.0.0.v20070609-7_--AvNDwNXrOcIwMflhNDDmDhHa.jar" id="org.eclipse.tm.terminal.sdk" version="1.0.0.v20070609-7_--AvNDwNXrOcIwMflhNDDmDhHa"> - <category name="TM and RSE 2.0"/> - </feature> - <feature url="features/org.eclipse.rse.core_2.0.0.v20070609-7P--EB7sQRxRjbc.jar" id="org.eclipse.rse.core" version="2.0.0.v20070609-7P--EB7sQRxRjbc"> - <category name="TM and RSE 2.0"/> - </feature> - <feature url="features/org.eclipse.rse.dstore_2.0.0.v20070609-7F--DUUEF6Ez0L1.jar" id="org.eclipse.rse.dstore" version="2.0.0.v20070609-7F--DUUEF6Ez0L1"> - <category name="TM and RSE 2.0"/> - </feature> - <feature url="features/org.eclipse.rse.ftp_2.0.0.v20070609-77378_kE77Y7U9K5G7A.jar" id="org.eclipse.rse.ftp" version="2.0.0.v20070609-77378_kE77Y7U9K5G7A"> - <category name="TM and RSE 2.0"/> - </feature> - <feature url="features/org.eclipse.rse.local_2.0.0.v20070609-7_--AgI99h9c9c.jar" id="org.eclipse.rse.local" version="2.0.0.v20070609-7_--AgI99h9c9c"> - <category name="TM and RSE 2.0"/> - </feature> - <feature url="features/org.eclipse.rse.ssh_2.0.0.v20070609-78--_kE77Y7U7U.jar" id="org.eclipse.rse.ssh" version="2.0.0.v20070609-78--_kE77Y7U7U"> - <category name="TM and RSE 2.0"/> - </feature> - <feature url="features/org.eclipse.rse.telnet_2.0.0.v20070609-6378AgI99h9cEU5G7A.jar" id="org.eclipse.rse.telnet" version="2.0.0.v20070609-6378AgI99h9cEU5G7A"> - <category name="TM and RSE 2.0"/> - </feature> - <feature url="features/org.eclipse.rse.tests_2.0.0.v20070609-6--9oA55P5M7J.jar" id="org.eclipse.rse.tests" version="2.0.0.v20070609-6--9oA55P5M7J"> - <category name="TM and RSE 2.0"/> - </feature> - <category-def name="TM and RSE 2.0" label="TM and RSE 2.0"> - <description> - Features and add-ons of the 2.0 release of Target Management / RSE. - </description> - </category-def> -<!-- END_2_0 --> -<!-- BEGIN_2_0_patches --> - <feature url="features/org.eclipse.rse.sdk_2.0.0.v20070706-7J--E7ZoHIP4TfeXykCt2OjqBvjq.jar" id="org.eclipse.rse.sdk" version="2.0.0.v20070706-7J--E7ZoHIP4TfeXykCt2OjqBvjq"> - <category name="TM and RSE 2.0 patches (aka 2.0.0.1)"/> - </feature> - <feature url="features/org.eclipse.rse_2.0.0.v20070706-7D--8mJIOQ6RwTkIMvp9OQKB.jar" id="org.eclipse.rse" version="2.0.0.v20070706-7D--8mJIOQ6RwTkIMvp9OQKB"> - <category name="TM and RSE 2.0 patches (aka 2.0.0.1)"/> - </feature> - <feature url="features/org.eclipse.rse.core_2.0.0.v20070706-7P--EB7sQRxRkbd.jar" id="org.eclipse.rse.core" version="2.0.0.v20070706-7P--EB7sQRxRkbd"> - <category name="TM and RSE 2.0 patches (aka 2.0.0.1)"/> - </feature> - <feature url="features/org.eclipse.rse.ftp_2.0.0.v20070706-77378_kE77Y7V9K5G7A.jar" id="org.eclipse.rse.ftp" version="2.0.0.v20070706-77378_kE77Y7V9K5G7A"> - <category name="TM and RSE 2.0 patches (aka 2.0.0.1)"/> - </feature> - <category-def name="TM and RSE 2.0 patches (aka 2.0.0.1)" label="TM and RSE 2.0 patches (aka 2.0.0.1)"> - <description> - Patches for features and add-ons of the 2.0 release of Target Management / RSE. - </description> - </category-def> -<!-- END_2_0_patches --> -<!-- BEGIN_2_0_1 --> - <feature url="features/org.eclipse.rse.sdk_2.0.1.v20070926-7J-77E7ZoHOP4inkX-oUe-z-wI6x.jar" id="org.eclipse.rse.sdk" version="2.0.1.v20070926-7J-77E7ZoHOP4inkX-oUe-z-wI6x"> - <category name="TM and RSE 2.0.1"/> - </feature> - <feature url="features/org.eclipse.rse_2.0.1.v20070926-7D-58mJIkP9WAviqV7HBvSLC.jar" id="org.eclipse.rse" version="2.0.1.v20070926-7D-58mJIkP9WAviqV7HBvSLC"> - <category name="TM and RSE 2.0.1"/> - </feature> - <feature url="features/org.eclipse.rse.examples_2.0.0.v20070609-6--9oA55P5M7Q.jar" id="org.eclipse.rse.examples" version="2.0.0.v20070609-6--9oA55P5M7Q"> - <category name="TM and RSE 2.0.1"/> - </feature> - <feature url="features/org.eclipse.rse.remotecdt_2.0.1.v20070926-4-18s733G3K5H.jar" id="org.eclipse.rse.remotecdt" version="2.0.1.v20070926-4-18s733G3K5H"> - <category name="TM and RSE 2.0.1"/> - </feature> - <feature url="features/org.eclipse.tm.discovery_2.0.0.v20070611-7J--E8McIJNJCPr.jar" id="org.eclipse.tm.discovery" version="2.0.0.v20070611-7J--E8McIJNJCPr"> - <category name="TM and RSE 2.0.1"/> - </feature> - <feature url="features/org.eclipse.tm.terminal.sdk_1.0.1.v20070926-7_-77AvNHwNY0SWJ6NvlhNDDmDtI.jar" id="org.eclipse.tm.terminal.sdk" version="1.0.1.v20070926-7_-77AvNHwNY0SWJ6NvlhNDDmDtI"> - <category name="TM and RSE 2.0.1"/> - </feature> - <feature url="features/org.eclipse.rse.core_2.0.1.v20070926-7P-7BEB7sQRxSFkT.jar" id="org.eclipse.rse.core" version="2.0.1.v20070926-7P-7BEB7sQRxSFkT"> - <category name="TM and RSE 2.0.1"/> - </feature> - <feature url="features/org.eclipse.rse.dstore_2.0.1.v20070926-7F-4DUUEF6FALu.jar" id="org.eclipse.rse.dstore" version="2.0.1.v20070926-7F-4DUUEF6FALu"> - <category name="TM and RSE 2.0.1"/> - </feature> - <feature url="features/org.eclipse.rse.ftp_2.0.1.v20070926-7737__kE77Y7dDK4I7B.jar" id="org.eclipse.rse.ftp" version="2.0.1.v20070926-7737__kE77Y7dDK4I7B"> - <category name="TM and RSE 2.0.1"/> - </feature> - <feature url="features/org.eclipse.rse.local_2.0.1.v20070705-7_-2AgI99h9l9l.jar" id="org.eclipse.rse.local" version="2.0.1.v20070705-7_-2AgI99h9l9l"> - <category name="TM and RSE 2.0.1"/> - </feature> - <feature url="features/org.eclipse.rse.ssh_2.0.1.v20070926-78-2_kE77Y7cAW.jar" id="org.eclipse.rse.ssh" version="2.0.1.v20070926-78-2_kE77Y7cAW"> - <category name="TM and RSE 2.0.1"/> - </feature> - <feature url="features/org.eclipse.rse.telnet_2.0.1.v20070704-637AAgI99h9mBW4I7B.jar" id="org.eclipse.rse.telnet" version="2.0.1.v20070704-637AAgI99h9mBW4I7B"> - <category name="TM and RSE 2.0.1"/> - </feature> - <feature url="features/org.eclipse.rse.tests_2.0.1.v20070926-6-19oA55P5SAG.jar" id="org.eclipse.rse.tests" version="2.0.1.v20070926-6-19oA55P5SAG"> - <category name="TM and RSE 2.0.1"/> - </feature> - <category-def name="TM and RSE 2.0.1" label="TM and RSE 2.0.1"> - <description> - Features and add-ons of the 2.0.1 release of Target Management / RSE. - </description> - </category-def> -<!-- END_2_0_1 --> -<!-- BEGIN_2_0_2 --> - <feature url="features/org.eclipse.rse.sdk_2.0.2.v20071030-7J-79E7ZoHPP5ZoeZ-oUe1z-wJnl.jar" id="org.eclipse.rse.sdk" version="2.0.2.v20071030-7J-79E7ZoHPP5ZoeZ-oUe1z-wJnl"> - <category name="TM and RSE 2.0.2"/> - </feature> - <feature url="features/org.eclipse.rse_2.0.2.v20071030-7D-68mJIkR9WAviqV8z0U9vz-C.jar" id="org.eclipse.rse" version="2.0.2.v20071030-7D-68mJIkR9WAviqV8z0U9vz-C"> - <category name="TM and RSE 2.0.2"/> - </feature> - <feature url="features/org.eclipse.rse.examples_2.0.0.v20070609-6--9oA55P5M7Q.jar" id="org.eclipse.rse.examples" version="2.0.0.v20070609-6--9oA55P5M7Q"> - <category name="TM and RSE 2.0.2"/> - </feature> - <feature url="features/org.eclipse.rse.remotecdt_2.0.1.v20070926-4-18s733G3K5H.jar" id="org.eclipse.rse.remotecdt" version="2.0.1.v20070926-4-18s733G3K5H"> - <category name="TM and RSE 2.0.2"/> - </feature> - <feature url="features/org.eclipse.tm.discovery_2.0.0.v20070611-7J--E8McIJNJCPr.jar" id="org.eclipse.tm.discovery" version="2.0.0.v20070611-7J--E8McIJNJCPr"> - <category name="TM and RSE 2.0.2"/> - </feature> - <feature url="features/org.eclipse.tm.terminal.sdk_1.0.2.v20071030-7_-7CAvNKwNabWDLhQglhNDDmGSL.jar" id="org.eclipse.tm.terminal.sdk" version="1.0.2.v20071030-7_-7CAvNKwNabWDLhQglhNDDmGSL"> - <category name="TM and RSE 2.0.2"/> - </feature> - <feature url="features/org.eclipse.rse.core_2.0.2.v20071030-7P-7DEB7sQRxTz0jQb.jar" id="org.eclipse.rse.core" version="2.0.2.v20071030-7P-7DEB7sQRxTz0jQb"> - <category name="TM and RSE 2.0.2"/> - </feature> - <feature url="features/org.eclipse.rse.dstore_2.0.1.v20070926-7F-4DUUEF6FALu.jar" id="org.eclipse.rse.dstore" version="2.0.1.v20070926-7F-4DUUEF6FALu"> - <category name="TM and RSE 2.0.2"/> - </feature> - <feature url="features/org.eclipse.rse.ftp_2.0.1.v20070926-7737__kE77Y7dDK4I7B.jar" id="org.eclipse.rse.ftp" version="2.0.1.v20070926-7737__kE77Y7dDK4I7B"> - <category name="TM and RSE 2.0.2"/> - </feature> - <feature url="features/org.eclipse.rse.local_2.0.1.v20070705-7_-2AgI99h9l9l.jar" id="org.eclipse.rse.local" version="2.0.1.v20070705-7_-2AgI99h9l9l"> - <category name="TM and RSE 2.0.2"/> - </feature> - <feature url="features/org.eclipse.rse.ssh_2.0.1.v20070926-78-2_kE77Y7cAW.jar" id="org.eclipse.rse.ssh" version="2.0.1.v20070926-78-2_kE77Y7cAW"> - <category name="TM and RSE 2.0.2"/> - </feature> - <feature url="features/org.eclipse.rse.telnet_2.0.1.v20070704-637AAgI99h9mBW4I7B.jar" id="org.eclipse.rse.telnet" version="2.0.1.v20070704-637AAgI99h9mBW4I7B"> - <category name="TM and RSE 2.0.2"/> - </feature> - <feature url="features/org.eclipse.tm.terminal_1.0.2.v20071030-1-17w31182141.jar" id="org.eclipse.tm.terminal" version="1.0.2.v20071030-1-17w31182141"> - <category name="TM and RSE 2.0.2"/> - </feature> - <feature url="features/org.eclipse.tm.terminal.serial_1.0.2.v20071030-1-17w31182141.jar" id="org.eclipse.tm.terminal.serial" version="1.0.2.v20071030-1-17w31182141"> - <category name="TM and RSE 2.0.2"/> - </feature> - <feature url="features/org.eclipse.tm.terminal.view_1.0.2.v20071023-1-17w31182134.jar" id="org.eclipse.tm.terminal.view" version="1.0.2.v20071023-1-17w31182134"> - <category name="TM and RSE 2.0.2"/> - </feature> - <feature url="features/org.eclipse.rse.tests_2.0.1.v20070926-6-19oA55P5SAG.jar" id="org.eclipse.rse.tests" version="2.0.1.v20070926-6-19oA55P5SAG"> - <category name="TM and RSE 2.0.2"/> - </feature> - <category-def name="TM and RSE 2.0.2" label="TM and RSE 2.0.2"> - <description> - Features and add-ons of the 2.0.2 release of Target Management / RSE. - </description> - </category-def> -<!-- END_2_0_2 --> -<!-- BEGIN_2_0_3 --> - <feature url="features/org.eclipse.rse.sdk_2.0.3.v20080225-7J-7EE7ZoHQURqoFwQQpz0MuGUHD.jar" id="org.eclipse.rse.sdk" version="2.0.3.v20080225-7J-7EE7ZoHQURqoFwQQpz0MuGUHD"> - <category name="TM and RSE 2.0.3"/> - </feature> - <feature url="features/org.eclipse.rse_2.0.3.v20080225-7D-7A8mJIoa9WAvksISSE8yz-C.jar" id="org.eclipse.rse" version="2.0.3.v20080225-7D-7A8mJIoa9WAvksISSE8yz-C"> - <category name="TM and RSE 2.0.3"/> - </feature> - <feature url="features/org.eclipse.rse.examples_2.0.0.v20070609-6--9oA55P5M7Q.jar" id="org.eclipse.rse.examples" version="2.0.0.v20070609-6--9oA55P5M7Q"> - <category name="TM and RSE 2.0.3"/> - </feature> - <feature url="features/org.eclipse.rse.remotecdt_2.0.1.v20070926-4-18s733G3K5H.jar" id="org.eclipse.rse.remotecdt" version="2.0.1.v20070926-4-18s733G3K5H"> - <category name="TM and RSE 2.0.3"/> - </feature> - <feature url="features/org.eclipse.tm.discovery_2.0.0.v20070611-7J--E8McIJNJCPr.jar" id="org.eclipse.tm.discovery" version="2.0.0.v20070611-7J--E8McIJNJCPr"> - <category name="TM and RSE 2.0.3"/> - </feature> - <feature url="features/org.eclipse.tm.terminal.sdk_1.0.3.v20080225-7_-7QAvNRwRYVZHJaTqlhNDDqELO.jar" id="org.eclipse.tm.terminal.sdk" version="1.0.3.v20080225-7_-7QAvNRwRYVZHJaTqlhNDDqELO"> - <category name="TM and RSE 2.0.3"/> - </feature> - <feature url="features/org.eclipse.rse.core_2.0.3.v20080225-7P-7IEB7sQRz0SoiTb.jar" id="org.eclipse.rse.core" version="2.0.3.v20080225-7P-7IEB7sQRz0SoiTb"> - <category name="TM and RSE 2.0.3"/> - </feature> - <feature url="features/org.eclipse.rse.dstore_2.0.1.v20070926-7F-4DUUEF6FALu.jar" id="org.eclipse.rse.dstore" version="2.0.1.v20070926-7F-4DUUEF6FALu"> - <category name="TM and RSE 2.0.3"/> - </feature> - <feature url="features/org.eclipse.rse.ftp_2.0.3.v20080225-7737D_kE77a7PDI4I7B.jar" id="org.eclipse.rse.ftp" version="2.0.3.v20080225-7737D_kE77a7PDI4I7B"> - <category name="TM and RSE 2.0.3"/> - </feature> - <feature url="features/org.eclipse.rse.local_2.0.1.v20070705-7_-2AgI99h9l9l.jar" id="org.eclipse.rse.local" version="2.0.1.v20070705-7_-2AgI99h9l9l"> - <category name="TM and RSE 2.0.3"/> - </feature> - <feature url="features/org.eclipse.rse.ssh_2.0.3.v20080225-78-6_kE77a7OAU.jar" id="org.eclipse.rse.ssh" version="2.0.3.v20080225-78-6_kE77a7OAU"> - <category name="TM and RSE 2.0.3"/> - </feature> - <feature url="features/org.eclipse.rse.telnet_2.0.1.v20070704-637AAgI99h9mBW4I7B.jar" id="org.eclipse.rse.telnet" version="2.0.1.v20070704-637AAgI99h9mBW4I7B"> - <category name="TM and RSE 2.0.3"/> - </feature> - <feature url="features/org.eclipse.tm.terminal_1.0.3.v20080225-1-27w31191336.jar" id="org.eclipse.tm.terminal" version="1.0.3.v20080225-1-27w31191336"> - <category name="TM and RSE 2.0.3"/> - </feature> - <feature url="features/org.eclipse.tm.terminal.serial_1.0.2.v20071030-1-17w31182141.jar" id="org.eclipse.tm.terminal.serial" version="1.0.2.v20071030-1-17w31182141"> - <category name="TM and RSE 2.0.3"/> - </feature> - <feature url="features/org.eclipse.tm.terminal.ssh_1.0.3.v20080225-1-27w31191336.jar" id="org.eclipse.tm.terminal.ssh" version="1.0.3.v20080225-1-27w31191336"> - <category name="TM and RSE 2.0.3"/> - </feature> - <feature url="features/org.eclipse.tm.terminal.telnet_1.0.3.v20080225-1-27w31191336.jar" id="org.eclipse.tm.terminal.telnet" version="1.0.3.v20080225-1-27w31191336"> - <category name="TM and RSE 2.0.3"/> - </feature> - <feature url="features/org.eclipse.tm.terminal.view_1.0.3.v20080225-1-27w31191336.jar" id="org.eclipse.tm.terminal.view" version="1.0.3.v20080225-1-27w31191336"> - <category name="TM and RSE 2.0.3"/> - </feature> - <feature url="features/org.eclipse.rse.tests_2.0.1.v20070926-6-19oA55P5SAG.jar" id="org.eclipse.rse.tests" version="2.0.1.v20070926-6-19oA55P5SAG"> - <category name="TM and RSE 2.0.3"/> - </feature> - <category-def name="TM and RSE 2.0.3" label="TM and RSE 2.0.3"> - <description> - Features and add-ons of the 2.0.3 release of Target Management / RSE. - </description> - </category-def> -<!-- END_2_0_3 --> -<!-- BEGIN_2_0_4 --> - <feature url="features/org.eclipse.rse.sdk_2.0.4.v20080418-7J-7GE7ZoHQVRsnIwSQpz0OuGULB.jar" id="org.eclipse.rse.sdk" version="2.0.4.v20080418-7J-7GE7ZoHQVRsnIwSQpz0OuGULB"> - <category name="TM and RSE 2.0.4"/> - </feature> - <feature url="features/org.eclipse.rse_2.0.4.v20080418-7D-7B8mJIoc9WAvksIWQK8yz-C.jar" id="org.eclipse.rse" version="2.0.4.v20080418-7D-7B8mJIoc9WAvksIWQK8yz-C"> - <category name="TM and RSE 2.0.4"/> - </feature> - <feature url="features/org.eclipse.rse.examples_2.0.0.v20070609-6--9oA55P5M7Q.jar" id="org.eclipse.rse.examples" version="2.0.0.v20070609-6--9oA55P5M7Q"> - <category name="TM and RSE 2.0.4"/> - </feature> - <feature url="features/org.eclipse.rse.remotecdt_2.0.1.v20070926-4-18s733G3K5H.jar" id="org.eclipse.rse.remotecdt" version="2.0.1.v20070926-4-18s733G3K5H"> - <category name="TM and RSE 2.0.4"/> - </feature> - <feature url="features/org.eclipse.tm.discovery_2.0.0.v20070611-7J--E8McIJNJCPr.jar" id="org.eclipse.tm.discovery" version="2.0.0.v20070611-7J--E8McIJNJCPr"> - <category name="TM and RSE 2.0.4"/> - </feature> - <feature url="features/org.eclipse.tm.terminal.sdk_1.0.3.v20080225-7_-7QAvNRwRYVZHJaTqlhNDDqELO.jar" id="org.eclipse.tm.terminal.sdk" version="1.0.3.v20080225-7_-7QAvNRwRYVZHJaTqlhNDDqELO"> - <category name="TM and RSE 2.0.4"/> - </feature> - <feature url="features/org.eclipse.rse.core_2.0.3.v20080225-7P-7IEB7sQRz0SoiTb.jar" id="org.eclipse.rse.core" version="2.0.3.v20080225-7P-7IEB7sQRz0SoiTb"> - <category name="TM and RSE 2.0.4"/> - </feature> - <feature url="features/org.eclipse.rse.dstore_2.0.1.v20070926-7F-4DUUEF6FALu.jar" id="org.eclipse.rse.dstore" version="2.0.1.v20070926-7F-4DUUEF6FALu"> - <category name="TM and RSE 2.0.4"/> - </feature> - <feature url="features/org.eclipse.rse.ftp_2.0.4.v20080418-7737F_kE77a7TBO4I7B.jar" id="org.eclipse.rse.ftp" version="2.0.4.v20080418-7737F_kE77a7TBO4I7B"> - <category name="TM and RSE 2.0.4"/> - </feature> - <feature url="features/org.eclipse.rse.local_2.0.1.v20070705-7_-2AgI99h9l9l.jar" id="org.eclipse.rse.local" version="2.0.1.v20070705-7_-2AgI99h9l9l"> - <category name="TM and RSE 2.0.4"/> - </feature> - <feature url="features/org.eclipse.rse.ssh_2.0.3.v20080225-78-6_kE77a7OAU.jar" id="org.eclipse.rse.ssh" version="2.0.3.v20080225-78-6_kE77a7OAU"> - <category name="TM and RSE 2.0.4"/> - </feature> - <feature url="features/org.eclipse.rse.telnet_2.0.1.v20070704-637AAgI99h9mBW4I7B.jar" id="org.eclipse.rse.telnet" version="2.0.1.v20070704-637AAgI99h9mBW4I7B"> - <category name="TM and RSE 2.0.4"/> - </feature> - <feature url="features/org.eclipse.tm.terminal_1.0.3.v20080225-1-27w31191336.jar" id="org.eclipse.tm.terminal" version="1.0.3.v20080225-1-27w31191336"> - <category name="TM and RSE 2.0.4"/> - </feature> - <feature url="features/org.eclipse.tm.terminal.serial_1.0.2.v20071030-1-17w31182141.jar" id="org.eclipse.tm.terminal.serial" version="1.0.2.v20071030-1-17w31182141"> - <category name="TM and RSE 2.0.4"/> - </feature> - <feature url="features/org.eclipse.tm.terminal.ssh_1.0.3.v20080225-1-27w31191336.jar" id="org.eclipse.tm.terminal.ssh" version="1.0.3.v20080225-1-27w31191336"> - <category name="TM and RSE 2.0.4"/> - </feature> - <feature url="features/org.eclipse.tm.terminal.telnet_1.0.3.v20080225-1-27w31191336.jar" id="org.eclipse.tm.terminal.telnet" version="1.0.3.v20080225-1-27w31191336"> - <category name="TM and RSE 2.0.4"/> - </feature> - <feature url="features/org.eclipse.tm.terminal.view_1.0.3.v20080225-1-27w31191336.jar" id="org.eclipse.tm.terminal.view" version="1.0.3.v20080225-1-27w31191336"> - <category name="TM and RSE 2.0.4"/> - </feature> - <feature url="features/org.eclipse.rse.tests_2.0.1.v20070926-6-19oA55P5SAG.jar" id="org.eclipse.rse.tests" version="2.0.1.v20070926-6-19oA55P5SAG"> - <category name="TM and RSE 2.0.4"/> - </feature> - <category-def name="TM and RSE 2.0.4" label="TM and RSE 2.0.4"> - <description> - Features and add-ons of the 2.0.4 release of Target Management / RSE. - </description> - </category-def> -<!-- END_2_0_4 --> -<!-- BEGIN_3_0 --> - <feature url="features/org.eclipse.rse.core_3.0.0.v20080609-7Z3-EB7sQS9RiVd.jar" id="org.eclipse.rse.core" version="3.0.0.v20080609-7Z3-EB7sQS9RiVd"> - <category name="TM and RSE 3.0"/> - </feature> - <feature url="features/org.eclipse.rse.dstore_3.0.0.v20080609-7J3-DUUEFDEyF.jar" id="org.eclipse.rse.dstore" version="3.0.0.v20080609-7J3-DUUEFDEyF"> - <category name="TM and RSE 3.0"/> - </feature> - <feature url="features/org.eclipse.rse.ftp_3.0.0.v20080609-78478_kE77c7O7W5I55.jar" id="org.eclipse.rse.ftp" version="3.0.0.v20080609-78478_kE77c7O7W5I55"> - <category name="TM and RSE 3.0"/> - </feature> - <feature url="features/org.eclipse.rse.local_2.1.0.v20080604-7_4-AgI99m9c9S.jar" id="org.eclipse.rse.local" version="2.1.0.v20080604-7_4-AgI99m9c9S"> - <category name="TM and RSE 3.0"/> - </feature> - <feature url="features/org.eclipse.rse_3.0.0.v20080609-7H3-8qfbaJJZCz-G-QT8RWUC6.jar" id="org.eclipse.rse" version="3.0.0.v20080609-7H3-8qfbaJJZCz-G-QT8RWUC6"> - <category name="TM and RSE 3.0"/> - </feature> - <feature url="features/org.eclipse.rse.sdk_3.0.0.v20080609-7Q3-E8VwNKi_uz0rSEApXAaTcHQS.jar" id="org.eclipse.rse.sdk" version="3.0.0.v20080609-7Q3-E8VwNKi_uz0rSEApXAaTcHQS"> - <category name="TM and RSE 3.0"/> - </feature> - <feature url="features/org.eclipse.rse.ssh_2.1.0.v20080604-783-_kE77c7U7M.jar" id="org.eclipse.rse.ssh" version="2.1.0.v20080604-783-_kE77c7U7M"> - <category name="TM and RSE 3.0"/> - </feature> - <feature url="features/org.eclipse.rse.telnet_2.1.0.v20080604-6678AgI99m9W9W5I55.jar" id="org.eclipse.rse.telnet" version="2.1.0.v20080604-6678AgI99m9W9W5I55"> - <category name="TM and RSE 3.0"/> - </feature> - <feature url="features/org.eclipse.rse.examples_3.0.0.v20080604-780-9oA55S5M5G.jar" id="org.eclipse.rse.examples" version="3.0.0.v20080604-780-9oA55S5M5G"> - <category name="TM and RSE 3.0"/> - </feature> - <feature url="features/org.eclipse.rse.remotecdt_2.1.0.v20080604-41-8s733I3E39.jar" id="org.eclipse.rse.remotecdt" version="2.1.0.v20080604-41-8s733I3E39"> - <category name="TM and RSE 3.0"/> - </feature> - <feature url="features/org.eclipse.rse.terminals_0.1.0.v20080610-22-9sB6EO_O8X2842.jar" id="org.eclipse.rse.terminals" version="0.1.0.v20080610-22-9sB6EO_O8X2842"> - <category name="TM and RSE 3.0"/> - </feature> - <feature url="features/org.eclipse.rse.useractions_1.1.0.v20080604-21-8s733I3E3A.jar" id="org.eclipse.rse.useractions" version="1.1.0.v20080604-21-8s733I3E3A"> - <category name="TM and RSE 3.0"/> - </feature> - <feature url="features/org.eclipse.rse.wince_0.1.0.v20080604-02-9oA55S5M5I.jar" id="org.eclipse.rse.wince" version="0.1.0.v20080604-02-9oA55S5M5I" os="win32" arch="x86"> - <category name="TM and RSE 3.0"/> - </feature> - <feature url="features/org.eclipse.tm.discovery_3.0.0.v20080530-7N-E8ME8McIJXIwdh.jar" id="org.eclipse.tm.discovery" version="3.0.0.v20080530-7N-E8ME8McIJXIwdh"> - <category name="TM and RSE 3.0"/> - </feature> - <feature url="features/org.eclipse.tm.terminal.sdk_2.0.0.v20080609-7J--B-NDwSXnUKIyQYlhNDDrDeLT.jar" id="org.eclipse.tm.terminal.sdk" version="2.0.0.v20080609-7J--B-NDwSXnUKIyQYlhNDDrDeLT"> - <category name="TM and RSE 3.0"/> - </feature> - <feature url="features/org.eclipse.rse.tests_3.0.0.v20080605-7D3_79oA55S5M5J.jar" id="org.eclipse.rse.tests" version="3.0.0.v20080605-7D3_79oA55S5M5J"> - <category name="TM and RSE 3.0"/> - </feature> - <category-def name="TM and RSE 3.0" label="TM and RSE 3.0"> - <description> - Features and add-ons of the 3.0 release of Target Management / RSE. - </description> - </category-def> -<!-- END_3_0 --> -<!-- BEGIN_3_0_1 --> - <feature url="features/org.eclipse.rse.core_3.0.1.v200809171600-7Z379EB7sQS9S4YPJaHC.jar" id="org.eclipse.rse.core" version="3.0.1.v200809171600-7Z379EB7sQS9S4YPJaHC"> - <category name="TM and RSE 3.0.1"/> - </feature> - <feature url="features/org.eclipse.rse.dstore_3.0.1.v200809181500-7J32DUUEFDF8Hu9FH7.jar" id="org.eclipse.rse.dstore" version="3.0.1.v200809181500-7J32DUUEFDF8Hu9FH7"> - <category name="TM and RSE 3.0.1"/> - </feature> - <feature url="features/org.eclipse.rse.ftp_3.0.1.v200809171630-78479_kE77c7Q8b8T_F.jar" id="org.eclipse.rse.ftp" version="3.0.1.v200809171630-78479_kE77c7Q8b8T_F"> - <category name="TM and RSE 3.0.1"/> - </feature> - <feature url="features/org.eclipse.rse.local_2.1.1.v20080710-7_40AgI99m9d_O.jar" id="org.eclipse.rse.local" version="2.1.1.v20080710-7_40AgI99m9d_O"> - <category name="TM and RSE 3.0.1"/> - </feature> - <feature url="features/org.eclipse.rse_3.0.1.v200809181500-7H368qfenEMeUOENNFdiKV_gK8.jar" id="org.eclipse.rse" version="3.0.1.v200809181500-7H368qfenEMeUOENNFdiKV_gK8"> - <category name="TM and RSE 3.0.1"/> - </feature> - <feature url="features/org.eclipse.rse.sdk_3.0.1.v200809181500-7Q379E8VwNRiAF6ydJFuZH7RGg1d.jar" id="org.eclipse.rse.sdk" version="3.0.1.v200809181500-7Q379E8VwNRiAF6ydJFuZH7RGg1d"> - <category name="TM and RSE 3.0.1"/> - </feature> - <feature url="features/org.eclipse.rse.ssh_2.1.1.v20080714-7830_kE77c7V8M.jar" id="org.eclipse.rse.ssh" version="2.1.1.v20080714-7830_kE77c7V8M"> - <category name="TM and RSE 3.0.1"/> - </feature> - <feature url="features/org.eclipse.rse.telnet_2.1.1.v200809181500-6678AgI99m9W9X5J79.jar" id="org.eclipse.rse.telnet" version="2.1.1.v200809181500-6678AgI99m9W9X5J79"> - <category name="TM and RSE 3.0.1"/> - </feature> - <feature url="features/org.eclipse.rse.examples_3.0.0.v20080604-780-9oA55S5M5G.jar" id="org.eclipse.rse.examples" version="3.0.0.v20080604-780-9oA55S5M5G"> - <category name="TM and RSE 3.0.1"/> - </feature> - <feature url="features/org.eclipse.rse.remotecdt_2.1.1.v200809041200-4118s733I3J4F5C48.jar" id="org.eclipse.rse.remotecdt" version="2.1.1.v200809041200-4118s733I3J4F5C48"> - <category name="TM and RSE 3.0.1"/> - </feature> - <feature url="features/org.eclipse.rse.terminals_0.1.1.v200809041200-2229sB7EO_T_T5C6B3457.jar" id="org.eclipse.rse.terminals" version="0.1.1.v200809041200-2229sB7EO_T_T5C6B3457"> - <category name="TM and RSE 3.0.1"/> - </feature> - <feature url="features/org.eclipse.rse.useractions_1.1.1.v200809041200-2118s733I3K484673.jar" id="org.eclipse.rse.useractions" version="1.1.1.v200809041200-2118s733I3K484673"> - <category name="TM and RSE 3.0.1"/> - </feature> - <feature url="features/org.eclipse.rse.wince_0.1.1.v20080626-0219oA55S5M9M.jar" id="org.eclipse.rse.wince" version="0.1.1.v20080626-0219oA55S5M9M" os="win32" arch="x86"> - <category name="TM and RSE 3.0.1"/> - </feature> - <feature url="features/org.eclipse.tm.discovery_3.0.0.v20080530-7N-E8ME8McIJXIwdh.jar" id="org.eclipse.tm.discovery" version="3.0.0.v20080530-7N-E8ME8McIJXIwdh"> - <category name="TM and RSE 3.0.1"/> - </feature> - <feature url="features/org.eclipse.tm.terminal.sdk_2.0.1.v200807281235-7J-79B-NIwSXwVTN4Y0c5RRRNHYG.jar" id="org.eclipse.tm.terminal.sdk" version="2.0.1.v200807281235-7J-79B-NIwSXwVTN4Y0c5RRRNHYG"> - <category name="TM and RSE 3.0.1"/> - </feature> - <feature url="features/org.eclipse.rse.tests_3.0.1.v200809041200-7D3_99oA55S5R7H2311.jar" id="org.eclipse.rse.tests" version="3.0.1.v200809041200-7D3_99oA55S5R7H2311"> - <category name="TM and RSE 3.0.1"/> - </feature> - <category-def name="TM and RSE 3.0.1" label="TM and RSE 3.0.1"> - <description> - Features and add-ons of the 3.0.1 release of Target Management / RSE. - </description> - </category-def> -<!-- END_3_0_1 --> -<!-- BEGIN_3_0_2 --> - <feature url="features/org.eclipse.rse.core_3.0.2.qualifier.jar" id="org.eclipse.rse.core" version="3.0.2.qualifier"> - <category name="TM and RSE 3.0.2"/> - </feature> - <feature url="features/org.eclipse.rse.dstore_3.0.2.qualifier.jar" id="org.eclipse.rse.dstore" version="3.0.2.qualifier"> - <category name="TM and RSE 3.0.2"/> - </feature> - <feature url="features/org.eclipse.rse.ftp_3.0.1.qualifier.jar" id="org.eclipse.rse.ftp" version="3.0.1.qualifier"> - <category name="TM and RSE 3.0.2"/> - </feature> - <feature url="features/org.eclipse.rse.local_2.1.1.qualifier.jar" id="org.eclipse.rse.local" version="2.1.1.qualifier"> - <category name="TM and RSE 3.0.2"/> - </feature> - <feature url="features/org.eclipse.rse_3.0.2.qualifier.jar" id="org.eclipse.rse" version="3.0.2.qualifier"> - <category name="TM and RSE 3.0.2"/> - </feature> - <feature url="features/org.eclipse.rse.sdk_3.0.2.qualifier.jar" id="org.eclipse.rse.sdk" version="3.0.2.qualifier"> - <category name="TM and RSE 3.0.2"/> - </feature> - <feature url="features/org.eclipse.rse.ssh_2.1.1.qualifier.jar" id="org.eclipse.rse.ssh" version="2.1.1.qualifier"> - <category name="TM and RSE 3.0.2"/> - </feature> - <feature url="features/org.eclipse.rse.telnet_2.1.1.qualifier.jar" id="org.eclipse.rse.telnet" version="2.1.1.qualifier"> - <category name="TM and RSE 3.0.2"/> - </feature> - <feature url="features/org.eclipse.rse.examples_3.0.0.qualifier.jar" id="org.eclipse.rse.examples" version="3.0.0.qualifier"> - <category name="TM and RSE 3.0.2"/> - </feature> - <feature url="features/org.eclipse.rse.remotecdt_2.1.1.qualifier.jar" id="org.eclipse.rse.remotecdt" version="2.1.1.qualifier"> - <category name="TM and RSE 3.0.2"/> - </feature> - <feature url="features/org.eclipse.rse.terminals_0.1.1.qualifier.jar" id="org.eclipse.rse.terminals" version="0.1.1.qualifier"> - <category name="TM and RSE 3.0.2"/> - </feature> - <feature url="features/org.eclipse.rse.useractions_1.1.2.qualifier.jar" id="org.eclipse.rse.useractions" version="1.1.2.qualifier"> - <category name="TM and RSE 3.0.2"/> - </feature> - <feature url="features/org.eclipse.rse.wince_0.1.1.qualifier.jar" id="org.eclipse.rse.wince" version="0.1.1.qualifier" os="win32" arch="x86"> - <category name="TM and RSE 3.0.2"/> - </feature> - <feature url="features/org.eclipse.tm.discovery_3.0.0.qualifier.jar" id="org.eclipse.tm.discovery" version="3.0.0.qualifier"> - <category name="TM and RSE 3.0.2"/> - </feature> - <feature url="features/org.eclipse.tm.terminal.sdk_2.0.2.qualifier.jar" id="org.eclipse.tm.terminal.sdk" version="2.0.2.qualifier"> - <category name="TM and RSE 3.0.2"/> - </feature> - <feature url="features/org.eclipse.rse.tests_3.0.1.qualifier.jar" id="org.eclipse.rse.tests" version="3.0.1.qualifier"> - <category name="TM and RSE 3.0.2"/> - </feature> - <category-def name="TM and RSE 3.0.2" label="TM and RSE 3.0.2"> - <description> - Features and add-ons of the 3.0.2 release of Target Management / RSE. - </description> - </category-def> -<!-- END_3_0_2 --> -</site> diff --git a/releng/org.eclipse.rse.updatesite/web/site.css b/releng/org.eclipse.rse.updatesite/web/site.css deleted file mode 100644 index 62c6f9ffa..000000000 --- a/releng/org.eclipse.rse.updatesite/web/site.css +++ /dev/null @@ -1,12 +0,0 @@ -<STYLE type="text/css"> -td.spacer {padding-bottom: 10px; padding-top: 10px;} -.title { font-family: sans-serif; color: #99AACC;} -.bodyText { font-family: sans-serif; font-size: 9pt; color:#000000; } -.sub-header { font-family: sans-serif; font-style: normal; font-weight: bold; font-size: 9pt; color: white;} -.log-text {font-family: sans-serif; font-style: normal; font-weight: lighter; font-size: 8pt; color:black;} -.big-header { font-family: sans-serif; font-style: normal; font-weight: bold; font-size: 9pt; color: white; border-top:10px solid white;} -.light-row {background:#FFFFFF} -.dark-row {background:#EEEEFF} -.header {background:#99AADD} -#indent {word-wrap : break-word;width :300px;text-indent:10px;} -</STYLE> diff --git a/releng/org.eclipse.rse.updatesite/web/site.xsl b/releng/org.eclipse.rse.updatesite/web/site.xsl deleted file mode 100644 index 070c3540e..000000000 --- a/releng/org.eclipse.rse.updatesite/web/site.xsl +++ /dev/null @@ -1,214 +0,0 @@ -<xsl:stylesheet version = '1.0' xmlns:xsl='http://www.w3.org/1999/XSL/Transform' xmlns:msxsl="urn:schemas-microsoft-com:xslt"> -<xsl:output method="html" encoding="UTF-8"/> -<xsl:key name="cat" match="category" use="@name"/> -<xsl:template match="/"> -<xsl:for-each select="site"> - <html> - <head> - <title>Target Management Project 2.0 Updates</title> - <style>@import url("web/site.css");</style> - </head> - <body> - - <p class="bodyText"><xsl:value-of select="description"/></p> - <table width="100%" border="0" cellspacing="1" cellpadding="2"> - <xsl:for-each select="category-def"> - <xsl:sort select="@label" order="ascending" case-order="upper-first"/> - <xsl:sort select="@name" order="ascending" case-order="upper-first"/> - <xsl:if test="count(key('cat',@name)) != 0"> - <tr class="header"> - <td class="sub-header" width="30%"> - <xsl:value-of select="@name"/> - </td> - <td class="sub-header" width="70%"> - <xsl:value-of select="@label"/> - </td> - </tr> - <xsl:for-each select="key('cat',@name)"> - <xsl:sort select="ancestor::feature//@version" order="ascending"/> - <xsl:sort select="ancestor::feature//@id" order="ascending" case-order="upper-first"/> - <tr> - <xsl:choose> - <xsl:when test="(position() mod 2 = 1)"> - <xsl:attribute name="class">dark-row</xsl:attribute> - </xsl:when> - <xsl:otherwise> - <xsl:attribute name="class">light-row</xsl:attribute> - </xsl:otherwise> - </xsl:choose> - <td class="log-text" id="indent"> - <xsl:choose> - <xsl:when test="ancestor::feature//@label"> - <a href="{ancestor::feature//@url}"><xsl:value-of select="ancestor::feature//@label"/></a> - <br/> - <div id="indent"> - (<xsl:value-of select="ancestor::feature//@id"/> - <xsl:value-of select="ancestor::feature//@version"/>) - </div> - </xsl:when> - <xsl:otherwise> - <a href="{ancestor::feature//@url}"><xsl:value-of select="ancestor::feature//@id"/> - <xsl:value-of select="ancestor::feature//@version"/></a> - </xsl:otherwise> - </xsl:choose> - <br /> - </td> - <td> - <table> - <xsl:if test="ancestor::feature//@os"> - <tr><td class="log-text" id="indent">Operating Systems:</td> - <td class="log-text" id="indent"><xsl:value-of select="ancestor::feature//@os"/></td> - </tr> - </xsl:if> - <xsl:if test="ancestor::feature//@ws"> - <tr><td class="log-text" id="indent">Windows Systems:</td> - <td class="log-text" id="indent"><xsl:value-of select="ancestor::feature//@ws"/></td> - </tr> - </xsl:if> - <xsl:if test="ancestor::feature//@nl"> - <tr><td class="log-text" id="indent">Languages:</td> - <td class="log-text" id="indent"><xsl:value-of select="ancestor::feature//@nl"/></td> - </tr> - </xsl:if> - <xsl:if test="ancestor::feature//@arch"> - <tr><td class="log-text" id="indent">Architecture:</td> - <td class="log-text" id="indent"><xsl:value-of select="ancestor::feature//@arch"/></td> - </tr> - </xsl:if> - </table> - </td> - </tr> - </xsl:for-each> - <tr><td class="spacer"><br/></td><td class="spacer"><br/></td></tr> - </xsl:if> - </xsl:for-each> - <xsl:if test="count(feature) > count(feature/category)"> - <tr class="header"> - <td class="sub-header" colspan="2"> - Uncategorized - </td> - </tr> - </xsl:if> - <xsl:choose> - <xsl:when test="function-available('msxsl:node-set')"> - <xsl:variable name="rtf-nodes"> - <xsl:for-each select="feature[not(category)]"> - <xsl:sort select="@id" order="ascending" case-order="upper-first"/> - <xsl:sort select="@version" order="ascending" /> - <xsl:value-of select="."/> - <xsl:copy-of select="." /> - </xsl:for-each> - </xsl:variable> - <xsl:variable name="myNodeSet" select="msxsl:node-set($rtf-nodes)/*"/> - <xsl:for-each select="$myNodeSet"> - <tr> - <xsl:choose> - <xsl:when test="position() mod 2 = 1"> - <xsl:attribute name="class">dark-row</xsl:attribute> - </xsl:when> - <xsl:otherwise> - <xsl:attribute name="class">light-row</xsl:attribute> - </xsl:otherwise> - </xsl:choose> - <td class="log-text" id="indent"> - <xsl:choose> - <xsl:when test="@label"> - <a href="{@url}"><xsl:value-of select="@label"/></a> - <br /> - <div id="indent"> - (<xsl:value-of select="@id"/> - <xsl:value-of select="@version"/>) - </div> - </xsl:when> - <xsl:otherwise> - <a href="{@url}"><xsl:value-of select="@id"/> - <xsl:value-of select="@version"/></a> - </xsl:otherwise> - </xsl:choose> - <br /><br /> - </td> - <td> - <table> - <xsl:if test="@os"> - <tr><td class="log-text" id="indent">Operating Systems:</td> - <td class="log-text" id="indent"><xsl:value-of select="@os"/></td> - </tr> - </xsl:if> - <xsl:if test="@ws"> - <tr><td class="log-text" id="indent">Windows Systems:</td> - <td class="log-text" id="indent"><xsl:value-of select="@ws"/></td> - </tr> - </xsl:if> - <xsl:if test="@nl"> - <tr><td class="log-text" id="indent">Languages:</td> - <td class="log-text" id="indent"><xsl:value-of select="@nl"/></td> - </tr> - </xsl:if> - <xsl:if test="@arch"> - <tr><td class="log-text" id="indent">Architecture:</td> - <td class="log-text" id="indent"><xsl:value-of select="@arch"/></td> - </tr> - </xsl:if> - </table> - </td> - </tr> - </xsl:for-each> - </xsl:when> - <xsl:otherwise> - <xsl:for-each select="feature[not(category)]"> - <xsl:sort select="@id" order="ascending" case-order="upper-first"/> - <xsl:sort select="@version" order="ascending" /> - <tr> - <xsl:choose> - <xsl:when test="count(preceding-sibling::feature[not(category)]) mod 2 = 1"> - <xsl:attribute name="class">dark-row</xsl:attribute> - </xsl:when> - <xsl:otherwise> - <xsl:attribute name="class">light-row</xsl:attribute> - </xsl:otherwise> - </xsl:choose> - <td class="log-text" id="indent"> - <xsl:choose> - <xsl:when test="@label"> - <a href="{@url}"><xsl:value-of select="@label"/></a> - <br /> - <div id="indent"> - (<xsl:value-of select="@id"/> - <xsl:value-of select="@version"/>) - </div> - </xsl:when> - <xsl:otherwise> - <a href="{@url}"><xsl:value-of select="@id"/> - <xsl:value-of select="@version"/></a> - </xsl:otherwise> - </xsl:choose> - <br /><br /> - </td> - <td> - <table> - <xsl:if test="@os"> - <tr><td class="log-text" id="indent">Operating Systems:</td> - <td class="log-text" id="indent"><xsl:value-of select="@os"/></td> - </tr> - </xsl:if> - <xsl:if test="@ws"> - <tr><td class="log-text" id="indent">Windows Systems:</td> - <td class="log-text" id="indent"><xsl:value-of select="@ws"/></td> - </tr> - </xsl:if> - <xsl:if test="@nl"> - <tr><td class="log-text" id="indent">Languages:</td> - <td class="log-text" id="indent"><xsl:value-of select="@nl"/></td> - </tr> - </xsl:if> - <xsl:if test="@arch"> - <tr><td class="log-text" id="indent">Architecture:</td> - <td class="log-text" id="indent"><xsl:value-of select="@arch"/></td> - </tr> - </xsl:if> - </table> - </td> - </tr> - </xsl:for-each> - </xsl:otherwise> - </xsl:choose> - </table> - </body> - </html> -</xsl:for-each> -</xsl:template> -</xsl:stylesheet> diff --git a/releng/org.eclipse.tm.releng.master-feature/.project b/releng/org.eclipse.tm.releng.master-feature/.project deleted file mode 100644 index 2bf620474..000000000 --- a/releng/org.eclipse.tm.releng.master-feature/.project +++ /dev/null @@ -1,17 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<projectDescription> - <name>org.eclipse.tm.releng.master-feature</name> - <comment></comment> - <projects> - </projects> - <buildSpec> - <buildCommand> - <name>org.eclipse.pde.FeatureBuilder</name> - <arguments> - </arguments> - </buildCommand> - </buildSpec> - <natures> - <nature>org.eclipse.pde.FeatureNature</nature> - </natures> -</projectDescription> diff --git a/releng/org.eclipse.tm.releng.master-feature/build.properties b/releng/org.eclipse.tm.releng.master-feature/build.properties deleted file mode 100644 index 1284a5491..000000000 --- a/releng/org.eclipse.tm.releng.master-feature/build.properties +++ /dev/null @@ -1,15 +0,0 @@ -################################################################################ -# Copyright (c) 2006, 2008 Wind River Systems, Inc. -# All rights reserved. This program and 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 = feature.xml,\ - license.html,\ - feature.properties,\ - epl-v10.html,\ - eclipse_update_120.jpg diff --git a/releng/org.eclipse.tm.releng.master-feature/eclipse_update_120.jpg b/releng/org.eclipse.tm.releng.master-feature/eclipse_update_120.jpg Binary files differdeleted file mode 100644 index bfdf708ad..000000000 --- a/releng/org.eclipse.tm.releng.master-feature/eclipse_update_120.jpg +++ /dev/null diff --git a/releng/org.eclipse.tm.releng.master-feature/epl-v10.html b/releng/org.eclipse.tm.releng.master-feature/epl-v10.html deleted file mode 100644 index 9321f4082..000000000 --- a/releng/org.eclipse.tm.releng.master-feature/epl-v10.html +++ /dev/null @@ -1,256 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml"><head> - - - - -<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>Eclipse Public License - Version 1.0</title> - -<style type="text/css"> - body { - size: 8.5in 11.0in; - margin: 0.25in 0.5in 0.25in 0.5in; - tab-interval: 0.5in; - } - p { - margin-left: auto; - margin-top: 0.5em; - margin-bottom: 0.5em; - } - p.list { - margin-left: 0.5in; - margin-top: 0.05em; - margin-bottom: 0.05em; - } - </style></head><body lang="EN-US"> - -<p align="center"><b>Eclipse Public License - v 1.0</b></p> - -<p>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.</p> - -<p><b>1. DEFINITIONS</b></p> - -<p>"Contribution" means:</p> - -<p class="list">a) in the case of the initial Contributor, the initial -code and documentation distributed under this Agreement, and</p> -<p class="list">b) in the case of each subsequent Contributor:</p> -<p class="list">i) changes to the Program, and</p> -<p class="list">ii) additions to the Program;</p> -<p class="list">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.</p> - -<p>"Contributor" means any person or entity that distributes -the Program.</p> - -<p>"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.</p> - -<p>"Program" means the Contributions distributed in accordance -with this Agreement.</p> - -<p>"Recipient" means anyone who receives the Program under -this Agreement, including all Contributors.</p> - -<p><b>2. GRANT OF RIGHTS</b></p> - -<p class="list">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.</p> - -<p class="list">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.</p> - -<p class="list">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.</p> - -<p class="list">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.</p> - -<p><b>3. REQUIREMENTS</b></p> - -<p>A Contributor may choose to distribute the Program in object code -form under its own license agreement, provided that:</p> - -<p class="list">a) it complies with the terms and conditions of this -Agreement; and</p> - -<p class="list">b) its license agreement:</p> - -<p class="list">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;</p> - -<p class="list">ii) effectively excludes on behalf of all Contributors -all liability for damages, including direct, indirect, special, -incidental and consequential damages, such as lost profits;</p> - -<p class="list">iii) states that any provisions which differ from this -Agreement are offered by that Contributor alone and not by any other -party; and</p> - -<p class="list">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.</p> - -<p>When the Program is made available in source code form:</p> - -<p class="list">a) it must be made available under this Agreement; and</p> - -<p class="list">b) a copy of this Agreement must be included with each -copy of the Program.</p> - -<p>Contributors may not remove or alter any copyright notices contained -within the Program.</p> - -<p>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.</p> - -<p><b>4. COMMERCIAL DISTRIBUTION</b></p> - -<p>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.</p> - -<p>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.</p> - -<p><b>5. NO WARRANTY</b></p> - -<p>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.</p> - -<p><b>6. DISCLAIMER OF LIABILITY</b></p> - -<p>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.</p> - -<p><b>7. GENERAL</b></p> - -<p>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.</p> - -<p>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.</p> - -<p>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.</p> - -<p>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.</p> - -<p>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.</p> - -</body></html>
\ No newline at end of file diff --git a/releng/org.eclipse.tm.releng.master-feature/feature.properties b/releng/org.eclipse.tm.releng.master-feature/feature.properties deleted file mode 100644 index 73043707a..000000000 --- a/releng/org.eclipse.tm.releng.master-feature/feature.properties +++ /dev/null @@ -1,142 +0,0 @@ -############################################################################### -# Copyright (c) 2006, 2008 IBM Corporation and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 -# which accompanies this distribution, and is available at -# 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=TM Releng Master Feature - -# "description" property - description of the feature -description=All of Target Management in one Feature - -# "providerName" property - name of the company that provides the feature -providerName=Eclipse.org - -# "tmUpdateSiteName" property - label for the update site -tmUpdateSiteName=Target Management Updates - -# "copyright" property - text of the "Feature Update Copyright" -copyright=\ -Copyright (c) 2000, 2008 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\n\ -\n\ -This product includes software developed by the\n\ -Apache Software Foundation http://www.apache.org/ -################ 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 --git a/releng/org.eclipse.tm.releng.master-feature/feature.xml b/releng/org.eclipse.tm.releng.master-feature/feature.xml deleted file mode 100644 index 4ee573731..000000000 --- a/releng/org.eclipse.tm.releng.master-feature/feature.xml +++ /dev/null @@ -1,62 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<feature - id="org.eclipse.tm.releng.master" - label="%featureName" - version="3.0.0.qualifier" - provider-name="%providerName" - image="eclipse_update_120.jpg"> - - <description> - %description - </description> - - <copyright> - %copyright - </copyright> - - <license url="%licenseURL"> - %license - </license> - - <url> - <update label="%tmUpdateSiteName" url="http://download.eclipse.org/dsdp/tm/updates/3.0"/> - <discovery label="%tmUpdateSiteName" url="http://download.eclipse.org/dsdp/tm/updates/3.0"/> - </url> - - <includes - id="org.eclipse.rse.sdk" - version="0.0.0"/> - - <includes - id="org.eclipse.tm.terminal.sdk" - version="0.0.0"/> - - <includes - id="org.eclipse.tm.discovery" - version="0.0.0"/> - - <includes - id="org.eclipse.rse.remotecdt.wrapper" - version="0.0.0"/> - - <includes - id="org.eclipse.rse.useractions.wrapper" - version="0.0.0"/> - - <includes - id="org.eclipse.rse.wince.wrapper" - version="0.0.0"/> - - <includes - id="org.eclipse.rse.examples" - version="0.0.0"/> - - <includes - id="org.eclipse.rse.tests" - version="0.0.0"/> - - <includes - id="org.eclipse.tm.terminal.test" - version="0.0.0"/> - -</feature> diff --git a/releng/org.eclipse.tm.releng.master-feature/license.html b/releng/org.eclipse.tm.releng.master-feature/license.html deleted file mode 100644 index c6af966b6..000000000 --- a/releng/org.eclipse.tm.releng.master-feature/license.html +++ /dev/null @@ -1,79 +0,0 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"> -<html> -<head> -<meta http-equiv=Content-Type content="text/html; charset=iso-8859-1"> -<title>Eclipse.org Software User Agreement</title> -</head> - -<body lang="EN-US" link=blue vlink=purple> -<h2>Eclipse Foundation Software User Agreement</h2> -<p>March 17, 2005</p> - -<h3>Usage Of Content</h3> - -<p>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.</p> - -<h3>Applicable Licenses</h3> - -<p>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 <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>. - For purposes of the EPL, "Program" will mean the Content.</p> - -<p>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").</p> - -<ul> - <li>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").</li> - <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java™ ARchive) in a directory named "plugins".</li> - <li>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.</li> - <li>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.</li> -</ul> - -<p>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:</p> - -<ul> - <li>The top-level (root) directory</li> - <li>Plug-in and Fragment directories</li> - <li>Inside Plug-ins and Fragments packaged as JARs</li> - <li>Sub-directories of the directory named "src" of certain Plug-ins</li> - <li>Feature directories</li> -</ul> - -<p>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.</p> - -<p>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):</p> - -<ul> - <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li> - <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li> - <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li> - <li>IBM Public License 1.0 (available at <a href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</a>)</li> - <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li> - <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li> -</ul> - -<p>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.</p> - -<h3>Cryptography</h3> - -<p>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.</p> - -<small>Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.</small> -</body> -</html> diff --git a/releng/org.eclipse.tm.releng/.cvsignore b/releng/org.eclipse.tm.releng/.cvsignore deleted file mode 100644 index 3a4edf690..000000000 --- a/releng/org.eclipse.tm.releng/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -.project diff --git a/releng/org.eclipse.tm.releng/build.xml b/releng/org.eclipse.tm.releng/build.xml deleted file mode 100644 index 1d4767e05..000000000 --- a/releng/org.eclipse.tm.releng/build.xml +++ /dev/null @@ -1,27 +0,0 @@ -<project default="main"> - <property name="pde.build.scripts" value="../org.eclipse.releng.basebuilder/plugins/org.eclipse.pde.build/scripts" /> - - <target name="init"> - <tstamp/> - <touch file="${user.home}/.cvspass" /> - <property name="timestamp" value="${DSTAMP}${TSTAMP}" /> - <property name="buildDirectory" value="${basedir}/src/eclipse" /> - - <property name="buildType" value="I" /> - <property name="buildId" value="${buildType}${timestamp}" /> - - <!-- Verify buildDirectory ends in eclipse. --> - <property name="fullBuild" location="${buildDirectory}"/> - <basename file="${fullBuild}" property="lastSeg"/> - <condition property="endsInEclipse"> - <equals arg1="${lastSeg}" arg2="eclipse"/> - </condition> - <fail message="buildDirectory's last segment is not eclipse." unless="endsInEclipse"/> - </target> - - <target name="main" depends="init"> - <ant antfile="build.xml" dir="${pde.build.scripts}"> - <property name="builder" value="${basedir}/${component}" /> - </ant> - </target> -</project>
\ No newline at end of file diff --git a/releng/org.eclipse.tm.releng/buildAll.xml b/releng/org.eclipse.tm.releng/buildAll.xml deleted file mode 100644 index bc33b9f5a..000000000 --- a/releng/org.eclipse.tm.releng/buildAll.xml +++ /dev/null @@ -1,227 +0,0 @@ -<project default="run"> - <target name="init"> - - <echo message="Set compilerArgs = '-enableJavadoc -encoding ISO-8859-1 -warn:-serial,nls,unused,unchecked,raw'"/> - <property name="compilerArg" value="-enableJavadoc -encoding ISO-8859-1 -warn:-serial,nls,unused,unchecked,raw" /> - - <!-- TODO: set correct source and target levels here --> - <echo message="Set javacSource and javacTarget = 1.4"/> - <property name="javacSource" value="1.4" /> - <property name="javacTarget" value="1.4" /> - - <path id="bc"> - <fileset dir="${java.home}/lib"> - <include name="*.jar" /> - </fileset> - </path> - <property name="bootclasspath" refid="bc" /> - - <!-- TODO: if using JDK1.4, comment out these lines --> - <!-- - <echo message="Set J2SE-1.5 = ${bootclasspath}"/> - <property name="J2SE-1.5" value="${bootclasspath}"/> - <condition property="bundleBootClasspath" value="${J2SE-1.5}"><isset property="J2SE-1.5"/></condition> - <condition property="bundleJavacSource" value="1.5"><isset property="J2SE-1.5"/></condition> - <condition property="bundleJavacTarget" value="1.5"><isset property="J2SE-1.5"/></condition> - --> - - <property name="buildingOSGi" value="true" /> - <property name="collectingFolder" value="eclipse" /> - <property name="archivePrefix" value="eclipse" /> - - <!-- Reduce the amount of info in the build log --> - <property name="javacVerbose" value="false" /> - - <property name="buildDirectory" location="${basedir}/../src/eclipse" /> - <property file="${basedir}/repoInfo.properties" /> - <property name="testBase" location="${buildDirectory}/../testing" /> - <available file="${buildDirectory}/label.properties" property="label.properties.exists" /> - <antcall target="create.label.properties" /> - <property file="${buildDirectory}/label.properties" /> - - <echo message="buildAll.xml properties:"/> - <echo message="basedir = ${basedir}"/> - - <!-- load a value for ${subprojectName}, among other variables, from build.cfg --> - <property name="buildConfigFile" value="${basedir}/../build.cfg"/> - <available file="${buildConfigFile}" type="file" property="buildConfigIsAvailable" /> - <fail message="Can't load build properties from ${buildConfigFile}" unless="buildConfigIsAvailable"/> - <!-- TODO: set any special build-related properties here by echoing them into ${buildConfigFile}: - <echo file="${buildConfigFile}" append="true"> - -# extra properties specific to just this build -propertyName=propertyValue -</echo> --> - - <property file="${buildConfigFile}" /> - - <echo message="buildVer = ${buildVer}"/> - <echo message="subprojectName = ${subprojectName}"/> - - <!-- <echo message="Base OS: ${baseos}; Base Window System: ${basews}"/> --> - <condition property="isWindows"> - <equals arg1="${baseos}.${basews}" arg2="win32.win32" /> - </condition> - <condition property="isLinuxGTK"> - <equals arg1="${baseos}.${basews}" arg2="linux.gtk" /> - </condition> - <condition property="isLinuxMotif"> - <equals arg1="${baseos}.${basews}" arg2="linux.motif" /> - </condition> - - </target> - - <target name="create.label.properties" unless="label.properties.exists"> - <mkdir dir="${buildDirectory}" /> - <tstamp /> - <property name="date" value="${DSTAMP}" /> - <property name="time" value="${TSTAMP}" /> - <property name="timestamp" value="${date}${time}" /> - <property name="buildType" value="I" /> - - <!--this naming convention used by php scripts on download server--> - <property name="buildLabel" value="${buildType}${timestamp}" /> - - <property name="buildAlias" value="${buildLabel}" /> - <property name="buildId" value="${buildAlias}" /> - <!-- <property name="forceContextQualifier" value="v${timestamp}"/> --> - - <!--store the build label information in a file--> - <echo file="${buildDirectory}/label.properties" append="true" > - buildType=${buildType} - </echo> - <echo file="${buildDirectory}/label.properties" append="true"> - buildId=${buildId} - </echo> - <echo file="${buildDirectory}/label.properties" append="true"> - timestamp=${timestamp} - </echo> - <echo file="${buildDirectory}/label.properties" append="true"> - buildLabel=${buildLabel} - </echo> - <echo file="${buildDirectory}/label.properties" append="true"> - buildAlias=${buildAlias} - </echo> - <!-- - <echo file="${buildDirectory}/label.properties" append="true" > - forceContextQualifier=${forceContextQualifier} - </echo> - --> - </target> - - <target name="run" depends="init"> - <antcall target="buildAll" /> - <antcall target="test" /> - <antcall target="publish" /> - <antcall target="cleanUp" /> - </target> - - <target name="runTestsOnly" depends="init"> - <delete dir="${buildDirectory}" /> - <mkdir dir="${buildDirectory}/${buildLabel}" /> - <copy todir="${buildDirectory}/${buildLabel}"> - <fileset dir="${buildDirectory}/.."> - <include name="**/*.zip" /> - </fileset> - </copy> - <antcall target="test" /> - <antcall target="publish" /> - <antcall target="cleanUp" /> - </target> - - <target name="runWithoutTest" depends="init"> - <antcall target="buildAll" /> - <antcall target="publish" /> - <antcall target="cleanUp" /> - </target> - - <target name="buildOnly" depends="init"> - <antcall target="buildAll" /> - <antcall target="cleanUp" /> - </target> - - <target name="buildAll"> - <ant antfile="build.xml" target="main"> - <property name="component" value="builder/terminal" /> - </ant> - <ant antfile="build.xml" target="main"> - <property name="component" value="builder/sdk" /> - </ant> - <ant antfile="build.xml" target="main"> - <property name="component" value="builder/runtime" /> - </ant> - <ant antfile="build.xml" target="main"> - <property name="component" value="builder/examples" /> - </ant> - <ant antfile="build.xml" target="main"> - <property name="component" value="builder/discovery" /> - </ant> - <ant antfile="build.xml" target="main"> - <property name="component" value="builder/tests" /> - </ant> - - <!-- doc must be the last execution --> - <!-- we dont have a separate doc feature for TM/RSE, so leave that out for now - <ant antfile="build.xml" target="main"> - <property name="component" value="builder/doc" /> - </ant> - --> - - <!-- TODO: if necessary, you can copy files from the SDK into the runtime or examples zips here --> - <!-- for example, see validation/buildAll.xml or cdo/buildAll.xml --> - - <!-- TODO: if necessary, you can remove 3rd party jars used at build time from the zips here --> - <!-- for example, see cdo's buildAll.xml --> - - <!-- TODO: you can run extra build scripts here, like for building additional zip bundles --> - - <!-- md5 files generation --> - <exec executable="bash" dir="${buildDirectory}/${buildLabel}"> - <arg line="${basedir}/../org.eclipse.modeling.common.releng/scripts/createZipCheckSum.sh" /> - </exec> - </target> - - <target name="cleanUp"> - <echo message="** Copying generated zips to drop folder... **" /> - <copy todir="${buildDirectory}/.." failonerror="false" overwrite="true"> - <fileset dir="${buildDirectory}/${buildLabel}" /> - </copy> - </target> - - <target name="test"> - - <property name="test.xml" value="../org.eclipse.releng.basebuilder/plugins/org.eclipse.build.tools/scripts/test.xml" /> - <antcall target="test-win32-local" /> - <antcall target="test-linux-gtk-local" /> - <antcall target="test-linux-motif-local" /> - </target> - - <target name="test-win32-local" if="isWindows"> - <ant antfile="${test.xml}"> - <property name="shell" value="relengbuildwin2.bat" /> - <property name="tester" value="${basedir}/builder/tests/configs/local" /> - </ant> - </target> - - <target name="test-linux-gtk-local" if="isLinuxGTK"> - <ant antfile="${test.xml}"> - <property name="shell" value="relengbuildgtk.sh" /> - <property name="tester" value="${basedir}/builder/tests/configs/local" /> - </ant> - </target> - - <target name="test-linux-motif-local" if="isLinuxMotif"> - <ant antfile="${test.xml}"> - <property name="shell" value="relengbuildmotif.sh" /> - <property name="tester" value="${basedir}/builder/tests/configs/local" /> - </ant> - </target> - - <target name="publish"> - <copy todir="${buildDirectory}/${buildLabel}" overwrite="true"> - <fileset - dir="${buildDirectory}/../org.eclipse.modeling.common.releng/staticDropFiles" /> - </copy> - </target> - -</project> diff --git a/releng/org.eclipse.tm.releng/builder/discovery/build.properties b/releng/org.eclipse.tm.releng/builder/discovery/build.properties deleted file mode 100644 index 60a9131e9..000000000 --- a/releng/org.eclipse.tm.releng/builder/discovery/build.properties +++ /dev/null @@ -1,36 +0,0 @@ -############################################################################### -# Copyright (c) 2005, 2008 IBM Corporation and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 -# which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html -# -# Contributors: -# IBM Corporation - initial API and implementation -# Martin Oberhuber (Wind River) - adapt for DSDP from o.e.emf.validation.releng -############################################################################### -# TODO: set correct source and target levels here -javacSource=1.4 -javacTarget=1.4 - -buildDirectory=${builder}/../eclipse -buildType=I -buildId=${buildId} -buildLabel=${buildLabel} -timestamp=0000 -collPlace=. -collBase=. -baseLocation= -configs=*,*,* -baseos=linux -basews=gtk -basearch=x86 -bootclasspath=${java.home}/lib/*.jar -javacFailOnError=true -javacVerbose=true -javacDebugInfo=on -zipargs= -archivesFormat = *,*,*-antZip -collectingFolder=eclipse -archivePrefix=eclipse -generateFeatureVersionSuffix=true diff --git a/releng/org.eclipse.tm.releng/builder/discovery/customTargets.xml b/releng/org.eclipse.tm.releng/builder/discovery/customTargets.xml deleted file mode 100644 index 54d7ac7eb..000000000 --- a/releng/org.eclipse.tm.releng/builder/discovery/customTargets.xml +++ /dev/null @@ -1,177 +0,0 @@ -<project name="Build specific targets and properties" default="noDefault" basedir="."> - - <!-- ===================================================================== --> - <!-- Run a given ${target} on all elements being built --> - <!-- ===================================================================== --> - <target name="allElements"> - <ant antfile="${genericTargets}" target="${target}"> - <property name="type" value="feature" /> - <property name="id" value="org.eclipse.tm.discovery" /> - </ant> - </target> - - <!-- ===================================================================== --> - <!-- Targets to assemble the built elements for particular configurations --> - <!-- These generally call the generated assemble scripts (named in --> - <!-- ${assembleScriptName}) but may also add pre and post processing --> - <!-- Add one target for each root element and each configuration --> - <!-- ===================================================================== --> - - <target name="assemble.org.eclipse.tm.discovery"> - <property name="archiveName" value="TM-discovery-${buildAlias}.zip" /> - <ant antfile="${assembleScriptName}" /> - <!-- ADD POST STEPS --> - </target> - - <!-- ===================================================================== --> - <!-- Check out map files from correct repository --> - <!-- Replace values for cvsRoot, package and mapVersionTag as desired. --> - <!-- ===================================================================== --> - <target name="checkLocal"> - <available property="mapsLocal" file="${buildDirectory}/maps" /> - </target> - - <target name="getMapFiles" depends="checkLocal" unless="mapsLocal"> - - <!-- *** change the repo info --> - <property name="mapCvsRoot" value=":${cvsReadProtocol}:${cvsReadUser}@${cvsHost}:${cvsRep}" /> - - <property name="mapVersionTag" value="HEAD" /> - <!-- <property name="packagePath" value="org.eclipse.${projectName}/org.eclipse.${subprojectName2}.releng/maps"/> --> - <property name="packagePath" value="org.eclipse.${projectName}.${subprojectName2}/releng/org.eclipse.${projectName}.releng/maps"/> - - <cvs cvsRsh="ssh" cvsRoot="${mapCvsRoot}" tag="${mapVersionTag}" - package="${packagePath}" dest="${buildDirectory}/maps" /> - <copy todir="${buildDirectory}/maps/CVS" overwrite="true"> - <fileset dir="${buildDirectory}/maps/${packagePath}/CVS" /> - </copy> - <copy todir="${buildDirectory}/maps" overwrite="true"> - <fileset dir="${buildDirectory}/maps/${packagePath}" /> - </copy> - <delete dir="${buildDirectory}/maps/org.eclipse.${projectName}" /> - - <!--tag the map files project--> - <antcall target="tagMapFiles" /> - </target> - - <target name="tagMapFiles" if="tagMaps"> - <cvs cvsRsh="ssh" dest="${buildDirectory}/maps" command="tag v${timestamp}" /> - </target> - - <!-- ===================================================================== --> - <!-- Steps to do before setup --> - <!-- ===================================================================== --> - <target name="preSetup"> - <mkdir dir="${buildDirectory}/${buildLabel}"/> - </target> - - <!-- ===================================================================== --> - <!-- Steps to do after setup but before starting the build proper --> - <!-- ===================================================================== --> - <target name="postSetup"> - <!-- TODO: if your project requires more dependencies, add them here; if it does not require all of these, remove those not required --> - <echo message="Download, then unpack: Eclipse, EMF ..." /> - <ant target="getDependency" antfile="${buildDirectory}/../org.eclipse.modeling.common.releng/scripts/getDependencies.xml"> - <property name="url" value="${eclipseURL}" /> - <property name="file" value="${eclipseFile}" /> - <property name="isUnpackedFile" value="${buildDirectory}/plugins/org.eclipse.platform.doc.isv/plugin.xml" /> - </ant> - <ant target="getDependency" antfile="${buildDirectory}/../org.eclipse.modeling.common.releng/scripts/getDependencies.xml"> - <property name="url" value="${emfURL}" /> - <property name="file" value="${emfFile}" /> - <property name="isUnpackedFile" value="${buildDirectory}/plugins/org.eclipse.emf.ecore/plugin.xml" /> - </ant> - </target> - - <!-- ===================================================================== --> - <!-- Steps to do before fetching the build elements --> - <!-- ===================================================================== --> - <target name="preFetch"> - </target> - - <!-- ===================================================================== --> - <!-- Steps to do after the fetch --> - <!-- ===================================================================== --> - <target name="postFetch"> - <replace dir="${buildDirectory}/plugins" value="${timestamp}" token="@buildid@"> - <include name="**/about.mappings" /> - </replace> - </target> - - <!-- ===================================================================== --> - <!-- Steps to do before generating build scripts --> - <!-- ===================================================================== --> - <target name="preGenerate"> - </target> - - <!-- ===================================================================== --> - <!-- Steps to do after generating the build scripts --> - <!-- ===================================================================== --> - <target name="postGenerate"> - <antcall target="clean" /> - </target> - - <!-- ===================================================================== --> - <!-- Steps to do before assembling --> - <!-- ===================================================================== --> - <target name="preAssemble"> - </target> - - <!-- ===================================================================== --> - <!-- Steps to do after assembling--> - <!-- ===================================================================== --> - <target name="postAssemble"> - </target> - - <!-- ===================================================================== --> - <!-- Steps to do before running the build.xmls for the elements being built. --> - <!-- ===================================================================== --> - <target name="preProcess"> - <replace dir="${buildDirectory}/plugins" value="${timestamp}" token="@build@"> - <include name="**/about.mappings" /> - </replace> - </target> - - <!-- ===================================================================== --> - <!-- Steps to do after running the build.xmls for the elements being built. --> - <!-- ===================================================================== --> - <target name="postProcess"> - </target> - - <!-- ===================================================================== --> - <!-- Steps to do after everything is built and assembled --> - <!-- (e.g., testing, posting, emailing, ...) --> - <!-- ===================================================================== --> - <target name="postBuild"> - <antcall target="gatherLogs" /> - </target> - - <!-- ===================================================================== --> - <!-- Helper targets --> - <!-- ===================================================================== --> - <target name="gatherLogs"> - <mkdir dir="${buildDirectory}/${buildLabel}/compilelogs" /> - <antcall target="allElements"> - <param name="target" value="gatherLogs" /> - </antcall> - - <unzip dest="${buildDirectory}/${buildLabel}/compilelogs" overwrite="true"> - <fileset dir="${buildDirectory}/features/org.eclipse.tm.discovery"> - <include name="*.log.zip" /> - </fileset> - </unzip> - </target> - <target name="clean" unless="noclean"> - <antcall target="allElements"> - <param name="target" value="cleanElement" /> - </antcall> - </target> - - <!-- ===================================================================== --> - <!-- Default target --> - <!-- ===================================================================== --> - <target name="noDefault"> - <echo message="You must specify a target when invoking this file" /> - </target> - -</project> diff --git a/releng/org.eclipse.tm.releng/builder/doc/build.properties b/releng/org.eclipse.tm.releng/builder/doc/build.properties deleted file mode 100644 index 918aa8e7f..000000000 --- a/releng/org.eclipse.tm.releng/builder/doc/build.properties +++ /dev/null @@ -1,37 +0,0 @@ -############################################################################### -# Copyright (c) 2005, 2008 IBM Corporation and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 -# which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html -# -# Contributors: -# IBM Corporation - initial API and implementation -# Martin Oberhuber (Wind River) - adapt for DSDP from o.e.emf.validation.releng -############################################################################### -# TODO: set correct source and target levels here -javacSource=1.4 -javacTarget=1.4 - -buildDirectory=${builder}/../eclipse -buildType=I -buildId=${buildId} -buildLabel=${buildLabel} -timestamp=0000 -collPlace=. -collBase=. -baseLocation= -configs=*,*,* -baseos=linux -basews=gtk -basearch=x86 -bootclasspath=${java.home}/lib/*.jar -javacFailOnError=true -javacVerbose=true -javacDebugInfo=on -zipargs= -archivesFormat = *,*,*-antZip -collectingFolder=eclipse -archivePrefix=eclipse -generateFeatureVersionSuffix=true -generateVersionsList=true diff --git a/releng/org.eclipse.tm.releng/builder/doc/customTargets.xml b/releng/org.eclipse.tm.releng/builder/doc/customTargets.xml deleted file mode 100644 index 51a258078..000000000 --- a/releng/org.eclipse.tm.releng/builder/doc/customTargets.xml +++ /dev/null @@ -1,187 +0,0 @@ -<project name="Build specific targets and properties" default="noDefault" basedir="."> - - <!-- ===================================================================== --> - <!-- Run a given ${target} on all elements being built --> - <!-- ===================================================================== --> - <target name="allElements"> - <ant antfile="${genericTargets}" target="${target}"> - <property name="type" value="feature" /> - <property name="id" value="org.eclipse.rse.doc" /> - </ant> - </target> - - <!-- ===================================================================== --> - <!-- Targets to assemble the built elements for particular configurations --> - <!-- These generally call the generated assemble scripts (named in --> - <!-- ${assembleScriptName}) but may also add pre and post processing --> - <!-- Add one target for each root element and each configuration --> - <!-- ===================================================================== --> - - <target name="assemble.org.eclipse.rse.doc"> - <property name="archiveName" value="RSE-SDK-${buildAlias}.zip" /> - <ant antfile="${assembleScriptName}" /> - <!-- ADD POST STEPS --> - </target> - - <!-- ===================================================================== --> - <!-- Check out map files from correct repository --> - <!-- Replace values for cvsRoot, package and mapVersionTag as desired. --> - <!-- ===================================================================== --> - <target name="checkLocal"> - <available property="mapsLocal" file="${buildDirectory}/maps" /> - </target> - - <target name="getMapFiles" depends="checkLocal" unless="mapsLocal"> - - <!-- *** change the repo info --> - <property name="mapCvsRoot" value=":${cvsReadProtocol}:${cvsReadUser}@${cvsHost}:${cvsRep}" /> - <property name="mapVersionTag" value="HEAD" /> - <!-- <property name="packagePath" value="org.eclipse.${projectName}/org.eclipse.${subprojectName2}.releng/maps"/> --> - <property name="packagePath" value="org.eclipse.${projectName}.${subprojectName2}/releng/org.eclipse.${projectName}.releng/maps"/> - - <cvs cvsRsh="ssh" cvsRoot="${mapCvsRoot}" tag="${mapVersionTag}" - package="${packagePath}" dest="${buildDirectory}/maps" /> - <copy todir="${buildDirectory}/maps/CVS" overwrite="true"> - <fileset dir="${buildDirectory}/maps/${packagePath}/CVS" /> - </copy> - <copy todir="${buildDirectory}/maps" overwrite="true"> - <fileset dir="${buildDirectory}/maps/${packagePath}" /> - </copy> - <delete dir="${buildDirectory}/maps/org.eclipse.${projectName}" /> - - <!--tag the map files project--> - <antcall target="tagMapFiles" /> - </target> - - <target name="tagMapFiles" if="tagMaps"> - <cvs cvsRsh="ssh" dest="${buildDirectory}/maps" command="tag v${timestamp}" /> - </target> - - <!-- ===================================================================== --> - <!-- Steps to do before setup --> - <!-- ===================================================================== --> - <target name="preSetup"> - <mkdir dir="${buildDirectory}/${buildLabel}" /> - </target> - - <!-- ===================================================================== --> - <!-- Steps to do after setup but before starting the build proper --> - <!-- ===================================================================== --> - <target name="postSetup"> - <!-- TODO: if your project requires more dependencies, add them here; if it does not require all of these, remove those not required --> - <echo message="Download, then unpack: Eclipse, EMF ..." /> - <ant target="getDependency" antfile="${buildDirectory}/../org.eclipse.modeling.common.releng/scripts/getDependencies.xml"> - <property name="url" value="${eclipseURL}" /> - <property name="file" value="${eclipseFile}" /> - <property name="isUnpackedFile" value="${buildDirectory}/plugins/org.eclipse.platform.doc.isv/plugin.xml" /> - </ant> - - <!-- Important: This must be the last dependency downloaded, because the - getDependency target strips versions from all plug-ins --> - <echo message="Download Orbit Bundles ..." /> - <ant target="getBundle" antfile="${buildDirectory}/../org.eclipse.modeling.common.releng/scripts/getDependenciesHelper.xml"> - <property name="url" value="${orbitURL}"/> - <property name="file" value="${orbitFile}"/> - </ant> - <echo message="Unpack selected jars ..." /> - <unzip dest="${buildDirectory}/.." src="${downloadsDir}/${orbitFile}"> - <patternset> - <include name="**/org.apache.oro*.jar"/> - <include name="**/org.apache.commons.net*.jar"/> - </patternset> - </unzip> - </target> - - <!-- ===================================================================== --> - <!-- Steps to do before fetching the build elements --> - <!-- ===================================================================== --> - <target name="preFetch"> - </target> - - <!-- ===================================================================== --> - <!-- Steps to do after the fetch --> - <!-- ===================================================================== --> - <target name="postFetch"> - <replace dir="${buildDirectory}/plugins" value="${timestamp}" token="@buildid@"> - <include name="**/about.mappings" /> - </replace> - </target> - - <!-- ===================================================================== --> - <!-- Steps to do before generating build scripts --> - <!-- ===================================================================== --> - <target name="preGenerate"> - </target> - - <!-- ===================================================================== --> - <!-- Steps to do after generating the build scripts --> - <!-- ===================================================================== --> - <target name="postGenerate"> - <antcall target="clean" /> - </target> - - <!-- ===================================================================== --> - <!-- Steps to do before assembling --> - <!-- ===================================================================== --> - <target name="preAssemble"> - </target> - - <!-- ===================================================================== --> - <!-- Steps to do after assembling--> - <!-- ===================================================================== --> - <target name="postAssemble"> - </target> - - <!-- ===================================================================== --> - <!-- Steps to do before running the build.xmls for the elements being built. --> - <!-- ===================================================================== --> - <target name="preProcess"> - <replace dir="${buildDirectory}/plugins" value="${timestamp}" token="@build@"> - <include name="**/about.mappings" /> - </replace> - </target> - - <!-- ===================================================================== --> - <!-- Steps to do after running the build.xmls for the elements being built. --> - <!-- ===================================================================== --> - <target name="postProcess"> - </target> - - <!-- ===================================================================== --> - <!-- Steps to do after everything is built and assembled --> - <!-- (e.g., testing, posting, emailing, ...) --> - <!-- ===================================================================== --> - <target name="postBuild"> - <antcall target="gatherLogs" /> - </target> - - <!-- ===================================================================== --> - <!-- Helper targets --> - <!-- ===================================================================== --> - <target name="gatherLogs"> - <mkdir dir="${buildDirectory}/${buildLabel}/compilelogs" /> - <antcall target="allElements"> - <param name="target" value="gatherLogs" /> - </antcall> - - <unzip dest="${buildDirectory}/${buildLabel}/compilelogs" overwrite="true"> - <fileset dir="${buildDirectory}/features/org.eclipse.rse.doc"> - <include name="*.log.zip" /> - </fileset> - </unzip> - </target> - - <target name="clean" unless="noclean"> - <antcall target="allElements"> - <param name="target" value="cleanElement" /> - </antcall> - </target> - - <!-- ===================================================================== --> - <!-- Default target --> - <!-- ===================================================================== --> - <target name="noDefault"> - <echo message="You must specify a target when invoking this file" /> - </target> - -</project> diff --git a/releng/org.eclipse.tm.releng/builder/examples/build.properties b/releng/org.eclipse.tm.releng/builder/examples/build.properties deleted file mode 100644 index 5cfbca4fd..000000000 --- a/releng/org.eclipse.tm.releng/builder/examples/build.properties +++ /dev/null @@ -1,36 +0,0 @@ -############################################################################### -# Copyright (c) 2005, 2008 IBM Corporation and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 -# which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html -# -# Contributors: -# IBM Corporation - initial API and implementation -# Martin Oberhuber (Wind River) - adapt for DSDP from o.e.emf.validation.releng -############################################################################### -# TODO: set correct source and target levels here -javacSource=1.4 -javacTarget=1.4 - -buildDirectory=${builder}/../eclipse -buildType=I -buildId=${buildId} -buildLabel=${buildLabel} -timestamp=0000 -collPlace=. -collBase=. -baseLocation= -configs=*,*,* -baseos=linux -basews=gtk -basearch=x86 -bootclasspath=${java.home}/lib/*.jar -javacFailOnError=true -javacVerbose=true -javacDebugInfo=on -zipargs= -archivesFormat = *,*,*-antZip -collectingFolder=eclipse -archivePrefix=eclipse -generateFeatureVersionSuffix=true
\ No newline at end of file diff --git a/releng/org.eclipse.tm.releng/builder/examples/customTargets.xml b/releng/org.eclipse.tm.releng/builder/examples/customTargets.xml deleted file mode 100644 index 2690068bc..000000000 --- a/releng/org.eclipse.tm.releng/builder/examples/customTargets.xml +++ /dev/null @@ -1,187 +0,0 @@ -<project name="Build specific targets and properties" default="noDefault" basedir="."> - - <!-- ===================================================================== --> - <!-- Run a given ${target} on all elements being built --> - <!-- ===================================================================== --> - <target name="allElements"> - <ant antfile="${genericTargets}" target="${target}"> - <property name="type" value="feature" /> - <property name="id" value="org.eclipse.rse.examples" /> - </ant> - </target> - - <!-- ===================================================================== --> - <!-- Targets to assemble the built elements for particular configurations --> - <!-- These generally call the generated assemble scripts (named in --> - <!-- ${assembleScriptName}) but may also add pre and post processing --> - <!-- Add one target for each root element and each configuration --> - <!-- ===================================================================== --> - - <target name="assemble.org.eclipse.rse.examples"> - <property name="archiveName" value="RSE-examples-${buildAlias}.zip" /> - <ant antfile="${assembleScriptName}" /> - <!-- ADD POST STEPS --> - </target> - - <!-- ===================================================================== --> - <!-- Check out map files from correct repository --> - <!-- Replace values for cvsRoot, package and mapVersionTag as desired. --> - <!-- ===================================================================== --> - <target name="checkLocal"> - <available property="mapsLocal" file="${buildDirectory}/maps" /> - </target> - - <target name="getMapFiles" depends="checkLocal" unless="mapsLocal"> - - <!-- *** change the repo info --> - <property name="mapCvsRoot" value=":${cvsReadProtocol}:${cvsReadUser}@${cvsHost}:${cvsRep}" /> - <property name="mapVersionTag" value="HEAD" /> - <!-- <property name="packagePath" value="org.eclipse.${projectName}/org.eclipse.${subprojectName2}.releng/maps"/> --> - <property name="packagePath" value="org.eclipse.${projectName}.${subprojectName2}/releng/org.eclipse.${projectName}.releng/maps"/> - - <cvs cvsRsh="ssh" cvsRoot="${mapCvsRoot}" tag="${mapVersionTag}" - package="${packagePath}" dest="${buildDirectory}/maps" /> - <copy todir="${buildDirectory}/maps/CVS" overwrite="true"> - <fileset dir="${buildDirectory}/maps/${packagePath}/CVS" /> - </copy> - <copy todir="${buildDirectory}/maps" overwrite="true"> - <fileset dir="${buildDirectory}/maps/${packagePath}" /> - </copy> - <delete dir="${buildDirectory}/maps/org.eclipse.${projectName}" /> - - <!--tag the map files project--> - <antcall target="tagMapFiles" /> - </target> - - <target name="tagMapFiles" if="tagMaps"> - <cvs cvsRsh="ssh" dest="${buildDirectory}/maps" command="tag v${timestamp}" /> - </target> - - <!-- ===================================================================== --> - <!-- Steps to do before setup --> - <!-- ===================================================================== --> - <target name="preSetup"> - <mkdir dir="${buildDirectory}/${buildLabel}"/> - </target> - - <!-- ===================================================================== --> - <!-- Steps to do after setup but before starting the build proper --> - <!-- ===================================================================== --> - <target name="postSetup"> - <!-- TODO: if your project requires more dependencies, add them here; if it does not require all of these, remove those not required --> - <echo message="Download, then unpack: Eclipse, EMF ..." /> - <ant target="getDependency" antfile="${buildDirectory}/../org.eclipse.modeling.common.releng/scripts/getDependencies.xml"> - <property name="url" value="${eclipseURL}" /> - <property name="file" value="${eclipseFile}" /> - <property name="isUnpackedFile" value="${buildDirectory}/plugins/org.eclipse.platform.doc.isv/plugin.xml" /> - </ant> - - <!-- Important: This must be the last dependency downloaded, because the - getDependency target strips versions from all plug-ins --> - <echo message="Download Orbit Bundles ..." /> - <ant target="getBundle" antfile="${buildDirectory}/../org.eclipse.modeling.common.releng/scripts/getDependenciesHelper.xml"> - <property name="url" value="${orbitURL}"/> - <property name="file" value="${orbitFile}"/> - </ant> - <echo message="Unpack selected jars ..." /> - <unzip dest="${buildDirectory}/.." src="${downloadsDir}/${orbitFile}"> - <patternset> - <include name="**/org.apache.oro*.jar"/> - <include name="**/org.apache.commons.net*.jar"/> - </patternset> - </unzip> - </target> - - <!-- ===================================================================== --> - <!-- Steps to do before fetching the build elements --> - <!-- ===================================================================== --> - <target name="preFetch"> - </target> - - <!-- ===================================================================== --> - <!-- Steps to do after the fetch --> - <!-- ===================================================================== --> - <target name="postFetch"> - <replace dir="${buildDirectory}/plugins" value="${timestamp}" token="@buildid@"> - <include name="**/about.mappings" /> - </replace> - </target> - - <!-- ===================================================================== --> - <!-- Steps to do before generating build scripts --> - <!-- ===================================================================== --> - <target name="preGenerate"> - </target> - - <!-- ===================================================================== --> - <!-- Steps to do after generating the build scripts --> - <!-- ===================================================================== --> - <target name="postGenerate"> - <antcall target="clean" /> - </target> - - <!-- ===================================================================== --> - <!-- Steps to do before assembling --> - <!-- ===================================================================== --> - <target name="preAssemble"> - </target> - - <!-- ===================================================================== --> - <!-- Steps to do after assembling--> - <!-- ===================================================================== --> - <target name="postAssemble"> - </target> - - <!-- ===================================================================== --> - <!-- Steps to do before running the build.xmls for the elements being built. --> - <!-- ===================================================================== --> - <target name="preProcess"> - <replace dir="${buildDirectory}/plugins" value="${timestamp}" token="@build@"> - <include name="**/about.mappings" /> - </replace> - </target> - - <!-- ===================================================================== --> - <!-- Steps to do after running the build.xmls for the elements being built. --> - <!-- ===================================================================== --> - <target name="postProcess"> - </target> - - <!-- ===================================================================== --> - <!-- Steps to do after everything is built and assembled --> - <!-- (e.g., testing, posting, emailing, ...) --> - <!-- ===================================================================== --> - <target name="postBuild"> - <antcall target="gatherLogs" /> - </target> - - <!-- ===================================================================== --> - <!-- Helper targets --> - <!-- ===================================================================== --> - <target name="gatherLogs"> - <mkdir dir="${buildDirectory}/${buildLabel}/compilelogs" /> - <antcall target="allElements"> - <param name="target" value="gatherLogs" /> - </antcall> - - <unzip dest="${buildDirectory}/${buildLabel}/compilelogs" overwrite="true"> - <fileset dir="${buildDirectory}/features/org.eclipse.rse.examples"> - <include name="*.log.zip" /> - </fileset> - </unzip> - </target> - - <target name="clean" unless="noclean"> - <antcall target="allElements"> - <param name="target" value="cleanElement" /> - </antcall> - </target> - - <!-- ===================================================================== --> - <!-- Default target --> - <!-- ===================================================================== --> - <target name="noDefault"> - <echo message="You must specify a target when invoking this file" /> - </target> - -</project> diff --git a/releng/org.eclipse.tm.releng/builder/runtime/build.properties b/releng/org.eclipse.tm.releng/builder/runtime/build.properties deleted file mode 100644 index 60a9131e9..000000000 --- a/releng/org.eclipse.tm.releng/builder/runtime/build.properties +++ /dev/null @@ -1,36 +0,0 @@ -############################################################################### -# Copyright (c) 2005, 2008 IBM Corporation and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 -# which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html -# -# Contributors: -# IBM Corporation - initial API and implementation -# Martin Oberhuber (Wind River) - adapt for DSDP from o.e.emf.validation.releng -############################################################################### -# TODO: set correct source and target levels here -javacSource=1.4 -javacTarget=1.4 - -buildDirectory=${builder}/../eclipse -buildType=I -buildId=${buildId} -buildLabel=${buildLabel} -timestamp=0000 -collPlace=. -collBase=. -baseLocation= -configs=*,*,* -baseos=linux -basews=gtk -basearch=x86 -bootclasspath=${java.home}/lib/*.jar -javacFailOnError=true -javacVerbose=true -javacDebugInfo=on -zipargs= -archivesFormat = *,*,*-antZip -collectingFolder=eclipse -archivePrefix=eclipse -generateFeatureVersionSuffix=true diff --git a/releng/org.eclipse.tm.releng/builder/runtime/customTargets.xml b/releng/org.eclipse.tm.releng/builder/runtime/customTargets.xml deleted file mode 100644 index b481075a9..000000000 --- a/releng/org.eclipse.tm.releng/builder/runtime/customTargets.xml +++ /dev/null @@ -1,188 +0,0 @@ -<project name="Build specific targets and properties" default="noDefault" basedir="."> - - <!-- ===================================================================== --> - <!-- Run a given ${target} on all elements being built --> - <!-- ===================================================================== --> - <target name="allElements"> - <ant antfile="${genericTargets}" target="${target}"> - <property name="type" value="feature" /> - <property name="id" value="org.eclipse.rse" /> - </ant> - </target> - - <!-- ===================================================================== --> - <!-- Targets to assemble the built elements for particular configurations --> - <!-- These generally call the generated assemble scripts (named in --> - <!-- ${assembleScriptName}) but may also add pre and post processing --> - <!-- Add one target for each root element and each configuration --> - <!-- ===================================================================== --> - - <target name="assemble.org.eclipse.rse"> - <property name="archiveName" value="RSE-runtime-${buildAlias}.zip" /> - <ant antfile="${assembleScriptName}" /> - <!-- ADD POST STEPS --> - </target> - - <!-- ===================================================================== --> - <!-- Check out map files from correct repository --> - <!-- Replace values for cvsRoot, package and mapVersionTag as desired. --> - <!-- ===================================================================== --> - <target name="checkLocal"> - <available property="mapsLocal" file="${buildDirectory}/maps" /> - </target> - - <target name="getMapFiles" depends="checkLocal" unless="mapsLocal"> - - <!-- *** change the repo info --> - <property name="mapCvsRoot" value=":${cvsReadProtocol}:${cvsReadUser}@${cvsHost}:${cvsRep}" /> - <property name="mapVersionTag" value="HEAD" /> - <!-- <property name="packagePath" value="org.eclipse.${projectName}/org.eclipse.${subprojectName2}.releng/maps"/> --> - <property name="packagePath" value="org.eclipse.${projectName}.${subprojectName2}/releng/org.eclipse.${projectName}.releng/maps"/> - <cvs cvsRsh="ssh" cvsRoot="${mapCvsRoot}" tag="${mapVersionTag}" - package="${packagePath}" dest="${buildDirectory}/maps" /> - <copy todir="${buildDirectory}/maps/CVS" overwrite="true"> - <fileset dir="${buildDirectory}/maps/${packagePath}/CVS" /> - </copy> - <copy todir="${buildDirectory}/maps" overwrite="true"> - <fileset dir="${buildDirectory}/maps/${packagePath}" /> - </copy> - <delete dir="${buildDirectory}/maps/org.eclipse.${projectName}" /> - - <!--tag the map files project--> - <antcall target="tagMapFiles" /> - </target> - - <target name="tagMapFiles" if="tagMaps"> - <cvs cvsRsh="ssh" dest="${buildDirectory}/maps" command="tag v${timestamp}" /> - </target> - - <!-- ===================================================================== --> - <!-- Steps to do before setup --> - <!-- ===================================================================== --> - <target name="preSetup"> - <mkdir dir="${buildDirectory}/${buildLabel}" /> - </target> - - <!-- ===================================================================== --> - <!-- Steps to do after setup but before starting the build proper --> - <!-- ===================================================================== --> - <target name="postSetup"> - <!-- TODO: if your project requires more dependencies, add them here; if it does not require all of these, remove those not required --> - <echo message="Download, then unpack: Eclipse, EMF ..." /> - <ant target="getDependency" antfile="${buildDirectory}/../org.eclipse.modeling.common.releng/scripts/getDependencies.xml"> - <property name="url" value="${eclipseURL}" /> - <property name="file" value="${eclipseFile}" /> - <property name="isUnpackedFile" value="${buildDirectory}/plugins/org.eclipse.platform.doc.isv/plugin.xml" /> - </ant> - - <!-- Important: This must be the last dependency downloaded, because the - getDependency target strips versions from all plug-ins --> - <echo message="Download Orbit Bundles ..." /> - <ant target="getBundle" antfile="${buildDirectory}/../org.eclipse.modeling.common.releng/scripts/getDependenciesHelper.xml"> - <property name="url" value="${orbitURL}"/> - <property name="file" value="${orbitFile}"/> - </ant> - <echo message="Unpack selected jars ..." /> - <unzip dest="${buildDirectory}/.." src="${downloadsDir}/${orbitFile}"> - <patternset> - <include name="**/org.apache.oro*.jar"/> - <include name="**/org.apache.commons.net*.jar"/> - </patternset> - </unzip> - - </target> - - <!-- ===================================================================== --> - <!-- Steps to do before fetching the build elements --> - <!-- ===================================================================== --> - <target name="preFetch"> - </target> - - <!-- ===================================================================== --> - <!-- Steps to do after the fetch --> - <!-- ===================================================================== --> - <target name="postFetch"> - <replace dir="${buildDirectory}/plugins" value="${timestamp}" token="@buildid@"> - <include name="**/about.mappings" /> - </replace> - </target> - - <!-- ===================================================================== --> - <!-- Steps to do before generating build scripts --> - <!-- ===================================================================== --> - <target name="preGenerate"> - </target> - - <!-- ===================================================================== --> - <!-- Steps to do after generating the build scripts --> - <!-- ===================================================================== --> - <target name="postGenerate"> - <antcall target="clean" /> - </target> - - <!-- ===================================================================== --> - <!-- Steps to do before assembling --> - <!-- ===================================================================== --> - <target name="preAssemble"> - - </target> - - <!-- ===================================================================== --> - <!-- Steps to do after assembling--> - <!-- ===================================================================== --> - <target name="postAssemble"> - </target> - - <!-- ===================================================================== --> - <!-- Steps to do before running the build.xmls for the elements being built. --> - <!-- ===================================================================== --> - <target name="preProcess"> - <replace dir="${buildDirectory}/plugins" value="${timestamp}" token="@build@"> - <include name="**/about.mappings" /> - </replace> - </target> - - <!-- ===================================================================== --> - <!-- Steps to do after running the build.xmls for the elements being built. --> - <!-- ===================================================================== --> - <target name="postProcess"> - - </target> - - <!-- ===================================================================== --> - <!-- Steps to do after everything is built and assembled --> - <!-- (e.g., testing, posting, emailing, ...) --> - <!-- ===================================================================== --> - <target name="postBuild"> - <antcall target="gatherLogs" /> - </target> - - <!-- ===================================================================== --> - <!-- Helper targets --> - <!-- ===================================================================== --> - <target name="gatherLogs"> - <mkdir dir="${buildDirectory}/${buildLabel}/compilelogs" /> - <antcall target="allElements"> - <param name="target" value="gatherLogs" /> - </antcall> - - <unzip dest="${buildDirectory}/${buildLabel}/compilelogs" overwrite="true"> - <fileset dir="${buildDirectory}/features/org.eclipse.rse"> - <include name="*.log.zip" /> - </fileset> - </unzip> - </target> - <target name="clean" unless="noclean"> - <antcall target="allElements"> - <param name="target" value="cleanElement" /> - </antcall> - </target> - - <!-- ===================================================================== --> - <!-- Default target --> - <!-- ===================================================================== --> - <target name="noDefault"> - <echo message="You must specify a target when invoking this file" /> - </target> - -</project> diff --git a/releng/org.eclipse.tm.releng/builder/sdk/build.properties b/releng/org.eclipse.tm.releng/builder/sdk/build.properties deleted file mode 100644 index 60a9131e9..000000000 --- a/releng/org.eclipse.tm.releng/builder/sdk/build.properties +++ /dev/null @@ -1,36 +0,0 @@ -############################################################################### -# Copyright (c) 2005, 2008 IBM Corporation and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 -# which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html -# -# Contributors: -# IBM Corporation - initial API and implementation -# Martin Oberhuber (Wind River) - adapt for DSDP from o.e.emf.validation.releng -############################################################################### -# TODO: set correct source and target levels here -javacSource=1.4 -javacTarget=1.4 - -buildDirectory=${builder}/../eclipse -buildType=I -buildId=${buildId} -buildLabel=${buildLabel} -timestamp=0000 -collPlace=. -collBase=. -baseLocation= -configs=*,*,* -baseos=linux -basews=gtk -basearch=x86 -bootclasspath=${java.home}/lib/*.jar -javacFailOnError=true -javacVerbose=true -javacDebugInfo=on -zipargs= -archivesFormat = *,*,*-antZip -collectingFolder=eclipse -archivePrefix=eclipse -generateFeatureVersionSuffix=true diff --git a/releng/org.eclipse.tm.releng/builder/sdk/customTargets.xml b/releng/org.eclipse.tm.releng/builder/sdk/customTargets.xml deleted file mode 100644 index 4588cd036..000000000 --- a/releng/org.eclipse.tm.releng/builder/sdk/customTargets.xml +++ /dev/null @@ -1,187 +0,0 @@ -<project name="Build specific targets and properties" default="noDefault" basedir="."> - - <!-- ===================================================================== --> - <!-- Run a given ${target} on all elements being built --> - <!-- ===================================================================== --> - <target name="allElements"> - <ant antfile="${genericTargets}" target="${target}"> - <property name="type" value="feature" /> - <property name="id" value="org.eclipse.rse.sdk" /> - </ant> - </target> - - <!-- ===================================================================== --> - <!-- Targets to assemble the built elements for particular configurations --> - <!-- These generally call the generated assemble scripts (named in --> - <!-- ${assembleScriptName}) but may also add pre and post processing --> - <!-- Add one target for each root element and each configuration --> - <!-- ===================================================================== --> - - <target name="assemble.org.eclipse.rse.sdk"> - <property name="archiveName" value="RSE-SDK-${buildAlias}.zip" /> - <ant antfile="${assembleScriptName}" /> - <!-- ADD POST STEPS --> - </target> - - <!-- ===================================================================== --> - <!-- Check out map files from correct repository --> - <!-- Replace values for cvsRoot, package and mapVersionTag as desired. --> - <!-- ===================================================================== --> - <target name="checkLocal"> - <available property="mapsLocal" file="${buildDirectory}/maps" /> - </target> - - <target name="getMapFiles" depends="checkLocal" unless="mapsLocal"> - - <!-- *** change the repo info --> - <property name="mapCvsRoot" value=":${cvsReadProtocol}:${cvsReadUser}@${cvsHost}:${cvsRep}" /> - - <property name="mapVersionTag" value="HEAD" /> - <!-- <property name="packagePath" value="org.eclipse.${projectName}/org.eclipse.${subprojectName2}.releng/maps"/> --> - <property name="packagePath" value="org.eclipse.${projectName}.${subprojectName2}/releng/org.eclipse.${projectName}.releng/maps"/> - - <cvs cvsRsh="ssh" cvsRoot="${mapCvsRoot}" tag="${mapVersionTag}" - package="${packagePath}" dest="${buildDirectory}/maps" /> - <copy todir="${buildDirectory}/maps/CVS" overwrite="true"> - <fileset dir="${buildDirectory}/maps/${packagePath}/CVS" /> - </copy> - <copy todir="${buildDirectory}/maps" overwrite="true"> - <fileset dir="${buildDirectory}/maps/${packagePath}" /> - </copy> - <delete dir="${buildDirectory}/maps/org.eclipse.${projectName}" /> - - <!--tag the map files project--> - <antcall target="tagMapFiles" /> - </target> - - <target name="tagMapFiles" if="tagMaps"> - <cvs cvsRsh="ssh" dest="${buildDirectory}/maps" command="tag v${timestamp}" /> - </target> - - <!-- ===================================================================== --> - <!-- Steps to do before setup --> - <!-- ===================================================================== --> - <target name="preSetup"> - <mkdir dir="${buildDirectory}/${buildLabel}"/> - </target> - - <!-- ===================================================================== --> - <!-- Steps to do after setup but before starting the build proper --> - <!-- ===================================================================== --> - <target name="postSetup"> - <!-- TODO: if your project requires more dependencies, add them here; if it does not require all of these, remove those not required --> - <echo message="Download, then unpack: Eclipse, EMF ..." /> - <ant target="getDependency" antfile="${buildDirectory}/../org.eclipse.modeling.common.releng/scripts/getDependencies.xml"> - <property name="url" value="${eclipseURL}" /> - <property name="file" value="${eclipseFile}" /> - <property name="isUnpackedFile" value="${buildDirectory}/plugins/org.eclipse.platform.doc.isv/plugin.xml" /> - </ant> - - <!-- Important: This must be the last dependency downloaded, because the - getDependency target strips versions from all plug-ins --> - <echo message="Download Orbit Bundles ..." /> - <ant target="getBundle" antfile="${buildDirectory}/../org.eclipse.modeling.common.releng/scripts/getDependenciesHelper.xml"> - <property name="url" value="${orbitURL}"/> - <property name="file" value="${orbitFile}"/> - </ant> - <echo message="Unpack selected jars ..." /> - <unzip dest="${buildDirectory}/.." src="${downloadsDir}/${orbitFile}"> - <patternset> - <include name="**/org.apache.oro*.jar"/> - <include name="**/org.apache.commons.net*.jar"/> - </patternset> - </unzip> - </target> - - <!-- ===================================================================== --> - <!-- Steps to do before fetching the build elements --> - <!-- ===================================================================== --> - <target name="preFetch"> - </target> - - <!-- ===================================================================== --> - <!-- Steps to do after the fetch --> - <!-- ===================================================================== --> - <target name="postFetch"> - <replace dir="${buildDirectory}/plugins" value="${timestamp}" token="@buildid@"> - <include name="**/about.mappings" /> - </replace> - </target> - - <!-- ===================================================================== --> - <!-- Steps to do before generating build scripts --> - <!-- ===================================================================== --> - <target name="preGenerate"> - </target> - - <!-- ===================================================================== --> - <!-- Steps to do after generating the build scripts --> - <!-- ===================================================================== --> - <target name="postGenerate"> - <antcall target="clean" /> - </target> - - <!-- ===================================================================== --> - <!-- Steps to do before assembling --> - <!-- ===================================================================== --> - <target name="preAssemble"> - </target> - - <!-- ===================================================================== --> - <!-- Steps to do after assembling--> - <!-- ===================================================================== --> - <target name="postAssemble"> - </target> - - <!-- ===================================================================== --> - <!-- Steps to do before running the build.xmls for the elements being built. --> - <!-- ===================================================================== --> - <target name="preProcess"> - <replace dir="${buildDirectory}/plugins" value="${timestamp}" token="@build@"> - <include name="**/about.mappings" /> - </replace> - </target> - - <!-- ===================================================================== --> - <!-- Steps to do after running the build.xmls for the elements being built. --> - <!-- ===================================================================== --> - <target name="postProcess"> - </target> - - <!-- ===================================================================== --> - <!-- Steps to do after everything is built and assembled --> - <!-- (e.g., testing, posting, emailing, ...) --> - <!-- ===================================================================== --> - <target name="postBuild"> - <antcall target="gatherLogs" /> - </target> - - <!-- ===================================================================== --> - <!-- Helper targets --> - <!-- ===================================================================== --> - <target name="gatherLogs"> - <mkdir dir="${buildDirectory}/${buildLabel}/compilelogs" /> - <antcall target="allElements"> - <param name="target" value="gatherLogs" /> - </antcall> - - <unzip dest="${buildDirectory}/${buildLabel}/compilelogs" overwrite="true"> - <fileset dir="${buildDirectory}/features/org.eclipse.rse.sdk"> - <include name="*.log.zip" /> - </fileset> - </unzip> - </target> - <target name="clean" unless="noclean"> - <antcall target="allElements"> - <param name="target" value="cleanElement" /> - </antcall> - </target> - - <!-- ===================================================================== --> - <!-- Default target --> - <!-- ===================================================================== --> - <target name="noDefault"> - <echo message="You must specify a target when invoking this file" /> - </target> - -</project> diff --git a/releng/org.eclipse.tm.releng/builder/terminal/build.properties b/releng/org.eclipse.tm.releng/builder/terminal/build.properties deleted file mode 100644 index 60a9131e9..000000000 --- a/releng/org.eclipse.tm.releng/builder/terminal/build.properties +++ /dev/null @@ -1,36 +0,0 @@ -############################################################################### -# Copyright (c) 2005, 2008 IBM Corporation and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 -# which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html -# -# Contributors: -# IBM Corporation - initial API and implementation -# Martin Oberhuber (Wind River) - adapt for DSDP from o.e.emf.validation.releng -############################################################################### -# TODO: set correct source and target levels here -javacSource=1.4 -javacTarget=1.4 - -buildDirectory=${builder}/../eclipse -buildType=I -buildId=${buildId} -buildLabel=${buildLabel} -timestamp=0000 -collPlace=. -collBase=. -baseLocation= -configs=*,*,* -baseos=linux -basews=gtk -basearch=x86 -bootclasspath=${java.home}/lib/*.jar -javacFailOnError=true -javacVerbose=true -javacDebugInfo=on -zipargs= -archivesFormat = *,*,*-antZip -collectingFolder=eclipse -archivePrefix=eclipse -generateFeatureVersionSuffix=true diff --git a/releng/org.eclipse.tm.releng/builder/terminal/customTargets.xml b/releng/org.eclipse.tm.releng/builder/terminal/customTargets.xml deleted file mode 100644 index f28b54a7a..000000000 --- a/releng/org.eclipse.tm.releng/builder/terminal/customTargets.xml +++ /dev/null @@ -1,177 +0,0 @@ -<project name="Build specific targets and properties" default="noDefault" basedir="."> - - <!-- ===================================================================== --> - <!-- Run a given ${target} on all elements being built --> - <!-- ===================================================================== --> - <target name="allElements"> - <ant antfile="${genericTargets}" target="${target}"> - <property name="type" value="feature" /> - <property name="id" value="org.eclipse.tm.terminal.sdk" /> - </ant> - </target> - - <!-- ===================================================================== --> - <!-- Targets to assemble the built elements for particular configurations --> - <!-- These generally call the generated assemble scripts (named in --> - <!-- ${assembleScriptName}) but may also add pre and post processing --> - <!-- Add one target for each root element and each configuration --> - <!-- ===================================================================== --> - - <target name="assemble.org.eclipse.tm.terminal.sdk"> - <property name="archiveName" value="TM-terminal-${buildAlias}.zip" /> - <ant antfile="${assembleScriptName}" /> - <!-- ADD POST STEPS --> - </target> - - <!-- ===================================================================== --> - <!-- Check out map files from correct repository --> - <!-- Replace values for cvsRoot, package and mapVersionTag as desired. --> - <!-- ===================================================================== --> - <target name="checkLocal"> - <available property="mapsLocal" file="${buildDirectory}/maps" /> - </target> - - <target name="getMapFiles" depends="checkLocal" unless="mapsLocal"> - - <!-- *** change the repo info --> - <property name="mapCvsRoot" value=":${cvsReadProtocol}:${cvsReadUser}@${cvsHost}:${cvsRep}" /> - - <property name="mapVersionTag" value="HEAD" /> - <!-- <property name="packagePath" value="org.eclipse.${projectName}/org.eclipse.${subprojectName2}.releng/maps"/> --> - <property name="packagePath" value="org.eclipse.${projectName}.${subprojectName2}/releng/org.eclipse.${projectName}.releng/maps"/> - - <cvs cvsRsh="ssh" cvsRoot="${mapCvsRoot}" tag="${mapVersionTag}" - package="${packagePath}" dest="${buildDirectory}/maps" /> - <copy todir="${buildDirectory}/maps/CVS" overwrite="true"> - <fileset dir="${buildDirectory}/maps/${packagePath}/CVS" /> - </copy> - <copy todir="${buildDirectory}/maps" overwrite="true"> - <fileset dir="${buildDirectory}/maps/${packagePath}" /> - </copy> - <delete dir="${buildDirectory}/maps/org.eclipse.${projectName}" /> - - <!--tag the map files project--> - <antcall target="tagMapFiles" /> - </target> - - <target name="tagMapFiles" if="tagMaps"> - <cvs cvsRsh="ssh" dest="${buildDirectory}/maps" command="tag v${timestamp}" /> - </target> - - <!-- ===================================================================== --> - <!-- Steps to do before setup --> - <!-- ===================================================================== --> - <target name="preSetup"> - <mkdir dir="${buildDirectory}/${buildLabel}"/> - </target> - - <!-- ===================================================================== --> - <!-- Steps to do after setup but before starting the build proper --> - <!-- ===================================================================== --> - <target name="postSetup"> - <!-- TODO: if your project requires more dependencies, add them here; if it does not require all of these, remove those not required --> - <echo message="Download, then unpack: Eclipse, EMF ..." /> - <ant target="getDependency" antfile="${buildDirectory}/../org.eclipse.modeling.common.releng/scripts/getDependencies.xml"> - <property name="url" value="${eclipseURL}" /> - <property name="file" value="${eclipseFile}" /> - <property name="isUnpackedFile" value="${buildDirectory}/plugins/org.eclipse.platform.doc.isv/plugin.xml" /> - </ant> - <ant target="getDependency" antfile="${buildDirectory}/../org.eclipse.modeling.common.releng/scripts/getDependencies.xml"> - <property name="url" value="${rxtxURL}" /> - <property name="file" value="${rxtxFile}" /> - <property name="isUnpackedFile" value="${buildDirectory}/plugins/gnu.io.rxtx.jar" /> - </ant> - </target> - - <!-- ===================================================================== --> - <!-- Steps to do before fetching the build elements --> - <!-- ===================================================================== --> - <target name="preFetch"> - </target> - - <!-- ===================================================================== --> - <!-- Steps to do after the fetch --> - <!-- ===================================================================== --> - <target name="postFetch"> - <replace dir="${buildDirectory}/plugins" value="${timestamp}" token="@buildid@"> - <include name="**/about.mappings" /> - </replace> - </target> - - <!-- ===================================================================== --> - <!-- Steps to do before generating build scripts --> - <!-- ===================================================================== --> - <target name="preGenerate"> - </target> - - <!-- ===================================================================== --> - <!-- Steps to do after generating the build scripts --> - <!-- ===================================================================== --> - <target name="postGenerate"> - <antcall target="clean" /> - </target> - - <!-- ===================================================================== --> - <!-- Steps to do before assembling --> - <!-- ===================================================================== --> - <target name="preAssemble"> - </target> - - <!-- ===================================================================== --> - <!-- Steps to do after assembling--> - <!-- ===================================================================== --> - <target name="postAssemble"> - </target> - - <!-- ===================================================================== --> - <!-- Steps to do before running the build.xmls for the elements being built. --> - <!-- ===================================================================== --> - <target name="preProcess"> - <replace dir="${buildDirectory}/plugins" value="${timestamp}" token="@build@"> - <include name="**/about.mappings" /> - </replace> - </target> - - <!-- ===================================================================== --> - <!-- Steps to do after running the build.xmls for the elements being built. --> - <!-- ===================================================================== --> - <target name="postProcess"> - </target> - - <!-- ===================================================================== --> - <!-- Steps to do after everything is built and assembled --> - <!-- (e.g., testing, posting, emailing, ...) --> - <!-- ===================================================================== --> - <target name="postBuild"> - <antcall target="gatherLogs" /> - </target> - - <!-- ===================================================================== --> - <!-- Helper targets --> - <!-- ===================================================================== --> - <target name="gatherLogs"> - <mkdir dir="${buildDirectory}/${buildLabel}/compilelogs" /> - <antcall target="allElements"> - <param name="target" value="gatherLogs" /> - </antcall> - - <unzip dest="${buildDirectory}/${buildLabel}/compilelogs" overwrite="true"> - <fileset dir="${buildDirectory}/features/org.eclipse.tm.terminal.sdk"> - <include name="*.log.zip" /> - </fileset> - </unzip> - </target> - <target name="clean" unless="noclean"> - <antcall target="allElements"> - <param name="target" value="cleanElement" /> - </antcall> - </target> - - <!-- ===================================================================== --> - <!-- Default target --> - <!-- ===================================================================== --> - <target name="noDefault"> - <echo message="You must specify a target when invoking this file" /> - </target> - -</project> diff --git a/releng/org.eclipse.tm.releng/builder/tests/build.properties b/releng/org.eclipse.tm.releng/builder/tests/build.properties deleted file mode 100644 index 60a9131e9..000000000 --- a/releng/org.eclipse.tm.releng/builder/tests/build.properties +++ /dev/null @@ -1,36 +0,0 @@ -############################################################################### -# Copyright (c) 2005, 2008 IBM Corporation and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 -# which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html -# -# Contributors: -# IBM Corporation - initial API and implementation -# Martin Oberhuber (Wind River) - adapt for DSDP from o.e.emf.validation.releng -############################################################################### -# TODO: set correct source and target levels here -javacSource=1.4 -javacTarget=1.4 - -buildDirectory=${builder}/../eclipse -buildType=I -buildId=${buildId} -buildLabel=${buildLabel} -timestamp=0000 -collPlace=. -collBase=. -baseLocation= -configs=*,*,* -baseos=linux -basews=gtk -basearch=x86 -bootclasspath=${java.home}/lib/*.jar -javacFailOnError=true -javacVerbose=true -javacDebugInfo=on -zipargs= -archivesFormat = *,*,*-antZip -collectingFolder=eclipse -archivePrefix=eclipse -generateFeatureVersionSuffix=true diff --git a/releng/org.eclipse.tm.releng/builder/tests/configs/local/chkpii_ignore_list.txt b/releng/org.eclipse.tm.releng/builder/tests/configs/local/chkpii_ignore_list.txt deleted file mode 100644 index a4dc1c6c4..000000000 --- a/releng/org.eclipse.tm.releng/builder/tests/configs/local/chkpii_ignore_list.txt +++ /dev/null @@ -1,2 +0,0 @@ -references/javadoc/*.html -**/epl-v10.html diff --git a/releng/org.eclipse.tm.releng/builder/tests/configs/local/customTest.xml b/releng/org.eclipse.tm.releng/builder/tests/configs/local/customTest.xml deleted file mode 100644 index c1e666497..000000000 --- a/releng/org.eclipse.tm.releng/builder/tests/configs/local/customTest.xml +++ /dev/null @@ -1,44 +0,0 @@ -<project name="Customized testing instructions" default="customSetup"> - - <property name="buildConfigFile" value="${testDir}/../../build.cfg" /> - <available file="${buildConfigFile}" type="file" property="buildConfigIsAvailable" /> - - <target name="loadbuildConfig" if="buildConfigIsAvailable"> - <property file="${buildConfigFile}" /> - </target> - - <target name="customSetup"> - <fail unless="buildConfigIsAvailable" message="ERROR! Can't find ${buildConfigFile}"/> - <antcall target="loadbuildConfig"/> - - <echo message="Unpack Eclipse SDK to ${testDir}..."/> - <echo message="customTest.xml: basedir = ${basedir}"/> - <property name="getTestDependencies.xml" value="${testDir}/../../org.eclipse.modeling.common.releng/scripts/getTestDependencies.xml"/> - <ant target="getTestDependency" antfile="${getTestDependencies.xml}"> - <property name="basedir" value="${basedir}"/> - <property name="url" value="${eclipseURL}"/> - <property name="file" value="${eclipseFile}"/> - <property name="unpackDest" value="${testDir}"/> - </ant> - - <!-- TODO: if your project requires more dependencies for testing, add them here --> - <echo message="Copy EMF SDK + Eclipse SDK to ${executionDir}..."/> - <copy todir="${executionDir}"> - <!--<fileset dir="${downloadsDir}" includes="${emfFile},${eclipseFile},${wtpFile},${orbitFile}"/>--> - <fileset dir="${downloadsDir}" includes="${emfFile},${eclipseFile},${orbitFile}"/> - <!--TODO: Main runtime is RSE, therefore need to copy TM-terminal and others to test as well--> - <fileset dir="${executionDir}/../../.." includes="TM-terminal-*.zip"/> - </copy> - <property name="shell" value="relengbuildgtk.sh"/> - - <!--copy the script which invokes the tests --> - <copy file="${tester}/${shell}" todir="${executionDir}"/> - <chmod file="${executionDir}/${shell}" perm="ugo+rx"/> - - <!--copy the testing.property files --> - <copy file="${tester}/testing.properties" todir="${executionDir}"/> - - <!-- at this point, we exit from this script and back into the parent script (presumably in pde or eclipse.releng?) --> - <echo message="Running ${shell} ..."/> - </target> -</project> diff --git a/releng/org.eclipse.tm.releng/builder/tests/configs/local/relengbuildgtk.sh b/releng/org.eclipse.tm.releng/builder/tests/configs/local/relengbuildgtk.sh deleted file mode 100644 index 97221e5d8..000000000 --- a/releng/org.eclipse.tm.releng/builder/tests/configs/local/relengbuildgtk.sh +++ /dev/null @@ -1,278 +0,0 @@ -############################################################################### -# Copyright (c) 2005, 2008 IBM Corporation and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 -# which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html -# -# Contributors: -# IBM Corporation - initial API and implementation -# Martin Oberhuber (Wind River) - adapt for DSDP from o.e.emf.validation.releng -############################################################################### -#!/bin/bash - -echo -n "[relengbuild] $0 started on: `date +%Y%m%d\ %H\:%M\:%S`"; - -# environment variables -PATH=.:/bin:/usr/bin:/usr/bin/X11:/usr/local/bin:/usr/X11R6/bin:`pwd`/../linux;export PATH - -export USERNAME=`whoami` -echo " running as $USERNAME"; -echo " currently in dir: `pwd`"; - -# fix for org.eclipse.swt.SWTError: No more handles [gtk_init_check() failed] -# fix for Failed to invoke suite():org.eclipse.swt.SWTError: No more handles [gtk_init_check() failed] -export CVS_RSH=ssh -ulimit -c unlimited; # core file size (blocks, -c) unlimited - -echo "Set JAVA_HIGH_ZIPFDS=500 & LANG=C"; -export JAVA_HIGH_ZIPFDS=500 -export LANG=C - -# configure X server thread for tests :: not yet working! -echo "Start Xvfb on :42" -Xvfb :42 -screen 0 1024x768x24 -ac & -sleep 40 -export DISPLAY=localhost:42.0 -xhost + - -#startkde & -#sleep 40 -# xwd -silent -display :42 -root -out /tmp/snap.xwd; # save a snapshot -#import -window root screenshot1.png # save a snapshot - -readPropertyOut=""; -readProperty () -{ - readPropertyOut=""; - file=$1 - property=$2 - readPropertyOut=$(grep $property $file | egrep -v "^#" | tail -1 | sed -e "s/$property=//"); -} - -if [[ ! $JAVA_HOME ]]; then - echo -n "[relengbuild] Get JAVA_HOME from build.cfg ... "; - buildcfg=$PWD/../../../build.cfg; - export JAVA_HOME=$(grep "JAVA_HOME=" $buildcfg | egrep -v "^#" | tail -1 | sed -e "s/JAVAHOME=//"); - echo "$JAVA_HOME"; -fi - -Xflags=""; -Dflags=""; - -# default target to run in org.eclipse.$subprojectName.releng/builder/tests/scripts/test.xml -antTestTarget=all - -# process command line arguments -while [ $# -gt 0 ] -do - case "$1" in - -vmExecutable) vmExecutable="$2"; shift;; - -consolelog) consolelog="$2"; shift;; - -X*) Xflags=$Xflags\ $1;; - -D*) Dflags=$Dflags\ $1;; - esac - shift -done - -checkIfj9 () -{ -# given a series of -X flags, see if the string -Xj9 can be found - j9=$Xflags; - #echo "Xflags=$Xflags" - j9=${j9/\-Xj9/} # substring replacement - #echo "remaining: $j9" - if [ "$j9" != "$Xflags" ]; then # found it - j9="j9"; - else - j9=""; - fi -} -checkIfj9; - -defined=0; -checkIfDefined () -{ - if [ -f $1 ] ; then - defined=1; - else - defined=0; - fi -} - -execCmd () -{ - echo ""; echo "[relengbuild] [`date +%H\:%M\:%S`]"; - echo " $1" | perl -pe "s/ -/\n -/g"; - if [ "x$2" != "x" ]; then - $1 2>&1 | tee $2; - else - $1; - fi -} - -doFunction () -{ - cmd=$1; - params=$2 - for pth in "." "/bin" "/usr/bin" "/usr/bin/X11" "/usr/local/bin" "/usr/X11R6/bin" "`pwd`/../linux" ; do - defined=0; - checkIfDefined $pth/$cmd - if [ $defined -eq 1 ] ; then - $cmd $params - sleep 3 - break; - fi - done - if [ $defined -eq 0 ] ; then - echo "$cmd is not defined (command not found)"; - fi -} - -# these don't work on old build server, so not point wrapping them to say so when we can just omit -# doFunction Xvfb ":42 -screen 0 1024x768x24 -ac & " -# doFunction Xnest ":43 -display :42 -depth 24 & " -# doFunction fvwm2 "-display localhost:43.0 & " -#export DISPLAY=$HOSTNAME:43.0 -#ulimit -c unlimited - -getBuildID() -{ # given $PWD: /home/www-data/build/dsdp/$projectName/$subprojectName/downloads/drops/1.1.0/N200702112049/testing/N200702112049/testing - # return N200702110400 - buildID=$1; #echo "buildID=$buildID"; - buildID=${buildID##*drops\/}; # trim up to drops/ (from start) (substring notation) - buildID=${buildID%%\/test*}; # trim off /test (to end) (substring notation) - buildID=${buildID##*\/}; # trim up to / (from start) (substring notation) -} -buildID=""; getBuildID $PWD; #echo buildID=$buildID; - -getBranch() -{ # given $PWD: /home/www-data/build/dsdp/$projectName/$subprojectName/downloads/drops/1.1.0/N200702112049/testing/N200702112049/testing - # return 1.1.0 - branch=$1; #echo "branch=$branch"; - branch=${branch##*drops\/}; # trim up to drops/ (from start) (substring notation) - branch=${branch%%\/*}; # trim off / (to end) (substring notation) -} -branch=""; getBranch $PWD; #echo branch=$branch; - -############################# BEGIN RUN TESTS ############################# - - -# operating system, windowing system and architecture variables -# for *nix systems, os, ws and arch values must be specified -Dflags=$Dflags" "-Dplatform=linux.gtk -os=linux -ws=gtk -arch=x86 - -# default value to determine if eclipse should be reinstalled between running of tests -installmode="clean" - -#this value must be set when using rsh to execute this script, otherwise the script will execute from the user's home directory -dir=. -cd $dir -workspaceDir="$dir/eclipse/workspace" - -# Replace the boot eclipse (The eclipse used to run the main test.xml, this will start another eclipse later) -if [ -d $dir/eclipse ] ; then - rm -rf $dir/eclipse -fi -if [ -d $workspaceDir ] ; then - rm -rf $dir/workspace -fi - -echo "[runtests] Currently in `pwd`:" -# need conditional processing here: M3.0.2 = zip, I3.1.0 = tar.gz -sdks=`find $dir -name "eclipse-SDK-*"` -# get extension from file(s) -for sdk in $sdks; do - sdk="eclipse"${sdk##*eclipse}; # trim up to eclipse (substring notation) - #echo -n "[runtests] Eclipse SDK $sdk is a"; - ext=${sdk%%\.zip}; # trim off .zip (substring notation) - if [ "$ext" != "$sdk" ]; then # it's a zip - #echo " zip. Unpacking..."; - unzip -qq -o $sdk - else - ext=${sdk%%\.tar\.gz}; # trim off .tar.gz (substring notation) - if [ "$ext" != "$sdk" ]; then # it's a tar.gz - #echo " tar.gz. Unpacking..."; - tar -xzf $sdk - else - ext=${sdk%%\.tar\.Z}; # trim off .tar.Z (substring notation) - if [ "$ext" != "$sdk" ]; then # it's a tar.Z - #echo " tar.Z. Unpacking..."; - tar -xZf $sdk - else - echo "[runtests] ERROR: Eclipse SDK $sdk is an UNKNOWN file type. Failure."; - exit 2 - fi - fi - fi -done - -J2SE15flags=""; -# TODO: if a 1.5 JDK and want source/target = 1.5, leave these in -# TODO: if source/target = 1.4, remove these! -if [ ${JAVA_HOME##*1.5*}"" = "" -o ${JAVA_HOME##*15*}"" = "" -o ${JAVA_HOME##*5.0*}"" = "" -o ${JAVA_HOME##*50*}"" = "" ]; then - # set J2SE-1.5 properties (-Dflags) - bootclasspath="."`find $JAVA_HOME/jre/lib -name "*.jar" -printf ":%p"`; - J2SE15flags=$J2SE15flags" -DJ2SE-1.5=$bootclasspath" - J2SE15flags=$J2SE15flags" -DbundleBootClasspath=$bootclasspath" - J2SE15flags=$J2SE15flags" -DjavacSource=1.5" - J2SE15flags=$J2SE15flags" -DjavacTarget=1.5" - J2SE15flags=$J2SE15flags" -DbundleJavacSource=1.5" - J2SE15flags=$J2SE15flags" -DbundleJavacTarget=1.5" -fi - -# different ways to get the launcher and Main class -if [[ -f eclipse/startup.jar ]]; then - cpAndMain="eclipse/startup.jar org.eclipse.core.launcher.Main"; # up to M4_33 -elif [[ -f eclipse/plugins/org.eclipse.equinox.launcher.jar ]]; then - cpAndMain="eclipse/plugins/org.eclipse.equinox.launcher.jar org.eclipse.equinox.launcher.Main"; # M5_33 -else - cpAndMain=`find eclipse/ -name "org.eclipse.equinox.launcher_*.jar" | sort | head -1`" org.eclipse.equinox.launcher.Main"; -fi - -# run tests -echo "[runtests] [`date +%H\:%M\:%S`] Launching Eclipse (installmode = $installmode with -enableassertions turned on) ..." -execCmd "$JAVA_HOME/bin/java $Xflags -enableassertions -cp $cpAndMain -ws $ws -os $os -arch $arch \ --application org.eclipse.ant.core.antRunner -data $workspaceDir -file test.xml $antTestTarget \ -$Dflags -Dws=$ws -Dos=$os -Darch=$arch -D$installmode=true $J2SE15flags \ -$properties -logger org.apache.tools.ant.DefaultLogger" $consolelog; -echo "[runtests] [`date +%H\:%M\:%S`] Eclipse test run completed. " - -#import -window root screenshot1.png # save a snapshot - -############################# END RUN TESTS ############################# - -# supress errors by checking for the file first -if [ -r /tmp/.X43-lock ] ; then - kill `cat /tmp/.X43-lock` -fi -if [ -r /tmp/.X42-lock ] ; then - kill `cat /tmp/.X42-lock` -fi - -if [[ ! -d $PWD/results ]]; then - echo "[relengbuild] No test results found in $PWD/results!"; - echo "[relengbuild] Creating 'noclean' file to prevent cleanup after build completes." - echo "1" > $PWD/../../../noclean; -else -# if the build failed for some reason, don't clean up! -xmls=`find $PWD/results/xml -name "*.xml"`; -testsFailed=1; -for xml in $xmls; do - if [ $testsFailed -eq 1 ]; then - testsFailed=`cat $xml | grep -c "<testsuite errors=\"0\" failures=\"0\""` - if [ $testsFailed -lt 1 ]; then - echo "[relengbuild] Found test failure(s) in $xml!"; - echo "[relengbuild] Creating 'noclean' file to prevent cleanup after build completes." - echo "1" > $PWD/../../../noclean; - break; - fi - fi -done -fi; - -echo "[relengbuild] relengbuildgtk.sh completed on: `date +%Y%m%d\ %H\:%M\:%S`" - diff --git a/releng/org.eclipse.tm.releng/builder/tests/configs/local/testing.properties b/releng/org.eclipse.tm.releng/builder/tests/configs/local/testing.properties deleted file mode 100644 index 9dc29709e..000000000 --- a/releng/org.eclipse.tm.releng/builder/tests/configs/local/testing.properties +++ /dev/null @@ -1,57 +0,0 @@ -############################################################################### -# Copyright (c) 2005, 2008 IBM Corporation and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 -# which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html -# -# Contributors: -# IBM Corporation - initial API and implementation -# Martin Oberhuber (Wind River) - adapt for DSDP from o.e.emf.validation.releng -############################################################################### -#which (sub)project? -project=rse - -#target to call in test.xml: runtests-local | runtests-remote -testTarget=runtests-local - -#directory on test machine where automated testing framework will be installed -testDir=${testBase}/${buildLabel} - -#name of zip file containing automated testing framework and JUnit test plug-ins -testFramework=RSE-automated-tests-${buildAlias}.zip - -#directory where test scripts are launched -executionDir=${testDir}/testing - -#name of runtime to install and test -runtime=RSE-SDK-${buildAlias}.zip - -# leave this blank and it will be generated by genBuildDetails.sh -javaHome=%%JAVA_HOME%% -vmExecutable=${javaHome}/bin/java - -#hack to override unneeded function in releng.basebuilder/plugins/org.eclipse.build.tools/scripts/test.xml -vmUrl= -vmDest=/dev/null -vmInstallExecutable=${vmExecutable} -vmInstallCommand=-version - -#eclipse platforms: win32 | linux.motif | linux.gtk | aix.motif | hpux.motif |solaris.motif -platform=${baseos}.${basews} - -#name of file that captures console output from running JUnit plug-in tests -consolelog=${baseos}.${basews}_consolelog.txt - -#Works with IBM and Sun JDKs, 1.4+ -#name of script to execute -testExecutable=bash - -#arguments to $(testExecutable) - .sh script + args -args=${executionDir}/${shell} -vmExecutable ${vmExecutable} -consolelog ${consolelog} ${Xflags} ${Dflags} - -#TODO: set vm-specific flags -#Xflags=-Xms64M -Xmx192M -Xflags=-Xms256M -Xmx256M -Dflags= - diff --git a/releng/org.eclipse.tm.releng/builder/tests/customTargets.xml b/releng/org.eclipse.tm.releng/builder/tests/customTargets.xml deleted file mode 100644 index 7fa3c3a3e..000000000 --- a/releng/org.eclipse.tm.releng/builder/tests/customTargets.xml +++ /dev/null @@ -1,275 +0,0 @@ -<project name="Build specific targets and properties" default="noDefault" basedir="."> - -<!-- ===================================================================== --> -<!-- Run a given ${target} on all elements being built --> -<!-- ===================================================================== --> -<target name="allElements"> - <ant antfile="${genericTargets}" target="${target}" > - <property name="type" value="feature" /> - <property name="id" value="org.eclipse.rse.tests" /> - </ant> - <ant antfile="${genericTargets}" target="${target}" > - <property name="type" value="feature" /> - <property name="id" value="org.eclipse.tm.terminal.test" /> - </ant> -</target> - -<!-- ===================================================================== --> -<!-- Targets to assemble the built elements for particular configurations --> -<!-- These generally call the generated assemble scripts (named in --> -<!-- ${assembleScriptName}) but may also add pre and post processing --> -<!-- Add one target for each root element and each configuration --> -<!-- ===================================================================== --> - -<target name="assemble.org.eclipse.rse.tests"> - <property name="archiveName" value="RSE-junit-tests-${buildAlias}.zip"/> - <ant antfile="${assembleScriptName}"/> -<!-- ADD POST STEPS --> -</target> -<target name="assemble.org.eclipse.tm.terminal.test"> - <property name="archiveName" value="TM-terminal-junit-tests-${buildAlias}.zip"/> - <ant antfile="${assembleScriptName}"/> -<!-- ADD POST STEPS --> -</target> - - -<!-- ===================================================================== --> -<!-- Check out map files from correct repository --> -<!-- Replace values for cvsRoot, package and mapVersionTag as desired. --> -<!-- ===================================================================== --> -<target name="checkLocal"> - <available property="mapsLocal" file="${buildDirectory}/maps" /> -</target> - -<target name="getMapFiles" depends="checkLocal" unless="mapsLocal"> - - <!-- *** change the repo info --> - <property name="mapCvsRoot" value=":${cvsReadProtocol}:${cvsReadUser}@${cvsHost}:${cvsRep}" /> - <property name="mapVersionTag" value="HEAD" /> - <!-- <property name="packagePath" value="org.eclipse.${projectName}/org.eclipse.${subprojectName2}.releng/maps"/> --> - <property name="packagePath" value="org.eclipse.${projectName}.${subprojectName2}/releng/org.eclipse.${projectName}.releng/maps"/> - - <cvs cvsRsh="ssh" cvsRoot="${mapCvsRoot}" tag="${mapVersionTag}" - package="${packagePath}" dest="${buildDirectory}/maps" /> - <copy todir="${buildDirectory}/maps/CVS" overwrite="true"> - <fileset dir="${buildDirectory}/maps/${packagePath}/CVS" /> - </copy> - <copy todir="${buildDirectory}/maps" overwrite="true"> - <fileset dir="${buildDirectory}/maps/${packagePath}" /> - </copy> - <delete dir="${buildDirectory}/maps/org.eclipse.${projectName}" /> - - <!--tag the map files project--> - <antcall target="tagMapFiles" /> -</target> - -<target name="tagMapFiles" if="tagMaps"> - <cvs dest="${buildDirectory}/maps/org.eclipse.${subprojectName2}" command="tag v${timestamp}" /> -</target> - -<!-- ===================================================================== --> -<!-- Steps to do before setup --> -<!-- ===================================================================== --> -<target name="preSetup"> -</target> - -<!-- ===================================================================== --> -<!-- Steps to do after setup but before starting the build proper --> -<!-- ===================================================================== --> -<target name="postSetup"> - <ant target="getDependency" antfile="${buildDirectory}/../org.eclipse.modeling.common.releng/scripts/getDependencies.xml"> - <property name="url" value="${eclipseURL}" /> - <property name="file" value="${eclipseFile}" /> - <property name="isUnpackedFile" value="${buildDirectory}/plugins/org.eclipse.platform.doc.isv/plugin.xml" /> - </ant> - <!-- Important: This must be the last dependency downloaded, because the - getDependency target strips versions from all plug-ins --> - <ant target="getBundle" antfile="${buildDirectory}/../org.eclipse.modeling.common.releng/scripts/getDependenciesHelper.xml"> - <property name="url" value="${orbitURL}" /> - <property name="file" value="${orbitFile}" /> - </ant> - <unzip dest="${buildDirectory}/.." src="${downloadsDir}/${orbitFile}"> - <patternset> - <include name="**/org.apache.oro*.jar" /> - <include name="**/org.apache.commons.net*.jar" /> - </patternset> - </unzip> -</target> - -<!-- ===================================================================== --> -<!-- Steps to do before fetching the build elements --> -<!-- ===================================================================== --> -<target name="preFetch"> -</target> - -<!-- ===================================================================== --> -<!-- Steps to do after the fetch --> -<!-- ===================================================================== --> -<target name="postFetch"> - <replace dir="${buildDirectory}/plugins" value="${timestamp}" token="@buildid@"> - <include name="**/about.mappings" /> - </replace> -</target> - -<!-- ===================================================================== --> -<!-- Steps to do before generating build scripts --> -<!-- ===================================================================== --> -<target name="preGenerate"> -</target> - -<!-- ===================================================================== --> -<!-- Steps to do after generating the build scripts --> -<!-- ===================================================================== --> -<target name="postGenerate"> - <antcall target="clean" /> -</target> - -<!-- ===================================================================== --> -<!-- Steps to do before assembling --> -<!-- ===================================================================== --> -<target name="preAssemble"> -</target> - -<!-- ===================================================================== --> -<!-- Steps to do after assembling--> -<!-- ===================================================================== --> -<target name="postAssemble"> -</target> - -<!-- ===================================================================== --> -<!-- Steps to do before running the build.xmls for the elements being built. --> -<!-- ===================================================================== --> -<target name="preProcess"> - <replace dir="${buildDirectory}/plugins" value="${timestamp}" token="@build@"> - <include name="**/about.mappings" /> - </replace> -</target> - -<!-- ===================================================================== --> -<!-- Steps to do after running the build.xmls for the elements being built. --> -<!-- ===================================================================== --> -<target name="postProcess"> - <condition property="logsAvailable"> - <istrue value="${javacVerbose}"/> - </condition> - <antcall target="gatherLogs" /> -</target> - -<!-- ===================================================================== --> -<!-- Steps to do after everything is built and assembled --> -<!-- (e.g., testing, posting, emailing, ...) --> -<!-- ===================================================================== --> -<target name="postBuild"> - <antcall target="packageTestFramework" /> -</target> - -<!-- ===================================================================== --> -<!-- Helper targets --> -<!-- ===================================================================== --> -<target name="gatherLogs" if="logsAvailable"> - <mkdir dir="${buildDirectory}/${buildLabel}/compilelogs" /> - <antcall target="allElements"> - <param name="target" value="gatherLogs" /> - </antcall> - - <unzip dest="${buildDirectory}/${buildLabel}/compilelogs" overwrite="true"> - <fileset dir="${buildDirectory}/features/org.eclipse.rse.tests"> - <include name="*.log.zip" /> - </fileset> - <fileset dir="${buildDirectory}/features/org.eclipse.tm.terminal.test"> - <include name="*.log.zip" /> - </fileset> - </unzip> -</target> - -<target name="clean" unless="noclean"> - <antcall target="allElements"> - <param name="target" value="cleanElement" /> - </antcall> -</target> - -<target name="packageTestFramework"> - <!--package automated test framework used in RSE builds--> - - <property name="workingDirectory" value="${buildDirectory}/test.assembly" /> - <echo message="workingDirectory: ${workingDirectory}"/> - - <!--unzip the junit tests--> - <mkdir dir="${workingDirectory}/eclipse" /> - <unzip dest="${workingDirectory}" overwrite="true"> - <fileset dir="${buildDirectory}/${buildLabel}"> - <include name="**/RSE-junit-tests*.zip"/> - <include name="**/TM-terminal-junit-tests*.zip"/> - </fileset> - </unzip> - - <!-- create top level testing directory--> - <delete dir="${workingDirectory}/testing"/> - <mkdir dir="${workingDirectory}/testing" /> - - <!--compile the tool used to generate the test.properties file, then run it.--> - <!--test.properties maps test plugin id's to the name of the plugin directory--> - - <!--eclipse.home is relative to the scripts directory in the org.eclipse.pde.build plugin. Assume the plugins used in the classpath are in the same directory as org.eclipse.pde.build--> - <property name="eclipse.home" value="../../.." /> - - <generateTestProperties - buildDirectory="${buildDirectory}" - featureId="org.eclipse.rse.tests" - outputFile="${workingDirectory}/testing/test.properties" - /> - <generateTestProperties - buildDirectory="${buildDirectory}" - featureId="org.eclipse.tm.terminal.test" - outputFile="${workingDirectory}/testing/test2.properties" - /> - - - <!--load the property file created with the directory names for all test plugins--> - <property file="${workingDirectory}/testing/test.properties" /> - <property file="${workingDirectory}/testing/test2.properties" /> - - <!-- Remove the plugin version number appended to the org.eclipse.test plugin directory. - This is so that contributors of test.xml's do not have to update their paths to - library.xml in org.eclipse.test whenever its version is updated. - --> - <move todir="${workingDirectory}/eclipse/plugins/org.eclipse.test"> - <fileset dir="${workingDirectory}/eclipse/plugins/${org.eclipse.test}" /> - </move> - - <!--the Ant move task leaves behind an empty directory--> - <delete dir="${workingDirectory}/eclipse/plugins/${org.eclipse.test}" includeEmptyDirs="true" /> - - <!-- rezip the JUnit plugin tests --> - <zip destfile="${workingDirectory}/testing/RSE-junit-tests-${buildAlias}.zip"> - <zipfileset dir="${workingDirectory}/eclipse" prefix="eclipse"/> - </zip> - - <!--Copy scripts and doc used in the automated testing to the testing directory--> - <copy todir="${workingDirectory}/testing"> - <fileset dir="${buildDirectory}/plugins/org.eclipse.test" includes="testframework.html,JUNIT.XSL" /> - </copy> - <copy todir="${workingDirectory}/testing"> - <fileset dir="${builderDirectory}/scripts" /> - </copy> - - <!--copy in the file containing the URL of the Eclipse build used for testing--> - <copy todir="${workingDirectory}/testing" file="${buildDirectory}/../build.cfg" /> - - <!--create zip file of the automated testing framework--> - <zip destfile="${buildDirectory}/${buildLabel}/RSE-automated-tests-${buildAlias}.zip"> - <zipfileset dir="${workingDirectory}/testing" prefix="testing"/> - </zip> - - <delete file="${buildDirectory}/${buildLabel}/RSE-junit-tests-${buildAlias}.zip" /> - <delete file="${buildDirectory}/${buildLabel}/TM-terminal-junit-tests-${buildAlias}.zip" /> -</target> - -<!-- ===================================================================== --> -<!-- Default target --> -<!-- ===================================================================== --> -<target name="noDefault"> - <echo message="You must specify a target when invoking this file" /> -</target> - -</project> diff --git a/releng/org.eclipse.tm.releng/builder/tests/scripts/readme.html b/releng/org.eclipse.tm.releng/builder/tests/scripts/readme.html deleted file mode 100644 index 628cbca98..000000000 --- a/releng/org.eclipse.tm.releng/builder/tests/scripts/readme.html +++ /dev/null @@ -1,162 +0,0 @@ -<html> -<head> -<title>Instructions</title> -<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> -</head> - -<body bgcolor="#FFFFFF" text="#000000"> -<font size="+2"> Automated Testing of DSDP Project Builds</font> -<p>last updated: November 9, 2005</p> -<p><font size="+1">Description</font></p> -<p>This document describes how to run the your project's JUnit test plugins from the command - line. This is the same mechanism used in the builds.</p> -<p>Click <a href="testframework.html">here</a> for a description of the testing - framework, and how it can be used outside of the setup described here.</p> -<p>If you simply wish to write and run JUnit tests interactively from an Eclipse - workbench, try one of the links below:</p> -<p><a href="http://dev.eclipse.org/viewcvs/index.cgi/%7Echeckout%7E/jdt-ui-home/plugins/org.eclipse.jdt.junit/index.html">JUnit - Support in Eclipse</a><br> -<a href="http://dev.eclipse.org:8080/help/content/help:/org.eclipse.jdt.doc.user/tasks/tasks-207.htm?resultof=%6a%75%6e%69%74%20&toc=%2Forg.eclipse.jdt.doc.user%2Ftoc.xml">Using - JUnit</a></p> - -<p><font size="+1">Requirements</font></p> -<p>1. All test machines must have a java runtime environment (version 1.3.1) installed and added to the path environment variable (see - <a href="#vm">-vm</a> parameter below).<br> - 2. <a href="http://www.info-zip.org/pub/infozip/UnZip.html">Info-ZIP UnZip</a> - version 5.41 or later installed and added to the path.<br> - 3. The Automated Test feature from a - <a href="http://www.eclipse.org/dsdp/tm">downloads</a>. - This contains the test framework plugins and the JUnit test plugins to run.<br> - 4. The zip file from the same build as the Automated Test feature. You can use the RSE-*-SDK zip file instead of the individual files.<br> - 5. An Eclipse SDK zip file. The URL and build name of the required builds - are specified in the build.cfg file included in the Automated Test zip file.</p> -<p><font size="+1">Setup</font></p> -<p>1. Extract the RSE-*-automated-tests-<buildid>.zip. On Window, extract - this file close to the root of the drive to prevent some path names from exceeding - the 255 character limit. This will create a top-level directory "<i>testing</i>".<br> - 2. Place the Eclipse SDK zip file and the project's runtime in the <i>testing</i> directory. - Do not unzip these files. (The test scripts will take care of this)<br> -</p> -<p><font size="+1">Running Tests</font></p> -<p>1. cd to the <i>testing</i> directory<br> - 2. Run the following script:</p> -<p><b>runtests.sh [-os <operating system>] [-ws <windowing system>] [-arch - <architecture>] [-noclean] [<testTarget>][-properties <path>][-vm - <path to java executable>]</b></p> -All parameters and targets are optional on windows systems. Just running "runtests.sh" -will run <b>ALL</b> tests on Windows, installing a clean Eclipse and your project's SDK between -each test target. On *nix systems, the os, ws and arch parameters must be specified. -<br> -<br> -Test results are placed in the <i>testing</i>/<i>results</i> directory in xml and html format.<br> -<p><font size="+1"><a name="vm"></a>Parameters</font></p> -<table width="90%" border="1"> - <tr> - <td>Parameter</td> - <td>Description</td> - </tr> - <tr> - <td>-os <operating system></td> - <td>The OS the tests are being run on. One of: aix, hpux, linux, qnx, solaris, - win32. <b>Default win32</b></td> - </tr> - <tr> - <td>-ws <windowing system></td> - <td>The windowing system the tests are being run on. One of: motif, gtk, photon, - win32. <b>Default win32</b></td> - </tr> - <tr> - <td>-arch <architecture></td> - <td>The architecture the tests are being run on. One of: ppc, PA_RISC, x86, - sparc. <b>Default x86</b></td> - </tr> - <tr> - <td>-noclean</td> - <td>Run tests without installing an Eclipse and GEF SDK and tests between - test targets. Default is to re-install these between test targets.</td> - </tr> - <tr> - <td>-properties</td> - <td>Used to reference a properties file containing additional Ant properties - used in running tests.Can be used to pass additional vm arguments to the - Java virtual machine running the tests by adding the entry "extraVMargs=<the - args to pass to the vm>" to the specified properties file.</td> - </tr> - <tr> - <td>-vm</td> - <td>The full path to the java executable with which to run the tests. Use - this to specify a specific virtual machine with which to run the tests. - For example, "-vm c:\sun131\jre\bin\java". Default set to "java" - (i.e. java executable on system path). </td> - </tr> -</table> - -<p><font size="+1">Test Targets</font></p> -<p>Specifies which ant target to run in the main test.xml. Typically this corresponds - to a test project's tests. If you do not specify a test target then the <b>all</b> - test target is run.</p> - -<table width="90%" border="1"> - <tr> - <td>all</td> - <td>Runs all the targets below.</td> - </tr> - <tr> - <td>rse</td> - <td>Runs the JUnit tests located in the test plug-ins</td> - </tr> - <tr> - <td>genHtml</td> - <td>Converts xml test results in the "<i>testing</i>/<i>results</i>" directory - to html.</td> - </tr> -</table> -<p> </p> -<p><font size="+1"><a name="appendixb"></a>Appendix A- Supported os, ws, and arch - value combinations</font></p> -<p>The following table contains the values that can be used with the -os, -ws, - and -arch switches.</p> -<table width="75%" border="1"> - <tr> - <td>Operating System (os)</td> - <td>Windowing System (ws)</td> - <td>Architecture (arch)</td> - </tr> - <tr> - <td>aix</td> - <td>motif</td> - <td>ppc</td> - </tr> - <tr> - <td>hpux</td> - <td>motif</td> - <td>PA_RISC</td> - </tr> - <tr> - <td>linux</td> - <td>gtk</td> - <td>x86</td> - </tr> - <tr> - <td>linux</td> - <td>motif</td> - <td>x86</td> - </tr> - <tr> - <td height="24">qnx</td> - <td height="24">photon</td> - <td height="24">x86</td> - </tr> - <tr> - <td>solaris</td> - <td>motif</td> - <td>sparc</td> - </tr> - <tr> - <td>win32</td> - <td>win32</td> - <td>x86</td> - </tr> -</table> -</body> -</html> diff --git a/releng/org.eclipse.tm.releng/builder/tests/scripts/test.xml b/releng/org.eclipse.tm.releng/builder/tests/scripts/test.xml deleted file mode 100644 index 0583e3d30..000000000 --- a/releng/org.eclipse.tm.releng/builder/tests/scripts/test.xml +++ /dev/null @@ -1,118 +0,0 @@ -<project name="Automated Testing" default="all" basedir="." > - - <!--properties file containing the plugin directory name including version number--> - <property file="test.properties" /> - - <!-- urls and such from the build --> - <property file="${basedir}/../../../build.cfg" /> - - <!--default directory where test-eclipse will be installed--> - <property name="install" value="${basedir}/target" /> - - <!--name that can be added to report name to identify which platform tests results come from--> - <property name="platform" value="" /> - - <!-- The root of the eclipse installation --> - <property name="eclipse-home" value="${install}/eclipse" /> - - <!-- The directory that will contain the xml and html results from the tests that are run --> - <property name="results" value="${basedir}/results" /> - - <target name="setup" if="clean" description="Reinstall the test Eclipse installation if specified by user"> - <delete dir="${install}" /><mkdir dir="${install}" /> - - <!-- TODO: if your project requires more dependencies, add them here --> - <echo message="Download, then unpack: Eclipse, EMF ..." /> - <property name="common.releng.dir" value="${basedir}/../../../org.eclipse.modeling.common.releng"/> - <property name="getTestDependencies.xml" value="${common.releng.dir}/scripts/getTestDependencies.xml"/> - <ant target="getTestDependency" antfile="${getTestDependencies.xml}" dir="${common.releng.dir}"> - <property name="url" value="${eclipseURL}" /> - <property name="file" value="${eclipseFile}" /> - <property name="unpackDest" value="${install}"/> - </ant> - <ant target="getTestDependency" antfile="${getTestDependencies.xml}" dir="${common.releng.dir}"> - <property name="url" value="${emfURL}" /> - <property name="file" value="${emfFile}" /> - <property name="unpackDest" value="${install}"/> - </ant> - <ant target="getTestDependency" antfile="${getTestDependencies.xml}" dir="${common.releng.dir}"> - <property name="url" value="${orbitURL}" /> - <property name="file" value="${orbitFile}" /> - <property name="unpackDest" value="${install}"/> - </ant> - - <property name="dir" location="."/> - <echo message="Unpack SDK + JUnit Tests (${dir}/RSE-*.zip) ..."/> - <unzip dest="${install}" overwrite="true"> - <fileset dir="${dir}"> - <include name="**/RSE-*.zip"/> - <include name="**/TM-terminal-*.zip"/> - </fileset> - </unzip> - </target> - - <target name="runtests" depends="setup" description="Runs ant on the test.xml for a specified plugin. Requires a property value setting for testPlugin only if test.properties is not available. The property testPlugin represents a directory name made up of the plugin id and plugin version. This directory must contain a valid test.xml."> - <echo message="Running test.xml from jarfile ${eclipse-home}/plugins/${testPlugin} ... "/> - <ant antfile="${eclipse-home}/plugins/${testPlugin}/test.xml" dir="${eclipse-home}"/> - <copy file="${eclipse-home}/${report}.xml" tofile="${results}/xml/${report}_${platform}.xml" /> - </target> - - <target name="unjarPlugin" depends="setup"> - <echo message="Unpack ${eclipse-home}/plugins/${testPlugin}.jar to ${eclipse-home}/plugins/${testPlugin} ... "/> - <move file="${eclipse-home}/plugins/${testPlugin}.jar" tofile="${eclipse-home}/plugins/${testPlugin}_.jar"/> - <unjar src="${eclipse-home}/plugins/${testPlugin}_.jar" dest="${eclipse-home}/plugins/${testPlugin}"/> - <delete file="${eclipse-home}/plugins/${testPlugin}_.jar"/> - </target> - - <target name="dontUnjarPlugin" depends="setup"> - <echo message="${eclipse-home}/plugins/${testPlugin} is not a jarred plugin. No unpack required!"/> - </target> - - <target name="rse" description="Runs the test.xml of the rse.tests plugin"> - <antcall target="dontUnjarPlugin"> - <param name="testPlugin" value="${org.eclipse.rse.tests}" /> - </antcall> - <antcall target="runtests"> - <param name="testPlugin" value="${org.eclipse.rse.tests}" /> - <param name="report" value="org.eclipse.rse.tests" /> - </antcall> - - <!-- test if chkpii script exists before proceeding --> - <property name="common.releng.dir" value="${basedir}/../../../org.eclipse.modeling.common.releng"/> - <property name="chkpii.xml" value="${common.releng.dir}/scripts/chkpii.xml"/> - <available file="${chkpii.xml}" property="chkpiiXMLAvailable"/> - <antcall target="runChkpii"/> - </target> - - <target name="terminal" description="Runs the test.xml of the tm.terminal.test plugin"> - <antcall target="unjarPlugin"> - <param name="testPlugin" value="${org.eclipse.tm.terminal.test}" /> - </antcall> - <antcall target="runtests"> - <param name="testPlugin" value="${org.eclipse.tm.terminal.test}" /> - <param name="report" value="org.eclipse.tm.terminal.test" /> - </antcall> - - <!-- test if chkpii script exists before proceeding --> - <property name="common.releng.dir" value="${basedir}/../../../org.eclipse.modeling.common.releng"/> - <property name="chkpii.xml" value="${common.releng.dir}/scripts/chkpii.xml"/> - <available file="${chkpii.xml}" property="chkpiiXMLAvailable"/> - <antcall target="runChkpii"/> - </target> - - <target name="runChkpii" if="chkpiiXMLAvailable"> - <ant target="chkpii" antfile="${chkpii.xml}" inheritall="true"> - <property name="zipPattern" value="RSE-*.zip"/> - </ant> - </target> - - <target name="all"> - <antcall target="rse" /> - <antcall target="terminal" /> - <antcall target="genHtml" /> - </target> - - <target name="genHtml" description="Generates HTML results with provided JUNIT.XSL provided"> - <style style="JUNIT.XSL" basedir="${results}/xml" destdir="${results}/html" /> - </target> -</project> diff --git a/releng/org.eclipse.tm.releng/maps/build.cfg b/releng/org.eclipse.tm.releng/maps/build.cfg deleted file mode 100644 index 28178b1d3..000000000 --- a/releng/org.eclipse.tm.releng/maps/build.cfg +++ /dev/null @@ -1 +0,0 @@ -# this file's contents are generated
\ No newline at end of file diff --git a/releng/org.eclipse.tm.releng/maps/discovery.map b/releng/org.eclipse.tm.releng/maps/discovery.map deleted file mode 100644 index 5c596b495..000000000 --- a/releng/org.eclipse.tm.releng/maps/discovery.map +++ /dev/null @@ -1,10 +0,0 @@ -feature@org.eclipse.tm.discovery=v20080530,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/discovery/org.eclipse.tm.discovery-feature -plugin@org.eclipse.rse.discovery=v20080402,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/discovery/org.eclipse.rse.discovery -plugin@org.eclipse.tm.discovery.doc.isv=v20080406,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/discovery/org.eclipse.tm.discovery.doc.isv -plugin@org.eclipse.tm.discovery.engine=v20080331,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/discovery/org.eclipse.tm.discovery.engine -plugin@org.eclipse.tm.discovery.model=v20080331,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/discovery/org.eclipse.tm.discovery.model -plugin@org.eclipse.tm.discovery.model.edit=v20080522,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/discovery/org.eclipse.tm.discovery.model.edit -plugin@org.eclipse.tm.discovery.protocol.dnssd=v20080331,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/discovery/org.eclipse.tm.discovery.protocol.dnssd -plugin@org.eclipse.tm.discovery.transport.udp=v20080331,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/discovery/org.eclipse.tm.discovery.transport.udp -plugin@org.eclipse.tm.discovery.view=v20080522,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/discovery/org.eclipse.tm.discovery.view -plugin@org.eclipse.tm.discovery.wizard=v20080529,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/discovery/org.eclipse.tm.discovery.wizard
\ No newline at end of file diff --git a/releng/org.eclipse.tm.releng/maps/rse.map b/releng/org.eclipse.tm.releng/maps/rse.map deleted file mode 100644 index 4087c3200..000000000 --- a/releng/org.eclipse.tm.releng/maps/rse.map +++ /dev/null @@ -1,64 +0,0 @@ -!*************** PROJECT CONTRIBUTION ******************************************************** -!*** Project's plugins, features and fragments -feature@org.eclipse.rse=v20080605,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/features/org.eclipse.rse-feature -feature@org.eclipse.rse.core=v20080604,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/features/org.eclipse.rse.core-feature -feature@org.eclipse.rse.dstore=v20080604,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/features/org.eclipse.rse.dstore-feature -feature@org.eclipse.rse.examples=v20080604,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/examples/org.eclipse.rse.examples-feature -feature@org.eclipse.rse.ftp=v20080605,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/features/org.eclipse.rse.ftp-feature -feature@org.eclipse.rse.local=v20080604,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/features/org.eclipse.rse.local-feature -feature@org.eclipse.rse.remotecdt=v20080604,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/features/org.eclipse.rse.remotecdt-feature -feature@org.eclipse.rse.sdk=v20080605,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/features/org.eclipse.rse.sdk-feature -feature@org.eclipse.rse.ssh=v20080604,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/features/org.eclipse.rse.ssh-feature -feature@org.eclipse.rse.telnet=v20080604,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/features/org.eclipse.rse.telnet-feature -feature@org.eclipse.rse.terminals=v20080605,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/features/org.eclipse.rse.terminals-feature -feature@org.eclipse.rse.tests=v20080605,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/tests/org.eclipse.rse.tests-feature -feature@org.eclipse.rse.useractions=v20080604,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/features/org.eclipse.rse.useractions-feature -plugin@org.eclipse.dstore.core=v20080604,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.dstore.core -plugin@org.eclipse.dstore.doc.isv=v20080604,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/doc/org.eclipse.dstore.doc.isv -plugin@org.eclipse.dstore.extra=v20080406,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.dstore.extra -plugin@org.eclipse.rse=v20080529,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse -plugin@org.eclipse.rse.connectorservice.dstore=v20080526,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.connectorservice.dstore -plugin@org.eclipse.rse.connectorservice.local=v20080604,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.connectorservice.local -plugin@org.eclipse.rse.connectorservice.ssh=v20080604,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.connectorservice.ssh -plugin@org.eclipse.rse.connectorservice.telnet=v20080604,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.connectorservice.telnet -plugin@org.eclipse.rse.core=v20080604,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.core -plugin@org.eclipse.rse.doc.isv=v20080604,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/doc/org.eclipse.rse.doc.isv -plugin@org.eclipse.rse.doc.user=v20080604,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/doc/org.eclipse.rse.doc.user -plugin@org.eclipse.rse.dstore.security=v20080604,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.dstore.security -plugin@org.eclipse.rse.efs=v20080604,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.efs -plugin@org.eclipse.rse.efs.ui=v20080604,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.efs.ui -plugin@org.eclipse.rse.examples.daytime=v20080604,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/examples/org.eclipse.rse.examples.daytime -plugin@org.eclipse.rse.examples.tutorial=v20080604,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/examples/org.eclipse.rse.examples.tutorial -plugin@org.eclipse.rse.files.ui=v20080604,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.files.ui -plugin@org.eclipse.rse.importexport=v20080604,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.importexport -plugin@org.eclipse.rse.processes.ui=v20080604,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.processes.ui -plugin@org.eclipse.rse.remotecdt=v20080602,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/examples/org.eclipse.rse.remotecdt -plugin@org.eclipse.rse.sdk=v20080529,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.sdk -plugin@org.eclipse.rse.services.dstore=v20080604,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.services.dstore -plugin@org.eclipse.rse.services.files.ftp=v20080605,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.services.files.ftp -plugin@org.eclipse.rse.services.local=v20080604,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.services.local -plugin@org.eclipse.rse.services.ssh=v20080604,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.services.ssh -plugin@org.eclipse.rse.services.telnet=v20080604,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.services.telnet -plugin@org.eclipse.rse.services=v20080604,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.services -plugin@org.eclipse.rse.shells.ui=v20080602,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.shells.ui -plugin@org.eclipse.rse.subsystems.files.core=v20080604,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.files.core -plugin@org.eclipse.rse.subsystems.files.dstore=v20080604,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.files.dstore -plugin@org.eclipse.rse.subsystems.files.ftp=v20080605,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.files.ftp -plugin@org.eclipse.rse.subsystems.files.local=v20080604,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.files.local -plugin@org.eclipse.rse.subsystems.files.ssh=v20080604,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.files.ssh -plugin@org.eclipse.rse.subsystems.processes.core=v20080529,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.processes.core -plugin@org.eclipse.rse.subsystems.processes.dstore=v20080604,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.processes.dstore -plugin@org.eclipse.rse.subsystems.processes.local=v20080604,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.processes.local -plugin@org.eclipse.rse.subsystems.processes.shell.linux=v20080604,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.processes.shell.linux -plugin@org.eclipse.rse.subsystems.shells.core=v20080604,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.shells.core -plugin@org.eclipse.rse.subsystems.shells.dstore=v20080604,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.shells.dstore -plugin@org.eclipse.rse.subsystems.shells.local=v20080604,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.shells.local -plugin@org.eclipse.rse.subsystems.shells.ssh=v20080604,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.shells.ssh -plugin@org.eclipse.rse.subsystems.shells.telnet=v20080604,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.shells.telnet -plugin@org.eclipse.rse.subsystems.terminals.core=v20080505,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.terminals.core -plugin@org.eclipse.rse.subsystems.terminals.ssh=v20080604,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.terminals.ssh -plugin@org.eclipse.rse.terminals.ui=v20080604,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.terminals.ui -plugin@org.eclipse.rse.tests=v20080605,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/tests/org.eclipse.rse.tests -plugin@org.eclipse.rse.tests.framework=v20080604,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/tests/org.eclipse.rse.tests.framework -plugin@org.eclipse.rse.ui=v20080604,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.ui -plugin@org.eclipse.rse.useractions=v20080604,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.useractions
\ No newline at end of file diff --git a/releng/org.eclipse.tm.releng/maps/terminal.map b/releng/org.eclipse.tm.releng/maps/terminal.map deleted file mode 100644 index cb38bb733..000000000 --- a/releng/org.eclipse.tm.releng/maps/terminal.map +++ /dev/null @@ -1,13 +0,0 @@ -feature@org.eclipse.tm.terminal=v20080505,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal-feature -feature@org.eclipse.tm.terminal.sdk=v20080530,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal.sdk-feature -feature@org.eclipse.tm.terminal.serial=v20080506,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal.serial-feature -feature@org.eclipse.tm.terminal.ssh=v20080530,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal.ssh-feature -feature@org.eclipse.tm.terminal.telnet=v20080530,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal.telnet-feature -feature@org.eclipse.tm.terminal.test=v20080530,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal.test-feature -feature@org.eclipse.tm.terminal.view=v20080507,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal.view-feature -plugin@org.eclipse.tm.terminal=v20080505,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal -plugin@org.eclipse.tm.terminal.serial=v20080506,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal.serial -plugin@org.eclipse.tm.terminal.ssh=v20080529,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal.ssh -plugin@org.eclipse.tm.terminal.telnet=v20080521,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal.telnet -plugin@org.eclipse.tm.terminal.test=v20080416,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal.test -plugin@org.eclipse.tm.terminal.view=v20080507,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal.view
\ No newline at end of file diff --git a/releng/org.eclipse.tm.releng/maps/testdrivers.map b/releng/org.eclipse.tm.releng/maps/testdrivers.map deleted file mode 100644 index 6ef4354c7..000000000 --- a/releng/org.eclipse.tm.releng/maps/testdrivers.map +++ /dev/null @@ -1,6 +0,0 @@ -!*************** PROJECT CONTRIBUTION ******************************************************** - -!*** Special entries from eclipse - -plugin@org.eclipse.test=v20071108,:pserver:anonymous@dev.eclipse.org:/cvsroot/eclipse, -fragment@org.eclipse.ant.optional.junit=v20070530,:pserver:anonymous@dev.eclipse.org:/cvsroot/eclipse, diff --git a/releng/org.eclipse.tm.releng/maps/wince.map b/releng/org.eclipse.tm.releng/maps/wince.map deleted file mode 100644 index b0e0b2678..000000000 --- a/releng/org.eclipse.tm.releng/maps/wince.map +++ /dev/null @@ -1,5 +0,0 @@ -feature@org.eclipse.rse.wince=v20080604,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/wince/org.eclipse.rse.wince-feature -plugin@org.eclipse.rse.subsystems.wince=v20080604,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/wince/org.eclipse.rse.subsystems.wince -plugin@org.eclipse.tm.rapi=v20080522,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/wince/org.eclipse.tm.rapi -plugin@org.eclipse.tm.rapi.examples=v20080522,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/wince/org.eclipse.tm.rapi.examples -plugin@org.eclipse.tm.rapi.tests=v20080522,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/wince/org.eclipse.tm.rapi.tests
\ No newline at end of file diff --git a/releng/org.eclipse.tm.releng/promoteToEclipse.rse.properties b/releng/org.eclipse.tm.releng/promoteToEclipse.rse.properties deleted file mode 100644 index fc7e8448e..000000000 --- a/releng/org.eclipse.tm.releng/promoteToEclipse.rse.properties +++ /dev/null @@ -1,175 +0,0 @@ -############################################################################### -# Copyright (c) 2006, 2008 IBM Corporation and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 -# which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html -# -# Contributors: -# IBM Corporation - initial API and implementation -# Martin Oberhuber (Wind River) - adapt for DSDP from o.e.emf.validation.releng -############################################################################### -## promoteToEclipse.*.properties -## specific version of promoteToEclipse.sh properties -## -## NOTE: -## You must rename this file to promoteToEclipse.$subprojectName.properties for it to be -## found when using the -sub flag; otherwise you'll have to use the -f flag to specify -## a CUSTOM-named properties file - -# product being built (folder name prefix) -projectName=tm -subprojectName=rse -projectNameVanity=`echo $projectName $subprojectName | tr "a-z" "A-Z"`; # or something else manually assigned - -# used to determine the actual name of the SDK zip (when builds are aliased) -SDKfilenamepattern="RSE-SDK-*.zip" - -# the following two arrays must be the same size (or else the second one will default to blank) -javadocModuleArray=( "RSE" ); # array, project-subproject, for the name of the zip scp'd to remote, eg. foo-bar-doc.zip -# if "", create in $projectName/javadoc; if "/path", create in $projectName/$subprojectName/javadoc -javadocFolderArray=( "/$subprojectName" ); # array of path fragments -# list of targets to use when executing fixJavadocs.sh -javadocTargetArray=( "-sub $subprojectName" ); - -# publisher of newsgroup announcements -newsgroupPublisherEmail="TM Builder <moberhuber@build.eclipse.org>" -newsgroup=eclipse.dsdp.tm -# to thread posts under an existing post (or posts) enter the slash-escaped Message-ID for which this is a reply, -# eg: <du7hic\$qos\$1@utils.eclipse.org> -newsgroupThreadReferences="" - -# default eclipse.org, build server, mapfile server usernames -user=$USER -# if no value set here or by -userIES flag, default to -user flag or value in properties file -userIES= - -# group permissions on eclipse.org so that anyone can change files -eclipseUserGroup="dsdp-tm"admin -eclipsePermsDir=2775 -eclipsePermsFile=664 - -# group permissions on build box so that anyone can change files -buildUserGroup="www" -buildPermsDir=2775 -buildPermsFile=664 - -# IES map file branch (required) -branchIES= - -# IES map file template: use "buildIDactual" and "webPath" as placeholders -IESmapfileArray=( -"RSE-runtime-buildIDactual.zip=webPath | | | runtime | $subprojectName" -"RSE-SDK-buildIDactual.zip=webPath | | | sdk | $subprojectName" ); # array of lines - -### DEFAULT BEHAVIOUR OPTIONS ### - -# default setting for whether to do or skip the drop upload section: 0 = do, 1 = skip -dodrop=1 - -# default setting for whether to do or skip the javadoc section: 0 = do, 1 = skip -dodocs=1 - -# default setting for whether to do or skip the Update Manager jars section: 0 = do, 1 = skip -UMjars=1 - -#default buildID -buildID= - -#default branch -branch=1.0.0 -cvsbranch=HEAD - -#do RSS feed file update? -RSS=1 - -# do search cvs update? -searchCVS=1 -# how long to block before giving up (in seconds, eg., 1200 for 20 mins wait) -searchCVSTimeout=1200 - -#do IES mapping file update? -IES=0 - -# debug output -debug=0 ; # values can be 0,1,2 - -#clean up /tmp folder? -noclean=0; - -# compare drops folder after scp upload? -noCompareDropsFolders=0 ; # default 0, do compare; set 1 to bypass or pass in querystring - -# compare UM folder after scp upload? -noCompareUMFolders= ; # default 0, do compare; set 1 to bypass or pass in querystring - -# announce new build in newsgroup? (default 0) -announce=0; - -### SERVER & PATH CONFIG OPTIONS ### - -#server on which builds occur (need to ssh to this box as $user@$buildServerFullName) -buildServerFullName=`hostname` - -#server on which eclipse's production CVS is located (need to ssh to this box as $user@$eclipseServerFullName) -eclipseServerFullName=dev.eclipse.org - -#server on which eclipse's production files are located (downloads, javadoc, etc.): ssh as $user@$downloadServerFullName) -downloadServerFullName=download1.eclipse.org - -#paths on \$downloadServerFullName where files are published -projectWWWDir=/home/data/httpd/download.eclipse.org/dsdp/$projectName -#projectDropsDir=$projectWWWDir/$subprojectName/downloads/drops -projectDropsDir=$projectWWWDir/downloads/drops - -#paths to build base, scripts, and drops on build server -baseBuildDir=/home/www-data/build/dsdp/$projectName -buildScriptsDir=/home/www-data/build/dsdp/scripts -buildDropsDir=$baseBuildDir/$subprojectName/downloads/drops - -# path to website on build server -localWebDir=/var/www/html/dsdp/$projectName - -# urls -releaseNotesURL=http://www.eclipse.org/dsdp/$projectName/news/relnotes.php?project=$subprojectName -downloadsURL=http://www.eclipse.org/dsdp/$projectName/downloads/?project=$subprojectName - -### ANT OPTIONS ### -ANT=/opt/apache-ant-1.6/bin/ant - -### DEFAULT BEHAVIOUR AND JVM OPTIONS :: buildUpdate.sh ### - -# specify the correct java home & vm used to run the build -javaHome=/opt/sun-java2-1.4 -vm=$javaHome/bin/java - -# zips to unpack for UM jar generation -filePrefixesToUnzipArray=( "RSE-SDK-" "RSE-automated-tests-" "RSE-examples-" ); - -# ant script and target to be executed -antScript=org.eclipse.releng.generators/buildProductUpdateJars.xml -target=run - -# default operations -builder=1 # get builder packages from cvs -promote=0 # don't promote by default -skipjars=0 # when promoting, upload all jars (don't skip) -cleanup=1 # delete temp stuff when done - -# compare UM folder after scp upload? -noCompareUMFolders=0 ; # default 0, do compare; set 1 to bypass or pass in querystring - -# do 4-part jars? -no4thPart=0; - -# where to get releng.generators.ProductUpdateBuilder, jars & ant scripts -relengGeneratorsCVSPath=releng-common/tools/updates/org.eclipse.releng.generators - -# use a default value for basebuilderBranch? 0 = no, 1 = yes -useDefaultBasebuilderBranch=0 - -# See http://wiki.eclipse.org/Modeling_Project_Releng/Releasing#Contributing_To_Ganymede_Update_Site -# pattern to use when searching for features to include in coordsite; defaults to ".*eclipse/features/org.eclipse..*(${subprojectName}|${subprojectName}.sdk)_.*\/$" -coordsiteFeaturePattern="" -# pattern to use when setting feature to include in coordsite's main feature ('Models and Model Development'); all other matching features will go in 'Enabling Features' -coordsiteMainFeaturePattern="" diff --git a/releng/org.eclipse.tm.releng/repoInfo.properties b/releng/org.eclipse.tm.releng/repoInfo.properties deleted file mode 100644 index c1ae539a0..000000000 --- a/releng/org.eclipse.tm.releng/repoInfo.properties +++ /dev/null @@ -1,18 +0,0 @@ -############################################################################### -# Copyright (c) 2006, 2008 IBM Corporation and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 -# which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html -# -# Contributors: -# IBM Corporation - initial API and implementation -# Martin Oberhuber (Wind River) - adapt for DSDP from o.e.emf.validation.releng -############################################################################### -cvsHost=dev.eclipse.org -cvsReadProtocol=pserver -cvsWriteProtocol=ext -cvsReadUser=anonymous -cvsWriteUser=moberhuber -cvsWriteRelengUser=moberhuber -cvsRep=/cvsroot/dsdp diff --git a/releng/org.eclipse.tm.releng/templateFiles/rse.map.template b/releng/org.eclipse.tm.releng/templateFiles/rse.map.template deleted file mode 100644 index 00a57167a..000000000 --- a/releng/org.eclipse.tm.releng/templateFiles/rse.map.template +++ /dev/null @@ -1,10 +0,0 @@ -!*************** PROJECT CONTRIBUTION ******************************************************** - -!*** Special entries from eclipse - -plugin@org.eclipse.test=v20070226,:pserver:anonymous@dev.eclipse.org:/cvsroot/eclipse, -fragment@org.eclipse.ant.optional.junit=v20050226,:pserver:anonymous@dev.eclipse.org:/cvsroot/eclipse, - -!*** Project's plugins, features and fragments - -@entries@ diff --git a/releng/org.eclipse.tm.releng/templateFiles/testManifest.xml.template b/releng/org.eclipse.tm.releng/templateFiles/testManifest.xml.template deleted file mode 100644 index bc431c548..000000000 --- a/releng/org.eclipse.tm.releng/templateFiles/testManifest.xml.template +++ /dev/null @@ -1,50 +0,0 @@ -<?xml version="1.0"?> -<topLevel> - <zipTypes> - <zipType name="projruntime"> - <platform - id="projRUN" - name="All" - fileName='<a href="RSE-runtime-@build@.zip">RSE-runtime-@build@.zip</a> <font size="2">(size:@RSE-runtime-@build@.zip.size@ - checksum:<a href="RSE-runtime-@build@.zip.md5">md5</a>)</font>'> - </platform> - </zipType> - <zipType name="projsdk"> - <platform - id="projSRC" - name="All" - fileName='<a href="RSE-SDK-@build@.zip">RSE-SDK-@build@.zip</a> <font size="2">(size:@RSE-SDK-@build@.zip.size@ - checksum:<a href="RSE-SDK-@build@.zip.md5">md5</a>)</font>'> - </platform> - </zipType> - <zipType name="projtests"> - <platform - id="T" - name="All" - fileName='<a href="RSE-automated-tests-@build@.zip">RSE-automated-tests-@build@.zip</a> <font size="2">(size:@RSE-automated-tests-@build@.zip.size@ - checksum:<a href="RSE-automated-tests-@build@.zip.md5">md5</a>)</font>'> - </platform> - </zipType> - <zipType name="projexamples"> - <platform - id="EX" - name="All" - fileName='<a href="RSE-examples-@build@.zip">RSE-examples-@build@.zip</a> <font size="2">(size:@RSE-examples-@build@.zip.size@ - checksum:<a href="RSE-examples-@build@.zip.md5">md5</a>)</font>'> - </platform> - </zipType> - </zipTypes> - - <logFiles> - <logFile name="org.eclipse.rse.tests_linux.gtk.xml"> - <effectedFile id="SDK"></effectedFile> - <effectedFile id="projRUN"></effectedFile> - </logFile> - - <!-- Comment out for now until we get tests on various platforms. - <logFile name="org.eclipse.rse.tests_win32.xml"> - <effectedFile id="SDK"></effectedFile> - <effectedFile id="projRUN"></effectedFile> - </logFile> - --> - -@entries@ - - </logFiles> -</topLevel> diff --git a/releng/org.eclipse.tm.releng/testManifest.xml b/releng/org.eclipse.tm.releng/testManifest.xml deleted file mode 100644 index 663d28f4c..000000000 --- a/releng/org.eclipse.tm.releng/testManifest.xml +++ /dev/null @@ -1,59 +0,0 @@ -<?xml version="1.0"?> -<topLevel> - <zipTypes> - <zipType name="projruntime"> - <platform - id="projRUN" - name="All" - fileName='<a href="RSE-runtime-@build@.zip">RSE-runtime-@build@.zip</a> <font size="2">(size:@RSE-runtime-@build@.zip.size@ - checksum:<a href="RSE-runtime-@build@.zip.md5">md5</a>)</font>'> - </platform> - </zipType> - <zipType name="projsdk"> - <platform - id="projSRC" - name="All" - fileName='<a href="RSE-SDK-@build@.zip">RSE-SDK-@build@.zip</a> <font size="2">(size:@RSE-SDK-@build@.zip.size@ - checksum:<a href="RSE-SDK-@build@.zip.md5">md5</a>)</font>'> - </platform> - </zipType> - <zipType name="projtests"> - <platform - id="T" - name="All" - fileName='<a href="RSE-automated-tests-@build@.zip">RSE-automated-tests-@build@.zip</a> <font size="2">(size:@RSE-automated-tests-@build@.zip.size@ - checksum:<a href="RSE-automated-tests-@build@.zip.md5">md5</a>)</font>'> - </platform> - </zipType> - <zipType name="projexamples"> - <platform - id="EX" - name="All" - fileName='<a href="RSE-examples-@build@.zip">RSE-examples-@build@.zip</a> <font size="2">(size:@RSE-examples-@build@.zip.size@ - checksum:<a href="RSE-examples-@build@.zip.md5">md5</a>)</font>'> - </platform> - </zipType> - </zipTypes> - - <logFiles> - <logFile name="org.eclipse.rse.tests_linux.gtk.xml"> - <effectedFile id="SDK"></effectedFile> - <effectedFile id="projRUN"></effectedFile> - </logFile> - - <!-- Comment out for now until we get tests on various platforms. - <logFile name="org.eclipse.rse.tests_win32.xml"> - <effectedFile id="SDK"></effectedFile> - <effectedFile id="projRUN"></effectedFile> - </logFile> - --> - - <logFile name="plugins/org.eclipse.rse.examples_*/*.bin.log"> - <effectedFile id="EX"></effectedFile> - </logFile> - <logFile name="plugins/org.eclipse.rse_*/*.bin.log"> - <effectedFile id="SDK"></effectedFile> - <effectedFile id="projRUN"></effectedFile> - </logFile> - <logFile name="plugins/org.eclipse.rse.tests_*/*.bin.log"> - <effectedFile id="T"></effectedFile> - </logFile> - - </logFiles> -</topLevel> diff --git a/releng/readme.txt b/releng/readme.txt deleted file mode 100644 index 78336b3a8..000000000 --- a/releng/readme.txt +++ /dev/null @@ -1,3 +0,0 @@ -Use the "releng" folder for projects containing instructions and scripts for -building RSE and the DSDP-TM Core components. -All projects should be named "org.eclipse.rse.releng<.*>". diff --git a/rse/doc/readme.txt b/rse/doc/readme.txt deleted file mode 100644 index 4b45b5127..000000000 --- a/rse/doc/readme.txt +++ /dev/null @@ -1,2 +0,0 @@ -Use the "doc" folder for plugin projects containing documentation. -All projects should be named "org.eclipse.rse.doc.*".
\ No newline at end of file diff --git a/rse/examples/readme.txt b/rse/examples/readme.txt deleted file mode 100644 index 5193a00e2..000000000 --- a/rse/examples/readme.txt +++ /dev/null @@ -1,2 +0,0 @@ -Use the "examples" folder for plugin projects containing examples. -All projects should be named "org.eclipse.rse.examples.*".
\ No newline at end of file diff --git a/rse/features/org.eclipse.rse-feature/.project b/rse/features/org.eclipse.rse-feature/.project deleted file mode 100644 index fc4435d95..000000000 --- a/rse/features/org.eclipse.rse-feature/.project +++ /dev/null @@ -1,17 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<projectDescription> - <name>org.eclipse.rse-feature</name> - <comment></comment> - <projects> - </projects> - <buildSpec> - <buildCommand> - <name>org.eclipse.pde.FeatureBuilder</name> - <arguments> - </arguments> - </buildCommand> - </buildSpec> - <natures> - <nature>org.eclipse.pde.FeatureNature</nature> - </natures> -</projectDescription> diff --git a/rse/features/org.eclipse.rse-feature/build.properties b/rse/features/org.eclipse.rse-feature/build.properties deleted file mode 100644 index 85f5b38e2..000000000 --- a/rse/features/org.eclipse.rse-feature/build.properties +++ /dev/null @@ -1,20 +0,0 @@ -################################################################################ -# Copyright (c) 2006 Wind River Systems, Inc. -# All rights reserved. This program and 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 = feature.xml,\ - license.html,\ - feature.properties,\ - epl-v10.html,\ - eclipse_update_120.jpg -#generate.feature@org.eclipse.rse.core.source=org.eclipse.rse.core -#generate.feature@org.eclipse.rse.dstore.source=org.eclipse.rse.dstore -#generate.feature@org.eclipse.rse.ftp.source=org.eclipse.rse.ftp -#generate.feature@org.eclipse.rse.local.source=org.eclipse.rse.local -#generate.feature@org.eclipse.rse.ssh.source=org.eclipse.rse.ssh diff --git a/rse/features/org.eclipse.rse-feature/eclipse_update_120.jpg b/rse/features/org.eclipse.rse-feature/eclipse_update_120.jpg Binary files differdeleted file mode 100644 index bfdf708ad..000000000 --- a/rse/features/org.eclipse.rse-feature/eclipse_update_120.jpg +++ /dev/null diff --git a/rse/features/org.eclipse.rse-feature/epl-v10.html b/rse/features/org.eclipse.rse-feature/epl-v10.html deleted file mode 100644 index 9321f4082..000000000 --- a/rse/features/org.eclipse.rse-feature/epl-v10.html +++ /dev/null @@ -1,256 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml"><head> - - - - -<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>Eclipse Public License - Version 1.0</title> - -<style type="text/css"> - body { - size: 8.5in 11.0in; - margin: 0.25in 0.5in 0.25in 0.5in; - tab-interval: 0.5in; - } - p { - margin-left: auto; - margin-top: 0.5em; - margin-bottom: 0.5em; - } - p.list { - margin-left: 0.5in; - margin-top: 0.05em; - margin-bottom: 0.05em; - } - </style></head><body lang="EN-US"> - -<p align="center"><b>Eclipse Public License - v 1.0</b></p> - -<p>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.</p> - -<p><b>1. DEFINITIONS</b></p> - -<p>"Contribution" means:</p> - -<p class="list">a) in the case of the initial Contributor, the initial -code and documentation distributed under this Agreement, and</p> -<p class="list">b) in the case of each subsequent Contributor:</p> -<p class="list">i) changes to the Program, and</p> -<p class="list">ii) additions to the Program;</p> -<p class="list">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.</p> - -<p>"Contributor" means any person or entity that distributes -the Program.</p> - -<p>"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.</p> - -<p>"Program" means the Contributions distributed in accordance -with this Agreement.</p> - -<p>"Recipient" means anyone who receives the Program under -this Agreement, including all Contributors.</p> - -<p><b>2. GRANT OF RIGHTS</b></p> - -<p class="list">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.</p> - -<p class="list">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.</p> - -<p class="list">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.</p> - -<p class="list">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.</p> - -<p><b>3. REQUIREMENTS</b></p> - -<p>A Contributor may choose to distribute the Program in object code -form under its own license agreement, provided that:</p> - -<p class="list">a) it complies with the terms and conditions of this -Agreement; and</p> - -<p class="list">b) its license agreement:</p> - -<p class="list">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;</p> - -<p class="list">ii) effectively excludes on behalf of all Contributors -all liability for damages, including direct, indirect, special, -incidental and consequential damages, such as lost profits;</p> - -<p class="list">iii) states that any provisions which differ from this -Agreement are offered by that Contributor alone and not by any other -party; and</p> - -<p class="list">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.</p> - -<p>When the Program is made available in source code form:</p> - -<p class="list">a) it must be made available under this Agreement; and</p> - -<p class="list">b) a copy of this Agreement must be included with each -copy of the Program.</p> - -<p>Contributors may not remove or alter any copyright notices contained -within the Program.</p> - -<p>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.</p> - -<p><b>4. COMMERCIAL DISTRIBUTION</b></p> - -<p>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.</p> - -<p>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.</p> - -<p><b>5. NO WARRANTY</b></p> - -<p>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.</p> - -<p><b>6. DISCLAIMER OF LIABILITY</b></p> - -<p>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.</p> - -<p><b>7. GENERAL</b></p> - -<p>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.</p> - -<p>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.</p> - -<p>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.</p> - -<p>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.</p> - -<p>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.</p> - -</body></html>
\ No newline at end of file diff --git a/rse/features/org.eclipse.rse-feature/feature.properties b/rse/features/org.eclipse.rse-feature/feature.properties deleted file mode 100644 index 39bff2e10..000000000 --- a/rse/features/org.eclipse.rse-feature/feature.properties +++ /dev/null @@ -1,144 +0,0 @@ -############################################################################### -# Copyright (c) 2006, 2008 IBM Corporation and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 -# which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html -# -# Contributors: -# IBM Corporation - initial API and implementation -# Martin Oberhuber (Wind River) - ongoing maintenance -############################################################################### - -# NLS_MESSAGEFORMAT_NONE -# NLS_ENCODING=UTF-8 - -# "featureName" property - name of the feature -featureName=Remote System Explorer End-User Runtime - -# "description" property - description of the feature -description=An integrated framework and toolkit for seamless working \ -on remote systems through SSH, FTP or dstore protocols. - -# "providerName" property - name of the company that provides the feature -providerName=Eclipse.org - -# "tmUpdateSiteName" property - label for the update site -tmUpdateSiteName=Target Management Updates - -# "copyright" property - text of the "Feature Update Copyright" -copyright=\ -Copyright (c) 2000, 2008 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\n\ -\n\ -This product includes software developed by the\n\ -Apache Software Foundation http://www.apache.org/ -################ 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 --git a/rse/features/org.eclipse.rse-feature/feature.xml b/rse/features/org.eclipse.rse-feature/feature.xml deleted file mode 100644 index b4eede1ee..000000000 --- a/rse/features/org.eclipse.rse-feature/feature.xml +++ /dev/null @@ -1,69 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<feature - id="org.eclipse.rse" - label="%featureName" - version="3.0.2.qualifier" - provider-name="%providerName" - plugin="org.eclipse.rse" - image="eclipse_update_120.jpg"> - - <description> - %description - </description> - - <copyright> - %copyright - </copyright> - - <license url="%licenseURL"> - %license - </license> - - <url> - <update label="%tmUpdateSiteName" url="http://download.eclipse.org/dsdp/tm/updates/3.0"/> - <discovery label="%tmUpdateSiteName" url="http://download.eclipse.org/dsdp/tm/updates/3.0"/> - </url> - - <includes - id="org.eclipse.rse.core" - version="0.0.0" - search-location="both"/> - - <includes - id="org.eclipse.rse.dstore" - version="0.0.0" - search-location="both"/> - - <includes - id="org.eclipse.rse.ftp" - version="0.0.0" - search-location="both"/> - - <includes - id="org.eclipse.rse.local" - version="0.0.0" - search-location="both"/> - - <includes - id="org.eclipse.rse.ssh" - version="0.0.0" - search-location="both"/> - - <includes - id="org.eclipse.rse.telnet" - version="0.0.0" - search-location="both"/> - - <includes - id="org.eclipse.rse.terminals" - version="0.0.0" - search-location="both"/> - - <plugin - id="org.eclipse.rse" - download-size="7" - install-size="8" - version="0.0.0" - unpack="false"/> - -</feature> diff --git a/rse/features/org.eclipse.rse-feature/license.html b/rse/features/org.eclipse.rse-feature/license.html deleted file mode 100644 index c6af966b6..000000000 --- a/rse/features/org.eclipse.rse-feature/license.html +++ /dev/null @@ -1,79 +0,0 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"> -<html> -<head> -<meta http-equiv=Content-Type content="text/html; charset=iso-8859-1"> -<title>Eclipse.org Software User Agreement</title> -</head> - -<body lang="EN-US" link=blue vlink=purple> -<h2>Eclipse Foundation Software User Agreement</h2> -<p>March 17, 2005</p> - -<h3>Usage Of Content</h3> - -<p>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.</p> - -<h3>Applicable Licenses</h3> - -<p>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 <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>. - For purposes of the EPL, "Program" will mean the Content.</p> - -<p>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").</p> - -<ul> - <li>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").</li> - <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java™ ARchive) in a directory named "plugins".</li> - <li>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.</li> - <li>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.</li> -</ul> - -<p>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:</p> - -<ul> - <li>The top-level (root) directory</li> - <li>Plug-in and Fragment directories</li> - <li>Inside Plug-ins and Fragments packaged as JARs</li> - <li>Sub-directories of the directory named "src" of certain Plug-ins</li> - <li>Feature directories</li> -</ul> - -<p>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.</p> - -<p>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):</p> - -<ul> - <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li> - <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li> - <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li> - <li>IBM Public License 1.0 (available at <a href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</a>)</li> - <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li> - <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li> -</ul> - -<p>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.</p> - -<h3>Cryptography</h3> - -<p>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.</p> - -<small>Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.</small> -</body> -</html> diff --git a/rse/features/org.eclipse.rse.core-feature/.project b/rse/features/org.eclipse.rse.core-feature/.project deleted file mode 100644 index 5e404d986..000000000 --- a/rse/features/org.eclipse.rse.core-feature/.project +++ /dev/null @@ -1,17 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<projectDescription> - <name>org.eclipse.rse.core-feature</name> - <comment></comment> - <projects> - </projects> - <buildSpec> - <buildCommand> - <name>org.eclipse.pde.FeatureBuilder</name> - <arguments> - </arguments> - </buildCommand> - </buildSpec> - <natures> - <nature>org.eclipse.pde.FeatureNature</nature> - </natures> -</projectDescription> diff --git a/rse/features/org.eclipse.rse.core-feature/build.properties b/rse/features/org.eclipse.rse.core-feature/build.properties deleted file mode 100644 index 92101e808..000000000 --- a/rse/features/org.eclipse.rse.core-feature/build.properties +++ /dev/null @@ -1,14 +0,0 @@ -############################################################################### -# Copyright (c) 2005, 2006 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 -############################################################################### -bin.includes = feature.xml,\ - license.html,\ - feature.properties,\ - epl-v10.html diff --git a/rse/features/org.eclipse.rse.core-feature/epl-v10.html b/rse/features/org.eclipse.rse.core-feature/epl-v10.html deleted file mode 100644 index 9321f4082..000000000 --- a/rse/features/org.eclipse.rse.core-feature/epl-v10.html +++ /dev/null @@ -1,256 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml"><head> - - - - -<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>Eclipse Public License - Version 1.0</title> - -<style type="text/css"> - body { - size: 8.5in 11.0in; - margin: 0.25in 0.5in 0.25in 0.5in; - tab-interval: 0.5in; - } - p { - margin-left: auto; - margin-top: 0.5em; - margin-bottom: 0.5em; - } - p.list { - margin-left: 0.5in; - margin-top: 0.05em; - margin-bottom: 0.05em; - } - </style></head><body lang="EN-US"> - -<p align="center"><b>Eclipse Public License - v 1.0</b></p> - -<p>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.</p> - -<p><b>1. DEFINITIONS</b></p> - -<p>"Contribution" means:</p> - -<p class="list">a) in the case of the initial Contributor, the initial -code and documentation distributed under this Agreement, and</p> -<p class="list">b) in the case of each subsequent Contributor:</p> -<p class="list">i) changes to the Program, and</p> -<p class="list">ii) additions to the Program;</p> -<p class="list">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.</p> - -<p>"Contributor" means any person or entity that distributes -the Program.</p> - -<p>"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.</p> - -<p>"Program" means the Contributions distributed in accordance -with this Agreement.</p> - -<p>"Recipient" means anyone who receives the Program under -this Agreement, including all Contributors.</p> - -<p><b>2. GRANT OF RIGHTS</b></p> - -<p class="list">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.</p> - -<p class="list">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.</p> - -<p class="list">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.</p> - -<p class="list">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.</p> - -<p><b>3. REQUIREMENTS</b></p> - -<p>A Contributor may choose to distribute the Program in object code -form under its own license agreement, provided that:</p> - -<p class="list">a) it complies with the terms and conditions of this -Agreement; and</p> - -<p class="list">b) its license agreement:</p> - -<p class="list">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;</p> - -<p class="list">ii) effectively excludes on behalf of all Contributors -all liability for damages, including direct, indirect, special, -incidental and consequential damages, such as lost profits;</p> - -<p class="list">iii) states that any provisions which differ from this -Agreement are offered by that Contributor alone and not by any other -party; and</p> - -<p class="list">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.</p> - -<p>When the Program is made available in source code form:</p> - -<p class="list">a) it must be made available under this Agreement; and</p> - -<p class="list">b) a copy of this Agreement must be included with each -copy of the Program.</p> - -<p>Contributors may not remove or alter any copyright notices contained -within the Program.</p> - -<p>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.</p> - -<p><b>4. COMMERCIAL DISTRIBUTION</b></p> - -<p>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.</p> - -<p>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.</p> - -<p><b>5. NO WARRANTY</b></p> - -<p>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.</p> - -<p><b>6. DISCLAIMER OF LIABILITY</b></p> - -<p>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.</p> - -<p><b>7. GENERAL</b></p> - -<p>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.</p> - -<p>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.</p> - -<p>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.</p> - -<p>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.</p> - -<p>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.</p> - -</body></html>
\ No newline at end of file diff --git a/rse/features/org.eclipse.rse.core-feature/feature.properties b/rse/features/org.eclipse.rse.core-feature/feature.properties deleted file mode 100644 index 19f4d4586..000000000 --- a/rse/features/org.eclipse.rse.core-feature/feature.properties +++ /dev/null @@ -1,141 +0,0 @@ -############################################################################### -# Copyright (c) 2006, 2008 IBM Corporation and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 -# which accompanies this distribution, and is available at -# 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=Remote System Explorer Core - -# "description" property - description of the feature -description=Remote System Explorer (RSE) core including \ -system and subsystem definition, basic service APIs, and \ -user documentation. - -# "providerName" property - name of the company that provides the feature -providerName=Eclipse.org - -# "tmUpdateSiteName" property - label for the update site -tmUpdateSiteName=Target Management Updates - -# "copyright" property - text of the "Feature Update Copyright" -copyright=\ -Copyright (c) 2000, 2008 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\ -available at http://www.eclipse.org/legal/epl-v10.html\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 --git a/rse/features/org.eclipse.rse.core-feature/feature.xml b/rse/features/org.eclipse.rse.core-feature/feature.xml deleted file mode 100644 index a2d4341dc..000000000 --- a/rse/features/org.eclipse.rse.core-feature/feature.xml +++ /dev/null @@ -1,142 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<feature - id="org.eclipse.rse.core" - label="%featureName" - version="3.0.2.qualifier" - provider-name="%providerName" - plugin="org.eclipse.rse.core"> - - <description> - %description - </description> - - <copyright url="http://www.eclipse.org/legal/epl-v10.html"> - %copyright - </copyright> - - <license url="%licenseURL"> - %license - </license> - - <url> - <update label="%tmUpdateSiteName" url="http://download.eclipse.org/dsdp/tm/updates/3.0"/> - <discovery label="%tmUpdateSiteName" url="http://download.eclipse.org/dsdp/tm/updates/3.0"/> - </url> - - <requires> - <import plugin="org.eclipse.compare"/> - <import plugin="org.eclipse.core.filesystem"/> - <import plugin="org.eclipse.core.resources"/> - <import plugin="org.eclipse.core.runtime"/> - <import plugin="org.eclipse.debug.core"/> - <import plugin="org.eclipse.jface"/> - <import plugin="org.eclipse.jface.text"/> - <import plugin="org.eclipse.search"/> - <import plugin="org.eclipse.swt"/> - <import plugin="org.eclipse.ui"/> - <import plugin="org.eclipse.ui.editors"/> - <import plugin="org.eclipse.ui.forms"/> - <import plugin="org.eclipse.ui.ide"/> - <import plugin="org.eclipse.ui.views"/> - <import plugin="org.eclipse.ui.workbench.texteditor"/> - </requires> - - <plugin - id="org.eclipse.rse.core" - download-size="41" - install-size="133" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.eclipse.rse.doc.user" - download-size="159" - install-size="193" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.eclipse.rse.efs" - download-size="7" - install-size="14" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.eclipse.rse.efs.ui" - download-size="7" - install-size="14" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.eclipse.rse.importexport" - download-size="51" - install-size="147" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.eclipse.rse.files.ui" - download-size="111" - install-size="407" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.eclipse.rse.processes.ui" - download-size="22" - install-size="61" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.eclipse.rse.services" - download-size="57" - install-size="183" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.eclipse.rse.shells.ui" - download-size="40" - install-size="135" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.eclipse.rse.subsystems.files.core" - download-size="32" - install-size="98" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.eclipse.rse.subsystems.processes.core" - download-size="7" - install-size="21" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.eclipse.rse.subsystems.processes.shell.linux" - download-size="8" - install-size="22" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.eclipse.rse.subsystems.shells.core" - download-size="16" - install-size="56" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.eclipse.rse.ui" - download-size="548" - install-size="1677" - version="0.0.0" - unpack="false"/> - -</feature> diff --git a/rse/features/org.eclipse.rse.core-feature/license.html b/rse/features/org.eclipse.rse.core-feature/license.html deleted file mode 100644 index f5a16251a..000000000 --- a/rse/features/org.eclipse.rse.core-feature/license.html +++ /dev/null @@ -1,81 +0,0 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"> -<html> -<head> -<meta http-equiv=Content-Type content="text/html; charset=iso-8859-1"> -<title>Eclipse.org Software User Agreement</title> -</head> - -<body lang="EN-US" link=blue vlink=purple> -<h2>Eclipse Foundation Software User Agreement</h2> -<p>March 17, 2005</p> - -<h3>Usage Of Content</h3> - -<p>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.</p> - -<h3>Applicable Licenses</h3> - -<p>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 <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>. -For purposes of the EPL, "Program" will mean the Content.</p> - -<p>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").</p> - -<ul> - <li>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").</li> - <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java™ ARchive) in a directory named "plugins".</li> - <li>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.</li> - <li>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.</li> -</ul> - -<p>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:</p> - -<ul> - <li>The top-level (root) directory</li> - - <li>Plug-in and Fragment directories</li> - <li>Inside Plug-ins and Fragments packaged as JARs</li> - <li>Sub-directories of the directory named "src" of certain Plug-ins</li> - <li>Feature directories</li> -</ul> - -<p>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.</p> - -<p>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):</p> - -<ul> - <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li> - <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li> - <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li> - <li>IBM Public License 1.0 (available at <a href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</a>)</li> - <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li> - - <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li> -</ul> - -<p>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.</p> - -<h3>Cryptography</h3> - -<p>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.</p> - -<small>Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.</small> -</body> -</html> diff --git a/rse/features/org.eclipse.rse.core-feature/sourceTemplateFeature/epl-v10.html b/rse/features/org.eclipse.rse.core-feature/sourceTemplateFeature/epl-v10.html deleted file mode 100644 index 9321f4082..000000000 --- a/rse/features/org.eclipse.rse.core-feature/sourceTemplateFeature/epl-v10.html +++ /dev/null @@ -1,256 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml"><head> - - - - -<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>Eclipse Public License - Version 1.0</title> - -<style type="text/css"> - body { - size: 8.5in 11.0in; - margin: 0.25in 0.5in 0.25in 0.5in; - tab-interval: 0.5in; - } - p { - margin-left: auto; - margin-top: 0.5em; - margin-bottom: 0.5em; - } - p.list { - margin-left: 0.5in; - margin-top: 0.05em; - margin-bottom: 0.05em; - } - </style></head><body lang="EN-US"> - -<p align="center"><b>Eclipse Public License - v 1.0</b></p> - -<p>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.</p> - -<p><b>1. DEFINITIONS</b></p> - -<p>"Contribution" means:</p> - -<p class="list">a) in the case of the initial Contributor, the initial -code and documentation distributed under this Agreement, and</p> -<p class="list">b) in the case of each subsequent Contributor:</p> -<p class="list">i) changes to the Program, and</p> -<p class="list">ii) additions to the Program;</p> -<p class="list">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.</p> - -<p>"Contributor" means any person or entity that distributes -the Program.</p> - -<p>"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.</p> - -<p>"Program" means the Contributions distributed in accordance -with this Agreement.</p> - -<p>"Recipient" means anyone who receives the Program under -this Agreement, including all Contributors.</p> - -<p><b>2. GRANT OF RIGHTS</b></p> - -<p class="list">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.</p> - -<p class="list">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.</p> - -<p class="list">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.</p> - -<p class="list">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.</p> - -<p><b>3. REQUIREMENTS</b></p> - -<p>A Contributor may choose to distribute the Program in object code -form under its own license agreement, provided that:</p> - -<p class="list">a) it complies with the terms and conditions of this -Agreement; and</p> - -<p class="list">b) its license agreement:</p> - -<p class="list">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;</p> - -<p class="list">ii) effectively excludes on behalf of all Contributors -all liability for damages, including direct, indirect, special, -incidental and consequential damages, such as lost profits;</p> - -<p class="list">iii) states that any provisions which differ from this -Agreement are offered by that Contributor alone and not by any other -party; and</p> - -<p class="list">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.</p> - -<p>When the Program is made available in source code form:</p> - -<p class="list">a) it must be made available under this Agreement; and</p> - -<p class="list">b) a copy of this Agreement must be included with each -copy of the Program.</p> - -<p>Contributors may not remove or alter any copyright notices contained -within the Program.</p> - -<p>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.</p> - -<p><b>4. COMMERCIAL DISTRIBUTION</b></p> - -<p>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.</p> - -<p>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.</p> - -<p><b>5. NO WARRANTY</b></p> - -<p>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.</p> - -<p><b>6. DISCLAIMER OF LIABILITY</b></p> - -<p>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.</p> - -<p><b>7. GENERAL</b></p> - -<p>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.</p> - -<p>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.</p> - -<p>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.</p> - -<p>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.</p> - -<p>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.</p> - -</body></html>
\ No newline at end of file diff --git a/rse/features/org.eclipse.rse.core-feature/sourceTemplateFeature/feature.properties b/rse/features/org.eclipse.rse.core-feature/sourceTemplateFeature/feature.properties deleted file mode 100644 index 5b166939a..000000000 --- a/rse/features/org.eclipse.rse.core-feature/sourceTemplateFeature/feature.properties +++ /dev/null @@ -1,144 +0,0 @@ -############################################################################### -# Copyright (c) 2006, 2008 IBM Corporation and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 -# which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html -# -# Contributors: -# IBM Corporation - 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=Remote System Explorer Core Source - -# "providerName" property - name of the company that provides the feature -providerName=Eclipse.org - -# "tmUpdateSiteName" property - label for the update site -tmUpdateSiteName=Target Management Updates - -# "description" property - description of the feature -description=Remote System Explorer (RSE) core including \ -system and subsystem definition, \ -basic service APIs, and \ -user documentation. - -# "copyright" property - text of the "Feature Update Copyright" -copyright=\ -Copyright (c) 2000, 2008 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\ -available at http://www.eclipse.org/legal/epl-v10.html\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 --git a/rse/features/org.eclipse.rse.core-feature/sourceTemplateFeature/license.html b/rse/features/org.eclipse.rse.core-feature/sourceTemplateFeature/license.html deleted file mode 100644 index c6af966b6..000000000 --- a/rse/features/org.eclipse.rse.core-feature/sourceTemplateFeature/license.html +++ /dev/null @@ -1,79 +0,0 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"> -<html> -<head> -<meta http-equiv=Content-Type content="text/html; charset=iso-8859-1"> -<title>Eclipse.org Software User Agreement</title> -</head> - -<body lang="EN-US" link=blue vlink=purple> -<h2>Eclipse Foundation Software User Agreement</h2> -<p>March 17, 2005</p> - -<h3>Usage Of Content</h3> - -<p>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.</p> - -<h3>Applicable Licenses</h3> - -<p>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 <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>. - For purposes of the EPL, "Program" will mean the Content.</p> - -<p>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").</p> - -<ul> - <li>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").</li> - <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java™ ARchive) in a directory named "plugins".</li> - <li>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.</li> - <li>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.</li> -</ul> - -<p>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:</p> - -<ul> - <li>The top-level (root) directory</li> - <li>Plug-in and Fragment directories</li> - <li>Inside Plug-ins and Fragments packaged as JARs</li> - <li>Sub-directories of the directory named "src" of certain Plug-ins</li> - <li>Feature directories</li> -</ul> - -<p>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.</p> - -<p>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):</p> - -<ul> - <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li> - <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li> - <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li> - <li>IBM Public License 1.0 (available at <a href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</a>)</li> - <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li> - <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li> -</ul> - -<p>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.</p> - -<h3>Cryptography</h3> - -<p>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.</p> - -<small>Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.</small> -</body> -</html> diff --git a/rse/features/org.eclipse.rse.core-feature/sourceTemplatePlugin/about.html b/rse/features/org.eclipse.rse.core-feature/sourceTemplatePlugin/about.html deleted file mode 100644 index e7b57cfff..000000000 --- a/rse/features/org.eclipse.rse.core-feature/sourceTemplatePlugin/about.html +++ /dev/null @@ -1,33 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" - "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml"> -<head> -<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/> -<title>About</title> -</head> -<body lang="EN-US"> -<h2>About This Content</h2> - -<p>June 5, 2007</p> -<h3>License</h3> - -<p>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 <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>. -For purposes of the EPL, "Program" will mean the Content.</p> - -<p>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 <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p> - -<h3>Source Code</h3> -<p>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.</p> - -</body> -</html>
\ No newline at end of file diff --git a/rse/features/org.eclipse.rse.core-feature/sourceTemplatePlugin/about.ini b/rse/features/org.eclipse.rse.core-feature/sourceTemplatePlugin/about.ini deleted file mode 100644 index fdd61ff0d..000000000 --- a/rse/features/org.eclipse.rse.core-feature/sourceTemplatePlugin/about.ini +++ /dev/null @@ -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=eclipse32.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 --git a/rse/features/org.eclipse.rse.core-feature/sourceTemplatePlugin/about.mappings b/rse/features/org.eclipse.rse.core-feature/sourceTemplatePlugin/about.mappings deleted file mode 100644 index bddaab431..000000000 --- a/rse/features/org.eclipse.rse.core-feature/sourceTemplatePlugin/about.mappings +++ /dev/null @@ -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 --git a/rse/features/org.eclipse.rse.core-feature/sourceTemplatePlugin/about.properties b/rse/features/org.eclipse.rse.core-feature/sourceTemplatePlugin/about.properties deleted file mode 100644 index 0c0aa9dbc..000000000 --- a/rse/features/org.eclipse.rse.core-feature/sourceTemplatePlugin/about.properties +++ /dev/null @@ -1,25 +0,0 @@ -############################################################################### -# Copyright (c) 2000, 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: -# IBM Corporation - 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=Remote System Explorer Core Source\n\ -\n\ -Version: {featureVersion}\n\ -Build id: {0}\n\ -\n\ -(c) Copyright IBM Corporation and others 2000, 2008. All rights reserved.\n\ -Visit http://www.eclipse.org/dsdp/tm diff --git a/rse/features/org.eclipse.rse.core-feature/sourceTemplatePlugin/build.properties b/rse/features/org.eclipse.rse.core-feature/sourceTemplatePlugin/build.properties deleted file mode 100644 index a93d3149a..000000000 --- a/rse/features/org.eclipse.rse.core-feature/sourceTemplatePlugin/build.properties +++ /dev/null @@ -1,13 +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) - Use eclipse32.png feature image -############################################################################### -bin.includes = about.html, about.ini, about.mappings, about.properties, eclipse32.png, plugin.properties, plugin.xml, src/, META-INF/ -sourcePlugin = true diff --git a/rse/features/org.eclipse.rse.core-feature/sourceTemplatePlugin/eclipse32.png b/rse/features/org.eclipse.rse.core-feature/sourceTemplatePlugin/eclipse32.png Binary files differdeleted file mode 100644 index 568fac1d0..000000000 --- a/rse/features/org.eclipse.rse.core-feature/sourceTemplatePlugin/eclipse32.png +++ /dev/null diff --git a/rse/features/org.eclipse.rse.core-feature/sourceTemplatePlugin/plugin.properties b/rse/features/org.eclipse.rse.core-feature/sourceTemplatePlugin/plugin.properties deleted file mode 100644 index e70df071f..000000000 --- a/rse/features/org.eclipse.rse.core-feature/sourceTemplatePlugin/plugin.properties +++ /dev/null @@ -1,12 +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 -############################################################################### -pluginName=Remote System Explorer Core Source -providerName=Eclipse.org diff --git a/rse/features/org.eclipse.rse.dstore-feature/.project b/rse/features/org.eclipse.rse.dstore-feature/.project deleted file mode 100644 index 06a332465..000000000 --- a/rse/features/org.eclipse.rse.dstore-feature/.project +++ /dev/null @@ -1,17 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<projectDescription> - <name>org.eclipse.rse.dstore-feature</name> - <comment></comment> - <projects> - </projects> - <buildSpec> - <buildCommand> - <name>org.eclipse.pde.FeatureBuilder</name> - <arguments> - </arguments> - </buildCommand> - </buildSpec> - <natures> - <nature>org.eclipse.pde.FeatureNature</nature> - </natures> -</projectDescription> diff --git a/rse/features/org.eclipse.rse.dstore-feature/build.properties b/rse/features/org.eclipse.rse.dstore-feature/build.properties deleted file mode 100644 index 92101e808..000000000 --- a/rse/features/org.eclipse.rse.dstore-feature/build.properties +++ /dev/null @@ -1,14 +0,0 @@ -############################################################################### -# Copyright (c) 2005, 2006 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 -############################################################################### -bin.includes = feature.xml,\ - license.html,\ - feature.properties,\ - epl-v10.html diff --git a/rse/features/org.eclipse.rse.dstore-feature/epl-v10.html b/rse/features/org.eclipse.rse.dstore-feature/epl-v10.html deleted file mode 100644 index 9321f4082..000000000 --- a/rse/features/org.eclipse.rse.dstore-feature/epl-v10.html +++ /dev/null @@ -1,256 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml"><head> - - - - -<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>Eclipse Public License - Version 1.0</title> - -<style type="text/css"> - body { - size: 8.5in 11.0in; - margin: 0.25in 0.5in 0.25in 0.5in; - tab-interval: 0.5in; - } - p { - margin-left: auto; - margin-top: 0.5em; - margin-bottom: 0.5em; - } - p.list { - margin-left: 0.5in; - margin-top: 0.05em; - margin-bottom: 0.05em; - } - </style></head><body lang="EN-US"> - -<p align="center"><b>Eclipse Public License - v 1.0</b></p> - -<p>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.</p> - -<p><b>1. DEFINITIONS</b></p> - -<p>"Contribution" means:</p> - -<p class="list">a) in the case of the initial Contributor, the initial -code and documentation distributed under this Agreement, and</p> -<p class="list">b) in the case of each subsequent Contributor:</p> -<p class="list">i) changes to the Program, and</p> -<p class="list">ii) additions to the Program;</p> -<p class="list">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.</p> - -<p>"Contributor" means any person or entity that distributes -the Program.</p> - -<p>"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.</p> - -<p>"Program" means the Contributions distributed in accordance -with this Agreement.</p> - -<p>"Recipient" means anyone who receives the Program under -this Agreement, including all Contributors.</p> - -<p><b>2. GRANT OF RIGHTS</b></p> - -<p class="list">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.</p> - -<p class="list">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.</p> - -<p class="list">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.</p> - -<p class="list">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.</p> - -<p><b>3. REQUIREMENTS</b></p> - -<p>A Contributor may choose to distribute the Program in object code -form under its own license agreement, provided that:</p> - -<p class="list">a) it complies with the terms and conditions of this -Agreement; and</p> - -<p class="list">b) its license agreement:</p> - -<p class="list">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;</p> - -<p class="list">ii) effectively excludes on behalf of all Contributors -all liability for damages, including direct, indirect, special, -incidental and consequential damages, such as lost profits;</p> - -<p class="list">iii) states that any provisions which differ from this -Agreement are offered by that Contributor alone and not by any other -party; and</p> - -<p class="list">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.</p> - -<p>When the Program is made available in source code form:</p> - -<p class="list">a) it must be made available under this Agreement; and</p> - -<p class="list">b) a copy of this Agreement must be included with each -copy of the Program.</p> - -<p>Contributors may not remove or alter any copyright notices contained -within the Program.</p> - -<p>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.</p> - -<p><b>4. COMMERCIAL DISTRIBUTION</b></p> - -<p>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.</p> - -<p>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.</p> - -<p><b>5. NO WARRANTY</b></p> - -<p>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.</p> - -<p><b>6. DISCLAIMER OF LIABILITY</b></p> - -<p>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.</p> - -<p><b>7. GENERAL</b></p> - -<p>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.</p> - -<p>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.</p> - -<p>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.</p> - -<p>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.</p> - -<p>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.</p> - -</body></html>
\ No newline at end of file diff --git a/rse/features/org.eclipse.rse.dstore-feature/feature.properties b/rse/features/org.eclipse.rse.dstore-feature/feature.properties deleted file mode 100644 index 4de5a2912..000000000 --- a/rse/features/org.eclipse.rse.dstore-feature/feature.properties +++ /dev/null @@ -1,139 +0,0 @@ -############################################################################### -# Copyright (c) 2006, 2008 IBM Corporation and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 -# which accompanies this distribution, and is available at -# 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 DStore Services - -# "providerName" property - name of the company that provides the feature -providerName=Eclipse.org - -# "tmUpdateSiteName" property - label for the update site -tmUpdateSiteName=Target Management Updates - -# "description" property - description of the feature -description=RSE DStore is an extensible tooling communication layer. - -# "copyright" property - text of the "Feature Update Copyright" -copyright=\ -Copyright (c) 2000, 2008 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\ -available at http://www.eclipse.org/legal/epl-v10.html\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 --git a/rse/features/org.eclipse.rse.dstore-feature/feature.xml b/rse/features/org.eclipse.rse.dstore-feature/feature.xml deleted file mode 100644 index 25732fac8..000000000 --- a/rse/features/org.eclipse.rse.dstore-feature/feature.xml +++ /dev/null @@ -1,94 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<feature - id="org.eclipse.rse.dstore" - label="%featureName" - version="3.0.2.qualifier" - provider-name="%providerName" - plugin="org.eclipse.rse.services.dstore"> - - <description> - %description - </description> - - <copyright url="http://www.eclipse.org/legal/epl-v10.html"> - %copyright - </copyright> - - <license url="%licenseURL"> - %license - </license> - - <url> - <update label="%tmUpdateSiteName" url="http://download.eclipse.org/dsdp/tm/updates/3.0"/> - <discovery label="%tmUpdateSiteName" url="http://download.eclipse.org/dsdp/tm/updates/3.0"/> - </url> - - <requires> - <import plugin="org.eclipse.core.resources"/> - <import plugin="org.eclipse.core.runtime"/> - <import plugin="org.eclipse.ui"/> - <import plugin="org.eclipse.ui.views"/> - <import plugin="org.eclipse.rse.services" version="3.0.0" match="compatible"/> - <import plugin="org.eclipse.rse.subsystems.files.core" version="3.0.0" match="compatible"/> - <import plugin="org.eclipse.rse.subsystems.processes.core" version="3.0.0" match="compatible"/> - <import plugin="org.eclipse.rse.subsystems.shells.core" version="3.0.0" match="compatible"/> - <import plugin="org.eclipse.rse.ui" version="3.0.0" match="compatible"/> - </requires> - - <plugin - id="org.eclipse.dstore.core" - download-size="52" - install-size="154" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.eclipse.dstore.extra" - download-size="4" - install-size="13" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.eclipse.rse.connectorservice.dstore" - download-size="16" - install-size="40" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.eclipse.rse.services.dstore" - download-size="59" - install-size="156" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.eclipse.rse.subsystems.files.dstore" - download-size="14" - install-size="42" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.eclipse.rse.subsystems.processes.dstore" - download-size="5" - install-size="10" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.eclipse.rse.subsystems.shells.dstore" - download-size="5" - install-size="10" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.eclipse.rse.dstore.security" - download-size="20" - install-size="56" - version="0.0.0" - unpack="false"/> - -</feature> diff --git a/rse/features/org.eclipse.rse.dstore-feature/license.html b/rse/features/org.eclipse.rse.dstore-feature/license.html deleted file mode 100644 index c6af966b6..000000000 --- a/rse/features/org.eclipse.rse.dstore-feature/license.html +++ /dev/null @@ -1,79 +0,0 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"> -<html> -<head> -<meta http-equiv=Content-Type content="text/html; charset=iso-8859-1"> -<title>Eclipse.org Software User Agreement</title> -</head> - -<body lang="EN-US" link=blue vlink=purple> -<h2>Eclipse Foundation Software User Agreement</h2> -<p>March 17, 2005</p> - -<h3>Usage Of Content</h3> - -<p>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.</p> - -<h3>Applicable Licenses</h3> - -<p>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 <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>. - For purposes of the EPL, "Program" will mean the Content.</p> - -<p>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").</p> - -<ul> - <li>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").</li> - <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java™ ARchive) in a directory named "plugins".</li> - <li>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.</li> - <li>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.</li> -</ul> - -<p>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:</p> - -<ul> - <li>The top-level (root) directory</li> - <li>Plug-in and Fragment directories</li> - <li>Inside Plug-ins and Fragments packaged as JARs</li> - <li>Sub-directories of the directory named "src" of certain Plug-ins</li> - <li>Feature directories</li> -</ul> - -<p>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.</p> - -<p>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):</p> - -<ul> - <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li> - <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li> - <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li> - <li>IBM Public License 1.0 (available at <a href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</a>)</li> - <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li> - <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li> -</ul> - -<p>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.</p> - -<h3>Cryptography</h3> - -<p>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.</p> - -<small>Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.</small> -</body> -</html> diff --git a/rse/features/org.eclipse.rse.dstore-feature/sourceTemplateFeature/epl-v10.html b/rse/features/org.eclipse.rse.dstore-feature/sourceTemplateFeature/epl-v10.html deleted file mode 100644 index 9321f4082..000000000 --- a/rse/features/org.eclipse.rse.dstore-feature/sourceTemplateFeature/epl-v10.html +++ /dev/null @@ -1,256 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml"><head> - - - - -<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>Eclipse Public License - Version 1.0</title> - -<style type="text/css"> - body { - size: 8.5in 11.0in; - margin: 0.25in 0.5in 0.25in 0.5in; - tab-interval: 0.5in; - } - p { - margin-left: auto; - margin-top: 0.5em; - margin-bottom: 0.5em; - } - p.list { - margin-left: 0.5in; - margin-top: 0.05em; - margin-bottom: 0.05em; - } - </style></head><body lang="EN-US"> - -<p align="center"><b>Eclipse Public License - v 1.0</b></p> - -<p>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.</p> - -<p><b>1. DEFINITIONS</b></p> - -<p>"Contribution" means:</p> - -<p class="list">a) in the case of the initial Contributor, the initial -code and documentation distributed under this Agreement, and</p> -<p class="list">b) in the case of each subsequent Contributor:</p> -<p class="list">i) changes to the Program, and</p> -<p class="list">ii) additions to the Program;</p> -<p class="list">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.</p> - -<p>"Contributor" means any person or entity that distributes -the Program.</p> - -<p>"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.</p> - -<p>"Program" means the Contributions distributed in accordance -with this Agreement.</p> - -<p>"Recipient" means anyone who receives the Program under -this Agreement, including all Contributors.</p> - -<p><b>2. GRANT OF RIGHTS</b></p> - -<p class="list">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.</p> - -<p class="list">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.</p> - -<p class="list">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.</p> - -<p class="list">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.</p> - -<p><b>3. REQUIREMENTS</b></p> - -<p>A Contributor may choose to distribute the Program in object code -form under its own license agreement, provided that:</p> - -<p class="list">a) it complies with the terms and conditions of this -Agreement; and</p> - -<p class="list">b) its license agreement:</p> - -<p class="list">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;</p> - -<p class="list">ii) effectively excludes on behalf of all Contributors -all liability for damages, including direct, indirect, special, -incidental and consequential damages, such as lost profits;</p> - -<p class="list">iii) states that any provisions which differ from this -Agreement are offered by that Contributor alone and not by any other -party; and</p> - -<p class="list">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.</p> - -<p>When the Program is made available in source code form:</p> - -<p class="list">a) it must be made available under this Agreement; and</p> - -<p class="list">b) a copy of this Agreement must be included with each -copy of the Program.</p> - -<p>Contributors may not remove or alter any copyright notices contained -within the Program.</p> - -<p>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.</p> - -<p><b>4. COMMERCIAL DISTRIBUTION</b></p> - -<p>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.</p> - -<p>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.</p> - -<p><b>5. NO WARRANTY</b></p> - -<p>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.</p> - -<p><b>6. DISCLAIMER OF LIABILITY</b></p> - -<p>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.</p> - -<p><b>7. GENERAL</b></p> - -<p>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.</p> - -<p>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.</p> - -<p>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.</p> - -<p>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.</p> - -<p>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.</p> - -</body></html>
\ No newline at end of file diff --git a/rse/features/org.eclipse.rse.dstore-feature/sourceTemplateFeature/feature.properties b/rse/features/org.eclipse.rse.dstore-feature/sourceTemplateFeature/feature.properties deleted file mode 100644 index 86d6df95c..000000000 --- a/rse/features/org.eclipse.rse.dstore-feature/sourceTemplateFeature/feature.properties +++ /dev/null @@ -1,141 +0,0 @@ -############################################################################### -# Copyright (c) 2006, 2008 IBM Corporation and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 -# which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html -# -# Contributors: -# IBM Corporation - 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=RSE DStore Services Source - -# "providerName" property - name of the company that provides the feature -providerName=Eclipse.org - -# "tmUpdateSiteName" property - label for the update site -tmUpdateSiteName=Target Management Updates - -# "description" property - description of the feature -description=RSE DStore is an extensible tooling communication layer. - -# "copyright" property - text of the "Feature Update Copyright" -copyright=\ -Copyright (c) 2000, 2008 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\ -available at http://www.eclipse.org/legal/epl-v10.html\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 --git a/rse/features/org.eclipse.rse.dstore-feature/sourceTemplateFeature/license.html b/rse/features/org.eclipse.rse.dstore-feature/sourceTemplateFeature/license.html deleted file mode 100644 index c6af966b6..000000000 --- a/rse/features/org.eclipse.rse.dstore-feature/sourceTemplateFeature/license.html +++ /dev/null @@ -1,79 +0,0 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"> -<html> -<head> -<meta http-equiv=Content-Type content="text/html; charset=iso-8859-1"> -<title>Eclipse.org Software User Agreement</title> -</head> - -<body lang="EN-US" link=blue vlink=purple> -<h2>Eclipse Foundation Software User Agreement</h2> -<p>March 17, 2005</p> - -<h3>Usage Of Content</h3> - -<p>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.</p> - -<h3>Applicable Licenses</h3> - -<p>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 <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>. - For purposes of the EPL, "Program" will mean the Content.</p> - -<p>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").</p> - -<ul> - <li>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").</li> - <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java™ ARchive) in a directory named "plugins".</li> - <li>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.</li> - <li>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.</li> -</ul> - -<p>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:</p> - -<ul> - <li>The top-level (root) directory</li> - <li>Plug-in and Fragment directories</li> - <li>Inside Plug-ins and Fragments packaged as JARs</li> - <li>Sub-directories of the directory named "src" of certain Plug-ins</li> - <li>Feature directories</li> -</ul> - -<p>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.</p> - -<p>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):</p> - -<ul> - <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li> - <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li> - <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li> - <li>IBM Public License 1.0 (available at <a href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</a>)</li> - <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li> - <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li> -</ul> - -<p>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.</p> - -<h3>Cryptography</h3> - -<p>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.</p> - -<small>Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.</small> -</body> -</html> diff --git a/rse/features/org.eclipse.rse.dstore-feature/sourceTemplatePlugin/about.html b/rse/features/org.eclipse.rse.dstore-feature/sourceTemplatePlugin/about.html deleted file mode 100644 index e7b57cfff..000000000 --- a/rse/features/org.eclipse.rse.dstore-feature/sourceTemplatePlugin/about.html +++ /dev/null @@ -1,33 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" - "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml"> -<head> -<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/> -<title>About</title> -</head> -<body lang="EN-US"> -<h2>About This Content</h2> - -<p>June 5, 2007</p> -<h3>License</h3> - -<p>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 <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>. -For purposes of the EPL, "Program" will mean the Content.</p> - -<p>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 <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p> - -<h3>Source Code</h3> -<p>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.</p> - -</body> -</html>
\ No newline at end of file diff --git a/rse/features/org.eclipse.rse.dstore-feature/sourceTemplatePlugin/about.ini b/rse/features/org.eclipse.rse.dstore-feature/sourceTemplatePlugin/about.ini deleted file mode 100644 index fdd61ff0d..000000000 --- a/rse/features/org.eclipse.rse.dstore-feature/sourceTemplatePlugin/about.ini +++ /dev/null @@ -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=eclipse32.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 --git a/rse/features/org.eclipse.rse.dstore-feature/sourceTemplatePlugin/about.mappings b/rse/features/org.eclipse.rse.dstore-feature/sourceTemplatePlugin/about.mappings deleted file mode 100644 index bddaab431..000000000 --- a/rse/features/org.eclipse.rse.dstore-feature/sourceTemplatePlugin/about.mappings +++ /dev/null @@ -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 --git a/rse/features/org.eclipse.rse.dstore-feature/sourceTemplatePlugin/about.properties b/rse/features/org.eclipse.rse.dstore-feature/sourceTemplatePlugin/about.properties deleted file mode 100644 index 40d74ac30..000000000 --- a/rse/features/org.eclipse.rse.dstore-feature/sourceTemplatePlugin/about.properties +++ /dev/null @@ -1,25 +0,0 @@ -############################################################################### -# Copyright (c) 2000, 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: -# IBM Corporation - 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=RSE DStore Services Source\n\ -\n\ -Version: {featureVersion}\n\ -Build id: {0}\n\ -\n\ -(c) Copyright IBM Corporation and others 2000, 2008. All rights reserved.\n\ -Visit http://www.eclipse.org/dsdp/tm diff --git a/rse/features/org.eclipse.rse.dstore-feature/sourceTemplatePlugin/build.properties b/rse/features/org.eclipse.rse.dstore-feature/sourceTemplatePlugin/build.properties deleted file mode 100644 index a93d3149a..000000000 --- a/rse/features/org.eclipse.rse.dstore-feature/sourceTemplatePlugin/build.properties +++ /dev/null @@ -1,13 +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) - Use eclipse32.png feature image -############################################################################### -bin.includes = about.html, about.ini, about.mappings, about.properties, eclipse32.png, plugin.properties, plugin.xml, src/, META-INF/ -sourcePlugin = true diff --git a/rse/features/org.eclipse.rse.dstore-feature/sourceTemplatePlugin/eclipse32.png b/rse/features/org.eclipse.rse.dstore-feature/sourceTemplatePlugin/eclipse32.png Binary files differdeleted file mode 100644 index 568fac1d0..000000000 --- a/rse/features/org.eclipse.rse.dstore-feature/sourceTemplatePlugin/eclipse32.png +++ /dev/null diff --git a/rse/features/org.eclipse.rse.dstore-feature/sourceTemplatePlugin/plugin.properties b/rse/features/org.eclipse.rse.dstore-feature/sourceTemplatePlugin/plugin.properties deleted file mode 100644 index b5881fb6f..000000000 --- a/rse/features/org.eclipse.rse.dstore-feature/sourceTemplatePlugin/plugin.properties +++ /dev/null @@ -1,12 +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 -############################################################################### -pluginName=RSE DStore Services Source -providerName=Eclipse.org diff --git a/rse/features/org.eclipse.rse.local-feature/.project b/rse/features/org.eclipse.rse.local-feature/.project deleted file mode 100644 index ff8964653..000000000 --- a/rse/features/org.eclipse.rse.local-feature/.project +++ /dev/null @@ -1,17 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<projectDescription> - <name>org.eclipse.rse.local-feature</name> - <comment></comment> - <projects> - </projects> - <buildSpec> - <buildCommand> - <name>org.eclipse.pde.FeatureBuilder</name> - <arguments> - </arguments> - </buildCommand> - </buildSpec> - <natures> - <nature>org.eclipse.pde.FeatureNature</nature> - </natures> -</projectDescription> diff --git a/rse/features/org.eclipse.rse.local-feature/build.properties b/rse/features/org.eclipse.rse.local-feature/build.properties deleted file mode 100644 index 8ed560ec8..000000000 --- a/rse/features/org.eclipse.rse.local-feature/build.properties +++ /dev/null @@ -1,14 +0,0 @@ -############################################################################### -# Copyright (c) 2005, 2006 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 -############################################################################### -bin.includes = feature.xml,\ - feature.properties,\ - license.html,\ - epl-v10.html diff --git a/rse/features/org.eclipse.rse.local-feature/epl-v10.html b/rse/features/org.eclipse.rse.local-feature/epl-v10.html deleted file mode 100644 index 9321f4082..000000000 --- a/rse/features/org.eclipse.rse.local-feature/epl-v10.html +++ /dev/null @@ -1,256 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml"><head> - - - - -<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>Eclipse Public License - Version 1.0</title> - -<style type="text/css"> - body { - size: 8.5in 11.0in; - margin: 0.25in 0.5in 0.25in 0.5in; - tab-interval: 0.5in; - } - p { - margin-left: auto; - margin-top: 0.5em; - margin-bottom: 0.5em; - } - p.list { - margin-left: 0.5in; - margin-top: 0.05em; - margin-bottom: 0.05em; - } - </style></head><body lang="EN-US"> - -<p align="center"><b>Eclipse Public License - v 1.0</b></p> - -<p>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.</p> - -<p><b>1. DEFINITIONS</b></p> - -<p>"Contribution" means:</p> - -<p class="list">a) in the case of the initial Contributor, the initial -code and documentation distributed under this Agreement, and</p> -<p class="list">b) in the case of each subsequent Contributor:</p> -<p class="list">i) changes to the Program, and</p> -<p class="list">ii) additions to the Program;</p> -<p class="list">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.</p> - -<p>"Contributor" means any person or entity that distributes -the Program.</p> - -<p>"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.</p> - -<p>"Program" means the Contributions distributed in accordance -with this Agreement.</p> - -<p>"Recipient" means anyone who receives the Program under -this Agreement, including all Contributors.</p> - -<p><b>2. GRANT OF RIGHTS</b></p> - -<p class="list">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.</p> - -<p class="list">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.</p> - -<p class="list">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.</p> - -<p class="list">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.</p> - -<p><b>3. REQUIREMENTS</b></p> - -<p>A Contributor may choose to distribute the Program in object code -form under its own license agreement, provided that:</p> - -<p class="list">a) it complies with the terms and conditions of this -Agreement; and</p> - -<p class="list">b) its license agreement:</p> - -<p class="list">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;</p> - -<p class="list">ii) effectively excludes on behalf of all Contributors -all liability for damages, including direct, indirect, special, -incidental and consequential damages, such as lost profits;</p> - -<p class="list">iii) states that any provisions which differ from this -Agreement are offered by that Contributor alone and not by any other -party; and</p> - -<p class="list">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.</p> - -<p>When the Program is made available in source code form:</p> - -<p class="list">a) it must be made available under this Agreement; and</p> - -<p class="list">b) a copy of this Agreement must be included with each -copy of the Program.</p> - -<p>Contributors may not remove or alter any copyright notices contained -within the Program.</p> - -<p>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.</p> - -<p><b>4. COMMERCIAL DISTRIBUTION</b></p> - -<p>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.</p> - -<p>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.</p> - -<p><b>5. NO WARRANTY</b></p> - -<p>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.</p> - -<p><b>6. DISCLAIMER OF LIABILITY</b></p> - -<p>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.</p> - -<p><b>7. GENERAL</b></p> - -<p>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.</p> - -<p>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.</p> - -<p>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.</p> - -<p>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.</p> - -<p>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.</p> - -</body></html>
\ No newline at end of file diff --git a/rse/features/org.eclipse.rse.local-feature/feature.properties b/rse/features/org.eclipse.rse.local-feature/feature.properties deleted file mode 100644 index 5c9b5cf24..000000000 --- a/rse/features/org.eclipse.rse.local-feature/feature.properties +++ /dev/null @@ -1,141 +0,0 @@ -############################################################################### -# Copyright (c) 2006, 2008 IBM Corporation and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 -# which accompanies this distribution, and is available at -# 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 Local Services - -# "providerName" property - name of the company that provides the feature -providerName=Eclipse.org - -# "tmUpdateSiteName" property - label for the update site -tmUpdateSiteName=Target Management Updates - -# "description" property - description of the feature -description=Remote System Explorer (RSE) Local Services provides an \ -implementation of the basic services defined by the RSE API that \ -accesses local resources. - -# "copyright" property - text of the "Feature Update Copyright" -copyright=\ -Copyright (c) 2000, 2008 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\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 --git a/rse/features/org.eclipse.rse.local-feature/feature.xml b/rse/features/org.eclipse.rse.local-feature/feature.xml deleted file mode 100644 index c77c748f1..000000000 --- a/rse/features/org.eclipse.rse.local-feature/feature.xml +++ /dev/null @@ -1,71 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<feature - id="org.eclipse.rse.local" - label="%featureName" - version="2.1.1.qualifier" - provider-name="%providerName" - plugin="org.eclipse.rse.services.local"> - - <description> - %description - </description> - - <copyright url="http://www.eclipse.org/legal/epl-v10.html"> - %copyright - </copyright> - - <license url="%licenseURL"> - %license - </license> - - <url> - <update label="%tmUpdateSiteName" url="http://download.eclipse.org/dsdp/tm/updates/3.0"/> - <discovery label="%tmUpdateSiteName" url="http://download.eclipse.org/dsdp/tm/updates/3.0"/> - </url> - - <requires> - <import plugin="org.eclipse.core.runtime"/> - <import plugin="org.eclipse.ui"/> - <import plugin="org.eclipse.rse.services" version="3.0.0" match="compatible"/> - <import plugin="org.eclipse.rse.subsystems.files.core" version="3.0.0" match="compatible"/> - <import plugin="org.eclipse.rse.ui" version="3.0.0" match="compatible"/> - <import plugin="org.eclipse.rse.subsystems.processes.core" version="3.0.0" match="compatible"/> - <import plugin="org.eclipse.rse.subsystems.shells.core" version="3.0.0" match="compatible"/> - </requires> - - <plugin - id="org.eclipse.rse.services.local" - download-size="21" - install-size="45" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.eclipse.rse.subsystems.files.local" - download-size="7" - install-size="17" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.eclipse.rse.subsystems.processes.local" - download-size="5" - install-size="10" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.eclipse.rse.subsystems.shells.local" - download-size="5" - install-size="10" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.eclipse.rse.connectorservice.local" - download-size="3" - install-size="8" - version="0.0.0" - unpack="false"/> - -</feature> diff --git a/rse/features/org.eclipse.rse.local-feature/license.html b/rse/features/org.eclipse.rse.local-feature/license.html deleted file mode 100644 index c6af966b6..000000000 --- a/rse/features/org.eclipse.rse.local-feature/license.html +++ /dev/null @@ -1,79 +0,0 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"> -<html> -<head> -<meta http-equiv=Content-Type content="text/html; charset=iso-8859-1"> -<title>Eclipse.org Software User Agreement</title> -</head> - -<body lang="EN-US" link=blue vlink=purple> -<h2>Eclipse Foundation Software User Agreement</h2> -<p>March 17, 2005</p> - -<h3>Usage Of Content</h3> - -<p>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.</p> - -<h3>Applicable Licenses</h3> - -<p>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 <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>. - For purposes of the EPL, "Program" will mean the Content.</p> - -<p>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").</p> - -<ul> - <li>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").</li> - <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java™ ARchive) in a directory named "plugins".</li> - <li>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.</li> - <li>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.</li> -</ul> - -<p>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:</p> - -<ul> - <li>The top-level (root) directory</li> - <li>Plug-in and Fragment directories</li> - <li>Inside Plug-ins and Fragments packaged as JARs</li> - <li>Sub-directories of the directory named "src" of certain Plug-ins</li> - <li>Feature directories</li> -</ul> - -<p>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.</p> - -<p>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):</p> - -<ul> - <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li> - <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li> - <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li> - <li>IBM Public License 1.0 (available at <a href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</a>)</li> - <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li> - <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li> -</ul> - -<p>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.</p> - -<h3>Cryptography</h3> - -<p>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.</p> - -<small>Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.</small> -</body> -</html> diff --git a/rse/features/org.eclipse.rse.local-feature/sourceTemplateFeature/epl-v10.html b/rse/features/org.eclipse.rse.local-feature/sourceTemplateFeature/epl-v10.html deleted file mode 100644 index 9321f4082..000000000 --- a/rse/features/org.eclipse.rse.local-feature/sourceTemplateFeature/epl-v10.html +++ /dev/null @@ -1,256 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml"><head> - - - - -<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>Eclipse Public License - Version 1.0</title> - -<style type="text/css"> - body { - size: 8.5in 11.0in; - margin: 0.25in 0.5in 0.25in 0.5in; - tab-interval: 0.5in; - } - p { - margin-left: auto; - margin-top: 0.5em; - margin-bottom: 0.5em; - } - p.list { - margin-left: 0.5in; - margin-top: 0.05em; - margin-bottom: 0.05em; - } - </style></head><body lang="EN-US"> - -<p align="center"><b>Eclipse Public License - v 1.0</b></p> - -<p>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.</p> - -<p><b>1. DEFINITIONS</b></p> - -<p>"Contribution" means:</p> - -<p class="list">a) in the case of the initial Contributor, the initial -code and documentation distributed under this Agreement, and</p> -<p class="list">b) in the case of each subsequent Contributor:</p> -<p class="list">i) changes to the Program, and</p> -<p class="list">ii) additions to the Program;</p> -<p class="list">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.</p> - -<p>"Contributor" means any person or entity that distributes -the Program.</p> - -<p>"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.</p> - -<p>"Program" means the Contributions distributed in accordance -with this Agreement.</p> - -<p>"Recipient" means anyone who receives the Program under -this Agreement, including all Contributors.</p> - -<p><b>2. GRANT OF RIGHTS</b></p> - -<p class="list">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.</p> - -<p class="list">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.</p> - -<p class="list">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.</p> - -<p class="list">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.</p> - -<p><b>3. REQUIREMENTS</b></p> - -<p>A Contributor may choose to distribute the Program in object code -form under its own license agreement, provided that:</p> - -<p class="list">a) it complies with the terms and conditions of this -Agreement; and</p> - -<p class="list">b) its license agreement:</p> - -<p class="list">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;</p> - -<p class="list">ii) effectively excludes on behalf of all Contributors -all liability for damages, including direct, indirect, special, -incidental and consequential damages, such as lost profits;</p> - -<p class="list">iii) states that any provisions which differ from this -Agreement are offered by that Contributor alone and not by any other -party; and</p> - -<p class="list">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.</p> - -<p>When the Program is made available in source code form:</p> - -<p class="list">a) it must be made available under this Agreement; and</p> - -<p class="list">b) a copy of this Agreement must be included with each -copy of the Program.</p> - -<p>Contributors may not remove or alter any copyright notices contained -within the Program.</p> - -<p>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.</p> - -<p><b>4. COMMERCIAL DISTRIBUTION</b></p> - -<p>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.</p> - -<p>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.</p> - -<p><b>5. NO WARRANTY</b></p> - -<p>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.</p> - -<p><b>6. DISCLAIMER OF LIABILITY</b></p> - -<p>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.</p> - -<p><b>7. GENERAL</b></p> - -<p>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.</p> - -<p>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.</p> - -<p>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.</p> - -<p>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.</p> - -<p>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.</p> - -</body></html>
\ No newline at end of file diff --git a/rse/features/org.eclipse.rse.local-feature/sourceTemplateFeature/feature.properties b/rse/features/org.eclipse.rse.local-feature/sourceTemplateFeature/feature.properties deleted file mode 100644 index 46a803901..000000000 --- a/rse/features/org.eclipse.rse.local-feature/sourceTemplateFeature/feature.properties +++ /dev/null @@ -1,143 +0,0 @@ -############################################################################### -# Copyright (c) 2006, 2008 IBM Corporation and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 -# which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html -# -# Contributors: -# IBM Corporation - 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=RSE Local Services Source - -# "providerName" property - name of the company that provides the feature -providerName=Eclipse.org - -# "tmUpdateSiteName" property - label for the update site -tmUpdateSiteName=Target Management Updates - -# "description" property - description of the feature -description=Remote System Explorer (RSE) Local Services provides an \ -implementation of the basic services defined by the RSE API that \ -accesses local resources. - -# "copyright" property - text of the "Feature Update Copyright" -copyright=\ -Copyright (c) 2000, 2008 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\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 --git a/rse/features/org.eclipse.rse.local-feature/sourceTemplateFeature/license.html b/rse/features/org.eclipse.rse.local-feature/sourceTemplateFeature/license.html deleted file mode 100644 index c6af966b6..000000000 --- a/rse/features/org.eclipse.rse.local-feature/sourceTemplateFeature/license.html +++ /dev/null @@ -1,79 +0,0 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"> -<html> -<head> -<meta http-equiv=Content-Type content="text/html; charset=iso-8859-1"> -<title>Eclipse.org Software User Agreement</title> -</head> - -<body lang="EN-US" link=blue vlink=purple> -<h2>Eclipse Foundation Software User Agreement</h2> -<p>March 17, 2005</p> - -<h3>Usage Of Content</h3> - -<p>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.</p> - -<h3>Applicable Licenses</h3> - -<p>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 <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>. - For purposes of the EPL, "Program" will mean the Content.</p> - -<p>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").</p> - -<ul> - <li>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").</li> - <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java™ ARchive) in a directory named "plugins".</li> - <li>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.</li> - <li>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.</li> -</ul> - -<p>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:</p> - -<ul> - <li>The top-level (root) directory</li> - <li>Plug-in and Fragment directories</li> - <li>Inside Plug-ins and Fragments packaged as JARs</li> - <li>Sub-directories of the directory named "src" of certain Plug-ins</li> - <li>Feature directories</li> -</ul> - -<p>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.</p> - -<p>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):</p> - -<ul> - <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li> - <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li> - <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li> - <li>IBM Public License 1.0 (available at <a href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</a>)</li> - <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li> - <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li> -</ul> - -<p>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.</p> - -<h3>Cryptography</h3> - -<p>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.</p> - -<small>Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.</small> -</body> -</html> diff --git a/rse/features/org.eclipse.rse.local-feature/sourceTemplatePlugin/about.html b/rse/features/org.eclipse.rse.local-feature/sourceTemplatePlugin/about.html deleted file mode 100644 index e7b57cfff..000000000 --- a/rse/features/org.eclipse.rse.local-feature/sourceTemplatePlugin/about.html +++ /dev/null @@ -1,33 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" - "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml"> -<head> -<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/> -<title>About</title> -</head> -<body lang="EN-US"> -<h2>About This Content</h2> - -<p>June 5, 2007</p> -<h3>License</h3> - -<p>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 <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>. -For purposes of the EPL, "Program" will mean the Content.</p> - -<p>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 <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p> - -<h3>Source Code</h3> -<p>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.</p> - -</body> -</html>
\ No newline at end of file diff --git a/rse/features/org.eclipse.rse.local-feature/sourceTemplatePlugin/about.ini b/rse/features/org.eclipse.rse.local-feature/sourceTemplatePlugin/about.ini deleted file mode 100644 index fdd61ff0d..000000000 --- a/rse/features/org.eclipse.rse.local-feature/sourceTemplatePlugin/about.ini +++ /dev/null @@ -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=eclipse32.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 --git a/rse/features/org.eclipse.rse.local-feature/sourceTemplatePlugin/about.mappings b/rse/features/org.eclipse.rse.local-feature/sourceTemplatePlugin/about.mappings deleted file mode 100644 index bddaab431..000000000 --- a/rse/features/org.eclipse.rse.local-feature/sourceTemplatePlugin/about.mappings +++ /dev/null @@ -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 --git a/rse/features/org.eclipse.rse.local-feature/sourceTemplatePlugin/about.properties b/rse/features/org.eclipse.rse.local-feature/sourceTemplatePlugin/about.properties deleted file mode 100644 index 6b24c001e..000000000 --- a/rse/features/org.eclipse.rse.local-feature/sourceTemplatePlugin/about.properties +++ /dev/null @@ -1,25 +0,0 @@ -############################################################################### -# Copyright (c) 2000, 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: -# IBM Corporation - 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=RSE Local Services Source\n\ -\n\ -Version: {featureVersion}\n\ -Build id: {0}\n\ -\n\ -(c) Copyright IBM Corporation and others 2000, 2008. All rights reserved.\n\ -Visit http://www.eclipse.org/dsdp/tm diff --git a/rse/features/org.eclipse.rse.local-feature/sourceTemplatePlugin/build.properties b/rse/features/org.eclipse.rse.local-feature/sourceTemplatePlugin/build.properties deleted file mode 100644 index a93d3149a..000000000 --- a/rse/features/org.eclipse.rse.local-feature/sourceTemplatePlugin/build.properties +++ /dev/null @@ -1,13 +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) - Use eclipse32.png feature image -############################################################################### -bin.includes = about.html, about.ini, about.mappings, about.properties, eclipse32.png, plugin.properties, plugin.xml, src/, META-INF/ -sourcePlugin = true diff --git a/rse/features/org.eclipse.rse.local-feature/sourceTemplatePlugin/eclipse32.png b/rse/features/org.eclipse.rse.local-feature/sourceTemplatePlugin/eclipse32.png Binary files differdeleted file mode 100644 index 568fac1d0..000000000 --- a/rse/features/org.eclipse.rse.local-feature/sourceTemplatePlugin/eclipse32.png +++ /dev/null diff --git a/rse/features/org.eclipse.rse.local-feature/sourceTemplatePlugin/plugin.properties b/rse/features/org.eclipse.rse.local-feature/sourceTemplatePlugin/plugin.properties deleted file mode 100644 index 67dfc6911..000000000 --- a/rse/features/org.eclipse.rse.local-feature/sourceTemplatePlugin/plugin.properties +++ /dev/null @@ -1,12 +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 -############################################################################### -pluginName=RSE Local Services Source -providerName=Eclipse.org diff --git a/rse/features/org.eclipse.rse.sdk-feature/.project b/rse/features/org.eclipse.rse.sdk-feature/.project deleted file mode 100644 index 18a5f73e2..000000000 --- a/rse/features/org.eclipse.rse.sdk-feature/.project +++ /dev/null @@ -1,17 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<projectDescription> - <name>org.eclipse.rse.sdk-feature</name> - <comment></comment> - <projects> - </projects> - <buildSpec> - <buildCommand> - <name>org.eclipse.pde.FeatureBuilder</name> - <arguments> - </arguments> - </buildCommand> - </buildSpec> - <natures> - <nature>org.eclipse.pde.FeatureNature</nature> - </natures> -</projectDescription> diff --git a/rse/features/org.eclipse.rse.sdk-feature/build.properties b/rse/features/org.eclipse.rse.sdk-feature/build.properties deleted file mode 100644 index 60e92e0fc..000000000 --- a/rse/features/org.eclipse.rse.sdk-feature/build.properties +++ /dev/null @@ -1,22 +0,0 @@ -################################################################################ -# Copyright (c) 2006, 2008 Wind River Systems, Inc. -# All rights reserved. This program and 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 = feature.xml,\ - license.html,\ - feature.properties,\ - epl-v10.html,\ - eclipse_update_120.jpg -generate.feature@org.eclipse.rse.core.source=org.eclipse.rse.core -generate.feature@org.eclipse.rse.dstore.source=org.eclipse.rse.dstore -generate.feature@org.eclipse.rse.ftp.source=org.eclipse.rse.ftp -generate.feature@org.eclipse.rse.local.source=org.eclipse.rse.local -generate.feature@org.eclipse.rse.ssh.source=org.eclipse.rse.ssh -generate.feature@org.eclipse.rse.telnet.source=org.eclipse.rse.telnet -generate.feature@org.eclipse.rse.terminals.source=org.eclipse.rse.terminals diff --git a/rse/features/org.eclipse.rse.sdk-feature/eclipse_update_120.jpg b/rse/features/org.eclipse.rse.sdk-feature/eclipse_update_120.jpg Binary files differdeleted file mode 100644 index bfdf708ad..000000000 --- a/rse/features/org.eclipse.rse.sdk-feature/eclipse_update_120.jpg +++ /dev/null diff --git a/rse/features/org.eclipse.rse.sdk-feature/epl-v10.html b/rse/features/org.eclipse.rse.sdk-feature/epl-v10.html deleted file mode 100644 index 9321f4082..000000000 --- a/rse/features/org.eclipse.rse.sdk-feature/epl-v10.html +++ /dev/null @@ -1,256 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml"><head> - - - - -<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>Eclipse Public License - Version 1.0</title> - -<style type="text/css"> - body { - size: 8.5in 11.0in; - margin: 0.25in 0.5in 0.25in 0.5in; - tab-interval: 0.5in; - } - p { - margin-left: auto; - margin-top: 0.5em; - margin-bottom: 0.5em; - } - p.list { - margin-left: 0.5in; - margin-top: 0.05em; - margin-bottom: 0.05em; - } - </style></head><body lang="EN-US"> - -<p align="center"><b>Eclipse Public License - v 1.0</b></p> - -<p>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.</p> - -<p><b>1. DEFINITIONS</b></p> - -<p>"Contribution" means:</p> - -<p class="list">a) in the case of the initial Contributor, the initial -code and documentation distributed under this Agreement, and</p> -<p class="list">b) in the case of each subsequent Contributor:</p> -<p class="list">i) changes to the Program, and</p> -<p class="list">ii) additions to the Program;</p> -<p class="list">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.</p> - -<p>"Contributor" means any person or entity that distributes -the Program.</p> - -<p>"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.</p> - -<p>"Program" means the Contributions distributed in accordance -with this Agreement.</p> - -<p>"Recipient" means anyone who receives the Program under -this Agreement, including all Contributors.</p> - -<p><b>2. GRANT OF RIGHTS</b></p> - -<p class="list">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.</p> - -<p class="list">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.</p> - -<p class="list">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.</p> - -<p class="list">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.</p> - -<p><b>3. REQUIREMENTS</b></p> - -<p>A Contributor may choose to distribute the Program in object code -form under its own license agreement, provided that:</p> - -<p class="list">a) it complies with the terms and conditions of this -Agreement; and</p> - -<p class="list">b) its license agreement:</p> - -<p class="list">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;</p> - -<p class="list">ii) effectively excludes on behalf of all Contributors -all liability for damages, including direct, indirect, special, -incidental and consequential damages, such as lost profits;</p> - -<p class="list">iii) states that any provisions which differ from this -Agreement are offered by that Contributor alone and not by any other -party; and</p> - -<p class="list">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.</p> - -<p>When the Program is made available in source code form:</p> - -<p class="list">a) it must be made available under this Agreement; and</p> - -<p class="list">b) a copy of this Agreement must be included with each -copy of the Program.</p> - -<p>Contributors may not remove or alter any copyright notices contained -within the Program.</p> - -<p>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.</p> - -<p><b>4. COMMERCIAL DISTRIBUTION</b></p> - -<p>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.</p> - -<p>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.</p> - -<p><b>5. NO WARRANTY</b></p> - -<p>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.</p> - -<p><b>6. DISCLAIMER OF LIABILITY</b></p> - -<p>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.</p> - -<p><b>7. GENERAL</b></p> - -<p>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.</p> - -<p>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.</p> - -<p>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.</p> - -<p>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.</p> - -<p>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.</p> - -</body></html>
\ No newline at end of file diff --git a/rse/features/org.eclipse.rse.sdk-feature/feature.properties b/rse/features/org.eclipse.rse.sdk-feature/feature.properties deleted file mode 100644 index ec5fd5f26..000000000 --- a/rse/features/org.eclipse.rse.sdk-feature/feature.properties +++ /dev/null @@ -1,144 +0,0 @@ -############################################################################### -# Copyright (c) 2006, 2008 IBM Corporation and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 -# which accompanies this distribution, and is available at -# 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=Remote System Explorer Extender SDK - -# "description" property - description of the feature -description=Install this if you plan to develop applications or tools \ -based on RSE. This SDK contains runtimes, documentation and sources \ -for the core RSE frameworks, SSH, FTP or dstore protocols. - -# "providerName" property - name of the company that provides the feature -providerName=Eclipse.org - -# "tmUpdateSiteName" property - label for the update site -tmUpdateSiteName=Target Management Updates - -# "copyright" property - text of the "Feature Update Copyright" -copyright=\ -Copyright (c) 2000, 2008 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\n\ -\n\ -This product includes software developed by the\n\ -Apache Software Foundation http://www.apache.org/ -################ 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 --git a/rse/features/org.eclipse.rse.sdk-feature/feature.xml b/rse/features/org.eclipse.rse.sdk-feature/feature.xml deleted file mode 100644 index c79814ac7..000000000 --- a/rse/features/org.eclipse.rse.sdk-feature/feature.xml +++ /dev/null @@ -1,79 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<feature - id="org.eclipse.rse.sdk" - label="%featureName" - version="3.0.2.qualifier" - provider-name="%providerName" - image="eclipse_update_120.jpg"> - - <description> - %description - </description> - - <copyright> - %copyright - </copyright> - - <license url="%licenseURL"> - %license - </license> - - <url> - <update label="%tmUpdateSiteName" url="http://download.eclipse.org/dsdp/tm/updates/3.0"/> - <discovery label="%tmUpdateSiteName" url="http://download.eclipse.org/dsdp/tm/updates/3.0"/> - </url> - - <includes - id="org.eclipse.rse" - version="0.0.0"/> - - <includes - id="org.eclipse.rse.core.source" - version="0.0.0"/> - - <includes - id="org.eclipse.rse.dstore.source" - version="0.0.0"/> - - <includes - id="org.eclipse.rse.ftp.source" - version="0.0.0"/> - - <includes - id="org.eclipse.rse.local.source" - version="0.0.0"/> - - <includes - id="org.eclipse.rse.ssh.source" - version="0.0.0"/> - - <includes - id="org.eclipse.rse.telnet.source" - version="0.0.0"/> - - <includes - id="org.eclipse.rse.terminals.source" - version="0.0.0"/> - - <plugin - id="org.eclipse.rse.sdk" - download-size="7" - install-size="8" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.eclipse.rse.doc.isv" - download-size="6630" - install-size="11610" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.eclipse.dstore.doc.isv" - download-size="339" - install-size="684" - version="0.0.0" - unpack="false"/> - -</feature> diff --git a/rse/features/org.eclipse.rse.sdk-feature/license.html b/rse/features/org.eclipse.rse.sdk-feature/license.html deleted file mode 100644 index c6af966b6..000000000 --- a/rse/features/org.eclipse.rse.sdk-feature/license.html +++ /dev/null @@ -1,79 +0,0 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"> -<html> -<head> -<meta http-equiv=Content-Type content="text/html; charset=iso-8859-1"> -<title>Eclipse.org Software User Agreement</title> -</head> - -<body lang="EN-US" link=blue vlink=purple> -<h2>Eclipse Foundation Software User Agreement</h2> -<p>March 17, 2005</p> - -<h3>Usage Of Content</h3> - -<p>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.</p> - -<h3>Applicable Licenses</h3> - -<p>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 <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>. - For purposes of the EPL, "Program" will mean the Content.</p> - -<p>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").</p> - -<ul> - <li>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").</li> - <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java™ ARchive) in a directory named "plugins".</li> - <li>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.</li> - <li>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.</li> -</ul> - -<p>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:</p> - -<ul> - <li>The top-level (root) directory</li> - <li>Plug-in and Fragment directories</li> - <li>Inside Plug-ins and Fragments packaged as JARs</li> - <li>Sub-directories of the directory named "src" of certain Plug-ins</li> - <li>Feature directories</li> -</ul> - -<p>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.</p> - -<p>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):</p> - -<ul> - <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li> - <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li> - <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li> - <li>IBM Public License 1.0 (available at <a href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</a>)</li> - <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li> - <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li> -</ul> - -<p>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.</p> - -<h3>Cryptography</h3> - -<p>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.</p> - -<small>Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.</small> -</body> -</html> diff --git a/rse/features/org.eclipse.rse.terminals-feature/.project b/rse/features/org.eclipse.rse.terminals-feature/.project deleted file mode 100644 index 568aec99d..000000000 --- a/rse/features/org.eclipse.rse.terminals-feature/.project +++ /dev/null @@ -1,17 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<projectDescription> - <name>org.eclipse.rse.terminals-feature</name> - <comment></comment> - <projects> - </projects> - <buildSpec> - <buildCommand> - <name>org.eclipse.pde.FeatureBuilder</name> - <arguments> - </arguments> - </buildCommand> - </buildSpec> - <natures> - <nature>org.eclipse.pde.FeatureNature</nature> - </natures> -</projectDescription> diff --git a/rse/features/org.eclipse.rse.terminals-feature/build.properties b/rse/features/org.eclipse.rse.terminals-feature/build.properties deleted file mode 100644 index 45ee56b37..000000000 --- a/rse/features/org.eclipse.rse.terminals-feature/build.properties +++ /dev/null @@ -1,16 +0,0 @@ -################################################################################ -# Copyright (c) 2006, 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: -# Martin Oberhuber - initial API and implementation -################################################################################ -bin.includes = feature.xml,\ - feature.properties,\ - license.html,\ - epl-v10.html,\ - eclipse_update_120.jpg -
\ No newline at end of file diff --git a/rse/features/org.eclipse.rse.terminals-feature/eclipse_update_120.jpg b/rse/features/org.eclipse.rse.terminals-feature/eclipse_update_120.jpg Binary files differdeleted file mode 100644 index bfdf708ad..000000000 --- a/rse/features/org.eclipse.rse.terminals-feature/eclipse_update_120.jpg +++ /dev/null diff --git a/rse/features/org.eclipse.rse.terminals-feature/epl-v10.html b/rse/features/org.eclipse.rse.terminals-feature/epl-v10.html deleted file mode 100644 index 9321f4082..000000000 --- a/rse/features/org.eclipse.rse.terminals-feature/epl-v10.html +++ /dev/null @@ -1,256 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml"><head> - - - - -<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>Eclipse Public License - Version 1.0</title> - -<style type="text/css"> - body { - size: 8.5in 11.0in; - margin: 0.25in 0.5in 0.25in 0.5in; - tab-interval: 0.5in; - } - p { - margin-left: auto; - margin-top: 0.5em; - margin-bottom: 0.5em; - } - p.list { - margin-left: 0.5in; - margin-top: 0.05em; - margin-bottom: 0.05em; - } - </style></head><body lang="EN-US"> - -<p align="center"><b>Eclipse Public License - v 1.0</b></p> - -<p>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.</p> - -<p><b>1. DEFINITIONS</b></p> - -<p>"Contribution" means:</p> - -<p class="list">a) in the case of the initial Contributor, the initial -code and documentation distributed under this Agreement, and</p> -<p class="list">b) in the case of each subsequent Contributor:</p> -<p class="list">i) changes to the Program, and</p> -<p class="list">ii) additions to the Program;</p> -<p class="list">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.</p> - -<p>"Contributor" means any person or entity that distributes -the Program.</p> - -<p>"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.</p> - -<p>"Program" means the Contributions distributed in accordance -with this Agreement.</p> - -<p>"Recipient" means anyone who receives the Program under -this Agreement, including all Contributors.</p> - -<p><b>2. GRANT OF RIGHTS</b></p> - -<p class="list">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.</p> - -<p class="list">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.</p> - -<p class="list">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.</p> - -<p class="list">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.</p> - -<p><b>3. REQUIREMENTS</b></p> - -<p>A Contributor may choose to distribute the Program in object code -form under its own license agreement, provided that:</p> - -<p class="list">a) it complies with the terms and conditions of this -Agreement; and</p> - -<p class="list">b) its license agreement:</p> - -<p class="list">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;</p> - -<p class="list">ii) effectively excludes on behalf of all Contributors -all liability for damages, including direct, indirect, special, -incidental and consequential damages, such as lost profits;</p> - -<p class="list">iii) states that any provisions which differ from this -Agreement are offered by that Contributor alone and not by any other -party; and</p> - -<p class="list">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.</p> - -<p>When the Program is made available in source code form:</p> - -<p class="list">a) it must be made available under this Agreement; and</p> - -<p class="list">b) a copy of this Agreement must be included with each -copy of the Program.</p> - -<p>Contributors may not remove or alter any copyright notices contained -within the Program.</p> - -<p>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.</p> - -<p><b>4. COMMERCIAL DISTRIBUTION</b></p> - -<p>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.</p> - -<p>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.</p> - -<p><b>5. NO WARRANTY</b></p> - -<p>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.</p> - -<p><b>6. DISCLAIMER OF LIABILITY</b></p> - -<p>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.</p> - -<p><b>7. GENERAL</b></p> - -<p>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.</p> - -<p>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.</p> - -<p>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.</p> - -<p>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.</p> - -<p>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.</p> - -</body></html>
\ No newline at end of file diff --git a/rse/features/org.eclipse.rse.terminals-feature/feature.properties b/rse/features/org.eclipse.rse.terminals-feature/feature.properties deleted file mode 100644 index a6aeed831..000000000 --- a/rse/features/org.eclipse.rse.terminals-feature/feature.properties +++ /dev/null @@ -1,139 +0,0 @@ -################################################################################ -# Copyright (c) 2006, 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: -# Martin Oberhuber - initial API and implementation -################################################################################ - -# NLS_MESSAGEFORMAT_NONE -# NLS_ENCODING=UTF-8 - -# "featureName" property - name of the feature -featureName=RSE Terminals UI (Incubation) - -# "providerName" property - name of the company that provides the feature -providerName=Eclipse.org - -# "tmUpdateSiteName" property - label for the update site -tmUpdateSiteName=Target Management 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, 2008 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\ -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 --git a/rse/features/org.eclipse.rse.terminals-feature/feature.xml b/rse/features/org.eclipse.rse.terminals-feature/feature.xml deleted file mode 100644 index 9e12dff89..000000000 --- a/rse/features/org.eclipse.rse.terminals-feature/feature.xml +++ /dev/null @@ -1,65 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<feature - id="org.eclipse.rse.terminals" - label="%featureName" - version="0.1.1.qualifier" - provider-name="%providerName" - plugin="org.eclipse.rse.terminals.ui" - image="eclipse_update_120.jpg"> - - <description> - %description - </description> - - <copyright> - %copyright - </copyright> - - <license url="%licenseURL"> - %license - </license> - - <url> - <update label="%tmUpdateSiteName" url="http://download.eclipse.org/dsdp/tm/updates/3.0"/> - <discovery label="%tmUpdateSiteName" url="http://download.eclipse.org/dsdp/tm/updates/3.0"/> - </url> - - <includes - id="org.eclipse.tm.terminal" - version="0.0.0" - search-location="self"/> - - <requires> - <import plugin="org.eclipse.core.runtime"/> - <import plugin="org.eclipse.ui"/> - <import plugin="org.eclipse.ui.views"/> - <import plugin="org.eclipse.rse.services" version="3.0.0" match="compatible"/> - <import plugin="org.eclipse.rse.services.ssh" version="2.1.0" match="equivalent"/> - <import plugin="org.eclipse.rse.core" version="3.0.0" match="compatible"/> - <import plugin="org.eclipse.rse.ui" version="3.0.0" match="compatible"/> - <import plugin="org.eclipse.rse.connectorservice.ssh" version="2.1.0" match="compatible"/> - <import plugin="org.eclipse.rse.subsystems.files.core" version="3.0.0" match="compatible"/> - </requires> - - <plugin - id="org.eclipse.rse.subsystems.terminals.core" - download-size="7" - install-size="15" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.eclipse.rse.subsystems.terminals.ssh" - download-size="7" - install-size="11" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.eclipse.rse.terminals.ui" - download-size="24" - install-size="51" - version="0.0.0" - unpack="false"/> - -</feature> diff --git a/rse/features/org.eclipse.rse.terminals-feature/license.html b/rse/features/org.eclipse.rse.terminals-feature/license.html deleted file mode 100644 index c6af966b6..000000000 --- a/rse/features/org.eclipse.rse.terminals-feature/license.html +++ /dev/null @@ -1,79 +0,0 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"> -<html> -<head> -<meta http-equiv=Content-Type content="text/html; charset=iso-8859-1"> -<title>Eclipse.org Software User Agreement</title> -</head> - -<body lang="EN-US" link=blue vlink=purple> -<h2>Eclipse Foundation Software User Agreement</h2> -<p>March 17, 2005</p> - -<h3>Usage Of Content</h3> - -<p>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.</p> - -<h3>Applicable Licenses</h3> - -<p>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 <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>. - For purposes of the EPL, "Program" will mean the Content.</p> - -<p>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").</p> - -<ul> - <li>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").</li> - <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java™ ARchive) in a directory named "plugins".</li> - <li>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.</li> - <li>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.</li> -</ul> - -<p>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:</p> - -<ul> - <li>The top-level (root) directory</li> - <li>Plug-in and Fragment directories</li> - <li>Inside Plug-ins and Fragments packaged as JARs</li> - <li>Sub-directories of the directory named "src" of certain Plug-ins</li> - <li>Feature directories</li> -</ul> - -<p>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.</p> - -<p>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):</p> - -<ul> - <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li> - <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li> - <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li> - <li>IBM Public License 1.0 (available at <a href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</a>)</li> - <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li> - <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li> -</ul> - -<p>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.</p> - -<h3>Cryptography</h3> - -<p>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.</p> - -<small>Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.</small> -</body> -</html> diff --git a/rse/features/org.eclipse.rse.terminals-feature/sourceTemplateFeature/epl-v10.html b/rse/features/org.eclipse.rse.terminals-feature/sourceTemplateFeature/epl-v10.html deleted file mode 100644 index 9321f4082..000000000 --- a/rse/features/org.eclipse.rse.terminals-feature/sourceTemplateFeature/epl-v10.html +++ /dev/null @@ -1,256 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml"><head> - - - - -<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>Eclipse Public License - Version 1.0</title> - -<style type="text/css"> - body { - size: 8.5in 11.0in; - margin: 0.25in 0.5in 0.25in 0.5in; - tab-interval: 0.5in; - } - p { - margin-left: auto; - margin-top: 0.5em; - margin-bottom: 0.5em; - } - p.list { - margin-left: 0.5in; - margin-top: 0.05em; - margin-bottom: 0.05em; - } - </style></head><body lang="EN-US"> - -<p align="center"><b>Eclipse Public License - v 1.0</b></p> - -<p>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.</p> - -<p><b>1. DEFINITIONS</b></p> - -<p>"Contribution" means:</p> - -<p class="list">a) in the case of the initial Contributor, the initial -code and documentation distributed under this Agreement, and</p> -<p class="list">b) in the case of each subsequent Contributor:</p> -<p class="list">i) changes to the Program, and</p> -<p class="list">ii) additions to the Program;</p> -<p class="list">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.</p> - -<p>"Contributor" means any person or entity that distributes -the Program.</p> - -<p>"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.</p> - -<p>"Program" means the Contributions distributed in accordance -with this Agreement.</p> - -<p>"Recipient" means anyone who receives the Program under -this Agreement, including all Contributors.</p> - -<p><b>2. GRANT OF RIGHTS</b></p> - -<p class="list">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.</p> - -<p class="list">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.</p> - -<p class="list">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.</p> - -<p class="list">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.</p> - -<p><b>3. REQUIREMENTS</b></p> - -<p>A Contributor may choose to distribute the Program in object code -form under its own license agreement, provided that:</p> - -<p class="list">a) it complies with the terms and conditions of this -Agreement; and</p> - -<p class="list">b) its license agreement:</p> - -<p class="list">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;</p> - -<p class="list">ii) effectively excludes on behalf of all Contributors -all liability for damages, including direct, indirect, special, -incidental and consequential damages, such as lost profits;</p> - -<p class="list">iii) states that any provisions which differ from this -Agreement are offered by that Contributor alone and not by any other -party; and</p> - -<p class="list">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.</p> - -<p>When the Program is made available in source code form:</p> - -<p class="list">a) it must be made available under this Agreement; and</p> - -<p class="list">b) a copy of this Agreement must be included with each -copy of the Program.</p> - -<p>Contributors may not remove or alter any copyright notices contained -within the Program.</p> - -<p>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.</p> - -<p><b>4. COMMERCIAL DISTRIBUTION</b></p> - -<p>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.</p> - -<p>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.</p> - -<p><b>5. NO WARRANTY</b></p> - -<p>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.</p> - -<p><b>6. DISCLAIMER OF LIABILITY</b></p> - -<p>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.</p> - -<p><b>7. GENERAL</b></p> - -<p>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.</p> - -<p>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.</p> - -<p>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.</p> - -<p>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.</p> - -<p>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.</p> - -</body></html>
\ No newline at end of file diff --git a/rse/features/org.eclipse.rse.terminals-feature/sourceTemplateFeature/feature.properties b/rse/features/org.eclipse.rse.terminals-feature/sourceTemplateFeature/feature.properties deleted file mode 100644 index 66d3496de..000000000 --- a/rse/features/org.eclipse.rse.terminals-feature/sourceTemplateFeature/feature.properties +++ /dev/null @@ -1,145 +0,0 @@ -################################################################################ -# Copyright (c) 2006, 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: -# 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 Terminals UI Source (Incubation) - -# "providerName" property - name of the company that provides the feature -providerName=Eclipse.org - -# "tmUpdateSiteName" property - label for the update site -tmUpdateSiteName=Target Management Updates - -# "description" property - description of the feature -description=A Terminal View Integration for RSE Shell and Terminal Services. - -# "copyright" property - text of the "Feature Update Copyright" -copyright=\ -Copyright (c) 2002, 2008 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\ -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 --git a/rse/features/org.eclipse.rse.terminals-feature/sourceTemplateFeature/license.html b/rse/features/org.eclipse.rse.terminals-feature/sourceTemplateFeature/license.html deleted file mode 100644 index c6af966b6..000000000 --- a/rse/features/org.eclipse.rse.terminals-feature/sourceTemplateFeature/license.html +++ /dev/null @@ -1,79 +0,0 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"> -<html> -<head> -<meta http-equiv=Content-Type content="text/html; charset=iso-8859-1"> -<title>Eclipse.org Software User Agreement</title> -</head> - -<body lang="EN-US" link=blue vlink=purple> -<h2>Eclipse Foundation Software User Agreement</h2> -<p>March 17, 2005</p> - -<h3>Usage Of Content</h3> - -<p>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.</p> - -<h3>Applicable Licenses</h3> - -<p>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 <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>. - For purposes of the EPL, "Program" will mean the Content.</p> - -<p>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").</p> - -<ul> - <li>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").</li> - <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java™ ARchive) in a directory named "plugins".</li> - <li>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.</li> - <li>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.</li> -</ul> - -<p>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:</p> - -<ul> - <li>The top-level (root) directory</li> - <li>Plug-in and Fragment directories</li> - <li>Inside Plug-ins and Fragments packaged as JARs</li> - <li>Sub-directories of the directory named "src" of certain Plug-ins</li> - <li>Feature directories</li> -</ul> - -<p>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.</p> - -<p>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):</p> - -<ul> - <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li> - <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li> - <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li> - <li>IBM Public License 1.0 (available at <a href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</a>)</li> - <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li> - <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li> -</ul> - -<p>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.</p> - -<h3>Cryptography</h3> - -<p>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.</p> - -<small>Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.</small> -</body> -</html> diff --git a/rse/features/org.eclipse.rse.terminals-feature/sourceTemplatePlugin/about.html b/rse/features/org.eclipse.rse.terminals-feature/sourceTemplatePlugin/about.html deleted file mode 100644 index aa029c699..000000000 --- a/rse/features/org.eclipse.rse.terminals-feature/sourceTemplatePlugin/about.html +++ /dev/null @@ -1,33 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" - "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml"> -<head> -<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/> -<title>About</title> -</head> -<body lang="EN-US"> -<h2>About This Content</h2> - -<p>March 27, 2008</p> -<h3>License</h3> - -<p>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 <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>. -For purposes of the EPL, "Program" will mean the Content.</p> - -<p>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 <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p> - -<h3>Source Code</h3> -<p>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.</p> - -</body> -</html>
\ No newline at end of file diff --git a/rse/features/org.eclipse.rse.terminals-feature/sourceTemplatePlugin/about.ini b/rse/features/org.eclipse.rse.terminals-feature/sourceTemplatePlugin/about.ini deleted file mode 100644 index fdd61ff0d..000000000 --- a/rse/features/org.eclipse.rse.terminals-feature/sourceTemplatePlugin/about.ini +++ /dev/null @@ -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=eclipse32.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 --git a/rse/features/org.eclipse.rse.terminals-feature/sourceTemplatePlugin/about.mappings b/rse/features/org.eclipse.rse.terminals-feature/sourceTemplatePlugin/about.mappings deleted file mode 100644 index bddaab431..000000000 --- a/rse/features/org.eclipse.rse.terminals-feature/sourceTemplatePlugin/about.mappings +++ /dev/null @@ -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 --git a/rse/features/org.eclipse.rse.terminals-feature/sourceTemplatePlugin/about.properties b/rse/features/org.eclipse.rse.terminals-feature/sourceTemplatePlugin/about.properties deleted file mode 100644 index 29bd173e3..000000000 --- a/rse/features/org.eclipse.rse.terminals-feature/sourceTemplatePlugin/about.properties +++ /dev/null @@ -1,29 +0,0 @@ -################################################################################ -# Copyright (c) 2006, 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: -# 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 Terminals UI Source (Incubation)\n\ -\n\ -Version: {featureVersion}\n\ -Build id: {0}\n\ -\n\ -(c) Copyright MontaVista Software, Inc. and others 2002, 2008. All rights reserved.\n\ -Visit http://www.eclipse.org/dsdp/tm diff --git a/rse/features/org.eclipse.rse.terminals-feature/sourceTemplatePlugin/build.properties b/rse/features/org.eclipse.rse.terminals-feature/sourceTemplatePlugin/build.properties deleted file mode 100644 index c218c8e65..000000000 --- a/rse/features/org.eclipse.rse.terminals-feature/sourceTemplatePlugin/build.properties +++ /dev/null @@ -1,12 +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: -# Martin Oberhuber (Wind River) - initial API and implementation -############################################################################### -bin.includes = about.html, about.ini, about.mappings, about.properties, eclipse32.png, plugin.properties, plugin.xml, src/, META-INF/ -sourcePlugin = true diff --git a/rse/features/org.eclipse.rse.terminals-feature/sourceTemplatePlugin/eclipse32.png b/rse/features/org.eclipse.rse.terminals-feature/sourceTemplatePlugin/eclipse32.png Binary files differdeleted file mode 100644 index 568fac1d0..000000000 --- a/rse/features/org.eclipse.rse.terminals-feature/sourceTemplatePlugin/eclipse32.png +++ /dev/null diff --git a/rse/features/org.eclipse.rse.terminals-feature/sourceTemplatePlugin/plugin.properties b/rse/features/org.eclipse.rse.terminals-feature/sourceTemplatePlugin/plugin.properties deleted file mode 100644 index 5b01a1af0..000000000 --- a/rse/features/org.eclipse.rse.terminals-feature/sourceTemplatePlugin/plugin.properties +++ /dev/null @@ -1,16 +0,0 @@ -################################################################################ -# Copyright (c) 2006, 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: -# Martin Oberhuber - initial API and implementation -################################################################################ - -# NLS_MESSAGEFORMAT_NONE -# NLS_ENCODING=UTF-8 - -pluginName=RSE Terminals UI Source (Incubation) -providerName=Eclipse.org diff --git a/rse/features/org.eclipse.rse.useractions-feature/.project b/rse/features/org.eclipse.rse.useractions-feature/.project deleted file mode 100644 index 8802e889a..000000000 --- a/rse/features/org.eclipse.rse.useractions-feature/.project +++ /dev/null @@ -1,17 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<projectDescription> - <name>org.eclipse.rse.useractions-feature</name> - <comment></comment> - <projects> - </projects> - <buildSpec> - <buildCommand> - <name>org.eclipse.pde.FeatureBuilder</name> - <arguments> - </arguments> - </buildCommand> - </buildSpec> - <natures> - <nature>org.eclipse.pde.FeatureNature</nature> - </natures> -</projectDescription> diff --git a/rse/features/org.eclipse.rse.useractions-feature/build.properties b/rse/features/org.eclipse.rse.useractions-feature/build.properties deleted file mode 100644 index 811666a55..000000000 --- a/rse/features/org.eclipse.rse.useractions-feature/build.properties +++ /dev/null @@ -1,17 +0,0 @@ -############################################################################### -# Copyright (c) 2005, 2008 IBM Corporation and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 -# which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html -# -# Contributors: -# IBM Corporation - initial API and implementation -# Martin Oberhuber (Wind River) - Adapted from rse.dstore-feature -############################################################################### -bin.includes = feature.xml,\ - license.html,\ - feature.properties,\ - epl-v10.html,\ - eclipse_update_120.jpg -generate.plugin@org.eclipse.rse.useractions.source=org.eclipse.rse.useractions diff --git a/rse/features/org.eclipse.rse.useractions-feature/eclipse_update_120.jpg b/rse/features/org.eclipse.rse.useractions-feature/eclipse_update_120.jpg Binary files differdeleted file mode 100644 index bfdf708ad..000000000 --- a/rse/features/org.eclipse.rse.useractions-feature/eclipse_update_120.jpg +++ /dev/null diff --git a/rse/features/org.eclipse.rse.useractions-feature/epl-v10.html b/rse/features/org.eclipse.rse.useractions-feature/epl-v10.html deleted file mode 100644 index 9321f4082..000000000 --- a/rse/features/org.eclipse.rse.useractions-feature/epl-v10.html +++ /dev/null @@ -1,256 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml"><head> - - - - -<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>Eclipse Public License - Version 1.0</title> - -<style type="text/css"> - body { - size: 8.5in 11.0in; - margin: 0.25in 0.5in 0.25in 0.5in; - tab-interval: 0.5in; - } - p { - margin-left: auto; - margin-top: 0.5em; - margin-bottom: 0.5em; - } - p.list { - margin-left: 0.5in; - margin-top: 0.05em; - margin-bottom: 0.05em; - } - </style></head><body lang="EN-US"> - -<p align="center"><b>Eclipse Public License - v 1.0</b></p> - -<p>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.</p> - -<p><b>1. DEFINITIONS</b></p> - -<p>"Contribution" means:</p> - -<p class="list">a) in the case of the initial Contributor, the initial -code and documentation distributed under this Agreement, and</p> -<p class="list">b) in the case of each subsequent Contributor:</p> -<p class="list">i) changes to the Program, and</p> -<p class="list">ii) additions to the Program;</p> -<p class="list">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.</p> - -<p>"Contributor" means any person or entity that distributes -the Program.</p> - -<p>"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.</p> - -<p>"Program" means the Contributions distributed in accordance -with this Agreement.</p> - -<p>"Recipient" means anyone who receives the Program under -this Agreement, including all Contributors.</p> - -<p><b>2. GRANT OF RIGHTS</b></p> - -<p class="list">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.</p> - -<p class="list">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.</p> - -<p class="list">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.</p> - -<p class="list">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.</p> - -<p><b>3. REQUIREMENTS</b></p> - -<p>A Contributor may choose to distribute the Program in object code -form under its own license agreement, provided that:</p> - -<p class="list">a) it complies with the terms and conditions of this -Agreement; and</p> - -<p class="list">b) its license agreement:</p> - -<p class="list">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;</p> - -<p class="list">ii) effectively excludes on behalf of all Contributors -all liability for damages, including direct, indirect, special, -incidental and consequential damages, such as lost profits;</p> - -<p class="list">iii) states that any provisions which differ from this -Agreement are offered by that Contributor alone and not by any other -party; and</p> - -<p class="list">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.</p> - -<p>When the Program is made available in source code form:</p> - -<p class="list">a) it must be made available under this Agreement; and</p> - -<p class="list">b) a copy of this Agreement must be included with each -copy of the Program.</p> - -<p>Contributors may not remove or alter any copyright notices contained -within the Program.</p> - -<p>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.</p> - -<p><b>4. COMMERCIAL DISTRIBUTION</b></p> - -<p>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.</p> - -<p>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.</p> - -<p><b>5. NO WARRANTY</b></p> - -<p>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.</p> - -<p><b>6. DISCLAIMER OF LIABILITY</b></p> - -<p>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.</p> - -<p><b>7. GENERAL</b></p> - -<p>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.</p> - -<p>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.</p> - -<p>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.</p> - -<p>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.</p> - -<p>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.</p> - -</body></html>
\ No newline at end of file diff --git a/rse/features/org.eclipse.rse.useractions-feature/feature.properties b/rse/features/org.eclipse.rse.useractions-feature/feature.properties deleted file mode 100644 index 43d254a86..000000000 --- a/rse/features/org.eclipse.rse.useractions-feature/feature.properties +++ /dev/null @@ -1,140 +0,0 @@ -############################################################################### -# Copyright (c) 2006, 2008 IBM Corporation and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 -# which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html -# -# Contributors: -# IBM Corporation - initial API and implementation -# Martin Oberhuber (Wind River) - ongoing maintenance -############################################################################### - -# NLS_MESSAGEFORMAT_NONE -# NLS_ENCODING=UTF-8 - -# "featureName" property - name of the feature -featureName=RSE User Actions - -# "providerName" property - name of the company that provides the feature -providerName=Eclipse.org - -# "tmUpdateSiteName" property - label for the update site -tmUpdateSiteName=Target Management Updates - -# "description" property - description of the feature -description=A framework for contributing user-defined actions and compile commands to RSE. - -# "copyright" property - text of the "Feature Update Copyright" -copyright=\ -Copyright (c) 2000, 2008 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\ -available at http://www.eclipse.org/legal/epl-v10.html\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 --git a/rse/features/org.eclipse.rse.useractions-feature/feature.xml b/rse/features/org.eclipse.rse.useractions-feature/feature.xml deleted file mode 100644 index a7eeb0867..000000000 --- a/rse/features/org.eclipse.rse.useractions-feature/feature.xml +++ /dev/null @@ -1,56 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<feature - id="org.eclipse.rse.useractions" - label="%featureName" - version="1.1.2.qualifier" - provider-name="%providerName" - plugin="org.eclipse.rse.useractions" - image="eclipse_update_120.jpg"> - - <description> - %description - </description> - - <copyright url="http://www.eclipse.org/legal/epl-v10.html"> - %copyright - </copyright> - - <license url="%licenseURL"> - %license - </license> - - <url> - <update label="%tmUpdateSiteName" url="http://download.eclipse.org/dsdp/tm/updates/3.0"/> - <discovery label="%tmUpdateSiteName" url="http://download.eclipse.org/dsdp/tm/updates/3.0"/> - </url> - - <requires> - <import plugin="org.eclipse.core.resources"/> - <import plugin="org.eclipse.core.runtime"/> - <import plugin="org.eclipse.jface.text"/> - <import plugin="org.eclipse.ui"/> - <import plugin="org.eclipse.ui.ide"/> - <import plugin="org.eclipse.ui.views"/> - <import plugin="org.eclipse.ui.workbench.texteditor"/> - <import plugin="org.eclipse.rse.core" version="3.0.0" match="compatible"/> - <import plugin="org.eclipse.rse.services" version="3.0.0" match="compatible"/> - <import plugin="org.eclipse.rse.shells.ui" version="3.0.0" match="compatible"/> - <import plugin="org.eclipse.rse.subsystems.files.core" version="3.0.0" match="compatible"/> - <import plugin="org.eclipse.rse.subsystems.shells.core" version="3.0.0" match="compatible"/> - <import plugin="org.eclipse.rse.ui" version="3.0.0" match="compatible"/> - </requires> - - <plugin - id="org.eclipse.rse.useractions" - download-size="105" - install-size="339" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.eclipse.rse.useractions.source" - download-size="281" - install-size="284" - version="0.0.0"/> - -</feature> diff --git a/rse/features/org.eclipse.rse.useractions-feature/license.html b/rse/features/org.eclipse.rse.useractions-feature/license.html deleted file mode 100644 index c6af966b6..000000000 --- a/rse/features/org.eclipse.rse.useractions-feature/license.html +++ /dev/null @@ -1,79 +0,0 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"> -<html> -<head> -<meta http-equiv=Content-Type content="text/html; charset=iso-8859-1"> -<title>Eclipse.org Software User Agreement</title> -</head> - -<body lang="EN-US" link=blue vlink=purple> -<h2>Eclipse Foundation Software User Agreement</h2> -<p>March 17, 2005</p> - -<h3>Usage Of Content</h3> - -<p>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.</p> - -<h3>Applicable Licenses</h3> - -<p>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 <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>. - For purposes of the EPL, "Program" will mean the Content.</p> - -<p>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").</p> - -<ul> - <li>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").</li> - <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java™ ARchive) in a directory named "plugins".</li> - <li>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.</li> - <li>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.</li> -</ul> - -<p>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:</p> - -<ul> - <li>The top-level (root) directory</li> - <li>Plug-in and Fragment directories</li> - <li>Inside Plug-ins and Fragments packaged as JARs</li> - <li>Sub-directories of the directory named "src" of certain Plug-ins</li> - <li>Feature directories</li> -</ul> - -<p>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.</p> - -<p>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):</p> - -<ul> - <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li> - <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li> - <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li> - <li>IBM Public License 1.0 (available at <a href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</a>)</li> - <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li> - <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li> -</ul> - -<p>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.</p> - -<h3>Cryptography</h3> - -<p>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.</p> - -<small>Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.</small> -</body> -</html> diff --git a/rse/features/org.eclipse.rse.useractions-feature/sourceTemplateFeature/epl-v10.html b/rse/features/org.eclipse.rse.useractions-feature/sourceTemplateFeature/epl-v10.html deleted file mode 100644 index 9321f4082..000000000 --- a/rse/features/org.eclipse.rse.useractions-feature/sourceTemplateFeature/epl-v10.html +++ /dev/null @@ -1,256 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml"><head> - - - - -<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>Eclipse Public License - Version 1.0</title> - -<style type="text/css"> - body { - size: 8.5in 11.0in; - margin: 0.25in 0.5in 0.25in 0.5in; - tab-interval: 0.5in; - } - p { - margin-left: auto; - margin-top: 0.5em; - margin-bottom: 0.5em; - } - p.list { - margin-left: 0.5in; - margin-top: 0.05em; - margin-bottom: 0.05em; - } - </style></head><body lang="EN-US"> - -<p align="center"><b>Eclipse Public License - v 1.0</b></p> - -<p>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.</p> - -<p><b>1. DEFINITIONS</b></p> - -<p>"Contribution" means:</p> - -<p class="list">a) in the case of the initial Contributor, the initial -code and documentation distributed under this Agreement, and</p> -<p class="list">b) in the case of each subsequent Contributor:</p> -<p class="list">i) changes to the Program, and</p> -<p class="list">ii) additions to the Program;</p> -<p class="list">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.</p> - -<p>"Contributor" means any person or entity that distributes -the Program.</p> - -<p>"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.</p> - -<p>"Program" means the Contributions distributed in accordance -with this Agreement.</p> - -<p>"Recipient" means anyone who receives the Program under -this Agreement, including all Contributors.</p> - -<p><b>2. GRANT OF RIGHTS</b></p> - -<p class="list">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.</p> - -<p class="list">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.</p> - -<p class="list">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.</p> - -<p class="list">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.</p> - -<p><b>3. REQUIREMENTS</b></p> - -<p>A Contributor may choose to distribute the Program in object code -form under its own license agreement, provided that:</p> - -<p class="list">a) it complies with the terms and conditions of this -Agreement; and</p> - -<p class="list">b) its license agreement:</p> - -<p class="list">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;</p> - -<p class="list">ii) effectively excludes on behalf of all Contributors -all liability for damages, including direct, indirect, special, -incidental and consequential damages, such as lost profits;</p> - -<p class="list">iii) states that any provisions which differ from this -Agreement are offered by that Contributor alone and not by any other -party; and</p> - -<p class="list">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.</p> - -<p>When the Program is made available in source code form:</p> - -<p class="list">a) it must be made available under this Agreement; and</p> - -<p class="list">b) a copy of this Agreement must be included with each -copy of the Program.</p> - -<p>Contributors may not remove or alter any copyright notices contained -within the Program.</p> - -<p>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.</p> - -<p><b>4. COMMERCIAL DISTRIBUTION</b></p> - -<p>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.</p> - -<p>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.</p> - -<p><b>5. NO WARRANTY</b></p> - -<p>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.</p> - -<p><b>6. DISCLAIMER OF LIABILITY</b></p> - -<p>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.</p> - -<p><b>7. GENERAL</b></p> - -<p>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.</p> - -<p>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.</p> - -<p>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.</p> - -<p>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.</p> - -<p>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.</p> - -</body></html>
\ No newline at end of file diff --git a/rse/features/org.eclipse.rse.useractions-feature/sourceTemplateFeature/feature.properties b/rse/features/org.eclipse.rse.useractions-feature/sourceTemplateFeature/feature.properties deleted file mode 100644 index 9d14673d0..000000000 --- a/rse/features/org.eclipse.rse.useractions-feature/sourceTemplateFeature/feature.properties +++ /dev/null @@ -1,142 +0,0 @@ -############################################################################### -# Copyright (c) 2006, 2008 IBM Corporation and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 -# which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html -# -# Contributors: -# IBM Corporation - initial API and implementation -# Martin Oberhuber (Wind River) - adapted from rse.dstore-feature -############################################################################### -# 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 User Actions Source - -# "providerName" property - name of the company that provides the feature -providerName=Eclipse.org - -# "tmUpdateSiteName" property - label for the update site -tmUpdateSiteName=Target Management Updates - -# "description" property - description of the feature -description=A framework for contributing user-defined actions and compile commands to RSE. - -# "copyright" property - text of the "Feature Update Copyright" -copyright=\ -Copyright (c) 2000, 2008 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\ -available at http://www.eclipse.org/legal/epl-v10.html\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 --git a/rse/features/org.eclipse.rse.useractions-feature/sourceTemplateFeature/license.html b/rse/features/org.eclipse.rse.useractions-feature/sourceTemplateFeature/license.html deleted file mode 100644 index c6af966b6..000000000 --- a/rse/features/org.eclipse.rse.useractions-feature/sourceTemplateFeature/license.html +++ /dev/null @@ -1,79 +0,0 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"> -<html> -<head> -<meta http-equiv=Content-Type content="text/html; charset=iso-8859-1"> -<title>Eclipse.org Software User Agreement</title> -</head> - -<body lang="EN-US" link=blue vlink=purple> -<h2>Eclipse Foundation Software User Agreement</h2> -<p>March 17, 2005</p> - -<h3>Usage Of Content</h3> - -<p>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.</p> - -<h3>Applicable Licenses</h3> - -<p>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 <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>. - For purposes of the EPL, "Program" will mean the Content.</p> - -<p>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").</p> - -<ul> - <li>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").</li> - <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java™ ARchive) in a directory named "plugins".</li> - <li>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.</li> - <li>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.</li> -</ul> - -<p>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:</p> - -<ul> - <li>The top-level (root) directory</li> - <li>Plug-in and Fragment directories</li> - <li>Inside Plug-ins and Fragments packaged as JARs</li> - <li>Sub-directories of the directory named "src" of certain Plug-ins</li> - <li>Feature directories</li> -</ul> - -<p>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.</p> - -<p>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):</p> - -<ul> - <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li> - <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li> - <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li> - <li>IBM Public License 1.0 (available at <a href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</a>)</li> - <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li> - <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li> -</ul> - -<p>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.</p> - -<h3>Cryptography</h3> - -<p>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.</p> - -<small>Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.</small> -</body> -</html> diff --git a/rse/features/org.eclipse.rse.useractions-feature/sourceTemplatePlugin/about.html b/rse/features/org.eclipse.rse.useractions-feature/sourceTemplatePlugin/about.html deleted file mode 100644 index e7b57cfff..000000000 --- a/rse/features/org.eclipse.rse.useractions-feature/sourceTemplatePlugin/about.html +++ /dev/null @@ -1,33 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" - "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml"> -<head> -<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/> -<title>About</title> -</head> -<body lang="EN-US"> -<h2>About This Content</h2> - -<p>June 5, 2007</p> -<h3>License</h3> - -<p>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 <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>. -For purposes of the EPL, "Program" will mean the Content.</p> - -<p>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 <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p> - -<h3>Source Code</h3> -<p>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.</p> - -</body> -</html>
\ No newline at end of file diff --git a/rse/features/org.eclipse.rse.useractions-feature/sourceTemplatePlugin/about.ini b/rse/features/org.eclipse.rse.useractions-feature/sourceTemplatePlugin/about.ini deleted file mode 100644 index fdd61ff0d..000000000 --- a/rse/features/org.eclipse.rse.useractions-feature/sourceTemplatePlugin/about.ini +++ /dev/null @@ -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=eclipse32.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 --git a/rse/features/org.eclipse.rse.useractions-feature/sourceTemplatePlugin/about.mappings b/rse/features/org.eclipse.rse.useractions-feature/sourceTemplatePlugin/about.mappings deleted file mode 100644 index bddaab431..000000000 --- a/rse/features/org.eclipse.rse.useractions-feature/sourceTemplatePlugin/about.mappings +++ /dev/null @@ -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 --git a/rse/features/org.eclipse.rse.useractions-feature/sourceTemplatePlugin/about.properties b/rse/features/org.eclipse.rse.useractions-feature/sourceTemplatePlugin/about.properties deleted file mode 100644 index 56695a268..000000000 --- a/rse/features/org.eclipse.rse.useractions-feature/sourceTemplatePlugin/about.properties +++ /dev/null @@ -1,26 +0,0 @@ -############################################################################### -# Copyright (c) 2000, 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: -# IBM Corporation - initial API and implementation -# Martin Oberhuber (Wind River) - Adapted from rse.dstore-feature -############################################################################### -# 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 User Actions Source\n\ -\n\ -Version: {featureVersion}\n\ -Build id: {0}\n\ -\n\ -(c) Copyright IBM Corporation and others 2000, 2008. All rights reserved.\n\ -Visit http://www.eclipse.org/dsdp/tm diff --git a/rse/features/org.eclipse.rse.useractions-feature/sourceTemplatePlugin/build.properties b/rse/features/org.eclipse.rse.useractions-feature/sourceTemplatePlugin/build.properties deleted file mode 100644 index ee08dc353..000000000 --- a/rse/features/org.eclipse.rse.useractions-feature/sourceTemplatePlugin/build.properties +++ /dev/null @@ -1,13 +0,0 @@ -############################################################################### -# Copyright (c) 2000, 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: -# 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, eclipse32.png, plugin.properties, plugin.xml, src/, META-INF/ -sourcePlugin = true diff --git a/rse/features/org.eclipse.rse.useractions-feature/sourceTemplatePlugin/eclipse32.png b/rse/features/org.eclipse.rse.useractions-feature/sourceTemplatePlugin/eclipse32.png Binary files differdeleted file mode 100644 index 568fac1d0..000000000 --- a/rse/features/org.eclipse.rse.useractions-feature/sourceTemplatePlugin/eclipse32.png +++ /dev/null diff --git a/rse/features/org.eclipse.rse.useractions-feature/sourceTemplatePlugin/plugin.properties b/rse/features/org.eclipse.rse.useractions-feature/sourceTemplatePlugin/plugin.properties deleted file mode 100644 index 3fef7349c..000000000 --- a/rse/features/org.eclipse.rse.useractions-feature/sourceTemplatePlugin/plugin.properties +++ /dev/null @@ -1,13 +0,0 @@ -############################################################################### -# Copyright (c) 2000, 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: -# IBM Corporation - initial API and implementation -# Martin Oberhuber (Wind River) - Adapted from rse.dstore-feature -############################################################################### -pluginName=RSE User Actions Source -providerName=Eclipse.org diff --git a/rse/features/readme.txt b/rse/features/readme.txt deleted file mode 100644 index b1491292b..000000000 --- a/rse/features/readme.txt +++ /dev/null @@ -1,2 +0,0 @@ -Use the "features" folder for feature projects. -All projects should be named "org.eclipse.rse.**-feature". diff --git a/rse/plugins/org.eclipse.dstore.core/.classpath b/rse/plugins/org.eclipse.dstore.core/.classpath deleted file mode 100644 index 045b0fcb3..000000000 --- a/rse/plugins/org.eclipse.dstore.core/.classpath +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<classpath> - <classpathentry kind="src" path="src"/> - <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"> - <accessrules> - <accessrule kind="accessible" pattern="org/eclipse/dstore/**"/> - <accessrule kind="discouraged" pattern="**/internal/**"/> - </accessrules> - </classpathentry> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/> - <classpathentry kind="output" path="bin"/> -</classpath> diff --git a/rse/plugins/org.eclipse.dstore.core/.cvsignore b/rse/plugins/org.eclipse.dstore.core/.cvsignore deleted file mode 100644 index ba077a403..000000000 --- a/rse/plugins/org.eclipse.dstore.core/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -bin diff --git a/rse/plugins/org.eclipse.dstore.core/.project b/rse/plugins/org.eclipse.dstore.core/.project deleted file mode 100644 index 5c7cd5c8a..000000000 --- a/rse/plugins/org.eclipse.dstore.core/.project +++ /dev/null @@ -1,34 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<projectDescription> - <name>org.eclipse.dstore.core</name> - <comment></comment> - <projects> - </projects> - <buildSpec> - <buildCommand> - <name>org.eclipse.jdt.core.javabuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.eclipse.pde.ManifestBuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.eclipse.pde.SchemaBuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name> - <arguments> - </arguments> - </buildCommand> - </buildSpec> - <natures> - <nature>org.eclipse.pde.PluginNature</nature> - <nature>org.eclipse.jdt.core.javanature</nature> - <nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature> - </natures> -</projectDescription> diff --git a/rse/plugins/org.eclipse.dstore.core/.settings/org.eclipse.jdt.core.prefs b/rse/plugins/org.eclipse.dstore.core/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 381fc6eb0..000000000 --- a/rse/plugins/org.eclipse.dstore.core/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -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 --git a/rse/plugins/org.eclipse.dstore.core/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.dstore.core/META-INF/MANIFEST.MF deleted file mode 100644 index cab2ad2ff..000000000 --- a/rse/plugins/org.eclipse.dstore.core/META-INF/MANIFEST.MF +++ /dev/null @@ -1,28 +0,0 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: %pluginName -Bundle-SymbolicName: org.eclipse.dstore.core -Bundle-Version: 3.0.1.qualifier -Bundle-Activator: org.eclipse.dstore.core.Activator -Bundle-Localization: plugin -Require-Bundle: org.eclipse.ui, - org.eclipse.core.runtime, - org.eclipse.dstore.extra;bundle-version="[2.1.0,3.0.0)", - org.eclipse.ui.views -Bundle-ActivationPolicy: lazy -Eclipse-LazyStart: true -Export-Package: org.eclipse.dstore.core, - org.eclipse.dstore.core.client, - org.eclipse.dstore.core.java, - org.eclipse.dstore.core.miners, - org.eclipse.dstore.core.model, - org.eclipse.dstore.core.server, - org.eclipse.dstore.core.util, - org.eclipse.dstore.core.util.ssl, - org.eclipse.dstore.internal.core.client;x-internal:=true, - org.eclipse.dstore.internal.core.model;x-internal:=true, - org.eclipse.dstore.internal.core.server;x-internal:=true, - org.eclipse.dstore.internal.core.util;x-internal:=true, - org.eclipse.dstore.internal.core.util.ssl;x-internal:=true -Bundle-Vendor: %providerName -Bundle-RequiredExecutionEnvironment: J2SE-1.4 diff --git a/rse/plugins/org.eclipse.dstore.core/about.html b/rse/plugins/org.eclipse.dstore.core/about.html deleted file mode 100644 index d4cc693f9..000000000 --- a/rse/plugins/org.eclipse.dstore.core/about.html +++ /dev/null @@ -1,28 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" - "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml"> -<head> -<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/> -<title>About</title> -</head> -<body lang="EN-US"> -<h2>About This Content</h2> - -<p>June 5, 2007</p> -<h3>License</h3> - -<p>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 <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>. -For purposes of the EPL, "Program" will mean the Content.</p> - -<p>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 <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p> - -</body> -</html>
\ No newline at end of file diff --git a/rse/plugins/org.eclipse.dstore.core/build.properties b/rse/plugins/org.eclipse.dstore.core/build.properties deleted file mode 100644 index 501100bf1..000000000 --- a/rse/plugins/org.eclipse.dstore.core/build.properties +++ /dev/null @@ -1,20 +0,0 @@ -############################################################################### -# Copyright (c) 2001, 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 -############################################################################### -bin.includes = .,\ - dstore_core.jar,\ - plugin.properties,\ - about.html,\ - META-INF/ -source.. = src/ -output.. = bin/ -source.dstore_core.jar = src/ -output.dstore_core.jar = dstore_core.bin/ -src.includes = about.html diff --git a/rse/plugins/org.eclipse.dstore.core/export.jardesc b/rse/plugins/org.eclipse.dstore.core/export.jardesc deleted file mode 100644 index 6eebacfac..000000000 --- a/rse/plugins/org.eclipse.dstore.core/export.jardesc +++ /dev/null @@ -1,18 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<jardesc> - <jar path="D:/servers/800/dstore_core.jar"/> - <options buildIfNeeded="true" compress="true" descriptionLocation="/org.eclipse.dstore.core/export.jardesc" exportErrors="true" exportWarnings="true" includeDirectoryEntries="false" overwrite="false" saveDescription="true" storeRefactorings="false" useSourceFolders="false"/> - <refactoring deprecationInfo="true" structuralOnly="true"/> - <selectedProjects> - <project name="org.eclipse.dstore.core"/> - </selectedProjects> - <manifest generateManifest="true" manifestLocation="" manifestVersion="1.0" reuseManifest="false" saveManifest="false" usesManifest="true"> - <sealing sealJar="false"> - <packagesToSeal/> - <packagesToUnSeal/> - </sealing> - </manifest> - <selectedElements exportClassFiles="true" exportJavaFiles="false" exportOutputFolder="false"> - <javaElement handleIdentifier="=org.eclipse.dstore.core/src"/> - </selectedElements> -</jardesc> diff --git a/rse/plugins/org.eclipse.dstore.core/plugin.properties b/rse/plugins/org.eclipse.dstore.core/plugin.properties deleted file mode 100644 index f1ea22c2b..000000000 --- a/rse/plugins/org.eclipse.dstore.core/plugin.properties +++ /dev/null @@ -1,16 +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 -############################################################################### - -# NLS_MESSAGEFORMAT_NONE -# NLS_ENCODING=UTF-8 - -pluginName = RSE DStore Core -providerName = Eclipse.org diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/Activator.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/Activator.java deleted file mode 100644 index df9339903..000000000 --- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/Activator.java +++ /dev/null @@ -1,59 +0,0 @@ -/******************************************************************************** - * Copyright (c) 2006 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 - * - * 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: - * {Name} (company) - description of contribution. - ********************************************************************************/ - -package org.eclipse.dstore.core; - -import org.eclipse.core.runtime.Plugin; -import org.osgi.framework.BundleContext; - -/** - * The main plugin class to be used in the desktop. - */ -public class Activator extends Plugin { - - //The shared instance. - private static Activator plugin; - - /** - * The constructor. - */ - public Activator() { - plugin = this; - } - - /** - * This method is called upon plug-in activation - */ - public void start(BundleContext context) throws Exception { - super.start(context); - } - - /** - * This method is called when the plug-in is stopped - */ - public void stop(BundleContext context) throws Exception { - super.stop(context); - plugin = null; - } - - /** - * Returns the shared instance. - */ - public static Activator getDefault() { - return plugin; - } - -}
\ No newline at end of file diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/client/ClientConnection.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/client/ClientConnection.java deleted file mode 100644 index b84949a0b..000000000 --- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/client/ClientConnection.java +++ /dev/null @@ -1,922 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2002, 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 - * - * 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 McKnight (IBM) - [205986] daemon handshake needs a timeout - * David McKnight (IBM) - [218685] [dstore] Unable to connect when using SSL. - * Martin Oberhuber (Wind River) - [219260][dstore][regression] Cannot connect to dstore daemon - * David McKnight (IBM) [220123][dstore] Configurable timeout on irresponsiveness - * David McKnight (IBM) - [220892][dstore] Backward compatibility: Server and Daemon should support old clients - * 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 - * David Dykstal (IBM) [235284] Cancel password change causes problem - *******************************************************************************/ - -package org.eclipse.dstore.core.client; - -import java.io.BufferedReader; -import java.io.IOException; -import java.io.InputStreamReader; -import java.io.InterruptedIOException; -import java.io.OutputStreamWriter; -import java.io.PrintWriter; -import java.net.Socket; -import java.net.UnknownHostException; -import java.util.ArrayList; - -import javax.net.SocketFactory; -import javax.net.ssl.SSLContext; -import javax.net.ssl.SSLHandshakeException; -import javax.net.ssl.SSLSession; -import javax.net.ssl.SSLSocket; -import javax.net.ssl.SSLSocketFactory; - -import org.eclipse.dstore.core.model.CommandHandler; -import org.eclipse.dstore.core.model.DE; -import org.eclipse.dstore.core.model.DataElement; -import org.eclipse.dstore.core.model.DataStore; -import org.eclipse.dstore.core.model.DataStoreAttributes; -import org.eclipse.dstore.core.model.IDataStoreCompatibilityHandler; -import org.eclipse.dstore.core.model.IDataStoreConstants; -import org.eclipse.dstore.core.model.IExternalLoader; -import org.eclipse.dstore.core.model.ISSLProperties; -import org.eclipse.dstore.core.server.ServerLauncher; -import org.eclipse.dstore.core.util.ssl.IDataStoreTrustManager; -import org.eclipse.dstore.extra.IDomainNotifier; -import org.eclipse.dstore.internal.core.client.ClientAttributes; -import org.eclipse.dstore.internal.core.client.ClientCommandHandler; -import org.eclipse.dstore.internal.core.client.ClientReceiver; -import org.eclipse.dstore.internal.core.client.ClientUpdateHandler; -import org.eclipse.dstore.internal.core.server.ServerCommandHandler; -import org.eclipse.dstore.internal.core.util.ExternalLoader; -import org.eclipse.dstore.internal.core.util.Sender; -import org.eclipse.dstore.internal.core.util.ssl.DStoreSSLContext; -import org.eclipse.dstore.internal.core.util.ssl.DataStoreTrustManager; -import org.eclipse.dstore.internal.extra.DomainNotifier; - - - -/** - * ClientConnection provides the standard means of creating a new connection to - * a DataStore. - * - * <li> - * If a connection is local, then a DataStore is instantiated - * in the same process to be used by the client to communicate with miners (tools). - * </li> - * - * <li> - * If a connection is not local, then a virtual DataStore is instantiated in the - * current process to communicate with the remote DataStore. If the client wishes - * to instantiate a remote DataStore through a daemon, then ClientConnection first connects - * to the daemon requesting a DataStore at a given port, and then connects to the - * newly launched DataStore. Otherwise, a DataStore is expected to be running on - * the remote machine under the same port that the client tries to connect to. - * </li> - * - * @noextend This class is not intended to be subclassed by clients. - * - */ -public class ClientConnection -{ - private ClientAttributes _clientAttributes; - - private Socket _theSocket; - private boolean _isConnected = false; - private boolean _isRemote = false; - private DataStore _dataStore; - private IDomainNotifier _domainNotifier; - private Sender _sender; - private ClientReceiver _receiver; - private ClientUpdateHandler _updateHandler; - private CommandHandler _commandHandler; - - private int _clientVersion; - private int _clientMinor; - - - private String _name; - private String _host; - private String _port; - private String _hostDirectory; - private Socket _launchSocket; - - private DataStoreTrustManager _trustManager; - - private ArrayList _loaders; - - // changed these to final since they are constants (that don't change) - public final static String INCOMPATIBLE_SERVER_UPDATE = "Incompatible DataStore."; //$NON-NLS-1$ - public final static String INCOMPATIBLE_CLIENT_UPDATE = "Incompatible DataStore."; //$NON-NLS-1$ - public final static String SERVER_OLDER = "Older DataStore Server."; //$NON-NLS-1$ - public final static String CLIENT_OLDER = "Older DataStore Client."; //$NON-NLS-1$ - public final static String INCOMPATIBLE_PROTOCOL = "Incompatible Protocol."; //$NON-NLS-1$ - public final static String CANNOT_CONNECT = "Cannot connect to server."; //$NON-NLS-1$ - - // TODO: should probably make this a public constant in 3.1 - private final static String INVALID_DAEMON_PORT_NUMBER = "Invalid daemon port number."; //$NON-NLS-1$ - - /** - * Creates a new ClientConnection instance - * - * @param name an identifier for this connection - */ - public ClientConnection(String name) - { - _domainNotifier = new DomainNotifier(); - _name = name; - init(); - } - - /** - * Creates a new ClientConnection instance - * - * @param name an identifier for this connection - * @param initialSize the number of elements to preallocate in the DataStore - */ - public ClientConnection(String name, int initialSize) - { - _domainNotifier = new DomainNotifier(); - _name = name; - init(initialSize); - } - - /** - * Creates a new ClientConnection instance - * - * @param name an identifier for this connection - * @param notifier the notifier used to keep the user interface in synch - * with the DataStore - * @since 3.0 changed DomainNotifier into IDomainNotifier - */ - public ClientConnection(String name, IDomainNotifier notifier) - { - _domainNotifier = notifier; - _name = name; - init(); - } - - /** - * Creates a new ClientConnection instance - * - * @param name an identifier for this connection - * @param notifier the notifier used to keep the user interface in synch - * with the DataStore - * @param initialSize the number of elements to preallocate in the DataStore - * @since 3.0 changed DomainNotifier into IDomainNotifier - */ - public ClientConnection(String name, IDomainNotifier notifier, int initialSize) - { - _domainNotifier = notifier; - _name = name; - init(initialSize); - } - - - public int getClientVersion() - { - return _clientVersion; - } - - public int getClientMinor() - { - return _clientMinor; - } - - public int getServerVersion() - { - return _dataStore.getServerVersion(); - } - - public int getServerMinor() - { - return _dataStore.getServerMinor(); - } - - public void setSSLProperties(ISSLProperties properties) - { - _dataStore.setSSLProperties(properties); - } - - /** - * @since 3.0 changed DataStoreCompatibilityHandler into - * IDataStoreCompatibilityHandler - */ - public void setCompatibilityHandler(IDataStoreCompatibilityHandler handler){ - _dataStore.setCompatibilityHandler(handler); - } - - /** - * @since 3.0 changed DataStoreCompatibilityHandler into - * IDataStoreCompatibilityHandler - */ - public IDataStoreCompatibilityHandler getCompatibilityHandler(){ - return _dataStore.getCompatibilityHandler(); - } - - /** - * Specifies the loaders used to instantiate the miners - * - * @param loaders the loaders - */ - public void setLoaders(ArrayList loaders) - { - _loaders = loaders; - } - - /** - * Adds a loader to be used to instantiate the miners - * - * @param loader the loader - * @since 3.0 changed ExternalLoader into IExternalLoader - */ - public void addLoader(IExternalLoader loader) - { - if (_loaders == null) - { - _loaders = new ArrayList(); - } - _loaders.add(loader); - } - - /** - * Specifies the hostname or IP of the host to connect to - * - * @param host the hostname or IP of the machine to connect to - */ - public void setHost(String host) - { - _host = host; - _clientAttributes.setAttribute(DataStoreAttributes.A_HOST_NAME, _host); - } - - /** - * Specifies the number of the socket port to connect to - * - * @param port the number of the socket port to connect to - */ - public void setPort(String port) - { - if (port == null || port.length() == 0) - { - port = "0"; //$NON-NLS-1$ - } - - _port = port; - _clientAttributes.setAttribute(DataStoreAttributes.A_HOST_PORT, _port); - } - - /** - * Specifies the default working directory on the remote machine - * - * @param directory the remote working directory - */ - public void setHostDirectory(String directory) - { - _hostDirectory = directory; - _clientAttributes.setAttribute(DataStoreAttributes.A_HOST_PATH, _hostDirectory); - } - - /** - * Returns the hostname/IP of the host to connect to - * - * @return the hostname/IP - */ - public String getHost() - { - return _host; - } - - /** - * Returns the number of the socket port to connect to - * - * @return the number of the socket port to connect to - */ - public String getPort() - { - return _port; - } - - /** - * Returns the default working directory on the host machine - * - * @return the working directory on the host - */ - public String getHostDirectory() - { - return _hostDirectory; - } - - /** - * Indicates whether the client is connected to the DataStore - * - * @return whether the client is connected - */ - public boolean isConnected() - { - if (_isConnected) - { - return _dataStore.isConnected(); - } - - return _isConnected; - } - - /** - * Disconnects from the DataStore and cleans up DataStore meta-information - */ - public void disconnect() - { - if (_isConnected) - { - _dataStore.removeDataStorePreferenceListener(_receiver); - _dataStore.setConnected(false); - - if (_isRemote) - { - _commandHandler.command( - _dataStore.find(_dataStore.getRoot(), DE.A_NAME, "Exit"), //$NON-NLS-1$ - _dataStore.getHostRoot(), - false); - _receiver.finish(); - } - - _commandHandler.finish(); - - - try - { - Thread.sleep(200); - } - catch (InterruptedException e) - { - System.out.println(e); - } - - _updateHandler.finish(); - _dataStore.finish(); - - _isConnected = false; - } - } - - /** - * Creates and connects to a local DataStore to work with in the current process. - * - * @return the status of the DataStore connection - */ - public ConnectionStatus localConnect() - { - _updateHandler = new ClientUpdateHandler(); - _updateHandler.start(); - - if (_loaders == null) - { - _loaders = new ArrayList(); - _loaders.add(new ExternalLoader(getClass().getClassLoader(), "*")); //$NON-NLS-1$ - } - - _commandHandler = new ServerCommandHandler(_loaders); - _commandHandler.start(); - - _dataStore.setCommandHandler(_commandHandler); - _dataStore.setUpdateHandler(_updateHandler); - _dataStore.setConnected(true); - _dataStore.setLoaders(_loaders); - _dataStore.getDomainNotifier().enable(true); - - _commandHandler.setDataStore(_dataStore); - _updateHandler.setDataStore(_dataStore); - ((ServerCommandHandler) _commandHandler).loadMiners(); - - _clientAttributes.setAttribute( - DataStoreAttributes.A_LOCAL_NAME, - _clientAttributes.getAttribute(DataStoreAttributes.A_HOST_NAME)); - _clientAttributes.setAttribute( - DataStoreAttributes.A_LOCAL_PATH, - _clientAttributes.getAttribute(DataStoreAttributes.A_HOST_PATH)); - - _isConnected = true; - - DataElement ticket = _dataStore.getTicket(); - ticket.setAttribute(DE.A_NAME, "null"); //$NON-NLS-1$ - - ConnectionStatus result = new ConnectionStatus(_isConnected); - result.setTicket(ticket.getName()); - - return result; - } - - /** - * Connects to a remote DataStore by first communicating with a remote daemon and then - * connecting to the DataStore. - * - * @param launchServer an indication of whether to launch a DataStore on the daemon on not - * @param user the user ID of the current user on the remote machine - * @param password the password of the current user on the remote machine - * @return the status of the connection - */ - public ConnectionStatus connect(boolean launchServer, String user, String password) - { - ConnectionStatus launchStatus = null; - if (launchServer) - { - launchStatus = launchServer(user, password); - if (!launchStatus.isConnected()) - { - return launchStatus; - } - } - else - { - launchStatus = new ConnectionStatus(true); - launchStatus.setTicket("null"); //$NON-NLS-1$ - } - - return connect(launchStatus.getTicket()); - } - - /** - * @since 3.0 changed DataStoreTrustManager into IDataStoreTrustManager - */ - public IDataStoreTrustManager getTrustManager() - { - if (_trustManager == null) - { - _trustManager = new DataStoreTrustManager(); - } - return _trustManager; - } - - /** - * Connects to a remote DataStore. - * A socket is created and the virtual DataStore is initialized with an update handler, command handler, - * socket sender and socket receiver. - * - * @param ticket the ticket required to be granted access to the remote DataStore - * @return the status of the connection - */ - public ConnectionStatus connect(String ticket) - { - return connect(ticket, 0); - } - - public ConnectionStatus connect(String ticket, int timeout) - { - boolean doTimeOut = (timeout > 0); - ConnectionStatus result = null; - try - { - int port = 0; - if (_port != null && _port.length() > 0) - { - port = Integer.parseInt(_port); - } - - if (!_dataStore.usingSSL()) - { - _theSocket = new Socket(_host, port); - if (doTimeOut && (_theSocket != null)) - _theSocket.setSoTimeout(timeout); - } - else - { - String location = _dataStore.getKeyStoreLocation(); - String pw = _dataStore.getKeyStorePassword(); - IDataStoreTrustManager mgr = getTrustManager(); - SSLContext context = DStoreSSLContext.getClientSSLContext(location, pw, mgr); - SSLSocketFactory factory = context.getSocketFactory(); - - _theSocket = factory.createSocket(_host, port); - if (doTimeOut && (_theSocket != null)) - _theSocket.setSoTimeout(timeout); - try - { - - ((SSLSocket) _theSocket).startHandshake(); - ((SSLSocket) _theSocket).getSession(); - - } - catch (SSLHandshakeException e) - { - result = new ConnectionStatus(false, e, true, mgr.getUntrustedCerts()); - return result; - } - catch (Exception e) - { - e.printStackTrace(); - _theSocket.close(); - result = new ConnectionStatus(false, e); - return result; - } - } - - String msg = null; - int handshakeResult = doHandShake(); - switch (handshakeResult) - { - case IDataStoreCompatibilityHandler.HANDSHAKE_CORRECT: - result = doConnect(ticket); - break; - case IDataStoreCompatibilityHandler.HANDSHAKE_SERVER_RECENT_NEWER: - result = doConnect(ticket); - result.setMessage(CLIENT_OLDER); - break; - case IDataStoreCompatibilityHandler.HANDSHAKE_SERVER_RECENT_OLDER: - result = doConnect(ticket); - result.setMessage(SERVER_OLDER); - break; - case IDataStoreCompatibilityHandler.HANDSHAKE_SERVER_NEWER: - { - msg = INCOMPATIBLE_CLIENT_UPDATE; - msg += "\nThe server running on " //$NON-NLS-1$ - + _host - + " under port " //$NON-NLS-1$ - + _port - + " is a newer DataStore server."; //$NON-NLS-1$ - break; - } - case IDataStoreCompatibilityHandler.HANDSHAKE_SERVER_OLDER: - { - msg = INCOMPATIBLE_SERVER_UPDATE; - msg += "\nThe server running on " //$NON-NLS-1$ - + _host - + " under port " //$NON-NLS-1$ - + _port - + " is an older DataStore server."; //$NON-NLS-1$ - break; - } - case IDataStoreCompatibilityHandler.HANDSHAKE_INCORRECT: - { - msg = CANNOT_CONNECT; - msg += INCOMPATIBLE_PROTOCOL; - msg += "\nThe server running on " //$NON-NLS-1$ - + _host - + " under port " //$NON-NLS-1$ - + _port - + " is not a valid DataStore server."; //$NON-NLS-1$ - break; - } - case IDataStoreCompatibilityHandler.HANDSHAKE_UNEXPECTED: - { - msg = CANNOT_CONNECT; - msg += "Unexpected exception."; //$NON-NLS-1$ - break; - } - case IDataStoreCompatibilityHandler.HANDSHAKE_TIMEOUT: - { - msg = CANNOT_CONNECT; - msg += "Timeout waiting for socket activity."; //$NON-NLS-1$ - break; - } - default: - break; - } - - if (result == null && msg != null) - { - result = new ConnectionStatus(false, msg); - _isConnected = false; - _theSocket.close(); - } - } - catch (java.net.ConnectException e) - { - String msg = "Connection Refused."; //$NON-NLS-1$ - msg += "\nMake sure that the DataStore server is running on " + _host + " under port " + _port + "."; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - result = new ConnectionStatus(false, msg); - } - catch (UnknownHostException uhe) - { - _isConnected = false; - result = new ConnectionStatus(_isConnected, uhe); - } - catch (IOException ioe) - { - _isConnected = false; - result = new ConnectionStatus(_isConnected, ioe); - } - return result; - } - - protected ConnectionStatus doConnect(String ticket) - { - _sender = new Sender(_theSocket, _dataStore); - _updateHandler = new ClientUpdateHandler(); - _updateHandler.start(); - - _commandHandler = new ClientCommandHandler(_sender); - _commandHandler.start(); - - _dataStore.setCommandHandler(_commandHandler); - _dataStore.setUpdateHandler(_updateHandler); - _dataStore.setConnected(true); - _dataStore.getDomainNotifier().enable(true); - - _commandHandler.setDataStore(_dataStore); - _updateHandler.setDataStore(_dataStore); - - _receiver = new ClientReceiver(_theSocket, _dataStore); - _dataStore.addDataStorePreferenceListener(_receiver); - _receiver.start(); - - _isConnected = true; - _isRemote = true; - ConnectionStatus result = new ConnectionStatus(_isConnected); - result.setTicket(ticket); - return result; - } - - /** - * Connects to a remote daemon and tells the daemon to launch - * a DataStore server. - * - * @param user the user ID of the current user on the remote machine - * @param password the password of the current user on the remote machine - * @return the status of the connection - */ - public ConnectionStatus launchServer(String user, String password) - { - // default daemon port is 4075 - return launchServer(user, password, ServerLauncher.DEFAULT_DAEMON_PORT); - } - - /** - * Connects to a remote daemon and tells the daemon to launch - * a DataStore server. - * - * @param user the user ID of the current user on the remote machine - * @param password the password of the current user on the remote machine - * @param daemonPort the port of the daemon - * @return the status of the connection - */ - public ConnectionStatus launchServer(String user, String password, int daemonPort) - { - return launchServer(user, password, daemonPort, 0); - } - - public ConnectionStatus launchServer(String user, String password, int daemonPort, int timeout) - { - if (timeout<=0) { - //bug 219260: default timeout 10 sec if not specified - timeout = 10000; - } - ConnectionStatus result = connectDaemon(daemonPort, timeout); - if (!result.isConnected()) { - return result; - } - try - { - PrintWriter writer = null; - BufferedReader reader = null; - - // create output stream for server launcher - try - { - writer = new PrintWriter(new OutputStreamWriter(_launchSocket.getOutputStream(), DE.ENCODING_UTF_8)); - writer.println(user); - writer.println(password); - writer.println(_port); - writer.flush(); - - reader = new BufferedReader(new InputStreamReader(_launchSocket.getInputStream(), DE.ENCODING_UTF_8)); - String status = null; - - try - { - status = reader.readLine(); - } - catch (InterruptedIOException e) - { - result = new ConnectionStatus(false, e); - } - - - if (status != null && !status.equals(IDataStoreConstants.CONNECTED)) - { - result = new ConnectionStatus(false, status); - } - else if (status == null) - { - Exception e = new Exception("no status returned"); //$NON-NLS-1$ - result = new ConnectionStatus(false, e); - } - else - { - result = new ConnectionStatus(true); - - _port = reader.readLine(); - String ticket = reader.readLine(); - result.setTicket(ticket); - } - } - catch (java.io.IOException e) - { - e.printStackTrace(); - result = new ConnectionStatus(false, e); - } - - if (reader != null) - reader.close(); - - if (writer != null) - writer.close(); - _launchSocket.close(); - } - catch (IOException ioe) - { - System.out.println(ioe); - ioe.printStackTrace(); - result = new ConnectionStatus(false, ioe); - } - - return result; - } - - /** - * Connect to a remote daemon - * - * @param daemonPort the port of the daemon - * @return the status of the connection - * @since 3.0 - */ - public ConnectionStatus connectDaemon(int daemonPort, int timeout) { - ConnectionStatus result = new ConnectionStatus(true); - try - { - _launchSocket = null; - if (_dataStore.usingSSL()) - { - try - { - String location = _dataStore.getKeyStoreLocation(); - String pw = _dataStore.getKeyStorePassword(); - IDataStoreTrustManager mgr = getTrustManager(); - SSLContext context = DStoreSSLContext.getClientSSLContext(location, pw, mgr); - - try - { - SocketFactory factory = context.getSocketFactory(); - SSLSocket lSocket = (SSLSocket) factory.createSocket(_host, daemonPort); - _launchSocket = lSocket; - - if (timeout > 0) { - _launchSocket.setSoTimeout(timeout); - } - lSocket.startHandshake(); - - SSLSession session = lSocket.getSession(); - if (session == null) - { - lSocket.close(); - } - } - catch (SSLHandshakeException e) - { - result = new ConnectionStatus(false, e, true, mgr.getUntrustedCerts()); - return result; - } - catch (Exception e) - { - if (_launchSocket != null) - { - _launchSocket.close(); - } - if (daemonPort <= 0 || daemonPort > 65535) { - result = new ConnectionStatus(false, INVALID_DAEMON_PORT_NUMBER); - } else { - result = new ConnectionStatus(false, e); - } - return result; - } - } - catch (Exception e) - { - result = new ConnectionStatus(false, e); - return result; - } - } - else - { - _launchSocket = new Socket(_host, daemonPort); - if (timeout > 0) { - _launchSocket.setSoTimeout(timeout); - } - } - } - catch (java.net.ConnectException e) - { - String msg = "Connection Refused."; //$NON-NLS-1$ - msg += "\nMake sure that the DataStore daemon is running on " + _host + "."; //$NON-NLS-1$ //$NON-NLS-2$ - result = new ConnectionStatus(false, msg); - } - catch (UnknownHostException uhe) - { - result = new ConnectionStatus(false, uhe); - } - catch (IllegalArgumentException e) { - result = new ConnectionStatus(false, INVALID_DAEMON_PORT_NUMBER); - } - catch (IOException ioe) - { - result = new ConnectionStatus(false, ioe); - } - - return result; - } - - /** - * Reeturns the launch socket - * - * @return the launch socket - */ - public Socket getLaunchSocket() { - return _launchSocket; - } - - /** - * Returns the DataStore that the client is connected to. - * @return the DataStore - */ - public DataStore getDataStore() - { - return _dataStore; - } - - private void init() - { - init(10000); - } - - private void init(int initialSize) - { - _clientAttributes = new ClientAttributes(); - _clientAttributes.setAttribute(DataStoreAttributes.A_ROOT_NAME, _name); - - - _dataStore = new DataStore(_clientAttributes, initialSize); - _dataStore.setDomainNotifier(_domainNotifier); - _dataStore.createRoot(); - - _host = _clientAttributes.getAttribute(DataStoreAttributes.A_HOST_NAME); - _hostDirectory = _clientAttributes.getAttribute(DataStoreAttributes.A_HOST_PATH); - _port = _clientAttributes.getAttribute(DataStoreAttributes.A_HOST_PORT); - } - - - private int doHandShake() - { - try - { - BufferedReader reader = new BufferedReader(new InputStreamReader(_theSocket.getInputStream(), DE.ENCODING_UTF_8)); - PrintWriter writer = new PrintWriter(new OutputStreamWriter(_theSocket.getOutputStream(), DE.ENCODING_UTF_8)); - writer.println(""); //$NON-NLS-1$ - writer.println(""); //$NON-NLS-1$ - writer.println(""); //$NON-NLS-1$ - writer.flush(); - - String handshake = null; - try - { - handshake = reader.readLine(); - } - catch (InterruptedIOException e) - { - return IDataStoreCompatibilityHandler.HANDSHAKE_TIMEOUT; - } - _theSocket.setSoTimeout(0); - - String[] serverVersionStr = handshake.split("\\."); //$NON-NLS-1$ - int serverVersion = Integer.parseInt(serverVersionStr[IDataStoreCompatibilityHandler.VERSION_INDEX_VERSION]); - _dataStore.setServerVersion(serverVersion); - _dataStore.setServerMinor(Integer.parseInt(serverVersionStr[IDataStoreCompatibilityHandler.VERSION_INDEX_MINOR])); - - return getCompatibilityHandler().checkCompatibility(handshake); - } - catch (Exception e) - { - return IDataStoreCompatibilityHandler.HANDSHAKE_UNEXPECTED; - } - - } - - public boolean isKnownStatus(String status) - { - return status.equals(IDataStoreConstants.CONNECTED) || - status.equals(IDataStoreConstants.AUTHENTICATION_FAILED) || - status.equals(IDataStoreConstants.UNKNOWN_PROBLEM) || - status.startsWith(IDataStoreConstants.SERVER_FAILURE) || - status.equals(IDataStoreConstants.PASSWORD_EXPIRED) || - status.equals(IDataStoreConstants.NEW_PASSWORD_INVALID); - } -} diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/client/ConnectionStatus.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/client/ConnectionStatus.java deleted file mode 100644 index a0659b544..000000000 --- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/client/ConnectionStatus.java +++ /dev/null @@ -1,154 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2002, 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 - * - * 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 McKnight (IBM) - [226561] [apidoc] Add API markup to RSE Javadocs where extend / implement is allowed - *******************************************************************************/ - -package org.eclipse.dstore.core.client; - -import java.util.List; - -/** - * ConnectionStatus represents the state of a connection. This class is - * used for feedback, when a client attempts to connect to a server. - * - * @noextend This class is not intended to be subclassed by clients. - * @noinstantiate This class is not intended to be instantiated by clients. - */ -public class ConnectionStatus -{ - - private boolean _connected; - private Throwable _exception; - private String _message; - private String _ticket; - private boolean _SSLProblem = false; - private List _untrustedCertificates; - - /** - * Constructor - * @param connected indicates whether a connection has been made - */ - public ConnectionStatus(boolean connected) - { - _connected = connected; - } - - /** - * Constructor - * @param connected indicates whether a connection has been made - * @param e the exception that occurred when attempting to connect - */ - public ConnectionStatus(boolean connected, Throwable e) - { - _connected = connected; - _exception = e; - _message = e.toString(); - } - - /** - * Constructor - * @param connected indicates whether a connection has been made - * @param msg a connection error message - */ - public ConnectionStatus(boolean connected, String msg) - { - _connected = connected; - _message = msg; - } - - public ConnectionStatus(boolean connected, Throwable e, boolean sslProblem, List untrustedCerts) - { - _connected = connected; - _exception = e; - _message = e.toString(); - _SSLProblem = sslProblem; - _untrustedCertificates = untrustedCerts; - } - - /** - * Sets whether the connection is successful or not - * @param flag indication of whether the connection is successful - */ - public void setConnected(boolean flag) - { - _connected = flag; - } - - /** - * Sets the connection error message - * @param message the error message - */ - public void setMessage(String message) - { - _message = message; - } - - /** - * Sets the ticket to use when connecting to a server. Typically, - * a ticket gets sent back from a server daemon so that the client - * can be granted access to the launched server DataStore - * @param ticket the ticket - */ - public void setTicket(String ticket) - { - _ticket = ticket; - } - - /** - * Indicates whether the connection was successful or not - * @return whether the connection was successful or not - */ - public boolean isConnected() - { - return _connected; - } - - /** - * Returns the error message for a connection attempt - * @return the error message - */ - public String getMessage() - { - return _message; - } - - /** - * Returns the ticket required for connecting to a server - * @return the ticket - */ - public String getTicket() - { - return _ticket; - } - - /* - * Returns the exception if there is one - * @return the exception - */ - public Throwable getException() - { - return _exception; - } - - public boolean isSLLProblem() - { - return _SSLProblem; - } - - public List getUntrustedCertificates() - { - return _untrustedCertificates; - } -}
\ No newline at end of file diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/java/ClassByteStreamHandler.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/java/ClassByteStreamHandler.java deleted file mode 100644 index 3c811eab3..000000000 --- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/java/ClassByteStreamHandler.java +++ /dev/null @@ -1,212 +0,0 @@ -/******************************************************************************** - * Copyright (c) 2005, 2008 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 - * - * 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 McKnight (IBM) - [226561] [apidoc] Add API markup to RSE Javadocs where extend / implement is allowed - ********************************************************************************/ - -package org.eclipse.dstore.core.java; - -import java.io.InputStream; -import java.io.ObjectInputStream; -import java.io.PipedInputStream; -import java.io.PipedOutputStream; - -import org.eclipse.dstore.core.model.DataElement; -import org.eclipse.dstore.core.model.DataStore; - - -/** - * <p> - * The ClassByteStreamHandler class is used to abstract classfile read and write operations - * across the network. By default this is used for sending and receiving class files - * on the client and the server. The class can be extended if the default byte stream - * implementations are not sufficient for a particular platform or use. - * </p> - * <p> - * If ClassByteStreamHandler is extended, you need to tell the DataStore to use the - * extended implementation. To do that, call <code>DataStore.setClassByteStreamHandler(ClassByteStreamHandler)</code>. - * </p> - * @noextend This class is not intended to be subclassed by clients. - * @noinstantiate This class is not intended to be instantiated by clients. - */ -public class ClassByteStreamHandler implements IClassByteStreamHandler -{ - - protected DataStore _dataStore; - protected DataElement _log; - protected static final String FILEMSG_REMOTE_SAVE_FAILED = "RSEF5006"; //$NON-NLS-1$ - - /** - * Contructor - * @param dataStore the DataStore instance - * @param log the log in which to log status and messages - */ - public ClassByteStreamHandler(DataStore dataStore, DataElement log) - { - _dataStore = dataStore; - _log = log; - } - - public String getIdentifier() - { - return getClass().getName(); - } - - /** - * Receive a class and load it. This method is called by the - * DataStore when the communication layer receives a class file transfer - * This method kicks off a new thread so that the receiver thread can be free - * to receive other data. - * - * @param className the name of the class to receive - * @param buffer the bytes that comprise the class - * @param size the number of bytes in the class - */ - public void receiveBytes(String className, byte[] buffer, int size) - { - ReceiveClassThread rct = new ReceiveClassThread(className, buffer, size); - rct.start(); - } - - - /** - * Receive a class instance and load it. This method is called by the - * DataStore when the communication layer receives a class file transfer - * This method kicks off a new thread so that the receiver thread can be free - * to receive other data. - * - * @param buffer the bytes that comprise the class instance - * @param size the number of bytes in the class instance - */ - public void receiveInstanceBytes(byte[] buffer, int size) - { - ReceiveClassInstanceThread rct = new ReceiveClassInstanceThread(buffer, size); - rct.start(); - } - - protected DataElement findStatusFor(String remotePath) - { - if (_log != null) - { - for (int i = 0; i < _log.getNestedSize(); i++) - { - DataElement child = _log.get(i); - if (child.getName().equals(remotePath)) - { - return child; - } - } - } - return null; - } - - /** - * A new thread that can be spawned to receive the class - * - */ - protected class ReceiveClassThread extends Thread - { - private String _className; - private byte[] _buffer; - private int _size; - - public ReceiveClassThread(String className, byte[] buffer, int size) - { - _className = className; - _buffer = buffer; - _size = size; - } - - /* (non-Javadoc) - * @see java.lang.Thread#run() - */ - public void run() - { - RemoteClassLoader remoteLoader = new RemoteClassLoader(_dataStore); - remoteLoader.receiveClass(_className, _buffer, _size); - } - - } - - /** - * A new thread that can be spawned to receive the class - * - */ - protected class ReceiveClassInstanceThread extends Thread - { - private byte[] _buffer; - private int _size; - - public ReceiveClassInstanceThread(byte[] buffer, int size) - { - _buffer = buffer; - _size = size; - } - - /* (non-Javadoc) - * @see java.lang.Thread#run() - */ - public void run() - { - try - { - PipedInputStream ins = new PipedInputStream(); - - PipedOutputStream outStream = new PipedOutputStream(ins); - outStream.write(_buffer, 0, _size); - outStream.flush(); - outStream.close(); - - IRemoteClassInstance instance = loadInstance(ins); - runInstance(instance); - - } - catch (Exception e) - { - e.printStackTrace(); - } - } - - protected IRemoteClassInstance loadInstance(InputStream ins) - { - ObjectInputStream inStream = null; - try - { - inStream = new RemoteObjectInputStream(ins, _dataStore.getRemoteClassLoader()); - - return (IRemoteClassInstance)inStream.readObject(); - } - catch (Exception e) - { - e.printStackTrace(); - } - return null; - } - - protected void runInstance(IRemoteClassInstance instance) - { - - if (_dataStore.isVirtual()) - { - // on client notify - instance.updatedOnClient(); - } - else - { - // on server run and update client - instance.arrivedOnServer(); - _dataStore.updateRemoteClassInstance(instance, getIdentifier()); - } - } - } -}
\ No newline at end of file diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/java/ClassByteStreamHandlerRegistry.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/java/ClassByteStreamHandlerRegistry.java deleted file mode 100644 index 8930b41bf..000000000 --- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/java/ClassByteStreamHandlerRegistry.java +++ /dev/null @@ -1,81 +0,0 @@ -/******************************************************************************** - * Copyright (c) 2006, 2008 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 - * - * 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 McKnight (IBM) - [226561] [apidoc] Add API markup to RSE Javadocs where extend / implement is allowed - ********************************************************************************/ - -package org.eclipse.dstore.core.java; - -import java.util.HashMap; - -import org.eclipse.dstore.core.model.DataStoreResources; - -/** - * @noextend This class is not intended to be subclassed by clients. - * @noinstantiate This class is not intended to be instantiated by clients. - */ -public class ClassByteStreamHandlerRegistry -{ - private HashMap _map; - private IClassByteStreamHandler _default; - public ClassByteStreamHandlerRegistry() - { - _map = new HashMap(); - } - - /** - * Registers the default class byte stream handler - * @param handler the default byte stream handler - */ - public void setDefaultClassByteStreamHandler(IClassByteStreamHandler handler) - { - _default = handler; - _map.put(DataStoreResources.DEFAULT_CLASSBYTESTREAMHANDLER, handler); - registerClassByteStreamHandler(handler); - } - - /** - * Registers a class byte stream handler. - * @param handler the handler to register - */ - public void registerClassByteStreamHandler(IClassByteStreamHandler handler) - { - _map.put(handler.getIdentifier(), handler); - } - - /** - * Returns the class byte stream handler with the specified id. - * If "default" is specified or no such id has been registered, - * the default byte stream handler is returned. - * @param id the id of the byte stream handler - * @return the byte stream handler - */ - public IClassByteStreamHandler getClassByteStreamHandler(String id) - { - IClassByteStreamHandler handler = (IClassByteStreamHandler)_map.get(id); - if (handler == null) - { - handler = _default; - } - return handler; - } - - /** - * Returns the default class byte stream handler - * @return the default - */ - public IClassByteStreamHandler getDefault() - { - return _default; - } -}
\ No newline at end of file diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/java/ClassInstanceOutputStream.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/java/ClassInstanceOutputStream.java deleted file mode 100644 index 42796543b..000000000 --- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/java/ClassInstanceOutputStream.java +++ /dev/null @@ -1,33 +0,0 @@ -/******************************************************************************** - * Copyright (c) 2006, 2008 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 - * - * 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 McKnight (IBM) - [226561] [apidoc] Add API markup to RSE Javadocs where extend / implement is allowed - ********************************************************************************/ - -package org.eclipse.dstore.core.java; - -import java.io.IOException; -import java.io.OutputStream; - -/** - * @noextend This class is not intended to be subclassed by clients. - * @noinstantiate This class is not intended to be instantiated by clients. - */ -public class ClassInstanceOutputStream extends OutputStream { - - public void write(int b) throws IOException { - // TODO Auto-generated method stub - - } - -}
\ No newline at end of file diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/java/ClassRequest.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/java/ClassRequest.java deleted file mode 100644 index 9c586cc16..000000000 --- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/java/ClassRequest.java +++ /dev/null @@ -1,142 +0,0 @@ -/******************************************************************************** - * Copyright (c) 2006, 2008 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 - * - * 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 McKnight (IBM) - [226561] [apidoc] Add API markup to RSE Javadocs where extend / implement is allowed - ********************************************************************************/ - -package org.eclipse.dstore.core.java; - -/** - * Represents a remote class request in the RemoteClassLoader. Contains - * methods for getting the status of the request, as well as getting the - * actual class after it has been loaded. - * @author mjberger - * - * @noextend This class is not intended to be subclassed by clients. - * @noinstantiate This class is not intended to be instantiated by clients. - */ -public class ClassRequest -{ - private boolean _requested; - private boolean _loaded; - private boolean _synchronous; - private String _className; - private Class _class = null; - - /** - * Constructs a new ClassRequest - * @param className The name of the class requested - * @param synchronous whether or not the request is synchronous - */ - public ClassRequest(String className, boolean synchronous) - { - _synchronous = synchronous; - _className = className; - _requested = false; - _loaded = false; - } - - /** - * Causes the current thread to wait until this class request has been - * fulfilled. - */ - public synchronized void waitForResponse() - { - try - { - if (!_loaded) wait(); - } - catch (InterruptedException e) - { - e.printStackTrace(); - } - } - - /** - * Causes all threads waiting for this class request to be filled - * to wake up. - */ - public synchronized void notifyResponse() - { - notifyAll(); - } - - /** - * Returns the class loaded, or null if it has not been loaded yet. - */ - public Class getLoadedClass() - { - return _class; - } - - /** - * Returns whether or not the class has been loaded yet. - */ - public boolean isLoaded() - { - return _loaded; - } - - /** - * Returns the name of the class requested/loaded. - */ - public String getClassName() - { - return _className; - } - - /** - * Returns whether or not the class has been requested yet. - */ - public boolean isRequested() - { - return _requested; - } - - /** - * Returns whether or not the class request is synchronous. - */ - public boolean isSynchronous() - { - return _synchronous; - } - - /** - * Call this method when the request for the class has been sent. - */ - public void setRequested(boolean requested) - { - _requested = requested; - } - - /** - * Call this method when the class has been received and loaded. - */ - public void setLoaded(boolean loaded) - { - _loaded = loaded; - } - - /** - * Sets the class represented by this object after it has been loaded. - * (Sets loaded to be true and requested to be false). Notifies all threads - * waiting on this class request that the class has been loaded. - */ - public synchronized void setLoadedClass(Class loadedClass) - { - _class = loadedClass; - setRequested(false); - setLoaded(true); - notifyAll(); - } -}
\ No newline at end of file diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/java/IClassByteStreamHandler.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/java/IClassByteStreamHandler.java deleted file mode 100644 index ec7a7565c..000000000 --- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/java/IClassByteStreamHandler.java +++ /dev/null @@ -1,55 +0,0 @@ -/******************************************************************************** - * Copyright (c) 2003, 2008 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 - * - * 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 McKnight (IBM) - [226561] [apidoc] Add API markup to RSE Javadocs where extend / implement is allowed - ********************************************************************************/ - -package org.eclipse.dstore.core.java; - -/** - * <p> - * The IClassByteStreamHandler interface is used to abstract file read and write operations - * across the network. - * - * @noimplement This interface is not intended to be implemented by clients. - */ -public interface IClassByteStreamHandler -{ - - /** - * Returns the unique ID for this bytestream handler - * @return the unique id - */ - public String getIdentifier(); - - /** - * Receive a class and load it. This method is called by the - * DataStore when the communication layer receives a class file transfer - * This method kicks off a new thread so that the receiver thread can be free - * to receive other data. - * - * @param className the name of the class to receive - * @param buffer the bytes that comprise the class - * @param size the number of bytes in the class - */ - public void receiveBytes(String className, byte[] buffer, int size); - - /** - * Save a class instance in the specified location. Invokes the operation in a new thread. This method is called by the - * DataStore when the communication layer receives a class file transfer - * - * @param buffer the bytes to insert in the class instance - * @param size the number of bytes to insert - */ - public void receiveInstanceBytes(byte[] buffer, int size); -}
\ No newline at end of file diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/java/IRemoteClassInstance.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/java/IRemoteClassInstance.java deleted file mode 100644 index e600bbbee..000000000 --- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/java/IRemoteClassInstance.java +++ /dev/null @@ -1,28 +0,0 @@ -/******************************************************************************** - * Copyright (c) 2006, 2008 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 - * - * 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 McKnight (IBM) - [226561] [apidoc] Add API markup to RSE Javadocs where extend / implement is allowed - ********************************************************************************/ - -package org.eclipse.dstore.core.java; - -import java.io.Serializable; - -/** - * @noimplement This interface is not intended to be implemented by clients. - */ -public interface IRemoteClassInstance extends Serializable -{ - public void arrivedOnServer(); - public void updatedOnClient(); -}
\ No newline at end of file diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/java/LocalObjectInputStream.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/java/LocalObjectInputStream.java deleted file mode 100644 index 5f85891df..000000000 --- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/java/LocalObjectInputStream.java +++ /dev/null @@ -1,57 +0,0 @@ -/******************************************************************************** - * Copyright (c) 2006, 2008 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 - * - * 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 McKnight (IBM) - [226561] [apidoc] Add API markup to RSE Javadocs where extend / implement is allowed - ********************************************************************************/ - -package org.eclipse.dstore.core.java; - -import java.io.IOException; -import java.io.InputStream; -import java.io.ObjectInputStream; -import java.io.ObjectStreamClass; -import java.util.List; - -/** - * @noextend This class is not intended to be subclassed by clients. - * @noinstantiate This class is not intended to be instantiated by clients. - */ -public class LocalObjectInputStream extends ObjectInputStream { - - private List _localLoaders; - public LocalObjectInputStream(InputStream in, List localLoaders) throws IOException - { - super(in); - _localLoaders = localLoaders; - } - - protected Class resolveClass(ObjectStreamClass desc) - throws IOException, ClassNotFoundException - { - ClassNotFoundException ex = null; - String name = desc.getName(); - for (int i = 0; i < _localLoaders.size(); i++) - { - ClassLoader cl = (ClassLoader)_localLoaders.get(i); - try - { - return cl.loadClass(name); - } - catch (ClassNotFoundException e) - { - ex = e; - } - } - throw ex; - } -}
\ No newline at end of file diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/java/RemoteClassLoader.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/java/RemoteClassLoader.java deleted file mode 100644 index 5995bdd54..000000000 --- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/java/RemoteClassLoader.java +++ /dev/null @@ -1,506 +0,0 @@ -/******************************************************************************** - * Copyright (c) 2006, 2008 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 - * - * 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 McKnight (IBM) - [226561] [apidoc] Add API markup to RSE Javadocs where extend / implement is allowed - * David McKnight (IBM) - [244388] [dstore] Connection hangs when a miner not installed - ********************************************************************************/ - -package org.eclipse.dstore.core.java; - -import java.net.MalformedURLException; -import java.net.URL; -import java.net.URLClassLoader; -import java.util.ArrayList; - -import org.eclipse.dstore.core.model.DataStore; - - - -/** - * This class loads a class from a remote peer. - * This classloader is used just as any other classloader is used. However, - * when instantiating the RemoteClassLoader, a DataStore is associated with - * it. The RemoteClassLoader goes through the following steps when trying to load - * a class: - * 1) Attempts to load the class from memory. Any class that had been loaded - * already this session would reside here. - * 2) Attempts to find the class using its parent classloader. - * 3) If caching preference is turned on: - * a) Attempts to find the class from the disk cache. - * 4) Requests the class, through the DataStore, from the remote peer. Waits for - * response. - * 5) If class cannot be found, throws ClassNotFoundException - * 6) If class is found, loads the class. - * 7) If caching preference is turned on: - * a) Caches new class in the disk cache for use in the next session. - * Notes: - * i) If there are one or more classes on which the target class depends, - * the RemoteClassLoader will attempt to load those classes too (possibly remotely), - * before loading the target class. - * ii) Since most implementations of Java use lazy classloading, the JVM may not - * attempt to load all required classes for the target class during class definition - * or instantiation. However, if the RemoteClassLoader was used to load the target - * class, then at any time, any additional classes required by the target class will - * be loaded using the RemoteClassLoader. Clients should be aware that this could trigger - * class requests and class transfers during the operation of objects of the target class, - * not just during definition and instantiation of it. - * iii) On the remote peer side, if you wish a class to be a candidate for transfer using the - * RemoteClassLoader on the opposite side of the connection, you MUST register the classloader - * for that class with the DataStore corresponding to the DataStore with which the RemoteClassLoader - * was instantiated. For example, in a client-server connection there is a "client" DataStore and a - * corresponding "server" DataStore. Suppose the server wishes to use the RemoteClassLoader to load - * class A from the client. Suppose A is loaded on the client using ClassLoaderForA. On the client - * side, ClassLoaderForA must be registered with the "client" DataStore so that when the - * class request for A comes in from the server, the client DataStore know how to load class A. - * - * Caching: - * To set your preference for caching, on either the client or server DataStore, use the following command: - * _dataStore.setPreference(RemoteClassLoader.CACHING_PREFERENCE, "true"); - * The cache of classes is kept in a jar in the following directory: - * $HOME/.eclipse/RSE/rmt_classloader_cache.jar - * To clear the cache, you must delete the jar. - * - * Threading Issues: - * It's safest to use the RemoteClassLoader on a separate thread, and preferably not - * from the CommandHandler or UpdateHandler threads. The RemoteClassLoader uses those - * threads to request and send the class. However, DataStore commands can be structured such that - * safe use of the RemoteClassLoader on these threads is possible. See below for an - * example. - * - * Using the RemoteClassLoader in your subsystem miner: - * Suppose you want the client to be able to kick off a class request in your host subsystem - * miner. In order to accomplish this, you would take the following steps: - * 1) Add a command to your miner in the extendSchema() method. - * 2) Add logic in the handleCommand() method to route command to another method when handleCommand - * receives your new command. - * 3) In your command handling method, get the name of the class to load from the subject - * DataElement. - * 4) Load the class using the RemoteClassLoader. - * 5) Make sure the class you are attempting to load exists on the client and that class's - * ClassLoader is registered with the DataStore! - * - * @author mjberger - * - * @noextend This class is not intended to be subclassed by clients. - * @noinstantiate This class is not intended to be instantiated by clients. - */ -public class RemoteClassLoader extends ClassLoader -{ - public final static String CACHING_PREFERENCE = "Class.Caching"; //$NON-NLS-1$ - private DataStore _dataStore; - private boolean _useCaching = false; - private CacheClassLoader _urlClassLoader; - - private class CacheClassLoader extends URLClassLoader - { - public CacheClassLoader(URL[] urls, ClassLoader parent) - { - super(urls, parent); - } - - public Class findCachedClass(String className) throws ClassNotFoundException - { - return super.findClass(className); - } - } - - /** - * Constructor - * @param dataStore A reference to the datastore to be used by this - * RemoteClassLoader. - */ - public RemoteClassLoader(DataStore dataStore) - { - super(dataStore.getClass().getClassLoader()); - //_urlClassLoader = new URLClassLoader(new URL[0]); - _dataStore = dataStore; - useCaching(); - } - - public boolean useCaching() - { - boolean useCaching = false; - String pref = _dataStore.getPreference(CACHING_PREFERENCE); - if (pref != null && pref.equals("true")) //$NON-NLS-1$ - { - useCaching = true; - } - if (useCaching != _useCaching) - { - if (useCaching && _dataStore.getRemoteClassLoaderCache() != null) - { - try - { - URL cache = _dataStore.getRemoteClassLoaderCache().toURL(); - URL[] urls = new URL[] { cache }; - _urlClassLoader = new CacheClassLoader(urls, this); - } - catch (MalformedURLException e) - { - e.printStackTrace(); - } - } - } - _useCaching = useCaching; - return _useCaching; - } - - /** - * Finds the specified class. If the class cannot be found locally, - * a synchronous request for the class is sent to the client, and the calling thread - * waits for a response. If the client can find the class, it sends it back to - * the server. The server receives the class in a new thread, defines it, and - * then notifies this thread. The class is then returned by this method. If the class - * cannot be found, the client notifies the server, and this method throws a - * ClassNotFoundException. - * @param className the fully qualified classname to find - * @return the loaded class - * @throws ClassNotFoundException if the class cannot be found on either the client or the server. - * - */ - protected Class findClass(String className) throws ClassNotFoundException - { - // first try using the datastore's local classloaders - - ArrayList localLoaders = _dataStore.getLocalClassLoaders(); - if (localLoaders != null) - { - Class theClass = null; - for (int i = 0; i < localLoaders.size(); i++) - { - try - { - theClass = ((ClassLoader)localLoaders.get(i)).loadClass(className); - if (theClass != null) return theClass; - } - catch (Exception e) - { - e.printStackTrace(); - } - } - } - - // next delegate the search to the superclass's find method. - try - { - Class theClass = super.findClass(className); - if (theClass != null) - { - //System.out.println("Using super's: " + className); - return theClass; - } - } - catch (Exception e) - { - e.printStackTrace(); - } - - // DKM - // only do lookup if the classname looks valid - // don't want to be requesting rsecomm from client - if (className.indexOf('.') == -1) - { - throw new ClassNotFoundException(className); - } - - // if it cannot be found: - - // search the class request repository to see if the class has been requested - // already - ClassRequest request; - request = (ClassRequest) _dataStore.getClassRequestRepository().get(className); - - if (request == null) - { - // the class has not been requested before - // try to look in the disk cache first - if (useCaching()) - { - try - { - - Class theClass = _urlClassLoader.findCachedClass(className); - - //System.out.println("Using cached: " + className); - return theClass; - } - catch (Throwable e) - { - // its not in the disk cache, so request it synchronously - return requestClass(className); - } - } - else - { - return requestClass(className); - } - } - else if (!request.isLoaded()) - { - System.out.println("request is not loaded"); - // the class has been requested before, but it has not yet been received - // System.out.println(className + " already requested but not loaded. Waiting for request to load."); - - System.out.println("waiting for response..."); - request.waitForResponse(); // just wait until the class is received - System.out.println("...finished waiting for response"); - - // after the class is received, get it from the repository and return it - // or if the class failed to be received, throw an exception - if (request.isLoaded()) return request.getLoadedClass(); - else throw new ClassNotFoundException(className); - } - else if (request.isLoaded()) - { - // the class has been requested before, and has already been received and loaded, - // so just return it. - return request.getLoadedClass(); - } - // if we ever get to this point, the class has not been found, - // throw the exception - else { - throw new ClassNotFoundException(className); - } - } - - - /** - * Receives a class sent by a remote agent and loads it. - * Notifies all threads waiting for this class to load that the - * class has been loaded. - * @param className the name of the class to receive - * @param bytes the bytes in the class - * @param size the size of the class - */ - public synchronized void receiveClass(String className, byte[] bytes, int size) - { - // System.out.println("receiving "+className); - // check the class request repository to see if the class is there - ClassRequest request = (ClassRequest) _dataStore.getClassRequestRepository().get(className); - if (request != null) - { - if (request.isLoaded()) return; // do not attempt to reload the class - } - if (size == 0) - { - // this is the signal that the class could not be found on the client - // System.out.println("Empty class/class not found: "+className); - // System.out.println("notifying requester"); - if (request != null) - request.notifyResponse(); // wake up the threads waiting for the class - return; - } - Class receivedClass = null; - try - { - // System.out.println("defining "+className+"..."); - // try to define the class. If any dependent classes cannot be - // found the JRE implementation will call findClass to look for them. - // Thus we could end up with a stack of requests all waiting until the - // classes with no dependent classes load. - receivedClass = defineClass(className, bytes, 0, size); - - // System.out.println("...finished defining "+className); - } - catch (NoClassDefFoundError e) - { - // the JRE implementation could not find a dependent class. - // (even after requesting it from the client). We must fail, - // but wake up the threads waiting for this class. - e.printStackTrace(); - if (request != null) - request.notifyResponse(); - return; - } - catch (LinkageError e) - { - // this happens when the system tries to redefine a class. - // dont try to redefine the class, just reload it. - e.printStackTrace(); - try - { - receivedClass = loadClass(className); - } - catch (NoClassDefFoundError err) - { - // we shouldn't really get here unless it has tried - // already to find the class on the client but couldnt, - // so we might as well just fail here and notify threads waiting - // for this class to load. - err.printStackTrace(); - if (request != null) - request.notifyResponse(); - return; - } - catch (ClassNotFoundException ee) - { - // we definitely shouldnt get here - if (request != null) - request.notifyResponse(); - return; - } - - // if after trying to define or trying to load the class - // we still dont have it, notify the threads and fail. - if (receivedClass == null) - { - if (request != null) - request.notifyResponse(); - return; - } - } - if (request == null) - { - // not used right now, this is the case where a class was sent by - // the client without us requesting it. - request = new ClassRequest(className, false); - request.setLoadedClass(receivedClass); - _dataStore.getClassRequestRepository().put(className, request); - return; - } - else - { - // SUCCESS! The class has been received, and defined, so just - // load it into the class request object. This action will - // also notify threads waiting for the class - // System.out.println("notifying requesters"); - request.setLoadedClass(receivedClass); - if (useCaching()) - { - _dataStore.cacheClass(className, bytes, size); - } - } - } - - /** - * Kicks off a separate thread in which to request the class, - * rather than doing it synchronously. - * @param className The fully qualified name of the class to request. - */ - protected void requestClassInThread(String className) - { - // System.out.println("requesting (in thread)"+className); - LoadClassThread thread = new LoadClassThread(className); - thread.start(); - } - - /** - * Requests a class (synchronously) from the client - * @param className The fully qualified name of the class to request. - * @return the requested class - * @throws ClassNotFoundException if the class was not found on the client - */ - public Class requestClass(String className) throws ClassNotFoundException - { - // first check to see if the class has been requested before - ClassRequest request; - request = (ClassRequest) _dataStore.getClassRequestRepository().get(className); - if (request == null) - { - // the class has not been requested yet, create a new ClassRequest - // object to represent it - request = new ClassRequest(className, true); - _dataStore.getClassRequestRepository().put(className, request); - request.setRequested(true); - - // put in the request for the class - _dataStore.requestClass(className); - - // wait for a response - // System.out.println("thread to wait: "+Thread.currentThread().getName()); - if (!request.isLoaded()) request.waitForResponse(); - // System.out.println("thread finished waiting: "+Thread.currentThread().getName()); - if (request.isLoaded()) return request.getLoadedClass(); - else { - // remove the request so that if another one comes in for the - // same thing it doesn't hang waiting for a response - _dataStore.getClassRequestRepository().remove(className); - - throw new ClassNotFoundException(className); - } - } - else if (!request.isLoaded()) - { - // class has already been requested, wait for it to load - // System.out.println("requested elsewhere, thread to wait: "+Thread.currentThread().getName()); - if (!request.isLoaded()) request.waitForResponse(); - // System.out.println("requested elsewhere, thread finished waiting: "+Thread.currentThread().getName()); - if (request.isLoaded()) return request.getLoadedClass(); - else throw new ClassNotFoundException(className); - } - else if (request.isLoaded()) - { - // class has already been requested and loaded, just return it - return request.getLoadedClass(); - } - // we shouldnt really get to this point, but if we do, it means the class - // was not found. - throw new ClassNotFoundException(className); - } - - /** - * Causes a new thread to start in which the specified class is loaded - * into the repository. This method usually returns before the class has been - * loaded. - * @param className The fully qualified name of the class to load - */ - public synchronized void loadClassInThread(String className) - { - //System.out.println("remote load of "+className); - // check if the class has been requested before - ClassRequest request; - request = (ClassRequest) _dataStore.getClassRequestRepository().get(className); - if (request == null) - { - // class has not been requested, request it in a thread - request = new ClassRequest(className, false); - _dataStore.getClassRequestRepository().put(className, request); - request.setRequested(true); - requestClassInThread(className); - return; - } - else if (!request.isLoaded()) - { - // class has been requested already, but not loaded. Just return. - return; - } - else if (request.isLoaded()) - { - // class has been requested already and already loaded. Just return. - return; - } - } - - /** - * A new thread for loading classes in. - * @author mjberger - * - */ - protected class LoadClassThread extends Thread - { - private String _className; - - public LoadClassThread(String className) - { - _className = className; - } - - /* (non-Javadoc) - * @see java.lang.Thread#run() - */ - public void run() - { - _dataStore.requestClass(_className); - } - } -}
\ No newline at end of file diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/java/RemoteObjectInputStream.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/java/RemoteObjectInputStream.java deleted file mode 100644 index 6dcb0697b..000000000 --- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/java/RemoteObjectInputStream.java +++ /dev/null @@ -1,43 +0,0 @@ -/******************************************************************************** - * Copyright (c) 2006, 2008 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 - * - * 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 McKnight (IBM) - [226561] [apidoc] Add API markup to RSE Javadocs where extend / implement is allowed - ********************************************************************************/ - -package org.eclipse.dstore.core.java; - -import java.io.IOException; -import java.io.InputStream; -import java.io.ObjectInputStream; -import java.io.ObjectStreamClass; - -/** - * @noextend This class is not intended to be subclassed by clients. - * @noinstantiate This class is not intended to be instantiated by clients. - */ -public class RemoteObjectInputStream extends ObjectInputStream { - - private RemoteClassLoader _loader; - public RemoteObjectInputStream(InputStream in, RemoteClassLoader loader) throws IOException - { - super(in); - _loader = loader; - } - - protected Class resolveClass(ObjectStreamClass desc) - throws IOException, ClassNotFoundException - { - String name = desc.getName(); - return _loader.loadClass(name); - } -}
\ No newline at end of file diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/miners/Miner.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/miners/Miner.java deleted file mode 100644 index f444cbda0..000000000 --- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/miners/Miner.java +++ /dev/null @@ -1,694 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2002, 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 - * - * 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: - * Noriaki Takatsu (IBM) [220126] [dstore][api][breaking] Single process server for multiple clients - * David McKnight (IBM) [224906] [dstore] changes for getting properties and doing exit due to single-process capability - * Noriaki Takatsu (IBM) [229146] [multithread] changes to stop Miner threads when clients disconnect - * David McKnight (IBM) - [226561] [apidoc] Add API markup to RSE Javadocs where extend / implement is allowed - * Martin Oberhuber (Wind River) - [199854][api] Improve error reporting for archive handlers - * David McKnight (IBM) - [232004] [dstore][multithread] some miner finish() is not terminated sometimes - *******************************************************************************/ - -package org.eclipse.dstore.core.miners; - -import java.util.ArrayList; -import java.util.List; -import java.util.ResourceBundle; - -import org.eclipse.dstore.core.model.DE; -import org.eclipse.dstore.core.model.DataElement; -import org.eclipse.dstore.core.model.DataStore; -import org.eclipse.dstore.core.model.DataStoreResources; -import org.eclipse.dstore.core.model.DataStoreSchema; -import org.eclipse.dstore.core.model.Handler; -import org.eclipse.dstore.core.model.IExternalLoader; -import org.eclipse.dstore.core.model.ISchemaExtender; -import org.eclipse.dstore.core.server.SystemServiceManager; - -/** - * Miner is the abstract base class of all DataStore extensions). The DataStore - * framework knows how to load and route commands to miners because it - * interfaces miners through the restricted set of interfaces declared here. To - * add a new miner, developers must extend this class and implement the abstract - * methods declared here. - * - * This class and its subclasses are not intended to be instantiated by clients. - * The dstore server infrastructure will take care of loading the Miner. - */ -public abstract class Miner extends Handler -implements ISchemaExtender -{ - - public DataElement _minerElement; - public DataElement _minerData; - public DataElement _minerTransient; - - - - private boolean _initialized; - private boolean _connected; - private IExternalLoader _loader; - - protected String _name = null; - protected String _value = null; - protected ArrayList _dependencies; - protected List _commandQueue; - - protected ResourceBundle _resourceBundle = null; - - /** - * Creates a new Miner - */ - protected Miner() - { - _initialized = false; - _connected = false; - _commandQueue = new ArrayList(); - } - - /** - * Returns the qualified names of all miners that - * this miner depends on. A miner depends on another - * miner if it's schema extends or uses another's schema. - * By default it returns an empty list. - * @return a list of miner dependencies, each represented as a qualified name - */ - public final ArrayList getMinerDependencies() - { - if (_dependencies == null) - { - _dependencies = getDependencies(); - } - return _dependencies; - } - - - protected ArrayList getDependencies() - { - return new ArrayList(); - } - - /** - * Indicates whether the miner has been initialized yet - * @return whether the miner has been initialized - */ - public final boolean isInitialized() - { - return _initialized; - } - - /** - * Indicates whether the miner has been connected to - * the DataStore yet. - * @return whether the miner has been connected to the DataStore - */ - public final boolean isConnected() - { - return _connected; - } - - /** - * Shuts down the miner and cleans up it's meta-information. Override this - * function to do your own cleanup. - * <p> - * Subclasses may override this method but must call - * <code>super.finish()</code> at the end of their overriding method. - */ - public void finish() - { - DataElement root = _dataStore.getMinerRoot(); - - _minerData.removeNestedData(); - _minerElement.removeNestedData(); - _dataStore.update(_minerElement); - - if (root.getNestedData() != null) - { - root.getNestedData().remove(_minerElement); - } - root.setExpanded(false); - root.setUpdated(false); - - _dataStore.update(root); - - super.finish(); - } - - /** - * Interface to retrieve an NL enabled resource bundle. - * Override this function to get access to a real resource bundle. - */ - public ResourceBundle getResourceBundle() - { - return null; - } - - /** - * Default method that gets called on a Miner when it is loaded. - * Override this function to perform some initialization at miner loading time. - */ - protected void load() - { - } - - /** - * Default method that gets called on a Miner when it is loaded. - * Override this function to perform some initialization at miner loading time. - * If loading the miner can result in some failure, set that status to incomplete - * - * @param status the status of the initialize miner command - */ - protected void load(DataElement status) - { - load(); - } - - /** - * This gets called after a miner is initialized. - * If you need to update element information at that time, override this method. - */ - protected void updateMinerInfo() - { - } - - /** - * Returns the qualified name of this miner - * - * @return the qualified name of this miner - */ - public final String getMinerName() - { - if (_name == null) - _name = getClass().getName(); - return _name; - } - - /** - * Returns the name of this miner - * - * @return the name of this miner - */ - public final String getValue() - { - if (_value == null) - { - String name = getMinerName(); - int indexOfValue = name.lastIndexOf("."); //$NON-NLS-1$ - _value = name.substring(indexOfValue + 1, name.length()); - } - return _value; - } - - public final void handle() - { - while (!_commandQueue.isEmpty()) - { - try - { - DataElement cmd = (DataElement)_commandQueue.remove(0); - if (cmd != null){ - command(cmd); - } - } - catch (Exception e){ - e.printStackTrace(); - } - } - } - - public final void requestCommand(DataElement command) - { - _commandQueue.add(command); - notifyInput(); - } - - public final void initMiner(DataElement status) - { - try - { - // System.out.println("initMiner:"+getMinerName()); - if (!_initialized) - { - load(status); - _initialized = true; - } - updateMinerInfo(); - - DataElement minerRoot = _dataStore.getMinerRoot(); - _dataStore.refresh(minerRoot); - if (status.getAttribute(DE.A_VALUE).equals(DataStoreResources.model_incomplete)) - { - _dataStore.refresh(status); - } - else - { - - status.setAttribute(DE.A_VALUE, DataStoreResources.model_done); - } - } - catch (Exception e) - { - e.printStackTrace(); - } - - - - } - - /** - * Issues a specified command on this miner from the DataStore framework. - * The base class handles "C_INIT_MINERS" but other commands are delegated to - * the concrete miner implementations through handleCommand() - * - * @param command the command that has been sent to this miner - * @return the status of the command - */ - protected final DataElement command(DataElement command) - { - String name = getCommandName(command); - DataElement status = getCommandStatus(command); - - if (status == null) - { - _dataStore.trace("bad command: "); //$NON-NLS-1$ - _dataStore.trace("\tcmd=" + command); //$NON-NLS-1$ - _dataStore.trace("\tparent=" + command.getParent()); //$NON-NLS-1$ - return null; - } - - if (status.getAttribute(DE.A_NAME).equals("start")) //$NON-NLS-1$ - { - status.setAttribute(DE.A_NAME, DataStoreResources.model_working); - } - - if (name.equals(DataStoreSchema.C_INIT_MINERS)) - { - initMiner(status); - } - else - { - try - { - status = handleCommand(command); - } - catch (Exception e) - { - //e.printStackTrace(); - _dataStore.trace(e); - status.setAttribute(DE.A_VALUE, "Failed with Exception:"+getStack(e)); //$NON-NLS-1$ - status.setAttribute(DE.A_NAME, DataStoreResources.model_done); - //status.setAttribute(DE.A_SOURCE, getStack(e)); - _dataStore.refresh(status); - - String exc = null; - if (e.getMessage() != null) - exc = e.getMessage(); - else - exc = "Exception"; //$NON-NLS-1$ - _dataStore.createObject(status, DataStoreResources.model_error, exc); - } - catch (Error er) - { - er.printStackTrace(); - _dataStore.trace(er); - _dataStore.finish(); - - if (SystemServiceManager.getInstance().getSystemService() == null) - System.exit(-1); - } - } - - _dataStore.refresh(status); - return status; - } - - private String getStack(Throwable e) - { - StringBuffer buf = new StringBuffer(); - StackTraceElement[] stack = e.getStackTrace(); - for (int i = 0; i < stack.length; i++) - { - buf.append(stack[i].getClassName() + ":" + stack[i].getMethodName() + ":" + stack[i].getLineNumber()); //$NON-NLS-1$ //$NON-NLS-2$ - buf.append(","); //$NON-NLS-1$ - } - return buf.toString(); - } - - /** - * Sets the DataStore and performs some fundamental initialization for this miner. - * The framework calls this method on a miner before any commands are issued. - * The extendSchema() is called on the miner. - * - * @param dataStore the DataStore that owns this miner - */ - public final void setDataStore(DataStore dataStore) - { - super.setDataStore(dataStore); - _dataStore = dataStore; - - DataElement root = _dataStore.getMinerRoot(); - String name = getMinerName(); - String value = getValue(); - - _resourceBundle = getResourceBundle(); - - // yantzi: Reuse existing miner root if found - _minerElement = _dataStore.find(root, DE.A_NAME, name, 1); - if (_minerElement == null || _minerElement.isDeleted()) - { - // Create new child for this miner - _minerElement = _dataStore.createObject(root, DataStoreResources.model_miner, name, name); - _minerElement.setAttribute(DE.A_VALUE, value); - _minerElement.setAttribute(DE.A_SOURCE, getVersion()); - - _minerData = _dataStore.createObject(_minerElement, DataStoreResources.model_data, DataStoreResources.model_Data, name); - _minerTransient = _dataStore.createObject(_minerElement, DataStoreResources.model_transient, DataStoreResources.model_Transient_Objects, name); - } - else - { - // Reuse existing miner node - _minerData = _dataStore.find(_minerElement, DE.A_NAME, DataStoreResources.model_Data, 1); - if (_minerData == null || _minerData.isDeleted()) - { - _minerData = _dataStore.createObject(_minerElement, DataStoreResources.model_data, DataStoreResources.model_Data, name); - } - - _minerTransient = _dataStore.find(_minerElement, DE.A_NAME, DataStoreResources.model_Transient_Objects, 1); - if (_minerTransient == null || _minerData.isDeleted()) - { - _minerTransient = _dataStore.createObject(_minerElement, DataStoreResources.model_transient, DataStoreResources.model_Transient_Objects, name); - } - } - - _dataStore.refresh(root, true); - _dataStore.refresh(_minerElement); - - _connected = true; - } - - /** - * Creates an abstract command descriptor. This is a helper method that miner may call - * when it creates or updates the schema for it's tool domain - * - * @param descriptor the parent descriptor for the new descriptor - * @param name the name of the command - * @param value the identifier for this command - * @return the new command descriptor - */ - public final DataElement createAbstractCommandDescriptor(DataElement descriptor, String name, String value) - { - return _dataStore.createAbstractCommandDescriptor(descriptor, name, getMinerName(), value); - } - - /** - * Creates a command descriptor. This is a helper method that miner may call - * when it creates or updates the schema for it's tool domain - * - * @param descriptor the parent descriptor for the new descriptor - * @param name the name of the command - * @param value the identifier for this command - * @return the new command descriptor - */ - public final DataElement createCommandDescriptor(DataElement descriptor, String name, String value) - { - return createCommandDescriptor(descriptor, name, value, true); - } - - /** - * Creates a command descriptor. This is a helper method that miner may call - * when it creates or updates the schema for it's tool domain - * - * @param descriptor the parent descriptor for the new descriptor - * @param name the name of the command - * @param value the identifier for this command - * @param visible an indication whether this command descriptor should be visible to an end-user - * @return the new command descriptor - */ - public final DataElement createCommandDescriptor(DataElement descriptor, String name, String value, boolean visible) - { - DataElement cmdD = _dataStore.createCommandDescriptor(descriptor, name, getMinerName(), value); - if (!visible) - { - cmdD.setDepth(0); - } - - return cmdD; - } - - /** - * Creates an abstract object descriptor. This is a helper method that miner may call - * when it creates or updates the schema for it's tool domain - * - * @param descriptor the parent descriptor for the new descriptor - * @param name the name of the object type - * @return the new object descriptor - */ - public final DataElement createAbstractObjectDescriptor(DataElement descriptor, String name) - { - return _dataStore.createAbstractObjectDescriptor(descriptor, name); - } - - /** - * Creates an abstract object descriptor. This is a helper method that miner may call - * when it creates or updates the schema for it's tool domain - * - * @param descriptor the parent descriptor for the new descriptor - * @param name the name of the object type - * @param source the plugin location of the miner that owns this object type - * @return the new object descriptor - */ - public final DataElement createAbstractObjectDescriptor(DataElement descriptor, String name, String source) - { - return _dataStore.createAbstractObjectDescriptor(descriptor, name, source); - } - - /** - * Creates a object descriptor. This is a helper method that miner may call - * when it creates or updates the schema for it's tool domain - * - * @param descriptor the parent descriptor for the new descriptor - * @param name the name of the object type - * @return the new object descriptor - */ - public final DataElement createObjectDescriptor(DataElement descriptor, String name) - { - return _dataStore.createObjectDescriptor(descriptor, name); - } - - /** - * Creates a object descriptor. This is a helper method that miner may call - * when it creates or updates the schema for it's tool domain - * - * @param descriptor the parent descriptor for the new descriptor - * @param name the name of the object type - * @param source the plugin location of the miner that owns this object type - * @return the new object descriptor - */ - public final DataElement createObjectDescriptor(DataElement descriptor, String name, String source) - { - return _dataStore.createObjectDescriptor(descriptor, name, source); - } - - /** - * Creates a new type of relationship descriptor. This is a helper method that miner may call - * when it creates or updates the schema for it's tool domain - * - * @param descriptor the parent descriptor for the new descriptor - * @param name the name of the relationship type - * @return the new relationship descriptor - */ - public final DataElement createRelationDescriptor(DataElement descriptor, String name) - { - return _dataStore.createRelationDescriptor(descriptor, name); - } - - /** - * Creates an abstract relationship between two descriptors. An abstract relationship between two descriptors - * indicates that the first descriptor abstracts the second, while the second inherits the - * properties of the first. This is a helper method that miner may call - * when it creates or updates the schema for it's tool domain. - * - * @param from the abstacting descriptor - * @param to the descriptor that is abstracted - * @return the new relationship descriptor - */ - public final DataElement createAbstractRelationship(DataElement from, DataElement to) - { - return _dataStore.createReference(from, to, "abstracts", "abstracted by"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - /** - * Creates a contents relationship between any two elements. - * - * @param from the containing element - * @param to the element that is contained - * @return the new relationship - */ - public final DataElement createReference(DataElement from, DataElement to) - { - return _dataStore.createReference(from, to); - } - - - - /** - * Returns the element that represents this miner. - * - * @return the miner element - */ - public final DataElement getMinerElement() - { - return _minerElement; - } - - /** - * Returns the element that contains this miners meta-information. - * - * @return the miner data element - */ - public final DataElement getMinerData() - { - return _minerData; - } - - /** - * Returns the transient object container for this element. - * - * @return the transient element - */ - public final DataElement getMinerTransient() - { - return _minerTransient; - } - - /** - * Identifies a give object descriptor type to be transient in this miner. - * - * @param objectDescriptor the object descriptor type that is transient - */ - public final void makeTransient(DataElement objectDescriptor) - { - _dataStore.createReference(_minerTransient, objectDescriptor); - } - - /** - * Returns the name of a command. - * This is a helper method to be used inside handleCommand(). - * - * @param command a tree of elements representing a command - * @return the name of the command - */ - public final String getCommandName(DataElement command) - { - return command.getAttribute(DE.A_NAME); - } - - /** - * Returns the status of a command. - * This is a helper method to be used inside handleCommand(). - * - * @param command a tree of elements representing a command - * @return the status element for the command - */ - public final DataElement getCommandStatus(DataElement command) - { - //DKM - status is always last - return command.get(command.getNestedSize() - 1); - //_dataStore.find(command, DE.A_TYPE, DataStoreResources.model_status"), 1); - } - - - - /** - * Returns the number of arguments for this command. - * This is a helper method to be used inside handleCommand(). - * - * @param command a tree of elements representing a command - * @return the number of arguments for this command - */ - public final int getNumberOfCommandArguments(DataElement command) - { - return command.getNestedSize(); - } - - /** - * Returns the argument of a command specified at a given index. - * This is a helper method to be used inside handleCommand(). - * - * @param command a tree of elements representing a command - * @param arg the index into the commands children - * @return the argument of the command - */ - public final DataElement getCommandArgument(DataElement command, int arg) - { - if (command.getNestedSize() > 0) - { - DataElement argument = command.get(arg); - if (argument != null) - { - return argument.dereference(); - } - } - - return null; - } - - - - /** - * Returns the descriptor root for the DataStore schema - * - * @return the descriptor root - */ - public final DataElement getSchemaRoot() - { - return _dataStore.getDescriptorRoot(); - } - - public void setExternalLoader(IExternalLoader loader) - { - _loader = loader; - } - - public IExternalLoader getExternalLoader() - { - return _loader; - } - - public synchronized void waitForInput() - { - if (_commandQueue.size() == 0) - { - super.waitForInput(); - } - } - - - - /** - * Handle commands that are routed to this miner. - * This interface must be implemented by each miner in order to - * perform tool actions driven from user interface interaction. - * - * @param theCommand an instance of a command containing a tree of arguments - */ - public abstract DataElement handleCommand(DataElement theCommand) throws Exception; - - - /** - * Returns the version of this miner - * The expected format for this is "<version>.<major>.<minor>" - */ - public abstract String getVersion(); -} diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/miners/MinerThread.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/miners/MinerThread.java deleted file mode 100644 index 44ec4186b..000000000 --- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/miners/MinerThread.java +++ /dev/null @@ -1,138 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2002, 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 - * - * 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: - * Noriaki Takatsu (IBM) [220126] [dstore][api][breaking] Single process server for multiple clients - *******************************************************************************/ - -package org.eclipse.dstore.core.miners; - -import org.eclipse.dstore.core.model.DataStore; -import org.eclipse.dstore.core.server.SecuredThread; - -/** - * MinerThread is a utility class used for doing threaded operations in a miner. - */ -public abstract class MinerThread extends SecuredThread -{ - - private volatile Thread minerThread; - protected boolean _isCancelled; - - /** - * Constructor - */ - public MinerThread() - { - _isCancelled = false; - } - - - /** - * Constructor with dataStore. - * - * @since 3.0 - */ - public MinerThread(DataStore dataStore) - { - super(dataStore); - _isCancelled = false; - } - - /** - * stops the thread - */ - public synchronized void stopThread() - { - if (minerThread != null) - { - _isCancelled = true; - - try - { - minerThread = null; - } - catch (Exception e) - { - System.out.println(e); - } - - } - notify(); - } - - /** - * runs the thread - */ - public void run() - { - super.run(); - Thread thisThread = Thread.currentThread(); - minerThread = thisThread; - //thisThread.setPriority(thisThread.getPriority()+1); - - //This function lets derived classes do some initialization - initializeThread(); - - while (minerThread != null && minerThread == thisThread && minerThread.isAlive() && !_isCancelled) - { - try - { - sleep(100); - // yield(); - } - catch (InterruptedException e) - { - System.out.println(e); - } - - //This function is where the Threads do real work, and return false when finished - if (!doThreadedWork()) - { - try - { - minerThread = null; - } - catch (Exception e) - { - System.out.println(e); - } - } - } - - //This function lets derived classes cleanup or whatever - cleanupThread(); - } - - /** - * Implement this method to provide initialization of this thread. - */ - public abstract void initializeThread(); - - /** - * Implement this method to provide the work implementation of this thread. - * This method gets called periodically by the miner thread so te work done - * here must be atomic. Each time this is called a incremental unit of - * work should be done. Once all the work is done, <b>true</b> should be - * returned. - * - * @return <b>true</b> if all the work is done. - */ - public abstract boolean doThreadedWork(); - - /** - * Implement this method to provide any cleanup that is required after - * all the work is done. - */ - public abstract void cleanupThread(); -} diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/ByteStreamHandler.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/ByteStreamHandler.java deleted file mode 100644 index e1a0e3415..000000000 --- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/ByteStreamHandler.java +++ /dev/null @@ -1,276 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2002, 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 - * - * 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 McKnight (IBM) [224906] [dstore] changes for getting properties and doing exit due to single-process capability - *******************************************************************************/ - -package org.eclipse.dstore.core.model; - -import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; - -/** - * <p> - * The ByteStreamHandler class is used to abstract file read and write operations - * across the network. By default this is used for sending and receiving files - * on the client and the server. The class can be extended if the default byte stream - * implementations are not sufficient for a particular platform or use. - * </p> - * <p> - * If ByteStreamHandler is extended, you need to tell the DataStore to use the - * extended implementation. To do that, call <code>DataStore.setByteStreamHandler(ByteStreamHandler)</code>. - * </p> - * - */ -public class ByteStreamHandler implements IByteStreamHandler -{ - - protected DataStore _dataStore; - protected DataElement _log; - protected static final String FILEMSG_REMOTE_SAVE_FAILED = "RSEF5006"; //$NON-NLS-1$ - - /** - * Contructor - * @param dataStore the DataStore instance - */ - public ByteStreamHandler(DataStore dataStore, DataElement log) - { - _dataStore = dataStore; - _log = log; - } - - public String getId() - { - return getClass().getName(); - } - - /** - * Save a file in the specified location. This method is called by the - * DataStore when the communication layer receives a file transfer - * - * @param remotePath the path where to save the file - * @param buffer the bytes to insert in the file - * @param size the number of bytes to insert - * @param binary indicates whether to save the bytes as binary or text - */ - public void receiveBytes(String remotePath, byte[] buffer, int size, boolean binary) - { - remotePath = new String(remotePath.replace('\\', '/')); - DataElement status = findStatusFor(remotePath); - String fileName = _dataStore.mapToLocalPath(remotePath); - - if (fileName != null) - { - try - { - // need to create directories as well - File file = new File(fileName); - if (!file.exists()) - { - File parent = new File(file.getParent()); - parent.mkdirs(); - } - else - { - } - - File newFile = new File(fileName); - FileOutputStream fileStream = new FileOutputStream(newFile); - - if (binary) - { - fileStream.write(buffer, 0, size); - } - else - { - IByteConverter byteConverter = _dataStore.getByteConverter(); - byteConverter.setContext(file); - byte[] convertedBytes = byteConverter.convertClientBytesToHostBytes(buffer, 0, size); - fileStream.write(convertedBytes, 0, convertedBytes.length); - } - - fileStream.close(); - if (status == null) - return; - status.setAttribute(DE.A_SOURCE, "success"); //$NON-NLS-1$ - _dataStore.refresh(status.getParent()); - } - catch (IOException e) - { - System.out.println(e); - if (status == null) - return; - status.setAttribute(DE.A_VALUE, FILEMSG_REMOTE_SAVE_FAILED); - status.setAttribute(DE.A_SOURCE, "failed"); //$NON-NLS-1$ - _dataStore.refresh(status.getParent()); - } - catch (Exception e) - { - System.out.println(e); - if (status == null) - return; - status.setAttribute(DE.A_VALUE, FILEMSG_REMOTE_SAVE_FAILED); - status.setAttribute(DE.A_SOURCE, "failed"); //$NON-NLS-1$ - _dataStore.refresh(status.getParent()); - } - } - } - - /** - * Append a bytes to a file at a specified location. This method is called by the - * DataStore when the communication layer receives a file transfer append. - * - * @param remotePath the path where to save the file - * @param buffer the bytes to append in the file - * @param size the number of bytes to append in the file - * @param binary indicates whether to save the bytes as binary or text - */ - public void receiveAppendedBytes(String remotePath, byte[] buffer, int size, boolean binary) - { - remotePath = new String(remotePath.replace('\\', '/')); - DataElement status = findStatusFor(remotePath); - String fileName = _dataStore.mapToLocalPath(remotePath); - - if (fileName != null) - { - try - { - // need to create directories as well - File file = new File(fileName); - if (!file.exists()) - { - File parent = new File(file.getParent()); - parent.mkdirs(); - - File newFile = new File(fileName); - FileOutputStream fileStream = new FileOutputStream(newFile); - - if (binary) - { - fileStream.write(buffer, 0, size); - } - else - { - IByteConverter byteConverter = _dataStore.getByteConverter(); - byteConverter.setContext(file); - - byte[] convertedBytes = byteConverter.convertClientBytesToHostBytes(buffer, 0, size); - fileStream.write(convertedBytes, 0, convertedBytes.length); - } - - fileStream.close(); - } - else - { - FileOutputStream outStream = new FileOutputStream(fileName, true); - - try - { - if (binary) - { - outStream.write(buffer, 0, size); - } - else - { - IByteConverter byteConverter = _dataStore.getByteConverter(); - byteConverter.setContext(file); - byte[] convertedBytes = byteConverter.convertClientBytesToHostBytes(buffer, 0, size); - outStream.write(convertedBytes, 0, convertedBytes.length); - } - } - catch (Exception e) - { - e.printStackTrace(); - } - - outStream.close(); - - } - if (status == null) - return; - status.setAttribute(DE.A_SOURCE, "success"); //$NON-NLS-1$ - _dataStore.refresh(status.getParent()); - } - catch (IOException e) - { - System.out.println(e); - if (status == null) - return; - status.setAttribute(DE.A_VALUE, FILEMSG_REMOTE_SAVE_FAILED); - status.setAttribute(DE.A_SOURCE, "failed"); //$NON-NLS-1$ - _dataStore.refresh(status.getParent()); - } - } - } - - - - /** - * Called by <code>sendBytes</code> to either save the bytes to a local file or transmit - * them to a remote file. - * @param path the path of the file - * @param bytes the bytes of the file - * @param size the size of the file - * @param binary indicates whether the bytes are to be sent as binary or text - */ - protected void internalSendBytes(String path, byte[] bytes, int size, boolean binary) - { - if (_dataStore.isVirtual()) - { - _dataStore.replaceFile(path, bytes, size, binary); - } - else - { - _dataStore.updateFile(path, bytes, size, binary); - } - } - - /** - * Called by <code>sendBytes</code> to either append the bytes to a local file or transmit - * them and append them to a remote file. - * @param path the path of the file - * @param bytes the bytes of the file - * @param size the size of the file - * @param binary indicates whether the bytes are to be sent as binary or text - */ - protected void internalSendAppendBytes(String path, byte[] bytes, int size, boolean binary) - { - if (_dataStore.isVirtual()) - { - _dataStore.replaceAppendFile(path, bytes, size, binary); - } - else - { - _dataStore.updateAppendFile(path, bytes, size, binary); - } - } - - protected DataElement findStatusFor(String remotePath) - { - if (_log != null) - { - for (int i = 0; i < _log.getNestedSize(); i++) - { - DataElement child = _log.get(i); - if (child.getName().equals(remotePath)) - { - return child; - } - } - } - return null; - } - -} diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/ByteStreamHandlerRegistry.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/ByteStreamHandlerRegistry.java deleted file mode 100644 index 4ac32787b..000000000 --- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/ByteStreamHandlerRegistry.java +++ /dev/null @@ -1,84 +0,0 @@ -/******************************************************************************** - * Copyright (c) 2006, 2008 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 - * - * 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 McKnight (IBM) - [226561] [apidoc] Add API markup to RSE Javadocs where extend / implement is allowed - ********************************************************************************/ - -package org.eclipse.dstore.core.model; - -import java.util.HashMap; - -/** - * Stores the set of registered byte stream handlers using the handler id - * as the key. Whenever a bytestream operation is required (i.e. for a save of bytes) - * The appropriate byte stream handler is retrieved via the specified id. - * If no such handler exists, then the default byte stream handler is returned. - * - * @noextend This class is not intended to be subclassed by clients. - * @noinstantiate This class is not intended to be instantiated by clients. - */ -public class ByteStreamHandlerRegistry -{ - private HashMap _map; - private IByteStreamHandler _default; - public ByteStreamHandlerRegistry() - { - _map = new HashMap(); - } - - /** - * Registers the default byte stream handler - * @param handler the default byte stream handler - */ - public void setDefaultByteStreamHandler(IByteStreamHandler handler) - { - _default = handler; - _map.put(DataStoreResources.DEFAULT_BYTESTREAMHANDLER, handler); - registerByteStreamHandler(handler); - } - - /** - * Registers a byte stream handler. - * @param handler the handler to register - */ - public void registerByteStreamHandler(IByteStreamHandler handler) - { - _map.put(handler.getId(), handler); - } - - /** - * Returns the byte stream handler with the specified id. - * If "default" is specified or no such id has been registered, - * the default byte stream handler is returned. - * @param id the id of the byte stream handler - * @return the byte stream handler - */ - public IByteStreamHandler getByteStreamHandler(String id) - { - IByteStreamHandler handler = (IByteStreamHandler)_map.get(id); - if (handler == null) - { - handler = _default; - } - return handler; - } - - /** - * Returns the default byte stream handler - * @return the default - */ - public IByteStreamHandler getDefault() - { - return _default; - } -}
\ No newline at end of file diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/Client.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/Client.java deleted file mode 100644 index 9c7ffee94..000000000 --- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/Client.java +++ /dev/null @@ -1,72 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006, 2008 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * 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: Noriaki Takatsu and Masao Nishimoto - * - * Contributors: - * Noriaki Takatsu (IBM) [220126] [dstore][api][breaking] Single process server for multiple clients - * Jacob Garcowski (IBM) [225175] [dstore] [dstore] error handling change for Client - * 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 - *******************************************************************************/ - -package org.eclipse.dstore.core.model; - -import org.eclipse.dstore.core.server.IServerLogger; -import org.eclipse.dstore.core.server.ServerReceiver; - -/** - * A DStore Client representing a user's connection in the multi-process - * dstore server. - * @noextend This class is not intended to be subclassed by clients. - * @since 3.0 - */ -public class Client -{ - public String _userid; - private IServerLogger _logger; - protected ServerReceiver _receiver; - - public void setUserid(String userid) - { - _userid = userid; - } - - public String getUserid() - { - return _userid; - } - - public void setLogger(IServerLogger logger) - { - _logger = logger; - } - - public IServerLogger getLogger() - { - return _logger; - } - - public String getProperty(String key) - { - return System.getProperty(key); - } - - public void disconnectServerReceiver() - { - if (_receiver != null) - _receiver.finish(); - } - - public void setServerReceiver(ServerReceiver receiver) - { - _receiver = receiver; - } -} - diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/CommandHandler.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/CommandHandler.java deleted file mode 100644 index 3a9e72e9d..000000000 --- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/CommandHandler.java +++ /dev/null @@ -1,306 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2002, 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 - * - * 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 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 - *******************************************************************************/ - -package org.eclipse.dstore.core.model; - -import java.util.ArrayList; - -import org.eclipse.dstore.core.java.IRemoteClassInstance; -import org.eclipse.dstore.core.util.CommandGenerator; - -/** - * <p> - * Abstract class for handling commands. A <code>CommandHandler</code> is a - * <code>Handler</code> that contains a queue of commands to be sent to miners. - * Each DataStore instance uses a single command handler that periodically sends - * it's queue either to a server or directly to miners. - * </p> - * <p> - * The CommandHandler is the means by which the DataStore sends information or - * files from the client to the remote tools. - * </p> - * - * @noextend This class is not intended to be subclassed by clients. - */ -public abstract class CommandHandler extends Handler -{ - - protected ArrayList _commands; - protected ArrayList _classesToSend; - - private CommandGenerator _commandGenerator; - - /** - * Constructor - */ - public CommandHandler() - { - super(); - setName("DStore CommandHandler"+getName()); //$NON-NLS-1$ - _commands = new ArrayList(); - _classesToSend = new ArrayList(); - _commandGenerator = new CommandGenerator(); - } - - /** - * Sets the associated DataStore - */ - public void setDataStore(DataStore dataStore) - { - super.setDataStore(dataStore); - _commandGenerator.setDataStore(dataStore); - } - - /** - * Returns the associated DataStore - * @return the associated DataStore - */ - public DataStore getDataStore() - { - return _dataStore; - } - - /** - * Adds a command object to the queue - * @param command the command to add to the queue - * @param immediate indicates whether the command should be inserted first in the queue - * or whether it should be appended. - */ - public void addCommand(DataElement command, boolean immediate) - { - synchronized (_commands) - { - if (!_commands.contains(command)) - { - if (immediate) - { - _commands.add(0, command); - } - else - { - _commands.add(command); - } - } - } - notifyInput(); - } - - /** - * Periodically called to send commands from the queue. - */ - public void handle() - { - if (!_commands.isEmpty() || !_classesToSend.isEmpty()) - { - sendCommands(); - } - } - - /** - * Create and add a new command object to the command queue. - * - * @param commandDescriptor the descriptor for the new command - * @param arguments the arguments for the command - * @param object the subject of the command - * @param refArg indicates whether the subject should be represented in the command as a - * reference to the subject or the actual subject, itself - * @param immediate indicates whether the command should be first in the queue or appended to it - * @return the status object of the command - */ - public DataElement command(DataElement commandDescriptor, ArrayList arguments, DataElement object, boolean refArg, boolean immediate) - { - DataElement command = _commandGenerator.generateCommand(commandDescriptor, arguments, object, refArg); - return command(command, immediate); - } - - /** - * Create and add a new command object to the command queue. - * - * @param commandDescriptor the descriptor for the new command - * @param arg the arg for the command - * @param object the subject of the command - * @param refArg indicates whether the subject should be represented in the command as a - * reference to the subject or the actual subject, itself - * @param immediate indicates whether the command should be first in the queue or appended to it - * @return the status object of the command - */ - public DataElement command(DataElement commandDescriptor, DataElement arg, DataElement object, boolean refArg, boolean immediate) - { - DataElement command = _commandGenerator.generateCommand(commandDescriptor, arg, object, refArg); - return command(command, immediate); - } - - /** - * Create and add a new command object to the command queue. - * - * @param commandDescriptor the descriptor for the new command - * @param object the subject of the command - * @param refArg indicates whether the subject should be represented in the command as a - * reference to the subject or the actual subject, itself - * @return the status object of the command - */ - public DataElement command(DataElement commandDescriptor, DataElement object, boolean refArg) - { - DataElement command = _commandGenerator.generateCommand(commandDescriptor, object, refArg); - return command(command); - } - - /** - * Add a command object to the command queue - * @param cmd the command object to add to the queue - * @return the status object of the command - */ - public DataElement command(DataElement cmd) - { - return command(cmd, false); - } - - /** - * Add a command object to the command queue - * @param cmd the command object to add to the queue - * @param immediate indicates whether the command is to be inserted first in the queue or appended - * @return the status object of the command - */ - public DataElement command(DataElement cmd, boolean immediate) - { - DataElement status = null; - if ((cmd != null) && _dataStore != null) - { - - status = cmd.get(cmd.getNestedSize() -1); - if (status != null && !status.getName().equals(DataStoreResources.model_done)) - { - addCommand(cmd, immediate); - } - } - - return status; - } - - /** - * Removes and affectively cancels all commands from the current queue of commands - */ - public synchronized void cancelAllCommands() - { - DataElement log = _dataStore.getLogRoot(); - for (int i = 0; i < _commands.size(); i++) - { - log.removeNestedData((DataElement) _commands.get(i)); - } - - _commands.clear(); - } - - /** - * @since 3.0 CommandGenerator moved from "internal" to API - */ - public CommandGenerator getCommandGenerator() - { - return _commandGenerator; - } - - /** - * Implemented to provide the means by which commands in the queue are sent - */ - public abstract void sendCommands(); - - - /** - * Implemented to provide the means by which file bytes are sent - * @param fileName the name of the file to send - * @param bytes to bytes of the file to send - * @param size the number of bytes to send - * @param binary indicates whether to send the bytes as binary or text - */ - public abstract void sendFile(String fileName, byte[] bytes, int size, boolean binary); - - - /** - * Implemented to provide the means by which file bytes are sent - * @param fileName the name of the file to send - * @param bytes to bytes of the file to send - * @param size the number of bytes to send - * @param binary indicates whether to send the bytes as binary or text - * @param byteStreamHandlerId indicates which byte stream handler to receive the bytes with - */ - public abstract void sendFile(String fileName, byte[] bytes, int size, boolean binary, String byteStreamHandlerId); - - /** - * Implemented to provide the means by which file bytes are sent and appended - * @param fileName the name of the file to send - * @param bytes to bytes of the file to send - * @param size the number of bytes to send - * @param binary indicates whether to send the bytes as binary or text - */ - public abstract void sendAppendFile(String fileName, byte[] bytes, int size, boolean binary); - - /** - * Implemented to provide the means by which file bytes are sent and appended - * @param fileName the name of the file to send - * @param bytes to bytes of the file to send - * @param size the number of bytes to send - * @param binary indicates whether to send the bytes as binary or text - * @param byteStreamHandlerId indicates which byte stream handler to receive the bytes with - */ - public abstract void sendAppendFile(String fileName, byte[] bytes, int size, boolean binary, String byteStreamHandlerId); - - /** - * Implemented to provide the means by which classes are sent - * across the comm channel. - * @param className the name of the class to send - */ - public abstract void sendClass(String className); - - /** - * Implemented to provide the means by which classes are sent - * across the comm channel. - * @param className the name of the class to send - * @param classByteStreamHandlerId indicates which class byte stream handler to receive the class with - */ - public abstract void sendClass(String className, String classByteStreamHandlerId); - - - /** - * Runs the specified class on the remote system - */ - public abstract void sendClassInstance(IRemoteClassInstance runnable, String classByteStreamHandlerId); - - - /** - * Causes the current thread to wait until this class request has been - * fulfilled. - */ - public synchronized void waitForInput() - { - if (_commands.size() == 0 && _classesToSend.size() == 0) - { - super.waitForInput(); - } - } - - /** - * Implemented to provide the means by which classes are requested - * across the comm channel. - * @param className the name of the class to request - */ - public abstract void requestClass(String className); - - public abstract void sendKeepAliveConfirmation(); - - public abstract void sendKeepAliveRequest(); -} diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/DE.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/DE.java deleted file mode 100644 index 0c9496282..000000000 --- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/DE.java +++ /dev/null @@ -1,237 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2001, 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 - * - * 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 McKnight (IBM) - [226561] [apidoc] Add API markup to RSE Javadocs where extend / implement is allowed - *******************************************************************************/ - -package org.eclipse.dstore.core.model; - -/** - * DE is a container of <code>DataElement</code> constants. These constants - * are used to identify <code>DataElement</code> attributes. - * - * <li> - * Attributes beginning with "P_" indicate <I>property</I> attribute identifiers. - * </li> - * <li> - * Attributes beginning with "T_" indicate <code>DataElement</code> <I>type</I> attributes. - * </li> - * <li> - * Attributes beginning with "A_" indicate <code>DataElement</code> indexs into <I>attributes</I>. - * </li> - * - * @noextend This class is not intended to be subclassed by clients. - * @noinstantiate This class is not intended to be instantiated by clients. - */ -public class DE -{ - - - /* - * The nested data (children) property identifier of a <code>DataElement</code>. - */ - public static final String P_CHILDREN = "children"; //$NON-NLS-1$ - - /* - * The image property identifier of a <code>DataElement</code>. This is the same - * as the value property identifier - */ - public static final String P_LABEL = "label"; //$NON-NLS-1$ - - /* - * The notifier property identifier of a <code>DataElement</code>. - */ - public static final String P_NOTIFIER = "notifier"; //$NON-NLS-1$ - - /* - * The <code>DataStore</code> property identifier of a <code>DataElement</code>. - */ - public static final String P_DATASTORE = "dataStore"; //$NON-NLS-1$ - - /* - * The source name property identifier of a <code>DataElement</code>. This is the - * name of a source location if one exists. - */ - public static final String P_SOURCE_NAME = "source"; //$NON-NLS-1$ - - /* - * The source file property identifier of a <code>DataElement</code>. - */ - public static final String P_SOURCE = "sourcefile"; //$NON-NLS-1$ - - /* - * The source location property identifier of a <code>DataElement</code>. - */ - public static final String P_SOURCE_LOCATION = "sourcelocation"; //$NON-NLS-1$ - - public static final String P_SOURCE_LOCATION_COLUMN = "sourcelocationcolumn"; //$NON-NLS-1$ - - /* - * The nested data (children) property identifier of a <code>DataElement</code>. Same as <code>P_CHILDREN</code>. - */ - public static final String P_NESTED = "nested"; //$NON-NLS-1$ - - /* - * The buffer property identifier of a <code>DataElement</code>. - */ - public static final String P_BUFFER = "buffer"; //$NON-NLS-1$ - - /* - * The type property identifier of a <code>DataElement</code>. - */ - public static final String P_TYPE = "type"; //$NON-NLS-1$ - - /* - * The id property identifier of a <code>DataElement</code>. - */ - public static final String P_ID = "id"; //$NON-NLS-1$ - - /* - * The name property identifier of a <code>DataElement</code>. - */ - public static final String P_NAME = "name"; //$NON-NLS-1$ - - /* - * The value property identifier of a <code>DataElement</code>. - */ - public static final String P_VALUE = "value"; //$NON-NLS-1$ - - /* - * The <I>is reference?</I> property identifier of a <code>DataElement</code>. Deprecated. Use P_REF_TYPE. - */ - public static final String P_ISREF = "isRef"; //$NON-NLS-1$ - - /* - * The <I>is reference?</I> property identifier of a <code>DataElement</code>. - */ - public static final String P_REF_TYPE = "refType"; //$NON-NLS-1$ - - /* - * The visibility property identifier of a <code>DataElement</code>. - */ - public static final String P_DEPTH = "depth"; //$NON-NLS-1$ - - /* - * The attributes property identifier of a <code>DataElement</code>. - */ - public static final String P_ATTRIBUTES = "attribute"; //$NON-NLS-1$ - - /* - * The file property identifier of a <code>DataElement</code>. - */ - public static final String P_FILE = "file"; //$NON-NLS-1$ - - /* - * The file property identifier of a <code>DataElement</code>. - */ - public static final String P_DESCRIPTOR = "descriptor"; //$NON-NLS-1$ - - /* - * Reference type. - */ - public static final String T_REFERENCE = "reference"; //$NON-NLS-1$ - - /* - * Command type. - */ - public static final String T_COMMAND = "command"; //$NON-NLS-1$ - - /* - * UI Command Descriptor type. - */ - public static final String T_UI_COMMAND_DESCRIPTOR = "ui_commanddescriptor"; //$NON-NLS-1$ - - /* - * Object Descriptor type. - */ - public static final String T_OBJECT_DESCRIPTOR = "objectdescriptor"; //$NON-NLS-1$ - - /* - * Command Descriptor type. - */ - public static final String T_COMMAND_DESCRIPTOR = "commanddescriptor"; //$NON-NLS-1$ - - /* - * Relation Descriptor type. - */ - public static final String T_RELATION_DESCRIPTOR = "relationdescriptor"; //$NON-NLS-1$ - - /* - * Abstract Object Descriptor type. - */ - public static final String T_ABSTRACT_OBJECT_DESCRIPTOR = "abstractobjectdescriptor"; //$NON-NLS-1$ - - /* - * Abstract Command Descriptor type. - */ - public static final String T_ABSTRACT_COMMAND_DESCRIPTOR = "abstractcommanddescriptor"; //$NON-NLS-1$ - - /* - * Abstract Relation Descriptor type. - */ - public static final String T_ABSTRACT_RELATION_DESCRIPTOR = "abstractrelationdescriptor"; //$NON-NLS-1$ - - - /* - * Type attribute index. - */ - public static final int A_TYPE = 0; - - /* - * ID attribute index. - */ - public static final int A_ID = 1; - - /* - * Name attribute index. - */ - public static final int A_NAME = 2; - - /* - * Value attribute index. - */ - public static final int A_VALUE = 3; - - /* - * Source attribute index. - */ - public static final int A_SOURCE = 4; - - /* - * Source location attribute index. - */ - public static final int A_SOURCE_LOCATION = 5; - - /* - * IsRef attribute index. Deprecated. Use A_REF_TYPE. - */ - public static final int A_ISREF = 6; - - /* - * RefType attribute index. - */ - public static final int A_REF_TYPE = 6; - - /* - * Visibility attribute index. - */ - public static final int A_DEPTH = 7; - - /* - * Size attribute index. - */ - public static final int A_SIZE = 8; - - public static final String ENCODING_UTF_8 = "UTF-8"; //$NON-NLS-1$ -} diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/DataElement.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/DataElement.java deleted file mode 100644 index 099c1c618..000000000 --- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/DataElement.java +++ /dev/null @@ -1,1688 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2002, 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 - * - * 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 McKnight (IBM) - [226561] [apidoc] Add API markup to RSE Javadocs where extend / implement is allowed - *******************************************************************************/ - -package org.eclipse.dstore.core.model; - -import java.util.ArrayList; -import java.util.List; - -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; - -/** - * <code>DataElement</code> is the unit of information for the <code>DataStore</code>. All objects including - * schema descriptors, commands and instance objects are represented by <code>DataElement</code>s. - * <code>DataElement</code>s should not be constructed directly, rather they are requested via the createObject() - * method in <code>DataStore</code> - * - * @noextend This class is not intended to be subclassed by clients. - * @noinstantiate This class is not intended to be instantiated by clients. DataElements - * should be created via the DataStore create methods. - */ -public final class DataElement implements IDataElement -{ - - - private String _attributes[]; - private StringBuffer _buffer; - - private boolean _isReference = false; - private boolean _isDescriptor = false; - private boolean _isExpanded = false; - private boolean _isUpdated = false; - private boolean _isPendingTransfer = false; - private boolean _isSpirit = false; - - private int _depth = 1; - - private DataStore _dataStore = null; - private DataElement _parent = null; - private DataElement _descriptor = null; - - private ArrayList _nestedData = null; - private DataElement _referencedObject = null; - - private PropertySource _propertySource = null; - - - /** - * Creates a new <code>DataElement</code> without initializing it. - * - */ - public DataElement() - { - _dataStore = null; - _parent = null; - DataElementRemover.addToCreatedCount(); - } - - /** - * Creates a new <code>DataElement</code> without initializing it. - * - * @param dataStore the owner <code>DataStore</code> for this element - */ - protected DataElement(DataStore dataStore) - { - _dataStore = dataStore; - _parent = null; - DataElementRemover.addToCreatedCount(); - } - - protected void finalize() - { - DataElementRemover.addToGCedCount(); - } - - /** - * Initializes a <code>DataElement</code> to be reference to some other <code>DataElement</code>. - * This method should only be called from the <code>DataStore</code>. - * - * @param parent the element that contains this reference - * @param originalObject the element that gets referenced - * @param refType the type descriptor of the reference - */ - public void reInit(DataElement parent, DataElement originalObject, DataElement refType) - { - if ((parent != null) && (originalObject != null)) - { - _parent = parent; - - _attributes = getAttributes(); - String type = refType.getName(); - _attributes[DE.A_TYPE] = type; - - String originalId = originalObject.getId(); - StringBuffer idBuf = new StringBuffer(parent.getId()); - idBuf.append(type); - idBuf.append(originalId); - _attributes[DE.A_ID] = idBuf.toString(); - _attributes[DE.A_NAME] = originalId; - _attributes[DE.A_VALUE] = originalId; - - initialize(refType); - - _referencedObject = originalObject; - _isReference = true; - } - } - - /** - * Initializes a <code>DataElement</code> to be reference to some other <code>DataElement</code> - * This method should only be called from the <code>DataStore</code>. - * - * @param parent the element that contains this reference - * @param originalObject the element that gets referenced - * @param refType the a string representing the type of reference - */ - public void reInit(DataElement parent, DataElement originalObject, String refType) - { - if ((parent != null) && (originalObject != null)) - { - _parent = parent; - - _attributes = getAttributes(); - _attributes[DE.A_TYPE] = refType; - - String originalId = originalObject.getId(); - StringBuffer idBuf = new StringBuffer(parent.getId()); - idBuf.append(refType); - idBuf.append(originalId); - - _attributes[DE.A_ID] = idBuf.toString(); - _attributes[DE.A_NAME] = originalId; - _attributes[DE.A_VALUE] = originalId; - - initialize(); - - _referencedObject = originalObject; - _isReference = true; - } - } - - /** - * Initializes a <code>DataElement</code> - * This method should only be called from the <code>DataStore</code>. - * - * @param parent the parent of the element - * @param type the type descriptor of the element - * @param id the ID of the element - * @param name the name of the element - * @param source the source location of the element - */ - public void reInit(DataElement parent, DataElement type, String id, String name, String source) - { - _parent = parent; - - _attributes = getAttributes(); - _attributes[DE.A_TYPE] = type.getAttribute(DE.A_NAME); - _attributes[DE.A_ID] = id; - _attributes[DE.A_NAME] = name; - _attributes[DE.A_VALUE] = name; - _attributes[DE.A_SOURCE] = source; - - initialize(type); - } - - /** - * Initializes a <code>DataElement</code> - * This method should only be called from the <code>DataStore</code>. - * - * @param parent the parent of the element - * @param type a string representing the type descriptor of the element - * @param id the ID of the element - * @param name the name of the element - * @param source the source location of the element - */ - public void reInit(DataElement parent, String type, String id, String name, String source) - { - _parent = parent; - - _attributes = getAttributes(); - _attributes[DE.A_TYPE] = type; - _attributes[DE.A_ID] = id; - _attributes[DE.A_NAME] = name; - _attributes[DE.A_VALUE] = name; - _attributes[DE.A_SOURCE] = source; - - initialize(); - } - - /** - * Initializes a <code>DataElement</code> - * This method should only be called from the <code>DataStore</code>. - * - * @param parent the parent of the element - * @param type the type descriptor of the element - * @param id the ID of the element - * @param name the name of the element - * @param source the source location of the element - * @param isRef an indication of whether the element is a reference or not - */ - public void reInit(DataElement parent, DataElement type, String id, String name, String source, boolean isRef) - { - _parent = parent; - - _attributes = getAttributes(); - _attributes[DE.A_TYPE] = type.getAttribute(DE.A_NAME); - _attributes[DE.A_ID] = id; - _attributes[DE.A_NAME] = name; - _attributes[DE.A_VALUE] = name; - _attributes[DE.A_SOURCE] = source; - - initialize(type); - _isReference = isRef; - } - - /** - * Initializes a <code>DataElement</code> - * This method should only be called from the <code>DataStore</code>. - * - * @param parent the parent of the element - * @param type a string representing the type descriptor of the element - * @param id the ID of the element - * @param name the name of the element - * @param source the source location of the element - * @param isRef an indication of whether the element is a reference or not - */ - public void reInit(DataElement parent, String type, String id, String name, String source, boolean isRef) - { - _parent = parent; - - _attributes = getAttributes(); - _attributes[DE.A_TYPE] = type; - _attributes[DE.A_ID] = id; - _attributes[DE.A_NAME] = name; - _attributes[DE.A_VALUE] = name; - _attributes[DE.A_SOURCE] = source; - - initialize(); - _isReference = isRef; - } - - /** - * Initializes a <code>DataElement</code> - * This method should only be called from the <code>DataStore</code>. - * - * @param parent the parent of the element - * @param type the type descriptor of the element - * @param attributes the attributes for this element (name, source, id, etc.) - */ - public void reInit(DataElement parent, DataElement type, String[] attributes) - { - _parent = parent; - - _attributes = attributes; - _attributes[DE.A_TYPE] = type.getName(); - - initialize(type); - } - - /** - * Initializes a <code>DataElement</code> - * This method should only be called from the <code>DataStore</code>. - * - * @param parent the parent of the element - * @param attributes the attributes for this element (type, name, source, id, etc.) - */ - public void reInit(DataElement parent, String[] attributes) - { - _parent = parent; - - _attributes = attributes; - - initialize(); - } - - public void reInitAsTransient(String attributes[]) - { - _attributes = attributes; - - _isReference = false; - _isDescriptor = false; - _depth = 1; - - _referencedObject = null; - _isExpanded = false; - _isUpdated = false; - - String depthStr = getAttribute(DE.A_DEPTH); - if (depthStr != null && depthStr.length() > 0) - { - if (!depthStr.equals("1")) //$NON-NLS-1$ - { - try - { - _depth = Integer.parseInt(depthStr); - } - catch (Exception e) - { - } - } - } - - if (_nestedData != null) - _nestedData.clear(); - } - - /** - * Indicates whether the <code>DataElement</code> is deleted or not. - * - * @return whehther the element is deleted or not - */ - public boolean isDeleted() - { - if (_attributes == null) - { - return true; - } - - String valueAttribute = getAttribute(DE.A_VALUE); - - if (valueAttribute != null && valueAttribute.equals(DataStoreResources.DELETED)) - { - return true; - } - - if (_isSpirit && !_dataStore.isVirtual()) - { - return true; - } - - return false; - } - - /** - * Adds a set of elements as children to this element. - * - * @param nestedData a set of elements to add to this element - * @param checkUnique whether to prevent duplicates from being added - */ - public synchronized void addNestedData(List nestedData, boolean checkUnique) - { - if (nestedData != null) - { - if (_nestedData == null) - { - _nestedData = new ArrayList(nestedData.size()); - } - - for (int i = 0; i < nestedData.size(); i++) - { - DataElement child = (DataElement) nestedData.get(i); - if (child != null && child != this) - { - addNestedData(child, checkUnique); - } - } - } - } - - /** - * Adds another element as a child to this element. - * - * @param obj the element to add - * @param checkUnique whether to prevent duplicates from being added - */ - public synchronized void addNestedData(DataElement obj, boolean checkUnique) - { - if (_nestedData == null) - { - _nestedData = new ArrayList(4); - } - - synchronized (_nestedData) - { - boolean alreadyThere = false; - if (checkUnique) - { - alreadyThere = _nestedData.contains(obj); - } - - if (!checkUnique || !alreadyThere) - { - if (alreadyThere) - { - return; - } - else - { - _nestedData.add(obj); - - if (obj.getParent() == null) - obj.setParent(this); - } - } - - _isUpdated = false; - obj.setUpdated(false); - } - } - - /** - * Removes a specified child element from this element. - * - * @param object the element to remove - */ - public synchronized void removeNestedData(DataElement object) - { - if (_nestedData != null) - { - synchronized(_nestedData) - { - _nestedData.remove(object); - } - } - _isExpanded = false; - _isUpdated = false; - } - - /** - * Removes all the children from this element. - */ - public synchronized void removeNestedData() - { - if (_nestedData != null) - { - synchronized (_nestedData) - { - while (_nestedData.size() > 0) - { - DataElement nestedObject = (DataElement) _nestedData.get(0); - _nestedData.remove(nestedObject); - } - } - } - - _isExpanded = false; - _isUpdated = false; - } - - /** - * Returns an attribute of this element. - * - * @param attributeIndex the index of the element - * @return the attribute - */ - public String getAttribute(int attributeIndex) - { - if (_attributes == null) - return ""; //$NON-NLS-1$ - return _attributes[attributeIndex]; - } - - /** - * Returns the set of attributes for this element. - * - * @return the set of attributes - */ - public String[] getAttributes() - { - if (_attributes == null) - { - return new String[DE.A_SIZE]; - } - return _attributes; - } - - /** - * Returns the type attribute for this element. - * - * @return the type attribute - */ - public String getType() - { - return getAttribute(DE.A_TYPE); - } - - /** - * Returns the ID attribute for this element. - * - * @return the ID attribute - */ - public String getId() - { - return getAttribute(DE.A_ID); - } - - /** - * Returns the name attribute for this element. - * - * @return the name attribute - */ - public String getName() - { - return getAttribute(DE.A_NAME); - } - - /** - * Returns the value attribute for this element. - * - * @return the value attribute - */ - public String getValue() - { - return getAttribute(DE.A_VALUE); - } - - /** - * Returns the source attribute for this element. - * - * @return the source attribute - */ - public String getSource() - { - return getAttribute(DE.A_SOURCE); - } - - /** - * Returns the buffer for this element. - * - * @return the buffer - */ - public StringBuffer getBuffer() - { - return _buffer; - } - - /** - * Returns the <code>DataStore</code> for this element. - * - * @return the <code>DataStore</code> - */ - public DataStore getDataStore() - { - return _dataStore; - } - - /** - * Initializes the children set of this element with a specified size. - * - * @param size the initial size - */ - public void initializeNestedData(int size) - { - if (_nestedData == null) - { - _nestedData = new ArrayList(size); - } - } - - /** - * Returns the children of this element. - * - * @return the children of this element - */ - public List getNestedData() - { - return _nestedData; - } - - /** - * Returns the child at the specified index. - * - * @param index the index of the child to retrieve - * @return the child element - */ - public DataElement get(int index) - { - if (_nestedData == null) - { - return null; - } - else - { - if (getNestedSize() > index) - { - Object obj = _nestedData.get(index); - return (DataElement) obj; - } - else - { - return null; - } - } - } - - /** - * Returns the number of children this element contains. - * - * @return the number of children - */ - public int getNestedSize() - { - if (_nestedData == null) - { - return 0; - } - else - { - return _nestedData.size(); - } - } - - /** - * Returns the parent of this element. - * - * @return the parent - */ - public DataElement getParent() - { - return _parent; - } - - public boolean isDescriptor() - { - return _isDescriptor; - } - - /** - * Explicitly sets the type descriptor for this element. - * - * @param theDescriptor the type descriptor for this element - */ - public void setDescriptor(DataElement theDescriptor) - { - _descriptor = theDescriptor; - } - - /** - * Returns the type descriptor for this element. - * - * @return the type descriptor for this element - */ - public DataElement getDescriptor() - { - if (isDeleted()) - { - return null; - } - - if (_isReference) - { - if (_referencedObject == null) - { - _referencedObject = dereference(); - } - if (this == _referencedObject || _referencedObject.isDeleted()) - { - _referencedObject = null; - } - else - { - return _referencedObject.getDescriptor(); - } - } - else if ((_descriptor == null) && (_dataStore != null)) - { - if (_isDescriptor) - { - _descriptor = _dataStore.findDescriptor(getAttribute(DE.A_TYPE), getName()); - } - else - { - _descriptor = _dataStore.findObjectDescriptor(getAttribute(DE.A_TYPE)); - if (_descriptor == null) - { - _descriptor = _dataStore.find(_dataStore.getDescriptorRoot(), DE.A_NAME, getAttribute(DE.A_TYPE), 3); - } - } - } - - return _descriptor; - } - - - /** - * Returns the visibility of this element. - * - * @return the level of visibility for this element - */ - public int depth() - { - return _depth; - } - - /** - * Indicates whether this is a reference or not. - * - * @return whether this is a reference or not - */ - public boolean isReference() - { - return _isReference; - } - - /** - * Indicates whether this element has been queried for it's children. - * - * @return whether element has been expanded - */ - public boolean isExpanded() - { - return _isExpanded; - } - - /** - * Indicates whether this element has been updated yet. - * On a server, an element is updated if it has been transfered the the client. - * On a client, an element is updated if a notification has been sent out for the ui - * - * @return whether element has been updated yet - */ - public boolean isUpdated() - { - return _isUpdated; - } - - /** - * Indicates whether this element is pending a transfer - * If the element is queued to be sent, the value will be true. - * - * @return whether element has been updated yet - */ - public boolean isPendingTransfer() - { - return _isPendingTransfer; - } - - /** - * Indicates whether this element is a 'spirit' element. - * In a client datastore, this means that the element's counterpart on the - * server is either also a spirit (and will be deleted soon) or has already - * been deleted. In a server datastore, this means that the element is - * to be deleted at the next opportunity in order to free memory. - */ - public boolean isSpirit() - { - return _isSpirit; - } - - /** - * Sets an attribute of the element. - * - * @param attributeIndex the index of the attribute to set - * @param attribute the new value for the specified attribute - */ - public void setAttribute(int attributeIndex, String attribute) - { - String nameAttribute = getAttribute(DE.A_NAME); - if ((attributeIndex == DE.A_NAME) && (nameAttribute != null && nameAttribute.equals(getAttribute(DE.A_VALUE)))) - { - _attributes[DE.A_VALUE] = attribute; - } - else if (attributeIndex == DE.A_DEPTH) - { - if (attribute != null) - _depth = Integer.parseInt(attribute); - else - _depth = 0; - } - else if (attributeIndex == DE.A_TYPE) - { - _descriptor = null; - } - - _attributes[attributeIndex] = attribute; - _isUpdated = false; - } - - /** - * Sets all of the attributes of the element. - * - * @param attributes the new set of attributes for the element - */ - public void setAttributes(String attributes[]) - { - for (int i = 0; i < DE.A_SIZE; i++) - { - if (attributes[i] != null) - { - setAttribute(i, attributes[i]); - } - } - - _isUpdated = false; - } - - /** - * Sets the buffer for this element. - * The buffer is used if extra temporary information needs to be stored - * with this element - * - * @param buffer the new buffer for this element - */ - public void setBuffer(StringBuffer buffer) - { - _buffer = buffer; - if (_depth < 1 && buffer.length() > 0) - { - setDepth(1); - } - - _isUpdated = false; - } - - /** - * Appends to the buffer for this element. - * The buffer is used if extra temporary information needs to be stored - * with this element - * - * @param text text to append to the buffer - */ - public void appendToBuffer(String text) - { - if (_buffer == null) - { - _buffer = new StringBuffer(); - } - _buffer.append(text); - _isUpdated = false; - } - - /** - * Sets the expanded indication for this element. - * - * @param flag whether the element is expanded or not - */ - public void setExpanded(boolean flag) - { - _isExpanded = flag; - } - - /** - * Sets the updated indication for this element. - * - * @param flag whether the element is updated or not - */ - public void setUpdated(boolean flag) - { - _isUpdated = flag; - } - - /** - * Sets indication of whether this element is waiting to be transferred. - * If so, the updated flag should not be set to true - * - * @param flag whether the element is waiting to be transferred - */ - public void setPendingTransfer(boolean flag) - { - _isPendingTransfer = flag; - } - - /** - * Sets indication of whether this element is a 'spirit' element. - * In a client datastore, this means that the element's counterpart on the - * server is either also a spirit (and will be deleted soon) or has already - * been deleted. In a server datastore, this means that the element is - * to be deleted at the next opportunity in order to free memory. - */ - public void setSpirit(boolean flag) - { - _isSpirit = flag; - } - - /** - * Sets the parent for this element. - * - * @param parent the new parent - */ - public void setParent(DataElement parent) - { - _parent = parent; - } - - /** - * Sets the <code>DataStore</code> for this element. - * - * @param dataStore the new dataStore - */ - public void setDataStore(DataStore dataStore) - { - _dataStore = dataStore; - } - - /** - * Sets the depth of visibility for this element. - * - * @param depth the level of visibility - */ - public void setDepth(int depth) - { - _depth = depth; - setAttribute(DE.A_DEPTH, "" + _depth); //$NON-NLS-1$ - _isUpdated = false; - //_dataStore.refresh(this); - } - - /** - * Tests if this element is of the specified type. - * - * @param typeStr a string representing the type descriptor to compare with - * @return whether the element is of the specified type - */ - public boolean isOfType(String typeStr) - { - DataElement typeDescriptor = _dataStore.find(_dataStore.getDescriptorRoot(), DE.A_NAME, typeStr, 1); - return isOfType(typeDescriptor); - } - - /** - * Tests if this element is of the specified type. - * - * @param typeStr a string representing the type descriptor to compare with - * @return whether the element is of the specified type - */ - public boolean isOfType(String typeStr, boolean isDescriptor) - { - DataElement typeDescriptor = _dataStore.find(_dataStore.getDescriptorRoot(), DE.A_NAME, typeStr, 1); - return isOfType(typeDescriptor, isDescriptor); - } - - /** - * Tests if this element is of the specified type. - * - * @param type the type descriptor to compare with - * @return whether the element is of the specified type - */ - public boolean isOfType(DataElement type) - { - return isOfType(type, false); - } - - /** - * Tests if this element is of the specified type. - * - * @param type the type descriptor to compare with - * @param isDescriptor whehter this element is a descriptor or an instance object - * @return whether the element is of the specified type - */ - public boolean isOfType(DataElement type, boolean isDescriptor) - { - boolean result = false; - - if (type == null) - { - return result; - } - - DataElement descriptor = this; - if (!isDescriptor) - { - descriptor = getDescriptor(); - } - - if (descriptor == type) - { - return true; - } - - if (descriptor != null && !descriptor.isDeleted()) - { - String typeType = type.getType(); - String typeName = type.getName(); - if (typeType.equals(DE.T_OBJECT_DESCRIPTOR) || typeType.equals(DE.T_ABSTRACT_OBJECT_DESCRIPTOR)) - { - if (descriptor.getName().equals(typeName) || (typeName.equals("all"))) //$NON-NLS-1$ - { - result = true; - return result; - } - } - - DataElement relationship = _dataStore.getAbstractedByRelation(); - List abstracted = null; - - if (relationship != null) - { - abstracted = descriptor.getAssociated(relationship); - } - if (abstracted != null) - { - for (int i = 0;(i < abstracted.size()) && !result; i++) - { - DataElement superDescriptor = (DataElement) abstracted.get(i); - result = superDescriptor.isOfType(type, true); - } - } - } - - return result; - } - - /** - * Tests if this element matches the specified patterns. - * - * @param attributes the attribute indexes to compare with - * @param patterns the values to compare the specified attributes with - * @param numAttributes the number of attributes to compare - * @param ignoreCase whether to ignore case or not - * @return whether the element matches the patterns - */ - public boolean patternMatch(int attributes[], String patterns[], int numAttributes, boolean ignoreCase) - { - int index = 0; - while (index < numAttributes) - { - String attribute = getAttribute(attributes[index]); - String pattern = patterns[index]; - - if (!StringCompare.compare(pattern, attribute, ignoreCase)) - { - return false; - } - index++; - } - - return true; - } - - /** - * Tests if this element contains a specified element in a particular relationship. - * - * @param object the object to look for - * @param property relationship under which to find the object - * @return whether the element is found - */ - public boolean contains(DataElement object, DataElement property) - { - return contains(object, property, 1); - } - - /** - * Tests if this element contains a specified element in a particular relationship. - * - * @param object the object to look for - * @param property relationship under which to find the object - * @param depth how deep to search for the specified element - * @return whether the element is found - */ - public synchronized boolean contains(DataElement object, DataElement property, int depth) - { - if (depth > 0) - { - depth--; - - if (object == null) - { - return false; - } - - if (property == null) - { - property = _dataStore.getContentsRelation(); - } - - if (getNestedSize() == 0) - { - return false; - } - - if (property != null) - { - if (property.getType().equals(DE.T_ABSTRACT_RELATION_DESCRIPTOR)) - { - for (int i = 0; i < property.getNestedSize(); i++) - { - DataElement subProperty = property.get(i).dereference(); - if (contains(object, subProperty)) - { - return true; - } - } - } - else - { - String type = property.getName(); - if (type.equals(DataStoreResources.model_parent) && (_parent != null)) - { - if (object == _parent) - { - return true; - } - else - { - return _parent.contains(object, property, depth); - } - } - else if (_nestedData != null) - { - for (int i = 0; i < _nestedData.size(); i++) - { - DataElement nestedObject = (DataElement) _nestedData.get(i); - if (nestedObject != null) - { - if (nestedObject.isReference()) - { - String relType = nestedObject.getAttribute(DE.A_TYPE); - if (relType.equals(type)) - { - DataElement referenced = nestedObject.dereference(); - - if (referenced == object) - { - return true; - } - else - { - return referenced.contains(object, property, depth); - } - } - } - else if (type.equals("contents")) //$NON-NLS-1$ - { - if (nestedObject == object) - { - return true; - } - else - { - if (nestedObject.contains(object, property, depth)) - { - return true; - } - } - } - } - } - } - } - } - } - return false; - } - - /** - * Tests if this element contains a specified element in the default contents relationship. - * - * @param object the object to look for - * @return whether the element is found - */ - public boolean contains(DataElement object) - { - return contains(object, 1); - } - - /** - * Tests if this element contains a specified element in the default contents relationship. - * - * @param object the object to look for - * @param depth how deep to search - * @return whether the element is found - */ - public boolean contains(DataElement object, int depth) - { - boolean result = false; - if (_nestedData != null) - { - depth--; - for (int i = 0; i < getNestedSize(); i++) - { - DataElement child = get(i); - - if (child == object) - { - return true; - } - else if (child.dereference() == object) - { - return true; - } - else if (depth > 0) - { - result = child.contains(object, depth); - if (result) - { - return true; - } - } - } - } - - return result; - } - - /** - * Tests if this element is the same as another. - * - * @param arg the object to compare with - * @return whether the element is the same - */ - public boolean equals(Object arg) - { - if (arg instanceof DataElement) - { - return arg == this; - } - - return false; - } - - /** - * Gets the set of elements that are related to this element via a specified relationship. - * - * @param propertyStr a string representing the relationship that is required - * @return the set of related elements - */ - public List getAssociated(String propertyStr) - { - DataElement property = _dataStore.findObjectDescriptor(propertyStr); - if (property == null) - { - property = _dataStore.findRelationDescriptor(propertyStr); - } - if (property != null) - { - return getAssociated(property); - } - else - { - return new ArrayList(1); - } - } - - /** - * Gets the set of elements that are related to this element via a specified relationship. - * - * @param property the relationship that is required - * @return the set of related elements - */ - public List getAssociated(DataElement property) - { - ArrayList set = new ArrayList(); - - if (property == null || getNestedSize() == 0) - { - return set; - } - else - { - if (property.getType().equals(DE.T_ABSTRACT_RELATION_DESCRIPTOR)) - { - // recursively concat the abstracted matches - for (int i = 0; i < property.getNestedSize(); i++) - { - DataElement subProperty = property.get(i).dereference(); - List subSet = getAssociated(subProperty); - set.addAll(subSet); - } - } - else - { - String type = property.getName(); - if (type.equals(DataStoreResources.model_parent) && (_parent != null)) - { - set.add(_parent); - return set; - } - else if (type.equals(DataStoreResources.model_descriptor_for)) - { - getDescriptor(); - if (_descriptor != null) - set.add(_descriptor); - } - else if (_nestedData != null) - { - for (int i = 0; i < _nestedData.size(); i++) - { - DataElement nestedObject = (DataElement) _nestedData.get(i); - if (nestedObject != null) - { - if (nestedObject.isReference()) - { - String relType = nestedObject.getType(); - if (relType.equals(type)) - { - DataElement referenced = nestedObject.dereference(); - if ((referenced != null) && !referenced.isDeleted()) - { - set.add(referenced); - } - } - } - else if (type.equals(DataStoreResources.model_contents)) - { - if (!nestedObject.isDeleted()) - set.add(nestedObject); - } - } - } - } - } - } - - return set; - } - - /** - * Returns the element that this references. - * If the element is not a reference, itself is returned - * - * @return the element that this references - */ - public DataElement dereference() - { - if (_isReference) - { - String name = getAttribute(DE.A_NAME); - if ((_referencedObject != null)) - { - if (_referencedObject.getId().equals(name)) - { - return _referencedObject; - } - else - { - _referencedObject = null; - delete(); - return null; - } - } - else - { - _referencedObject = _dataStore.find(name); - if ((_referencedObject != null)) - { - return _referencedObject; - } - else - { - return null; - } - } - } - else - { - return this; - } - } - - /** - * Do the specified command on this element. - * This element becomes the subject of a command that has a value, command - * - * @param command the string representing the command to issue - * @param isSynchronized an indication of whether this command should be synchronized - * @return the status of the command - */ - public DataElement doCommandOn(String command, boolean isSynchronized) - { - DataElement status = null; - if ((_dataStore != null) && (_dataStore.isConnected())) - { - DataElement cmdDescriptor = _dataStore.localDescriptorQuery(getDescriptor(), command); - if (cmdDescriptor != null) - { - if (isSynchronized) - { - status = _dataStore.synchronizedCommand(cmdDescriptor, this); - } - else - { - status = _dataStore.command(cmdDescriptor, this); - } - } - } - return status; - } - - - - /** - * Gets the adapter specified by key for this element - * - * @param key the identifier for this adapter - * @return the adapter - */ - public Object getAdapter(Class key) - { - Object adapter = DesktopElement.getPlatformAdapter(this, key); - if (adapter != null) - { - return adapter; - } - else if (PropertySource.matches(key)) - { - if (_propertySource == null) - { - _propertySource = new PropertySource(this); - } - - return _propertySource; - } - else if (DataElementActionFilter.matches(key)) - { - return DataElementActionFilter.getInstance(); - } - return null; - } - - /** - * Returns a string showing the attributes of this element - * - * @return a printable string - */ - public String toString() - { - return "DataElement " //$NON-NLS-1$ - + (_isReference ? "reference" : "") //$NON-NLS-1$ //$NON-NLS-2$ - + "\n{\n\tType:\t" //$NON-NLS-1$ - + getType() - + "\n\tName:\t" //$NON-NLS-1$ - + getName() - + "\n\tValue:\t" //$NON-NLS-1$ - + getValue() - + "\n\tID:\t" //$NON-NLS-1$ - + getId() - + "\n\tSource:\t" //$NON-NLS-1$ - + getSource() - + "\n\tDepth:\t" //$NON-NLS-1$ - + _depth - + "\n\tDataStore:\t" //$NON-NLS-1$ - + _dataStore.getName() - + "\n}\n"; //$NON-NLS-1$ - } - - /** - * Returns the property identified by name. - * - * @param name a specifier of which property to return - * @return the specified property - */ - public Object getElementProperty(Object name) - { - return getElementProperty(name, 3); - } - - private Object getElementProperty(Object name, int depth) - { - if (depth == 0) - { - return null; - } - - if (_isReference) - { - if (_referencedObject == null) - { - dereference(); - } - - if (_referencedObject != null) - { - return _referencedObject.getElementProperty(name, depth - 1); - } - else - { - return null; - } - } - else - { - if (DE.P_NOTIFIER.equals(name)) - { - return _dataStore.getDomainNotifier(); - } - else if (DE.P_LABEL.equals(name)) - { - return getAttribute(DE.A_NAME); - } - else if (DE.P_TYPE.equals(name)) - { - return getAttribute(DE.A_TYPE); - } - else if (DE.P_NAME.equals(name)) - { - return getAttribute(DE.A_NAME); - } - else if (DE.P_VALUE.equals(name)) - { - return getAttribute(DE.A_VALUE); - } - else if (DE.P_ID.equals(name)) - { - return getAttribute(DE.A_ID); - } - else if (DE.P_DESCRIPTOR.equals(name)) - { - return _descriptor; - } - else if (DE.P_SOURCE_NAME.equals(name)) - { - String source = getAttribute(DE.A_SOURCE); - int locationIndex = source.lastIndexOf(":"); //$NON-NLS-1$ - if (locationIndex > 3) - { - return source.substring(0, locationIndex); - } - return source; - } - else if (DE.P_BUFFER.equals(name)) - { - return _buffer; - } - else if (DE.P_SOURCE.equals(name)) - { - return getAttribute(DE.A_SOURCE); - } - else if (DE.P_SOURCE_LOCATION_COLUMN.equals(name)) - { - return null; - } - else if (DE.P_DATASTORE.equals(name)) - { - return _dataStore.getName(); - } - else if (DE.P_NESTED.equals(name) || DE.P_CHILDREN.equals(name)) - { - return getNestedData(); - } - else - { - return null; - } - } - - } - - private void initialize() - { - initialize(null); - } - - private void initialize(DataElement typeDescriptor) - { - _isReference = false; - _isDescriptor = false; - _depth = 1; - - _referencedObject = null; - _isExpanded = false; - _isUpdated = false; - _descriptor = typeDescriptor; - - - String depthStr = getAttribute(DE.A_DEPTH); - if (depthStr != null && depthStr.length() > 0) - { - if (!depthStr.equals("2")) //$NON-NLS-1$ - { - try - { - _depth = Integer.parseInt(depthStr); - } - catch (Exception e) - { - } - } - } - - - - String refType = getAttribute(DE.A_REF_TYPE); - if (refType != null) - { - if (refType.equals(DataStoreResources.TRUE) || refType.equals(DataStoreResources.REFERENCE)) - { - _isReference = true; - _isSpirit = false; - } - else if (refType.equals(DataStoreResources.FALSE) || refType.equals(DataStoreResources.VALUE)) - { - _isReference = false; - _isSpirit = false; - } - else if (refType.equals(DataStoreResources.SPIRIT)) - { - _isReference = false; - _isSpirit = true; - } - } - - 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 (_nestedData != null) - _nestedData.clear(); - } - - /** - * Removes all the attributes of a <code>DataElement</code>. - * This method should only be called from the UpdateHandlers. - */ - protected synchronized void clear() - { - if (_attributes != null) - { - for (int i = 0; i < _attributes.length; i++) - { - String att = _attributes[i]; - if (att != null) - { - att = null; - } - } - - } - - if (_nestedData != null) - { - _nestedData.clear(); - } - - _parent = null; - _descriptor = null; - _referencedObject = null; - - _propertySource = null; - _buffer = null; - } - - /** - * Marks a <code>DataElement</code> as deleted. - * This method should only be called from the <code>DataStore</code> - */ - public synchronized void delete() - { - if (!isDeleted()) - { - // set delete attribute - - setAttribute(DE.A_SOURCE, null); - setAttribute(DE.A_VALUE, DataStoreResources.DELETED); - setAttribute(DE.A_TYPE, null); - setAttribute(DE.A_NAME, null); - - _isUpdated = false; - _isExpanded = true; - _buffer = null; - //_nestedData = null; // commented out this null setting so that the children of this element can be properly deleted - } - } - - public synchronized void notifyUpdate() - { - notify(); - } - - public synchronized void waitForUpdate(long timeout) - { - try - { - //System.out.println("waiting on:"+this); - wait(timeout); - //System.out.println("done waiting on:"+this); - } - catch (Exception e) - { - // timeed out - // System.out.println("timeout:"+this); - } - } -} diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/DataStore.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/DataStore.java deleted file mode 100644 index 877222041..000000000 --- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/DataStore.java +++ /dev/null @@ -1,4493 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2002, 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 - * - * 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: - * Michael Berger (IBM) - 146326 fixed erroneously disconnected dstore elements. - * Michael Berger (IBM) - 145799 added refresh() method with depth parameter. - * David McKnight (IBM) - 202822 findDeleted should not be synchronized - * David McKnight (IBM) [220123][dstore] Configurable timeout on irresponsiveness - * David McKnight (IBM) - [222168][dstore] Buffer in DataElement is not sent - * Noriaki Takatsu (IBM) - [220126] [dstore][api][breaking] Single process server for multiple clients - * 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) - [227881] [dstore][threaded] There is no chance to set client object for getUserPreferencesDirectory() - * Noriaki Takatsu (IBM) - [228156] [dstore] DataElementRemover thread doesn't terminate after a client disconnects the server - * David McKnight (IBM) - [226561] [apidoc] Add API markup to RSE Javadocs where extend / implement is allowed - * David McKnight (IBM) - [231639] [dstore] in single-process multi-client mode tracing shouldn't start until the client is set - * Noriaki Takatsu (IBM) - [239073] [dstore] [multithread] In multithread, the cache jar should be assigned after the client is set - * Noriaki Takatsu (IBM) - [245069] [dstore] dstoreTrace has no timestamp - *******************************************************************************/ - -package org.eclipse.dstore.core.model; - -import java.io.BufferedInputStream; -import java.io.BufferedWriter; -import java.io.File; -import java.io.FileInputStream; -import java.io.FileNotFoundException; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.OutputStreamWriter; -import java.io.PrintStream; -import java.io.RandomAccessFile; -import java.util.ArrayList; -import java.util.Date; -import java.util.Enumeration; -import java.util.HashMap; -import java.util.List; -import java.util.Random; -import java.util.jar.JarEntry; -import java.util.jar.JarFile; -import java.util.jar.JarOutputStream; -import java.util.zip.ZipOutputStream; - -import org.eclipse.dstore.core.java.ClassByteStreamHandler; -import org.eclipse.dstore.core.java.ClassByteStreamHandlerRegistry; -import org.eclipse.dstore.core.java.IClassByteStreamHandler; -import org.eclipse.dstore.core.java.IRemoteClassInstance; -import org.eclipse.dstore.core.java.RemoteClassLoader; -import org.eclipse.dstore.core.server.SystemServiceManager; -import org.eclipse.dstore.core.util.StringCompare; -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.server.ServerUpdateHandler; -import org.eclipse.dstore.internal.core.util.DataElementRemover; -import org.eclipse.dstore.internal.core.util.XMLgenerator; -import org.eclipse.dstore.internal.core.util.XMLparser; - -/** - * <code>DataStore</code> is the heart of the <code>DataStore</code> Distributed Tooling Framework. - * This class is used for creating, deleting and accessing <code>DataElement</code>s and for communicating commands - * to miners (tools). - * - * <p> - * Every <code>DataStore</code> has both a command handler and an update handler. The command - * handler is responsible for sending commands, in the form of <code>DataElement</code> trees, to the appropriate - * implementer, either directly to the miner, or indirectly over the communication layer through a server - * <code>DataStore</code>. The update handler is responsible for notifying listeners about changes in the - * <code>DataStore</code>, either directly via a <code>IDomainNotifier</code> or indirectly over the communication - * layer through a client <code>DataStore</code>. - * </p> - * @noextend This class is not intended to be subclassed by clients. - * @noinstantiate This class is not intended to be instantiated by clients. - */ -public final class DataStore -{ - - - private DataStoreAttributes _dataStoreAttributes; - - private RemoteClassLoader _remoteLoader; - - private DataElement _root; - private DataElement _descriptorRoot; - private DataElement _logRoot; - private DataElement _hostRoot; - private DataElement _minerRoot; - private DataElement _tempRoot; - private DataElement _dummy; - private DataElement _externalRoot; - private DataElement _status; - - private DataElement _ticket; - private String _remoteIP; - private DataStoreSchema _dataStoreSchema; - private CommandHandler _commandHandler; - private UpdateHandler _updateHandler; - - private IByteConverter _byteConverter; - private ByteStreamHandlerRegistry _byteStreamHandlerRegistry; - private ClassByteStreamHandlerRegistry _classbyteStreamHandlerRegistry; - - private IDomainNotifier _domainNotifier; - - private ArrayList _loaders; - private ArrayList _minersLocations; - private ArrayList _localClassLoaders; - private HashMap _dataStorePreferences; - - private List _dataStorePreferenceListeners; - - - private ISSLProperties _sslProperties; - - private boolean _autoRefresh; - - private boolean _isConnected; - private boolean _logTimes; - private int _timeout; - - private int _serverIdleShutdownTimeout = 0; - - private HashMap _hashMap; - private HashMap _objDescriptorMap; - private HashMap _cmdDescriptorMap; - private HashMap _relDescriptorMap; - - private ArrayList _recycled; - - private Random _random; - private int _initialSize; - - private File _traceFileHandle; - private RandomAccessFile _traceFile; - private boolean _tracingOn; - - private boolean _spiritModeOn = false; - private boolean _spiritCommandReceived = false; - private File _memLoggingFileHandle; - private RandomAccessFile _memLogFile; - private boolean _memLoggingOn; - - private ArrayList _waitingStatuses = null; - - private String _userPreferencesDirectory = null; - private IDataStoreCompatibilityHandler _compatibilityHandler; - - - private HashMap _classReqRepository; - private File _cacheJar; - public static final String REMOTE_CLASS_CACHE_JARFILE_NAME = "rmt_classloader_cache"; //$NON-NLS-1$ - public static final String JARFILE_EXTENSION = ".jar"; //$NON-NLS-1$ - private DataElementRemover _deRemover; - public static final int SPIRIT_ON_INITIAL_SIZE = 1000; - private String referenceTag = null; - - private int _serverVersion; - private int _serverMinor; - - private List _lastCreatedElements; - private Client _client; - - /** - * Creates a new <code>DataStore</code> instance - * - * @param attributes the default attributes of the <code>DataStore</code> - */ - public DataStore(DataStoreAttributes attributes) - { - _dataStoreAttributes = attributes; - _commandHandler = null; - _updateHandler = null; - _domainNotifier = null; - _isConnected = false; - _logTimes = false; - setSpiritModeOnState(); - _initialSize = _spiritModeOn && !isVirtual() ? SPIRIT_ON_INITIAL_SIZE : 100000; - initialize(); - } - - /** - * Creates a new DataStore instance - * - * @param attributes the default attributes of the <code>DataStore</code> - * @param initialSize the initial number of preallocated <code>DataElement</code>s - */ - public DataStore(DataStoreAttributes attributes, int initialSize) - { - _dataStoreAttributes = attributes; - _commandHandler = null; - _updateHandler = null; - _domainNotifier = null; - _isConnected = false; - _logTimes = false; - setSpiritModeOnState(); - _initialSize = _spiritModeOn && !isVirtual() ? SPIRIT_ON_INITIAL_SIZE : initialSize; - initialize(); - } - - /** - * Creates a new <code>DataStore</code> instance - * - * @param attributes the default attributes of the <code>DataStore</code> - * @param commandHandler the DataStore's handler for sending commands - * @param updateHandler the DataStore's handler for doing updates - * @param domainNotifier the domain notifier - * @since 3.0 replaced DomainNotifier with IDomainNotifier - */ - public DataStore(DataStoreAttributes attributes, CommandHandler commandHandler, UpdateHandler updateHandler, IDomainNotifier domainNotifier) - { - _dataStoreAttributes = attributes; - _commandHandler = commandHandler; - _updateHandler = updateHandler; - _domainNotifier = domainNotifier; - _isConnected = true; - _logTimes = false; - setSpiritModeOnState(); - _initialSize = _spiritModeOn && !isVirtual() ? SPIRIT_ON_INITIAL_SIZE : 10000; - initialize(); - createRoot(); - } - - /** - * Creates a new DataStore instance - * - * @param attributes the default attributes of the <code>DataStore</code> - * @param commandHandler the DataStore's handler for sending commands - * @param updateHandler the DataStore's handler for doing updates - * @param domainNotifier the domain notifier - * @param initialSize the initialNumber of preallocated - * <code>DataElement</code>s - * @since 3.0 replaced DomainNotifier with IDomainNotifier - */ - public DataStore(DataStoreAttributes attributes, CommandHandler commandHandler, UpdateHandler updateHandler, IDomainNotifier domainNotifier, int initialSize) - { - _dataStoreAttributes = attributes; - _commandHandler = commandHandler; - _updateHandler = updateHandler; - _domainNotifier = domainNotifier; - _isConnected = true; - _logTimes = false; - setSpiritModeOnState(); - _initialSize = _spiritModeOn && !isVirtual() ? SPIRIT_ON_INITIAL_SIZE : initialSize; - initialize(); - createRoot(); - } - - protected void setSpiritModeOnState() - { - if (isVirtual()) _spiritModeOn = true; - else - { - String doSpirit = System.getProperty("DSTORE_SPIRIT_ON"); //$NON-NLS-1$ - _spiritModeOn = (doSpirit != null && doSpirit.equals("true")); //$NON-NLS-1$ - } - } - - public void setServerVersion(int version) - { - _serverVersion = version; - } - - public void setServerMinor(int minor) - { - _serverMinor = minor; - } - - public int getServerVersion() - { - return _serverVersion; - } - - public int getServerMinor() - { - return _serverMinor; - } - - /** - * Sets the ticket for this <code>DataStore</code>. A ticket is used to prevent unauthorized users - * from accessing the <code>DataStore</code> - * - * @param ticket the <code>DataElement</code> representing the ticket - */ - public void setTicket(DataElement ticket) - { - _ticket = ticket; - } - - /** - * Sets the loaders for this <code>DataStore</code>. The loaders are used to load miners (extension tools). - * - * @param loaders the loaders for the miners this <code>DataStore</code> will be using - */ - public void setLoaders(ArrayList loaders) - { - _loaders = loaders; - } - - /** - * Adds a loader for this <code>DataStore</code>. The loader is used to load miners (extension tools). - * - * @param loader the loader for the miners this <code>DataStore</code> will be using - * @since 3.0 replaced ExternalLoader by IExternalLoader - */ - public void addLoader(IExternalLoader loader) - { - if (_loaders == null) - { - _loaders = new ArrayList(); - } - _loaders.add(loader); - } - - - - public boolean usingSSL() - { - if (_sslProperties != null) - { - return _sslProperties.usingSSL() && _sslProperties.usingServerSSL(); - } - return false; - } - /** - * Specifies the security properties of this DataStore. These properties - * indicate whether or not to use SSL, the keystore location and password. - * - * @param properties the properties to set - */ - public void setSSLProperties(ISSLProperties properties) - { - _sslProperties = properties; - } - - /* - * Returns the location for the keystore associated with the DataStore. - * The keystore is used when using SSL for remote communications. On the - * host the file typically resides in the server directory. On the client, - * the keystore location is normally customized vi <code>setKeyStoreLocation</code>. - */ - public String getKeyStoreLocation() - { - if (_sslProperties != null) - { - return _sslProperties.getServerKeyStorePath(); - } - return null; - } - - /* - * Returns the password to use when accessing the DataStore keystore. - */ - public String getKeyStorePassword() - { - if (_sslProperties != null) - { - return _sslProperties.getServerKeyStorePassword(); - } - return null; - } - - /** - * Tells the <code>DataStore</code> where to find the miners which it needs to load. - * - * @param minersLocation a string representing the location of the miners - */ - public DataElement addMinersLocation(String minersLocation) - { - if (_minersLocations == null) - { - _minersLocations = new ArrayList(); - } - if (!_minersLocations.contains(minersLocation)) - { - _minersLocations.add(minersLocation); - - if (isVirtual()) - { - DataElement location = createObject(_tempRoot, "location", minersLocation); //$NON-NLS-1$ - DataElement cmd = findCommandDescriptor(DataStoreSchema.C_ADD_MINERS);//localDescriptorQuery(_root.getDescriptor(), DataStoreSchema.C_ADD_MINERS, 1); - ArrayList args = new ArrayList(); - args.add(location); - return command(cmd, args, _dummy); - } - } - - return null; - } - - /** - * Tells the <code>DataStore</code> where to find the miners which it needs to load. - * - * @param location a <code>DataElement</code> representing the location of the miners - */ - public void addMinersLocation(DataElement location) - { - String name = location.getName(); - if (_minersLocations == null) - { - _minersLocations = new ArrayList(); - } - - if (!_minersLocations.contains(name)) - { - _minersLocations.add(name); - } - } - - /** - * Tells the <code>DataStore</code> that it is connected to it's tools - * - * @param isConnected indicates whether it is connected or not - */ - public void setConnected(boolean isConnected) - { - _isConnected = isConnected; - } - - /** - * Sets the <code>DataStore</code>'s IDomainNotifier - * - * @param domainNotifier the domainNotifier - * @since 3.0 replaced DomainNotifier by IDomainNotifier - */ - public void setDomainNotifier(IDomainNotifier domainNotifier) - { - _domainNotifier = domainNotifier; - } - - /** - * Sets the <code>DataStore</code>'s handler for doing updates - * - * @param updateHandler the handler for doing updates - */ - public void setUpdateHandler(UpdateHandler updateHandler) - { - _updateHandler = updateHandler; - } - - /** - * Sets the <code>DataStore</code>'s handler for sending commands to miners - * - * @param commandHandler the handler for sending commands to miners - */ - public void setCommandHandler(CommandHandler commandHandler) - { - _commandHandler = commandHandler; - } - - /** - * Set the compatibility handler for the client. This is used when potential - * compatibility problems are run into - i.e. localDescriptorQuery fails - * - * @param handler the compatibilityHandler to use - * @since 3.0 - */ - public void setCompatibilityHandler(IDataStoreCompatibilityHandler handler){ - _compatibilityHandler = handler; - } - - /** - * Get the compatibility handler for the client. This is used when potential - * compatibility problems are run into - i.e. localDescriptorQuery fails - * - * @return the compatibilityHandler - * @since 3.0 - */ - public IDataStoreCompatibilityHandler getCompatibilityHandler(){ - if (_compatibilityHandler == null){ - _compatibilityHandler = new DefaultDataStoreCompatibilityHandler(this); - } - return _compatibilityHandler; - } - - - /** - * Sets the time the update handler sleeps in between update requests - * - * @param time interval to wait - */ - public void setUpdateWaitTime(int time) - { - _updateHandler.setWaitTime(time); - } - - /** - * Sets the time the command handler sleeps in between command requests - * - * @param time interval to wait - */ - public void setCommandWaitTime(int time) - { - _commandHandler.setWaitTime(time); - } - - /** - * Sets the maximum amount of time that the <code>DataStore</code> will wait to receive a response - * for a synchronous command - * - * @param time interval to wait - */ - public void setTimeoutValue(int time) - { - _timeout = time; - } - - public int getTimeoutValue() - { - return _timeout; - } - - /** - * Gets the time the server may remain idle before shutting down - * - * @return the idle time before shutdown - * @since 3.0 - */ - public int getServerIdleShutdownTimeout() - { - return _serverIdleShutdownTimeout; - } - - /** - * Sets an attribute of the <code>DataStore</code> - * - * @param attribute index of the attribute to set - * @param value value to set the attribute at the give index - */ - public void setAttribute(int attribute, String value) - { - _dataStoreAttributes.setAttribute(attribute, value); - } - - /** - * Tells the <code>DataStore</code> to log durations of commands - * - * @param flag whether to log times or not - */ - public void setLogTimes(boolean flag) - { - _logTimes = flag; - } - - /** - * Indicates whether this <code>DataStore</code> is virtual or not. A virtual <code>DataStore</code> - * is one that does not have it's own tools, but rather communicates with a non-virtual - * <code>DataStore</code> that does. - * - * @return whether the <code>DataStore</code> is virtual or not - */ - public boolean isVirtual() - { - if (_commandHandler == null) - { - return true; - } - else if (_commandHandler instanceof org.eclipse.dstore.internal.core.client.ClientCommandHandler) - { - return true; - } - else - { - return false; - } - } - - /** - * Indicates whether this <code>DataStore</code> is connected to it's miners or another <code>DataStore</code> - * - * @return whether the <code>DataStore</code> is connected or not - */ - public boolean isConnected() - { - return _isConnected; - } - - /** - * Indicates whether this <code>DataStore</code> logs the durations of commands - * - * @return whether the <code>DataStore</code> logs command times or not - */ - public boolean logTimes() - { - return _logTimes; - } - - /** - * Returns the <code>DataStore</code>'s ticket - * - * @return the ticket - */ - public DataElement getTicket() - { - return _ticket; - } - - /** - * Returns the time the update handler waits between requests - * - * @return wait time - */ - public int getUpdateWaitTime() - { - return _updateHandler.getWaitTime(); - } - - /** - * Returns the time the command handler waits between requests - * - * @return wait time - */ - public int getCommandWaitTime() - { - return _commandHandler.getWaitTime(); - } - - - - - - /** - * Returns the name of the <code>DataStore</code> - * - * @return the name of the <code>DataStore</code> - */ - public String getName() - { - return getAttribute(DataStoreAttributes.A_HOST_NAME); - } - - /** - * Returns the root <code>DataElement</code> in the <code>DataStore</code>. - * The root <code>DataElement</code> has no parent and contains every <code>DataElement</code> - * in the <code>DataStore</code> through a <code>DataElement</code> tree - * - * @return the root <code>DataElement</code> - */ - public DataElement getRoot() - { - return _root; - } - - public DataElement getDummy() - { - return _dummy; - } - - /** - * Returns the host root <code>DataElement</code> in the <code>DataStore</code>. - * The host root <code>DataElement</code> is a child of root and references - * <code>DataElement</code>s in the <code>DataStore</code> that are related to host information - * - * @return the host root <code>DataElement</code> - */ - public DataElement getHostRoot() - { - return _hostRoot; - } - - public DataElement getExternalRoot() - { - return _externalRoot; - } - - /** - * Returns the miner root <code>DataElement</code> in the <code>DataStore</code>. - * The miner root <code>DataElement</code> is a child of root and contains - * <code>DataElement</code>s the represent tools and the information that tools possess - * - * @return the miner root <code>DataElement</code> - */ - public DataElement getMinerRoot() - { - return _minerRoot; - } - - /** - * Returns the status of the <code>DataStore</code>. - * - * @return the status of the <code>DataStore</code> - */ - public DataElement getStatus() - { - return _status; - } - - /** - * Returns the log root <code>DataElement</code> of the <code>DataStore</code>. - * The log root contains all commands that are issued from the <code>DataStore</code> - * - * @return the log root - */ - public DataElement getLogRoot() - { - return _logRoot; - } - - /** - * Returns the descriptor root <code>DataElement</code> of the <code>DataStore</code>. - * The descriptor root contains the schema for the <code>DataStore</code> and it's tools - * - * @return the descriptor root - */ - public DataElement getDescriptorRoot() - { - return _descriptorRoot; - } - - /** - * Returns the temp root <code>DataElement</code> of the <code>DataStore</code>. - * The temp root contains temporary information. - * - * @return the temp root - */ - public DataElement getTempRoot() - { - return _tempRoot; - } - - /** - * Returns the handler for sending commands. - * - * @return the command handler - */ - public CommandHandler getCommandHandler() - { - return _commandHandler; - } - - /** - * Returns the handler for doing updates. - * - * @return the update handler - */ - public UpdateHandler getUpdateHandler() - { - return _updateHandler; - } - - /** - * Returns the loader that is used for loading miners. - * - * @return the loader - */ - public ArrayList getLoaders() - { - return _loaders; - } - - /** - * Returns registered local classloaders. - */ - public ArrayList getLocalClassLoaders() - { - return _localClassLoaders; - } - - /** - * Registers a local class loader. On the client, each subsystem - * must register its local class loader using this method so that - * if the subsystem's classes cannot be found on the server, they can - * be requested from the client, loaded using <code>loader</code>, - * transferred to the server, and then loaded on the server. - */ - public void registerLocalClassLoader(ClassLoader loader) - { - if (_localClassLoaders == null) - { - _localClassLoaders = new ArrayList(); - } - if (!_localClassLoaders.contains(loader)) _localClassLoaders.add(loader); - } - - public DataElement getContentsRelation() - { - return _dataStoreSchema.getContentsRelation(); - } - - public DataElement getAttributesRelation() - { - return _dataStoreSchema.getAttributesRelation(); - } - - public DataElement getAbstractedByRelation() - { - return _dataStoreSchema.getAbstractedByRelation(); - } - - public DataElement getAbstractsRelation() - { - return _dataStoreSchema.getAbstractsRelation(); - } - - /** - * Returns the location of the miners. - * - * @return the location of the miners - */ - public ArrayList getMinersLocation() - { - return _minersLocations; - } - - /** - * Returns the domain notifier. - * - * @return the domain notifier - * @since 3.0 replaced DomainNotifier by IDomainNotifier - */ - public IDomainNotifier getDomainNotifier() - { - return _domainNotifier; - } - - /** - * Returns the attribute indicated by an index. - * - * @param attribute the index of the attribute to get - * @return the attribute - */ - public String getAttribute(int attribute) - { - return _dataStoreAttributes.getAttribute(attribute); - } - - /** - * Returns the number of live elements in the <code>DataStore</code>. - * - * @return the number of live elements - */ - public int getNumElements() - { - return _hashMap.size(); - } - - /** - * Returns the number of recycled elements in the <code>DataStore</code>. - * - * @return the number of recycled elements - */ - public int getNumRecycled() - { - return _recycled.size(); - } - /** - * Returns the table of live elements in the <code>DataStore</code>. - * - * @return the table of live elements - */ - public HashMap getHashMap() - { - return _hashMap; - } - - /** - * Initializes the <code>DataStore</code> by creating the root elements - * - */ - public void createRoot() - { - _root = - createObject( - null, - DataStoreResources.model_root, - _dataStoreAttributes.getAttribute(DataStoreAttributes.A_ROOT_NAME), - _dataStoreAttributes.getAttribute(DataStoreAttributes.A_ROOT_PATH), - "rootID"); //$NON-NLS-1$ - - - _descriptorRoot = createObject(_root, DE.T_OBJECT_DESCRIPTOR, DataStoreResources.model_descriptors, "", "schemaID"); //$NON-NLS-1$ //$NON-NLS-2$ - - _ticket = createObject(_root, DataStoreResources.model_ticket, "null", "", "ticketID"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - - createRoots(); - initializeDescriptors(); - } - - /** - * Creates a contents relationship between two <code>DataElement</code>s - * - * @param from the element that contains the other - * @param to the element that is contained by the other - * @return the new reference - */ - public DataElement createReference(DataElement from, DataElement to) - { - // default reference is a containment relationship - return createReference(from, to, getContentsRelation()); - } - - /** - * Creates a relationship between two <code>DataElement</code>s given a type of relationship - * - * @param parent the element that references the other element - * @param realObject the element that is referenced by the parent element - * @param relationType the descriptor element that represents the type of relationship between parent and realObject - * @return the new reference - */ - public DataElement createReference(DataElement parent, DataElement realObject, DataElement relationType) - { - if (parent != null) - { - - // reference with a specified type of relationship - DataElement reference = createElement(); - - reference.reInit(parent, realObject, relationType); - parent.addNestedData(reference, false); - - String sugId = reference.getId(); - _hashMap.put(sugId, reference); - - refresh(parent); - - return reference; - } - else - { - return null; - } - } - - /** - * Creates a relationship between two <code>DataElement</code>s given a type of relationship - * - * @param parent the element that references the other element - * @param realObject the element that is referenced by the parent element - * @param relationType the string that represents the type of relationship between parent and realObject - * @return the new reference - */ - public DataElement createReference(DataElement parent, DataElement realObject, String relationType) - { - return createReference(parent, realObject, relationType, true); - } - - /** - * Creates a relationship between two <code>DataElement</code>s given a type of relationship - * - * @param parent the element that references the other element - * @param realObject the element that is referenced by the parent element - * @param relationType the string that represents the type of relationship between parent and realObject - * @param doRefresh indicates whether or not to refresh the parent of the new reference - * @return the new reference - */ - public DataElement createReference(DataElement parent, DataElement realObject, String relationType, boolean doRefresh) - { - if (parent != null) - { - // reference with a specified type of relationship - DataElement reference = createElement(); - - DataElement toDescriptor = findDescriptor(DE.T_RELATION_DESCRIPTOR, relationType); - if (toDescriptor != null) - { - reference.reInit(parent, realObject, toDescriptor); - } - else - { - reference.reInit(parent, realObject, relationType); - } - - parent.addNestedData(reference, false); - - String sugId = reference.getId(); - _hashMap.put(sugId, reference); - - if (doRefresh) - { - refresh(parent); - } - - return reference; - } - return null; - } - - /** - * Creates a set of relationships between one <code>DataElement</code> and a set of <code>DataElement</code>s given a type of relationship - * - * @param from the element that references the other elements - * @param to a list of elements that from references - * @param type the string that represents the type of relationships between from and to - */ - public void createReferences(DataElement from, ArrayList to, String type) - { - DataElement toDescriptor = findDescriptor(DE.T_RELATION_DESCRIPTOR, type); - if (toDescriptor != null) - { - createReferences(from, to, toDescriptor); - } - else - { - for (int i = 0; i < to.size(); i++) - { - DataElement toObject = (DataElement) to.get(i); - createReference(from, toObject, type); - } - } - } - - /** - * Creates a set of relationships between one <code>DataElement</code> and a set of <code>DataElement</code>s given a type of relationship - * - * @param from the element that references the other elements - * @param to a list of elements that from references - * @param type the descriptor element that represents the type of relationships between from and to - */ - public void createReferences(DataElement from, ArrayList to, DataElement type) - { - for (int i = 0; i < to.size(); i++) - { - DataElement toObject = (DataElement) to.get(i); - createReference(from, toObject, type); - } - } - - /** - * Creates a two-way relationship between two elements - * - * @param parent an element that references the other element - * @param realObject an element that references the other element - * @param toRelation the descriptor element that represents the type of relationship between parent and realObject - * @param fromRelation the descriptor element that represents the type of relationship between realObject and parent - * @return the new reference - */ - public DataElement createReference(DataElement parent, DataElement realObject, DataElement toRelation, DataElement fromRelation) - { - if (parent != null) - { - // reference with "to" relationship - DataElement toReference = createElement(); - 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); - - - return toReference; - } - return null; - } - - /** - * Creates a two-way relationship between two elements - * - * @param parent an element that references the other element - * @param realObject an element that references the other element - * @param toRelation the string that represents the type of relationship between parent and realObject - * @param fromRelation the string that represents the type of relationship between realObject and parent - * @return the new reference - */ - public DataElement createReference(DataElement parent, DataElement realObject, String toRelation, String fromRelation) - { - if (parent != null) - { - // reference with "to" relationship - DataElement toReference = createElement(); - DataElement toDescriptor = findDescriptor(DE.T_RELATION_DESCRIPTOR, toRelation); - if (toDescriptor != null) - { - toReference.reInit(parent, realObject, toDescriptor); - } - else - { - toReference.reInit(parent, realObject, toRelation); - } - - parent.addNestedData(toReference, false); - - String toId = toReference.getId(); - _hashMap.put(toId, toReference); - - // reference with "from" relationship - DataElement fromReference = createElement(); - - DataElement fromDescriptor = findDescriptor(DE.T_RELATION_DESCRIPTOR, fromRelation); - if (fromDescriptor != null) - { - fromReference.reInit(realObject, parent, fromDescriptor); - } - else - { - fromReference.reInit(realObject, parent, fromRelation); - } - - realObject.addNestedData(fromReference, false); - - String fromId = fromReference.getId(); - _hashMap.put(fromId, fromReference); - - refresh(parent); - - - return toReference; - } - return null; - } - - /** - * Creates a set of two-way relationship between a <code>DataElement</code> and a list of elements - * - * @param from an element that references the other elements - * @param to a list of elements that reference from - * @param toRel the descriptor element that represents the type of relationship between from and to - * @param fromRel the descriptor element that represents the type of relationship between to and from - */ - public void createReferences(DataElement from, ArrayList to, DataElement toRel, DataElement fromRel) - { - for (int i = 0; i < to.size(); i++) - { - DataElement toObject = (DataElement) to.get(i); - createReference(from, toObject, toRel, fromRel); - } - } - - /** - * Creates a set of two-way relationship between a DataElement and a list of elements - * - * @param from an element that references the other elements - * @param to a list of elements that reference from - * @param toRel the string that represents the type of relationship between from and to - * @param fromRel the string that represents the type of relationship between to and from - */ - public void createReferences(DataElement from, ArrayList to, String toRel, String fromRel) - { - DataElement toDescriptor = findDescriptor(DE.T_RELATION_DESCRIPTOR, toRel); - DataElement fromDescriptor = findDescriptor(DE.T_RELATION_DESCRIPTOR, fromRel); - - if ((toDescriptor != null) && (fromDescriptor != null)) - { - createReferences(from, to, toDescriptor, fromDescriptor); - } - else - { - for (int i = 0; i < to.size(); i++) - { - DataElement toObject = (DataElement) to.get(i); - createReference(from, toObject, toRel, fromRel); - } - } - } - - public DataElement createTransientObject(String attributes[]) - { - DataElement newObject = createElement(); - - newObject.reInitAsTransient(attributes); - return newObject; - } - - /** - * Creates a new <code>DataElement</code> - * - * @param parent the parent of the new element - * @param type the descriptor representing the type of the new element - * @param name the name of the new element - * @return the new element - */ - public DataElement createObject(DataElement parent, DataElement type, String name) - { - return createObject(parent, type, name, ""); //$NON-NLS-1$ - } - - /** - * Creates a new <code>DataElement</code> - * - * @param parent the parent of the new element - * @param type the string representing the type of the new element - * @param name the name of the new element - * @return the new element - */ - public DataElement createObject(DataElement parent, String type, String name) - { - return createObject(parent, type, name, ""); //$NON-NLS-1$ - } - - /** - * Creates a new <code>DataElement</code> - * - * @param parent the parent of the new element - * @param type the descriptor element representing the type of the new element - * @param name the name of the new element - * @param source the source location of the new element - * @return the new element - */ - public DataElement createObject(DataElement parent, DataElement type, String name, String source) - { - String id = generateId(); - return createObject(parent, type, name, source, id); - } - - /** - * Creates a new <code>DataElement</code> - * - * @param parent the parent of the new element - * @param type the string representing the type of the new element - * @param name the name of the new element - * @param source the source location of the new element - * @return the new element - */ - public DataElement createObject(DataElement parent, String type, String name, String source) - { - String id = generateId(parent, type, name); - if (id == null) - { - return null; - } - - return createObject(parent, type, name, source, id); - } - - /** - * Creates a new <code>DataElement</code> - * - * @param parent the parent of the new element - * @param type the descriptor element representing the type of the new element - * @param name the name of the new element - * @param source the source location of the new element - * @param sugId the suggested ID for the new element - * @return the new element - */ - public DataElement createObject(DataElement parent, DataElement type, String name, String source, String sugId) - { - return createObject(parent, type, name, source, sugId, false); - } - - /** - * Creates a new <code>DataElement</code> - * - * @param parent the parent of the new element - * @param type the string representing the type of the new element - * @param name the name of the new element - * @param source the source location of the new element - * @param sugId the suggested ID for the new element - * @return the new element - */ - public DataElement createObject(DataElement parent, String type, String name, String source, String sugId) - { - return createObject(parent, type, name, source, sugId, false); - } - - /** - * Creates a new <code>DataElement</code> - * - * @param parent the parent of the new element - * @param type the descriptor element representing the type of the new element - * @param name the name of the new element - * @param source the source location of the new element - * @param sugId the suggested ID for the new element - * @param isReference an indication whether the new element is a reference - * @return the new element - */ - public DataElement createObject(DataElement parent, DataElement type, String name, String source, String sugId, boolean isReference) - { - String id = makeIdUnique(sugId); - - DataElement newObject = createElement(); - if (parent == null) - { - parent = _tempRoot; - } - - newObject.reInit(parent, type, id, name, source, isReference); - - if (parent != null) - { - parent.addNestedData(newObject, false); - } - - synchronized (_hashMap) - { - _hashMap.put(id, newObject); - } - - if (_autoRefresh) - refresh(parent); - return newObject; - } - - /** - * Creates a new <code>DataElement</code> - * - * @param parent the parent of the new element - * @param type the string representing the type of the new element - * @param name the name of the new element - * @param source the source location of the new element - * @param sugId the suggested ID for the new element - * @param isReference an indication whether the new element is a reference - * @return the new element - */ - public DataElement createObject(DataElement parent, String type, String name, String source, String sugId, boolean isReference) - { - String id = makeIdUnique(sugId); - - DataElement newObject = createElement(); - if (parent == null) - { - parent = _tempRoot; - } - - - DataElement descriptor = findDescriptor(DE.T_OBJECT_DESCRIPTOR, type); - if (descriptor != null && (parent != _descriptorRoot)) - { - newObject.reInit(parent, descriptor, id, name, source, isReference); - } - else - { - newObject.reInit(parent, type, id, name, source, isReference); - } - - if (parent != null) - { - parent.addNestedData(newObject, false); - } - - synchronized(_hashMap) - { - _hashMap.put(id, newObject); - } - - if (_autoRefresh) - refresh(parent); - return newObject; - } - - /** - * Creates a new <code>DataElement</code>. This is normally called on client side via xml parser - * - * @param parent the parent of the new element - * @param attributes the attributes to use in this new element - * @return the new element - */ - public DataElement createObject(DataElement parent, String attributes[]) - { - DataElement newObject = createElement(); - - if (parent == null) - { - parent = _tempRoot; - } - - DataElement descriptor = findObjectDescriptor(attributes[DE.A_TYPE]); - - if (descriptor != null && (parent != _descriptorRoot)) - { - newObject.reInit(parent, descriptor, attributes); - } - else - { - newObject.reInit(parent, attributes); - } - - if (parent != null) - { - parent.addNestedData(newObject, false); - } - - // cache descriptors in map for faster access - if (descriptor == _dataStoreSchema.getObjectDescriptor() || descriptor == _dataStoreSchema.getAbstractObjectDescriptor()) - { - _objDescriptorMap.put(attributes[DE.A_NAME], newObject); - } - else if (descriptor == _dataStoreSchema.getCommandDescriptor() || descriptor == _dataStoreSchema.getAbstractCommandDescriptor()) - { - _cmdDescriptorMap.put(attributes[DE.A_NAME], newObject); - } - else if (descriptor == _dataStoreSchema.getRelationDescriptor() || descriptor == _dataStoreSchema.getAbstractRelationDescriptor()) - { - _relDescriptorMap.put(attributes[DE.A_NAME], newObject); - } - - synchronized (_hashMap) - { - _hashMap.put(attributes[DE.A_ID], newObject); - } - return newObject; - } - - /** - * Creates a new abstract object descriptor <code>DataElement</code> - * - * @param parent the parent of the new element - * @param name the name of the new element - * @return the new descriptor element - */ - public DataElement createAbstractObjectDescriptor(DataElement parent, String name) - { - DataElement descriptor = createObject(parent, DE.T_ABSTRACT_OBJECT_DESCRIPTOR, name, "org.eclipse.rse.dstore.core", name); //$NON-NLS-1$ - _objDescriptorMap.put(name, descriptor); - return descriptor; - } - - /** - * Creates a new abstract object descriptor <code>DataElement</code> - * - * @param parent the parent of the new element - * @param name the name of the new element - * @param source the source location of the new element - * @return the new descriptor element - */ - public DataElement createAbstractObjectDescriptor(DataElement parent, String name, String source) - { - DataElement descriptor = createObject(parent, DE.T_ABSTRACT_OBJECT_DESCRIPTOR, name, source, name); - _objDescriptorMap.put(name, descriptor); - return descriptor; - } - - /** - * Creates a new object descriptor <code>DataElement</code> - * - * @param parent the parent of the new element - * @param name the name of the new element - * @return the new descriptor element - */ - public DataElement createObjectDescriptor(DataElement parent, String name) - { - DataElement parentDescriptor = _dataStoreSchema.getObjectDescriptor(); - DataElement descriptor = null; - if (parentDescriptor != null) - { - descriptor = createObject(parent, parentDescriptor, name, "org.eclipse.rse.dstore.core", name); //$NON-NLS-1$ - } - else - { - descriptor = createObject(parent, DE.T_OBJECT_DESCRIPTOR, name, "org.eclipse.rse.dstore.core", name); //$NON-NLS-1$ - } - _objDescriptorMap.put(name, descriptor); - return descriptor; - } - - /** - * Creates a new object descriptor <code>DataElement</code> - * - * @param parent the parent of the new element - * @param name the name of the new element - * @param source the name of the new element - * @return the new descriptor element - */ - public DataElement createObjectDescriptor(DataElement parent, String name, String source) - { - DataElement parentDescriptor = _dataStoreSchema.getObjectDescriptor(); - DataElement descriptor = null; - if (parentDescriptor != null) - { - descriptor = createObject(parent, parentDescriptor, name, source, name); - } - else - { - descriptor = createObject(parent, DE.T_OBJECT_DESCRIPTOR, name, source, name); - } - _objDescriptorMap.put(name, descriptor); - return descriptor; - } - - /** - * Creates a new abstract relation descriptor <code>DataElement</code> - * - * @param parent the parent of the new element - * @param name the name of the new element - * @return the new descriptor element - */ - public DataElement createAbstractRelationDescriptor(DataElement parent, String name) - { - DataElement descriptor = createObject(parent, DE.T_ABSTRACT_RELATION_DESCRIPTOR, name, "org.eclipse.rse.dstore.core", name); //$NON-NLS-1$ - _relDescriptorMap.put(name, descriptor); - return descriptor; - } - - /** - * Creates a new abstract relation descriptor <code>DataElement</code> - * - * @param parent the parent of the new element - * @param name the name of the new element - * @param source the source location of the new element - * @return the new descriptor element - */ - public DataElement createAbstractRelationDescriptor(DataElement parent, String name, String source) - { - DataElement descriptor = createObject(parent, DE.T_ABSTRACT_RELATION_DESCRIPTOR, name, source, name); - _relDescriptorMap.put(name, descriptor); - return descriptor; - } - - /** - * Creates a new relation descriptor <code>DataElement</code> - * - * @param parent the parent of the new element - * @param name the name of the new element - * @return the new descriptor element - */ - public DataElement createRelationDescriptor(DataElement parent, String name) - { - DataElement descriptor = createObject(parent, DE.T_RELATION_DESCRIPTOR, name, "org.eclipse.rse.dstore.core", name); //$NON-NLS-1$ - _relDescriptorMap.put(name, descriptor); - return descriptor; - } - - /** - * Creates a new relation descriptor <code>DataElement</code> - * - * @param parent the parent of the new element - * @param name the name of the new element - * @param source the source location of the new element - * @return the new descriptor element - */ - public DataElement createRelationDescriptor(DataElement parent, String name, String source) - { - DataElement descriptor = createObject(parent, DE.T_RELATION_DESCRIPTOR, name, source, name); - _relDescriptorMap.put(name, descriptor); - return descriptor; - } - - /** - * Creates a new abstract command descriptor <code>DataElement</code> - * - * @param parent the parent of the new element - * @param name the name of the new element - * @return the new descriptor element - */ - public DataElement createAbstractCommandDescriptor(DataElement parent, String name) - { - DataElement descriptor = createAbstractCommandDescriptor(parent, name, name); - _cmdDescriptorMap.put(name, descriptor); - return descriptor; - } - - /** - * Creates a new abstract command descriptor <code>DataElement</code> - * - * @param parent the parent of the new element - * @param name the name of the new element - * @param value the value used to identify the command - * @return the new descriptor element - */ - public DataElement createAbstractCommandDescriptor(DataElement parent, String name, String value) - { - DataElement cmd = createObject(parent, DE.T_ABSTRACT_COMMAND_DESCRIPTOR, name, "org.eclipse.rse.dstore.core", name); //$NON-NLS-1$ - cmd.setAttribute(DE.A_VALUE, value); - _cmdDescriptorMap.put(value, cmd); - return cmd; - } - - /** - * Creates a new abstract command descriptor <code>DataElement</code> - * - * @param parent the parent of the new element - * @param name the name of the new element - * @param source the source location of the new element - * @param value the value used to identify the command - * @return the new descriptor element - */ - public DataElement createAbstractCommandDescriptor(DataElement parent, String name, String source, String value) - { - DataElement cmd = createObject(parent, DE.T_ABSTRACT_COMMAND_DESCRIPTOR, name, source, name); - cmd.setAttribute(DE.A_VALUE, value); - _cmdDescriptorMap.put(value, cmd); - return cmd; - } - - /** - * Creates a new command descriptor <code>DataElement</code> - * - * @param parent the parent of the new element - * @param name the name of the new element - * @return the new descriptor element - */ - public DataElement createCommandDescriptor(DataElement parent, String name) - { - DataElement descriptor = createCommandDescriptor(parent, name, name); - _cmdDescriptorMap.put(name, descriptor); - return descriptor; - } - - /** - * Creates a new command descriptor <code>DataElement</code> - * - * @param parent the parent of the new element - * @param name the name of the new element - * @param value the value used to identify the command - * @return the new descriptor element - */ - public DataElement createCommandDescriptor(DataElement parent, String name, String value) - { - DataElement parentDescriptor = _dataStoreSchema.getCommandDescriptor(); - DataElement cmd = null; - if (parentDescriptor != null) - { - cmd = createObject(parent, parentDescriptor, name, "org.eclipse.rse.dstore.core", name); //$NON-NLS-1$ - } - else - { - cmd = createObject(parent, DE.T_COMMAND_DESCRIPTOR, name, "org.eclipse.rse.dstore.core", name); //$NON-NLS-1$ - } - cmd.setAttribute(DE.A_VALUE, value); - _cmdDescriptorMap.put(value, cmd); - return cmd; - } - - /** - * Creates a new command descriptor <code>DataElement</code> - * - * @param parent the parent of the new element - * @param name the name of the new element - * @param source the source location of the new element - * @param value the value used to identify the command - * @return the new descriptor element - */ - public DataElement createCommandDescriptor(DataElement parent, String name, String source, String value) - { - DataElement parentDescriptor = _dataStoreSchema.getCommandDescriptor(); - DataElement cmd = null; - if (parentDescriptor != null) - { - cmd = createObject(parent, parentDescriptor, name, source, name); - } - else - { - cmd = createObject(parent, DE.T_COMMAND_DESCRIPTOR, name, source, name); - } - cmd.setAttribute(DE.A_VALUE, value); - _cmdDescriptorMap.put(value, cmd); - return cmd; - } - - /** - * Creates a new command descriptor <code>DataElement</code> - * - * @param parent the parent of the new element - * @param name the name of the new element - * @param source the source location of the new element - * @param value the value used to identify the command - * @param visible indicates whether the command is visible or not - * @return the new descriptor element - */ - public DataElement createCommandDescriptor(DataElement parent, String name, String source, String value, boolean visible) - { - DataElement parentDescriptor = _dataStoreSchema.getCommandDescriptor(); - DataElement cmd = null; - if (parentDescriptor != null) - { - cmd = createObject(parent, parentDescriptor, name, source, name); - } - else - { - cmd = createObject(parent, DE.T_COMMAND_DESCRIPTOR, name, source, name); - } - cmd.setAttribute(DE.A_VALUE, value); - if (!visible) - { - cmd.setDepth(0); - } - _cmdDescriptorMap.put(value, cmd); - - return cmd; - } - - /** - * Moves a element from one location in the <code>DataStore</code> tree to another - * - * @param source the element to move - * @param target the element to move source to - */ - public void moveObject(DataElement source, DataElement target) - { - DataElement oldParent = source.getParent(); - List nested = oldParent.getNestedData(); - if (nested != null) - { - nested.remove(source); - } - refresh(oldParent, true); - - target.addNestedData(source, false); - source.setParent(target); - refresh(target, true); - } - - /** - * Deletes all the elements contained in from - * - * @param from the element from which to delete objects from - */ - public void deleteObjects(DataElement from) - { - if (from != null) - { - for (int i = from.getNestedSize() - 1; i >= 0; i--) - { - DataElement deletee = from.get(i); - if (deletee != null) - { - deleteObjectHelper(from, deletee, 5); - } - } - - // refresh(from); - } - } - - /** - * Disconnect all the elements contained in from - * - * @param from the element from which to disconnect objects - */ - public void disconnectObjects(DataElement from) - { - if (!isDoSpirit()) - { - return; - } - if (from != null) - { - for (int i = from.getNestedSize() - 1; i >= 0; i--) - { - DataElement disconnectee = from.get(i); - if (disconnectee != null) - { - disconnectObjectHelper(disconnectee, 5); - } - } - - // refresh(from); - } - } - - /** - * Deletes an element from another element - * - * @param from the element from which to delete an object from - * @param toDelete the element to remove - */ - public void deleteObject(DataElement from, DataElement toDelete) - { - if (toDelete != null) - { - deleteObjectHelper(from, toDelete, 5); - // refresh(toDelete); - // refresh(from); - } - } - - /** - * Disconnects an element and makes it a "spirit" - * - * @param toDisconnect the element to disconnect - */ - public void disconnectObject(DataElement toDisconnect) - { - if (!isDoSpirit()) return; - if (toDisconnect != null) - { - disconnectObjectHelper(toDisconnect, 5); - // refresh(toDisconnect); - // refresh(from); - } - } - - /** - * Replaces a deleted object - */ - public DataElement replaceDeleted(DataElement deletedObject) - { - if (deletedObject != null) - { - synchronized (deletedObject) - { - String name = deletedObject.getName(); - String type = deletedObject.getType(); - - // find undeleted ancestor - DataElement parent = deletedObject.getParent(); - if ((parent != null) && parent.isDeleted()) - { - parent = replaceDeleted(parent); - } - if ((parent != null) && !parent.isDeleted()) - { - for (int i = 0; i < parent.getNestedSize(); i++) - { - DataElement child = parent.get(i); - if (!child.isDeleted()) - { - if (child.getName().equals(name) && child.getType().equals(type)) - { - return child; - } - } - } - } - } - } - - return null; - } - - /** - * Checks if a <code>DataElement</code> with a given ID exists in the <code>DataStore</code> - * - * @param id the id to look for - * @return whether it exists or not - */ - public boolean contains(String id) - { - return _hashMap.containsKey(id); - } - - /** - * Refresh a set of <code>DataElement</code>s - * - * @param elements a list of elements to refresh - */ - public void refresh(ArrayList elements) - { - // this gets called in response to a query - for (int i = 0; i < elements.size(); i++) - { - refresh((DataElement) elements.get(i)); - } - } - - /** - * Refresh a <code>DataElement</code> - * - * @param element an element to refresh - */ - public void refresh(DataElement element) - { - if (element != null) - { - if (element.isReference()) - { - refresh(element.dereference(), false); - } - refresh(element, false); - } - } - - /** - * Refresh a <code>DataElement</code> - immediately if indicated - * - * @param element an element to refresh - * @param immediate indicates to do the refresh immediately - */ - public void refresh(DataElement element, boolean immediate) - { - if ((_updateHandler != null) && (element != null)) - { - //element = findLastUpdatedAncestor(element, 5); - - // update either client or ui - //element.setUpdated(false); - _updateHandler.update(element, immediate); - } - } - - /** - * Refresh a <code>DataElement</code> and its children to a certain depth - immediately if indicated - * - * @param element an element to refresh - * @param depth The depth to refresh the elements descendants. A depth of 0 means only the element itself - * is refreshed; 1 means the element and its children are refreshed, 2 - it, its children, and its grandchildren, - * etc. - * @param immediate indicates to do the refresh immediately. If true, the update handler will send updates - * for each refreshed element in the subtree of depth <code>depth</code> below the element. - */ - public void refresh(DataElement element, int depth, boolean immediate) - { - if (depth < 0) return; - - if (depth == 0) refresh(element, immediate); - - if (depth > 0) - { - if (element.getNestedSize() > 0) - { - List children = element.getNestedData(); - for (int i = 0; i < children.size(); i++) - { - refresh((DataElement)children.get(i), depth-1, immediate); - } - } - refresh(element, immediate); - } - } - - public void update(ArrayList objects) - { - // this gets called in response to a query - for (int i = 0; i < objects.size(); i++) - { - update((DataElement) objects.get(i)); - } - } - - public void update(DataElement dataElement) - { - refresh(dataElement); - } - - public void updateRemoteClassInstance(IRemoteClassInstance instance, String byteStreamHandlerId) - { - getUpdateHandler().updateClassInstance(instance, byteStreamHandlerId); - } - - /** - * Transfers a file from a server to a client. This should only be called from - * a miner on a different machine from the client. If a file exists on the client - * side that the server file maps to then the existing client file will be replaced. - * - * @param remotePath the path of the file on the client side - * @param bytes an array of bytes representing a file - * @param size the number of bytes to transfer - * @param binary indicates whether to send the bytes as binary or text - */ - public void updateFile(String remotePath, byte[] bytes, int size, boolean binary) - { - updateFile(remotePath, bytes, size, binary, DataStoreResources.DEFAULT_BYTESTREAMHANDLER); - } - - /** - * Transfers a file from a server to a client. This should only be called from - * a miner on a different machine from the client. If a file exists on the client - * side that the server file maps to then the existing client file will be replaced. - * - * @param remotePath the path of the file on the client side - * @param bytes an array of bytes representing a file - * @param size the number of bytes to transfer - * @param binary indicates whether to send the bytes as binary or text - * @param byteStreamHandlerId indicates the client byte stream handler to receive the bytes - */ - public void updateFile(String remotePath, byte[] bytes, int size, boolean binary, String byteStreamHandlerId) - { - remotePath = new String(remotePath.replace('\\', '/')); - String fileName = mapToLocalPath(remotePath); - if (fileName != null) - { - _updateHandler.updateFile(remotePath, bytes, size, binary, byteStreamHandlerId); - } - } - - /** - * Transfers and appends a file from a server to a client. This should only be called from - * a miner on a different machine from the client. If a file exists on the client - * side that the server file maps to then the existing client file will be appended to - * - * @param remotePath the path of the file on the client side - * @param bytes an array of bytes representing a file - * @param size the number of bytes to transfer - * @param binary indicates whether to send the bytes as binary or text - */ - public void updateAppendFile(String remotePath, byte[] bytes, int size, boolean binary) - { - updateAppendFile(remotePath, bytes, size, binary, DataStoreResources.DEFAULT_BYTESTREAMHANDLER); - } - - /** - * Transfers and appends a file from a server to a client. This should only be called from - * a miner on a different machine from the client. If a file exists on the client - * side that the server file maps to then the existing client file will be appended to - * - * @param remotePath the path of the file on the client side - * @param bytes an array of bytes representing a file - * @param size the number of bytes to transfer - * @param binary indicates whether to send the bytes as binary or text - * @param byteStreamHandlerId indicates the client byte stream handler to receive the bytes - */ - public void updateAppendFile(String remotePath, byte[] bytes, int size, boolean binary, String byteStreamHandlerId) - { - remotePath = new String(remotePath.replace('\\', '/')); - String fileName = mapToLocalPath(remotePath); - if (fileName != null) - { - _updateHandler.updateAppendFile(remotePath, bytes, size, binary, byteStreamHandlerId); - } - } - - - - /** - * Transfers a file from a client to a server. The should only be called from - * a client on a different machine from the server. If a file exists on the server - * side that the client file maps to then the existing server file will be replaced. - * - * @param remotePath the path of the file on the server side - * @param bytes an array of bytes representing a file - * @param size the number of bytes to transfer - * @param binary indicates whether to send the bytes as binary or text - * @param byteStreamHandlerId indicates which byteStreamHandler to use to receive the bytes - */ - public void replaceFile(String remotePath, byte[] bytes, int size, boolean binary, String byteStreamHandlerId) - { - remotePath = new String(remotePath.replace('\\', '/')); - - _commandHandler.sendFile(remotePath, bytes, size, binary, byteStreamHandlerId); - } - - - /** - * Transfers a file from a client to a server. The should only be called from - * a client on a different machine from the server. If a file exists on the server - * side that the client file maps to then the existing server file will be replaced. - * - * @param remotePath the path of the file on the server side - * @param bytes an array of bytes representing a file - * @param size the number of bytes to transfer - * @param binary indicates whether to send the bytes as binary or text - */ - public void replaceFile(String remotePath, byte[] bytes, int size, boolean binary) - { - replaceFile(remotePath, bytes, size, binary, DataStoreResources.DEFAULT_BYTESTREAMHANDLER); - } - - /** - * Transfers a file from a client to a server. The should only be called from - * a client on a different machine from the server. If a file exists on the server - * side that the client file maps to then the existing server file will be appended to. - * - * @param remotePath the path of the file on the server side - * @param bytes an array of bytes representing a file - * @param size the number of bytes to transfer - * @param binary indicates whether to send the bytes as binary or text - * @param byteStreamHandlerId indicates which byte stream handler to use to receive the bytes - */ - public void replaceAppendFile(String remotePath, byte[] bytes, int size, boolean binary, String byteStreamHandlerId) - { - remotePath = new String(remotePath.replace('\\', '/')); - - _commandHandler.sendAppendFile(remotePath, bytes, size, binary, byteStreamHandlerId); - } - - /** - * Transfers a file from a client to a server. The should only be called from - * a client on a different machine from the server. If a file exists on the server - * side that the client file maps to then the existing server file will be appended to. - * - * @param remotePath the path of the file on the server side - * @param bytes an array of bytes representing a file - * @param size the number of bytes to transfer - * @param binary indicates whether to send the bytes as binary or text - */ - public void replaceAppendFile(String remotePath, byte[] bytes, int size, boolean binary) - { - replaceAppendFile(remotePath, bytes, size, binary, DataStoreResources.DEFAULT_BYTESTREAMHANDLER); - } - - /** - * Makes a given client element available on the server - * - * @param localObject the element to transfer - */ - public void setObject(DataElement localObject) - { - setObject(localObject, true); - } - - /** - * Makes a given client element available on the server - * - * @param localObject the element to transfer - * @param noRef indicates whether the element is a reference or not - */ - public void setObject(DataElement localObject, boolean noRef) - { - DataElement cmd = findCommandDescriptor(DataStoreSchema.C_SET); - //localDescriptorQuery(_root.getDescriptor(), DataStoreSchema.C_SET, 1); - command(cmd, localObject, noRef); - } - - public void modifyObject(DataElement localObject) - { - DataElement cmd = find(_descriptorRoot, DE.A_NAME, DataStoreResources.model_Modify, 2); - DataElement status = _commandHandler.command(cmd, localObject, true); - waitUntil(status, DataStoreResources.model_done); - } - - /** - * Used at <code>DataStore</code> initialization time to indicate where to point the host root - * - * @param localHostObject the client host element to transfer to the server site - */ - public DataElement setHost(DataElement localHostObject) - { - DataElement cmd = findCommandDescriptor(DataStoreSchema.C_SET_HOST);//localDescriptorQuery(_root.getDescriptor(), DataStoreSchema.C_SET_HOST, 1); - DataElement status = _commandHandler.command(cmd, localHostObject, false); - waitUntil(status, DataStoreResources.model_done); - return status; - } - - /** - * Used at <code>DataStore</code> initialization time to setup the schema - * - */ - public DataElement getSchema() - { - DataElement cmd = findCommandDescriptor(DataStoreSchema.C_SCHEMA);//localDescriptorQuery(_root.getDescriptor(), DataStoreSchema.C_SCHEMA, 1); - return command(cmd, _dummy); - } - - /** - * Sets a property value preference on the client and server datastore - * @param property the property to set - * @param value the value of the property - */ - public void setPreference(String property, String value) - { - setPreference(property, value, true); - } - - /** - * Sets a property value preference on the client datastore. If - * remoteAndLocal is set then the property get set on the server side as - * well as the client. - * - * @param property the property to set - * @param value the value of the property - * @param remoteAndLocal whether to propagate the change to the server - * @since 3.0 - */ - public void setPreference(String property, String value, boolean remoteAndLocal) - { - _dataStorePreferences.put(property, value); - if (isVirtual() && remoteAndLocal) - { - DataElement cmd = findCommandDescriptor(DataStoreSchema.C_SET_PREFERENCE); - if (cmd != null) - { - DataElement prefObj = createObject(null, "preference", property); //$NON-NLS-1$ - prefObj.setAttribute(DE.A_VALUE, value); - command(cmd, prefObj, true); - } - } - - // notify that preferences have changed - for (int i = 0; i < _dataStorePreferenceListeners.size(); i++){ - IDataStorePreferenceListener listener = (IDataStorePreferenceListener)_dataStorePreferenceListeners.get(i); - listener.preferenceChanged(property, value); - } - } - - public String getPreference(String property) - { - return (String)_dataStorePreferences.get(property); - } - - /** - * Adds a preference change listener to the DataStore - * - * @param listener the listener to add - * @since 3.0 - */ - public void addDataStorePreferenceListener(IDataStorePreferenceListener listener){ - _dataStorePreferenceListeners.add(listener); - } - - /** - * Removes a specific preference change listener from the Datastore - * - * @param listener the listener to remove - * @since 3.0 - */ - public void removeDataStorePreferenceListener(IDataStorePreferenceListener listener){ - _dataStorePreferenceListeners.remove(listener); - } - - /** - * Removes all the preference change listeners - * @since 3.0 - */ - public void removeAllDataStorePreferenceListeners(){ - _dataStorePreferenceListeners.clear(); - } - - /** - * Used to load and initialize a new miner on the host - * @param minerId the qualified classname of the miner to load - * @return the status of the activate miner command - */ - public DataElement activateMiner(String minerId) - { - // check if the miner is loaded - DataElement minerInfo = findMinerInformation(minerId); - if (minerInfo == null) - { - if (isVirtual()) - { - DataElement cmd = findCommandDescriptor(DataStoreSchema.C_ACTIVATE_MINER); - DataElement minerObj = createObject(null, DataStoreResources.model_miner, minerId); - return command(cmd, minerObj, true); - } - else - { - } - } - return null; - } - - - - /** - * Used at <code>DataStore</code> initialization time to initialize the miners - * - * @return the status element for the initMiners command - */ - public DataElement initMiners() - { - DataElement cmd = findCommandDescriptor(DataStoreSchema.C_INIT_MINERS);//localDescriptorQuery(_root.getDescriptor(), DataStoreSchema.C_INIT_MINERS, 1); - - return command(cmd, _dummy); - } - - - public DataElement queryInstall() - { - DataElement cmd = findCommandDescriptor(DataStoreSchema.C_QUERY_INSTALL);//localDescriptorQuery(_root.getDescriptor(), DataStoreSchema.C_QUERY_INSTALL, 1); - return synchronizedCommand(cmd, _dummy); - } - - public DataElement queryClientIP() - { - DataElement cmd = findCommandDescriptor(DataStoreSchema.C_QUERY_CLIENT_IP);//localDescriptorQuery(_root.getDescriptor(), DataStoreSchema.C_QUERY_INSTALL, 1); - return synchronizedCommand(cmd, _dummy); - } - - 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; - } - - public DataElement queryHostJVM() - { - DataElement cmd = findCommandDescriptor(DataStoreSchema.C_QUERY_JVM); - return synchronizedCommand(cmd, _dummy); - } - - - public void runRemoteClassInstance(IRemoteClassInstance runnable) - { - getCommandHandler().sendClassInstance(runnable, ClassByteStreamHandler.class.getName()); - } - - /** - * Used at <code>DataStore</code> initialization validate access to the <code>DataStore</code> - * - * @param ticketStr ticket string - * @return and indication of whether the ticket is valid or not - */ - public boolean showTicket(String ticketStr) - { - DataElement ticket = createTicket(ticketStr); - DataElement status = queryShowTicket(ticket); - - if (status != null) - { - waitUntil(status, DataStoreResources.model_done); - } - else - { - return true; - } - - return ticketValid(ticket); - } - - public boolean ticketValid(DataElement ticket) - { - return ticket.getAttribute(DE.A_VALUE).equals(DataStoreResources.model_valid); - } - - public DataElement createTicket(String ticketStr) - { - if (ticketStr == null) - { - ticketStr = "null"; //$NON-NLS-1$ - } - return createObject(_tempRoot, DataStoreResources.model_ticket, ticketStr); - } - - public DataElement queryShowTicket(DataElement ticket) - { - DataElement cmd = findCommandDescriptor(DataStoreSchema.C_VALIDATE_TICKET); - DataElement status = _commandHandler.command(cmd, ticket, false); - - if (ticket.getName().equals("null")) //$NON-NLS-1$ - { - return null; - } - return status; - } - - /** - * Indicates whether a client has permission to access the <code>DataStore</code> - * - * @return and indication of whether the ticket is valid or not - */ - public boolean validTicket() - { - if (_ticket.getAttribute(DE.A_VALUE).equals(DataStoreResources.model_valid)) - { - return true; - } - else - { - return false; - } - } - - - - /** - * Wait until a given status element reached the specified state. - * This is used for issuing synchronized commands - * - * @param status the status element - * @param state the state to wait until - */ - public void waitUntil(DataElement status, String state) - { - waitUntil(status, state, _timeout); - } - - public boolean isWaiting(DataElement status) - { - return _waitingStatuses.contains(status); - } - - public void stopWaiting(DataElement status) - { - _waitingStatuses.remove(status); - } - - public void startWaiting(DataElement status) - { - _waitingStatuses.add(status); - } - - public void waitUntil(DataElement status, String state, int timeout) - { - int timeToWait = 500; - int timeWaited = 0; - boolean timedOut = false; - startWaiting(status); - - while ((status != null) - && (_status == null || _status.getName().equals("okay")) //$NON-NLS-1$ - && !status.getName().equals(state) - && !status.getValue().equals(state) - && !status.getName().equals(DataStoreResources.model_incomplete) - && !timedOut) - { - if ((timeout != -1) && (timeWaited > timeout)) - { - // waited too long! - timedOut = true; - } - - status.waitForUpdate(timeToWait); - - - timeWaited += timeToWait; - - if (!isWaiting(status)) - { - // stopped waiting - return; - } - } - - stopWaiting(status); - - if (timedOut) - { - if (status != null) - status.setAttribute(DE.A_NAME, DataStoreResources.model_timeout); - } - - } - - public void cleanBadReferences(DataElement root) - { - } - - /** - * Tells the command handler to cancel all pending commands. - */ - public void cancelAllCommands() - { - _commandHandler.cancelAllCommands(); - } - - /** - * Creates and issues a synchronized command. - * - * @param commandDescriptor the comamnd descriptor for the command - * @param dataObject the subject of the command - * @return the status of the command - */ - public DataElement synchronizedCommand(DataElement commandDescriptor, DataElement dataObject) - { - return synchronizedCommand(commandDescriptor, dataObject, false); - } - - /** - * Creates and issues a synchronized command. - * - * @param commandDescriptor the comamnd descriptor for the command - * @param dataObject the subject of the command - * @param noRef and indication of whether the subject should be referenced or not - * @return the status of the command - */ - public DataElement synchronizedCommand(DataElement commandDescriptor, DataElement dataObject, boolean noRef) - { - DataElement status = command(commandDescriptor, dataObject, noRef, true); - waitUntil(status, DataStoreResources.model_done); - - return status; - } - - /** - * Creates and issues a synchronized command. - * - * @param commandDescriptor the comamnd descriptor for the command - * @param arguments the arguments for the command - * @param dataObject the subject of the command - * @return the status of the command - */ - public DataElement synchronizedCommand(DataElement commandDescriptor, ArrayList arguments, DataElement dataObject) - { - DataElement status = command(commandDescriptor, arguments, dataObject, true); - waitUntil(status, DataStoreResources.model_done); - - return status; - } - - /** - * Creates and issues a command. - * - * @param commandDescriptor the comamnd descriptor for the command - * @param arguments the arguments for the command - * @param dataObject the subject of the command - * @return the status of the command - */ - public DataElement command(DataElement commandDescriptor, ArrayList arguments, DataElement dataObject) - { - return command(commandDescriptor, arguments, dataObject, false); - } - - /** - * Creates and issues a command. - * - * @param commandDescriptor the comamnd descriptor for the command - * @param arguments the arguments for the command - * @param dataObject the subject of the command - * @param immediate indicates whether the command should be placed first on the request queue - * @return the status of the command - */ - public DataElement command(DataElement commandDescriptor, ArrayList arguments, DataElement dataObject, boolean immediate) - { - if (_commandHandler != null) - { - return _commandHandler.command(commandDescriptor, arguments, dataObject, true, immediate); - } - return null; - } - - /** - * Creates and issues a command. - * - * @param commandDescriptor the comamnd descriptor for the command - * @param arg an argument for the command - * @param dataObject the subject of the command - * @return the status of the command - */ - public DataElement command(DataElement commandDescriptor, DataElement arg, DataElement dataObject) - { - return command(commandDescriptor, arg, dataObject, false); - } - - /** - * Creates and issues a command. - * - * @param commandDescriptor the comamnd descriptor for the command - * @param arg an argument for the command - * @param dataObject the subject of the command - * @param immediate indicates whether the command should be placed first on the request queue - * @return the status of the command - */ - public DataElement command(DataElement commandDescriptor, DataElement arg, DataElement dataObject, boolean immediate) - { - if (_commandHandler != null) - { - return _commandHandler.command(commandDescriptor, arg, dataObject, true, immediate); - } - return null; - } - - /** - * Creates and issues a command. - * - * @param commandDescriptor the comamnd descriptor for the command - * @param dataObject the subject of the command - * @return the status of the command - */ - public DataElement command(DataElement commandDescriptor, DataElement dataObject) - { - return command(commandDescriptor, dataObject, false); - } - - /** - * Creates and issues a command. - * - * @param commandDescriptor the comamnd descriptor for the command - * @param dataObject the subject of the command - * @param noRef an indication of whether to reference the subject or not - * @return the status of the command - */ - public DataElement command(DataElement commandDescriptor, DataElement dataObject, boolean noRef) - { - return command(commandDescriptor, dataObject, noRef, false); - } - - /** - * Creates and issues a command. - * - * @param commandDescriptor the comamnd descriptor for the command - * @param dataObject the subject of the command - * @param noRef an indication of whether to reference the subject or not - * @param immediate an indication of whether - * @return the status of the command - */ - public DataElement command(DataElement commandDescriptor, DataElement dataObject, boolean noRef, boolean immediate) - { - if (_commandHandler != null) - { - return _commandHandler.command(commandDescriptor, dataObject, !noRef); - } - - return null; - } - - /** - * Issues a command. - * - * @param commandObject an instance of a command - * @return the status of the command - */ - public DataElement command(DataElement commandObject) - { - return _commandHandler.command(commandObject); - } - - /** - * Delete information from the <code>DataStore</code>. - * - */ - public void flush() - { - // flush the whole thing - flush(_logRoot); - flush(_hostRoot); - flush(_minerRoot); - flush(_tempRoot); - flush(_descriptorRoot); - flush(_dummy); - flush(_root); - - } - - /** - * Delete information from the <code>DataStore</code> contained by an element. - * - * @param element the element from which to delete - */ - public void flush(DataElement element) - { - if (element != null) - { - deleteObjects(element); - } - } - - /** - * Find a command descriptor element in the schema with the given value. - * - * @param object the object descriptor representing the type of object that can issue such a command - * @param keyName the value of the command to search for - * @return the command descriptor for the specified command - */ - public DataElement localDescriptorQuery(DataElement object, String keyName) - { - return localDescriptorQuery(object, keyName, 5); - } - - /** - * Find a command descriptor element in the schema with the given value. - * - * @param descriptor the object descriptor representing the type of object that can issue such a command - * @param keyName the value of the command to search for - * @param depth the depth of abstraction to search - * @return the command descriptor for the specified command - */ - public DataElement localDescriptorQuery(DataElement descriptor, String keyName, int depth) - { - if ((descriptor != null) && (depth > 0)) - { - for (int i = 0; i < descriptor.getNestedSize(); i++) - { - DataElement subDescriptor = descriptor.get(i).dereference(); - String type = subDescriptor.getType(); - if (type == null) - { - } - else if (type.equals(DE.T_COMMAND_DESCRIPTOR)) - { - if (keyName.equals(subDescriptor.getValue())) - return subDescriptor; - } - else if (type.equals(DE.T_ABSTRACT_COMMAND_DESCRIPTOR)) - { - DataElement result = localDescriptorQuery(subDescriptor, keyName, depth - 1); - if (result != null) - return result; - } - } - - DataElement abstractedBy = getAbstractedByRelation(); - List abstractDescriptors = descriptor.getAssociated(abstractedBy); - int numInherited = abstractDescriptors.size(); - - for (int j = 0; j < numInherited; j++) - { - DataElement abstractDescriptor = (DataElement) abstractDescriptors.get(j); - - DataElement result = localDescriptorQuery(abstractDescriptor, keyName, depth - 1); - if (result != null) - { - return result; - } - } - } - - getCompatibilityHandler().handleMissingCommand(descriptor, keyName); - return null; - } - - public void addToRecycled(DataElement toRecycle) - { - if (!_recycled.contains(toRecycle)) _recycled.add(0, toRecycle); - } - - /** - * Finds the element that represents the miner that implements a particular command. - * - * @param commandDescriptor a command descriptor - * @return the element representing a miner - */ - public DataElement getMinerFor(DataElement commandDescriptor) - { - String minerName = commandDescriptor.getSource(); - DataElement theMinerElement = find(_minerRoot, DE.A_NAME, minerName, 1); - return theMinerElement; - } - - /** - * Finds all the elements that are of a given type from a specified element. - * - * @param root where to search from - * @param type the descriptor representing the type of the objects to search for - * @return a list of elements - */ - public List findObjectsOfType(DataElement root, DataElement type) - { - ArrayList results = new ArrayList(); - List searchList = root.getAssociated(getContentsRelation()); - if (searchList != null) - { - for (int i = 0; i < searchList.size(); i++) - { - DataElement child = (DataElement) searchList.get(i); - if (child.isOfType(type)) - { - results.add(child); - } - - List subResults = findObjectsOfType(child, type); - for (int j = 0; j < subResults.size(); j++) - { - results.add(subResults.get(j)); - } - } - } - - return results; - } - - /** - * Finds all the elements that are of a given type from a specified element. - * - * @param root where to search from - * @param type the descriptor representing the type of the objects to search for - * @return a list of elements - */ - public List findObjectsOfType(DataElement root, String type) - { - ArrayList results = new ArrayList(); - List searchList = root.getAssociated(getContentsRelation()); - if (searchList != null) - { - for (int i = 0; i < searchList.size(); i++) - { - DataElement child = (DataElement) searchList.get(i); - if (child.getType().equals(type) || child.isOfType(type)) - { - results.add(child); - } - - List subResults = findObjectsOfType(child, type); - for (int j = 0; j < subResults.size(); j++) - { - results.add(subResults.get(j)); - } - } - } - - return results; - } - - /** - * Finds all the deleted elements - * - * @param root where to search from - * @return a list of elements - */ - public List findDeleted(DataElement root) - { - return findDeleted(root, 10); - } - - /** - * Finds all the deleted elements - * - * @param root where to search from - * @param depth the depth to search - * @return a list of elements - */ - public List findDeleted(DataElement root, int depth) - { - ArrayList results = new ArrayList(); -// synchronized (root) - // synchronized can cause hang here..but may not be necessary anyway since - // we're not adding or removing anything here - { - if (root != null && root.getDataStore() == this) - { - if (results.contains(root)) - { - return results; - } - - if (root.isDeleted()) - { - results.add(root); - } - - - List searchList = root.getNestedData(); - - 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)); - } - } - - } - } - } - } - } - } - } - } - return results; - } - - /** - * Finds all relationship descriptor types that can be applied to a particular element. - * - * @param descriptor the object descriptor that uses relationships - * @param fixateOn a filter for the type of relationships to look for - * @return a list of relationship descriptor elements - */ - public ArrayList getRelationItems(DataElement descriptor, String fixateOn) - { - ArrayList result = new ArrayList(); - if (descriptor != null) - { - // contained relationships - for (int i = 0; i < descriptor.getNestedSize(); i++) - { - DataElement object = descriptor.get(i).dereference(); - - String objType = (String) object.getElementProperty(DE.P_TYPE); - if (objType.equals(DE.T_RELATION_DESCRIPTOR) || objType.equals(DE.T_ABSTRACT_RELATION_DESCRIPTOR)) - { - if (fixateOn != null) - { - String objName = (String) object.getElementProperty(DE.P_NAME); - if (objName.equals(fixateOn)) - { - if (!result.contains(object)) - result.add(object); - } - } - else - { - if (!result.contains(object)) - result.add(object); - } - } - } - - // abstracted relationships - List baseDescriptors = descriptor.getAssociated(getAbstractedByRelation()); - for (int j = 0; j < baseDescriptors.size(); j++) - { - - DataElement baseDescriptor = (DataElement) baseDescriptors.get(j); - ArrayList baseRelations = getRelationItems(baseDescriptor, fixateOn); - for (int k = 0; k < baseRelations.size(); k++) - { - DataElement relation = (DataElement) baseRelations.get(k); - if (!result.contains(relation)) - { - result.add(relation); - } - } - } - } - - return result; - } - - - - /** - * Find all elements from a given element that match a certain attribute. - * - * @param root the element to search from - * @param attribute the index of the attribute to match - * @param pattern the value to compare with the attribute - * @param ignoreCase an indication whether to ignore case for the attribute or not - * @return the list of matches - */ - public ArrayList searchForPattern(DataElement root, int attribute, String pattern, boolean ignoreCase) - { - int attributes[] = { attribute }; - String patterns[] = { pattern }; - return searchForPattern(root, attributes, patterns, 1, ignoreCase); - } - - /** - * Find all elements from a given element that match a certain set of attributes. - * - * @param root the element to search from - * @param attributes a list of attributes to match - * @param patterns a list of values to compare with the attributes - * @param ignoreCase an indication whether to ignore case for the attributes or not - * @return the list of matches - */ - public ArrayList searchForPattern(DataElement root, ArrayList attributes, ArrayList patterns, boolean ignoreCase) - { - int att[] = new int[attributes.size()]; - String ptn[] = new String[attributes.size()]; - for (int i = 0; i < attributes.size(); i++) - { - att[i] = ((Integer) attributes.get(i)).intValue(); - ptn[i] = (String) (patterns.get(i)); - } - - return searchForPattern(root, att, ptn, attributes.size(), ignoreCase); - } - - /** - * Find all elements from a given element that match a certain set of attributes. - * - * @param root the element to search from - * @param attributes a list of attribute indexes to match - * @param patterns a list of values to compare with the attributes - * @param numAttributes the number of attributes to match - * @param ignoreCase an indication whether to ignore case for the attributes or not - * @return the list of matches - */ - public ArrayList searchForPattern(DataElement root, int attributes[], String patterns[], int numAttributes, boolean ignoreCase) - { - return searchForPattern(root, attributes, patterns, numAttributes, ignoreCase, 1); - } - - /** - * Find all elements from a given element that match a certain set of attributes. - * - * @param root the element to search from - * @param attributes a list of attribute indexes to match - * @param patterns a list of values to compare with the attributes - * @param numAttributes the number of attributes to match - * @param ignoreCase an indication whether to ignore case for the attributes or not - * @param depth how deep to search - * @return the list of matches - */ - public ArrayList searchForPattern(DataElement root, int attributes[], String patterns[], int numAttributes, boolean ignoreCase, int depth) - { - ArrayList searched = new ArrayList(); - return searchForPattern(root, attributes, patterns, numAttributes, ignoreCase, depth, searched); - } - - /** - * Find all elements from a given element that match a certain set of attributes. - * - * @param root the element to search from - * @param attributes a list of attribute indexes to match - * @param patterns a list of values to compare with the attributes - * @param numAttributes the number of attributes to match - * @param ignoreCase an indication whether to ignore case for the attributes or not - * @param depth how deep to search - * @param searched a list of objects already searched - * @return the list of matches - */ - public ArrayList searchForPattern(DataElement root, int attributes[], String patterns[], int numAttributes, boolean ignoreCase, int depth, ArrayList searched) - { - ArrayList result = new ArrayList(); - if (depth > 0) - { - for (int i = 0; i < root.getNestedSize(); i++) - { - DataElement child = root.get(i); - child = child.dereference(); - if ((child != null) && !searched.contains(child)) - { - searched.add(child); - if (child.patternMatch(attributes, patterns, numAttributes, ignoreCase)) - { - result.add(child); - } - - ArrayList subResults = searchForPattern(child, attributes, patterns, numAttributes, ignoreCase, depth - 1, searched); - for (int j = 0; j < subResults.size(); j++) - { - result.add(subResults.get(j)); - } - } - } - } - - return result; - } - - /** - * Returns the element that represents the specified miner's data. - * - * @param minerName the qualified name of the miner - * @return the element representing the miner information - */ - public DataElement findMinerInformation(String minerName) - { - DataElement information = null; - DataElement minerElement = find(_minerRoot, DE.A_NAME, minerName, 1); - if (minerElement != null) - { - information = find(minerElement, DE.A_TYPE, DataStoreResources.model_data, 1); - } - - return information; - } - - /** - * Finds a descriptor element with a specified type and name. - * - * @param type the type of the descriptor - * @param name the name of the descriptor - * @return the found descriptor - */ - public DataElement findDescriptor(String type, String name) - { - if (_descriptorRoot != null) - { - synchronized (_descriptorRoot) - { - if (type.equals(DE.T_OBJECT_DESCRIPTOR)) - { - return (DataElement)_objDescriptorMap.get(name); - } - else if (type.equals(DE.T_COMMAND_DESCRIPTOR)) - { - return (DataElement)_cmdDescriptorMap.get(name); - - } - else if (type.equals(DE.T_RELATION_DESCRIPTOR)) - { - return (DataElement)_relDescriptorMap.get(name); - } - else - { - for (int i = 0; i < _descriptorRoot.getNestedSize(); i++) - { - DataElement descriptor = _descriptorRoot.get(i); - - if (descriptor.getName().equals(name) && descriptor.getType().equals(type)) - { - return descriptor; - } - } - } - } - } - - return null; - } - - /** - * Finds an object descriptor element with a specified name. - * - * @param name the name of the descriptor - * @return the found descriptor - */ - public DataElement findObjectDescriptor(String name) - { - return (DataElement)_objDescriptorMap.get(name); - } - - /** - * Finds an relation descriptor element with a specified name. - * - * @param name the name of the descriptor - * @return the found descriptor - */ - public DataElement findRelationDescriptor(String name) - { - return (DataElement)_relDescriptorMap.get(name); - } - - /** - * Finds an command descriptor element with a specified name. - * - * @param name the name of the descriptor - * @return the found descriptor - */ - public DataElement findCommandDescriptor(String name) - { - return (DataElement)_cmdDescriptorMap.get(name); - } - - /** - * Finds an element with the specified ID. - * - * @param id the ID of the descriptor - * @return the found element - */ - public DataElement find(String id) - { - DataElement result = (DataElement) _hashMap.get(id); - return result; - } - - /** - * Finds an element matching a specified attribute and name. - * - * @param root the element to search from - * @param attribute the index of the attribute to compare - * @param name the name of the element - * @return the first found element - */ - public DataElement find(DataElement root, int attribute, String name) - { - return find(root, attribute, name, 10); - } - - /** - * Finds an element matching a specified attribute and name. - * - * @param root the element to search from - * @param attribute the index of the attribute to compare - * @param name the name of the element - * @param depth the depth of the search - * @return the first found element - */ - public DataElement find(DataElement root, int attribute, String name, int depth) - { - if ((root != null) && (name != null) && !root.isReference() && depth > 0) - { - - if (StringCompare.compare(name, root.getAttribute(attribute), false)) - { - return root; - } - else if (depth > 0) - { - for (int h = 0; h < root.getNestedSize(); h++) - { - DataElement nestedObject = root.get(h); - String compareName = nestedObject.getAttribute(attribute); - - if (!nestedObject.isReference() && (compareName != null)) - { - - if (name.compareTo(compareName) == 0) - { - return nestedObject; - } - else - { - DataElement foundObject = find(nestedObject, attribute, name, depth - 1); - if (foundObject != null) - { - return foundObject; - } - } - } - } - } - } - - return null; - } - - /** - * Get the mapping from a remote path to a local path. - * - * @param aPath the remote path - * @return the local path - */ - public String mapToLocalPath(String aPath) - { - /* - String result = null; - - char slash = '/'; - String remotePath = aPath.replace('\\', slash); - String localRoot = _dataStoreAttributes.getAttribute(DataStoreAttributes.A_LOCAL_PATH).replace('\\', slash); - String remoteRoot = getHostRoot().getSource().replace('\\', slash); - - if (localRoot.equals(remoteRoot)) - { - result = remotePath; - } - else if (remotePath.startsWith(localRoot)) - { - result = remotePath; - } - else if (remotePath.startsWith(remoteRoot)) - { - result = new String(localRoot + slash + remotePath.substring(remoteRoot.length(), remotePath.length())); - } - else - { - // file is outside of scope - // create temporary location - int indexOfDrive = remotePath.indexOf(":"); - if (indexOfDrive > 0) - { - remotePath = remotePath.substring(indexOfDrive + 1, remotePath.length()); - } - - result = new String(localRoot + remotePath); - } - - return result; - */ - - // no more mapping here - expect actual paths - return aPath; - } - - /** - * Persist the <code>DataStore</code> tree from a given root - * - * @param root the element to persist from - * @param remotePath the path where the persisted file should be saved - * @param depth the depth of persistence from the root - */ - public void saveFile(DataElement root, String remotePath, int depth) - { - remotePath = new String(remotePath.replace('\\', '/')); - String fileName = mapToLocalPath(remotePath); - try - { - // need to create directories as well - File file = new File(fileName); - try - { - file = file.getCanonicalFile(); - } - catch (IOException e) - { - } - - if (!file.exists()) - { - File dir = new File(file.getParent()); - dir.mkdirs(); - file.createNewFile(); - } - - File newFile = new File(file.getCanonicalPath()); - - if (newFile.canWrite()) - { - FileOutputStream fileStream = new FileOutputStream(newFile); - PrintStream fileWriter = new PrintStream(fileStream); - BufferedWriter dataWriter = new BufferedWriter(new OutputStreamWriter(fileStream, DE.ENCODING_UTF_8)); - - XMLgenerator generator = new XMLgenerator(this); - generator.setIgnoreDeleted(true); - generator.setFileWriter(fileWriter); - generator.setDataWriter(dataWriter); - generator.setBufferSize(1000); - generator.generate(root, depth); - generator.flushData(); - - fileStream.close(); - } - } - catch (IOException e) - { - System.out.println(e); - } - } - - /** - * Save a file in the specified location - * - * @param remotePath the path where to save the file - * @param buffer the buffer to save in the file - */ - public void saveFile(String remotePath, byte[] buffer, int size, boolean binary) - { - getDefaultByteStreamHandler().receiveBytes(remotePath, buffer, size, binary); - } - - /** - * Save a file in the specified location - * - * @param remotePath the path where to save the file - * @param buffer the buffer to save in the file - * @param byteStreamHandlerId indicates which byte stream handler to receive the bytes - */ - public void saveFile(String remotePath, byte[] buffer, int size, boolean binary, String byteStreamHandlerId) - { - - getByteStreamHandler(byteStreamHandlerId).receiveBytes(remotePath, buffer, size, binary); - } - - /** - * Saves a class to memory (but not to disk) where it can then be loaded by - * the RemoteClassLoaders. The class will be saved in a new thread, so this method - * will potentially return before the class has been saved. - * - * @param className the fully qualified name of the class - * @param buffer the contents of the class - * @param size the size of the buffer - */ - public void saveClass(String className, byte[] buffer, int size) - { - getDefaultClassByteStreamHandler().receiveBytes(className, buffer, size); - } - - - /** - * Saves a class instance - * - * @param buffer the contents of the class - * @param size the size of the buffer - * @param classbyteStreamHandlerId the id for the byte stream handler - */ - public void saveClassInstance(byte[] buffer, int size, String classbyteStreamHandlerId) - { - getDefaultClassByteStreamHandler().receiveInstanceBytes(buffer, size); - } - - - /** - * Saves a class to memory (but not to disk) where it can then be loaded by - * the RemoteClassLoaders. The class will be saved in a new thread, so this method - * will potentially return before the class has been saved. - * - * @param className the fully qualified name of the class - * @param buffer the contents of the class - * @param size the size of the buffer - * @param classbyteStreamHandlerId indicates which class byte stream handler to receive the bytes - */ - public void saveClass(String className, byte[] buffer, int size, String classbyteStreamHandlerId) - { - getClassByteStreamHandler(classbyteStreamHandlerId).receiveBytes(className, buffer, size); - } - - /** - * Append a file to the specified location - * - * @param remotePath the path where to save the file - * @param buffer the buffer to append into the file - */ - public void appendToFile(String remotePath, byte[] buffer, int size, boolean binary) - { - getDefaultByteStreamHandler().receiveAppendedBytes(remotePath, buffer, size, binary); - } - - /** - * Append a file to the specified location - * - * @param remotePath the path where to save the file - * @param buffer the buffer to append into the file - * @param byteStreamHandlerId indicates which byte stream handler to receive the bytes - */ - public void appendToFile(String remotePath, byte[] buffer, int size, boolean binary, String byteStreamHandlerId) - { - getByteStreamHandler(byteStreamHandlerId).receiveAppendedBytes(remotePath, buffer, size, binary); - } - - /** - * Load a persisted <code>DataStore</code> tree into the specified <code>DataElement</code> - * - * @param root the root element of the persisted tree - * @param pathName the location of the persisted file - */ - public void load(DataElement root, String pathName) - { - String fileName = pathName; - - FileInputStream inFile = loadFile(fileName); - if (inFile != null) - { - BufferedInputStream document = new BufferedInputStream(inFile); - try - { - XMLparser parser = new XMLparser(this); - DataElement subRoot = parser.parseDocument(document, null); - if (subRoot != null) - { - root.removeNestedData(); - List nestedData = subRoot.getNestedData(); - if (nestedData != null) - { - root.addNestedData(nestedData, true); - } - refresh(root); - } - } - catch (IOException e) - { - } - } - - } - - public static FileInputStream loadFile(String fileName) - { - File file = new File(fileName); - if (file.exists() && (file.length() > 0)) - { - try - { - FileInputStream inFile = new FileInputStream(file); - - return inFile; - } - catch (FileNotFoundException e) - { - return null; - } - } - else - { - return null; - } - } - - /** - * Indicate whether a given descriptor can contain the specified element - * - * @param descriptor the object descriptor to test - * @param dataElement the object to test against - * @return and indication whether dataElement can be in an object of type descriptor - */ - public boolean filter(DataElement descriptor, DataElement dataElement) - { - return filter(descriptor, dataElement, 2); - } - - /** - * Indicate whether a given descriptor can contain the specified element - * - * @param descriptor the object descriptor to test - * @param dataElement the object to test against - * @param depth how far to search - * @return and indication whether dataElement can be in an object of type descriptor - */ - public boolean filter(DataElement descriptor, DataElement dataElement, int depth) - { - if (depth > 0) - { - depth--; - - String dataType = (String) dataElement.getElementProperty(DE.P_TYPE); - String typeStr = (String) descriptor.getElementProperty(DE.P_NAME); - - if (((dataType != null) && (typeStr != null)) && (dataType.equals(typeStr) || typeStr.equals(DataStoreResources.model_all))) - { - return true; - } - else - { - for (int i = 0; i < descriptor.getNestedSize(); i++) - { - if (filter(descriptor.get(i), dataElement, depth)) - { - return true; - } - } - - return false; - } - } - - return false; - } - - /** - * Indicate whether a given set of descriptors can contain the specified element - * - * @param descriptors the object descriptors to test - * @param dataElement the object to test against - * @return and indication whether dataElement can be in an object of type descriptor - */ - public boolean filter(ArrayList descriptors, DataElement dataElement) - { - for (int i = 0; i < descriptors.size(); i++) - { - if (filter((DataElement) descriptors.get(i), dataElement)) - { - return true; - } - } - return false; - } - - /** - * Indicate whether an command is specified as transient - * - * @param commandObject the object descriptors to test - * @return and indication whether the command is transient - */ - public boolean isTransient(DataElement commandObject) - { - boolean isTransient = false; - DataElement subject = commandObject.get(0); - - DataElement subjectDescriptor = subject.getDescriptor(); - if (subjectDescriptor != null) - { - DataElement minerElement = getMinerFor(commandObject); - DataElement transientObjects = find(minerElement, DE.A_TYPE, DataStoreResources.model_transient, 1); - if (transientObjects != null) - { - for (int i = 0; i < transientObjects.getNestedSize(); i++) - { - DataElement transientDescriptor = transientObjects.get(i).dereference(); - if (transientDescriptor == subjectDescriptor) - { - isTransient = true; - } - } - } - } - - return isTransient; - } - - private void initializeDescriptors() - { - _dataStoreSchema.extendSchema(_descriptorRoot); - } - - public void enableAutoRefresh(boolean flag) - { - _autoRefresh = flag; - } - - public boolean isAutoRefreshOn() - { - return _autoRefresh; - } - /** - * getUserPreferencesDirectory() - returns directory on IFS where to store user settings - */ - public String getUserPreferencesDirectory() - { - if (_userPreferencesDirectory == null) { - - String clientUserID; - if (_client != null){ - _userPreferencesDirectory = _client.getProperty("user.home"); //$NON-NLS-1$ - clientUserID = _client.getProperty("client.username"); //$NON-NLS-1$ - } - else { - _userPreferencesDirectory = System.getProperty("user.home"); //$NON-NLS-1$ - clientUserID = System.getProperty("client.username"); //$NON-NLS-1$ - } - - if (clientUserID == null || clientUserID.equals("")) //$NON-NLS-1$ - { - clientUserID = ""; //$NON-NLS-1$ - } - else - { - clientUserID += File.separator; - } - - // append a '/' if not there - if ( _userPreferencesDirectory.length() == 0 || - _userPreferencesDirectory.charAt( _userPreferencesDirectory.length() -1 ) != File.separatorChar ) { - - _userPreferencesDirectory = _userPreferencesDirectory + File.separator; - } - - _userPreferencesDirectory = _userPreferencesDirectory + ".eclipse" + File.separator + //$NON-NLS-1$ - "RSE" + File.separator + clientUserID; //$NON-NLS-1$ - File dirFile = new File(_userPreferencesDirectory); - if (!dirFile.exists()) { - dirFile.mkdirs(); - } - } - return _userPreferencesDirectory; - } - - private void initialize() - { - _lastCreatedElements = new ArrayList(); - _minersLocations = new ArrayList(); - - - _random = new Random(System.currentTimeMillis()); - - _objDescriptorMap = new HashMap(100); - _cmdDescriptorMap = new HashMap(100); - _relDescriptorMap = new HashMap(100); - _dataStorePreferences = new HashMap(10); - _dataStorePreferenceListeners = new ArrayList(); - - _hashMap = new HashMap(2 * _initialSize); - _recycled = new ArrayList(_initialSize); - initElements(_initialSize); - - _timeout = 20000; - _autoRefresh = false;//true; - - - _dataStoreSchema = new DataStoreSchema(this); - - if (!isVirtual()) - { - // get the time the server can remain idle before automatically shutting down - // 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$ - if (serverIdleShutdownTimeout != null) - { - _serverIdleShutdownTimeout = Integer.parseInt(serverIdleShutdownTimeout); - } - - } - - - String tracingProperty = System.getProperty("DSTORE_TRACING_ON"); //$NON-NLS-1$ - if (tracingProperty != null && tracingProperty.equals("true")) //$NON-NLS-1$ - { - _tracingOn = true; - } - else - { - _tracingOn = false; - } - if (_tracingOn) - { - // only start tracing now if we're in one process per server mode - 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(); - } - catch (IOException e) - { - } - } - } - - //_remoteClassLoader = new RemoteClassLoader(this); - _classReqRepository = new HashMap(); - - _waitingStatuses = new ArrayList(); - - _byteStreamHandlerRegistry = new ByteStreamHandlerRegistry(); - _classbyteStreamHandlerRegistry = new ClassByteStreamHandlerRegistry(); - setDefaultByteStreamHandler(); - setDefaultClassByteStreamHandler(); - - // only start tracing now if we're in one process per server mode - if (SystemServiceManager.getInstance().getSystemService() == null){ - assignCacheJar(); - } - - registerLocalClassLoader(this.getClass().getClassLoader()); - } - - public void startDataElementRemoverThread() - { - if (!isVirtual() && _deRemover == null) - { - String memLogging = System.getProperty("DSTORE_MEMLOGGING_ON"); //$NON-NLS-1$ - _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(); - } - catch (IOException e) - { - } - } - _deRemover = new DataElementRemover(this); - _deRemover.start(); - } - } - - public boolean isDoSpirit() - { - if (isVirtual()) return _spiritModeOn; - else return _spiritModeOn && _spiritCommandReceived; - } - - public void receiveStartSpiritCommand() - { - _spiritCommandReceived = true; - } - - public IByteStreamHandler getDefaultByteStreamHandler() - { - return _byteStreamHandlerRegistry.getDefault(); - } - - public IClassByteStreamHandler getDefaultClassByteStreamHandler() - { - return _classbyteStreamHandlerRegistry.getDefault(); - } - - public IByteStreamHandler getByteStreamHandler(String id) - { - return _byteStreamHandlerRegistry.getByteStreamHandler(id); - } - - public IClassByteStreamHandler getClassByteStreamHandler(String id) - { - return _classbyteStreamHandlerRegistry.getClassByteStreamHandler(id); - } - - public void setRemoteIP(String remoteIP) - { - _remoteIP = remoteIP; - } - - public String getRemoteIP() - { - return _remoteIP; - } - - /** - * Sets the current <code>ByteStreamHandler</code> to be the default. - */ - public void setDefaultByteStreamHandler() - { - setDefaultByteStreamHandler(null); - } - - /** - * Sets the current <code>ClassByteStreamHandler</code> to be the default. - */ - public void setDefaultClassByteStreamHandler() - { - setDefaultClassByteStreamHandler(null); - } - - /** - * Sets the current <code>ByteStreamHandler</code> to use for sending and receiving - * files. - * @param handler the <code>ByteStreamHandler</code> to use - */ - public void setDefaultByteStreamHandler(IByteStreamHandler handler) - { - if (handler == null) - { - DataElement log = null; - handler = new ByteStreamHandler(this, log); - } - _byteStreamHandlerRegistry.setDefaultByteStreamHandler(handler); - } - - public RemoteClassLoader getRemoteClassLoader() - { - if (_remoteLoader == null) - { - - _remoteLoader = new RemoteClassLoader(this); - } - return _remoteLoader; - } - - /** - * Sets the current <code>ClassByteStreamHandler</code> to use for sending and receiving - * classes. - * @param handler the <code>ClassByteStreamHandler</code> to use - */ - public void setDefaultClassByteStreamHandler(IClassByteStreamHandler handler) - { - if (handler == null) - { - DataElement log = null; - handler = new ClassByteStreamHandler(this, log); - } - _classbyteStreamHandlerRegistry.setDefaultClassByteStreamHandler(handler); - } - - /** - * Registers a byte stream handler. - * @param handler the handler to register - */ - public void registerByteStreamHandler(IByteStreamHandler handler) - { - _byteStreamHandlerRegistry.registerByteStreamHandler(handler); - } - - /** - * Registers a class byte stream handler. - * @param handler the handler to register - */ - public void registerClassByteStreamHandler(IClassByteStreamHandler handler) - { - _classbyteStreamHandlerRegistry.registerClassByteStreamHandler(handler); - } - - public void setByteConverter(IByteConverter converter) - { - _byteConverter = converter; - } - - public IByteConverter getByteConverter() - { - if (_byteConverter == null) - { - _byteConverter = new DefaultByteConverter(); - } - return _byteConverter; - } - - - /** - * Preallocates a set of <code>DataElement</code>s. - * - * @param the number of elements to preallocate - */ - private void initElements(int size) - { - for (int i = 0; i < size; i++) - { - _recycled.add(new DataElement(this)); - } - } - - /** - * Returns a new <code>DataElement</code> by either using an existing preallocated <code>DataElement</code> or - * by creating a new one. - * - * @return the new <code>DataElement</code> - */ - private synchronized DataElement createElement() - { - DataElement newObject = null; - - int numRecycled = _recycled.size(); - - if (numRecycled > 1) - { - 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; - } - } - */ - - newObject = (DataElement) _recycled.remove((_recycled.size() - 1)); - } - } - if (newObject == null) - { - newObject = new DataElement(this); - } - - newObject.setUpdated(false); - updateLastCreated(newObject); - return newObject; - } - - private void updateLastCreated(DataElement element) - { - _lastCreatedElements.add(0, element); - if (_lastCreatedElements.size() > 4) - { - for (int i = _lastCreatedElements.size() - 1; i > 4; i--) - { - _lastCreatedElements.remove(i); - } - } - } - - public List getLastCreatedElements() - { - return _lastCreatedElements; - } - - private void createRoots() - { - _externalRoot = createObject(_root, DataStoreResources.model_host, "External DataStores", "", "extID"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - - _tempRoot = createObject(_root, "temp", "Temp Root", "", "tempID"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ - _dummy = createObject(_root, "temp", "dummy"); //$NON-NLS-1$ //$NON-NLS-2$ - _logRoot = createObject(_root, DataStoreResources.model_log, DataStoreResources.model_Log_Root, "", "logID"); //$NON-NLS-1$ //$NON-NLS-2$ - - _minerRoot = createObject(_root, DataStoreResources.model_miners, DataStoreResources.model_Tool_Root, "", "minersID"); //$NON-NLS-1$ //$NON-NLS-2$ - - _hostRoot = - createObject( - _root, - DataStoreResources.model_host, - _dataStoreAttributes.getAttribute(DataStoreAttributes.A_HOST_NAME), - _dataStoreAttributes.getAttribute(DataStoreAttributes.A_HOST_PATH), - "hostID"); //$NON-NLS-1$ - - _status = createObject(_root, DataStoreResources.model_status, "okay", "", "statusID"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - } - - private void deleteObjectHelper(DataElement from, DataElement toDelete, int depth) - { - if (depth > 0) - { - depth--; - toDelete.delete(); - for (int i = 0; i < toDelete.getNestedSize(); i++) - { - DataElement subDelete = toDelete.get(i); - if (subDelete != null && subDelete.getDataStore() == this && !subDelete.isDeleted()) { - deleteObjectHelper(toDelete, subDelete, depth); - } - } - - String id = toDelete.getAttribute(DE.A_ID); - synchronized (_hashMap) - { - _hashMap.remove(id); - } - - if (!isConnected()) - { - from.removeNestedData(toDelete); - } - } - } - - private void disconnectObjectHelper(DataElement toDisconnect, int depth) - { - 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); - } - } - } - } - - private String makeIdUnique(String id) - { - - if (!_hashMap.containsKey(id)) - { - 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) - { - // by default, name will be the id - //return name; - return generateId(); - } - - /** - * Generates a new unique ID to be used by a <code>DataElement</code> - * - * @return the new id - */ - protected String generateId() - { - //return "" + _uniqueNumber++; - ///* - String newId = String.valueOf(_random.nextInt()); - while (_hashMap.containsKey(newId)) - { - newId = String.valueOf(_random.nextInt()); - } - - return newId; -// */ - } - - public void startTracing() - { - if (_tracingOn && _traceFile != null && _traceFileHandle != null) - { - try - { - _traceFile.seek(_traceFileHandle.length()); - } - catch (IOException e) - { - } - - trace("-----------------------------------------"); //$NON-NLS-1$ - trace("Start Tracing at " + System.currentTimeMillis()); //$NON-NLS-1$ - } - } - - public void startMemLogging() - { - if (_memLoggingOn && _memLogFile != null && _memLoggingFileHandle != null) - { - try - { - _memLogFile.seek(_memLoggingFileHandle.length()); - } - catch (IOException e) - { - } - - memLog("-----------------------------------------"); //$NON-NLS-1$ - memLog("Start Memory Logging at " + System.currentTimeMillis()); //$NON-NLS-1$ - } - } - - public void memLog(String str) - { - internalMemLog(str); - } - - public void trace(String str) - { - internalTrace(str); - } - - public void trace(Throwable e) - { - internalTrace(e.getMessage()); - internalTrace(e); - } - - private void internalTrace(Throwable e) - { - if (_tracingOn && _traceFile != null && e != null) - { - try - { - StackTraceElement[] stack = e.getStackTrace(); - for (int i = 0;i<stack.length;i++) - { - _traceFile.writeBytes(stack[i].toString()); - _traceFile.writeBytes(System.getProperty("line.separator")); //$NON-NLS-1$ - } - _traceFile.writeBytes(System.getProperty("line.separator")); //$NON-NLS-1$ - } - catch (IOException ex) - { - } - } - } - - private void internalTrace(String message) - { - if (_tracingOn && _traceFile != null && message != null) - { - try - { - _traceFile.writeBytes((new Date()).toString() + ": "); //$NON-NLS-1$ - _traceFile.writeBytes(message); - _traceFile.writeBytes(System.getProperty("line.separator")); //$NON-NLS-1$ - } - catch (IOException e) - { - } - } - } - - private void internalMemLog(String message) - { - if (_memLoggingOn && _memLogFile != null && message != null) - { - try - { - _memLogFile.writeBytes((new Date()).toString() + ": "); //$NON-NLS-1$ - _memLogFile.writeBytes(message); - _memLogFile.writeBytes(System.getProperty("line.separator")); //$NON-NLS-1$ - } - catch (IOException e) - { - } - } - } - - public void finish() - { - // dy: the call to flush deletes all the elements in the tree - // which causes havoc for iSeries caching when switching between offline / online - //if (isVirtual()) - // flush(); - if (_deRemover != null) - _deRemover.finish(); - - if (_tracingOn) - { - try - { - _traceFile.writeBytes("Finished Tracing"); //$NON-NLS-1$ - _traceFile.writeBytes(System.getProperty("line.separator")); //$NON-NLS-1$ - _traceFile.close(); - } - catch (IOException e) - { - } - } - } - - /** - * On the server, sends a class request through the ServerUpdateHandler - * to the client. - * On the client, sends the request through the ClientCommandHandler - * @param className The fully qualified name of the class to request. - */ - public void requestClass(String className) - { - if (isVirtual()) - { - _commandHandler.requestClass(className); - } - else - { - _updateHandler.requestClass(className); - } - } - - /** - * On the server, sends a keepalive request through the ServerUpdateHandler - * to the client. - */ - public void sendKeepAliveRequest() - { - if (isVirtual()) - { - _commandHandler.sendKeepAliveRequest(); - } - else - { - _updateHandler.sendKeepAliveRequest(); - } - } - - /** - * On the server, sends a class through the ServerCommandHandler - * to the client. - * On the client, sends the class through the ClientUpdateHandler - * @param className The fully qualified name of the class to request. - */ - public void sendClass(String className) - { - if (isVirtual()) - { - _commandHandler.sendClass(className); - } - else - { - _updateHandler.sendClass(className); - } - } - - - /** - * @return the central repository for all class requests initiated by - * this server and its RemoteClassLoaders. - */ - public HashMap getClassRequestRepository() - { - return _classReqRepository; - } - - - /** - * Saves a class to disk (caches it) so that it can be loaded by the classloader without needing to - * download it again - */ - public synchronized void cacheClass(String className, byte[] bytes, int size) - { - if (_cacheJar == null) return; - - // get the entries from the old cache file - Enumeration oldEntries; - JarFile oldJarFile = null; - - try - { - oldJarFile = new JarFile(_cacheJar); - } - catch (IOException e) - { - // the jar must be corrupted, so we must erase it. - System.out.println("Cache jarfile corrupted... erasing it."); //$NON-NLS-1$ - if (!_cacheJar.delete()) System.out.println("Couldn't erase corrupted jarfile!"); //$NON-NLS-1$ - // try to make a new one again. - assignCacheJar(); - return; - } - oldEntries = oldJarFile.entries(); - - // create a new cache file to store the new class in - File newJarFile = new File(getCacheDirectory() + REMOTE_CLASS_CACHE_JARFILE_NAME + "_next" + JARFILE_EXTENSION); //$NON-NLS-1$ - JarOutputStream newJarOutput = null; - - try - { - newJarOutput = createNewCacheJar(newJarFile); - } - catch (IOException e) - { - System.out.println("Class caching failed. Could not create new cache jarfile."); //$NON-NLS-1$ - return; - } - - // transfer the old entries to the new cache file - while (oldEntries.hasMoreElements()) - { - JarEntry nextEntry = (JarEntry) oldEntries.nextElement(); - BufferedInputStream source = null; - try - { - source = new BufferedInputStream(oldJarFile.getInputStream(nextEntry)); - } - catch (Exception e) - { - continue; - } - nextEntry.setCompressedSize(-1); - try - { - newJarOutput.putNextEntry(nextEntry); - - byte[] buf = new byte[1024]; - int numRead = source.read(buf); - - while (numRead > 0) - { - newJarOutput.write(buf, 0, numRead); - numRead = source.read(buf); - } - - newJarOutput.closeEntry(); - source.close(); - } - catch (IOException e) - { - System.out.println("Class caching failed. Could not recopy entry from old jar. Cleaning..."); //$NON-NLS-1$ - try { newJarOutput.close(); } catch (IOException ee) { } - if (!newJarFile.delete()) System.out.println("Couldn't erase new jarfile!"); //$NON-NLS-1$ - } - } - - // add the new class file - JarEntry newEntry = new JarEntry(className.replace('.', '/') + ".class"); //$NON-NLS-1$ - newEntry.setCompressedSize(-1); - - try - { - newJarOutput.putNextEntry(newEntry); - newJarOutput.write(bytes, 0, size); - newJarOutput.closeEntry(); - newJarOutput.close(); - } - catch (IOException e) - { - System.out.println("Class caching failed. Could not cache new class into new jar. Cleaning..."); //$NON-NLS-1$ - try { newJarOutput.close(); } catch (IOException ee) { } - if (!newJarFile.delete()) System.out.println("Couldn't erase new jarfile!"); //$NON-NLS-1$ - } - - // get rid of the old jar file - try { oldJarFile.close(); } catch (IOException ee) { } - if (!_cacheJar.delete()) System.out.println("Could not delete old cache jar."); //$NON-NLS-1$ - if (!newJarFile.renameTo(_cacheJar)) System.out.println("Could not rename new cache jar."); //$NON-NLS-1$ - - System.out.println(className + " cached in " + _cacheJar.getAbsolutePath()); //$NON-NLS-1$ - } - - protected JarOutputStream createNewCacheJar(File newJar) throws IOException - { - newJar.createNewFile(); - JarOutputStream dest = new JarOutputStream( - new FileOutputStream(newJar)); - dest.setMethod(ZipOutputStream.DEFLATED); - return dest; - } - - 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()) - { - try - { - JarOutputStream cacheOut = createNewCacheJar(cacheJar); - cacheOut.putNextEntry(new JarEntry("/")); //$NON-NLS-1$ - cacheOut.closeEntry(); - cacheOut.close(); - } - catch (IOException e) - { - e.printStackTrace(); - _cacheJar = null; - return; - } - } - _cacheJar = cacheJar; - } - - protected String getCacheDirectory() - { - String cacheDirectory = getUserPreferencesDirectory(); - if (!cacheDirectory.endsWith(File.separator)) - { - cacheDirectory = cacheDirectory + File.separator; - } - return cacheDirectory; - } - - public File getRemoteClassLoaderCache() - { - return _cacheJar; - } - - public void sendKeepAliveConfirmation() - { - if (isVirtual()) - { - _commandHandler.sendKeepAliveConfirmation(); - } - else - { - _updateHandler.sendKeepAliveConfirmation(); - } - } - - /** - * @return what type of attribute tag is used on the peer DataStore to indicate whether dataelements - * are references, values, or spirit elements. If the peer DataStore is an older one, this will return - * "isRef", if its up-to-date, it will return "refType", and if the tag hasnt been determined yet, this method - * will return null. - */ - public String getReferenceTag() - { - return referenceTag; - } - - /** - * Sets what type of attribute tag is used on the peer DataStore to indicate whether dataelements - * are references, values, or spirit elements. - */ - public void setReferenceTag(String tag) - { - referenceTag = tag; - } - - /** - * @since 3.0 - */ - public int printTree(String indent, DataElement root) - { - return printTree(indent, 0, root); - } - - /** - * @since 3.0 - */ - public int printTree(String indent, int number, DataElement root) - { - int total = number; - if (root != null) - { - total++; - boolean isSpirit = root.isSpirit(); - boolean isDeleted = root.isDeleted(); - String prefix = "DataElement"; //$NON-NLS-1$ - if (isSpirit) - prefix += "<spirit>"; //$NON-NLS-1$ - if (isDeleted) - prefix += "<deleted>"; //$NON-NLS-1$ - - String msg = indent + prefix + "["+ total + "]("+root.getType()+", "+root.getName()+")"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ - System.out.println(msg); - for (int i = 0; i < root.getNestedSize(); i++) - { - DataElement currentElement = root.get(i); - total = printTree(indent + " ", total, currentElement); //$NON-NLS-1$ - } - } - return total; - } - - /** - * Indicates that the datastore should transfer a DataElement's buffer - * attribute in the communication layer - * - * @param flag true if the DataElement buffer attribute should be transfered - * @since 3.0 - */ - public void setGenerateBuffer(boolean flag) - { - if (isVirtual()) - { - // client side - ((ClientCommandHandler)_commandHandler).setGenerateBuffer(flag); - } - else - { - // server side - ((ServerUpdateHandler)_updateHandler).setGenerateBuffer(flag); - } - } - - /** - * This method is used to set the Client object for each user. The _client - * variable is null until setClient() is called. After _client is set, it - * can not be changed. - * - * This method should only be called once to associate a particular client - * with a DataStore. By default, the client for the user of the DataStore - * process is set but, when there is an ISystemService, the daemon sets the - * client. - * - * @param client the object of the Client class - * @since 3.0 - */ - public void setClient(Client client) - { - // if client is not null, then this method gets called once. - // subsequent calls will have no effect. - if (_client == null){ - _client = client; - _userPreferencesDirectory = null; - String logDir = getUserPreferencesDirectory(); - - // single process server? - if (SystemServiceManager.getInstance().getSystemService() != null) - { - if (_tracingOn) { - _traceFileHandle = new File(logDir, ".dstoreTrace"); //$NON-NLS-1$ - try - { - _traceFile = new RandomAccessFile(_traceFileHandle, "rw"); //$NON-NLS-1$ - startTracing(); - } - catch (IOException e) - { - } - } - } - assignCacheJar(); - } - } - - /** - * This method is used to get the object of the Client stored for each user. - * - * @return the object of the Client stored for each user - * @since 3.0 - */ - public Client getClient() - { - return _client; - } - - -} diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/DataStoreAttributes.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/DataStoreAttributes.java deleted file mode 100644 index 2a0fa21ab..000000000 --- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/DataStoreAttributes.java +++ /dev/null @@ -1,102 +0,0 @@ -/******************************************************************************** - * Copyright (c) 2006, 2008 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 - * - * 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 McKnight (IBM) - update version to 9.0.0 - * David McKnight (IBM) - [220892] version back to 8.1.0 since protocol hasn't changed - * Martin Oberhuber (Wind River) - [cleanup] Add API "since" Javadoc tags - * David McKnight (IBM) - [226561] [apidoc] Add API markup to RSE Javadocs where extend / implement is allowed - ********************************************************************************/ - -package org.eclipse.dstore.core.model; - -/** - * This class is used to store attributes that are required for configuring a - * remote connection. - * - * @noextend This class is not intended to be subclassed by clients. - * @noinstantiate This class is not intended to be instantiated by clients. - */ -public class DataStoreAttributes -{ - /** - * Datastore Protocol Version. Current value = "DataStore.8.0.0". Will be - * changed with protocol updates (which are only rarely necessary). - */ - public static final String DATASTORE_VERSION = "DataStore.8.0.0"; //$NON-NLS-1$ - - public static final int A_PLUGIN_PATH = 0; - public static final int A_ROOT_NAME = 1; - public static final int A_ROOT_PATH = 2; - public static final int A_HOST_NAME = 3; - public static final int A_HOST_PATH = 4; - public static final int A_HOST_PORT = 5; - public static final int A_LOCAL_NAME = 6; - public static final int A_LOCAL_PATH = 7; - public static final int A_LOG_NAME = 8; - public static final int A_LOG_PATH = 9; - public static final int A_SIZE = 10; - - private String _attributes[]; - - /** - * Constructor - */ - public DataStoreAttributes() - { - _attributes = new String[A_SIZE]; - - // root - _attributes[A_ROOT_NAME] = new String("Local"); //$NON-NLS-1$ - _attributes[A_ROOT_PATH] = new String(""); //$NON-NLS-1$ - - // log - _attributes[A_LOG_NAME] = new String("log"); //$NON-NLS-1$ - _attributes[A_LOG_PATH] = new String("log.xml"); //$NON-NLS-1$ - - // host - _attributes[A_HOST_NAME] = new String(""); //$NON-NLS-1$ - _attributes[A_HOST_PATH] = new String(""); //$NON-NLS-1$ - _attributes[A_HOST_PORT] = new String("4033"); //$NON-NLS-1$ - - // local - _attributes[A_LOCAL_NAME] = new String(""); //$NON-NLS-1$ - _attributes[A_LOCAL_PATH] = new String(""); //$NON-NLS-1$ - } - - /** - * Gets an attribute at a specified index - * @param attributeIndex the index of an attribute - * @return the attribute - */ - public String getAttribute(int attributeIndex) - { - return _attributes[attributeIndex]; - } - - /** - * Set an attribute at a specified index - * @param attributeIndex the index of an attribute - */ - public void setAttribute(int attributeIndex, String attribute) - { - _attributes[attributeIndex] = new String(attribute); - if (attributeIndex == A_PLUGIN_PATH) - { - if (_attributes[A_ROOT_PATH].length() == 0) - { - _attributes[A_ROOT_PATH] = attribute; - } - } - } - -}
\ No newline at end of file diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/DataStoreResources.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/DataStoreResources.java deleted file mode 100644 index b8a354fce..000000000 --- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/DataStoreResources.java +++ /dev/null @@ -1,119 +0,0 @@ -/******************************************************************************** - * Copyright (c) 2006, 2008 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 - * - * 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 McKnight (IBM) - [226561] [apidoc] Add API markup to RSE Javadocs where extend / implement is allowed - ********************************************************************************/ - -package org.eclipse.dstore.core.model; - -/** - * @noextend This class is not intended to be subclassed by clients. - * @noinstantiate This class is not intended to be instantiated by clients. - **/ -public class DataStoreResources -{ - public static final String model_Log_Root="Log Root"; //$NON-NLS-1$ - public static final String model_Tool_Root="Tool Root"; //$NON-NLS-1$ - public static final String model_Set="Set"; //$NON-NLS-1$ - public static final String model_Modify="Modify"; //$NON-NLS-1$ - public static final String model_timeout="timeout"; //$NON-NLS-1$ - public static final String model_data="data"; //$NON-NLS-1$ - public static final String model_transient="transient"; //$NON-NLS-1$ - public static final String model_all="all"; //$NON-NLS-1$ - public static final String model_host="host"; //$NON-NLS-1$ - public static final String model_root="root"; //$NON-NLS-1$ - public static final String model_descriptors="descriptors"; //$NON-NLS-1$ - public static final String model_descriptor_for="descriptor for"; //$NON-NLS-1$ - public static final String model_project="Project"; //$NON-NLS-1$ - public static final String model_log="log"; //$NON-NLS-1$ - public static final String model_deleted="deleted"; //$NON-NLS-1$ - public static final String model_status="status"; //$NON-NLS-1$ - public static final String model_start="start"; //$NON-NLS-1$ - public static final String model_failed="failed"; //$NON-NLS-1$ - public static final String model_done="done"; //$NON-NLS-1$ - public static final String model_working="working"; //$NON-NLS-1$ - public static final String model_progress="progress"; //$NON-NLS-1$ - public static final String model_error="error"; //$NON-NLS-1$ - public static final String model_warning="warning"; //$NON-NLS-1$ - public static final String model_informational="informational"; //$NON-NLS-1$ - public static final String model_markers="markers"; //$NON-NLS-1$ - public static final String model_invocation="invocation"; //$NON-NLS-1$ - public static final String model_pattern="pattern"; //$NON-NLS-1$ - public static final String model_input="input"; //$NON-NLS-1$ - public static final String model_output="output"; //$NON-NLS-1$ - public static final String model_details="details"; //$NON-NLS-1$ - public static final String model_contents="contents"; //$NON-NLS-1$ - public static final String model_contents_arguments="Contents and Arguments"; //$NON-NLS-1$ - public static final String model_parent="parent"; //$NON-NLS-1$ - public static final String model_arguments="arguments"; //$NON-NLS-1$ - public static final String model_Commands="Commands"; //$NON-NLS-1$ - public static final String model_device="device"; //$NON-NLS-1$ - public static final String model_directory="directory"; //$NON-NLS-1$ - public static final String model_folder="folder"; //$NON-NLS-1$ - public static final String model_file="file"; //$NON-NLS-1$ - public static final String model_Filesystem_Objects="Filesystem Objects"; //$NON-NLS-1$ - public static final String model_Container_Object="Container Object"; //$NON-NLS-1$ - public static final String model_Directories="Directories"; //$NON-NLS-1$ - public static final String model_Details="Details"; //$NON-NLS-1$ - public static final String model_miners="miners"; //$NON-NLS-1$ - public static final String model_miner="miner"; //$NON-NLS-1$ - public static final String model_state="state"; //$NON-NLS-1$ - public static final String model_ticket="ticket"; //$NON-NLS-1$ - public static final String model_valid="valid"; //$NON-NLS-1$ - public static final String model_invalid="invalid"; //$NON-NLS-1$ - public static final String model_abstracted_by="abstracted by"; //$NON-NLS-1$ - public static final String model_abstracts="abstracts"; //$NON-NLS-1$ - public static final String model_incomplete="incomplete"; //$NON-NLS-1$ - public static final String model_Miner_Details="Miner Details"; //$NON-NLS-1$ - public static final String model_Hosts="Hosts"; //$NON-NLS-1$ - public static final String model_Tools="Tools"; //$NON-NLS-1$ - public static final String model_Schema="Schema"; //$NON-NLS-1$ - public static final String model_Logged_Commands="Logged Commands"; //$NON-NLS-1$ - public static final String model_Cancel="Cancel"; //$NON-NLS-1$ - public static final String model_Get_Schema="Get Schema"; //$NON-NLS-1$ - public static final String model_Show_Ticket="Show Ticket"; //$NON-NLS-1$ - public static final String model_Init_Miners="Init Miners"; //$NON-NLS-1$ - public static final String model_Set_Host="Set Host"; //$NON-NLS-1$ - public static final String model_Exit="Exit"; //$NON-NLS-1$ - public static final String model_Connect_to="Connect to"; //$NON-NLS-1$ - public static final String model_Disconnect_from="Disconnect from"; //$NON-NLS-1$ - public static final String model_Delete_Connection="Delete Connection"; //$NON-NLS-1$ - public static final String model_time="time"; //$NON-NLS-1$ - public static final String model_property="property"; //$NON-NLS-1$ - public static final String model_start_time="start time"; //$NON-NLS-1$ - public static final String model_command_time="command time"; //$NON-NLS-1$ - public static final String model_Transient_Objects="Transient Objects"; //$NON-NLS-1$ - public static final String model_Data="Data"; //$NON-NLS-1$ - public static final String model_No_input="No input"; //$NON-NLS-1$ - public static final String model_Open="Open"; //$NON-NLS-1$ - public static final String model_Close="Close"; //$NON-NLS-1$ - public static final String model_Refresh="Refresh"; //$NON-NLS-1$ - public static final String model_Query="Query"; //$NON-NLS-1$ - public static final String model_Cancellable="Cancellable"; //$NON-NLS-1$ - - public static final String SERIALIZED_TYPE="SERIALIZED"; //$NON-NLS-1$ - public static final String CLASS_TYPE="CLASS"; //$NON-NLS-1$ - public static final String REQUEST_CLASS_TYPE="REQUEST_CLASS"; //$NON-NLS-1$ - public static final String DEFAULT_CLASSBYTESTREAMHANDLER="default"; //$NON-NLS-1$ - public static final String FILE_TYPE="FILE"; //$NON-NLS-1$ - public static final String DOCUMENT_TYPE="DOCUMENT"; //$NON-NLS-1$ - public static final String DEFAULT_BYTESTREAMHANDLER="default"; //$NON-NLS-1$ - public static final String TRUE="true"; //$NON-NLS-1$ - public static final String FALSE="false"; //$NON-NLS-1$ - public static final String DELETED="deleted"; //$NON-NLS-1$ - public static final String KEEPALIVE_TYPE="KEEPALIVE"; //$NON-NLS-1$ - public static final String KEEPALIVECONFIRM_TYPE="CONFIRMKEEPALIVE"; //$NON-NLS-1$ - public static final String REFERENCE="reference"; //$NON-NLS-1$ - public static final String VALUE="value"; //$NON-NLS-1$ - public static final String SPIRIT="spirit"; //$NON-NLS-1$ -} diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/DataStoreSchema.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/DataStoreSchema.java deleted file mode 100644 index 711aa463e..000000000 --- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/DataStoreSchema.java +++ /dev/null @@ -1,353 +0,0 @@ -/******************************************************************************** - * Copyright (c) 2002, 2008 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 - * - * 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 McKnight (IBM) - [226561] [apidoc] Add API markup to RSE Javadocs where extend / implement is allowed - ********************************************************************************/ - -package org.eclipse.dstore.core.model; - - -/** - * This class is used for defining the base DataStore schema. All - * miner schemas are derived from the schema defined here. This class - * provides getters for quickly getting at commonly used schema descriptors. - * - * @noextend This class is not intended to be subclassed by clients. - * @noinstantiate This class is not intended to be instantiated by clients. - */ -public class DataStoreSchema -{ - - - private DataStore _dataStore; - private DataElement _abstractedBy; - private DataElement _abstracts; - private DataElement _contents; - private DataElement _container; - private DataElement _attributes; - - private DataElement _objectDescriptor; - private DataElement _commandDescriptor; - private DataElement _relationDescriptor; - - private DataElement _abstractObjectDescriptor; - private DataElement _abstractCommandDescriptor; - private DataElement _abstractRelationDescriptor; - - - public static final String C_VALIDATE_TICKET = "C_VALIDATE_TICKET"; //$NON-NLS-1$ - public static final String C_SET = "C_SET"; //$NON-NLS-1$ - public static final String C_MODIFY = "C_MODIFY"; //$NON-NLS-1$ - public static final String C_SET_HOST = "C_SET_HOST"; //$NON-NLS-1$ - public static final String C_SCHEMA = "C_SCHEMA"; //$NON-NLS-1$ - public static final String C_SET_PREFERENCE = "C_SET_PREFERENCE"; //$NON-NLS-1$ - public static final String C_ADD_MINERS = "C_ADD_MINERS"; //$NON-NLS-1$ - public static final String C_ACTIVATE_MINER = "C_ACTIVATE_MINER"; //$NON-NLS-1$ - public static final String C_INIT_MINERS = "C_INIT_MINERS"; //$NON-NLS-1$ - public static final String C_OPEN = "C_OPEN"; //$NON-NLS-1$ - public static final String C_CANCEL = "C_CANCEL"; //$NON-NLS-1$ - public static final String C_SEND_INPUT = "C_SEND_INPUT"; //$NON-NLS-1$ - public static final String C_QUERY = "C_QUERY"; //$NON-NLS-1$ - public static final String C_REFRESH = "C_REFRESH"; //$NON-NLS-1$ - public static final String C_EXIT = "C_EXIT"; //$NON-NLS-1$ - public static final String C_CLOSE = "C_CLOSE"; //$NON-NLS-1$ - public static final String C_NOTIFICATION = "C_NOTIFICATION"; //$NON-NLS-1$ - public static final String C_QUERY_INSTALL = "C_QUERY_INSTALL"; //$NON-NLS-1$ - public static final String C_QUERY_CLIENT_IP = "C_QUERY_CLIENT_IP"; //$NON-NLS-1$ - public static final String C_QUERY_JVM = "C_QUERY_JVM"; //$NON-NLS-1$ - - - /** - * Constructor - * @param dataStore the associated DataStore - */ - public DataStoreSchema(DataStore dataStore) - { - _dataStore = dataStore; - } - - /** - * Returns the <i>abstracted by</i> relationship descriptor - * @return the descriptor - */ - public DataElement getAbstractedByRelation() - { - return _abstractedBy; - } - - /** - * Returns the <i>abstracts</i> relationship descriptor - * @return the descriptor - */ - public DataElement getAbstractsRelation() - { - return _abstracts; - } - - /** - * Returns the <i>contents</i> relationship descriptor - * @return the descriptor - */ - public DataElement getContentsRelation() - { - return _contents; - } - - /** - * Returns the <i>attributes</i> relationship descriptor - * @return the descriptor - */ - public DataElement getAttributesRelation() - { - return _attributes; - } - - /** - * Returns the <i>container</i> base object descriptor - * @return the descriptor - */ - public DataElement getContainerType() - { - return _container; - } - - /** - * Returns the base object descriptor - * @return the descriptor - */ - public DataElement getObjectDescriptor() - { - return _objectDescriptor; - } - - - /** - * Returns the base command descriptor - * @return the descriptor - */ - public DataElement getCommandDescriptor() - { - return _commandDescriptor; - } - - /** - * Returns the base relation descriptor - * @return the descriptor - */ - public DataElement getRelationDescriptor() - { - return _relationDescriptor; - } - - - /** - * Returns the base object descriptor - * @return the descriptor - */ - public DataElement getAbstractObjectDescriptor() - { - return _abstractObjectDescriptor; - } - - - /** - * Returns the base command descriptor - * @return the descriptor - */ - public DataElement getAbstractCommandDescriptor() - { - return _abstractCommandDescriptor; - } - - /** - * Returns the base relation descriptor - * @return the descriptor - */ - public DataElement getAbstractRelationDescriptor() - { - return _abstractRelationDescriptor; - } - - - - /** - * This method is called when the DataStore is initialized. It sets - * up the base DataStore schema. - * @param schemaRoot the root object of the DataStore schema - */ - public void extendSchema(DataElement schemaRoot) - { - // 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); - - _abstractObjectDescriptor = _dataStore.createAbstractObjectDescriptor(schemaRoot, DE.T_ABSTRACT_OBJECT_DESCRIPTOR); - _abstractCommandDescriptor = _dataStore.createAbstractCommandDescriptor(schemaRoot, DE.T_ABSTRACT_COMMAND_DESCRIPTOR); - _abstractRelationDescriptor = _dataStore.createAbstractRelationDescriptor(schemaRoot, DE.T_ABSTRACT_RELATION_DESCRIPTOR); - - // cancellable command base descriptor - DataElement cancellable = _dataStore.createAbstractObjectDescriptor(schemaRoot, DataStoreResources.model_Cancellable); - - DataElement rootD = _dataStore.createObjectDescriptor(schemaRoot, DataStoreResources.model_root); - - DataElement hostD = _dataStore.createObjectDescriptor(schemaRoot, DataStoreResources.model_host); - - DataElement logD = _dataStore.createObjectDescriptor(schemaRoot, DataStoreResources.model_log); - DataElement statusD = _dataStore.createObjectDescriptor(schemaRoot, DataStoreResources.model_status); - -// DataElement deletedD = _dataStore.createObjectDescriptor(schemaRoot, DataStoreResources.model_deleted); - _dataStore.createObjectDescriptor(schemaRoot, DataStoreResources.model_deleted); - - // misc - DataElement allD = _dataStore.createObjectDescriptor(schemaRoot, DataStoreResources.model_all); - -// DataElement invokeD = _dataStore.createObjectDescriptor(schemaRoot, DataStoreResources.model_invocation); - _dataStore.createObjectDescriptor(schemaRoot, DataStoreResources.model_invocation); -// DataElement patternD = _dataStore.createObjectDescriptor(schemaRoot, DataStoreResources.model_pattern); - _dataStore.createObjectDescriptor(schemaRoot, DataStoreResources.model_pattern); - -// DataElement inputD = _dataStore.createObjectDescriptor(schemaRoot, DataStoreResources.model_input); - _dataStore.createObjectDescriptor(schemaRoot, DataStoreResources.model_input); -// DataElement outputD = _dataStore.createObjectDescriptor(schemaRoot, DataStoreResources.model_output); - _dataStore.createObjectDescriptor(schemaRoot, DataStoreResources.model_output); - - // types of relationships - _contents = _dataStore.createRelationDescriptor(schemaRoot, DataStoreResources.model_contents); - _contents.setDepth(100); - - DataElement descriptorForD = _dataStore.createRelationDescriptor(schemaRoot, DataStoreResources.model_descriptor_for); - descriptorForD.setDepth(1); - - DataElement parentD = _dataStore.createRelationDescriptor(schemaRoot, DataStoreResources.model_parent); - parentD.setDepth(1); - - _attributes = _dataStore.createRelationDescriptor(schemaRoot, "attributes"); //$NON-NLS-1$ - _attributes.setDepth(0); - - DataElement argsD = _dataStore.createRelationDescriptor(schemaRoot, DataStoreResources.model_arguments); - _abstracts = _dataStore.createRelationDescriptor(schemaRoot, DataStoreResources.model_abstracts); - - _abstractedBy = _dataStore.createRelationDescriptor(schemaRoot, DataStoreResources.model_abstracted_by); - - DataElement caRelations = _dataStore.createAbstractRelationDescriptor(schemaRoot, DataStoreResources.model_contents_arguments); - _dataStore.createReference(caRelations, _contents, _contents); - _dataStore.createReference(caRelations, argsD, _contents); - - _dataStore.createReference(_objectDescriptor, _contents, _contents); - _dataStore.createReference(_objectDescriptor, parentD, _contents); - _dataStore.createReference(_objectDescriptor, _abstracts, _contents); - _dataStore.createReference(_objectDescriptor, _abstractedBy, _contents); - - _dataStore.createReference(_abstractObjectDescriptor, _contents, _contents); - _dataStore.createReference(_abstractObjectDescriptor, parentD, _contents); - _dataStore.createReference(_abstractObjectDescriptor, _abstracts, _contents); - _dataStore.createReference(_abstractObjectDescriptor, _abstractedBy, _contents); - - _dataStore.createReference(statusD, _contents, _contents); - - _dataStore.createReference(_commandDescriptor, allD, _contents); - _dataStore.createReference(_commandDescriptor, caRelations, _contents); - _dataStore.createReference(_commandDescriptor, argsD, _contents); - _dataStore.createReference(_commandDescriptor, _contents, _contents); - - DataElement logDetails = _dataStore.createAbstractObjectDescriptor(logD, DataStoreResources.model_Commands); - _dataStore.createReference(logDetails, _commandDescriptor, _contents); - _dataStore.createReference(logDetails, allD, _contents); - _dataStore.createReference(logD, caRelations, _contents); - _dataStore.createReference(logD, _contents, _contents); - - //Base Container Object - _container = _dataStore.createAbstractObjectDescriptor(schemaRoot, DataStoreResources.model_Container_Object); - _dataStore.createCommandDescriptor(_container, DataStoreResources.model_Query, "*", C_QUERY, false); //$NON-NLS-1$ - _dataStore.createReference(_container, _contents, _contents); - - // file objects - DataElement fileD = _dataStore.createObjectDescriptor(schemaRoot, DataStoreResources.model_file); - DataElement dirD = _dataStore.createObjectDescriptor(schemaRoot, DataStoreResources.model_directory); - - DataElement fsObject = _dataStore.createAbstractObjectDescriptor(schemaRoot, DataStoreResources.model_Filesystem_Objects); - - - _dataStore.createReference(_container, fsObject, _abstracts, _abstractedBy); - - _dataStore.createReference(fileD, fsObject, _abstracts, _abstractedBy); - _dataStore.createReference(fsObject, dirD, _abstracts, _abstractedBy); - - _dataStore.createReference(fsObject, fileD, _contents); - _dataStore.createReference(fsObject, dirD, _contents); - _dataStore.createReference(fsObject, fsObject, _contents); - - _dataStore.createReference(dirD, fileD, _contents); - _dataStore.createReference(dirD, dirD, _contents); - - // miner descriptors - DataElement minersD = _dataStore.createObjectDescriptor(schemaRoot, DataStoreResources.model_miners); - DataElement minerD = _dataStore.createObjectDescriptor(schemaRoot, DataStoreResources.model_miner); - DataElement dataD = _dataStore.createObjectDescriptor(schemaRoot, DataStoreResources.model_data); -// DataElement transientD = _dataStore.createObjectDescriptor(schemaRoot, DataStoreResources.model_transient); - _dataStore.createObjectDescriptor(schemaRoot, DataStoreResources.model_transient); -// DataElement stateD = _dataStore.createObjectDescriptor(schemaRoot, DataStoreResources.model_state); - _dataStore.createObjectDescriptor(schemaRoot, DataStoreResources.model_state); - // containers - _dataStore.createReference(_container, rootD, _abstracts, _abstractedBy); - _dataStore.createReference(_container, hostD, _abstracts, _abstractedBy); - _dataStore.createReference(_container, logD, _abstracts, _abstractedBy); - _dataStore.createReference(_container, minersD, _abstracts, _abstractedBy); - _dataStore.createReference(_container, minerD, _abstracts, _abstractedBy); - _dataStore.createReference(_container, dataD, _abstracts, _abstractedBy); - - - - // basic commands - _dataStore.createCommandDescriptor(cancellable, DataStoreResources.model_Cancel, "*", C_CANCEL); //$NON-NLS-1$ - _dataStore.createCommandDescriptor(rootD, DataStoreResources.model_Set, "-", C_SET, false); //$NON-NLS-1$ - _dataStore.createCommandDescriptor(rootD, DataStoreResources.model_Set_Host, "-", C_SET_HOST, false); //$NON-NLS-1$ - _dataStore.createCommandDescriptor(rootD, DataStoreResources.model_Init_Miners, "*", C_INIT_MINERS, false); //$NON-NLS-1$ - _dataStore.createCommandDescriptor(rootD, "Add Miners", "-", C_ADD_MINERS, false); //$NON-NLS-1$ //$NON-NLS-2$ - _dataStore.createCommandDescriptor(rootD, "Activate Miner", "-", C_ACTIVATE_MINER, false); //$NON-NLS-1$ //$NON-NLS-2$ - _dataStore.createCommandDescriptor(rootD, "Set Preference", "-", C_SET_PREFERENCE, false); //$NON-NLS-1$ //$NON-NLS-2$ - - _dataStore.createCommandDescriptor(rootD, DataStoreResources.model_Show_Ticket, "-", C_VALIDATE_TICKET, false); //$NON-NLS-1$ - _dataStore.createCommandDescriptor(rootD, DataStoreResources.model_Get_Schema, "*", C_SCHEMA, false); //$NON-NLS-1$ - _dataStore.createCommandDescriptor(rootD, DataStoreResources.model_Exit, "*", C_EXIT, false); //$NON-NLS-1$ - _dataStore.createCommandDescriptor(rootD, "Query Install", "*", C_QUERY_INSTALL, false); //$NON-NLS-1$ //$NON-NLS-2$ - _dataStore.createCommandDescriptor(rootD, "Query Client IP", "*", C_QUERY_CLIENT_IP, false); //$NON-NLS-1$ //$NON-NLS-2$ - _dataStore.createCommandDescriptor(rootD, "Query JVM", "*", C_QUERY_JVM, false); //$NON-NLS-1$ //$NON-NLS-2$ - - _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$ - - - // both ends have this base schema, so mark each descriptor as updated - for (int i = 0; i < schemaRoot.getNestedSize(); i++) - { - DataElement descriptor = schemaRoot.get(i); - descriptor.setUpdated(true); - - for (int j = 0; j < descriptor.getNestedSize(); j++) - { - DataElement subDescriptor = descriptor.get(j); - subDescriptor.setUpdated(true); - } - - schemaRoot.setUpdated(true); - } - } - -}
\ No newline at end of file diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/DefaultDataStoreCompatibilityHandler.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/DefaultDataStoreCompatibilityHandler.java deleted file mode 100644 index 730283781..000000000 --- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/DefaultDataStoreCompatibilityHandler.java +++ /dev/null @@ -1,99 +0,0 @@ -/******************************************************************************** - * Copyright (c) 2008 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 - * - * Initial Contributors: - * The following IBM employees contributed to the Remote System Explorer - * component that contains this file: David McKnight. - * - * Contributors: - * David McKnight (IBM) - [220892][dstore] Backward compatibility: Server and Daemon should support old clients - ********************************************************************************/ -package org.eclipse.dstore.core.model; - -/** - * @since 3.0 - */ -public class DefaultDataStoreCompatibilityHandler implements - IDataStoreCompatibilityHandler { - private DataStore _dataStore; - - public DefaultDataStoreCompatibilityHandler(DataStore dataStore){ - _dataStore = dataStore; - } - - public int checkCompatibility(String handshake){ - - String[] clientVersionStr = DataStoreAttributes.DATASTORE_VERSION.split("\\."); //$NON-NLS-1$ - String[] serverVersionStr = handshake.split("\\."); //$NON-NLS-1$ - - int clientVersion = Integer.parseInt(clientVersionStr[VERSION_INDEX_VERSION]); - int serverVersion = Integer.parseInt(serverVersionStr[VERSION_INDEX_VERSION]); - - if (handshake.equals(DataStoreAttributes.DATASTORE_VERSION)) - { - return HANDSHAKE_CORRECT; - } - else - { - if (handshake.startsWith("<DataElement")) //$NON-NLS-1$ - { - return HANDSHAKE_SERVER_OLDER; - } - else if (serverVersionStr[VERSION_INDEX_PROTOCOL].equals(clientVersionStr[VERSION_INDEX_PROTOCOL])) - { - if (serverVersion == clientVersion) - { - // major versions match so should be compatible - return HANDSHAKE_CORRECT; - } - else - { - if (serverVersion > clientVersion) - { - // newer server - if (serverVersion - 1 == clientVersion) - { - return HANDSHAKE_SERVER_RECENT_NEWER; - } - else - { - return HANDSHAKE_SERVER_NEWER; - } - } - else - { - // newer client - if (serverVersion + 1 == clientVersion) - { - return HANDSHAKE_SERVER_RECENT_OLDER; - } - else if (serverVersion + 2 == clientVersion) - { - // TODO we shouldn't be allowing this but - // wanting to see if old (non-open RSE server still works with open RSE) - return HANDSHAKE_SERVER_RECENT_OLDER; - } - else - { - return HANDSHAKE_SERVER_OLDER; - } - } - } - } - else - { - return HANDSHAKE_INCORRECT; - } - } - } - - public void handleMissingCommand(DataElement descriptor, String keyName){ - // default does nothing in this situation - // System.out.println("missing command:"+keyName); - // System.out.println("Descriptor:"+descriptor.getName()); - } - -} diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/Handler.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/Handler.java deleted file mode 100644 index a05802249..000000000 --- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/Handler.java +++ /dev/null @@ -1,165 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2002, 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 - * - * 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: - * Noriaki Takatsu (IBM) - [220126] [dstore][api][breaking] Single process server for multiple clients - *******************************************************************************/ - -package org.eclipse.dstore.core.model; - -import org.eclipse.dstore.core.server.SecuredThread; - -/** - * The Handler class is the base class for the threaded mechanisms in - * the DataStore. This is a thread that periodically does some activity. - * The frequency of handling can be configured. - */ -public abstract class Handler extends SecuredThread -{ - - - protected int _waitIncrement; - protected boolean _keepRunning; - - /** - * Constructor - */ - public Handler() - { - _keepRunning = true; - _waitIncrement = 100; - } - - /** - * Sets the time interval to wait between handling - * @param value the wait interval - */ - public void setWaitTime(int value) - { - _waitIncrement = value; - } - - /** - * Returns the time interval to wait between handling - * @return the wait interval - */ - public int getWaitTime() - { - return _waitIncrement; - } - - /** - * Sets the associated DataStore - * @param dataStore - */ - public void setDataStore(DataStore dataStore) - { - super.setDataStore(dataStore); - } - - /** - * Indicates whether the handler is finished or not - * @return whether the handler is finished or not - */ - public boolean isFinished() - { - return !_keepRunning; - } - - /** - * Finish handling - */ - public void finish() - { - if (_keepRunning) - { - - _waitIncrement = 0; - _keepRunning = false; - notifyInput(); - - /* causes hang - try - { - interrupt(); - join(); - } - catch (InterruptedException e) - { - System.out.println(e); - } - */ - handle(); - } - } - - /** - * Implemented to provide the periodic activity to be done in a handler. - * This method is called between wait intervals by the handler thread. - */ - public abstract void handle(); - - /** - * Runs the handler loop in a thread. - */ - public void run() - { - super.run(); - while (_keepRunning) - { - /* - try - { - Thread.sleep(_waitIncrement); - Thread.yield(); - } - catch (InterruptedException e) - { - e.printStackTrace(); - finish(); - return; - } - */ - waitForInput(); - - handle(); - } - } - - /** - * Causes the current thread to wait until this class request has been - * fulfilled. - */ - public synchronized void waitForInput() - { - try - { - wait(); - } - catch (InterruptedException e) - { - e.printStackTrace(); - finish(); - return; - } - } - - /** - * Causes all threads waiting for this class request to be filled - * to wake up. - */ - public synchronized void notifyInput() - { - notifyAll(); - } -} diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/IByteConverter.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/IByteConverter.java deleted file mode 100644 index 3f5ce8616..000000000 --- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/IByteConverter.java +++ /dev/null @@ -1,29 +0,0 @@ -/******************************************************************************** - * Copyright (c) 2004, 2006 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 - * - * 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: - * {Name} (company) - description of contribution. - ********************************************************************************/ - -package org.eclipse.dstore.core.model; - -import java.io.File; - -/** - * Interface for converting between host bytes and client bytes - */ -public interface IByteConverter -{ - public void setContext(File file); - public byte[] convertHostBytesToClientBytes(byte[] buffer, int offset, int length); - public byte[] convertClientBytesToHostBytes(byte[] buffer, int offset, int length); -}
\ No newline at end of file diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/IByteStreamHandler.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/IByteStreamHandler.java deleted file mode 100644 index cf7a31d4f..000000000 --- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/IByteStreamHandler.java +++ /dev/null @@ -1,59 +0,0 @@ -/******************************************************************************** - * Copyright (c) 2002, 2006 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 - * - * 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: - * {Name} (company) - description of contribution. - ********************************************************************************/ - -package org.eclipse.dstore.core.model; - -/** - * <p> - * The ByteStreamHandler interface is used to abstract file read and write operations - * across the network. - * - */ -public interface IByteStreamHandler -{ - - /** - * Returns the unique ID for this bytestream handler - * @return the unique id - */ - public String getId(); - - /** - * Save a file in the specified location. This method is called by the - * DataStore when the communication layer receives a file transfer - * - * @param remotePath the path where to save the file - * @param buffer the bytes to insert in the file - * @param size the number of bytes to insert - * @param binary indicates whether to save the bytes as binary or text - */ - public void receiveBytes(String remotePath, byte[] buffer, int size, boolean binary); - - /** - * Append a bytes to a file at a specified location. This method is called by the - * DataStore when the communication layer receives a file transfer append. - * - * @param remotePath the path where to save the file - * @param buffer the bytes to append in the file - * @param size the number of bytes to append in the file - * @param binary indicates whether to save the bytes as binary or text - */ - public void receiveAppendedBytes(String remotePath, byte[] buffer, int size, boolean binary); - - - - -}
\ No newline at end of file diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/IDataStoreCompatibilityHandler.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/IDataStoreCompatibilityHandler.java deleted file mode 100644 index 519831619..000000000 --- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/IDataStoreCompatibilityHandler.java +++ /dev/null @@ -1,50 +0,0 @@ -/******************************************************************************** - * Copyright (c) 2008 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 - * - * Initial Contributors: - * The following IBM employees contributed to the Remote System Explorer - * component that contains this file: David McKnight. - * - * Contributors: - * David McKnight (IBM) - [220892][dstore] Backward compatibility: Server and Daemon should support old clients - ********************************************************************************/ -package org.eclipse.dstore.core.model; - - -/** - * @since 3.0 - */ -public interface IDataStoreCompatibilityHandler { - public static final int HANDSHAKE_INCORRECT = 0; - public static final int HANDSHAKE_SERVER_OLDER = 1; - public static final int HANDSHAKE_CORRECT = 2; - public static final int HANDSHAKE_UNEXPECTED = 3; - public static final int HANDSHAKE_SERVER_NEWER = 4; - public static final int HANDSHAKE_SERVER_RECENT_OLDER = 5; - public static final int HANDSHAKE_SERVER_RECENT_NEWER = 6; - public static final int HANDSHAKE_TIMEOUT = 7; - - public static final int VERSION_INDEX_PROTOCOL = 0; - public static final int VERSION_INDEX_VERSION = 1; - public static final int VERSION_INDEX_MINOR = 2; - - /** - * Checks whether a server is compatible with the current client - * @param handshake the server handshake string in the form <version>.<major>.<miner> - * @return whether this is considered compatible with the client datastore version - */ - public int checkCompatibility(String handshake); - - /** - * This method is called to notify the compatibility handler that a call - * to localDescriptorQuery() failed to return a result. - * - * @param descriptor the object descriptor that the command was looked for under - * @param keyName the value of the command descriptor to look for - */ - public void handleMissingCommand(DataElement descriptor, String keyName); - -} diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/IDataStoreConstants.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/IDataStoreConstants.java deleted file mode 100644 index d2b62b715..000000000 --- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/IDataStoreConstants.java +++ /dev/null @@ -1,32 +0,0 @@ -/******************************************************************************** - * Copyright (c) 2006 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 - * - * 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: - * {Name} (company) - description of contribution. - ********************************************************************************/ - -package org.eclipse.dstore.core.model; - -public interface IDataStoreConstants -{ - public static final String PASSWORD_EXPIRED = "password expired"; //$NON-NLS-1$ - public static final String NEW_PASSWORD_INVALID = "new password not valid"; //$NON-NLS-1$ - public static final String AUTHENTICATION_FAILED = "Authentification Failed"; //$NON-NLS-1$ - public static final String CONNECTED = "connected"; //$NON-NLS-1$ - public static final String UNKNOWN_PROBLEM = "unknown problem connecting to server"; //$NON-NLS-1$ - public static final String SERVER_FAILURE = "server failure: "; //$NON-NLS-1$ - public static final String ATTEMPT_RECONNECT = "attempt reconnect"; //$NON-NLS-1$ - public static final String PORT_OUT_RANGE = "specified port out of range:"; //$NON-NLS-1$ - - public static final String DATASTORE_SPIRIT_DESCRIPTOR = "datastore.spirit"; //$NON-NLS-1$ - public static final String C_START_SPIRIT = "C_START_SPIRIT"; //$NON-NLS-1$ -} diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/IDataStorePreferenceListener.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/IDataStorePreferenceListener.java deleted file mode 100644 index 6f6270fd0..000000000 --- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/IDataStorePreferenceListener.java +++ /dev/null @@ -1,31 +0,0 @@ -/******************************************************************************** - * Copyright (c) 2008 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 - * - * Initial Contributors: - * The following IBM employees contributed to the Remote System Explorer - * component that contains this file: David McKnight. - * - * Contributors: - * David McKnight (IBM) [220123][dstore] Configurable timeout on irresponsiveness - ********************************************************************************/ -package org.eclipse.dstore.core.model; - -/** - * Classes that implement this and add themselves to the DataStore preference - * listeners get called each time a preference is changed. - * - * @since 3.0 - */ -public interface IDataStorePreferenceListener { - - /** - * A DataStore preference has changed - * @param property the property that has changed - * @param value the value of the property - */ - public void preferenceChanged(String property, String value); - -} diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/IDataStoreProvider.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/IDataStoreProvider.java deleted file mode 100644 index b0ae8d0a1..000000000 --- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/IDataStoreProvider.java +++ /dev/null @@ -1,23 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006, 2008 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * 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: - *******************************************************************************/ - -package org.eclipse.dstore.core.model; - - -public interface IDataStoreProvider -{ - public DataStore getDataStore(); -}
\ No newline at end of file diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/IExternalLoader.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/IExternalLoader.java deleted file mode 100644 index 50cf21e93..000000000 --- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/IExternalLoader.java +++ /dev/null @@ -1,34 +0,0 @@ -/******************************************************************************** - * Copyright (c) 2007 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 - * - * Initial Contributors: - * The following IBM employees contributed to the Remote System Explorer - * component that contains this file: David McKnight. - * - * Contributors: - * {Name} (company) - description of contribution. - ********************************************************************************/ -package org.eclipse.dstore.core.model; - -public interface IExternalLoader { - - - /** - * Indicates whether this external loader can load a particular class - * @param source a qualified classname - * @return true if it can load the clas - */ - public boolean canLoad(String source); - - /** - * Loads the specified class - * @param source a qualified classname - * @return the loaded class - * @throws ClassNotFoundException - */ - public Class loadClass(String source) throws ClassNotFoundException; - -} diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/ISSLProperties.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/ISSLProperties.java deleted file mode 100644 index 02b9f49a3..000000000 --- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/ISSLProperties.java +++ /dev/null @@ -1,28 +0,0 @@ -/******************************************************************************** - * Copyright (c) 2006 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 - * - * 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: - * {Name} (company) - description of contribution. - ********************************************************************************/ - -package org.eclipse.dstore.core.model; - -public interface ISSLProperties -{ - public boolean usingSSL(); - public boolean usingServerSSL(); - public String getDaemonKeyStorePassword(); - public String getDaemonKeyStorePath(); - public String getServerKeyStorePassword(); - public String getServerKeyStorePath(); - -}
\ No newline at end of file diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/ISchemaExtender.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/ISchemaExtender.java deleted file mode 100644 index 5e8aed432..000000000 --- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/ISchemaExtender.java +++ /dev/null @@ -1,49 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2002, 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 - * - * 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: - * {Name} (company) - description of contribution. - *******************************************************************************/ - -package org.eclipse.dstore.core.model; - - - -/** - * ISchemaExtender describes the interfaces that tool extensions - * need to implement to add or extend other schemas in the DataStore. - */ -public interface ISchemaExtender -{ - - - /** - * Add this tool's schema to the global DataStore schema. - * This interface must be implemented by each miner in order to - * populate the DataStore schema with information about this tool's - * object model and information about how to communicate with the - * tool from objects available to the user interface. - * - * @param schemaRoot the descriptor root - */ - public abstract void extendSchema(DataElement schemaRoot); - - /** - * Implement this to returns the external class loader for this extender - * implementation. In order for a tool extension to be loaded by the DataStore, it's - * class loader needs to be supplied. - * - * @return the external loader - */ - public abstract IExternalLoader getExternalLoader(); -} diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/ISchemaRegistry.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/ISchemaRegistry.java deleted file mode 100644 index 79ac140db..000000000 --- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/ISchemaRegistry.java +++ /dev/null @@ -1,50 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2002, 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 - * - * 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: - * {Name} (company) - description of contribution. - *******************************************************************************/ - -package org.eclipse.dstore.core.model; - - -/** - * ISchemaRegistry describes the interface that needs to be - * implemented for external tools to contribute their - * schemas to the DataStore. - */ -public interface ISchemaRegistry -{ - - /** - * This method gets called when a new schema extender needs to be - * registered. - * - * @param extender the new schema extender - */ - public void registerSchemaExtender(ISchemaExtender extender); - - /** - * This method is responsible for calling <code>extendSchema</code> on - * each of the registered schema extenders. - * @param dataStore the DataStore for which the schema will be extended - */ - public void extendSchema(DataStore dataStore); - - /** - * Returns an <code>IExternalLoader</code> for the specified qualified class name - * @param qualifiedClassName the qualified class name of an external tool - * @return the external loader that can load to specified class - */ - public IExternalLoader getLoaderFor(String qualifiedClassName); -} diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/UpdateHandler.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/UpdateHandler.java deleted file mode 100644 index f11ff6545..000000000 --- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/UpdateHandler.java +++ /dev/null @@ -1,304 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2002, 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 - * - * 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 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 - *******************************************************************************/ - -package org.eclipse.dstore.core.model; - -import java.util.ArrayList; -import java.util.List; - -import org.eclipse.dstore.core.java.IRemoteClassInstance; -import org.eclipse.dstore.internal.core.util.DataElementRemover; - -/** - * <p> - * Abstract class for handling updates. A <code>UpdateHandler</code> is a - * <code>Handler</code> that contains a queue of data responses to be sent to - * the client. Each DataStore instance uses a single update handler that - * periodically sends it's data queue either to a client or directly to a domain - * listener on the client. - * </p> - * <p> - * The UpdateHandler is the means by which the DataStore sends information or - * files from the remote tools to the client. - * </p> - * - * @noextend This class is not intended to be subclassed by clients. - */ -public abstract class UpdateHandler extends Handler -{ - - - protected ArrayList _dataObjects; - protected ArrayList _classesToSend; - - /** - * Constructor - */ - public UpdateHandler() - { - setName("DStore UpdateHandler"+getName()); //$NON-NLS-1$ - _dataObjects = new ArrayList(); - _classesToSend = new ArrayList(); - } - - /** - * Periodically called on the handler thread to sends data updates. - */ - public void handle() - { - if (!_dataObjects.isEmpty() || !_classesToSend.isEmpty()) - { - sendUpdates(); - } - } - - protected void clean(DataElement object) - { - clean(object, 2); - } - - protected void clean(DataElement object, int depth) - { - if ((depth > 0) && (object != null) && object.getNestedSize() > 0) - { - List deletedList = _dataStore.findDeleted(object); - - for (int i = 0; i < deletedList.size(); i++) - { - DataElement child = (DataElement) deletedList.get(i); - 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(); - } - child.clear(); - - 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 - * @param parent - */ - protected void cleanChildren(DataElement parent) - { - 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(); - } - child.clear(); - parent.removeNestedData(child); - } - } - } - - /** - * Adds a set of data objects to the update queue - * @param objects a set of objects to get updated - */ - public void update(ArrayList objects) - { - for (int i = 0; i < objects.size(); i++) - { - update((DataElement) objects.get(i)); - } - } - - /** - * Adds an object to the update queue - * @param object an object to get updated - */ - public void update(DataElement object) - { - update(object, false); - } - - /** - * Adds an object to the update queue - * @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(); - } - else - { - if (!_dataObjects.contains(object)) - { - _dataObjects.add(object); - } - else - { - - if (_dataStore != null && object != null && !object.isDeleted()) - { - if (object.getType().equals(DataStoreResources.model_status)) - { - if (object.getName().equals(DataStoreResources.model_done)) - { - //DKM - // 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); - } - } - } - } - } - } - notifyInput(); - } - - /** - * Causes the current thread to wait until this class request has been - * fulfilled. - */ - public synchronized void waitForInput() - { - if (_dataObjects.size() == 0 && _classesToSend.size() == 0) - { - super.waitForInput(); - } - } - - /** - * Implemented to provide the means by which updates on the queue are sent. - */ - public abstract void sendUpdates(); - - - /** - * Implemented to provide the means by which files are sent - * @param path the path of the file to send - * @param bytes the bytes to send - * @param size the number of bytes to send - * @param binary indicates whether to send the bytes as binary or text - */ - public abstract void updateFile(String path, byte[] bytes, int size, boolean binary); - - /** - * Implemented to provide the means by which files are sent and appended - * @param path the path of the file to send - * @param bytes the bytes to send - * @param size the number of bytes to send - * @param binary indicates whether to send the bytes as binary or text - */ - public abstract void updateAppendFile(String path, byte[] bytes, int size, boolean binary); - - /** - * Implemented to provide the means by which files are sent - * @param path the path of the file to send - * @param bytes the bytes to send - * @param size the number of bytes to send - * @param binary indicates whether to send the bytes as binary or text - * @param byteStreamHandlerId indicates the byte stream handler to receive the bytes - */ - public abstract void updateFile(String path, byte[] bytes, int size, boolean binary, String byteStreamHandlerId); - - /** - * Implemented to provide the means by which files are sent and appended - * @param path the path of the file to send - * @param bytes the bytes to send - * @param size the number of bytes to send - * @param binary indicates whether to send the bytes as binary or text - * @param byteStreamHandlerId indicates the byte stream handler to receive the bytes - */ - public abstract void updateAppendFile(String path, byte[] bytes, int size, boolean binary, String byteStreamHandlerId); - - /** - * Implemented to provide the means by which classes are requested - * across the comm channel. - * @param className the name of the class to request - */ - public abstract void requestClass(String className); - - /** - * Implemented to provide the means by which keepalive requests are sent - * across the comm channel. - */ - public abstract void sendKeepAliveRequest(); - - /** - * Impleted to provide the means by which a class on the host is updated on the client - * @param runnable - * @param deserializebyteStreamHandlerId - */ - public abstract void updateClassInstance(IRemoteClassInstance runnable, String deserializebyteStreamHandlerId); - - /** - * Implemented to provide the means by which classes are sent - * across the comm channel. - * @param className the name of the class to send - */ - public abstract void sendClass(String className); - - /** - * Implemented to provide the means by which classes are sent - * across the comm channel. - * @param className the name of the class to send - * @param classByteStreamHandlerId indicates which class byte stream handler to receive the class with - */ - public abstract void sendClass(String className, String classByteStreamHandlerId); - - /** - * Implemented to provide the means by which keepalive confirmations are sent - * across the comm channel. - */ - public abstract void sendKeepAliveConfirmation(); - -} diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/server/ConnectionEstablisher.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/server/ConnectionEstablisher.java deleted file mode 100644 index c2934f01e..000000000 --- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/server/ConnectionEstablisher.java +++ /dev/null @@ -1,514 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2002, 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 - * - * 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 McKnight (IBM) [220123][dstore] Configurable timeout on irresponsiveness - * David McKnight (IBM) [220892][dstore] Backward compatibility: Server and Daemon should support old clients - * Noriaki Takatsu (IBM) - [220126] [dstore][api][breaking] Single process server for multiple clients - * David McKnight (IBM) [224906] [dstore] changes for getting properties and doing exit due to single-process capability - * Jacob Garcowski (IBM) [225175] [dstore] error handling change for Client - * David McKnight (IBM) - [225507][api][breaking] RSE dstore API leaks non-API types - * Noriaki Takatsu (IBM) - [226074] process for getStatus() API - * Noriaki Takatsu (IBM) - [226237] [dstore] Move the place where the ServerLogger instance is made - * David McKnight (IBM) - [226561] [apidoc] Add API markup to RSE Javadocs where extend / implement is allowed - * Noriaki Takatsu (IBM) - [242968] [multithread] serverSocket must be closed when an exception happens in Accept - *******************************************************************************/ - -package org.eclipse.dstore.core.server; - -import java.io.BufferedWriter; -import java.io.IOException; -import java.io.OutputStreamWriter; -import java.io.PrintWriter; -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 javax.net.ssl.SSLContext; -import javax.net.ssl.SSLSession; -import javax.net.ssl.SSLSocket; - -import org.eclipse.dstore.core.model.Client; -import org.eclipse.dstore.core.model.DE; -import org.eclipse.dstore.core.model.DataElement; -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.server.ServerAttributes; -import org.eclipse.dstore.internal.core.server.ServerCommandHandler; -import org.eclipse.dstore.internal.core.server.ServerReturnCodes; -import org.eclipse.dstore.internal.core.server.ServerSSLProperties; -import org.eclipse.dstore.internal.core.server.ServerUpdateHandler; -import org.eclipse.dstore.internal.core.util.ExternalLoader; -import org.eclipse.dstore.internal.core.util.Sender; -import org.eclipse.dstore.internal.core.util.ssl.DStoreSSLContext; - -/** - * ConnectionEstablisher is responsible for managing the server DataStore and - * facilitating the communication between client and server DataStores. - * - * @noextend This class is not intended to be subclassed by clients. - * @noinstantiate This class is not intended to be instantiated by clients. - * - * @since 3.0 moved from non-API to API - */ -public class ConnectionEstablisher -{ - - - private ServerSocket _serverSocket; - private static boolean _continue; - - private ArrayList _receivers; - - private ServerCommandHandler _commandHandler; - private ServerUpdateHandler _updateHandler; - - private ServerAttributes _serverAttributes = new ServerAttributes(); - private DataStore _dataStore; - - private int _maxConnections; - private int _timeout; - private String _msg; - - - /** - * Creates the default ConnectionEstablisher. Communication occurs - * on a default port, there is no timeout and no ticket is required - * for a client to work with the DataStore. - * - */ - public ConnectionEstablisher() - { - String port = _serverAttributes.getAttribute(DataStoreAttributes.A_HOST_PORT); - setup(port, null, null); - } - - /** - * Creates a ConnectionEstablisher. Communication occurs - * on the specified port, there is no timeout and no ticket is required - * for a client to work with the DataStore. - * - * @param port the number of the socket port - */ - public ConnectionEstablisher(String port) - { - setup(port, null, null); - } - - /** - * Creates a ConnectionEstablisher. Communication occurs - * on the specified port, a timeout value indicates the idle wait - * time before shutting down, and no ticket is required - * for a client to work with the DataStore. - * - * @param port the number of the socket port - * @param timeout the idle duration to wait before shutting down - */ - public ConnectionEstablisher(String port, String timeout) - { - setup(port, timeout, null); - } - - /** - * Creates a ConnectionEstablisher. Communication occurs - * on the specified port, 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 timeout the idle duration to wait before shutting down - * @param ticket validation id required by the client to access the DataStore - */ - public ConnectionEstablisher(String port, String timeout, String ticket) - { - setup(port, timeout, ticket); - } - - - /** - * Starts the run loop for the ConnectionEstablisher. - */ - public void start() - { - run(); - } - - - - /** - * Returns the DataStore. - * - * @return the DataStore - */ - public DataStore getDataStore() - { - return _dataStore; - } - - /** - * Return the Server port opened for this client - * - * @return the Server port opened for this client - */ - public int getServerPort() - { - if (_serverSocket != null) - { - return _serverSocket.getLocalPort(); - } - - return -1; - } - - /** - * Return the connection status for this client - * - * * @return the connection status for this client - */ - public String getStatus() - { - return _msg; - } - - /** - * Tells the connection establisher to clean up and shutdown - */ - public void finished(ServerReceiver receiver) - { - _updateHandler.removeSenderWith(receiver.socket()); - _receivers.remove(receiver); - _dataStore.removeDataStorePreferenceListener(receiver); - //if (_receivers.size() == 0) - { - _continue = false; - _commandHandler.finish(); - _updateHandler.finish(); - _dataStore.finish(); - System.out.println(ServerReturnCodes.RC_FINISHED); - - if (SystemServiceManager.getInstance().getSystemService() == null) - System.exit(0); - } - } - - private void waitForConnections() - { - while (_continue == true) - { - try - { - Socket newSocket = _serverSocket.accept(); - if (_dataStore.usingSSL()) - { - - // wait for connection - SSLSocket sslSocket = (SSLSocket)newSocket; - sslSocket.setUseClientMode(false); - sslSocket.setNeedClientAuth(false); - SSLSession session = sslSocket.getSession(); - - if (session == null) - { - System.out.println("handshake failed"); //$NON-NLS-1$ - sslSocket.close(); - return; - } - } - - doHandShake(newSocket); - newSocket.setKeepAlive(true); - - ServerReceiver receiver = new ServerReceiver(newSocket, this); - _dataStore.addDataStorePreferenceListener(receiver); - - if (_dataStore.getClient() != null) - _dataStore.getClient().setServerReceiver(receiver); - - Sender sender = new Sender(newSocket, _dataStore); - - // add this connection to list of elements - _receivers.add(receiver); - _updateHandler.addSender(sender); - - receiver.start(); - - if (_receivers.size() == 1) - { - _updateHandler.start(); - _commandHandler.start(); - } - - if (_receivers.size() == _maxConnections) - { - _continue = false; - _serverSocket.close(); - - } - } - catch (IOException ioe) - { - System.err.println(ServerReturnCodes.RC_CONNECTION_ERROR); - System.err.println("Server: error initializing socket: " + ioe); //$NON-NLS-1$ - _msg = ioe.toString(); - try - { - _serverSocket.close(); - } - catch (Throwable e) - { - - } - _continue = false; - } - } - } - - - - - private ServerSocket createSocket(String portStr) throws UnknownHostException - { - ServerSocket serverSocket = null; - SSLContext sslContext = null; - // port - int port = 0; - - if (_dataStore.usingSSL()) - { - String keyStoreFileName = _dataStore.getKeyStoreLocation(); - String keyStorePassword = _dataStore.getKeyStorePassword(); - - try - { - sslContext = DStoreSSLContext.getServerSSLContext(keyStoreFileName, keyStorePassword); - } - catch (Exception e) - { - - } - } - - // determine if portStr is a port range or just a port - String[] range = portStr.split("-"); //$NON-NLS-1$ - if (range.length == 2) - { - int lPort = 0; - int hPort = 0; - try - { - lPort = Integer.parseInt(range[0]); - hPort = Integer.parseInt(range[1]); - } - catch (Exception e) - { - } - - for (int i = lPort; i < hPort; i++) - { - // create server socket from port - try - { - if (_dataStore.usingSSL() && sslContext != null) - { - try - { - serverSocket = sslContext.getServerSocketFactory().createServerSocket(i); - } - catch (Exception e) - { - e.printStackTrace(); - } - } - else - { - serverSocket = new ServerSocket(i); - } - } - catch (Exception e) - { - _dataStore.trace(e); - } - if (serverSocket != null && serverSocket.getLocalPort() > 0) - { - return serverSocket; - } - } - } - else - { - port = Integer.parseInt(portStr); - - - // create server socket from port - if (_dataStore.usingSSL() && sslContext != null) - { - try - { - serverSocket = sslContext.getServerSocketFactory().createServerSocket(port); - } - catch (Exception e) - { - _dataStore.trace(e); - } - } - else - { - try - { - serverSocket = new ServerSocket(port); - } - catch (Exception e) - { - _dataStore.trace(e); - } - } - } - return serverSocket; - } - - /** - * Create the DataStore and initializes it's handlers and communications. - * - * @param portStr the number of the socket port - * @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, String timeoutStr, String ticketStr) - { - _maxConnections = 1; - - - ArrayList loaders = new ArrayList(); - loaders.add(new ExternalLoader(getClass().getClassLoader(), "*")); //$NON-NLS-1$ - _commandHandler = new ServerCommandHandler(loaders); - _updateHandler = new ServerUpdateHandler(); - - ISSLProperties sslProperties = new ServerSSLProperties(); - - _dataStore = new DataStore(_serverAttributes, _commandHandler, _updateHandler, null); - _dataStore.setSSLProperties(sslProperties); - - DataElement ticket = _dataStore.getTicket(); - ticket.setAttribute(DE.A_NAME, ticketStr); - - _updateHandler.setDataStore(_dataStore); - _commandHandler.setDataStore(_dataStore); - - if (SystemServiceManager.getInstance().getSystemService() == null) - { - Client client = new Client(); - _dataStore.setClient(client); - ServerLogger logger = new ServerLogger(_dataStore.getUserPreferencesDirectory()); - client.setLogger(logger); - } - - _receivers = new ArrayList(); - _continue = true; - - try - { - - _serverSocket = createSocket(portStr); - if (_serverSocket == null) - { - System.err.println(ServerReturnCodes.RC_BIND_ERROR); - _msg = ServerReturnCodes.RC_BIND_ERROR; - _continue = false; - } - else - { - // timeout - if (timeoutStr != null) - { - _timeout = Integer.parseInt(timeoutStr); - } - else - { - _timeout = 120000; - } - - if (_timeout > 0) - { - _serverSocket.setSoTimeout(_timeout); - } - - 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 - } - } - } - catch (UnknownHostException e) - { - System.err.println(ServerReturnCodes.RC_UNKNOWN_HOST_ERROR); - _msg = ServerReturnCodes.RC_UNKNOWN_HOST_ERROR; - _continue = false; - } - catch (BindException e) - { - System.err.println(ServerReturnCodes.RC_BIND_ERROR); - _msg = ServerReturnCodes.RC_BIND_ERROR; - _continue = false; - } - catch (IOException e) - { - System.err.println(ServerReturnCodes.RC_GENERAL_IO_ERROR); - _msg = ServerReturnCodes.RC_GENERAL_IO_ERROR; - _continue = false; - } - catch (SecurityException e) - { - System.err.println(ServerReturnCodes.RC_SECURITY_ERROR); - _msg = ServerReturnCodes.RC_SECURITY_ERROR; - _continue = false; - } - } - - private void run() - { - waitForConnections(); - } - - private void doHandShake(Socket socket) - { - try - { - BufferedWriter bwriter = new BufferedWriter(new OutputStreamWriter(socket.getOutputStream(), DE.ENCODING_UTF_8)); - PrintWriter writer = new PrintWriter(bwriter); - - String version = DataStoreAttributes.DATASTORE_VERSION; - String preferenceVersion = System.getProperty("DSTORE_VERSION"); //$NON-NLS-1$ - if (preferenceVersion != null && preferenceVersion.length() > 0){ - version = preferenceVersion; - } - writer.println(version); - writer.flush(); - } - catch (IOException e) - { - System.out.println(e); - } - - } -} diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/server/IServerLogger.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/server/IServerLogger.java deleted file mode 100644 index 862282b21..000000000 --- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/server/IServerLogger.java +++ /dev/null @@ -1,54 +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 - * - * Initial Contributors: - * The following IBM employees contributed to the Remote System Explorer - * component that contains this file: Noriaki Takatsu and Masao Nishimoto - - * Contributors: - * Noriaki Takatsu (IBM) - [220126] [dstore][api][breaking] Single process server for multiple clients - *******************************************************************************/ - -package org.eclipse.dstore.core.server; - -/** - * @since 3.0 - */ -public interface IServerLogger -{ - /** - * logInfo - * - * @param minerName - * @param message Message text to be logged. - */ - public void logInfo(String minerName, String message); - - /** - * logWarning - * - * @param minerName - * @param message Message text to be logged. - */ - public void logWarning(String minerName, String message); - - /** - * logError - * - * @param minerName - * @param message Message text to be logged. - * @param exception Exception that generated the error. Used to print a stack trace. - */ - public void logError(String minerName, String message, Throwable exception); - - /** - * logDebugMessage - * @param minerName - * @param message Message text to be logged. - */ - public void logDebugMessage(String minerName, String message); -} diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/server/ISystemService.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/server/ISystemService.java deleted file mode 100644 index 90137a4e6..000000000 --- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/server/ISystemService.java +++ /dev/null @@ -1,41 +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 - * - * Initial Contributors: - * The following IBM employees contributed to the Remote System Explorer - * component that contains this file: Noriaki Takatsu and Masao Nishimoto - * - * Contributors: - * Noriaki Takatsu (IBM) - [220126] [dstore][api][breaking] Single process server for multiple clients - *******************************************************************************/ - - -package org.eclipse.dstore.core.server; - -import org.eclipse.dstore.core.model.Client; - -/** - * @since 3.0 - */ -public interface ISystemService -{ - /** - * This method is used to establish a thread-level security. - * - * @param client the object of the client - */ - public void setThreadSecurity(Client client); - - /** - * This method is used to execute run() in a thread assigned - * from thread pools. - * - * @param securedThread the securedThread object that implements - * Runnable. - */ - public void executeThread(SecuredThread securedThread); -} diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/server/SecuredThread.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/server/SecuredThread.java deleted file mode 100644 index ed2f97cf1..000000000 --- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/server/SecuredThread.java +++ /dev/null @@ -1,173 +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 - * - * Initial Contributors: - * The following IBM employees contributed to the Remote System Explorer - * component that contains this file: Noriaki Takatsu and Masao Nishimoto - * - * Contributors: - * Noriaki Takatsu (IBM) - [220126] [dstore][api][breaking] Single process server for multiple clients - * Noriaki Takatsu (IBM) - [228335] [dstore][multithread] start() in SecuredThread class - *******************************************************************************/ - -package org.eclipse.dstore.core.server; - - -import java.io.PrintWriter; - -import org.eclipse.dstore.core.model.DataStore; - -/** - * @since 3.0 - */ -public class SecuredThread extends Thread -{ - - public DataStore _dataStore; - - - /** - * Constructs a new SecuredThread without a DataStore. In this case, the DataStore - * needs to be set sometime after creation via <code>setDataStore(DataStore)</code>. - */ - public SecuredThread() { - } - - /** - * Constructs a new SecuredThread given a DataStore. - * - * @param dataStore used to extract user id and password for a client - */ - public SecuredThread(DataStore dataStore) - { - this(null, dataStore); - } - - - /** - * Constructs a new SecuredThread with a DataStore and a runnable. After - * the thread starts, the runnable will be implicitly executed. - * - * @param runnable the runnable to be executed by the thread - * @param dataStore used to extract user id and password for a client - */ - public SecuredThread(Runnable runnable, DataStore dataStore) { - super(runnable); - _dataStore = dataStore; - } - - - /** - * Constructs a new SecuredThread with a DataStore, a runnable and name for the thread. - * After the thread starts, the runnable will be implicitly executed. - * - * @param runnable the runnable to be executed by the thread - * @param threadName the name for the SecuredThread being created - * @param dataStore used to extract user id and password for a client - */ - public SecuredThread(Runnable runnable, String threadName, DataStore dataStore) { - this(null, runnable, threadName, dataStore); - } - - /** - * Constructs a new SecuredThread with a DataStore, a runnable and a ThreadGroup. - * After the thread starts, the runnable will be implicitly executed. - * - * @param group the thread group for which this thread will belong - * @param runnable the runnable to be executed by the thread - * @param dataStore used to extract user id and password for a client - */ - public SecuredThread(ThreadGroup group, Runnable runnable, DataStore dataStore) { - super(group, runnable); - _dataStore = dataStore; - } - - - /** - * Constructs a new SecuredThread with a DataStore, a runnable, a name and a ThreadGroup. - * After the thread starts, the runnable will be implicitly executed. - * - * @param group the thread group for which this thread will belong - * @param runnable the runnable to be executed by the thread - * @param threadName the name for the SecuredThread being created - * @param dataStore used to extract user id and password for a client - */ - public SecuredThread(ThreadGroup group, Runnable runnable, String threadName, DataStore dataStore) { - super(group, runnable, threadName); - _dataStore = dataStore; - } - - - /** - * Sets the DataStore associated with the client - * @param dataStore - */ - public void setDataStore(DataStore dataStore) - { - _dataStore = dataStore; - } - - - /** - * When run() is called, a check is made to see if there is an ISystemService. If there is - * the <code>ISystemService.setThreadSecurity(Client)</code> is called before <code>Thread.run()</code> - * is called. - * - * If a Runnable was passed into the constructor for SecuredThread then, when <code>Thread.run()</code> - * is called, the Runnable will be invoked. - */ - public void run() - { - try - { - ISystemService systemService = SystemServiceManager.getInstance().getSystemService(); - if (systemService != null){ - systemService.setThreadSecurity(_dataStore.getClient()); - } - } - catch (Throwable e) - { - e.printStackTrace(new PrintWriter(System.err)); - } - - super.run(); - } - - /** - * - * As per bug 228335, this is commented out. - * - * When start() is called, a check is made to see if there is an ISystemService. - * If there is, the <code>ISystemService.executeThread(SecuredThread)</code> is called. - * In this case, the run() method is invoked in a thread assigned from the running - * work threads - * If there isn't, the <code>super.start()</code> is called. - * In this case. the run() method is invoked as a new thread. - - public void start() - { - - try - { - - ISystemService systemService = SystemServiceManager.getInstance().getSystemService(); - if (systemService != null){ - systemService.executeThread(this); - } - else - { - super.start(); - } - } - catch(Throwable e) - { - e.printStackTrace(new PrintWriter(System.err)); - } - } - */ -} - diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/server/Server.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/server/Server.java deleted file mode 100644 index cfe1040f9..000000000 --- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/server/Server.java +++ /dev/null @@ -1,183 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2002, 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 - * - * 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: - * Noriaki Takatsu (IBM) - [220126] [dstore][api][breaking] Single process server for multiple clients - * 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 - *******************************************************************************/ - -package org.eclipse.dstore.core.server; - -import java.util.StringTokenizer; - -import org.eclipse.dstore.internal.core.server.ServerReturnCodes; - -/** - * Server is the standard way of instantiating and controlling a remote DataStore. - * The server runs a ConnectionEstablisher which manages client connections to - * the DataStore. - * - * @noextend This class is not intended to be subclassed by clients. - */ -public class Server implements Runnable -{ - - private ConnectionEstablisher _establisher; - - /** - * The startup interface to run the Server. - * - * @param args a list of arguments for running the server. These consist of - * the socket port to wait on, the timeout value, and the the ticket - */ - public static void main(String[] args) - { - //Tell the Launcher that we are starting - System.err.println(ServerReturnCodes.RC_DSTORE_SERVER_MAGIC); - - String jversion = System.getProperty("java.version"); //$NON-NLS-1$ - - StringTokenizer tokenizer = new StringTokenizer(jversion, "."); //$NON-NLS-1$ - try - { - String[] vers = new String[3]; - vers[0] = tokenizer.nextToken(); - vers[1] = tokenizer.nextToken(); - - int version = Integer.parseInt(vers[0]); - int major = Integer.parseInt(vers[1]); - - - if (version >= 1 && major >= 4) - { - // version is good - } - else - { - // version is bad - System.err.println(ServerReturnCodes.RC_JRE_VERSION_ERROR); - if (SystemServiceManager.getInstance().getSystemService() == null) - System.exit(-1); - } - } - catch (Exception e) - { - // version is bad - System.err.println(ServerReturnCodes.RC_JRE_VERSION_ERROR); - if (SystemServiceManager.getInstance().getSystemService() == null) - System.exit(-1); - } - - try - { - Server theServer = null; - switch (args.length) - { - case 0 : - theServer = new Server(); - break; - case 1 : - theServer = new Server(args[0]); - break; - case 2 : - theServer = new Server(args[0], args[1]); - break; - case 3 : - theServer = new Server(args[0], args[1], args[2]); - break; - default : - break; - } - - - if (theServer != null) - { - theServer.run(); - } - } - catch (SecurityException e) - { - System.err.println(ServerReturnCodes.RC_SECURITY_ERROR); - throw e; // Optional - } - } - - /** - * Creates a new Server with default DataStore and connection attributes. - * - */ - public Server() - { - _establisher = new ConnectionEstablisher(); - } - - /** - * Creates a new Server that waits on the specified socket port. - * - * @param port the number of the socket port to wait on - */ - public Server(String port) - { - _establisher = new ConnectionEstablisher(port); - } - - /** - * Creates a new Server that waits on the specified socket port for - * the specified time interval before shutting down. - * - * @param port the number of the socket port to wait on - * @param timeout the idle time to wait before shutting down - */ - public Server(String port, String timeout) - { - _establisher = new ConnectionEstablisher(port, timeout); - } - - /** - * Creates a new Server that waits on the specified socket port for - * the specified time interval before shutting down. - * - * @param port the number of the socket port to wait on - * @param timeout the idle time to wait before shutting down - * @param ticket the ticket that the client needs to interact with the DataStore - */ - public Server(String port, String timeout, String ticket) - { - _establisher = new ConnectionEstablisher(port, timeout, ticket); - } - - - /** - * Runs the server by starting the ConnectionEstablisher - */ - public void run() - { - _establisher.start(); - } - - - /** - * Return the reference for the ConnectionEstablisher for this client - * - * @return the the reference for the ConnectionEstablisher instance for this - * client - * @since 3.0 - */ - public ConnectionEstablisher getEstablisher() - { - return _establisher; - } - -} diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/server/ServerLauncher.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/server/ServerLauncher.java deleted file mode 100644 index 5f6fdef60..000000000 --- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/server/ServerLauncher.java +++ /dev/null @@ -1,686 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2002, 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 - * - * 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 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 - *******************************************************************************/ - -package org.eclipse.dstore.core.server; - -import java.io.BufferedReader; -import java.io.BufferedWriter; -import java.io.File; -import java.io.IOException; -import java.io.InputStreamReader; -import java.io.OutputStreamWriter; -import java.io.PrintWriter; -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 javax.net.ssl.HandshakeCompletedEvent; -import javax.net.ssl.HandshakeCompletedListener; -import javax.net.ssl.SSLContext; -import javax.net.ssl.SSLSession; -import javax.net.ssl.SSLSocket; - -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.server.ServerReturnCodes; -import org.eclipse.dstore.internal.core.server.ServerSSLProperties; -import org.eclipse.dstore.internal.core.util.ssl.DStoreSSLContext; - -/** - * This class is the DataStore daemon. It is used for authenticating users, - * launching DataStore servers under particular user IDs, and providing a client - * with enough information to connect to a launched server. - * - */ -public class ServerLauncher extends Thread { - - /** - * An instances of this class get loaded whenever a client requests access - * to a DataStore server. The ConnectionListener attempts to launch a server - * under the client user's ID, communicating back information to the client - * so that if may connect to the launched server. If the authentification - * and connection to the server are successful, ConnectionListener continues - * to monitor the server connection until it is terminated. - */ - public class ConnectionListener extends Thread implements - HandshakeCompletedListener { - - private Socket _socket; - - private PrintWriter _writer; - - private BufferedReader _reader; - - private Process _serverProcess; - - private String _port; - - private boolean _done; - - private BufferedReader _outReader; - - private BufferedReader _errReader; - - /** - * Constructor - * - * @param socket - * a socket to the daemon - */ - public ConnectionListener(Socket socket) { - - _socket = socket; - try { - _writer = new PrintWriter(new OutputStreamWriter(_socket - .getOutputStream(), DE.ENCODING_UTF_8)); - _reader = new BufferedReader(new InputStreamReader(_socket - .getInputStream(), DE.ENCODING_UTF_8)); - } catch (java.io.IOException e) { - System.out.println("ServerLauncher:" + e); //$NON-NLS-1$ - } - } - - /** - * Called when shutdown - */ - public void finalize() throws Throwable { - if (_serverProcess != null) { - _serverProcess.destroy(); - } - super.finalize(); - } - - /** - * Listens to the connection and prints any output while the connection - * is active - */ - public void run() { - _done = true; - if (listen()) { - if (_serverProcess != null) { - _done = false; - - try { - String line = null; - - while ((_outReader != null) - && ((line = _outReader.readLine()) != null)) { - if (line.equals(ServerReturnCodes.RC_FINISHED)) { - break; - } else { - System.out.println(line); - } - } - - if (_outReader != null) { - _outReader.close(); - } - if (_errReader != null) { - _errReader.close(); - } - - _serverProcess.waitFor(); - } catch (Exception e) { - System.out.println("ServerLauncher:" + e); //$NON-NLS-1$ - } - } - - System.out.println("finished on port " + _port); //$NON-NLS-1$ - _outReader = null; - _errReader = null; - _serverProcess = null; - _done = true; - } else { - _done = true; - } - } - - /** - * Indicates whether the connection has terminated or not - * - * @return true if the connection has terminated - */ - public boolean isDone() { - return _done; - } - - /** - * Returns the DataStore server port used - * - * @return the server port - */ - public String getServerPort() { - return _port; - } - - private boolean isPortInRange(String portStr, String portRange) { - if (portRange != null) { - String[] range = portRange.split("-"); //$NON-NLS-1$ - if (range.length == 2) { - int lPort = 0; - int hPort = 0; - int port = 0; - try { - lPort = Integer.parseInt(range[0]); - hPort = Integer.parseInt(range[1]); - port = Integer.parseInt(portStr); - } catch (Exception e) { - } - - return (port >= lPort && port <= hPort); - } - } - return true; - } - - /** - * Attempt to start a new DataStore server. The port and the ticket for - * a newly started DataStore are captured and sent back to the client so - * that it may connect to the server. - * - * @return whether the server started successfully - */ - public boolean listen() - { - boolean connected = false; - - String user = null; - String password = null; - - _port = null; - - boolean problemReadingSocket = false; - try - { - user = _reader.readLine(); - password = _reader.readLine(); - _port = _reader.readLine(); - } - catch (IOException e) - { - // don't display exceptions 193426 - //e.printStackTrace(); - _port = "0"; //$NON-NLS-1$ - - // this is probably an SSL exception - _writer.println(IDataStoreConstants.SERVER_FAILURE + e); - problemReadingSocket = true; - } - - - if (_serverPortRange != null && (_port == null || _port.equals("0"))) //$NON-NLS-1$ - { - _port = _serverPortRange; - } - - if (!problemReadingSocket) - { - boolean isError = false; - if (_serverPortRange != null && _port != _serverPortRange) - { - if (!isPortInRange(_port, _serverPortRange)) - { - String message = IDataStoreConstants.PORT_OUT_RANGE; - message += _serverPortRange; - _writer.println(message); - isError = true; - } - } - if (!isError) - { - // start new server - try - { - String launchStatus = null; - String ticket = new String("" + System.currentTimeMillis()); //$NON-NLS-1$ - - String theOS = System.getProperty("os.name"); //$NON-NLS-1$ - String timeout = "120000"; //$NON-NLS-1$ - - - if (!theOS.toLowerCase().startsWith("win")) //$NON-NLS-1$ - { - // assuming unix compatable - // - // Get the property which - // contains the authorization - // script path - // - String authPath = System.getProperty("RSE.AUTH"); //$NON-NLS-1$ - File authFile = null; - if (authPath != null && authPath.length() > 0) - { - authFile = new File(authPath); - } - if (authFile == null || !authFile.exists()) - { - authPath = "perl " + _path + File.separator + "auth.pl"; //$NON-NLS-1$ //$NON-NLS-2$ - } - - String authString = - authPath - + " " //$NON-NLS-1$ - + user - + " " //$NON-NLS-1$ - + _path - + " " //$NON-NLS-1$ - + _port - + " " //$NON-NLS-1$ - + timeout - + " " //$NON-NLS-1$ - + ticket - + " " //$NON-NLS-1$ - + System.getProperty("java.home") //$NON-NLS-1$ - ; - - String[] authArray = { "sh", "-c", authString }; //$NON-NLS-1$ //$NON-NLS-2$ - - // test password - _serverProcess = Runtime.getRuntime().exec(authArray); - - _outReader = new BufferedReader(new InputStreamReader(_serverProcess.getInputStream())); - _errReader = new BufferedReader(new InputStreamReader(_serverProcess.getErrorStream())); - BufferedWriter inWriter = new BufferedWriter(new OutputStreamWriter(_serverProcess.getOutputStream())); - // write password - if (password != null) - { - inWriter.write(password); - inWriter.newLine(); - inWriter.flush(); - - launchStatus = _outReader.readLine(); - } - } - else - { - - // launch new server - String[] cmdArray = - { - "java", //$NON-NLS-1$ - "-DA_PLUGIN_PATH=" + _path, //$NON-NLS-1$ - "-DDSTORE_SPIRIT_ON=true", //$NON-NLS-1$ - "org.eclipse.dstore.core.server.Server", //$NON-NLS-1$ - _port, - timeout, - ticket}; - - _serverProcess = Runtime.getRuntime().exec(cmdArray); - _outReader = new BufferedReader(new InputStreamReader(_serverProcess.getInputStream())); - _errReader = new BufferedReader(new InputStreamReader(_serverProcess.getErrorStream())); - - launchStatus = "success"; //$NON-NLS-1$ - } - - if ((launchStatus == null) || !launchStatus.equals("success")) //$NON-NLS-1$ - { - _writer.println(IDataStoreConstants.AUTHENTICATION_FAILED); - } - else - { - // look for the server startup string, it needs to occur - // somewhere in the line. - String status = _errReader.readLine(); - while (status!=null && (status.indexOf(ServerReturnCodes.RC_DSTORE_SERVER_MAGIC) < 0)) - { - status = _errReader.readLine(); - } - // now read the real server status - if (status != null) - { - status = _errReader.readLine(); - } - if ((status != null) && status.equals(ServerReturnCodes.RC_SUCCESS)) - { - _port = _errReader.readLine(); - _errReader.readLine(); - _writer.println(IDataStoreConstants.CONNECTED); - _writer.println(_port); - _writer.println(ticket); - - System.out.println("launched new server on " + _port); //$NON-NLS-1$ - connected = true; - } - else - { - if (status == null) - { - status = new String(IDataStoreConstants.UNKNOWN_PROBLEM); - } - // TODO Make sure that the client doesnt try - // connecting forever - _writer.println(status); - - _serverProcess.destroy(); - _serverProcess = null; - _outReader.close(); - _outReader = null; - - _errReader.close(); - _errReader = null; - } - } - - } - catch (IOException e) - { - _writer.println(IDataStoreConstants.SERVER_FAILURE + e); - } - } - } - - _writer.flush(); - - // close socket - try - { - _socket.close(); - } - catch (IOException e) - { - System.out.println("ServerLauncher:" + e); //$NON-NLS-1$ - } - - return connected; - } - - public void handshakeCompleted(HandshakeCompletedEvent event) { - System.out.println("handshake completed"); //$NON-NLS-1$ - System.out.println(event); - - } - } - - private ServerSocket _serverSocket; - - private String _path; - - private ArrayList _connections; - - private String _serverPortRange; - - private ISSLProperties _sslProperties; - - public static int DEFAULT_DAEMON_PORT = 4075; - - /** - * Constructor - */ - public ServerLauncher() { - String pluginPath = System.getProperty("A_PLUGIN_PATH"); //$NON-NLS-1$ - if (pluginPath == null) { - System.out.println("A_PLUGIN_PATH is not defined"); //$NON-NLS-1$ - System.exit(-1); - } - else - { - _path = pluginPath.trim(); - - _connections = new ArrayList(); - - init(DEFAULT_DAEMON_PORT + ""); //$NON-NLS-1$ - } - } - - /** - * Constructor - * - * @param portStr - * the port for the daemon socket to run on - */ - public ServerLauncher(String portStr) { - String pluginPath = System.getProperty("A_PLUGIN_PATH"); //$NON-NLS-1$ - if (pluginPath == null) { - System.out.println("A_PLUGIN_PATH is not defined"); //$NON-NLS-1$ - System.exit(-1); - } - else - { - _path = pluginPath.trim(); - - _connections = new ArrayList(); - init(portStr); - } - } - - /** - * Constructor - * - * @param portStr - * the port for the daemon socket to run on - * @param serverPortRange - * the port range for launched servers - */ - public ServerLauncher(String portStr, String serverPortRange) { - String pluginPath = System.getProperty("A_PLUGIN_PATH"); //$NON-NLS-1$ - if (pluginPath == null) { - System.out.println("A_PLUGIN_PATH is not defined"); //$NON-NLS-1$ - System.exit(-1); - } - else - { - _path = pluginPath.trim(); - - _serverPortRange = serverPortRange; - _connections = new ArrayList(); - init(portStr); - } - } - - private String getKeyStoreLocation() { - return _sslProperties.getDaemonKeyStorePath(); - } - - private String getKeyStorePassword() { - return _sslProperties.getDaemonKeyStorePassword(); - } - - /** - * initializes the DataStore daemon - * - * @param portStr the daemon port - */ - public void init(String portStr) { - // create server socket from port - _sslProperties = new ServerSSLProperties(); - - // determine if portStr is a port range or just a port - String[] range = portStr.split("-"); //$NON-NLS-1$ - if (range.length == 2) { - int lPort = 0; - int hPort = 0; - try { - lPort = Integer.parseInt(range[0]); - hPort = Integer.parseInt(range[1]); - } catch (Exception e) { - } - - boolean socketBound = false; - for (int i = lPort; i < hPort && !socketBound; i++) { - // create server socket from port - try { - if (_sslProperties.usingSSL()) { - String keyStoreFileName = getKeyStoreLocation(); - String keyStorePassword = getKeyStorePassword(); - - try { - SSLContext sslContext = DStoreSSLContext - .getServerSSLContext(keyStoreFileName, - keyStorePassword); - - _serverSocket = sslContext.getServerSocketFactory() - .createServerSocket(i); - } catch (Exception e) { - // don't display exceptions 193426 - //e.printStackTrace(); - } - } else { - _serverSocket = new ServerSocket(i); - } - 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$ - } - } catch (UnknownHostException e) { - System.err - .println("Networking problem, can't resolve local host"); //$NON-NLS-1$ - // don't display exceptions 193426 - //e.printStackTrace(); - System.exit(-1); - } catch (BindException e) { - System.err.println("socket taken on " + i); //$NON-NLS-1$ - // keep going - } catch (IOException e) { - System.err.println("Failure to create ServerSocket"); //$NON-NLS-1$ - // don't display exceptions 193426 - //e.printStackTrace(); - System.exit(-1); - } - - } - } else { - int port = Integer.parseInt(portStr); - try { - if (_sslProperties.usingSSL()) { - String keyStoreFileName = getKeyStoreLocation(); - String keyStorePassword = getKeyStorePassword(); - - try { - SSLContext sslContext = DStoreSSLContext - .getServerSSLContext(keyStoreFileName, - keyStorePassword); - - _serverSocket = sslContext.getServerSocketFactory() - .createServerSocket(port); - } catch (Exception e) { - // don't display exceptions 193426 - //e.printStackTrace(); - System.err.println(e.getMessage()); - 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); - } catch (UnknownHostException e) { - System.err - .println("Networking problem, can't resolve local host"); //$NON-NLS-1$ - // don't display exceptions 193426 - //e.printStackTrace(); - System.exit(-1); - } catch (IOException e) { - System.err.println("Failure to create ServerSocket"); //$NON-NLS-1$ - // don't display exceptions 193426 - //e.printStackTrace(); - System.exit(-1); - } - } - } - - /** - * Return the connection listener for the specified port if there is one - * - * @param port - * the port - * @return the listener associated with the port - */ - protected ConnectionListener getListenerForPort(String port) { - for (int i = 0; i < _connections.size(); i++) { - ConnectionListener listener = (ConnectionListener) _connections - .get(i); - if (listener.getServerPort().equals(port)) { - return listener; - } - } - - return null; - } - - /** - * Run the daemon - */ - public void run() { - while (true) { - try { - boolean connectionOkay = true; - Socket newSocket = _serverSocket.accept(); - if (_sslProperties.usingSSL()) { - - SSLSocket sslSocket = (SSLSocket) newSocket; - sslSocket - .addHandshakeCompletedListener(new HandshakeCompletedListener() { - - public void handshakeCompleted( - HandshakeCompletedEvent event) { - System.out.println("handshake completed"); //$NON-NLS-1$ - } - - }); - SSLSession session = sslSocket.getSession(); - if (session == null) { - System.out.println("handshake failed"); //$NON-NLS-1$ - - sslSocket.close(); - connectionOkay = false; - } - } - if (connectionOkay) { - ConnectionListener listener = new ConnectionListener( - newSocket); - listener.start(); - _connections.add(listener); - } - } catch (IOException ioe) { - System.err.println("Server: error initializing socket: " + ioe); //$NON-NLS-1$ - System.exit(-1); - } - } - } - - /** - * Entry point into the DataStore daemon - * - * @param args - * the port for the daemon to run on (default is 4075). - * Optionally, the second arg specifies whether to use SSL or - * not. an optional second arg can be used to specify the port - * range of servers that get launched - */ - public static void main(String args[]) { - if (args.length == 2) { - ServerLauncher theServer = new ServerLauncher(args[0], args[1]); - theServer.start(); - } else if (args.length == 1) { - ServerLauncher theServer = new ServerLauncher(args[0]); - theServer.start(); - } else { - ServerLauncher theServer = new ServerLauncher(); - theServer.start(); - } - } -} diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/server/ServerLogger.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/server/ServerLogger.java deleted file mode 100644 index f60b8c836..000000000 --- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/server/ServerLogger.java +++ /dev/null @@ -1,227 +0,0 @@ -/******************************************************************************** - * Copyright (c) 2002, 2008 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 - * - * 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: - * Noriaki Takatsu (IBM) - [220126] [dstore][api][breaking] Single process server for multiple clients - * David McKnight (IBM) - [226086] [dstore][api][breaking] Move ServerLogger class to dstore.core - * Jacob Garcowski (IBM) - [232738] [dstore] Delay creation of log file until written to - * Noriaki Takatsu (IBM) - [232443] [multithread] A single rsecomm.log for all clients - * Noriaki Takatsu (IBM) - [239419] [multithread] Dynamically change the level of logging - * David McKnight (IBM) - [244876] [dstore] make DEBUG a non-final variable of the ServerLogger class - ********************************************************************************/ - -package org.eclipse.dstore.core.server; - -import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.PrintWriter; -import java.util.Date; -import java.util.ResourceBundle; - -/** - * Class that facilitates logging for errors, warnings, debug messages and info - * for DataStore servers. - * - * @since 3.0 moved from non-API to API - */ -public class ServerLogger implements IServerLogger -{ - - - // Constants for logging - for use in rsecomm.properties - private static final String DEBUG_LEVEL = "debug_level"; //$NON-NLS-1$ - private static final String LOG_LOCATION = "log_location"; //$NON-NLS-1$ - - private static final int LOG_WARNING = 1; - private static final int LOG_INFO = 2; - private static final int LOG_DEBUG = 3; - - private static final String LOG_TO_STDOUT = "Log_To_StdOut"; //$NON-NLS-1$ - - private Object writeLock = new Object(); - private PrintWriter _logFileStream = null; - - /** - * Switch to enable debug-level logging. Note that, in 3.0, this variable - * was final but, as of 3.0.1, it's not. - */ - public static boolean DEBUG = false; - - private int log_level = 0; - - private boolean initialized = false; - private String logPathName = null; - private boolean logToFile = true; - - /** - * Constructs a new ServerLogger. - * - * @param logPathName the path on the filesystem to store the log information - */ - public ServerLogger(String logPathName) { - this.logPathName = logPathName; - // Read .properties file to configure - try { - ResourceBundle properties = ResourceBundle.getBundle("rsecomm"); //$NON-NLS-1$ - String debug_level = properties.getString(DEBUG_LEVEL).trim(); - log_level = Integer.parseInt(debug_level); - String log_location = properties.getString(LOG_LOCATION).trim(); - if (log_location.equalsIgnoreCase(LOG_TO_STDOUT)) { - logToFile = false; - _logFileStream = new PrintWriter(System.out); - } - } catch (Exception e) { - // Just use logging defaults: log_level = 0, log to file - //e.printStackTrace(); - } - } - - private void initialize() - { - initialized = true; - if (_logFileStream == null) { - if (logToFile) { - try { - File _logFile = new File(logPathName, "rsecomm.log"); //$NON-NLS-1$ - - if (!_logFile.exists()) { - _logFile.createNewFile(); - } - - _logFileStream = new PrintWriter(new FileOutputStream(_logFile)); - - } catch (IOException e) { - System.out.println("Error opening log file " + logPathName + "rsecomm.log"); //$NON-NLS-1$ //$NON-NLS-2$ - } - } - } - } - - - /** - * Logs an informational message - * - * @param minerName the name of the miner associated with this message - * @param message Message text to be logged. - */ - public void logInfo(String minerName, String message) { - if (!initialized) - initialize(); - String loggerLogLevel = System.getProperty("DSTORE_LOGGER_LOG_LEVEL"); //$NON-NLS-1$ - if (loggerLogLevel != null){ - try { - log_level = Integer.parseInt(loggerLogLevel); - } - catch (NumberFormatException e){ - System.err.println("ServerLogger: "+e.toString()); //$NON-NLS-1$ - } - } - if (log_level >= LOG_INFO) { - if (_logFileStream != null) { - synchronized(writeLock) { - try { - _logFileStream.println(new Date()); - _logFileStream.println("INFO " + minerName + ": " + message); //$NON-NLS-1$ //$NON-NLS-2$ - _logFileStream.println("---------------------------------------------------------------"); //$NON-NLS-1$ - _logFileStream.flush(); - }catch (Exception e) {} - } - } - } - } - - - /** - * Logs a warning message - * - * @param minerName the name of the miner associated with this message - * @param message Message text to be logged. - */ - public void logWarning(String minerName, String message) { - if (!initialized) - initialize(); - String loggerLogLevel = System.getProperty("DSTORE_LOGGER_LOG_LEVEL"); //$NON-NLS-1$ - if (loggerLogLevel != null){ - try { - log_level = Integer.parseInt(loggerLogLevel); - } - catch (NumberFormatException e){ - System.err.println("ServerLogger: "+e.toString()); //$NON-NLS-1$ - } - } - if (log_level >= LOG_WARNING) { - if (_logFileStream != null) { - synchronized(writeLock) { - try { - _logFileStream.println(new Date()); - _logFileStream.println("WARNING " + minerName + ": " + message); //$NON-NLS-1$ //$NON-NLS-2$ - _logFileStream.println("---------------------------------------------------------------"); //$NON-NLS-1$ - _logFileStream.flush(); - }catch (Exception e) {} - } - } - } - } - - - /** - * Logs an error message - * - * @param minerName the name of the miner associated with this message - * @param message Message text to be logged. - * - * @param exception Exception that generated the error. Used to print a stack trace. - */ - public void logError(String minerName, String message, Throwable exception) { - if (!initialized) - initialize(); - if (_logFileStream != null) { - synchronized(writeLock) { - try { - _logFileStream.println(new Date()); - _logFileStream.println("ERROR " + minerName + ": " + message); //$NON-NLS-1$ //$NON-NLS-2$ - if (exception != null) { - exception.printStackTrace(_logFileStream); - } - _logFileStream.println("---------------------------------------------------------------"); //$NON-NLS-1$ - _logFileStream.flush(); - }catch (Exception e) {} - } - } - } - - - /** - * Logs a debug message - * - * @param minerName the name of the miner associated with this message - * @param message Message text to be logged. - */ - public synchronized void logDebugMessage(String minerName, String message) { - if (!initialized) - initialize(); - if (DEBUG && log_level == LOG_DEBUG) { - if (_logFileStream != null) { - synchronized(writeLock) { - try { - _logFileStream.println(new Date()); - _logFileStream.println("DEBUG " + minerName + ": " + message); //$NON-NLS-1$ //$NON-NLS-2$ - _logFileStream.println("---------------------------------------------------------------"); //$NON-NLS-1$ - _logFileStream.flush(); - }catch (Exception e) {} - } - } - } - } - -}
\ No newline at end of file diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/server/ServerReceiver.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/server/ServerReceiver.java deleted file mode 100644 index e47b3451c..000000000 --- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/server/ServerReceiver.java +++ /dev/null @@ -1,98 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2002, 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 - * - * 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 McKnight (IBM) - [225507][api][breaking] RSE dstore API leaks non-API types - * Noriaki Takatsu (IBM) - [227905] prevent double invocations of finished in ConncetionEstablisher - * David McKnight (IBM) - [226561] [apidoc] Add API markup to RSE Javadocs where extend / implement is allowed - *******************************************************************************/ - -package org.eclipse.dstore.core.server; - -import java.net.Socket; - -import org.eclipse.dstore.core.model.DataElement; -import org.eclipse.dstore.core.util.Receiver; - -/** - * The ServerReciever is responsible for recieving data from the client side. - * - * @noextend This class is not intended to be subclassed by clients. - * @noinstantiate This class is not intended to be instantiated by clients. - * @since 3.0 moved from non-API to API - */ -public class ServerReceiver extends Receiver -{ - - private ConnectionEstablisher _connection; - - /** - * Constructor - * - * @param socket the socket to receive from - * @param connection the connection establisher - */ - public ServerReceiver(Socket socket, ConnectionEstablisher connection) - { - super(socket, connection.getDataStore()); - _connection = connection; - } - - - /** - * Implementation for handling the receiving on documents on - * the server side. - * - * @param documentObject to tree root of received data. - */ - public void handleDocument(DataElement documentObject) - { - // parse request and determine what is wanted - for (int a = 0; a < documentObject.getNestedSize(); a++) - { - DataElement rootOutput = documentObject.get(a); - - DataElement log = _dataStore.getLogRoot(); - log.addNestedData(rootOutput, false); - - if (rootOutput.getName().equals("C_EXIT")) //$NON-NLS-1$ - { - finish(); - - } - else - { - _dataStore.command(rootOutput); - } - } - } - - public void finish() - { - _dataStore.setConnected(false); - super.finish(); - _connection.finished(this); - } - - /** - * @see Receiver#finish() - */ - public void handleError(Throwable e) - { - System.out.println("RECEIVER ERROR"); //$NON-NLS-1$ - e.printStackTrace(); - System.out.println(e); - _connection.finished(this); - } - -} diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/server/SystemServiceManager.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/server/SystemServiceManager.java deleted file mode 100644 index 88f8fb1a4..000000000 --- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/server/SystemServiceManager.java +++ /dev/null @@ -1,70 +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 - * - * Initial Contributors: - * The following IBM employees contributed to the Remote System Explorer - * component that contains this file: Noriaki Takatsu and Masao Nishimoto - * - * Contributors: - * Noriaki Takatsu (IBM) - [220126] [dstore][api][breaking] Single process server for multiple clients - *******************************************************************************/ - -package org.eclipse.dstore.core.server; - -/** - * @since 3.0 - */ -public class SystemServiceManager -{ - private static SystemServiceManager instance = null; - private static ISystemService _systemService; - - - /** - * Creates an instance of SystemServiceManager to hold the system-specific - * parts that needs unique implementations for this system. - * - */ - private SystemServiceManager() - {} - - /** - * Get the SystemServiceManager object for this system. - * - * @return the object of the SystemServiceManager - */ - public static SystemServiceManager getInstance() - { - if (instance == null) - { - instance = new SystemServiceManager(); - } - return instance; - } - - /** - * Set the SystemService object for this system. - * - * @param systemService the object of the SystemService - */ - public void setSystemService(ISystemService systemService) - { - _systemService = systemService; - } - - /** - * Get the SystemService object for this system. - * - * @return the object of the SystemService stored in SystemServiceManager - */ - public ISystemService getSystemService() - { - return _systemService; - } - - -} diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/util/CommandGenerator.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/util/CommandGenerator.java deleted file mode 100644 index 9f4697c8c..000000000 --- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/util/CommandGenerator.java +++ /dev/null @@ -1,318 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2002, 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 - * - * 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 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 - *******************************************************************************/ - -package org.eclipse.dstore.core.util; - -import java.util.ArrayList; - -import org.eclipse.dstore.core.model.DE; -import org.eclipse.dstore.core.model.DataElement; -import org.eclipse.dstore.core.model.DataStore; -import org.eclipse.dstore.core.model.DataStoreResources; - -/** - * This class is used to generate command object instances from command - * descriptors and arguments to commands. Command instances are instances of - * command descriptors. Each command instance contains a set of data arguments - * and a status object, that represents the current state of a command. After a - * command instance is created, it is referenced in the command log for the - * DataStore. - * - * @noextend This class is not intended to be subclassed by clients. - * @noinstantiate This class is not intended to be instantiated by clients. - * @since 3.0 moved from non-API to API - */ -public class CommandGenerator -{ - private DataStore _dataStore = null; - private DataElement _log = null; - - static private int _id = 0; - - /** - * Constructor - */ - public CommandGenerator() - { - } - - /** - * Sets the associated DataStore - * @param dataStore the associated DataStore - */ - public void setDataStore(DataStore dataStore) - { - _dataStore = dataStore; - _log = _dataStore.getLogRoot(); - } - - /** - * This method logs the current command object in the DataStore command log. For each - * logged command, a status object is created and returned. - * @param commandObject the commandObject to log - * @return the status object of the command - */ - public DataElement logCommand(DataElement commandObject) - { - try - { - // create time and status objects - StringBuffer id = new StringBuffer(commandObject.getId()); - id.append(DataStoreResources.model_status); - _dataStore.createObject( - commandObject, - DataStoreResources.model_status, - DataStoreResources.model_start, - "", //$NON-NLS-1$ - id.toString()); - - _log.addNestedData(commandObject, false); - - } - catch (Exception e) - { - _dataStore.trace(e); - } - - return commandObject; - } - - /** - * Creates a new command instance object from a command descriptor - * @param commandDescriptor the descriptor of the command to create - * @return the new command instance - */ - public DataElement createCommand(DataElement commandDescriptor) - { - if (commandDescriptor != null) - { - if (commandDescriptor.getType().equals(DE.T_COMMAND_DESCRIPTOR)) - { - DataElement commandInstance = _dataStore.createObject(null, commandDescriptor.getName(), commandDescriptor.getValue(), commandDescriptor.getSource()); - commandInstance.setDescriptor(commandDescriptor); - return commandInstance; - } - else - { - System.out.println("not cd -> " + commandDescriptor); //$NON-NLS-1$ - return null; - } - } - else - { - return null; - } - } - - private void clearDeleted(DataElement element) - { - for (int i = 0; i < element.getNestedSize(); i++) - { - DataElement child = element.get(i).dereference(); - if (child.isDeleted()) - { - element.removeNestedData(child); - } - } - } - - /** - * Creates a new command from a command descriptor and it's arguments. - * - * @param commandDescriptor the command type of the new command - * @param arguments the arguments for the command, besides the subject - * @param dataObject the subject of the command - * @param refArg indicates whether the subject should be represented as a reference or directly - * @return the status object of the command - */ - public DataElement generateCommand(DataElement commandDescriptor, ArrayList arguments, DataElement dataObject, boolean refArg) - { - - DataElement commandObject = createCommand(commandDescriptor); - if (commandObject != null) - { - clearDeleted(dataObject); - - commandObject.setAttribute(DE.A_VALUE, commandDescriptor.getName()); - - if (dataObject.isUpdated() && !dataObject.isSpirit()) - { - _dataStore.createReference(commandObject, dataObject,DataStoreResources.model_contents); - } - else - { - dataObject.setPendingTransfer(true); - commandObject.addNestedData(dataObject, false); - } - - if (arguments != null) - { - for (int i = 0; i < arguments.size(); i++) - { - DataElement arg = (DataElement) arguments.get(i); - if (arg != null) - { - if (!arg.isUpdated() || arg.isSpirit()) - { - commandObject.addNestedData(arg, false); - } - else - { - _dataStore.createReference(commandObject, arg, "argument"); //$NON-NLS-1$ - } - } - } - } - - return logCommand(commandObject); - } - else - { - return null; - } - } - - - /** - * Creates a new command from a command descriptor and it's arguments. - * - * @param commandDescriptor the command type of the new command - * @param arg the arguement for the command, besides the subject - * @param dataObject the subject of the command - * @param refArg indicates whether the subject should be represented as a reference or directly - * @return the status object of the command - */ - public DataElement generateCommand(DataElement commandDescriptor, DataElement arg, DataElement dataObject, boolean refArg) - { - _id++; - - DataElement commandObject = createCommand(commandDescriptor); - if (commandObject != null) - { - commandObject.setAttribute(DE.A_VALUE, commandDescriptor.getName()); - clearDeleted(dataObject); - if ((refArg || dataObject.isUpdated()) && !dataObject.isSpirit()) - { - _dataStore.createReference(commandObject, dataObject,DataStoreResources.model_contents); - } - else - { - dataObject.setPendingTransfer(true); - commandObject.addNestedData(dataObject, false); - } - - if (!arg.isUpdated() || arg.isSpirit()) - { - commandObject.addNestedData(arg, false); - } - else - { - _dataStore.createReference(commandObject, arg, "argument"); //$NON-NLS-1$ - } - - - return logCommand(commandObject); - } - else - { - return null; - } - } - - /** - * Creates a new command from a command descriptor and it's arguments. - * - * @param commandDescriptor the command type of the new command - * @param dataObject the subject of the command - * @param refArg indicates whether the subject should be represented as a reference or directly - * @return the status object of the command - */ - public DataElement generateCommand(DataElement commandDescriptor, DataElement dataObject, boolean refArg) - { - _id++; - - DataElement commandObject = createCommand(commandDescriptor); - if (commandObject != null) - { - commandObject.setAttribute(DE.A_VALUE, commandDescriptor.getName()); - - clearDeleted(dataObject); - if ((refArg || dataObject.isUpdated()) && !dataObject.isSpirit()) - { - _dataStore.createReference(commandObject, dataObject,DataStoreResources.model_arguments); - } - else - { - dataObject.setPendingTransfer(true); - commandObject.addNestedData(dataObject, false); - } - - return logCommand(commandObject); - } - else - { - return null; - } - } - - /** - * Creates a response tree for transmitting a set of data from a server to a client. - * - * @param document the root of the response - * @param objects the data contained in the response - * @return the response tree root - */ - public DataElement generateResponse(DataElement document, ArrayList objects) - { - document.addNestedData(objects, false); - return document; - } - - /** - * Creates a response tree for transmitting a set of data from a server to a client. - * - * @param responseType the type of data to respond with - * @param dataObject the child object in the response tree - * @return the response tree root - */ - public DataElement generateResponse(String responseType, DataElement dataObject) - { - if (dataObject != null) - { - DataElement commandObject = _dataStore.createObject(null, "RESPONSE", responseType); //$NON-NLS-1$ - commandObject.addNestedData(dataObject, true); - return commandObject; - } - else - { - return null; - } - } - - /** - * Creates a simple response object of the specified type - * - * @param responseType the type of data to respond with - * @return the response object - */ - public DataElement generateResponse(String responseType) - { - DataElement commandObject = _dataStore.createObject(null, "RESPONSE", responseType); //$NON-NLS-1$ - return commandObject; - } -} diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/util/Receiver.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/util/Receiver.java deleted file mode 100644 index 98079e565..000000000 --- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/util/Receiver.java +++ /dev/null @@ -1,220 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2002, 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 - * - * 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 McKnight (IBM) [220123][dstore] Configurable timeout on irresponsiveness - * David McKnight (IBM) [222003] Client remains connected after server terminates - * Noriaki Takatsu (IBM) - [220126] [dstore][api][breaking] Single process server for multiple clients - * 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 - *******************************************************************************/ - -package org.eclipse.dstore.core.util; - -import java.io.BufferedInputStream; -import java.io.IOException; -import java.net.Socket; -import java.net.UnknownHostException; - -import org.eclipse.dstore.core.model.DataElement; -import org.eclipse.dstore.core.model.DataStore; -import org.eclipse.dstore.core.model.IDataStorePreferenceListener; -import org.eclipse.dstore.core.server.SecuredThread; -import org.eclipse.dstore.internal.core.util.XMLparser; - -/** - * This class is used for receiving data from a socket in the DataStore - * communication layer. - * - * @noextend This class is not intended to be subclassed by clients. - * @since 3.0 Moved from non-API to API - */ -public abstract class Receiver extends SecuredThread implements IDataStorePreferenceListener -{ - - - private Socket _socket; - - private XMLparser _xmlParser; - private BufferedInputStream _in; - - protected boolean _canExit; - - /** - * Constructor - * @param socket the socket to read from - * @param dataStore the associated DataStore - */ - public Receiver(Socket socket, DataStore dataStore) - { - super(dataStore); - setName("DStore Receiver"+getName()); //$NON-NLS-1$ - _socket = socket; - _canExit = false; - _xmlParser = new XMLparser(dataStore); - - try - { - _in = new BufferedInputStream(socket.getInputStream()); - } - catch (UnknownHostException uhe) - { - //System.out.println("Receiver:" + uhe); - } - catch (IOException ioe) - { - //System.out.println("Receiver:" + ioe); - } - - // keepalive preferences - String keepAliveResponseTimeout = System.getProperty(XMLparser.KEEPALIVE_RESPONSE_TIMEOUT_PREFERENCE); - if (keepAliveResponseTimeout != null){ - preferenceChanged(XMLparser.KEEPALIVE_RESPONSE_TIMEOUT_PREFERENCE, keepAliveResponseTimeout); - } - String iosocketReadTimeout = System.getProperty(XMLparser.IO_SOCKET_READ_TIMEOUT_PREFERENCE); - if (iosocketReadTimeout != null){ - preferenceChanged(XMLparser.IO_SOCKET_READ_TIMEOUT_PREFERENCE, iosocketReadTimeout); - } - String enableKeepAlive = System.getProperty(XMLparser.KEEPALIVE_ENABLED_PREFERENCE); - if (enableKeepAlive != null){ - preferenceChanged(XMLparser.KEEPALIVE_ENABLED_PREFERENCE, enableKeepAlive); - } - } - - /** - * Called when a DataStore connection is terminated. - */ - public void finish() - { - _canExit = true; - } - - /** - * Indicates that the receiver can stop receiving data from the socket. - * @return true if the receiver can stop - */ - public boolean canExit() - { - return _canExit; - } - - /** - * Called when the receiver thread is running - */ - public void run() - { - super.run(); - try - { - while (!_canExit) - { - handleInput(); - } - - if (_canExit){ - // is this an unexpected exit? - if (_dataStore.isConnected()){ - // server exited without client exit - Exception e = new Exception("Server terminated unexpectedly"); - handleError(e); - } - } - } - catch (Exception e) - { - _canExit = true; - e.printStackTrace(); - handleError(e); - } - } - - /** - * Periodically called to receive data from the socket - */ - public void handleInput() - { - try - { - // wait on the socket - DataElement rootObject = _xmlParser.parseDocument(_in, _socket); - - if (rootObject != null) - { - String type = rootObject.getType(); - if (!type.equals("FILE")) //$NON-NLS-1$ - { - - handleDocument(rootObject); - } - } - else - { - // something really bad happened - _canExit = true; - if (_xmlParser.getPanicException() != null) - handleError(_xmlParser.getPanicException()); - } - } - catch (IOException ioe) - { - _canExit = true; - handleError(ioe); - } - catch (Exception e) - { - handleError(e); - } - } - - /** - * Returns the associated socket - * @return the socket - */ - public Socket socket() - { - return _socket; - } - - /** - * Implemented to provide a means of handling received input - * @param documentObject the root object of the received data - */ - public abstract void handleDocument(DataElement documentObject); - - /** - * Implemented to provide a means of handling errors in the communication layer - * @param e an exception that occurred - */ - public abstract void handleError(Throwable e); - - - public void preferenceChanged(String property, String value) - { - //System.out.println("setting preference: "+property + "="+value); - if (property.equals(XMLparser.IO_SOCKET_READ_TIMEOUT_PREFERENCE)){ - int timeout = Integer.parseInt(value); - _xmlParser.setIOSocketReadTimeout(timeout); - } - else if (property.equals(XMLparser.KEEPALIVE_RESPONSE_TIMEOUT_PREFERENCE)){ - int timeout = Integer.parseInt(value); - _xmlParser.setKeepaliveResponseTimeout(timeout); - } - else if (property.equals(XMLparser.KEEPALIVE_ENABLED_PREFERENCE)){ - boolean enable = true; - if (value.equals("false")) //$NON-NLS-1$ - enable = false; - _xmlParser.setEnableKeepalive(enable); - } - } - -} diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/util/StringCompare.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/util/StringCompare.java deleted file mode 100644 index 0a6876d4b..000000000 --- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/util/StringCompare.java +++ /dev/null @@ -1,123 +0,0 @@ -/******************************************************************************** - * Copyright (c) 2002, 2006 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 - * - * 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: - * {Name} (company) - description of contribution. - ********************************************************************************/ - -package org.eclipse.dstore.core.util; - -/** - * Utility class for comparing a wildcard string to another string - */ -public class StringCompare -{ - - /** - * Constructor - */ - public StringCompare() - { - } - - /** - * Compare two strings - * - * @param pattern the pattern to match - * @param compareStr the string to compare against the pattern - * @param noCase indicates whether the strings should be compared based on case - * @return true if the compare string matches the pattern - */ - public static boolean compare(String pattern, String compareStr, boolean noCase) - { - if ((pattern == null) || (compareStr == null)) - return false; - - if (noCase) - { - pattern = pattern.toUpperCase(); - compareStr = compareStr.toUpperCase(); - } - - int iText = 0; - int iPattern = 0; - int lastStar = 0; - int len = compareStr.length(); - - int patternLen = pattern.length(); - - while (iPattern < patternLen) - { - char p = pattern.charAt(iPattern++); - if (p == '*') - { - - if (iPattern >= patternLen) - { - while (iText < len) - { - iText++; - } - return true; - } - else - { - lastStar = iPattern; - } - } - else - { - if (iText >= len) - { - return false; - } - else - { - char t = compareStr.charAt(iText++); - if (p == t) - { - if ((lastStar > 0) && (iPattern >= patternLen) && (iText < len)) - { - } - else - { - continue; - } - - } - else - { - if (lastStar == 0) - { - return false; - } - } - - int matched = iPattern - lastStar - 1; - iPattern = lastStar; - - iText -= matched; - } - } - } - - if (iText >= len) - { - return true; - } - else - { - return false; - } - } - -}
\ No newline at end of file diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/util/ssl/DStoreKeyStore.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/util/ssl/DStoreKeyStore.java deleted file mode 100644 index 9b5108e2b..000000000 --- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/util/ssl/DStoreKeyStore.java +++ /dev/null @@ -1,133 +0,0 @@ -/******************************************************************************** - * Copyright (c) 2006, 2008 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 - * - * 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 McKnight (IBM) - [226561] [apidoc] Add API markup to RSE Javadocs where extend / implement is allowed - * David McKnight (IBM) - [230013] [api][breaking] need to make DStoreKeyStore _instance private - ********************************************************************************/ - -package org.eclipse.dstore.core.util.ssl; - -import java.io.File; -import java.io.FileInputStream; -import java.io.FileNotFoundException; -import java.io.FileOutputStream; -import java.io.IOException; -import java.security.KeyStore; -import java.security.KeyStoreException; -import java.security.NoSuchAlgorithmException; -import java.security.NoSuchProviderException; -import java.security.cert.Certificate; -import java.security.cert.CertificateException; -import java.security.cert.CertificateFactory; - - -/** - * This class is used for managing the DStore keystore for use with the DStore communication framework. - * - * @noextend This class is not intended to be subclassed by clients. - * @noinstantiate This class is not intended to be instantiated by clients. - */ -public class DStoreKeyStore -{ - private static DStoreKeyStore _instance = new DStoreKeyStore(); - - public DStoreKeyStore() - { - } - - public static DStoreKeyStore getInstance() - { - if (_instance == null) - { - _instance = new DStoreKeyStore(); - } - return _instance; - } - - public static KeyStore getKeyStore(String filePath, String password) - throws KeyStoreException, NoSuchAlgorithmException, - CertificateException, IOException, NoSuchProviderException - - { - KeyStore keyStore= null; - - - if (filePath != null) - { - File keyStoreFile = new File(filePath); - - /* Do not stomp an existing file */ - if(!keyStoreFile.exists()) - { - keyStore = KeyStore.getInstance("JKS"); //$NON-NLS-1$ - keyStore.load(null, password.toCharArray()); - persistKeyStore(keyStore, filePath, password); - } - else { - keyStore = loadKeyStore(filePath, password); - } - } - - return keyStore; - } - - - public static KeyStore loadKeyStore(String pathname, String password) - throws KeyStoreException, - NoSuchAlgorithmException, - CertificateException, - IOException, - NoSuchProviderException { - - KeyStore ks=null; - File file=new File(pathname); - - /* Do not stomp an existing file */ - if(file.exists()) { - ks=KeyStore.getInstance("JKS"); //$NON-NLS-1$ - /* Initialize the keystore with no information */ - FileInputStream is=new FileInputStream(file); - ks.load(is, password.toCharArray()); - is.close(); - } - return ks; - } - - public static Certificate loadCertificate(String certFilename) - throws CertificateException, - FileNotFoundException { - - CertificateFactory factory=CertificateFactory.getInstance("X.509"); //$NON-NLS-1$ - - return factory.generateCertificate(new FileInputStream(certFilename)); - } - - public static void addCertificateToKeyStore(KeyStore ks, Certificate cert, String alias) - throws KeyStoreException { - ks.setCertificateEntry(alias, cert); - - } - - public static void persistKeyStore(KeyStore ks, String pathname, String password) - throws KeyStoreException, - FileNotFoundException, - NoSuchAlgorithmException, - CertificateException, - IOException { - FileOutputStream os=new FileOutputStream(pathname); - ks.store(os, password.toCharArray()); - os.close(); - - - } -}
\ No newline at end of file diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/util/ssl/IDataStoreTrustManager.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/util/ssl/IDataStoreTrustManager.java deleted file mode 100644 index 785c7a64b..000000000 --- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/util/ssl/IDataStoreTrustManager.java +++ /dev/null @@ -1,38 +0,0 @@ -/******************************************************************************** - * Copyright (c) 2008 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 - * - * Initial Contributors: - * The following IBM employees contributed to the Remote System Explorer - * component that contains this file: David McKnight. - * - * Contributors: - * David McKnight (IBM) - [225507][api][breaking] RSE dstore API leaks non-API types - ********************************************************************************/ -package org.eclipse.dstore.core.util.ssl; - -import java.util.List; - -import javax.net.ssl.X509TrustManager; - -/** - * Extracted interface from DataStoreTrustManager. - * @since 3.0 - */ -public interface IDataStoreTrustManager extends X509TrustManager -{ - /** - * Sets the path and password for the trust manager - * @param filePath the path - * @param password the password - */ - public void setKeystore(String filePath, String password); - - /** - * Returns the list of untrusted certificates - * @return the list of untrusted certificates - */ - public List getUntrustedCerts(); -} diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/client/ClientAttributes.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/client/ClientAttributes.java deleted file mode 100644 index a03f6c811..000000000 --- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/client/ClientAttributes.java +++ /dev/null @@ -1,58 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2002, 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 - * - * 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: - * {Name} (company) - description of contribution. - *******************************************************************************/ - -package org.eclipse.dstore.internal.core.client; - -import java.io.File; -import java.net.InetAddress; -import java.net.UnknownHostException; - -import org.eclipse.dstore.core.model.DataStoreAttributes; - -/** - * ClientAttributes is a container of communication related - * information. - */ -public class ClientAttributes extends DataStoreAttributes -{ - - /** - * Constructor - */ - public ClientAttributes() - { - super(); - - try - { - String pluginPath = System.getProperty("A_PLUGIN_PATH"); //$NON-NLS-1$ - if ((pluginPath != null) && (pluginPath.length() > 0)) - { - setAttribute(A_PLUGIN_PATH, pluginPath + File.separator); - } - - setAttribute(A_LOCAL_NAME, InetAddress.getLocalHost().getHostName()); - setAttribute(A_LOCAL_PATH, "/tmp/"); //$NON-NLS-1$ - setAttribute(A_HOST_NAME, "local"); //$NON-NLS-1$ - setAttribute(A_HOST_PATH, "/"); //$NON-NLS-1$ - } - - catch (UnknownHostException e) - { - } - } -} diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/client/ClientCommandHandler.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/client/ClientCommandHandler.java deleted file mode 100644 index 434b2cf34..000000000 --- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/client/ClientCommandHandler.java +++ /dev/null @@ -1,392 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2002, 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 - * - * 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 McKnight (IBM) [220123][dstore] Configurable timeout on irresponsiveness - * David McKnight (IBM) [222168][dstore] Buffer in DataElement is not sent - *******************************************************************************/ - -package org.eclipse.dstore.internal.core.client; - -import org.eclipse.dstore.core.java.IRemoteClassInstance; -import org.eclipse.dstore.core.model.CommandHandler; -import org.eclipse.dstore.core.model.DE; -import org.eclipse.dstore.core.model.DataElement; -import org.eclipse.dstore.core.model.DataStore; -import org.eclipse.dstore.core.model.DataStoreResources; -import org.eclipse.dstore.internal.core.util.Sender; - - -/** - * The ClientCommandHandler is reponsible for maintaining - * a queue of commands and periodically sending commands - * from the queue to the server side. - */ -public class ClientCommandHandler extends CommandHandler -{ - - private Sender _sender; - protected DataElement _requestClassDocumentElement; - protected DataElement _keepAliveDocumentElement; - protected DataElement _confirmKeepAliveDocumentElement; - protected DataElement _pendingKeepAliveRequest; - protected DataElement _pendingKeepAliveConfirmation; - - private static String[] _docAttributes = { - DataStoreResources.DOCUMENT_TYPE, - "client.doc.root.id", //$NON-NLS-1$ - "client.document", //$NON-NLS-1$ - "doc", //$NON-NLS-1$ - "", //$NON-NLS-1$ - "", //$NON-NLS-1$ - DataStoreResources.FALSE, - "2"}; //$NON-NLS-1$ - - private static String[] _fileAttributes = { - DataStoreResources.FILE_TYPE, - "client.file.root.id", //$NON-NLS-1$ - "client.file", //$NON-NLS-1$ - "doc", //$NON-NLS-1$ - "", //$NON-NLS-1$ - "", //$NON-NLS-1$ - DataStoreResources.FALSE, - "2"}; //$NON-NLS-1$ - - private static String[] _classAttributes = { - DataStoreResources.CLASS_TYPE, - "client.class.root.id", //$NON-NLS-1$ - "client.class", //$NON-NLS-1$ - "doc", //$NON-NLS-1$ - "", //$NON-NLS-1$ - "", //$NON-NLS-1$ - DataStoreResources.FALSE, - "2"}; //$NON-NLS-1$ - - private static String[] _serializeAttributes = { - DataStoreResources.SERIALIZED_TYPE, - "client.serialized.root.id", //$NON-NLS-1$ - "client.serialized", //$NON-NLS-1$ - "doc", //$NON-NLS-1$ - "", //$NON-NLS-1$ - "", //$NON-NLS-1$ - DataStoreResources.FALSE, - "2"}; //$NON-NLS-1$ - - private static String[] _requestClassAttributes = { - DataStoreResources.REQUEST_CLASS_TYPE, - "client.requestclass.root.id", //$NON-NLS-1$ - "client.requestclass", //$NON-NLS-1$ - "doc", //$NON-NLS-1$ - "", //$NON-NLS-1$ - "", //$NON-NLS-1$ - DataStoreResources.FALSE, - "2"}; //$NON-NLS-1$ - - private static String[] _keepAliveAttributes = { - DataStoreResources.KEEPALIVE_TYPE, - "client.keepalive.root.id", //$NON-NLS-1$ - "server.keepalive", //$NON-NLS-1$ - "doc", //$NON-NLS-1$ - "", //$NON-NLS-1$ - "", //$NON-NLS-1$ - DataStoreResources.FALSE, - "2"}; //$NON-NLS-1$ - - private static String[] _confirmKeepAliveAttributes = { - DataStoreResources.KEEPALIVECONFIRM_TYPE, - "client.keepalive.confirm.root.id", //$NON-NLS-1$ - "server.confirmkeepalive", //$NON-NLS-1$ - "doc", //$NON-NLS-1$ - "", //$NON-NLS-1$ - "", //$NON-NLS-1$ - DataStoreResources.FALSE, - "2"}; //$NON-NLS-1$ - - - protected DataElement _fileDocumentElement; - protected DataElement _docDocumentElement; - protected DataElement _classDocumentElement; - protected DataElement _serializedDocumentElement; - - /** - * Constructor - * @param sender the Sender - */ - public ClientCommandHandler(Sender sender) - { - super(); - _sender = sender; - } - - - public void setDataStore(DataStore dataStore) - { - super.setDataStore(dataStore); - _fileDocumentElement = dataStore.createTransientObject(_fileAttributes); - _docDocumentElement = dataStore.createObject(null, _docAttributes); - _classDocumentElement = dataStore.createTransientObject(_classAttributes); - _serializedDocumentElement = dataStore.createTransientObject(_serializeAttributes); - _requestClassDocumentElement = dataStore.createTransientObject(_requestClassAttributes); - _keepAliveDocumentElement = dataStore.createTransientObject(_keepAliveAttributes); - _confirmKeepAliveDocumentElement = dataStore.createTransientObject(_confirmKeepAliveAttributes); - } - - /** - * Transmits the bytes of a file from the client to the server - * @param bytes the bytes of a file to send - * @param size the number of bytes to send - * @param binary indicates whether to send the bytes as binary or unicode - * @param byteStreamHandlerId indicates wwhich byte stream handler should receive the bytes - */ - public synchronized void sendFile(String fileName, byte[] bytes, int size, boolean binary, String byteStreamHandlerId) - { - // send pending commands before file - if (_commands.size() > 0) - sendCommands(); - - //DataElement document = _dataStore.createObject(null, DataStoreResources.FILE_TYPE, byteStreamHandlerId, fileName, fileName); - DataElement document = _fileDocumentElement; - document.setAttribute(DE.A_NAME, byteStreamHandlerId); - document.setAttribute(DE.A_VALUE, byteStreamHandlerId); - document.setAttribute(DE.A_SOURCE, fileName); - document.setPendingTransfer(true); - document.setParent(null); - _sender.sendFile(document, bytes, size, binary); - } - - /** - * Transmits the bytes of a file from the client to the server - * @param bytes the bytes of a file to send - * @param size the number of bytes to send - * @param binary indicates whether to send the bytes as binary or unicode - */ - public synchronized void sendFile(String fileName, byte[] bytes, int size, boolean binary) - { - sendFile(fileName, bytes, size, binary, "default"); //$NON-NLS-1$ - } - - /** - * Appends bytes of a file from the client to the server - * @param bytes the bytes of a file to send - * @param size the number of bytes to send - * @param binary indicates whether to send the bytes as binary or unicode - * @param byteStreamHandlerId indicates which byte stream handler should receive the bytes - */ - public synchronized void sendAppendFile(String fileName, byte[] bytes, int size, boolean binary, String byteStreamHandlerId) - { - // send pending commands before file - if (_commands.size() > 0) - sendCommands(); - - //DataElement document = _dataStore.createObject(null, DataStoreResources.FILE_TYPE, byteStreamHandlerId, fileName, fileName); - - DataElement document = _fileDocumentElement; - document.setAttribute(DE.A_NAME, byteStreamHandlerId); - document.setAttribute(DE.A_VALUE, byteStreamHandlerId); - document.setAttribute(DE.A_SOURCE, fileName); - document.setPendingTransfer(true); - document.setParent(null); - _sender.sendAppendFile(document, bytes, size, binary); - } - - - /** - * Appends bytes of a file from the client to the server - * @param bytes the bytes of a file to send - * @param size the number of bytes to send - * @param binary indicates whether to send the bytes as binary or unicode - */ - public synchronized void sendAppendFile(String fileName, byte[] bytes, int size, boolean binary) - { - sendAppendFile(fileName, bytes, size, binary, "default"); //$NON-NLS-1$ - } - - /** - * Called periodically to send the current queue of commands to the server - */ - public synchronized void sendCommands() - { - //DataElement commandRoot = _dataStore.createObject(null, DataStoreResources.DOCUMENT_TYPE, "client.doc"/*"client.doc." + _requests++*/); - DataElement commandRoot = _docDocumentElement; - commandRoot.removeNestedData(); - commandRoot.setPendingTransfer(true); - commandRoot.setParent(null); - while (_commands.size() > 0) - { - DataElement command = null; - //synchronized (_commands) - { - command = (DataElement)_commands.remove(0); - } - - commandRoot.addNestedData(command, false); - } - - _sender.sendDocument(commandRoot, 3); - - if (_pendingKeepAliveConfirmation != null) - { - _sender.sendKeepAliveConfirmation(_pendingKeepAliveConfirmation); - _pendingKeepAliveConfirmation = null; - } - if (_pendingKeepAliveRequest != null) - { - _sender.sendKeepAliveRequest(_pendingKeepAliveRequest); - _pendingKeepAliveRequest = null; - } - - // finished sending commands, now send all classes that are waiting - // in the queue - while (_classesToSend != null && _classesToSend.size() > 0) - { - DataElement document = null; - synchronized (_classesToSend) - { - document = (DataElement)_classesToSend.remove(0); - } - _sender.sendClass(document); - } - - - } - - public void handle() - { - if (!_commands.isEmpty() || _pendingKeepAliveConfirmation != null || _pendingKeepAliveRequest != null || !_classesToSend.isEmpty()) - { - sendCommands(); - } - } - - /** - * Implemented to provide the means by which classes are sent - * across the comm channel. - * @param className the name of the class to send - * @param classbyteStreamHandlerId the name of the byte stream handler to use to receive the class - */ - public synchronized void sendClass(String className, String classbyteStreamHandlerId) - { - // send pending commands before sending class - if (_commands.size() > 0) - sendCommands(); - - DataElement document = _classDocumentElement; - document.setAttribute(DE.A_NAME, className); - document.setAttribute(DE.A_SOURCE, classbyteStreamHandlerId); - //document.setAttribute(DE.A_SOURCE, className); - document.setPendingTransfer(true); - document.setParent(null); - - addClassToSend(document); - } - - /** - * Implemented to provide the means by which classes are requested and sent - * across the comm channel. - * @param className the name of the class to send - */ - public synchronized void sendClass(String className) - { - sendClass(className, "default"); //$NON-NLS-1$ - } - - /** - * Adds a class to the queue of classes (represented by DataElements) to - * be sent to the server. - * @param classElement the DataElement representing the class to be sent - */ - public void addClassToSend(DataElement classElement) - { - synchronized (_classesToSend) - { - if (!_classesToSend.contains(classElement)) - { - _classesToSend.add(classElement); - } - } - notifyInput(); - } - - - public synchronized void sendClassInstance(IRemoteClassInstance runnable, String deserializebyteStreamHandlerId) - { - // send pending commands before sending class - if (_commands.size() > 0) - sendCommands(); - - DataElement document = _serializedDocumentElement; - document.setAttribute(DE.A_NAME, runnable.toString()); - document.setAttribute(DE.A_SOURCE, deserializebyteStreamHandlerId); - document.setPendingTransfer(true); - document.setParent(null); - - - _sender.sendRemoteClassRunnable(document, runnable); - } - - /** - * Implemented to provide the means by which classes are requested - * across the comm channel. - * @param className the name of the class to request - */ - public void requestClass(String className) - { - DataElement document = _requestClassDocumentElement; - document.setPendingTransfer(true); - document.setAttribute(DE.A_NAME, className); - document.setAttribute(DE.A_VALUE, className); - document.setParent(null); - - _sender.requestClass(document); - } - - - public void sendKeepAliveConfirmation() - { - DataElement document = _confirmKeepAliveDocumentElement; - document.setPendingTransfer(true); - document.setAttribute(DE.A_NAME, "confirm"); //$NON-NLS-1$ - document.setAttribute(DE.A_VALUE, "confirm"); //$NON-NLS-1$ - document.setParent(null); - _pendingKeepAliveConfirmation = document; - notifyInput(); - } - - public void sendKeepAliveRequest() - { - DataElement document = _keepAliveDocumentElement; - document.setPendingTransfer(true); - document.setAttribute(DE.A_NAME, "request"); //$NON-NLS-1$ - document.setAttribute(DE.A_VALUE, "request"); //$NON-NLS-1$ - document.setParent(null); - _pendingKeepAliveRequest = document; - notifyInput(); - } - - public synchronized void waitForInput() - { - if (_commands.size() == 0 && _classesToSend.size() == 0 && _pendingKeepAliveConfirmation == null && _pendingKeepAliveRequest == null) - { - super.waitForInput(); - } - } - - /** - * Indicates whether the xml generator should transfer the buffer attribute of a DataElement - * @param flag true to transfer the buffer attribute - */ - public void setGenerateBuffer(boolean flag) - { - _sender.setGenerateBuffer(flag); - } -} diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/client/ClientReceiver.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/client/ClientReceiver.java deleted file mode 100644 index 8f0b13147..000000000 --- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/client/ClientReceiver.java +++ /dev/null @@ -1,78 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2002, 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 - * - * 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: - * {Name} (company) - description of contribution. - *******************************************************************************/ - -package org.eclipse.dstore.internal.core.client; - -import java.net.Socket; - -import org.eclipse.dstore.core.model.DE; -import org.eclipse.dstore.core.model.DataElement; -import org.eclipse.dstore.core.model.DataStore; -import org.eclipse.dstore.core.util.Receiver; - -/* - * The ClientReciever is responsible for recieving data from - * the server side. - */ -public class ClientReceiver extends Receiver -{ - - /** - * Constructor - */ - public ClientReceiver(Socket socket, DataStore dataStore) - { - super(socket, dataStore); - } - - /** - * Called when new data is received from the server side. - * @param documentObject the root object of incoming data - */ - public void handleDocument(DataElement documentObject) - { - if (documentObject.getName().equals("exit")) //$NON-NLS-1$ - { - _canExit = true; - } - else - { - synchronized (documentObject) - { - for (int i = 0; i < documentObject.getNestedSize(); i++) - { - DataElement rootOutput = documentObject.get(i); - _dataStore.refresh(rootOutput); - } - documentObject.removeNestedData(); - //_dataStore.deleteObject(documentObject.getParent(), documentObject); - } - } - } - - /** - * Called when an error occurs - * @param e the exception that occurred - */ - public void handleError(Throwable e) - { - DataElement status = _dataStore.getStatus(); - status.setAttribute(DE.A_NAME, e.getMessage()); - _dataStore.refresh(status); - _dataStore.setConnected(false); - } -} diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/client/ClientSSLProperties.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/client/ClientSSLProperties.java deleted file mode 100644 index c4df4a8b5..000000000 --- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/client/ClientSSLProperties.java +++ /dev/null @@ -1,107 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006, 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 - * - * 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: - * {Name} (company) - description of contribution. - *******************************************************************************/ - -package org.eclipse.dstore.internal.core.client; - -import org.eclipse.dstore.core.model.ISSLProperties; -public class ClientSSLProperties implements ISSLProperties -{ - private boolean _enableSSL = false; - private boolean _disableServerSSL = false; - private String _daemonKeyStorePath; - private String _daemonKeyStorePassword; - - private String _serverKeyStorePath; - private String _serverKeyStorePassword; - - public ClientSSLProperties(boolean enableSSL, - String daemonKeystore, String daemonPassword, - String serverKeystore, String serverPassword) - { - _enableSSL = enableSSL; - _daemonKeyStorePath = daemonKeystore; - _daemonKeyStorePassword = daemonPassword; - _serverKeyStorePath = serverKeystore; - _serverKeyStorePassword = serverPassword; - } - - public ClientSSLProperties(boolean enableSSL, boolean disableServerSSL, - String daemonKeystore, String daemonPassword, - String serverKeystore, String serverPassword) - { - _enableSSL = enableSSL; - _disableServerSSL = disableServerSSL; - _daemonKeyStorePath = daemonKeystore; - _daemonKeyStorePassword = daemonPassword; - _serverKeyStorePath = serverKeystore; - _serverKeyStorePassword = serverPassword; - } - - public ClientSSLProperties(boolean enableSSL, String keystore, String password) - { - _enableSSL = enableSSL; - _daemonKeyStorePath = keystore; - _daemonKeyStorePassword = password; - - _serverKeyStorePath = keystore; - _serverKeyStorePassword = password; - } - - public ClientSSLProperties(boolean enableSSL, boolean disableServerSSL, String keystore, String password) - { - _enableSSL = enableSSL; - _disableServerSSL = disableServerSSL; - _daemonKeyStorePath = keystore; - _daemonKeyStorePassword = password; - - _serverKeyStorePath = keystore; - _serverKeyStorePassword = password; - } - - - public boolean usingSSL() - { - return _enableSSL; - } - - public boolean usingServerSSL() - { - return !_disableServerSSL; - } - - - public String getDaemonKeyStorePassword() - { - return _daemonKeyStorePassword; - } - - public String getDaemonKeyStorePath() - { - return _daemonKeyStorePath; - } - - public String getServerKeyStorePassword() - { - return _serverKeyStorePassword; - } - - public String getServerKeyStorePath() - { - return _serverKeyStorePath; - } - -} diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/client/ClientUpdateHandler.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/client/ClientUpdateHandler.java deleted file mode 100644 index c873c442c..000000000 --- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/client/ClientUpdateHandler.java +++ /dev/null @@ -1,190 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2002, 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 - * - * 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: - * {Name} (company) - description of contribution. - *******************************************************************************/ - -package org.eclipse.dstore.internal.core.client; - -import java.io.File; - -import org.eclipse.dstore.core.java.IRemoteClassInstance; -import org.eclipse.dstore.core.model.DE; -import org.eclipse.dstore.core.model.DataElement; -import org.eclipse.dstore.core.model.UpdateHandler; -import org.eclipse.dstore.extra.DomainEvent; -import org.eclipse.dstore.extra.IDomainNotifier; - -/** - * The ClientUpdateHandler is contains a queue of data update requests - * and periodically sends out domain notifications to domain listeners - */ -public class ClientUpdateHandler extends UpdateHandler -{ - - /** - * Constructor - */ - public ClientUpdateHandler() - { - super(); - _waitIncrement = 200; - } - - /** - * Not applicable - this is only applicable on the server side - */ - public void updateFile(String path, byte[] bytes, int size, boolean binary) - { - } - - /** - * Not applicable - this is only applicable on the server side - */ - public void updateAppendFile(String path, byte[] bytes, int size, boolean binary) - { - } - - /** - * Not applicable - this is only applicable on the server side - */ - public void updateFile(String path, byte[] bytes, int size, boolean binary, String byteStreamHandlerId) - { - } - - /** - * Not applicable - this is only applicable on the server side - */ - public void updateAppendFile(String path, byte[] bytes, int size, boolean binary, String byteStreamHandlerId) - { - } - - /** - * Notifies domain listeners that a file has been updated - * @param file the updated file - * @param object the element associated with the updated file - */ - public void updateFile(File file, DataElement object) - { - IDomainNotifier notifier = _dataStore.getDomainNotifier(); - notifier.fireDomainChanged(new DomainEvent(DomainEvent.FILE_CHANGE, object, DE.P_NESTED)); - } - - /** - * Periodically called to notify domain listeners of updated data from the - * server - */ - public void sendUpdates() - { - if (_dataStore != null && !isFinished()) - { - while (_dataObjects.size() > 0) - { - DataElement object = null; - synchronized (_dataObjects) - { - if (_dataObjects.size() > 0) - { - object = (DataElement) _dataObjects.get(0); - _dataObjects.remove(object); - } - } - - if ((object != null)) - { - - if (!object.isUpdated() && !object.isDescriptor()) - { - - //DataElement parent = object.getParent(); - //System.out.println("notifying "+parent); - notify(object); - } - clean(object); - } - } - } - } - - private void notify(DataElement object) - { - if (object.isExpanded()) - { - object.setUpdated(true); - } - - object.setExpanded(true); - - IDomainNotifier notifier = _dataStore.getDomainNotifier(); - - if (object.getNestedSize() == 0) - { - notifier.fireDomainChanged(new DomainEvent(DomainEvent.NON_STRUCTURE_CHANGE, object, DE.P_NESTED)); - - } - else - { - notifier.fireDomainChanged(new DomainEvent(DomainEvent.INSERT, object, DE.P_NESTED)); - } - } - - /** - * Implemented to provide the means by which classes are requested - * across the comm channel. (Only applies to ServerUpdateHandler, so is a dummy method here) - * @param className the name of the class to request - */ - public void requestClass(String className) - { - } - - /** - * Impleted to provide the means by which a class on the host is updated on the client - * @param runnable - * @param deserializebyteStreamHandlerId - */ - public synchronized void updateClassInstance(IRemoteClassInstance runnable, String deserializebyteStreamHandlerId) - { - notifyInput(); - } - - /** - * Does not apply in this case. Use ClientCommandHandler.sendClass(). - */ - public void sendClass(String className, String classByteStreamHandlerId) - { - } - - /** - * Does not apply in this case. Use ClientCommandHandler.sendClass(). - */ - public void sendClass(String className) - { - } - - /** - * Does not apply in this case. Use ClientCommandHandler.sendKeepAliveRequest(). - */ - public void sendKeepAliveRequest() - { - } - - /** - * Does not apply in this case. Use ClientCommandHandler.sendKeepAliveConfirmation(). - */ - public void sendKeepAliveConfirmation() - { - } - - -} diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/model/DefaultByteConverter.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/model/DefaultByteConverter.java deleted file mode 100644 index 2b56aa9ea..000000000 --- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/model/DefaultByteConverter.java +++ /dev/null @@ -1,95 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2004, 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 - * - * 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: - * {Name} (company) - description of contribution. - *******************************************************************************/ - -package org.eclipse.dstore.internal.core.model; - -import java.io.File; -import java.io.UnsupportedEncodingException; - -import org.eclipse.dstore.core.model.DE; -import org.eclipse.dstore.core.model.IByteConverter; - -/** - * @author dmcknigh - * - * To change the template for this generated type comment go to - * Window>Preferences>Java>Code Generation>Code and Comments - */ -public class DefaultByteConverter implements IByteConverter -{ - private String _clientEncoding = DE.ENCODING_UTF_8; - private String _hostEncoding = System.getProperty("file.encoding"); //$NON-NLS-1$ - public void setContext(File file) - { - } - - public void setHostEncoding(String hostEncoding) - { - _hostEncoding = hostEncoding; - } - - public void setClientEncoding(String clientEncoding) - { - _clientEncoding = clientEncoding; - } - - public byte[] convertHostBytesToClientBytes(byte[] buffer, int offset, int length) - { - byte[] convertedBytes =null; - try - { - convertedBytes = (new String(buffer, offset, length, _hostEncoding)).getBytes(_clientEncoding); - } - catch (UnsupportedEncodingException e) - { - try - { - convertedBytes = (new String(buffer, offset, length)).getBytes(_clientEncoding); - } - catch (UnsupportedEncodingException e2) - { - return buffer; - } - } - - return convertedBytes; - } - - public byte[] convertClientBytesToHostBytes(byte[] buffer, int offset, int length) - { - byte[] convertedBytes = null; - - try - { - convertedBytes = (new String(buffer, offset, length, _clientEncoding)).getBytes(_hostEncoding); - } - catch (UnsupportedEncodingException e) - { - try - { - convertedBytes = (new String(buffer, offset, length)).getBytes(_hostEncoding); - } - catch (UnsupportedEncodingException e2) - { - return buffer; - } - } - - return convertedBytes; - } - -} diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/model/SchemaRegistry.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/model/SchemaRegistry.java deleted file mode 100644 index 73375a26e..000000000 --- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/model/SchemaRegistry.java +++ /dev/null @@ -1,96 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2002, 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 - * - * 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: - * {Name} (company) - description of contribution. - *******************************************************************************/ - -package org.eclipse.dstore.internal.core.model; - -import java.util.ArrayList; - -import org.eclipse.dstore.core.model.DataElement; -import org.eclipse.dstore.core.model.DataStore; -import org.eclipse.dstore.core.model.IExternalLoader; -import org.eclipse.dstore.core.model.ISchemaExtender; -import org.eclipse.dstore.core.model.ISchemaRegistry; - -/** - * SchemaRegistry implements the interface for external tools to contribute their - * schemas to the DataStore. - */ -public class SchemaRegistry implements ISchemaRegistry -{ - - - private ArrayList _initializedDataStores = new ArrayList(); - private ArrayList _extenders = new ArrayList(); - - /** - * Registers a schema extender with the associated DataStores - * @param extender the schema extender to register - */ - public void registerSchemaExtender(ISchemaExtender extender) - { - if (!_extenders.contains(extender)) - { - _extenders.add(extender); - for (int i = 0; i < _initializedDataStores.size(); i++) - { - DataStore dataStore = (DataStore) _initializedDataStores.get(i); - DataElement schemaRoot = dataStore.getDescriptorRoot(); - extender.extendSchema(schemaRoot); - } - } - } - - /** - * Calls extendSchema() on each of the registered schema extenders to - * extend the schema of the specified DataStore - * - * @param dataStore the DataStore whos schema will be updated - */ - public void extendSchema(DataStore dataStore) - { - if (!_initializedDataStores.contains(dataStore)) - { - DataElement schemaRoot = dataStore.getDescriptorRoot(); - for (int i = 0; i < _extenders.size(); i++) - { - ISchemaExtender extender = (ISchemaExtender) _extenders.get(i); - extender.extendSchema(schemaRoot); - } - _initializedDataStores.add(dataStore); - } - } - - /** - * Gets the <code>ExternalLoader</code> for the specified qualified classname - * - * @param source the qualified classname - * @return the external loader for the specified classname - */ - public IExternalLoader getLoaderFor(String source) - { - for (int i = 0; i < _extenders.size(); i++) - { - ISchemaExtender extender = (ISchemaExtender) _extenders.get(i); - IExternalLoader loader = extender.getExternalLoader(); - if (loader.canLoad(source)) - { - return loader; - } - } - return null; - } -} diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/server/MinerLoader.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/server/MinerLoader.java deleted file mode 100644 index 46b48f670..000000000 --- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/server/MinerLoader.java +++ /dev/null @@ -1,426 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2002, 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 - * - * 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 McKnight (IBM) - [244388] [dstore] Connection hangs when a miner not installed - *******************************************************************************/ - -package org.eclipse.dstore.internal.core.server; - -import java.io.BufferedReader; -import java.io.File; -import java.io.FileInputStream; -import java.io.InputStreamReader; -import java.util.ArrayList; - -import org.eclipse.dstore.core.java.RemoteClassLoader; -import org.eclipse.dstore.core.miners.Miner; -import org.eclipse.dstore.core.model.DE; -import org.eclipse.dstore.core.model.DataElement; -import org.eclipse.dstore.core.model.DataStore; -import org.eclipse.dstore.core.model.DataStoreAttributes; -import org.eclipse.dstore.core.model.IExternalLoader; -import org.eclipse.dstore.core.model.ISchemaExtender; -import org.eclipse.dstore.core.model.ISchemaRegistry; -import org.eclipse.dstore.internal.core.util.ExternalLoader; - -/** - * MinerLoader is an implementation of <code>ISchemaRegistry</code> used for - * loading and initializing miners. - */ -public class MinerLoader implements ISchemaRegistry -{ - - - private DataStore _dataStore; - private ArrayList _miners; - private ArrayList _minerList; - private ArrayList _minerFileList; - private ArrayList _connectedList; - private ArrayList _loaders; - private RemoteClassLoader _remoteLoader; - private ExternalLoader _externalRemoteLoader; - - /** - * Constructor - * - * @param dataStore the associated DataStore - * @param loaders the list of <code>ExternalLoader</code>s used be the miner loader - */ - public MinerLoader(DataStore dataStore, ArrayList loaders) - { - _dataStore = dataStore; - _loaders = loaders; - _miners = new ArrayList(); - _minerList = new ArrayList(); - _minerFileList = new ArrayList(); - _connectedList = new ArrayList(); - } - - /** - * Loads all miners that are specified in the default <i>minerFile.dat</i> as - * well as any others indicated by <code>DataStore.getMinersLocation</code> that - * have not yet been loaded. - */ - public void loadMiners() - { - // load the miners - String pluginDir = _dataStore.getAttribute(DataStoreAttributes.A_PLUGIN_PATH); - - // default location - String defaultMinerFile = pluginDir + File.separator + "minerFile.dat"; //$NON-NLS-1$ - File defaultMF = new File(defaultMinerFile); - if (defaultMF.exists()) - { - try - { - loadMiners(defaultMinerFile, DE.ENCODING_UTF_8); - } - catch (Exception e) - { - _dataStore.trace("failed to load minerFile.data with UTF-8. Trying with native encoding"); //$NON-NLS-1$ - - try - { - loadMiners(defaultMinerFile, null); - } - catch (Exception ex) - { - _dataStore.trace(ex); - } - } - _minerFileList.add(defaultMinerFile); - } - - ArrayList minerLocations = _dataStore.getMinersLocation(); - - for (int i = 0; i < minerLocations.size(); i++) - { - String minersDir = (String) minerLocations.get(i); - String minerFile = null; - if (minersDir.endsWith(".dat")) //$NON-NLS-1$ - { - minerFile = pluginDir + File.separator + minersDir; - } - else - { - minerFile = pluginDir + File.separator + minersDir + File.separator + "minerFile.dat"; //$NON-NLS-1$ - } - //_dataStore.trace("load miners for " + minerFile); - if (!_minerFileList.contains(minerFile)) - { - try - { - loadMiners(minerFile, DE.ENCODING_UTF_8); - } - catch (Exception e) - { - _dataStore.trace("failed to load minerFile.data with UTF-8. Trying with native encoding"); //$NON-NLS-1$ - try - { - loadMiners(minerFile, null); - } - catch (Exception ex) - { - _dataStore.trace(ex); - } - } - _minerFileList.add(minerFile); - } - } - } - - /** - * Loads that miners specified in a particular miner configuration file (i.e. <i>minerFile.dat</i>) - * @param minerFile a file specifying a list of miners - * @return a list of the loaded miners - */ - public ArrayList loadMiners(String minerFile, String encoding) throws Exception - { - // load the miners - ArrayList unconnectedMiners = new ArrayList(); - File file = new File(minerFile); - - FileInputStream inFile = new FileInputStream(file); - BufferedReader in = null; - if (encoding == null) - { - in = new BufferedReader(new InputStreamReader(inFile)); - } - else - { - in = new BufferedReader(new InputStreamReader(inFile, encoding)); - } - - String name = null; - while ((name = in.readLine()) != null) - { - // check name - name = name.trim(); - - if (!name.startsWith("#") && (name.length() > 5)) //$NON-NLS-1$ - { - Miner miner = loadMiner(name); - if (miner != null) - { - unconnectedMiners.add(miner); - } - } - } - - connectMiners(unconnectedMiners); - return _miners; - } - - - - public Miner loadMiner(String name) - { - Miner miner = null; - if (!_minerList.contains(name)) - { - // only load new miners - try - { - IExternalLoader loader = getLoaderFor(name); - if (loader != null) - { - // try to load and instantiate the miner - // the RemoteClassLoader will kick off a synchronous - // request to the client for any classes that cannot be found - // on the host. - Class theClass = loader.loadClass(name); - miner = (Miner) theClass.newInstance(); - if (miner != null) - { - miner.setExternalLoader(loader); - _minerList.add(name); - } - else { - System.out.println("miner is null"); - } - } - } - catch (NoClassDefFoundError e) - { - e.printStackTrace(); - handleNoClassFound(e.getMessage().replace('/','.')); - } - catch (ClassNotFoundException e) - { - e.printStackTrace(); - handleNoClassFound(name); - } - catch (InstantiationException e) - { - e.printStackTrace(); - } - catch (IllegalAccessException e) - { - e.printStackTrace(); - } - catch (Exception e) - { - e.printStackTrace(); - } - } - else - { - } - return miner; - } - - private void handleNoClassFound(String name) - { - if (_remoteLoader != null){ - _remoteLoader.loadClassInThread(name); - } - } - - private void connectMiners(ArrayList unconnectedMiners) - { - // init list - for (int i = 0; i < _miners.size(); i++) - { - _connectedList.add(((Miner) _miners.get(i)).getMinerName()); - } - - while (unconnectedMiners.size() > 0) - { - Miner miner = (Miner) unconnectedMiners.get(0); - unconnectedMiners.remove(miner); - if (connectMiner(miner)) - { - _dataStore.trace("connected " + miner.getMinerName()); //$NON-NLS-1$ - } - else - { - unconnectedMiners.add(miner); - } - } - - } - - public boolean connectMiner(Miner miner) - { - boolean canConnect = true; - ArrayList dependencies = miner.getMinerDependencies(); - for (int i = 0; i < dependencies.size(); i++) - { - String dependency = (String) dependencies.get(i); - if (!_connectedList.contains(dependency)) - { - canConnect = false; - } - } - - if (canConnect) - { - // set the datastore for the miner - miner.setDataStore(_dataStore); - miner.extendSchema(_dataStore.getDescriptorRoot()); - _dataStore.refresh(_dataStore.getDescriptorRoot()); - _miners.add(miner); - _connectedList.add(miner.getMinerName()); - miner.start(); - } - return canConnect; - } - - /** - * Currently not used for the miner loader - */ - public void registerSchemaExtender(ISchemaExtender extender) - { - } - - /** - * Calls <code>extendSchema</code> on each of the loaded miners - * - * @param dataStore the DataStore containing the base schema to extend - */ - public void extendSchema(DataStore dataStore) - { - DataElement schemaRoot = dataStore.getDescriptorRoot(); - for (int i = 0; i < _miners.size(); i++) - { - Miner miner = (Miner) _miners.get(i); - miner.extendSchema(schemaRoot); - } - - } - - public ExternalLoader getExternalRemoteLoader() - { - if (_externalRemoteLoader == null) - { - _externalRemoteLoader = new ExternalLoader(getRemoteLoader(), "*"); //$NON-NLS-1$ - } - return _externalRemoteLoader; - } - - public RemoteClassLoader getRemoteLoader() - { - return _dataStore.getRemoteClassLoader(); - } - - /** - * Returns the <code>ExternalLoader</code> for a particular - * class. - * - * @param source a qualified classname - * @return the loader for the specified class - */ - public IExternalLoader getLoaderFor(String source) - { - ExternalLoader remoteLoader = getExternalRemoteLoader(); - - // for now we always return the RemoteClassLoader - - //if (remoteLoader.canLoad(source)) - if(true) - { - //System.out.println("using RemoteClassLoader"); - return remoteLoader; - } - - for (int i = 0; i < _loaders.size(); i++) - { - ExternalLoader loader = (ExternalLoader) _loaders.get(i); - if (loader.canLoad(source)) - { - // System.out.println("using local loader"); - return loader; - } - else - { - } - } - - return null; - } - - /** - * Returns the loaded miners - * - * @return the loaded miners - */ - public ArrayList getMiners() - { - return _miners; - } - - /** - * Returns the miner indicated with the specified name - * - * @param name the qualified classname of the miner - * @return the miner - */ - public Miner getMiner(String name) - { - for (int i = 0; i < _miners.size(); i++) - { - Miner miner = (Miner) _miners.get(i); - if (miner.getClass().getName().equals(name)) - { - return miner; - } - } - - return null; - } - - /** - * Terminates the specified miner - * - * @param name the qualified classname of the miner to terminate - */ - public void finishMiner(String name) - { - Miner miner = getMiner(name); - miner.finish(); - _miners.remove(miner); - } - - /** - * Terminate all the miners - */ - public void finishMiners() - { - for (int i = 0; i < _miners.size(); i++) - { - Miner miner = (Miner) _miners.get(i); - miner.finish(); - } - } -} diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/server/ServerAttributes.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/server/ServerAttributes.java deleted file mode 100644 index 6b0fa84fe..000000000 --- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/server/ServerAttributes.java +++ /dev/null @@ -1,73 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2002, 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 - * - * 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: - * {Name} (company) - description of contribution. - *******************************************************************************/ - -package org.eclipse.dstore.internal.core.server; - -import java.io.File; -import java.net.InetAddress; -import java.net.UnknownHostException; - -import org.eclipse.dstore.core.model.DataStoreAttributes; - -/** - * This class is used to store attributes that are required - * for configurating a remote connection. - */ -public class ServerAttributes extends DataStoreAttributes -{ - - /** - * Constructor - */ - public ServerAttributes() - { - super(); - - try - { - String pluginPath = System.getProperty("A_PLUGIN_PATH"); //$NON-NLS-1$ - if (pluginPath != null) pluginPath = pluginPath.trim(); - if ((pluginPath != null) && (pluginPath.length() > 0)) - { - File f = new File(pluginPath); - try - { - pluginPath = f.getCanonicalPath(); - } - catch (Exception e) - { - pluginPath = f.getAbsolutePath(); - } - - setAttribute(A_PLUGIN_PATH, pluginPath + File.separator); - } - else - { - setAttribute(A_PLUGIN_PATH, "/home/"); //$NON-NLS-1$ - } - - setAttribute(A_LOCAL_NAME, InetAddress.getLocalHost().getHostName()); - - setAttribute(A_HOST_NAME, "server_host"); //$NON-NLS-1$ - setAttribute(A_HOST_PATH, "/home/"); //$NON-NLS-1$ - } - catch (UnknownHostException e) - { - } - - } -} diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/server/ServerCommandHandler.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/server/ServerCommandHandler.java deleted file mode 100644 index e1aca949b..000000000 --- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/server/ServerCommandHandler.java +++ /dev/null @@ -1,576 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2002, 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 - * - * 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 McKnight (IBM) [224906] [dstore] changes for getting properties and doing exit due to single-process capability - * David McKnight (IBM) - [244388] [dstore] Connection hangs when a miner not installed - *******************************************************************************/ - -package org.eclipse.dstore.internal.core.server; - -import java.io.File; -import java.util.ArrayList; -import java.util.List; - -import org.eclipse.dstore.core.java.IRemoteClassInstance; -import org.eclipse.dstore.core.miners.Miner; -import org.eclipse.dstore.core.model.CommandHandler; -import org.eclipse.dstore.core.model.DE; -import org.eclipse.dstore.core.model.DataElement; -import org.eclipse.dstore.core.model.DataStore; -import org.eclipse.dstore.core.model.DataStoreAttributes; -import org.eclipse.dstore.core.model.DataStoreResources; -import org.eclipse.dstore.core.model.DataStoreSchema; -import org.eclipse.dstore.core.model.IDataStoreConstants; -import org.eclipse.dstore.core.server.SystemServiceManager; - -/** - * The ServerCommandHandler is reponsible for maintaining - * a queue of commands and periodically routing commands - * from the queue to the appropriate miners. - */ -public class ServerCommandHandler extends CommandHandler -{ - public class ServerIdleThread extends Thread - { - private long _timeout; - private boolean _serverTimedOut = false; - - public ServerIdleThread(long timeout) - { - _timeout = timeout; - } - - public void run() - { - while (!_serverTimedOut) - { - waitForTimeout(); - } - if (_serverTimedOut) - { - - _dataStore.getCommandHandler().finish(); - _dataStore.getUpdateHandler().finish(); - _dataStore.finish(); - System.out.println(ServerReturnCodes.RC_FINISHED); - - // only exit if there's no service manager - if (SystemServiceManager.getInstance().getSystemService() == null) - System.exit(0); - } - } - - protected synchronized void waitForTimeout() - { - try - { - wait(_timeout); - } - catch (InterruptedException e) - { - // whenver a new command comes through we interrupt this - // if we do timeout then it's time to shutdown the server - return; - } - System.out.println("server timed out!"); //$NON-NLS-1$ - _serverTimedOut = true; - } - - } - - - private ArrayList _loaders; - private MinerLoader _minerLoader; - private ServerIdleThread _serverIdleThread; - - /** - * Constructor - * - * @param loaders a list of <code>ExternalLoader</code>s used for loading miners - */ - public ServerCommandHandler(ArrayList loaders) - { - super(); - _loaders = loaders; - } - - /** - * Sets the associated DataStore - * - * @param dataStore the associated DataStore - */ - public void setDataStore(DataStore dataStore) - { - super.setDataStore(dataStore); - } - - /** - * Loads the miners - */ - public void loadMiners() - { - if (_dataStore != null) - { - if (_minerLoader == null) - { - _minerLoader = new MinerLoader(_dataStore, _loaders); - } - // load the miners - _minerLoader.loadMiners(); - - } - } - - public Miner loadMiner(String minerId) - { - - if (_dataStore != null) - { - if (_minerLoader == null) - { - _minerLoader = new MinerLoader(_dataStore, _loaders); - } - - _dataStore.trace("loading "+minerId); //$NON-NLS-1$ - // load and connect the miner - Miner miner = _minerLoader.loadMiner(minerId); - if (miner != null) - { - _minerLoader.connectMiner(miner); - } - return miner; - } - return null; - } - - /** - * Returns the list of loaded miners - * - * @return the list of miners - */ - public ArrayList getMiners() - { - return _minerLoader.getMiners(); - } - - /** - * Returns the specified miner - * - * @param name the qualified classname of the miner to return - * @return the miner - */ - public Miner getMiner(String name) - { - return _minerLoader.getMiner(name); - } - - /** - * Terminates a specified miner - * - * @param name the qualified classname of the miner to terminate - */ - public void finishMiner(String name) - { - _minerLoader.finishMiner(name); - } - - /** - * Called when the DataStore session is finished or when there is - * an unexpected error. - */ - public void finish() - { - if (_minerLoader != null) - _minerLoader.finishMiners(); - super.finish(); - } - - private void clearDeleted(DataElement element, int depth) - { - if (depth > 0 && element != null) - { - for (int i = 0; i < element.getNestedSize(); i++) - { - DataElement child = element.get(i); - if (child != null) - { - if (child.isReference()) - child = child.dereference(); - - - if (child != null) - { - if (child.isDeleted()) - { - element.removeNestedData(child); - } - else - { - clearDeleted(child, depth - 1); - } - } - } - } - } - } - - - /** - * Called periodically to route the current queue of commands to the appropriate miners - */ - public void sendCommands() - { - // send commands to the appropriate miners - while (_commands.size() > 0) - { - DataElement command = null; - - synchronized (_commands) - { - command = (DataElement) _commands.get(0); - clearDeleted(command, 2); - _commands.remove(command); - } - - //DKM-status is always last - DataElement status = command.get(command.getNestedSize() - 1); - //_dataStore.find(command, DE.A_TYPE,DataStoreResources.model_status"), 1); - - String commandSource = command.getSource(); - String commandName = command.getName(); - _dataStore.trace(commandName); - - if (commandName.equals(DataStoreSchema.C_VALIDATE_TICKET)) - { - DataElement serverTicket = _dataStore.getTicket(); - DataElement clientTicket = command.get(0); - String st = serverTicket.getName(); - String ct = clientTicket.getName(); - - if (st == null || (ct != null && ct.equals(st))) - { - serverTicket.setAttribute(DE.A_VALUE,DataStoreResources.model_valid); - clientTicket.setAttribute(DE.A_VALUE,DataStoreResources.model_valid); - - DataElement host = _dataStore.getHostRoot(); - _dataStore.getHashMap().remove(host.getId()); - host.setAttribute(DE.A_ID, "host." + serverTicket.getName()); //$NON-NLS-1$ - - _dataStore.getHashMap().put(host.getId(), host); - _dataStore.update(host); - } - else - { - serverTicket.setAttribute(DE.A_VALUE,DataStoreResources.model_invalid); - clientTicket.setAttribute(DE.A_VALUE,DataStoreResources.model_invalid); - } - _dataStore.update(clientTicket); - _dataStore.startDataElementRemoverThread(); - status.setAttribute(DE.A_NAME,DataStoreResources.model_done); - } - else if (commandName.equals(DataStoreSchema.C_SET)) - { - //DataElement dataObject = command.get(0); - status.setAttribute(DE.A_NAME,DataStoreResources.model_done); - } - else if (commandName.equals(DataStoreSchema.C_MODIFY)) - { - DataElement dataObject = command.get(0); - DataElement original = _dataStore.find(dataObject.getId()); - original.setAttributes(dataObject.getAttributes()); - status.setAttribute(DE.A_NAME,DataStoreResources.model_done); - } - else if (commandName.equals(DataStoreSchema.C_SET_HOST)) - { - DataElement dataObject = command.get(0); - - DataElement original = _dataStore.getHostRoot(); - original.setAttributes(dataObject.getAttributes()); - - _dataStore.setAttribute(DataStoreAttributes.A_LOCAL_PATH, dataObject.getSource()); - _dataStore.setAttribute(DataStoreAttributes.A_HOST_PATH, dataObject.getSource()); - status.setAttribute(DE.A_NAME,DataStoreResources.model_done); - } - else if (commandName.equals(DataStoreSchema.C_ADD_MINERS)) - { - DataElement location = command.get(1); - _dataStore.addMinersLocation(location); - status.setAttribute(DE.A_NAME,DataStoreResources.model_done); - } - else if (commandName.equals(DataStoreSchema.C_ACTIVATE_MINER)) - { - DataElement minerId = command.get(0); - String minerName = minerId.getName(); - Miner miner = loadMiner(minerName); - if (miner != null){ - miner.initMiner(status); - } - else { // failed to load miner - status.setAttribute(DE.A_NAME,DataStoreResources.model_done); - status.setAttribute(DE.A_VALUE, DataStoreResources.model_failed); - } - //System.out.println("finished initing "+miner.getMinerName()); - //status.setAttribute(DE.A_NAME,DataStoreResources.model_done); - } - else if (commandName.equals(DataStoreSchema.C_SET_PREFERENCE)) - { - DataElement dataObject = command.get(0); - String property = dataObject.getName(); - String value = dataObject.getValue(); - _dataStore.setPreference(property, value); - } - else if (commandName.equals(DataStoreSchema.C_QUERY_INSTALL)) - { - // determine where dstore is located - status.setAttribute(DE.A_SOURCE, _dataStore.getAttribute(DataStoreAttributes.A_PLUGIN_PATH)); - status.setAttribute(DE.A_NAME,DataStoreResources.model_done); - } - else if (commandName.equals(DataStoreSchema.C_QUERY_CLIENT_IP)) - { - // determine where dstore is connected to - status.setAttribute(DE.A_SOURCE, _dataStore.getRemoteIP()); - status.setAttribute(DE.A_NAME,DataStoreResources.model_done); - } - else if (commandName.equals(DataStoreSchema.C_QUERY_JVM)) - { - // get jvm stats - // check memory consuption - // if we're running low, try to free some - Runtime runtime = Runtime.getRuntime(); - runtime.gc(); - long freeMem = runtime.freeMemory(); - long totalMem = runtime.totalMemory(); - long maxMem = runtime.maxMemory(); - - - StringBuffer statsBuffer = new StringBuffer(); - statsBuffer.append(freeMem); - statsBuffer.append(','); - statsBuffer.append(totalMem); - statsBuffer.append(','); - statsBuffer.append(maxMem); - statsBuffer.append(','); - statsBuffer.append(_dataStore.getNumElements()); - statsBuffer.append(','); - - // last 7 dataelements created - List lastCreated = _dataStore.getLastCreatedElements(); - for (int i = 0; i < lastCreated.size(); i++) - { - DataElement element = (DataElement)lastCreated.get(i); - statsBuffer.append(element.getName()); - statsBuffer.append(":"); //$NON-NLS-1$ - statsBuffer.append("id="+element.getId()); //$NON-NLS-1$ - statsBuffer.append(";"); //$NON-NLS-1$ - } - - - status.setAttribute(DE.A_SOURCE, statsBuffer.toString()); - status.setAttribute(DE.A_NAME,DataStoreResources.model_done); - } - else if (commandName.equals(DataStoreSchema.C_SCHEMA)) - { - loadMiners(); - - DataElement schemaRoot = _dataStore.getDescriptorRoot(); - - // update all descriptor objects - _dataStore.refresh(schemaRoot); - status.setAttribute(DE.A_NAME,DataStoreResources.model_done); - } - else if (commandName.equals(IDataStoreConstants.C_START_SPIRIT)) - { - _dataStore.receiveStartSpiritCommand(); - status.setAttribute(DE.A_NAME, DataStoreResources.model_done); - } - else if (_dataStore.validTicket() && _minerLoader != null) - { - if (status != null) - { - boolean failure = false; - ArrayList miners = _minerLoader.getMiners(); - for (int j = 0;(j < miners.size()) && !failure; j++) - { - Miner miner = (Miner) miners.get(j); - - if (commandSource.equals("*") || commandSource.equals(miner.getClass().getName())) //$NON-NLS-1$ - { - if (_dataStore.isAutoRefreshOn()) - { - _dataStore.enableAutoRefresh(false); - } - /* - status = miner.command(command); - - if ((status != null) && status.getAttribute(DE.A_NAME).equals(DataStoreResources.model_incomplete)) - { - failure = true; - } - */ - miner.requestCommand(command); - - - - } - - } - if (commandName.equals(DataStoreSchema.C_INIT_MINERS)) - { - // old way was to submit this command for all miners at once - // now we wait til activateMiner call is made per each miner - // for backward compatibility, we still call init miners - // so we need to make sure, in cases were miners are loaded dynamically, - // that we set this to done if there's no miners to init - status.setAttribute(DE.A_NAME, DataStoreResources.model_done); - } - } - - } - - _dataStore.refresh(status); - - } - } - - /** - * Set the contents of a file with the specified file - * @param fileName the name of the target file - * @param file the source file - */ - public void sendFile(String fileName, File file) - { - //_dataStore.saveFile(fileName, file); - } - - /** - * Sets the contents of a file with bytes sent from the client - * @param fileName the name of the file to append to - * @param bytes the bytes of a file to insert - * @param size the number of bytes to insert - * @param binary indicates whether to insert the bytes as binary or unicode - */ - public void sendFile(String fileName, byte[] bytes, int size, boolean binary) - { - sendFile(fileName, bytes, size, binary, "default"); //$NON-NLS-1$ - } - -/** - * Sets the contents of a file with bytes sent from the client - * @param fileName the name of the file to append to - * @param bytes the bytes of a file to insert - * @param size the number of bytes to insert - * @param binary indicates whether to insert the bytes as binary or unicode - * @param byteStreamHandlerId indicates which byte stream handler should receive the bytes - */ - public void sendFile(String fileName, byte[] bytes, int size, boolean binary, String byteStreamHandlerId) - { - _dataStore.saveFile(fileName, bytes, size, binary, byteStreamHandlerId); - } - - /** - * Appends bytes sent from the client to a file - * @param fileName the name of the file to append to - * @param bytes the bytes of a file to append - * @param size the number of bytes to append - * @param binary indicates whether to append the bytes as binary or unicode - */ - public void sendAppendFile(String fileName, byte[] bytes, int size, boolean binary) - { - sendAppendFile(fileName, bytes, size, binary, "default"); //$NON-NLS-1$ - } - - /** - * Appends bytes sent from the client to a file - * @param fileName the name of the file to append to - * @param bytes the bytes of a file to append - * @param size the number of bytes to append - * @param binary indicates whether to append the bytes as binary or unicode - * @param byteStreamHandlerId indicates which byte stream handler should receive the bytes - */ - public void sendAppendFile(String fileName, byte[] bytes, int size, boolean binary, String byteStreamHandlerId) - { - _dataStore.appendToFile(fileName, bytes, size, binary); - } - - /** - * Implemented to provide the means by which classes are requested and sent - * across the comm channel. - * @param className the name of the class to request - */ - public synchronized void sendClass(String className) - { - sendClass(className, "default"); //$NON-NLS-1$ - } - - /** - * Implemented to provide the means by which classes are requested and sent - * across the comm channel. - * @param className the name of the class to request - */ - public synchronized void sendClass(String className, String classByteStreamHandlerId) - { - //_dataStore.sendClass(className, classByteStreamHandlerId); - } - - public void sendClassInstance(IRemoteClassInstance runnable, String classByteStreamHandlerId) - { - notifyInput(); - } - - /** - * Does not apply to server. Use ServerUpdateHandler.requestClass(). - */ - public void requestClass(String className) - { - } - - /** - * Does not apply to server. Use ServerUpdateHandler.sendKeepAliveConfirmation(). - */ - public void sendKeepAliveConfirmation() - { - } - - /** - * Does not apply to server. Use ServerUpdateHandler.sendKeepAliveRequest(). - */ - public void sendKeepAliveRequest() - { - } - - - /** - * Overridden so that ServerIdleThread knows when new commands are received - */ - public void addCommand(DataElement command, boolean immediate) - { - super.addCommand(command, immediate); - - int serverIdleShutdownTimeout = _dataStore.getServerIdleShutdownTimeout(); - if (serverIdleShutdownTimeout > 0) - { - if (_serverIdleThread != null) - { - // new command so restart timeout - _serverIdleThread.interrupt(); - } - else - { - _serverIdleThread = new ServerIdleThread(serverIdleShutdownTimeout); - _serverIdleThread.start(); - } - } - } - -} diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/server/ServerReturnCodes.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/server/ServerReturnCodes.java deleted file mode 100644 index 3b9ceaccf..000000000 --- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/server/ServerReturnCodes.java +++ /dev/null @@ -1,40 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2002, 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 - * - * 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: - * {Name} (company) - description of contribution. - *******************************************************************************/ - -package org.eclipse.dstore.internal.core.server; - -/** - * This class contains a list of server return codes that are used - * to negociate server communication with a client - */ -public class ServerReturnCodes -{ - public static final String RC_DSTORE_SERVER_MAGIC = "DStore Server Starting..."; //$NON-NLS-1$ - - public static final String RC_SUCCESS = "Server Started Successfully"; //$NON-NLS-1$ - - public static final String RC_UNKNOWN_HOST_ERROR = "Unknown host error"; //$NON-NLS-1$ - public static final String RC_BIND_ERROR = "Error binding socket"; //$NON-NLS-1$ - public static final String RC_GENERAL_IO_ERROR = "General IO error creating socket"; //$NON-NLS-1$ - public static final String RC_CONNECTION_ERROR = "Connection error"; //$NON-NLS-1$ - - public static final String RC_SECURITY_ERROR = "Security error creating socket"; //$NON-NLS-1$ - - public static final String RC_FINISHED = "Server Finished"; //$NON-NLS-1$ - - public static final String RC_JRE_VERSION_ERROR = "JRE 1.4 or higher required"; //$NON-NLS-1$ -} diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/server/ServerSSLProperties.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/server/ServerSSLProperties.java deleted file mode 100644 index 0e4089921..000000000 --- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/server/ServerSSLProperties.java +++ /dev/null @@ -1,148 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2002, 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 - * - * 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: - * {Name} (company) - description of contribution. - *******************************************************************************/ - -package org.eclipse.dstore.internal.core.server; - -import java.util.ResourceBundle; - -import org.eclipse.dstore.core.model.ISSLProperties; - - -public class ServerSSLProperties implements ISSLProperties -{ - private boolean _enableSSL = false; - private boolean _disableServerSSL = false; - - private String _daemonKeyStorePath; - private String _daemonKeyStorePassword; - - private String _serverKeyStorePath; - private String _serverKeyStorePassword; - - - private static final String ENABLE_SSL = "enable_ssl"; //$NON-NLS-1$ - private static final String DISABLE_SERVER_SSL = "disable_server_ssl"; //$NON-NLS-1$ - - private static final String DAEMON_KEYSTORE_FILE = "daemon_keystore_file"; //$NON-NLS-1$ - private static final String DAEMON_KEYSTORE_PASSWORD = "daemon_keystore_password"; //$NON-NLS-1$ - - private static final String SERVER_KEYSTORE_FILE = "server_keystore_file"; //$NON-NLS-1$ - private static final String SERVER_KEYSTORE_PASSWORD = "server_keystore_password"; //$NON-NLS-1$ - - - public ServerSSLProperties() - { - try - { - ResourceBundle properties = ResourceBundle.getBundle("ssl"); //$NON-NLS-1$ - _enableSSL = properties.getString(ENABLE_SSL).trim().equals("true"); //$NON-NLS-1$ - if (_enableSSL) - { - try - { - _disableServerSSL = properties.getString(DISABLE_SERVER_SSL).trim().equals("true"); //$NON-NLS-1$ - } - catch (Exception e) - { - - } - - try - { - _daemonKeyStorePath = properties.getString(DAEMON_KEYSTORE_FILE).trim(); - _daemonKeyStorePassword = properties.getString(DAEMON_KEYSTORE_PASSWORD).trim(); - } - catch (Exception e) - { - } - - if (!_disableServerSSL) - { - try - { - _serverKeyStorePath = properties.getString(SERVER_KEYSTORE_FILE).trim(); - _serverKeyStorePassword = properties.getString(SERVER_KEYSTORE_PASSWORD).trim(); - } - catch (Exception e) - { - } - } - - if (_daemonKeyStorePath == null && _serverKeyStorePath != null) - { - _daemonKeyStorePath = _serverKeyStorePath; - _daemonKeyStorePassword = _serverKeyStorePassword; - } - if (!_disableServerSSL && _serverKeyStorePath == null && _daemonKeyStorePath != null) - { - _serverKeyStorePath = _daemonKeyStorePath; - _serverKeyStorePassword = _daemonKeyStorePassword; - } - - } - - if (_enableSSL) - { - System.out.println("SSL Settings"); //$NON-NLS-1$ - System.out.println("[daemon keystore:\t"+_daemonKeyStorePath+"]"); //$NON-NLS-1$ //$NON-NLS-2$ - System.out.println("[daemon keystore pw:\t"+_daemonKeyStorePassword+"]"); //$NON-NLS-1$ //$NON-NLS-2$ - if (!_disableServerSSL) - { - System.out.println("[server keystore:\t"+_serverKeyStorePath+"]"); //$NON-NLS-1$ //$NON-NLS-2$ - System.out.println("[server keystore pw:\t"+_serverKeyStorePassword+"]"); //$NON-NLS-1$ //$NON-NLS-2$ - } - } - } - catch (Exception e) - { - e.printStackTrace(); - } - } - - - public boolean usingSSL() - { - return _enableSSL; - } - - public boolean usingServerSSL() - { - return !_disableServerSSL; - } - - - public String getDaemonKeyStorePath() - { - return _daemonKeyStorePath; - } - - public String getServerKeyStorePath() - { - return _serverKeyStorePath; - } - - public String getDaemonKeyStorePassword() - { - return _daemonKeyStorePassword; - } - - public String getServerKeyStorePassword() - { - return _serverKeyStorePassword; - } - -} diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/server/ServerUpdateHandler.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/server/ServerUpdateHandler.java deleted file mode 100644 index 84a721f61..000000000 --- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/server/ServerUpdateHandler.java +++ /dev/null @@ -1,477 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2002, 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 - * - * 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 McKnight (IBM) [222168][dstore] Buffer in DataElement is not sent - * David McKnight (IBM) - [225507][api][breaking] RSE dstore API leaks non-API types - *******************************************************************************/ - -package org.eclipse.dstore.internal.core.server; - -import java.net.Socket; -import java.util.ArrayList; - -import org.eclipse.dstore.core.java.IRemoteClassInstance; -import org.eclipse.dstore.core.model.DE; -import org.eclipse.dstore.core.model.DataElement; -import org.eclipse.dstore.core.model.DataStore; -import org.eclipse.dstore.core.model.DataStoreResources; -import org.eclipse.dstore.core.model.UpdateHandler; -import org.eclipse.dstore.core.util.CommandGenerator; -import org.eclipse.dstore.internal.core.util.Sender; - -/** - * The ServerUpdateHandler is contains a queue of data update requests - * and periodically transmits it's queue to the client - */ -public class ServerUpdateHandler extends UpdateHandler -{ - - - private ArrayList _senders; - private CommandGenerator _commandGenerator; - protected DataElement _classDocumentElement; - protected DataElement _keepAliveDocumentElement; - protected DataElement _confirmKeepAliveDocumentElement; - protected DataElement _pendingKeepAliveRequest; - protected DataElement _pendingKeepAliveConfirmation; - - private static String[] _keepAliveAttributes = { - DataStoreResources.KEEPALIVE_TYPE, - "server.keepalive.root.id", //$NON-NLS-1$ - "server.keepalive", //$NON-NLS-1$ - "doc", //$NON-NLS-1$ - "", //$NON-NLS-1$ - "", //$NON-NLS-1$ - DataStoreResources.FALSE, - "2"}; //$NON-NLS-1$ - - private static String[] _confirmKeepAliveAttributes = { - DataStoreResources.KEEPALIVECONFIRM_TYPE, - "server.keepalive.confirm.root.id", //$NON-NLS-1$ - "server.confirmkeepalive", //$NON-NLS-1$ - "doc", //$NON-NLS-1$ - "", //$NON-NLS-1$ - "", //$NON-NLS-1$ - DataStoreResources.FALSE, - "2"}; //$NON-NLS-1$ - - private static String[] _docAttributes = { - DataStoreResources.DOCUMENT_TYPE, - "server.doc.root.id", //$NON-NLS-1$ - "server.document", //$NON-NLS-1$ - "doc", //$NON-NLS-1$ - "", //$NON-NLS-1$ - "", //$NON-NLS-1$ - DataStoreResources.FALSE, - "2"}; //$NON-NLS-1$ - - private static String[] _fileAttributes = { - DataStoreResources.FILE_TYPE, - "server.file.root.id", //$NON-NLS-1$ - "server.file", //$NON-NLS-1$ - "doc", //$NON-NLS-1$ - "", //$NON-NLS-1$ - "", //$NON-NLS-1$ - DataStoreResources.FALSE, - "2"}; //$NON-NLS-1$ - - private static String[] _classAttributes = { - DataStoreResources.CLASS_TYPE, - "server.class.root.id", //$NON-NLS-1$ - "server.class", //$NON-NLS-1$ - "doc", //$NON-NLS-1$ - "", //$NON-NLS-1$ - "", //$NON-NLS-1$ - DataStoreResources.FALSE, - "2"}; //$NON-NLS-1$ - - private static String[] _requestClassAttributes = { - DataStoreResources.REQUEST_CLASS_TYPE, - "server.requestclass.root.id", //$NON-NLS-1$ - "server.requestclass", //$NON-NLS-1$ - "doc", //$NON-NLS-1$ - "", //$NON-NLS-1$ - "", //$NON-NLS-1$ - DataStoreResources.FALSE, - "2"}; //$NON-NLS-1$ - - private static String[] _serializeAttributes = { - DataStoreResources.SERIALIZED_TYPE, - "server.serialized.root.id", //$NON-NLS-1$ - "server.serialized", //$NON-NLS-1$ - "doc", //$NON-NLS-1$ - "", //$NON-NLS-1$ - "", //$NON-NLS-1$ - DataStoreResources.FALSE, - "2"}; //$NON-NLS-1$ - - protected DataElement _fileDocumentElement; - protected DataElement _docDocumentElement; - protected DataElement _requestClassDocumentElement; - protected DataElement _serializedDocumentElement; - - /** - * Constructor - */ - public ServerUpdateHandler() - { - _senders = new ArrayList(); - _commandGenerator = new CommandGenerator(); - - } - - /** - * Sets the associated DataStore - */ - public void setDataStore(DataStore dataStore) - { - super.setDataStore(dataStore); - _commandGenerator.setDataStore(dataStore); - _fileDocumentElement = dataStore.createTransientObject(_fileAttributes); - _docDocumentElement = dataStore.createObject(null, _docAttributes); - _requestClassDocumentElement = dataStore.createTransientObject(_requestClassAttributes); - _serializedDocumentElement = dataStore.createTransientObject(_serializeAttributes); - _classDocumentElement = dataStore.createTransientObject(_classAttributes); - _keepAliveDocumentElement = dataStore.createTransientObject(_keepAliveAttributes); - _confirmKeepAliveDocumentElement = dataStore.createTransientObject(_confirmKeepAliveAttributes); - - } - - /** - * Add a sender to the list of senders. Normally there is only one - * client for the server, which requires one <code>Sender</code>. If - * there are more than one clients, then this is how senders are added. - * - * @param sender a sender connected to a socket - */ - public void addSender(Sender sender) - { - _senders.add(sender); - } - - /** - * Remove a sender from the list of senders. - * @param sender the sender to remove - */ - public void removeSender(Sender sender) - { - _senders.remove(sender); - if (_senders.size() == 0) - { - finish(); - } - } - - /** - * Sends bytes to the specified file on the client. - * - * @param path the name of the file on the client - * @param bytes the bytes to send - * @param size the number of bytes to send - * @param binary indicates whether to send the bytes and binary or text - */ - public synchronized void updateFile(String path, byte[] bytes, int size, boolean binary) - { - updateFile(path, bytes, size, binary, DataStoreResources.DEFAULT_BYTESTREAMHANDLER); - } - - /** - * Sends bytes to the specified file on the client. - * - * @param path the name of the file on the client - * @param bytes the bytes to send - * @param size the number of bytes to send - * @param binary indicates whether to send the bytes and binary or text - * @param byteStreamHandlerId indicates the byte stream handler to receive the bytes - * - */ - public synchronized void updateFile(String path, byte[] bytes, int size, boolean binary, String byteStreamHandlerId) - { - //DataElement document = _dataStore.createObject(null, DataStoreResources.FILE_TYPE, byteStreamHandlerId, path, path); - DataElement document = _fileDocumentElement; - document.setAttribute(DE.A_NAME, byteStreamHandlerId); - document.setAttribute(DE.A_VALUE, byteStreamHandlerId); - document.setAttribute(DE.A_SOURCE, path); - document.setPendingTransfer(true); - document.setParent(null); - - for (int j = 0; j < _senders.size(); j++) - { - Sender sender = (Sender) _senders.get(j); - sender.sendFile(document, bytes, size, binary); - } - } - - /** - * Appends bytes to the specified file on the client. - * - * @param path the name of the file on the client - * @param bytes the bytes to send - * @param size the number of bytes to send - * @param binary indicates whether to send the bytes and binary or text - */ - public synchronized void updateAppendFile(String path, byte[] bytes, int size, boolean binary) - { - updateAppendFile(path, bytes, size, binary, DataStoreResources.DEFAULT_BYTESTREAMHANDLER); - } - -/** - * Appends bytes to the specified file on the client. - * - * @param path the name of the file on the client - * @param bytes the bytes to send - * @param size the number of bytes to send - * @param binary indicates whether to send the bytes and binary or text - * @param byteStreamHandlerId indicates the byte stream handler to receive the bytes - */ - public synchronized void updateAppendFile(String path, byte[] bytes, int size, boolean binary, String byteStreamHandlerId) - { - //DataElement document = _dataStore.createObject(null, DataStoreResources.FILE_TYPE, byteStreamHandlerId, path, path); - DataElement document = _fileDocumentElement; - document.setAttribute(DE.A_NAME, byteStreamHandlerId); - document.setAttribute(DE.A_VALUE, byteStreamHandlerId); - document.setAttribute(DE.A_SOURCE, path); - document.setPendingTransfer(true); - document.setParent(null); - - for (int j = 0; j < _senders.size(); j++) - { - Sender sender = (Sender) _senders.get(j); - sender.sendAppendFile(document, bytes, size, binary); - } - } - - - /** - * Periodically called on the handler thread to sends data updates. - */ - public void handle() - { - if (!_dataObjects.isEmpty() || _pendingKeepAliveConfirmation != null || _pendingKeepAliveRequest != null || !_classesToSend.isEmpty()) - { - sendUpdates(); - } - } - - /** - * Periodically called to send data in the queue from the server to the client - */ - public void sendUpdates() - { - synchronized (_dataObjects) - { - //DataElement document = _dataStore.createObject(null, DataStoreResources.DOCUMENT_TYPE, "server.doc"); - DataElement document = _docDocumentElement; - document.removeNestedData(); - document.setPendingTransfer(true); - document.setUpdated(true); - document.setParent(null); - - _commandGenerator.generateResponse(document, _dataObjects); - - for (int j = 0; j < _senders.size(); j++) - { - Sender sender = (Sender) _senders.get(j); - sender.sendDocument(document, 5); - if (_pendingKeepAliveConfirmation != null) - { - sender.sendKeepAliveConfirmation(_pendingKeepAliveConfirmation); - _pendingKeepAliveConfirmation = null; - } - if (_pendingKeepAliveRequest != null) - { - sender.sendKeepAliveRequest(_pendingKeepAliveRequest); - _pendingKeepAliveRequest = null; - } - } - - for (int i = 0; i < _dataObjects.size(); i++) - { - DataElement obj = (DataElement) _dataObjects.get(i); - clean(obj); - } - - _dataObjects.clear(); - //_dataStore.getLogRoot().removeNestedData(); - //_dataStore.getTempRoot().removeNestedData(); - } - - // finished sending updates, now send all classes that are waiting - // in the queue - while (_classesToSend.size() > 0) - { - DataElement document = null; - synchronized (_classesToSend) - { - document = (DataElement)_classesToSend.remove(0); - for (int i = 0; i < _senders.size(); i++) - { - Sender sender = (Sender) _senders.get(i); - sender.sendClass(document); - } - } - } - - } - - /** - * Removes the sender that is associated with the specified socket. This causes - * A disconnect for the client that is associated with this socket. - * - * @param socket the socket on which a sender communicates - */ - public void removeSenderWith(Socket socket) - { - for (int i = 0; i < _senders.size(); i++) - { - Sender sender = (Sender) _senders.get(i); - if (sender.socket() == socket) - { - // sender sends last ack before death - DataElement document = _dataStore.createObject(null, DataStoreResources.DOCUMENT_TYPE, "exit", "exit"); //$NON-NLS-1$ //$NON-NLS-2$ - sender.sendDocument(document, 2); - removeSender(sender); - } - } - } - - /** - * Implemented to provide the means by which classes are sent - * across the comm channel. - * @param className the name of the class to request - */ - public synchronized void requestClass(String className) - { - DataElement document = _requestClassDocumentElement; - document.setPendingTransfer(true); - document.setAttribute(DE.A_NAME, className); - document.setAttribute(DE.A_VALUE, className); - document.setParent(null); - //DataElement document = _dataStore.createObject(null, DataStoreResources.REQUEST_CLASS_TYPE, className); - - for (int j = 0; j < _senders.size(); j++) - { - Sender sender = (Sender) _senders.get(j); - sender.requestClass(document); - } - - } - - - public synchronized void updateClassInstance(IRemoteClassInstance runnable, String deserializebyteStreamHandlerId) - { - DataElement document = _serializedDocumentElement; - document.setAttribute(DE.A_NAME, runnable.toString()); - document.setAttribute(DE.A_SOURCE, deserializebyteStreamHandlerId); - document.setPendingTransfer(true); - document.setParent(null); - - for (int j = 0; j < _senders.size(); j++) - { - Sender sender = (Sender) _senders.get(j); - sender.sendRemoteClassRunnable(document, runnable); - } - notifyInput(); - } - - /** - * Implemented to provide the means by which classes are sent - * across the comm channel. - * @param className the name of the class to send - * @param classByteStreamHandlerId the name of the byte stream handler to use to receive the class - */ - public synchronized void sendClass(String className, String classByteStreamHandlerId) - { - // send pending updates before sending class - if (_dataObjects.size() > 0) - sendUpdates(); - - DataElement document = _classDocumentElement; - document.setAttribute(DE.A_NAME, className); - document.setAttribute(DE.A_SOURCE, classByteStreamHandlerId); - document.setPendingTransfer(true); - document.setParent(null); - - addClassToSend(document); - } - - /** - * Adds a class to the queue of classes (represented by DataElements) to - * be sent to the client. - * @param classElement the DataElement representing the class to be sent - */ - public void addClassToSend(DataElement classElement) - { - synchronized (_classesToSend) - { - if (!_classesToSend.contains(classElement)) - { - _classesToSend.add(classElement); - } - } - } - - /** - * Implemented to provide the means by which classes are requested and sent - * across the comm channel. - * @param className the name of the class to send - */ - public synchronized void sendClass(String className) - { - sendClass(className, "default"); //$NON-NLS-1$ - } - - public void sendKeepAliveRequest() - { - DataElement document = _keepAliveDocumentElement; - document.setPendingTransfer(true); - document.setAttribute(DE.A_NAME, "request"); //$NON-NLS-1$ - document.setAttribute(DE.A_VALUE, "request"); //$NON-NLS-1$ - document.setParent(null); - _pendingKeepAliveRequest = document; - notifyInput(); - } - - public void sendKeepAliveConfirmation() - { - DataElement document = _confirmKeepAliveDocumentElement; - document.setPendingTransfer(true); - document.setAttribute(DE.A_NAME, "confirm"); //$NON-NLS-1$ - document.setAttribute(DE.A_VALUE, "confirm"); //$NON-NLS-1$ - document.setParent(null); - _pendingKeepAliveConfirmation = document; - notifyInput(); - } - - public synchronized void waitForInput() - { - if (_dataObjects.size() == 0 && _classesToSend.size() == 0 && _pendingKeepAliveConfirmation == null && _pendingKeepAliveRequest == null) - { - super.waitForInput(); - } - } - - /** - * Indicates whether the xml generator should transfer the buffer attribute of a DataElement - * @param flag true to transfer the buffer attribute - */ - public void setGenerateBuffer(boolean flag) - { - for (int i = 0; i < _senders.size(); i++) - { - Sender sender = (Sender)_senders.get(i); - sender.setGenerateBuffer(flag); - } - } -} diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/util/DataElementRemover.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/util/DataElementRemover.java deleted file mode 100644 index e71aa809a..000000000 --- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/util/DataElementRemover.java +++ /dev/null @@ -1,215 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2002, 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 - * - * 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: - * {Name} (company) - description of contribution. - * David McKnight (IBM) - [202822] don't need to remove children from map here - *******************************************************************************/ - -package org.eclipse.dstore.internal.core.util; - -import java.util.ArrayList; -import java.util.LinkedList; - -import org.eclipse.dstore.core.model.DataElement; -import org.eclipse.dstore.core.model.DataStore; -import org.eclipse.dstore.core.model.Handler; -import org.eclipse.dstore.core.model.IDataStoreConstants; - -public class DataElementRemover extends Handler -{ - private LinkedList _queue; - private static int numRemoved = 0; - private static int numDisconnected = 0; - private static int numCreated = 0; - private static int numGCed = 0; - - // The following determine how DataElements are chosen to be removed once they - // are in the queue for removal. - // The queue is checked every _intervalTime milliseconds and all elements - // that are older than _expiryTime milliseconds are removed. - public static final int DEFAULT_EXPIRY_TIME = 600; // in seconds - public static final int DEFAULT_INTERVAL_TIME = 60; // in seconds - private int _intervalTime = DEFAULT_INTERVAL_TIME * 10; - private int _expiryTime = DEFAULT_EXPIRY_TIME * 10; - public static final String EXPIRY_TIME_PROPERTY_NAME = "SPIRIT_EXPIRY_TIME"; //$NON-NLS-1$ - public static final String INTERVAL_TIME_PROPERTY_NAME = "SPIRIT_INTERVAL_TIME"; //$NON-NLS-1$ - - public DataElementRemover(DataStore dataStore) - { - super(); - _dataStore = dataStore; - _queue = new LinkedList(); - getTimes(); - setWaitTime(_intervalTime); - 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$ - _dataStore.refresh(_dataStore.getDescriptorRoot()); - } - - protected void getTimes() - { - try - { - String expiryTime = System.getProperty(EXPIRY_TIME_PROPERTY_NAME); - if (expiryTime != null && !expiryTime.equals("")) _expiryTime = Integer.parseInt(expiryTime) * 1000; //$NON-NLS-1$ - } - catch (Exception e) - { - System.out.println("Invalid spirit expiry time property, using default."); //$NON-NLS-1$ - _expiryTime = DEFAULT_EXPIRY_TIME; - } - try - { - String intervalTime = System.getProperty(INTERVAL_TIME_PROPERTY_NAME); - if (intervalTime != null && !intervalTime.equals("")) _intervalTime = Integer.parseInt(intervalTime) * 1000; //$NON-NLS-1$ - } - catch (Exception e) - { - System.out.println("Invalid spirit interval time property, using default."); //$NON-NLS-1$ - _intervalTime = DEFAULT_INTERVAL_TIME; - } - } - - public static void addToRemovedCount() - { - numRemoved++; - } - - public static void addToCreatedCount() - { - numCreated++; - } - - public static void addToGCedCount() - { - numGCed++; - } - - public synchronized void addToQueueForRemoval(DataElement element) - { - synchronized (_queue) - { - - if (_dataStore.isDoSpirit() && _dataStore == element.getDataStore()) - { - QueueItem item = new QueueItem(element, System.currentTimeMillis()); - _queue.add(item); - } - } - } - - public void handle() - { - clearQueue(); - } - - public synchronized void clearQueue() - { - synchronized (_queue) - { - _dataStore.memLog(" "); //$NON-NLS-1$ - int disconnected = 0; - if (!_dataStore.isDoSpirit()) - { - if (_queue.size() > 0) - { - _dataStore.memLog("Clearing queue of size " + _queue.size() + ". DSTORE_SPIRIT_ON not set or set to false."); //$NON-NLS-1$ //$NON-NLS-2$ - _queue.clear(); - } - _dataStore.memLog("Total heap size: " + Runtime.getRuntime().totalMemory()); //$NON-NLS-1$ - _dataStore.memLog("Elements created so far: " + numCreated); //$NON-NLS-1$ - _dataStore.memLog("Elements disconnected so far: " + numDisconnected); //$NON-NLS-1$ - _dataStore.memLog("Spirit elements cleaned so far: " + numRemoved); //$NON-NLS-1$ - _dataStore.memLog("DataElements GCed so far: " + numGCed); //$NON-NLS-1$ - return; - } - _dataStore.memLog("Total heap size before disconnection: " + Runtime.getRuntime().totalMemory()); //$NON-NLS-1$ - - _dataStore.memLog("Size of queue: " + _queue.size()); //$NON-NLS-1$ - - ArrayList toRefresh = new ArrayList(); - while (_queue.size() > 0 && System.currentTimeMillis() - ((QueueItem) _queue.getFirst()).timeStamp > _expiryTime) - { - DataElement toBeDisconnected = ((QueueItem) _queue.removeFirst()).dataElement; - if (!toBeDisconnected.isSpirit()) - { - toBeDisconnected.setSpirit(true); - toBeDisconnected.setUpdated(false); - DataElement parent = toBeDisconnected.getParent(); - if (!toRefresh.contains(parent)) - { - toRefresh.add(toBeDisconnected.getParent()); - } - //_dataStore.refresh(toBeDisconnected); - disconnected++; - numDisconnected++; - } - else - { - //_dataStore.memLog(toBeDisconnected.toString()); - } - unmap(toBeDisconnected); - } - - _dataStore.refresh(toRefresh); - - _dataStore.memLog("Disconnected " + disconnected + " DataElements."); //$NON-NLS-1$ //$NON-NLS-2$ - _dataStore.memLog("Elements created so far: " + numCreated); //$NON-NLS-1$ - _dataStore.memLog("Elements disconnected so far: " + numDisconnected); //$NON-NLS-1$ - _dataStore.memLog("Spirit elements cleaned so far: " + numRemoved); //$NON-NLS-1$ - _dataStore.memLog("DataElements GCed so far: " + numGCed); //$NON-NLS-1$ - } - } - - private void unmap(DataElement element) - { - _dataStore.getHashMap().remove(element.getId()); - } - - - protected class QueueItem - { - public DataElement dataElement; - public long timeStamp; - - public QueueItem(DataElement element, long stamp) - { - dataElement = element; - timeStamp = stamp; - } - } - - /** - * Runs the handler loop in a thread. - */ - public void run() - { - while (_keepRunning) - { - try - { - Thread.sleep(100000); // wait 100 seconds - Thread.yield(); - } - catch (InterruptedException e) - { - e.printStackTrace(); - finish(); - return; - } - handle(); - } - } -} - diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/util/ExternalLoader.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/util/ExternalLoader.java deleted file mode 100644 index f798277f3..000000000 --- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/util/ExternalLoader.java +++ /dev/null @@ -1,109 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2002, 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 - * - * 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: - * {Name} (company) - description of contribution. - *******************************************************************************/ - -package org.eclipse.dstore.internal.core.util; - -import java.util.ArrayList; - -import org.eclipse.dstore.core.java.RemoteClassLoader; -import org.eclipse.dstore.core.model.IExternalLoader; -import org.eclipse.dstore.core.util.StringCompare; - - -/** - * ExternalLoader is a <code>ClassLoader</code> wrapper used for loading external - * tools that are not in the same classpath as the DataStore. Each ExternalLoader - * contains a <i>load scope</i>, a list of classpaths that it's class loader is able - * to load. - */ -public class ExternalLoader implements IExternalLoader -{ - - private ClassLoader _classLoader; - private ArrayList _loadScope; - - /** - * Constructor - * - * @param classLoader the classloader - * @param loadScope the scope in which the classloader can load classes - */ - public ExternalLoader(ClassLoader classLoader, String loadScope) - { - _classLoader = classLoader; - _loadScope = new ArrayList(); - _loadScope.add(loadScope); - } - - /** - * Constructor - * - * @param classLoader the classloader - * @param loadScope the scope in which the classloader can load classes - */ - public ExternalLoader(ClassLoader classLoader, ArrayList loadScope) - { - _classLoader = classLoader; - _loadScope = loadScope; - } - - /** - * Indicates whether this external loader can load a particular class - * @param source a qualified classname - * @return true if it can load the clas - */ - public boolean canLoad(String source) - { - if (_classLoader instanceof RemoteClassLoader) - { - return true; - } - - boolean result = false; - if (_loadScope != null) - { - for (int i = 0; i < _loadScope.size(); i++) - { - String scope = (String) _loadScope.get(i); - result = StringCompare.compare(scope, source, true); - if (result) - { - return result; - } - } - } - return result; - } - - /** - * Loads the specified class - * @param source a qualified classname - * @return the loaded class - * @throws ClassNotFoundException - */ - public Class loadClass(String source) throws ClassNotFoundException - { - try - { - return _classLoader.loadClass(source); - } - catch (NoClassDefFoundError e) - { - throw new ClassNotFoundException(source); - } - } -} diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/util/ISender.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/util/ISender.java deleted file mode 100644 index 064a6f8d7..000000000 --- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/util/ISender.java +++ /dev/null @@ -1,28 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2001, 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 - * - * 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: - * {Name} (company) - description of contribution. - *******************************************************************************/ - -package org.eclipse.dstore.internal.core.util; - -import org.eclipse.dstore.core.model.DataElement; - -public interface ISender -{ - - - public void sendDocument(String document); - public void sendDocument(DataElement objectRoot, int depth); -} diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/util/Pattern.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/util/Pattern.java deleted file mode 100644 index 22d66ae7c..000000000 --- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/util/Pattern.java +++ /dev/null @@ -1,166 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2002, 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 - * - * 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: - * {Name} (company) - description of contribution. - *******************************************************************************/ - -package org.eclipse.dstore.internal.core.util; - -import java.util.ArrayList; - -/** - * This class is used to define a wildcard string pattern. Strings - * can be compared against a pattern to determine whether they match - * or not. - */ -public class Pattern -{ - - private String _pattern; - private ArrayList _subMatches; - private ArrayList _matchSchema; - - /** - * Constructor - * @param pattern a wildcard string - * @param matchSchema - */ - public Pattern(String pattern, ArrayList matchSchema) - { - _pattern = pattern; - - _matchSchema = matchSchema; - } - - /** - * Returns a list of submatches - * @return a list of submatches - */ - public ArrayList getSubMatches() - { - return _subMatches; - } - - /** - * Returns a submatch - * @param attribute an attribute to match - * @return a submatch - */ - public String getSubMatch(String attribute) - { - // find attribute index in match schema - int index = _matchSchema.indexOf(attribute); - if ((index >= 0) && (index < _subMatches.size())) - { - Object match = _subMatches.get(index); - return new String((String) match); - } - else - { - return new String("null"); //$NON-NLS-1$ - } - } - - /** - * Checks whther a compare string matches the pattern - * @param compareStr to string to compare - * @return true if there is a match - */ - public boolean matches(String compareStr) - { - String currentMatch = new String(""); //$NON-NLS-1$ - _subMatches = new ArrayList(); - - int iText = 0; - int iPattern = 0; - int lastStar = 0; - int len = compareStr.length(); - - int patternLen = _pattern.length(); - - while (iPattern < patternLen) - { - char p = _pattern.charAt(iPattern++); - if (p == '*') - { - if (currentMatch.length() > 0) - { - _subMatches.add(new String(currentMatch)); - } - currentMatch = new String(""); //$NON-NLS-1$ - - if (iPattern >= patternLen) - { - while (iText < len) - { - currentMatch += compareStr.charAt(iText++); - } - _subMatches.add(new String(currentMatch)); - - return true; - } - else - { - lastStar = iPattern; - } - } - else - { - if (iText >= len) - { - return false; - } - else - { - char t = compareStr.charAt(iText++); - if (p == t) - { - if ((lastStar > 0) && (iPattern >= patternLen) && (iText < len)) - { - } - else - { - continue; - } - - } - else - { - currentMatch += t; - if (lastStar == 0) - { - return false; - } - } - - int matched = iPattern - lastStar - 1; - iPattern = lastStar; - - iText -= matched; - } - } - } - - if (iText >= len) - { - _subMatches.add(new String(currentMatch)); - return true; - } - else - { - return false; - } - } - -} diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/util/Sender.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/util/Sender.java deleted file mode 100644 index 6085babd0..000000000 --- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/util/Sender.java +++ /dev/null @@ -1,346 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2002, 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 - * - * 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 McKnight (IBM) [222168][dstore] Buffer in DataElement is not sent - *******************************************************************************/ - -package org.eclipse.dstore.internal.core.util; - -import java.io.BufferedInputStream; -import java.io.BufferedWriter; -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStreamWriter; -import java.io.PrintStream; -import java.net.InetSocketAddress; -import java.net.Socket; -import java.net.SocketException; -import java.net.URL; -import java.util.ArrayList; - -import org.eclipse.dstore.core.java.IRemoteClassInstance; -import org.eclipse.dstore.core.model.DE; -import org.eclipse.dstore.core.model.DataElement; -import org.eclipse.dstore.core.model.DataStore; - -/** - * This class is used for sending data to a socket in the DataStore - * communication layer. - */ -public class Sender implements ISender -{ - - private Socket _socket; - private PrintStream _outFile; - private BufferedWriter _outData; - private XMLgenerator _xmlGenerator; - private DataStore _dataStore; - - /** - * Constructor - * @param socket the associated socket - * @param dataStore the associated DataStore - */ - public Sender(Socket socket, DataStore dataStore) - { - _socket = socket; - _dataStore = dataStore; - - _xmlGenerator = new XMLgenerator(_dataStore); - try - { - int bufferSize = _socket.getSendBufferSize(); - _xmlGenerator.setBufferSize(bufferSize); - } - catch (SocketException e) - { - } - try - { - _outFile = new PrintStream(_socket.getOutputStream()); - _outData = new BufferedWriter(new OutputStreamWriter(_socket.getOutputStream(), DE.ENCODING_UTF_8)); - - _xmlGenerator.setFileWriter(_outFile); - _xmlGenerator.setDataWriter(_outData); - _xmlGenerator.setGenerateBuffer(false); - InetSocketAddress address = (InetSocketAddress)socket.getRemoteSocketAddress(); - if (address != null) - { - if (address.getAddress() != null) - { - String remoteIP = address.getAddress().getHostAddress(); - _dataStore.setRemoteIP(remoteIP); - } - else - { - String remoteIP = address.getHostName(); - _dataStore.setRemoteIP(remoteIP); - } - } - else - { - String remoteIP = socket.getInetAddress().getHostAddress(); - _dataStore.setRemoteIP(remoteIP); - } - } - catch (java.io.IOException e) - { - e.printStackTrace(); - } - } - - /** - * Returns the associated socket - * @return the socket - */ - public Socket socket() - { - return _socket; - } - - /** - * Sends a string through the socket - * @param document the string to send - */ - public void sendDocument(String document) - { - synchronized (_outData) - { - try - { - _outData.write(document, 0, document.length()); - _outData.flush(); - } - catch (IOException e) - { - e.printStackTrace(); - } - } - } - - /** - * Sends the bytes of a file through the socket - * @param objectRoot the object representing the file to send - * @param bytes the bytes to send over the socket - * @param size the number of bytes to send over the socket - * @param binary indicates whether to send the bytes and binary or text - */ - public void sendFile(DataElement objectRoot, byte[] bytes, int size, boolean binary) - { - - synchronized (_outData) - { - synchronized (_outFile) - { - - _xmlGenerator.empty(); - _xmlGenerator.generate(objectRoot, bytes, size, false, binary); - _xmlGenerator.flushData(); - } - } - } - - /** - * Sends a class through the socket - * @param classElement the object representing the class to send - */ - public void sendClass(DataElement classElement) - { - String className = classElement.getName(); - - ArrayList loaders = _dataStore.getLocalClassLoaders(); - if (loaders == null) - { - // could not get the registered classLoaders. Fail. - generateEmptyClass(classElement); - return; - } - - InputStream classInStream = null; - className = className.replace('.', '/'); - className = className + ".class"; //$NON-NLS-1$ - URL classLocation = null; - for (int i = 0; i < loaders.size(); i++) - { - ClassLoader loader = (ClassLoader) loaders.get(i); - - classInStream = loader.getResourceAsStream(className); - classLocation = loader.getResource(className); - if (classInStream != null && classLocation != null) break; - } - if (classLocation == null || classInStream == null) - { - // could not load the class with any of the class loaders. Fail. - generateEmptyClass(classElement); - return; - } - - // got a stream to read the classfile. Now read the class into a buffer. - BufferedInputStream bufInputStream = new BufferedInputStream(classInStream); - - try - { - int classSize = bufInputStream.available(); - byte[] bytes = new byte[classSize]; - int result = 0; - result = bufInputStream.read(bytes); - - if (result != classSize) - { - generateEmptyClass(classElement); - return; // throw new IOException("Could not read class from BufferedInputStream: " + className); - } - - synchronized (_outData) - { - synchronized (_outFile) - { - - _xmlGenerator.empty(); - _xmlGenerator.generate(classElement, bytes, classSize); - _xmlGenerator.flushData(); - } - } - } - catch (IOException e) - { - generateEmptyClass(classElement); - return; - } - } - - /** - * Generates an empty class and sends it across the pipe, as a signal that the - * class could not be found or loaded or read on the client. - * @param classElement - */ - private void generateEmptyClass(DataElement classElement) - { - _xmlGenerator.empty(); - _xmlGenerator.generate(classElement, new byte[0], 0); - _xmlGenerator.flushData(); - } - - /** - * Sends the bytes of a file through the socket to be appended to a file on the other end - * - * @param objectRoot the object representing the file to send - * @param bytes the bytes to send over the socket - * @param size the number of bytes to send over the socket - * @param binary indicates whether to send the bytes and binary or text - */ - public void sendAppendFile(DataElement objectRoot, byte[] bytes, int size, boolean binary) - { - synchronized (_outData) - { - - synchronized (_outFile) - { - _xmlGenerator.empty(); - _xmlGenerator.generate(objectRoot, bytes, size, true, binary); - _xmlGenerator.flushData(); - } - } - } - - /** - * Sends a DataStore tree of data through the socket - * - * @param objectRoot the root of the tree to send - * @param depth the depth of the tree to send - */ - public void sendDocument(DataElement objectRoot, int depth) - { - synchronized (_outData) - { - synchronized (_outFile) - { - - _xmlGenerator.empty(); - _xmlGenerator.generate(objectRoot, depth); - _xmlGenerator.flushData(); - } - - } - -// if (objectRoot.getParent() != null) - // objectRoot.getDataStore().deleteObject(objectRoot.getParent(), objectRoot); - } - - /** - * Requests a class from the client - */ - public void requestClass(DataElement classRequest) - { - synchronized (_outData) - { - synchronized (_outFile) - { - - _xmlGenerator.empty(); - _xmlGenerator.generateClassRequest(classRequest); - _xmlGenerator.flushData(); - } - } - } - - public void sendRemoteClassRunnable(DataElement objectRoot, IRemoteClassInstance runnable) - { - synchronized (_outData) - { - synchronized (_outFile) - { - _xmlGenerator.empty(); - _xmlGenerator.generateSerializedObject(objectRoot, runnable); - _xmlGenerator.flushData(); - } - } - } - - public void sendKeepAliveRequest(DataElement document) - { - synchronized (_outData) - { - synchronized (_outFile) - { - _xmlGenerator.empty(); - _xmlGenerator.generate(document, 2); - _xmlGenerator.flushData(); - } - } - } - - public void sendKeepAliveConfirmation(DataElement document) - { - synchronized (_outData) - { - synchronized (_outFile) - { - _xmlGenerator.empty(); - _xmlGenerator.generate(document, 2); - _xmlGenerator.flushData(); - } - } - } - - - /** - * Indicates whether the xml generator should transfer the buffer attribute of a DataElement - * @param flag true to transfer the buffer attribute - */ - public void setGenerateBuffer(boolean flag) - { - _xmlGenerator.setGenerateBuffer(flag); - } -} diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/util/Sorter.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/util/Sorter.java deleted file mode 100644 index c87584090..000000000 --- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/util/Sorter.java +++ /dev/null @@ -1,72 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2002, 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 - * - * 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: - * {Name} (company) - description of contribution. - *******************************************************************************/ - -package org.eclipse.dstore.internal.core.util; - -import java.util.ArrayList; - -import org.eclipse.dstore.core.model.DataElement; - -/** - * Utility class used for sorting a list of DataElements based on - * their depth attributes. - */ -public class Sorter -{ - - /** - * Sort a list of DataElements based on their depth attributes - * @param list a list of DataElements - * @return a sorted list of DataElements - */ - public static ArrayList sort(ArrayList list) - { - ArrayList sortedList = new ArrayList(list.size()); - while (list.size() > 0) - { - DataElement first = findFirst(list); - sortedList.add(first); - } - - return sortedList; - } - - /** - * Find the DataElement with the highest depth in the list - * @param list a list of DataElements - * @return the DataElement with the highest depth - */ - private static DataElement findFirst(ArrayList list) - { - DataElement result = null; - for (int i = 0; i < list.size(); i++) - { - DataElement item = (DataElement) list.get(i); - if (item != null) - { - int depth = item.depth(); - if ((result == null) || (depth > result.depth())) - { - result = item; - } - } - } - - list.remove(result); - return result; - } -} diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/util/XMLgenerator.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/util/XMLgenerator.java deleted file mode 100644 index da0261f75..000000000 --- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/util/XMLgenerator.java +++ /dev/null @@ -1,694 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2002, 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 - * - * 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 McKnight (IBM) - [232233] [dstore] Buffer in DataElement is not retained - * David McKnight (IBM) - [245481] [dstore] CR/LF not restored for new client/old server - *******************************************************************************/ - -package org.eclipse.dstore.internal.core.util; - -import java.io.BufferedWriter; -import java.io.IOException; -import java.io.ObjectOutputStream; -import java.io.PipedInputStream; -import java.io.PipedOutputStream; -import java.io.PrintStream; -import java.util.Stack; - -import org.eclipse.dstore.core.java.IRemoteClassInstance; -import org.eclipse.dstore.core.model.DE; -import org.eclipse.dstore.core.model.DataElement; -import org.eclipse.dstore.core.model.DataStore; -import org.eclipse.dstore.core.model.DataStoreResources; - -/** - * <p> - * This class is used to serialize data and send it either - * to a file or a socket. - * </p> - * <p> - * When a DataStore tree needs to be transmitted, it's DataElements are - * converted to XML before sending. Only those elements which have changed and - * are thus out of synch with the DataStore on the other end of the socket are - * actually transferred. - * </p> - * <p> - * When a byte stream or file needs to be transmitted, bytes are - * either send as is if binary transfer is requested or as unicode if - * binary transfer is not requested. - * </p> - */ -public class XMLgenerator -{ - - private int _state; - - private StringBuffer _document; - - private int _indent; - private Stack _tagStack; - - private PrintStream _fileWriter; - private BufferedWriter _dataWriter; - - private int _bufferSize; - private boolean _generateBuffer; - private boolean _ignoreDeleted; - - private DataStore _dataStore; - - public static final int EMPTY = 0; - public static final int OPEN = 1; - public static final int CLOSE = 2; - public static final int BODY = 3; - - /** - * Constructor - * @param dataStore the associated DataStore - */ - public XMLgenerator(DataStore dataStore) - { - _dataStore = dataStore; - _state = EMPTY; - _bufferSize = 100000; - - _document = new StringBuffer(_bufferSize); - - _indent = 0; - _generateBuffer = true; - _ignoreDeleted = false; - _tagStack = new Stack(); - } - - /** - * Indicate whether DataElements marked as deleted should be sent. - * @param flag whether deleted elements should be sent - */ - public void setIgnoreDeleted(boolean flag) - { - _ignoreDeleted = flag; - } - - /** - * Sets the file writer used for file transfer - * @param writer the file writer used for file transfer - */ - public void setFileWriter(PrintStream writer) - { - _fileWriter = writer; - } - - /** - * Sets the data writer used for XML transfer - * @param writer the data writer used for XML transfer - */ - public void setDataWriter(BufferedWriter writer) - { - _dataWriter = writer; - } - - /** - * Set the buffer size - * @param size of the buffer used for transmitting packets - */ - public void setBufferSize(int size) - { - _bufferSize = size; - } - - /** - * Indicate whether the buffer attribute of each DataElement should be - * transferred - * @param flag whether the buffer should be transferred - */ - public void setGenerateBuffer(boolean flag) - { - _generateBuffer = flag; - } - - private void append(char c) - { - _document.append(c); - } - - private void append(String buffer) - { - _document.append(buffer); - } - - private void append(StringBuffer buffer) - { - _document.append(buffer); - } - - private void nextLine() - { - if (_dataWriter != null) - { - _document.append('\n'); - - int length = _document.length(); - if (length > _bufferSize) - { - flushData(); - } - } - } - - /** - * Send all buffered data through the pipe. - */ - public void flushData() - { - if (_document.length() > 0 && _dataWriter != null) - { - try - { - _dataWriter.write(_document.toString(), 0, _document.length()); - _dataWriter.write('\n'); - _dataWriter.flush(); - _document.setLength(0); - } - catch (Exception e) - { - _dataStore.trace(e); - _dataWriter = null; - } - } - } - - private void indent() - { - for (int i = 0; i < _indent; i++) - { - append(' '); - } - } - - private void startTag(String name) - { - if (_state == OPEN) - { - append('>'); - _indent++; - } - if (_state == CLOSE) - { - _indent--; - } - if (_state == BODY) - { - nextLine(); - } - indent(); - if (_document == null) - { - append('<'); - append(name); - } - else - { - append('<'); - append(name); - } - _tagStack.push(name); - _state = OPEN; - } - - private void endTag(String name) - { - String top = (String) _tagStack.pop(); - if (_state == CLOSE) - { - } - else if (_state == OPEN) - { - if (top == name) - { - append("/>"); //$NON-NLS-1$ - if (_tagStack.empty()) - { - _state = CLOSE; - } - else - { - _state = BODY; - } - } - } - else if (_state == BODY) - { - if (top == name) - { - nextLine(); - _indent--; - indent(); - append("</"); //$NON-NLS-1$ - append(name); - append('>'); - if (_tagStack.empty()) - { - _state = CLOSE; - } - } - } - } - - private void addAttribute(String name, String value) - { - if (_state != OPEN) - { - } - - StringBuffer niceValue = null; - if (value != null) - { - niceValue = prepareStringForXML(value); - - append(' '); - append(name); - append("=\""); //$NON-NLS-1$ - append(niceValue); - append('"'); - } - else - { - append(' '); - append(name); - append("=\"\""); //$NON-NLS-1$ - } - - } - - private void addReferenceTypeAttribute(DataElement object) - { - if (object.isSpirit()) - { - addAttribute(DE.P_REF_TYPE, DataStoreResources.SPIRIT); - } - else - { - if (object.isReference()) - { - if (_dataStore.getReferenceTag() != null && _dataStore.getReferenceTag().equals(DE.P_REF_TYPE)) addAttribute(DE.P_REF_TYPE, DataStoreResources.REFERENCE); - else addAttribute(DE.P_REF_TYPE, DataStoreResources.TRUE); - } - else - { - if (_dataStore.getReferenceTag() != null && _dataStore.getReferenceTag().equals(DE.P_REF_TYPE)) addAttribute(DE.P_REF_TYPE, DataStoreResources.VALUE); - else addAttribute(DE.P_REF_TYPE, DataStoreResources.FALSE); - } - } - } - - private void addFile(byte[] bytes, int size, boolean binary) - { - if (_state == OPEN) - { - append('>'); - - _indent++; - _state = BODY; - } - if (_state == BODY) - { - flushData(); - - // send everything across - if (binary) - { - _fileWriter.write(bytes, 0, size); - _fileWriter.flush(); - } - else - { - try - { - _dataWriter.write(new String(bytes), 0, size); - _dataWriter.flush(); - } - catch (IOException e) - { - _dataStore.trace(e); - } - } - } - else if (_state == EMPTY) - { - } - else if (_state == CLOSE) - { - } - } - - private void addData(StringBuffer data) - { - if (_state == OPEN) - { - append('>'); - - _indent++; - _state = BODY; - } - if (_state == BODY) - { - if (_generateBuffer && data != null && (data.length() > 0)) - { - StringBuffer text = prepareStringForXML(data); - if (text != null && text.length() > 0) - { - nextLine(); - indent(); - append("<Buffer>"); //$NON-NLS-1$ - nextLine(); - append(text.toString()); - nextLine(); - append("</Buffer>"); //$NON-NLS-1$ - } - } - else - { - append(""); //$NON-NLS-1$ - } - } - else if (_state == EMPTY) - { - } - else if (_state == CLOSE) - { - } - } - - /** - * Returns the current serialized document - * @return the current document - */ - public StringBuffer document() - { - return _document; - } - - /** - * Clears the current serlized document - */ - public void empty() - { - _indent = 0; - _document.delete(0, _document.length()); - } - - /** - * Converts special characters to appropriate representation in XML - * @param input buffer to convert - * @return the converted buffer - */ - public static StringBuffer prepareStringForXML(StringBuffer input) - { - StringBuffer output = new StringBuffer(); - - for (int idx = 0; idx < input.length(); idx++) - { - char currChar = input.charAt(idx); - switch (currChar) - { - case '&' : - output.append(XMLparser.STR_AMP); - break; - case '"' : - output.append(XMLparser.STR_QUOTE); - break; - case '\'' : - output.append(XMLparser.STR_APOS); - break; - case '<' : - output.append(XMLparser.STR_LT); - break; - case '>' : - output.append(XMLparser.STR_GT); - break; - case ';' : - output.append(XMLparser.STR_SEMI); - break; - case '\n': - output.append(XMLparser.STR_NL); - break; - case '\r': - output.append(XMLparser.STR_CR); - break; - case '\0': - output.append(XMLparser.STR_EOL); - break; - default : - output.append(currChar); - break; - } - } - - return output; - } - - /** - * Converts special characters to appropriate representation in XML - * @param input buffer to convert - * @return the converted buffer - */ - public static StringBuffer prepareStringForXML(String input) - { - StringBuffer output = new StringBuffer(); - - for (int idx = 0; idx < input.length(); idx++) - { - char currChar = input.charAt(idx); - switch (currChar) - { - case '&' : - output.append(XMLparser.STR_AMP); - break; - case '"' : - output.append(XMLparser.STR_QUOTE); - break; - case '\'' : - output.append(XMLparser.STR_APOS); - break; - case '<' : - output.append(XMLparser.STR_LT); - break; - case '>' : - output.append(XMLparser.STR_GT); - break; - case ';' : - output.append(XMLparser.STR_SEMI); - break; - case '\n': - output.append(XMLparser.STR_NL); - break; - case '\r': - output.append(XMLparser.STR_CR); - break; - case '\0': - output.append(XMLparser.STR_EOL); - break; - default : - output.append(currChar); - break; - } - } - - return output; - } - - /** - * Generate an tags for a file transfer and send bytes over the pipe. - * - * @param object the element representing the file transfer - * @param bytes the bytes to send - * @param size the number of bytes to send - * @param isAppend indicates whether bytes should be appended or not to a file on the other end of the pipe - * @param binary indicates whether the bytes should be sent as binary or text - */ - public synchronized void generate(DataElement object, byte[] bytes, int size, boolean isAppend, boolean binary) - { - String tagType = XMLparser.STR_FILE; - if (isAppend) - { - tagType += ".Append"; //$NON-NLS-1$ - } - if (binary) - { - tagType += ".Binary"; //$NON-NLS-1$ - } - - if (object != null) - { - startTag(tagType); - addAttribute(DE.P_TYPE, object.getAttribute(DE.A_TYPE)); - addAttribute(DE.P_ID, object.getAttribute(DE.A_ID)); - addAttribute(DE.P_NAME, object.getAttribute(DE.A_NAME)); - addAttribute(DE.P_VALUE, object.getAttribute(DE.A_VALUE)); - addAttribute(DE.P_SOURCE, object.getAttribute(DE.A_SOURCE)); - addAttribute(DE.P_SOURCE_LOCATION, object.getAttribute(DE.A_SOURCE_LOCATION)); - - addReferenceTypeAttribute(object); - - addAttribute(DE.P_DEPTH, "" + size); //$NON-NLS-1$ - addFile(bytes, size, binary); - - endTag(tagType); - } - } - - /** - * Generate tags for class transfer and send bytes over the pipe. - * - * @param object the element representing the class transfer - * @param bytes the bytes to send - * @param size the number of bytes to send - */ - public synchronized void generate(DataElement object, byte[] bytes, int size) - { - String tagType = XMLparser.STR_CLASS; - - if (object != null) - { - startTag(tagType); - addAttribute(DE.P_TYPE, object.getAttribute(DE.A_TYPE)); - addAttribute(DE.P_ID, object.getAttribute(DE.A_ID)); - addAttribute(DE.P_NAME, object.getAttribute(DE.A_NAME)); - addAttribute(DE.P_VALUE, object.getAttribute(DE.A_VALUE)); - addAttribute(DE.P_SOURCE, object.getAttribute(DE.A_SOURCE)); - addAttribute(DE.P_SOURCE_LOCATION, object.getAttribute(DE.A_SOURCE_LOCATION)); - - addReferenceTypeAttribute(object); - - addAttribute(DE.P_DEPTH, "" + size); //$NON-NLS-1$ - addFile(bytes, size, true); - - endTag(tagType); - } - } - - /** - * Serializes and sends a DataStore tree through the pipe - * - * @param object the root of the DataStore tree to send - * @param depth the depth of the tree to send - */ - public void generate(DataElement object, int depth) - { - if ((object != null) && (depth >= 0)) - { - String tagType = XMLparser.STR_DATAELEMENT; - - if (object.isUpdated() && !object.isPendingTransfer()) - { - } - else - { - if (object.isDeleted() && _ignoreDeleted) - { - } - else - { - object.setPendingTransfer(false); - - startTag(tagType); - addAttribute(DE.P_TYPE, object.getAttribute(DE.A_TYPE)); - addAttribute(DE.P_ID, object.getAttribute(DE.A_ID)); - addAttribute(DE.P_NAME, object.getAttribute(DE.A_NAME)); - addAttribute(DE.P_VALUE, object.getAttribute(DE.A_VALUE)); - addAttribute(DE.P_SOURCE, object.getAttribute(DE.A_SOURCE)); - addAttribute(DE.P_SOURCE_LOCATION, object.getAttribute(DE.A_SOURCE_LOCATION)); - - addReferenceTypeAttribute(object); - - addAttribute(DE.P_DEPTH, "" + object.depth()); //$NON-NLS-1$ - addData(object.getBuffer()); - object.setUpdated(true); - - if (!object.isReference() && depth >= 0) - { - for (int i = 0; i < object.getNestedSize(); i++) - { - generate(object.get(i), depth - 1); - } - } - - // end generation - endTag(tagType); - } - } - } - } - - public void generateClassRequest(DataElement object) - { - String tagType = XMLparser.STR_REQUEST_CLASS; - if (object != null) - { - startTag(tagType); - addAttribute(DE.P_TYPE, object.getAttribute(DE.A_TYPE)); - addAttribute(DE.P_ID, object.getAttribute(DE.A_ID)); - addAttribute(DE.P_NAME, object.getAttribute(DE.A_NAME)); - addAttribute(DE.P_VALUE, object.getAttribute(DE.A_VALUE)); - addAttribute(DE.P_SOURCE, object.getAttribute(DE.A_SOURCE)); - addAttribute(DE.P_SOURCE_LOCATION, object.getAttribute(DE.A_SOURCE_LOCATION)); - - addReferenceTypeAttribute(object); - _state = BODY; - endTag(tagType); - } - - } - - public void generateSerializedObject(DataElement object, IRemoteClassInstance runnable) - { - String tagType = XMLparser.STR_SERIALIZED; - if (object != null) - { - startTag(tagType); - addAttribute(DE.P_TYPE, object.getAttribute(DE.A_TYPE)); - addAttribute(DE.P_ID, object.getAttribute(DE.A_ID)); - addAttribute(DE.P_NAME, object.getAttribute(DE.A_NAME)); - addAttribute(DE.P_VALUE, object.getAttribute(DE.A_VALUE)); - addAttribute(DE.P_SOURCE, object.getAttribute(DE.A_SOURCE)); - addAttribute(DE.P_SOURCE_LOCATION, object.getAttribute(DE.A_SOURCE_LOCATION)); - - addReferenceTypeAttribute(object); - - try - { - PipedInputStream pin = new PipedInputStream(); - PipedOutputStream pout = new PipedOutputStream(pin); - ObjectOutputStream outStream = new ObjectOutputStream(pout); - outStream.writeObject(runnable); - - - int size = pin.available(); - byte[] bytes = new byte[size]; - int nRead = pin.read(bytes, 0, size); - addAttribute(DE.P_DEPTH, "" + nRead); //$NON-NLS-1$ - addFile(bytes, nRead, true); - - outStream.close(); - pin.close(); - - } - catch (Exception e) - { - e.printStackTrace(); - } - endTag(tagType); - } - } -} diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/util/XMLparser.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/util/XMLparser.java deleted file mode 100644 index 0f1b8bf9c..000000000 --- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/util/XMLparser.java +++ /dev/null @@ -1,1088 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2002, 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 - * - * 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 McKnight (IBM) [220123][dstore] Configurable timeout on irresponsiveness - * David McKnight (IBM) [221601][dstore] xmlparser needs to be able to handle very large attributes - * David McKnight (IBM) [222163][dstore] Special characters from old server are not restored - * David McKnight (IBM) [224906] [dstore] changes for getting properties and doing exit due to single-process capability - *******************************************************************************/ - -package org.eclipse.dstore.internal.core.util; - -import java.io.BufferedInputStream; -import java.io.IOException; -import java.io.InterruptedIOException; -import java.net.Socket; -import java.net.SocketException; -import java.util.ArrayList; -import java.util.List; -import java.util.Stack; - -import org.eclipse.dstore.core.model.DE; -import org.eclipse.dstore.core.model.DataElement; -import org.eclipse.dstore.core.model.DataStore; -import org.eclipse.dstore.core.model.DataStoreResources; - -/** - * <p> - * This class is used to deserialize data received from a file or a socket. - * </p> - * <p> - * When tags indicate that data is being received, the byte stream is deserialized - * as a DataStore tree. When deserialized data maps to existing DataElements in - * the DataStore, those elements are updated directly. Any deserialized data - * that maps to within an existing DataElement, that does not already exist, gets - * created under the existing DataElement. When parsing DataElement XML, there is - * no intermediate DOM - rather the DOM is the DataStore itself. - * </p> - * <p> - * When tags indicate that a byte stream or file is being received, bytes are - * sent the the current DataStore <code>ByteStreamHandler</code> to be saved on disk. - * </p> - */ -public class XMLparser -{ - public static final String KEEPALIVE_RESPONSE_TIMEOUT_PREFERENCE = "DSTORE_KEEPALIVE_RESPONSE_TIMEOUT"; //$NON-NLS-1$ - public static final String IO_SOCKET_READ_TIMEOUT_PREFERENCE = "DSTORE_IO_SOCKET_READ_TIMEOUT"; //$NON-NLS-1$ - public static final String KEEPALIVE_ENABLED_PREFERENCE = "DSTORE_KEEPALIVE_ENABLED"; //$NON-NLS-1$ - - public int IO_SOCKET_READ_TIMEOUT = 3600000; - public long KEEPALIVE_RESPONSE_TIMEOUT = 60000; - - public static final boolean VERBOSE_KEEPALIVE = false; - - private DataStore _dataStore; - private DataElement _rootDataElement; - private Stack _tagStack; - private Stack _objStack; - - private boolean _isFile; - private boolean _isClass; - private boolean _isRequestClass; - private boolean _isKeepAlive; - private boolean _isKeepAliveConfirm; - private boolean _isSerialized; - - private String _tagType; - - private byte[] _byteBuffer; - private byte[] _fileByteBuffer; - private int _maxBuffer; - - private boolean _panic = false; - private Throwable _panicException = null; - - private boolean _isKeepAliveCompatible = false; - private boolean _isKeepAliveEnabled = true; - private boolean _firstTime = true; - - private KeepAliveRequestThread _kart = null; - private KeepAliveRequestThread _initialKart = null; - - public static String STR_DATAELEMENT = "DataElement"; //$NON-NLS-1$ - - public static String STR_BUFFER_START = "<Buffer>"; //$NON-NLS-1$ - public static String STR_BUFFER_END = "</Buffer>"; //$NON-NLS-1$ - public static String STR_BUFFER = "Buffer"; //$NON-NLS-1$ - - public static String STR_STATUS = "status"; //$NON-NLS-1$ - public static String STR_STATUS_DONE = "done"; //$NON-NLS-1$ - public static String STR_STATUS_ALMOST_DONE = "almost done"; //$NON-NLS-1$ - - public static String STR_FILE = "File"; //$NON-NLS-1$ - public static String STR_CLASS = "Class"; //$NON-NLS-1$ - public static String STR_REQUEST_CLASS= "RequestClass"; //$NON-NLS-1$ - public static String STR_SERIALIZED = "Serialized"; //$NON-NLS-1$ - - public static String STR_AMP = "&"; //$NON-NLS-1$ - public static String STR_QUOTE = """; //$NON-NLS-1$ - public static String STR_APOS = "'"; //$NON-NLS-1$ - public static String STR_LT = "<"; //$NON-NLS-1$ - public static String STR_GT = ">"; //$NON-NLS-1$ - public static String STR_SEMI = ";"; //$NON-NLS-1$ - - public static String STR_NL = "\n"; //$NON-NLS-1$ - public static String STR_CR = "\r"; //$NON-NLS-1$ - public static String STR_EOL = "\0"; //$NON-NLS-1$ - - /** - * Constructor - * @param dataStore the associated DataStore - */ - public XMLparser(DataStore dataStore) - { - _dataStore = dataStore; - _tagStack = new Stack(); - _objStack = new Stack(); - _maxBuffer = 100000; - _byteBuffer = new byte[_maxBuffer]; - - } - - /** - * Set whether to enable keepalive - * @param enable <code>true</code> to enable keepalive - */ - public void setEnableKeepalive(boolean enable){ - // if false, we ignore the keepalive stuff - _isKeepAliveCompatible = enable; - _isKeepAliveEnabled = enable; - } - - /** - * Set the keepalive response timeout - * @param timeout the time to wait for a response after - * initiating a keepalive request - */ - public void setKeepaliveResponseTimeout(int timeout){ - // the new value will be picked up on the next readLine() call - KEEPALIVE_RESPONSE_TIMEOUT = timeout; - } - - /** - * Set the socket read timeout - * @param timeout the time to wait before initiating a keepalive request - */ - public void setIOSocketReadTimeout(int timeout){ - // the new value will be picked up on the next readLine() call - IO_SOCKET_READ_TIMEOUT = timeout; - } - - /** - * Read a file from the pipe - * @param reader the pipe reader - * @param size the number of bytes to read - * @param path the path of the file where the received bytes should be inserted - */ - public void readFile(BufferedInputStream reader, int size, String path, String byteStreamHandlerId) - { - /* - Runtime rt = Runtime.getRuntime(); - //long totalMem = rt.totalMemory(); - long freeMem = rt.freeMemory(); - - if (size * 100 > freeMem) - { - rt.gc(); - } - */ - if (_fileByteBuffer == null || _fileByteBuffer.length < size) - { - try - { - _fileByteBuffer = new byte[size]; - } - catch (OutOfMemoryError e) - { - System.exit(-1); - } - } - - int written = 0; - while (written < size) - { - try - { - int read = reader.read(_fileByteBuffer, written, size - written); - written += read; - } - catch (SocketException se) - { - // DKM- socket exception means connection is gone - // need bail now! - _dataStore.trace(se); - handlePanic(se); - return; - } - catch (IOException e) - { - _dataStore.trace(e); - handlePanic(e); - } - catch (Error err) - { - System.out.println("error!"); //$NON-NLS-1$ - handlePanic(err); - } - } - - if (_tagType.startsWith("File.Append")) //$NON-NLS-1$ - { - boolean binary = _tagType.equals("File.Append.Binary"); //$NON-NLS-1$ - _dataStore.appendToFile(path, _fileByteBuffer, size, binary, byteStreamHandlerId); - } - else - { - boolean binary = _tagType.equals("File.Binary"); //$NON-NLS-1$ - _dataStore.saveFile(path, _fileByteBuffer, size, binary, byteStreamHandlerId); - } - } - - public boolean readInstance(BufferedInputStream reader, int size, String classbyteStreamHandlerId) - { - byte[] buffer = new byte[size]; - int written = 0; - - while (written < size) - { - try - { - int read = reader.read(buffer, written, size - written); - written += read; - } - catch (SocketException se) - { - // DKM- socket exception means connection is gone - // need bail now! - _dataStore.trace(se); - handlePanic(se); - return false; - } - catch (IOException e) - { - _dataStore.trace(e); - handlePanic(e); - return false; - } - } - _dataStore.saveClassInstance(buffer, size, classbyteStreamHandlerId); - return true; - } - - /** - * Read a class file from the pipe - * @param reader the pipe reader - * @param size the number of bytes to read - * @param className the name of the class defined by the byte array. - * @param classbyteStreamHandlerId the name of the classByteStreamHandler that will receive the bytes of the file. - * @return whether the operation is successful - */ - public boolean readClass(BufferedInputStream reader, int size, String className, String classbyteStreamHandlerId) - { - byte[] buffer = new byte[size]; - int written = 0; - - while (written < size) - { - try - { - int read = reader.read(buffer, written, size - written); - written += read; - } - catch (SocketException se) - { - // DKM- socket exception means connection is gone - // need bail now! - _dataStore.trace(se); - handlePanic(se); - return false; - } - catch (IOException e) - { - _dataStore.trace(e); - handlePanic(e); - return false; - } - } - _dataStore.saveClass(className, buffer, size, classbyteStreamHandlerId); - return true; - } - - /** - * Reads a line from the pipe - * - * @param reader the pipe reader - * @return the line received - */ - public String readLine(BufferedInputStream reader, Socket socket) - { - boolean done = false; - int offset = 0; - - try - { - boolean inquotes = false; - while (!done) - { - if (_isKeepAliveEnabled) - { - if (_firstTime) - { - _initialKart = new KeepAliveRequestThread(KEEPALIVE_RESPONSE_TIMEOUT); - _firstTime = false; - if (VERBOSE_KEEPALIVE) System.out.println("Starting initial KeepAlive thread."); //$NON-NLS-1$ - _initialKart.start(); - continue; - } - else if (_initialKart != null && !_initialKart.isAlive()) - { - if (!_initialKart.failed()) - { - _isKeepAliveCompatible = true; - if (VERBOSE_KEEPALIVE) System.out.println("KeepAlive compatible."); //$NON-NLS-1$ - _initialKart = null; - } - else - { - _isKeepAliveCompatible = false; - if (VERBOSE_KEEPALIVE) System.out.println("KeepAlive incompatible."); //$NON-NLS-1$ - _initialKart = null; - } - } - } - - int in = -1; - - if (_isKeepAliveEnabled && _isKeepAliveCompatible) - { - if (_kart == null || !_kart.isAlive()){ // normal read wait - socket.setSoTimeout(IO_SOCKET_READ_TIMEOUT); - } - else { // read wait time when awaking a keepalive response - // otherwise, if IO_SOCKET_READ_TIMEOUT is bigger we don't get out of here until IO_SOCKET_READ_TIMEOUT is complete - socket.setSoTimeout((int)KEEPALIVE_RESPONSE_TIMEOUT); - } - - try - { - in = reader.read(); - } - catch (InterruptedIOException e) - { - if ((_kart != null) && _kart.failed()) - { - done = true; - if (_dataStore.isVirtual()) handlePanic(new Exception("KeepAlive request to server wasnt answered in time.")); //$NON-NLS-1$ - else handlePanic(new Exception("KeepAlive request to client wasnt answered in time.")); //$NON-NLS-1$ - return null; - } - else - { - if (_kart == null || !_kart.isAlive()){ - _kart = new KeepAliveRequestThread(KEEPALIVE_RESPONSE_TIMEOUT); - if (VERBOSE_KEEPALIVE) System.out.println("No activity on socket. KeepAlive thread started."); //$NON-NLS-1$ - _kart.start(); - continue; - } - } - } - } - else - { - in = reader.read(); - } - - if (in == -1) - { - done = true; - Exception e = new Exception("The connection to the server has been lost."); //$NON-NLS-1$ - handlePanic(e); - } - else - { - if (in <= 0) - { - done = true; - } - else - { - if (_kart != null) _kart.interrupt(); - } - byte aByte = (byte) in; - switch (aByte) - { - case '"': - inquotes = !inquotes; - break; - case '\n': - case '\r': - case '\0': - if (!inquotes) - done = true; - break; - default: - break; - } - - if (offset >= _maxBuffer) - { - int newMaxBuffer = 2 * _maxBuffer; - byte[] newBuffer = new byte[newMaxBuffer]; - System.arraycopy(_byteBuffer, 0, newBuffer, 0, _maxBuffer); - _maxBuffer = newMaxBuffer; - _byteBuffer = newBuffer; - } - _byteBuffer[offset] = aByte; - offset++; - } - } - } - catch (IOException e) - { - _dataStore.trace(e); - done = true; - - handlePanic(e); - - return null; - } - - if (offset > 0) - { - String result = null; - try - { - result = new String(_byteBuffer, 0, offset, DE.ENCODING_UTF_8); - } - catch (IOException e) - { - _dataStore.trace(e); - } - return result; - } - else - { - return null; - } - } - - /** - * Called if an exception occurs during reading of the pipe - * @param e the Exception - */ - private void handlePanic(Throwable e) - { - _panic = true; - _panicException = e; - } - - /** - * Returns the communications exception if one occurred - * @return a exception - */ - public Throwable getPanicException() - { - return _panicException; - } - - /** - * This method gets called to receive data from the pipe. It deserializes - * DataStore XML documents, creating the appropriate DataElements in appropriate - * places in the DataStore tree. If files are being transmitted it creates - * the appropriate files using the DataStore <code>ByteStreamHandler</code>. - * - * @param reader the pipe reader - * @return the root DataElement of the parsed document - * @throws IOException - */ - public DataElement parseDocument(BufferedInputStream reader, Socket socket) throws IOException - { - _tagStack.clear(); - _objStack.clear(); - - _rootDataElement = null; - _isFile = false; - _isClass = false; - _isRequestClass = false; - _isKeepAlive = false; - _isKeepAliveConfirm = false; - _isSerialized = false; - _tagType = STR_DATAELEMENT; - - DataElement parent = null; - String matchTag = null; - - boolean done = false; - while (!done) - { - String xmlTag = readLine(reader, socket); - - if (xmlTag != null) - { - String trimmedTag = xmlTag.trim(); - - - if (_dataStore.getReferenceTag() == null) - { - if (trimmedTag.indexOf(DE.P_ISREF + "=") > -1) _dataStore.setReferenceTag(DE.P_ISREF); //$NON-NLS-1$ - else if (trimmedTag.indexOf(DE.P_REF_TYPE + "=") > -1) _dataStore.setReferenceTag(DE.P_REF_TYPE); //$NON-NLS-1$ - } - - if (!_tagStack.empty()) - { - matchTag = (String) _tagStack.peek(); - } - if (trimmedTag.equals(STR_BUFFER_START)) - { - _tagType = STR_BUFFER; - _tagStack.push(STR_BUFFER_END); - } - else if (trimmedTag.equals(STR_BUFFER_END)) - { - _tagType = STR_DATAELEMENT; - _tagStack.pop(); - } - else if (_tagType.equals(STR_BUFFER)) - { - String buffer = convertStringFromXML(xmlTag); - if (parent != null) - parent.appendToBuffer(buffer); - } - else if ((matchTag != null) && trimmedTag.equals(matchTag)) - { - if (parent != null && parent.getType().equals(STR_STATUS)) - { - if (parent.getName().equals(STR_STATUS_ALMOST_DONE)) - { - - parent.setAttribute(DE.A_NAME, STR_STATUS_DONE); - if (parent.getValue().equals(STR_STATUS_ALMOST_DONE)) - { - parent.setAttribute(DE.A_VALUE,STR_STATUS_DONE); - } - if (_dataStore.isWaiting(parent)) - { - _dataStore.stopWaiting(parent); - parent.notifyUpdate(); - } - } - } - - if (parent != null && parent.getNestedSize() > 0 && _dataStore.isVirtual()) - { - List toDelete = new ArrayList(); - List nested = parent.getNestedData(); - synchronized (nested) - { - for (int s= 0; s < nested.size(); s++) - { - DataElement element = (DataElement)nested.get(s); - if (element.isSpirit()) - { - boolean addedToDelete = false; - String name = element.getName(); - String value = element.getValue(); - - // delete this element if there's another one with the same name and value - for (int n = 0; n < parent.getNestedSize() && !addedToDelete; n++) - { - if (n != s) - { - DataElement compare = parent.get(n); - String cname = compare.getName(); - String cvalue = compare.getValue(); - if (!compare.isSpirit() && cname.equals(name) && cvalue.equals(value)) - { - toDelete.add(element); - addedToDelete = true; - } - } - } - } - } - - // delete elements - for (int d = 0; d < toDelete.size(); d++) - { - DataElement delement = (DataElement)toDelete.get(d); - _dataStore.deleteObject(parent,delement); - } - } - } - - _tagStack.pop(); - if (_tagStack.empty()) - { - done = true; - } - else if (_tagStack.size() == 1) - { - parent = _rootDataElement; - } - else - { - parent = (DataElement) _objStack.pop(); - } - - } - else - { - xmlTag = xmlTag.trim(); - - if (xmlTag.length() > 3) - { - - try - { - if (parent != null) - { - if (_objStack.contains(parent)) - { - } - else - { - _objStack.push(parent); - } - } - - DataElement result = parseTag(xmlTag, parent); - - if (_panic) - { - return null; - } - - if (result != null) - { - result.setUpdated(true); - - if (parent == null && _rootDataElement == null) - { - _rootDataElement = result; - _rootDataElement.setParent(null); - } - - parent = result; - - if (_isFile) - { - int size = result.depth(); - String path = result.getSource(); - - String byteStreamHandler = result.getName(); - if (path.equals(byteStreamHandler)) - { - // older client or server, fall back to default - byteStreamHandler = DataStoreResources.DEFAULT_BYTESTREAMHANDLER; - } - readFile(reader, size, path, byteStreamHandler); - - _isFile = false; - //_dataStore.deleteObject(parent, result); - } - else if (_isClass) - { - int size = result.depth(); - - String classbyteStreamHandler = result.getSource(); - - if (result.getName() != null) - { - readClass(reader, size, result.getName(), classbyteStreamHandler); - } - _isClass = false; - } - else if (_isRequestClass) - { - result.getDataStore().sendClass(result.getName()); - _isRequestClass = false; - } - else if (_isKeepAlive) - { - if (VERBOSE_KEEPALIVE) System.out.println("KeepAlive request received, sending confirmation."); //$NON-NLS-1$ - result.getDataStore().sendKeepAliveConfirmation(); - _isKeepAlive = false; - } - else if (_isKeepAliveConfirm ) - { - if (VERBOSE_KEEPALIVE) System.out.println("KeepAlive confirmation received."); //$NON-NLS-1$ - if (_initialKart != null) _initialKart.interrupt(); - _isKeepAliveConfirm = false; - } - else if (_isSerialized) - { - int size = result.depth(); - String classbyteStreamHandler = result.getSource(); - if (result.getName() != null) - { - readInstance(reader, size, classbyteStreamHandler); - } - _isSerialized = false; - } - - StringBuffer endTag = new StringBuffer("</"); //$NON-NLS-1$ - endTag.append(_tagType); - endTag.append('>'); - _tagStack.push(endTag.toString()); - } - } - catch (Exception e) - { - e.printStackTrace(); - _dataStore.trace(e); - return _rootDataElement; - } - } - } - } - - if (_panic) - return null; - } - - DataElement result = _rootDataElement; - _rootDataElement.setParent(null); // this root is transient - - _rootDataElement = null; - return result; - } - - /** - * Deserializes a single DataElement from the XML stream. - * - * @param fullTag the DataElement XML tag - * @param parent the DataElement that container for the deserialized DataElement - * @return the parsed DataElement - */ - protected synchronized DataElement parseTag(String fullTag, DataElement parent) - { - if (!fullTag.startsWith("<")) //$NON-NLS-1$ - return null; - - try - { - fullTag = fullTag.substring(1, fullTag.length() - 1); - } - catch (Exception e) - { - return null; - } - - // get type - int nextSpace = fullTag.indexOf(' '); - if (nextSpace > 0) - { - String[] attributes = new String[DE.A_SIZE]; - - // tag type - String tagType = fullTag.substring(0, nextSpace); - if (tagType.startsWith(STR_FILE)) - { - _isFile = true; - _tagType = tagType; - } - else if (tagType.startsWith(STR_CLASS)) - { - _isClass = true; - _tagType = tagType; - } - else if (tagType.startsWith(STR_REQUEST_CLASS)) - { - _isRequestClass = true; - _tagType = tagType; - } - else if (tagType.startsWith(STR_SERIALIZED)) - { - _isSerialized = true; - _tagType = tagType; - } - - int index = 0; - int nextQuote = 0; - int nextnextQuote = nextSpace; - while ((index < DE.A_SIZE) && (nextQuote >= 0)) - { - nextQuote = fullTag.indexOf('\"', nextnextQuote + 1); - nextnextQuote = fullTag.indexOf('\"', nextQuote + 1); - - if ((nextQuote >= 0) && (nextnextQuote > nextQuote) && (fullTag.length() > nextnextQuote)) - { - String attribute = fullTag.substring(nextQuote + 1, nextnextQuote); - attributes[index] = convertStringFromXML(attribute); - index++; - } - } - - DataElement result = null; - if (attributes.length == DE.A_SIZE) - { - String type = attributes[DE.A_TYPE]; - if (type.equals(DataStoreResources.KEEPALIVE_TYPE)) - { - _isKeepAlive= true; - result = _dataStore.createTransientObject(attributes); - } - else if (type.equals(DataStoreResources.KEEPALIVECONFIRM_TYPE)) - { - _isKeepAliveConfirm = true; - result = _dataStore.createTransientObject(attributes); - } - - else if (type.equals(DataStoreResources.DOCUMENT_TYPE)) - { - String id = attributes[DE.A_ID]; - if (_dataStore.contains(id)) - { - result = _dataStore.find(id); - result.removeNestedData(); - } - else - { - result = _dataStore.createObject(null, attributes); - } - } - - else if (_isFile || _isClass || _isSerialized || parent == null) - { - result = _dataStore.createTransientObject(attributes); - } - else - { - String refType = attributes[DE.A_REF_TYPE]; - boolean isSpirit = false; - if (refType != null) isSpirit = refType.equals(DataStoreResources.SPIRIT); - - if ((refType != null) && (refType.equals(DataStoreResources.TRUE) || refType.equals(DataStoreResources.REFERENCE))) - { - // new reference - String origId = attributes[DE.A_NAME]; - if (_dataStore.contains(origId)) - { - - DataElement to = _dataStore.find(origId); - result = _dataStore.createReference(parent, to, attributes[DE.A_TYPE], false); - } - else - { - // creating reference to unknown object - result = _dataStore.createObject(parent, attributes); - } - } - else - { - String id = attributes[DE.A_ID]; - if (id == null) - { - handlePanic(new Exception(fullTag)); - return null; - } - - if (_dataStore.contains(id)) - { - result = _dataStore.find(id); - - // treat status special test - String name = attributes[DE.A_NAME]; - String value = attributes[DE.A_VALUE]; - if (type.equals(STR_STATUS) && name.equals(STR_STATUS_DONE)) - { - attributes[DE.A_NAME] = STR_STATUS_ALMOST_DONE; - if (value.equals(STR_STATUS_DONE)) - { - attributes[DE.A_VALUE] = STR_STATUS_ALMOST_DONE; - } - - result.setAttributes(attributes); - } - else - { - if (isSpirit) - { - if (!_dataStore.isVirtual()) attributes[DE.A_REF_TYPE] = DataStoreResources.VALUE; - result.setSpirit(_dataStore.isVirtual()); - } - else - { - result.setSpirit(false); - } - result.setAttributes(attributes); - } - - if (parent == _rootDataElement) - { - DataElement rParent = result.getParent(); - parent = rParent; - - _rootDataElement.addNestedData(result, false); - } - else - { - if (result.getParent() == null) - { - if (result != _dataStore.getRoot()) - { - result.setParent(parent); - } - } - } - - if (parent != null) - { - parent.addNestedData(result, true); - } - else - { - if (result != _dataStore.getRoot()) - { - _dataStore.trace("parent of " + result.getName() + " is NULL!"); //$NON-NLS-1$ //$NON-NLS-2$ - } - else - { - result.setParent(null); - } - } - if (result.isDeleted()) - //_dataStore.deleteObject(result.getParent(), result); - result.delete(); - } - else - { - // new object - if (_dataStore.isVirtual()) - { - result = _dataStore.find(parent, DE.A_NAME, attributes[DE.A_NAME], 1); - } - if (isSpirit) - { - if (!_dataStore.isVirtual()) attributes[DE.A_REF_TYPE] = DataStoreResources.VALUE; - result = _dataStore.createObject(parent, attributes); - result.setSpirit(_dataStore.isVirtual()); - } - else - { - result = _dataStore.createObject(parent, attributes); - result.setSpirit(false); - } - - - } - - } - } - } - - if (result != null && result.isDeleted()) - { - _dataStore.deleteObject(parent, result); - } - - return result; - } - - return null; - } - - - public static String replaceSpecial(String input) - { - int indexOfAmp = input.indexOf('&'); - int indexOfSemi = input.indexOf(';'); - if (indexOfAmp >= 0 && indexOfSemi > indexOfAmp) - { - String converted = input.replaceAll(STR_AMP, "&") //$NON-NLS-1$ - .replaceAll(STR_SEMI, ";") //$NON-NLS-1$ - .replaceAll(STR_QUOTE, "\"") //$NON-NLS-1$ - .replaceAll(STR_APOS, "\'") //$NON-NLS-1$ - .replaceAll(STR_LT, "<") //$NON-NLS-1$ - .replaceAll(STR_GT, ">") //$NON-NLS-1$ - .replaceAll(STR_NL, "\n") //$NON-NLS-1$ - .replaceAll(STR_CR, "\r") //$NON-NLS-1$ - .replaceAll(STR_EOL, "\0"); //$NON-NLS-1$ - return converted; - } - else - { - return input; - } - } - - /** - * Converts XML special character representations to the appropriate characters - * @param input buffer to convert - * @return the converted buffer - */ - public static String convertStringFromXML(String input) - { - if (input.indexOf('&') > -1) - { - return replaceSpecial(input); - /* - StringBuffer result = new StringBuffer(); - - String[] tokens = splitString(input); - for (int i = 0; i < tokens.length; i++) - { - String token = tokens[i]; - if (token.equals(STR_AMP_TRIMMED)) - { - result.append('&'); - } - else if (token.equals(STR_SEMI_TRIMMED)) - { - result.append(';'); - } - else if (token.equals(STR_QUOTE_TRIMMED)) - { - result.append('"'); - } - else if (token.equals(STR_APOS_TRIMMED)) - { - result.append('\''); - } - else if (token.equals(STR_LT_TRIMMED)) - { - result.append('<'); - } - else if (token.equals(STR_GT_TRIMMED)) - { - result.append('>'); - } - else - result.append(token); - } - - - return result.toString(); - */ - } - else - { - return input; - } - } - - public class KeepAliveRequestThread extends Thread - { - private long _timeout; - private boolean _failed; - - public KeepAliveRequestThread(long timeout) - { - _timeout = timeout; - _failed = false; - } - - public void run() - { - _dataStore.sendKeepAliveRequest(); - try - { - sleep(_timeout); - } - catch (InterruptedException e) - { - if (VERBOSE_KEEPALIVE) System.out.println("KeepAlive thread interrupted."); //$NON-NLS-1$ - return; - } - if (VERBOSE_KEEPALIVE) System.out.println("KeepAlive thread failed to be interrupted."); //$NON-NLS-1$ - _failed = true; - } - - public boolean failed() - { - return _failed; - } - } - -} diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/util/ssl/DStoreSSLContext.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/util/ssl/DStoreSSLContext.java deleted file mode 100644 index 197b2f578..000000000 --- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/util/ssl/DStoreSSLContext.java +++ /dev/null @@ -1,78 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006, 2008 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * 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 McKnight (IBM) - [225507][api][breaking] RSE dstore API leaks non-API types - *******************************************************************************/ - -package org.eclipse.dstore.internal.core.util.ssl; - -import java.security.KeyStore; - -import javax.net.ssl.KeyManagerFactory; -import javax.net.ssl.SSLContext; -import javax.net.ssl.TrustManager; - -import org.eclipse.dstore.core.util.ssl.DStoreKeyStore; -import org.eclipse.dstore.core.util.ssl.IDataStoreTrustManager; - - -public class DStoreSSLContext -{ - - public static SSLContext getServerSSLContext(String filePath, String password) - { - SSLContext serverContext = null; - - try - { - KeyStore ks = DStoreKeyStore.getKeyStore(filePath, password); - String keymgrAlgorithm = KeyManagerFactory.getDefaultAlgorithm(); - KeyManagerFactory kmf = KeyManagerFactory.getInstance(keymgrAlgorithm); - kmf.init(ks, password.toCharArray()); - - serverContext = SSLContext.getInstance("SSL"); //$NON-NLS-1$ - serverContext.init(kmf.getKeyManagers(), null, null); - } - catch (Exception e) - { - e.printStackTrace(); - } - - return serverContext; - } - - public static SSLContext getClientSSLContext(String filePath, String password, IDataStoreTrustManager trustManager) - { - SSLContext clientContext = null; - - try - { - trustManager.setKeystore(filePath, password); - clientContext = SSLContext.getInstance("SSL"); //$NON-NLS-1$ - TrustManager[] mgrs = new TrustManager[1]; - mgrs[0] = trustManager; - - - clientContext.init(null, mgrs, null); - } - catch (Exception e) - { - e.printStackTrace(); - } - - return clientContext; - } - - -} diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/util/ssl/DataStoreTrustManager.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/util/ssl/DataStoreTrustManager.java deleted file mode 100644 index 3ba6a3f66..000000000 --- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/util/ssl/DataStoreTrustManager.java +++ /dev/null @@ -1,151 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006, 2008 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * 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 McKnight (IBM) - [225507][api][breaking] RSE dstore API leaks non-API types - *******************************************************************************/ - -package org.eclipse.dstore.internal.core.util.ssl; - -import java.security.KeyStore; -import java.security.cert.CertificateException; -import java.security.cert.X509Certificate; -import java.util.ArrayList; -import java.util.Enumeration; -import java.util.List; - -import org.eclipse.dstore.core.util.ssl.DStoreKeyStore; -import org.eclipse.dstore.core.util.ssl.IDataStoreTrustManager; - -public class DataStoreTrustManager implements IDataStoreTrustManager -{ - private KeyStore _keystore; - private List _untrustedCerts; - private List _verifyExceptions; - - //private X509Certificate _untrustedCert; - //private Exception _verifyException; - - private List _trustedCerts; - - public DataStoreTrustManager() - { - _trustedCerts = new ArrayList(); - _untrustedCerts = new ArrayList(); - _verifyExceptions = new ArrayList(); - } - - - public void setKeystore(String filePath, String password) - { - try - { - KeyStore ks = DStoreKeyStore.getKeyStore(filePath, password); - _keystore = ks; - loadTrustedCertificates(); - } - catch (Exception e) - { - - } - } - - private void loadTrustedCertificates() - { - _trustedCerts.clear(); - try - { - Enumeration aliases = _keystore.aliases(); - - while (aliases.hasMoreElements()) - { - String alias = (String) (aliases.nextElement()); - - /* The alias may be either a key or a certificate */ - java.security.cert.Certificate cert = _keystore.getCertificate(alias); - _trustedCerts.add(cert); - } - } - catch (Exception e) - { - e.printStackTrace(); - } - } - - - public List getUntrustedCerts() - { - return _untrustedCerts; - } - - public List getVerifyExceptions() - { - return _verifyExceptions; - } - - private void checkTrusted(X509Certificate[] certs, String arg1) throws CertificateException - { - _untrustedCerts.clear(); - _verifyExceptions.clear(); - - - for (int i = 0; i < certs.length; i++) - { - X509Certificate cert = certs[i]; - boolean foundMatch = false; - if (_trustedCerts.size() > 0) - { - - for (int j = 0; j < _trustedCerts.size() && !foundMatch; j++) - { - X509Certificate tcert = (X509Certificate)_trustedCerts.get(j); - try - { - cert.verify(tcert.getPublicKey()); - foundMatch = true; - } - catch (Exception e) - { - } - } - } - if (!foundMatch) - { - _untrustedCerts.add(cert); - } - } - if (_trustedCerts.size() == 0 || _untrustedCerts.size() > 0) - { - throw new CertificateException(); - } - } - - public void checkClientTrusted(X509Certificate[] certs, String arg1) throws CertificateException - { - checkTrusted(certs, arg1); - - } - - public void checkServerTrusted(X509Certificate[] certs, String arg1) throws CertificateException - { - checkTrusted(certs,arg1); - } - - public X509Certificate[] getAcceptedIssuers() - { - return null; - } - - - -} diff --git a/rse/plugins/org.eclipse.dstore.extra/.classpath b/rse/plugins/org.eclipse.dstore.extra/.classpath deleted file mode 100644 index b7464f3ca..000000000 --- a/rse/plugins/org.eclipse.dstore.extra/.classpath +++ /dev/null @@ -1,7 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<classpath> - <classpathentry kind="src" path="src"/> - <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/> - <classpathentry kind="output" path="bin"/> -</classpath> diff --git a/rse/plugins/org.eclipse.dstore.extra/.cvsignore b/rse/plugins/org.eclipse.dstore.extra/.cvsignore deleted file mode 100644 index ba077a403..000000000 --- a/rse/plugins/org.eclipse.dstore.extra/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -bin diff --git a/rse/plugins/org.eclipse.dstore.extra/.project b/rse/plugins/org.eclipse.dstore.extra/.project deleted file mode 100644 index ef6dc13c3..000000000 --- a/rse/plugins/org.eclipse.dstore.extra/.project +++ /dev/null @@ -1,34 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<projectDescription> - <name>org.eclipse.dstore.extra</name> - <comment></comment> - <projects> - </projects> - <buildSpec> - <buildCommand> - <name>org.eclipse.jdt.core.javabuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.eclipse.pde.ManifestBuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.eclipse.pde.SchemaBuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name> - <arguments> - </arguments> - </buildCommand> - </buildSpec> - <natures> - <nature>org.eclipse.pde.PluginNature</nature> - <nature>org.eclipse.jdt.core.javanature</nature> - <nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature> - </natures> -</projectDescription> diff --git a/rse/plugins/org.eclipse.dstore.extra/.settings/org.eclipse.jdt.core.prefs b/rse/plugins/org.eclipse.dstore.extra/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 381fc6eb0..000000000 --- a/rse/plugins/org.eclipse.dstore.extra/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -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 --git a/rse/plugins/org.eclipse.dstore.extra/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.dstore.extra/META-INF/MANIFEST.MF deleted file mode 100644 index cec256ce4..000000000 --- a/rse/plugins/org.eclipse.dstore.extra/META-INF/MANIFEST.MF +++ /dev/null @@ -1,16 +0,0 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: %pluginName -Bundle-SymbolicName: org.eclipse.dstore.extra -Bundle-Version: 2.1.0.qualifier -Bundle-Activator: org.eclipse.dstore.extra.Activator -Bundle-Localization: plugin -Require-Bundle: org.eclipse.ui, - org.eclipse.core.runtime, - org.eclipse.ui.views -Bundle-ActivationPolicy: lazy -Eclipse-LazyStart: true -Bundle-Vendor: %providerName -Bundle-RequiredExecutionEnvironment: J2SE-1.4 -Export-Package: org.eclipse.dstore.extra, - org.eclipse.dstore.internal.extra;x-friends:="org.eclipse.rse.subsystems.files.dstore" diff --git a/rse/plugins/org.eclipse.dstore.extra/about.html b/rse/plugins/org.eclipse.dstore.extra/about.html deleted file mode 100644 index d4cc693f9..000000000 --- a/rse/plugins/org.eclipse.dstore.extra/about.html +++ /dev/null @@ -1,28 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" - "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml"> -<head> -<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/> -<title>About</title> -</head> -<body lang="EN-US"> -<h2>About This Content</h2> - -<p>June 5, 2007</p> -<h3>License</h3> - -<p>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 <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>. -For purposes of the EPL, "Program" will mean the Content.</p> - -<p>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 <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p> - -</body> -</html>
\ No newline at end of file diff --git a/rse/plugins/org.eclipse.dstore.extra/build.properties b/rse/plugins/org.eclipse.dstore.extra/build.properties deleted file mode 100644 index fb8af93c6..000000000 --- a/rse/plugins/org.eclipse.dstore.extra/build.properties +++ /dev/null @@ -1,20 +0,0 @@ -############################################################################### -# Copyright (c) 2001, 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 -############################################################################### -bin.includes = .,\ - about.html,\ - META-INF/,\ - dstore_extra_server.jar,\ - plugin.properties -source.. = src/ -output.. = bin/ -source.dstore_extra_server.jar = server/ -output.dstore_extra_server.jar = server.bin/ -src.includes = about.html diff --git a/rse/plugins/org.eclipse.dstore.extra/plugin.properties b/rse/plugins/org.eclipse.dstore.extra/plugin.properties deleted file mode 100644 index e6ca40d61..000000000 --- a/rse/plugins/org.eclipse.dstore.extra/plugin.properties +++ /dev/null @@ -1,16 +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 -############################################################################### - -# NLS_MESSAGEFORMAT_NONE -# NLS_ENCODING=UTF-8 - -pluginName = RSE DStore Platform Support -providerName = Eclipse.org diff --git a/rse/plugins/org.eclipse.dstore.extra/server/org/eclipse/dstore/extra/DomainEvent.java b/rse/plugins/org.eclipse.dstore.extra/server/org/eclipse/dstore/extra/DomainEvent.java deleted file mode 100644 index 298b3c4ef..000000000 --- a/rse/plugins/org.eclipse.dstore.extra/server/org/eclipse/dstore/extra/DomainEvent.java +++ /dev/null @@ -1,103 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2001, 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 - * - * 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: - * {Name} (company) - description of contribution. - *******************************************************************************/ - -package org.eclipse.dstore.extra; - -import java.util.List; - - -public class DomainEvent -{ - - - public static final int UNKNOWN= 0; - public static final int INSERT= 1; - public static final int REMOVE= 2; - public static final int STRUCTURE_CHANGE= 3; - public static final int NON_STRUCTURE_CHANGE= 4; - public static final int FILE_CHANGE=5; - - - public static final int FIRST_CUSTOM_CHANGE= 10; - public static final int LAST_CUSTOM_CHANGE= 255; - - public static final int MASK= 0xFF; - public static final int REVEAL= 0x100; - public static final int SELECT= 0x200; - - public static final int INSERT_REVEAL= INSERT | REVEAL; - public static final int INSERT_REVEAL_SELECT= INSERT_REVEAL | SELECT; - - private IDataElement _parent; - private int _type; - - public DomainEvent(int type, IDataElement parent, Object property) - { - _type = type; - _parent = parent; - } - - public DomainEvent(int type, IDataElement parent, Object property, IDataElement child) - { - _type = type; - _parent = parent; - } - - - public DomainEvent(IDomainNotifier source, int type, IDataElement parent, Object property) - { - _type = type; - _parent = parent; - } - - - public boolean equals(Object event) - { - return (((DomainEvent)event).getParent() == getParent()); - } - - public String getId() - { - return _parent.getId(); - } - - public String getName() - { - return _parent.getName(); - - } - - public int getType() - { - return _type; - } - - public IDataElement getParent() - { - return _parent; - } - - public List getChildren() - { - return _parent.getNestedData(); - } - - public int getChildrenCount() - { - return _parent.getNestedSize(); - } -} diff --git a/rse/plugins/org.eclipse.dstore.extra/server/org/eclipse/dstore/extra/IDataElement.java b/rse/plugins/org.eclipse.dstore.extra/server/org/eclipse/dstore/extra/IDataElement.java deleted file mode 100644 index 358a68d4a..000000000 --- a/rse/plugins/org.eclipse.dstore.extra/server/org/eclipse/dstore/extra/IDataElement.java +++ /dev/null @@ -1,37 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2001, 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 - * - * 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: - * {Name} (company) - description of contribution. - *******************************************************************************/ - -package org.eclipse.dstore.extra; - -import java.util.List; - - -public interface IDataElement extends IElement -{ - - - String getName(); - String getType(); - String getId(); - List getNestedData(); - int getNestedSize(); - - - Object getElementProperty(Object obj); - List getAssociated(String key); - boolean isOfType(String typeStr); -} diff --git a/rse/plugins/org.eclipse.dstore.extra/server/org/eclipse/dstore/extra/IDomainListener.java b/rse/plugins/org.eclipse.dstore.extra/server/org/eclipse/dstore/extra/IDomainListener.java deleted file mode 100644 index cf41e1d6e..000000000 --- a/rse/plugins/org.eclipse.dstore.extra/server/org/eclipse/dstore/extra/IDomainListener.java +++ /dev/null @@ -1,27 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2001, 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 - * - * 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: - * {Name} (company) - description of contribution. - *******************************************************************************/ - -package org.eclipse.dstore.extra; - - -public interface IDomainListener -{ - - - public boolean listeningTo(DomainEvent e); - public void domainChanged(DomainEvent e); -} diff --git a/rse/plugins/org.eclipse.dstore.extra/server/org/eclipse/dstore/extra/IDomainNotifier.java b/rse/plugins/org.eclipse.dstore.extra/server/org/eclipse/dstore/extra/IDomainNotifier.java deleted file mode 100644 index 2394a1ed8..000000000 --- a/rse/plugins/org.eclipse.dstore.extra/server/org/eclipse/dstore/extra/IDomainNotifier.java +++ /dev/null @@ -1,29 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2001, 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 - * - * 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: - * {Name} (company) - description of contribution. - *******************************************************************************/ - -package org.eclipse.dstore.extra; - - -public interface IDomainNotifier -{ - - - public void addDomainListener(IDomainListener listener); - public void fireDomainChanged(DomainEvent event); - public boolean hasDomainListener(IDomainListener listener); - public void removeDomainListener(IDomainListener listener); -} diff --git a/rse/plugins/org.eclipse.dstore.extra/server/org/eclipse/dstore/extra/IElement.java b/rse/plugins/org.eclipse.dstore.extra/server/org/eclipse/dstore/extra/IElement.java deleted file mode 100644 index 2e336806e..000000000 --- a/rse/plugins/org.eclipse.dstore.extra/server/org/eclipse/dstore/extra/IElement.java +++ /dev/null @@ -1,25 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2001, 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 - * - * 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: - * {Name} (company) - description of contribution. - *******************************************************************************/ - -package org.eclipse.dstore.extra; - -public interface IElement -{ - - - public Object getElementProperty(Object key); -} diff --git a/rse/plugins/org.eclipse.dstore.extra/server/org/eclipse/dstore/internal/extra/DataElementActionFilter.java b/rse/plugins/org.eclipse.dstore.extra/server/org/eclipse/dstore/internal/extra/DataElementActionFilter.java deleted file mode 100644 index 06c8189ea..000000000 --- a/rse/plugins/org.eclipse.dstore.extra/server/org/eclipse/dstore/internal/extra/DataElementActionFilter.java +++ /dev/null @@ -1,60 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006, 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 - * - * 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: - * {Name} (company) - description of contribution. - *******************************************************************************/ - -package org.eclipse.dstore.internal.extra; - -import org.eclipse.dstore.extra.IDataElement; - - - -public class DataElementActionFilter -{ - - - private static String _type = "type"; - private static DataElementActionFilter _instance; - - public static DataElementActionFilter getInstance() - { - if (_instance == null) - _instance = new DataElementActionFilter(); - return _instance; - } - - /** - * @see IActionFilter#testAttribute(Object, String, String) - */ - public boolean testAttribute(Object target, String name, String value) - { - if (name.equals(_type)) - { - IDataElement le = (IDataElement)target; - if (le.getType().equals(value) || le.isOfType(value)) - { - return true; - } - } - - return false; - } - - public static boolean matches(Class aClass) - { - return false; - } - -} diff --git a/rse/plugins/org.eclipse.dstore.extra/server/org/eclipse/dstore/internal/extra/DesktopElement.java b/rse/plugins/org.eclipse.dstore.extra/server/org/eclipse/dstore/internal/extra/DesktopElement.java deleted file mode 100644 index e907c651b..000000000 --- a/rse/plugins/org.eclipse.dstore.extra/server/org/eclipse/dstore/internal/extra/DesktopElement.java +++ /dev/null @@ -1,33 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2001, 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 - * - * 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: - * {Name} (company) - description of contribution. - *******************************************************************************/ - -package org.eclipse.dstore.internal.extra; - -public class DesktopElement -{ - - - public static boolean matches(Class aClass) - { - return false; - } - - public static Object getPlatformAdapter(Object obj, Class aClass) - { - return null; - } -} diff --git a/rse/plugins/org.eclipse.dstore.extra/server/org/eclipse/dstore/internal/extra/DomainNotifier.java b/rse/plugins/org.eclipse.dstore.extra/server/org/eclipse/dstore/internal/extra/DomainNotifier.java deleted file mode 100644 index 63c723727..000000000 --- a/rse/plugins/org.eclipse.dstore.extra/server/org/eclipse/dstore/internal/extra/DomainNotifier.java +++ /dev/null @@ -1,58 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2001, 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 - * - * 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: - * {Name} (company) - description of contribution. - *******************************************************************************/ - -package org.eclipse.dstore.internal.extra; - -import org.eclipse.dstore.extra.DomainEvent; -import org.eclipse.dstore.extra.IDomainListener; -import org.eclipse.dstore.extra.IDomainNotifier; - -public class DomainNotifier implements IDomainNotifier -{ - - - public DomainNotifier() - { - } - - public void enable(boolean on) - { - } - - public boolean isEnabled() - { - return false; - } - - public void addDomainListener(IDomainListener listener) - { - } - - - public void fireDomainChanged(DomainEvent event) - { - } - - public boolean hasDomainListener(IDomainListener listener) - { - return false; - } - - public void removeDomainListener(IDomainListener listener) - { - } -} diff --git a/rse/plugins/org.eclipse.dstore.extra/server/org/eclipse/dstore/internal/extra/IDesktopElement.java b/rse/plugins/org.eclipse.dstore.extra/server/org/eclipse/dstore/internal/extra/IDesktopElement.java deleted file mode 100644 index 84b0b95d5..000000000 --- a/rse/plugins/org.eclipse.dstore.extra/server/org/eclipse/dstore/internal/extra/IDesktopElement.java +++ /dev/null @@ -1,24 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2001, 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 - * - * 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: - * {Name} (company) - description of contribution. - *******************************************************************************/ - -package org.eclipse.dstore.internal.extra; - -public interface IDesktopElement -{ - - -} diff --git a/rse/plugins/org.eclipse.dstore.extra/server/org/eclipse/dstore/internal/extra/IPropertySource.java b/rse/plugins/org.eclipse.dstore.extra/server/org/eclipse/dstore/internal/extra/IPropertySource.java deleted file mode 100644 index 65a6eca3c..000000000 --- a/rse/plugins/org.eclipse.dstore.extra/server/org/eclipse/dstore/internal/extra/IPropertySource.java +++ /dev/null @@ -1,24 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2001, 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 - * - * 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: - * {Name} (company) - description of contribution. - *******************************************************************************/ - -package org.eclipse.dstore.internal.extra; - -public interface IPropertySource -{ - - -} diff --git a/rse/plugins/org.eclipse.dstore.extra/server/org/eclipse/dstore/internal/extra/PropertySource.java b/rse/plugins/org.eclipse.dstore.extra/server/org/eclipse/dstore/internal/extra/PropertySource.java deleted file mode 100644 index ac8aa1c84..000000000 --- a/rse/plugins/org.eclipse.dstore.extra/server/org/eclipse/dstore/internal/extra/PropertySource.java +++ /dev/null @@ -1,34 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2001, 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 - * - * 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: - * {Name} (company) - description of contribution. - *******************************************************************************/ - -package org.eclipse.dstore.internal.extra; - -import org.eclipse.dstore.extra.IDataElement; - -public class PropertySource -{ - - - public PropertySource(IDataElement element) - { - } - - public static boolean matches(Class key) - { - return false; - } -} diff --git a/rse/plugins/org.eclipse.dstore.extra/serverruntime/.cvsignore b/rse/plugins/org.eclipse.dstore.extra/serverruntime/.cvsignore deleted file mode 100644 index 2053777fa..000000000 --- a/rse/plugins/org.eclipse.dstore.extra/serverruntime/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -dstore_extra_server.jar diff --git a/rse/plugins/org.eclipse.dstore.extra/src/org/eclipse/dstore/extra/Activator.java b/rse/plugins/org.eclipse.dstore.extra/src/org/eclipse/dstore/extra/Activator.java deleted file mode 100644 index 367ae369f..000000000 --- a/rse/plugins/org.eclipse.dstore.extra/src/org/eclipse/dstore/extra/Activator.java +++ /dev/null @@ -1,59 +0,0 @@ -/******************************************************************************** - * Copyright (c) 2006 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 - * - * 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: - * {Name} (company) - description of contribution. - ********************************************************************************/ - -package org.eclipse.dstore.extra; - -import org.eclipse.core.runtime.Plugin; -import org.osgi.framework.BundleContext; - -/** - * The main plugin class to be used in the desktop. - */ -public class Activator extends Plugin { - - //The shared instance. - private static Activator plugin; - - /** - * The constructor. - */ - public Activator() { - plugin = this; - } - - /** - * This method is called upon plug-in activation - */ - public void start(BundleContext context) throws Exception { - super.start(context); - } - - /** - * This method is called when the plug-in is stopped - */ - public void stop(BundleContext context) throws Exception { - super.stop(context); - plugin = null; - } - - /** - * @return the shared instance of this plugin. - */ - public static Activator getDefault() { - return plugin; - } - -}
\ No newline at end of file diff --git a/rse/plugins/org.eclipse.dstore.extra/src/org/eclipse/dstore/extra/DomainEvent.java b/rse/plugins/org.eclipse.dstore.extra/src/org/eclipse/dstore/extra/DomainEvent.java deleted file mode 100644 index 0d7117617..000000000 --- a/rse/plugins/org.eclipse.dstore.extra/src/org/eclipse/dstore/extra/DomainEvent.java +++ /dev/null @@ -1,103 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2002, 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 - * - * 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: - * {Name} (company) - description of contribution. - *******************************************************************************/ - -package org.eclipse.dstore.extra; - -import java.util.List; - - -public class DomainEvent -{ - - - public static final int UNKNOWN= 0; - public static final int INSERT= 1; - public static final int REMOVE= 2; - public static final int STRUCTURE_CHANGE= 3; - public static final int NON_STRUCTURE_CHANGE= 4; - public static final int FILE_CHANGE=5; - - - public static final int FIRST_CUSTOM_CHANGE= 10; - public static final int LAST_CUSTOM_CHANGE= 255; - - public static final int MASK= 0xFF; - public static final int REVEAL= 0x100; - public static final int SELECT= 0x200; - - public static final int INSERT_REVEAL= INSERT | REVEAL; - public static final int INSERT_REVEAL_SELECT= INSERT_REVEAL | SELECT; - - private IDataElement _parent; - private int _type; - - public DomainEvent(int type, IDataElement parent, Object property) - { - _type = type; - _parent = parent; - } - - public DomainEvent(int type, IDataElement parent, Object property, IDataElement child) - { - _type = type; - _parent = parent; - } - - - public DomainEvent(IDomainNotifier source, int type, IDataElement parent, Object property) - { - _type = type; - _parent = parent; - } - - - public boolean equals(Object event) - { - return (((DomainEvent)event).getParent() == getParent()); - } - - public String getId() - { - return _parent.getId(); - } - - public String getName() - { - return _parent.getName(); - - } - - public int getType() - { - return _type; - } - - public IDataElement getParent() - { - return _parent; - } - - public List getChildren() - { - return _parent.getNestedData(); - } - - public int getChildrenCount() - { - return _parent.getNestedSize(); - } -} diff --git a/rse/plugins/org.eclipse.dstore.extra/src/org/eclipse/dstore/extra/IDataElement.java b/rse/plugins/org.eclipse.dstore.extra/src/org/eclipse/dstore/extra/IDataElement.java deleted file mode 100644 index 97d2cfa8f..000000000 --- a/rse/plugins/org.eclipse.dstore.extra/src/org/eclipse/dstore/extra/IDataElement.java +++ /dev/null @@ -1,37 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2002, 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 - * - * 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: - * {Name} (company) - description of contribution. - *******************************************************************************/ - -package org.eclipse.dstore.extra; - -import java.util.List; - - -public interface IDataElement extends IElement -{ - - - String getName(); - String getType(); - String getId(); - List getNestedData(); - int getNestedSize(); - - Object getElementProperty(Object obj); - List getAssociated(String key); - - boolean isOfType(String typeStr); -} diff --git a/rse/plugins/org.eclipse.dstore.extra/src/org/eclipse/dstore/extra/IDomainListener.java b/rse/plugins/org.eclipse.dstore.extra/src/org/eclipse/dstore/extra/IDomainListener.java deleted file mode 100644 index 1156ce856..000000000 --- a/rse/plugins/org.eclipse.dstore.extra/src/org/eclipse/dstore/extra/IDomainListener.java +++ /dev/null @@ -1,26 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2002, 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 - * - * 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: - * {Name} (company) - description of contribution. - *******************************************************************************/ - -package org.eclipse.dstore.extra; - - -public interface IDomainListener -{ - - public boolean listeningTo(DomainEvent e); - public void domainChanged(DomainEvent e); -} diff --git a/rse/plugins/org.eclipse.dstore.extra/src/org/eclipse/dstore/extra/IDomainNotifier.java b/rse/plugins/org.eclipse.dstore.extra/src/org/eclipse/dstore/extra/IDomainNotifier.java deleted file mode 100644 index 2aff9a051..000000000 --- a/rse/plugins/org.eclipse.dstore.extra/src/org/eclipse/dstore/extra/IDomainNotifier.java +++ /dev/null @@ -1,43 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2002, 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 - * - * 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 McKnight (IBM) - [225507][api][breaking] RSE dstore API leaks non-API types - *******************************************************************************/ - -package org.eclipse.dstore.extra; - -/** - * For DataStore domain notification - * - * @noimplement This interface is not intended to be implemented by clients. - */ -public interface IDomainNotifier { - public void addDomainListener(IDomainListener listener); - - public void fireDomainChanged(DomainEvent event); - - public boolean hasDomainListener(IDomainListener listener); - - public void removeDomainListener(IDomainListener listener); - - /** - * @since 2.1 - */ - public void enable(boolean on); - - /** - * @since 2.1 - */ - public boolean isEnabled(); -} diff --git a/rse/plugins/org.eclipse.dstore.extra/src/org/eclipse/dstore/extra/IElement.java b/rse/plugins/org.eclipse.dstore.extra/src/org/eclipse/dstore/extra/IElement.java deleted file mode 100644 index 6037f86b4..000000000 --- a/rse/plugins/org.eclipse.dstore.extra/src/org/eclipse/dstore/extra/IElement.java +++ /dev/null @@ -1,27 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2002, 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 - * - * 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: - * {Name} (company) - description of contribution. - *******************************************************************************/ - -package org.eclipse.dstore.extra; - -import org.eclipse.core.runtime.IAdaptable; - -public interface IElement extends IAdaptable -{ - - - public Object getElementProperty(Object key); -} diff --git a/rse/plugins/org.eclipse.dstore.extra/src/org/eclipse/dstore/internal/extra/DataElementActionFilter.java b/rse/plugins/org.eclipse.dstore.extra/src/org/eclipse/dstore/internal/extra/DataElementActionFilter.java deleted file mode 100644 index 10a685c80..000000000 --- a/rse/plugins/org.eclipse.dstore.extra/src/org/eclipse/dstore/internal/extra/DataElementActionFilter.java +++ /dev/null @@ -1,70 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2002, 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 - * - * 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: - * {Name} (company) - description of contribution. - *******************************************************************************/ - -package org.eclipse.dstore.internal.extra; - -import org.eclipse.dstore.extra.IDataElement; - -public class DataElementActionFilter implements org.eclipse.ui.IActionFilter { - - - // constants to be used by Eclipse Filtering and Enablement Support. - private static String _type = "type"; //$NON-NLS-1$ - private static String _name = "name"; //$NON-NLS-1$ - private static DataElementActionFilter _instance; - - public static DataElementActionFilter getInstance() { - if (_instance == null) - _instance = new DataElementActionFilter(); - return _instance; - } - - /** - * Supports Eclipse filtering and enablement. - * - * The above contribution uses the RSE pop-up extension point to contribute an action - * to any single RSE object but not anything beginning with SPECIAL. - * @see IDataElementActionFilter#testAttribute(Object, String, String) - */ - public boolean testAttribute(Object target, String name, String value) { - if (name.equals(_type) && target instanceof IDataElement) { - // support for "type" filter - IDataElement le = (IDataElement) target; - if (le.getType().equals(value) || le.isOfType(value)) - return true; - } else if (name.equals(_name) && target instanceof IDataElement) { - // support for "name" filter. - IDataElement le = (IDataElement) target; - if (value.endsWith("*")) { //$NON-NLS-1$ - // we have a wild card test, and * is the last character in the value - if (le - .getName() - .startsWith(value.substring(0, value.length() - 1))) - return true; - } else if (le.getName().equals(value)) - return true; - } - - // type and name filter do not match, or we have a filter we do not support. - return false; - } - - public static boolean matches(Class aClass) { - return (aClass == org.eclipse.ui.IActionFilter.class); - } - -} diff --git a/rse/plugins/org.eclipse.dstore.extra/src/org/eclipse/dstore/internal/extra/DesktopElement.java b/rse/plugins/org.eclipse.dstore.extra/src/org/eclipse/dstore/internal/extra/DesktopElement.java deleted file mode 100644 index 3c9316eff..000000000 --- a/rse/plugins/org.eclipse.dstore.extra/src/org/eclipse/dstore/internal/extra/DesktopElement.java +++ /dev/null @@ -1,84 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2002, 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 - * - * 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: - * {Name} (company) - description of contribution. - *******************************************************************************/ - -package org.eclipse.dstore.internal.extra; - -import java.util.List; - -import org.eclipse.dstore.extra.IDataElement; -import org.eclipse.jface.resource.ImageDescriptor; - - -public class DesktopElement implements org.eclipse.ui.model.IWorkbenchAdapter -{ - - - private IDataElement _element; - - public DesktopElement (IDataElement e) - { - _element = e; - } - - public IDataElement toElement(Object object) - { - IDataElement element = null; - if (object instanceof IDataElement) - { - element = (IDataElement)object; - } - else - { - element = _element; - } - return element; - } - - public Object[] getChildren(Object o) - { - IDataElement element = toElement(o); - - - List objs = element.getAssociated("contents"); //$NON-NLS-1$ - return objs.toArray(); - } - - public ImageDescriptor getImageDescriptor(Object object) - { - return null; - } - - public String getLabel(Object o) - { - return (String)_element.getElementProperty("value"); //$NON-NLS-1$ - } - - public Object getParent(Object o) - { - return null; - } - - public static boolean matches(Class aClass) - { - return (aClass == org.eclipse.ui.model.IWorkbenchAdapter.class); - } - - public static Object getPlatformAdapter(Object obj, Class aClass) - { - return org.eclipse.core.runtime.Platform.getAdapterManager().getAdapter(obj, aClass); - } -} diff --git a/rse/plugins/org.eclipse.dstore.extra/src/org/eclipse/dstore/internal/extra/DomainNotifier.java b/rse/plugins/org.eclipse.dstore.extra/src/org/eclipse/dstore/internal/extra/DomainNotifier.java deleted file mode 100644 index a644217c1..000000000 --- a/rse/plugins/org.eclipse.dstore.extra/src/org/eclipse/dstore/internal/extra/DomainNotifier.java +++ /dev/null @@ -1,85 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2002, 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 - * - * 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: - * {Name} (company) - description of contribution. - *******************************************************************************/ - -package org.eclipse.dstore.internal.extra; - -import java.util.ArrayList; - -import org.eclipse.dstore.extra.DomainEvent; -import org.eclipse.dstore.extra.IDomainListener; -import org.eclipse.dstore.extra.IDomainNotifier; - -public class DomainNotifier implements IDomainNotifier -{ - - - private ArrayList _listeners; - - private boolean _enabled; - - public DomainNotifier() - { - _listeners = new ArrayList(); - _enabled = false; - } - - - - public void enable(boolean on) - { - _enabled = on; - } - - public boolean isEnabled() - { - return _enabled; - } - - public void addDomainListener(IDomainListener listener) - { - if (!_listeners.contains(listener)) - { - _listeners.add(listener); - } - } - - - public void fireDomainChanged(DomainEvent event) - { - if (_enabled) - { - for (int i = 0; i < _listeners.size(); i++) - { - IDomainListener listener = (IDomainListener) _listeners.get(i); - if ((listener != null) && listener.listeningTo(event)) - { - listener.domainChanged(event); - } - } - } - } - - public boolean hasDomainListener(IDomainListener listener) - { - return _listeners.contains(listener); - } - - public void removeDomainListener(IDomainListener listener) - { - _listeners.remove(listener); - } -} diff --git a/rse/plugins/org.eclipse.dstore.extra/src/org/eclipse/dstore/internal/extra/IDataElementActionFilter.java b/rse/plugins/org.eclipse.dstore.extra/src/org/eclipse/dstore/internal/extra/IDataElementActionFilter.java deleted file mode 100644 index c0b553ab7..000000000 --- a/rse/plugins/org.eclipse.dstore.extra/src/org/eclipse/dstore/internal/extra/IDataElementActionFilter.java +++ /dev/null @@ -1,24 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2002, 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 - * - * 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: - * {Name} (company) - description of contribution. - *******************************************************************************/ - -package org.eclipse.dstore.internal.extra; - -public interface IDataElementActionFilter extends org.eclipse.ui.IActionFilter -{ - - -} diff --git a/rse/plugins/org.eclipse.dstore.extra/src/org/eclipse/dstore/internal/extra/IDesktopElement.java b/rse/plugins/org.eclipse.dstore.extra/src/org/eclipse/dstore/internal/extra/IDesktopElement.java deleted file mode 100644 index 2829440c0..000000000 --- a/rse/plugins/org.eclipse.dstore.extra/src/org/eclipse/dstore/internal/extra/IDesktopElement.java +++ /dev/null @@ -1,25 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2002, 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 - * - * 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: - * {Name} (company) - description of contribution. - *******************************************************************************/ - -package org.eclipse.dstore.internal.extra; - - -public interface IDesktopElement extends org.eclipse.ui.model.IWorkbenchAdapter -{ - - -} diff --git a/rse/plugins/org.eclipse.dstore.extra/src/org/eclipse/dstore/internal/extra/IPropertySource.java b/rse/plugins/org.eclipse.dstore.extra/src/org/eclipse/dstore/internal/extra/IPropertySource.java deleted file mode 100644 index 85605a8c6..000000000 --- a/rse/plugins/org.eclipse.dstore.extra/src/org/eclipse/dstore/internal/extra/IPropertySource.java +++ /dev/null @@ -1,24 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2002, 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 - * - * 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: - * {Name} (company) - description of contribution. - *******************************************************************************/ - -package org.eclipse.dstore.internal.extra; - -public interface IPropertySource extends org.eclipse.ui.views.properties.IPropertySource -{ - - -} diff --git a/rse/plugins/org.eclipse.dstore.extra/src/org/eclipse/dstore/internal/extra/PropertySource.java b/rse/plugins/org.eclipse.dstore.extra/src/org/eclipse/dstore/internal/extra/PropertySource.java deleted file mode 100644 index 60fee16e2..000000000 --- a/rse/plugins/org.eclipse.dstore.extra/src/org/eclipse/dstore/internal/extra/PropertySource.java +++ /dev/null @@ -1,152 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2002, 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 - * - * 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: - * {Name} (company) - description of contribution. - *******************************************************************************/ - -package org.eclipse.dstore.internal.extra; - -import java.util.HashMap; -import java.util.List; - -import org.eclipse.dstore.extra.IDataElement; -import org.eclipse.ui.views.properties.IPropertyDescriptor; -import org.eclipse.ui.views.properties.TextPropertyDescriptor; - -public class PropertySource implements IPropertySource -{ - - - private IDataElement _dataElement; - private HashMap _properties; - private IPropertyDescriptor[] _descriptors; - - public PropertySource(IDataElement element) - { - _dataElement = element; - - _properties = new HashMap(); - - IDataElement descriptor = (IDataElement)element.getElementProperty("descriptor"); //$NON-NLS-1$ - - List attributes = null; - int attributesSize = 0; - if (descriptor != null) - { - attributes = descriptor.getAssociated("attributes"); //$NON-NLS-1$ - attributesSize = attributes.size(); - } - - _descriptors = new IPropertyDescriptor[attributesSize + 2]; - _descriptors[0] = new TextPropertyDescriptor("type", "type"); //$NON-NLS-1$ //$NON-NLS-2$ - _descriptors[1] = new TextPropertyDescriptor("name", "name"); //$NON-NLS-1$ //$NON-NLS-2$ - if (attributes != null) - { - for (int i = 0; i < attributesSize; i++) - { - IDataElement attribute = (IDataElement)attributes.get(i); - List types = attribute.getAssociated("attributes"); //$NON-NLS-1$ - - String type = null; - if (types.size() > 0) - type = ((IDataElement)types.get(0)).getName(); - else - type = "String"; //$NON-NLS-1$ - - _properties.put(attribute.getName(), type); - _descriptors[i+2] = new TextPropertyDescriptor(attribute.getName(), attribute.getName()); - } - } - - } - - public static boolean matches(Class aClass) - { - return (aClass == org.eclipse.ui.views.properties.IPropertySource.class); - } - - - public Object getEditableValue() - { - return this; - } - - public IPropertyDescriptor[] getPropertyDescriptors() - { - return _descriptors; - } - - public Object getPropertyValue(Object name) - { - return getPropertyValue((String)name); - } - - public Object getPropertyValue(String name) - { - Object result = null; - - // find the appropriate attribute - List attributes = _dataElement.getAssociated("attributes"); //$NON-NLS-1$ - for (int i = 0; i < attributes.size(); i++) - { - IDataElement attribute = (IDataElement)attributes.get(i); - if (attribute.getType().equals(name)) - { - result = attribute.getElementProperty("value"); //$NON-NLS-1$ - } - } - - if (result == null) - { - String type = (String)_properties.get(name); - - if (type != null && type.equals("Integer")) //$NON-NLS-1$ - result = "0"; //$NON-NLS-1$ - else if (type != null && type.equals("Float")) //$NON-NLS-1$ - result = "0.0"; //$NON-NLS-1$ - else - result = _dataElement.getElementProperty(name); - } - - return result; - } - - public boolean isPropertySet(Object property) - { - return isPropertySet((String)property); - } - - public boolean isPropertySet(String property) - { - return false; - } - - public void resetPropertyValue(Object property) - { - } - - public void resetPropertyValue(String property) - { - } - - public void setPropertyValue(Object name, Object value) - { - setPropertyValue((String)name, value); - } - - public void setPropertyValue(String name, Object value) - { - } - -} diff --git a/rse/plugins/org.eclipse.rse.connectorservice.dstore/.classpath b/rse/plugins/org.eclipse.rse.connectorservice.dstore/.classpath deleted file mode 100644 index 089217cde..000000000 --- a/rse/plugins/org.eclipse.rse.connectorservice.dstore/.classpath +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<classpath> - <classpathentry kind="src" path="src"/> - <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"> - <accessrules> - <accessrule kind="accessible" pattern="org/eclipse/dstore/**"/> - </accessrules> - </classpathentry> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/> - <classpathentry kind="output" path="bin"/> -</classpath> diff --git a/rse/plugins/org.eclipse.rse.connectorservice.dstore/.cvsignore b/rse/plugins/org.eclipse.rse.connectorservice.dstore/.cvsignore deleted file mode 100644 index ba077a403..000000000 --- a/rse/plugins/org.eclipse.rse.connectorservice.dstore/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -bin diff --git a/rse/plugins/org.eclipse.rse.connectorservice.dstore/.project b/rse/plugins/org.eclipse.rse.connectorservice.dstore/.project deleted file mode 100644 index 1e7ae5944..000000000 --- a/rse/plugins/org.eclipse.rse.connectorservice.dstore/.project +++ /dev/null @@ -1,34 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<projectDescription> - <name>org.eclipse.rse.connectorservice.dstore</name> - <comment></comment> - <projects> - </projects> - <buildSpec> - <buildCommand> - <name>org.eclipse.jdt.core.javabuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.eclipse.pde.ManifestBuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.eclipse.pde.SchemaBuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name> - <arguments> - </arguments> - </buildCommand> - </buildSpec> - <natures> - <nature>org.eclipse.pde.PluginNature</nature> - <nature>org.eclipse.jdt.core.javanature</nature> - <nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature> - </natures> -</projectDescription> diff --git a/rse/plugins/org.eclipse.rse.connectorservice.dstore/.settings/.api_filters b/rse/plugins/org.eclipse.rse.connectorservice.dstore/.settings/.api_filters deleted file mode 100644 index b92dee4eb..000000000 --- a/rse/plugins/org.eclipse.rse.connectorservice.dstore/.settings/.api_filters +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<component id="org.eclipse.rse.connectorservice.dstore" version="2"> - <resource path="src/org/eclipse/rse/connectorservice/dstore/DStoreConnectorService.java" type="org.eclipse.rse.connectorservice.dstore.DStoreConnectorService"> - <filter id="572522506"> - <message_arguments> - <message_argument value="ConnectionStatus"/> - <message_argument value="DStoreConnectorService"/> - </message_arguments> - </filter> - </resource> -</component> diff --git a/rse/plugins/org.eclipse.rse.connectorservice.dstore/.settings/org.eclipse.jdt.core.prefs b/rse/plugins/org.eclipse.rse.connectorservice.dstore/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 381fc6eb0..000000000 --- a/rse/plugins/org.eclipse.rse.connectorservice.dstore/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -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 --git a/rse/plugins/org.eclipse.rse.connectorservice.dstore/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.connectorservice.dstore/META-INF/MANIFEST.MF deleted file mode 100644 index f8df82de7..000000000 --- a/rse/plugins/org.eclipse.rse.connectorservice.dstore/META-INF/MANIFEST.MF +++ /dev/null @@ -1,24 +0,0 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: %pluginName -Bundle-SymbolicName: org.eclipse.rse.connectorservice.dstore;singleton:=true -Bundle-Version: 3.0.1.qualifier -Bundle-Activator: org.eclipse.rse.internal.connectorservice.dstore.Activator -Bundle-Localization: plugin -Require-Bundle: org.eclipse.ui, - org.eclipse.core.runtime, - org.eclipse.rse.services;bundle-version="[3.0.0,4.0.0)", - org.eclipse.rse.services.dstore;bundle-version="[3.0.0,4.0.0)", - org.eclipse.dstore.core;bundle-version="[3.0.0,4.0.0)", - org.eclipse.dstore.extra;bundle-version="[2.1.0,3.0.0)", - org.eclipse.rse.ui;bundle-version="[3.0.0,4.0.0)", - org.eclipse.rse.core;bundle-version="[3.0.0,4.0.0)" -Bundle-ActivationPolicy: lazy -Eclipse-LazyStart: true -Export-Package: - org.eclipse.rse.connectorservice.dstore, - org.eclipse.rse.connectorservice.dstore.util, - org.eclipse.rse.internal.connectorservice.dstore;x-internal:=true, - org.eclipse.rse.internal.connectorservice.dstore.ui.propertypages;x-internal:=true -Bundle-Vendor: %providerName -Bundle-RequiredExecutionEnvironment: J2SE-1.4 diff --git a/rse/plugins/org.eclipse.rse.connectorservice.dstore/about.html b/rse/plugins/org.eclipse.rse.connectorservice.dstore/about.html deleted file mode 100644 index d4cc693f9..000000000 --- a/rse/plugins/org.eclipse.rse.connectorservice.dstore/about.html +++ /dev/null @@ -1,28 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" - "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml"> -<head> -<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/> -<title>About</title> -</head> -<body lang="EN-US"> -<h2>About This Content</h2> - -<p>June 5, 2007</p> -<h3>License</h3> - -<p>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 <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>. -For purposes of the EPL, "Program" will mean the Content.</p> - -<p>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 <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p> - -</body> -</html>
\ No newline at end of file diff --git a/rse/plugins/org.eclipse.rse.connectorservice.dstore/build.properties b/rse/plugins/org.eclipse.rse.connectorservice.dstore/build.properties deleted file mode 100644 index 7911f574b..000000000 --- a/rse/plugins/org.eclipse.rse.connectorservice.dstore/build.properties +++ /dev/null @@ -1,18 +0,0 @@ -############################################################################### -# Copyright (c) 2001, 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: -# IBM Corporation - initial API and implementation -############################################################################### -bin.includes = .,\ - META-INF/,\ - about.html,\ - plugin.properties,\ - plugin.xml -source.. = src/ -output.. = bin/ -src.includes = about.html diff --git a/rse/plugins/org.eclipse.rse.connectorservice.dstore/plugin.properties b/rse/plugins/org.eclipse.rse.connectorservice.dstore/plugin.properties deleted file mode 100644 index faff66f5a..000000000 --- a/rse/plugins/org.eclipse.rse.connectorservice.dstore/plugin.properties +++ /dev/null @@ -1,20 +0,0 @@ -############################################################################### -# Copyright (c) 2000, 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: -# IBM Corporation - initial API and implementation -############################################################################### - -# NLS_MESSAGEFORMAT_NONE -# NLS_ENCODING=UTF-8 - -pluginName = RSE DStore Connector Service -providerName = Eclipse.org - -# START NON-TRANSLATABLE -PreferencePage.Datastore = DataStore -# END NON-TRANSLATABLE diff --git a/rse/plugins/org.eclipse.rse.connectorservice.dstore/plugin.xml b/rse/plugins/org.eclipse.rse.connectorservice.dstore/plugin.xml deleted file mode 100644 index 219eb8b28..000000000 --- a/rse/plugins/org.eclipse.rse.connectorservice.dstore/plugin.xml +++ /dev/null @@ -1,25 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -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 - -Initial Contributors: -The following IBM employees contributed to the Remote System Explorer component -that contains this file: David McKnight - -Contributors: ---> -<?eclipse version="3.0"?> -<plugin> - <extension - point="org.eclipse.ui.preferencePages"> - <page - name="%PreferencePage.Datastore" - category="org.eclipse.rse.ui.preferences.RemoteSystemsPreferencePage" - class="org.eclipse.rse.internal.connectorservice.dstore.ui.propertypages.DStorePreferencePage" - id="org.eclipse.rse.connectorservice.DStorePreferences"> - </page> - </extension> -</plugin> diff --git a/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/DStoreConnectorService.java b/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/DStoreConnectorService.java deleted file mode 100644 index 2208af816..000000000 --- a/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/DStoreConnectorService.java +++ /dev/null @@ -1,1558 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2002, 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 - * - * 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) - 168977: refactoring IConnectorService and ServerLauncher hierarchies - * Martin Oberhuber (Wind River) - [175262] IHost.getSystemType() should return IRSESystemType - * Martin Oberhuber (Wind River) - [186640] Add IRSESystemType.testProperty() - * Martin Oberhuber (Wind River) - [186128][refactoring] Move IProgressMonitor last in public base classes - * David McKnight (IBM) - [202822] need to enable spiriting on the server side - * David McKnight (IBM) - [199565] taking out synchronize for internalConnect - * David McKnight (IBM) - [205986] attempt SSL before non-SSL for daemon connect - * David McKnight (IBM) - [186363] get rid of obsolete calls to SubSystem.connect() - * David McKnight (IBM) - [196624] dstore miner IDs should be String constants rather than dynamic lookup - * David McKnight (IBM) - [216596] dstore preferences (timeout, and others) - * David McKnight (IBM) - [216252] [api][nls] Resource Strings specific to subsystems should be moved from rse.ui into files.ui / shells.ui / processes.ui where possible - * David McKnight (IBM) - [218685] [api][breaking][dstore] Unable to connect when using SSL. - * David McKnight (IBM) - [220123][dstore] Configurable timeout on irresponsiveness - * David McKnight (IBM) - [220547] [api][breaking] SimpleSystemMessage needs to specify a message id and some messages should be shared - * David McKnight (IBM) - [220123] [api][dstore] Configurable timeout on irresponsiveness - * David McKnight (IBM) - [223204] [cleanup] fix broken nls strings in files.ui and others - * David Dykstal (IBM) - [225089][ssh][shells][api] Canceling connection leads to exception - * David McKnight (IBM) - [227406] [dstore] DStoreFileService must listen to buffer size preference changes - * 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) - [244116] [dstore][daemon][ssl] Connecting to RSE server doesn't complete when the connection is SSL - * David McKnight (IBM) - [233160] [dstore] SSL/non-SSL alert are not appropriate - * David Dykstal (IBM) [235284] Cancel password change causes problem - *******************************************************************************/ - -package org.eclipse.rse.connectorservice.dstore; -import java.io.File; -import java.io.IOException; -import java.net.URL; -import java.security.cert.X509Certificate; -import java.util.List; - -import javax.net.ssl.SSLException; -import javax.net.ssl.SSLHandshakeException; - -import org.eclipse.core.runtime.FileLocator; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.NullProgressMonitor; -import org.eclipse.core.runtime.OperationCanceledException; -import org.eclipse.dstore.core.client.ClientConnection; -import org.eclipse.dstore.core.client.ConnectionStatus; -import org.eclipse.dstore.core.java.IRemoteClassInstance; -import org.eclipse.dstore.core.java.RemoteClassLoader; -import org.eclipse.dstore.core.model.DE; -import org.eclipse.dstore.core.model.DataElement; -import org.eclipse.dstore.core.model.DataStore; -import org.eclipse.dstore.core.model.IDataStoreConstants; -import org.eclipse.dstore.core.model.IDataStoreProvider; -import org.eclipse.dstore.core.model.ISSLProperties; -import org.eclipse.dstore.internal.core.client.ClientSSLProperties; -import org.eclipse.dstore.internal.core.util.XMLparser; -import org.eclipse.jface.dialogs.IDialogConstants; -import org.eclipse.jface.preference.IPreferenceStore; -import org.eclipse.osgi.util.NLS; -import org.eclipse.rse.connectorservice.dstore.util.ConnectionStatusListener; -import org.eclipse.rse.connectorservice.dstore.util.StatusMonitor; -import org.eclipse.rse.connectorservice.dstore.util.StatusMonitorFactory; -import org.eclipse.rse.core.RSECorePlugin; -import org.eclipse.rse.core.comm.ISystemKeystoreProvider; -import org.eclipse.rse.core.comm.SystemKeystoreProviderManager; -import org.eclipse.rse.core.model.IHost; -import org.eclipse.rse.core.model.SystemSignonInformation; -import org.eclipse.rse.core.subsystems.CommunicationsEvent; -import org.eclipse.rse.core.subsystems.IRemoteServerLauncher; -import org.eclipse.rse.core.subsystems.IServerLauncher; -import org.eclipse.rse.core.subsystems.IServerLauncherProperties; -import org.eclipse.rse.core.subsystems.ISubSystem; -import org.eclipse.rse.core.subsystems.ServerLaunchType; -import org.eclipse.rse.core.subsystems.SubSystem; -import org.eclipse.rse.dstore.universal.miners.IUniversalDataStoreConstants; -import org.eclipse.rse.internal.connectorservice.dstore.Activator; -import org.eclipse.rse.internal.connectorservice.dstore.ConnectorServiceResources; -import org.eclipse.rse.internal.connectorservice.dstore.IConnectorServiceMessageIds; -import org.eclipse.rse.internal.connectorservice.dstore.RexecDstoreServer; -import org.eclipse.rse.internal.ui.SystemPropertyResources; -import org.eclipse.rse.services.clientserver.messages.CommonMessages; -import org.eclipse.rse.services.clientserver.messages.ICommonMessageIds; -import org.eclipse.rse.services.clientserver.messages.SimpleSystemMessage; -import org.eclipse.rse.services.clientserver.messages.SystemMessage; -import org.eclipse.rse.services.clientserver.messages.SystemMessageException; -import org.eclipse.rse.ui.ISystemPreferencesConstants; -import org.eclipse.rse.ui.RSEUIPlugin; -import org.eclipse.rse.ui.SystemBasePlugin; -import org.eclipse.rse.ui.actions.DisplayHidableSystemMessageAction; -import org.eclipse.rse.ui.actions.DisplaySystemMessageAction; -import org.eclipse.rse.ui.messages.SystemMessageDialog; -import org.eclipse.rse.ui.subsystems.StandardConnectorService; -import org.eclipse.swt.widgets.Display; -import org.osgi.framework.Bundle; -import org.osgi.framework.Version; - -/** - * System class required by the remote systems framework. - * This represents the live connection at tool runtime. - * <p> - * The universal subsystems are based on datastore technology so we use that - * to do the connection. - */ -public class DStoreConnectorService extends StandardConnectorService implements IDataStoreProvider -{ - private class StartSpiritThread extends Thread - { - private DataStore _dataStore; - public StartSpiritThread(DataStore dataStore) - { - _dataStore = dataStore; - } - - public void run() - { - if (_dataStore.isDoSpirit()) _dataStore.queryServerSpiritState(); - } - } - - private ClientConnection clientConnection = null; - private ConnectionStatusListener _connectionStatusListener = null; - private IServerLauncher starter = null; - private IServerLauncherProperties _remoteServerLauncherProperties = null; - private boolean _isConnecting = false; - - // Shortcut to sysInfo to save time - private transient DataElement sysInfo = null; - private transient DataElement installInfo = null; - private transient DataElement clientIP = null; - private static String DSTORE_PACKAGE = "org.eclipse.dstore.core"; //$NON-NLS-1$ - - private Exception connectException; - private class ShowConnectMessage implements Runnable - { - private SystemMessage _msg; - public ShowConnectMessage(SystemMessage msg) - { - _msg = msg; - } - - public void run() - { - SystemMessageDialog dlg = new SystemMessageDialog(SystemBasePlugin.getActiveWorkbenchShell(), _msg); - dlg.open(); - } - } - - /** - * Constructor when we don't have a subsystem yet. - * Call setSubSystem after. - */ - public DStoreConnectorService(String name, String description, IHost host) - { - super(name, description, host, 0); - } - - - - /* - * Set the subsystem, when its not known at constructor time - * - public void setSubSystem(SubSystem ss) - { - super.setSubSystem(ss); - setDaemonLaunchEnabled((SubSystemImpl)ss, false); - }*/ - - - public int getServerVersion() - { - return clientConnection.getServerVersion(); - } - - public int getServerMinor() - { - return clientConnection.getServerMinor(); - } - - /** - * Retrieve the value of a property which is contained in the environment miners - * system info child. Currently supported properties: - * <ul> - * <li>os.name - * <li>os.version - * <li>user.home - * <li>temp.dir - * </ul> - * @return The String value of the property or "" if the property was not found. - */ - private String getSystemInfoProperty(String propertyName) - { - // System properties require a connection - if (!isConnected()) - { - try - { - ISubSystem ss = getPrimarySubSystem(); - if (ss != null) - { - if (Display.getCurrent() == null) { - ss.connect(new NullProgressMonitor(), false); - } else { - ss.connect(false, null); - } - } - } - catch (Exception e) - { - SystemBasePlugin.logError("UniversalSystem.getSystemInfoProperty: error during connect", e); //$NON-NLS-1$ - return ""; //$NON-NLS-1$ - } - } - - String propertyValue = null; - DataElement envMinerData = null; - DataStore ds = getDataStore(); - - // Check if we have sysInfo cached already - if (sysInfo == null) - { - envMinerData = ds.findMinerInformation(IUniversalDataStoreConstants.UNIVERSAL_ENVIRONMENT_MINER_ID); - if (envMinerData != null) - { - sysInfo = ds.find(envMinerData, DE.A_NAME, "systemInfo", 1); //$NON-NLS-1$ - } - } - - if (sysInfo != null) - { - DataElement propertyNode = ds.find(sysInfo, DE.A_NAME, propertyName, 1); - if (propertyNode != null) - { - propertyValue = propertyNode.getSource(); - } - else - propertyValue = ""; //$NON-NLS-1$ - } - else - { - // at connect time, the info node is not guaranteed to be present, so this gets logged a lot - // it doesn't cause any functional problems, so I'm commenting this out - //SystemBasePlugin.logError("UniversalSystem.getSystemInfoNode: sysInfo node not found", null); //$NON-NLS-1$ - //SystemBasePlugin.logError("UniversalSystem.getSystemInfoNode: miner data = " + envMinerData, null); //$NON-NLS-1$ - propertyValue = ""; //$NON-NLS-1$ - } - - return propertyValue; - } - - /** - * Return the version, release, modification of the remote system - */ - public String getVersionReleaseModification() - { - if (!isConnected()) - return SystemPropertyResources.RESID_TERM_NOTAVAILABLE; - - StringBuffer buffer = new StringBuffer(getSystemInfoProperty("os.name")); //$NON-NLS-1$ - buffer.append(" "); //$NON-NLS-1$ - buffer.append(getSystemInfoProperty("os.version")); //$NON-NLS-1$ - - return buffer.toString(); - } - - /** - * Return the home directory of the remote system for the current user, if available. - */ - public String getHomeDirectory() - { - return getSystemInfoProperty("user.home"); //$NON-NLS-1$ - } - - public boolean runClassInstanceRemotely(IRemoteClassInstance instance) - { - DataStore dataStore = getDataStore(); - dataStore.registerLocalClassLoader(instance.getClass().getClassLoader()); - dataStore.runRemoteClassInstance(instance); - return true; - } - - /** - * Return the location where the RSE server is installed - * @return the server install location - */ - public String getServerInstallPath() - { - if (clientConnection != null) - { - if (installInfo == null) - { - DataStore ds = clientConnection.getDataStore(); - installInfo = ds.queryInstall(); - } - return installInfo.getAttribute(DE.A_SOURCE); - } - return ""; //$NON-NLS-1$ - } - - /** - * Return the Client IP that the RSE server is connected to. When connected, - * the client IP is obtained from the server-side. When not-connected, - * the fall back is to get the IP locally (note that the IP obtained locally - * may be not be what you want when using VPN). - * @return the client ip - */ - public String getClientIP() - { - if (clientConnection != null && clientConnection.isConnected()) - { - if (clientIP == null) - { - DataStore ds = clientConnection.getDataStore(); - clientIP = ds.queryClientIP(); - } - return clientIP.getAttribute(DE.A_SOURCE); - } - - // fall back to getting local machine ip address - // this may be incorrect for the server in certain cases - // like over VPN - return RSECorePlugin.getLocalMachineIPAddress(); - } - - /** - * Return the temp directory of the remote system for the current user, if available. - */ - public String getTempDirectory() - { - return getSystemInfoProperty("temp.dir"); //$NON-NLS-1$ - } - - protected int getSocketTimeOutValue() - { - IPreferenceStore store = RSEUIPlugin.getDefault().getPreferenceStore(); - return store.getInt(IUniversalDStoreConstants.RESID_PREF_SOCKET_TIMEOUT); - } - - /** - * @see org.eclipse.rse.core.subsystems.IConnectorService#disconnect(IProgressMonitor) - */ - protected void internalDisconnect(IProgressMonitor monitor) throws Exception - { - try - { - if (clientConnection != null) - { - // Is disconnect being called because the network (connection) went down? - if (_connectionStatusListener != null && _connectionStatusListener.isConnectionDown()) - { - notifyError(); - } - else - { - // Fire comm event to signal state about to change - fireCommunicationsEvent(CommunicationsEvent.BEFORE_DISCONNECT); - } - - DataStore dataStore = getDataStore(); - if (dataStore != null && _connectionStatusListener != null) - { - dataStore.getDomainNotifier().removeDomainListener(_connectionStatusListener); - } - if (clientConnection != null) - { - clientConnection.disconnect(); - } - -// Fire comm event to signal state changed - notifyDisconnection(); - - clientConnection = null; - // DKM - no need to clear uid cache - clearPassword(false, true); // clear in-memory password - //clearUserIdCache(); // Clear any cached local user IDs - sysInfo = null; - installInfo = null; - clientIP = null; - - - } - } - catch (Exception exc) - { - throw new java.lang.reflect.InvocationTargetException(exc); - } - } - - private IRemoteServerLauncher getDStoreServerLauncher() - { - IServerLauncherProperties sl = getRemoteServerLauncherProperties(); - //System.out.println("in UniversalSystem#getServerLauncher: sl = "+sl); - if (sl != null && sl instanceof IRemoteServerLauncher) - { - return (IRemoteServerLauncher)sl; - } - else - //return ((SubSystemConfigurationImpl)ss.getParentSubSystemConfiguration()).getDefaultIBMServerLauncher(ss); - return null; // should never happen! - } - - protected void setPluginPathProperty() - { - Bundle bundle = RSEUIPlugin.getDefault().getBundle(); - URL pluginsURL = bundle.getEntry("/"); //$NON-NLS-1$ - - try - { - String path = FileLocator.resolve(pluginsURL).getPath(); - File systemsPluginDir = new File(path); - path = systemsPluginDir.getParentFile().getAbsolutePath(); - String version = (String)(bundle.getHeaders().get(org.osgi.framework.Constants.BUNDLE_VERSION)); - Version v = new Version(version); - String versionString = v.toString(); - String dstorePath = getDStorePath(path, versionString); - System.setProperty("A_PLUGIN_PATH", dstorePath); //$NON-NLS-1$ - } - catch (IOException e) - { - } - } - - private String getDStorePath(String pluginDir, String version) - { - File dstorePath = new File(pluginDir + "/" + DSTORE_PACKAGE + "_" + version); //$NON-NLS-1$ //$NON-NLS-2$ - if (!dstorePath.exists()) - { - // might be in workspace - dstorePath = new File(pluginDir + "/" + DSTORE_PACKAGE); //$NON-NLS-1$ - } - - return dstorePath.getAbsolutePath(); - } - -// /** -// * Specify if you support connecting to a running daemon -// * @deprecated use {@link #enableServerLaunchType(ISubSystem, ServerLaunchType, boolean)} -// * or your subsystem factory should override {@link org.eclipse.rse.core.subsystems.SubSystemConfiguration#supportsServerLaunchType(ServerLaunchType)} -// */ -// public void setDaemonLaunchEnabled(SubSystem subsystemImpl, boolean enable) { -// enableServerLaunchType(subsystemImpl, ServerLaunchType.DAEMON_LITERAL, enable); -// } - -// /** -// * Return if you support connecting to a running daemon -// * @deprecated Use instead {@link #isEnabledServerLaunchType(ISubSystem, ServerLaunchType)} -// * or {@link org.eclipse.rse.core.subsystems.SubSystemConfiguration#supportsServerLaunchType(ServerLaunchType)} -// */ -// public boolean getDaemonLaunchEnabled(SubSystem subsystemImpl) { -// return isEnabledServerLaunchType(subsystemImpl, ServerLaunchType.DAEMON_LITERAL); -// } - -// /** -// * Specify if you support remotely launching a server script -// * @deprecated use {@link #enableServerLaunchType(ISubSystem, ServerLaunchType, boolean)} -// * or your subsystem factory should override {@link org.eclipse.rse.core.subsystems.SubSystemConfiguration#supportsServerLaunchType(ServerLaunchType)} -// */ -// public void setRexecLaunchEnabled(SubSystem subsystemImpl, boolean enable) { -// enableServerLaunchType(subsystemImpl, ServerLaunchType.REXEC_LITERAL, enable); -// } - - /** - * Return if you support remotely launching a server script - * @deprecated Use instead {@link #isServerLaunchTypeEnabled(ISubSystem, ServerLaunchType)} - * or {@link org.eclipse.rse.core.subsystems.SubSystemConfiguration#supportsServerLaunchType(ServerLaunchType)} - */ - public boolean getRexecLaunchEnabled(SubSystem subsystemImpl) { - return isServerLaunchTypeEnabled(subsystemImpl, ServerLaunchType.REXEC_LITERAL); - } - -// /** -// * Specify if you support connecting to a server already running -// * @deprecated use {@link #enableServerLaunchType(ISubSystem, ServerLaunchType, boolean)} -// * or your subsystem factory should override {@link org.eclipse.rse.core.subsystems.SubSystemConfiguration#supportsServerLaunchType(ServerLaunchType)} -// */ -// public void setNoLaunchEnabled(SubSystem subsystemImpl, boolean enable) { -// enableServerLaunchType(subsystemImpl, ServerLaunchType.RUNNING_LITERAL, enable); -// } - - /** - * Return if you support connecting to a server already running - * @deprecated Use instead {@link #isServerLaunchTypeEnabled(ISubSystem, ServerLaunchType)} - * or {@link org.eclipse.rse.core.subsystems.SubSystemConfiguration#supportsServerLaunchType(ServerLaunchType)} - */ - public boolean getNoLaunchEnabled(SubSystem subsystemImpl) { - return isServerLaunchTypeEnabled(subsystemImpl, ServerLaunchType.RUNNING_LITERAL); - } - - /** - * Return the remote server launcher, which implements IServerLauncher. - * This is called by the default implementation of connect, if - * subsystem.getParentSubSystemConfiguration().supportsServerLaunchProperties returns true. - */ - public IServerLauncher getRemoteServerLauncher() - { - - if (starter == null) - starter = new RexecDstoreServer(); - ((RexecDstoreServer)starter).setClientConnection(clientConnection); - ((RexecDstoreServer)starter).setSocketTimeoutValue(getSocketTimeOutValue()); - return starter; - } - - public IServerLauncherProperties getRemoteServerLauncherProperties() { - return _remoteServerLauncherProperties; - } - - public void setRemoteServerLauncherProperties(IServerLauncherProperties newRemoteServerLauncher) { - if (_remoteServerLauncherProperties != newRemoteServerLauncher) - { - _remoteServerLauncherProperties = newRemoteServerLauncher; - setDirty(true); - } - } - - /** - * @see org.eclipse.rse.core.subsystems.IConnectorService#connect(IProgressMonitor) - */ - protected void internalConnect(IProgressMonitor monitor) throws Exception - { - if (isConnected() || _isConnecting) { - return; - } - - _isConnecting = true; - boolean alertedNONSSL = false; - - // set A_PLUGIN_PATH so that dstore picks up the property - setPluginPathProperty(); - - // Fire comm event to signal state about to change - fireCommunicationsEvent(CommunicationsEvent.BEFORE_CONNECT); - - ConnectionStatus connectStatus = null; - ConnectionStatus launchStatus = null; - - clientConnection = new ClientConnection(getPrimarySubSystem().getHost().getAliasName()); - - clientConnection.setHost(getHostName()); - clientConnection.setPort(Integer.toString(getPort())); - -// ISubSystem ss = getPrimarySubSystem(); - getPrimarySubSystem(); - IRemoteServerLauncher serverLauncher = getDStoreServerLauncher(); - - ServerLaunchType serverLauncherType = null; - boolean autoDetectSSL = true; - if (serverLauncher != null) - { - serverLauncherType = serverLauncher.getServerLaunchType(); - autoDetectSSL = serverLauncher.getAutoDetectSSL(); - } - else - { - // System.out.println("server launcher is null"); - } - - //long t1 = System.currentTimeMillis(); - SystemMessage msg = null; - boolean launchFailed = false; - - // get Socket Timeout Value Preference - int timeout = getSocketTimeOutValue(); - - if (serverLauncherType == ServerLaunchType.REXEC_LITERAL) - { - if (monitor != null) - { - String cmsg = ConnectorServiceResources.MSG_STARTING_SERVER_VIA_REXEC; - monitor.subTask(cmsg); - } - - SystemSignonInformation info = getSignonInformation(); - - // GC: - if failed to get a connection in another way, try - // starting the datastore server with rexec - IServerLauncher starter = getRemoteServerLauncher(); - starter.setSignonInformation(info); - starter.setServerLauncherProperties(serverLauncher); - if (starter instanceof RexecDstoreServer){ - ((RexecDstoreServer)starter).setSocketTimeoutValue(timeout); - } - if (autoDetectSSL) timeout = 3000; - else setSSLProperties(isUsingSSL()); - - int iServerPort = launchUsingRexec(info, serverLauncher, monitor); - - if(iServerPort != 0) - { - clientConnection.setPort("" + iServerPort); //$NON-NLS-1$ - - if (monitor != null) - { - String cmsg = NLS.bind(ConnectorServiceResources.MSG_CONNECTING_TO_SERVER, clientConnection.getPort()); - monitor.subTask(cmsg); - } - - // connect to launched server - connectStatus = clientConnection.connect(null, timeout); - if (!connectStatus.isConnected() && connectStatus.getMessage().startsWith(ClientConnection.CANNOT_CONNECT) && autoDetectSSL) - { - if (setSSLProperties(true)) - { - iServerPort = launchUsingRexec(info, serverLauncher, monitor); - if (iServerPort != 0) - { - clientConnection.setPort("" + iServerPort); //$NON-NLS-1$ - connectStatus = clientConnection.connect(null, timeout); - } - } - } - } - else - { - launchFailed = true; - connectStatus = new ConnectionStatus(false); - msg = starter.getErrorMessage(); - String errorMsg = null; - if (msg == null) - { - errorMsg = NLS.bind(ConnectorServiceResources.MSG_COMM_CONNECT_FAILED, getHostName()); - } - else - { - errorMsg = msg.getLevelTwoText(); - } - connectStatus.setMessage(errorMsg); - } - } - // Start the server via the daemon - else if (serverLauncherType == ServerLaunchType.DAEMON_LITERAL) - { - if (monitor != null) - { - String cmsg = ConnectorServiceResources.MSG_STARTING_SERVER_VIA_DAEMON; - monitor.subTask(cmsg); - } - - // DY: getLocalUserId() may return null for Windows connections because - // we no longer prompt for userid / pwd. But for other connections the userid - // should be the same as the one stored in the password info (and for Windows - // this will be the temp remoteuser userid. - //launchStatus = clientConnection.launchServer(getLocalUserId(), getPassword(getPasswordInformation())); - SystemSignonInformation info = getSignonInformation(); - if (info == null) - { - SystemBasePlugin.logError("password info = null!"); //$NON-NLS-1$ - } - - int daemonPort = 0; - if (serverLauncher != null) - daemonPort = serverLauncher.getDaemonPort(); - - /* String daemonPortStr = getSubSystem().getVendorAttribute("Remote", "DAEMON_PORT"); - if (daemonPortStr != null && daemonPortStr.length() > 0) - { - daemonPort = Integer.parseInt(daemonPortStr); - }*/ - - // 205986] FIRST TRY SSL, THEN NON-SECURE! - boolean usedSSL = true; - setSSLProperties(true); - - launchStatus = launchServer(clientConnection, info, daemonPort, monitor, timeout); - if (!launchStatus.isConnected() && !clientConnection.isKnownStatus(launchStatus.getMessage())) - { - Throwable conE = launchStatus.getException(); - if (conE instanceof SSLHandshakeException) - { - List certs = launchStatus.getUntrustedCertificates(); - if (certs != null && certs.size() > 0) - { - ISystemKeystoreProvider provider = SystemKeystoreProviderManager.getInstance().getDefaultProvider(); - if (provider != null) - { - _isConnecting = false; - if (provider.importCertificates(certs, getHostName())) - { - internalConnect(monitor); - return; - } - else - { - throw new InterruptedException(); - } - } - } - - } - - if (setSSLProperties(false)) - { - usedSSL = false; - - boolean allowNonSSL = true; - // warning before launch without SSL - IPreferenceStore store = RSEUIPlugin.getDefault().getPreferenceStore(); - if (store.getBoolean(ISystemPreferencesConstants.ALERT_NONSSL)) - { - String cmsg = NLS.bind(ConnectorServiceResources.MSG_COMM_NOT_USING_SSL, getHostName()); - msg = createSystemMessage(IConnectorServiceMessageIds.MSG_COMM_NOT_USING_SSL, IStatus.INFO, cmsg); - - DisplayHidableSystemMessageAction msgAction = new DisplayHidableSystemMessageAction(msg, store, ISystemPreferencesConstants.ALERT_NONSSL); - Display.getDefault().syncExec(msgAction); - if (msgAction.getReturnCode() != IDialogConstants.YES_ID){ - allowNonSSL = false; - } else { - alertedNONSSL = true; - } - } - if (allowNonSSL){ - launchStatus = launchServer(clientConnection, info, daemonPort, monitor, timeout); - } - else { - _isConnecting = false; - clientConnection = null; - - throw new OperationCanceledException(); - } - } - } - - if (!launchStatus.isConnected()) - { - String launchMsg = launchStatus.getMessage(); - // If password has expired and must be changed - if (launchMsg != null && (isPasswordExpired(launchMsg) || isNewPasswordInvalid(launchMsg))) - { - SystemSignonInformation oldCredentials = (SystemSignonInformation) getCredentialsProvider().getCredentials(); - SystemSignonInformation newCredentials = null; - while (launchMsg != null && (isPasswordExpired(launchMsg) || isNewPasswordInvalid(launchMsg))) - { - String pmsg = null; - String pmsgDetails = null; - String msgId = null; - boolean expired = isPasswordExpired(launchMsg); - if (expired){ - pmsg = ConnectorServiceResources.MSG_VALIDATE_PASSWORD_EXPIRED; - pmsgDetails = ConnectorServiceResources.MSG_VALIDATE_PASSWORD_EXPIRED_DETAILS; - msgId = IConnectorServiceMessageIds.MSG_VALIDATE_PASSWORD_EXPIRED; - } - else { - pmsg = ConnectorServiceResources.MSG_VALIDATE_PASSWORD_INVALID; - pmsgDetails = ConnectorServiceResources.MSG_VALIDATE_PASSWORD_INVALID_DETAILS; - msgId = IConnectorServiceMessageIds.MSG_VALIDATE_PASSWORD_INVALID; - } - - SystemMessage message = createSystemMessage(msgId,IStatus.ERROR, pmsg, pmsgDetails); - try { - getCredentialsProvider().repairCredentials(message); - } catch (OperationCanceledException e) { - _isConnecting = false; - clientConnection = null; - throw e; - } - newCredentials = (SystemSignonInformation) getCredentialsProvider().getCredentials(); - launchStatus = changePassword(clientConnection, oldCredentials, serverLauncher, monitor, newCredentials.getPassword()); - launchMsg = launchStatus.getMessage(); - } - if (newCredentials != null) - { - info = newCredentials; - } - if (launchMsg != null && launchMsg.equals(IDataStoreConstants.ATTEMPT_RECONNECT)) - { - _isConnecting = false; - internalConnect(monitor); - return; - } - } - else if (launchMsg != null && isPortOutOfRange(launchMsg)) - { - _isConnecting = false; - launchFailed = true; - - - int colonIndex = launchMsg.indexOf(':'); - String portRange = launchMsg.substring(colonIndex + 1); - - String pmsg =NLS.bind(ConnectorServiceResources.MSG_PORT_OUT_RANGE, portRange); - SystemMessage message = createSystemMessage(IConnectorServiceMessageIds.MSG_PORT_OUT_RANGE, IStatus.ERROR, pmsg); - - ShowConnectMessage msgAction = new ShowConnectMessage(message); - Display.getDefault().asyncExec(msgAction); - return; - } - else - { - launchFailed = true; - SystemBasePlugin.logError("Error launching server: " + launchStatus.getMessage(), null); //$NON-NLS-1$ - } - } - if (launchStatus.isConnected()) - { - if (monitor != null) - { - if (clientConnection == null){ - SystemBasePlugin.logError("client connection is null!"); //$NON-NLS-1$ - } - String pmsg = NLS.bind(ConnectorServiceResources.MSG_CONNECTING_TO_SERVER, clientConnection.getPort()); - monitor.subTask(pmsg); - } - // connect to launched server - connectStatus = clientConnection.connect(launchStatus.getTicket(), timeout); - Throwable conE = connectStatus.getException(); - if (!connectStatus.isConnected() && - (connectStatus.getMessage().startsWith(ClientConnection.CANNOT_CONNECT) || - conE instanceof SSLException - ) - ) - { - _isConnecting = false; - if (conE instanceof SSLHandshakeException) - { - List certs = connectStatus.getUntrustedCertificates(); - if (certs != null && certs.size() > 0) - { - ISystemKeystoreProvider provider = SystemKeystoreProviderManager.getInstance().getDefaultProvider(); - if (provider != null) - { - - if (provider.importCertificates(certs, getHostName())) - { - internalConnect(monitor); - return; - } - else - { - throw new InterruptedException(); - } - } - } - - } - launchStatus = launchServer(clientConnection, info, daemonPort, monitor); - if (!launchStatus.isConnected()) - { - launchFailed = true; - } - else - { - if (setSSLProperties(!usedSSL)) - { - connectStatus = clientConnection.connect(launchStatus.getTicket(), timeout); - } - } - } - if (!connectStatus.isConnected() && connectStatus.isSLLProblem()) - { - _isConnecting = false; - importCertsAndReconnect(connectStatus, monitor); - return; - } - - /* - if (connectStatus != null && connectStatus.getMessage().startsWith(ClientConnection.INCOMPATIBLE_UPDATE)) - { - // offer to update it - clientConnection.getDataStore().queryInstall(); - } - */ - } - else - { - connectStatus = new ConnectionStatus(false); - - String cmsg = NLS.bind(ConnectorServiceResources.MSG_COMM_CONNECT_FAILED, getHostName()); - connectStatus.setMessage(cmsg); - } - } - else if (serverLauncherType == ServerLaunchType.RUNNING_LITERAL) - { - if (monitor != null) - { - String cmsg = NLS.bind(ConnectorServiceResources.MSG_CONNECTING_TO_SERVER, clientConnection.getPort()); - monitor.subTask(cmsg); - } - // connection directly - boolean useSSL = isUsingSSL(); - setSSLProperties(useSSL); - connectStatus = clientConnection.connect(null, timeout); - } - // server launcher type is unknown - else - { - SystemSignonInformation info = getSignonInformation(); - connectStatus = launchServer(clientConnection, info, serverLauncher, monitor); - if (!connectStatus.isConnected() && !clientConnection.isKnownStatus(connectStatus.getMessage())) - { - if (setSSLProperties(true)) - { - connectStatus = launchServer(clientConnection, info, serverLauncher, monitor); - if (!connectStatus.isConnected() && connectStatus.isSLLProblem()) - { - _isConnecting = false; - importCertsAndReconnect(connectStatus, monitor); - return; - } - } - } - - } - - // if connected - if (connectStatus != null && connectStatus.isConnected()) - { - IPreferenceStore store = RSEUIPlugin.getDefault().getPreferenceStore(); - if (clientConnection.getDataStore().usingSSL() && store.getBoolean(ISystemPreferencesConstants.ALERT_SSL)) - { - String cmsg = NLS.bind(ConnectorServiceResources.MSG_COMM_USING_SSL, getHostName()); - msg = createSystemMessage(IConnectorServiceMessageIds.MSG_COMM_USING_SSL, IStatus.INFO, cmsg); - - DisplayHidableSystemMessageAction msgAction = new DisplayHidableSystemMessageAction(msg, store, ISystemPreferencesConstants.ALERT_SSL); - Display.getDefault().syncExec(msgAction); - if (msgAction.getReturnCode() != IDialogConstants.YES_ID) - { - internalDisconnect(monitor); - _isConnecting = false; - throw new InterruptedException(); - } - } - else if (!clientConnection.getDataStore().usingSSL() && store.getBoolean(ISystemPreferencesConstants.ALERT_NONSSL)) - { - if (!alertedNONSSL){ // only alert if we haven't already - String cmsg = NLS.bind(ConnectorServiceResources.MSG_COMM_NOT_USING_SSL, getHostName()); - msg = createSystemMessage(IConnectorServiceMessageIds.MSG_COMM_NOT_USING_SSL, IStatus.INFO, cmsg); - - DisplayHidableSystemMessageAction msgAction = new DisplayHidableSystemMessageAction(msg, store, ISystemPreferencesConstants.ALERT_NONSSL); - Display.getDefault().syncExec(msgAction); - if (msgAction.getReturnCode() != IDialogConstants.YES_ID) - { - internalDisconnect(monitor); - _isConnecting = false; - throw new InterruptedException(); - } - } - } - - DataStore dataStore = clientConnection.getDataStore(); - - _connectionStatusListener = new ConnectionStatusListener(dataStore.getStatus(), this); - dataStore.getDomainNotifier().addDomainListener(_connectionStatusListener); - - - - // DKM: dataStore needs a miners location - // for now, I'll use dstore.miners as default location - // (I've inserted the universal miner in it's minerFile.dat file) - - // DY: defect 46811 The minerFile.dat does not exist in this directory which causes a - // java.io.FileNotFoundException to be printed to the console (not very - // encouraging for the end user.) So I'm setting it to the current directory (.) - // which should be where the code is run from - //dataStore.addMinersLocation("org.eclipse.dstore.miners"); - - - StatusMonitor statusMonitor = StatusMonitorFactory.getInstance().getStatusMonitorFor(this, dataStore); - - if (launchStatus != null && launchStatus.isConnected()) - { - //dataStore.showTicket(launchStatus.getTicket()); // send security token to server, this must be done first - DataElement ticket = dataStore.createTicket(launchStatus.getTicket()); - dataStore.queryShowTicket(ticket); - //statusMonitor.waitForUpdate(ticketStatus); - } - else - { - dataStore.showTicket(null); - } - - // if (dataStore.isDoSpirit()) dataStore.queryServerSpiritState(); - StartSpiritThread thread = new StartSpiritThread(dataStore); - thread.start(); - - // Fire comm event to signal state changed - fireCommunicationsEvent(CommunicationsEvent.AFTER_CONNECT); - - // is there a warning message? - String message = connectStatus.getMessage(); - if (message != null) - { - if (message.startsWith(ClientConnection.CLIENT_OLDER)) - { - String cmsg = NLS.bind(ConnectorServiceResources.MSG_COMM_CLIENT_OLDER_WARNING, getHostName()); - String cmsgDetail = ConnectorServiceResources.MSG_COMM_CLIENT_OLDER_WARNING_DETAILS; - - msg = createSystemMessage(IConnectorServiceMessageIds.MSG_COMM_CLIENT_OLDER_WARNING, IStatus.WARNING, cmsg, cmsgDetail); - - } - else if (message.startsWith(ClientConnection.SERVER_OLDER)) - { - String cmsg = NLS.bind(ConnectorServiceResources.MSG_COMM_SERVER_OLDER_WARNING, getHostName()); - String cmsgDetail = ConnectorServiceResources.MSG_COMM_SERVER_OLDER_WARNING_DETAILS; - - msg = createSystemMessage(IConnectorServiceMessageIds.MSG_COMM_SERVER_OLDER_WARNING, IStatus.WARNING, cmsg, cmsgDetail); - } - - if (store.getBoolean(IUniversalDStoreConstants.ALERT_MISMATCHED_SERVER)){ - DisplayHidableSystemMessageAction msgAction = new DisplayHidableSystemMessageAction(msg, store, IUniversalDStoreConstants.ALERT_MISMATCHED_SERVER, false); - Display.getDefault().syncExec(msgAction); - } - } - - // register the classloader for this plugin with the datastore - dataStore.registerLocalClassLoader(getClass().getClassLoader()); - - int serverVersion = getServerVersion(); - if (serverVersion >= 8 || (serverVersion == 7 && getServerMinor() >= 1)) - { - // register the preference for remote class caching with the datastore - boolean cacheRemoteClasses = store.getBoolean(IUniversalDStoreConstants.RESID_PREF_CACHE_REMOTE_CLASSES); - - // this preference is set on the server side - dataStore.setPreference(RemoteClassLoader.CACHING_PREFERENCE, cacheRemoteClasses ? "true" : "false", true); //$NON-NLS-1$ //$NON-NLS-2$ - - if (serverVersion >= 8){ // keepalive preferences - boolean doKeepalive = store.getBoolean(IUniversalDStoreConstants.RESID_PREF_DO_KEEPALIVE); - - int keepaliveResponseTimeout = store.getInt(IUniversalDStoreConstants.RESID_PREF_KEEPALIVE_RESPONSE_TIMEOUT); - if (keepaliveResponseTimeout == 0){ // use the default - keepaliveResponseTimeout = store.getDefaultInt(IUniversalDStoreConstants.RESID_PREF_KEEPALIVE_RESPONSE_TIMEOUT); - } - - int socketTimeout = store.getInt(IUniversalDStoreConstants.RESID_PREF_SOCKET_READ_TIMEOUT); - if (socketTimeout == 0){ // use the default - socketTimeout = store.getDefaultInt(IUniversalDStoreConstants.RESID_PREF_SOCKET_READ_TIMEOUT); - } - - // these preferences are only for the client - dataStore.setPreference(XMLparser.KEEPALIVE_ENABLED_PREFERENCE, doKeepalive ? "true" : "false", false); //$NON-NLS-1$//$NON-NLS-2$ - dataStore.setPreference(XMLparser.KEEPALIVE_RESPONSE_TIMEOUT_PREFERENCE, ""+ keepaliveResponseTimeout, false); //$NON-NLS-1$ - dataStore.setPreference(XMLparser.IO_SOCKET_READ_TIMEOUT_PREFERENCE, ""+socketTimeout, false); //$NON-NLS-1$ - } - } - else - { - dataStore.addMinersLocation("."); //$NON-NLS-1$ - // older servers initialized in one shot - dataStore.getSchema(); - - // Initialzie the miners - if (monitor != null) - { - String imsg = ConnectorServiceResources.MSG_INITIALIZING_SERVER; - monitor.subTask(imsg); - } - DataElement initStatus = dataStore.initMiners(); - statusMonitor.waitForUpdate(initStatus); - } - //long t2 = System.currentTimeMillis(); - //System.out.println("connect time = "+(t2 - t1)); - } - else - { - // if daemon launch failed because of an SSL problem - if (launchFailed && launchStatus != null && launchStatus.isSLLProblem()) - { - if (launchStatus.isSLLProblem()) - { - launchStatus.getException(); - - List certs = launchStatus.getUntrustedCertificates(); - if (certs.size() > 0) - { - ISystemKeystoreProvider provider = SystemKeystoreProviderManager.getInstance().getDefaultProvider(); - if (provider != null) - { - if (provider.importCertificates(certs, getHostName())) - { - _isConnecting = false; - internalConnect(monitor); - return; - } - } - } - else - { - String cmsg = NLS.bind(ConnectorServiceResources.MSG_CONNECT_SSL_EXCEPTION, launchStatus.getMessage()); - String cmsgDetails = ConnectorServiceResources.MSG_CONNECT_SSL_EXCEPTION_DETAILS; - msg = createSystemMessage(IConnectorServiceMessageIds.MSG_CONNECT_SSL_EXCEPTION, IStatus.ERROR, cmsg, cmsgDetails); - } - } - } - - // if daemon launch failed (SSL or otherwise) - if (launchFailed && launchStatus != null) - { - String launchMsg = launchStatus.getMessage(); - if (launchStatus.getException() != null && serverLauncher != null) - { - Throwable exception = launchStatus.getException(); - String fmsg = NLS.bind(ConnectorServiceResources.MSG_CONNECT_DAEMON_FAILED_EXCEPTION, getHostName(), ""+serverLauncher.getDaemonPort()); //$NON-NLS-1$ - - msg = createSystemMessage(IConnectorServiceMessageIds.MSG_CONNECT_DAEMON_FAILED_EXCEPTION, IStatus.ERROR, fmsg, exception); - } - else if (launchMsg != null && launchMsg.indexOf(IDataStoreConstants.AUTHENTICATION_FAILED) != -1) - { - _isConnecting = false; - if (launchFailed) - { - clearPassword(true, true); - } - - // Display error message - String msgTxt = CommonMessages.MSG_COMM_AUTH_FAILED; - String msgDetails = NLS.bind(CommonMessages.MSG_COMM_AUTH_FAILED_DETAILS, getHostName()); - - msg = createSystemMessage(ICommonMessageIds.MSG_COMM_AUTH_FAILED, IStatus.ERROR, msgTxt, msgDetails); - - DisplaySystemMessageAction msgAction = new DisplaySystemMessageAction(msg); - Display.getDefault().syncExec(msgAction); - - // Re-prompt for password - connectException = null; - Display.getDefault().syncExec(new Runnable() - { - public void run() - { - try - { - acquireCredentials(true); - } - catch (OperationCanceledException e) - { - connectException = e; - } - } - }); - - // Check if the user cancelled the prompt - if (connectException instanceof OperationCanceledException) - { - throw connectException; - } - - - // Try to connect again. This is a recursive call, but will only - // call if the user presses OK on the password prompt dialog, otherwise - // it will continue and return - internalConnect(monitor); - - // Since we got here we must be connected so skip error checking below - return; - } - // If password has expired and must be changed - else if (launchMsg != null && (isPasswordExpired(launchMsg) || isNewPasswordInvalid(launchMsg))) - { - _isConnecting = false; - SystemSignonInformation oldCredentials = (SystemSignonInformation) getCredentialsProvider().getCredentials(); - SystemSignonInformation newCredentials = null; - while (launchMsg != null && (isPasswordExpired(launchMsg) || isNewPasswordInvalid(launchMsg))) - { - String msgTxt = ConnectorServiceResources.MSG_VALIDATE_PASSWORD_INVALID; - String msgDetails = ConnectorServiceResources.MSG_VALIDATE_PASSWORD_INVALID_DETAILS; - String msgId = IConnectorServiceMessageIds.MSG_VALIDATE_PASSWORD_INVALID; - if (isPasswordExpired(launchMsg)){ - msgTxt = ConnectorServiceResources.MSG_VALIDATE_PASSWORD_EXPIRED; - msgDetails = ConnectorServiceResources.MSG_VALIDATE_PASSWORD_EXPIRED_DETAILS; - msgId = IConnectorServiceMessageIds.MSG_VALIDATE_PASSWORD_EXPIRED; - } - - SystemMessage message = createSystemMessage(msgId, IStatus.ERROR, msgTxt, msgDetails); - - getCredentialsProvider().repairCredentials(message); - newCredentials = (SystemSignonInformation) getCredentialsProvider().getCredentials(); - launchStatus = changePassword(clientConnection, oldCredentials, serverLauncher, monitor, newCredentials.getPassword()); - launchMsg = launchStatus.getMessage(); - } - if (launchMsg != null && launchMsg.equals(IDataStoreConstants.ATTEMPT_RECONNECT)) - { - internalConnect(monitor); - return; - } -// NewPasswordInfo newPasswordInfo = null; -// while (launchMsg != null && (isPasswordExpired(launchMsg) || isNewPasswordInvalid(launchMsg))) -// { -// newPasswordInfo = promptForNewPassword(isPasswordExpired(launchMsg) ? RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_VALIDATE_PASSWORD_EXPIRED) : RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_VALIDATE_PASSWORD_INVALID)); -// launchStatus = changePassword(clientConnection, getPasswordInformation(), serverLauncher, monitor, newPasswordInfo.newPassword); -// launchMsg = launchStatus.getMessage(); -// } -// if (newPasswordInfo != null) -// { -// setPassword(getPasswordInformation().getUserid(), newPasswordInfo.newPassword, newPasswordInfo.savePassword); -// } -// if (launchMsg != null && launchMsg.equals(IDataStoreConstants.ATTEMPT_RECONNECT)) -// { -// internalConnect(monitor); -// return; -// } - } - else if (launchMsg != null) - { - String msgTxt = NLS.bind(ConnectorServiceResources.MSG_CONNECT_DAEMON_FAILED, getHostName(), clientConnection.getPort()); - msg = createSystemMessage(IConnectorServiceMessageIds.MSG_CONNECT_DAEMON_FAILED, IStatus.ERROR, msgTxt, launchMsg); - } - } - - // if connection failed for known reason - else if (connectStatus != null && !connectStatus.isConnected()) - { - if (connectStatus.getMessage().startsWith(ClientConnection.INCOMPATIBLE_SERVER_UPDATE)) - { - String msgTxt = NLS.bind(ConnectorServiceResources.MSG_COMM_INCOMPATIBLE_UPDATE, getHostName()); - String msgDetails = ConnectorServiceResources.MSG_COMM_INCOMPATIBLE_UPDATE_DETAILS; - - msg = createSystemMessage(IConnectorServiceMessageIds.MSG_COMM_INCOMPATIBLE_UPDATE, IStatus.ERROR, msgTxt, msgDetails); - } - else if (connectStatus.getMessage().startsWith(ClientConnection.INCOMPATIBLE_PROTOCOL)) - { - String msgTxt = NLS.bind(ConnectorServiceResources.MSG_COMM_INCOMPATIBLE_PROTOCOL, getHostName()); - String msgDetails = ConnectorServiceResources.MSG_COMM_INCOMPATIBLE_PROTOCOL_DETAILS; - - msg = createSystemMessage(IConnectorServiceMessageIds.MSG_COMM_INCOMPATIBLE_PROTOCOL, IStatus.ERROR, msgTxt, msgDetails); - } - else - { - Throwable exception = connectStatus.getException(); - if (exception instanceof SSLHandshakeException) - { - List certs = connectStatus.getUntrustedCertificates(); - if (certs != null && certs.size() > 0) - { - ISystemKeystoreProvider provider = SystemKeystoreProviderManager.getInstance().getDefaultProvider(); - if (provider != null) - { - _isConnecting = false; - provider.importCertificates(certs, getHostName()); - _isConnecting = false; - - // Don't attempt reconnect when server was started manually. The problem is that - // in that situation, the server will have terminated on the failed connection - // due to the missing certs - if (serverLauncherType != ServerLaunchType.RUNNING_LITERAL){ - internalConnect(monitor); - } - return; - } - } - } - else if (exception != null) - { - String msgTxt = NLS.bind(CommonMessages.MSG_CONNECT_FAILED, getHostName()); - msg = createSystemMessage(ICommonMessageIds.MSG_CONNECT_FAILED, IStatus.ERROR, msgTxt, exception); - } - } - } - - // if connect failed for unknown reason - else if (connectStatus == null) - { - SystemBasePlugin.logError("Failed to connect to remote system", null); //$NON-NLS-1$ - String msgTxt = NLS.bind(ConnectorServiceResources.MSG_COMM_CONNECT_FAILED, getHostName()); - String msgDetails = NLS.bind(ConnectorServiceResources.MSG_COMM_CONNECT_FAILED_DETAILS, getHostName()); - msg = createSystemMessage(IConnectorServiceMessageIds.MSG_COMM_CONNECT_FAILED, IStatus.ERROR, msgTxt, msgDetails); - } - - // if, for some reason, we don't have a message - if (msg == null && connectStatus != null) - { - SystemBasePlugin.logError("Failed to connect to remote system" + connectStatus.getMessage(), null); //$NON-NLS-1$ - String msgTxt = NLS.bind(ConnectorServiceResources.MSG_COMM_CONNECT_FAILED, getHostName()); - String msgDetails = NLS.bind(ConnectorServiceResources.MSG_COMM_CONNECT_FAILED_DETAILS, getHostName()); - msg = createSystemMessage(IConnectorServiceMessageIds.MSG_COMM_CONNECT_FAILED, IStatus.ERROR, msgTxt, msgDetails); - } - - clientConnection.disconnect(); - clientConnection = null; - - // yantzi: artemis 6.0, check for invalid login (user ID / pwd) and reprompt for signon information - if (msg != null && - // tODO use ID or something instead of string - msg.getLevelOneText().startsWith(NLS.bind(ConnectorServiceResources.MSG_COMM_INVALID_LOGIN, getHostName()))) - { - if (launchFailed) - { - clearPassword(true, true); - } - - DisplaySystemMessageAction msgAction = new DisplaySystemMessageAction(msg); - Display.getDefault().syncExec(msgAction); - - // Re-prompt for password - connectException = null; - Display.getDefault().syncExec(new Runnable() - { - public void run() - { - try - { - acquireCredentials(true); - } - catch (OperationCanceledException e) - { - connectException = e; - } - } - }); - - _isConnecting = false; - - // Check if the user cancelled the prompt - if (connectException instanceof OperationCanceledException) - { - throw connectException; - } - - - // Try to connect again. This is a recursive call, but will only - // call if the user presses OK on the password prompt dialog, otherwise - // it will continue and return - internalConnect(monitor); - - // we are connected from recursive so continue - return; - } - - _isConnecting = false; - throw new SystemMessageException(msg); - } - _isConnecting = false; - } - - protected boolean isPortOutOfRange(String message) - { - return message.indexOf(IDataStoreConstants.PORT_OUT_RANGE) != -1; - } - - protected boolean isPasswordExpired(String message) - { - return message.indexOf(IDataStoreConstants.PASSWORD_EXPIRED) != -1; - } - - protected boolean isNewPasswordInvalid(String message) - { - return message.indexOf(IDataStoreConstants.NEW_PASSWORD_INVALID) != -1; - } - - protected void importCertsAndReconnect(ConnectionStatus connectStatus, IProgressMonitor monitor) throws Exception - { - List certs = connectStatus.getUntrustedCertificates(); - if (certs != null && certs.size() > 0) - { - ISystemKeystoreProvider provider = SystemKeystoreProviderManager.getInstance().getDefaultProvider(); - if (provider != null) - { - if (provider.importCertificates(certs, getHostName())) - { - internalConnect(monitor); - return; - } - else - { - throw new InterruptedException(); - } - } - } - } - - protected int launchUsingRexec(SystemSignonInformation info, IServerLauncherProperties serverLauncherProperties, IProgressMonitor monitor) throws Exception - { - IServerLauncher starter = getRemoteServerLauncher(); - starter.setSignonInformation(info); - starter.setServerLauncherProperties(serverLauncherProperties); - - String serverPort = (String)starter.launch(monitor); - if (monitor.isCanceled()) - { - SystemMessage msg = createSystemMessage(ICommonMessageIds.MSG_OPERATION_CANCELLED, IStatus.CANCEL, CommonMessages.MSG_OPERATION_CANCELLED); - throw new SystemMessageException(msg); - } - - int iServerPort = 0; - if (serverPort != null) - { - iServerPort = Integer.parseInt(serverPort); - } - return iServerPort; - } - - protected boolean setSSLProperties(boolean enable) - { - ISystemKeystoreProvider provider = SystemKeystoreProviderManager.getInstance().getDefaultProvider(); - if (provider != null) - { - String keyStore = provider.getKeyStorePath(); - String password = provider.getKeyStorePassword(); - - ISSLProperties properties = new ClientSSLProperties(enable, keyStore, password); - clientConnection.setSSLProperties(properties); - return true; - } - else return false; - } - - - - protected boolean promptForTrusting( X509Certificate cert) - { - return true; - } - - - /* - * Launch a DataStore server using a daemon. This method can be overridden if a custom implementation is required. - * The default implementation uses the daemon client that is built into ClientConnection. - */ - protected ConnectionStatus launchServer(ClientConnection clientConnection, SystemSignonInformation info, int daemonPort, IProgressMonitor monitor) - { - return launchServer(clientConnection, info, daemonPort, monitor, 0); - } - - - /* - * Launch a DataStore server using a daemon. This method can be overridden if a custom implementation is required. - * The default implementation uses the daemon client that is built into ClientConnection. - */ - protected ConnectionStatus launchServer(ClientConnection clientConnection, SystemSignonInformation info, int daemonPort, IProgressMonitor monitor, int timeout) - { - return clientConnection.launchServer(info.getUserId(), info.getPassword(), daemonPort, timeout); - } - - /* - * Launch a DataStore server using a specified server launcher. By default, this method does nothing since UniversalSystem does - * not know how to handle this particular launch type. This method should be overridden to provide a custom implementation - * of the launch. - */ - protected ConnectionStatus launchServer(ClientConnection clientConnection, SystemSignonInformation info, IServerLauncherProperties launcher, IProgressMonitor monitor) - { - return null; - } - - /** - * Change the password on a remote system and optionally remain connected to it. Subclasses must implement this - * method if they wish to - * @param clientConnection The connection on which the password must be changed - * @param info The old SystemSignonInformation, including the old password. - * @param serverLauncherProperties The properties of the server launcher used to connect to the server. Use this object to get the type of serverlauncher, if your implementation varies depending on the type. - * @param monitor a progress monitor - * @param newPassword the new password to which the old one will be changed. - * @return the status of the password change and optionally the connection. If the new password is rejected by the remote - * system, return new ConnectionStatus(false, IDataStoreConstants.NEW_PASSWORD_INVALID). - * If the system is now connected, and the server is ready to be connected, construct a new ConnectionStatus(true) and if using the RSE daemon, set the ticket on it - * to the ticket number of the server. If you wish to just have the UniversalSystem attempt a reconnect from the beginning after changing the password, - * return new ConnectionStatus(true, IDataStoreConstants.ATTEMPT_RECONNECT). - */ - protected ConnectionStatus changePassword(ClientConnection clientConnection, SystemSignonInformation info, IServerLauncherProperties serverLauncherProperties, IProgressMonitor monitor, String newPassword) - { - return new ConnectionStatus(false, IDataStoreConstants.AUTHENTICATION_FAILED); - } - - /** - * @see org.eclipse.rse.core.subsystems.IConnectorService#isConnected() - */ - public boolean isConnected() - { - if (clientConnection != null) - { - return clientConnection.isConnected(); - } - - return false; - } - - /** - * Shortcut to checking if the network is down - */ - public boolean isNetworkError() - { - if (_connectionStatusListener != null) - { - return _connectionStatusListener.isConnectionDown(); - } - - return false; - } - - - /** - * @return The DataStore currently being used by this connection. - */ - public DataStore getDataStore() - { - if (clientConnection != null) - { - return clientConnection.getDataStore(); - } - else - { - return null; - } - } - - public boolean supportsRemoteServerLaunching() - { - return true; - } - - public boolean supportsServerLaunchProperties() - { - return true; - } - - /* (non-Javadoc) - * @see org.eclipse.rse.core.subsystems.AbstractConnectorService#supportsPassword() - */ - public boolean supportsPassword() { - boolean result = super.supportsPassword(); - IHost host = getHost(); - if (host.getSystemType().isWindows()) { - result = false; - } - return result; - } - - /* (non-Javadoc) - * @see org.eclipse.rse.core.subsystems.AbstractConnectorService#supportsUserid() - */ - public boolean supportsUserId() { - boolean result = super.supportsUserId(); - if (getHost().getSystemType().isWindows()) { - result = false; - } - return result; - } - - - /** - * @since org.eclipse.rse.connectorservice.dstore 3.0 - */ - protected SystemMessage createSystemMessage(String msgId, int severity, String msg) { - return createSystemMessage(msgId, severity, msg, (String)null); - } - - /** - * @since org.eclipse.rse.connectorservice.dstore 3.0 - */ - protected SystemMessage createSystemMessage(String msgId, int severity, String msg, Throwable e) { - return new SimpleSystemMessage(Activator.PLUGIN_ID, msgId, severity, msg, e); - } - - /** - * @since org.eclipse.rse.connectorservice.dstore 3.0 - */ - protected SystemMessage createSystemMessage(String msgId, int severity, String msg, String msgDetails) { - return new SimpleSystemMessage(Activator.PLUGIN_ID, msgId, severity, msg, msgDetails); - } - -} - diff --git a/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/DStoreConnectorServiceManager.java b/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/DStoreConnectorServiceManager.java deleted file mode 100644 index 32d5831bb..000000000 --- a/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/DStoreConnectorServiceManager.java +++ /dev/null @@ -1,114 +0,0 @@ -/******************************************************************************** - * Copyright (c) 2002, 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 - * - * 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: - * Martin Oberhuber (Wind River) - [177523] Unify singleton getter methods - ********************************************************************************/ - -package org.eclipse.rse.connectorservice.dstore; -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; -import org.eclipse.rse.internal.connectorservice.dstore.ConnectorServiceResources; - - - -/** - * IConnectorService manager class. - * There should be only one of these instantiated. - * Use {@link #getInstance()} to get that singleton. - * <p> - * The job of this manager is to manage and return IConnectorService objects. - * It ensures there is only ever one per unique SystemConnection, - * so that both the file and command subsystems can share the same system object. - */ -public class DStoreConnectorServiceManager extends AbstractConnectorServiceManager -{ - private static DStoreConnectorServiceManager inst = null; - - /** - * Private constructor to ensure not instantiated this way. - * Use {@link #getInstance()} instead. - */ - private DStoreConnectorServiceManager() - { - } - - /** - * Return singleton instance of this class - */ - public static DStoreConnectorServiceManager getInstance() - { - if (inst == null) - inst = new DStoreConnectorServiceManager(); - return inst; - } - - /** - * Return true if the singleton has been created. - * This saves creating it at shutdown just to test for isConnected. - */ - public static boolean isInstantiated() - { - return (inst != null); - } - - // ------------------------------------- - // ABSTRACT METHODS FROM PARENT CLASS... - // ------------------------------------- - - /** - * Return the actual IConnectorService object. We return an instance of UniversalSystem. - */ - public IConnectorService createConnectorService(IHost host) - { - IConnectorService service = new DStoreConnectorService(ConnectorServiceResources.DStore_ConnectorService_Label, ConnectorServiceResources.DStore_ConnectorService_Description, host); - return service; - } - - /** - * For all subsystems in a particular SystemConnection, we need to know which - * ones are to share a single IConnectorService object. To do this, we need a key which - * is canonical for all subsystems in a given connection. This can be anything, - * but is typically a unique interface that all subsystems supported a shared - * IConnectorService object implement. - * <p> - * Whatever is returned from here is used as the key into a hashtable to find the - * singleton IConnectorService object in getSystemObject. - * <p> - * @return IUniversalSubSystem.class - */ - public Class getSubSystemCommonInterface(ISubSystem subsystem) - { - return IUniversalDStoreSubSystem.class; - } - /** - * Given another subsystem, return true if that subsystem shares a single IConnectorService object - * with this one. You must override this to return true if you recognize that subsystem - * as one of your own. You are guaranteed the other subsystem will be from the same - * SystemConnection as this one. - * <p> - * You can't assume a SystemConnection will you only have subsystems of that you created, - * so you should only return true if it implements your interface or you know it is an - * instance of your subsystem class. - * <p> - * This should simply return (otherSubSystem instanceof interface) where interface is - * the same one returned from getSubSystemCommonInterface - * - * @return true if otherSubSystem instanceof IUniversalSubSystem - */ - public boolean sharesSystem(ISubSystem otherSubSystem) - { - return (otherSubSystem instanceof IUniversalDStoreSubSystem); - } -}
\ No newline at end of file diff --git a/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/IUniversalDStoreConstants.java b/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/IUniversalDStoreConstants.java deleted file mode 100644 index dc4ac6672..000000000 --- a/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/IUniversalDStoreConstants.java +++ /dev/null @@ -1,88 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2002, 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 - * - * 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: - * {Name} (company) - description of contribution. - * David McKnight (IBM) - [216596] dstore preferences (timeout, and others) - * David McKnight (IBM) - [218685] [api][breaking][dstore] Unable to connect when using SSL. - * David McKnight (IBM) - [220123][dstore] Configurable timeout on irresponsiveness - * David McKnight (IBM) - [221747] Default Connection Timeout is too high - * David McKnight (IBM) - [228334] [dstore] Default DataStore connection timeout is too short - * David McKnight (IBM) - [228334][api][breaking][dstore] Default DataStore connection timeout is too short - *******************************************************************************/ - -package org.eclipse.rse.connectorservice.dstore; -/** - * Constants used throughout the UniversalSystem plugin - */ -public interface IUniversalDStoreConstants -{ - - - public static final String PLUGIN_ID ="org.eclipse.rse.connectorservice.dstore"; //$NON-NLS-1$ - - public static final String PREFIX = PLUGIN_ID + "."; //$NON-NLS-1$ - - // prefix for context sensitive help - public static final String HELP_PREFIX = PREFIX; - - // Resource Bundle ids - public static final String RESID_PREFIX = PREFIX + "ui."; //$NON-NLS-1$ - - // Icons - public static final String ICON_DIR = "icons"; //$NON-NLS-1$ - public static final String ICON_PATH = java.io.File.separator + ICON_DIR + java.io.File.separator; - public static final String ICON_SUFFIX = "Icon"; //$NON-NLS-1$ - public static final String ICON_EXT = ".gif"; //$NON-NLS-1$ - - // ------------------------- - // Action prefixes. - // SYstemBaseAction class adds "label" to get text and "tooltip" and "description" to get hover help - // ------------------------- - // action ids - public static final String ACTION_PREFIX = RESID_PREFIX + "action."; //$NON-NLS-1$ - public static final String RESID_RUN_REMOTECMD_PREFIX = ACTION_PREFIX+"RunRemoteCommand"; //$NON-NLS-1$ - - - // ------------------------- - // Preferences... - // ------------------------- - public static final String RESID_PREF_PREFIX = RESID_PREFIX+"preferences."; //$NON-NLS-1$ - public static final String RESID_PREF_ROOT_TITLE = RESID_PREF_PREFIX+"root.title"; //$NON-NLS-1$ - - // RemoteClassLoader caching preferences - public static final String RESID_PREF_CACHE_REMOTE_CLASSES = RESID_PREF_PREFIX + "cacheremoteclasses"; //$NON-NLS-1$ - - // Socket timeout preference - public static final String RESID_PREF_SOCKET_TIMEOUT = RESID_PREF_PREFIX + "sockettimeout"; //$NON-NLS-1$ - - public static final String RESID_PREF_DO_KEEPALIVE = RESID_PREF_PREFIX + "dokeepalive"; //$NON-NLS-1$ - - /** - * @since 3.0 - */ - public static final String RESID_PREF_KEEPALIVE_RESPONSE_TIMEOUT = RESID_PREF_PREFIX + "keepalivetimeout"; //$NON-NLS-1$ - - /** - * @since 3.0 - */ - public static final String RESID_PREF_SOCKET_READ_TIMEOUT = RESID_PREF_PREFIX + "socketreadtimeout"; //$NON-NLS-1$ - - - - /** - * @since 3.0 - */ - public static final String ALERT_MISMATCHED_SERVER = RESID_PREFIX + "alert.mismatched.server"; //$NON-NLS-1$ - -} diff --git a/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/IUniversalDStoreMessages.java b/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/IUniversalDStoreMessages.java deleted file mode 100644 index 8bf2b731d..000000000 --- a/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/IUniversalDStoreMessages.java +++ /dev/null @@ -1,60 +0,0 @@ -/******************************************************************************** - * Copyright (c) 2000, 2006 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 - * - * 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: - * {Name} (company) - description of contribution. - ********************************************************************************/ - -package org.eclipse.rse.connectorservice.dstore; - -/** - * Message IDs - */ -public interface IUniversalDStoreMessages -{ - - - public static final String PLUGIN_ID ="org.eclipse.rse.connectorservice.dstore"; //$NON-NLS-1$ - public static final String PREFIX = PLUGIN_ID+"."; //$NON-NLS-1$ - // Resource Bundle ids - public static final String RESID_PREFIX = PREFIX+"ui."; //$NON-NLS-1$ - // Messages prefixes - public static final String MSG_PREFIX = RESID_PREFIX+"msg."; //$NON-NLS-1$ - public static final String MSG_TITLE = MSG_PREFIX + "Title"; //$NON-NLS-1$ - - // Messages - public static final String MSG_CONNECTION_PREFIX = MSG_PREFIX + "Connection."; //$NON-NLS-1$ - public static final String MSG_CONNECTION_FAILED = MSG_CONNECTION_PREFIX + "Failed"; //$NON-NLS-1$ - public static final String MSG_CONNECTION_UNKNOWN_HOST = MSG_CONNECTION_PREFIX + "UnknownHost"; //$NON-NLS-1$ - public static final String MSG_CONNECTION_VERIFY = MSG_CONNECTION_PREFIX + "Verify"; //$NON-NLS-1$ - public static final String MSG_CONNECTION_COMMPROPERTIES = MSG_CONNECTION_PREFIX + "CommProperties"; //$NON-NLS-1$ - - // RSE Server Connection Messages - public static final String MSG_SIGNON_PREFIX = MSG_PREFIX + "Signon."; //$NON-NLS-1$ - public static final String MSG_SIGNON_PASSWORD_ERROR = MSG_SIGNON_PREFIX + "PasswordError"; //$NON-NLS-1$ - public static final String MSG_SIGNON_PASSWORD_INCORRECT = MSG_SIGNON_PREFIX + "PasswordIncorrect"; //$NON-NLS-1$ - public static final String MSG_SIGNON_PASSWORD_INCORRECT_USER_DISABLED= MSG_SIGNON_PREFIX + "PasswordIncorrectUserDisabled"; //$NON-NLS-1$ - public static final String MSG_SIGNON_PASSWORD_EXPIRED = MSG_SIGNON_PREFIX + "PasswordExpired"; //$NON-NLS-1$ - public static final String MSG_SIGNON_USERID_INVALID = MSG_SIGNON_PREFIX + "UserIDInvalid"; //$NON-NLS-1$ - public static final String MSG_SIGNON_USERID_DISABLED = MSG_SIGNON_PREFIX + "UserIDDisabled"; //$NON-NLS-1$ - public static final String MSG_SIGNON_USERID_ERROR = MSG_SIGNON_PREFIX + "UserIDError"; //$NON-NLS-1$ - - public static final String MSG_DATASTORE_PREFIX = MSG_PREFIX + "DataStore."; //$NON-NLS-1$ - public static final String MSG_DATASTORE_STARTSERVER = MSG_DATASTORE_PREFIX + "StartServer"; //$NON-NLS-1$ - public static final String MSG_DATASTORE_CONNECTSERVER = MSG_DATASTORE_PREFIX + "ConnectServer"; //$NON-NLS-1$ - public static final String MSG_DATASTORE_INITIALIZESERVER = MSG_DATASTORE_PREFIX + "InitializeServer"; //$NON-NLS-1$ - public static final String MSG_DATASTORE_INITIALIZECODESERVER = MSG_DATASTORE_PREFIX + "InitializeCODEServer"; //$NON-NLS-1$ - - public static final String MSG_CMD_PREFIX = MSG_PREFIX + "Command."; //$NON-NLS-1$ - public static final String MSG_CMDNAME_EMPTY = MSG_CMD_PREFIX + "Required"; //$NON-NLS-1$ - public static final String MSG_CMDNAME_NOTVALID = MSG_CMD_PREFIX + "NotValid"; //$NON-NLS-1$ -}
\ No newline at end of file diff --git a/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/IUniversalDStoreSubSystem.java b/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/IUniversalDStoreSubSystem.java deleted file mode 100644 index f291564a1..000000000 --- a/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/IUniversalDStoreSubSystem.java +++ /dev/null @@ -1,26 +0,0 @@ -/******************************************************************************** - * Copyright (c) 2002, 2006 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 - * - * 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: - * {Name} (company) - description of contribution. - ********************************************************************************/ - -package org.eclipse.rse.connectorservice.dstore; -/** - * Simply a tag to indicate this factory is one our universal subsystems. - */ -public interface IUniversalDStoreSubSystem -{ - - - -}
\ No newline at end of file diff --git a/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/IUniversalSubSystemConfiguration.java b/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/IUniversalSubSystemConfiguration.java deleted file mode 100644 index 95e52a035..000000000 --- a/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/IUniversalSubSystemConfiguration.java +++ /dev/null @@ -1,26 +0,0 @@ -/******************************************************************************** - * Copyright (c) 2002, 2006 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 - * - * 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: - * {Name} (company) - description of contribution. - ********************************************************************************/ - -package org.eclipse.rse.connectorservice.dstore; -/** - * Simply a tag to indicate this factory is one our universal subsystem factories. - */ -public interface IUniversalSubSystemConfiguration -{ - - - -}
\ No newline at end of file diff --git a/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/util/ConnectionStatusListener.java b/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/util/ConnectionStatusListener.java deleted file mode 100644 index bbc8a5e5f..000000000 --- a/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/util/ConnectionStatusListener.java +++ /dev/null @@ -1,284 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2002, 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 - * - * 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: - * Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry - * David McKnight (IBM) - [216252] SystemMessages using RSEStatus - * David McKnight (IBM) - [216252] [api][nls] Resource Strings specific to subsystems should be moved from rse.ui into files.ui / shells.ui / processes.ui where possible - * David McKnight (IBM) - [220547] [api][breaking] SimpleSystemMessage needs to specify a message id and some messages should be shared - *******************************************************************************/ - -package org.eclipse.rse.connectorservice.dstore.util; - -import java.lang.reflect.InvocationTargetException; - -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.dstore.core.model.DataElement; -import org.eclipse.dstore.extra.DomainEvent; -import org.eclipse.dstore.extra.IDomainListener; -import org.eclipse.jface.dialogs.ProgressMonitorDialog; -import org.eclipse.jface.operation.IRunnableContext; -import org.eclipse.jface.operation.IRunnableWithProgress; -import org.eclipse.osgi.util.NLS; -import org.eclipse.rse.core.RSECorePlugin; -import org.eclipse.rse.core.model.ISystemRegistry; -import org.eclipse.rse.core.subsystems.IConnectorService; -import org.eclipse.rse.core.subsystems.SubSystemConfiguration; -import org.eclipse.rse.internal.connectorservice.dstore.Activator; -import org.eclipse.rse.services.clientserver.messages.CommonMessages; -import org.eclipse.rse.services.clientserver.messages.ICommonMessageIds; -import org.eclipse.rse.services.clientserver.messages.SimpleSystemMessage; -import org.eclipse.rse.services.clientserver.messages.SystemMessage; -import org.eclipse.rse.ui.RSEUIPlugin; -import org.eclipse.rse.ui.SystemBasePlugin; -import org.eclipse.rse.ui.messages.SystemMessageDialog; -import org.eclipse.swt.widgets.Display; -import org.eclipse.swt.widgets.Shell; -import org.eclipse.ui.IWorkbenchWindow; -import org.eclipse.ui.PlatformUI; - -public class ConnectionStatusListener implements IDomainListener, IRunnableWithProgress -{ - - - protected DataElement _dataStoreStatus; - protected IConnectorService _connection; - protected boolean _connectionDown = false; - - /** - * @param status The status element for the DataStore handling this connection. - */ - public ConnectionStatusListener(DataElement status, IConnectorService connection) - { - _dataStoreStatus = status; - _connection = connection; - } - - protected Shell internalGetShell() - { - Shell activeShell = SystemBasePlugin.getActiveWorkbenchShell(); - if (activeShell != null) - { - return activeShell; - } - - IWorkbenchWindow window = null; - try - { - window = PlatformUI.getWorkbench().getActiveWorkbenchWindow(); - } - catch (Exception e) - { - return null; - } - if (window == null) - { - - IWorkbenchWindow[] windows = PlatformUI.getWorkbench().getWorkbenchWindows(); - if (windows != null && windows.length > 0) - { - return windows[0].getShell(); - } - - } - else - { - return window.getShell(); - } - - return null; - } - - /** - * The handleConnectionDown method is invoked if the network connection between the - * client and server goes down while connected. Currently this method displays - * an error to the user and the subsytem is disconnected. - */ - protected void handleConnectionDown() - { - Display.getDefault().asyncExec(new ConnectionDown(this)); - } - - class ConnectionDown implements Runnable - { - private ConnectionStatusListener _listener; - public ConnectionDown(ConnectionStatusListener listener) - { - _listener = listener; - } - - public void run() - { - Shell shell = getShell(); - _connectionDown = true; - - String fmsgStr = NLS.bind(CommonMessages.MSG_CONNECT_UNKNOWNHOST, _connection.getPrimarySubSystem().getHost().getAliasName()); - - SystemMessage msg = new SimpleSystemMessage(Activator.PLUGIN_ID, ICommonMessageIds.MSG_CONNECT_UNKNOWNHOST, IStatus.ERROR, fmsgStr); - SystemMessageDialog dialog = new SystemMessageDialog(internalGetShell(), msg); - dialog.open(); - - try - { - IRunnableContext runnableContext = getRunnableContext(getShell()); - runnableContext.run(false,true,_listener); // inthread, cancellable, IRunnableWithProgress - _connection.reset(); - ISystemRegistry sr = RSECorePlugin.getTheSystemRegistry(); - sr.connectedStatusChange(_connection.getPrimarySubSystem(), false, true, true); - } - catch (InterruptedException exc) // user cancelled - { - if (shell != null) - showDisconnectCancelledMessage(shell, _connection.getHostName(), _connection.getPort()); - } - catch (java.lang.reflect.InvocationTargetException invokeExc) // unexpected error - { - Exception exc = (Exception)invokeExc.getTargetException(); - if (shell != null) - showDisconnectErrorMessage(shell, _connection.getHostName(), _connection.getPort(), exc); - } - catch (Exception e) - { - SystemBasePlugin.logError("ConnectionStatusListener: Error disconnecting", e); //$NON-NLS-1$ - } - } - } - - /** - * @see IDomainListener#listeningTo(DomainEvent) - */ - public boolean listeningTo(DomainEvent event) - { - if (_dataStoreStatus == event.getParent()) - { - return true; - } - return false; - } - - /** - * @see IDomainListener#domainChanged(DomainEvent) - */ - public void domainChanged(DomainEvent event) - { - if (!_dataStoreStatus.getName().equals("okay")) //$NON-NLS-1$ - { - handleConnectionDown(); - } - } - - public Shell getShell() - { - return internalGetShell(); - } - - /** - * Callback method for the IConnectorService to determine if the connection is down. This is - * called by the disconnect method to determine if we can do saves or not. - */ - public boolean isConnectionDown() - { - return _connectionDown; - } - - public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException - { - String message = null; - message = SubSystemConfiguration.getDisconnectingMessage(_connection.getHostName(), _connection.getPort()); - monitor.beginTask(message, IProgressMonitor.UNKNOWN); - try - { - _connection.disconnect(monitor); - } - catch(Exception exc) - { - if (exc instanceof java.lang.reflect.InvocationTargetException) - throw (java.lang.reflect.InvocationTargetException)exc; - if (exc instanceof java.lang.InterruptedException) - throw (java.lang.InterruptedException)exc; - throw new java.lang.reflect.InvocationTargetException(exc); - } - finally - { - monitor.done(); - } - } - /** - * Get the progress monitor dialog for this operation. We try to - * use one for all phases of a single operation, such as connecting - * and resolving. - */ - protected IRunnableContext getRunnableContext(Shell rshell) - { - Shell shell = getShell(); - // for other cases, use statusbar - IWorkbenchWindow win = SystemBasePlugin.getActiveWorkbenchWindow(); - if (win != null) - { - Shell winShell = RSEUIPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow().getShell(); - if (winShell != null && !winShell.isDisposed() && winShell.isVisible()) - { - SystemBasePlugin.logInfo("Using active workbench window as runnable context"); //$NON-NLS-1$ - shell = winShell; - return win; - } - else - { - win = null; - } - } - - if (shell == null || shell.isDisposed() || !shell.isVisible()) - { - SystemBasePlugin.logInfo("Using progress monitor dialog with given shell as parent"); //$NON-NLS-1$ - shell = rshell; - } - - - IRunnableContext dlg = new ProgressMonitorDialog(rshell); - return dlg; - } - - /** - * Show an error message when the disconnection fails. - * Shows a common message by default. - * Overridable. - */ - protected void showDisconnectErrorMessage(Shell shell, String hostName, int port, Exception exc) - { - String dfailedMsg = NLS.bind(CommonMessages.MSG_DISCONNECT_FAILED, hostName); - - - try{ - SystemMessage msg = new SimpleSystemMessage(Activator.PLUGIN_ID, ICommonMessageIds.MSG_DISCONNECT_FAILED, IStatus.ERROR, dfailedMsg, exc); - - SystemMessageDialog msgDlg = new SystemMessageDialog(shell, msg); - msgDlg.setException(exc); - msgDlg.open(); - } - catch (Exception e){ - } - } - /** - * Show an error message when the user cancels the disconnection. - * Shows a common message by default. - * Overridable. - */ - protected void showDisconnectCancelledMessage(Shell shell, String hostName, int port) - { - String msg = NLS.bind(CommonMessages.MSG_DISCONNECT_CANCELLED, hostName); - SystemMessageDialog msgDlg = new SystemMessageDialog(shell, new SimpleSystemMessage(Activator.PLUGIN_ID, ICommonMessageIds.MSG_DISCONNECT_CANCELLED, IStatus.CANCEL, msg)); - msgDlg.open(); - } -} diff --git a/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/util/ICommunicationsDiagnostic.java b/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/util/ICommunicationsDiagnostic.java deleted file mode 100644 index 8c1854bf6..000000000 --- a/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/util/ICommunicationsDiagnostic.java +++ /dev/null @@ -1,80 +0,0 @@ -/******************************************************************************** - * Copyright (c) 2002, 2006 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 - * - * 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: - * {Name} (company) - description of contribution. - ********************************************************************************/ - -package org.eclipse.rse.connectorservice.dstore.util; - -import org.eclipse.rse.core.subsystems.IConnectorService; - -/** - * An interface for ICommunicationsDiagnostic class - */ -public interface ICommunicationsDiagnostic extends Runnable { - - - - public static final int CANCEL_WAIT_REQUESTED = 1; - - - /** - * Setup for the diagnostic - * - * @param id assign an ID for this diagnostic instance - * @param quiet true if user to be prompted for a dialog - * @param server the host network name - * @param system the connection to be investigated - * @param str1 optional string - * @param str2 optional string - * @param str3 optional string - */ - public void setUp(String id, boolean quiet, String server, IConnectorService system, String str1, String str2, String str3); - - /** - * Log an error in the .log file - * - * @param text message text to be logged - */ - public void logError(String text); - - /** - * Check if network is down - * - * @return true or false - */ - public boolean isNetworkDown(); - - /** - * Check if host server is still active - * - * @return true or false - */ - public boolean isServerActive(); - - /** - * Dispaly a message dialog - * - * @param id message to be displayed. - */ - public void displayMessage(String id); - - /** - * diagnosticStatus - * - * @return status - */ - public int diagnosticStatus(); - - -}
\ No newline at end of file diff --git a/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/util/ICommunicationsDiagnosticFactory.java b/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/util/ICommunicationsDiagnosticFactory.java deleted file mode 100644 index 3bc4c334c..000000000 --- a/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/util/ICommunicationsDiagnosticFactory.java +++ /dev/null @@ -1,29 +0,0 @@ -/******************************************************************************** - * Copyright (c) 2006 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 - * - * 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: - * {Name} (company) - description of contribution. - ********************************************************************************/ - -package org.eclipse.rse.connectorservice.dstore.util; - -/** - * Factory for creating ICommunicationsDiagnostic instances. - */ -public interface ICommunicationsDiagnosticFactory -{ - - /** - * Factory method for creating instances - */ - public ICommunicationsDiagnostic createInstance(); -}
\ No newline at end of file diff --git a/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/util/StatusMonitor.java b/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/util/StatusMonitor.java deleted file mode 100644 index 101a1bc24..000000000 --- a/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/util/StatusMonitor.java +++ /dev/null @@ -1,494 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2002, 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 - * - * 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: - * Martin Oberhuber (Wind River) - [168870] refactor org.eclipse.rse.core package of the UI plugin - * David McKnight (IBM) - [225902] [dstore] use C_NOTIFICATION command to wake up the server - * David McKnight (IBM) - [229947] [dstore] interruption to Thread.sleep() should not stop waitForUpdate() - * David McKnight (IBM) - [231126] [dstore] status monitor needs to reset WaitThreshold on nudge - *******************************************************************************/ - -package org.eclipse.rse.connectorservice.dstore.util; - -import java.util.ArrayList; -import java.util.List; - -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.dstore.core.model.DE; -import org.eclipse.dstore.core.model.DataElement; -import org.eclipse.dstore.core.model.DataStore; -import org.eclipse.dstore.core.model.DataStoreSchema; -import org.eclipse.dstore.extra.DomainEvent; -import org.eclipse.dstore.extra.IDomainListener; -import org.eclipse.rse.core.subsystems.CommunicationsEvent; -import org.eclipse.rse.core.subsystems.ICommunicationsListener; -import org.eclipse.rse.core.subsystems.IConnectorService; -import org.eclipse.rse.ui.SystemBasePlugin; -import org.eclipse.swt.widgets.Display; -import org.eclipse.swt.widgets.Shell; - - -/* - * This utility class can be used to monitor the status of one more more status DataElements. - * Only one instanceof of this class is required per DataStore for use in monitoring statuses. - * This is intended to be used in place of StatusChangeListeners - * - * * <p> - * The following is one example of the use of the StatusMonitor. The code: - * <blockquote><pre> - * DataElement status = dataStore.command(dsCmd, args, deObj); - * - * StatusMonitor smon = StatusMonitorFactory.getInstance().getStatusMonitorFor(getSystem(), ds); - * smon.waitForUpdate(status, monitor); - * </pre></blockquote> - */ -public class StatusMonitor implements IDomainListener, ICommunicationsListener -{ - - protected Shell _shell; - protected IConnectorService _system; - - - protected boolean _networkDown = false; - - protected List _workingStatuses; - protected List _cancelledStatuses; - protected List _doneStatuses; - - protected DataStore _dataStore; - - protected class FindShell implements Runnable - { - private Shell shell; - - /** - * @see Runnable#run() - */ - public void run() - { - try { - Shell[] shells = Display.getCurrent().getShells(); - for (int loop = 0; loop < shells.length && shell == null; loop++) { - if (shells[loop].isEnabled()) { - shell = shells[loop]; - } - } - } catch (Exception e) { - SystemBasePlugin.logError("StatusChangeListener.FindShell exception: ", e); //$NON-NLS-1$ - } - } - } - - /** - * Construct a StatusChangeListener - * - * @param system the system associated with this monitor - * @param dataStore the dataStore associated with this monitor - * @param factory the diagnostic factory for this monitor - */ - public StatusMonitor(IConnectorService system, DataStore dataStore, ICommunicationsDiagnosticFactory factory) - { - _system = system; - _dataStore = dataStore; - reInit(); - } - - /** - * Construct a StatusChangeListener - * - * @param system the system associated with this monitor - * @param dataStore the dataStore associated with this monitor - */ - public StatusMonitor(IConnectorService system, DataStore dataStore) - { - this(system, dataStore, null); - } - - public void reInit() - { - _networkDown = false; - _system.addCommunicationsListener(this); - _workingStatuses = new ArrayList(); - _doneStatuses = new ArrayList(); - _cancelledStatuses = new ArrayList(); - _dataStore.getDomainNotifier().addDomainListener(this); - } - - public DataStore getDataStore() - { - return _dataStore; - } - - public void dispose() - { - _system.removeCommunicationsListener(this); - _workingStatuses.clear(); - _doneStatuses.clear(); - _cancelledStatuses.clear(); - _dataStore.getDomainNotifier().removeDomainListener(this); - } - - /** - * @see IDomainListener#listeningTo(DomainEvent) - */ - public boolean listeningTo(DomainEvent event) - { - if (_workingStatuses.size() == 0) - { - return true; - } - - DataElement parent = (DataElement)event.getParent(); - if (_workingStatuses.contains(parent)) - { - return determineStatusDone(parent); - } - - return false; - } - - - - /** - * @see IDomainListener#domainChanged(DomainEvent) - */ - public void domainChanged(DomainEvent event) - { - if (_workingStatuses.size() == 0) - { - return; - } - - DataElement parent = (DataElement)event.getParent(); - if (_workingStatuses.contains(parent)) - { - boolean isStatusDone = determineStatusDone(parent); - if (isStatusDone) - { - setDone(parent); - } - } - } - - - /** - * Determines whether the status is done. - * @return <code>true</code> if status done, <code>false</code> otherwise. - */ - protected boolean determineStatusDone(DataElement status) - { - return status.getAttribute(DE.A_VALUE).equals("done") || status.getAttribute(DE.A_NAME).equals("done"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - /** - * @see org.eclipse.rse.core.subsystems.ICommunicationsListener#isPassiveCommunicationsListener() - */ - public boolean isPassiveCommunicationsListener() - { - return false; - } - - /** - * setDone(boolean) - */ - public synchronized void setDone(DataElement status) - { - _workingStatuses.remove(status); - _doneStatuses.add(status); - } - - - public synchronized void setCancelled(DataElement status) - { - _workingStatuses.remove(status); - _cancelledStatuses.add(status); - } - - public synchronized void setWorking(DataElement status) - { - _workingStatuses.add(status); - } - - - public boolean wasCancelled(DataElement status) - { - if (_cancelledStatuses.contains(status)) - { - return true; - } - return false; - } - - - - /** - * @see ICommunicationsListener#communicationsStateChange(CommunicationsEvent) - */ - public void communicationsStateChange(CommunicationsEvent e) - { - if (e.getState() == CommunicationsEvent.CONNECTION_ERROR) - { - _networkDown = true; - } - else if (e.getState() == CommunicationsEvent.AFTER_DISCONNECT) - { - _networkDown = true; - } - } - - /** - * Test if the StatusChangeListener returned because the network connection to the - * remote system was broken. - */ - public boolean isNetworkDown() - { - return _networkDown; - } - - public DataElement waitForUpdate(DataElement status) throws InterruptedException - { - return waitForUpdate(status, null, 0); - } - - public DataElement waitForUpdate(DataElement status, IProgressMonitor monitor) throws InterruptedException - { - return waitForUpdate(status, monitor, 0); - } - - public DataElement waitForUpdate(DataElement status, int wait) throws InterruptedException - { - return waitForUpdate(status, null, wait); - } - - public synchronized DataElement waitForUpdate(DataElement status, IProgressMonitor monitor, int wait) throws InterruptedException - { - if (_networkDown && status.getDataStore().isConnected()) - { - reInit(); - } - if (determineStatusDone(status)) - { - setDone(status); - return status; - } - - setWorking(status); - - Display display = Display.getCurrent(); - - // Prevent infinite looping by introducing a threshold for wait - - int WaitThreshold = 50; - if ( wait > 0 ) - WaitThreshold = wait*10; // 1 second means 10 sleep(100ms) - else if ( wait == -1 ) // force a diagnostic - WaitThreshold = -1; - - 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 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) - { - dispose(); - throw new InterruptedException(); - } - } - } - - } - else - { - // Current thread is not UI thread - while (_workingStatuses.contains(status)) - { - - 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) - { - dispose(); - throw new InterruptedException(); - } - } - } - } - - - return status; - } - - private void wakeupServer(DataElement status) - { - if (status != null) - { - // token command to wake up update handler - DataElement cmdDescriptor = _dataStore.findCommandDescriptor(DataStoreSchema.C_NOTIFICATION); - DataElement subject = status.getParent().get(0); - if (cmdDescriptor != null) - { - _dataStore.command(cmdDescriptor, subject); - } - } - } - - /** - * Start diagnostic - * - * @param factory is the an implementation of ICommunicationsDiagnostic - * @param quiet is the flag to indicate if user should be prompted - * - true for no prompt - * @return ICommunciationsDiagnostic class instance - */ - public ICommunicationsDiagnostic whatIsGoingOn(ICommunicationsDiagnosticFactory factory, boolean quiet, DataElement target) throws InterruptedException //@01 - { - if (target == null) - return null; - - ICommunicationsDiagnostic d = null; - try { - String name = target.getName(); /* Get the current element status name: started/working/done */ - /* Log the current status */ - SystemBasePlugin.logError("StatusChangeListener."+name+": " + "Communications Diagnostic started"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - SystemBasePlugin.logError("StatusChangeListener."+name + //$NON-NLS-1$ - ": done = " + _doneStatuses.contains(target) + //$NON-NLS-1$ - "; cancelled = " + _cancelledStatuses.contains(target)+ //$NON-NLS-1$ - "; _networkDown = " + _networkDown ); //$NON-NLS-1$ - - DataStore ds = _dataStore; - /* Log the status in DataStore */ - SystemBasePlugin.logError("StatusChangeListener."+name+"(DataStore): " + " isConnected = " + ds.isConnected() + "; isWaiting = " + ds.isWaiting(target)); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ - - /*Log all nested DataElement's in target's parent*/ - List deList = target.getParent().getNestedData(); - if ( deList != null && !deList.isEmpty() ) { - int num = deList.size(); - for ( int i = 0; i < num; i++) - { - DataElement child = (DataElement) deList.get(i); - if (child != null) { - SystemBasePlugin.logError("StatusChangeListener."+name+".child"+i+"(DataElement): " + child.toString()); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - DataElement descriptor = child.getDescriptor(); - if (descriptor != null) - SystemBasePlugin.logError("StatusChangeListener."+name+".child"+i+"(Descriptor): " + descriptor.toString()); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - } - } - } - //Spawn off a diagnostic to check more stuff - if (factory != null) { - d = factory.createInstance(); - - //Initialize the diagnostic instance - //Set diagnostic id(name), server name(ds.getName()), this connection(system) - d.setUp(name, quiet, ds.getName(),_system, null ,null, null); - - new Thread(d).start(); - } - - } - catch (Exception e) - { - SystemBasePlugin.logError("StatusChangeListener.ICommunicationsDiagnostic exception: ", e); //$NON-NLS-1$ - } - - return d; // return the created diagnostic class instance - } - - -} diff --git a/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/util/StatusMonitorFactory.java b/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/util/StatusMonitorFactory.java deleted file mode 100644 index a132b6e5d..000000000 --- a/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/util/StatusMonitorFactory.java +++ /dev/null @@ -1,78 +0,0 @@ -/******************************************************************************** - * Copyright (c) 2005, 2006 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 - * - * 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: - * {Name} (company) - description of contribution. - ********************************************************************************/ - -package org.eclipse.rse.connectorservice.dstore.util; - -import java.util.HashMap; - -import org.eclipse.dstore.core.model.DataStore; -import org.eclipse.rse.core.subsystems.IConnectorService; - -/** - * Factory for finding and creating the StatusMonitor class for a given system - */ -public class StatusMonitorFactory -{ - protected HashMap _monitorMap; - protected static StatusMonitorFactory _instance; - - public static StatusMonitorFactory getInstance() - { - if (_instance == null) - { - _instance = new StatusMonitorFactory(); - } - return _instance; - } - - public StatusMonitorFactory() - { - _monitorMap= new HashMap(); - } - - public void removeStatusMonitorFor(IConnectorService system) - { - StatusMonitor monitor = (StatusMonitor)_monitorMap.remove(system); - if (monitor != null) - { - monitor.dispose(); - } - } - - public StatusMonitor getStatusMonitorFor(IConnectorService system, DataStore dataStore) - { - return getStatusMonitorFor(system, dataStore, null); - } - - public StatusMonitor getStatusMonitorFor(IConnectorService system, DataStore dataStore, ICommunicationsDiagnosticFactory diagnosticFactory) - { - StatusMonitor monitor = (StatusMonitor)_monitorMap.get(system); - if (monitor == null) - { - monitor = new StatusMonitor(system, dataStore, diagnosticFactory); - _monitorMap.put(system, monitor); - } - DataStore mDataStore = monitor.getDataStore(); - if (mDataStore != dataStore) - { - removeStatusMonitorFor(system); - monitor = new StatusMonitor(system, dataStore, diagnosticFactory); - _monitorMap.put(system, monitor); - } - - return monitor; - } -}
\ No newline at end of file diff --git a/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/internal/connectorservice/dstore/Activator.java b/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/internal/connectorservice/dstore/Activator.java deleted file mode 100644 index d58954f2f..000000000 --- a/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/internal/connectorservice/dstore/Activator.java +++ /dev/null @@ -1,130 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006, 2008 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * 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: - * Martin Oberhuber (Wind River) - [168870] refactor org.eclipse.rse.core package of the UI plugin - * David McKnight (IBM) - [216252] [api][nls] Resource Strings specific to subsystems should be moved from rse.ui into files.ui / shells.ui / processes.ui where possible - * David McKnight (IBM) - [220123] [api][dstore] Configurable timeout on irresponsiveness - * David McKnight (IBM) - [227406] [dstore] DStoreFileService must listen to buffer size preference changes - * David McKnight (IBM) - [228334][api][breaking][dstore] Default DataStore connection timeout is too short - * David McKnight (IBM) - [233160] [dstore] SSL/non-SSL alert are not appropriate - * Martin Oberhuber (Wind River) - [245918] Allow customization of DStore Preferences - *******************************************************************************/ - -package org.eclipse.rse.internal.connectorservice.dstore; - -import org.eclipse.core.runtime.preferences.DefaultScope; -import org.eclipse.jface.preference.IPreferenceStore; -import org.eclipse.rse.connectorservice.dstore.IUniversalDStoreConstants; -import org.eclipse.rse.ui.ISystemPreferencesConstants; -import org.eclipse.rse.ui.RSEUIPlugin; -import org.eclipse.rse.ui.SystemBasePlugin; -import org.eclipse.ui.preferences.ScopedPreferenceStore; -import org.osgi.framework.BundleContext; - -/** - * The main plugin class to be used in the desktop. - */ -public class Activator extends SystemBasePlugin { - - //The shared instance. - private static Activator plugin; - - public final static String PLUGIN_ID = "org.eclipse.rse.connectorservice.dstore"; //$NON-NLS-1$ - - /** - * The constructor. - */ - public Activator() { - plugin = this; - } - - /** - * This method is called upon plug-in activation - */ - public void start(BundleContext context) throws Exception - { - super.start(context); - - initializeDefaultPreferences(); - } - - public void initializeDefaultPreferences() { - - // [245918] Since our Preferences are stored in RSEUIPlugin, we cannot - // use the core.runtime.preferences extension in order to do - // initialization in the correct order (allow overriding by - // plugin_customization.ini). We therefore explicitly check each - // Preference slot, and only set a there isn't one set already. - // This requires explicit access to the DefaultScope(). - // TODO move Preferences to our own PreferenceStore to simplify this - IPreferenceStore store = new ScopedPreferenceStore(new DefaultScope(), RSEUIPlugin.getDefault().getBundle().getSymbolicName()); - //IPreferenceStore store = RSEUIPlugin.getDefault().getPreferenceStore(); - //Preferences store = RSECorePlugin.getDefault().getPluginPreferences(); - - //In DefaultScope, isDefault() means: no value specified in defaultScope, fallback to default-default - //In this case (no default specified yet), we may specify our default - if (store.isDefault(IUniversalDStoreConstants.RESID_PREF_SOCKET_TIMEOUT)) - store.setDefault(IUniversalDStoreConstants.RESID_PREF_SOCKET_TIMEOUT, IDStoreDefaultPreferenceConstants.DEFAULT_PREF_SOCKET_TIMEOUT); - - // do keepalive - if (store.isDefault(IUniversalDStoreConstants.RESID_PREF_DO_KEEPALIVE)) - store.setDefault(IUniversalDStoreConstants.RESID_PREF_DO_KEEPALIVE, IDStoreDefaultPreferenceConstants.DEFAULT_PREF_DO_KEEPALIVE); - - // socket read timeout - if (store.isDefault(IUniversalDStoreConstants.RESID_PREF_SOCKET_READ_TIMEOUT)) - store.setDefault(IUniversalDStoreConstants.RESID_PREF_SOCKET_READ_TIMEOUT, IDStoreDefaultPreferenceConstants.DEFAULT_PREF_SOCKET_READ_TIMEOUT); - - // keepalive response timeout - if (store.isDefault(IUniversalDStoreConstants.RESID_PREF_KEEPALIVE_RESPONSE_TIMEOUT)) - store.setDefault(IUniversalDStoreConstants.RESID_PREF_KEEPALIVE_RESPONSE_TIMEOUT, - IDStoreDefaultPreferenceConstants.DEFAULT_PREF_KEEPALIVE_RESPONSE_TIMEOUT); - - // show mismatched server warning - if (store.isDefault(IUniversalDStoreConstants.ALERT_MISMATCHED_SERVER)) - store.setDefault(IUniversalDStoreConstants.ALERT_MISMATCHED_SERVER, IDStoreDefaultPreferenceConstants.DEFAULT_ALERT_MISMATCHED_SERVER); - - // cache remote classes - if (store.isDefault(IUniversalDStoreConstants.RESID_PREF_CACHE_REMOTE_CLASSES)) - store.setDefault(IUniversalDStoreConstants.RESID_PREF_CACHE_REMOTE_CLASSES, IDStoreDefaultPreferenceConstants.DEFAULT_PREF_CACHE_REMOTE_CLASSES); - - // alert defaults - if (store.isDefault(ISystemPreferencesConstants.ALERT_SSL)) - store.setDefault(ISystemPreferencesConstants.ALERT_SSL, ISystemPreferencesConstants.DEFAULT_ALERT_SSL); - if (store.isDefault(ISystemPreferencesConstants.ALERT_NONSSL)) - store.setDefault(ISystemPreferencesConstants.ALERT_NONSSL, ISystemPreferencesConstants.DEFAULT_ALERT_NON_SSL); - } - - /** - * This method is called when the plug-in is stopped - */ - public void stop(BundleContext context) throws Exception { - super.stop(context); - plugin = null; - } - - /** - * Returns the shared instance. - */ - public static Activator getDefault() { - return plugin; - } - - - - protected void initializeImageRegistry() - { - // TODO Auto-generated method stub - - } -} diff --git a/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/internal/connectorservice/dstore/ConnectorServiceResources.java b/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/internal/connectorservice/dstore/ConnectorServiceResources.java deleted file mode 100644 index 4823906a1..000000000 --- a/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/internal/connectorservice/dstore/ConnectorServiceResources.java +++ /dev/null @@ -1,76 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006, 2008 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * 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 McKnight (IBM) - [216252] [api][nls] Resource Strings specific to subsystems should be moved from rse.ui into files.ui / shells.ui / processes.ui where possible - * David McKnight (IBM) - [220547] [api][breaking] SimpleSystemMessage needs to specify a message id and some messages should be shared - *******************************************************************************/ - -package org.eclipse.rse.internal.connectorservice.dstore; - -import org.eclipse.osgi.util.NLS; - -public class ConnectorServiceResources extends NLS -{ - private static String BUNDLE_NAME = "org.eclipse.rse.internal.connectorservice.dstore.ConnectorServiceResources";//$NON-NLS-1$ - - public static String DStore_ConnectorService_Label; - public static String DStore_ConnectorService_Description; - - - public static String MSG_CONNECT_SSL_EXCEPTION; - public static String MSG_CONNECT_SSL_EXCEPTION_DETAILS; - public static String MSG_STARTING_SERVER_VIA_REXEC; - public static String MSG_STARTING_SERVER_VIA_DAEMON; - - public static String MSG_CONNECTING_TO_SERVER; - public static String MSG_INITIALIZING_SERVER; - public static String MSG_PORT_OUT_RANGE; - - public static String MSG_COMM_CONNECT_FAILED; - public static String MSG_COMM_CONNECT_FAILED_DETAILS; - - public static String MSG_VALIDATE_PASSWORD_EXPIRED; - public static String MSG_VALIDATE_PASSWORD_INVALID; - - public static String MSG_VALIDATE_PASSWORD_EXPIRED_DETAILS; - public static String MSG_VALIDATE_PASSWORD_INVALID_DETAILS; - - public static String MSG_COMM_USING_SSL; - public static String MSG_COMM_NOT_USING_SSL; - - public static String MSG_COMM_SERVER_OLDER_WARNING; - public static String MSG_COMM_CLIENT_OLDER_WARNING; - public static String MSG_COMM_SERVER_OLDER_WARNING_DETAILS; - public static String MSG_COMM_CLIENT_OLDER_WARNING_DETAILS; - - public static String MSG_CONNECT_DAEMON_FAILED; - public static String MSG_CONNECT_DAEMON_FAILED_EXCEPTION; - - public static String MSG_COMM_INCOMPATIBLE_PROTOCOL; - public static String MSG_COMM_INCOMPATIBLE_UPDATE; - public static String MSG_COMM_INCOMPATIBLE_PROTOCOL_DETAILS; - public static String MSG_COMM_INCOMPATIBLE_UPDATE_DETAILS; - - public static String MSG_COMM_INVALID_LOGIN; - public static String MSG_COMM_INVALID_LOGIN_DETAILS; - - - public static String MSG_COMM_REXEC_NOTSTARTED; - public static String MSG_COMM_REXEC_NOTSTARTED_DETAILS; - - static { - // load message values from bundle file - NLS.initializeMessages(BUNDLE_NAME, ConnectorServiceResources.class); - } -} diff --git a/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/internal/connectorservice/dstore/ConnectorServiceResources.properties b/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/internal/connectorservice/dstore/ConnectorServiceResources.properties deleted file mode 100644 index 7bb8eb424..000000000 --- a/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/internal/connectorservice/dstore/ConnectorServiceResources.properties +++ /dev/null @@ -1,76 +0,0 @@ -############################################################################### -# Copyright (c) 2006, 2008 IBM Corporation and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 -# which accompanies this distribution, and is available at -# 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 McKnight (IBM) - [216252] [api][nls] Resource Strings specific to subsystems should be moved from rse.ui into files.ui / shells.ui / processes.ui where possible -# David McKnight (IBM) - [220547] [api][breaking] SimpleSystemMessage needs to specify a message id and some messages should be shared -# David McKnight (IBM) - [223204] [cleanup] fix broken nls strings in files.ui and others -############################################################################### - -# NLS_MESSAGEFORMAT_NONE -# NLS_ENCODING=UTF-8 - -DStore_ConnectorService_Label=DStore Connector Service -DStore_ConnectorService_Description=The DStore Connector Service uses RSE's DataStore protocol to connect to the host. You must have a DataStore daemon or server running on the remote machine. - -MSG_COMM_CONNECT_FAILED=Connection to {0} could not be established. -MSG_COMM_CONNECT_FAILED_DETAILS=A socket connection to {0} could not be established. If you are connecting via the communications daemon make sure the daemon is running on the remote system. If you are connecting directly to the communications server make sure the server is started on the remote system. If you are connecting using REXEC, make sure that the server is installed on the remote system and that the REXEC service is running on that system. - - -MSG_CONNECT_SSL_EXCEPTION = Unable to establish a secure connection with the Remote System Explorer host server. -MSG_CONNECT_SSL_EXCEPTION_DETAILS = Make sure both the client and server are configured to use SSL. The SSL handshake between client and server failed with the following exception: {0} - -MSG_STARTING_SERVER_VIA_REXEC = Remote System Explorer host server using REXEC - -MSG_STARTING_SERVER_VIA_DAEMON = Starting Remote System Explorer host server using daemon - -MSG_CONNECTING_TO_SERVER= Connecting to Remote System Explorer host server on port {0} -MSG_INITIALIZING_SERVER= Initializing Remote System Explorer host server -MSG_PORT_OUT_RANGE = The specified server port is out of the allowed range: {0} - -MSG_VALIDATE_PASSWORD_EXPIRED=Password has expired -MSG_VALIDATE_PASSWORD_EXPIRED_DETAILS=Your password has expired, and must be reset before continuing. - -MSG_VALIDATE_PASSWORD_INVALID=The new password is invalid. -MSG_VALIDATE_PASSWORD_INVALID_DETAILS=The remote system indicated that the new password is unacceptable. Please ensure the new password follows all password rules for the remote system. - -MSG_COMM_USING_SSL=Communication with the remote system {0} has been secured using SSL. Continue? -MSG_COMM_NOT_USING_SSL=Connection {0} has not been secured using SSL. Proceed anyway? - -MSG_COMM_SERVER_OLDER_WARNING=The host server running on remote system {0} is an older version than the RSE client. -MSG_COMM_SERVER_OLDER_WARNING_DETAILS=It is recommended that the client and server versions match. -MSG_COMM_CLIENT_OLDER_WARNING=The host server running on remote system {0} is a newer version than the RSE client. -MSG_COMM_CLIENT_OLDER_WARNING_DETAILS=It is recommended that the client and server versions match. - - -MSG_CONNECT_DAEMON_FAILED=Daemon failed to launch server on {0} using port {1} -MSG_CONNECT_DAEMON_FAILED_EXCEPTION=Failed to connect to the daemon on {0} using port {1} with an unexpected exception - - -MSG_COMM_INCOMPATIBLE_PROTOCOL=Incompatible host server running on remote system {0}. -MSG_COMM_INCOMPATIBLE_PROTOCOL_DETAILS=The host server is not a Remote System Explorer server. - -MSG_COMM_INCOMPATIBLE_UPDATE=Incompatible Remote System Explorer host server running on remote system {0}. -MSG_COMM_INCOMPATIBLE_UPDATE_DETAILS=The host server needs to be updated to work with the current client. - - -MSG_COMM_INVALID_LOGIN=Invalid password or user ID for {0}. -MSG_COMM_INVALID_LOGIN_DETAILS=Message from host: {0} - -MSG_COMM_REXEC_NOTSTARTED=Unable to connect to REXEC host service on port {0} of host {1} -MSG_COMM_REXEC_NOTSTARTED_DETAILS=Message from host: {0} - - - - - diff --git a/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/internal/connectorservice/dstore/DStoreResources.java b/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/internal/connectorservice/dstore/DStoreResources.java deleted file mode 100644 index f05319ec9..000000000 --- a/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/internal/connectorservice/dstore/DStoreResources.java +++ /dev/null @@ -1,49 +0,0 @@ -/******************************************************************************** - * Copyright (c) 2008 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 - * - * Initial Contributors: - * The following IBM employees contributed to the Remote System Explorer - * component that contains this file: David McKnight. - * - * Contributors: - * David McKnight (IBM) - [216596] dstore preferences (timeout, and others) - * David McKnight (IBM) - [220123][dstore] Configurable timeout on irresponsiveness - ********************************************************************************/ -package org.eclipse.rse.internal.connectorservice.dstore; - -import org.eclipse.osgi.util.NLS; - -public class DStoreResources extends NLS { - - private static String BUNDLE_NAME = "org.eclipse.rse.internal.connectorservice.dstore.DStoreResources"; //$NON-NLS-1$ - - public static String RESID_PREFERENCE_CONNECTION_TIMEOUT_LABEL; - public static String RESID_PREFERENCE_CONNECTION_TIMEOUT_TOOLTIP; - - public static String RESID_PREFERENCE_DO_KEEPALIVE_LABEL; - public static String RESID_PREFERENCE_DO_KEEPALIVE_TOOLTIP; - - public static String RESID_PREFERENCE_KEEPALIVE_SOCKET_READ_TIMEOUT_LABEL; - public static String RESID_PREFERENCE_KEEPALIVE_SOCKET_READ_TIMEOUT_TOOLTIP; - - public static String RESID_PREFERENCE_KEEPALIVE_RESPONSE_TIMEOUT_LABEL; - public static String RESID_PREFERENCE_KEEPALIVE_RESPONSE_TIMEOUT_TOOLTIP; - - public static String RESID_PREFERENCE_CACHE_REMOTE_CLASSES_LABEL; - public static String RESID_PREFERENCE_CACHE_REMOTE_CLASSES_TOOLTIP; - - public static String RESID_PREFERENCE_SHOW_MISMATCHED_SERVER_LABEL; - public static String RESID_PREFERENCE_SHOW_MISMATCHED_SERVER_TOOLTIP; - - public static String RESID_PREFERENCE_KEEPALIVE_LABEL; - - static - { - // load message values from bundle file - NLS.initializeMessages(BUNDLE_NAME, DStoreResources.class); - } - -}
\ No newline at end of file diff --git a/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/internal/connectorservice/dstore/DStoreResources.properties b/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/internal/connectorservice/dstore/DStoreResources.properties deleted file mode 100644 index 05267726a..000000000 --- a/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/internal/connectorservice/dstore/DStoreResources.properties +++ /dev/null @@ -1,37 +0,0 @@ -################################################################################ -# Copyright (c) 2008 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 -# -# Initial Contributors: -# The following IBM employees contributed to the Remote System Explorer -# component that contains this file: David McKnight - -# Contributors: -# David McKnight (IBM) - [216596] dstore preferences (timeout, and others) -# David McKnight (IBM) - [220123][dstore] Configurable timeout on irresponsiveness -################################################################################# - -# NLS_MESSAGEFORMAT_VAR -# NLS_ENCODING=UTF-8 - -RESID_PREFERENCE_CONNECTION_TIMEOUT_LABEL=Connection Timeout (ms) -RESID_PREFERENCE_CONNECTION_TIMEOUT_TOOLTIP=Time to wait for establishing a Datastore connection. - -RESID_PREFERENCE_DO_KEEPALIVE_LABEL=Enable Keepalive -RESID_PREFERENCE_DO_KEEPALIVE_TOOLTIP=Keep DataStore connections alive when idle. - -RESID_PREFERENCE_KEEPALIVE_SOCKET_READ_TIMEOUT_LABEL=Socket Read Timeout (ms) -RESID_PREFERENCE_KEEPALIVE_SOCKET_READ_TIMEOUT_TOOLTIP=Time to wait for input on a socket before initiating a keepalive request - -RESID_PREFERENCE_KEEPALIVE_RESPONSE_TIMEOUT_LABEL=Keepalive Response Timeout (ms) -RESID_PREFERENCE_KEEPALIVE_RESPONSE_TIMEOUT_TOOLTIP=Time to wait for a response to a keepalive request - -RESID_PREFERENCE_CACHE_REMOTE_CLASSES_LABEL=Cache Remote Classes -RESID_PREFERENCE_CACHE_REMOTE_CLASSES_TOOLTIP=Cache remote server classes. This is only useful when all required classes are unavailable on the server side. - -RESID_PREFERENCE_SHOW_MISMATCHED_SERVER_LABEL=Show Mismatched Server Warning -RESID_PREFERENCE_SHOW_MISMATCHED_SERVER_TOOLTIP=Show a warning when the DataStore server is compatible but older or newer then the current client. - -RESID_PREFERENCE_KEEPALIVE_LABEL=Keepalive
\ No newline at end of file diff --git a/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/internal/connectorservice/dstore/IConnectorServiceMessageIds.java b/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/internal/connectorservice/dstore/IConnectorServiceMessageIds.java deleted file mode 100644 index e167485f7..000000000 --- a/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/internal/connectorservice/dstore/IConnectorServiceMessageIds.java +++ /dev/null @@ -1,59 +0,0 @@ -/******************************************************************************** - * Copyright (c) 2008 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 - * - * Initial Contributors: - * The following IBM employees contributed to the Remote System Explorer - * component that contains this file: David McKnight. - * - * Contributors: - * David McKnight (IBM) - [220547] [api][breaking] SimpleSystemMessage needs to specify a message id and some messages should be shared - ********************************************************************************/ -package org.eclipse.rse.internal.connectorservice.dstore; - -public interface IConnectorServiceMessageIds { - - public static final String MSG_CONNECT_DAEMON_FAILED = "RSEG1242"; //MSG_CONNECT_PREFIX + "Failed"; //$NON-NLS-1$ - public static final String MSG_CONNECT_DAEMON_FAILED_EXCEPTION = "RSEG1243"; //MSG_CONNECT_PREFIX + "Failed"; //$NON-NLS-1$ - public static final String MSG_CONNECT_SSL_EXCEPTION = "RSEC2307"; //MSG_CONNECT_PREFIX + "Failed"; //$NON-NLS-1$ - - public static final String MSG_STARTING_SERVER_VIA_REXEC = "RSEC2310"; //$NON-NLS-1$ - public static final String MSG_STARTING_SERVER_VIA_DAEMON = "RSEC2311"; //$NON-NLS-1$ - public static final String MSG_CONNECTING_TO_SERVER= "RSEC2312"; //$NON-NLS-1$ - public static final String MSG_INITIALIZING_SERVER= "RSEC2313"; //$NON-NLS-1$ - public static final String MSG_PORT_OUT_RANGE = "RSEC2316"; //$NON-NLS-1$ - - public static final String MSG_COMM_CONNECT_FAILED = "RSEC1001"; //$NON-NLS-1$ - - public static final String MSG_COMM_PWD_EXISTS = "RSEC2101"; //$NON-NLS-1$ - public static final String MSG_COMM_PWD_MISMATCH = "RSEC2102"; //$NON-NLS-1$ - public static final String MSG_COMM_PWD_BLANKFIELD = "RSEC2103"; //$NON-NLS-1$ - - public static final String MSG_COMM_ENVVAR_DUPLICATE = "RSEC2001"; //$NON-NLS-1$ - public static final String MSG_COMM_ENVVAR_NONAME = "RSEC2002"; //$NON-NLS-1$ - public static final String MSG_COMM_ENVVAR_INVALIDCHAR = "RSEC2004"; //$NON-NLS-1$ - - public static final String MSG_COMM_SERVER_NOTSTARTED = "RSEC2301"; //$NON-NLS-1$ - public static final String MSG_COMM_INVALID_LOGIN = "RSEC2302"; //$NON-NLS-1$ - - public static final String MSG_COMM_INCOMPATIBLE_PROTOCOL = "RSEC2303"; //$NON-NLS-1$ - public static final String MSG_COMM_INCOMPATIBLE_UPDATE = "RSEC2304"; //$NON-NLS-1$ - - - public static final String MSG_COMM_REXEC_NOTSTARTED = "RSEC2305"; //$NON-NLS-1$ - - public static final String MSG_COMM_PORT_WARNING = "RSEC2306"; //$NON-NLS-1$ - - public static final String MSG_COMM_SERVER_OLDER_WARNING = "RSEC2308"; //$NON-NLS-1$ - public static final String MSG_COMM_CLIENT_OLDER_WARNING = "RSEC2309"; //$NON-NLS-1$ - - public static final String MSG_COMM_USING_SSL = "RSEC2314"; //$NON-NLS-1$ - public static final String MSG_COMM_NOT_USING_SSL = "RSEC2315"; //$NON-NLS-1$ - - public static final String MSG_VALIDATE_PASSWORD_EMPTY = "RSEG1035"; //MSG_VALIDATE_PREFIX + "PasswordRequired"; //$NON-NLS-1$ - public static final String MSG_VALIDATE_PASSWORD_EXPIRED = "RSEG1036"; //MSG_VALIDATE_PREFIX + "PasswordExpired"; //$NON-NLS-1$ - public static final String MSG_VALIDATE_PASSWORD_INVALID = "RSEG1297"; //$NON-NLS-1$ - -} diff --git a/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/internal/connectorservice/dstore/IDStoreDefaultPreferenceConstants.java b/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/internal/connectorservice/dstore/IDStoreDefaultPreferenceConstants.java deleted file mode 100644 index bdcdd3760..000000000 --- a/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/internal/connectorservice/dstore/IDStoreDefaultPreferenceConstants.java +++ /dev/null @@ -1,23 +0,0 @@ -/******************************************************************************** - * Copyright (c) 2008 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 - * - * Initial Contributors: - * The following IBM employees contributed to the Remote System Explorer - * component that contains this file: David McKnight. - * - * Contributors: - * David McKnight (IBM) - [228334][api][breaking][dstore] Default DataStore connection timeout is too short - ********************************************************************************/ -package org.eclipse.rse.internal.connectorservice.dstore; - -public interface IDStoreDefaultPreferenceConstants { - public static final boolean DEFAULT_PREF_CACHE_REMOTE_CLASSES = true; - public static final int DEFAULT_PREF_SOCKET_TIMEOUT = 5000; - public static final boolean DEFAULT_PREF_DO_KEEPALIVE = true; - public static final int DEFAULT_PREF_KEEPALIVE_RESPONSE_TIMEOUT = 60000; - public static final int DEFAULT_PREF_SOCKET_READ_TIMEOUT = 3600000; - public static final boolean DEFAULT_ALERT_MISMATCHED_SERVER = true; -} diff --git a/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/internal/connectorservice/dstore/RexecDstoreServer.java b/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/internal/connectorservice/dstore/RexecDstoreServer.java deleted file mode 100644 index 97fc4df66..000000000 --- a/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/internal/connectorservice/dstore/RexecDstoreServer.java +++ /dev/null @@ -1,1219 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2002, 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 - * - * 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: - * Martin Oberhuber (Wind River) - [186128] Move IProgressMonitor last in all API - * Martin Oberhuber (Wind River) - [186640] Add IRSESystemType.testProperty() - * Martin Oberhuber (Wind River) - [168870] refactor org.eclipse.rse.core package of the UI plugin - * David McKnight (IBM) - [220547] [api][breaking] SimpleSystemMessage needs to specify a message id and some messages should be shared - * 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 - *******************************************************************************/ - -package org.eclipse.rse.internal.connectorservice.dstore; - -import java.io.DataInputStream; -import java.io.DataOutputStream; -import java.io.EOFException; -import java.net.Socket; - -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.dstore.core.client.ClientConnection; -import org.eclipse.dstore.core.client.ConnectionStatus; -import org.eclipse.osgi.util.NLS; -import org.eclipse.rse.core.model.SystemSignonInformation; -import org.eclipse.rse.core.subsystems.IRemoteServerLauncher; -import org.eclipse.rse.core.subsystems.IServerLauncher; -import org.eclipse.rse.core.subsystems.IServerLauncherProperties; -import org.eclipse.rse.services.clientserver.messages.SimpleSystemMessage; -import org.eclipse.rse.services.clientserver.messages.SystemMessage; -import org.eclipse.rse.ui.SystemBasePlugin; - -/** - * Launch Datastore server on selected host using the rexec - * protocol - */ -public class RexecDstoreServer implements IServerLauncher -{ - private SystemMessage _errorMessage; - private SystemSignonInformation signonInfo; - //private String host = null; - private String cwd = null; - private String invocation = null; - //private String userID = null; - private int rexecPort = 512; // the port where rexecd normally listens - private String cmd = null; - //private String pwd = null; - private static String ASCII_TEST_STRING = "ASCII"; //$NON-NLS-1$ - private static String PORT_LEADING_STRING = "Server Started Successfully"; //$NON-NLS-1$ - private static final String EZYRD11E="EZYRD11E"; //$NON-NLS-1$ - private ClientConnection clientConnection; - private IServerLauncherProperties propertyInfo; - private boolean isModeChecked = false; - private boolean checkPort =true; - private boolean logInfo = false; - private int _socketTimeoutValue = IDStoreDefaultPreferenceConstants.DEFAULT_PREF_SOCKET_TIMEOUT; - - private static char[] ebcdictounicode = - { - 0x0000, - 0x0001, - 0x0002, - 0x0003, - 0x0000, - 0x0009, - 0x0000, - 0x007F, - 0x0000, - 0x0000, - 0x0000, - 0x000B, - 0x000C, - 0x000D, - 0x000E, - 0x000F, - 0x0010, - 0x0011, - 0x0012, - 0x0013, - 0x0000, - 0x000A, - 0x0008, - 0x0000, - 0x0018, - 0x0019, - 0x0000, - 0x0000, - 0x0000, - 0x0000, - 0x0000, - 0x0000, - 0x0000, - 0x0000, - 0x001C, - 0x0000, - 0x0000, - 0x000A, - 0x0017, - 0x001B, - 0x0000, - 0x0000, - 0x0000, - 0x0000, - 0x0000, - 0x0005, - 0x0006, - 0x0007, - 0x0000, - 0x0000, - 0x0016, - 0x0000, - 0x0000, - 0x0000, - 0x0000, - 0x0004, - 0x0000, - 0x0000, - 0x0000, - 0x0000, - 0x0014, - 0x0015, - 0x0000, - 0x001A, - 0x0020, - 0x0000, - 0x0000, - 0x0000, - 0x0000, - 0x0000, - 0x0000, - 0x0000, - 0x0000, - 0x0000, - 0x0000, - 0x002E, - 0x003C, - 0x0028, - 0x002B, - 0x007C, - 0x0026, - 0x0000, - 0x0000, - 0x0000, - 0x0000, - 0x0000, - 0x0000, - 0x0000, - 0x0000, - 0x0000, - 0x0021, - 0x0024, - 0x002A, - 0x0029, - 0x003B, - 0x0000, - 0x002D, - 0x002F, - 0x0000, - 0x0000, - 0x0000, - 0x0000, - 0x0000, - 0x0000, - 0x0000, - 0x0000, - 0x007C, - 0x002C, - 0x0025, - 0x005F, - 0x003E, - 0x003F, - 0x0000, - 0x0000, - 0x0000, - 0x0000, - 0x0000, - 0x0000, - 0x0000, - 0x0000, - 0x0000, - 0x0060, - 0x003A, - 0x0023, - 0x0040, - 0x0027, - 0x003D, - 0x0022, - 0x0000, - 0x0061, - 0x0062, - 0x0063, - 0x0064, - 0x0065, - 0x0066, - 0x0067, - 0x0068, - 0x0069, - 0x0000, - 0x007B, - 0x0000, - 0x0000, - 0x0000, - 0x002B, - 0x0000, - 0x006A, - 0x006B, - 0x006C, - 0x006D, - 0x006E, - 0x006F, - 0x0070, - 0x0071, - 0x0072, - 0x0000, - 0x007D, - 0x0000, - 0x0000, - 0x0000, - 0x0000, - 0x0000, - 0x0000, - 0x0073, - 0x0074, - 0x0075, - 0x0076, - 0x0077, - 0x0078, - 0x0079, - 0x007A, - 0x0000, - 0x0000, - 0x0000, - 0x005B, - 0x0000, - 0x0000, - 0x0000, - 0x0000, - 0x0000, - 0x0000, - 0x0000, - 0x0000, - 0x0000, - 0x0000, - 0x0000, - 0x0000, - 0x0000, - 0x0000, - 0x0000, - 0x005D, - 0x0000, - 0x002D, - 0x007D, - 0x0041, - 0x0042, - 0x0043, - 0x0044, - 0x0045, - 0x0046, - 0x0047, - 0x0048, - 0x0049, - 0x0000, - 0x0000, - 0x0000, - 0x0000, - 0x0000, - 0x0000, - 0x007D, - 0x004A, - 0x004B, - 0x004C, - 0x004D, - 0x004E, - 0x004F, - 0x0050, - 0x0051, - 0x0052, - 0x0000, - 0x0000, - 0x0000, - 0x0000, - 0x0000, - 0x0000, - 0x005C, - 0x0000, - 0x0053, - 0x0054, - 0x0055, - 0x0056, - 0x0057, - 0x0058, - 0x0059, - 0x005A, - 0x0000, - 0x0000, - 0x0000, - 0x0000, - 0x0000, - 0x0000, - 0x0030, - 0x0031, - 0x0032, - 0x0033, - 0x0034, - 0x0035, - 0x0036, - 0x0037, - 0x0038, - 0x0039, - 0x0000, - 0x0000, - 0x0000, - 0x0000, - 0x0000, - 0x0000 }; - - /** - * Constructor - */ - public RexecDstoreServer() - { - super(); - } - - /** - * Set the datastore client connection. This is reset for each connect() - */ - public void setClientConnection(ClientConnection clientConnection) - { - this.clientConnection = clientConnection; - } - - /** - * Set the remote system signon information - */ - public void setSignonInformation(SystemSignonInformation info) - { - this.signonInfo = info; - } - - /** - * Get the remote system signon information, as set in - * {@link #setSignonInformation(SystemSignonInformation)} - */ - public SystemSignonInformation getSignonInformation() - { - return signonInfo; - } - - /** - * Set the object which contains the user-specified properties that - * are used by this launcher - */ - public void setServerLauncherProperties(IServerLauncherProperties propertyInfo) - { - this.propertyInfo = propertyInfo; - - // set path... - this.cwd = ((IRemoteServerLauncher)propertyInfo).getServerPath(); - char separatorChar = signonInfo.getSystemType().isWindows() ? '\\' : '/'; - if (cwd.length() > 0 && cwd.charAt(cwd.length() - 1) != separatorChar) - cwd += separatorChar; - // set script... - this.invocation = ((IRemoteServerLauncher)propertyInfo).getServerScript(); - - // set port - this.rexecPort = ((IRemoteServerLauncher)propertyInfo).getRexecPort(); - - } - - /** - * Get the object which contians the user-specified properties that are - * used by this launcher. As set in {@link #setServerLauncherProperties(IServerLauncherProperties)}. - */ - public IServerLauncherProperties getServerLauncherProperties() - { - return propertyInfo; - } - - /** - * Determine if the remote server needs to be launched or not. - * Generally is always false. - */ - public boolean isLaunched() - { - return false; - } - - /** - * Send a command to the host via rexec to launch the datastore server - * under the specified user ID/pwd. the datastore server will emit - * messages that include the port number on which the server is listening - * for client connections - * - * @return port number as String - */ - /* - * There used to be a problem in Communications Server for z/OS and - * the message from the REXEC daemon was in EBCDIC. see APAR PQ76782. - * Since this problem was fixed in Communication Server, there is no need to convert EBCDIC to ASCII - */ - // updated method - public Object launch(IProgressMonitor monitor) throws Exception - { - - boolean isEBCDICTest=false; - isModeChecked= false; - checkPort=true; - _errorMessage = null; - String port = new String("0"); // default no port //$NON-NLS-1$ - //String hostResponse = ""; //buffer to hold all the messages, so that it can be printed out later - String originalHostResponse=""; //$NON-NLS-1$ - String convertedHostResponse=""; //$NON-NLS-1$ - String debugOptions = System.getProperty("REXEC_DEBUG"); //$NON-NLS-1$ - if (debugOptions!= null){ - if (debugOptions.toUpperCase().indexOf("LOG") > -1) //$NON-NLS-1$ - logInfo = true; - if (debugOptions.toUpperCase().indexOf("EBCDIC") > -1) //$NON-NLS-1$ - isEBCDICTest=true; - } - boolean isEBCDIC = false; - try - { - - // establish socket for rexec connection - Socket rexecCall = new Socket(signonInfo.getHostname(), rexecPort); // rexec listens here - 512 - - // set socket timeout value - rexecCall.setSoTimeout(_socketTimeoutValue); - - // set up data streams on rexec socket - DataOutputStream rxOut = new DataOutputStream(rexecCall.getOutputStream()); - DataInputStream rxIn = new DataInputStream(rexecCall.getInputStream()); - - // we're not opening a socket for stderr to circumvent problems that - // may arise if the client is behind a firewall with respect to the - // host, in which case the rexec daemon may have trouble connecting - // to the client error port. - // Not sending a port number at this point indicates to the daemon - // that there is no error socket to establish. - rxOut.writeByte(0); // send null terminator - rxOut.flush(); - - // send userid and password on rexec socket - rxOut.writeBytes(signonInfo.getUserId()); - rxOut.writeByte(0); // send null terminator - rxOut.writeBytes(signonInfo.getPassword()); - rxOut.writeByte(0); // send null terminator - rxOut.flush(); - - // send the command on rexec socket to start datastore daemon listening - // on any port - // TODO - assumes a particular script and location to start the server, - // this should be stored in some resource bundle later - //cmd = new String ("echo USSTEST;cd ~/dstore;start_anyport"); - //cmd = new String("echo " + ASCII_TEST_STRING + ";cd ~/rseserver;start_anyport"); - cmd = new String("echo " + ASCII_TEST_STRING + ";cd " + this.cwd + ";" + this.invocation); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - //cmd = new String("echo " + ASCII_TEST_STRING + ";cd " + this.cwd + ";" + this.invocation + " " + System.getProperty("user.name")); - logMessage("The command is " + cmd); //$NON-NLS-1$ - SystemBasePlugin.logInfo("RexecDstoreServer :"); //$NON-NLS-1$ - - rxOut.writeBytes(cmd); - rxOut.writeByte(0); // send null terminator - rxOut.flush(); - - int inBytes = rxIn.available(); // any data available? - - int timeout = _socketTimeoutValue; - - while (inBytes == 0 && timeout > 0) - { - if (monitor.isCanceled()) // Cancel button pressed? - return "0"; //$NON-NLS-1$ - - // try for more input - Thread.sleep(100); - inBytes = rxIn.available(); - timeout--; - } - - if (timeout == 0) { - String msgTxt = NLS.bind(ConnectorServiceResources.MSG_COMM_INVALID_LOGIN, signonInfo.getHostname()); - String msgDetails = NLS.bind(ConnectorServiceResources.MSG_COMM_INVALID_LOGIN_DETAILS, ""); //$NON-NLS-1$ - - SystemMessage msg = new SimpleSystemMessage(Activator.PLUGIN_ID, IConnectorServiceMessageIds.MSG_COMM_INVALID_LOGIN, IStatus.ERROR, msgTxt, msgDetails); - _errorMessage = msg; - return port; - } - - // get command output on socket, one byte at a time until - // got the datastore port number or EOF is reached for this input - String maybePort=null; - while (true ){ - if (monitor.isCanceled()) - return "0"; //$NON-NLS-1$ - byte aByte = rxIn.readByte(); - if (isEBCDICTest) - aByte = convertFromASCIIToEBCDIC(aByte); // for EBCDIC Test - if (aByte == 0) // drop the null - continue; - originalHostResponse += (char)aByte; - logMessage("Host response is " + originalHostResponse); //$NON-NLS-1$ - if (!isModeChecked) - { - convertedHostResponse += convertFromEBCDICToASCII(aByte); - logMessage("Host response is converted to " + convertedHostResponse); //$NON-NLS-1$ - if (originalHostResponse.indexOf(ASCII_TEST_STRING) > -1) - { // It's ASCII mode - isModeChecked = true; - logMessage("This is the ASCII mode. "); //$NON-NLS-1$ - } - else if (convertedHostResponse.indexOf(ASCII_TEST_STRING) > -1) - { // It's EBCDIC mode - logMessage("This is the EBCDIC mode. "); //$NON-NLS-1$ - isModeChecked = true; - isEBCDIC = true; - } - } - else - { - if (isEBCDIC) - { - convertedHostResponse += convertFromEBCDICToASCII(aByte); - logMessage("Host response is converted to " + convertedHostResponse); //$NON-NLS-1$ - if(checkPort) - { // It's EBCDIC mode - maybePort = extractPortNumber (convertedHostResponse); - } - } - else if (checkPort) - { // it's ASCII - maybePort = extractPortNumber (originalHostResponse); - } - if (maybePort == null) - continue ; - port = maybePort; - break; - } - } - // ----------------------------------------------------------------- - // Close input/output streams and socket - // ----------------------------------------------------------------- - rxIn.close(); - rxOut.close(); - rexecCall.close(); - logMessage("Going to return port " + port); //$NON-NLS-1$ - return port; - } - catch (EOFException e) - { - // do nothing - } - catch (Exception e) - { - e.printStackTrace(); - } - // if no port is found, create error message - String hostMessage = originalHostResponse; - if (isEBCDIC) // pick up the right messages - hostMessage = convertedHostResponse; - int index = hostMessage.indexOf(ASCII_TEST_STRING); - if (index > -1) // remove the embedded ASCII_TEST_STRING - hostMessage = hostMessage.substring(0,index) + hostMessage.substring(index+1+ASCII_TEST_STRING.length()); - if (hostMessage.indexOf(EZYRD11E) >0 ){ - String msgTxt = NLS.bind(ConnectorServiceResources.MSG_COMM_INVALID_LOGIN, signonInfo.getHostname()); - String msgDetails = NLS.bind(ConnectorServiceResources.MSG_COMM_INVALID_LOGIN_DETAILS, hostMessage); - - SystemMessage msg = new SimpleSystemMessage(Activator.PLUGIN_ID, IConnectorServiceMessageIds.MSG_COMM_INVALID_LOGIN, IStatus.ERROR, msgTxt, msgDetails); - _errorMessage = msg; - } else { - String msgTxt = NLS.bind(ConnectorServiceResources.MSG_COMM_REXEC_NOTSTARTED, ""+rexecPort, signonInfo.getHostname()); //$NON-NLS-1$ - String msgDetails = NLS.bind(ConnectorServiceResources.MSG_COMM_REXEC_NOTSTARTED_DETAILS, hostMessage); - - SystemMessage msg = new SimpleSystemMessage(Activator.PLUGIN_ID, IConnectorServiceMessageIds.MSG_COMM_REXEC_NOTSTARTED, IStatus.ERROR, msgTxt, msgDetails); - _errorMessage = msg; - - } - - return port; - } - /** - * @param newLine - * @return - */ - /* - private String checkCodePage(String newLine) { - // check in which mode the host is sending the message back - if (isModeChecked) - return newLine; - if (newLine.indexOf(ASCII_TEST_STRING) > -1){ // It's ASCII mode - isASCIIMode = true; - isModeChecked = true; - } else { // Check whether it's EBCDIC mode - String convertedNewLine = convertFromEBCDICToASCII(newLine.toCharArray()); - if (convertedNewLine.indexOf(ASCII_TEST_STRING) > -1){ - isASCIIMode = false; - isModeChecked = true; - } - } - return newLine; - } - */ - /* wait until host responds with some data - at least should send null byte */ -/* char cChar; - int inBytes = rxIn.available(); // any data available? - StringBuffer buf = new StringBuffer(); - String chunk = null; - - while (inBytes == 0) - { - if (monitor.isCanceled()) - return "0"; - - // try for more input - Thread.sleep(100); - - inBytes = rxIn.available(); - } - - // get command output on socket, one byte at a time until - // got the datastore port number or EOF is reached for this input - byte[] bDSPort = new byte[4]; - byte[] byteBuf = new byte[8]; - int index; - if (inBytes > 0) - { - byte aByte = rxIn.readByte(); - cChar = (char)aByte; // discard first null byte - -// port = getPortASCII(rxIn); - // should have at least 8 bytes plus newline from the "echo USSTEST" command. This is - // used to test if the data being returned is ASCII or EBCDIC - for (index = 0; index < ASCII_TEST_STRING.length(); index++) - { // include newline too - aByte = rxIn.readByte(); - cChar = (char)aByte; - buf.append(cChar); - byteBuf[index] = aByte; - } - chunk = new String(buf); - - if (chunk.indexOf(ASCII_TEST_STRING) >= 0) - { - // returned data is ASCII - port = getPortASCII(rxIn); - } - else - { - - chunk = convertFromEBCDICToASCII(byteBuf); - if (chunk.indexOf(ASCII_TEST_STRING) >= 0) - { - - // returned data is EBCDIC - port = getPortEBCDIC(rxIn); - } - else - { - // rexec error! - // there's an error - while (cChar != '\n') - { - cChar = (char) rxIn.readByte(); - buf.append(cChar); - } - SystemMessage msg = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_COMM_INVALID_LOGIN); - msg.makeSubstitution(signonInfo.getHostname(), buf.toString()); - _errorMessage = msg; - } - } - } - rxIn.close(); - rxOut.close(); - rexecCall.close(); - - } - catch (Exception e) - { - System.out.println(e); - SystemMessage msg = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_COMM_REXEC_NOTSTARTED); - msg.makeSubstitution(""+rexecPort, signonInfo.getHostname(), e.getMessage()); - _errorMessage = msg; - } - - return port; - } // end of launch method - */ - /* original method - public Object launch(IProgressMonitor monitor) throws Exception - { - _errorMessage = null; - String port = new String("0"); // default no port - try - { - - // establish socket for rexec connection - Socket rexecCall = new Socket(signonInfo.getHostname(), rexecPort); // rexec listens here - 512 - - // set up data streams on rexec socket - DataOutputStream rxOut = new DataOutputStream(rexecCall.getOutputStream()); - DataInputStream rxIn = new DataInputStream(rexecCall.getInputStream()); - - // we're not opening a socket for stderr to circumvent problems that - // may arise if the client is behind a firewall with respect to the - // host, in which case the rexec daemon may have trouble connecting - // to the client error port. - // Not sending a port number at this point indicates to the daemon - // that there is no error socket to establish. - rxOut.writeByte((int) 0); // send null terminator - rxOut.flush(); - - // send userid and password on rexec socket - rxOut.writeBytes(signonInfo.getUserid()); - rxOut.writeByte((int) 0); // send null terminator - rxOut.writeBytes(signonInfo.getPassword()); - rxOut.writeByte((int) 0); // send null terminator - rxOut.flush(); - - // send the command on rexec socket to start datastore daemon listening - // on any port - // TODO - assumes a particular script and location to start the server, - // this should be stored in some resource bundle later - //cmd = new String ("echo USSTEST;cd ~/dstore;start_anyport"); - //cmd = new String("echo " + ASCII_TEST_STRING + ";cd ~/rseserver;start_anyport"); - cmd = new String("echo " + ASCII_TEST_STRING + ";cd " + this.cwd + ";" + this.invocation); - - rxOut.writeBytes(cmd); - rxOut.writeByte((int) 0); // send null terminator - rxOut.flush(); - - // wait until host responds with some data - at least should send null byte - - char cChar; - int inBytes = rxIn.available(); // any data available? - StringBuffer buf = new StringBuffer(); - String chunk = null; - - while (inBytes == 0) - { - if (monitor.isCanceled()) - return "0"; - - // try for more input - Thread.sleep(100); - - inBytes = rxIn.available(); - } - - // get command output on socket, one byte at a time until - // got the datastore port number or EOF is reached for this input - byte[] bDSPort = new byte[4]; - byte[] byteBuf = new byte[8]; - int index; - if (inBytes > 0) - { - byte aByte = rxIn.readByte(); - cChar = (char)aByte; // discard first null byte - - // should have at least 8 bytes plus newline from the "echo USSTEST" command. This is - // used to test if the data being returned is ASCII or EBCDIC - for (index = 0; index < ASCII_TEST_STRING.length(); index++) - { // include newline too - aByte = rxIn.readByte(); - cChar = (char)aByte; - buf.append(cChar); - byteBuf[index] = aByte; - } - chunk = new String(buf); - - if (chunk.indexOf(ASCII_TEST_STRING) >= 0) - { - // returned data is ASCII - port = getPortASCII(rxIn); - } - else - { - - chunk = convertFromEBCDICToASCII(byteBuf); - if (chunk.indexOf(ASCII_TEST_STRING) >= 0) - { - - // returned data is EBCDIC - port = getPortEBCDIC(rxIn); - } - else - { - // rexec error! - // there's an error - while (cChar != '\n') - { - cChar = (char) rxIn.readByte(); - buf.append(cChar); - } - SystemMessage msg = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_COMM_INVALID_LOGIN); - msg.makeSubstitution(signonInfo.getHostname(), buf.toString()); - _errorMessage = msg; - } - } - - } - rxIn.close(); - rxOut.close(); - rexecCall.close(); - - } - catch (Exception e) - { - System.out.println(e); - SystemMessage msg = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_COMM_REXEC_NOTSTARTED); - msg.makeSubstitution(""+rexecPort, signonInfo.getHostname(), e.getMessage()); - _errorMessage = msg; - } - - return port; - } // end of launch method -*/ - /** - * Determine if we are connected to the remote server or not. - * @return true if we are connected, false otherwise. - */ - public boolean isConnected() - { - if (clientConnection != null) - { - return clientConnection.isConnected(); - } - return false; - } - - /** - * Connect to the remote server. - * @param connectPort the port to use for launching the server - * @param monitor a monitor for showing progress - * @see #getErrorMessage() - * @return Anything you want. - */ - public Object connect(int connectPort, IProgressMonitor monitor) throws Exception - { - clientConnection.setPort(Integer.toString(connectPort)); - - if (monitor != null) - { - String cmsg = NLS.bind(ConnectorServiceResources.MSG_CONNECTING_TO_SERVER, clientConnection.getPort()); - monitor.subTask(cmsg); - } - - // connect to launched server - ConnectionStatus connectStatus = clientConnection.connect(null); - - return connectStatus; - } - - /** - * Disconnect from the remote server - * @see #getErrorMessage() - */ - public void disconnect() throws Exception - { - if (clientConnection != null) - { - /* TODO! - // Is disconnect being called because the network (connection) went down? - if (_connectionStatusListener != null && _connectionStatusListener.isConnectionDown()) - { - fireCommunicationsEvent(CommunicationsEvent.CONNECTION_ERROR); - } - else - { - // Fire comm event to signal state about to change - fireCommunicationsEvent(CommunicationsEvent.BEFORE_DISCONNECT); - } - - DataStore dataStore = getDataStore(); - if (dataStore != null && _connectionStatusListener != null) - { - dataStore.getDomainNotifier().removeDomainListener(_connectionStatusListener); - } - - clientConnection.disconnect(); - clientConnection = null; - getUserId(); // Clear any cached local user IDs - sysInfo = null; - - // Fire comm event to signal state changed - fireCommunicationsEvent(CommunicationsEvent.AFTER_DISCONNECT); - */ - clientConnection.disconnect(); - clientConnection = null; - } - } - - /** - * Return the last error message issued - */ - public SystemMessage getErrorMessage() - { - return _errorMessage; - } - - // ------------------ - // PRIVATE METHODS... - // ------------------ -/* - // sam private String convertFromEBCDICToASCII(byte[] eBytes) - private String convertFromEBCDICToASCII(char[] eBytes) - { - - StringBuffer buf = new StringBuffer(); - for (int i = 0; i < eBytes.length; i++) - { - byte bByte = (byte)eBytes[i]; - int index = bByte; - if (index < 0) - { - index = 256 + index; - } - char cChar = ebcdictounicode[index]; - buf.append(cChar); - } - return buf.toString(); - } -*/ - /** - * Read the data returned on the rexec port as ASCII characters and - * detect the port number in the datastore server messages - * @param rxIn - * @return String port number - */ - /* - private String getPortASCII(DataInputStream rxIn) - { - String port = new String("0"); // default to no port - char cChar; - byte bByte; - int numPortChars = 5; - byte[] bDSPort = new byte[numPortChars]; - StringBuffer buf = new StringBuffer(); - StringBuffer diagnosticString = new StringBuffer(); - String chunk = null; - boolean serverStartedMsg = false; - while (true) - { - try - { - cChar = (char) rxIn.readByte(); - if (cChar == '\n') - { // hit a newline - chunk = new String(buf); - - // DKM: need to handle mixed order cases - - if (chunk.indexOf("Server Started Successfully") >= 0) - { - serverStartedMsg = true; - // this server output precedes the datastore server port number - buf.delete(0, buf.length()); // clear buffer - - // might have already got port - // check first - if (port.equals("0")) - { - rxIn.read(bDSPort, 0, numPortChars); // get next 4 bytes - datastore port # - for (int i = 0; i < numPortChars; i++) - { - char c = (char) bDSPort[i]; - if (Character.isDigit(c)) - buf.append(c); - } - port = new String(buf); // got port where datastore server is listening - - // check for valid port - try - { - int possiblePort = Integer.parseInt(port); - break; - - } - catch (Exception e) - { - // not valid - } - } - - } - else - { - // might be the port - try - { - int possiblePort = Integer.parseInt(chunk); - port = chunk; - if (serverStartedMsg) - break; - } - catch (Exception e) - { - } - } - - buf.delete(0, buf.length()); // clear buffer - } - else - { - diagnosticString.append(cChar); - buf.append(cChar); - } - } - // EOF indicates no more lines to come through on error socket - catch (EOFException e) - { - break; - } - catch (IOException e) - { - break; - } - } // end of while true - - // if port is somethign wierd...log this - if (port.equals("0")) - { - // port is weird! - - try - { - - int available = rxIn.available(); - while (available > 0) - { - rxIn.read(bDSPort, 0, numPortChars); - for (int i = 0; i < numPortChars; i++) - { - char c = (char) bDSPort[i]; - diagnosticString.append(c); - } - available = rxIn.available(); - } - - } - catch (Exception ex) - { - } - - SystemMessage msg = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_COMM_SERVER_NOTSTARTED); - diagnosticString.insert(0, "\n\n"); - msg.makeSubstitution(signonInfo.getHostname(), diagnosticString.toString()); - - _errorMessage = msg; - } - - return port; - } -*/ - /** - * Read the data returned on the rexec port as EBCDIC characters and - * convert to unicode. Detect the port number in the datastore server messages - * @param rxIn - * @return String port number - */ - /* - private String getPortEBCDIC(DataInputStream rxIn) - { - String port = new String("0"); // default to no port - int index; - char cChar; - byte bByte; - byte[] bDSPort = new byte[4]; - StringBuffer buf = new StringBuffer(); - String chunk = null; - while (true) - { - try - { - bByte = rxIn.readByte(); - index = bByte; - if (index < 0) - { - index = 256 + index; - } - cChar = ebcdictounicode[index]; - if (cChar == '\n') - { // hit a newline - chunk = new String(buf); - - if (chunk.indexOf("Server Started Successfully") >= 0) - { - // this server output precedes the datastore server port number - buf.delete(0, buf.length()); // clear buffer - rxIn.read(bDSPort, 0, 4); // get next 4 bytes - datastore port # - for (int i = 0; i < 4; i++) - { - index = bDSPort[i]; - if (index < 0) - { - index = 256 + index; - } - buf.append(ebcdictounicode[index]); - } - port = new String(buf); // got port where datastore server is listening - break; - } - buf.delete(0, buf.length()); // clear buffer - } - else - { - buf.append(cChar); - } - } - // EOF indicates no more lines to come through on error socket - catch (EOFException e) - { - break; - } - catch (IOException e) - { - break; - } - } // end of while true - return port; - } - */ - private String extractPortNumber (String hostResponse) { - String port ="0"; //$NON-NLS-1$ - logMessage("Going to find port number. "); //$NON-NLS-1$ - int index = hostResponse.indexOf(PORT_LEADING_STRING); - if ( index < 0 ) - return null; - logMessage("Found the leading string. "); //$NON-NLS-1$ - String portString = hostResponse.substring(index + PORT_LEADING_STRING.length()); - logMessage("Removed the leading string as " + portString); //$NON-NLS-1$ - if (portString != null && portString.startsWith("\n")) //$NON-NLS-1$ - portString = portString.substring(1); - if (portString == null) - return null; - - //if (portString.length() < 4) - // return null; - - // change to support 5 digit ports - StringBuffer portBuffer = new StringBuffer(); - - for (int i = 0; i < portString.length(); i++) - { - char c = portString.charAt(i); - if (Character.isDigit(c)) - { - portBuffer.append(c); - } - } - - if (portString.length() != portBuffer.length()) - { - port = portBuffer.toString(); - // old code - didn't support 5 digits - //port = portString.substring(0,4); - - logMessage("Got the port " + port); //$NON-NLS-1$ - try - { - Integer.parseInt(port); - logMessage("Going to return port " + port); //$NON-NLS-1$ - return port; - } - catch (RuntimeException e) - { - e.printStackTrace(); - logMessage("Got the wrong port " + port); //$NON-NLS-1$ - checkPort=false; - return null; - } - } - else - { - return null; - } - } - private char convertFromEBCDICToASCII(byte eByte) - { - int index = eByte; - if (index < 0) - { - index = 256 + index; - } - return ebcdictounicode[index]; - } - private byte convertFromASCIIToEBCDIC(byte eByte) - { - int index = eByte; - for (int i = 0; i <ebcdictounicode.length; i++) { - if (index == ebcdictounicode[i]){ - if (i > 128) - return (byte )(i - 256); - return (byte)i; - } - - } - return (byte)0; - } - private void logMessage (String message) { - if (logInfo) - SystemBasePlugin.logError("RexecDstoreServer :" + message); //$NON-NLS-1$ - } - - public void setSocketTimeoutValue(int value) - { - _socketTimeoutValue = value; - } -} diff --git a/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/internal/connectorservice/dstore/ui/propertypages/DStorePreferencePage.java b/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/internal/connectorservice/dstore/ui/propertypages/DStorePreferencePage.java deleted file mode 100644 index 58f95f2a1..000000000 --- a/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/internal/connectorservice/dstore/ui/propertypages/DStorePreferencePage.java +++ /dev/null @@ -1,333 +0,0 @@ -/******************************************************************************** - * Copyright (c) 2008 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 - * - * Initial Contributors: - * The following IBM employees contributed to the Remote System Explorer - * component that contains this file: David McKnight. - * - * Contributors: - * David McKnight (IBM) - [216596] dstore preferences (timeout, and others) - * David McKnight (IBM) - [220123][dstore] Configurable timeout on irresponsiveness - * David McKnight (IBM) - [228334][api][breaking][dstore] Default DataStore connection timeout is too short - * David Dykstal (IBM) - [232317] add help for this preference page - ********************************************************************************/ -package org.eclipse.rse.internal.connectorservice.dstore.ui.propertypages; - -import org.eclipse.jface.preference.IPreferenceStore; -import org.eclipse.jface.preference.PreferencePage; -import org.eclipse.rse.connectorservice.dstore.IUniversalDStoreConstants; -import org.eclipse.rse.internal.connectorservice.dstore.DStoreResources; -import org.eclipse.rse.ui.RSEUIPlugin; -import org.eclipse.rse.ui.SystemWidgetHelpers; -import org.eclipse.swt.SWT; -import org.eclipse.swt.events.VerifyEvent; -import org.eclipse.swt.events.VerifyListener; -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.Control; -import org.eclipse.swt.widgets.Event; -import org.eclipse.swt.widgets.Group; -import org.eclipse.swt.widgets.Listener; -import org.eclipse.swt.widgets.Text; -import org.eclipse.ui.IWorkbench; -import org.eclipse.ui.IWorkbenchPreferencePage; -import org.eclipse.ui.PlatformUI; - -public class DStorePreferencePage extends PreferencePage implements IWorkbenchPreferencePage, Listener -{ - - private Text _connectionTimeout; - private Button _doKeepaliveButton; - private Text _keepaliveResponseTimeout; - private Text _socketReadTimeout; - -// private Button _cacheRemoteClassesButton; - private Button _showMismatchedServerWarningButton; - - protected Control createContents(Composite gparent) { - - PlatformUI.getWorkbench().getHelpSystem().setHelp(getControl(), RSEUIPlugin.HELPPREFIX + "DStorePreferencePage"); //$NON-NLS-1$ - - Composite parent = SystemWidgetHelpers.createComposite(gparent, 2); - - GridLayout layout = new GridLayout(); - layout.numColumns = 2; - parent.setLayout(layout); - parent.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING)); - - Composite connectComposite = SystemWidgetHelpers.createComposite(parent, 2); - - SystemWidgetHelpers.createLabel(connectComposite, DStoreResources.RESID_PREFERENCE_CONNECTION_TIMEOUT_LABEL); - - _connectionTimeout = new Text(connectComposite, SWT.BORDER); - //GridData gd = new GridData(SWT.BEGINNING, SWT.CENTER, false, false); - GridData gd = new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING); - gd.widthHint = 75; - gd.horizontalSpan =1; - _connectionTimeout.setLayoutData(gd); - _connectionTimeout.setTextLimit(10); - _connectionTimeout.setToolTipText(DStoreResources.RESID_PREFERENCE_CONNECTION_TIMEOUT_TOOLTIP); - _connectionTimeout.addVerifyListener(new VerifyListener() - { - public void verifyText(VerifyEvent e) - { - e.doit = true; - for (int loop = 0; loop < e.text.length(); loop++) - { - if (!Character.isDigit(e.text.charAt(loop))) - e.doit = false; - } - } - }); - - -// _cacheRemoteClassesButton = SystemWidgetHelpers.createCheckBox(parent, DStoreResources.RESID_PREFERENCE_CACHE_REMOTE_CLASSES_LABEL, this); -// _cacheRemoteClassesButton.setToolTipText(DStoreResources.RESID_PREFERENCE_CACHE_REMOTE_CLASSES_TOOLTIP); -// _cacheRemoteClassesButton.setLayoutData(new GridData(SWT.BEGINNING, SWT.BEGINNING, true, false)); -// ((GridData)_cacheRemoteClassesButton.getLayoutData()).horizontalSpan = 2; - - _showMismatchedServerWarningButton = SystemWidgetHelpers.createCheckBox(parent, DStoreResources.RESID_PREFERENCE_SHOW_MISMATCHED_SERVER_LABEL, this); - _showMismatchedServerWarningButton.setToolTipText(DStoreResources.RESID_PREFERENCE_SHOW_MISMATCHED_SERVER_TOOLTIP); - _showMismatchedServerWarningButton.setLayoutData(new GridData(SWT.BEGINNING, SWT.BEGINNING, true, false)); - ((GridData)_showMismatchedServerWarningButton.getLayoutData()).horizontalSpan = 2; - - - // keepalive stuff - Group keepaliveGroup = SystemWidgetHelpers.createGroupComposite(parent, 2, DStoreResources.RESID_PREFERENCE_KEEPALIVE_LABEL); - layout = new GridLayout(); - layout.numColumns = 2; - keepaliveGroup.setLayout(layout); - GridData data = new GridData(GridData.HORIZONTAL_ALIGN_FILL - | GridData.GRAB_HORIZONTAL); - keepaliveGroup.setLayoutData(data); - - - - _doKeepaliveButton = SystemWidgetHelpers.createCheckBox(keepaliveGroup, DStoreResources.RESID_PREFERENCE_DO_KEEPALIVE_LABEL, this); - _doKeepaliveButton.setToolTipText(DStoreResources.RESID_PREFERENCE_DO_KEEPALIVE_TOOLTIP); - _doKeepaliveButton.setLayoutData(new GridData(SWT.BEGINNING, SWT.BEGINNING, true, false)); - ((GridData)_doKeepaliveButton.getLayoutData()).horizontalSpan = 2; - - - SystemWidgetHelpers.createLabel(keepaliveGroup, DStoreResources.RESID_PREFERENCE_KEEPALIVE_SOCKET_READ_TIMEOUT_LABEL); - - _socketReadTimeout = new Text(keepaliveGroup, SWT.BORDER); - gd = new GridData(SWT.BEGINNING, SWT.CENTER, false, false); - gd.widthHint = 75; - gd.horizontalSpan =1; - _socketReadTimeout.setLayoutData(gd); - _socketReadTimeout.setTextLimit(10); - _socketReadTimeout.setToolTipText(DStoreResources.RESID_PREFERENCE_KEEPALIVE_SOCKET_READ_TIMEOUT_TOOLTIP); - _socketReadTimeout.addVerifyListener(new VerifyListener() - { - public void verifyText(VerifyEvent e) - { - e.doit = true; - for (int loop = 0; loop < e.text.length(); loop++) - { - if (!Character.isDigit(e.text.charAt(loop))) - e.doit = false; - } - } - }); - - SystemWidgetHelpers.createLabel(keepaliveGroup, DStoreResources.RESID_PREFERENCE_KEEPALIVE_RESPONSE_TIMEOUT_LABEL); - - _keepaliveResponseTimeout = new Text(keepaliveGroup, SWT.BORDER); - gd = new GridData(SWT.BEGINNING, SWT.CENTER, false, false); - gd.widthHint = 75; - gd.horizontalSpan =1; - _keepaliveResponseTimeout.setLayoutData(gd); - _keepaliveResponseTimeout.setTextLimit(10); - _keepaliveResponseTimeout.setToolTipText(DStoreResources.RESID_PREFERENCE_KEEPALIVE_RESPONSE_TIMEOUT_TOOLTIP); - _keepaliveResponseTimeout.addVerifyListener(new VerifyListener() - { - public void verifyText(VerifyEvent e) - { - e.doit = true; - for (int loop = 0; loop < e.text.length(); loop++) - { - if (!Character.isDigit(e.text.charAt(loop))) - e.doit = false; - } - } - }); - - - - - initControls(); - return parent; - } - - private void initControls() - { - IPreferenceStore store = RSEUIPlugin.getDefault().getPreferenceStore(); - - - // timeout - int timeout = 0; - if (store.contains(IUniversalDStoreConstants.RESID_PREF_SOCKET_TIMEOUT)){ - timeout = store.getInt(IUniversalDStoreConstants.RESID_PREF_SOCKET_TIMEOUT); - } - else { - timeout = store.getDefaultInt(IUniversalDStoreConstants.RESID_PREF_SOCKET_TIMEOUT); - store.setDefault(IUniversalDStoreConstants.RESID_PREF_SOCKET_TIMEOUT, timeout); - } - _connectionTimeout.setText(""+timeout); //$NON-NLS-1$ - - - // cache remote classes - boolean cacheRemoteClasses = false; - if (store.contains(IUniversalDStoreConstants.RESID_PREF_CACHE_REMOTE_CLASSES)) { - cacheRemoteClasses = store.getBoolean(IUniversalDStoreConstants.RESID_PREF_CACHE_REMOTE_CLASSES); - } - else { - cacheRemoteClasses = store.getDefaultBoolean(IUniversalDStoreConstants.RESID_PREF_CACHE_REMOTE_CLASSES); - store.setDefault(IUniversalDStoreConstants.RESID_PREF_CACHE_REMOTE_CLASSES, cacheRemoteClasses); - } -// _cacheRemoteClassesButton.setSelection(cacheRemoteClasses); - - - // do keepalive - boolean doKeepalive = false; - if (store.contains(IUniversalDStoreConstants.RESID_PREF_DO_KEEPALIVE)){ - doKeepalive = store.getBoolean(IUniversalDStoreConstants.RESID_PREF_DO_KEEPALIVE); - } - else { - doKeepalive = store.getDefaultBoolean(IUniversalDStoreConstants.RESID_PREF_DO_KEEPALIVE); - } - _doKeepaliveButton.setSelection(doKeepalive); - - int socketTimeout = 0; - if (store.contains(IUniversalDStoreConstants.RESID_PREF_SOCKET_READ_TIMEOUT)){ - socketTimeout = store.getInt(IUniversalDStoreConstants.RESID_PREF_SOCKET_READ_TIMEOUT); - } - else { - socketTimeout = store.getDefaultInt(IUniversalDStoreConstants.RESID_PREF_SOCKET_READ_TIMEOUT); - } - _socketReadTimeout.setText(""+socketTimeout); //$NON-NLS-1$ - _socketReadTimeout.setEnabled(doKeepalive); - - int keepaliveTimeout = 0; - if (store.contains(IUniversalDStoreConstants.RESID_PREF_KEEPALIVE_RESPONSE_TIMEOUT)){ - keepaliveTimeout = store.getInt(IUniversalDStoreConstants.RESID_PREF_KEEPALIVE_RESPONSE_TIMEOUT); - } - else { - keepaliveTimeout = store.getDefaultInt(IUniversalDStoreConstants.RESID_PREF_KEEPALIVE_RESPONSE_TIMEOUT); - } - _keepaliveResponseTimeout.setText(""+keepaliveTimeout); //$NON-NLS-1$ - _keepaliveResponseTimeout.setEnabled(doKeepalive); - - // show mismatched server warning - boolean showMismatchedWarning = false; - if (store.contains(IUniversalDStoreConstants.ALERT_MISMATCHED_SERVER)){ - showMismatchedWarning = store.getBoolean(IUniversalDStoreConstants.ALERT_MISMATCHED_SERVER); - } - else { - showMismatchedWarning = store.getDefaultBoolean(IUniversalDStoreConstants.ALERT_MISMATCHED_SERVER); - } - _showMismatchedServerWarningButton.setSelection(showMismatchedWarning); - } - - protected void performApply() { - super.performApply(); - applyValues(); - } - - protected void performDefaults() { - super.performDefaults(); - - IPreferenceStore store = RSEUIPlugin.getDefault().getPreferenceStore(); - - int timeout = store.getDefaultInt(IUniversalDStoreConstants.RESID_PREF_SOCKET_TIMEOUT); - _connectionTimeout.setText(""+timeout); //$NON-NLS-1$ - - // do keepalive - boolean doKeepalive = store.getDefaultBoolean(IUniversalDStoreConstants.RESID_PREF_DO_KEEPALIVE); - _doKeepaliveButton.setSelection(doKeepalive); - - // socket read timeout - int socketTimeout = store.getDefaultInt(IUniversalDStoreConstants.RESID_PREF_SOCKET_READ_TIMEOUT); - - _socketReadTimeout.setText(""+socketTimeout); //$NON-NLS-1$ - _socketReadTimeout.setEnabled(doKeepalive); - - // keepalive response timeout - int keepaliveTimeout = store.getDefaultInt(IUniversalDStoreConstants.RESID_PREF_KEEPALIVE_RESPONSE_TIMEOUT); - _keepaliveResponseTimeout.setText(""+keepaliveTimeout); //$NON-NLS-1$ - _keepaliveResponseTimeout.setEnabled(doKeepalive); - - - // show mismatched server warning - boolean showMismatchedWarning = store.getDefaultBoolean(IUniversalDStoreConstants.ALERT_MISMATCHED_SERVER); - _showMismatchedServerWarningButton.setSelection(showMismatchedWarning); - - // cache remote classes -// boolean cacheRemoteClasses = store.getDefaultBoolean(IUniversalDStoreConstants.RESID_PREF_CACHE_REMOTE_CLASSES); -// _cacheRemoteClassesButton.setSelection(cacheRemoteClasses); - - } - - public void init(IWorkbench workbench) { - - } - - public void handleEvent(Event event) { - if (event.widget == _doKeepaliveButton){ - boolean isEnabled = _doKeepaliveButton.getSelection(); - - _socketReadTimeout.setEnabled(isEnabled); - _keepaliveResponseTimeout.setEnabled(isEnabled); - - } - } - - private void applyValues() - { - IPreferenceStore store = RSEUIPlugin.getDefault().getPreferenceStore(); - - // timeout - String timeoutStr = _connectionTimeout.getText(); - int timeout = Integer.parseInt(timeoutStr); - store.setValue(IUniversalDStoreConstants.RESID_PREF_SOCKET_TIMEOUT, timeout); - - // do keepalive - boolean doKeepalive = _doKeepaliveButton.getSelection(); - store.setValue(IUniversalDStoreConstants.RESID_PREF_DO_KEEPALIVE, doKeepalive); - - - // socket read timeout - String socketTimeoutStr = _socketReadTimeout.getText(); - int socketTimeout = Integer.parseInt(socketTimeoutStr); - store.setValue(IUniversalDStoreConstants.RESID_PREF_SOCKET_READ_TIMEOUT, socketTimeout); - - // keepalive response timeout - String keepaliveTimeoutStr = _keepaliveResponseTimeout.getText(); - int keepaliveTimeout = Integer.parseInt(keepaliveTimeoutStr); - store.setValue(IUniversalDStoreConstants.RESID_PREF_KEEPALIVE_RESPONSE_TIMEOUT, keepaliveTimeout); - - - // cache remote classes -// boolean cacheRemoteClasses = _cacheRemoteClassesButton.getSelection(); -// store.setValue(IUniversalDStoreConstants.RESID_PREF_CACHE_REMOTE_CLASSES, cacheRemoteClasses); - - // show mismatched server warning - boolean showMismatchedWarning = _showMismatchedServerWarningButton.getSelection(); - store.setValue(IUniversalDStoreConstants.ALERT_MISMATCHED_SERVER, showMismatchedWarning); - - } - - public boolean performOk() { - applyValues(); - return super.performOk(); - } - - - -} diff --git a/rse/plugins/org.eclipse.rse.core/.classpath b/rse/plugins/org.eclipse.rse.core/.classpath deleted file mode 100644 index b7464f3ca..000000000 --- a/rse/plugins/org.eclipse.rse.core/.classpath +++ /dev/null @@ -1,7 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<classpath> - <classpathentry kind="src" path="src"/> - <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/> - <classpathentry kind="output" path="bin"/> -</classpath> diff --git a/rse/plugins/org.eclipse.rse.core/.cvsignore b/rse/plugins/org.eclipse.rse.core/.cvsignore deleted file mode 100644 index ba077a403..000000000 --- a/rse/plugins/org.eclipse.rse.core/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -bin diff --git a/rse/plugins/org.eclipse.rse.core/.project b/rse/plugins/org.eclipse.rse.core/.project deleted file mode 100644 index 8fbb720bf..000000000 --- a/rse/plugins/org.eclipse.rse.core/.project +++ /dev/null @@ -1,34 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<projectDescription> - <name>org.eclipse.rse.core</name> - <comment></comment> - <projects> - </projects> - <buildSpec> - <buildCommand> - <name>org.eclipse.jdt.core.javabuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.eclipse.pde.ManifestBuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.eclipse.pde.SchemaBuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name> - <arguments> - </arguments> - </buildCommand> - </buildSpec> - <natures> - <nature>org.eclipse.pde.PluginNature</nature> - <nature>org.eclipse.jdt.core.javanature</nature> - <nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature> - </natures> -</projectDescription> diff --git a/rse/plugins/org.eclipse.rse.core/.settings/org.eclipse.core.resources.prefs b/rse/plugins/org.eclipse.rse.core/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index a426e828d..000000000 --- a/rse/plugins/org.eclipse.rse.core/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,3 +0,0 @@ -#Wed Apr 25 15:35:14 CEST 2007 -eclipse.preferences.version=1 -encoding//src/org/eclipse/rse/internal/core/messages.properties=8859_1 diff --git a/rse/plugins/org.eclipse.rse.core/.settings/org.eclipse.jdt.core.prefs b/rse/plugins/org.eclipse.rse.core/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 138063a1c..000000000 --- a/rse/plugins/org.eclipse.rse.core/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -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.4 -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.4 diff --git a/rse/plugins/org.eclipse.rse.core/.settings/org.eclipse.jdt.ui.prefs b/rse/plugins/org.eclipse.rse.core/.settings/org.eclipse.jdt.ui.prefs deleted file mode 100644 index 5743d38d0..000000000 --- a/rse/plugins/org.eclipse.rse.core/.settings/org.eclipse.jdt.ui.prefs +++ /dev/null @@ -1,3 +0,0 @@ -#Fri Dec 08 11:38:30 CST 2006 -eclipse.preferences.version=1 -internal.default.compliance=user diff --git a/rse/plugins/org.eclipse.rse.core/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.core/META-INF/MANIFEST.MF deleted file mode 100644 index 9d4882659..000000000 --- a/rse/plugins/org.eclipse.rse.core/META-INF/MANIFEST.MF +++ /dev/null @@ -1,33 +0,0 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: %pluginName -Bundle-SymbolicName: org.eclipse.rse.core;singleton:=true -Bundle-Version: 3.0.2.qualifier -Bundle-Activator: org.eclipse.rse.core.RSECorePlugin -Bundle-Localization: plugin -Require-Bundle: org.eclipse.core.runtime, - org.eclipse.core.resources, - org.eclipse.rse.services;bundle-version="[3.0.0,4.0.0)", - org.eclipse.swt -Bundle-ActivationPolicy: lazy -Eclipse-LazyStart: true -Export-Package: org.eclipse.rse.core, - org.eclipse.rse.core.comm, - org.eclipse.rse.core.events, - org.eclipse.rse.core.filters, - org.eclipse.rse.core.model, - org.eclipse.rse.core.references, - org.eclipse.rse.core.subsystems, - org.eclipse.rse.internal.core;x-internal:=true, - org.eclipse.rse.internal.core.filters;x-internal:=true, - org.eclipse.rse.internal.core.model;x-internal:=true, - org.eclipse.rse.internal.core.subsystems;x-internal:=true, - org.eclipse.rse.internal.logging;x-internal:=true, - org.eclipse.rse.internal.persistence;x-internal:=true, - org.eclipse.rse.internal.persistence.dom;x-internal:=true, - org.eclipse.rse.internal.references;x-internal:=true, - org.eclipse.rse.logging, - org.eclipse.rse.persistence, - org.eclipse.rse.persistence.dom -Bundle-Vendor: %providerName -Bundle-RequiredExecutionEnvironment: J2SE-1.4 diff --git a/rse/plugins/org.eclipse.rse.core/about.html b/rse/plugins/org.eclipse.rse.core/about.html deleted file mode 100644 index d4cc693f9..000000000 --- a/rse/plugins/org.eclipse.rse.core/about.html +++ /dev/null @@ -1,28 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" - "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml"> -<head> -<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/> -<title>About</title> -</head> -<body lang="EN-US"> -<h2>About This Content</h2> - -<p>June 5, 2007</p> -<h3>License</h3> - -<p>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 <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>. -For purposes of the EPL, "Program" will mean the Content.</p> - -<p>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 <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p> - -</body> -</html>
\ No newline at end of file diff --git a/rse/plugins/org.eclipse.rse.core/about.ini b/rse/plugins/org.eclipse.rse.core/about.ini deleted file mode 100644 index fdd61ff0d..000000000 --- a/rse/plugins/org.eclipse.rse.core/about.ini +++ /dev/null @@ -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=eclipse32.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 --git a/rse/plugins/org.eclipse.rse.core/about.mappings b/rse/plugins/org.eclipse.rse.core/about.mappings deleted file mode 100644 index bddaab431..000000000 --- a/rse/plugins/org.eclipse.rse.core/about.mappings +++ /dev/null @@ -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 --git a/rse/plugins/org.eclipse.rse.core/about.properties b/rse/plugins/org.eclipse.rse.core/about.properties deleted file mode 100644 index 26a1fb606..000000000 --- a/rse/plugins/org.eclipse.rse.core/about.properties +++ /dev/null @@ -1,29 +0,0 @@ -############################################################################### -# Copyright (c) 2000, 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: -# IBM Corporation - 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 Core\n\ -\n\ -Version: {featureVersion}\n\ -Build id: {0}\n\ -\n\ -(c) Copyright IBM Corporation and others 2000, 2008. All rights reserved.\n\ -Visit http://www.eclipse.org/dsdp/tm
\ No newline at end of file diff --git a/rse/plugins/org.eclipse.rse.core/build.properties b/rse/plugins/org.eclipse.rse.core/build.properties deleted file mode 100644 index 6d217bc3d..000000000 --- a/rse/plugins/org.eclipse.rse.core/build.properties +++ /dev/null @@ -1,28 +0,0 @@ -############################################################################### -# Copyright (c) 2001, 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) - [186525] Move keystoreProviders to core -############################################################################### -bin.includes = META-INF/,\ - plugin.xml,\ - plugin.properties,\ - about.properties,\ - about.html,\ - .,\ - about.ini,\ - about.mappings,\ - eclipse32.png,\ - icons/ -source.. = src/ -output.. = bin/ - -javacSource=1.4 -javacTarget=1.4 -src.includes = about.html,\ - schema/ diff --git a/rse/plugins/org.eclipse.rse.core/eclipse32.png b/rse/plugins/org.eclipse.rse.core/eclipse32.png Binary files differdeleted file mode 100644 index 568fac1d0..000000000 --- a/rse/plugins/org.eclipse.rse.core/eclipse32.png +++ /dev/null diff --git a/rse/plugins/org.eclipse.rse.core/icons/full/obj16/systemlinux_obj.gif b/rse/plugins/org.eclipse.rse.core/icons/full/obj16/systemlinux_obj.gif Binary files differdeleted file mode 100644 index 7b5a98e0b..000000000 --- a/rse/plugins/org.eclipse.rse.core/icons/full/obj16/systemlinux_obj.gif +++ /dev/null diff --git a/rse/plugins/org.eclipse.rse.core/icons/full/obj16/systemlinuxlive_obj.gif b/rse/plugins/org.eclipse.rse.core/icons/full/obj16/systemlinuxlive_obj.gif Binary files differdeleted file mode 100644 index f337d8bf6..000000000 --- a/rse/plugins/org.eclipse.rse.core/icons/full/obj16/systemlinuxlive_obj.gif +++ /dev/null diff --git a/rse/plugins/org.eclipse.rse.core/icons/full/obj16/systemlocal_obj.gif b/rse/plugins/org.eclipse.rse.core/icons/full/obj16/systemlocal_obj.gif Binary files differdeleted file mode 100644 index d60c188ca..000000000 --- a/rse/plugins/org.eclipse.rse.core/icons/full/obj16/systemlocal_obj.gif +++ /dev/null diff --git a/rse/plugins/org.eclipse.rse.core/icons/full/obj16/systemlocallive_obj.gif b/rse/plugins/org.eclipse.rse.core/icons/full/obj16/systemlocallive_obj.gif Binary files differdeleted file mode 100644 index ba10dec0a..000000000 --- a/rse/plugins/org.eclipse.rse.core/icons/full/obj16/systemlocallive_obj.gif +++ /dev/null diff --git a/rse/plugins/org.eclipse.rse.core/icons/full/obj16/systemunix_obj.gif b/rse/plugins/org.eclipse.rse.core/icons/full/obj16/systemunix_obj.gif Binary files differdeleted file mode 100644 index 18afe87ac..000000000 --- a/rse/plugins/org.eclipse.rse.core/icons/full/obj16/systemunix_obj.gif +++ /dev/null diff --git a/rse/plugins/org.eclipse.rse.core/icons/full/obj16/systemunixlive_obj.gif b/rse/plugins/org.eclipse.rse.core/icons/full/obj16/systemunixlive_obj.gif Binary files differdeleted file mode 100644 index cd8c312d4..000000000 --- a/rse/plugins/org.eclipse.rse.core/icons/full/obj16/systemunixlive_obj.gif +++ /dev/null diff --git a/rse/plugins/org.eclipse.rse.core/icons/full/obj16/systemwin_obj.gif b/rse/plugins/org.eclipse.rse.core/icons/full/obj16/systemwin_obj.gif Binary files differdeleted file mode 100644 index 0a2efbbed..000000000 --- a/rse/plugins/org.eclipse.rse.core/icons/full/obj16/systemwin_obj.gif +++ /dev/null diff --git a/rse/plugins/org.eclipse.rse.core/icons/full/obj16/systemwinlive_obj.gif b/rse/plugins/org.eclipse.rse.core/icons/full/obj16/systemwinlive_obj.gif Binary files differdeleted file mode 100644 index 6abee6378..000000000 --- a/rse/plugins/org.eclipse.rse.core/icons/full/obj16/systemwinlive_obj.gif +++ /dev/null diff --git a/rse/plugins/org.eclipse.rse.core/plugin.properties b/rse/plugins/org.eclipse.rse.core/plugin.properties deleted file mode 100644 index 6976c8852..000000000 --- a/rse/plugins/org.eclipse.rse.core/plugin.properties +++ /dev/null @@ -1,41 +0,0 @@ -############################################################################### -# Copyright (c) 2000, 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: -# IBM Corporation - initial API and implementation -# Martin Oberhuber (Wind River) - [186525] Move keystoreProviders to core -# Martin Oberhuber (Wind River) - [186523] Move subsystemConfigurations from UI to core -############################################################################### - -# NLS_MESSAGEFORMAT_NONE -# NLS_ENCODING=UTF-8 - -pluginName = Remote System Explorer Core -providerName = Eclipse.org - -extPoint.keystoreProviders = Keystore Providers -extPoint.persistenceProviders=RSE Persistence Providers -extPoint.systemTypes=RSE System Types -extPoint.systemTypeProviders=RSE System Type Providers -extPoint.subsystemConfigurations = Remote Subsystem Configurations -extPoint.modelInitializers = RSE Model Initializers - -systemType.windows.label=Windows -systemType.unix.label=Unix -systemType.linux.label=Linux -systemType.local.label=Local - -#systemType.iseries.description = iSeries native operating system (OS/400 or i5/OS) -#systemType.iseries.PASE.description = PASE on iSeries -#systemType.zseries.description = zSeries native operating system (z/OS) -systemType.windows.description = Any version of Microsoft Windows -systemType.unix.description = Any distribution of Unix -#systemType.aix.description = IBM AIX operating system -systemType.linux.description = Any distribution of Linux -#systemType.powerlinux.description = Linux running on PowerPC hardware -#systemType.zlinux.description = Linux running on zSeries hardware -systemType.local.description = Local file system on this computer diff --git a/rse/plugins/org.eclipse.rse.core/plugin.xml b/rse/plugins/org.eclipse.rse.core/plugin.xml deleted file mode 100644 index 62411e53b..000000000 --- a/rse/plugins/org.eclipse.rse.core/plugin.xml +++ /dev/null @@ -1,163 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<?eclipse version="3.0"?> -<plugin> -<!-- ================================================================= --> -<!-- Define keystoreProviders extension point --> -<!-- ================================================================= --> - <extension-point id="keystoreProviders" name="%extPoint.keystoreProviders" schema="schema/keystoreProviders.exsd"/> - -<!-- ================================================================= --> -<!-- Define Persistence Provider extension point --> -<!-- ================================================================= --> - <extension-point id="persistenceProviders" name="%extPoint.persistenceProviders" schema="schema/persistenceProviders.exsd"/> - <!-- Pre-defined Persistence Providers --> - <extension - point="org.eclipse.rse.core.persistenceProviders"> - <persistenceProvider - autostart="false" - class="org.eclipse.rse.internal.persistence.SerializingProvider" - id="org.eclipse.rse.persistence.SerializingProvider" - name="Serializing Persistence Provider"/> - <persistenceProvider - autostart="true" - class="org.eclipse.rse.internal.persistence.PropertyFileProvider" - id="org.eclipse.rse.persistence.PropertyFileProvider" - name="Property File Persistence Provider (workspace)"> - <property - name="location" - value="workspace"> - </property> - </persistenceProvider> - <persistenceProvider - autostart="true" - class="org.eclipse.rse.internal.persistence.PropertyFileProvider" - id="org.eclipse.rse.persistence.MetadataPropertyFileProvider" - name="Property File Persistence Provider (metadata)"> - <property - name="location" - value="metadata"> - </property> - </persistenceProvider> - </extension> - -<!-- ================================================================= --> -<!-- Define systemTypes extension point --> -<!-- ================================================================= --> - <extension-point id="systemTypes" name="%extPoint.systemTypes" schema="schema/systemTypes.exsd"/> - <extension-point id="systemTypeProviders" - name="%extPoint.systemTypeProviders" - schema="schema/systemTypeProviders.exsd"/> - <!-- Pre-defined system types --> - <extension - point="org.eclipse.rse.core.systemTypes"> - <systemType - description="%systemType.windows.description" - icon="icons/full/obj16/systemwin_obj.gif" - iconLive="icons/full/obj16/systemwinlive_obj.gif" - id="org.eclipse.rse.systemtype.windows" - label="%systemType.windows.label" - name="Windows"/> - <systemType - description="%systemType.linux.description" - icon="icons/full/obj16/systemlinux_obj.gif" - iconLive="icons/full/obj16/systemlinuxlive_obj.gif" - id="org.eclipse.rse.systemtype.linux" - label="%systemType.linux.label" - name="Linux"/> - <!-- - <systemType id="org.eclipse.rse.systemtype.linux.power" - name="Power Linux" - description="%systemType.powerlinux.description" - icon="icons/full/obj16/systemlinux_obj.gif" - iconLive="icons/full/obj16/systemlinuxlive_obj.gif"/> - --> - <systemType - description="%systemType.unix.description" - icon="icons/full/obj16/systemunix_obj.gif" - iconLive="icons/full/obj16/systemunixlive_obj.gif" - id="org.eclipse.rse.systemtype.unix" - label="%systemType.unix.label" - name="Unix"/> - <systemType - description="%systemType.local.description" - icon="icons/full/obj16/systemlocal_obj.gif" - iconLive="icons/full/obj16/systemlocallive_obj.gif" - id="org.eclipse.rse.systemtype.local" - label="%systemType.local.label" - name="Local"/> - </extension> - -<!-- ================================================================================== --> -<!-- EXTENSION POINT: org.eclipse.rse.core.subsystemConfigurations --> -<!-- ================================================================================== --> -<!-- Extension point for defining subsystem configurations. A configuration is responsible for --> -<!-- creating subsystem instances. --> -<!-- --> -<!-- Example of extension configuration: --> -<!-- <extension --> -<!-- point="org.eclipse.rse.core.subsystemConfigurations"> --> -<!-- <configuration --> -<!-- systemTypeIds="org.eclipse.rse.systemtype.local;org.eclipse.rse.systemtype.unix"--> -<!-- name="Files" --> -<!-- description="This subsystem allows you to work with files on local or remote systems."--> -<!-- icon="icons/filesubsys.gif" --> -<!-- iconlive="icons/filesubsyslive.gif" --> -<!-- id="com.acme.etools.mypkg.myconfiguration" --> -<!-- class="com.acme.etools.mypkg.MyClass" --> -<!-- category="files" --> -<!-- vendor="ACME" --> -<!-- > --> -<!-- </configuration> --> -<!-- </extension> --> -<!-- Each extension can contain multiple configuration tags that identify a subsystem configuration --> -<!-- --> -<!-- <configuration> tag attributes: --> -<!-- ================================================================================== --> -<!-- systemTypes => semicolon-separated list of system types or * for all --> -<!-- class => class implementing org.eclipse.rse.subsystems.SubSystemConfiguration --> -<!-- category => optionally identifies category to allow efficient subsetting of --> -<!-- connection lists. Pre-defined categories are "files", "cmds" and --> -<!-- "jobs". Can also specify your own category like "database" --> -<!-- icon => icon to display for subsystems of this configuration when not connected --> -<!-- iconlive => icon to display for subsystems of this configuration when connected --> -<!-- name => translatable display name for subsystems of this configuration --> -<!-- description => translatable descriptin for subsystems of this configuration --> -<!-- id => unique id for this extension point. Will be used for a folder name --> -<!-- vendor => name of company supplying this configuration --> -<!-- systemClass => OBSOLETE - Removed in OpenRSE. --> -<!-- Was only used when naming a predefined subsystem configuration --> -<!-- in the <samp>class</samp> attribute, when you want to subclass or replace the --> -<!-- predefined IConnectorService object used to manage the live connection with --> -<!-- the remote system. Name a class that implements --> -<!-- org.eclipse.rse.core.subsystems.IConnectorService or extends the appropriate --> -<!-- predefined class such as org.eclipse.rse.universal.UniversalSystem --> -<!-- for unix, windows and system types. --> -<!-- ================================================================================== --> -<!-- --> -<!-- For systemTypes, if you specify * for all, you still have a chance at runtime to --> -<!-- not create a subsystem for a given system type. Simply return false from your --> -<!-- appliesToSystemType method. --> -<!-- --> -<!-- --> -<!-- ================================================================================== --> - - <extension-point id="subsystemConfigurations" name="%extPoint.subsystemConfigurations" schema="schema/subsystemConfigurations.exsd"/> - <extension-point id="modelInitializers" name="%extPoint.modelInitializers" schema="schema/modelInitializers.exsd"/> - -<!-- ================================================================= --> -<!-- PreferencesInitializers --> -<!-- ================================================================= --> - <extension - point="org.eclipse.core.runtime.preferences"> - <initializer class="org.eclipse.rse.internal.core.RSEPreferenceInitializer"/> - <initializer class="org.eclipse.rse.internal.logging.LoggingPreferenceInitializer"/> - </extension> - <extension - point="org.eclipse.rse.core.modelInitializers"> - <modelInitializer - class="org.eclipse.rse.internal.core.RSELocalConnectionInitializer" - type="workspace"> - </modelInitializer> - </extension> - -</plugin> diff --git a/rse/plugins/org.eclipse.rse.core/schema/keystoreProviders.exsd b/rse/plugins/org.eclipse.rse.core/schema/keystoreProviders.exsd deleted file mode 100644 index af9c3df0d..000000000 --- a/rse/plugins/org.eclipse.rse.core/schema/keystoreProviders.exsd +++ /dev/null @@ -1,137 +0,0 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!-- Schema file written by PDE --> -<schema targetNamespace="org.eclipse.rse.core"> -<annotation> - <appInfo> - <meta.schema plugin="org.eclipse.rse.core" id="keystoreProviders" name="Keystore Providers"/> - </appInfo> - <documentation> - This extension point is used to allow the delegation of client keystores to vendors where needed. - </documentation> - </annotation> - - <element name="extension"> - <annotation> - <documentation> - (no description available) - </documentation> - </annotation> - <complexType> - <sequence> - <element ref="keystoreProvider" minOccurs="0" maxOccurs="unbounded"/> - </sequence> - <attribute name="point" type="string" use="required"> - <annotation> - <documentation> - - </documentation> - </annotation> - </attribute> - <attribute name="id" type="string"> - <annotation> - <documentation> - - </documentation> - </annotation> - </attribute> - <attribute name="name" type="string"> - <annotation> - <documentation> - - </documentation> - </annotation> - </attribute> - </complexType> - </element> - - <element name="keystoreProvider"> - <annotation> - <documentation> - (no description available) - </documentation> - </annotation> - <complexType> - <attribute name="id" type="string" use="required"> - <annotation> - <documentation> - a unique name that will be used to identify the Keystore Provider. - </documentation> - </annotation> - </attribute> - <attribute name="name" type="string" use="required"> - <annotation> - <documentation> - a translatable name that will be used to identify this Keystore Provider in the UI. - </documentation> - </annotation> - </attribute> - <attribute name="class" type="string" use="required"> - <annotation> - <documentation> - a fully qualified name of the Java class that implements the <samp>org.eclipse.rse.core.comm.ISystemKeystoreProvider</samp> interface. - </documentation> - <appInfo> - <meta.attribute kind="java" basedOn="org.eclipse.rse.core.comm.ISystemKeystoreProvider"/> - </appInfo> - </annotation> - </attribute> - </complexType> - </element> - - <annotation> - <appInfo> - <meta.section type="examples"/> - </appInfo> - <documentation> - The following is an example of this extension point's usage: - -<p> -<pre> - <extension point="org.eclipse.rse.core.keystoreProviders"> - <keystoreProvider - id="com.xyz.universal.security.UniversalKeystoreProvider" - name="Universal Keystore Provider" - class="com.xyz.universal.security.UniversalKeystoreProvider"> - </keystoreProvider> - </extension> -</pre> -</p> - </documentation> - </annotation> - - <annotation> - <appInfo> - <meta.section type="apiInfo"/> - </appInfo> - <documentation> - Plug-ins that want to extend this extension point must implement <samp>org.eclipse.rse.core.comm.ISystemKeystoreProvider</samp> interface. - </documentation> - </annotation> - - <annotation> - <appInfo> - <meta.section type="implementation"/> - </appInfo> - <documentation> - The Remote System Explorer provides a default implementation of this extension point -in <samp>org.eclipse.rse.dstore.security.UniversalKeystoreProvider</samp>. - </documentation> - </annotation> - - <annotation> - <appInfo> - <meta.section type="copyright"/> - </appInfo> - <documentation> - Copyright (c) 2002, 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) - [186525] Move keystoreProviders to core - </documentation> - </annotation> - -</schema> diff --git a/rse/plugins/org.eclipse.rse.core/schema/modelInitializers.exsd b/rse/plugins/org.eclipse.rse.core/schema/modelInitializers.exsd deleted file mode 100644 index 1027cb2bd..000000000 --- a/rse/plugins/org.eclipse.rse.core/schema/modelInitializers.exsd +++ /dev/null @@ -1,120 +0,0 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!-- Schema file written by PDE --> -<schema targetNamespace="org.eclipse.rse.core" xmlns="http://www.w3.org/2001/XMLSchema"> -<annotation> - <appinfo> - <meta.schema plugin="org.eclipse.rse.core" id="modelInitializers" name="Model Initializers"/> - </appinfo> - <documentation> - A model initializer is used to create supplemental connections and filter pools after the RSE model has been restored from its persistent form. The base RSE uses this extension point to supply the "Local" connection if one has not already been created for this workspace. Other extenders of RSE may use this to augment the mode in other ways. An initializer is run at the end of the initialization job begun by RSE when it is activated. - </documentation> - </annotation> - - <element name="extension"> - <annotation> - <appinfo> - <meta.element /> - </appinfo> - </annotation> - <complexType> - <sequence> - <element ref="modelInitializer" minOccurs="0" maxOccurs="unbounded"/> - </sequence> - <attribute name="point" type="string" use="required"> - <annotation> - <documentation> - - </documentation> - </annotation> - </attribute> - <attribute name="id" type="string"> - <annotation> - <documentation> - - </documentation> - </annotation> - </attribute> - <attribute name="name" type="string"> - <annotation> - <documentation> - - </documentation> - <appinfo> - <meta.attribute translatable="true"/> - </appinfo> - </annotation> - </attribute> - </complexType> - </element> - - <element name="modelInitializer"> - <complexType> - <attribute name="class" type="string" use="required"> - <annotation> - <documentation> - A class that extends <b>org.eclipse.rse.core.IRSEModelInitializer</b>. - </documentation> - <appinfo> - <meta.attribute kind="java" basedOn=":org.eclipse.rse.core.IRSEModelInitializer"/> - </appinfo> - </annotation> - </attribute> - <attribute name="type"> - <annotation> - <documentation> - The type of initialization that is to take place. If this is a one time initialization for this workspace then use "workspace". If this initialization is to occur at the beginning of each workspace session then use "session". If nothing is specfied then "session" is assumed. - </documentation> - </annotation> - <simpleType> - <restriction base="string"> - <enumeration value="workspace"> - </enumeration> - <enumeration value="session"> - </enumeration> - </restriction> - </simpleType> - </attribute> - </complexType> - </element> - - <annotation> - <appinfo> - <meta.section type="since"/> - </appinfo> - <documentation> - RSE 3.0 - </documentation> - </annotation> - - <annotation> - <appinfo> - <meta.section type="examples"/> - </appinfo> - <documentation> - An example taken from the plug-in org.eclipse.rse.ui: -<pre> -<extension point="org.eclipse.rse.core.modelInitializers"> - <modelInitializer class="org.eclipse.rse.internal.ui.RSEUIPluginModelInitializer"/> -</extension> -</pre> - </documentation> - </annotation> - - - - <annotation> - <appinfo> - <meta.section type="copyright"/> - </appinfo> - <documentation> - 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 -<br/> -<br/>Contributors: -<br/>David Dykstal (IBM) - [197167] adding notification and waiting for RSE model - </documentation> - </annotation> - -</schema> diff --git a/rse/plugins/org.eclipse.rse.core/schema/persistenceProviders.exsd b/rse/plugins/org.eclipse.rse.core/schema/persistenceProviders.exsd deleted file mode 100644 index 4337d822b..000000000 --- a/rse/plugins/org.eclipse.rse.core/schema/persistenceProviders.exsd +++ /dev/null @@ -1,166 +0,0 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!-- Schema file written by PDE --> -<schema targetNamespace="org.eclipse.rse.core"> -<annotation> - <appInfo> - <meta.schema plugin="org.eclipse.rse.core" id="persistenceProviders" name="Persistence Providers"/> - </appInfo> - <documentation> - This extension point is used to allow the delegation of profile persistence to vendors where needed. - </documentation> - </annotation> - - <element name="extension"> - <complexType> - <sequence> - <element ref="persistenceProvider" minOccurs="0" maxOccurs="unbounded"/> - </sequence> - <attribute name="point" type="string" use="required"> - <annotation> - <documentation> - - </documentation> - </annotation> - </attribute> - <attribute name="id" type="string"> - <annotation> - <documentation> - - </documentation> - </annotation> - </attribute> - <attribute name="name" type="string"> - <annotation> - <documentation> - - </documentation> - </annotation> - </attribute> - </complexType> - </element> - - <element name="persistenceProvider"> - <annotation> - <documentation> - The persistenceProvider element defines a class that implements the IRSEPersistenceProvider interface. It is used to persist the RSE object model to a form of external storage. - </documentation> - </annotation> - <complexType> - <sequence minOccurs="0" maxOccurs="unbounded"> - <element ref="property"/> - </sequence> - <attribute name="id" type="string" use="required"> - <annotation> - <documentation> - a unique name that will be used to identify the persistence Provider. - </documentation> - </annotation> - </attribute> - <attribute name="name" type="string" use="required"> - <annotation> - <documentation> - a translatable name that will be used to identify this persistence Provider in the UI. - </documentation> - </annotation> - </attribute> - <attribute name="class" type="string" use="required"> - <annotation> - <documentation> - a fully qualified name of the Java class that implements the <samp>org.eclipse.rse.persistence.IRSEPersistenceProvider</samp> interface. - </documentation> - <appInfo> - <meta.attribute kind="java" basedOn="org.eclipse.rse.persistence.IRSEpersistenceProvider"/> - </appInfo> - </annotation> - </attribute> - <attribute name="autostart" type="boolean" use="default" value="false"> - <annotation> - <documentation> - The autostart attribute determines if the persistence provider will be loaded and asked to restore the profiles known to it at the time RSE starts. - </documentation> - </annotation> - </attribute> - </complexType> - </element> - - <element name="property"> - <annotation> - <documentation> - The property element is contained within the persistenceProvider element. Use these to provide properties that can tailor the behavior of a persistence provider. Each provider must document the properties that it expects. - </documentation> - </annotation> - <complexType> - <attribute name="name" type="string" use="required"> - <annotation> - <documentation> - The name attribute provides the name for this property. - </documentation> - </annotation> - </attribute> - <attribute name="value" type="string" use="required"> - <annotation> - <documentation> - The value attribute provides the string value for this property. - </documentation> - </annotation> - </attribute> - </complexType> - </element> - - <annotation> - <appInfo> - <meta.section type="examples"/> - </appInfo> - <documentation> - The following is an example of this extension point's usage: - -<p> -<pre> - <extension point="org.eclipse.rse.core.persistenceProviders"> - <persistenceProvider - id="org.eclipse.rse.persistence.DefaultRSEpersistenceProvider" - name="Default persistence Provider" - class="org.eclipse.rse.persistence.DefaultRSEpersistenceProvider" - autostart="true"> - </persistenceProvider> - </extension> -</pre> -</p> - </documentation> - </annotation> - - <annotation> - <appInfo> - <meta.section type="apiInfo"/> - </appInfo> - <documentation> - Plug-ins that want to extend this extension point must implement <samp>org.eclipse.rse.persistence.IRSEPersistenceProvider</samp> interface. - </documentation> - </annotation> - - <annotation> - <appInfo> - <meta.section type="implementation"/> - </appInfo> - <documentation> - The Remote System Explorer in org.eclipse.rse.core provides a default implementation of this extension point. - </documentation> - </annotation> - - <annotation> - <appInfo> - <meta.section type="copyright"/> - </appInfo> - <documentation> - Copyright (c) 2006, 2007 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 - -Contributors: -IBM Corporation - initial API and implementation -David Dykstal (IBM) - added autostart attribute - </documentation> - </annotation> - -</schema> diff --git a/rse/plugins/org.eclipse.rse.core/schema/subsystemConfigurations.exsd b/rse/plugins/org.eclipse.rse.core/schema/subsystemConfigurations.exsd deleted file mode 100644 index 52ef36396..000000000 --- a/rse/plugins/org.eclipse.rse.core/schema/subsystemConfigurations.exsd +++ /dev/null @@ -1,252 +0,0 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!-- Schema file written by PDE --> -<schema targetNamespace="org.eclipse.rse.core"> -<annotation> - <appInfo> - <meta.schema plugin="org.eclipse.rse.core" id="subsystemConfigurations" name="Subsystem Configurations"/> - </appInfo> - <documentation> - This extension point allows tool-writers to extend the capability of the Remote System Explorer, by identifying a subsystem configuration that produces a subsystem whenever a new connection is created. This subsystem appears under the connection when it is expanded in the Remote Systems view of the Remote System Explorer perspective. The subsystem configuration is called by the Remote System framework when the user creates a new connection, when the connection's system type is one of the types identified as supported by this subsystem configuration extension. -<p> -There is one subsystem object per connection, and the role of a subsystem is to allow users to work with remote resources for the remote system identified by the containing connection. Defining a subsystem configuration involves more than the single subsystem configuration class. There must also be a subsystem class defined. There may also be other classes defined, such as classes for the content area of wizards for defining filters, user actions and compile commands, if the subsystem configuration wishes to support these. See the developer documentation for the Remote System Explorer for documentation details on defining subsystems. - </documentation> - </annotation> - - <element name="extension"> - <annotation> - <documentation> - (no description available) - </documentation> - </annotation> - <complexType> - <sequence> - <element ref="configuration" minOccurs="1" maxOccurs="unbounded"/> - </sequence> - <attribute name="point" type="string" use="required"> - <annotation> - <documentation> - - </documentation> - </annotation> - </attribute> - <attribute name="id" type="string"> - <annotation> - <documentation> - - </documentation> - </annotation> - </attribute> - <attribute name="name" type="string"> - <annotation> - <documentation> - - </documentation> - </annotation> - </attribute> - </complexType> - </element> - - <element name="configuration"> - <annotation> - <appInfo> - <meta.element labelAttribute="name" icon="icon"/> - </appInfo> - <documentation> - This element defines a subsystem configuration to the Remote System Explorer framework. - </documentation> - </annotation> - <complexType> - <attribute name="id" type="string" use="required"> - <annotation> - <documentation> - A unique ID for this subsystem configuration. This will be used by persistency -as a folder name for information contained by the subsystem configuration, or by any of its subsystems. - </documentation> - </annotation> - </attribute> - <attribute name="name" type="string" use="required"> - <annotation> - <documentation> - Translatable name for subsystems created by this configuration. -These appear immediately under a connection when the connection is expanded in the Remote Systems view of the Remote System Explorer perspective. - </documentation> - <appInfo> - <meta.attribute translatable="true"/> - </appInfo> - </annotation> - </attribute> - <attribute name="description" type="string" use="required"> - <annotation> - <documentation> - Translatable description for subsystems created by this configuration. -These appear in configuration and properties pages for subsystems. - </documentation> - <appInfo> - <meta.attribute translatable="true"/> - </appInfo> - </annotation> - </attribute> - <attribute name="vendor" type="string" use="required"> - <annotation> - <documentation> - Name of the vendor supplying this subsystem configuration. - </documentation> - <appInfo> - <meta.attribute translatable="true"/> - </appInfo> - </annotation> - </attribute> - <attribute name="class" type="string" use="required"> - <annotation> - <documentation> - A class that implements <samp>org.eclipse.rse.core.subsystems.ISubSystemConfiguration</samp>. -It is recommended to extend <samp>org.eclipse.rse.core.subsystems.SubSystemConfiguration</samp>. - </documentation> - <appInfo> - <meta.attribute kind="java" basedOn="org.eclipse.rse.core.subsystems.SubSystemConfiguration:org.eclipse.rse.core.subsystems.ISubSystemConfiguration"/> - </appInfo> - </annotation> - </attribute> - <attribute name="systemTypeIds" type="string"> - <annotation> - <documentation> - A semicolon separated list of system type ids that subsystems from this configuration support. For example, <code>"org.eclipse.rse.systemtype.unix;org.eclipse.rse.systemtype.linux" -</code>. -<p/> -The wildcards '*' and '?' are accepted. Therefore, if a subsystem configuration should be registered against all existing system types, this slot should be set to <code>"*"</code>. - </documentation> - </annotation> - </attribute> - <attribute name="icon" type="string"> - <annotation> - <documentation> - The icon to dipslay for subsystems of this configuration, when not connected. -Specify the path of the .gif file, relative to your plugin directory. - </documentation> - <appInfo> - <meta.attribute kind="resource"/> - </appInfo> - </annotation> - </attribute> - <attribute name="iconlive" type="string"> - <annotation> - <documentation> - The icon to display for subsystems of this configuration, when there is a live connection. This -is usually derived from the normal icon, but adorned with a bright green arrow. Specify -a path to the icon's .gif file, relative to your plugin directory. - </documentation> - <appInfo> - <meta.attribute kind="resource"/> - </appInfo> - </annotation> - </attribute> - <attribute name="category" type="string"> - <annotation> - <documentation> - This optional attribute allows subsystem providers to classify the type of remote resources that are listed by this subsystem configuration. It is possible for -multiple subsystem factories to support the same remote resource category. This category is used in the popupMenus and propertyPages extension points, to scope actions and property pages to only remote resources of a particular category, via their <samp>subsystemconfigurationCategory</samp> attribute. -For example, if listing database resources you might specify a category of "database". - </documentation> - </annotation> - </attribute> - <attribute name="priority" type="string"> - <annotation> - <documentation> - This optional attribute determines the order in which subsystems appear in the New Connection wizard and RSE views. Integer values are allowed. Subsystems with lower number will appear first in the RSE tree. Subsystems that do not define the priority attribute will be appended last to the list of subsystems. - -Note that service subsystems that share the same service should always use the same priority, since their service implementation can change at runtime. The following priorities are used by the predefined subsystems: files=100, processes=200, shells=300. - </documentation> - </annotation> - </attribute> - <attribute name="serviceType" type="string"> - <annotation> - <documentation> - This optional attribute allows providing a semicolon separated list of standard names and transports expected to be used by service discovery servers to advertise this service. -The name is usually the keyword used by the IANA in the port number allocation (http://www.iana.org/assignments/port-numbers) or in DNS SRV service types (RFC 2782) (http://www.dns-sd.org/ServiceTypes.html). - -For example, this attribute could be <code>serviceType="_ftp._tcp;_ftp._udp"</code> to advertise a subsystem that supports ftp servers using tcp and udp transport. - </documentation> - </annotation> - </attribute> - </complexType> - </element> - - <annotation> - <appInfo> - <meta.section type="examples"/> - </appInfo> - <documentation> - Example of using this extension point: - -<p> -<pre> - <extension - point="org.eclipse.rse.core.subsystemConfigurations"> - <configuration - systemTypeIds="org.eclipse.rse.systemtype.unix;*.rse.systemtype.linux" - name="Databases" - icon="icons/dbsubsys.gif" - iconlive="icons/dbsubsyslive.gif" - id="com.acme.tools.mypkg.myconfiguration" - class="com.acme.tools.db.DBSubSystemFactory" - category="databases" - vendor="ACME" - serviceType="_database._tcp;_database._udp" - > - </configuration> - </extension> -</pre> -</p> - -<p> -Defining the xml for the extension point is easy. There is a fair amount to know about -creating the classes needed for a subsystem configuration, however. For this information, consult the Remote System Explorer developer documention, including the JavaDoc for the supplied classes and interfaces for this task. - </documentation> - </annotation> - - <annotation> - <appInfo> - <meta.section type="apiInfo"/> - </appInfo> - <documentation> - The provider of subsystem configurations must implement the interface -<samp>org.eclipse.rse.core.subsystems.ISubSystemConfiguration</samp>, -although it is not recommended to create a new class from scratch. -Rather, it is highly recommended to use the supplied base class <samp>org.eclipse.rse.core.subsystems.SubSystemConfiguration</samp>. -This base class supplies much functionality, including support for -persisting properties and metadata, and support for filters. - </documentation> - </annotation> - - <annotation> - <appInfo> - <meta.section type="implementation"/> - </appInfo> - <documentation> - All supplied subsystems are implemented by using this extension point. -See the <samp>plugin.xml</samp> files for plugins -<samp>org.eclipse.rse.subsystems.files.dstore</samp> and -<samp>org.eclipse.rse.subsystems.processes.dstore</samp> -for examples. - </documentation> - </annotation> - - <annotation> - <appInfo> - <meta.section type="copyright"/> - </appInfo> - <documentation> - Copyright (c) 2002, 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 -Uwe Stieber (Wind River) - systemTypeIds attribute extensions -Javier Montalvo Orus (Symbian) - [plan] Improve Discovery and Autodetect in RSE -Martin Oberhuber (Wind River) - [186523] Move subsystemConfigurations from UI to core - </documentation> - </annotation> - -</schema> diff --git a/rse/plugins/org.eclipse.rse.core/schema/systemTypeProviders.exsd b/rse/plugins/org.eclipse.rse.core/schema/systemTypeProviders.exsd deleted file mode 100644 index 0ceefd605..000000000 --- a/rse/plugins/org.eclipse.rse.core/schema/systemTypeProviders.exsd +++ /dev/null @@ -1,129 +0,0 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!-- Schema file written by PDE --> -<schema targetNamespace="org.eclipse.rse.core"> -<annotation> - <appInfo> - <meta.schema plugin="org.eclipse.rse.core" id="systemTypesProvider" name="RSE System Types Provider"/> - </appInfo> - <documentation> - This extension point is used to allow the contribution of dynamically generated RSE system types by vendors where needed. - </documentation> - </annotation> - - <element name="extension"> - <complexType> - <sequence> - <element ref="systemTypeProvider" minOccurs="1" maxOccurs="unbounded"/> - </sequence> - <attribute name="point" type="string" use="required"> - <annotation> - <documentation> - - </documentation> - </annotation> - </attribute> - <attribute name="id" type="string"> - <annotation> - <documentation> - - </documentation> - </annotation> - </attribute> - <attribute name="name" type="string"> - <annotation> - <documentation> - - </documentation> - <appInfo> - <meta.attribute translatable="true"/> - </appInfo> - </annotation> - </attribute> - </complexType> - </element> - - <element name="systemTypeProvider"> - <complexType> - <attribute name="id" type="string" use="required"> - <annotation> - <documentation> - a unique name that will be used to identify the system type Provider. - </documentation> - </annotation> - </attribute> - <attribute name="class" type="string" use="required"> - <annotation> - <documentation> - a fully qualified name of the Java class that implements the <samp>org.eclipse.rse.core.IRSESystemTypeProvider</samp> interface. - </documentation> - <appInfo> - <meta.attribute kind="java" basedOn="org.eclipse.rse.core.IRSESystemTypeProvider"/> - </appInfo> - </annotation> - </attribute> - </complexType> - </element> - - <annotation> - <appInfo> - <meta.section type="since"/> - </appInfo> - <documentation> - RSE 2.0 - </documentation> - </annotation> - - <annotation> - <appInfo> - <meta.section type="examples"/> - </appInfo> - <documentation> - The following is an example of this extension point's usage: - -<p> -<pre> - <extension point="org.eclipse.rse.core.systemTypeProviders"> - <systemTypeProvider - id="org.eclipse.rse.core.DefaultSystemTypeProvider" - class="org.eclipse.rse.core.DefaultRSESystemTypeProvider"> - </systemTypeProvider> - </extension> -</pre> - </documentation> - </annotation> - - <annotation> - <appInfo> - <meta.section type="apiInfo"/> - </appInfo> - <documentation> - Plug-ins that want to extend this extension point must implement <samp>org.eclipse.rse.core.IRSESystemTypesProvider</samp> interface. - </documentation> - </annotation> - - <annotation> - <appInfo> - <meta.section type="implementation"/> - </appInfo> - <documentation> - - </documentation> - </annotation> - - <annotation> - <appInfo> - <meta.section type="copyright"/> - </appInfo> - <documentation> - Copyright (c) 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: -Uwe Stieber (Wind River) - initial API and implementation. - </documentation> - </annotation> - -</schema> diff --git a/rse/plugins/org.eclipse.rse.core/schema/systemTypes.exsd b/rse/plugins/org.eclipse.rse.core/schema/systemTypes.exsd deleted file mode 100644 index 0e4eb6aa3..000000000 --- a/rse/plugins/org.eclipse.rse.core/schema/systemTypes.exsd +++ /dev/null @@ -1,236 +0,0 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!-- Schema file written by PDE --> -<schema targetNamespace="org.eclipse.rse.core"> -<annotation> - <appInfo> - <meta.schema plugin="org.eclipse.rse.core" id="systemTypes" name="RSE System Types"/> - </appInfo> - <documentation> - This extension point is used in combination with the "org.eclipse.rse.core.subsystemConfigurations" extension point for defining new subsystems, which appear under a connection when it is expanded in the Remote Systems view. The systemTypes extension point allows subsystem providers to define a new system type that appears in the list of valid system types in the New Connection wizard, used by users when defining a new connection to a remote system. The system type is simply a string identifying the operating system type, such as Solaris, and an pair of icons used to identify connections to systems of this type. One icon is used when the connection is not connected, while the other is used when there is a live connection. - </documentation> - </annotation> - - <element name="extension"> - <annotation> - <documentation> - (no description available) - </documentation> - </annotation> - <complexType> - <sequence> - <element ref="systemType" minOccurs="1" maxOccurs="unbounded"/> - </sequence> - <attribute name="point" type="string" use="required"> - <annotation> - <documentation> - - </documentation> - </annotation> - </attribute> - <attribute name="id" type="string"> - <annotation> - <documentation> - - </documentation> - </annotation> - </attribute> - <attribute name="name" type="string"> - <annotation> - <documentation> - - </documentation> - </annotation> - </attribute> - </complexType> - </element> - - <element name="systemType"> - <annotation> - <appInfo> - <meta.element labelAttribute="name" icon="icon"/> - </appInfo> - <documentation> - This element defines a remote system type like "Linux", against which subsystem configurations can be registered. - </documentation> - </annotation> - <complexType> - <sequence minOccurs="0" maxOccurs="unbounded"> - <element ref="property"/> - </sequence> - <attribute name="id" type="string" use="required"> - <annotation> - <documentation> - A unique identifier for this extension. - </documentation> - </annotation> - </attribute> - <attribute name="name" type="string" use="required"> - <annotation> - <documentation> - The display name for the system type, such as "Solaris". This name is also currently used as internal identifier when referencing the system type in filters, subsystem configurations and similar, therefore it is not translatable. Future versions of RSE may change this and reference the systemType id instead of the name. -<p> -<b>Deprecated:</b> Use system type id to specify a unique identifier and system type label to specify a translatable UI label. -<p> -RSE pre-defines a number of system types, although they may not appear unless a subsystem configuration is registered against that type. These are the supplied system types: -<ul> -<li>Local</li> -<li>Unix</li> -<li>Linux</li> -</ul> -</p> - </documentation> - </annotation> - </attribute> - <attribute name="label" type="string" use="required"> - <annotation> - <documentation> - A label used in the UI to identify the system type besides the system type icon. - </documentation> - <appInfo> - <meta.attribute translatable="true"/> - </appInfo> - </annotation> - </attribute> - <attribute name="description" type="string"> - <annotation> - <documentation> - A short description of the system type. Shows up in preferences for system type. - </documentation> - <appInfo> - <meta.attribute translatable="true"/> - </appInfo> - </annotation> - </attribute> - <attribute name="icon" type="string"> - <annotation> - <documentation> - A relative path to an icon that will be used when displaying connections to systems of this type. If not specified, a default icon will be used by RSE. - </documentation> - <appInfo> - <meta.attribute kind="resource"/> - </appInfo> - </annotation> - </attribute> - <attribute name="iconLive" type="string"> - <annotation> - <documentation> - A relative path to an icon that will be used when displaying connections to systems of this type, when there is a live connection to the remote system. This is usually a derivation of the icon attribute, adorned with a bright green arrow. -If not specified, a default icon will be used by RSE. - </documentation> - <appInfo> - <meta.attribute kind="resource"/> - </appInfo> - </annotation> - </attribute> - <attribute name="enableOffline" type="boolean"> - <annotation> - <documentation> - Whether this system type can be put in offline mode. This decides whether to show the Work Offline action for connections of this type. This is an optional attribute, the default value is false. - </documentation> - </annotation> - </attribute> - <attribute name="subsystemConfigurationIds" type="string"> - <annotation> - <documentation> - A semicolon separated list of fully qualified subsystem configuration ids this system type wants to get registered against. -<p> -<b>Note:</b> The list specified here does not imply that the corresponding subsystem configurations exist. The list contains only possibilites, not requirements. - </documentation> - </annotation> - </attribute> - </complexType> - </element> - - <element name="property"> - <annotation> - <appInfo> - <meta.element labelAttribute="name"/> - </appInfo> - <documentation> - On optional property for the system type. The following property keys are already used internally, and are thus reserved: -<ul> -<li>"icon" to store the value of the icon attribute</li> -<li>"iconLive" to store the value of the iconLive attribute</li> -<li>"enableOffline" to store the value of the enableOffline attribute</li> -<li>"isCaseSensitive" for system types with a case sensitive file system</li> -<li>"isLocal" for system types that refer to the local system</li> -<li>"isWindows" for system types that refer to a Windows kind of system (case insensitive file system with drive letters)</li> -</ul> -In general, clients can use any own properties with system types, but should use reverse DNS notation to qualify their property keys (e.g. <code>com.acme.isFoobarSystem</code>. Property keys without qualifying namespace are reserved for RSE internal use. See also class IRSESystemType, methods getProperty() and testProperty(). - - </documentation> - </annotation> - <complexType> - <attribute name="name" type="string" use="required"> - <annotation> - <documentation> - - </documentation> - </annotation> - </attribute> - <attribute name="value" type="string" use="required"> - <annotation> - <documentation> - - </documentation> - </annotation> - </attribute> - </complexType> - </element> - - <annotation> - <appInfo> - <meta.section type="examples"/> - </appInfo> - <documentation> - The following is an example of the extension point schema: -<p> -<pre> - <extension point="org.eclipse.rse.core.systemTypes"> - <systemType id="com.acme.systemtype.Solaris" - name="Solaris" - description="Connects to Solaris systems." - icon="icons/solaris.gif" - iconLive="icons/solarisLive.gif"> - </systemType> - </extension> -</pre> -</p> - </documentation> - </annotation> - - <annotation> - <appInfo> - <meta.section type="apiInfo"/> - </appInfo> - <documentation> - There is no code to implement for this extension point. - </documentation> - </annotation> - - <annotation> - <appInfo> - <meta.section type="implementation"/> - </appInfo> - <documentation> - See the plugin.xml file for plugin org.eclipse.rse.ui for examples of using this extension point. - </documentation> - </annotation> - - <annotation> - <appInfo> - <meta.section type="copyright"/> - </appInfo> - <documentation> - Copyright (c) 2002, 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) - [186523] Move subsystemConfigurations from UI to core - </documentation> - </annotation> - -</schema> diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/AbstractRSESystemType.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/AbstractRSESystemType.java deleted file mode 100644 index c58d41fd9..000000000 --- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/AbstractRSESystemType.java +++ /dev/null @@ -1,208 +0,0 @@ -/******************************************************************************** - * Copyright (c) 2006, 2008 IBM Corporation and others. All rights reserved. - * This program and the accompanying materials are made available under the terms - * of the Eclipse Public License v1.0 which accompanies this distribution, and is - * available at 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: - * Uwe Stieber (Wind River) - Dynamic system type provider extension. - * Martin Oberhuber (Wind River) - [184095] Replace systemTypeName by IRSESystemType - * Martin Oberhuber (Wind River) - [186640] Add IRSESystemType.testProperty() - * Martin Oberhuber (Wind River) - [186868] Fix IRSESystemType.testProperty() semantics - * Martin Oberhuber (Wind River) - [218655][api] Provide SystemType enablement info in non-UI - ********************************************************************************/ -package org.eclipse.rse.core; - -import java.util.HashMap; -import java.util.Map; - -import org.eclipse.core.runtime.PlatformObject; -import org.eclipse.rse.core.model.Host; -import org.eclipse.rse.core.model.IHost; -import org.eclipse.rse.core.model.ISystemProfile; -import org.eclipse.rse.core.subsystems.ISubSystemConfigurationProxy; -import org.osgi.framework.Bundle; - -/** - * Abstract base class holding core functionality of a system type. - * - * Extenders must override {@link IRSESystemType#getSubsystemConfigurationIds()} - * according to their strategy of finding subsystem configuration id's that - * match their system type. - * - * Extenders may override any other method. - */ -public abstract class AbstractRSESystemType extends PlatformObject implements IRSESystemType { - - protected String id = null; - protected String name = null; - protected String label = null; - protected String description = null; - protected Bundle definingBundle = null; - protected Map properties; - - /** - * Default constructor. - * Only subclasses may call this if set the id, name, label, - * description and properties attributes themselves. - */ - protected AbstractRSESystemType() - { - super(); - } - - /** - * Constructor for an object representing a system type. - * @param id unique id of this system type. Must be system unique. - * @param name a name of this system type to be used for internal checks. - * @param label a user-visible label of this system type. - * May be <code>null</code> and falls back to the name in this case. - * @param description a user-visible description of this system type. - * May be <code>null</code> and falls back to the label in this case. - */ - public AbstractRSESystemType(String id, String name, String label, String description, Bundle definingBundle) - { - super(); - this.id = id; - this.name = name; - this.label = label == null ? name : label; - this.description = description == null ? "" : description; //$NON-NLS-1$ - this.definingBundle = definingBundle; - this.properties = new HashMap(); - } - - /** - * Checks whether two system types are the same. - * - * System types are considered the same if they have the same ID. - */ - public boolean equals(Object obj) { - if (obj instanceof IRSESystemType) { - return id.equals( ((IRSESystemType)obj).getId() ); - } - return false; - } - - /** - * Returns the hashCode for this system type. - * - * The hashCode is the hashCode of its ID. - */ - public int hashCode() { - return id.hashCode(); - } - - /* (non-Javadoc) - * @see org.eclipse.rse.core.IRSESystemType#getId() - */ - public String getId() { - return id; - } - - /* (non-Javadoc) - * @see org.eclipse.rse.core.IRSESystemType#getLabel() - */ - public String getLabel() { - // For default RSE system types, the UI label is equal to the - // name. Therefore, fallback to the name if the label is not - // explicitly set. - if (label == null) return getName(); - return label; - } - - /* - * (non-Javadoc) - * @see org.eclipse.rse.core.IRSESystemType#getName() - */ - public String getName() { - return name; - } - - /* (non-Javadoc) - * @see org.eclipse.rse.core.IRSESystemType#getDescription() - */ - public String getDescription() { - return description; - } - - /* - * (non-Javadoc) - * @see org.eclipse.rse.core.IRSESystemType#getDefiningBundle() - */ - public Bundle getDefiningBundle() { - return definingBundle; - } - - /* (non-Javadoc) - * @see org.eclipse.rse.core.IRSESystemType#getProperty(java.lang.String) - */ - public String getProperty(String key) { - return (String) (properties.get(key)); - } - - /* (non-Javadoc) - * @see org.eclipse.rse.core.IRSESystemType#getProperty(java.lang.String, boolean) - */ - public boolean testProperty(String key, boolean expectedValue) { - Object val = properties.get(key); - if (val instanceof String) { - return Boolean.valueOf((String)val).booleanValue() == expectedValue; - } - return false; - } - - /** - * {@inheritDoc} - * @see IRSESystemType#isEnabled() - * @since org.eclipse.rse.core 3.0 - */ - public boolean isEnabled() { - if (RSEPreferencesManager.getIsSystemTypeEnabled(this)) { - // if enabled, check if the system type has any registered subsystems. If - // not, this will auto-disable the system type. - ISubSystemConfigurationProxy[] proxies = RSECorePlugin.getTheSystemRegistry().getSubSystemConfigurationProxies(); - for (int i=0; i<proxies.length; i++) { - if (proxies[i].appliesToSystemType(this)) { - return true; - } - } - } - return false; - } - - /* - * (non-Javadoc) - * @see org.eclipse.rse.core.IRSESystemType#isLocal() - */ - public boolean isLocal() { - return IRSESystemType.SYSTEMTYPE_LOCAL_ID.equals(getId()) - || testProperty(IRSESystemType.PROPERTY_IS_LOCAL, true); - } - - /* - * (non-Javadoc) - * @see org.eclipse.rse.core.IRSESystemType#isLocal() - */ - public boolean isWindows() { - return IRSESystemType.SYSTEMTYPE_WINDOWS_ID.equals(getId()) - || (isLocal() && System.getProperty("os.name").toLowerCase().startsWith("win")) //$NON-NLS-1$ //$NON-NLS-2$ - || testProperty(IRSESystemType.PROPERTY_IS_WINDOWS, true); - } - - public IHost createNewHostInstance(ISystemProfile profile) { - return new Host(profile); - } - - /* (non-Javadoc) - * @see java.lang.Object#toString() - */ - public String toString() { - return getLabel() + " (" + getId() + ")"; //$NON-NLS-1$ //$NON-NLS-2$ - } -}
\ No newline at end of file diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/IRSECoreRegistry.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/IRSECoreRegistry.java deleted file mode 100644 index 07a03cc33..000000000 --- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/IRSECoreRegistry.java +++ /dev/null @@ -1,57 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006, 2008 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * 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: - * Uwe Stieber (Wind River) - Added system types provider extension. - *******************************************************************************/ -package org.eclipse.rse.core; - - -/** - * Interface for RSE core registry. Clients should use this interface as the - * starting point for querying and manipulating model objects in the RSE - * framework. - * - * @noimplement This interface is not intended to be implemented by clients. - */ -public interface IRSECoreRegistry { - - public static final String PI_RSE_CORE = "org.eclipse.rse.core"; //$NON-NLS-1$ - public static final String PI_SYSTEM_TYPES = "systemTypes"; //$NON-NLS-1$ - public static final String PI_SYSTEM_TYPES_PROVIDER = "systemTypeProviders"; //$NON-NLS-1$ - - /** - * Returns all defined system types. - * - * @return an array of all defined system types. - */ - public IRSESystemType[] getSystemTypes(); - - /** - * Returns a system type object given the name. - * - * @param name the name of the system type - * @return the system type object with the given name, or <code>null</code> if none is found - * - * @deprecated Use {@link #getSystemTypeById(String)}. - */ - public IRSESystemType getSystemType(String name); - - /** - * Returns a system type object given by the id. - * - * @param systemTypeId The system type id. - * @return The system type object with the given id, or <code>null</code> if none is found - */ - public IRSESystemType getSystemTypeById(String systemTypeId); -} diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/IRSECoreStatusCodes.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/IRSECoreStatusCodes.java deleted file mode 100644 index b082ee2a3..000000000 --- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/IRSECoreStatusCodes.java +++ /dev/null @@ -1,57 +0,0 @@ -/********************************************************************************* - * Copyright (c) 2008 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 - * - * Contributors: - * David Dykstal (IBM) - [225988] need API to mark persisted profiles as migrated - * David Dykstal (IBM) - [226561] Add API markup to RSE Javadocs where extend / implement is allowed - *********************************************************************************/ - -package org.eclipse.rse.core; - -/** - * Codes for use in constructing IStatus objects. These are unique across - * org.eclipse.rse.core - * - * @since org.eclipse.rse.core 3.0 - * @noimplement this interface is not intended to be implemented by clients - */ -public interface IRSECoreStatusCodes { - - /* - * General codes (1 to 100) - */ - - /** - * A code used for constructing IStatus objects. - * Value 1. An exception occurred during the operation. - */ - public static final int EXCEPTION_OCCURRED = 1; - - /** - * A code used for constructing IStatus objects. - * Value 2. An invalid format was encountered operation. - * The object in question must be assumed to be corrupted. - */ - public static final int INVALID_FORMAT = 2; - - /* - * Persistence manager and provider codes (101 to 200) - */ - - /** - * A code used for constructing IStatus objects. - * Value 101. A persistent form of a profile is not found. - */ - public static final int PROFILE_NOT_FOUND = 101; - - /** - * A code used for constructing IStatus objects. - * Value 102. - * The marking of profiles as migrated is not supported by this provider. - */ - public static final int MIGRATION_NOT_SUPPORTED = 102; - -} diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/IRSEInitListener.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/IRSEInitListener.java deleted file mode 100644 index 7c0d56a17..000000000 --- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/IRSEInitListener.java +++ /dev/null @@ -1,27 +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: - * David Dykstal (IBM) - [197167] adding notification and waiting for RSE model - ********************************************************************************/ -package org.eclipse.rse.core; - -/** - * An IRSEInitListener will be invoked when the initialization of RSE reaches - * the completion of each phase. - * - * @since org.eclipse.rse.core 3.0 - */ -public interface IRSEInitListener { - - /** - * @param phase The phase of initialization that has completed. - * @see RSECorePlugin#INIT_MODEL - * @see RSECorePlugin#INIT_ALL - */ - public void phaseComplete(int phase); - -} diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/IRSEInteractionProvider.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/IRSEInteractionProvider.java deleted file mode 100644 index 20cdd1b0e..000000000 --- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/IRSEInteractionProvider.java +++ /dev/null @@ -1,143 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 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: - * Martin Oberhuber (Wind River) - [190231] initial API and implementation - * IBM Corporation - Javadoc for runInDefaultContext() method - * Martin Oberhuber (Wind River) - [236355] [api] Add an IRSEInteractionProvider#eventExec() method - *******************************************************************************/ -package org.eclipse.rse.core; - -import java.lang.reflect.InvocationTargetException; - -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.rse.services.clientserver.messages.SystemMessage; - -/** - * Interaction Provider Interface. - * - * Classes implementing this interface provide a means for RSE to communicate - * with the outside world: via progress monitors, events and messages. A UI - * implementation of this interface would typically use UI components for user - * interaction; although this can be changed also intermittently. - * - * Non-UI headless applications may log messages rather than doing interactive - * messages, and may use different Threads for sending messages. - * - * <p> - * <strong>EXPERIMENTAL</strong>. 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 <a href="http://www.eclipse.org/dsdp/tm/">Target Management</a> - * team. - * </p> - * - * @since org.eclipse.rse.core 3.0 - */ -public interface IRSEInteractionProvider { - - /** - * Return a default progress monitor for the context that's currently - * active. - * - * Usually, long-running operations should always be created from the client - * with a progress monitor that they can use. Historically, however, this - * has not always been done and is especially problematic in operations that - * are performed as the result of Callbacks. - * - * For such situations, this method returns a default progress monitor in a - * context that we guess. We try to use one default progress use one for all - * phases of a single operation, such as connecting and resolving. - * - * @return a default progress monitor - */ - public IProgressMonitor getDefaultProgressMonitor(); - - /** - * <p> - * Runs the given <code>IRSERunnableWithProgress</code> in the default - * context available to this interaction provider, that provides a progress - * monitor. For example, if the default context is a - * <code>ProgressMonitorDialog</code> then the runnable is run using the - * dialog's progress monitor. This method is derived from - * <code>IRunnableContext#run()</code>. - * </p> - * <p> - * If <code>fork</code> is <code>false</code>, the current thread is - * used to run the runnable. Note that if <code>fork</code> is - * <code>true</code>, it is unspecified whether or not this method blocks - * until the runnable has been run. Implementers should document whether the - * runnable is run synchronously (blocking) or asynchronously - * (non-blocking), or if no assumption can be made about the blocking - * behaviour. - * </p> - * - * @param fork <code>true</code> if the runnable should be run in a - * separate thread, and <code>false</code> to run in the same - * thread - * @param cancellable <code>true</code> to enable the cancellation, and - * <code>false</code> to make the operation uncancellable - * @param runnable the runnable to run - * - * @exception InvocationTargetException wraps any exception or error which - * occurs while running the runnable - * @exception InterruptedException propagated by the context if the runnable - * acknowledges cancellation by throwing this exception. This - * should not be thrown if cancellable is <code>false</code>. - */ - public void runInDefaultContext(boolean fork, boolean cancellable, IRSERunnableWithProgress runnable) throws InvocationTargetException, - InterruptedException; - - /** - * Asynchronously run the given runnable in a separate thread. - * - * UI implementations should have the runnable run in the dispatch thread, - * where it has access to UI components. This is used for notifications. - * Non-UI applications may choose any Thread they like, provided that two - * conditions are met: - * <ol> - * <li>All Runnables are run on the same Thread. - * <li>The ordering of Runnables remains intact. - * </ol> - * - * @param runnable the Runnable to run asynchronously - */ - public void asyncExec(Runnable runnable); - - /** - * Run the given runnable with "event" semantics, that is: asynchronously - * run it through {@link #asyncExec(Runnable)} on the interaction provider's - * designated event thread, unless the call is already coming from that very - * thread. - * - * In that case, the Runnable is run immediately and synchronously. - * - * @param runnable the Runnable to run asynchronously with "event" semantics - * @see #asyncExec(Runnable) - */ - public void eventExec(Runnable runnable); - - /** - * Flush the Queue of Runnables enqueued with {@link #asyncExec(Runnable)}. - * - * This needs to be done when this interaction provider is to be replaced by - * a different one, in order to ensure that the ordering of all Runnables - * remains intact. - */ - public void flushRunnableQueue(); - - /** - * Show the given message or log it. - * - * In an interactive environment, this pops up a dialog asking the user to - * press an OK button. The method will not return before the OK button is - * pressed. - * - * @param msg the message to show - */ - public void showMessage(SystemMessage msg); -} diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/IRSEModelInitializer.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/IRSEModelInitializer.java deleted file mode 100644 index f5aa961c8..000000000 --- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/IRSEModelInitializer.java +++ /dev/null @@ -1,32 +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: - * David Dykstal (IBM) - [197167] adding notification and waiting for RSE model - ********************************************************************************/ -package org.eclipse.rse.core; - -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.IStatus; - -/** - * A model initializer creates objects in an RSE profile. For example, - * initializers can be used to create initial connections, filter pools, and - * filters. - * - * @since org.eclipse.rse.core 3.0 - */ -public interface IRSEModelInitializer { - - /** - * Runs the initializer. The initializer should set the monitor to done when complete. - * @param monitor the monitor that measures progress of this initializer. - * @return an IStatus indicating the success of the initializer. The status will - * be logged if it is not an OK status. - */ - public IStatus run(IProgressMonitor monitor); - -}
\ No newline at end of file diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/IRSEPreferenceNames.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/IRSEPreferenceNames.java deleted file mode 100644 index 720192e28..000000000 --- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/IRSEPreferenceNames.java +++ /dev/null @@ -1,81 +0,0 @@ -/******************************************************************************** - * Copyright (c) 2006, 2008 IBM Corporation and others. All rights reserved. - * This program and the accompanying materials are made available under the terms - * of the Eclipse Public License v1.0 which accompanies this distribution, and is - * available at http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Kushal Munir (IBM) - Initial API and implementation. - * David Dykstal (IBM) - updated with comments, removed keys that are not to be used globally - * David Dykstal (IBM) - [197167] adding notification and waiting for RSE model - * Martin Oberhuber (Wind River) - [cleanup] Add API "since" Javadoc tags - ********************************************************************************/ -package org.eclipse.rse.core; - -/** - * These constants define the set of preference names that the RSE core uses. - * - * @noimplement This interface is not intended to be implemented by clients. - */ - -/* - * Preference names that are API should be all capitals and have words separated - * by an underscore (that is, "public static final" style). - * Preferences that are not API should using "method name" style. - */ -public interface IRSEPreferenceNames { - - /** - * The key for the value that specifies that queries should be "deferred", - * that is, run when needed and in the background, as nodes are asked for - * their children. This value is not part of the API. - * - * This field is not intended to be referenced by clients. - */ - public static final String USE_DEFERRED_QUERIES = "useDeferredQueries"; //$NON-NLS-1$ - - /** - * The key for the default system type. Used when a system type is needed - * but not declared when creating new connections (hosts) and for password - * determination. This value is not part of the API. - * - * This field is not intended to be referenced by clients. - */ - public static final String SYSTEMTYPE = "systemtype"; //$NON-NLS-1$ - - /** - * The key for an hash table, encoded as a string, that contains user ids as - * values keyed by some key - usually a system type, a connection name, or a - * combination of a connection name and subsystem. This value is not part of - * the API. - * - * This field is not intended to be referenced by clients. - */ - public static final String USERIDPERKEY = "useridperkey"; //$NON-NLS-1$ - - /** - * The key for the string containing the list of active user profiles in - * alphabetical order. As profiles are activated, deactivated, or renamed - * this string must be modified. This value is not part of the API. - * - * This field is not intended to be referenced by clients. - */ - public static final String ACTIVEUSERPROFILES = "activeuserprofiles"; //$NON-NLS-1$ - - /** - * The key of the string containing the id of the default persistence provider. - * Value is "DEFAULT_PERSISTENCE_PROVIDER". - * This value is part of the API and may be used to customize products. - */ - public static final String DEFAULT_PERSISTENCE_PROVIDER = "DEFAULT_PERSISTENCE_PROVIDER"; //$NON-NLS-1$ - - /** - * The key of the string containing the id of the boolean value to create a - * local connection. Value is "CREATE_LOCAL_CONNECTION". This value is part - * of the API and may be used to customize products. - * - * @since org.eclipse.rse.core 3.0 - */ - public static final String CREATE_LOCAL_CONNECTION = "CREATE_LOCAL_CONNECTION"; //$NON-NLS-1$ - -} diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/IRSERunnableWithProgress.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/IRSERunnableWithProgress.java deleted file mode 100644 index 04d896f00..000000000 --- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/IRSERunnableWithProgress.java +++ /dev/null @@ -1,68 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 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: - * IBM Corporation - initial API and implementation - * Martin Oberhuber (Wind River) - [190231] Adapted from jface.operation.IRunnableWithProgress - *******************************************************************************/ -package org.eclipse.rse.core; - -import java.lang.reflect.InvocationTargetException; - -import org.eclipse.core.runtime.IProgressMonitor; - -/** - * The <code>IRSERunnableWithProgress</code> interface should be implemented - * by any class whose instances are intended to be executed as a long-running - * operation. Long-running operations are typically presented at the UI via a - * modal dialog showing a progress indicator and a Cancel button. - * - * This interface is derived from - * <code>org.eclipse.jface.operation.IRunnableWithProgress</code>, but - * brought into no-UI space. The class must define a <code>run</code> method - * that takes a progress monitor. The <code>run</code> method is usually not - * invoked directly, but rather by passing the - * <code>IRunnableWithProgress</code> to the <code>run</code> method of an - * <code>IRunnableContext</code>, which provides the UI for the progress - * monitor and Cancel button. - * <p> - * <strong>EXPERIMENTAL</strong>. 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 <a href="http://www.eclipse.org/dsdp/tm/">Target Management</a> - * team. - * </p> - * - * @see IRSEInteractionProvider - * @since org.eclipse.rse.core 3.0 - */ -public interface IRSERunnableWithProgress { - /** - * Runs this operation. Progress should be reported to the given progress - * monitor. This method is usually invoked by an - * <code>IRunnableContext</code>'s <code>run</code> method, which - * supplies the progress monitor. A request to cancel the operation should - * be honored and acknowledged by throwing <code>InterruptedException</code>. - * - * @param monitor the progress monitor to use to display progress and - * receive requests for cancellation - * @exception InvocationTargetException if the run method must propagate a - * checked exception, it should wrap it inside an - * <code>InvocationTargetException</code>; runtime - * exceptions are automatically wrapped in an - * <code>InvocationTargetException</code> by the calling - * context - * @exception InterruptedException if the operation detects a request to - * cancel, using <code>IProgressMonitor.isCanceled()</code>, - * it should exit by throwing - * <code>InterruptedException</code> - * - * @see IRSEInteractionProvider - */ - public void run(IProgressMonitor monitor) throws InvocationTargetException, - InterruptedException; -} diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/IRSESystemType.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/IRSESystemType.java deleted file mode 100644 index e27eaa09c..000000000 --- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/IRSESystemType.java +++ /dev/null @@ -1,356 +0,0 @@ -/******************************************************************************** - * Copyright (c) 2000, 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 - * - * 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: - * Uwe Stieber (Wind River) - Extended system type -> subsystemConfiguration association. - * Martin Oberhuber (Wind River) - [185098] Provide constants for all well-known system types - * 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 - * Martin Oberhuber (Wind River) - [226574][api] Add ISubSystemConfiguration#supportsEncoding() - ********************************************************************************/ - -package org.eclipse.rse.core; - -import org.eclipse.core.runtime.IAdaptable; -import org.eclipse.rse.core.model.IHost; -import org.eclipse.rse.core.model.ISystemProfile; -import org.eclipse.rse.core.subsystems.ISubSystemConfiguration; -import org.eclipse.rse.internal.core.model.SystemHostPool; -import org.osgi.framework.Bundle; - -/** - * Interface for a system type. Constants are defined for various system types. - * These constants are kept in sync with definitions in plugin.xml. - * <p> - * @noimplement This interface is not intended to be implemented by clients. - * System type implementations must subclass - * {@link AbstractRSESystemType} rather than implementing this - * interface directly. - * </p> - */ -public interface IRSESystemType extends IAdaptable { - - /** - * Linux system type, "Linux". - * @deprecated Use {@link #SYSTEMTYPE_LINUX_ID}. - */ - public static final String SYSTEMTYPE_LINUX = "Linux"; //$NON-NLS-1$ - - /** - * Linux system type, "org.eclipse.rse.systemtype.linux". - */ - public static final String SYSTEMTYPE_LINUX_ID = "org.eclipse.rse.systemtype.linux"; //$NON-NLS-1$ - - /** - * Power Linux type, "Power Linux". - * @deprecated Use {@link #SYSTEMTYPE_POWER_LINUX_ID}. - */ - public static final String SYSTEMTYPE_POWER_LINUX = "Power Linux"; //$NON-NLS-1$ - - /** - * Power Linux type, "org.eclipse.rse.systemtype.linux.power". - */ - public static final String SYSTEMTYPE_POWER_LINUX_ID = "org.eclipse.rse.systemtype.linux.power"; //$NON-NLS-1$ - - /** - * Power Linux type, "zSeries Linux". - * @deprecated Use {@link #SYSTEMTYPE_ZSERIES_LINUX_ID}. - */ - public static final String SYSTEMTYPE_ZSERIES_LINUX = "zSeries Linux"; //$NON-NLS-1$ - - /** - * Power Linux type, "org.eclipse.rse.systemtype.linux.zseries". - */ - public static final String SYSTEMTYPE_ZSERIES_LINUX_ID = "org.eclipse.rse.systemtype.linux.zSeries"; //$NON-NLS-1$ - - /** - * Unix system type, "Unix". - * @deprecated Use {@link #SYSTEMTYPE_UNIX_ID}. - */ - public static final String SYSTEMTYPE_UNIX = "Unix"; //$NON-NLS-1$ - - /** - * Unix system type, "org.eclipse.rse.systemtype.unix". - */ - public static final String SYSTEMTYPE_UNIX_ID = "org.eclipse.rse.systemtype.unix"; //$NON-NLS-1$ - - /** - * AIX system type, "AIX". - * @deprecated Use {@link #SYSTEMTYPE_AIX_ID}. - */ - public static final String SYSTEMTYPE_AIX = "AIX"; //$NON-NLS-1$ - - /** - * AIX system type, "org.eclipse.rse.systemtype.aix". - */ - public static final String SYSTEMTYPE_AIX_ID = "org.eclipse.rse.systemtype.aix"; //$NON-NLS-1$ - - /** - * PASE system type, "PASE". - * @deprecated Use {@link #SYSTEMTYPE_PASE_ID}. - */ - public static final String SYSTEMTYPE_PASE = "PASE"; //$NON-NLS-1$ - - /** - * PASE system type, "org.eclipse.rse.systemtype.PASE". - */ - public static final String SYSTEMTYPE_PASE_ID = "org.eclipse.rse.systemtype.iseries.PASE"; //$NON-NLS-1$ - - /** - * iSeries system type, "iSeries". - * @deprecated Use {@link #SYSTEMTYPE_ISERIES_ID}. - */ - public static final String SYSTEMTYPE_ISERIES = "iSeries"; //$NON-NLS-1$ - - /** - * iSeries system type, "org.eclipse.rse.systemtype.iseries". - */ - public static final String SYSTEMTYPE_ISERIES_ID = "org.eclipse.rse.systemtype.iseries"; //$NON-NLS-1$ - - /** - * Local system type, "Local". - * @deprecated Use {@link #SYSTEMTYPE_LOCAL_ID}. - */ - public static final String SYSTEMTYPE_LOCAL = "Local"; //$NON-NLS-1$ - - /** - * Local system type, "org.eclipse.rse.systemtype.local". - */ - public static final String SYSTEMTYPE_LOCAL_ID = "org.eclipse.rse.systemtype.local"; //$NON-NLS-1$ - - /** - * z/OS system type, "z/OS". - * @deprecated Use {@link #SYSTEMTYPE_ZSERIES_ID}. - */ - public static final String SYSTEMTYPE_ZSERIES = "z/OS"; //$NON-NLS-1$ - - /** - * z/OS system type, "org.eclipse.rse.systemtype.zseries". - */ - public static final String SYSTEMTYPE_ZSERIES_ID = "org.eclipse.rse.systemtype.zseries"; //$NON-NLS-1$ - - /** - * Windows system type, "Windows". - * @deprecated Use {@link #SYSTEMTYPE_WINDOWS_ID}. - */ - public static final String SYSTEMTYPE_WINDOWS = "Windows"; //$NON-NLS-1$ - - /** Windows system type, "org.eclipse.rse.systemtype.windows". */ - public static final String SYSTEMTYPE_WINDOWS_ID = "org.eclipse.rse.systemtype.windows"; //$NON-NLS-1$ - - /** Discovery system type, "org.eclipse.rse.systemtype.discovery". */ - public static final String SYSTEMTYPE_DISCOVERY_ID = "org.eclipse.rse.systemtype.discovery"; //$NON-NLS-1$ - /** FTP Only system type, "org.eclipse.rse.systemtype.ftp". */ - public static final String SYSTEMTYPE_FTP_ONLY_ID = "org.eclipse.rse.systemtype.ftp"; //$NON-NLS-1$ - /** SSH Only system type, "org.eclipse.rse.systemtype.ssh". */ - public static final String SYSTEMTYPE_SSH_ONLY_ID = "org.eclipse.rse.systemtype.ssh"; //$NON-NLS-1$ - /** Telnet Only system type, "org.eclipse.rse.systemtype.telnet". */ - public static final String SYSTEMTYPE_TELNET_ONLY_ID = "org.eclipse.rse.systemtype.telnet"; //$NON-NLS-1$ - - /** - * System type Property Key (value: "isLocal") indicating whether - * a system type is declared in plugin.xml to refers to the local - * system. - * On a the local system, the following properties are expected: - * <ul> - * <li>Subsystem Queries are fast and safe.</li> - * <li>Files in the file system can be converted to java.io.File.</li> - * </ul> - * @see #testProperty(String, boolean) - */ - public static final String PROPERTY_IS_LOCAL = "isLocal"; //$NON-NLS-1$ - - /** - * System type Property Key (value: "isWindows") indicating whether - * a system type is declared in plugin.xml to refers to a Windows - * system. - * <p> - * This is an "aggregate" property consisting of several smaller - * properties like isCaseSensitive. In the future, we'll want more - * fine granular properties to check against. On a Windows system, - * the following properties are expected: - * <ul> - * <li>File system is not case sensitive</li> - * <li>File system has root drives</li> - * <li>Symbolic links are not supported</li> - * <li>"cmd" is used as the default shell, meaning that %envVar% refers to environment variables</li> - * <li>Path separator is backslash (\)</li> - * <li>Line end character is CRLF</li> - * <li>Valid characters in file names and paths as known on Windows</li> - * </ul> - * @see #testProperty(String, boolean) - */ - public static final String PROPERTY_IS_WINDOWS = "isWindows"; //$NON-NLS-1$ - - /** - * System type Property Key (value: "isCaseSensitive") indicating - * whether a given system type is in general case sensitive. - * @see #testProperty(String, boolean) - */ - public static final String PROPERTY_IS_CASE_SENSITIVE = "isCaseSensitive"; //$NON-NLS-1$ - - /** - * System type Property Key (value: "supportsEncoding") indicating whether a - * given system type supports the user specifying an encoding to use for - * translating binary data to Java Unicode Strings when working on - * subsystems. - * - * It is up to the subsystems registered against a given system type whether - * they observe the system type's setting or not; the default - * implementations do observe it. Given that all subsystem configurations - * registered against a given system type do not support encodings, the - * corresponding RSE controls for allowing the user to change encodings will - * be disabled. - * - * Expected default value of this Property is "true" if not set. - * - * @see ISubSystemConfiguration#supportsEncoding(IHost) - * @since org.eclipse.rse.core 3.0 - */ - public static final String PROPERTY_SUPPORTS_ENCODING = "supportsEncoding"; //$NON-NLS-1$ - - /** - * Returns the id of the system type. - * @return the id of the system type - */ - public String getId(); - - /** - * Returns the translatable label for use in the UI. - * - * @return The UI label or <code>null</code> if not set. - */ - public String getLabel(); - - /** - * Returns the name of the system type. - * @return the name of the system type - * - * @deprecated Use {@link #getId()} for accessing the unique id or {@link #getLabel()} for the UI label. - */ - public String getName(); - - /** - * Returns the description of the system type. - * @return the description of the system type - */ - public String getDescription(); - - /** - * Returns the property of this system type with the given key. - * <code>null</code> is returned if there is no such key/value pair. - * - * @param key the name of the property to return - * @return the value associated with the given key or <code>null</code> if none - */ - public String getProperty(String key); - - /** - * Tests whether the given boolean property matches the expected value - * for this system type. - * - * Clients can use their own properties with system types, but should - * use reverse DNS notation to qualify their property keys (e.g. - * <code>com.acme.isFoobarSystem</code>. Property keys without qualifying - * namespace are reserved for RSE internal use. - * - * @param key the name of the property to return - * @param expectedValue the expected boolean value of the property. - * @return <code>true</code> if the Property is set on the system type and - * matches the expected value. Returns <code>false</code> if the property - * is not set or does not match. - */ - public boolean testProperty(String key, boolean expectedValue); - - /** - * Tests whether the system type is currently enabled. - * - * The enabled state is a dynamic property of a system type, compared to the - * static configuration by plugin markup. Enablement is a non-UI property, - * which can be set by a Product in the Preferences or modified by a user to - * hide certain system types. - * <p> - * Implementers of custom system types (which are registered by a - * SystemTypeProvider) can override this method to provide more advanced - * enabled checks e.g. based on license availability. - * - * @return <code>true</code> if the system type is currently enabled, or - * <code>false</code> otherwise. - * @since org.eclipse.rse.core 3.0 - */ - public boolean isEnabled(); - - /** - * Tests whether the system type refers to the local system. - * This is a shortcut for - * <pre> - * getId().equals(SYSTEMTYPE_LOCAL_ID) || - * || testProperty(PROPERTY_IS_LOCAL, true) - * </pre> - * See {@link #PROPERTY_IS_LOCAL} for properties expected on - * a Local system. - * Extenders (contributors of custom system types) may override. - * @return true if the system type refers to the local system. - */ - public boolean isLocal(); - - /** - * Tests whether the system type refers to the Windows system. - * This is a shortcut for - * <pre> - * getId().equals(SYSTEMTYPE_WINDOWS_ID) - * || isLocal() && System.getProperty("os.name").toLowerCase().startsWith("win") - * || testProperty(PROPERTY_IS_WINDOWS, true) - * </pre> - * See {@link #PROPERTY_IS_WINDOWS} for properties expected on - * a Windows system. This is an "aggregate" property consisting - * of several smaller properties like isCaseSensitive. In the - * future, we'll want more fine granular properties to check against. - * Extenders (contributors of custom system types) may override. - * @return true if the system type refers to a Windows system. - */ - public boolean isWindows(); - - /** - * Returns the bundle which is responsible for the definition of this system type. - * Typically this is used as a base for searching for images and other files - * that are needed in presenting the system type. - * - * @return the bundle which defines this system type or <code>null</code> if none - */ - public Bundle getDefiningBundle(); - - /** - * Returns a list of fully qualified known subsystem configuration id's that - * this system type wants to be registered against. - * More subsystem configurations can be added through the <tt>subsystemConfigurations</tt> - * extension point. - * <p> - * <b>Note:</b> The list returned here does not imply that the corresponding - * subsystem configurations exist. The list contains only possibilites not, - * requirements. - * - * @return The list of subsystem configuration id's. May be empty, - * but never <code>null</code>. - */ - public String[] getSubsystemConfigurationIds(); - - /** - * Creates a new <code>IHost</code> object instance. This method is - * called from {@link SystemHostPool#createHost(IRSESystemType, String, String, String, String, int)}. - * - * @param profile The system profile to associate with the host. - * @return A new <code>IHost</code> object instance. - */ - public IHost createNewHostInstance(ISystemProfile profile); -}
\ No newline at end of file diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/IRSESystemTypeConstants.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/IRSESystemTypeConstants.java deleted file mode 100644 index 1501e39e7..000000000 --- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/IRSESystemTypeConstants.java +++ /dev/null @@ -1,25 +0,0 @@ -/******************************************************************************** - * Copyright (c) 2006, 2008 IBM Corporation and others. All rights reserved. - * This program and the accompanying materials are made available under the terms - * of the Eclipse Public License v1.0 which accompanies this distribution, and is - * available at http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Kushal Munir (IBM) - Initial API and implementation. - * Martin Oberhuber (Wind River) - [cleanup] Add API "since" Javadoc tags - ********************************************************************************/ -package org.eclipse.rse.core; - -/** - * These constants define the set of properties that the UI expects to be - * available via <code>IRSESystemType.getProperty(String)</code>. - * - * @see org.eclipse.rse.core.IRSESystemType#getProperty(String) - * @noimplement This interface is not intended to be implemented by clients. - */ -public interface IRSESystemTypeConstants { - - public static final String ICON = "icon"; //$NON-NLS-1$ - public static final String ICON_LIVE = "iconLive"; //$NON-NLS-1$ - public static final String ENABLE_OFFLINE = "enableOffline"; //$NON-NLS-1$ -} diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/IRSESystemTypeProvider.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/IRSESystemTypeProvider.java deleted file mode 100644 index 8d7d86acc..000000000 --- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/IRSESystemTypeProvider.java +++ /dev/null @@ -1,39 +0,0 @@ -/******************************************************************************** - * Copyright (c) 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: - * Uwe Stieber (Wind River) - initial API and implementation. - ********************************************************************************/ -package org.eclipse.rse.core; - -import org.eclipse.rse.internal.core.RSECoreRegistry; - -/** - * Dynamic RSE system types provider interface. - * - * See also extension point <code>org.eclipse.rse.core.systemTypeProviders</code> - * - * Clients may implement this interface. - * - * @since RSE 2.0 - */ -public interface IRSESystemTypeProvider { - - /** - * Returns a list of possible RSE system types to register - * at initialization of the RSE core system. The method will - * be called only once for each provider from {@link RSECoreRegistry}. - * The list of the returned RSE system types will be checked - * for duplicates (via the system type id). Duplicates will - * be dropped. - * - * Returned system types should be subclasses of {@link AbstractRSESystemType}. - * - * @return The list of RSE system types to register or <code>null</code>. - */ - public IRSESystemType[] getSystemTypesForRegistration(); -} diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/IRSEUserIdConstants.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/IRSEUserIdConstants.java deleted file mode 100644 index 3965bf400..000000000 --- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/IRSEUserIdConstants.java +++ /dev/null @@ -1,53 +0,0 @@ -/******************************************************************************** - * Copyright (c) 2000, 2008 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 - * - * 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: - * Martin Oberhuber (Wind River) - [cleanup] Add API "since" Javadoc tags - ********************************************************************************/ - -package org.eclipse.rse.core; - -/** - * Constants for user id management. Used when specifying the scope of a user id - * when setting a user id. - * - * @noimplement This interface is not intended to be implemented by clients. - */ -public interface IRSEUserIdConstants { - - /** - * Value 0. Location of user id has not yet been set. Used only as a return value. - */ - public static final int USERID_LOCATION_NOTSET = 0; - - /** - * Value 1. Location of user id is scoped to the connector service inside the host. - */ - public static final int USERID_LOCATION_CONNECTORSERVICE = 1; - - /** - * Value 2. Location of user id is scoped to the host, sometimes call "connection". - */ - public static final int USERID_LOCATION_HOST = 2; - - /** - * Value 3. Location of user id is scoped to system type. It will be the default - * for all hosts of this system type that do not have a specified user id assigned. - */ - public static final int USERID_LOCATION_DEFAULT_SYSTEMTYPE = 3; - - /** - * Value 4. Location of user id is scoped to workspace. - */ - public static final int USERID_LOCATION_DEFAULT_OVERALL = 4; - -}
\ No newline at end of file diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/ISystemResourceListener.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/ISystemResourceListener.java deleted file mode 100644 index b10bbbe42..000000000 --- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/ISystemResourceListener.java +++ /dev/null @@ -1,28 +0,0 @@ -/******************************************************************************** - * Copyright (c) 2007 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 - * - * Initial Contributors: - * The following IBM employees contributed to the Remote System Explorer - * component that contains this file: David McKnight. - * - * Contributors: - * {Name} (company) - description of contribution. - ********************************************************************************/ -package org.eclipse.rse.core; - -import org.eclipse.core.resources.IResourceChangeListener; - -public interface ISystemResourceListener extends IResourceChangeListener -{ - public void ensureOnResourceEventListening(); - public void turnOffResourceEventListening(); - public void turnOnResourceEventListening(); - public void addResourceChangeListener(IResourceChangeListener l); - public void removeResourceChangeListener(IResourceChangeListener l); - - - -} diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/PasswordPersistenceManager.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/PasswordPersistenceManager.java deleted file mode 100644 index bd4f11edb..000000000 --- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/PasswordPersistenceManager.java +++ /dev/null @@ -1,649 +0,0 @@ -/******************************************************************************** - * Copyright (c) 2002, 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 - * - * 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.core; - -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.Platform; -import org.eclipse.rse.core.model.SystemSignonInformation; -import org.eclipse.rse.internal.core.RSECoreMessages; - - -/** - * 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 PasswordPersistenceManager { - - // 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 PasswordPersistenceManager _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 <code>true</code> if the user ID is case sensitive, <code>false</code> otherwise. - */ - public boolean isUserIDCaseSensitive() { - return _userIDCaseSensitive; - } - } - - /** - * Singleton so private constructor - */ - private PasswordPersistenceManager(){ - String userName = System.getProperty("user.name"); //$NON-NLS-1$ - - if (userName == null) { - userName = DEFAULT_USER_NAME; - } - - newURL = SERVER_URL + userName; - } - - /** - * Retrieve the singleton instance of the PasswordPersistenceManger - */ - public static final synchronized PasswordPersistenceManager getInstance() - { - if (_instance == null) - { - _instance = new PasswordPersistenceManager(); - _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 --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/RSECorePlugin.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/RSECorePlugin.java deleted file mode 100644 index db4978053..000000000 --- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/RSECorePlugin.java +++ /dev/null @@ -1,520 +0,0 @@ -/******************************************************************************** - * Copyright (c) 2006, 2008 IBM Corporation and others. All rights reserved. - * This program and the accompanying materials are made available under the terms - * of the Eclipse Public License v1.0 which accompanies this distribution, and is - * available at 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) - added utility method for finding qualifiedHostNames - * Martin Oberhuber (Wind River) - [177523] Unify singleton getter methods - * Martin Oberhuber (Wind River) - [186525] Move keystoreProviders to core - * Martin Oberhuber (Wind River) - [181939] Deferred class loading for keystoreProviders - * Martin Oberhuber (Wind River) - [175680] Deprecate obsolete ISystemRegistry methods - * Martin Oberhuber (Wind River) - [160293] NPE on startup when only Core feature is installed - * Uwe Stieber (Wind River) - [192611] RSE Core plugin may fail to initialize because of cyclic code invocation - * Martin Oberhuber (Wind River) - [165674] Sort subsystem configurations by priority then Id - * Martin Oberhuber (Wind River) - [215820] Move SystemRegistry implementation to Core - * David Dykstal (IBM) - [197167] adding notification and waiting for RSE model - * Martin Oberhuber (Wind River) - [cleanup] Add API "since" Javadoc tags - * Martin Oberhuber (Wind River) - [190231] Prepare API for UI/Non-UI Splitting - * David Dykstal (IBM) = [226958] add status values to waitForInitCompletion(phase) - ********************************************************************************/ -package org.eclipse.rse.core; - -import java.net.InetAddress; -import java.net.UnknownHostException; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - -import org.eclipse.core.runtime.IConfigurationElement; -import org.eclipse.core.runtime.IExtensionRegistry; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Platform; -import org.eclipse.core.runtime.Plugin; -import org.eclipse.rse.core.comm.SystemKeystoreProviderManager; -import org.eclipse.rse.core.model.ISystemProfileManager; -import org.eclipse.rse.core.model.ISystemRegistry; -import org.eclipse.rse.core.subsystems.ISubSystemConfigurationProxy; -import org.eclipse.rse.internal.core.RSECoreRegistry; -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.core.subsystems.SubSystemConfigurationProxy; -import org.eclipse.rse.internal.core.subsystems.SubSystemConfigurationProxyComparator; -import org.eclipse.rse.internal.persistence.RSEPersistenceManager; -import org.eclipse.rse.logging.Logger; -import org.eclipse.rse.logging.LoggerFactory; -import org.eclipse.rse.persistence.IRSEPersistenceManager; -import org.osgi.framework.Bundle; -import org.osgi.framework.BundleContext; - -/** - * RSECorePlugin provides the activation for the RSE core and acts as the - * primary registry for logging, persistence, and the main RSE service - * registries. - * - * @noextend This class is not intended to be subclassed by clients. - * @noinstantiate This class is not intended to be instantiated by clients. - */ -public class RSECorePlugin extends Plugin { - - /** - * The plugin id for this plugin. Value "org.eclipse.rse.core". - * - * @since org.eclipse.rse.core 3.0 - */ - public static final String PLUGIN_ID = "org.eclipse.rse.core"; //$NON-NLS-1$ - - /** - * Current release as a number (multiplied by 100). E.g. 300 is for release 3.0.0 - */ - public static final int CURRENT_RELEASE = 200; // updated to new release - - /** - * Current release as a string. - */ - public static final String CURRENT_RELEASE_NAME = "2.0.0"; //$NON-NLS-1$ - - /** - * Initialization phase constant, value 0. Used in - * {@link #isInitComplete(int)} which will return true if all phases of - * initialization are complete. Clients must not assume any particular - * ordering among phases based on the value. - * - * @since org.eclipse.rse.core 3.0 - */ - public static final int INIT_ALL = 0; - - /** - * Initialization phase constant, value 1. Used in - * {@link #isInitComplete(int)} which will return true if the model phase of - * the initialization is complete. Clients must not assume any particular - * ordering among phases based on the value. - * - * @since org.eclipse.rse.core 3.0 - */ - public static final int INIT_MODEL = 1; - - /** - * Initialization phase constant, value 2. Used in - * {@link #isInitComplete(int)} which will return true if the initializer - * phase of the initialization is complete. Clients must not assume any - * particular ordering among phases based on the value. - * - * @since org.eclipse.rse.core 3.0 - */ - public static final int INIT_INITIALIZER = 2; - - private static RSECorePlugin plugin = null; // the singleton instance of this plugin - private Logger logger = null; - private ISystemRegistry _systemRegistry = null; - private IRSEPersistenceManager _persistenceManager = null; - private ISubSystemConfigurationProxy[] _subsystemConfigurations = null; - private IRSEInteractionProvider _interactionProvider = null; - - /** - * Returns the singleton instance of RSECorePlugin. - * @return the singleton instance. - */ - public static RSECorePlugin getDefault() { - return plugin; - } - - /** - * Waits until the RSE model has been fully restored from its persistent - * form. Should be used before accessing pieces of the model. - * - * @return an IStatus indicating how the initialization ended. - * @throws InterruptedException if this wait was interrupted for some - * reason. - * @since org.eclipse.rse.core 3.0 - */ - public static IStatus waitForInitCompletion() throws InterruptedException { - return RSEInitJob.getInstance().waitForCompletion(); - } - - /** - * Waits until the RSE has completed a specific phase of its initialization. - * - * @param phase the phase to wait for completion. - * @return an IStatus indicating how the initialization for that phase ended. - * @throws InterruptedException if this wait was interrupted for some - * reason. - * @throws IllegalArgumentException if the phase is undefined. - * @see #INIT_ALL - * @see #INIT_INITIALIZER - * @see #INIT_MODEL - * @since org.eclipse.rse.core 3.0 - */ - public static IStatus waitForInitCompletion(int phase) throws InterruptedException { - return RSEInitJob.getInstance().waitForCompletion(phase); - } - - /** - * Check whether the initialization of the RSE model is complete for a given - * phase. - * - * @param phase the phase identifier. - * @return <code>true</code> if the initialization for the given phase has - * completed regardless of its status of that completion. - * @throws IllegalArgumentException if the phase is undefined. - * @see #INIT_ALL - * @see #INIT_INITIALIZER - * @see #INIT_MODEL - * @since org.eclipse.rse.core 3.0 - */ - public static boolean isInitComplete(int phase) { - return RSEInitJob.getInstance().isComplete(phase); - } - - /** - * Adds a new listener to the set of listeners to be notified when - * initialization phases complete. If the listener is added after the phase - * has completed it will not be invoked. If the listener is already in the - * set it will not be added again. Listeners may be notified in any order. - * - * @param listener the listener to be added - * @since org.eclipse.rse.core 3.0 - */ - public static void addInitListener(IRSEInitListener listener) { - RSEInitJob.getInstance().addInitListener(listener); - } - - /** - * Removes a listener to the set of listeners to be notified when phases - * complete. If the listener is not in the set this does nothing. - * - * @param listener the listener to be removed - * @since org.eclipse.rse.core 3.0 - */ - public static void removeInitListener(IRSEInitListener listener) { - RSEInitJob.getInstance().removeInitListener(listener); - } - - /** - * A static convenience method - fully equivalent to - * <code>RSECorePlugin.getDefault().getRegistry()</code>. - * @return the RSE Core Registry. - */ - public static IRSECoreRegistry getTheCoreRegistry() { - return getDefault().getCoreRegistry(); - } - - /** - * A static convenience method - fully equivalent to - * <code>RSECorePlugin.getDefault().getPersistenceManager()</code>. - * @return the persistence manager currently in use for RSE - */ - public static IRSEPersistenceManager getThePersistenceManager() { - return getDefault().getPersistenceManager(); - } - - /** - * Return the master profile manager singleton. - * - * @return the RSE Profile Manager Singleton. - * @since org.eclipse.rse.core 3.0 - */ - public static ISystemProfileManager getTheSystemProfileManager() { - return SystemProfileManager.getDefault(); - } - - /** - * Check if the SystemRegistry has been instantiated already. Use this when - * you don't want to start the system registry as a side effect of - * retrieving it. - * - * @return <code>true</code> if the System Registry has been instantiated - * already. - * @since org.eclipse.rse.core 3.0 - */ - public static boolean isTheSystemRegistryActive() - { - if (plugin == null) { - return false; - } - return getDefault().isSystemRegistryActive(); - } - - /** - * A static convenience method - fully equivalent to - * <code>RSECorePlugin.getDefault().getSystemRegistry()</code>. - * The SystemRegistry is used to gain access to the basic services - * and components used in RSE. - * @return the RSE System Registry. - */ - public static ISystemRegistry getTheSystemRegistry() { - return getDefault().getSystemRegistry(); - } - - /** - * @return the IP host name of this machine - */ - public static String getLocalMachineName() { - String machineName = null; - try { - machineName = InetAddress.getLocalHost().getHostName(); - } catch (UnknownHostException e) { - getDefault().log(e); - } - return machineName; - } - - /** - * @return the local IP address of this machine - */ - public static String getLocalMachineIPAddress() { - String machineAddress = null; - try { - machineAddress = InetAddress.getLocalHost().getHostAddress(); - } catch (UnknownHostException e) { - getDefault().log(e); - } - return machineAddress; - } - - /** - * Returns a qualified host name given a potentially unqualified host name - */ - public static String getQualifiedHostName(String hostName) { - try { - InetAddress address = InetAddress.getByName(hostName); - return address.getCanonicalHostName(); - } catch (UnknownHostException exc) { - return hostName; - } - } - - /** - * The constructor. This may be called only by plugin activation. - */ - public RSECorePlugin() { - plugin = this; - } - - /* - * (non-Javadoc) - * @see org.eclipse.core.runtime.Plugin#start(org.osgi.framework.BundleContext) - */ - public void start(BundleContext context) throws Exception { - super.start(context); - registerKeystoreProviders(); - RSEInitJob job = RSEInitJob.getInstance(); - job.schedule(); - } - - /* - * (non-Javadoc) - * @see org.eclipse.core.runtime.Plugin#stop(org.osgi.framework.BundleContext) - */ - public void stop(BundleContext context) throws Exception { - LoggerFactory.freeLogger(this); - logger = null; - plugin = null; - super.stop(context); - } - - /** - * @return the persistence manager used for persisting RSE profiles - */ - public IRSEPersistenceManager getPersistenceManager() { - if (_persistenceManager == null) { - synchronized(this) { - if (_persistenceManager==null) { - _persistenceManager = new RSEPersistenceManager(getSystemRegistry()); - } - } - } - return _persistenceManager; - } - - /** - * Test if the SystemRegistry has been instantiated already. - * Use this when you don't want to start the system registry as a - * side effect of retrieving it. - * @return <code>true</code> if the system registry has been instantiated already. - */ - private boolean isSystemRegistryActive() - { - return (_systemRegistry != null); - } - - /** - * Return the SystemRegistry singleton. - * Clients should use static @{link getTheSystemRegistry()} instead. - * @return the RSE system registry - */ - public ISystemRegistry getSystemRegistry() { - if (_systemRegistry == null) { - synchronized(this) { - if (_systemRegistry == null) { - String logfilePath = getStateLocation().toOSString(); - SystemRegistry sr = SystemRegistry.getInstance(logfilePath); - ISubSystemConfigurationProxy[] proxies = getSubSystemConfigurationProxies(); - if (proxies != null) { - sr.setSubSystemConfigurationProxies(proxies); - } - _systemRegistry = sr; - } - } - } - return _systemRegistry; - } - - /** - * Returns the RSE core registry. Clients should use this method to get the registry which - * is the starting point for working with the RSE framework. It contains methods to access - * core services and components. It is distinct from, and more basic than, an implementation - * of ISystemRegistry. - * <p> - * This may return null if the registry has not yet been set. - * @return the RSE core registry. - */ - public IRSECoreRegistry getCoreRegistry() { - return RSECoreRegistry.getInstance(); - } - - /** - * Returns an instance of the logger being used by the core. All core services, or extensions to - * core services, should use this logger to log any messages. The RSE logger provides run-time - * filtering according to user preference and uses the platform's logging capabilities. RSE services - * should use this logger rather than a platform logger. The logger is defined at plugin start and - * should always be available. - * @return the instance of System#Logger used by the core RSE - */ - public Logger getLogger() { - if (logger == null) logger = LoggerFactory.getLogger(this); - return logger; - } - - /** - * Log an unexpected exception that occurs during the functioning of this class. - * @param t the exception to log - */ - private void log(Throwable t) { - getLogger().logError("Unexpected Exception", t); //$NON-NLS-1$ - } - - /** - * Set the default interaction provider. - * - * When RSE is run with UI, the UI plugins need to set an UI-based - * interaction provider for showing dialogs from Core operations. Non-UI - * headless operations can use an Interaction Provider that just logs its - * messages and works without other UI. - * <p> - * <strong>EXPERIMENTAL</strong>. 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 <a href="http://www.eclipse.org/dsdp/tm/">Target - * Management</a> team. - * </p> - * - * @param p the interaction provider to set. - * @since org.eclipse.rse.core 3.0 - */ - public void setDefaultInteractionProvider(IRSEInteractionProvider p) { - synchronized (this) { - _interactionProvider = p; - } - } - - /** - * Get the default interface for interacting with the user or other outside - * world. - * <p> - * <strong>EXPERIMENTAL</strong>. 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 <a href="http://www.eclipse.org/dsdp/tm/">Target - * Management</a> team. - * </p> - * - * @return the default interaction provider. - * @since org.eclipse.rse.core 3.0 - */ - public IRSEInteractionProvider getDefaultInteractionProvider() { - synchronized (this) { - return _interactionProvider; - } - } - - /** - * Register declared keystore providers. - */ - private void registerKeystoreProviders() - { - // Get reference to the plug-in registry - IExtensionRegistry registry = Platform.getExtensionRegistry(); - - // Get configured extenders - IConfigurationElement[] systemTypeExtensions = registry.getConfigurationElementsFor("org.eclipse.rse.core", "keystoreProviders"); //$NON-NLS-1$ //$NON-NLS-2$ - - for (int i = 0; i < systemTypeExtensions.length; i++) - { - // get the name space of the declaring extension - String nameSpace = systemTypeExtensions[i].getDeclaringExtension().getNamespaceIdentifier(); - String keystoreProviderType = systemTypeExtensions[i].getAttribute("class"); //$NON-NLS-1$ - - // use the name space to get the bundle - Bundle bundle = Platform.getBundle(nameSpace); - if (bundle.getState() != Bundle.UNINSTALLED) - { - SystemKeystoreProviderManager.getInstance().registerKeystoreProvider(bundle, keystoreProviderType); - } - } - } - - /** - * Return all elements that extend the org.eclipse.rse.core.subsystemConfigurations extension point - */ - private IConfigurationElement[] getSubSystemConfigurationPlugins() - { - // Get reference to the plug-in registry - IExtensionRegistry registry = Platform.getExtensionRegistry(); - // Get configured extenders - IConfigurationElement[] subsystemConfigurationExtensions = - registry.getConfigurationElementsFor("org.eclipse.rse.core","subsystemConfigurations"); //$NON-NLS-1$ //$NON-NLS-2$ - - return subsystemConfigurationExtensions; - } - - /** - * Return an array of SubSystemConfigurationProxy objects. - * These represent all extensions to our subsystemConfigurations extension point. - */ - public ISubSystemConfigurationProxy[] getSubSystemConfigurationProxies() - { - if (_subsystemConfigurations != null) // added by PSC - return _subsystemConfigurations; - - IConfigurationElement[] factoryPlugins = getSubSystemConfigurationPlugins(); - if (factoryPlugins != null) - { - List l = new ArrayList(); - for (int idx=0; idx<factoryPlugins.length; idx++) - { - SubSystemConfigurationProxy ssf = - new SubSystemConfigurationProxy(factoryPlugins[idx]); - - l.add(ssf); - } - ISubSystemConfigurationProxy[] newProxies = (ISubSystemConfigurationProxy[])l.toArray(new ISubSystemConfigurationProxy[l.size()]); - //[149280][165674]: Sort proxies by priority then ID in order to - //get deterministic results on all getSubSystemConfiguration*() queries - Arrays.sort(newProxies, new SubSystemConfigurationProxyComparator()); - _subsystemConfigurations = newProxies; - } - - return _subsystemConfigurations; - } - - -}
\ No newline at end of file diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/RSEPreferencesManager.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/RSEPreferencesManager.java deleted file mode 100644 index 29fc53582..000000000 --- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/RSEPreferencesManager.java +++ /dev/null @@ -1,541 +0,0 @@ -/******************************************************************************** - * Copyright (c) 2007, 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: - * David Dykstal (IBM) - initial API and implementation - * Martin Oberhuber (Wind River) - [184095] Replace systemTypeName by IRSESystemType - * Martin Oberhuber (Wind River) - [177523] Unify singleton getter methods - * David Dykstal (IBM) - [197167] adding notification and waiting for RSE model - * Martin Oberhuber (Wind River) - [cleanup] Add API "since" Javadoc tags - * David Dykstal (IBM) - [210474] Deny save password function missing - * David Dykstal (IBM) - [233892] Deny password save is not persistent - ********************************************************************************/ -package org.eclipse.rse.core; - -import java.util.Arrays; -import java.util.Enumeration; -import java.util.Hashtable; -import java.util.Locale; -import java.util.SortedSet; -import java.util.StringTokenizer; -import java.util.TreeSet; - -import org.eclipse.core.runtime.Preferences; - -/** - * Preferences Manager utility class. - * - * @noextend This class is not intended to be subclassed by clients. - * @noinstantiate This class is not intended to be instantiated by clients. - */ -public class RSEPreferencesManager { - - /** - * Used as a suffix when combined with the system type name to produce the key for the enabled value. - */ - private static final String ST_ENABLED = "systemType.enabled"; //$NON-NLS-1$ - /** - * Used as a suffix when combined with the system type name to produce the key for the default user id value. - */ - private static final String ST_DEFAULT_USERID = "systemType.defaultUserId"; //$NON-NLS-1$ - /** - * The default value for using deferred queries. Value is <code>true</code>. - */ - private static final boolean DEFAULT_USE_DEFERRED_QUERIES = true; - /** - * The default value for the name of the team profile. Value is "Team". - */ - private static final String DEFAULT_TEAMPROFILE = "Team"; //$NON-NLS-1$ - /** - * The default value for the list of active user profiles. Value is "Team". - */ - private static final String DEFAULT_ACTIVEUSERPROFILES = "Team"; //$NON-NLS-1$ - - /** - * @return the Hashtable where the key is a string identifying a particular object, and - * the value is the user ID for that object. - * @see #setUserId(String, String) - */ - private static Hashtable getUserIds() { - Preferences store = RSECorePlugin.getDefault().getPluginPreferences(); - Hashtable userIds = null; - String value = store.getString(IRSEPreferenceNames.USERIDPERKEY); - if (value != null) { - userIds = parseString(value); - } else { - userIds = new Hashtable(); - } - return userIds; - } - - /** - * Store the user ids that are saved keyed by some key. - * @param userIds A Hashtable of userids. - * @see #setUserId(String, String) - */ - private static void setUserIds(Hashtable userIds) { - Preferences store = RSECorePlugin.getDefault().getPluginPreferences(); - String userIdsString = makeString(userIds); - store.setValue(IRSEPreferenceNames.USERIDPERKEY, userIdsString); - savePreferences(); - } - - /** - * Retrieves a user id given a key. - * @param key the key from which to get the particular user id. - * @return user ID for the given key or null if the key was not found. - * @see #setUserId(String, String) - */ - public static String getUserId(String key) { - String uid = null; - Hashtable userIds = getUserIds(); - uid = (String) userIds.get(key); - return uid; - } - - /** - * Clears the user ID for the given key. - * @param key the key for the user id. - * @see #setUserId(String, String) - */ - public static void clearUserId(String key) { - Hashtable userIds = getUserIds(); - if (userIds.containsKey(key)) { - userIds.remove(key); - setUserIds(userIds); - } - } - - /** - * Sets the user Id for this key. - * The key typically designates a scope for this userid so that a hierarchy - * of user ids can be maintained for inheritance. - * For example, hosts have greater scope than subsystems. - * A key would typically be <profile-name>.<host-name>, - * or <profile-name>.<host-type>, - * or <profile-name>.<host-name>.<subsystem-name>. - * @param key the key used to find the userId - * @param userId the userId to retrieve by this key. - */ - public static void setUserId(String key, String userId) { - if ((key != null) && (userId != null)) { - Hashtable userIds = getUserIds(); - String storedUserId = (String) userIds.get(key); - if (storedUserId == null || !storedUserId.equals(userId)) { // don't bother updating if its already there - userIds.put(key, userId); - setUserIds(userIds); - } - } - } - - /** - * Gets the default user id for a given system type. - * @param systemType the systemtype for which to retrieve the default user id - * @return The default user id - */ - public static String getDefaultUserId(IRSESystemType systemType) { - Preferences store = RSECorePlugin.getDefault().getPluginPreferences(); - String key = getSystemTypePreferencesKey(systemType, RSEPreferencesManager.ST_DEFAULT_USERID); - if (!store.contains(key)) { - store.setDefault(key, System.getProperty("user.name")); //$NON-NLS-1$ - } - String result = store.getString(key); - return result; - } - - /** - * Sets the default userId for the given system type. - * @param systemType the system type for which to set the default - * @param userId the default user id for this system type. - * This may be null to "unset" the default. - */ - public static void setDefaultUserId(IRSESystemType systemType, String userId) { - Preferences store = RSECorePlugin.getDefault().getPluginPreferences(); - String key = getSystemTypePreferencesKey(systemType, RSEPreferencesManager.ST_DEFAULT_USERID); - store.setValue(key, userId); - savePreferences(); - } - - /** - * Gets the system type values table for editing. This is a synthesized preference - * that is handled as a single value. Rows are separated by semi-colons. - * Each row is of the format <systemTypeId>=<enabled>+<defaultUserId>; - * @return the table of system types formatted as a single string - */ - public static String getSystemTypeValues() { - IRSESystemType[] systemTypes = RSECorePlugin.getTheCoreRegistry().getSystemTypes(); - StringBuffer buffer = new StringBuffer(100); - for (int i = 0; i < systemTypes.length; i++) { - IRSESystemType systemType = systemTypes[i]; - buffer.append(systemType.getId()); - buffer.append('='); - buffer.append(getIsSystemTypeEnabled(systemType)); - buffer.append('+'); - buffer.append(getDefaultUserId(systemType)); - buffer.append(';'); - } - String result = buffer.toString(); - return result; - } - - /** - * Sets the default user id and enabled state for all system types. - * @param systemTypeValues a tabled encoded as a string that contains - * entries for each system type. See {@link #getSystemTypeValues()} for the - * table format. - */ - public static void setSystemTypeValues(String systemTypeValues) { - IRSECoreRegistry registry = RSECorePlugin.getTheCoreRegistry(); - Hashtable table = parseString(systemTypeValues); - Enumeration e = table.keys(); - while (e.hasMoreElements()) { - String key = (String) e.nextElement(); - String compoundValue = (String) table.get(key); - String[] values = compoundValue.split("\\+"); //$NON-NLS-1$ - String isEnabled = values[0]; - String defaultUserId = values[1]; - IRSESystemType systemType = registry.getSystemTypeById(key); - setIsSystemTypeEnabled(systemType, isEnabled.equals("true")); //$NON-NLS-1$ - setDefaultUserId(systemType, defaultUserId); - } - } - - /** - * Sets if a system type is enabled. - * @param systemType the system type to be enabled on this machine. - * @param isEnabled the enabled state - */ - public static void setIsSystemTypeEnabled(IRSESystemType systemType, boolean isEnabled) { - Preferences store = RSECorePlugin.getDefault().getPluginPreferences(); - String key = getSystemTypePreferencesKey(systemType, RSEPreferencesManager.ST_ENABLED); - if (!store.contains(key)) { - store.setDefault(key, true); - } - store.setValue(key, isEnabled); - savePreferences(); - } - - /** - * Gets the enabled state for a particular system type. - * @param systemType the system type - * @return the enabled state of that type - */ - public static boolean getIsSystemTypeEnabled(IRSESystemType systemType) { - Preferences store = RSECorePlugin.getDefault().getPluginPreferences(); - String key = getSystemTypePreferencesKey(systemType, RSEPreferencesManager.ST_ENABLED); - if (!store.contains(key)) { - store.setDefault(key, true); - } - boolean result = store.getBoolean(key); - return result; - } - - private static String getSystemTypePreferencesKey(IRSESystemType systemType, String preference) { - String key = systemType.getId() + "." + preference; //$NON-NLS-1$ - return key; - } - - /** - * @return the names of the profiles the user has elected to make active. - */ - public static String[] getActiveProfiles() { - Preferences store = RSECorePlugin.getDefault().getPluginPreferences(); - String value = store.getString(IRSEPreferenceNames.ACTIVEUSERPROFILES); - String[] result = parseStrings(value); - return result; - } - - /** - * Sets the names of the profiles the user has elected to make "active". - * The caller must also save the preferences when completing. - * @see SystemPreferencesManager#savePreferences() - * @param newProfileNames an array of profile names considered to be active. - */ - private static void setActiveProfiles(String[] newProfileNames) { - Preferences store = RSECorePlugin.getDefault().getPluginPreferences(); - store.setValue(IRSEPreferenceNames.ACTIVEUSERPROFILES, makeString(newProfileNames)); - savePreferences(); - } - - /** - * Add a name to the active profile list. - * A name already in the list is not added again. - * The list remains sorted in the natural order. - * @param newName a new active profile name - */ - public static void addActiveProfile(String newName) { - SortedSet names = new TreeSet(Arrays.asList(getActiveProfiles())); - names.add(newName); - String[] newNames = new String[names.size()]; - names.toArray(newNames); - RSEPreferencesManager.setActiveProfiles(newNames); - savePreferences(); - } - - /** - * Delete one of the active profile names in the list of names stored in the registry. - * @param oldName the name of the profile to remove from the active profiles list. - */ - public static void deleteActiveProfile(String oldName) { - String[] names = getActiveProfiles(); - int matchPos = -1; - for (int idx = 0; (matchPos == -1) && (idx < names.length); idx++) { - if (names[idx].equalsIgnoreCase(oldName)) { - matchPos = idx; - names[idx] = null; - } - } - if (matchPos >= 0) { - RSEPreferencesManager.setActiveProfiles(names); - savePreferences(); - } - } - - /** - * @param profileName the name of the profile to search for in the list of active profiles. - * @return the zero-based position of a give profile name in the active list - */ - public static int getActiveProfilePosition(String profileName) { - String[] names = getActiveProfiles(); - int matchPos = -1; - for (int idx = 0; (matchPos == -1) && (idx < names.length); idx++) { - if (names[idx].equalsIgnoreCase(profileName)) matchPos = idx; - } - return matchPos; - } - - /** - * Renames one of the active profile names in the list of names stored in the registry. - * This is usually employed after renaming a profile to ensure that the active names - * list stays in synch with the actual profile names. The active state of the profiles - * cannot be kept in the profiles themselves since that can vary from workspace to workspace - * for profiles that are shared in a team. - * @param oldName the old name of the profile - * @param newName the new name of the profile - */ - public static void renameActiveProfile(String oldName, String newName) { - // update active profile name list - String[] names = getActiveProfiles(); - int matchPos = -1; - for (int idx = 0; (matchPos == -1) && (idx < names.length); idx++) { - if (names[idx].equalsIgnoreCase(oldName)) { - matchPos = idx; - names[idx] = newName; - } - } - if (matchPos >= 0) { - RSEPreferencesManager.setActiveProfiles(names); - savePreferences(); - } - } - - public static void initDefaults() { - String defaultProfileNames = RSEPreferencesManager.DEFAULT_ACTIVEUSERPROFILES; - String userProfileName = getDefaultPrivateSystemProfileName(); - defaultProfileNames += ";" + userProfileName; //$NON-NLS-1$ - Preferences store = RSECorePlugin.getDefault().getPluginPreferences(); - store.setDefault(IRSEPreferenceNames.ACTIVEUSERPROFILES, defaultProfileNames); - store.setDefault(IRSEPreferenceNames.USE_DEFERRED_QUERIES, RSEPreferencesManager.DEFAULT_USE_DEFERRED_QUERIES); - savePreferences(); - } - - /** - * Save the preference store. - */ - private static void savePreferences() { - RSECorePlugin.getDefault().savePluginPreferences(); - } - - /** - * @return The name of the default private system profile. This - * is typically the short name of the host machine or the name of the - * user account. - */ - public static String getDefaultPrivateSystemProfileName() { - String name = RSECorePlugin.getLocalMachineName(); - if (name != null) { - int i = name.indexOf('.'); - if (i > 0) { - name = name.substring(0, i); - } - } - if (name == null) { - name = System.getProperty("user.name"); //$NON-NLS-1$ - } - return name; - } - - /** - * @return the name of the default team system profile. - */ - public static String getDefaultTeamProfileName() { - String name = RSEPreferencesManager.DEFAULT_TEAMPROFILE; - return name; - } - - /** - * Convert table of key-value pairs into a single string. Each (name, value) pair is - * encoded as "name=value;" thus no keys or values in the string may - * contain semi-colons or equal signs. - * @param table a Hashtable to convert - * @return the string containing the converted table - */ - private static String makeString(Hashtable table) { - Enumeration keys = table.keys(); - StringBuffer sb = new StringBuffer(20 * table.size()); - while (keys.hasMoreElements()) { - String key = (String) keys.nextElement(); - String value = (String) table.get(key); - if ((value != null) && (value.length() > 0)) { - sb.append(key); - sb.append('='); - sb.append(value); - sb.append(';'); - } - } - return sb.toString(); - } - - /** - * Make a single string out of an array of strings. A semicolon is used as a - * delimiter between the separate values. No value in the array can contain - * a semicolon. - * - * @param values the array of strings to condense into a single one - * @return the condensed string - */ - private static String makeString(String[] values) { - StringBuffer allValues = new StringBuffer(20 * values.length); - for (int idx = 0; idx < values.length; idx++) { - if (values[idx] != null) { - if (idx > 0) { - allValues = allValues.append(';'); - } - allValues.append(values[idx]); - } - } - return allValues.toString(); - } - - /** - * Parse out list of multiple values into a string array per value. - * This is the inverse of the {@link #makeString(String[])} operation. - * @param allvalues the string holding the condensed value - * @return the reconstituted array of strings. - */ - private static String[] parseStrings(String allvalues) { - if (allvalues == null) return new String[0]; - String[] tokens = allvalues.split(";"); //$NON-NLS-1$ - return tokens; - } - - /** - * Parse out list of key-value pairs into a Hashtable. This is the inverse - * of the {@link SystemPreferencesManager#makeString(Hashtable)} operation. - * - * @param allValues the string containing the key-value pairs. If empty or - * null returns and empty Hashtable. - * @return the reconstituted Hashtable - */ - private static Hashtable parseString(String allValues) { - Hashtable keyValues = new Hashtable(10); - if (allValues != null) { - StringTokenizer tokens = new StringTokenizer(allValues, "=;"); //$NON-NLS-1$ - int count = 0; - String token1 = null; - String token2 = null; - while (tokens.hasMoreTokens()) { - count++; - if ((count % 2) == 0) // even number - { - token2 = tokens.nextToken(); - keyValues.put(token1, token2); - } else - token1 = tokens.nextToken(); - } - } - return keyValues; - } - - /** - * Get the Preference setting whether the local connection should be created - * by default or not. - * - * @return the boolean value indicating whether or not to create a local - * connection on a fresh workspace. - * @since org.eclipse.rse.core 3.0 - */ - public static boolean getCreateLocalConnection() { - Preferences prefs = RSECorePlugin.getDefault().getPluginPreferences(); - boolean result = prefs.getBoolean(IRSEPreferenceNames.CREATE_LOCAL_CONNECTION); - return result; - } - - /** - * Sets the preference for a particular system type and host address that causes passwords - * not to be savable. The default for this attribute is false - that is, passwords are savable for - * all system types and hosts. - * @param systemType The system type of this preference. - * @param hostAddress The host address of this preference - * @param deny true if save of passwords is to be denied. false is save is to be allowed. - * If true then all passwords that have been saved for this system type and host address are removed. - * All passwords saved for the default system type and host address are also removed. - * @return the number of passwords removed if deny was set to true - * @since org.eclipse.rse.core 3.0 - */ - public static int setDenyPasswordSave(IRSESystemType systemType, String hostAddress, boolean deny) { - int result = 0; - Preferences preferences = RSECorePlugin.getDefault().getPluginPreferences(); - String preferenceName = getPasswordSavePreferenceName(systemType, hostAddress); - preferences.setValue(preferenceName, deny); - if (deny) { - result = PasswordPersistenceManager.getInstance().remove(systemType, hostAddress); - result += PasswordPersistenceManager.getInstance().remove(PasswordPersistenceManager.DEFAULT_SYSTEM_TYPE, hostAddress); - } - savePreferences(); - return result; - } - - /** - * Retrieves the preference for a particular system type and host address that determines if passwords - * can be saved. The default for this attribute is false, that is, save is not denied, - * thus passwords are savable. - * @param systemType - * @param hostAddress - * @return true if saving of passwords is denied. false if saving is allowed. - * @since org.eclipse.rse.core 3.0 - */ - public static boolean getDenyPasswordSave(IRSESystemType systemType, String hostAddress) { - Preferences preferences = RSECorePlugin.getDefault().getPluginPreferences(); - String preferenceName = getPasswordSavePreferenceName(systemType, hostAddress); - boolean result = preferences.getBoolean(preferenceName); - return result; - } - - /** - * Retrieves the "denyPasswordSave" preference name of a particular host address. - * @param systemType The system type we are concerned with - * @param hostAddress The host address, typically an IP address. - * @return the name associated with this preference. - * This name is of the form {systemTypeId}___{hostAddress}___DENY_PASSWORD_SAVE. - */ - private static String getPasswordSavePreferenceName(IRSESystemType systemType, String hostAddress) { - StringBuffer b = new StringBuffer(100); - b.append(systemType.getId()); - b.append("___"); //$NON-NLS-1$ - b.append(hostAddress.toUpperCase(Locale.US)); // should use US locale for IP names and addresses - b.append("___DENY_PASSWORD_SAVE"); //$NON-NLS-1$ - String preferenceName = b.toString(); - return preferenceName; - } - - /* - * Having this method private disables instance creation. - */ - private RSEPreferencesManager() { - } - -} diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/RemoteSystemsTempProjectNature.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/RemoteSystemsTempProjectNature.java deleted file mode 100644 index 477629376..000000000 --- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/RemoteSystemsTempProjectNature.java +++ /dev/null @@ -1,55 +0,0 @@ -/******************************************************************************** - * Copyright (c) 2003, 2007 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 - * - * 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: - * {Name} (company) - description of contribution. - ********************************************************************************/ - -package org.eclipse.rse.core; - -import org.eclipse.core.resources.IProject; -import org.eclipse.core.resources.IProjectNature; -import org.eclipse.core.runtime.CoreException; - -/** - * A nature for the temporary project where we store files. - */ -public class RemoteSystemsTempProjectNature implements IProjectNature { - - - - /** - * @see org.eclipse.core.resources.IProjectNature#configure() - */ - public void configure() throws CoreException { - } - - /** - * @see org.eclipse.core.resources.IProjectNature#deconfigure() - */ - public void deconfigure() throws CoreException { - } - - /** - * @see org.eclipse.core.resources.IProjectNature#getProject() - */ - public IProject getProject() { - return null; - } - - /** - * @see org.eclipse.core.resources.IProjectNature#setProject(IProject) - */ - public void setProject(IProject project) { - } - -}
\ No newline at end of file diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/SystemRemoteObjectMatcher.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/SystemRemoteObjectMatcher.java deleted file mode 100644 index 3bc67dc03..000000000 --- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/SystemRemoteObjectMatcher.java +++ /dev/null @@ -1,590 +0,0 @@ -/******************************************************************************** - * Copyright (c) 2001, 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 - * - * 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: - * Martin Oberhuber (Wind River) - [175262] IHost.getSystemType() should return IRSESystemType - * Martin Oberhuber (Wind River) - [168870] refactor org.eclipse.rse.core package of the UI plugin - * Martin Oberhuber (Wind River) - [175680] Deprecate obsolete ISystemRegistry methods - ********************************************************************************/ - -package org.eclipse.rse.core; -import java.util.StringTokenizer; -import java.util.Vector; - -import org.eclipse.rse.core.model.IHost; -import org.eclipse.rse.core.subsystems.ISystemRemoteObjectMatchProvider; -import org.eclipse.rse.core.subsystems.ISubSystem; - - -/** - * This class encapsulates all the criteria required to identify a match on a remote - * system object, and the methods to determine if a given input meets that criteria. - * <ol> - * <li>subsystemconfigurationid. For scoping to remote objects for a given subsystem configuration - * <li>subsystemconfigurationCategory. For scoping to remote objects for a given subsystem configuration category. - * <li>systemTypes. For scoping to remote objects from systems of a given type, or semicolon-separated types. - * <li>category. For scoping to remote objects of a given type category - * <li>namefilter. For scoping to remote objects of a given name - * <li>typefilter. For scoping to remote objects of a given type - * <li>subtypefilter. For scoping to remote objects of a given subtype - * <li>subsubtypefilter. For scoping to remote objects of a given sub-subtype - * </ol> - * <p> - * The names given can be scalar or very simple generic (begin or end with an asterisk). - * Occasionally, as with iSeries objects types, an asterisk is a valid part of the - * name, as in *PGM. If "*PGM" is specified for the type filter, then it would match - * on other types too, like *SRVPGM. To solve this special case, users can specify - * the following to tell us that the asterisk is to be taken literally, versus as a - * leading or trailing wild card: - * <pre><code> - * "%%ast.PGM" or "%%ast;PGM" - * </code></pre> - * <p> - * The special symbol "%%ast." is resolved into an asterisk as part of the literal name. - * @see org.eclipse.rse.core.subsystems.ISystemRemoteObjectMatchProvider - */ -public class SystemRemoteObjectMatcher -{ - public static final String STAR_SYMBOL = "%ast."; //$NON-NLS-1$ - public static final String STAR_SYMBOL2 = "%ast;"; // really should have been this I think. //$NON-NLS-1$ - public static final int STAR_SYMBOL_LEN = 5; - private String categoryfilter, subsystemfilter,subsystemCategoryFilter, systypesfilter, namefilter,typefilter,subtypefilter,subsubtypefilter; - private String categoryfilterpart, subsystemfilterpart,subsystemCategoryFilterpart,namefilterpart,typefilterpart,subtypefilterpart,subsubtypefilterpart; - private boolean allSSFCategories = false; - private boolean allCategories = false; - private boolean allNames = false; - private boolean allTypes = false; - private boolean allSubTypes = false; - private boolean allSubSubTypes = false; - private boolean allSubSystems = false; - private boolean allSystemTypes = false; - - private boolean genericSSFCategoriesStart = false; - private boolean genericCategoriesStart = false; - private boolean genericNamesStart = false; - private boolean genericTypesStart = false; - private boolean genericSubTypesStart = false; - private boolean genericSubSubTypesStart = false; - private boolean genericSubSystemStart = false; - - private boolean genericSSFCategoriesEnd = false; - private boolean genericCategoriesEnd = false; - private boolean genericNamesEnd = false; - private boolean genericTypesEnd = false; - private boolean genericSubTypesEnd = false; - private boolean genericSubSubTypesEnd = false; - private boolean genericSubSystemEnd = false; - - /** - * Historical constructor that doesn't support "subsystemConfigurationCategory" or "systemTypes". - */ - public SystemRemoteObjectMatcher(String subsystemConfigurationId, String categoryFilter, - String nameFilter, String typeFilter, - String subtypeFilter, String subsubtypeFilter) - { - this(subsystemConfigurationId, null, categoryFilter, null, nameFilter, typeFilter, subtypeFilter, subsubtypeFilter); - } - /** - * Constructor that supports "subsystemConfigurationCategory" and "systemTypes". - */ - public SystemRemoteObjectMatcher(String subsystemConfigurationId, String subsystemConfigurationCategoryFilter, String categoryFilter, - String systemTypes, String nameFilter, String typeFilter, - String subtypeFilter, String subsubtypeFilter) - { - this.subsystemCategoryFilter = subsystemConfigurationCategoryFilter; - this.subsystemfilter = subsystemConfigurationId; - this.systypesfilter = systemTypes; - this.categoryfilter = categoryFilter; - this.namefilter = nameFilter; - this.typefilter = typeFilter; - this.subtypefilter = subtypeFilter; - this.subsubtypefilter = subsubtypeFilter; - - if ((systypesfilter == null) || (systypesfilter.length()==0)) - systypesfilter = "*"; //$NON-NLS-1$ - if ((subsystemCategoryFilter == null) || (subsystemCategoryFilter.length()==0)) - subsystemCategoryFilter = "*"; //$NON-NLS-1$ - if (categoryfilter == null) - categoryfilter = "*"; //$NON-NLS-1$ - if (namefilter == null) - namefilter = "*"; //$NON-NLS-1$ - if (typefilter == null) - typefilter = "*"; //$NON-NLS-1$ - if (subtypefilter == null) - subtypefilter = "*"; //$NON-NLS-1$ - if (subsubtypefilter == null) - subsubtypefilter = "*"; //$NON-NLS-1$ - if (subsystemfilter == null) - subsystemfilter = "*"; //$NON-NLS-1$ - - this.allSSFCategories = subsystemCategoryFilter.equals("*"); //$NON-NLS-1$ - this.allCategories = categoryfilter.equals("*"); //$NON-NLS-1$ - this.allSystemTypes = systypesfilter.equals("*"); //$NON-NLS-1$ - this.allNames = namefilter.equals("*"); //$NON-NLS-1$ - this.allTypes = typefilter.equals("*"); //$NON-NLS-1$ - this.allSubTypes = subtypefilter.equals("*"); //$NON-NLS-1$ - this.allSubSubTypes = subsubtypefilter.equals("*"); //$NON-NLS-1$ - this.allSubSystems = subsystemfilter.equals("*"); //$NON-NLS-1$ - - // -------------------------------------------------- - // determine if the name starts or ends with asterisk - // -------------------------------------------------- - this.genericSSFCategoriesStart = !allSSFCategories && startsWithAsterisk(subsystemCategoryFilter); - this.genericCategoriesStart = !allCategories && startsWithAsterisk(categoryfilter); - this.genericNamesStart = !allNames && startsWithAsterisk(namefilter); - this.genericTypesStart = !allTypes && startsWithAsterisk(typefilter); - this.genericSubTypesStart = !allSubTypes && startsWithAsterisk(subtypefilter); - this.genericSubSubTypesStart = !allSubSubTypes && startsWithAsterisk(subsubtypefilter); - this.genericSubSystemStart = !allSubSystems && startsWithAsterisk(subsystemfilter); - - this.genericSSFCategoriesEnd = !allSSFCategories && endsWithAsterisk(subsystemCategoryFilter); - this.genericCategoriesEnd = !allCategories && endsWithAsterisk(categoryfilter); - this.genericNamesEnd = !allNames && endsWithAsterisk(namefilter); - this.genericTypesEnd = !allTypes && endsWithAsterisk(typefilter); - this.genericSubTypesEnd = !allSubTypes && endsWithAsterisk(subtypefilter); - this.genericSubSubTypesEnd = !allSubSubTypes && endsWithAsterisk(subsubtypefilter); - this.genericSubSystemEnd = !allSubSystems && endsWithAsterisk(subsystemfilter); - - if (genericSSFCategoriesStart) - subsystemCategoryFilterpart = stripLeadingAsterisk(subsystemCategoryFilter); // strip off asterisk - if (genericCategoriesStart) - categoryfilterpart = stripLeadingAsterisk(categoryfilter); // strip off asterisk - if (genericNamesStart) - namefilterpart = stripLeadingAsterisk(namefilter); // strip off asterisk - if (genericTypesStart) - typefilterpart = stripLeadingAsterisk(typefilter); // strip off asterisk - if (genericSubTypesStart) - subtypefilterpart = stripLeadingAsterisk(subtypefilter); // strip off asterisk - if (genericSubSubTypesStart) - subsubtypefilterpart = stripLeadingAsterisk(subsubtypefilter); // strip off asterisk - if (genericSubSystemStart) - subsystemfilterpart = stripLeadingAsterisk(subsystemfilter); // strip off asterisk - - if (genericSSFCategoriesEnd) - subsystemCategoryFilterpart = stripTrailingAsterisk(subsystemCategoryFilter); // strip off asterisk - if (genericCategoriesEnd) - categoryfilterpart = stripTrailingAsterisk(categoryfilter); // strip off asterisk - if (genericNamesEnd) - namefilterpart = stripTrailingAsterisk(namefilter); // strip off asterisk - if (genericTypesEnd) - typefilterpart = stripTrailingAsterisk(typefilter); // strip off asterisk - if (genericSubTypesEnd) - subtypefilterpart = stripTrailingAsterisk(subtypefilter); // strip off asterisk - if (genericSubSubTypesEnd) - subsubtypefilterpart = stripTrailingAsterisk(subsubtypefilter);// strip off asterisk - if (genericSubSystemEnd) - subsystemfilterpart = stripTrailingAsterisk(subsystemfilter); // strip off asterisk - - // -------------------------------------------------- - // resolve '\*' escape characters - // -------------------------------------------------- - subsystemCategoryFilter = resolveSymbols(subsystemCategoryFilter); - categoryfilter = resolveSymbols(categoryfilter); - namefilter = resolveSymbols(namefilter); - typefilter = resolveSymbols(typefilter); - subtypefilter = resolveSymbols(subtypefilter); - subsubtypefilter = resolveSymbols(subsubtypefilter); - subsystemfilter = resolveSymbols(subsystemfilter); - } - - /** - * Helper method. - * Returns true if given name starts with an asterisk. - */ - protected boolean startsWithAsterisk(String name) - { - return name.startsWith("*"); //$NON-NLS-1$ - } - /** - * Helper method. - * Returns true if given name ends with an asterisk. - */ - protected boolean endsWithAsterisk(String name) - { - return name.endsWith("*"); //$NON-NLS-1$ - } - /** - * Helper method. - * Strips off the leading asterisk. - */ - protected String stripLeadingAsterisk(String name) - { - return resolveSymbols(name.substring(1)); - } - /** - * Helper method. - * Strips off the trailing asterisk. - */ - protected String stripTrailingAsterisk(String name) - { - return resolveSymbols(name.substring(0, name.length()-1)); - } - /** - * Occasionally, as with iSeries objects types, an asterisk is a valid part of the - * name, as in *PGM. If "*PGM" is specified for the type filter, then it would match - * on other types too, like *SRVPGM. To solve this special case, users can specify - * the following to tell us that the asterisk is to be taken literally, versus as a - * leading or trailing wild card:<br> - * <pre><code> - * "%%ast.PGM" or "%%ast;PGM" - * </code></pre> - * <p> - * The special symbol "%%ast." is resolved into an asterisk as part of the literal name. - */ - protected String resolveSymbols(String name) - { - // yantzi:5.1.2 workaround for eclipse bug 49312 - if (name.startsWith("%%ast.") || name.startsWith("%%ast;")) //$NON-NLS-1$ //$NON-NLS-2$ - { - // eclipse should have stripped the leading % off but doesn't because of this bug - name = name.substring(1); - } - - int symbolLength = STAR_SYMBOL_LEN; - int symbolIndex = name.indexOf(STAR_SYMBOL); - if (symbolIndex == -1) - symbolIndex = name.indexOf(STAR_SYMBOL2); - boolean hasSymbols = (symbolIndex != -1); - boolean hadSymbols = hasSymbols; - boolean debug = false; - if (hasSymbols && debug) - System.out.println("Before: " + name); //$NON-NLS-1$ - while (hasSymbols) - { - if (symbolIndex == 0) - { - // "&.abc" - if (name.length() > symbolLength) - name = "*" + name.substring(symbolLength); //$NON-NLS-1$ - // "&." - else - name = "*"; //$NON-NLS-1$ - } - else if ((symbolIndex+symbolLength) < name.length()) - { - // "abc&.def" - // "01234567890" - String part1 = name.substring(0,symbolIndex); // up to symbol - String part2 = name.substring(symbolIndex+symbolLength); // after symbol - name = part1 + "*" + part2; //$NON-NLS-1$ - } - else - { - // "abc&." - // "01234567" - String part1 = name.substring(0,symbolIndex); // up to symbol - name = part1 + "*"; //$NON-NLS-1$ - } - symbolIndex = name.indexOf(STAR_SYMBOL); - if (symbolIndex == -1) - symbolIndex = name.indexOf(STAR_SYMBOL2); - hasSymbols = (symbolIndex != -1); - } - if (hadSymbols && debug) - System.out.println("After: " + name); //$NON-NLS-1$ - return name; - } - - /** - * Getter method. - * Return what was specified for the <samp>subsystemconfigurationCategory</samp> xml attribute. - */ - public String getSubSystemConfigurationCategoryFilter() - { - return subsystemCategoryFilter; - } - /** - * Getter method. - * Return what was specified for the <samp>systemTypes</samp> xml attribute. - */ - public String getSystemTypesFilter() - { - return systypesfilter; - } - - /** - * Getter method. - * Return what was specified for the <samp>typecategoryfilter</samp> xml attribute. - */ - public String getCategoryFilter() - { - return categoryfilter; - } - /** - * Getter method. - * Return what was specified for the <samp>namefilter</samp> xml attribute. - */ - public String getNameFilter() - { - return namefilter; - } - /** - * Getter method. - * Return what was specified for the <samp>typefilter</samp> xml attribute. - */ - public String getTypeFilter() - { - return typefilter; - } - /** - * Getter method. - * Return what was specified for the <samp>subtypefilter</samp> xml attribute. - */ - public String getSubTypeFilter() - { - return subtypefilter; - } - /** - * Getter method. - * Return what was specified for the <samp>subsubtypefilter</samp> xml attribute. - */ - public String getSubSubTypeFilter() - { - return subsubtypefilter; - } - /** - * Getter method. - * Return what was specified for the <samp>subsystemconfigurationid</samp> xml attribute. - */ - public String getSubSystemConfigurationId() - { - return subsystemfilter; - } - - /** - * Given an ISystemRemoteElement, return true if that element - * meets this criteria. - */ - public boolean appliesTo(ISystemRemoteObjectMatchProvider adapter, Object element) - { - boolean applies = true; - // must match on all attributes to apply - - // ----------------------------------- - // check for match on subsystem filter - // ----------------------------------- - boolean subsystemMatch = true; - if (!allSubSystems) - { - String subsystem = adapter.getSubSystemConfigurationId(element); - if (subsystem == null) - subsystemMatch = false; - else if (!genericSubSystemStart && !genericSubSystemEnd) - subsystemMatch = subsystem.equals(subsystemfilter); - else if (genericSubSystemStart) - subsystemMatch = subsystem.endsWith(subsystemfilterpart); - else if (genericSubSystemEnd) - subsystemMatch = subsystem.startsWith(subsystemfilterpart); - } - if (!subsystemMatch) - return false; - - // ---------------------------------------------------- - // check for match on subsystem factory category filter - // ---------------------------------------------------- - boolean ssfCategoryMatch = true; - if (!allSSFCategories) - { - ISubSystem subsystem = adapter.getSubSystem(element); - if (subsystem == null) - ssfCategoryMatch = true; // should be false, but this was added late and I don't to regress anyting. - else - { - String ssfCategory = subsystem.getSubSystemConfiguration().getCategory(); - if (ssfCategory == null) - ssfCategory = ""; //$NON-NLS-1$ - if (!genericSSFCategoriesStart && !genericSSFCategoriesEnd) - ssfCategoryMatch = ssfCategory.equals(subsystemCategoryFilter); - else if (genericSSFCategoriesStart) - ssfCategoryMatch = ssfCategory.endsWith(subsystemCategoryFilterpart); - else if (genericSSFCategoriesEnd) - ssfCategoryMatch = ssfCategory.startsWith(subsystemCategoryFilterpart); - } - } - if (!ssfCategoryMatch) - return false; - - // ---------------------------------------------------- - // check for match on system types filter - // ---------------------------------------------------- - boolean systemTypesMatch = true; - if (!allSystemTypes) - { - ISubSystem subsystem = adapter.getSubSystem(element); - String[] values = tokenize(systypesfilter); - if (subsystem == null) - { - if (!(element instanceof IHost)) // should never happen for remote objects! - systemTypesMatch = false; - else - { - String connSysType = ((IHost)element).getSystemType().getName(); - systemTypesMatch = false; - for (int idx=0; !systemTypesMatch && (idx<values.length); idx++) - { - if (connSysType.equals(values[idx])) - systemTypesMatch = true; - } - } - } - else - { - systemTypesMatch = false; - for (int idx=0; !systemTypesMatch && (idx<values.length); idx++) - { - if (subsystem.getHost().getSystemType().getName().equals(values[idx])) - systemTypesMatch = true; - } - } - } - if (!systemTypesMatch) - return false; - - // ------------------------------ - // check for match on name filter - // ------------------------------ - boolean nameMatch = true; - - // default is case insensitive - boolean caseSensitive = false; - - // get subsystem - ISubSystem subsystem = adapter.getSubSystem(element); - - // find out whether system is case sensitive or not - if (subsystem != null) { - caseSensitive = subsystem.getSubSystemConfiguration().isCaseSensitive(); - } - - if (!allNames) - { - String name = adapter.getName(element); - String theNameFilter = namefilter; - String theNameFilterPart = namefilterpart; - - if (name == null) { - nameMatch = false; - } - - else { - - if (!caseSensitive) { - name = name.toLowerCase(); - theNameFilter = theNameFilter.toLowerCase(); - theNameFilterPart = theNameFilterPart.toLowerCase(); - } - - if (!genericNamesStart && !genericNamesEnd) - nameMatch = name.equals(theNameFilter); - else if (genericNamesStart) - nameMatch = name.endsWith(theNameFilterPart); - else if (genericNamesEnd) - nameMatch = name.startsWith(theNameFilterPart); - } - } - if (!nameMatch) - return false; - - // --------------------------------------- - // check for match on type category filter - // --------------------------------------- - boolean catMatch = true; - if (!allCategories) - { - String cat = adapter.getRemoteTypeCategory(element); - if (cat == null) - catMatch = false; - else if (!genericCategoriesStart && !genericCategoriesEnd) - catMatch = cat.equals(categoryfilter); - else if (genericCategoriesStart) - catMatch = cat.endsWith(categoryfilterpart); - else if (genericCategoriesEnd) - catMatch = cat.startsWith(categoryfilterpart); - } - if (!catMatch) - return false; - - // ------------------------------ - // check for match on type filter - // ------------------------------ - boolean typeMatch = true; - if (!allTypes) - { - String type = adapter.getRemoteType(element); - if (type == null) - typeMatch = false; - else if (!genericTypesStart && !genericTypesEnd) - typeMatch = type.equals(typefilter); - else if (genericTypesStart) - typeMatch = type.endsWith(typefilterpart); - else if (genericTypesEnd) - typeMatch = type.startsWith(typefilterpart); - } - if (!typeMatch) - return false; - - // --------------------------------- - // check for match on subtype filter - // --------------------------------- - boolean subtypeMatch = true; - if (!allSubTypes) - { - String subtype = adapter.getRemoteSubType(element); - if (subtype == null) - subtypeMatch = false; - else if (!genericSubTypesStart && !genericSubTypesEnd) - subtypeMatch = subtype.equals(subtypefilter); - else if (genericSubTypesStart) - subtypeMatch = subtype.endsWith(subtypefilterpart); - else if (genericSubTypesEnd) - subtypeMatch = subtype.startsWith(subtypefilterpart); - } - if (!subtypeMatch) - return false; - - // ------------------------------------- - // check for match on sub-subtype filter - // ------------------------------------- - boolean subsubtypeMatch = true; - if (!allSubSubTypes) - { - String subsubtype = adapter.getRemoteSubSubType(element); - if (subsubtype == null) - subsubtypeMatch = false; - else if (!genericSubSubTypesStart && !genericSubSubTypesEnd) - subsubtypeMatch = subsubtype.equals(subsubtypefilter); - else if (genericSubSubTypesStart) - subsubtypeMatch = subsubtype.endsWith(subsubtypefilterpart); - else if (genericSubSubTypesEnd) - subsubtypeMatch = subsubtype.startsWith(subsubtypefilterpart); - } - if (!subsubtypeMatch) - return false; - - return applies; - } - - /** - * Break given comma-delimited string into tokens - */ - private String[] tokenize(String input) - { - StringTokenizer tokens = new StringTokenizer(input,";"); //$NON-NLS-1$ - Vector v = new Vector(); - while (tokens.hasMoreTokens()) - v.addElement(tokens.nextToken()); - String[] stringArray = new String[v.size()]; - for (int idx=0; idx<v.size(); idx++) - stringArray[idx] = (String)v.elementAt(idx); - return stringArray; - } -}
\ No newline at end of file diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/SystemResourceHelpers.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/SystemResourceHelpers.java deleted file mode 100644 index 016658d3e..000000000 --- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/SystemResourceHelpers.java +++ /dev/null @@ -1,777 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2002, 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 - * - * 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) - [226561] Add API markup to RSE Javadocs where extend / implement is allowed - *******************************************************************************/ - -package org.eclipse.rse.core; -import java.io.File; -import java.io.FileFilter; -import java.io.FileWriter; -import java.io.IOException; -import java.util.Vector; - -import org.eclipse.core.resources.IContainer; -import org.eclipse.core.resources.IFile; -import org.eclipse.core.resources.IFolder; -import org.eclipse.core.resources.IProject; -import org.eclipse.core.resources.IResource; -import org.eclipse.core.resources.IResourceStatus; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IPath; -import org.eclipse.core.runtime.IStatus; - -/** - * A class with helper methods for working with the underlying Eclipse resources - * needed for filters, filter pools and filter pool managers. - * @noextend This class is not intended to be subclassed by clients. - * @noinstantiate This class is not intended to be instantiated by clients. - */ -public class SystemResourceHelpers implements FileFilter -{ - - private static SystemResourceHelpers defaultInstance = null; - - //private SystemLogFile logFile = null; - - // variables to affect the list method for subsetting folder contents - private boolean filesOnly = false; - private boolean foldersOnly = false; - private String namePrefix = null; - private String nameSuffix = null; - - - /** - * Constructor - */ - public SystemResourceHelpers() - { - } - - /** - * Return common instance if unique instance not required. - */ - public static SystemResourceHelpers getResourceHelpers() - { - if (defaultInstance == null) - defaultInstance = new SystemResourceHelpers(); - return defaultInstance; - } - - // --------------------------- - // GENERIC RESOURCE METHODS... - // --------------------------- - - /** - * Method to delete a folder or file and absorb the exception - */ - public void deleteResource(IResource fileOrFolder) - { - try { - if (fileOrFolder instanceof IFile) - deleteFile((IFile)fileOrFolder); - else - deleteFolder((IFolder)fileOrFolder); - } catch (Exception exc) - { - logException("Exception deleting resource " + fileOrFolder.getName(), exc); //$NON-NLS-1$ - } - } - /** - * Method to rename a folder or file and absorb the exception - */ - public void renameResource(IResource fileOrFolder, String newName) - { - //System.out.println("inside renameResource for "+fileOrFolder.getFullPath() + ". newName = " + newName); - if (fileOrFolder.getName().equals(newName)) - { - //System.out.println("same name! "); - Exception exc = new Exception("Rename to same name: " + newName); //$NON-NLS-1$ - exc.fillInStackTrace(); - exc.printStackTrace(); - return; - } - try { - if (fileOrFolder instanceof IFile) - renameFile((IFile)fileOrFolder, newName); - else - renameFolder((IFolder)fileOrFolder, newName); - } catch (Exception exc) - { - logException("Exception rename resource " + fileOrFolder.getName() + " to " + newName, exc); //$NON-NLS-1$ //$NON-NLS-2$ - } - } - - /** - * Refresh a resource from disk. Turns off resource event listening to avoid recursion. - * Does a DEPTH_INFINITE refresh. - */ - public void refreshResource(IResource fileOrFolder) - { - SystemResourceManager.turnOffResourceEventListening(); - try - { - if (!fileOrFolder.getWorkspace().isTreeLocked()) - fileOrFolder.refreshLocal(IResource.DEPTH_INFINITE, null); - } catch (Exception exc) {} - SystemResourceManager.turnOnResourceEventListening(); - } - /** - * Refresh a resource from disk. Turns off resource event listening to avoid recursion. - * Does a DEPTH_ZERO refresh, so children are not refreshed. Should be more efficient than - * deep refresh. - */ - public void refreshResourceShallow(IResource fileOrFolder) - { - SystemResourceManager.turnOffResourceEventListening(); - try - { - if (!fileOrFolder.getWorkspace().isTreeLocked()) - fileOrFolder.refreshLocal(IResource.DEPTH_ZERO, null); - } catch (Exception exc) {} - SystemResourceManager.turnOnResourceEventListening(); - } - - /** - * Test if a resource is in use, prior to attempting to rename or delete it. - * @return true if it is in use or read only, false if it is not. - */ - public static boolean testIfResourceInUse(IResource resource) - { - boolean inUse = resource.getResourceAttributes().isReadOnly() || !resource.isAccessible(); - if (!inUse) // keep testing.. - { - IPath localOSLocation = resource.getLocation(); - if (localOSLocation != null) - { - File osFile = new File(localOSLocation.toOSString()); - inUse = !osFile.canWrite(); - if (!inUse && (resource instanceof IFile)) - { - try { - //System.out.println("testing " + osFile.getAbsolutePath()); - FileWriter outFileStream = new FileWriter(osFile.getAbsolutePath(),true); - outFileStream.close(); - } - catch (IOException exc) - { - inUse = true; - //System.out.println("...file is locked!"); - } - } - } - } - //System.out.println("Testing in-use of resource " + resource.getName() + ": " + inUse); - return inUse; - } - - // -------------------------- - // FOLDER SPECIFIC METHODS... - // -------------------------- - - /** - * Create a folder, if it does not already exist. - */ - public IFolder getOrCreateFolder(IContainer parentFolder, String folderName) - { - /* - if (folderName.equals("Private")) - { - String msg = "Someone asked to create Private folder!"; - Exception e = new Exception(msg); - e.fillInStackTrace(); - RSEUIPlugin.logError(msg, e); - } - */ - IFolder folder = getFolder(parentFolder, folderName); - if (!exists(folder)) - createFolder(folder); - return folder; - } - /** - * Create a folder, if it does not already exist. - */ - public boolean ensureFolderExists(IFolder folder) - { - boolean ok = true; - if (!exists(folder)) - { - ok = createFolder(folder); - } - return ok; - } - - /** - * Get a folder whose parent is either a project or a folder - */ - public IFolder getFolder(IContainer parent, String folderName) - { - SystemResourceManager.turnOffResourceEventListening(); - IFolder folder = null; - if (parent instanceof IProject) - { - folder = ((IProject)parent).getFolder(folderName); - } - else - folder = ((IFolder)parent).getFolder(folderName); - SystemResourceManager.turnOnResourceEventListening(); - return folder; - } - /** - * Re-get a folder which has been renamed. - */ - public IFolder getRenamedFolder(IFolder oldFolder, String newFolderName) - { - SystemResourceManager.turnOffResourceEventListening(); - IFolder folder = null; - IContainer parent = oldFolder.getParent(); - if (parent instanceof IProject) - folder = ((IProject)parent).getFolder(newFolderName); - else - folder = ((IFolder)parent).getFolder(newFolderName); - SystemResourceManager.turnOnResourceEventListening(); - return folder; - } - - - /** - * Create new folder - */ - public boolean createFolder(IFolder folder) - { - boolean ok = true; - try - { - SystemResourceManager.turnOffResourceEventListening(); - folder.create(true,true,null); - SystemResourceManager.turnOnResourceEventListening(); - /* - if (folder.getName().equals("Private")) - { - String msg = "Someone asked to create Private folder!"; - Exception e = new Exception(msg); - e.fillInStackTrace(); - RSEUIPlugin.logError(msg, e); - } - */ - } catch (CoreException e) - { - SystemResourceManager.turnOnResourceEventListening(); - IStatus status = e.getStatus(); - if (status!=null) - { - int code = status.getCode(); - if (code != IResourceStatus.RESOURCE_EXISTS) - { - logException("error creating folder "+folder.getName(),e); //$NON-NLS-1$ - ok = false; - } - } - } - return ok; - } - - /** - * Delete a folder - */ - public boolean deleteFolder(IFolder folder) - throws Exception - { - // to ensure success, we force a refresh local action... - refreshResource(folder); - boolean existsInFileSystem = exists(folder); - if (!existsInFileSystem) - return true; - boolean existsInWorkSpace = folder.exists(); - if (existsInFileSystem && !existsInWorkSpace) - { - logMessage("...deleteFolder error: folder "+folder.getLocation().toOSString()+" exists in file system but not in workspace! Cannot delete it."); //$NON-NLS-1$ //$NON-NLS-2$ - existsInWorkSpace = folder.exists(); // for debugging. set breakpoint here - } - boolean ok = true; - //String name = folder.getName(); - SystemResourceManager.turnOffResourceEventListening(); - folder.delete(true,false,null); // force-yes, keep-history-no, no progress monitor - SystemResourceManager.turnOnResourceEventListening(); - return ok; - } - /** - * Rename a folder - */ - public boolean renameFolder(IFolder folder, String newName) - throws Exception - { - //System.out.println("inside renameFolder for "+folder.getFullPath() + ". exists? = " + folder.exists()); - if (!exists(folder)) - return true; - boolean ok = true; - IPath newPath = folder.getFullPath().removeLastSegments(1).append(newName); - //System.out.println("new path = " + newPath.toOSString()); - try { - SystemResourceManager.turnOffResourceEventListening(); - if (!newPath.toFile().exists()) - folder.move(newPath, true, false, null); - SystemResourceManager.turnOnResourceEventListening(); - //System.out.println("...path after move = " + folder.getFullPath().toOSString()); - } catch (Exception exc) - { - SystemResourceManager.turnOnResourceEventListening(); - //exc.printStackTrace(); - throw exc; - } - return ok; - } - /** - * Move a folder - */ - public boolean moveFolder(IFolder newParent, IFolder folder) - throws Exception - { - boolean ok = true; - if (!exists(folder)) - return true; - SystemResourceManager.turnOffResourceEventListening(); - folder.move(newParent.getFullPath().append(folder.getName()),true,false,null); - SystemResourceManager.turnOnResourceEventListening(); - return ok; - } - - /** - * Return the path of the given folder - */ - public String getFolderPath(IFolder folder) - { - return folder.getLocation().toOSString(); - } - - /** - * Return a list of child folders in the given container - * @param projectOrFolder The parent container to search. - * @return an array of IFolder objects - */ - public IFolder[] listFolders(IContainer projectOrFolder) - { - if (!projectOrFolder.exists()) - return (new IFolder[0]); - - SystemResourceManager.turnOffResourceEventListening(); - - Vector folders = new Vector(); - try - { - IResource[] members = projectOrFolder.members(); - if (members != null) - for (int idx=0; idx<members.length; idx++) - if (members[idx].getType() == IResource.FOLDER) - folders.addElement(members[idx]); - } catch (Exception exc) - { - logException("Error retrieving folder list",exc); //$NON-NLS-1$ - } - - SystemResourceManager.turnOnResourceEventListening(); - - return convertToFolderArray(folders); - } - - /** - * Return a list of child folders in the given container, - * which contain a file of the given name. - * @param projectOrFolder The parent container to search. - * @param fileName The name of the file which must exist - * in the folder in order to be included in the returned list - * @return an array of IFolder objects - */ - public IFolder[] listFolders(IContainer projectOrFolder, String fileName) - { - if (!exists(projectOrFolder)) - return (new IFolder[0]); - - SystemResourceManager.turnOffResourceEventListening(); - - Vector folders = new Vector(); - // to ensure we get everything, we force a refresh local action... - try { - refreshResource(projectOrFolder); - } catch (Exception exc) {} - try - { - // ok, now we can query the children... - IResource[] members = projectOrFolder.members(); - if (members != null) - { - for (int idx=0; idx<members.length; idx++) - { - if (members[idx].getType() == IResource.FOLDER) - { - if (exists(getFile((IFolder)members[idx], fileName))) - folders.addElement(members[idx]); - } - } - } - } catch (Exception exc) - { - logException("Error retrieving folder list",exc); //$NON-NLS-1$ - } - - SystemResourceManager.turnOnResourceEventListening(); - - return convertToFolderArray(folders); - } - - /** - * Return a list of names of folders in the given container - * @param folder The folder to query - * @param namePrefix Optional prefix all names should match. Can be null. - * @param nameSuffix Optional suffix all names should match. Can be null. - */ - public String[] listFolders(IFolder folder, String namePrefix, String nameSuffix) - { - setListValues(false, true, namePrefix, nameSuffix); - if (!folder.exists()) - { - return new String[0]; - } - - File dirFile = new File(folder.getLocation().toOSString()); - //String[] folders = dirFile.listFiles(this); - File[] fileObjs = dirFile.listFiles(this); - String[] folders = null; - if (fileObjs != null) - { - folders = new String[fileObjs.length]; - for (int idx=0; idx<folders.length; idx++) - folders[idx] = fileObjs[idx].getName(); - } - else - folders = new String[0]; - return folders; - } - - // ------------------------ - // FILE SPECIFIC METHODS... - // ------------------------ - - /** - * Get a file whose parent is either a project or a folder - */ - public IFile getFile(IContainer parent, String fileName) - { - IFile file = null; - - SystemResourceManager.turnOffResourceEventListening(); - - if (parent instanceof IProject) - file = ((IProject)parent).getFile(fileName); - else - file = ((IFolder)parent).getFile(fileName); - - SystemResourceManager.turnOnResourceEventListening(); - - return file; - } - /** - * Check if a file exists in the file system. - * For some reason, the exists() method of IFile cannot be trusted to - * report actual file system existence. - */ - public boolean fileExists(IFile file) - { - String fileLocation = file.getLocation().toOSString(); - //System.out.println("File name = "+file.getName()+" File location = " + fileLocation); - return (new File(fileLocation)).exists(); - } - - /** - * Delete a file - */ - public boolean deleteFile(IFile file) - throws Exception - { - SystemResourceManager.turnOffResourceEventListening(); - // to ensure success, we force a refresh local action... - try { - file.refreshLocal(IResource.DEPTH_INFINITE, null); - } catch (Exception exc) {} - - boolean ok = true; - file.delete(true,false,null); // force-yes, keep-history-no, no progress monitor - SystemResourceManager.turnOnResourceEventListening(); - return ok; - } - /** - * Rename a file - * @param newName - the name name for the file, unqualified! - */ - public boolean renameFile(IFile file, String newName) - throws Exception - { - boolean ok = true; - IPath newPath = file.getFullPath().removeLastSegments(1).append(newName); - SystemResourceManager.turnOffResourceEventListening(); - // to ensure success, we force a refresh local action... - try { - file.refreshLocal(IResource.DEPTH_INFINITE, null); - } catch (Exception exc) {} - try { - file.move(newPath, true, false, null); // path, force, keep-history, progress monitor - } catch (Exception exc) - { - SystemResourceManager.turnOnResourceEventListening(); - throw exc; - } - SystemResourceManager.turnOnResourceEventListening(); - return ok; - } - /** - * Move a file - */ - public boolean moveFile(IFolder newParent, IFile file) - throws Exception - { - boolean ok = true; - SystemResourceManager.turnOffResourceEventListening(); - // to ensure success, we force a refresh local action... - try { - file.refreshLocal(IResource.DEPTH_INFINITE, null); - } catch (Exception exc) {} - try - { - file.move(newParent.getFullPath().append(file.getName()),true,false,null); - } catch (Exception exc) - { - SystemResourceManager.turnOnResourceEventListening(); - throw exc; - } - SystemResourceManager.turnOnResourceEventListening(); - return ok; - } - - /** - * Return the path of the given file - */ - public static String getFilePath(IFile file) - { - return file.getLocation().toOSString(); - } - - - - /** - * Return a list of child files in the given container - * @param projectOrFolder The parent container to search. - * @return an array of IFile objects - */ - public IFile[] listFiles(IContainer projectOrFolder) - { - if (!exists(projectOrFolder)) - return (new IFile[0]); - - SystemResourceManager.turnOffResourceEventListening(); - - Vector files = new Vector(); - // to ensure we get everything, we force a refresh local action... - try { - refreshResource(projectOrFolder); - } catch (Exception exc) {} - try - { - IResource[] members = projectOrFolder.members(); - if (members != null) - for (int idx=0; idx<members.length; idx++) - if (members[idx].getType() == IResource.FILE) - files.addElement(members[idx]); - } catch (Exception exc) - { - logException("Error retrieving file list",exc); //$NON-NLS-1$ - } - - SystemResourceManager.turnOnResourceEventListening(); - return convertToFileArray(files); - } - - /** - * Return a list of names of files in the given container - * @param folder The folder to query - * @param namePrefix Optional prefix all names should match. Can be null. - * @param nameSuffix Optional suffix all names should match. Can be null. - */ - public String[] listFiles(IFolder folder, String namePrefix, String nameSuffix) - { - setListValues(true, false, namePrefix, nameSuffix); - File dirFile = new File(folder.getLocation().toOSString()); - //String[] files = dirFile.list(this); - File[] fileObjs = dirFile.listFiles(this); - String[] files = null; - if (fileObjs != null) - { - files = new String[fileObjs.length]; - for (int idx=0; idx<files.length; idx++) - files[idx] = fileObjs[idx].getName(); - } - else - files = new String[0]; - return files; - } - - // ------------------------ - // UTILITY METHODS... - // ------------------------ - - /** - * Convert a vector of IFolder objects to an array of IFolder. - * Result is only null if input is null. - */ - public IFolder[] convertToFolderArray(Vector vector) - { - if (vector == null) - return null; - IFolder[] folders = new IFolder[vector.size()]; - for (int idx=0; idx<vector.size(); idx++) - folders[idx] = (IFolder)vector.elementAt(idx); - return folders; - } - /** - * Convert a vector of IFile objects to an array of IFile. - * Result is only null if input is null. - */ - public IFile[] convertToFileArray(Vector vector) - { - if (vector == null) - return null; - IFile[] files = new IFile[vector.size()]; - for (int idx=0; idx<vector.size(); idx++) - files[idx] = (IFile)vector.elementAt(idx); - return files; - } - - /** - * Convert a name array to a vector. If array is null or empty, an empty vector is returned. - */ - public Vector convertToVector(String[] array) - { - Vector v = new Vector(); - if (array != null) - for (int idx=0; idx<array.length; idx++) - v.addElement(array[idx]); - return v; - } - /** - * Convert a name array to a vector. As each name is copied - * to the vector, its prefix and suffix are stripped off. - * If array is null or empty, an empty vector is returned. - */ - public Vector convertToVectorAndStrip(String[] array, String namePrefix, String nameSuffix) - { - Vector v = new Vector(); - if (array != null) - for (int idx=0; idx<array.length; idx++) - { - String name = array[idx]; - if (namePrefix != null) - name = name.substring(namePrefix.length()); - if (nameSuffix != null) - name = name.substring(0,name.lastIndexOf(nameSuffix)); - v.addElement(name); - } - return v; - } - - // ------------------------ - // INTERNAL METHODS... - // ------------------------ - - /** - * Method to set variables to affect the folder content subsetting - */ - public void setListValues(boolean filesOnly, boolean foldersOnly, String namePrefix, String nameSuffix) - { - this.filesOnly = filesOnly; - this.foldersOnly = foldersOnly; - this.namePrefix = namePrefix; - this.nameSuffix = nameSuffix; - } - - /** - * Method required by FilenameFilter interface, used by java.io.File.list() - */ - //public boolean accept(File file, String name) - public boolean accept(File file) - { - boolean match = true; - if (filesOnly) - { - if (!file.isFile()) - return false; - } - else if (foldersOnly) - { - if (!file.isDirectory()) - return false; - } - String name = file.getName(); - if (nameSuffix != null) - { - if (!name.endsWith(nameSuffix)) - return false; - } - if (namePrefix != null) - { - if (!name.startsWith(namePrefix)) - return false; - } - return match; - } - - public void logMessage(String msg) - { - RSECorePlugin.getDefault().getLogger().logWarning(msg); - } - public void logException(String msg, Exception exc) - { - RSECorePlugin.getDefault().getLogger().logError(msg, exc); - } - - - /** - * For some reason the exists() method on IResource is fundamentally not reliable. - * Because of this, we resort to the looking ourselves at the file system. - */ - public boolean exists(IResource resource) - { - // DKM - doing a refresh while in a wizard causes stack overflow - // defect #57739 - // I think this is an unnecessary step since in most cases the resource will - // already exist. - if (resource.exists()) - { - return true; - } - - // it appears the serious reliability problems are due to out of synch problems. - // so, I have decided to do a refresh and see if that is cheaper than creating - // hundreds of these java.io.File objects for every touch of every resource... phil. 10/21/2002. - refreshResourceShallow(resource); - return resource.exists(); - /* - IPath localOSLocation = resource.getLocation(); - if (localOSLocation == null) - return true; // what else? - File osFile = new File(localOSLocation.toOSString()); - return osFile.exists(); - */ - } - - -} diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/SystemResourceManager.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/SystemResourceManager.java deleted file mode 100644 index dafce4123..000000000 --- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/SystemResourceManager.java +++ /dev/null @@ -1,369 +0,0 @@ -/******************************************************************************** - * Copyright (c) 2006, 2008 IBM Corporation and others. All rights reserved. - * This program and the accompanying materials are made available under the terms - * of the Eclipse Public License v1.0 which accompanies this distribution, and is - * available at 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 McKnight (IBM) - [177155] Move from rse.ui/systems/org.eclipse.rse.core - * Martin Oberhuber (Wind River) - Re-add missing methods for user actions - * David Dykstal (IBM) - [189858] delayed the creation of the remote systems project - * removed unneeded first time logic and flags - * renamed createRemoteSystemsProjectInternal to ensureRemoteSystemsProject - * made ensureRemoteSystemsProject private instead of protected - * David Dykstal (IBM) - [186589] move user types, user actions, and compile commands - * API to the user actions plugin - * David Dykstal (IBM) - [191130] remove getRemoteSystemsProject() and getProfileFolder() - * as part of the work to removed the exception printed at startup. - * Martin Oberhuber (Wind River) - [224671] Fix non-API leakage of ISystemResourceConstants - ********************************************************************************/ - -package org.eclipse.rse.core; - -import java.io.File; - -import org.eclipse.core.resources.IFolder; -import org.eclipse.core.resources.IProject; -import org.eclipse.core.resources.IProjectDescription; -import org.eclipse.core.resources.IResource; -import org.eclipse.core.resources.IResourceChangeEvent; -import org.eclipse.core.resources.IResourceChangeListener; -import org.eclipse.core.resources.IWorkspace; -import org.eclipse.core.resources.ResourcesPlugin; -import org.eclipse.core.runtime.CoreException; -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.model.ISystemHostPool; -import org.eclipse.rse.core.subsystems.ISubSystemConfiguration; -import org.eclipse.rse.internal.core.RemoteSystemsProject; -import org.eclipse.rse.internal.core.SystemResourceConstants; - - -/** - * Static methods that manage the workbench resource tree for the remote systems - * project. All code in the framework uses this to access the file system for - * save/restore purposes. By limiting all access to one place, we simply changes - * should we decide to change the underlying file system map. - * <p> - * <b>Assumptions</b> - * <ul> - * <li>Each SystemConnectionPool object manages the connections for a given - * system profile - * <li>Each SystemFilterPoolManager object manages the filter pools for a given - * subsystem factory, for a given system profile! - * <li>Each SystemFilterPool object is an arbitrary named collection of filters - * all stored in one folder on disk with the same name as the pool. - * </ul> - * <p> - * - * @noextend This class is not intended to be subclassed by clients. - * @noinstantiate This class is not intended to be instantiated by clients. - */ -public class SystemResourceManager -{ - - private static IProject remoteSystemsProject = null; - private static IProject remoteSystemsTempFilesProject = null; - private static SystemResourceHelpers helpers = null; - - private static ISystemResourceListener _listener = null; - - /** - * Turn off event listening. Please call this before do anything that modifies resources and - * turn it on again after. - */ - public static void turnOffResourceEventListening() - { - if (_listener != null) - _listener.turnOffResourceEventListening(); - } - - /** - * Turn off event listening. Please call this after modifying resources. - */ - public static void turnOnResourceEventListening() - { - if (_listener != null) - _listener.turnOnResourceEventListening(); - } - /** - * Ensure event listening is on. Called at start of team synch action to be safe. - */ - public static void ensureOnResourceEventListening() - { - if (_listener != null) - _listener.ensureOnResourceEventListening(); - } - - /** - * Start event listening. Requests to turn on and off are ignored until this is called, - * which is at the appropriate point in the startup sequence. - */ - public static void startResourceEventListening(ISystemResourceListener listener) - { - _listener = listener; - listener.turnOnResourceEventListening(); - - - IWorkspace ws = remoteSystemsProject.getWorkspace(); - int eventMask = IResourceChangeEvent.POST_CHANGE; - - // add listener for global events ; - ws.addResourceChangeListener(listener, eventMask); - } - /** - * End event listening. Requests to turn on and off are ignored after this is called, - * which is at the appropriate point in the shutdown sequence. - */ - public static void endResourceEventListening() - { - if (_listener != null) - { - IWorkspace ws = remoteSystemsProject.getWorkspace(); - ws.removeResourceChangeListener(_listener); - _listener = null; - } - } - - /** - * Register a listener for resource change events on objects in our remote system project. - * No attempt is made to filter the events, they are simply passed on and the listener can - * decide if the event applies to them or not. - * <p> - * However, the event will only be fired if a change is made to that resource outside of the - * normal activities of the Remote Systems Framework, and only for resources within the - * Remote Systems Connection project. - */ - public static void addResourceChangeListener(IResourceChangeListener l) - { - if (_listener != null) - _listener.addResourceChangeListener(l); - } - /** - * Remove a listener for resource change events on an object in our remote system project. - */ - public static void removeResourceChangeListener(IResourceChangeListener l) - { - if (_listener != null) - _listener.removeResourceChangeListener(l); - } - - /** - * Get the default remote systems project. - * If found but closed, this will open the project. - * @param force if true force the creation of the project if not found. - * In any case, returns handle to the project. - * @return IProject handle of the project. Clients should use - * exists() or isAccessible() to test existence. - */ - public static IProject getRemoteSystemsProject(boolean force) { - if (remoteSystemsProject == null) { - remoteSystemsProject = ResourcesPlugin.getWorkspace().getRoot().getProject(SystemResourceConstants.RESOURCE_PROJECT_NAME); - } - if ((!remoteSystemsProject.exists() && force) || (remoteSystemsProject.exists() && !remoteSystemsProject.isOpen())) { - ensureRemoteSystemsProject(remoteSystemsProject); - } - return remoteSystemsProject; - } - - /** - * Get the default remote systems temp files project. - * @return IProject handle of the project. Use exists() to test existence. - */ - public static IProject getRemoteSystemsTempFilesProject() - { - if (remoteSystemsTempFilesProject == null) - { - remoteSystemsTempFilesProject = ResourcesPlugin.getWorkspace().getRoot().getProject(SystemResourceConstants.RESOURCE_TEMPFILES_PROJECT_NAME); - } - return remoteSystemsTempFilesProject; - } - /** - * Create a remote systems project, plus the core subfolders required. - * @param proj the handle for the remote systems project - * @return the IProject handle of the project (the argument) - */ - private static IProject ensureRemoteSystemsProject(IProject proj) - { - // Check first for the project to be closed. If yes, try to open it and if this fails, - // try to delete if first before failing here. The case is that the user removed the - // directory in the workspace and we must be able to recover from it. - // See https://bugs.eclipse.org/bugs/show_bug.cgi?id=172437. - if (!proj.isOpen()) { - try { - proj.open(null); - } catch (Exception e) { - try { - proj.delete(false, true, null); - RSECorePlugin.getDefault().getLogger().logWarning("Removed stale remote systems project reference. Re-creating remote system project to recover."); //$NON-NLS-1$ - } catch (CoreException exc) { - // If the delete fails, the original opening error will be passed to the error log. - RSECorePlugin.getDefault().getLogger().logError("error opening remote systems project", e); //$NON-NLS-1$ - } - } - } - if (!proj.exists()) { - try { - proj.create(null); - proj.open(null); - IProjectDescription description = proj.getDescription(); - String newNatures[] = { RemoteSystemsProject.ID }; - description.setNatureIds(newNatures); - proj.setDescription(description, null); - } catch (Exception e) { - RSECorePlugin.getDefault().getLogger().logError("error creating remote systems project", e); //$NON-NLS-1$ - } - } - return proj; - } - - // ------------------- - // FOLDER ACTIONS... - // ------------------- - - /** - * Rename a folder - */ - public static void renameFolder(IFolder folder, String newName) - { - getResourceHelpers().renameResource(folder, newName); - } - /** - * Delete a folder - */ - public static void deleteFolder(IFolder folder) - { - getResourceHelpers().deleteResource(folder); - } - - // ------------------- - // FILE ACTIONS... - // ------------------- - - /** - * Rename a file - */ - public static void renameFile(IFolder folder, String oldName, String newName) - { - getResourceHelpers().renameResource( - getResourceHelpers().getFile(folder,oldName), newName); - } - /** - * Delete a file - */ - public static void deleteFile(IFolder folder, String fileName) - { - getResourceHelpers().deleteResource( - getResourceHelpers().getFile(folder, fileName)); - } - - - // ------------------- - // GENERIC HELPERS... - // ------------------- - - /** - * Map a connection pool name to a profile name. - * Current algorith is that pool name equals profile name, but we use - * this method to allow flexibility in the future. - */ - public static String getProfileName(ISystemHostPool pool) - { - return pool.getName(); - } - - /** - * Map a filter pool manager name to a profile name - * Current algorith is that manager name equals profile name, but we use - * this method to allow flexibility in the future. - */ - public static String getProfileName(ISystemFilterPoolManager mgr) - { - return mgr.getName(); - } - - /** - * Map a filter pool name to a folder name - * Current algorith is that pool name equals folder name, but we use - * this method to allow flexibility in the future. - */ - public static String getFolderName(ISystemFilterPool pool) - { - return pool.getName(); - } - - /** - * Map a system connection object to a folder name - */ - public static String getFolderName(IHost conn) - { - return conn.getAliasName(); - } - - /** - * Map a subsystem factory object to a folder name - */ - public static String getFolderName(ISubSystemConfiguration ssFactory) - { - return ssFactory.getId(); // Should we use name instead?? Can we assume the name is unique? - } - - /** - * Given any folder, return its path as a string. - */ - public static String getFolderPath(IFolder folder) - { - return getResourceHelpers().getFolderPath(folder); - } - - /** - * Given any folder, return its path as a string, and an ending '\' - */ - public static String getFolderPathWithTerminator(IFolder folder) - { - return addPathTerminator(getResourceHelpers().getFolderPath(folder)); - } - - - /** - * Return singleton of resource helpers object - */ - protected static SystemResourceHelpers getResourceHelpers() - { - if (helpers == null) - { - helpers = SystemResourceHelpers.getResourceHelpers(); - //helpers.setLogFile(RSEUIPlugin.getDefault().getLogFile()); - } - return helpers; - } - - /** - * Ensure given path ends with path separator. - */ - public static String addPathTerminator(String path) - { - if (!path.endsWith(File.separator)) - path = path + File.separatorChar; - //else - // path = path; - return path; - } - - /** - * Test if a resource is in use, prior to attempting to rename or delete it. - * @return true if it is in use or read only, false if it is not. - */ - public static boolean testIfResourceInUse(IResource resource) - { - return SystemResourceHelpers.testIfResourceInUse(resource); - } - -}
\ No newline at end of file diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/SystemTypeMatcher.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/SystemTypeMatcher.java deleted file mode 100644 index cce2e2fc8..000000000 --- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/SystemTypeMatcher.java +++ /dev/null @@ -1,102 +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: - * Uwe Stieber (Wind River) - initial API and implementation. - *******************************************************************************/ -package org.eclipse.rse.core; - -import java.util.Iterator; -import java.util.LinkedList; -import java.util.List; -import java.util.regex.Pattern; - -/** - * Shared system type id list parser and matcher. Parses a given - * list of system type id's, separated by semicolon and possibly - * containing the wildcards '*' and '?. - */ -public final class SystemTypeMatcher { - private final class SystemTypeIdPattern { - private final Pattern pattern; - - /** - * Constructor. - */ - public SystemTypeIdPattern(Pattern pattern) { - assert pattern != null; - this.pattern = pattern; - } - - /* (non-Javadoc) - * @see org.eclipse.rse.core.internal.subsystems.SubSystemConfigurationProxy.ISystemTypePattern#matches(org.eclipse.rse.core.IRSESystemType) - */ - public boolean matches(IRSESystemType systemType) { - assert systemType != null; - return pattern.matcher(systemType.getId()).matches(); - } - } - - // List of patterns to match. The order is preserved. - private final List patterns = new LinkedList(); - private boolean matchAllTypes = false; - - /** - * Constructor. - * - * @param declaredSystemTypeIds The list of declared system type ids. Might be <code>null</code>. - */ - public SystemTypeMatcher(String declaredSystemTypeIds) { - // Compile the list of patterns out of given lists of declared system types - if (declaredSystemTypeIds != null) { - String[] ids = declaredSystemTypeIds.split(";"); //$NON-NLS-1$ - if (ids != null && ids.length > 0) { - for (int i = 0; i < ids.length; i++) { - String id = ids[i].trim(); - if (id.equals("*")) { //$NON-NLS-1$ - matchAllTypes = true; - patterns.clear(); - return; - } else if(id.length()>0) { - SystemTypeIdPattern pattern = new SystemTypeIdPattern(Pattern.compile(makeRegex(id))); - patterns.add(pattern); - } - } - } - } - } - - private String makeRegex(String pattern) { - assert pattern != null; - String translated = pattern; - if (translated.indexOf('.') != -1) translated = translated.replaceAll("\\.", "\\."); //$NON-NLS-1$ //$NON-NLS-2$ - if (translated.indexOf('*') != -1) translated = translated.replaceAll("\\*", ".*"); //$NON-NLS-1$ //$NON-NLS-2$ - if (translated.indexOf('?') != -1) translated = translated.replaceAll("\\?", "."); //$NON-NLS-1$ //$NON-NLS-2$ - return translated; - } - - /** - * @return true if this matcher supports all system types. - */ - public boolean supportsAllSystemTypes() { - return matchAllTypes; - } - - /** - * Checks if the specified system type is matched by this pattern. - */ - public boolean matches(IRSESystemType systemType) { - assert systemType != null; - if (matchAllTypes) return true; - Iterator iterator = patterns.iterator(); - while (iterator.hasNext()) { - SystemTypeIdPattern matcher = (SystemTypeIdPattern)iterator.next(); - if (matcher.matches(systemType)) return true; - } - return false; - } -} diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/comm/ISystemKeystoreProvider.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/comm/ISystemKeystoreProvider.java deleted file mode 100644 index 269121780..000000000 --- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/comm/ISystemKeystoreProvider.java +++ /dev/null @@ -1,30 +0,0 @@ -/******************************************************************************** - * Copyright (c) 2006, 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 - * - * 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: - * Martin Oberhuber (Wind River) - [186525] Move keystoreProviders to core - ********************************************************************************/ - -package org.eclipse.rse.core.comm; - -import java.util.List; - -/* - * Interface for the keystoreProviders extension point. - * Implementors must provide a keystore and it's password. - */ -public interface ISystemKeystoreProvider -{ - public String getKeyStorePassword(); - public String getKeyStorePath(); - public boolean importCertificates(List certificates, String systemName); -} diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/comm/SystemKeystoreProviderManager.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/comm/SystemKeystoreProviderManager.java deleted file mode 100644 index f61ad8f89..000000000 --- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/comm/SystemKeystoreProviderManager.java +++ /dev/null @@ -1,160 +0,0 @@ -/******************************************************************************** - * Copyright (c) 2006, 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 - * - * 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: - * Martin Oberhuber (Wind River) - [186525] Move keystoreProviders to core - * Martin Oberhuber (Wind River) - [181939] Deferred class loading for keystoreProviders - ********************************************************************************/ - -package org.eclipse.rse.core.comm; - -import java.util.ArrayList; -import java.util.List; - -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Status; -import org.eclipse.rse.core.RSECorePlugin; -import org.osgi.framework.Bundle; - -/** - * A Registry of keystore providers, with the ability to instantiate - * providers lazily when needed. - */ -public class SystemKeystoreProviderManager -{ - private static SystemKeystoreProviderManager _instance = new SystemKeystoreProviderManager(); - - private List _extensions; - - private static class ExtensionInfo { - public Bundle bundle; - public String className; - public ExtensionInfo(Bundle bundle, String className) { - this.bundle = bundle; - this.className = className; - } - } - - private SystemKeystoreProviderManager() - { - _extensions= new ArrayList(); - } - - /** - * Return the SystemKeystoreProviderManager Instance. - * @return the singleton instance. - */ - public static SystemKeystoreProviderManager getInstance() - { - return _instance; - } - - /** - * Register a keystore provider. - * @param ext keystore provider to register. - */ - public void registerKeystoreProvider(ISystemKeystoreProvider ext) - { - _extensions.add(ext); - } - - /** - * Register a keystore provider for deferred (lazy) loading. - * - * @param bundle the bundle that declares the extension. The bundle - * must be installed and will be activated lazily when trying - * to load the given class name. - * @param className fully qualified classname of the keystore provider - * declared in the given bundle. - */ - public void registerKeystoreProvider(Bundle bundle, String className) - { - _extensions.add(new ExtensionInfo(bundle, className)); - } - - public boolean hasProvider() - { - return !_extensions.isEmpty(); - } - - /** - * Return the keystore provider at the given index in the registry, - * or <code>null</code> if there is no provider at the given index - * or it cannot be loaded. - * @return An ISystemKeystoreProvider instance, or <code>null</code> - * if no provider is found at the given index. - */ - public ISystemKeystoreProvider getProviderAt(int idx) - { - if (idx >= 0 && idx < _extensions.size()) { - Object o = _extensions.get(idx); - if (o instanceof ISystemKeystoreProvider) { - return (ISystemKeystoreProvider)o; - } else if (o instanceof ExtensionInfo) { - ExtensionInfo info = (ExtensionInfo)o; - try { - Class keystoreProvider = info.bundle.loadClass(info.className); - ISystemKeystoreProvider extension = (ISystemKeystoreProvider)keystoreProvider.getConstructors()[0].newInstance(null); - _extensions.set(idx, extension); - return extension; - } catch(Exception e) { - RSECorePlugin.getDefault().getLog().log( - new Status(IStatus.ERROR, info.bundle.getSymbolicName(), -1, e.getMessage(), e)); - } - } - } - return null; - } - - /** - * Return the default keystore provider. - * The default provider is the one which was added last by the - * extension registry, and loads properly. - * @return An ISystemKeystoreProvider instance, or <code>null</code> - * if no provider is found at the given index. - */ - public ISystemKeystoreProvider getDefaultProvider() - { - int idx = _extensions.size()-1; - while (idx>=0) { - ISystemKeystoreProvider provider = getProviderAt(idx); - if (provider!=null) { - return provider; - } - _extensions.remove(idx); - idx--; - } - return null; - } - - /** - * Return an array of all registered keystore providers. - * The default provider is the one which was added last by the - * extension registry, and loads properly. - * @return An array of all registered keystore providers - * that load properly. - */ - public ISystemKeystoreProvider[] getProviders() - { - List providers = new ArrayList(); - for (int i = _extensions.size()-1; i>=0; i--) { - ISystemKeystoreProvider provider = getProviderAt(i); - if (provider!=null) { - providers.add(0, provider); - } else { - _extensions.remove(i); - } - } - ISystemKeystoreProvider[] result = (ISystemKeystoreProvider[])providers.toArray(new ISystemKeystoreProvider[providers.size()]); - return result; - } -}
\ No newline at end of file diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/events/ISystemModelChangeEvent.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/events/ISystemModelChangeEvent.java deleted file mode 100644 index 289703060..000000000 --- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/events/ISystemModelChangeEvent.java +++ /dev/null @@ -1,45 +0,0 @@ -/******************************************************************************** - * Copyright (c) 2002, 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 - * - * 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: - * Martin Oberhuber (Wind River) - [168975] Move RSE Events API to Core - ********************************************************************************/ - -package org.eclipse.rse.core.events; - -/** - * A change event passed to you when listening for RSE model changes. - * Note these are post-events, sent after the fact. - */ -public interface ISystemModelChangeEvent { - /** - * Get the event type, such as {@link org.eclipse.rse.core.events.ISystemModelChangeEvents#SYSTEM_RESOURCE_ADDED}. - * @see org.eclipse.rse.core.events.ISystemModelChangeEvents - */ - public int getEventType(); - - /** - * Get the resource type, such as {@link org.eclipse.rse.core.events.ISystemModelChangeEvents#SYSTEM_RESOURCETYPE_CONNECTION}. - * @see org.eclipse.rse.core.events.ISystemModelChangeEvents - */ - public int getResourceType(); - - /** - * Get the resource that this event applies to - */ - public Object getResource(); - - /** - * Get the old name of the resource, in the event of a resource rename. Null for other event types. - */ - public String getOldName(); -}
\ No newline at end of file diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/events/ISystemModelChangeEvents.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/events/ISystemModelChangeEvents.java deleted file mode 100644 index 391c85f61..000000000 --- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/events/ISystemModelChangeEvents.java +++ /dev/null @@ -1,107 +0,0 @@ -/******************************************************************************** - * Copyright (c) 2002, 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 - * - * 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: - * Martin Oberhuber (Wind River) - [168975] Move RSE Events API to Core - * David Dykstal (IBM) - [186589] Move User Actions events to the user actions plugin - * Martin Oberhuber (Wind River) - [cleanup] Add API "since" Javadoc tags - ********************************************************************************/ - -package org.eclipse.rse.core.events; - -/** - * The event IDs sent when local resources in the RSE model change. - * You should monitor for these events in your view if you display any of the resource types listed here. - * <p> - * To monitor, implement interface {@link org.eclipse.rse.core.events.ISystemModelChangeListener} and - * call {@link org.eclipse.rse.core.model.ISystemRegistry#addSystemModelChangeListener(ISystemModelChangeListener)} - * and in your dispose method, call {@link org.eclipse.rse.core.model.ISystemRegistry#removeSystemModelChangeListener(ISystemModelChangeListener)}. - * <p> - * If you are interesting in firing model change events, see - * {@link org.eclipse.rse.core.model.ISystemRegistry#fireModelChangeEvent(int, int, Object, String)}. - * These events will typically be signaled in an implementation of ISystemRegistry. - * - * @noimplement This interface is not intended to be implemented by clients. - */ -public interface ISystemModelChangeEvents { - - /** - * Event Type: a resource was added - */ - public static final int SYSTEM_RESOURCE_ADDED = 1; - - /** - * Event Type: a resource was removed - */ - public static final int SYSTEM_RESOURCE_REMOVED = 2; - - /** - * Event Type: a resource was changed - */ - public static final int SYSTEM_RESOURCE_CHANGED = 4; - - /** - * Event Type: a resource was renamed - */ - public static final int SYSTEM_RESOURCE_RENAMED = 8; - /** - * Event Type: a resource was reordered relative to its siblings - */ - public static final int SYSTEM_RESOURCE_REORDERED = 16; - - /** - * Event Type: all resource were reloaded from the workspace: you need to refresh your viewer! - * This is fired after the user selects the Reload RSE action in the Team view, after recieving files from the repository. - */ - public static final int SYSTEM_RESOURCE_ALL_RELOADED = 128; - - /** - * Resource Type: profile - */ - public static final int SYSTEM_RESOURCETYPE_PROFILE = 1; - /** - * Resource Type: connection - */ - public static final int SYSTEM_RESOURCETYPE_CONNECTION = 2; - /** - * Resource Type: subsystem - */ - public static final int SYSTEM_RESOURCETYPE_SUBSYSTEM = 4; - /** - * Resource Type: filter pool - */ - public static final int SYSTEM_RESOURCETYPE_FILTERPOOL = 8; - /** - * Resource Type: filter pool reference. These are what subsystems contain... references to filter pools. - */ - public static final int SYSTEM_RESOURCETYPE_FILTERPOOLREF = 16; - /** - * Resource Type: filter - */ - public static final int SYSTEM_RESOURCETYPE_FILTER = 32; - // /** - // * Resource Type: user action - // */ - // public static final int SYSTEM_RESOURCETYPE_USERACTION = 128; - // /** - // * Resource Type: named type, which are used in user actions - // */ - // public static final int SYSTEM_RESOURCETYPE_NAMEDTYPE = 256; - // /** - // * Resource Type: compile command - // */ - // public static final int SYSTEM_RESOURCETYPE_COMPILECMD = 512; - /** - * Resource Type: ALL. Used with SYSTEM_RESOURCE_ALL_RELOADED - */ - public static final int SYSTEM_RESOURCETYPE_ALL = 9999; -}
\ No newline at end of file diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/events/ISystemModelChangeListener.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/events/ISystemModelChangeListener.java deleted file mode 100644 index f998c4658..000000000 --- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/events/ISystemModelChangeListener.java +++ /dev/null @@ -1,40 +0,0 @@ -/******************************************************************************** - * Copyright (c) 2002, 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 - * - * 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: - * Martin Oberhuber (Wind River) - [168975] Move RSE Events API to Core - ********************************************************************************/ - -package org.eclipse.rse.core.events; - -/** - * Interface that listeners interesting in changes to local resources in the RSE model - * implement, and subsequently register their interest, via SystemRegistry. - * <p> - * If you list any of the resource types defined in {@link org.eclipse.rse.core.events.ISystemModelChangeEvents} - * you should monitor by implementing this interface, and registering with the - * system registry via {@link org.eclipse.rse.core.model.ISystemRegistry#addSystemModelChangeListener(ISystemModelChangeListener)}. - * In your view's dispose method, you must also de-register by calling - * {@link org.eclipse.rse.core.model.ISystemRegistry#removeSystemModelChangeListener(ISystemModelChangeListener)}. - * <p> - * If you are interesting in firing model change events, see - * {@link org.eclipse.rse.core.model.ISystemRegistry#fireModelChangeEvent(int, int, Object, String)}. - */ -public interface ISystemModelChangeListener { - - /** - * This is the method in your class that will be called when a resource in the - * RSE model changes. You will be called after the resource is changed. - * @see ISystemModelChangeEvent - */ - public void systemModelResourceChanged(ISystemModelChangeEvent event); -}
\ No newline at end of file diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/events/ISystemPreferenceChangeEvent.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/events/ISystemPreferenceChangeEvent.java deleted file mode 100644 index f3bf66746..000000000 --- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/events/ISystemPreferenceChangeEvent.java +++ /dev/null @@ -1,53 +0,0 @@ -/******************************************************************************** - * Copyright (c) 2002, 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 - * - * 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: - * Martin Oberhuber (Wind River) - [168975] Move RSE Events API to Core - ********************************************************************************/ - -package org.eclipse.rse.core.events; - -/** - * Interface of event sent when a remote system preference changes. - * @see org.eclipse.rse.core.events.ISystemPreferenceChangeEvents - */ -public interface ISystemPreferenceChangeEvent { - - /** - * Returns the type of the event. - * @see org.eclipse.rse.core.events.ISystemPreferenceChangeEvents - * @return a type that is one of the constants in ISystemPreferenceChangeEvents. - */ - public int getType(); - - /** - * Set the type of the event. - * @see org.eclipse.rse.core.events.ISystemPreferenceChangeEvents - * @param type the type of the event. - */ - public void setType(int type); - - /** - * Get the old value of the Preference. - * For boolean will be a Boolean object. - * @return the old value of the Preference. - */ - public Object getOldValue(); - - /** - * Get the new value of the Preference. - * For boolean will be a Boolean object. - * @return the new value of the Preference. - */ - public Object getNewValue(); - -}
\ No newline at end of file diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/events/ISystemPreferenceChangeEvents.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/events/ISystemPreferenceChangeEvents.java deleted file mode 100644 index e8a0a7cd5..000000000 --- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/events/ISystemPreferenceChangeEvents.java +++ /dev/null @@ -1,48 +0,0 @@ -/******************************************************************************** - * Copyright (c) 2002, 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 - * - * 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: - * Martin Oberhuber (Wind River) - [168975] Move RSE Events API to Core - * Martin Oberhuber (Wind River) - [cleanup] Add API "since" Javadoc tags - ********************************************************************************/ - -package org.eclipse.rse.core.events; - -/** - * Interface of event ID constants for preferences changed - * - * @noimplement This interface is not intended to be implemented by clients. - */ -public interface ISystemPreferenceChangeEvents { - /** - * The Show Filter Pools preference has changed - */ - public static final int EVENT_SHOWFILTERPOOLS = 5; - /** - * The Show Filter String preference has changed - */ - public static final int EVENT_SHOWFILTERSTRINGS = 10; - /** - * The Qualify Connection Names preference has changed - */ - public static final int EVENT_QUALIFYCONNECTIONNAMES = 15; - /** - * The Restore State preference has changed - */ - public static final int EVENT_RESTORESTATE = 20; - - /** - * A connection type has been enabled or disabled - */ - public static final int EVENT_ENABLED_CONNECTIONS_CHANGED = 25; - -}
\ No newline at end of file diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/events/ISystemPreferenceChangeListener.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/events/ISystemPreferenceChangeListener.java deleted file mode 100644 index e2fe428c8..000000000 --- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/events/ISystemPreferenceChangeListener.java +++ /dev/null @@ -1,35 +0,0 @@ -/******************************************************************************** - * Copyright (c) 2002, 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 - * - * 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: - * Martin Oberhuber (Wind River) - [168975] Move RSE Events API to Core - ********************************************************************************/ - -package org.eclipse.rse.core.events; - -import java.util.EventListener; - -/** - * Interface that listeners interesting in changes to remote - * system preferences can implement and subsequently register - * their interest in with the ISystemRegistry. - */ -public interface ISystemPreferenceChangeListener extends EventListener { - - /** - * This method will be called when a Preference changes. - * TODO document on which thread the event will be sent. - * @see ISystemPreferenceChangeEvent - * @param event the event being sent. - */ - public void systemPreferenceChanged(ISystemPreferenceChangeEvent event); -}
\ No newline at end of file diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/events/ISystemRemoteChangeEvent.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/events/ISystemRemoteChangeEvent.java deleted file mode 100644 index e96012778..000000000 --- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/events/ISystemRemoteChangeEvent.java +++ /dev/null @@ -1,82 +0,0 @@ -/******************************************************************************** - * Copyright (c) 2002, 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 - * - * 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: - * Martin Oberhuber (Wind River) - [168975] Move RSE Events API to Core - * David McKnight (IBM) - [224313] [api] Create RSE Events for MOVE and COPY holding both source and destination fields - ********************************************************************************/ - -package org.eclipse.rse.core.events; - -import org.eclipse.rse.core.subsystems.ISubSystem; - - -/** - * A change event passed to you when listening for remote resource changes. - * Note these are post-events, sent after the fact. - */ -public interface ISystemRemoteChangeEvent -{ - /** - * Get the event type, such as {@link org.eclipse.rse.core.events.ISystemRemoteChangeEvents#SYSTEM_REMOTE_RESOURCE_CREATED}. - * @see org.eclipse.rse.core.events.ISystemRemoteChangeEvents - * @return the event type. - */ - public int getEventType(); - - /** - * Get the resource that this event applies to. - * It must either be the binary object of the resource, or the absolute name of the resource, - * or a List of absolute names of the resources - * @return the resource that this event applies to. - */ - public Object getResource(); - - /** - * Get the parent remote object for the affected remote object. This is not always known, - * but when it is (ie, non null) then it can be used to refresh all expanded occurrences of that parent - * @return the parent remote object of the affected resource, - * or <code>null</code> if not applicable. - */ - public Object getResourceParent(); - - /** - * Get the old name(s) of the resource(s), in the event of a resource - * rename, move or copy. Null for other event types. - * - * @return the old names of the resources in case of a rename event, or - * <code>null</code> if not applicable. - * @since org.eclipse.rse.core 3.0 - */ - public String[] getOldNames(); - - /** - * Get the subsystem in which this resource resides. - * This allows the search for impacts to be limited to subsystems - * of the same parent factory, and to connections with the same - * hostname as the subsystem's connection. - * @return the subsystem in which this resource resides. - */ - public ISubSystem getSubSystem(); - - /** - * Returns the operation of this event if it's not implied by the event - * itself. - * - * @see ISystemRemoteChangeEvents#SYSTEM_REMOTE_OPERATION_COPY - * @see ISystemRemoteChangeEvents#SYSTEM_REMOTE_OPERATION_MOVE - * - * @return the operation that triggered this event - * @since org.eclipse.rse.core 3.0 - */ - public String getOperation(); -}
\ No newline at end of file diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/events/ISystemRemoteChangeEvents.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/events/ISystemRemoteChangeEvents.java deleted file mode 100644 index a18d35ae1..000000000 --- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/events/ISystemRemoteChangeEvents.java +++ /dev/null @@ -1,176 +0,0 @@ -/******************************************************************************** - * Copyright (c) 2002, 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 - * - * 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: - * Martin Oberhuber (Wind River) - [168975] Move RSE Events API to Core - * David McKnight (IBM) - [207100] Events for after a resource is downloaded and uploaded - * Martin Oberhuber (Wind River) - [cleanup] Add API "since" Javadoc tags - ********************************************************************************/ - -package org.eclipse.rse.core.events; - -/** - * The event IDs sent when remote resources in the model change These IDs are - * used when creating ISystemRemoteChangeEvent objects. - * - * @noimplement This interface is not intended to be implemented by clients. - */ -public interface ISystemRemoteChangeEvents -{ - /** - * Event Type: a remote resource was added - * - * The event stores the following event parameters: - * <ul> - * <li>resource - the remote resource object, or absolute name of the resource as would be given by calling getAbsoluteName on its remote adapter, - * or a List of absolute names each of which would be given by calling getAbsoluteName on it's remote adapter - * <li>resourceParent - the remote resource's parent object, or absolute name, if that is known. If it is non-null, this will aid in refreshing occurrences of that parent. - * <li>subsystem - the subsystem which contains this remote resource. This allows the search for impacts to be - * limited to subsystems of the same parent factory, and to connections with the same hostname as the subsystem's connection. - * <li>oldName - on a rename operation, this is the absolute name of the resource prior to the rename - * <li>originatingViewer - optional. If set, this gives the viewer a clue that it should select the affected resource after refreshing its parent. - * This saves sending a separate event to reveal and select the new created resource on a create event, for example. - * </ul> - */ - public static final int SYSTEM_REMOTE_RESOURCE_CREATED = 1; - - /** - * Event Type: a remote resource was removed - * - * The event stores the following event parameters: - * <ul> - * <li>resource - the remote resource object, or absolute name of the resource as would be given by calling getAbsoluteName on its remote adapter, - * or a List of absolute names each of which would be given by calling getAbsoluteName on it's remote adapter - * <li>resourceParent - the remote resource's parent object, or absolute name, if that is known. If it is non-null, this will aid in refreshing occurrences of that parent. - * <li>subsystem - the subsystem which contains this remote resource. This allows the search for impacts to be - * limited to subsystems of the same parent factory, and to connections with the same hostname as the subsystem's connection. - * <li>oldName - on a rename operation, this is the absolute name of the resource prior to the rename - * <li>originatingViewer - optional. If set, this gives the viewer a clue that it should select the affected resource after refreshing its parent. - * This saves sending a separate event to reveal and select the new created resource on a create event, for example. - * </ul> - */ - public static final int SYSTEM_REMOTE_RESOURCE_DELETED = 2; - - /** - * Event Type: a remote resource was changed - * - * The event stores the following event parameters: - * <ul> - * <li>resource - the remote resource object, or absolute name of the resource as would be given by calling getAbsoluteName on its remote adapter, - * or a List of absolute names each of which would be given by calling getAbsoluteName on it's remote adapter - * <li>resourceParent - the remote resource's parent object, or absolute name, if that is known. If it is non-null, this will aid in refreshing occurrences of that parent. - * <li>subsystem - the subsystem which contains this remote resource. This allows the search for impacts to be - * limited to subsystems of the same parent factory, and to connections with the same hostname as the subsystem's connection. - * <li>oldName - on a rename operation, this is the absolute name of the resource prior to the rename - * <li>originatingViewer - optional. If set, this gives the viewer a clue that it should select the affected resource after refreshing its parent. - * This saves sending a separate event to reveal and select the new created resource on a create event, for example. - * </ul> - */ - public static final int SYSTEM_REMOTE_RESOURCE_CHANGED = 4; - - /** - * Event Type: a remote resource was renamed - * - * The event stores the following event parameters: - * <ul> - * <li>resource - the remote resource object, or absolute name of the resource as would be given by calling getAbsoluteName on its remote adapter, - * or a List of absolute names each of which would be given by calling getAbsoluteName on it's remote adapter - * <li>resourceParent - the remote resource's parent object, or absolute name, if that is known. If it is non-null, this will aid in refreshing occurrences of that parent. - * <li>subsystem - the subsystem which contains this remote resource. This allows the search for impacts to be - * limited to subsystems of the same parent factory, and to connections with the same hostname as the subsystem's connection. - * <li>oldName - on a rename operation, this is the absolute name of the resource prior to the rename - * <li>originatingViewer - optional. If set, this gives the viewer a clue that it should select the affected resource after refreshing its parent. - * This saves sending a separate event to reveal and select the new created resource on a create event, for example. - * </ul> - */ - public static final int SYSTEM_REMOTE_RESOURCE_RENAMED = 8; - - - /** - * Event Type: a remote resource was uploaded - * - * The event stores the following event parameters: - * <ul> - * <li>resource - the remote resource object, or absolute name of the - * resource as would be given by calling getAbsoluteName on its remote - * adapter - * <li>resourceParent - the remote resource's parent object, or absolute - * name, if that is known. If it is non-null, this will aid in refreshing - * occurrences of that parent. - * <li>subsystem - the subsystem which contains this remote resource. This - * allows the search for impacts to be limited to subsystems of the same - * parent factory, and to connections with the same hostname as the - * subsystem's connection. - * </ul> - * - * @since org.eclipse.rse.core 3.0 - */ - public static final int SYSTEM_REMOTE_RESOURCE_UPLOADED = 20; - - /** - * Event Type: a remote resource was downloaded - * - * The event stores the following event parameters: - * <ul> - * <li>resource - the remote resource object, or absolute name of the - * resource as would be given by calling getAbsoluteName on its remote - * adapter - * <li>resourceParent - the remote resource's parent object, or absolute - * name, if that is known. If it is non-null, this will aid in refreshing - * occurrences of that parent. - * <li>subsystem - the subsystem which contains this remote resource. This - * allows the search for impacts to be limited to subsystems of the same - * parent factory, and to connections with the same hostname as the - * subsystem's connection. - * </ul> - * - * @since org.eclipse.rse.core 3.0 - */ - public static final int SYSTEM_REMOTE_RESOURCE_DOWNLOADED = 24; - - - /** - * Indicates that the event is for a delete operation - * - * @since org.eclipse.rse.core 3.0 - */ - public static final String SYSTEM_REMOTE_OPERATION_DELETE = "DELETE"; //$NON-NLS-1$ - - /** - * Indicates that the event is for a rename operation - * - * @since org.eclipse.rse.core 3.0 - */ - public static final String SYSTEM_REMOTE_OPERATION_RENAME = "RENAME"; //$NON-NLS-1$ - - /** - * Indicates that the event is for a create operation - * - * @since org.eclipse.rse.core 3.0 - */ - public static final String SYSTEM_REMOTE_OPERATION_CREATE = "CREATE"; //$NON-NLS-1$ - - /** - * Indicates that the event is for a move operation - * - * @since org.eclipse.rse.core 3.0 - */ - public static final String SYSTEM_REMOTE_OPERATION_MOVE = "MOVE"; //$NON-NLS-1$ - - /** - * Indicates that the event is for a copy operation - * - * @since org.eclipse.rse.core 3.0 - */ - public static final String SYSTEM_REMOTE_OPERATION_COPY = "COPY"; //$NON-NLS-1$ - -}
\ No newline at end of file diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/events/ISystemRemoteChangeListener.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/events/ISystemRemoteChangeListener.java deleted file mode 100644 index e96e721e6..000000000 --- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/events/ISystemRemoteChangeListener.java +++ /dev/null @@ -1,33 +0,0 @@ -/******************************************************************************** - * Copyright (c) 2002, 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 - * - * 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: - * Martin Oberhuber (Wind River) - [168975] Move RSE Events API to Core - ********************************************************************************/ - -package org.eclipse.rse.core.events; - -/** - * Interface that listeners interesting in changes to remote resources - * implement, and subsequently register their interest, in via SystemRegistry. - */ -public interface ISystemRemoteChangeListener -{ - - /** - * This method will be called when a remote resource changes. - * You will be called after the resource is changed. - * TODO document on which thread the event will be sent. - * @param event the event. - */ - public void systemRemoteResourceChanged(ISystemRemoteChangeEvent event); -}
\ No newline at end of file diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/events/ISystemResourceChangeEvent.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/events/ISystemResourceChangeEvent.java deleted file mode 100644 index f26bab95c..000000000 --- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/events/ISystemResourceChangeEvent.java +++ /dev/null @@ -1,108 +0,0 @@ -/******************************************************************************** - * Copyright (c) 2002, 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 - * - * 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: - * Martin Oberhuber (Wind River) - [168975] Move RSE Events API to Core -s ********************************************************************************/ - -package org.eclipse.rse.core.events; - -/** - * Interface of event sent when a remote system resource changes. - * - * These events are mainly for internal use. BPs/ISVs should instead - * fire and monitor for {@link org.eclipse.rse.core.events.ISystemModelChangeEvent}. - * @see org.eclipse.rse.core.events.ISystemResourceChangeEvents - */ -public interface ISystemResourceChangeEvent -{ - /** - * Returns an object identifying the source of this event. - * @see java.util.EventObject - * - * @return an object identifying the source of this event - */ - public Object getSource(); - - /** - * For multi-target events, return the array of source targets. - * @return array of source objects. - */ - public Object[] getMultiSource(); - - /** - * Returns the parent of the object source. - * Only guaranteed to be set for additions and deletions. - * - * @return an object identifying the parent of the source of this event, - * or <code>null</code> if not applicable. - */ - public Object getParent(); - - /** - * Set the parent object of this event. - * @param parent the parent object. - */ - public void setParent(Object parent); - - /** - * Returns the grandparent of the object source. - * Only guaranteed to be set for special case events, which have a - * special contract with the SystemView. - * - * @return an object identifying the grandparent of the source of this event - */ - public Object getGrandParent(); - - /** - * Return the position value for adding a new item. - * Used in ADD events. A negative number indicates an append operation. - * - * @return position to add the new item to. - */ - public int getPosition(); - - /** - * Set the position value for adding a new item. - * Used in ADD events. A negative number indicates an append operation. - * - * @param position zero-based position to insert the new item. - */ - public void setPosition(int position); - - /** - * For relative add events, return the previous node this is being added after. - * @return the previous node for adding a new node after. - */ - public Object getRelativePrevious(); - - /** - * For relative add events, set the previous node this is being added after. - * @param previousObject the object after which to add the new object. - */ - public void setRelativePrevious(Object previousObject); - - /** - * Returns the type of the event. - * @see org.eclipse.rse.core.events.ISystemResourceChangeEvents - * @return a type that is one of the constants in ISystemResourceChangeEvents. - */ - public int getType(); - - /** - * Set the type of this event - * @see org.eclipse.rse.core.events.ISystemResourceChangeEvents - * @param type a type that is one of the constants in ISystemResourceChangeEvents. - */ - public void setType(int type); - -}
\ No newline at end of file diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/events/ISystemResourceChangeEvents.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/events/ISystemResourceChangeEvents.java deleted file mode 100644 index c07fb130b..000000000 --- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/events/ISystemResourceChangeEvents.java +++ /dev/null @@ -1,355 +0,0 @@ -/******************************************************************************** - * Copyright (c) 2002, 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 - * - * 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: - * Martin Oberhuber (Wind River) - [168975] Move RSE Events API to Core - * Martin Oberhuber (Wind River) - [cleanup] Add API "since" Javadoc tags - ********************************************************************************/ - -package org.eclipse.rse.core.events; - -import org.eclipse.rse.core.subsystems.IRemoteObjectIdentifier; - -/** - * Interface of event ID constants - * - * @noimplement This interface is not intended to be implemented by clients. - */ -public interface ISystemResourceChangeEvents -{ - /** - * The event is specifically a filter reference add (filter added) - * An ISystemFilter is expected as a parameter of this event - */ - public static final int EVENT_ADD_FILTER_REFERENCE = 10; - /** - * The event is specifically a filter reference rename (filter renamed) - * An ISystemFilter is expected as a parameter of this event - */ - public static final int EVENT_RENAME_FILTER_REFERENCE = 15; - /** - * The event is specifically a filter reference delete (filter deleted) - * An ISystemFilter is expected as a parameter of this event - */ - public static final int EVENT_DELETE_FILTER_REFERENCE = 20; - /** - * The event is specifically a filter reference change (filter strings changes) - * An ISystemFilter is expected as a parameter of this event - */ - public static final int EVENT_CHANGE_FILTER_REFERENCE = 25; - - /** - * The event is specifically a filter reference move (filters reordered) - * An array of ISystemFilter[] is the expected multi-source - * parameter. The source is the first item in that array. - */ - public static final int EVENT_MOVE_FILTER_REFERENCES = 30; - - /** - * The event is specifically a filter string reference add (filterstring added) - * An ISystemFilterString is expected as a parameter of this event - */ - public static final int EVENT_ADD_FILTERSTRING_REFERENCE = 41; - - /** - * The event is specifically a filter string reference delete (filterstring deleted) - * An ISystemFilterString is expected as a parameter of this event - */ - public static final int EVENT_DELETE_FILTERSTRING_REFERENCE = 42; - - /** - * The event is specifically a filter string reference change (filterstring changed) - * An ISystemFilterString is expected as a parameter of this event - */ - public static final int EVENT_CHANGE_FILTERSTRING_REFERENCE = 43; - - /** - * The event is specifically a filter string reference move (filterstrings reordered) - * An array of ISystemFilterString[] is the expected multi-source - * parameter. The source is the first item in that array. - */ - public static final int EVENT_MOVE_FILTERSTRING_REFERENCES = 44; - - /** - * The event is a resource add. - * Any RSE object is the expected parameter - */ - public static final int EVENT_ADD = 50; - - /** - * The event is a multi-resource add. - * An array of RSE objects (i.e. Object[]) is the multi-source - * parameter (the source is the first item in that array) and a parent - * RSE object is expected. - */ - public static final int EVENT_ADD_MANY = 51; - - /** - * The event is a resource add. The resource is added relative to the "previous" attribute . - * The expected parameters are an RSE object and it's parent RSE object - */ - public static final int EVENT_ADD_RELATIVE = 53; - - /** - * After an add, you wish to expand the parent to reveal and select the new child. - * This is a harmless operation if the parent was already expanded when EVENT_ADD was sent. - * The expected parameters are an RSE object and the selected object - */ - public static final int EVENT_REVEAL_AND_SELECT = 52; - - /** - * The event is a single resource deletion. - * An RSE object is the expected parameter - */ - public static final int EVENT_DELETE = 55; - - /** - * The event is a multiple resource deletion. - * An array of RSE objects (i.e. Object[]) is the expected multi-source - * parameter. The source is the first item in that array. - */ - public static final int EVENT_DELETE_MANY = 60; - - /** - * The event is a resource rename. - * An RSE object is the expected parameter - */ - public static final int EVENT_RENAME = 65; - - /** - * The event is a multiple resource move within the same children set - * An array of RSE objects (i.e. Object[]) is the multi-source - * parameter (the source is the first item in that array) and a parent - * RSE object is expected. - */ - public static final int EVENT_MOVE_MANY = 75; - - /** - * The event is an icon change event - * A source RSE object and it's parent RSE object are the expected parameters - */ - public static final int EVENT_ICON_CHANGE = 81; - - /** - * Refresh the single item passed in the "source" field of the event. - * - * All expanded sub-nodes are re-queried for their children, unexpanded - * nodes lose their children cache. Selection is not maintained by this - * event (use EVENT_REFRESH_REMOTE instead to maintain the selection). - * - * A source RSE object to refresh is the expected parameter - */ - public static final int EVENT_REFRESH = 82; - - /** - * Refresh the items currently selected in the SystemView. - * - * All expanded sub-nodes are re-queried for their children, unexpanded nodes - * lose their children cache. After refreshing, selection of the currently selected - * elements is restored if possible (in case an absoluteName is available). - * - * In case any of the selected items is a leaf node, the parent of that - * leaf node is refreshed rather than the leaf node itself. In this particular - * case, a multiselect is not considered properly. - * - * The SystemScratchpadView also listens to this event and refreshes those - * elements that are selected in it. - * - * @deprecated obtain the selection yourself and do EVENT_REFRESH or EVENT_REFRESH_REMOTE - */ - public static final int EVENT_REFRESH_SELECTED = 83; - - /** - * Refresh the parent of the first item currently selected in the SystemView. - * - * This only refreshes the parent TreeItem of the first item in the selection. - * It does not consider multiselect, multiple occurrences of the Item under multiple - * filters, and does not maintain the current selection. - * - * @deprecated obtain the selection yourself and do EVENT_REFRESH or EVENT_REFRESH_REMOTE - */ - public static final int EVENT_REFRESH_SELECTED_PARENT = 84; - - /** - * Refresh the filter under which the first item currently selected in the - * SystemView is found. - * - * From the filter level, all expanded sub-nodes are re-queried - * for their children, unexpanded nodes lose their children cache. - * After refreshing, selection of the currently selected elements - * is restored if possible. Multiselect is not considered properly. - * - * @deprecated Refreshing a particular context(filter) only can lead - * to inconsistencies, so better obtain the selection yourself - * and do EVENT_REFRESH or EVENT_REFRESH_REMOTE - */ - public static final int EVENT_REFRESH_SELECTED_FILTER = 135; - - /** - * Refresh a remote object in the SystemView, given either the remote - * object or a string that will match on getAbsoluteName, and optionally - * (re)select a list of objects after refreshing. - * - * An object is considered remote if it has an adapter that implements - * {@link ISystemViewElementAdapter} where the adapter returns true for - * the isRemote(Object) call. This method refreshes all occurrences of - * the remote object, even under multiple filters. The tricky part about - * remote objects is their actual memory object changes on each refresh, - * so to find one in the tree we must use something more permanent: hence - * the use of getAbsoluteName to find it. - * <p> - * You can optionally pass a child remote object, or string, or Vector of - * objects or strings, in the "parent" parameter of the event, and it/they - * will be selected after the refresh. When passing a string, it must be - * the result of {@link IRemoteObjectIdentifier#getAbsoluteName(Object)} - * on the adapter. - * - * A remote RSE object is the expected source parameter - */ - public static final int EVENT_REFRESH_REMOTE = 85; - - /** - * The event is a resource property change. - * A source RSE object and it's parent RSE object are the expected parameters - */ - public static final int EVENT_PROPERTY_CHANGE = 86; - - /** - * The event is a request to update the property sheet of whatever is currently selected. - * A source RSE object and it's parent RSE object are the expected parameters - */ - public static final int EVENT_PROPERTYSHEET_UPDATE = 87; - - /** - * The event is a resource property change that invalidates child nodes - * in the GUI (eg, hostname change means the expanded information should - * be collapsed) - * A source RSE object is the expected parameter - */ - public static final int EVENT_MUST_COLLAPSE = 90; - - /** - * The event is a full collapse of the RSE tree - * Pass "false" for the src value to prevent the memory flush, else - * pass any dummy value for the src to prevent crash, but it is ignored - */ - public static final int EVENT_COLLAPSE_ALL = 91; - - /** - * The event is a collapse of the selected elements in the tree - * Pass any dummy value for the src to prevent crash, but it is ignored - */ - public static final int EVENT_COLLAPSE_SELECTED = 92; - - /** - * The event is an expand of the selected elements in the tree - * Pass any dummy value for the src to prevent crash, but it is ignored - */ - public static final int EVENT_EXPAND_SELECTED = 93; - - /** - * The event is a generic notification that the children have changed - * and must be refreshed. - * A source RSE object and (optionally) it's parent RSE object are the - * expected parameters - */ - public static final int EVENT_CHANGE_CHILDREN = 95; - - /** - * The event is simply to force selection of the given object. - * A source RSE object is the expected parameter - */ - public static final int EVENT_SELECT = 100; - - /** - * Select one or more remote objects. - * - * The "src" parameter holds a remote object, or string, or Vector of - * objects or strings. When passing a string, it must be the result of - * {@link IRemoteObjectIdentifier#getAbsoluteName(Object)} - * on the adapter of the object. - * The "parent" parameter can optionally hold a model object that is - * the parent of the objects to be refreshed, in order to optimize searches. - */ - public static final int EVENT_SELECT_REMOTE = 101; - - /** - * The event is to both select and expand the given object. - * A source RSE object is the expected parameter - */ - public static final int EVENT_SELECT_EXPAND = 105; - - /** - * The event is to log a command that has been run - * A source RSE object is the expected parameter - */ - public static final int EVENT_COMMAND_RUN = 110; - - /** - * The event is to log a message from a command that has been run - * A source RSE object and it's parent RSE object are the expected parameters - */ - public static final int EVENT_COMMAND_MESSAGE = 115; - - /** - * The event is to replace the children (similar to EVENT_ADD_MANY), it will - * expand also - * An array of RSE objects (i.e. Object[]) is the multi-source - * parameter (the source is the first item in that array) and a parent - * RSE object is expected. - */ - public static final int EVENT_REPLACE_CHILDREN = 120; - - /** - * The event is to log a command that has been run - * @deprecated - */ - public static final int EVENT_COMPILE_COMMAND_RUN = 125; - - /** - * The event is to update the command history drop-down in the remote shell view - * A source RSE object is the expected parameter - * - * TODO should be moved out of core since this is command-specific - */ - public static final int EVENT_COMMAND_HISTORY_UPDATE = 130; - - /** - * The event is to update the remote shell view when a command is finished - * @deprecated use EVENT_COMMAND_SHELL_FINISHED - */ - public static final int EVENT_COMMAND_FINISHED = 140; - - /** - * The event is to update the remote shell view when a command is finished - * A source RSE object is the expected parameter - */ - public static final int EVENT_COMMAND_SHELL_FINISHED = 140; - - /** - * The event is to indicate that a shell has been removed - * A source RSE object is the expected parameter - */ - public static final int EVENT_COMMAND_SHELL_REMOVED = 141; - - /** - * The event is to update the search view when a search is finished - * A IHostSearchResultConfiguration is the expected parameter - */ - public static final int EVENT_SEARCH_FINISHED = 150; - - /** - * Predefined event object for a property sheet update. - */ - public static final ISystemResourceChangeEvent PROPERTYSHEET_UPDATE_EVENT = - new SystemResourceChangeEvent("dummy",EVENT_PROPERTYSHEET_UPDATE,null); //$NON-NLS-1$ -}
\ No newline at end of file diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/events/ISystemResourceChangeListener.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/events/ISystemResourceChangeListener.java deleted file mode 100644 index 84777e2b5..000000000 --- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/events/ISystemResourceChangeListener.java +++ /dev/null @@ -1,34 +0,0 @@ -/******************************************************************************** - * Copyright (c) 2002, 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 - * - * 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: - * Martin Oberhuber (Wind River) - [168975] Move RSE Events API to Core - ********************************************************************************/ - -package org.eclipse.rse.core.events; -import java.util.EventListener; - -/** - * Interface that listeners interesting in changes to remote - * system connections and subsystems can listen implement and - * subsequently register their interest in via SystemRegistry. - */ -public interface ISystemResourceChangeListener extends EventListener -{ - /** - * This is the method in your class that will be called when a - * system resource changes. - * @see ISystemResourceChangeEvent - */ - public void systemResourceChanged(ISystemResourceChangeEvent event); - -}
\ No newline at end of file diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/events/SystemRemoteChangeEvent.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/events/SystemRemoteChangeEvent.java deleted file mode 100644 index 3e6992a95..000000000 --- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/events/SystemRemoteChangeEvent.java +++ /dev/null @@ -1,285 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2002, 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 - * - * 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: - * Martin Oberhuber (Wind River) - [168975] Move RSE Events API to Core - * David McKnight (IBM) - [224313] [api] Create RSE Events for MOVE and COPY holding both source and destination fields - *******************************************************************************/ - -package org.eclipse.rse.core.events; - -import org.eclipse.rse.core.subsystems.ISubSystem; - -/** - * For listeners interested in changes with remote resources. These events are - * designed to state what the change to the resource was, not to optimize those - * events for a GUI (eg, a delete event versus a refresh event). - * - * In RSE 3.0, the concept of Operation type was added (See - * {@link #setOperation(String)} and the new Constructors, and the oldNames - * property was extended from a single String into a String array. - */ -public class SystemRemoteChangeEvent implements ISystemRemoteChangeEvent -{ - private int eventType; - private Object resource, parent; - private String[] oldNames; - private ISubSystem subsystem; - private Object originatingViewer; - private String operation; - - /** - * Constructor for non-rename event - * @param eventType - one of the constants from {@link org.eclipse.rse.core.events.ISystemRemoteChangeEvents} - * @param resource - the remote resource object, or absolute name of the resource as would be given by calling getAbsoluteName on its remote adapter, - * or List of absoluteNames - * @param resourceParent - the remote resource's parent object, or absolute name, if that is known. If it is non-null, this will aid in refreshing occurences of that parent. - * @param subsystem - the subsystem which contains this remote resource. This allows the search for impacts to be - * limited to subsystems of the same parent factory, and to connections with the same hostname as the subsystem's connection. - */ - public SystemRemoteChangeEvent(int eventType, Object resource, Object resourceParent, ISubSystem subsystem) - { - super(); - this.eventType = eventType; - this.resource = resource; - this.parent = resourceParent; - this.subsystem = subsystem; - } - - - /** - * Constructor for a rename event. - * - * @param eventType - one of the constants from - * {@link org.eclipse.rse.core.events.ISystemRemoteChangeEvents} - * @param resource - the remote resource object, or absolute name of the - * resource as would be given by calling getAbsoluteName on its - * remote adapter, or List of absoluteNames - * @param resourceParent - the remote resource's parent object, or absolute - * name, if that is known. If it is non-null, this will aid in - * refreshing occurrences of that parent. - * @param subsystem - the subsystem which contains this remote resource. - * This allows the search for impacts to be limited to subsystems - * of the same parent factory, and to connections with the same - * hostname as the subsystem's connection. - * @param oldNames - on a rename, copy or move operation, these are the - * absolute names of the resources prior to the operation - * @since 3.0 replaced String oldName by String[] oldNames - */ - public SystemRemoteChangeEvent(int eventType, Object resource, Object resourceParent, ISubSystem subsystem, String[] oldNames) - { - this(eventType, resource, resourceParent, subsystem); - this.oldNames = oldNames; - } - - /** - * Constructor for non-rename event - * - * @param operation - the operation for which this event was fired. From - * {@link ISystemRemoteChangeEvents#SYSTEM_REMOTE_OPERATION_COPY} - * and related String constants - * @param eventType - one of the constants from - * {@link org.eclipse.rse.core.events.ISystemRemoteChangeEvents} - * @param resource - the remote resource object, or absolute name of the - * resource as would be given by calling getAbsoluteName on its - * remote adapter, or List of absoluteNames - * @param resourceParent - the remote resource's parent object, or absolute - * name, if that is known. If it is non-null, this will aid in - * refreshing occurrences of that parent. - * @param subsystem - the subsystem which contains this remote resource. - * This allows the search for impacts to be limited to subsystems - * of the same parent factory, and to connections with the same - * hostname as the subsystem's connection. - * @since 3.0 - */ - public SystemRemoteChangeEvent(String operation, int eventType, Object resource, Object resourceParent, ISubSystem subsystem) - { - super(); - this.eventType = eventType; - this.resource = resource; - this.parent = resourceParent; - this.subsystem = subsystem; - this.operation = operation; - } - - /** - * Constructor for a rename event. - * - * @param operation - the operation for which this event was fired. From - * {@link ISystemRemoteChangeEvents#SYSTEM_REMOTE_OPERATION_COPY} - * and related String constants - * @param eventType - one of the constants from - * {@link org.eclipse.rse.core.events.ISystemRemoteChangeEvents} - * @param resource - the remote resource object, or absolute name of the - * resource as would be given by calling getAbsoluteName on its - * remote adapter, or List of absoluteNames - * @param resourceParent - the remote resource's parent object, or absolute - * name, if that is known. If it is non-null, this will aid in - * refreshing occurrences of that parent. - * @param subsystem - the subsystem which contains this remote resource. - * This allows the search for impacts to be limited to subsystems - * of the same parent factory, and to connections with the same - * hostname as the subsystem's connection. - * @param oldNames - on a rename, copy or move operation, these are the - * absolute names of the resources prior to the operation - * @since 3.0 - */ - public SystemRemoteChangeEvent(String operation, int eventType, Object resource, Object resourceParent, ISubSystem subsystem, String[] oldNames) - { - this(operation, eventType, resource, resourceParent, subsystem); - this.oldNames = oldNames; - } - /** - * Constructor you shouldn't use unless you intend to call the setters - */ - public SystemRemoteChangeEvent() - { - } - - /** - * Reset the event type - */ - public void setEventType(int eventType) - { - this.eventType = eventType; - } - - /** - * Reset the resource - */ - public void setResource(Object resource) - { - this.resource = resource; - } - - /** - * Reset the resource's remote resource parent - */ - public void setResourceParent(Object resourceParent) - { - this.parent = resourceParent; - } - - /** - * Reset the subsystem - */ - public void setSubSystem(ISubSystem subsystem) - { - this.subsystem = subsystem; - } - - /** - * Reset the old names on a rename, move or copy event - * - * @since 3.0 - */ - public void setOldNames(String[] oldNames) - { - this.oldNames = oldNames; - } - - /** - * Get the event type, such as {@link org.eclipse.rse.core.events.ISystemRemoteChangeEvents#SYSTEM_REMOTE_RESOURCE_CREATED}. - * @see org.eclipse.rse.core.events.ISystemRemoteChangeEvents - */ - public int getEventType() - { - return eventType; - } - - /** - * Get the resource that this event applies to - * It must either be the binary object of the resource, or the absolute name of the resource, - * or List of absoluteNames. - */ - public Object getResource() - { - return resource; - } - - /** - * Get the parent remote object for the affected remote object. This is not always known, - * but when it is (ie, non null) then it can be used to refresh all expanded occurrences of that parent - */ - public Object getResourceParent() - { - return parent; - } - - /** - * Get the subsystem in which this resource resides. - * This allows the search for impacts to be limited to subsystems of the same parent factory, and to connections - * with the same hostname as the subsystem's connection. - */ - public ISubSystem getSubSystem() - { - return subsystem; - } - - /** - * Get the old name of the resource, in the event of a resource rename. Null - * for other event types. - * - * @since 3.0 - */ - public String[] getOldNames() - { - return oldNames; - } - - /** - * Set the originating viewer. - * Only this viewer is candidate for updating the selection. Eg, on a - * create event, if this and the resource parent is set, the newly - * created object is selected after the parent's contents are refreshed, - * for the originating viewer. - */ - public void setOriginatingViewer(Object originatingViewer) { - this.originatingViewer = originatingViewer; - } - - /** - * Get the originating viewer from which this remote resource change event - * comes from. The combination of this, if non-null, plus the resource parent, - * allows viewers to decide whether to update the selection within the - * parent resource, after refreshing that resource. - */ - public Object getOriginatingViewer() { - return originatingViewer; - } - - - /** - * @since 3.0 - * @param operation from - * {@link ISystemRemoteChangeEvents#SYSTEM_REMOTE_OPERATION_COPY} - * and related String constants - */ - public void setOperation(String operation){ - this.operation = operation; - } - - /** - * Returns the operation of this event if it's not implied by the event - * itself. The operation can be optionally specified when the event is - * constructed. By default this will return null. - * - * @return the operation that triggered this event - * @since 3.0 - */ - public String getOperation() { - return operation; - } - - -} diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/events/SystemResourceChangeEvent.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/events/SystemResourceChangeEvent.java deleted file mode 100644 index 24cef06c2..000000000 --- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/events/SystemResourceChangeEvent.java +++ /dev/null @@ -1,153 +0,0 @@ -/******************************************************************************** - * Copyright (c) 2002, 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 - * - * 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: - * Martin Oberhuber (Wind River) - [168975] Move RSE Events API to Core - ********************************************************************************/ - -package org.eclipse.rse.core.events; -import java.util.EventObject; - -/** - * Event object sent to SystemResourceChangeListeners when a - * remote system object is created, changed, removed, etc. - * @see org.eclipse.rse.core.events.ISystemResourceChangeEvents - */ -public class SystemResourceChangeEvent - extends EventObject - implements ISystemResourceChangeEvent -{ - private static final long serialVersionUID = 1; - private Object parent,grandparent, prevObj; - private Object[] multiSource; - private int type; - private int position = -1; - - /** - * Constructor for SystemResourceChangeEvent. - * @see org.eclipse.rse.core.events.ISystemResourceChangeEvents - * @param source The object that was added,deleted,renamed,changed. - * @param type The type of event, one of ISystemChangeEvent constants. - * @param parent The parent of the object that was added or deleted. - */ - public SystemResourceChangeEvent(Object source, int type, Object parent) - { - super(source); - setType(type); - setParent(parent); - } - /** - * Constructor for SystemResourceChangeEvent when the source is multipe resources. - * @see org.eclipse.rse.core.events.ISystemResourceChangeEvents - * @param source The array of objects that were added,deleted,renamed,changed. - * @param type The type of event, one of ISystemChangeEvent constants. - * @param parent The parent of the object that was added or deleted. - */ - public SystemResourceChangeEvent(Object[] source, int type, Object parent) - { - super(((source!=null) && (source.length>0)) ? source[0] : "nada"); // defect 42112 //$NON-NLS-1$ - this.multiSource = source; - this.type = type; - this.parent = parent; - } - - /** - * For multi-target events, return the array of source targets. - */ - public Object[] getMultiSource() - { - return multiSource; - } - - /** - * Return the parent of the object added or removed. - * @see ISystemResourceChangeEvent#getParent() - */ - public Object getParent() - { - return parent; - } - /** - * Set the parent - */ - public void setParent(Object parent) - { - this.parent = parent; - } - - /** - * Return the grand parent of the object added or removed. - * @see ISystemResourceChangeEvent#getParent() - */ - public Object getGrandParent() - { - return grandparent; - } - /** - * Set the grand parent of the object added or removed. - */ - public void setGrandParent(Object grandparent) - { - this.grandparent = grandparent; - } - /** - * Return the position value. Used in ADD events. - * @return position to add the new item to. A negative number indicates an append operation - */ - public int getPosition() - { - return position; - } - /** - * Set the position value. Used in ADD events. - * @param position zero-based position to insert the new item. A negative number indicates an append operation - */ - public void setPosition(int position) - { - this.position = position; - } - - /** - * Return the type of the event (add, change, remove, rename, change, property change). - * @see org.eclipse.rse.core.events.ISystemResourceChangeEvents - * @see org.eclipse.rse.core.events.ISystemResourceChangeEvent - * @see org.eclipse.rse.core.events.ISystemResourceChangeEvent#getType() - */ - public int getType() - { - return type; - } - /** - * Set the type - * @see org.eclipse.rse.core.events.ISystemResourceChangeEvents - */ - public void setType(int type) - { - this.type = type; - } - - /** - * For relative add events, return the previous node this is being added after - */ - public Object getRelativePrevious() - { - return prevObj; - } - /** - * For relative add events, set the previous node this is being added after - */ - public void setRelativePrevious(Object previousObject) - { - this.prevObj = previousObject; - } - -}
\ No newline at end of file diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/ISystemFilter.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/ISystemFilter.java deleted file mode 100644 index fc7017112..000000000 --- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/ISystemFilter.java +++ /dev/null @@ -1,650 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2003, 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 - * - * 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) - cleanup format and javadoc - * Martin Oberhuber (Wind River) - [cleanup] Add API "since" Javadoc tags - * David Dykstal (IBM) - [224671] [api] org.eclipse.rse.core API leaks non-API types - * David Dykstal (IBM) - [226561] Add API markup to RSE Javadocs where extend / implement is allowed - *******************************************************************************/ - -package org.eclipse.rse.core.filters; - -import org.eclipse.rse.core.model.IRSEModelObject; -import org.eclipse.rse.core.references.IRSEReferencedObject; -import org.eclipse.rse.core.subsystems.ISubSystem; - -/** - * A filter consists of filter strings and may be contained in a filter pool. - * Filter pools are referenced by subsystems. Subsystems are responsible for - * interpreting the filters. Filters, in and of themselves, provide no - * interpretation of themselves when applied to the resources managed by a - * subsystem. - * - * @noimplement This interface is not intended to be implemented by clients. The - * allowable implementations already present in the framework. - */ - -public interface ISystemFilter extends IRSEReferencedObject, ISystemFilterContainer, IRSEModelObject { - - /** - * Returns the value of the '<em><b>Name</b></em>' attribute. - * <p> - * This is the name of the filter. It may be present in the user interface and is also - * used to refer to the filter when it is persisted. - * </p> - * @return the value of the '<em>Name</em>' attribute. - * @see #setName(String) - */ - public String getName(); - - /** - * Sets the value of the '{@link org.eclipse.rse.core.filters.ISystemFilter#getName <em>Name</em>}' attribute. - * This is the name of the filter. It may be present in the user interface and is also - * used to refer to the filter when it is persisted. - * @param value the new value of the '<em>Name</em>' attribute. - * @see #getName() - */ - public void setName(String value); - - /** - * Returns the value of the '<em><b>Type</b></em>' attribute. - * <p> - * Filters may be further typed for use by subsystems. The type is also uninterpreted by the - * filter. The type may be used to select a parser/interpreter for the filter strings. - * </p> - * @return the value of the '<em>Type</em>' attribute. - * @see #setType(String) - */ - public String getType(); - - /** - * Sets the value of the '{@link org.eclipse.rse.core.filters.ISystemFilter#getType <em>Type</em>}' attribute. - * Filters may be further typed for use by subsystems. The type is also uninterpreted by the - * filter. The type may be used to select a parser/interpreter for the filter strings. - * @param value the new value of the '<em>Type</em>' attribute. - * @see #getType() - */ - public void setType(String value); - - /** - * Returns the value of the '<em><b>Supports Nested Filters</b></em>' attribute. - * <p> - * Specifies whether filters may be nested or not. If nested the intent is to apply this filter - * to the results of the parent filter - further restricting the resources selected by the - * parent filter. However, it is up to the subsystem to interpret exactly what "nesting" means. - * </p> - * @return the value of the '<em>Supports Nested Filters</em>' attribute. - * @see #setSupportsNestedFilters(boolean) - */ - public boolean isSupportsNestedFilters(); - - /** - * Sets the value of the '{@link org.eclipse.rse.core.filters.ISystemFilter#isSupportsNestedFilters <em>Supports Nested Filters</em>}' attribute. - * <p> - * Specifies whether filters may be nested or not. If nested the intent is to apply this filter - * to the results of the parent filter - further restricting the resources selected by the - * parent filter. However, it is up to the subsystem to interpret exactly what "nesting" means. - * </p> - * @param value the new value of the '<em>Supports Nested Filters</em>' attribute. - * @see #isSupportsNestedFilters() - */ - public void setSupportsNestedFilters(boolean value); - - /** - * Returns the value of the '<em><b>Relative Order</b></em>' attribute. - * <p> - * The relative order of a filter is intended to be used - * by a persistence mechanism to keep the filters in a particular order - * when restoring them into a filter pool. Filters with higher numbers should - * occur later in the pool. It may be employed in the absence of another - * mechanism for maintaining order. - * </p> - * @return the value of the '<em>Relative Order</em>' attribute. - * @see #setRelativeOrder(int) - */ - public int getRelativeOrder(); - - /** - * Sets the value of the '{@link org.eclipse.rse.core.filters.ISystemFilter#getRelativeOrder <em>Relative Order</em>}' attribute. - * The relative order of a filter is intended to be used - * by a persistence mechanism to keep the filters in a particular order - * when restoring them into a filter pool. Filters with higher numbers should - * occur later in the pool. It may be employed in the absence of another - * mechanism for maintaining order. - * @param value the new value of the '<em>Relative Order</em>' attribute. - * @see #getRelativeOrder() - */ - public void setRelativeOrder(int value); - - /** - * Returns the value of the '<em><b>Default</b></em>' attribute. - * <p> - * This filter is a "default" filter in this filter pool. - * The meaning of "default" is determined by the subsystem in which it is deployed. - * It typically means that the filter is supplied by the subsystem at the time the subsystem is created. - * That is, the filter is "vendor supplied". - * There is no restriction on the number of default filters in a pool. - * </p> - * @return the value of the '<em>Default</em>' attribute. - * @see #setDefault(boolean) - */ - public boolean isDefault(); - - /** - * Sets the value of the '{@link org.eclipse.rse.core.filters.ISystemFilter#isDefault <em>Default</em>}' attribute. - * Make this filter is a "default" filter in this filter pool. - * The meaning of "default" is determined by the subsystem in which it is deployed. - * It typically means that the filter is supplied by the subsystem at the time the subsystem is created. - * That is, the filter is "vendor supplied". - * There is no restriction on the number of default filters in a pool. - * @param value the new value of the '<em>Default</em>' attribute. - * @see #isDefault() - */ - public void setDefault(boolean value); - - /** - * Returns the value of the '<em><b>Strings Case Sensitive</b></em>' attribute. - * <p> - * An attribute that may be used by the subystems when interpreting the filter. Used - * to indicate whether or not comparisons involving the filter should be considered - * case sensitive. - * This attribute is optional and may be known (set) or unknown (unset). - * </p> - * <p> - * If unset the value - * returned is from the parent filter pool. - * </p> - * @return the value of the '<em>Strings Case Sensitive</em>' attribute. - * @see #isSetStringsCaseSensitive() - * @see #unsetStringsCaseSensitive() - * @see #setStringsCaseSensitive(boolean) - */ - public boolean isStringsCaseSensitive(); - - /** - * Sets the value of the '{@link org.eclipse.rse.core.filters.ISystemFilter#isStringsCaseSensitive <em>Strings Case Sensitive</em>}' attribute. - * <p> - * An attribute that may be used by the subystems when interpreting the filter. Used - * to indicate whether or not comparisons involving the filter should be considered - * case sensitive. - * This attribute is optional and may be known (set) or unknown (unset). - * </p> - * <p> - * This will cause this attribute to be set in this filter. - * </p> - * @param value the new value of the '<em>Strings Case Sensitive</em>' attribute. - * @see #isSetStringsCaseSensitive() - * @see #unsetStringsCaseSensitive() - * @see #isStringsCaseSensitive() - */ - void setStringsCaseSensitive(boolean value); - - /** - * Unsets the value of the '{@link org.eclipse.rse.core.filters.ISystemFilter#isStringsCaseSensitive <em>Strings Case Sensitive</em>}' attribute. - * <p> - * An attribute that may be used by the subystems when interpreting the filter. Used - * to indicate whether or not comparisons involving the filter should be considered - * case sensitive. - * This attribute is optional and may be known (set) or unknown (unset). - * </p><p> - * Causes this filter to use the value specified by the parent filter pool. - * </p> - * @see #isSetStringsCaseSensitive() - * @see #isStringsCaseSensitive() - * @see #setStringsCaseSensitive(boolean) - */ - public void unsetStringsCaseSensitive(); - - /** - * Returns whether the value of the '{@link org.eclipse.rse.core.filters.ISystemFilter#isStringsCaseSensitive <em>Strings Case Sensitive</em>}' attribute is set. - * <p> - * An attribute that may be used by the subystems when interpreting the filter. Used - * to indicate whether or not comparisons involving the filter should be considered - * case sensitive. - * This attribute is optional and may be known (set) or unknown (unset). - * </p><p> - * This will be true if this attribute is explicitly specified for this filter. It will be false if this - * is being inherited from the parent filter pool. - * </p> - * @return whether the value of the '<em>Strings Case Sensitive</em>' attribute is set. - * @see #unsetStringsCaseSensitive() - * @see #isStringsCaseSensitive() - * @see #setStringsCaseSensitive(boolean) - */ - public boolean isSetStringsCaseSensitive(); - - /** - * Returns the value of the '<em><b>Promptable</b></em>' attribute. - * <p> - * An attribute that may be used by the subystems when interpreting the filter. - * Typically used to indicate whether or not some sort of prompting is to occur when the - * filter is used. Typically used when applying a filter in the UI to indicate - * the start of a wizard or dialog. It may also have an effect on whether - * the state of the filter is saved when the workbench is shut down. - * </p> - * @return the value of the '<em>Promptable</em>' attribute. - * @see #setPromptable(boolean) - */ - public boolean isPromptable(); - - /** - * Sets the value of the '{@link org.eclipse.rse.core.filters.ISystemFilter#isPromptable <em>Promptable</em>}' attribute. - * <p> - * An attribute that may be used by the subystems when interpreting the filter. - * Typically used to indicate whether or not some sort of prompting is to occur when the - * filter is used. Typically used when applying a filter in the UI to indicate - * the start of a wizard or dialog. It may also have an effect on whether - * the state of the filter is saved when the workbench is shut down. - * </p> - * @param value the new value of the '<em>Promptable</em>' attribute. - * @see #isPromptable() - */ - public void setPromptable(boolean value); - - /** - * Returns the value of the '<em><b>Supports Duplicate Filter Strings</b></em>' attribute. - * <p> - * This attribute may be used by subsystems when interpreting the filter. - * Typically used when adding filter strings to the filter or as a hint when - * applying the filter to the resources understood by the subsystem. - * </p> - * @return the value of the '<em>Supports Duplicate Filter Strings</em>' attribute. - * @see #setSupportsDuplicateFilterStrings(boolean) - */ - public boolean isSupportsDuplicateFilterStrings(); - - /** - * Does this support duplicate filter strings? - * A convenience method for {@link #isSupportsDuplicateFilterStrings()}. - */ - public boolean supportsDuplicateFilterStrings(); - - /** - * Sets the value of the '{@link org.eclipse.rse.core.filters.ISystemFilter#isSupportsDuplicateFilterStrings <em>Supports Duplicate Filter Strings</em>}' attribute. - * <p> - * This attribute may be used by subsystems when interpreting the filter. - * Typically used when adding filter strings to the filter or as a hint when - * applying the filter to the resources understood by the subsystem. - * </p> - * @param value the new value of the '<em>Supports Duplicate Filter Strings</em>' attribute. - * @see #isSupportsDuplicateFilterStrings() - */ - public void setSupportsDuplicateFilterStrings(boolean value); - - /** - * Returns the value of the '<em><b>Non Deletable</b></em>' attribute. - * <p> - * An attribute that can be used when managing filters in filter pools. - * Some filters should not be deleted. - * </p> - * @return the value of the '<em>Non Deletable</em>' attribute. - * @see #setNonDeletable(boolean) - */ - public boolean isNonDeletable(); - - /** - * Sets the value of the '{@link org.eclipse.rse.core.filters.ISystemFilter#isNonDeletable <em>Non Deletable</em>}' attribute. - * <p> - * An attribute that can be used when managing filters in filter pools. - * Some filters should not be deleted. - * </p> - * @param value the new value of the '<em>Non Deletable</em>' attribute. - * @see #isNonDeletable() - */ - public void setNonDeletable(boolean value); - - /** - * Returns the value of the '<em><b>Non Renamable</b></em>' attribute. - * <p> - * An attribute that can be used when managing filters in filter pools. - * Some filters should not be renamed. - * </p> - * @return the value of the '<em>Non Renamable</em>' attribute. - * @see #setNonRenamable(boolean) - */ - public boolean isNonRenamable(); - - /** - * Sets the value of the '{@link org.eclipse.rse.core.filters.ISystemFilter#isNonRenamable <em>Non Renamable</em>}' attribute. - * <p> - * An attribute that can be used when managing filters in filter pools. - * Some filters should not be renamed. - * </p> - * @param value the new value of the '<em>Non Renamable</em>' attribute. - * @see #isNonRenamable() - */ - public void setNonRenamable(boolean value); - - /** - * Returns the value of the '<em><b>Non Changable</b></em>' attribute. - * <p> - * An attribute that can be used when managing filters in filter pools. - * Some filters should not be modifiable. - * </p> - * @return the value of the '<em>Non Changable</em>' attribute. - * @see #setNonChangable(boolean) - */ - public boolean isNonChangable(); - - /** - * Sets the value of the '{@link org.eclipse.rse.core.filters.ISystemFilter#isNonChangable <em>Non Changable</em>}' attribute. - * <p> - * An attribute that can be used when managing filters in filter pools. - * Some filters should not be modifiable. - * </p> - * @param value the new value of the '<em>Non Changable</em>' attribute. - * @see #isNonChangable() - */ - public void setNonChangable(boolean value); - - /** - * Returns the value of the '<em><b>Strings Non Changable</b></em>' attribute. - * <p> - * An attribute that can be used when managing filters in filter pools. - * Some filters contain filter strings that should not be modifiable. - * </p> - * @return the value of the '<em>Strings Non Changable</em>' attribute. - * @see #setStringsNonChangable(boolean) - */ - public boolean isStringsNonChangable(); - - /** - * Sets the value of the '{@link org.eclipse.rse.core.filters.ISystemFilter#isStringsNonChangable <em>Strings Non Changable</em>}' attribute. - * <p> - * An attribute that can be used when managing filters in filter pools. - * Some filters contain filter strings that should not be modifiable. - * </p> - * @param value the new value of the '<em>Strings Non Changable</em>' attribute. - * @see #isStringsNonChangable() - */ - public void setStringsNonChangable(boolean value); - - /** - * Returns the value of the '<em><b>Release</b></em>' attribute. - * <p> - * This is an attribute specifying the release level of the - * filter. This will be persisted in the filter definition and - * can be used to migrate the internal form of the filter. - * </p> - * @return the value of the '<em>Release</em>' attribute. - * @see #setRelease(int) - */ - public int getRelease(); - - /** - * Sets the value of the '{@link org.eclipse.rse.core.filters.ISystemFilter#getRelease <em>Release</em>}' attribute. - * <p> - * This is an attribute specifying the release level of the - * filter. This will be persisted in the filter definition and - * can be used to migrate the internal form of the filter. - * </p> - * @param value the new value of the '<em>Release</em>' attribute. - * @see #getRelease() - */ - public void setRelease(int value); - - /** - * Returns the value of the '<em><b>Single Filter String Only</b></em>' attribute. - * <p> - * This attribute specifies that the filter may contain only a single - * filter string. Used by a filter manager to ensure that the - * filter contains only one string. May, alternatively, be enforced - * by the filter implementation. - * </p><p> - * This attribute may be set or unset. If unset this value will be inherited - * from the parent filter pool. - * </p> - * @return the value of the '<em>Single Filter String Only</em>' attribute. - * @see #isSetSingleFilterStringOnly() - * @see #unsetSingleFilterStringOnly() - * @see #setSingleFilterStringOnly(boolean) - */ - public boolean isSingleFilterStringOnly(); - - /** - * Sets the value of the '{@link org.eclipse.rse.core.filters.ISystemFilter#isSingleFilterStringOnly <em>Single Filter String Only</em>}' attribute. - * <p> - * This attribute specifies that the filter may contain only a single - * filter string. Used by a filter manager to ensure that the - * filter contains only one string. May, alternatively, be enforced - * by the filter implementation. - * </p><p> - * This causes the attribute to be set for this filter, ignoring the value - * specified for the parent filter pool. - * </p> - * @param value the new value of the '<em>Single Filter String Only</em>' attribute. - * @see #isSetSingleFilterStringOnly() - * @see #unsetSingleFilterStringOnly() - * @see #isSingleFilterStringOnly() - */ - public void setSingleFilterStringOnly(boolean value); - - /** - * Unsets the value of the '{@link org.eclipse.rse.core.filters.ISystemFilter#isSingleFilterStringOnly <em>Single Filter String Only</em>}' attribute. - * This causes the value of this attribute to be inherited from the parent filter pool. - * @see #isSetSingleFilterStringOnly() - * @see #isSingleFilterStringOnly() - * @see #setSingleFilterStringOnly(boolean) - */ - public void unsetSingleFilterStringOnly(); - - /** - * Returns whether the value of the '{@link org.eclipse.rse.core.filters.ISystemFilter#isSingleFilterStringOnly <em>Single Filter String Only</em>}' attribute is set. - * If true then the value of this attribute is set in this filter. If false it is inherited from the parent filter pool. - * @return whether the value of the '<em>Single Filter String Only</em>' attribute is set. - * @see #unsetSingleFilterStringOnly() - * @see #isSingleFilterStringOnly() - * @see #setSingleFilterStringOnly(boolean) - */ - public boolean isSetSingleFilterStringOnly(); - - /** - * Returns the value of the '<em><b>Nested Filters</b></em>' - * containment reference list. It is bidirectional and its opposite is '{@link org.eclipse.rse.core.filters.ISystemFilter#getParentFilter <em>Parent Filter</em>}'. - * <p> - * If this filter can contain child filters this will return the list of - * children. - * </p> - * - * @return the value of the '<em>Nested Filters</em>' containment - * reference list. - * @see org.eclipse.rse.core.filters.ISystemFilter#getParentFilter - * @since org.eclipse.rse.core 3.0 - */ - public ISystemFilter[] getNestedFilters(); - - /** - * Returns the value of the '<em><b>Parent Filter</b></em>' container reference. - * It is bidirectional and its opposite is '{@link org.eclipse.rse.core.filters.ISystemFilter#getNestedFilters <em>Nested Filters</em>}'. - * <p> - * If this filter can be nested inside another this will return the parent filter. Will be - * null if there is no parent. - * </p> - * @return the value of the '<em>Parent Filter</em>' container reference. - * @see #setParentFilter(ISystemFilter) - * @see org.eclipse.rse.core.filters.ISystemFilter#getNestedFilters - */ - public ISystemFilter getParentFilter(); - - /** - * Sets the value of the '{@link org.eclipse.rse.core.filters.ISystemFilter#getParentFilter <em>Parent Filter</em>}' container reference. - * This is used by a filter manager to set the parent filter when one filter is nested inside another. - * @param value the new value of the '<em>Parent Filter</em>' container reference. - * @see #getParentFilter() - */ - public void setParentFilter(ISystemFilter value); - - /** - * Returns the value of the '<em><b>Strings</b></em>' containment - * reference list. - * - * @return the value of the '<em>Strings</em>' containment reference - * list. - * @since org.eclipse.rse.core 3.0 - */ - public ISystemFilterString[] getStrings(); - - /** - * @return the parent pool of this filter. For nested filters, this will walk up the parent chain - * until we find the pool. May return null if this is a simple filter that has no parent pool. - */ - public ISystemFilterPool getParentFilterPool(); - - /** - * Internal use method to set the parent filter pool. This should be invoked only by a filter manager - * or a filter pool manager when adding a filter to a filter pool. - * @param parentPool the filter pool that contains or will contain this filter. - */ - public void setParentFilterPool(ISystemFilterPool parentPool); - - /** - * Set this filter's filter strings by giving an array of String objects. - * This will construct the filter strings objects. - * @param strings the array of String objects. - */ - public void setFilterStrings(String[] strings); - - /** - * @return this filter's filter strings as an array of String objects. This array will - * not be null, but may be empty. - */ - public String[] getFilterStrings(); - - /** - * @return this filter's filter string objects as an array of IFilterString objects. - * This array will not be null, but may be empty. - */ - public ISystemFilterString[] getSystemFilterStrings(); - - /** - * @return the number of filter strings this filter currently contains. - */ - public int getFilterStringCount(); - - /** - * @return a filter string given its string value. This will be null if there - * is no string matching the argument. - */ - public ISystemFilterString getSystemFilterString(String string); - - /** - * Append a new filter string to this filter's list of filter strings. - * This will construct a filter string object. - * @param newString the string to append - */ - public ISystemFilterString addFilterString(String newString); - - /** - * Insert a new filter string to this filter's list, at the given zero-based position. - * Thsi will construct a filter string object. - * @param newString the string from which to construct the filter string to be added. - * @param position the zero-based position at which to add the string. - */ - public ISystemFilterString addFilterString(String newString, int position); - - /** - * Update a new filter string's string value. - * The filter string need not belong to this filter. - * @param filterString the string update. - * @param newValue the new value of that string. - */ - public void updateFilterString(ISystemFilterString filterString, String newValue); - - /** - * Delete a filter string from this filter's list. - * @param oldString the string to remove - * @return the SystemFilterString object deleted, or null if not found - */ - public ISystemFilterString removeFilterString(String oldString); - - /** - * Remove a filter string from this filter's list, given its zero-based position - * @param position the position of the filter string. - * @return the SystemFilterString object deleted, or null if not found - */ - public ISystemFilterString removeFilterString(int position); - - /** - * Remove a filter string from this filter's list, given its SystemFilterString object. - * The specific filter string will be removed, based on object identity. - * @param filterString the filterString to be removed. - * @return true if the given string existed and hence was deleted. - */ - public boolean removeFilterString(ISystemFilterString filterString); - - /** - * Move a given filter string to a given zero-based location. This will - * do nothing if the argument is not a string already contained by this filter. - * @param pos the new position of this filter string - * @param filterString the filter string to move - */ - public void moveSystemFilterString(int pos, ISystemFilterString filterString); - - /** - * Copies a given filter string from this filter to another filter in this pool or another pool - * in this manager or another manager. Will do nothing if the filter string is not - * originally contained in this filter. - * @param targetFilter the filter to which to copy the filter string - * @param oldFilterString the filter string to copy - */ - public ISystemFilterString copySystemFilterString(ISystemFilter targetFilter, ISystemFilterString oldFilterString); - - /** - * @return true if this filter is a nested filter or not. If not, its parent is the filter pool. - */ - public boolean isNested(); - - /** - * @return true if this a transient or simple filter that is not intended to be - * saved or part of the filter framework. It will have no manager or provider. - */ - public boolean isTransient(); - - /** - * Set the subsytem of this filter. - * This is ignored if the filter is not transient. - * @param subsystem a subsystem associated with this transient filter - * @since 3.0 - */ - public void setSubSystem(ISubSystem subsystem); - - /** - * Get the subsystem for this filter. - * This will return null if the filter is not transient. - * @return the subsystem - * @since 3.0 - */ - public Object getSubSystem(); - - /** - * Clones a given filter to the given target filter. - * All filter strings, and all nested filters, are copied. - * Typically used when copying a whole filter. - * @param targetFilter new filter into which all the data of this filter will be copied. - */ - public void clone(ISystemFilter targetFilter); - - /** - * @return the ISystemFilterContainer parent of this filter. This will be either - * an ISystemFilterPool or an ISystemFilter if this is a nested filter. - */ - public ISystemFilterContainer getParentFilterContainer(); - - /** - * @return the caller which instantiated the filter pool manager overseeing this filter framework instance. - * This will typically be a subsystem configuration. - */ - public ISystemFilterPoolManagerProvider getProvider(); - -} diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/ISystemFilterContainer.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/ISystemFilterContainer.java deleted file mode 100644 index beb582b31..000000000 --- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/ISystemFilterContainer.java +++ /dev/null @@ -1,132 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2002, 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 - * - * 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: - * Martin Oberhuber (Wind River) - [cleanup] Add API "since" Javadoc tags - * David Dykstal (IBM) - [226561] Add API markup to RSE Javadocs where extend / implement is allowed - *******************************************************************************/ -package org.eclipse.rse.core.filters; - -import org.eclipse.rse.core.model.IRSEPersistableContainer; - -/** - * Filter containers are any objects that contain filters. - * This includes filter pools and filters themselves. - * @noimplement This interface is not intended to be implemented by clients. - * The allowable implementations are already present in the framework. - */ -public interface ISystemFilterContainer extends IRSEPersistableContainer { - /** - * @return the filter pool manager managing this collection of filter pools and their filters. - */ - public ISystemFilterPoolManager getSystemFilterPoolManager(); - - /** - * @return The value of the StringsCaseSensitive attribute Are filters in - * this filter container case sensitive? If not set locally, queries - * the parent filter pool manager's attribute. - */ - public boolean areStringsCaseSensitive(); - - /** - * Adds a new system filter to this container (SystemFilterPool or - * SystemFilter) and populates it with the filter strings created from the - * strings provided. Does nothing if this filter already exists in this - * container. - * - * @param aliasName The name to give the new filter. Must be unique for this - * pool. - * @param filterStrings The list of String objects that represent the filter - * strings. - * @since org.eclipse.rse.core 3.0 - */ - public ISystemFilter createSystemFilter(String aliasName, String[] filterStrings); - - /** - * Adds given filter to the list without populating the filter strings. - * @param filter SystemFilter object to add - * @return true if added, false if a filter with this aliasname already existed. - */ - public boolean addSystemFilter(ISystemFilter filter); - - /** - * Get the names of existing filters in this container. Typically used by - * name validators for New and Rename actions to verify new name is unique. - * - * @return String array of the names of existing filters in this container. - * @since org.eclipse.rse.core 3.0 - */ - public String[] getSystemFilterNames(); - - /** - * @return an array of the ISystemFilter objects contained in this filter container. - */ - public ISystemFilter[] getSystemFilters(); - - /** - * @return a system filter given its name. Will return null if no filter by this name is found. - */ - public ISystemFilter getSystemFilter(String filterName); - - /** - * @return the parent pool of this container. - * If this is itself a pool, returns "this". - * For a nested filter, returns the pool that is the ultimate parent of this filter. - */ - public ISystemFilterPool getSystemFilterPool(); - - /** - * @return how many filters are directly defined in this filter container. - */ - public int getSystemFilterCount(); - - /** - * Removes a given filter from the list. Will do nothing if the specified filter - * is not in this filter container. - * @param filter SystemFilter object to remove - */ - public void deleteSystemFilter(ISystemFilter filter); - - /** - * Renames a given filter in the list. The new name is assumed to be valid. - * Will perform the rename whether or not the filter is contained in this - * container. - * @param filter SystemFilter object to rename - * @param newName New name to assign it. - */ - public void renameSystemFilter(ISystemFilter filter, String newName); - - /** - * @return a given filter's zero-based location. Will return -1 if the filter - * is not present in this container. - */ - public int getSystemFilterPosition(ISystemFilter filter); - - /** - * Move a given filter to a given zero-based location. - * Does nothing if the filter is not in this container. - * @param pos the new position of the filter. - * @param filter the filter to move. - */ - public void moveSystemFilter(int pos, ISystemFilter filter); - - /** - * Updates a given filter. - * The filter need not be present in this container but will operate on - * any filter. - * @param filter SystemFilter object to update - * @param newName New name to assign it. Assumes unique checking already done. - * @param newStrings New strings to assign it. Replaces current strings. - */ - public void updateSystemFilter(ISystemFilter filter, String newName, String[] newStrings); -} diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/ISystemFilterContainerReference.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/ISystemFilterContainerReference.java deleted file mode 100644 index a1d00bd11..000000000 --- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/ISystemFilterContainerReference.java +++ /dev/null @@ -1,88 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2002, 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 - * - * 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) - [226561] Add API markup to RSE Javadocs where extend / implement is allowed - *******************************************************************************/ - -package org.eclipse.rse.core.filters; - -import org.eclipse.rse.core.subsystems.ISubSystem; - -/** - * Both ISystemFilter and ISystemFilterPool may contain filters, so the - * common methods for filters are abstracted out in SystemFilterContainer, - * which both classes implement. - * Both ISystemFilterReference and ISystemFilterPoolReference hold references - * to ISystemFilterContainer objects. - * There are methods common to both classes, related to - * getting an array of references to the filters that are held by the referenced - * object. - * This interface captures those common methods, and both - * SystemFilterReference and SystemFilterPoolReference - * implement this interface and hence these methods. - * @noimplement This interface is not intended to be implemented by clients. - * The allowable implementations are already present in the framework. - */ -public interface ISystemFilterContainerReference { - /** - * @return the filter container object which is referenced. - */ - public ISystemFilterContainer getReferencedSystemFilterContainer(); - - /** - * Build and return an array of SystemFilterReference objects. - * Each object is created new. There is one for each of the filters - * in the reference SystemFilter or SystemFilterPool. - * For performance reasons, we will cache this array and only - * return a fresh one if something changes in the underlying - * filter list. - * @param subSystem the subsystem from which to get the filter references. - */ - public ISystemFilterReference[] getSystemFilterReferences(ISubSystem subSystem); - - /** - * Finds an existing filter in a particular subsystem. - * @param subSystem the subsystem in which to look for the filter reference. - * @param filter the filter for which to look. - * @return an existing reference to a given system filter. - * If no reference currently exists to this filter, returns null. - * @see #getSystemFilterReference(ISubSystem, ISystemFilter) - */ - public ISystemFilterReference getExistingSystemFilterReference(ISubSystem subSystem, ISystemFilter filter); - - /** - * Find or create a single filter refererence to a given filter. - * If there already is a reference to this filter, in this subsystem it will be returned. - * If not, a new reference is created and added at the end of the list of filter references. - * @param subSystem the subsystem in which to find or create the filter. - * @param filter the filter to for which to create a reference. - * @see #getExistingSystemFilterReference(ISubSystem, ISystemFilter) - */ - public ISystemFilterReference getSystemFilterReference(ISubSystem subSystem, ISystemFilter filter); - - /** - * @return the name of the SystemFilter or SystemFilterPool that we reference. - */ - public String getName(); - - /** - * @return true if this container has filters. - */ - public boolean hasFilters(); - - /** - * @return the number of filters in the referenced container - */ - public int getFilterCount(); -} diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/ISystemFilterPool.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/ISystemFilterPool.java deleted file mode 100644 index 521f1f2cb..000000000 --- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/ISystemFilterPool.java +++ /dev/null @@ -1,307 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2002, 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 - * - * 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) - cleanup - format and javadoc - * Martin Oberhuber (Wind River) - [cleanup] Add API "since" Javadoc tags - * David Dykstal (IBM) - [226561] Add API markup to RSE Javadocs where extend / implement is allowed - * David Dykstal (IBM) - [235800] Document naming restriction for profiles and filter pools - *******************************************************************************/ - -package org.eclipse.rse.core.filters; - -import org.eclipse.rse.core.model.IRSEModelObject; -import org.eclipse.rse.core.references.IRSEPersistableReferencedObject; - -/** - * This interface represents a system filter pool, which is a means of - * grouping filters to be referenced together. - * @noimplement This interface is not intended to be implemented by clients. - * The allowable implementations are already present in the framework. - */ -public interface ISystemFilterPool extends IRSEPersistableReferencedObject, ISystemFilterContainer, IRSEModelObject { - - /** - * @return the object that instantiated the filter pool manager owning this filter pool - */ - public ISystemFilterPoolManagerProvider getProvider(); - - /** - * @return true if filters in this pool support nested filters. - */ - public boolean supportsNestedFilters(); - - /** - * @return true if filters in this pool supports duplicate filter strings. - */ - public boolean supportsDuplicateFilterStrings(); - - /** - * @return true if the filters in this pool are case sensitive - */ - public boolean isStringsCaseSensitive(); - - /** - * Set the filter pool manager for this filter pool. Should only be done when the filter - * pool is created by the manager. - * @param mgr the manager of this filter pool - */ - public void setSystemFilterPoolManager(ISystemFilterPoolManager mgr); - - /** - * @return the filter pool manager managing this collection of filter pools and their filters. - */ - public ISystemFilterPoolManager getSystemFilterPoolManager(); - - /** - * Set a data object to be associated with this filter pool. This data is uninterpreted by this - * filter pool. - * @param data the data object - */ - public void setSystemFilterPoolData(Object data); - - /** - * @return the data object set using setFilterPoolData. - */ - public Object getSystemFilterPoolData(); - - /** - * Clone the attributes from this filter pool into another filter pool. - * Assumes the core attributes were already set when filter pool was created: - * <ul> - * <li>Name - * <li>Deletable - * <li>Supports nested filters - * <li>Manager - * </ul> - * Attributes we clone: - * <ul> - * <li>Data - * <li>Type - * <li>Default - * </ul> - * @param targetPool the filter pool that will receive the new attributes - */ - public void cloneSystemFilterPool(ISystemFilterPool targetPool) throws Exception; - - /** - * Copy a system filter to this or another filter pool. - * @param targetPool the receiving pool - * @param oldFilter the filter to copy - * @param newName the name which to give the new copy of the filter - * @return the newly created filter - */ - public ISystemFilter copySystemFilter(ISystemFilterPool targetPool, ISystemFilter oldFilter, String newName) throws Exception; - - /** - * Order filters according to the names in the list. Typically used to enforce - * a particular ordering in the filter list. If a name appears in this list and - * does not name a filter it is ignored. If there are filters in this pool that - * are not named in this list their order in the pool is undefined. - * @param names the names of the filters in this pool in the order they should be returned. - */ - public void orderSystemFilters(String[] names); - - /** - * @return the id of the filter pool. Used for referencing this filter pool from filter pool references. - */ - public String getId(); - - /** - * @return The value of the Name attribute - */ - public String getName(); - - /** - * Sets the filter pool name for this filter pool. - * Filter pool names must not contain 3 consecutive underscores "___" since these are used to separate - * profile names from filter pool names in a filter pool reference. - * @param value The new value of the Name attribute. - * @throws IllegalArgumentException if the name contains three consecutive underscore characters. - */ - public void setName(String value); - - /** - * @return The value of the Type attribute - * Allows tools to have typed filter pools. - * Type is not interpreted by the filter pool, but may be used by a subsystem. - */ - public String getType(); - - /** - * @param value The new value of the Type attribute - * Allows tools to have typed filter pools. - * Type is not interpreted by the filter pool, but may be used by a subsystem. - */ - public void setType(String value); - - /** - * @return The value of the SupportsNestedFilters attribute - */ - public boolean isSupportsNestedFilters(); - - /** - * @param value The new value of the SupportsNestedFilters attribute - */ - public void setSupportsNestedFilters(boolean value); - - /** - * @return The value of the Deletable attribute - */ - public boolean isDeletable(); - - /** - * @param value The new value of the Deletable attribute - */ - public void setDeletable(boolean value); - - /** - * @return The value of the Default attribute - * true if this is a vendor-supplied pool versus user-created pool - */ - public boolean isDefault(); - - /** - * @param value The new value of the Default attribute - */ - public void setDefault(boolean value); - - /** - * Sets the attribute for this filter pool that determines whether strings of - * filters contained in this pool are case sensitive or not. If not set - * this attribute is inherited from the containing filter pool manager. - * @param value The new value of the StringsCaseSensitive attribute - */ - public void setStringsCaseSensitive(boolean value); - - /** - * Unsets the StringsCaseSensitive attribute. Causes the case sensitivity of the - * filter pool to be determined by its filter pool manager. - */ - public void unsetStringsCaseSensitive(); - - /** - * @return <b>true</b> if the StringsCaseSensitive attribute has been set - */ - public boolean isSetStringsCaseSensitive(); - - /** - * Return the filters in this pool. - * - * @return An array of filters in this pool - * @since org.eclipse.rse.core 3.0 - */ - public ISystemFilter[] getFilters(); - - /** - * @return The value of the SupportsDuplicateFilterStrings attribute - */ - public boolean isSupportsDuplicateFilterStrings(); - - /** - * @param value The new value of the SupportsDuplicateFilterStrings attribute - */ - public void setSupportsDuplicateFilterStrings(boolean value); - - /** - * @return The value of the Release attribute - * The release in which this filter pool was initially created. - * Typically, will be the version and release times 10, as in 40 or 51. - */ - public int getRelease(); - - /** - * @param value The new value of the Release attribute - */ - public void setRelease(int value); - - /** - * Returns the value of the '<em><b>Single Filter String Only</b></em>' attribute. - * <p> - * If true then filters in this filter pool can have only a single filter string unless the - * filter has overriden this attribute. - * </p> - * @return the value of the '<em>Single Filter String Only</em>' attribute. - * @see #isSetSingleFilterStringOnly() - * @see #unsetSingleFilterStringOnly() - * @see #setSingleFilterStringOnly(boolean) - */ - public boolean isSingleFilterStringOnly(); - - /** - * Sets the value of the '{@link org.eclipse.rse.core.filters.ISystemFilterPool#isSingleFilterStringOnly <em>Single Filter String Only</em>}' attribute. - * If set to true filters in this filter pool can hold only a single filter string unless overridden by the filter itself. - * If false then the filter may hold more than one filter string. - * @param value the new value of the '<em>Single Filter String Only</em>' attribute. - * @see #isSetSingleFilterStringOnly() - * @see #unsetSingleFilterStringOnly() - * @see #isSingleFilterStringOnly() - */ - public void setSingleFilterStringOnly(boolean value); - - /** - * Unsets the value of the '{@link org.eclipse.rse.core.filters.ISystemFilterPool#isSingleFilterStringOnly <em>Single Filter String Only</em>}' attribute. - * Causes the value of the single filter string attribute to be inherited from the containing filter pool manager. - * @see #isSetSingleFilterStringOnly() - * @see #isSingleFilterStringOnly() - * @see #setSingleFilterStringOnly(boolean) - */ - public void unsetSingleFilterStringOnly(); - - /** - * Returns whether the value of the '{@link org.eclipse.rse.core.filters.ISystemFilterPool#isSingleFilterStringOnly <em>Single Filter String Only</em>}' attribute is set. - * This will be true if this attribute has been set for this filter pool. It will be false if this - * attribute is inherited from the filter pool manager. - * @return whether the value of the '<em>Single Filter String Only</em>' attribute is set. - * @see #unsetSingleFilterStringOnly() - * @see #isSingleFilterStringOnly() - * @see #setSingleFilterStringOnly(boolean) - */ - public boolean isSetSingleFilterStringOnly(); - - /** - * Returns the value of the '<em><b>Owning Parent Name</b></em>' attribute. - * <p> - * If the meaning of the '<em>Owning Parent Name</em>' attribute isn't clear, - * there really should be more of a description here... - * </p> - * @return the value of the '<em>Owning Parent Name</em>' attribute. - * @see #setOwningParentName(String) - */ - public String getOwningParentName(); - - /** - * Sets the value of the '{@link org.eclipse.rse.core.filters.ISystemFilterPool#getOwningParentName <em>Owning Parent Name</em>}' attribute. - * @param value the new value of the '<em>Owning Parent Name</em>' attribute. - * @see #getOwningParentName() - */ - public void setOwningParentName(String value); - - /** - * Returns the value of the '<em><b>Non Renamable</b></em>' attribute. - * <p> - * If the meaning of the '<em>Non Renamable</em>' attribute isn't clear, - * there really should be more of a description here... - * @return the value of the '<em>Non Renamable</em>' attribute. - * @see #setNonRenamable(boolean) - */ - public boolean isNonRenamable(); - - /** - * Sets the value of the '{@link org.eclipse.rse.core.filters.ISystemFilterPool#isNonRenamable <em>Non Renamable</em>}' attribute. - * @param value the new value of the '<em>Non Renamable</em>' attribute. - * @see #isNonRenamable() - */ - public void setNonRenamable(boolean value); - -} diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/ISystemFilterPoolManager.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/ISystemFilterPoolManager.java deleted file mode 100644 index 1734aa44a..000000000 --- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/ISystemFilterPoolManager.java +++ /dev/null @@ -1,642 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2002, 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 - * - * 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) - [197036] All filter pools created on clean workspace - * cleaned javadoc for renameSystemFilterPool - * David Dykstal (IBM) - [222270] clean up interfaces in org.eclipse.rse.core.filters - * Martin Oberhuber (Wind River) - [cleanup] Add API "since" Javadoc tags - * David Dykstal (IBM) - [226561] Add API markup to RSE Javadocs where extend / implement is allowed - * David Dykstal (IBM) - [235800] Document naming restriction for profiles and filter pools - *******************************************************************************/ - -package org.eclipse.rse.core.filters; - -import java.util.List; - -import org.eclipse.rse.core.model.IRSEPersistableContainer; -import org.eclipse.rse.core.model.ISystemProfile; - -/** - * A filter pool manager manages filter pools. - * <p> - * Further, this is the front door for working with filters too. By forcing all - * filter related activity through a single point like this, we can ensure that - * all changes are saved to disk, and events are fired properly. - * - * @noimplement This interface is not intended to be implemented by clients. - */ -public interface ISystemFilterPoolManager extends IRSEPersistableContainer { - // --------------------------------- - // ATTRIBUTE METHODS - // --------------------------------- - /** - * Return the caller which instantiated the filter pool manager - */ - public ISystemFilterPoolManagerProvider getProvider(); - - /** - * Return the owning profile for this provider - */ - public ISystemProfile getSystemProfile(); - - /** - * Set the caller instance which instantiated the filter pool manager. - * This is only recorded to enable getProvider from any filter framework object. - */ - public void setProvider(ISystemFilterPoolManagerProvider caller); - - /** - * This is to set transient data that is subsequently queryable. - */ - public void setSystemFilterPoolManagerData(Object data); - - /** - * Return transient data set via setFilterPoolDataManager. - */ - public Object getSystemFilterPoolManagerData(); - - /** - * Return the name of this manager. - * This matches the name of the folder, which is the parent of the individual filter pool folders. - */ - public String getName(); - - /** - * Set the name of this manager. - */ - public void setName(String name); - - /** - * Return attribute indicating if filter pools managed by this manager support nested filters. - */ - public boolean supportsNestedFilters(); - - /** - * Return attribute indicating if filters managed by this manager support nested duplicate filter strings. - */ - public boolean supportsDuplicateFilterStrings(); - - /** - * Set attribute indicating if filter pools managed by this manager support nested filters, by default. - */ - public void setSupportsNestedFilters(boolean supports); - - /** - * Set attribute indicating if filters managed by this manager support duplicate filter strings, by default. - */ - public void setSupportsDuplicateFilterStrings(boolean supports); - - /** - * @return The value of the StringsCaseSensitive attribute - * Are filter strings in this filter case sensitive? - */ - public boolean isStringsCaseSensitive(); - - /** - * @return The value of the StringsCaseSensitive attribute - * Are filter strings in this filter case sensitive? - * Same as isStringsCaseSensitive() - */ - public boolean areStringsCaseSensitive(); - - /** - * Return false if the instantiation of this filter pool manager resulting in a new manager versus a restoration - */ - public boolean wasRestored(); - - // --------------------------------- - // FILTER POOL METHODS - // --------------------------------- - /** - * Get array of filter pool names currently existing. - */ - public String[] getSystemFilterPoolNames(); - - /** - * Return array of SystemFilterPools managed by this manager. - */ - public ISystemFilterPool[] getSystemFilterPools(); - - /** - * Given a filter pool name, return that filter pool object. - * If not found, returns null. - */ - public ISystemFilterPool getSystemFilterPool(String name); - - /** - * Return the first pool that has the default attribute set to true. - * If none found, returns null. - */ - public ISystemFilterPool getFirstDefaultSystemFilterPool(); - - /** - * Create a new filter pool. - * Inherits the following attributes from this manager: - * <ul> - * <li>data ... the transient data to be associated with every filter pool and filter - * <li>supportsNestedFilters ... whether filters in the pool can themselves contain filters - * </ul> - * <p> - * If a pool of this name already exists, null will be returned. - * <p> - * Depending on the save policy, a new folder to hold the pool may be created. Its name will - * be derived from the pool name. - * <p> - * If the operation is successful, the pool will be saved to disk. - * <p> - * If this operation fails unexpectedly, an exception will be thrown. - * @see ISystemFilterPool#setName(String) - */ - public ISystemFilterPool createSystemFilterPool(String name, boolean isDeletable) throws Exception; - - /** - * Delete a given filter pool. Dependending on the save policy, the - * appropriate file or folder on disk will also be deleted. - * <p> - * Does the following: - * <ul> - * <li>Removes all references - * <li>Removes pool object from in-memory model - * <li>Removes folder from disk for policies of one folder per pool - * <li>Removes file from disk for policy of one file per pool - * <li>Saves model to disk for policy of one file per manager - * <li>Invalidates in-memory caches - * <li>Calls back to inform caller of this event - * </ul> - * @param pool The filter pool object to physically delete - */ - public void deleteSystemFilterPool(ISystemFilterPool pool) throws Exception; - - /** - * Delete all existing filter pools. Call this when you are about to delete this manager, say. - */ - public void deleteAllSystemFilterPools(); - - /** - * Pre-test if we are going to run into any trouble renaming any of the files or folders - * used to persist a filter pool. - * @return true if everything seems ok, false if a file/folder is in use. - */ - public boolean preTestRenameFilterPool(ISystemFilterPool pool) throws Exception; - - /** - * Rename a filter pool. - * <ul> - * <li>Renames pool object - * <li>Informs any filter pool references to this pool - * <li>Schedules a save of the pool object - * </ul> - * @param pool The filter pool object to rename - * @param newName The new name to give the pool - * @see ISystemFilterPool#setName(String) - */ - public void renameSystemFilterPool(ISystemFilterPool pool, String newName) throws Exception; - - /** - * Copy the specified filter pool from this manager to this manager or another manager. - * <p> - * Does the following: - * <ul> - * <li>Clones all filters within the pool - * <li>Clones all filter strings within each filter - * <li>Asks target manager to save to disk - * <li>Calls back to target manager provider, unless callbacks are suspended - * </ul> - * @param targetMgr The target manager to copy our filter pool to. Can be this manager, but target pool name must be unique. - * @param pool The filter pool to copy - * @param newName The new name to give the copied pool - * @return the new copy of the copied system filter pool - * @see ISystemFilterPool#setName(String) - */ - public ISystemFilterPool copySystemFilterPool(ISystemFilterPoolManager targetMgr, ISystemFilterPool pool, String newName) throws Exception; - - /** - * Copy all filter pools from this manager to another manager. - * <p> - * Does the following: - * <ul> - * <li>Clones all filter pools - * <li>Clones all filters within each pool - * <li>Clones all filter strings within each filter - * <li>Asks target manager to save to disk - * <li>Does not callback to caller to fire events, assumes caller doesn't want to know - * </ul> - * @param targetMgr The target manager to copy our filter pools to - */ - public void copySystemFilterPools(ISystemFilterPoolManager targetMgr) throws Exception; - - /** - * Move the specified filter pool from this manager to another manager. - * <p> - * Does the following: - * <ul> - * <li>Performs a {@link #copySystemFilterPool(ISystemFilterPoolManager, ISystemFilterPool, String) copySystemFilterPool} operation. - * <li>If copy is successful, updates all references to reference the new copy. - * <li>If copy is successful, deletes original filter pool in this manager - * <li>If this final delete fails, deletes the copied version and restore original references - * <li>Asks target manager to save to disk - * <li>Saves this manager to disk - * <li>Calls back to both targer manager provider and this manager provider, unless callbacks are suspended - * </ul> - * @param targetMgr The target manager to move our filter pool to. Cannot be this manager. - * @param oldPool The filter pool to move - * @param newName The new name to give the moved pool - * @return the new copy of the moved system filter pool - * @see ISystemFilterPool#setName(String) - */ - public ISystemFilterPool moveSystemFilterPool(ISystemFilterPoolManager targetMgr, ISystemFilterPool oldPool, String newName) throws Exception; - - // --------------------------------- - // FILTER METHODS - // --------------------------------- - /** - * Creates a new system filter within the given filter container (either a - * filter pool, or a filter). This creates the filter, and then saves the - * filter pool. - * <p> - * Calls back to provider to inform of the event (filterEventFilterCreated) - * - * @param parent The parent which is either a SystemFilterPool or a - * SystemFilter - * @param aliasName The name to give the new filter. Must be unique for this - * pool. - * @param filterStrings The list of String objects that represent the filter - * strings. - * @since org.eclipse.rse.core 3.0 - */ - public ISystemFilter createSystemFilter(ISystemFilterContainer parent, String aliasName, String[] filterStrings) throws Exception; - - /** - * Creates a new system filter within the given filter container (either a - * filter pool, or a filter). This creates the filter, and then saves the - * filter pool. - * <p> - * Calls back to provider to inform of the event (filterEventFilterCreated) - * - * @param parent The parent which is either a SystemFilterPool or a - * SystemFilter - * @param aliasName The name to give the new filter. Must be unique for this - * pool. - * @param filterStrings The list of String objects that represent the filter - * strings. - * @since org.eclipse.rse.core 3.0 - */ - public ISystemFilter createSystemFilter(ISystemFilterContainer parent, String aliasName, List filterStrings) throws Exception; - - /** - * Creates a new system filter that is typed. Same as - * {@link #createSystemFilter(ISystemFilterContainer, String, String[])} but - * takes a filter type as an additional parameter. - * <p> - * A filter's type is an arbitrary string that is not interpreted or used by - * the base framework. This is for use entirely by tools who wish to support - * multiple types of filters and be able to launch unique actions per type, - * say. - * - * @param parent The parent which is either a SystemFilterPool or a - * SystemFilter - * @param aliasName The name to give the new filter. Must be unique for this - * pool. - * @param filterStrings The list of String objects that represent the filter - * strings. - * @param type The type of this filter - * @since org.eclipse.rse.core 3.0 - */ - public ISystemFilter createSystemFilter(ISystemFilterContainer parent, String aliasName, String[] filterStrings, String type) throws Exception; - - /** - * Creates a new system filter that is typed. Same as - * {@link #createSystemFilter(ISystemFilterContainer, String, String[])} but - * takes a filter type as an additional parameter. - * <p> - * A filter's type is an arbitrary string that is not interpreted or used by - * the base framework. This is for use entirely by tools who wish to support - * multiple types of filters and be able to launch unique actions per type, - * say. - * - * @param parent The parent which is either a SystemFilterPool or a - * SystemFilter - * @param aliasName The name to give the new filter. Must be unique for this - * pool. - * @param filterStrings The list of String objects that represent the filter - * strings. - * @param type The type of this filter - * @since org.eclipse.rse.core 3.0 - */ - public ISystemFilter createSystemFilter(ISystemFilterContainer parent, String aliasName, List filterStrings, String type) throws Exception; - - /** - * Creates a new system filter that is typed and promptable Same as - * {@link #createSystemFilter(ISystemFilterContainer, String ,String[], String)} - * but takes a boolean indicating if it is promptable. - * <p> - * A promptable filter is one in which the user is prompted for information - * at expand time. There is no base filter framework support for this, but - * tools can query this attribute and do their own thing at expand time. - * - * @param parent The parent which is either a SystemFilterPool or a - * SystemFilter - * @param aliasName The name to give the new filter. Must be unique for this - * pool. - * @param filterStrings The list of String objects that represent the filter - * strings. - * @param type The type of this filter - * @param promptable Pass true if this is a promptable filter - * @since org.eclipse.rse.core 3.0 - */ - public ISystemFilter createSystemFilter(ISystemFilterContainer parent, String aliasName, String[] filterStrings, String type, boolean promptable) throws Exception; - - /** - * Creates a new system filter that is typed and promptable Same as - * {@link #createSystemFilter(ISystemFilterContainer, String ,String[], String)} - * but takes a boolean indicating if it is promptable. - * <p> - * A promptable filter is one in which the user is prompted for information - * at expand time. There is no base filter framework support for this, but - * tools can query this attribute and do their own thing at expand time. - * - * @param parent The parent which is either a SystemFilterPool or a - * SystemFilter - * @param aliasName The name to give the new filter. Must be unique for this - * pool. - * @param filterStrings The list of String objects that represent the filter - * strings. - * @param type The type of this filter - * @param promptable Pass true if this is a promptable filter - * @since org.eclipse.rse.core 3.0 - */ - public ISystemFilter createSystemFilter(ISystemFilterContainer parent, String aliasName, List filterStrings, String type, boolean promptable) throws Exception; - - /** - * Delete an existing system filter. - * Does the following: - * <ul> - * <li>Removes filter from its parent in memory. - * <li>If appropriate for the save policy, deletes the filter's file from disk. - * <li>Save the SystemFilterPool which direct or indirectly contains the filter. - * <li>Calls back to provider to inform of the event (filterEventFilterDelete) - * </ul> - */ - public boolean deleteSystemFilter(ISystemFilter filter) throws Exception; - - /** - * Renames a filter. This is better than filter.setName(String newName) as it - * saves the parent pool to disk. - * <p> - * Does the following: - * <ul> - * <li>Renames the object in the in-memory cache - * <li>If appropriate for the save policy, rename's the filter's file on disk. - * <li>Save parent filter pool's in-memory object to disk. - * <li>Calls back to provider to inform of the event (filterEventFilterRenamed) - * </ul> - */ - public void renameSystemFilter(ISystemFilter filter, String newName) throws Exception; - - /** - * Updates a filter. This is better than doing it directly as it saves it to disk. - * <p> - * Does the following: - * <ul> - * <li>Updates the object in the in-memory cache - * <li>Save parent filter pool's in-memory object to disk. - * <li>Calls back to provider to inform of the event (filterEventFilterUpdated). Will be two callbacks if the name is changed ((filterEventFilterRenamed) - * </ul> - */ - public void updateSystemFilter(ISystemFilter filter, String newName, String[] strings) throws Exception; - - /** - * Sets a filter's type. This is better than calling filter.setType(String) directly as it saves the filter to disk after. - * <p> - * A filter's type is an arbitrary string that is not interpreted or used by the base framework. This - * is for use entirely by tools who wish to support multiple types of filters and be able to launch unique - * actions per type, say. - * @param filter The parent which is either a SystemFilter - * @param newType The type of this filter - */ - public void setSystemFilterType(ISystemFilter filter, String newType) throws Exception; - - /** - * Copy a system filter to a pool in this or another filter manager. - */ - public ISystemFilter copySystemFilter(ISystemFilterPool targetPool, ISystemFilter oldFilter, String newName) throws Exception; - - /** - * Return the zero-based position of a SystemFilter object within its container - */ - public int getSystemFilterPosition(ISystemFilter filter); - - /** - * Move a system filter to a pool in this or another filter manager. - * Does this by first copying the filter, and only if successful, deleting the old copy. - */ - public ISystemFilter moveSystemFilter(ISystemFilterPool targetPool, ISystemFilter oldFilter, String newName) throws Exception; - - /** - * Move existing filters a given number of positions in the same container. - * If the delta is negative, they are all moved up by the given amount. If - * positive, they are all moved down by the given amount.<p> - * <p> - * Does the following: - * <ul> - * <li>After the move, the pool containing the filter is saved to disk. - * <li>Calls back to provider to inform of the event (filterEventFiltersRePositioned) - * </ul> - * @param filters Array of SystemFilters to move. - * @param delta the amount by which to move the filters - */ - public void moveSystemFilters(ISystemFilter filters[], int delta) throws Exception; - - /** - * Order filters according to user preferences. - * <p> - * While the framework has all the code necessary to arrange filters and save/restore - * that arrangement, you may choose to use preferences instead of this support. - * In this case, call this method and pass in the saved and sorted filter name list. - * <p> - * Called by someone after restore. - */ - public void orderSystemFilters(ISystemFilterPool pool, String[] names) throws Exception; - - // ------------------------------- - // SYSTEM FILTER STRING METHODS... - // ------------------------------- - /** - * Append a new filter string to the given filter's list - * <p> - * Does the following: - * <ul> - * <li>Adds the filter string to the in-memory cache - * <li>Saves parent filter pool to disk. - * <li>Calls back to provider to inform it of this event (filterEventFilterStringCreated) - * </ul> - */ - public ISystemFilterString addSystemFilterString(ISystemFilter filter, String newString) throws Exception; - - /** - * Insert a new filter string to the given filter's list, at the given zero-based position - * <p> - * Does the following: - * <ul> - * <li>Adds the filter string to the in-memory cache - * <li>Saves parent filter pool to disk. - * <li>Calls back to provider to inform it of this event (filterEventFilterStringCreated) - * </ul> - */ - public ISystemFilterString addSystemFilterString(ISystemFilter filter, String newString, int position) throws Exception; - - /** - * Remove a filter string from this filter's list, given its SystemFilterString object. - * <p> - * Does the following: - * <ul> - * <li>Removes the filter string from the in-memory cache - * <li>Saves parent filter pool to disk. - * <li>Calls back to provider to inform it of this event (filterEventFilterStringDeleted) - * </ul> - * @return true if the given string existed and hence was deleted. - */ - public boolean removeSystemFilterString(ISystemFilter filter, ISystemFilterString filterString) throws Exception; - - /** - * Delete a filter string from the given filter's list - * <p> - * Does the following: - * <ul> - * <li>Removes the filter string from the in-memory cache - * <li>Saves parent filter pool to disk. - * <li>Calls back to provider to inform it of this event (filterEventFilterStringDeleted) - * </ul> - * @return true if given string was found and hence was deleted. - */ - public boolean removeSystemFilterString(ISystemFilter filter, String oldString) throws Exception; - - /** - * Remove a filter string from the given filter's list, given its zero-based position - * <p> - * Does the following: - * <ul> - * <li>Removes the filter string from the in-memory cache - * <li>Saves parent filter pool to disk. - * <li>Calls back to provider to inform it of this event (filterEventFilterStringDeleted) - * </ul> - * @return true if a string existed at the given position and hence was deleted. - */ - public boolean removeSystemFilterString(ISystemFilter filter, int position) throws Exception; - - /** - * Update a filter string's string vale - * <p> - * Does the following: - * <ul> - * <li>Update the filter string in the in-memory cache - * <li>Saves parent filter pool to disk. - * <li>Calls back to provider to inform it of this event (filterEventFilterStringUpdated) - * </ul> - */ - public void updateSystemFilterString(ISystemFilterString filterString, String newValue) throws Exception; - - /** - * Return the zero-based position of a SystemFilterString object within its filter - */ - public int getSystemFilterStringPosition(ISystemFilterString filterString); - - /** - * Copy a system filter string to a filter in this or another filter pool manager. - */ - public ISystemFilterString copySystemFilterString(ISystemFilter targetFilter, ISystemFilterString oldFilterString) throws Exception; - - /** - * Move a system filter string to a filter in this or another filter pool manager. - * Does this by doing a copy operation, then if successful doing a delete operation. - */ - public ISystemFilterString moveSystemFilterString(ISystemFilter targetFilter, ISystemFilterString oldFilterString) throws Exception; - - /** - * Move existing filter strings a given number of positions in the same filter - * If the delta is negative, they are all moved up by the given amount. If - * positive, they are all moved down by the given amount.<p> - * <p> - * Does the following: - * <ul> - * <li>After the move, the filter pool containing the filter containing the filter strings is saved to disk. - * <li>Calls back to provider to inform of the event (filterEventFilterStringsRePositioned) - * </ul> - * @param filterStrings Array of SystemFilterStrings to move. - * @param delta the amount by which to move the filters - */ - public void moveSystemFilterStrings(ISystemFilterString filterStrings[], int delta) throws Exception; - - // ----------------------------------- - // SUSPEND/RESUME CALLBACKS METHODS... - // ----------------------------------- - /** - * Suspend callbacks to the provider - */ - public void suspendCallbacks(boolean suspend); - - /** - * @generated This field/method will be replaced during code generation - * @return The value of the SupportsNestedFilters attribute - */ - boolean isSupportsNestedFilters(); - - /** - * @generated This field/method will be replaced during code generation - * @param value The new value of the StringsCaseSensitive attribute - */ - void setStringsCaseSensitive(boolean value); - - /** - * @generated This field/method will be replaced during code generation - * @return The value of the SupportsDuplicateFilterStrings attribute - */ - boolean isSupportsDuplicateFilterStrings(); - - /** - * @generated This field/method will be replaced during code generation - * Unsets the SupportsDuplicateFilterStrings attribute - */ - void unsetSupportsDuplicateFilterStrings(); - - /** - * @generated This field/method will be replaced during code generation - * @return <b>true</b> if the SupportsDuplicateFilterStrings attribute has been set - */ - boolean isSetSupportsDuplicateFilterStrings(); - - /** - * Returns the value of the '<em><b>Single Filter String Only</b></em>' attribute. - * <!-- begin-user-doc --> - * <p> - * If the meaning of the '<em>Single Filter String Only</em>' attribute isn't clear, - * there really should be more of a description here... - * </p> - * <!-- end-user-doc --> - * @return the value of the '<em>Single Filter String Only</em>' attribute. - * @see #setSingleFilterStringOnly(boolean) - */ - boolean isSingleFilterStringOnly(); - - /** - * Sets the value of the '{@link org.eclipse.rse.core.filters.ISystemFilterPoolManager#isSingleFilterStringOnly <em>Single Filter String Only</em>}' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @param value the new value of the '<em>Single Filter String Only</em>' attribute. - * @see #isSingleFilterStringOnly() - * @generated - */ - void setSingleFilterStringOnly(boolean value); - -} diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/ISystemFilterPoolManagerProvider.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/ISystemFilterPoolManagerProvider.java deleted file mode 100644 index 4965bdf03..000000000 --- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/ISystemFilterPoolManagerProvider.java +++ /dev/null @@ -1,146 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2002, 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 - * - * 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) - [226561] Add API markup to RSE Javadocs where extend / implement is allowed - *******************************************************************************/ - -package org.eclipse.rse.core.filters; - -import org.eclipse.core.runtime.IAdaptable; - -/** - * An interface for classes that instantiate SystemFilterPoolManager objects. - * This is the "caller" and as is recorded and recoverable from any object within - * the filter framework. This enables callers to get back instances of themselves - * given any filter object. Important when enabling UI actions against user - * selected filter framework objects - * <p> - * Further, the goal is the allow all the filter framework UI actions to work - * independently, able to fully handle all actions without intervention on the - * provider's part. However, often the provider needs to be informed of all events - * in order to fire events to update its GUI. So this interface captures those - * callbacks that done to the provider for every interesting event. Should you - * not care about these, supply empty shells for these methods. - * @noimplement This interface is not intended to be implemented by clients. - */ -public interface ISystemFilterPoolManagerProvider extends IAdaptable { - - /** - * Return the unique id for this provider - * @return the id - */ - public String getId(); - - /** - * Return the manager object for the given manager name. - */ - public ISystemFilterPoolManager getSystemFilterPoolManager(String managerName); - - /** - * Return all the manager objects this provider owns - */ - public ISystemFilterPoolManager[] getSystemFilterPoolManagers(); - - /** - * Return all the manager objects this provider owns, to which it wants - * to support referencing from the given filter reference manager. - * <p> - * Called by SystemFilterPoolReferenceManager. - */ - public ISystemFilterPoolManager[] getReferencableSystemFilterPoolManagers(ISystemFilterPoolReferenceManager refMgr); - - /** - * Last chance call, by a filter pool reference manager, when a reference to a filter - * pool is found but the referenced master filter pool is not found in those the reference - * manager by getSystemFilterPoolManagers(). - * <p> - * If this returns null, then this broken reference will be deleted - */ - public ISystemFilterPool getSystemFilterPoolForBrokenReference(ISystemFilterPoolReferenceManager callingRefenceMgr, String missingPoolMgrName, String missingPoolName); - - // --------------------- - // FILTER POOL EVENTS... - // --------------------- - /** - * A new filter pool has been created - */ - public void filterEventFilterPoolCreated(ISystemFilterPool newPool); - - /** - * A filter pool has been deleted - */ - public void filterEventFilterPoolDeleted(ISystemFilterPool oldPool); - - /** - * A filter pool has been renamed - */ - public void filterEventFilterPoolRenamed(ISystemFilterPool pool, String oldName); - - /** - * One or more filter pools have been re-ordered within their manager - */ - public void filterEventFilterPoolsRePositioned(ISystemFilterPool[] pools, int delta); - - // --------------------- - // FILTER EVENTS... - // --------------------- - /** - * A new filter has been created - */ - public void filterEventFilterCreated(ISystemFilter newFilter); - - /** - * A filter has been deleted - */ - public void filterEventFilterDeleted(ISystemFilter oldFilter); - - /** - * A filter has been renamed - */ - public void filterEventFilterRenamed(ISystemFilter filter, String oldName); - - /** - * A filter's strings have been updated - */ - public void filterEventFilterUpdated(ISystemFilter filter); - - /** - * One or more filters have been re-ordered within their pool or filter (if nested) - */ - public void filterEventFiltersRePositioned(ISystemFilter[] filters, int delta); - - // ----------------------- - // FILTER STRING EVENTS... - // ----------------------- - /** - * A new filter string has been created - */ - public void filterEventFilterStringCreated(ISystemFilterString newFilterString); - - /** - * A filter string has been deleted - */ - public void filterEventFilterStringDeleted(ISystemFilterString oldFilterString); - - /** - * A filter string has been updated - */ - public void filterEventFilterStringUpdated(ISystemFilterString filterString); - - /** - * One or more filters have been re-ordered within their filter - */ - public void filterEventFilterStringsRePositioned(ISystemFilterString[] filterStrings, int delta); - -} diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/ISystemFilterPoolReference.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/ISystemFilterPoolReference.java deleted file mode 100644 index 08bef1567..000000000 --- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/ISystemFilterPoolReference.java +++ /dev/null @@ -1,78 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2002, 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 - * - * 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) - [226561] Add API markup to RSE Javadocs where extend / implement is allowed - *******************************************************************************/ - -package org.eclipse.rse.core.filters; - -import org.eclipse.rse.core.model.IRSEModelObject; -import org.eclipse.rse.core.references.IRSEPersistableReferencingObject; - -/** - * Interface implemented by references to filter pools. Filter pools are stored at the profile - * level, while subsystems contain references to one or more pools. A pool can be referenced - * by multiple connections. Pools don't go away until explicitly deleted by the user, regardless - * of their reference count. - * @noimplement This interface is not intended to be implemented by clients. - * The allowable implementations are already present in the framework. - */ -public interface ISystemFilterPoolReference extends IRSEPersistableReferencingObject, ISystemFilterContainerReference, IRSEModelObject { - /** - * @return the reference manager which is managing this filter pool reference - */ - public ISystemFilterPoolReferenceManager getFilterPoolReferenceManager(); - - /** - * @return the object which instantiated the pool reference manager object. - * Makes it easy to get back to the point of origin, given any filter pool reference. - */ - public ISystemFilterPoolReferenceManagerProvider getProvider(); - - /** - * @return the simple name of the filter pool we reference. Not qualified by the manager name. - */ - public String getReferencedFilterPoolName(); - - /** - * @return name of the filter pool manager containing the pool we reference. - */ - public String getReferencedFilterPoolManagerName(); - - /** - * Reset the name of the filter pool we reference. - * Called on filter pool rename operations. - * @param newName the new name of the filer pool - */ - public void resetReferencedFilterPoolName(String newName); - - /** - * Set the filter pool that we reference. - * This should also call addReference(this) on that pool. - * @param pool the pool to which this reference refers. - */ - public void setReferenceToFilterPool(ISystemFilterPool pool); - - /** - * @return referenced filter pool object. - * This may be null if the reference is broken - * or is yet to be resolved. - */ - public ISystemFilterPool getReferencedFilterPool(); - - /** - * @return the fully qualified name that includes the name of the filter pool manager - */ - public String getFullName(); -}
\ No newline at end of file diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/ISystemFilterPoolReferenceManager.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/ISystemFilterPoolReferenceManager.java deleted file mode 100644 index e1a69ad49..000000000 --- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/ISystemFilterPoolReferenceManager.java +++ /dev/null @@ -1,257 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2002, 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 - * - * 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) - [226561] Add API markup to RSE Javadocs where extend / implement is allowed - *******************************************************************************/ - -package org.eclipse.rse.core.filters; - -import org.eclipse.rse.core.references.IRSEBasePersistableReferenceManager; -import org.eclipse.rse.core.subsystems.ISubSystem; - -/** - * This class manages a persistable list of objects each of which reference - * a filter pool. This class builds on the parent class SystemPersistableReferenceManager, - * offering convenience versions of the parent methods that are typed to the - * classes in the filters framework. - * @noimplement This interface is not intended to be implemented by clients. - * The allowable implementations are already present in the framework. - */ -public interface ISystemFilterPoolReferenceManager extends IRSEBasePersistableReferenceManager { - /** - * Get the object which instantiated this instance of the filter pool reference manager. - * This is also available from any filter reference framework object. - */ - public ISystemFilterPoolReferenceManagerProvider getProvider(); - - /** - * Set the object which instantiated this instance of the filter pool reference manager. - * This makes it available to retrieve from any filter reference framework object, - * via the ubiquitous getProvider interface method. - */ - public void setProvider(ISystemFilterPoolReferenceManagerProvider caller); - - /** - * Turn off callbacks to the provider until turned on again. - */ - public void setProviderEventNotification(boolean fireEvents); - - // ------------------------------------------------------------ - // Methods for setting and querying related filterpool manager - // ------------------------------------------------------------ - /* - * Set the managers of the master list of filter pools, from which - * objects in this list reference. - * NOW DELETED SO THAT WE DYNAMICALLY QUERY THIS LIST FROM THE - * ASSOCIATED SYSTEMFILTERPOOLMANAGER PROVIDER, SO IT IS ALWAYS UP - * TO DATE. psc. - */ - //public void setSystemFilterPoolManagers(SystemFilterPoolManager[] mgrs); - /** - * Set the associated master pool manager provider. Note the provider - * typically manages multiple pool managers and we manage references - * across those. - */ - public void setSystemFilterPoolManagerProvider(ISystemFilterPoolManagerProvider poolMgrProvider); - - /** - * Get the associated master pool manager provider. Note the provider - * typically manages multiple pool managers and we manage references - * across those. - */ - public ISystemFilterPoolManagerProvider getSystemFilterPoolManagerProvider(); - - /** - * Get the managers of the master list of filter pools, from which - * objects in this list reference. - */ - public ISystemFilterPoolManager[] getSystemFilterPoolManagers(); - - /** - * Get the managers of the master list of filter pools, from which - * objects in this list reference, but which are not in the list of - * managers our pool manager supplier gives us. That is, these are - * references to filter pools outside the expected list. - * @return null if no unmatched managers found, else an array of such managers. - */ - public ISystemFilterPoolManager[] getAdditionalSystemFilterPoolManagers(); - - /** - * Set the default manager of the master list of filter pools, from which - * objects in this list reference. - */ - public void setDefaultSystemFilterPoolManager(ISystemFilterPoolManager mgr); - - /** - * Get the default manager of the master list of filter pools, from which - * objects in this list reference. - */ - public ISystemFilterPoolManager getDefaultSystemFilterPoolManager(); - - // --------------------------------------------------- - // Methods that work on FilterPool referencing objects - // --------------------------------------------------- - /** - * Ask each referenced pool for its name, and update it. - * Called after the name of the pool or its manager changes. - */ - public void regenerateReferencedSystemFilterPoolNames(); - - /** - * Return array of SystemFilterPoolReference objects. - * Result will never be null, although it may be an array of length zero. - */ - public ISystemFilterPoolReference[] getSystemFilterPoolReferences(); - - /** - * In one shot, set the filter pool references - * <p> Calls back to inform provider - * @param filterPoolReferences of filter pool reference objects to set the list to. - * @param deReference true to first de-reference all objects in the existing list. - */ - public void setSystemFilterPoolReferences(ISystemFilterPoolReference[] filterPoolReferences, boolean deReference); - - /** - * Add a filter pool referencing object to the list. - * @return the new count of referencing objects - */ - public int addSystemFilterPoolReference(ISystemFilterPoolReference filterPoolReference); - - /** - * Reset the filter pool a reference points to. Called on a move-filter-pool operation - */ - public void resetSystemFilterPoolReference(ISystemFilterPoolReference filterPoolReference, ISystemFilterPool newPool); - - /** - * Remove a filter pool referencing object from the list. - * @param filterPoolReference the reference to remove - * @param deReference true if we want to dereference the referenced object (call removeReference on it) - * @return the new count of referencing objects - */ - public int removeSystemFilterPoolReference(ISystemFilterPoolReference filterPoolReference, boolean deReference); - - /** - * Return count of referenced filter pools - */ - public int getSystemFilterPoolReferenceCount(); - - /** - * Return the zero-based position of a SystemFilterPoolReference object within this list - */ - public int getSystemFilterPoolReferencePosition(ISystemFilterPoolReference filterPoolRef); - - /** - * Move a given filter pool reference to a given zero-based location - * <p> Calls back to inform provider - */ - public void moveSystemFilterPoolReference(ISystemFilterPoolReference filterPoolRef, int pos); - - /** - * Move existing filter pool references a given number of positions. - * If the delta is negative, they are all moved up by the given amount. If - * positive, they are all moved down by the given amount.<p> - * <p> Calls back to inform provider - * @param filterPoolRefs Array of SystemFilterPoolReferences to move. - * @param delta the amount by which to move the filter pool references. - */ - public void moveSystemFilterPoolReferences(ISystemFilterPoolReference[] filterPoolRefs, int delta); - - // ---------------------------------------------- - // Methods that work on FilterPool master objects - // ---------------------------------------------- - /** - * Return array of filter pools currently referenced by this manager - * Result will never be null, although it may be an array of length zero. - */ - public ISystemFilterPool[] getReferencedSystemFilterPools(); - - /** - * Return true if the given filter pool has a referencing object in this list. - */ - public boolean isSystemFilterPoolReferenced(ISystemFilterPool filterPool); - - /** - * Given a filter pool, locate the referencing object for it and return it. - * @return the referencing object if found, else null - */ - public ISystemFilterPoolReference getReferenceToSystemFilterPool(ISystemFilterPool filterPool); - - /** - * Given a filter pool, create a referencing object and add it to the list. - * <p> Calls back to inform provider - * @return new filter pool reference - */ - public ISystemFilterPoolReference addReferenceToSystemFilterPool(ISystemFilterPool filterPool); - - /** - * Given a filter pool name, create a referencing object and add it to the list. - * This creates an unresolved reference to that filter pool. It will be resolved on first use. - * <p> Calls back to inform provider - * @param filterPoolName the name of the filter pool being referenced. - * @return new filter pool reference - */ - public ISystemFilterPoolReference addReferenceToSystemFilterPool(String filterPoolName); - - /** - * Given a filter pool, locate the referencing object for it and remove it from the list. - * <p> Calls back to inform provider - * @return the new count of referencing objects - */ - public int removeReferenceToSystemFilterPool(ISystemFilterPool filterPool); - - /** - * A reference filter pool has been renamed. Update our stored name... - * <p> Calls back to inform provider - */ - public void renameReferenceToSystemFilterPool(ISystemFilterPool pool); - - /** - * In one shot, set the filter pool references to new references to supplied filter pools. - * <p> Calls back to inform provider - * @param filterPools of filter pool objects to create references for - * @param deReference true to first de-reference all objects in the existing list. - */ - public void setSystemFilterPoolReferences(ISystemFilterPool[] filterPools, boolean deReference); - - // ------------------------- - // SPECIAL CASE METHODS - // ------------------------- - /** - * Create a single filter refererence to a given filter. Needed when a filter - * is added to a pool, and the GUI is not showing pools but rather all filters - * in all pool references. - */ - public ISystemFilterReference getSystemFilterReference(ISubSystem subSystem, ISystemFilter filter); - - /** - * Concatenate all filter references from all filter pools we reference, into one - * big list. - */ - public ISystemFilterReference[] getSystemFilterReferences(ISubSystem subSystem); - - /** - * Given a filter reference, return its position within this reference manager - * when you think of all filter references from all filter pool references as - * being concatenated - */ - public int getSystemFilterReferencePosition(ISystemFilterReference filterRef); - - /** - * Given a filter, return its position within this reference manager - * when you think of all filter references from all filter pool references as - * being concatenated - */ - public int getSystemFilterReferencePosition(ISubSystem subSystem, ISystemFilter filter); - -} diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/ISystemFilterPoolReferenceManagerProvider.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/ISystemFilterPoolReferenceManagerProvider.java deleted file mode 100644 index b5471a456..000000000 --- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/ISystemFilterPoolReferenceManagerProvider.java +++ /dev/null @@ -1,105 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2002, 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 - * - * 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) - [226561] Add API markup to RSE Javadocs where extend / implement is allowed - *******************************************************************************/ - -package org.eclipse.rse.core.filters; - -/** - * An interface for classes that instantiate SystemFilterPoolReferenceManager objects. - * This is the "caller" and as is recorded and recoverable from any object within - * the filter reference framework. This enables callers to get back instances of themselves - * given any filter reference object. Important when enabling UI actions against user - * selected filter reference framework objects - * <p> - * Further, the goal is the allow all the filter framework UI actions to work - * independently, able to fully handle all actions without intervention on the - * provider's part. However, often the provider needs to be informed of all events - * in order to fire events to update its GUI. So this interface captures those - * callbacks that done to the provider for every interesting event. Should you - * not care about these, supply empty shells for these methods. - * @noimplement This interface is not intended to be implemented by clients. - * The allowable implementations are already present in the framework. - */ -public interface ISystemFilterPoolReferenceManagerProvider { - /** - * Return the SystemFilterPoolReferenceManager object this provider holds/provides. - */ - public ISystemFilterPoolReferenceManager getSystemFilterPoolReferenceManager(); - - /** - * Return the owning filter pool that is unique to this provider - */ - public ISystemFilterPool getUniqueOwningSystemFilterPool(boolean createIfNotFound); - - // ------------------------------- - // FILTER POOL REFERENCE EVENTS... - // ------------------------------- - /** - * A new filter pool reference has been created - */ - public void filterEventFilterPoolReferenceCreated(ISystemFilterPoolReference newPoolRef); - - /** - * A filter pool reference has been deleted - */ - public void filterEventFilterPoolReferenceDeleted(ISystemFilterPoolReference filterPoolRef); - - /** - * A single filter pool reference has been reset to reference a new pool - */ - public void filterEventFilterPoolReferenceReset(ISystemFilterPoolReference filterPoolRef); - - /** - * All filter pool references has been reset - */ - public void filterEventFilterPoolReferencesReset(); - - /** - * A filter pool reference has been renamed (ie, its reference filter pool renamed) - */ - public void filterEventFilterPoolReferenceRenamed(ISystemFilterPoolReference poolRef, String oldName); - - /** - * One or more filter pool references have been re-ordered within their manager - */ - public void filterEventFilterPoolReferencesRePositioned(ISystemFilterPoolReference[] poolRefs, int delta); - - // ------------------------------- - // FILTER REFERENCE EVENTS... - // ------------------------------- - /** - * A new filter has been created. This is called when a filter pool reference is selected and a new filter - * is created, so that the provider can expand the selected filter pool reference and reveal the new filter - * within the selected pool reference. - * <p> - * Only the selected node should be expanded if not already. All other references to this pool will already - * have been informed of the new addition, and will have refreshed their children but not expanded them. - */ - public void filterEventFilterCreated(Object selectedObject, ISystemFilter newFilter); - - // --------------------------------- - // FILTER STRING REFERENCE EVENTS... - // --------------------------------- - /** - * A new filter string has been created. This is called when a filter reference is selected and a new filter - * string is created, so that the provider can expand the selected filter reference and reveal the new filter - * string within the selected filter reference. - * <p> - * Only the selected node should be expanded if not already. All other references to this filter will already - * have been informed of the new addition, and will have refreshed their children but not expanded them. - */ - public void filterEventFilterStringCreated(Object selectedObject, ISystemFilterString newFilterString); -} diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/ISystemFilterPoolSelectionValidator.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/ISystemFilterPoolSelectionValidator.java deleted file mode 100644 index d47db9deb..000000000 --- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/ISystemFilterPoolSelectionValidator.java +++ /dev/null @@ -1,43 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2002, 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 - * - * 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) - [226561] Add API markup to RSE Javadocs where extend / implement is allowed - *******************************************************************************/ - -package org.eclipse.rse.core.filters; - -import org.eclipse.rse.services.clientserver.messages.SystemMessage; - -/** - * An interface required if you wish to be called back by the system filter - * wizard, when the user selects a target filter pool. - * - * @noimplement This interface is not intended to be implemented by clients. - */ -public interface ISystemFilterPoolSelectionValidator { - - /** - * Delimiter used to qualify filter names by filter pool name, when calling - * filter pool selection validator in new filter wizard. - */ - public static final String DELIMITER_FILTERPOOL_FILTER = "_____"; //$NON-NLS-1$ - - /** - * Validate the given selection. - * @param filterPool the user-selected filter pool - * @return null if no error, else a SystemMessage - */ - public SystemMessage validate(ISystemFilterPool filterPool); - -} diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/ISystemFilterPoolWrapper.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/ISystemFilterPoolWrapper.java deleted file mode 100644 index efdf03d80..000000000 --- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/ISystemFilterPoolWrapper.java +++ /dev/null @@ -1,37 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2002, 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 - * - * 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) - [226561] Add API markup to RSE Javadocs where extend / implement is allowed - *******************************************************************************/ - -package org.eclipse.rse.core.filters; - -/** - * The system filter wizard allows callers to pass a list of wrapper objects for - * the user to select a filter pool. - * - * @noimplement This interface is not intended to be implemented by clients. - */ -public interface ISystemFilterPoolWrapper { - - /** - * Get the name to display in the combo box for this wrapper - */ - public String getDisplayName(); - - /** - * Get the wrappered SystemFilterPool object - */ - public ISystemFilterPool getSystemFilterPool(); -} diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/ISystemFilterPoolWrapperInformation.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/ISystemFilterPoolWrapperInformation.java deleted file mode 100644 index ead44d69a..000000000 --- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/ISystemFilterPoolWrapperInformation.java +++ /dev/null @@ -1,69 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2002, 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 - * - * 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 McKnight (IBM) - [225506] [api][breaking] RSE UI leaks non-API types - * David Dykstal (IBM) - [226561] Add API markup to RSE Javadocs where extend / implement is allowed - *******************************************************************************/ - -package org.eclipse.rse.core.filters; - -/** - * The system filter wizard allows callers to pass a list of wrapper objects for - * the user to select a filter pool. Effectively, this prompting for euphemisms - * to filter pools. This requires an array of wrapper objects, and requires - * replacement text for the pool prompt and tooltip text, and the verbiage above - * it. - * <p> - * This is all encapsulated in this interface. There is also a class offered - * that implements all this and is populated via setters. - * - * @noimplement This interface is not intended to be implemented by clients. - */ -public interface ISystemFilterPoolWrapperInformation { - - /** - * Get the label - */ - public String getPromptLabel(); - - /** - * Get the tooltip - */ - public String getPromptTooltip(); - - public String getVerbiageLabel(); - - /** - * Get the list of wrappered filter pool objects to show in the combo. The wrappering allows - * each to be displayed with a different name in the list than just pool.getName() - */ - public ISystemFilterPoolWrapper[] getWrappers(); - - /** - * Get the wrapper to preselect in the list. - */ - public ISystemFilterPoolWrapper getPreSelectWrapper(); - - /** - * Add a wrapper object - * @since 3.0 - */ - public void addWrapper(ISystemFilterPoolWrapper wrapper); - /** - * Add a filter pool, which we will wrapper here by creating a SystemFilterPoolWrapper object for you - * @since 3.0 - */ - public void addWrapper(String displayName, ISystemFilterPool poolToWrap, boolean preSelect); - -} diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/ISystemFilterReference.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/ISystemFilterReference.java deleted file mode 100644 index 1c5b8cca8..000000000 --- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/ISystemFilterReference.java +++ /dev/null @@ -1,105 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2002, 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 - * - * 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) - [226561] Add API markup to RSE Javadocs where extend / implement is allowed - *******************************************************************************/ - -package org.eclipse.rse.core.filters; - -import org.eclipse.rse.core.model.ISystemContainer; -import org.eclipse.rse.core.model.ISystemContentsType; -import org.eclipse.rse.core.references.IRSEReferencingObject; -import org.eclipse.rse.core.subsystems.ISubSystem; - -/** - * Represents a shadow or reference to a system filter. Such references are only - * transient, not savable to disk. - * - * @noimplement This interface is not intended to be implemented by clients. The - * allowable implementations are already present in the framework. - */ -public interface ISystemFilterReference extends IRSEReferencingObject, ISystemFilterContainerReference, ISystemContainer { - /** - * Return the reference manager which is managing this filter reference - * framework object. - */ - public ISystemFilterPoolReferenceManager getFilterPoolReferenceManager(); - - /** - * Return the object which instantiated the pool reference manager object. - * Makes it easy to get back to the point of origin, given any filter reference - * framework object - */ - public ISystemFilterPoolReferenceManagerProvider getProvider(); - - /** - * Gets the subsystem that contains this reference - * @return the subsystem - */ - public ISubSystem getSubSystem(); - - /** - * Sets the subsystem that contains this reference - * @param subSystem the subsystem that holds this reference - */ - public void setSubSystem(ISubSystem subSystem); - - /** - * Return the filter to which we reference... - */ - public ISystemFilter getReferencedFilter(); - - /** - * Set the filter to which we reference... - */ - public void setReferencedFilter(ISystemFilter filter); - - /** - * Get the parent of this reference. - * It will be either a SystemFilterPoolReference, or - * a SystemFilterReference(if nested). - */ - public ISystemFilterContainerReference getParent(); - - /** - * Get parent or super parent filter pool reference. - */ - public ISystemFilterPoolReference getParentSystemFilterReferencePool(); - - // ------------------------------------------------- - // Methods for returning filter string references... - // ------------------------------------------------- - /** - * Return the number of filter strings in the referenced filter - */ - public int getSystemFilterStringCount(); - - /** - * Get the filter strings contained by this filter. But get references to each, - * not the masters. - */ - public ISystemFilterStringReference[] getSystemFilterStringReferences(); - - /** - * Create a single filter string refererence to a given filter string - */ - public ISystemFilterStringReference getSystemFilterStringReference(ISystemFilterString filterString); - - /* - * Sets the cached contents for this filter reference. If the filter changes or is refreshed, these cached - * items will be removed. - */ - public void setContents(ISystemContentsType type, Object[] cachedContents); - -} diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/ISystemFilterStartHere.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/ISystemFilterStartHere.java deleted file mode 100644 index 940fc5a1d..000000000 --- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/ISystemFilterStartHere.java +++ /dev/null @@ -1,60 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2005, 2008 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - * Martin Oberhuber (Wind River) - [cleanup] Add API "since" Javadoc tags - * David Dykstal (IBM) - [226561] Add API markup to RSE Javadocs where extend / implement is allowed - *******************************************************************************/ -package org.eclipse.rse.core.filters; - -import org.eclipse.rse.core.model.ISystemProfile; -import org.eclipse.rse.logging.Logger; - -/** - * @noimplement This interface is not intended to be implemented by clients. - * The allowable implementations are already present in the framework. - */ -public interface ISystemFilterStartHere { - - /** - * Factory to create a filter pool manager, when you do NOT want it to worry about - * saving and restoring the filter data to disk. Rather, you will save and restore - * yourself. - * @param logger A logging object into which to log errors as they happen in the framework - * @param caller Objects which instantiate this class should implement the - * SystemFilterPoolManagerProvider interface, and pass "this" for this parameter. - * Given any filter framework object, it is possible to retrieve the caller's - * object via the getProvider method call. - * @param name the name of the filter pool manager. Not currently used but you may - * find a use for it. - * @param allowNestedFilters true if filters inside filter pools in this manager are - * to allow nested filters. This is the default, but can be overridden at the - * individual filter pool level. - */ - public ISystemFilterPoolManager createSystemFilterPoolManager(ISystemProfile profile, Logger logger, ISystemFilterPoolManagerProvider caller, String name, boolean allowNestedFilters); - - /** - * Create a SystemFilterPoolReferenceManager instance, when you do NOT want - * it to be saved and restored to its own file. Rather, you will save and - * restore it yourself. - * - * @param caller Objects which instantiate this class should implement the - * SystemFilterPoolReferenceManagerProvider interface, and pass - * "this" for this parameter. Given any filter framework object, - * it is possible to retrieve the caller's object via the - * getProvider method call. - * @param relatedPoolMgrProvider The creator of the managers that own the - * master list of filter pools that this manager will contain - * references to. - * @param name the name of the filter pool reference manager. This is not - * currently used, but you may find a use for it. - * @since org.eclipse.rse.core 3.0 - */ - public ISystemFilterPoolReferenceManager createSystemFilterPoolReferenceManager(ISystemFilterPoolReferenceManagerProvider caller, ISystemFilterPoolManagerProvider relatedPoolMgrProvider, - String name); -} diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/ISystemFilterString.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/ISystemFilterString.java deleted file mode 100644 index 10362d2f8..000000000 --- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/ISystemFilterString.java +++ /dev/null @@ -1,100 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2002, 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 - * - * 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: - * Martin Oberhuber (Wind River) - Cleanup Javadoc. - * David Dykstal (IBM) - [226561] Add API markup to RSE Javadocs where extend / implement is allowed - *******************************************************************************/ - -package org.eclipse.rse.core.filters; - -import org.eclipse.core.runtime.IAdaptable; -import org.eclipse.rse.core.model.IRSEModelObject; -import org.eclipse.rse.core.references.IRSEBaseReferencedObject; - -/** - * A filter string is a pattern used by the server-side code to know what to return to - * the client. A filter contains one or more filter strings. Basically, its nothing more - * than a string, and its up to each consumer to know what to do with it. Generally, - * a filter string edit pane is designed to prompt the user for the contents of the - * string in a domain-friendly way. - * @noimplement This interface is not intended to be implemented by clients. - * The allowable implementations are already present in the framework. - */ -public interface ISystemFilterString extends IRSEBaseReferencedObject, IAdaptable, IRSEModelObject { - /** - * Return the caller which instantiated the filter pool manager overseeing this filter framework instance - */ - public ISystemFilterPoolManagerProvider getProvider(); - - /** - * Return the filter pool manager managing this collection of filter pools and their filters and their filter strings. - */ - public ISystemFilterPoolManager getSystemFilterPoolManager(); - - /** - * Set the transient parent back-pointer. Called by framework at restore/create time. - */ - public void setParentSystemFilter(ISystemFilter filter); - - /** - * Get the parent filter that contains this filter string. - */ - public ISystemFilter getParentSystemFilter(); - - /** - * Clones this filter string's attributes into the given filter string - */ - public void clone(ISystemFilterString targetString); - - /** - * Check if this filter string is changeable. - * Depends on attributes of parent filter. - */ - public boolean isChangable(); - - /** - * @return The value of the String attribute - */ - String getString(); - - /** - * @param value The new value of the String attribute - */ - void setString(String value); - - /** - * Returns the type attribute. - * Intercepted to return SystemFilterConstants.DEFAULT_TYPE if it is currently null - * Allows tools to have typed filter strings - * @return The value of the Type attribute - */ - String getType(); - - /** - * @param value The new value of the Type attribute - */ - void setType(String value); - - /** - * Check if this is a vendor-supplied filter string versus a user-defined filter string. - * @return The value of the Default attribute - */ - boolean isDefault(); - - /** - * @param value The new value of the Default attribute - */ - void setDefault(boolean value); - -} diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/ISystemFilterStringReference.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/ISystemFilterStringReference.java deleted file mode 100644 index 32770f657..000000000 --- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/ISystemFilterStringReference.java +++ /dev/null @@ -1,61 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2002, 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 - * - * 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) - [226561] Add API markup to RSE Javadocs where extend / implement is allowed - *******************************************************************************/ - -package org.eclipse.rse.core.filters; - -import org.eclipse.rse.core.references.IRSEBaseReferencingObject; - -/** - * Represents a reference to a filter string. - * Needed so the UI can show the same filter string multiple times. - * @noimplement This interface is not intended to be implemented by clients. - * The allowable implementations are already present in the framework. - */ -public interface ISystemFilterStringReference extends IRSEBaseReferencingObject { - /** - * Return the reference manager which is managing this filter reference - * framework object. - */ - public ISystemFilterPoolReferenceManager getFilterPoolReferenceManager(); - - /** - * Return the object which instantiated the pool reference manager object. - * Makes it easy to get back to the point of origin, given any filter reference - * framework object - */ - public ISystemFilterPoolReferenceManagerProvider getProvider(); - - /** - * Get the master filter string - */ - public ISystemFilterString getReferencedFilterString(); - - /** - * Get the referenced filter that contains this filter string reference. - */ - public ISystemFilterReference getParent(); - - /** - * Get the actual filter that contain the actual filter string we reference - */ - public ISystemFilter getParentSystemFilter(); - - /** - * Same as getReferencedFilterString().getString() - */ - public String getString(); -} diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/SystemFilterReference.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/SystemFilterReference.java deleted file mode 100644 index 69e807299..000000000 --- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/SystemFilterReference.java +++ /dev/null @@ -1,453 +0,0 @@ -/******************************************************************************** - * Copyright (c) 2002, 2008 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 - * - * 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) - 142806: refactoring persistence framework - * David Dykstal (IBM) - [224671] [api] org.eclipse.rse.core API leaks non-API types - * David Dykstal (IBM) - [226561] Add API markup to RSE Javadocs where extend / implement is allowed - ********************************************************************************/ - -package org.eclipse.rse.core.filters; - -import java.util.Arrays; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; - -import org.eclipse.core.runtime.IAdaptable; -import org.eclipse.core.runtime.Platform; -import org.eclipse.rse.core.model.IRSEPersistableContainer; -import org.eclipse.rse.core.model.ISystemContainer; -import org.eclipse.rse.core.model.ISystemContentsType; -import org.eclipse.rse.core.references.IRSEBaseReferencedObject; -import org.eclipse.rse.core.references.SystemReferencingObject; -import org.eclipse.rse.core.subsystems.ISubSystem; -import org.eclipse.rse.internal.core.filters.SystemFilterContainerReferenceCommonMethods; -import org.eclipse.rse.internal.core.filters.SystemFilterStringReference; - -/** - * Represents a shadow or reference to a system filter. - * Such references are only transient, not savable to disk. - * All major function is inherited. - * <p> - * SystemFilter references typically exist for only one reason: - * <ol> - * <li>As a simple shadow to enable a unique object in a GUI tree. For example, - * if it is possible for the same filter to show up in different places in - * the tree, then we must create shadows for each place it shows up. - * </ol> - * @noextend This class is not intended to be subclassed by clients. - * @noinstantiate This class is not intended to be instantiated by clients. - * Use the factory method {@link #createSystemFilterReference(ISubSystem, ISystemFilterContainerReference, ISystemFilter, boolean)}. - */ -public class SystemFilterReference extends SystemReferencingObject implements IAdaptable, ISystemFilterReference { - private SystemFilterContainerReferenceCommonMethods containerHelper = null; - private ISystemFilterContainerReference parent = null; - private ISystemFilter referencedFilter = null; - private ISystemFilterStringReference[] referencedFilterStrings = null; - protected boolean persistent; - protected boolean isStale; -// protected Object[] cachedContents; - protected ISubSystem _subSystem; - - protected HashMap cachedContents; - - public static final boolean PERSISTENT_YES = true; - public static final boolean PERSISTENT_NO = false; - - /** - * Constructor. - */ - protected SystemFilterReference() { - super(); - containerHelper = new SystemFilterContainerReferenceCommonMethods(this); - persistent = true; - isStale = true; - cachedContents = new HashMap(); - } - - /** - * Create a new instance of this class. - * @param parent The SystemFilterReference or SystemFilterPoolReference object that we are a child of. - * @param filter The master object to be referenced. - * @param persistent Whether we should formally register our reference with the target filter or not. - */ - public static ISystemFilterReference createSystemFilterReference(ISubSystem subSystem, ISystemFilterContainerReference parent, ISystemFilter filter, boolean persistent) { - SystemFilterReference newRef = new SystemFilterReference(); - newRef.persistent = persistent; - newRef.setSubSystem(subSystem); - newRef.setParent(parent); - newRef.setReferencedFilter(filter); - filter.addReference(newRef); - return newRef; - } - - /** - * Gets the subsystem that contains this reference - * @return the subsystem - */ - public ISubSystem getSubSystem() { - return _subSystem; - } - - /** - * Sets the subsystem that contains this reference - * @param subSystem the subsystem that holds this reference - */ - public void setSubSystem(ISubSystem subSystem) { - _subSystem = subSystem; - } - - /** - * Return the reference manager which is managing this filter reference - * framework object. - */ - public ISystemFilterPoolReferenceManager getFilterPoolReferenceManager() { - ISystemFilterPoolReference pool = getParentSystemFilterReferencePool(); - if (pool != null) - return pool.getFilterPoolReferenceManager(); - else - return null; - } - - /** - * Return the object which instantiated the pool reference manager object. - * Makes it easy to get back to the point of origin, given any filter reference - * framework object - */ - public ISystemFilterPoolReferenceManagerProvider getProvider() { - ISystemFilterPoolReferenceManager mgr = getFilterPoolReferenceManager(); - if (mgr != null) { - ISystemFilterPoolReferenceManagerProvider provider = mgr.getProvider(); - if (provider == null) { - provider = getSubSystem(); - } - return provider; - } else - return null; - } - - /** - * If this is a reference to a nested filter, the parent is the - * reference to the nested filter's parent. Else, it is the - * reference to the parent filter pool - */ - public void setParent(ISystemFilterContainerReference parent) { - this.parent = parent; - } - - /** - * The parent will either by a SystemFilterPoolReference or - * a SystemFilterReference. - */ - public ISystemFilterContainerReference getParent() { - return parent; - } - - /** - * Return the filter to which we reference... - */ - public ISystemFilter getReferencedFilter() { - return persistent ? (ISystemFilter) super.getReferencedObject() : referencedFilter; - } - - /** - * Set the filter to which we reference... - */ - public void setReferencedFilter(ISystemFilter filter) { - if (persistent) - super.setReferencedObject(filter); - else - referencedFilter = filter; - } - - /** - * If this is a reference to a nested filter, the parent is the - * reference to the nested filter's parent. Else, it is the - * reference to the parent filter pool - */ - public ISystemFilterPoolReference getParentSystemFilterReferencePool() { - if (parent instanceof ISystemFilterPoolReference) - return (ISystemFilterPoolReference) parent; - else - return ((ISystemFilterReference) parent).getParentSystemFilterReferencePool(); - } - - /** - * This is the method required by the IAdaptable interface. - * Given an adapter class type, return an object castable to the type, or - * null if this is not possible. - */ - public Object getAdapter(Class adapterType) { - return Platform.getAdapterManager().getAdapter(this, adapterType); - } - - // ------------------------------------------------------------- - // Methods common with SystemFilterPoolReferenceImpl, and hence - // abstracted out into SystemFilterContainerReference... - // ------------------------------------------------------------- - /** - * Return the object to which we hold a reference. This is either - * SystemFilter or SystemFilterPool. Since both implement - * SystemFilterContainer, that is what we return. - * <p> - * Of course, this is a generic method, and in our case it is always - * true that we only hold a SystemFilter. Hence, this is the same - * as calling getReferenceFilter and casting the result. - */ - public ISystemFilterContainer getReferencedSystemFilterContainer() { - return getReferencedFilter(); - } - - /** - * Build and return an array of SystemFilterReference objects. - * Each object is created new. There is one for each of the filters - * in the reference SystemFilter or SystemFilterPool. - * For performance reasons, we will cache this array and only - * return a fresh one if something changes in the underlying - * filter list. - */ - public ISystemFilterReference[] getSystemFilterReferences(ISubSystem subSystem) { - List references = containerHelper.getSystemFilterReferences(subSystem); - ISystemFilterReference[] result = new ISystemFilterReference[references.size()]; - references.toArray(result); - return result; - } - - /** - * Create a single filter refererence to a given filter. - * If there already is a reference to this filter, it is returned. - * If not, a new reference is created and appended to the end of the existing filter reference array. - * @see #getExistingSystemFilterReference(ISubSystem, ISystemFilter) - */ - public ISystemFilterReference getSystemFilterReference(ISubSystem subSystem, ISystemFilter filter) { - //return containerHelper.generateFilterReference(filter); - return containerHelper.generateAndRecordFilterReference(subSystem, filter); - } - - /** - * Return an existing reference to a given system filter. - * If no reference currently exists to this filter, returns null. - * @see #getSystemFilterReference(ISubSystem, ISystemFilter) - */ - public ISystemFilterReference getExistingSystemFilterReference(ISubSystem subSystem, ISystemFilter filter) { - return containerHelper.getExistingSystemFilterReference(subSystem, filter); - } - - /** - * Return true if the referenced pool or filter has filters. - */ - public boolean hasFilters() { - return containerHelper.hasFilters(); - } - - /** - * Return count of the number of filters in the referenced pool or filter - */ - public int getFilterCount() { - return containerHelper.getFilterCount(); - } - - /** - * Return the name of the SystemFilter or SystemFilterPool that we reference. - * For such objects this is what we show in the GUI. - */ - public String getName() { - ISystemFilter filter = getReferencedFilter(); - if (filter != null) - return filter.getName(); - else - return ""; //$NON-NLS-1$ - } - - /** - * Override of Object method. Turn this filter in an outputable string - */ - public String toString() { - return getName(); - } - - // ------------------------------------------------- - // Methods for returning filter string references... - // ------------------------------------------------- - /** - * Return the number of filter strings in the referenced filter - */ - public int getSystemFilterStringCount() { - int count = 0; - ISystemFilter referencedFilter = getReferencedFilter(); - if (referencedFilter != null) count = referencedFilter.getFilterStringCount(); - return count; - } - - /** - * Get the filter strings contained by this filter. But get references to each, - * not the masters. - */ - public ISystemFilterStringReference[] getSystemFilterStringReferences() { - // These reference objects are built on the fly, each time, rather than - // maintaining a persisted list of such references. The reason - // is we do no at this time allow users to subset the master list - // of strings maintained by a filter. Hence, we always simply - // return a complete list. However, to save memory we try to only - // re-gen the list if something has changed. - ISystemFilterString[] filterStrings = getReferencedFilter().getStrings(); - List filterStringList = Arrays.asList(filterStrings); - boolean needToReGen = compareFilterStrings(filterStringList); - if (needToReGen) referencedFilterStrings = generateFilterStringReferences(filterStringList); - return referencedFilterStrings; - } - - /** - * Create a single filter string refererence to a given filter string - */ - public ISystemFilterStringReference getSystemFilterStringReference(ISystemFilterString filterString) { - return new SystemFilterStringReference(this, filterString); - } - - /** - * To save memory, we try to only regenerate the referenced filter list - * if something has changed. - */ - private boolean compareFilterStrings(List newFilterStrings) { - boolean mustReGen = false; - if (newFilterStrings == null) { - if (referencedFilterStrings != null) - return true; - else - return false; - } else if (referencedFilterStrings == null) { - return true; // newFilterStrings != null && referencedFilterStrings == null - } - // both old and new are non-null - if (newFilterStrings.size() != referencedFilterStrings.length) return true; - Iterator i = newFilterStrings.iterator(); - for (int idx = 0; !mustReGen && (idx < referencedFilterStrings.length); idx++) { - ISystemFilterString newFilterString = (ISystemFilterString) i.next(); - if (!(referencedFilterStrings[idx].getReferencedFilterString().equals(newFilterString))) mustReGen = true; - } - return mustReGen; - } - - /** - * Get references to filter strings from a list of the filter strings - */ - private ISystemFilterStringReference[] generateFilterStringReferences(List newFilterStrings) { - if (newFilterStrings == null) return null; - ISystemFilterStringReference[] refs = new ISystemFilterStringReference[newFilterStrings.size()]; - Iterator i = newFilterStrings.iterator(); - int idx = 0; - while (i.hasNext()) { - refs[idx++] = getSystemFilterStringReference((ISystemFilterString) i.next()); - } - return refs; - } - - // ----------------------------------- - // IRSEReferencingObject methods... - // ----------------------------------- - - /** - * Set the object to which we reference. Override of inherited - */ - public void setReferencedObject(IRSEBaseReferencedObject obj) { - setReferencedFilter((ISystemFilter) obj); - } - - /** - * Get the object which we reference. Override of inherited - */ - public IRSEBaseReferencedObject getReferencedObject() { - return getReferencedFilter(); - } - - /** - * Fastpath to getReferencedObject().removeReference(this). - * @return new reference count of master object - */ - public int removeReference() { - int count = 0; - if (persistent) super.removeReference(); - setReferencedFilter(null); - return count; - } - - /* (non-Javadoc) - * @see org.eclipse.rse.model.ISystemContainer#hasContents(org.eclipse.rse.model.ISystemContentsType) - */ - public boolean hasContents(ISystemContentsType contentsType) { - if (cachedContents.containsKey(contentsType)) { - return true; - } - return false; - } - - /* (non-Javadoc) - * @see org.eclipse.rse.model.ISystemContainer#getContents(org.eclipse.rse.model.ISystemContentsType) - */ - public Object[] getContents(ISystemContentsType contentsType) { - return (Object[]) cachedContents.get(contentsType); - } - - public void setContents(ISystemContentsType type, Object[] cachedContents) { - this.cachedContents.put(type, cachedContents); - - isStale = false; - } - - /* (non-Javadoc) - * @see org.eclipse.rse.model.ISystemContainer#isStale() - */ - public boolean isStale() { - return isStale; - } - - /* (non-Javadoc) - * @see org.eclipse.rse.model.ISystemContainer#markStale(boolean) - */ - public void markStale(boolean isStale) { - markStale(isStale, true); - } - - /* (non-Javadoc) - * @see org.eclipse.rse.model.ISystemContainer#markStale(boolean) - */ - public void markStale(boolean isStale, boolean clearCache) { - this.isStale = isStale; - if (clearCache && isStale) { - Iterator iterator = cachedContents.values().iterator(); - while (iterator.hasNext()) { - Object[] arr = (Object[]) iterator.next(); - for (int i = 0; i < arr.length; i++) { - Object obj = arr[i]; - if (obj instanceof ISystemContainer) { - ((ISystemContainer) obj).markStale(true); - } - } - } - cachedContents.clear(); - } - } - - public boolean commit() { - return false; - } - - public IRSEPersistableContainer getPersistableParent() { - return null; - } - - public IRSEPersistableContainer[] getPersistableChildren() { - return IRSEPersistableContainer.NO_CHILDREN; - } - -}
\ No newline at end of file diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/SystemFilterUtil.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/SystemFilterUtil.java deleted file mode 100644 index 51e0d4388..000000000 --- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/SystemFilterUtil.java +++ /dev/null @@ -1,29 +0,0 @@ -/********************************************************************************* - * Copyright (c) 2008 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 - * - * Contributors: - * David Dykstal (IBM) - [224671] [api] org.eclipse.rse.core API leaks non-API types - * David Dykstal (IBM) - [226561] Add API markup to RSE Javadocs where extend / implement is allowed - *********************************************************************************/ - -package org.eclipse.rse.core.filters; - -import org.eclipse.rse.internal.core.filters.SystemFilterSimple; - -/** - * Utilities to be used in the construction and manipulation of filters. - * - * @noextend This class is not intended to be subclassed by clients. - * @noinstantiate This class is not intended to be instantiated by clients. - * @since org.eclipse.rse.core 3.0 - */ -public class SystemFilterUtil { - - public static ISystemFilter makeSimpleFilter(String name) { - return new SystemFilterSimple(name); - } - -} diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/AbstractSystemResourceSet.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/AbstractSystemResourceSet.java deleted file mode 100644 index d274bee27..000000000 --- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/AbstractSystemResourceSet.java +++ /dev/null @@ -1,121 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006, 2008 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * 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) - [226561] Add API markup to RSE javadocs for extend / implement - *******************************************************************************/ - -package org.eclipse.rse.core.model; - -import java.util.ArrayList; -import java.util.List; - -import org.eclipse.rse.services.clientserver.messages.SystemMessage; - -/** - * The common abstract implementation of a ISystemResourceSet. - * Extenders can use this to inherit the basic implementations. - */ -public abstract class AbstractSystemResourceSet implements ISystemResourceSet { - private List _resourceSet; - private SystemMessage _message; - private long _byteSize; - - public AbstractSystemResourceSet() { - _resourceSet = new ArrayList(); - } - - public AbstractSystemResourceSet(Object[] set) { - _resourceSet = new ArrayList(); - if (set != null) { - for (int i = 0; i < set.length; i++) { - addResource(set[i]); - } - } - } - - public AbstractSystemResourceSet(List set) { - _resourceSet = set; - } - - public int size() { - return _resourceSet.size(); - } - - public Object get(String absoluteName) { - for (int i = 0; i < _resourceSet.size(); i++) { - String path = pathFor(_resourceSet.get(i)); - if (path.equals(absoluteName)) { - return _resourceSet.get(i); - } - } - return null; - } - - public Object get(int index) { - return _resourceSet.get(index); - } - - public List getResourceSet() { - return _resourceSet; - } - - public void addResource(Object src) { - _resourceSet.add(src); - } - - public void removeResource(Object src) { - _resourceSet.remove(src); - } - - public String pathFor(Object resource) { - return resource.toString(); - } - - public String toString() { - StringBuffer buf = new StringBuffer(); - for (int i = 0; i < _resourceSet.size(); i++) { - Object resource = _resourceSet.get(i); - buf.append(pathFor(resource)); - if (i < _resourceSet.size()) { - buf.append(", "); //$NON-NLS-1$ - } - buf.append('\n'); - } - return buf.toString(); - } - - public void setMessage(SystemMessage message) { - _message = message; - } - - public SystemMessage getMessage() { - return _message; - } - - public boolean hasMessage() { - return _message != null; - } - - public boolean hasByteSize() { - return (_byteSize > 0); - } - - public long byteSize() { - return _byteSize; - } - - public void setByteSize(long byteSize) { - _byteSize = byteSize; - } -} diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/DummyHost.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/DummyHost.java deleted file mode 100644 index a8a0a7e16..000000000 --- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/DummyHost.java +++ /dev/null @@ -1,267 +0,0 @@ -/******************************************************************************** - * Copyright (c) 2006, 2008 IBM Corporation and others. All rights reserved. - * This program and the accompanying materials are made available under the terms - * of the Eclipse Public License v1.0 which accompanies this distribution, and is - * available at 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: - * Martin Oberhuber (Wind River) - [175262] IHost.getSystemType() should return IRSESystemType - * David Dykstal (IBM) - 142806: refactoring persistence framework - * David Dykstal (IBM) - [226561] Add API markup to RSE javadocs for extend / implement - ********************************************************************************/ - -package org.eclipse.rse.core.model; -import org.eclipse.core.runtime.PlatformObject; -import org.eclipse.rse.core.IRSESystemType; -import org.eclipse.rse.core.subsystems.IConnectorService; -import org.eclipse.rse.core.subsystems.ISubSystem; - -/** - * A DummyHost is used as a placeholder during the construction of hosts by wizards. - * @noextend This class is not intended to be subclassed by clients. - */ -public class DummyHost extends PlatformObject implements IHost -{ - protected String _hostName; - protected IRSESystemType _systemType; - - /** - * Constructor. - * @param hostName name of the dummy host - * @param systemType sytem type. May be <code>null</code>. - */ - public DummyHost(String hostName, IRSESystemType systemType) - { - _hostName = hostName; - _systemType = systemType; - } - public ISystemProfile getSystemProfile() - { - return null; - } - - public String getSystemProfileName() - { - return null; - } - - public void setHostPool(ISystemHostPool pool) - { - //Auto-generated method stub - } - - public ISystemHostPool getHostPool() - { - return null; - } - - public ISubSystem[] getSubSystems() - { - return null; - } - - - - public String getLocalDefaultUserId() - { - return null; - } - - public void clearLocalDefaultUserId() - { - //Auto-generated method stub - } - - public void deletingHost() - { - //Auto-generated method stub - } - - public void renamingSystemProfile(String oldName, String newName) - { - //Auto-generated method stub - } - - public boolean getForceUserIdToUpperCase() - { - return false; - } - - public boolean compareUserIds(String userId1, String userId2) - { - return false; - } - - public IRSESystemType getSystemType() - { - return _systemType; - } - - public void setSystemType(IRSESystemType value) - { - //Auto-generated method stub - } - - public String getAliasName() - { - return null; - } - - public void setAliasName(String value) - { - //Auto-generated method stub - } - - public String getHostName() - { - return _hostName; - } - - public void setHostName(String value) - { - //Auto-generated method stub - } - - public String getDescription() - { - return null; - } - - public void setDescription(String value) - { - //Auto-generated method stub - } - - public String getDefaultUserId() - { - return null; - } - - public void setDefaultUserId(String value) - { - //Auto-generated method stub - } - - public boolean isPromptable() - { - return false; - } - - public void setPromptable(boolean value) - { - //Auto-generated method stub - } - - public boolean isOffline() - { - return false; - } - - public void setOffline(boolean value) - { - //Auto-generated method stub - } - - public IConnectorService[] getConnectorServices() - { - return null; - } - - public String getName() - { - return null; - } - - public IPropertySet[] getPropertySets() - { - return null; - } - - public IPropertySet getPropertySet(String name) - { - return null; - } - - public IPropertySet createPropertySet(String name, String description) - { - return null; - } - - public IPropertySet createPropertySet(String name) - { - return null; - } - - - public boolean addPropertySet(IPropertySet set) - { - return false; - } - - public boolean addPropertySets(IPropertySet[] sets) - { - return false; - } - - public boolean removePropertySet(String name) - { - return false; - } - - public boolean isDirty() - { - return false; - } - - public void setDirty(boolean flag) - { - } - - public boolean commit() - { - return false; - } - - public boolean wasRestored() - { - return false; - } - - public void setWasRestored(boolean flag) - { - } - - public IRSEPersistableContainer getPersistableParent() { - return null; - } - - public IRSEPersistableContainer[] getPersistableChildren() { - return IRSEPersistableContainer.NO_CHILDREN; - } - - public boolean isTainted() { - return false; - } - - public void beginRestore() { - } - - public void endRestore() { - } - - public void setTainted(boolean flag) { - } - - public String getDefaultEncoding(boolean checkRemote) { - return null; - } - - public void setDefaultEncoding(String encoding, boolean fromRemote) { - } -}
\ No newline at end of file diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/Host.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/Host.java deleted file mode 100644 index e16c162a0..000000000 --- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/Host.java +++ /dev/null @@ -1,602 +0,0 @@ -/******************************************************************************** - * Copyright (c) 2006, 2008 IBM Corporation and others. All rights reserved. - * This program and the accompanying materials are made available under the terms - * of the Eclipse Public License v1.0 which accompanies this distribution, and is - * available at 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) - using new API from RSECorePlugin, RSEPreferencesManager - * - moved SystemsPreferencesManager to a new plugin - * Uwe Stieber (Wind River) - Dynamic system type provider extensions. - * - Moved to package org.eclipse.rse.model for being extendable. - * Martin Oberhuber (Wind River) - [175262] IHost.getSystemType() should return IRSESystemType - * David Dykstal (IBM) - 142806: refactoring persistence framework - * 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() - * Kevin Doyle (IBM) - [203365] Profile should not be saved as a result of file transfer - * David Dykstal (IBM) - [225911] Exception received after deleting a profile containing a connection - * David McKnight (IBM) - [226324] Default user ID from preferences not inherited - ********************************************************************************/ - -package org.eclipse.rse.core.model; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.Locale; - -import org.eclipse.core.runtime.Platform; -import org.eclipse.rse.core.IRSESystemType; -import org.eclipse.rse.core.RSECorePlugin; -import org.eclipse.rse.core.RSEPreferencesManager; -import org.eclipse.rse.core.subsystems.IConnectorService; -import org.eclipse.rse.core.subsystems.ISubSystem; - -/** - * Default implementation of the <code>IHost</code> interface. - * <p> - * Dynamic system type providers may extend this implementation - * if needed. - */ -public class Host extends RSEModelObject implements IHost { - - private boolean ucId = true; - private boolean userIdCaseSensitive = true; - private ISystemHostPool pool; - protected String previousUserIdKey; - - private static final String ENCODING_PROPERTY_SET = "EncodingPropertySet"; //$NON-NLS-1$ - private static final String ENCODING_REMOTE_PROPERTY_KEY = "EncodingRemotePropertyKey"; //$NON-NLS-1$ - private static final String ENCODING_NON_REMOTE_PROPERTY_KEY = "EncodingNonRemotePropertyKey"; //$NON-NLS-1$ - - /** - * The system type which is associated to this <code>IHost</code> object. - */ - private IRSESystemType systemType = null; - - /** - * The alias name of this <code>IHost</code> object. - */ - private String aliasName = null; - - /** - * The host name of the target which is associated to this <code>IHost</code> object. - */ - private String hostName = null; - - /** - * The description of this <code>IHost</code> object. - */ - private String description = null; - - /** - * The default user id to use to login to the target host. - */ - private String defaultUserId = null; - - /** - * Prompt for user id and password. - */ - private boolean promptable = false; - - /** - * Offline mode. - */ - private boolean offline = false; - - /** - * The system profile associated with this <code>IHost</code> object. - */ - private ISystemProfile _profile; - - /** - * Constructor - */ - public Host(ISystemProfile profile) { - super(); - _profile = profile; - } - - /* - * (non-Javadoc) - * @see org.eclipse.rse.core.model.IHost#setHostPool(org.eclipse.rse.core.model.ISystemHostPool) - */ - public void setHostPool(ISystemHostPool pool) { - this.pool = pool; - previousUserIdKey = getPreferencesKey(); - } - - /* - * (non-Javadoc) - * @see org.eclipse.rse.core.model.IHost#getHostPool() - */ - public ISystemHostPool getHostPool() { - return pool; - } - - /* - * (non-Javadoc) - * @see org.eclipse.rse.core.model.IHost#getConnectorServices() - */ - public IConnectorService[] getConnectorServices() { - return RSECorePlugin.getTheSystemRegistry().getConnectorServices(this); - } - - /* - * (non-Javadoc) - * @see org.eclipse.rse.core.model.IHost#getSubSystems() - */ - public ISubSystem[] getSubSystems() { - return RSECorePlugin.getTheSystemRegistry().getSubSystems(this); - } - - /* - * (non-Javadoc) - * @see org.eclipse.rse.core.model.IHost#deletingHost() - */ - public void deletingHost() { - String oldUserId = null; - if (previousUserIdKey != null) oldUserId = getLocalDefaultUserId(previousUserIdKey); - // if the userId attribute held a preference store key of the form profileName.connectionName, - // we have to delete that key entry from the preference store and re-gen a new keyed entry with the same - // value (the actual user id) the old keyed entry held. - if (oldUserId != null) { - RSEPreferencesManager.clearUserId(previousUserIdKey); - } - } - - /* - * (non-Javadoc) - * @see org.eclipse.rse.core.model.IHost#renamingSystemProfile(java.lang.String, java.lang.String) - */ - public void renamingSystemProfile(String oldName, String newName) { - String userIdValue = null; - if (previousUserIdKey != null) userIdValue = getLocalDefaultUserId(previousUserIdKey); - // if the userId attribute held a preference store key of the form profileName.connectionName, - // we have to delete that key entry from the preference store and re-gen a new keyed entry with the same - // value (the actual user id) the old keyed entry held. - String newKey = getPreferencesKey(newName, getAliasName()); - if ((userIdValue != null) && (userIdValue.length() > 0)) { - RSEPreferencesManager.clearUserId(previousUserIdKey); - RSEPreferencesManager.setUserId(newKey, userIdValue); // store old value with new preference key - } - previousUserIdKey = newKey; - } - - /* - * (non-Javadoc) - * @see org.eclipse.rse.core.model.IHost#getSystemProfile() - */ - public ISystemProfile getSystemProfile() { - return _profile; - } - - /* - * (non-Javadoc) - * @see org.eclipse.rse.core.model.IHost#getSystemProfileName() - */ - public String getSystemProfileName() { - String result = null; - if (_profile != null) { - result = _profile.getName(); - } else if (pool != null) { - ISystemProfile profile = pool.getSystemProfile(); - if (profile != null) { - result = profile.getName(); - } - } - return result; - } - - /** - * Intercept of setAliasName so we can potentially rename the default-user-id key - * for the preferences store. That key is profileName.connectionAliasName so is - * affected when the alias name changes. - */ - public void setAliasName(String newName) { - String userIdValue = null; - if (previousUserIdKey != null) userIdValue = getLocalDefaultUserId(previousUserIdKey); - this.setAliasNameGen(newName); // update mof-modelled attribute - // if the userId attribute held a preference store key of the form profileName.connectionAliasName, - // we have to delete that key entry from the preference store and re-gen a new keyed entry with the same - // value (the actual user id) the old keyed entry held. - String newKey = getPreferencesKey(getSystemProfileName(), newName); - if ((userIdValue != null) && (userIdValue.length() > 0)) { - RSEPreferencesManager.clearUserId(previousUserIdKey); - RSEPreferencesManager.setUserId(newKey, userIdValue); // store old value with new preference key - } - previousUserIdKey = newKey; - } - - /** - * Intercept of setSystemType so we can decide if the user ID is case sensitive - */ - public void setSystemType(IRSESystemType systemType) { - // defect 43219 - if (systemType != null) { - //FIXME MOB this should be in IRSESystemType.isForceUC() / IRSESystemType.isUIDCaseSensitive() - String systemTypeId = systemType.getId(); - boolean forceUC = systemTypeId.equals(IRSESystemType.SYSTEMTYPE_ISERIES_ID); - boolean caseSensitiveUID = systemTypeId.equals(IRSESystemType.SYSTEMTYPE_UNIX_ID) || systemTypeId.equals(IRSESystemType.SYSTEMTYPE_LINUX_ID) - || (systemType.isLocal() && !systemType.isWindows()); - setForceUserIdToUpperCase(forceUC); - setUserIdCaseSensitive(caseSensitiveUID); - } - this.setSystemTypeGen(systemType); - } - - /** - * Intercept of setHostName so we can force it to uppercase. - * IPv4 host names are case insensitive. Much data is stored using the host - * name as part of the key. Therefore, the host name is capitalized here so that - * these comparisons work naturally. - * However, this must be done using the US locale since IPv4 host names - * use can be compared using this locale. See RFC1035. - */ - public void setHostName(String name) { - if (name != null) { - name = name.toUpperCase(Locale.US); - } - this.setHostNameGen(name); - } - - /** - * Intercept of setDefaultUserId so we can force it to uppercase. - * Also, we do not store the user Id per se in the attribute, but rather - * we store it in the preference with a key name unique to this connection. - * We store that key name in this attribute. However, this is all transparent to - * the caller. - */ - public void setDefaultUserId(String newId) { - if ((newId != null) && ucId) newId = newId.toUpperCase(); - - if ((newId == null) || (newId.length() == 0)) // a "clear" request? - { - clearLocalDefaultUserId(); - } - else { - String key = getPreferencesKey(); - if (key != null) { - RSEPreferencesManager.setUserId(key, newId); - } - } - } - - /* - * (non-Javadoc) - * @see org.eclipse.rse.core.model.IHost#getDefaultUserId() - */ - public String getDefaultUserId() { - String uid = getLocalDefaultUserId(); - if ((uid == null) || (uid.length() == 0)) { - uid = RSEPreferencesManager.getDefaultUserId(getSystemType()); // resolve from preferences - if ((uid != null) && ucId) uid = uid.toUpperCase(); - } - return uid; - } - - /** - * Return the local default user Id without resolving up the food chain. - * @see #getDefaultUserId() - */ - protected static String getLocalDefaultUserId(String key) { - String uid = null; - if ((key != null) && (key.length() > 0)) { - uid = RSEPreferencesManager.getUserId(key); // resolve from preferences - } - return uid; - } - - /* - * (non-Javadoc) - * @see org.eclipse.rse.core.model.IHost#getLocalDefaultUserId() - */ - public String getLocalDefaultUserId() { - return getLocalDefaultUserId(getPreferencesKey()); - } - - /* - * (non-Javadoc) - * @see org.eclipse.rse.core.model.IHost#clearLocalDefaultUserId() - */ - public void clearLocalDefaultUserId() { - if (previousUserIdKey != null) RSEPreferencesManager.clearUserId(previousUserIdKey); - } - - /** - * Helper method to compute a unique name for a given subsystem instance - */ - protected String getPreferencesKey() { - if ((getSystemProfileName() == null) || (getAliasName() == null)) return null; - return getPreferencesKey(getSystemProfileName()); - } - - /** - * Helper method to compute a unique name for a given subsystem instance, given a profile name - */ - protected String getPreferencesKey(String profileName) { - String connectionName = getAliasName(); - if (connectionName == null) return null; - return getPreferencesKey(profileName, connectionName); - } - - /** - * Helper method to compute a unique name for a given subsystem instance, given a profile name and connection name - */ - protected String getPreferencesKey(String profileName, String connectionName) { - return profileName + "." + connectionName; //$NON-NLS-1$ - } - - /** - * Call this with false to turn off the default behaviour of forcing the default userId to uppercase. - */ - public void setForceUserIdToUpperCase(boolean force) { - this.ucId = force; - } - - /** - * Call this to turn off the default behaviour of considering case when comparing userIds - */ - public void setUserIdCaseSensitive(boolean caseSensitive) { - this.userIdCaseSensitive = caseSensitive; - } - - /** - * Call this to query whether the default userId is to be uppercased. - */ - public boolean getForceUserIdToUpperCase() { - return ucId; - } - - /** - * Call this to query whether the default userId is case sensitive - */ - public boolean getUserIdCaseSensitive() { - return userIdCaseSensitive; - } - - /** - * Call this to compare two userIds taking case sensitivity - */ - public boolean compareUserIds(String userId1, String userId2) { - if (userId1 == null) userId1 = ""; //$NON-NLS-1$ - if (userId2 == null) userId2 = ""; //$NON-NLS-1$ - if (userIdCaseSensitive) - return userId1.equals(userId2); - else return userId1.equalsIgnoreCase(userId2); - } - - public String toString() { - if (getAliasName() == null) { - StringBuffer result = new StringBuffer(super.toString()); - result.append(" (systemType: "); //$NON-NLS-1$ - result.append(systemType); - result.append(", aliasName: "); //$NON-NLS-1$ - result.append(aliasName); - result.append(", hostName: "); //$NON-NLS-1$ - result.append(hostName); - result.append(", description: "); //$NON-NLS-1$ - result.append(description); - result.append(", defaultUserId: "); //$NON-NLS-1$ - result.append(defaultUserId); - result.append(", promptable: "); //$NON-NLS-1$ - result.append(promptable); - result.append(", offline: "); //$NON-NLS-1$ - result.append(offline); - result.append(')'); - return result.toString(); - } - - return getAliasName(); - } - - /* - * (non-Javadoc) - * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class) - */ - public Object getAdapter(Class adapterType) { - return Platform.getAdapterManager().getAdapter(this, adapterType); - } - - /* - * (non-Javadoc) - * @see org.eclipse.rse.core.model.IHost#getSystemType() - */ - public IRSESystemType getSystemType() { - return systemType; - } - - /* - * (non-Javadoc) - * @see org.eclipse.rse.core.model.IRSEModelObject#getName() - */ - public String getName() { - return getAliasName(); - } - - /* - * (non-Javadoc) - * @see org.eclipse.rse.core.model.IHost#getAliasName() - */ - public String getAliasName() { - return aliasName; - } - - /* - * (non-Javadoc) - * @see org.eclipse.rse.core.model.IHost#getHostName() - */ - public String getHostName() { - return hostName; - } - - /* - * (non-Javadoc) - * @see org.eclipse.rse.core.model.RSEModelObject#getDescription() - */ - public String getDescription() { - return description; - } - - /* - * (non-Javadoc) - * @see org.eclipse.rse.core.model.IHost#setDescription(java.lang.String) - */ - public void setDescription(String newDescription) { - setDirty(!compareStrings(description, newDescription)); - description = newDescription; - } - - /* - * (non-Javadoc) - * @see org.eclipse.rse.core.model.IHost#isPromptable() - */ - public boolean isPromptable() { - return promptable; - } - - /* - * (non-Javadoc) - * @see org.eclipse.rse.core.model.IHost#setPromptable(boolean) - */ - public void setPromptable(boolean newPromptable) { - setDirty(promptable != newPromptable); - promptable = newPromptable; - } - - /* - * (non-Javadoc) - * @see org.eclipse.rse.core.model.IHost#isOffline() - */ - public boolean isOffline() { - return offline; - } - - /* - * (non-Javadoc) - * @see org.eclipse.rse.core.model.IHost#setOffline(boolean) - */ - public void setOffline(boolean newOffline) { - setDirty(offline != newOffline); - offline = newOffline; - } - - private void setSystemTypeGen(IRSESystemType newSystemType) { - setDirty( systemType==null ? (newSystemType==null) : !systemType.equals(newSystemType) ); - systemType = newSystemType; - } - - private void setAliasNameGen(String newAliasName) { - setDirty(!compareStrings(aliasName, newAliasName)); - aliasName = newAliasName; - } - - private void setHostNameGen(String newHostName) { - setDirty(!compareStrings(hostName, newHostName)); - hostName = newHostName; - } - - /* (non-Javadoc) - * @see org.eclipse.rse.core.model.IRSEPersistableContainer#commit() - */ - public boolean commit() { - ISystemProfile profile = getSystemProfile(); - boolean result = profile.commit(); - return result; - } - - public IRSEPersistableContainer getPersistableParent() { - return _profile; - } - - public IRSEPersistableContainer[] getPersistableChildren() { - List children = new ArrayList(10); - children.addAll(Arrays.asList(getPropertySets())); - children.addAll(Arrays.asList(getConnectorServices())); - IRSEPersistableContainer[] result = new IRSEPersistableContainer[children.size()]; - children.toArray(result); - return result; - } - - /* - * (non-Javadoc) - * @see org.eclipse.rse.core.model.IHost#getDefaultEncoding(boolean) - */ - public String getDefaultEncoding(boolean fromRemote) { - - IPropertySet encPropertySet = getPropertySet(ENCODING_PROPERTY_SET); - - if (encPropertySet == null) { - return null; - } - else { - String nonRemoteEncoding = encPropertySet.getPropertyValue(ENCODING_NON_REMOTE_PROPERTY_KEY); - - if (nonRemoteEncoding != null) { - return nonRemoteEncoding; - } - else { - - if (!fromRemote) { - return null; - } - else { - String remoteEncoding = encPropertySet.getPropertyValue(ENCODING_REMOTE_PROPERTY_KEY); - return remoteEncoding; - } - } - } - } - - /* - * (non-Javadoc) - * @see org.eclipse.rse.core.model.IHost#setDefaultEncoding(java.lang.String, boolean) - */ - public void setDefaultEncoding(String encoding, boolean fromRemote) { - boolean commit = false; - IPropertySet encPropertySet = getPropertySet(ENCODING_PROPERTY_SET); - - if (encPropertySet == null) { - encPropertySet = createPropertySet(ENCODING_PROPERTY_SET); - } - - if (encPropertySet != null) { - String savedNonRemoteEncoding = encPropertySet.getPropertyValue(ENCODING_NON_REMOTE_PROPERTY_KEY); - String savedRemoteEncoding = encPropertySet.getPropertyValue(ENCODING_REMOTE_PROPERTY_KEY); - - if (encoding != null) { - - if (!fromRemote && !encoding.equals(savedNonRemoteEncoding)) { - encPropertySet.addProperty(ENCODING_NON_REMOTE_PROPERTY_KEY, encoding); - commit = true; - } - else if (fromRemote && !encoding.equals(savedRemoteEncoding)) { - encPropertySet.addProperty(ENCODING_REMOTE_PROPERTY_KEY, encoding); - commit = true; - } - } - else { - - if (!fromRemote && savedNonRemoteEncoding != null) { - encPropertySet.removeProperty(ENCODING_NON_REMOTE_PROPERTY_KEY); - commit = true; - } - else if (fromRemote && savedRemoteEncoding != null) { - encPropertySet.removeProperty(ENCODING_REMOTE_PROPERTY_KEY); - commit = true; - } - } - } - // Only commit if the encoding has changed - if (commit) { - commit(); - } - } -}
\ No newline at end of file diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/IHost.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/IHost.java deleted file mode 100644 index 912f64afa..000000000 --- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/IHost.java +++ /dev/null @@ -1,273 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006, 2008 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * 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: - * Martin Oberhuber (Wind River) - [175262] IHost.getSystemType() should return IRSESystemType - * Martin Oberhuber (Wind River) - [206742] Make SystemHostPool thread-safe - * David Dykstal (IBM) - [197036] cleaned javddoc for getConnectorServices() - * David Dykstal (IBM) - [226561] Add API markup to RSE javadocs for extend / implement - *******************************************************************************/ - -package org.eclipse.rse.core.model; - -import org.eclipse.core.runtime.IAdaptable; -import org.eclipse.rse.core.IRSESystemType; -import org.eclipse.rse.core.subsystems.IConnectorService; -import org.eclipse.rse.core.subsystems.ISubSystem; - -/** - * Interface for Host (SystemConnection) objects. - * - * An IHost holds information identifying a remote system. It also logically contains - * ISubSystem objects, although this containment is achievable programmatically versus via - * object oriented containment. - * @noimplement This interface is not intended to be implemented by clients. - * The standard implementations are included in the framework. - */ -public interface IHost extends IAdaptable, IRSEModelObject { - - /** - * Return the system profile that owns this connection - * @return the profile which contains this host - */ - public ISystemProfile getSystemProfile(); - - /** - * Return the name of the system profile that owns this connection - * FIXME Check how this is different from getSystemProfile().getName() - */ - public String getSystemProfileName(); - - /** - * Set the parent connection pool this is owned by. - * Connection pools are internal management objects, one per profile. - */ - public void setHostPool(ISystemHostPool pool); - - /** - * Set the parent connection pool this is owned by. - * Connection pools are internal management objects, one per profile. - */ - public ISystemHostPool getHostPool(); - - /** - * Return the subsystem instances under this connection. - * Just a shortcut to {@link org.eclipse.rse.core.model.ISystemRegistry#getSubSystems(IHost)} - */ - public ISubSystem[] getSubSystems(); - - /** - * Return the local default user Id without resolving up the food chain. - * @see #getDefaultUserId() - */ - public String getLocalDefaultUserId(); - - /** - * Clear the local default user Id so next query will return the value from - * the preference store. - * <p> - * Same as calling setDefaultUserId(null) - * @see #setDefaultUserId(String) - */ - public void clearLocalDefaultUserId(); - - /** - * Notification method called when this connection is being deleted. - * Allows doing pre-death cleanup in overriders. - * <p> - * What we need to do is delete our entry in the preference store for our default userId. - */ - public void deletingHost(); - - /** - * Notification method called when this connection's profile is being renamed. - * Allows doing pre-death cleanup in overriders. - * <p> - * Implementations must not fork off other threads in the implementation of this method, - * since the old and new profiles will be locked during the rename operation so deadlock - * could occur when another thread tries to access theprofile during the time of rename - * ongoing. - * </p><p> - * What we need to do is rename our entry in the preference store for our default userId. - * </p> - */ - public void renamingSystemProfile(String oldName, String newName); - - /** - * Query whether the default userId is to be uppercased. - * @return <code>true</code> if the user id is to be uppercased. - */ - public boolean getForceUserIdToUpperCase(); - - /** - * Compare two userIds taking case sensitivity into account. - * @param userId1 first id to compare - * @param userId2 second id to compare - */ - public boolean compareUserIds(String userId1, String userId2); - - /** - * Get the system type. - * @return The value of the SystemType attribute - */ - public IRSESystemType getSystemType(); - - /** - * Set the system type. - * @param value The new value of the SystemType attribute - */ - public void setSystemType(IRSESystemType value); - - /** - * Get the unique user-visible connection name. - * This is a key that is unique per connection pool. - * @return The value of the AliasName attribute - */ - public String getAliasName(); - - /** - * Set the unique user-visible connection name. - * This needs to be a key that is unique per connection pool. - * @param value The new value of the AliasName attribute - */ - public void setAliasName(String value); - - /** - * Get the host name or IP address. - * @return The value of the HostName attribute - */ - public String getHostName(); - - /** - * Set the host name or IP address. - * @param value The new value of the HostName attribute - */ - public void setHostName(String value); - - /** - * Return the description of this host. - * @return The value of the Description attribute - */ - public String getDescription(); - - /** - * Set the description of this host. - * @param value The new value of the Description attribute - */ - public void setDescription(String value); - - /** - * Return the default user Id for this host. - * - * Note that we don't store it directly in an attribute, as we don't want - * the team to share it. The actual user Id is stored in the preference - * store keyed by this connection's unique name (profile.connName) instead, - * and that key is stored in this attribute. - * <p> - * Further, it is possible that there is no default user id. If so, this - * method will go to the preference store and will try to get the default user - * Id per this connection's system type. - * <p> - * This is all transparent to the caller though. - * <p> - * @return The value of the DefaultUserId attribute - */ - public String getDefaultUserId(); - - /** - * Intercept of setDefaultUserId so we can force it to uppercase. - * Also, we do not store the user Id per se in the attribute, but rather - * we store it in the preference with a key name unique to this connection. - * We store that key name in this attribute. However, this is all transparent to - * the caller. - * @param value The new value of the DefaultUserId attribute - */ - public void setDefaultUserId(String value); - - /** - * Check if this host is promptable. - * @return The value of the Promptable attribute - */ - boolean isPromptable(); - - /** - * Returns the default encoding of the host. - * <p> - * If fromRemote is <code>false</code>, returns an encoding preference - * specified locally without querying the remote system (for example, - * an encoding set by a user). - * If fromRemote is <code>true</code>, it first checks to see if there is - * a local "overriding" encoding set by the client without querying the - * remote system, and if such a "local" encoding preference does not exist, - * returns the encoding that was set by the client by querying a remote system. - * </p> - * @param fromRemote <code>false</code> to get the encoding that was - * obtained by the client by not querying the remote system, - * <code>true</code> to also check the encoding, if needed, that was - * set by the client after querying a remote system. - * @return the default encoding of the host, or <code>null</code> if - * no encoding was set. - * @see #setDefaultEncoding(String, boolean) - */ - public String getDefaultEncoding(boolean fromRemote); - - /** - * Set the default encoding of the host. - * <p> - * This method can only be called when no subsystem is connected. - * The client has to obtain the encoding either by querying the - * remote system, or by some other means (for example, set by a user). - * </p> - * @param encoding the encoding of the host, or <code>null</code> - * to erase the current encoding. - * @param fromRemote <code>true</code> if the encoding is set by the - * client after querying the remote system, or <code>false</code> - * otherwise (e.g. setting a local user preference). - * @see #getDefaultEncoding(boolean) - */ - public void setDefaultEncoding(String encoding, boolean fromRemote); - - /** - * Set the promptable attribute. - * @param value The new value of the Promptable attribute - */ - void setPromptable(boolean value); - - /** - * Returns the value of the '<em><b>Offline</b></em>' attribute. - * <p> - * Query if this connection is offline or not. - * If so, there is no live connection. Subsystems - * decide how much to enable while offline. - * It is up to each subsystem to honor this flag. - * </p> - * @return the value of the '<em>Offline</em>' attribute. - * @see #setOffline(boolean) - */ - boolean isOffline(); - - /** - * Specify if this connection is offline or not. - * It is up to each subsystem to honor this flag. - * - * @param value the new value of the '<em>Offline</em>' attribute. - * @see #isOffline() - */ - void setOffline(boolean value); - - /** - * Returns all the connector services currently configured for this host - * @return the connector services - */ - IConnectorService[] getConnectorServices(); -} diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ILabeledObject.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ILabeledObject.java deleted file mode 100644 index 2b8f86ad3..000000000 --- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ILabeledObject.java +++ /dev/null @@ -1,34 +0,0 @@ -/******************************************************************************** - * Copyright (c) 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: - * David Dykstal (IBM) - initial API and implementation - ********************************************************************************/ - -package org.eclipse.rse.core.model; - -/** - * This interface provides a means of extending RSE model objects and property sets - * with labels that can be used for display purposes. - * The persistence characteristics of labels are left to the implementing - * objects. - */ -public interface ILabeledObject { - - /** - * @return the display label for the object. If this has not - * previously been set, this can return the name of object or - * some other generated or constant label. It may return null - * if no label can be determined. - */ - public String getLabel(); - - /** - * @param label A display label for this object. - */ - public void setLabel(String label); - -} diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/IProperty.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/IProperty.java deleted file mode 100644 index 99b99d8ac..000000000 --- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/IProperty.java +++ /dev/null @@ -1,107 +0,0 @@ -/******************************************************************************** - * Copyright (c) 2006, 2008 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 - * - * 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) - added javadoc - * David Dykstal (IBM) - [150939] added read-only attribute - * David Dykstal (IBM) - [226561] Add API markup to RSE javadocs for extend / implement - ********************************************************************************/ - -package org.eclipse.rse.core.model; - -/** - * Properties are contained in property sets ({@link IPropertySet}) and may be associated with objects that - * implement {@link IPropertySetContainer}. These would typically be model objects. - * Properties also have a type (see {@link IPropertyType}). - * @see IRSEModelObject - * @noimplement This interface is not intended to be implemented by clients. - * Use {@link Property} directly. - */ -public interface IProperty { - - /** - * @return the name of the property. - */ - public String getKey(); - - /** - * Sets the displayable label of the property. - * @param label the label for this property. - */ - public void setLabel(String label); - - /** - * @return the displayable label of this property - */ - public String getLabel(); - - /** - * Sets the value of this property. - * May raise a runtime exception if the new value of the property is - * not compatible with its type. - * @param value the new value for this property. - */ - public void setValue(String value); - - /** - * @return the value of this property - */ - public String getValue(); - - /** - * Sets the type of this property. May raise an runtime exception if the - * value of the property is not compatible with the new type. - * - * @param type the property type - */ - public void setType(IPropertyType type); - - /** - * @return the type of this property - */ - public IPropertyType getType(); - - /** - * Sets the "enabled" presentation attribute of this property. - * This is an attribute that can be used to drive the presentation of this - * property and does not otherwise affect how this property can be used. - * Properties are enabled by default. - * @param flag true if the property is to be enabled. - */ - public void setEnabled(boolean flag); - - /** - * Retrieves the "enabled" presentation attribute of this property. - * This is an attribute that can be used to drive the presentation of this - * property and does not otherwise affect how this property can be used. - * @return true if the property is enabled. - */ - public boolean isEnabled(); - - /** - * Sets the "read-only" presentation attribute of this property. - * This is an attribute that can be used to drive the presentation of this - * property and does not otherwise affect how this property can be used. - * Properties are read-write by default. - * @param flag true if the property is to be read-only. - */ - public void setReadOnly(boolean flag); - - /** - * Retrieves the "read-only" presentation attribute of this property. - * This is an attribute that can be used to drive the presentation of this - * property and does not otherwise affect how this property can be used. - * @return true if the property is read-only. - */ - public boolean isReadOnly(); - -}
\ No newline at end of file diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/IPropertySet.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/IPropertySet.java deleted file mode 100644 index e270c3b33..000000000 --- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/IPropertySet.java +++ /dev/null @@ -1,180 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006, 2008 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * 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: - * Martin Oberhuber (Wind River) - Added Javadoc. - * David McKnight (IBM) - [217715] [api] RSE property sets should support nested property sets - * David Dykstal (IBM) - [226561] Add API markup to RSE javadocs for extend / implement - *******************************************************************************/ - -package org.eclipse.rse.core.model; - -import java.util.Map; - -/** - * A Property Set stores key/value pairs, where the keys - * are Strings and the values are an {@link IProperty}, - * of a type declared by an {@link IPropertyType}. - * - * The Property Set is identified by a name. - * By default, the type of each property is of type String, and - * in fact each value can be retrieved in String representation. - * - * The key <code>"description"</code> is reserved for internal - * use, to store the description of the Property set. - * @noimplement This interface is not intended to be implemented by clients. - * Use {@link PropertySet} directly. - */ -public interface IPropertySet extends IPropertySetContainer { - /** - * The key used to store the description of the Property Set. - * This is no longer used and should not be referenced except for - * compatibility reasons. - */ - public static final String DESCRIPTION_KEY = "description"; //$NON-NLS-1$ - - /** - * Return the name of this Property Set. - * @return String name of the Property Set. - */ - public String getName(); - - /** - * Return the description of this Property Set. - * - * Note that in order to set the description, you need to call - * <code>addProperty(IPropertySet.DESCRIPTION_KEY, "Description");</code> - * - * @return Description of the Property Set, - * or <code>null</code> in case no description has been set. - */ - public String getDescription(); - - /** - * Sets the description property of the property set. - * Fully equivalent to - * <code>addProperty(IPropertySet.DESCRIPTION_KEY, description);</code> - * @param description the string describing this property set. - */ - public void setDescription(String description); - - /** - * Return the {@link IProperty} associated with the given key. - * - * If the key is not in the set, <code>null</code> is returned. - * - * @param key String key for Property - * @return requested Property, - * or <code>null</code> if the key is not found in the set. - */ - public IProperty getProperty(String key); - - /** - * Return the String representation of a Property. - * - * Provided that the key is found in the set, this is a shortcut - * for getProperty(key).getValue(). If the key is not in the set, - * <code>null</code> is returned. - * - * @param key String key for Property - * @return String value of requested Property, - * or <code>null</code> if the key is not found in the set. - */ - public String getPropertyValue(String key); - - /** - * Return the list of Property Keys in this Set. - * - * Provided that the Set has a description, the - * @link{DESCRIPTION_KEY} key will also be in the list. - * The interface defines no particular ordering for the - * keys. - * - * @return String array of Property keys. - */ - public String[] getPropertyKeys(); - - /** - * Return the type of the property identified by the given key. - * - * @param key String key for Property - * @return Type of requested Property, - * or <code>null</code> if the key is not found in the set. - */ - public IPropertyType getPropertyType(String key); - - /** - * Set the name of this Property Set. - * @param name the name to set. Must not be <code>null</code> - */ - public void setName(String name); - - /** - * Set all the Properties of this set. - * - * @param map a Map of String to {@link IProperty} associations. - */ - public void setProperties(Map map); - - /** - * Add a Property with String value to the set. - * - * In case a Property already exist for the given key, it will be overwritten - * by the new value, note that this will <b>not</b> change the Property's type, - * so if the key identifies an integer Property but you set it to String value - * "foo" the resulting Property Set will be inconsistent. - * - * If the Property does not yet exist in the set, a new key will be added and - * the new Property will be of type "String". - * - * @param key Key to add - * @param value Value to add - * @return The added Property - */ - public IProperty addProperty(String key, String value); - - /** - * Add a typed Property to the set. - * - * In case a Property already exists for the given key, it will be - * removed and replaced by the new one. - * - * @param key Key to add - * @param value Value to add - * @param type Type of the Property to add - * @return The added Property - */ - public IProperty addProperty(String key, String value, IPropertyType type); - - /** - * Remove a Property from the set. - * - * @param key The key to remove - * @return <code>true</code> if the Property has been removed, - * or <code>false</code> if the key has not been part of the set. - */ - public boolean removeProperty(String key); - - /** - * Sets the container of this property set. Used to notify the container of - * a change in a property. - * - * @param container the property set container - */ - public void setContainer(IPropertySetContainer container); - - /** - * @return the container of this property set or null if there is no container. - */ - public IPropertySetContainer getContainer(); -} diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/IPropertySetContainer.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/IPropertySetContainer.java deleted file mode 100644 index d19416f1f..000000000 --- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/IPropertySetContainer.java +++ /dev/null @@ -1,102 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006, 2008 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * 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: - * Johann Draschwandtner (Wind River) - [227509][apidoc] Add note how to persist property sets - * David Dykstal (IBM) - [226561] Add API markup to RSE javadocs for extend / implement - *******************************************************************************/ - -package org.eclipse.rse.core.model; - -/** - * A property set container is capable of containing property sets. This interface allows for the - * addition, retrieval, and deletion of property sets from the container. A property set may have only - * one container. - * @noimplement This interface is not intended to be implemented by clients. - * The standard implementations are included in the framework. - */ -public interface IPropertySetContainer { - - /** - * Retrieves an array all property sets known to this container. It will return an empty array if this - * container has property sets. The order of these property sets is not dictated by the interface. - * @return an array of property sets. - */ - public IPropertySet[] getPropertySets(); - - /** - * Retrieves a particular property set by its name. - * @param name the name of the property set. - * @return the named property set or null if one by that name does not exist. - */ - public IPropertySet getPropertySet(String name); - - /** - * Creates a new property set of a particular name in this container. - * - * If one already exists by this name, it is replaced with a new empty - * property set. - * - * In order to have the property set persisted, the implementing class - * should also implement {@link IRSEPersistableContainer}. The - * {@link IRSEPersistableContainer#commit()} method must then be used to - * commit any changes into persistent storage. - * - * @param name the name of the property set. - * @return The property set. - */ - public IPropertySet createPropertySet(String name); - - /** - * Creates a new property set of a particular name and description in this - * container. If one already exists by this name it is replaced with a new - * empty property set. - * - * In order to have the property set persisted, the implementing class - * should also implement {@link IRSEPersistableContainer}. The - * {@link IRSEPersistableContainer#commit()} method must then be used to - * commit any changes into persistent storage. - * - * @param name the name of the property set. - * @param description the description (usually already localized) for this - * property set. - * @return the newly created property set. - */ - public IPropertySet createPropertySet(String name, String description); - - /** - * Adds an existing property set to this container. If the property set already has a container - * it is removed from that container and added to this one. If this container already - * has a property set by this name, this one replaces it. - * @param set the property set to be added. - * @return true if the property set was added. - */ - public boolean addPropertySet(IPropertySet set); - - /** - * Adds a number of existing property sets to this container. - * @param sets the sets to be added - * @return true if all property sets were added. - * @see #addPropertySet(IPropertySet) - */ - public boolean addPropertySets(IPropertySet[] sets); - - /** - * Removes a particular property set from this container. - * @param name the name of the property set to be removed - * @return true if the property set was removed; - * false if a property set was not removed, usually if it does not exist in the container. - */ - public boolean removePropertySet(String name); - -} diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/IPropertyType.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/IPropertyType.java deleted file mode 100644 index 983280717..000000000 --- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/IPropertyType.java +++ /dev/null @@ -1,62 +0,0 @@ -/******************************************************************************** - * Copyright (c) 2006, 2008 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 - * - * 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) - added javadoc - * David Dykstal (IBM) - [226561] Add API markup to RSE javadocs for extend / implement - ********************************************************************************/ - -package org.eclipse.rse.core.model; - -/** - * Property types are used to type instances of {@link IProperty}. - * @noimplement This interface is not intended to be implemented by clients. - * Use {@link PropertyType} directly. - */ -public interface IPropertyType { - - public static final int TYPE_STRING = 0; - public static final int TYPE_INTEGER = 1; - public static final int TYPE_ENUM = 2; - public static final int TYPE_BOOLEAN = 3; - - /** - * @return true if the property is of TYPE_STRING - */ - public boolean isString(); - - /** - * @return true if the property is of TYPE_INTEGER - */ - public boolean isInteger(); - - /** - * @return true if the property is of TYPE_ENUM - */ - public boolean isEnum(); - - /** - * @return true if the property is of TYPE_BOOLEAN - */ - public boolean isBoolean(); - - /** - * @return the integer value of the property type - */ - public int getType(); - - /** - * @return the array of values that comprise the enumeration - */ - public String[] getEnumValues(); - -}
\ No newline at end of file diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/IRSECallback.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/IRSECallback.java deleted file mode 100644 index 4af32dc4f..000000000 --- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/IRSECallback.java +++ /dev/null @@ -1,24 +0,0 @@ -/******************************************************************************** - * Copyright (c) 2007, 2008 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 - * - * Initial Contributors: - * The following IBM employees contributed to the Remote System Explorer - * component that contains this file: David McKnight. - * - * Contributors: - * David Dykstal (IBM) - [226561] Add API markup to RSE javadocs for extend / implement - ********************************************************************************/ -package org.eclipse.rse.core.model; - -import org.eclipse.core.runtime.IStatus; - -/** - * Implement this class to create callbacks. - */ -public interface IRSECallback { - - public void done(IStatus status, Object result); -} diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/IRSEModelObject.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/IRSEModelObject.java deleted file mode 100644 index f490fe1d3..000000000 --- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/IRSEModelObject.java +++ /dev/null @@ -1,32 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006, 2008 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * 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) - [226561] Add API markup to RSE javadocs for extend / implement - *******************************************************************************/ - -package org.eclipse.rse.core.model; - - -/** - * IRSEModelObject is the root type of all objects in the RSE model. - * @noimplement This interface is not intended to be implemented by clients. - * The standard implementations are included in the framework. - */ -public interface IRSEModelObject extends IPropertySetContainer, IRSEPersistableContainer { - - String getName(); - - String getDescription(); - -} diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/IRSEPersistableContainer.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/IRSEPersistableContainer.java deleted file mode 100644 index dc24359c3..000000000 --- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/IRSEPersistableContainer.java +++ /dev/null @@ -1,127 +0,0 @@ -/******************************************************************************** - * Copyright (c) 2006, 2008 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 - * - * 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) - adding new persistence support - * David Dykstal (IBM) - 142806: refactoring persistence framework - * David Dykstal (IBM) - [226561] Add API markup to RSE javadocs for extend / implement - ********************************************************************************/ - -package org.eclipse.rse.core.model; - -/** - * This is the interface for all objects that contain persistent data. - * The objects themselves may not have a persistent form, but can lie in the - * persistence hierarchy and be reconstructed when the persistent form is restored. - * An example of this is the SytemFilterPoolManager, which is itself not persisted, but - * has this interface since it can be reconstructed from its ordering and exists - * in the parent chain from SystemFilterPool to SystemProfile. - * @noimplement This interface is not intended to be implemented by clients. - * The standard implementations are included in the framework. - */ -public interface IRSEPersistableContainer { - - /** - * A constant indicating the presence of no children for a given container. - * This can be used when implementing {@link #getPersistableChildren()}. - * The value is an empty array. - */ - public static final IRSEPersistableContainer[] NO_CHILDREN = new IRSEPersistableContainer[0]; - - /** - * Request a persistence manager to persist this object. - * @return true if the object was persisted. - */ - public boolean commit(); - - /** - * An object was restored if it originated from a persistent form. - * @return true if the object was created from its persistent form, - * false if the object has never been persisted. - */ - public boolean wasRestored(); - - /** - * Sets the restored state of the object. Only persistence managers - * should do this. Persistable objects should be initially created with - * this as false and the persistence manager set this to true. - * This attribute is "sticky" in the face of most property changes. - * It should be set false if the object is renamed or re-parented. - * @param flag true if the object was restored. - */ - public void setWasRestored(boolean flag); - - /** - * An object is dirty if a change has been made to it that requires - * it to be persisted. - * @return true if the object is dirty - */ - public boolean isDirty(); - - /** - * <p>An object is dirty if a change has been made to it that requires - * it to be persisted. Objects should usually mark themselves dirty - * when a persistable change is made. However, there may be a need - * to mark related objects dirty as well. - * <p>Persistable changes are: - * <ul> - * <li>Any modification of a persistable attribute</li> - * <li>A rename</li> - * <li>A deletion of a child object</li> - * <li>A reordering of the list of child objects</li> - * <li>The addition of a child object</li> - * </ul> - * <p>A rename may also cause a parent to be marked dirty if the - * parent refers to the child by name. - * <p>Setting this value to false should be done only in the persistence - * manager after the object has been written to the DOM. - * <p>Marking an object as dirty must cause it and all of its ancestors - * in the persistence hierarchy to be marked as tainted. - * @param flag true if the object must be persisted. - */ - public void setDirty(boolean flag); - - /** - * An object is tainted if it contains an object that is dirty - * somewhere in its containment hierarchy. - * @return true if the object is tainted. - */ - public boolean isTainted(); - - /** - * Sets the tainted attribute for this object. This should set to - * true only by child objects when they have been marked dirty or tainted. - * Setting this to true will cause all parent objects in the containment - * hierarchy to be marked tainted. - * It should be set to false only by a persistence manager when the - * object has been committed. - * @param flag the tainted state of the object. - */ - public void setTainted(boolean flag); - - /** - * Retrieve the parent of this object in the persistence containment hierarchy. - * This is related to, but not necessarily the same as, the model hierarchy. - * @return the parent persistent object. This is null if there is no parent. - */ - public IRSEPersistableContainer getPersistableParent(); - - /** - * Retrieves the children of this object in the persistence containment hierarchy. - * This is related to, but not necessarily the same as, the model hierarchy. - * @return the array of persistent children in the order they are to be stored in the - * persistent form. This is an empty array if there are no children. - * See {@link #NO_CHILDREN}. - */ - public IRSEPersistableContainer[] getPersistableChildren(); - -}
\ No newline at end of file diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ISubSystemConfigurationCategories.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ISubSystemConfigurationCategories.java deleted file mode 100644 index a8a7ac0c0..000000000 --- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ISubSystemConfigurationCategories.java +++ /dev/null @@ -1,42 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 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 - * - * 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) - [226561] Add API markup to RSE javadocs for extend / implement - *******************************************************************************/ - -package org.eclipse.rse.core.model; - -/** - * Constants for predefined subsystem factory categories. Use these in calls to - * {@link org.eclipse.rse.core.model.ISystemRegistry#getHostsBySubSystemConfigurationCategory(String)}. - * - * @noimplement This interface is not intended to be implemented by clients. - * This is a constant interface. The individual items should be - * referenced directly. - */ -public interface ISubSystemConfigurationCategories { - /** - * Job subsystems - */ - public static final String SUBSYSTEM_CATEGORY_JOBS = "jobs"; //$NON-NLS-1$ - /** - * File subsystems - */ - public static final String SUBSYSTEM_CATEGORY_FILES = "files"; //$NON-NLS-1$ - /** - * Command subsystems - */ - public static final String SUBSYSTEM_CATEGORY_CMDS = "commands"; //$NON-NLS-1$ - -} diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ISubSystemConfigurator.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ISubSystemConfigurator.java deleted file mode 100644 index 799be5356..000000000 --- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ISubSystemConfigurator.java +++ /dev/null @@ -1,46 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2002, 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 - * - * 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) - [168976][api] move ISystemNewConnectionWizardPage from core to UI - * David Dykstal (IBM) - [226561] Add API markup to RSE javadocs for extend / implement - *******************************************************************************/ - -package org.eclipse.rse.core.model; - -import org.eclipse.rse.core.subsystems.ISubSystem; -import org.eclipse.rse.core.subsystems.ISubSystemConfiguration; - -/** - * An interface used to drive properties into a subsystem during host creation. - * - * This is an internal interface for use in the framework. Potential clients - * should extend one of the implementations or implement one of the extensions. - * - * @since org.eclipse.rse.core 3.0 - */ -public interface ISubSystemConfigurator { - - /** - * Return the subsystem configuration associated with these properties. - */ - public ISubSystemConfiguration getSubSystemConfiguration(); - - /** - * Apply the values herein to a subsystem. - * @param ss the subystem to be affected. - * @return true if the values were applied. - */ - public boolean applyValues(ISubSystem ss); - -} diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ISystemContainer.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ISystemContainer.java deleted file mode 100644 index 20fedfacd..000000000 --- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ISystemContainer.java +++ /dev/null @@ -1,61 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2004, 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 - * - * 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) - [226561] Add API markup to RSE javadocs for extend / implement - *******************************************************************************/ - -package org.eclipse.rse.core.model; - -/** - * ISystemContainer is an interface implemented by objects that can contain remote resources. - * @noimplement This interface is not intended to be implemented by clients. - * The standard implementations are included in the framework. - * These can be extended by clients. - */ -public interface ISystemContainer { - - /** - * Returns whether the object has contents of a particular type. - * @param contentsType type of contents - * @return <code>true</code> if the object has contents, <code>false</code> otherwise. - */ - public boolean hasContents(ISystemContentsType contentsType); - - /** - * Returns all the contents of the object (combining results of all filters - * @param contentsType type of contents - * @return an array of contents. - */ - public Object[] getContents(ISystemContentsType contentsType); - - /** - * Indicates whether the cached object is stale - * @return whether the container is stale - */ - public boolean isStale(); - - /** - * Marks the object as stale or not - * @param isStale whether the object is to be marked stale or not - */ - public void markStale(boolean isStale); - - /** - * Marks the object as stale or not - * @param isStale whether the object is to be marked stale or not - * @param clearCache indicates whether or not to clear the cache - */ - public void markStale(boolean isStale, boolean clearCache); - -} diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ISystemContentsType.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ISystemContentsType.java deleted file mode 100644 index 2ec0698d1..000000000 --- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ISystemContentsType.java +++ /dev/null @@ -1,38 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006, 2008 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * 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) - [226561] Add API markup to RSE javadocs for extend / implement - *******************************************************************************/ - -package org.eclipse.rse.core.model; - -/** - * Common interface for representing different contents types of artifacts that - * can be stored in an IRemoteContainer. - * - * @noimplement This interface is not intended to be implemented by clients. - */ -public interface ISystemContentsType { - /* - * Indicates the type of this contents - */ - public String getType(); - - /* - * Indicates whether or not the contents - * can be flushed or not when a container becomes - * stale. - */ - public boolean isPersistent(); -} diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ISystemHostPool.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ISystemHostPool.java deleted file mode 100644 index a778552e3..000000000 --- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ISystemHostPool.java +++ /dev/null @@ -1,240 +0,0 @@ -/******************************************************************************** - * Copyright (c) 2002, 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 - * - * 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: - * Martin Oberhuber (Wind River) - [184095] Replace systemTypeName by IRSESystemType - * Martin Oberhuber (Wind River) - [210534] Remove ISystemHostPool.getHostList() and setName() - * David Dykstal (IBM) - [210537] removed exception signalling from this interface, no longer needed - * David Dykstal (IBM) - [226561] Add API markup to RSE javadocs for extend / implement - ********************************************************************************/ - -package org.eclipse.rse.core.model; - -import org.eclipse.rse.core.IRSESystemType; -import org.eclipse.rse.core.IRSEUserIdConstants; - -/** - * An ordered list of connections ({@link IHost} objects), owned by an - * {@link ISystemProfile}. - * <p> - * Implementations of this interface are expected to be thread-safe in the sense - * that integrity of the host list is maintained even if multiple threads call - * multiple methods in this interface concurrently. - * </p> - * @noimplement This interface is not intended to be implemented by clients. - * The standard implementations are included in the framework. - */ -public interface ISystemHostPool extends IRSEPersistableContainer { - - /** - * Return the system profile that owns this connection pool. - * @return the system profile that owns this connection pool. - */ - public ISystemProfile getSystemProfile(); - - /** - * Return the name of this host pool. - * @return The value of the Name attribute. - */ - String getName(); - - /** - * Rename this connection pool. - * @param newName the new name for this connection pool. - */ - public void renameHostPool(String newName); - - /** - * Return array of connections in this pool. - * - * The returned array is a copy of the internal connection list. Modifications by - * clients will not affect the internal list of connections, but modifications to - * the array elements will affect the actual IHost objects maintained in the list. - * - * @return array of connections in this pool. - */ - public IHost[] getHosts(); - - /** - * Create a connection object, given only the minimal information. - * <p> - * THE RESULTING CONNECTION OBJECT IS ADDED TO THE LIST OF EXISTING CONNECTIONS FOR YOU. - * @param systemType system type matching one of the system types - * defined via the systemTypes extension point. - * @param aliasName unique connection name. - * @param hostName IP name or address of the host. - * @return IHost object, or null if it failed to create - * because the aliasName is not unique. All other errors throw an exception. - */ - public IHost createHost(IRSESystemType systemType, String aliasName, String hostName); - - /** - * Create a connection object, given all the possible attributes except default userId. - * <p> - * THE RESULTING CONNECTION OBJECT IS ADDED TO THE LIST OF EXISTING CONNECTIONS FOR YOU. - * @param systemType system type matching one of the system types - * defined via the systemTypes extension point. - * @param aliasName unique connection name. - * @param hostName IP name or address of the host. - * @param description optional description of the connection. Can be null. - * @return IHost object, or <code>null</code> if it failed to create - * because the aliasName is not unique. All other errors throw an exception. - */ - public IHost createHost(IRSESystemType systemType, String aliasName, String hostName, String description); - - /** - * Create a connection object, given all the possible attributes. - * <p> - * The new connection is added to the list and saved to disk. - * @param systemType system type matching one of the system types - * defined via the systemTypes extension point. - * @param aliasName unique connection name. - * @param hostName IP name or address of the host. - * @param description optional description of the connection. Can be null. - * @param defaultUserId userId to use as the default for the subsystems. - * @param defaultUserIdLocation where to set the given default user Id. See IRSEUserIdConstants for values. - * @return IHost object, or <code>null</code> if it failed to create - * because the aliasName is not unique. - * @see IRSEUserIdConstants - */ - public IHost createHost(IRSESystemType systemType, String aliasName, String hostName, String description, String defaultUserId, int defaultUserIdLocation); - - /** - * Update an existing connection given the new information. - * This method: - * <ul> - * <li>calls the setXXX methods on the given connection object, updating the information in it. - * <li>saves the connection to disk (renaming its folder if needed) - * </ul> - * <p> - * @param conn IHost to be updated - * @param systemType system type matching one of the system types - * defined via the systemType extension point. - * @param aliasName unique connection name. - * @param hostName IP name or address of the host. - * @param description optional description of the connection. Can be null. - * @param defaultUserId userId to use as the default for the subsystems. - * @param defaultUserIdLocation where to set the given default user Id from IRSEUserIdConstants. - * @see IRSEUserIdConstants - */ - public void updateHost(IHost conn, IRSESystemType systemType, String aliasName, String hostName, String description, String defaultUserId, int defaultUserIdLocation); - - /** - * Return a connection object, given its alias name. - * - * Can be used to test if an alias name is already used (non-null return). - * - * @param aliasName unique aliasName (case insensitive) to search on. - * @return IHost object with unique aliasName, or null if - * no connection object with this name exists. - */ - public IHost getHost(String aliasName); - - /** - * Return the connection at the given zero-based offset. - * @param pos zero-based offset of requested connection in the connection list. - * @return IHost object requested. - */ - public IHost getHost(int pos); - - /** - * Add a new connection to the list. - * <p> - * This method will not ensure that the added connection's alias name is - * different (case-insensitive) than all other existing alias names. - * Clients are responsible for maintaining this invariant. - * </p> - * @param conn Connection to add. Must not be <code>null</code>. - * @return <code>true</code> if the new connection was added successfully, false otherwise. - */ - public boolean addHost(IHost conn); - - /** - * Removes a given connection from the list and deletes it from disk. - * <p> - * This will: - * <ul> - * <li>Delete the connection in memory - * <li>Delete the underlying folder - * </ul> - * <p> - * @param conn IHost object to remove - */ - public void deleteHost(IHost conn); - - /** - * Renames a given connection in the list. - * This will: - * <ul> - * <li>Rename the profile in memory - * <li>Rename the underlying folder - * <li>Update the user preferences if this profile is currently active. - * </ul> - * @param conn IHost object to rename - * @param newName The new alias name to give that connection. - * The alias name is not checked for uniqueness. Clients are responsible - * themselves for ensuring that no two connections with the same alias - * name (compared case insensitive) are created. - */ - public void renameHost(IHost conn, String newName); - - /** - * Return the zero-based position of a connection object within this host pool. - * @param conn connection to find in this host pool. - * @return the zero-based position of the requested connection in this host pool, - * or -1 if the connection was not found. - */ - public int getHostPosition(IHost conn); - - /** - * Return the number of connections within this pool. - * @return the number of IHost objects within this pool. - */ - public int getHostCount(); - - /** - * Duplicates a given connection in this list within this list or another list. - * @param targetPool The ISystemHostPool to hold the copied connection. Can equal this pool, - * as long as alias name is unique. - * @param conn IHost object (within our pool) to clone. - * @param aliasName New, unique, alias name to give this connection. Clone will fail - * (returning <code>null</code> as result) if this is not unique. - * @return the cloned host, or <code>null</code> if the new alias name was not unique. - */ - public IHost cloneHost(ISystemHostPool targetPool, IHost conn, String aliasName); - - /** - * Move existing connections a given number of positions in the same pool. - * If the delta is negative, they are all moved up (left) by the given amount. If - * positive, they are all moved down (right) by the given amount.<p> - * <ul> - * <li>After the move, the pool containing the moved connection is saved to disk. - * <li>The connection's alias name must be unique in pool. - * </ul> - * <b>TODO PROBLEM: CAN'T RE-ORDER FOLDERS SO CAN WE SUPPORT THIS ACTION?</b> - * @param conns an Array of hosts to move, can be empty but must not be null. - * @param delta the amount by which to move the hosts within this pool - */ - public void moveHosts(IHost conns[], int delta); - - /** - * Order connections by alias name, in the order given by the names parameter. - * - * Called after restore to order by user preferences. Alias names are case-insensitive. - * Existing connections in the internal connection list that do not match any - * alias name in the given name list, will be deleted from this host pool! - * - * @param names list of connection alias names in expected order. - */ - public void orderHosts(String[] names); - -}
\ No newline at end of file diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ISystemMessageObject.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ISystemMessageObject.java deleted file mode 100644 index 11e9d6dd6..000000000 --- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ISystemMessageObject.java +++ /dev/null @@ -1,77 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2002, 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 - * - * 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) - [226561] Add API markup to RSE javadocs for extend / implement - *******************************************************************************/ - -package org.eclipse.rse.core.model; - -/** - * This interface represents a message we wish to display as child node in the tree view. - * @noimplement This interface is not intended to be implemented by clients. - * The standard implementations are included in the framework. - */ -public interface ISystemMessageObject { - /** - * 0. An error occurred. - */ - public static final int MSGTYPE_ERROR = 0; - /** - * 1. User cancelled - */ - public static final int MSGTYPE_CANCEL = 1; - /** - * 3. Informational text - */ - public static final int MSGTYPE_INFO = 2; - /** - * 4. Empty list. Eg "Nothing meets subset criteria" - */ - public static final int MSGTYPE_EMPTY = 3; - /** - * 5. Object created successfully. - */ - public static final int MSGTYPE_OBJECTCREATED = 4; - - /** - * Return the message text shown for the label. - * The translated text is pre-determined from the message type. - */ - public String getMessage(); - - /** - * Return the type of message: - * <ul> - * <li>{@link #MSGTYPE_ERROR} - * <li>{@link #MSGTYPE_CANCEL} - * <li>{@link #MSGTYPE_INFO} - * <li>{@link #MSGTYPE_EMPTY} - * <li>{@link #MSGTYPE_OBJECTCREATED} - * </ul> - */ - public int getType(); - - /** - * Return the parent object in the tree. That is, what was expanded to produce this message - */ - public Object getParent(); - - /** - * isTransient determines if the message should be removed from the - * tree when the parent item in the tree is collapsed. - * - * @return true if the item should be removed, false if it should not - */ - public boolean isTransient(); -} diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ISystemModifiableContainer.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ISystemModifiableContainer.java deleted file mode 100644 index 2afd3de49..000000000 --- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ISystemModifiableContainer.java +++ /dev/null @@ -1,31 +0,0 @@ -/********************************************************************************* - * Copyright (c) 2008 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 - * - * Contributors: - * David Dykstal (IBM) - [224671] [api] org.eclipse.rse.core API leaks non-API types - * David Dykstal (IBM) - [226561] Add API markup to RSE javadocs for extend / implement - *********************************************************************************/ - -package org.eclipse.rse.core.model; - -/** - * A modifiable container allows its contents to be set directly. - * - * @noimplement This interface is not intended to be implemented by clients. The - * standard implementations are included in the framework. - * - * @since org.eclipse.rse.core 3.0 - */ -public interface ISystemModifiableContainer extends ISystemContainer { - - /** - * Cache contents of a certain type. - * @param type the contents type. - * @param cachedContents the contents to cache. - */ - public void setContents(ISystemContentsType type, Object[] cachedContents); - -} diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ISystemProfile.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ISystemProfile.java deleted file mode 100644 index 8f20539c9..000000000 --- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ISystemProfile.java +++ /dev/null @@ -1,160 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2002, 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 - * - * 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) - 142806: refactoring persistence framework - * Martin Oberhuber (Wind River) - [184095] Replace systemTypeName by IRSESystemType - * David Dykstal (IBM) - [197036] removed createHost() shortcut (should use ISystemRegistry), - * cleaned javadoc for getFilterPools() - * David Dykstal (IBM) - [202630] getDefaultPrivateProfile() and ensureDefaultPrivateProfile() are inconsistent - * David Dykstal (IBM) - [200735][Persistence] Delete a profile that contains a connection and restart, profile is back without connections - * David Dykstal (IBM) - [226561] Add API markup to RSE javadocs for extend / implement - * David Dykstal (IBM) - [235800] Document naming restriction for profiles and filter pools - *******************************************************************************/ - -package org.eclipse.rse.core.model; - -import org.eclipse.rse.core.filters.ISystemFilterPool; -import org.eclipse.rse.core.subsystems.ISubSystemConfiguration; -import org.eclipse.rse.persistence.IRSEPersistenceProvider; - -/** - * A system profile holds definitions for hosts - * (connections), filter pools, filters, and filter strings. - * It is the unit of persistence for those definitions. Individual - * hosts and filter pool definitions always reside in a profile and the profile - * itself is the entity that is saved and restored. - * <p> - * Profiles may be active or inactive. An active profile contributes its - * definitions to RSE. When made inactive, it those definition are no longer - * available for use. - * <p> - * @noimplement This interface is not intended to be implemented by clients. - * The standard implementations are included in the framework. - */ -public interface ISystemProfile extends IRSEModelObject { - - /** - * Set the in-memory pointer back to the parent system profile manager - */ - public void setProfileManager(ISystemProfileManager mgr); - - /** - * Get the in-memory pointer back to the parent system profile manager - */ - public ISystemProfileManager getProfileManager(); - - /** - * @return The value of the Name attribute - */ - String getName(); - - /** - * Sets the name of the profile. - * Profile names must not contain three consecutive underscores "___", since these are used - * to separate a profile name from a filter pool name in a filter pool reference. - * @param value The new value of the Name attribute - * @throws IllegalArgumentException if the name contains three consecutive underscore characters. - */ - void setName(String value); - - /** - * @return The value of the DefaultPrivate attribute - * Is this profile created automatically, and is it the profile - * that is unique for this developer? - */ - boolean isDefaultPrivate(); - - /** - * @generated This field/method will be replaced during code generation - * @param value The new value of the DefaultPrivate attribute - */ - void setDefaultPrivate(boolean value); - - /** - * Return all connections for this profile - */ - public IHost[] getHosts(); - - /** - * @return all existing filter pools for this profile. - */ - public ISystemFilterPool[] getFilterPools(); - - /** - * Return all filter pools for this profile, scoped by a given subsystem factory - */ - public ISystemFilterPool[] getFilterPools(ISubSystemConfiguration ssf); - - /** - * Return true if this profile is currently active. - * An active profile is one that whose connections and filter pools are available - * for use by RSE. A profile may be loaded but be inactive. - * The active state of a profile is remembered from session to session. - */ - public boolean isActive(); - - /** - * Activates or deactivates a profile. If the profile is already in the - * requested state, this will do nothing. The default private system profile - * cannot be deactivated and such a request will be ignored. - * @param flag true to activate the profile, false to deactivate it. - * @see ISystemProfile#isActive() - */ - public void setActive(boolean flag); - - /** - * Suspend this profile. - * Suspended profiles ignore commit requests. - * Profiles are created in a non-suspended state. - * Profiles should be suspended while deleting their contents prior to their own deletion. - * Note that being non-suspended is a different condition than being active. - * A suspended profile may be resumed. - * @since 3.0 - * @see #resume() - */ - public void suspend(); - - /** - * Resume this profile from a suspended state. - * The profile will now honor commit requests. - * @since 3.0 - * @see #suspend() - */ - public void resume(); - - /** - * @return true if the profile is in a suspended state - * @since 3.0 - * @see #suspend() - * @see #resume() - */ - public boolean isSuspended(); - - /** - * Each profile is persisted by a persistence provider. This returns the instance of the - * persistence provider used for this profile. New profiles will use the default persistence - * provider unless one is set by some other means. - * @return The persistence provider used for saving and restoring this profile. - */ - public IRSEPersistenceProvider getPersistenceProvider(); - - /** - * Sets the persistence provider for the use of this profile. If this is not called then - * this profile will be persisted by the default persistence provider. This will typically - * be set by either a persistence persistence provider when restoring a profile or by a migration - * utility when converting profiles from one form to another. - * @param provider the persistence provider to use when saving this profile. - */ - public void setPersistenceProvider(IRSEPersistenceProvider provider); -} diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ISystemProfileManager.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ISystemProfileManager.java deleted file mode 100644 index 688d7b400..000000000 --- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ISystemProfileManager.java +++ /dev/null @@ -1,145 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2002, 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 - * - * 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) - [197036] added commitSystemProfile operation to interface - * David Dykstal (IBM) - [202630] getDefaultPrivateProfile() and ensureDefaultPrivateProfile() are inconsistent - * Martin Oberhuber (Wind River) - [cleanup] Add API "since" Javadoc tags - * David Dykstal (IBM) - [226561] Add API markup to RSE javadocs for extend / implement - *******************************************************************************/ - -package org.eclipse.rse.core.model; - -import org.eclipse.core.runtime.IStatus; - -/** - * Manages a list of SystemProfile objects. System profiles should be created, - * deleted, restored, activated, and deactivated though this interface if event - * processing is not desired. If events are necessary then the system registry - * should be used. - * - * @noimplement This interface is not intended to be implemented by clients. - * The standard implementations are included in the framework. - */ -public interface ISystemProfileManager { - - /** - * Create a new profile with the given name, and add to the list. - * The name must be unique within the existing list. - * <p> - * @param name What to name this profile - * @param makeActive true if this profile is to be added to the active profile list. - * @return new profile, or null if name not unique. - */ - public ISystemProfile createSystemProfile(String name, boolean makeActive); - - /** - * Toggle an existing profile's state between active and inactive. - * The default private profile cannot be deactivated and such a request will be ignored. - * @param profile the profile to (in)activate - * @param makeActive the state to make this profile - */ - public void makeSystemProfileActive(ISystemProfile profile, boolean makeActive); - - /** - * @return an array of all existing profiles. This is guaranteed to contain the - * default private profile. - */ - public ISystemProfile[] getSystemProfiles(); - - /** - * @return the number of profiles known to this manager. - */ - public int getSize(); - - /** - * @return an array of all existing profile names. - */ - public String[] getSystemProfileNames(); - - /** - * Get a profile given its name. - * @param name the name of the profile - * @return the profile - */ - public ISystemProfile getSystemProfile(String name); - - /** - * @return the profiles identified via preferences as the active profiles... - */ - public ISystemProfile[] getActiveSystemProfiles(); - - /** - * @return the profile names currently selected by the user as his "active" profiles - */ - public String[] getActiveSystemProfileNames(); - - /** - * @return the default private profile created at first touch. - * Will return null if it has been renamed. - */ - public ISystemProfile getDefaultPrivateSystemProfile(); - - /** - * @return the default team profile created at first touch. - * Will return null if it has been renamed. - */ - public ISystemProfile getDefaultTeamSystemProfile(); - - /** - * Rename the given profile. - * @param profile the profile to rename - * @param newName the new profile name - */ - public void renameSystemProfile(ISystemProfile profile, String newName); - - /** - * Delete the given profile. The default private profile cannot be deleted and such a request will be ignored. - * @param profile the name of the profile to delete. - * @param persist true if the deletion is meant to be persisted as well, false if the deletion is just in the - * model. - */ - public void deleteSystemProfile(ISystemProfile profile, boolean persist); - - /** - * Clone the given profile - * @param profile the profile to clone - * @param newName the name of the new profile - * @return the new profile - */ - public ISystemProfile cloneSystemProfile(ISystemProfile profile, String newName); - - /** - * Commit a system profile - * - * @param profile the profile to commit - * @return a status object indicating the result of the commit - * @since org.eclipse.rse.core 3.0 - */ - public IStatus commitSystemProfile(ISystemProfile profile); - - /** - * Get an indication of whether a profile is active or not. - * @param profileName the name of the profile to test - * @return true if the given profile is active - * @see ISystemProfile#isActive() - */ - public boolean isSystemProfileActive(String profileName); - - /** - * Adds a system profile to this profile manager. - * @param profile The system profile to add. - */ - public void addSystemProfile(ISystemProfile profile); - -} diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ISystemRegistry.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ISystemRegistry.java deleted file mode 100644 index ac1d54787..000000000 --- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ISystemRegistry.java +++ /dev/null @@ -1,984 +0,0 @@ -/******************************************************************************** - * Copyright (c) 2006, 2008 IBM Corporation and others. All rights reserved. - * This program and the accompanying materials are made available under the terms - * of the Eclipse Public License v1.0 which accompanies this distribution, and is - * available at 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: - * Martin Oberhuber (Wind River) - [168975] Move RSE Events API to Core - * Martin Oberhuber (Wind River) - [184095] Replace systemTypeName by IRSESystemType - * Martin Oberhuber (Wind River) - [177523] Unify singleton getter methods - * Martin Oberhuber (Wind River) - [186128] Move IProgressMonitor last in all API - * Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry - * Martin Oberhuber (Wind River) - [189123] Prepare ISystemRegistry for move into non-UI - * Martin Oberhuber (Wind River) - [175680] Deprecate obsolete ISystemRegistry methods - * Martin Oberhuber (Wind River) - [190271] Move ISystemViewInputProvider to Core - * David McKnight (IBM) - [207100] adding ISystemRegistry.isRegisteredSystemRemoteChangeListener - * David Dykstal (IBM) - [197036] adding new createHost and getSubSystemConfigurationsBySYstemType which - * are able to delay the creation of subsystems. - * David Dykstal (IBM) - [217556] remove service subsystem types - * Martin Oberhuber (Wind River) - [215820] Move SystemRegistry implementation to Core - * David Dykstal (IBM) - [202630] getDefaultPrivateProfile() and ensureDefaultPrivateProfile() are inconsistent - * Martin Oberhuber (Wind River) - [cleanup] Add API "since" Javadoc tags - * David Dykstal (IBM) - [168976][api] move ISystemNewConnectionWizardPage from core to UI - * David Dykstal (IBM) - [226561] Add API markup to RSE javadocs for extend / implement - * David Dykstal (IBM) - [235800] Document naming restriction for profiles and filter pools - * David Dykstal (IBM) - [236516] Bug in user code causes failure in RSE initialization - ********************************************************************************/ - -package org.eclipse.rse.core.model; - -import java.util.List; -import java.util.Vector; - -import org.eclipse.core.runtime.IAdaptable; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.jobs.ISchedulingRule; -import org.eclipse.rse.core.IRSESystemType; -import org.eclipse.rse.core.events.ISystemModelChangeEvent; -import org.eclipse.rse.core.events.ISystemModelChangeListener; -import org.eclipse.rse.core.events.ISystemPreferenceChangeEvent; -import org.eclipse.rse.core.events.ISystemPreferenceChangeListener; -import org.eclipse.rse.core.events.ISystemRemoteChangeEvent; -import org.eclipse.rse.core.events.ISystemRemoteChangeListener; -import org.eclipse.rse.core.events.ISystemResourceChangeEvent; -import org.eclipse.rse.core.events.ISystemResourceChangeListener; -import org.eclipse.rse.core.filters.ISystemFilterStartHere; -import org.eclipse.rse.core.subsystems.IConnectorService; -import org.eclipse.rse.core.subsystems.ISubSystem; -import org.eclipse.rse.core.subsystems.ISubSystemConfiguration; -import org.eclipse.rse.core.subsystems.ISubSystemConfigurationProxy; -import org.eclipse.rse.internal.core.RSECoreRegistry; - -/** - * Registry or front door for all remote system connections. There is a - * singleton of the class implementation of this interface. To get it, call the - * {@link org.eclipse.rse.core.RSECorePlugin#getTheSystemRegistry()}. - * <p> - * The idea here is that connections are grouped by system profile. At any time, - * there is a user-specified number of profiles "active" and connections from - * each active profile are worked with. - * </p> - * @noimplement This interface is not intended to be implemented by clients. - * The standard implementations are included in the framework. - */ -public interface ISystemRegistry extends ISchedulingRule, IAdaptable, ISystemViewInputProvider { - - /** - * Get the SystemFilterStartHere singleton instance. - * @return the SystemFilterStartHere singleton instance. - */ - public ISystemFilterStartHere getSystemFilterStartHere(); - - // ---------------------------- - // SUBSYSTEM FACTORY METHODS... - // ---------------------------- - - /** - * Public method to retrieve list of subsystem factory proxies registered by extension points. - */ - public ISubSystemConfigurationProxy[] getSubSystemConfigurationProxies(); - - /** - * Return all subsystem factory proxies matching a subsystem factory category. - * @see ISubSystemConfigurationCategories - */ - public ISubSystemConfigurationProxy[] getSubSystemConfigurationProxiesByCategory(String factoryCategory); - - /** - * Return all subsystem factories. - * - * Be careful when you call this, as it activates all subsystem configurations. - * @deprecated use {@link #getSubSystemConfigurationProxies()} and filter the - * list of needed subsystem configurations in order to activate only those - * that are really needed. - */ - public ISubSystemConfiguration[] getSubSystemConfigurations(); - - /** - * Return the subsystem configuration, given its plugin.xml-declared id. - */ - public ISubSystemConfiguration getSubSystemConfiguration(String id); - - /** - * Return all subsystem configurations which support the given system type. - * If the type is null, returns all subsystem configurations. Fully - * equivalent to getSubSystemConfigurationsBySystemType(systemType, - * filterDuplicates, <code>true</code>) which is preferred since we do not - * want to load subsystem configurations unless necessary. - * - * @param systemType system type to filter - * @param filterDuplicates if true and the subsystem configuration uses - * services then return only one subsystem configuration that - * supports this service. Which configuration is returned is - * undefined. - * @return an array of subsystem configurations meeting the criteria - * - * @deprecated Use - * {@link #getSubSystemConfigurationsBySystemType(IRSESystemType,boolean,boolean)} - * instead in order to avoid instantiating subsystem - * configurations if possible. - */ - public ISubSystemConfiguration[] getSubSystemConfigurationsBySystemType(IRSESystemType systemType, boolean filterDuplicates); - - /** - * Return all subsystem configurations which support the given system type. - * If the type is null, returns all subsystem configurations. - * - * @param systemType system type to filter - * @param filterDuplicates if true and the subsystem configuration uses - * services then return only one subsystem configuration that - * supports this service. Which configuration is returned is - * undefined. - * @param activate if true activate the respective configurations if not - * already active, if false return only those that are already - * active. - * @return an array of subsystem configurations meeting the criteria - * @since org.eclipse.rse.core 3.0 - */ - public ISubSystemConfiguration[] getSubSystemConfigurationsBySystemType(IRSESystemType systemType, boolean filterDuplicates, boolean activate); - - // ---------------------------------- - // SYSTEMVIEWINPUTPROVIDER METHODS... - // ---------------------------------- - - /** - * This method is called by the connection adapter when the user expands - * a connection. This method must return the child objects to show for that - * connection. - * @param selectedConnection the connection undergoing expansion - * @return the list of objects under the connection - */ - public Object[] getConnectionChildren(IHost selectedConnection); - - /** - * This method is called by the connection adapter when deciding to show a plus-sign - * or not beside a connection. - * @param selectedConnection the connection being shown in the viewer - * @return true if this connection has children to be shown. - */ - public boolean hasConnectionChildren(IHost selectedConnection); - - // ---------------------------- - // PROFILE METHODS... - // ---------------------------- - /** - * Return singleton profile manager - */ - public ISystemProfileManager getSystemProfileManager(); - - /** - * Return the profiles currently selected by the user as his "active" profiles - * @see ISystemProfileManager#getActiveSystemProfiles() - */ - public ISystemProfile[] getActiveSystemProfiles(); - - /** - * Get a SystemProfile given its name - */ - public ISystemProfile getSystemProfile(String profileName); - - /** - * Create a SystemProfile given its name and whether or not to make it active - * Note that there are some naming restrictions on profile names. - * @see ISystemProfile#setName(String) - */ - public ISystemProfile createSystemProfile(String profileName, boolean makeActive) throws Exception; - - /** - * Copy a SystemProfile. All connections connection data is copied. - * Note that there are some naming restrictions on profile names. - * @see ISystemProfile#setName(String) - * @param profile Source profile to copy - * @param newName Unique name to give copied profile - * @param makeActive whether to make the copied profile active or not - * @param monitor Progress monitor to reflect each step of the operation - * @return new SystemProfile object - */ - public ISystemProfile copySystemProfile(ISystemProfile profile, String newName, boolean makeActive, IProgressMonitor monitor) throws Exception; - - /** - * Rename a SystemProfile. Rename is propagated to all subsystem factories so - * they can rename their filter pool managers and whatever else is required. - * Note that there are some naming restrictions on profile names. - * @see ISystemProfile#setName(String) - */ - public void renameSystemProfile(ISystemProfile profile, String newName) throws Exception; - - /** - * Delete a SystemProfile. Prior to physically deleting the profile, we delete all - * the connections it has, all the subsystems they have. - * The default private profile cannot be deleted and such a request will be ignored. - * <p> - * As well, all the filter pools for this profile are deleted, and subsequently any - * cross references from subsystems in connections in other profiles are removed. - * <p> - * A delete event is fired for every connection deleted. - */ - public void deleteSystemProfile(ISystemProfile profile) throws Exception; - - /** - * Make or unmake the given profile active. - * The default private profile cannot be deactivated and such - * a request will be ignored. - */ - public void setSystemProfileActive(ISystemProfile profile, boolean makeActive); - - /** - * Return the list of connector services currently configured for the given host - * @param host the host - * @return the list of connector services - */ - public IConnectorService[] getConnectorServices(IHost host); - - // ---------------------------- - // SUBSYSTEM METHODS... - // ---------------------------- - - /** - * Return list of subsystem objects for a given host. - * @param host the host for which to return the subsystems that are currently known. - * @return an array of subsystem objects known to this host. - */ - public ISubSystem[] getSubSystems(IHost host); - - /** - * Return list of subsystem objects for a given connection. - * @param host the host for which to return the subsystems that are known. - * @param force if true, force the creation of subsystems for which the system type of this host is configured. - * Use this parameter with care since it can cause extensive initialization. - * @return the list of subsystems known to this host, possibly after the creation of subsystems. - * @deprecated Use {@link #getSubSystems(IHost)} instead, the "force" parameter is now ignored. - */ - public ISubSystem[] getSubSystems(IHost host, boolean force); - - /** - * Get those subsystems that are registered against a given connection, - * which are an instance of the given interface class. - * </p> - * @param host the connection to check - * @param subsystemInterface the interface class to filter against - * @return list of matching subsystems - */ - public ISubSystem[] getSubsystems(IHost host, Class subsystemInterface); - - /** - * Get those subsystems that are registered against a given connection, - * which are service subsystems with the given serviceType. - * </p> - * @param host the host to check - * @param serviceType the class of service to ask for - * @return list of matching subsystems - */ - public ISubSystem[] getServiceSubSystems(IHost host, Class serviceType); - - /** - * Resolve a subsystem from it's absolute name - * The absolute name of a subsystem - * is denoted by <I>profileName</I>.<I>connectionName</I>:<I>subsystemConfigurationId</I> - * @param absoluteSubSystemName the name of the subsystem - * @return the subsystem or null if the profile, connection, or subsystem configuration cannot be found. - */ - public ISubSystem getSubSystem(String absoluteSubSystemName); - - /** - * Return the absolute name for the specified subsystem - * @param subsystem the subsystem to query - * @return the absolute name of the subsystem - */ - public String getAbsoluteNameForSubSystem(ISubSystem subsystem); - - /** - * Return the absolute name for the specified host (connection) - * @param host the host (aka connection) object to query - * @return the absolute name of the host - */ - public String getAbsoluteNameForConnection(IHost host); - - /** - * Get a list of subsystem objects for given connection, owned by a subsystem factory - * that is of the given category. Array will never be null but may be length zero. - * <p> - * This looks for a match on the "category" of the subsystem factory's xml declaration - * in its plugin.xml file. - * - * @see org.eclipse.rse.core.model.ISubSystemConfigurationCategories - * @deprecated use {@link #getSubSystemConfigurationProxiesByCategory(String)} - * and instantiate only those subsystem configurations from the proxy - * that are really needed. Then, use {@link ISubSystemConfiguration#getSubSystems(boolean)} - * with a parameter true. - */ - public ISubSystem[] getSubSystemsBySubSystemConfigurationCategory(String factoryCategory, IHost host); - - /** - * Delete a subsystem object. This code finds the factory that owns it and - * delegates the request to that factory. - */ - public boolean deleteSubSystem(ISubSystem subsystem); - - // ---------------------------- - // CONNECTION METHODS... - // ---------------------------- - /** - * Return the first connection to the local host we can find. - * - * While we always create a default one in the user's profile, it is possible that - * this profile is not active or the connection was deleted. However, since any - * connection to the local host will usually do, we just search all active profiles - * until we find one, and return it. <br> - * If no connection to the local host can be found, this will return <code>null</code>. - * If one is needed, it can be created easily by calling - * {@link #createLocalHost(ISystemProfile, String, String)}. - */ - public IHost getLocalHost(); - - /** - * Return all connections in all active profiles. - */ - public IHost[] getHosts(); - - /** - * Return all connections in a given profile. - */ - public IHost[] getHostsByProfile(ISystemProfile profile); - - /** - * Return all connections for which there exists one or more - * subsystems owned by a given subsystem configuration. - * @see #getSubSystemConfiguration(String) - */ - public IHost[] getHostsBySubSystemConfiguration(ISubSystemConfiguration config); - - /** - * Return all connections for which there exists one or more - * subsystems owned by any a given subsystem configuration - * that is of the given category. - * <p> - * This looks for a match on the "category" of the subsystem - * configuration's xml declaration in its plugin.xml file. - * Thus, it is efficient as it need not bring to life a - * subsystem configuration just to test its parent class type. - * - * @see org.eclipse.rse.core.model.ISubSystemConfigurationCategories - */ - public IHost[] getHostsBySubSystemConfigurationCategory(String factoryCategory); - - /** - * Returns all connections for all active profiles, for the given system type. - * If the specified system type is null, an empty array is returned. - * In order to get an IRSESystemType, use - * <code>RSECorePlugin.getTheCoreRegistry().{@link RSECoreRegistry#getSystemTypeById(String) getSystemTypeById(String)}</code> - * - * @param systemType The system type instance. - * @return The list of connections or an empty array. - */ - public IHost[] getHostsBySystemType(IRSESystemType systemType); - - /** - * Return all connections for all active profiles, for the given system types. - * - * In order to get an IRSESystemType, use - * <code>RSECorePlugin.getTheCoreRegistry().{@link RSECoreRegistry#getSystemTypeById(String) getSystemTypeById(String)}</code> - */ - public IHost[] getHostsBySystemTypes(IRSESystemType[] systemTypes); - - /** - * Return a SystemConnection object given a system profile containing it, - * and a connection name uniquely identifying it. - */ - public IHost getHost(ISystemProfile profile, String connectionName); - - /** - * Return the zero-based position of a SystemConnection object within - * its profile. - */ - public int getHostPosition(IHost conn); - - /** - * Return the number of SystemConnection objects within the given profile. - */ - public int getHostCount(ISystemProfile profile); - - /** - * Return the number of SystemConnection objects within the given - * connection's owning profile. - */ - public int getHostCountWithinProfile(IHost conn); - - /** - * Return the number of SystemConnection objects within all active - * profiles. - */ - public int getHostCount(); - - /** - * Return a vector of previously-used connection names in the given profile. - * @return Vector of String objects. - */ - public Vector getHostAliasNames(ISystemProfile profile); - - /** - * Return a vector of previously-used connection names in all active profiles. - */ - public Vector getHostAliasNamesForAllActiveProfiles(); - - /** - * Return array of previously specified host names for a given system type. - * After careful consideration, it is decided that if the system type is null, - * then no host names should be returned. Previously all for all types were returned. - */ - public String[] getHostNames(IRSESystemType systemType); - - /** - * Convenience method to create a local connection, as it often that one is needed - * for access to the local file system. - * @param profile - the profile to create this connection in. If null is passed, we first - * try to find the default private profile and use it, else we take the first active profile. - * @param name - the name to give this profile. Must be unique and non-null. - * @param userId - the user ID to use as the default for the subsystems. Can be null. - */ - public IHost createLocalHost(ISystemProfile profile, String name, String userId); - - /** - * Create a host object, sometimes called a "connection", - * given the containing profile and given all the possible attributes. - * The profile is then scheduled to be persisted. - * <p> - * This method: - * <ul> - * <li>creates and saves a new connection within the given profile - * <li>calls all subsystem factories to give them a chance to create a subsystem instance - * <li>fires an ISystemResourceChangeEvent event of type EVENT_ADD to all registered listeners - * </ul> - * <p> - * @param profileName Name of the system profile the connection is to be added to. - * @param systemType system type matching one of the system types - * defined via the systemTypes extension point. - * @param connectionName unique connection name. - * @param hostName ip name of host. - * @param description optional description of the connection. Can be null. - * @param defaultUserId userId to use as the default for the subsystems. - * @param defaultUserIdLocation one of the constants in {@link org.eclipse.rse.core.IRSEUserIdConstants} - * that tells us where to store the user Id - * @param configurators these are the configurators supplied by the subsystem configurations that pertain to the specified system type. Else null. - * @return SystemConnection object, or null if it failed to create. This is typically - * because the connectionName is not unique. Call getLastException() if necessary. - * @since 3.0 - */ - public IHost createHost(String profileName, IRSESystemType systemType, String connectionName, String hostName, String description, String defaultUserId, int defaultUserIdLocation, - ISubSystemConfigurator[] configurators) throws Exception; - - /** - * Create a connection object. This is a simplified version - * <p> - * THE RESULTING CONNECTION OBJECT IS ADDED TO THE LIST OF EXISTING CONNECTIONS FOR YOU, IN - * THE PROFILE YOU SPECIFY. THE PROFILE IS ALSO SAVED TO DISK. - * <p> - * This method: - * <ul> - * <li>creates and saves a new connection within the given profile - * <li>calls all subsystem factories to give them a chance to create a subsystem instance - * <li>fires an ISystemResourceChangeEvent event of type EVENT_ADD to all registered listeners - * </ul> - * <p> - * @param profileName Name of the system profile the connection is to be added to. - * @param systemType system type matching one of the system types - * defined via the systemTypes extension point. - * @param connectionName unique connection name. - * @param hostName ip name of host. - * @param description optional description of the connection. Can be null. - * @return SystemConnection object, or null if it failed to create. This is typically - * because the connectionName is not unique. Call getLastException() if necessary. - */ - public IHost createHost(String profileName, IRSESystemType systemType, String connectionName, String hostName, String description) throws Exception; - - /** - * Create a connection object. This is a very simplified version that defaults to the user's - * private profile, or the first active profile if there is no private profile. - * <p> - * THE RESULTING CONNECTION OBJECT IS ADDED TO THE LIST OF EXISTING CONNECTIONS FOR YOU, IN - * THE DEFAULT PRIVATE PROFILE, WHICH IS SAVED TO DISK. - * <p> - * This method: - * <ul> - * <li>creates and saves a new connection within the given profile - * <li>calls all subsystem factories to give them a chance to create a subsystem instance - * <li>fires an ISystemResourceChangeEvent event of type EVENT_ADD to all registered listeners - * </ul> - * <p> - * @param systemType system type matching one of the system types - * defined via the systemTypes extension point. - * @param connectionName unique connection name. - * @param hostAddress ip name of host. - * @param description optional description of the connection. Can be null. - * @return SystemConnection object, or null if it failed to create. This is typically - * because the connectionName is not unique. Call getLastException() if necessary. - */ - public IHost createHost(IRSESystemType systemType, String connectionName, String hostAddress, String description) throws Exception; - - /** - * Create a host object. The resulting host object is added to the list of - * existing host objects in the specified profile. - * <ul> - * <li>creates and saves a new host within the given profile - * <li>optionally creates subsystem instances - * <li>fires an ISystemResourceChangeEvent event of type EVENT_ADD to all - * registered listeners - * </ul> - * <p> - * - * @param profileName Name of the system profile to which the host is to be - * added. - * @param systemType system type of the new host. - * @param hostName unique host name within the profile. - * @param hostAddress ip name of host. - * @param description optional description of the connection. May be null. - * @param createSubSystems <code>true</code> to create subsystems for the - * host, <code>false</code> otherwise. - * @return IHost object, or null if it failed to create. This is typically - * because the hostName is not unique. Call getLastException() if - * necessary. - * @since org.eclipse.rse.core 3.0 - */ - public IHost createHost(String profileName, IRSESystemType systemType, String hostName, String hostAddress, String description, boolean createSubSystems) throws Exception; - - /** - * Update an existing host given the new information. - * This method: - * <ul> - * <li>calls the setXXX methods on the given host object, updating the information in it. - * <li>save the host's host pool to disk - * <li>fires an ISystemResourceChangeEvent event of type EVENT_CHANGE to all registered listeners - * <li>if the system type or host name is changed, calls disconnect on each associated subsystem. - * We must do this because a host name changes fundamentally affects the connection, - * rendering any information currently displayed under - * that host obsolete. - * </ul> - * <p> - * @param host the host to be updated - * @param systemType system type matching one of the system types - * defined via the systemTypes extension point. - * @param connectionName unique connection name. - * @param hostName ip name of host. - * @param description optional description of the host. Can be null. - * @param defaultUserId userId to use as the default for the subsystems under this host. - * @param defaultUserIdLocation one of the constants in {@link org.eclipse.rse.core.IRSEUserIdConstants} - * that tells us where to set the user Id - */ - public void updateHost(IHost host, IRSESystemType systemType, String connectionName, - String hostName, String description, - String defaultUserId, int defaultUserIdLocation); - - /** - * Creates subsystems for a given host and subsystem configurations. - * If a subsystem cannot be created then null is returned in its corresponding place in the returned array. - * @param host the host. - * @param configurations the subsystem configurations. - * @return the array of subsystems corresponding to the array of given configurations. - * @since 2.0 - */ - public ISubSystem[] createSubSystems(IHost host, ISubSystemConfiguration[] configurations); - - /** - * Update the workoffline mode for a connection. - * - * @param conn SystemConnection to change - * @param offline true if connection should be set offline, false if it should be set online - */ - public void setHostOffline(IHost conn, boolean offline); - - /** - * Delete an existing connection. - * <p> - * Lots to do here: - * <ul> - * <li>Delete all subsystem objects for this connection, including their file's on disk. - * <li>Delete the connection from memory. - * <li>Delete the connection's folder from disk. - * </ul> - * Assumption: firing the delete event is done elsewhere. Specifically, the doDelete method of SystemView. - */ - public void deleteHost(IHost conn); - - /** - * Renames an existing connection. - * <p> - * Lots to do here: - * <ul> - * <li>Reset the conn name for all subsystem objects for this connection - * <li>Rename the connection in memory. - * <li>Rename the connection's folder on disk. - * </ul> - * Assumption: firing the rename event is done elsewhere. Specifically, the doRename method of SystemView. - */ - public void renameHost(IHost conn, String newName) throws Exception; - - /** - * Move existing connections a given number of positions in the same profile. - * If the delta is negative, they are all moved up by the given amount. If - * positive, they are all moved down by the given amount.<p> - * <ul> - * <li>After the move, the pool containing the moved connection is saved to disk. - * <li>The connection's name must be unique in pool. - * <li>Fires a single ISystemResourceChangeEvent event of type EVENT_MOVE, if the pool is the private pool. - * </ul> - * @param conns Array of SystemConnections to move. - * @param delta new zero-based position for the connection - */ - public void moveHosts(String profileName, IHost conns[], int delta); - - /** - * Copy a SystemConnection. All subsystems are copied, and all connection data is copied. - * @param conn The connection to copy - * @param targetProfile What profile to copy into - * @param newName Unique name to give copied profile - * @param monitor Progress monitor to reflect each step of the operation - * @return new SystemConnection object - */ - public IHost copyHost(IHost conn, ISystemProfile targetProfile, String newName, IProgressMonitor monitor) throws Exception; - - /** - * Move a SystemConnection to another profile. - * All subsystems are moved, and all connection data is moved. - * This is actually accomplished by doing a copy operation first, - * and if successful deleting the original. - * @param conn The connection to move - * @param targetProfile What profile to move into - * @param newName Unique name to give copied profile. Typically this is the same as the original name, but - * will be different on name collisions - * @param monitor Progress monitor to reflect each step of the operation - * @return new SystemConnection object - */ - public IHost moveHost(IHost conn, ISystemProfile targetProfile, String newName, IProgressMonitor monitor) throws Exception; - - /** - * Return true if any subsystem supports connecting. - * @param conn the connection. - * @return <code>true</code> if any subsystem supports connecting, <code>false</code> otherwise. - */ - public boolean isAnySubSystemSupportsConnect(IHost conn); - - /** - * Return true if any of the subsystems for the given connection are - * currently connected. - */ - public boolean isAnySubSystemConnected(IHost conn); - - /** - * Return true if all of the subsystems for the given connection are - * currently connected. - */ - public boolean areAllSubSystemsConnected(IHost conn); - - /** - * Disconnect all subsystems for the given connection, if they are - * currently connected. - */ - public void disconnectAllSubSystems(IHost conn); - - /** - * Inform the world when the connection status changes for a subsystem - * within a connection. - * Update properties for the subsystem and its connection. - */ - public void connectedStatusChange(ISubSystem subsystem, boolean connected, boolean wasConnected); - - /** - * Inform the world when the connection status changes for a subsystem - * within a connection. - * Update properties for the subsystem and its connection. - */ - public void connectedStatusChange(ISubSystem subsystem, boolean connected, boolean wasConnected, boolean collapseTree); - - // ---------------------------- - // RESOURCE EVENT METHODS... - // ---------------------------- - - /** - * Register your interest in being told when a system resource such as a connection is changed. - */ - public void addSystemResourceChangeListener(ISystemResourceChangeListener l); - - /** - * De-Register your interest in being told when a system resource such as a connection is changed. - */ - public void removeSystemResourceChangeListener(ISystemResourceChangeListener l); - - /** - * Query if the ISystemResourceChangeListener is already listening for SystemResourceChange events - */ - public boolean isRegisteredSystemResourceChangeListener(ISystemResourceChangeListener l); - - /** - * Notify all listeners of a change to a system resource such as a connection. - * You would not normally call this as the methods in this class call it when appropriate. - */ - public void fireEvent(ISystemResourceChangeEvent event); - - /** - * Notify a specific listener of a change to a system resource such as a connection. - */ - public void fireEvent(ISystemResourceChangeListener l, ISystemResourceChangeEvent event); - - // ---------------------------- - // MODEL RESOURCE EVENT METHODS... - // ---------------------------- - - /** - * Register your interest in being told when an RSE model resource is changed. - * These are model events, not GUI-optimized events. - */ - public void addSystemModelChangeListener(ISystemModelChangeListener l); - - /** - * De-Register your interest in being told when an RSE model resource is changed. - */ - public void removeSystemModelChangeListener(ISystemModelChangeListener l); - - /** - * Notify all listeners of a change to a system model resource such as a connection. - * You would not normally call this as the methods in this class call it when appropriate. - */ - public void fireEvent(ISystemModelChangeEvent event); - - /** - * Notify all listeners of a change to a system model resource such as a connection. - * This one takes the information needed and creates the event for you. - */ - public void fireModelChangeEvent(int eventType, int resourceType, Object resource, String oldName); - - /** - * Notify a specific listener of a change to a system model resource such as a connection. - */ - public void fireEvent(ISystemModelChangeListener l, ISystemModelChangeEvent event); - - // -------------------------------- - // REMOTE RESOURCE EVENT METHODS... - // -------------------------------- - - /** - * Register your interest in being told when a remote resource is changed. - * These are model events, not GUI-optimized events. - */ - public void addSystemRemoteChangeListener(ISystemRemoteChangeListener l); - - /** - * Unregister your interest in being told when a remote resource is changed. - */ - public void removeSystemRemoteChangeListener(ISystemRemoteChangeListener l); - - - /** - * Query if the ISystemRemoteChangeListener is already listening for - * SystemRemoteChange events. - * - * @param l the listener instance to check - * @since org.eclipse.rse.core 3.0 - */ - public boolean isRegisteredSystemRemoteChangeListener(ISystemRemoteChangeListener l); - - /** - * Notify all listeners of a change to a remote resource such as a file. - * You would not normally call this as the methods in this class call it when appropriate. - */ - public void fireEvent(ISystemRemoteChangeEvent event); - - /** - * Notify all listeners of a change to a remote resource such as a file. - * This one takes the information needed and creates the event for you. - * - * @param eventType - one of the constants from - * {@link org.eclipse.rse.core.events.ISystemRemoteChangeEvents} - * @param resource - the remote resource object, or absolute name of the - * resource as would be given by calling getAbsoluteName on its - * remote adapter - * @param resourceParent - the remote resource's parent object, or absolute - * name, if that is known. If it is non-null, this will aid in - * refreshing occurrences of that parent. - * @param subsystem - the subsystem which contains this remote resource. - * This allows the search for impacts to be limited to subsystems - * of the same parent factory, and to connections with the same - * hostname as the subsystem's connection. - * @param oldNames - on a rename, copy or move operation, these are the - * absolute names of the resources prior to the operation - * @since org.eclipse.rse.core 3.0 - */ - public void fireRemoteResourceChangeEvent(int eventType, Object resource, Object resourceParent, ISubSystem subsystem, String[] oldNames); - - /** - * Notify all listeners of a change to a remote resource such as a file. - * This one takes the information needed and creates the event for you. - * - * @param eventType - one of the constants from - * {@link org.eclipse.rse.core.events.ISystemRemoteChangeEvents} - * @param resource - the remote resource object, or absolute name of the - * resource as would be given by calling getAbsoluteName on its - * remote adapter - * @param resourceParent - the remote resource's parent object, or absolute - * name, if that is known. If it is non-null, this will aid in - * refreshing occurrences of that parent. - * @param subsystem - the subsystem which contains this remote resource. - * This allows the search for impacts to be limited to subsystems - * of the same parent factory, and to connections with the same - * hostname as the subsystem's connection. - * @param oldNames - on a rename, copy or move operation, these are the - * absolute names of the resources prior to the operation - * @param originatingViewer - optional. If set, this gives the viewer a clue - * that it should select the affected resource after refreshing - * its parent. This saves sending a separate event to reveal and - * select the new created resource on a create event, for - * example. - * @since org.eclipse.rse.core 3.0 - */ - public void fireRemoteResourceChangeEvent(int eventType, Object resource, Object resourceParent, ISubSystem subsystem, String[] oldNames, Object originatingViewer); - - /** - * Notify all listeners of a change to a remote resource such as a file. - * This one takes the information needed and creates the event for you. - * - * @param operation - the operation for which this event was fired - * @param eventType - one of the constants from - * {@link org.eclipse.rse.core.events.ISystemRemoteChangeEvents} - * @param resource - the remote resource object, or absolute name of the - * resource as would be given by calling getAbsoluteName on its - * remote adapter - * @param resourceParent - the remote resource's parent object, or absolute - * name, if that is known. If it is non-null, this will aid in - * refreshing occurrences of that parent. - * @param subsystem - the subsystem which contains this remote resource. - * This allows the search for impacts to be limited to subsystems - * of the same parent factory, and to connections with the same - * hostname as the subsystem's connection. - * @param oldNames - on a rename, copy or move operation, these are the - * absolute names of the resources prior to the operation - * @since org.eclipse.rse.core 3.0 - */ - public void fireRemoteResourceChangeEvent(String operation, int eventType, Object resource, Object resourceParent, ISubSystem subsystem, String[] oldNames); - - /** - * Notify all listeners of a change to a remote resource such as a file. - * This one takes the information needed and creates the event for you. - * - * @param operation - the operation for which this event was fired - * @param eventType - one of the constants from - * {@link org.eclipse.rse.core.events.ISystemRemoteChangeEvents} - * @param resource - the remote resource object, or absolute name of the - * resource as would be given by calling getAbsoluteName on its - * remote adapter - * @param resourceParent - the remote resource's parent object, or absolute - * name, if that is known. If it is non-null, this will aid in - * refreshing occurrences of that parent. - * @param subsystem - the subsystem which contains this remote resource. - * This allows the search for impacts to be limited to subsystems - * of the same parent factory, and to connections with the same - * hostname as the subsystem's connection. - * @param oldNames - on a rename, copy or move operation, these are the - * absolute names of the resources prior to the operation - * @param originatingViewer - optional. If set, this gives the viewer a clue - * that it should select the affected resource after refreshing - * its parent. This saves sending a separate event to reveal and - * select the new created resource on a create event, for - * example. - * @since org.eclipse.rse.core 3.0 - */ - public void fireRemoteResourceChangeEvent(String operation, int eventType, Object resource, Object resourceParent, ISubSystem subsystem, String[] oldNames, Object originatingViewer); - - /** - * Notify a specific listener of a change to a remote resource such as a file. - */ - public void fireEvent(ISystemRemoteChangeListener l, ISystemRemoteChangeEvent event); - - // ---------------------------- - // PREFERENCE EVENT METHODS... - // ---------------------------- - - /** - * Register your interest in being told when a system preference changes - */ - public void addSystemPreferenceChangeListener(ISystemPreferenceChangeListener l); - - /** - * Unregister your interest in being told when a system preference changes - */ - public void removeSystemPreferenceChangeListener(ISystemPreferenceChangeListener l); - - /** - * Notify all listeners of a change to a system preference - * You would not normally call this as the methods in this class call it when appropriate. - */ - public void fireEvent(ISystemPreferenceChangeEvent event); - - /** - * Notify a specific listener of a change to a system preference - */ - public void fireEvent(ISystemPreferenceChangeListener l, ISystemPreferenceChangeEvent event); - - // ---------------------------- - // MISCELLANEOUS METHODS... - // ---------------------------- - - /** - * Returns filter references associated with this resource under the subsystem - */ - public List findFilterReferencesFor(Object resource, ISubSystem subsystem); - - /** - * Returns filter references associated with this resource under the subsystem - */ - public List findFilterReferencesFor(Object resource, ISubSystem subsystem, boolean onlyCached); - - /** - * Marks all filters for this subsystem as stale to prevent caching - * - * @param subsystem the subsystem to work on - */ - public void invalidateFiltersFor(ISubSystem subsystem); - - /** - * Marks all filters for this subsystem that contain resourceParent as stale - * to prevent caching - * - * @param resourceParent a remote resource object - * @param subsystem the subsystem to work on - */ - public void invalidateFiltersFor(Object resourceParent, ISubSystem subsystem); - - /** - * Return last exception object caught in any method, or null if no exception. - * This has the side effect of clearing the last exception. - */ - public Exception getLastException(); - - // ---------------------------- - // SAVE / RESTORE METHODS... - // ---------------------------- - - /** - * Save everything! - */ - public boolean save(); - - /** - * Save specific connection pool - * @return true if saved ok, false if error encountered. If false, call getLastException(). - */ - public boolean saveHostPool(ISystemHostPool pool); - - /** - * Save specific connection - * @return true if saved ok, false if error encountered. If false, call getLastException(). - */ - public boolean saveHost(IHost conn); - - /** - * Restore all connections within active profiles - * @return true if restored ok, false if error encountered. If false, call getLastException(). - */ - public boolean restore(); -} diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ISystemResourceSet.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ISystemResourceSet.java deleted file mode 100644 index 80d5b96c4..000000000 --- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ISystemResourceSet.java +++ /dev/null @@ -1,97 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006, 2008 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * 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) - [226561] Add API markup to RSE javadocs for extend / implement - *******************************************************************************/ - -package org.eclipse.rse.core.model; - -import java.util.List; - -import org.eclipse.rse.services.clientserver.messages.SystemMessage; - - -/** - * This interface is refers to a collection of any type of resources. The resources - * may be remote RSE resources, or local workspace resources. - * @noimplement This interface is not intended to be implemented by clients. - * Extend {@link AbstractSystemResourceSet} instead. - */ -public interface ISystemResourceSet { - - /** - * Returns the number of resources in the set - * @return the number of resources in the set - */ - public int size(); - - /** - * Returns the resource in the set with the specified absoluteName - * @param absoluteName the path of the resource to return - * @return the resource - */ - public Object get(String absoluteName); - - /** - * Returns the path of a specified resource. This is the same path - * that is used be the get(absoluteName) method to retrieve the object - * @param obj the resource to return the path for - * @return the path of the resource - */ - public String pathFor(Object obj); - - /** - * Returns the resource at the specified index - * @param index the index of the resource to return - * @return the resource - */ - public Object get(int index); - - /** - * Returns the set of resources as a List - * @return the set of resources as a List - */ - public List getResourceSet(); - - /** - * Returns a message if a problem occurs when using this resource set - * @return the message - */ - public SystemMessage getMessage(); - - /** - * Indicates whether a message was set corresponding to this resource set - * during an operation against it. - * @return true if there is a message - */ - public boolean hasMessage(); - - /** - * Indicates whether the set of resources has a size in bytes greater than zero - * @return true if there are more than 0 bytes in this set - */ - public boolean hasByteSize(); - - /** - * Returns the total number of bytes in this collection of resources - * @return the number of bytes - */ - public long byteSize(); - - /** - * Sets the total number of bytes in this collection of resources - * @param byteSize the number of bytes - */ - public void setByteSize(long byteSize); -} diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ISystemViewInputProvider.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ISystemViewInputProvider.java deleted file mode 100644 index 5a54e8761..000000000 --- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ISystemViewInputProvider.java +++ /dev/null @@ -1,83 +0,0 @@ -/******************************************************************************** - * Copyright (c) 2002, 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 - * - * 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: - * Martin Oberhuber (Wind River) - [186773] split SystemRegistryUI from SystemRegistry implementation - * Martin Oberhuber (Wind River) - [190271] Move ISystemViewInputProvider to Core from org.eclipse.rse.ui.view - * Martin Oberhuber (Wind River) - [218524][api] Remove deprecated ISystemViewInputProvider#getShell() - ********************************************************************************/ - -package org.eclipse.rse.core.model; - -import org.eclipse.core.runtime.IAdaptable; - -/** - * Abstraction for any object that wishes to be a roots-provider for the SystemView tree viewer. - */ -public interface ISystemViewInputProvider extends IAdaptable { - - /** - * Return the child objects to constitute the root elements in the system view tree. - * @return Array of root root elements for the system view tree - */ - public Object[] getSystemViewRoots(); - - /** - * Test if {@link #getSystemViewRoots()} will return a non-empty list - * @return <code>true</code> if root elements are available, or <code>false</code> otherwise. - */ - public boolean hasSystemViewRoots(); - - /** - * @return true if we are listing connections or not, so we know whether we are interested in - * connection-add events - */ - public boolean showingConnections(); - - /** - * This method is called by the connection adapter when the user expands - * a connection. This method must return the child objects to show for that - * connection. - * @param selectedConnection the connection undergoing expansion - * @return the list of objects under the connection - */ - public Object[] getConnectionChildren(IHost selectedConnection); - - /** - * This method is called by the connection adapter when deciding to show a plus-sign - * or not beside a connection. - * @param selectedConnection the connection being shown in the viewer - * @return true if this connection has children to be shown. - */ - public boolean hasConnectionChildren(IHost selectedConnection); - - /* (non-Javadoc) - * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class) - */ - public Object getAdapter(Class adapterType); - - /** - * Set the viewer in case it is needed for anything. - * The label and content provider will call this. - * @param viewer the {@link org.eclipse.jface.viewers.Viewer viewer} - * that uses this provider - */ - public void setViewer(Object viewer); - - /** - * Return the viewer we are currently associated with - * @return the {@link org.eclipse.jface.viewers.Viewer viewer} - * we are currently associated with - * @deprecated use other methods for getting the active viewer. - */ - public Object getViewer(); -}
\ No newline at end of file diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/Property.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/Property.java deleted file mode 100644 index 7235149aa..000000000 --- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/Property.java +++ /dev/null @@ -1,160 +0,0 @@ -/******************************************************************************** - * Copyright (c) 2006, 2008 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 - * - * 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) - added javadoc - * David Dykstal (IBM) - [150939] added read-only attribute - * David Dykstal (IBM) - [226561] Add API markup to RSE javadocs for extend / implement - ********************************************************************************/ - -package org.eclipse.rse.core.model; - -import java.util.Observable; - -/** - * A Property is used in PropertySets and may be persisted as a result of persisting the - * containing set. Each property has a type, a label, a key and a value. - * @noextend This class is not intended to be subclassed by clients. - */ -public class Property extends Observable implements IProperty { - - private String _name; - private String _label; - private String _value; - private IPropertyType _type; - private boolean _isEnabled = true; - private boolean _isReadOnly = false; - - public Property(IProperty property) { - _name = property.getKey(); - _label = property.getLabel(); - _value = property.getValue(); - _type = property.getType(); - _isEnabled = property.isEnabled(); - touch(); - } - - public Property(String name, String value, IPropertyType type, boolean isEnabled) { - _name = name; - _value = value; - _type = type; - _isEnabled = isEnabled; - touch(); - } - - /* (non-Javadoc) - * @see org.eclipse.rse.core.model.IProperty#getKey() - */ - public String getKey() { - return _name; - } - - /* (non-Javadoc) - * @see org.eclipse.rse.core.model.IProperty#setLabel(java.lang.String) - */ - public void setLabel(String label) { - if (!stringsAreEqual(_label, label)) { - _label = label; - touch(); - } - } - - /* (non-Javadoc) - * @see org.eclipse.rse.core.model.IProperty#getLabel() - */ - public String getLabel() { - if (_label == null) { - return _name; - } - return _label; - } - - /* (non-Javadoc) - * @see org.eclipse.rse.core.model.IProperty#setValue(java.lang.String) - */ - public void setValue(String value) { - if (!stringsAreEqual(_value, value)) { - _value = value; - touch(); - } - } - - /* (non-Javadoc) - * @see org.eclipse.rse.core.model.IProperty#getValue() - */ - public String getValue() { - return _value; - } - - /* (non-Javadoc) - * @see org.eclipse.rse.core.model.IProperty#setType(org.eclipse.rse.core.model.IPropertyType) - */ - public void setType(IPropertyType type) { - if (_type != type) { - _type = type; - touch(); - } - } - - /* (non-Javadoc) - * @see org.eclipse.rse.core.model.IProperty#getType() - */ - public IPropertyType getType() { - return _type; - } - - /* (non-Javadoc) - * @see org.eclipse.rse.core.model.IProperty#setEnabled(boolean) - */ - public void setEnabled(boolean flag) { - if (_isEnabled != flag) { - _isEnabled = flag; - touch(); - } - } - - /* (non-Javadoc) - * @see org.eclipse.rse.core.model.IProperty#isEnabled() - */ - public boolean isEnabled() { - return _isEnabled; - } - - /* (non-Javadoc) - * @see org.eclipse.rse.core.model.IProperty#setReadOnly(boolean) - */ - public void setReadOnly(boolean flag) { - if (_isReadOnly != flag) { - _isReadOnly = flag; - touch(); - } - } - - /* (non-Javadoc) - * @see org.eclipse.rse.core.model.IProperty#isReadOnly() - */ - public boolean isReadOnly() { - return _isReadOnly; - } - - private boolean stringsAreEqual(String s1, String s2) { - if (s1 == s2) return true; - if (s1 == null) return false; - return s1.equals(s2); - } - - private void touch() { - setChanged(); - notifyObservers(); - } - -}
\ No newline at end of file diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/PropertyList.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/PropertyList.java deleted file mode 100644 index dcd2ef482..000000000 --- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/PropertyList.java +++ /dev/null @@ -1,64 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007, 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: - * IBM Corporation - initial API and implementation - * David Dykstal (IBM) - [226561] Add API markup to RSE javadocs for extend / implement - *******************************************************************************/ -package org.eclipse.rse.core.model; - -import java.util.ArrayList; -import java.util.List; -import java.util.Map; - -/** - * A property list is an ordered property set. - * As items are added and removed their arrival order is maintained. - * @noextend This class is not intended to be subclassed by clients. - */ -public class PropertyList extends PropertySet { - - private List _keys = new ArrayList(10); - - public PropertyList(String name) { - super(name); - } - - public IProperty addProperty(String key, IProperty property) { - _keys.remove(key); - _keys.add(key); - return super.addProperty(key, property); - } - - public IProperty addProperty(String key, String value) { - _keys.remove(key); - _keys.add(key); - return super.addProperty(key, value); - } - - public IProperty addProperty(String key, String value, IPropertyType type) { - _keys.remove(key); - _keys.add(key); - return super.addProperty(key, value, type); - } - - public String[] getPropertyKeys() { - return (String[]) _keys.toArray(new String[_keys.size()]); - } - - public boolean removeProperty(String key) { - _keys.remove(key); - return super.removeProperty(key); - } - - public void setProperties(Map map) { - _keys.clear(); - _keys.addAll(map.keySet()); - super.setProperties(map); - } - -} diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/PropertySet.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/PropertySet.java deleted file mode 100644 index cc28ad503..000000000 --- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/PropertySet.java +++ /dev/null @@ -1,212 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006, 2008 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * 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: - * Martin Oberhuber (Wind River) - Added Javadoc. - * David McKnight (IBM) - [217715] [api] RSE property sets should support nested property sets - * David Dykstal (IBM) - [226561] Add API markup to RSE javadocs for extend / implement - *******************************************************************************/ - -package org.eclipse.rse.core.model; - -import java.util.HashMap; -import java.util.Iterator; -import java.util.Map; -import java.util.Observable; -import java.util.Observer; -import java.util.Set; - -/** - * A Hashmap based implementation of the {@link IPropertySet} interface. - * - * Not thread-safe since the underlying {@link java.util.HashMap} is - * not thread-safe. - * @noextend This class is not intended to be subclassed by clients. - * The standard extensions are included in the framework. - */ -public class PropertySet extends RSEModelObject implements IPropertySet, IRSEModelObject, ILabeledObject, Observer { - - private String _name; - private String _label = null; - private String _description = null; - private Map _properties; - private IPropertySetContainer _container = null; - - protected static IPropertyType _defaultType = PropertyType.getStringPropertyType(); - - /** - * Construct a new PropertySet based on an existing one (i.e. clone it). - * @param propertySet existing Property Set to clone - */ - public PropertySet(IPropertySet propertySet) { - _name = propertySet.getName(); - _description = propertySet.getDescription(); - _properties = new HashMap(); - if (propertySet instanceof ILabeledObject) { - ILabeledObject p = (ILabeledObject) propertySet; - _label = p.getLabel(); - } - - String[] keys = propertySet.getPropertyKeys(); - for (int i = 0; i < keys.length; i++) { - String key = keys[i]; - IProperty property = propertySet.getProperty(key); - addProperty(key, new Property(property)); - } - setDirty(true); - } - - /** - * Construct a new empty PropertySet. - * @param name of the new PropertySet - */ - public PropertySet(String name) { - _name = name; - _properties = new HashMap(); - setDirty(true); - } - - public String getName() { - return _name; - } - - public String getLabel() { - if (_label != null) return _label; - return _name; - } - - public void setLabel(String label) { - _label = label; - setDirty(true); - } - - public String getDescription() { - return _description; - } - - public void setDescription(String description) { - _description = description; - setDirty(true); - } - - public String[] getPropertyKeys() { - Set set = _properties.keySet(); - return (String[]) set.toArray(new String[set.size()]); - } - - public void setName(String name) { - _name = name; - setDirty(true); - } - - public void setProperties(Map map) { - _properties = new HashMap(map.size()); - for (Iterator z = map.keySet().iterator(); z.hasNext();) { - String key = (String) z.next(); - Object value = map.get(key); - if (value instanceof IProperty) { - addProperty(key, (IProperty)value); - } else if (value instanceof String) { - addProperty(key, (String)value); - } - } - } - - /** - * Add a typed Property to the set. - * - * In case a Property already exists for the given key, it will be overwritten. - * - * @param key Key to add - * @param property The Property to add - * @return The added Property - */ - public IProperty addProperty(String key, IProperty property) { - _properties.put(key, property); - setDirty(true); - return property; - } - - public IProperty addProperty(String key, String value) { - IProperty property = getProperty(key); - if (property != null) { - //FIXME should throw a NumberFormatException or similar, - //if the value does not fit the type of the existing property. - property.setValue(value); - } else { - property = addProperty(key, value, _defaultType); - } - return property; - } - - public IProperty addProperty(String key, String value, IPropertyType type) { - IProperty property = new Property(key, value, type, true); - return addProperty(key, property); - } - - public boolean removeProperty(String key) { - Object value = _properties.remove(key); - if (value == null) return false; - setDirty(true); - return true; - } - - public IProperty getProperty(String key) { - return (IProperty) _properties.get(key); - } - - public String getPropertyValue(String key) { - IProperty property = getProperty(key); - if (property != null) { - return property.getValue(); - } - return null; - } - - public IPropertyType getPropertyType(String key) { - IProperty property = getProperty(key); - if (property != null) { - return property.getType(); - } - return null; - } - - public boolean commit() { - return getPersistableParent().commit(); - } - - public IRSEPersistableContainer[] getPersistableChildren() { - return IRSEPersistableContainer.NO_CHILDREN; - } - - public IRSEPersistableContainer getPersistableParent() { - IRSEPersistableContainer result = null; - if (_container instanceof IRSEPersistableContainer) { - result = (IRSEPersistableContainer) _container; - } - return result; - } - - public void setContainer(IPropertySetContainer container) { - _container = container; - } - - public IPropertySetContainer getContainer() { - return _container; - } - - public void update(Observable o, Object arg) { - setDirty(true); - } - -} diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/PropertySetContainer.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/PropertySetContainer.java deleted file mode 100644 index 99d8cfab4..000000000 --- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/PropertySetContainer.java +++ /dev/null @@ -1,87 +0,0 @@ -/******************************************************************************** - * Copyright (c) 2006, 2008 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 - * - * 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) - 142806: refactoring persistence framework - * David Dykstal (IBM) - [226561] Add API markup to RSE javadocs for extend / implement - ********************************************************************************/ - -package org.eclipse.rse.core.model; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Map; - -/** - * A PropertySetContainer is capable of holding multiple named property sets. - * @noextend This class is not intended to be subclassed by clients. - * The standard extensions are included in the framework. - */ -public abstract class PropertySetContainer extends RSEPersistableObject implements IPropertySetContainer { - private Map _propertySets; - - public PropertySetContainer() { - _propertySets = new HashMap(); - } - - public IPropertySet[] getPropertySets() { - List sets = new ArrayList(); - Iterator iter = _propertySets.values().iterator(); - while (iter.hasNext()) { - sets.add(iter.next()); - } - return (IPropertySet[]) sets.toArray(new IPropertySet[sets.size()]); - } - - public IPropertySet getPropertySet(String name) { - return (IPropertySet) _propertySets.get(name); - } - - public IPropertySet createPropertySet(String name, String description) { - IPropertySet newSet = new PropertySet(name); - newSet.setDescription(description); - newSet.setContainer(this); - _propertySets.put(name, newSet); - return newSet; - } - - public IPropertySet createPropertySet(String name) { - IPropertySet newSet = new PropertySet(name); - newSet.setContainer(this); - _propertySets.put(name, newSet); - return newSet; - } - - public boolean addPropertySet(IPropertySet set) { - IPropertySetContainer old = set.getContainer(); - if (old != null) { - old.removePropertySet(set.getName()); - } - set.setContainer(this); - _propertySets.put(set.getName(), set); - return true; - } - - public boolean addPropertySets(IPropertySet[] sets) { - for (int i = 0; i < sets.length; i++) { - addPropertySet(sets[i]); - } - return true; - } - - public boolean removePropertySet(String name) { - return _propertySets.remove(name) != null; - } - -}
\ No newline at end of file diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/PropertyType.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/PropertyType.java deleted file mode 100644 index d0dbaf508..000000000 --- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/PropertyType.java +++ /dev/null @@ -1,165 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006, 2008 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * 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) - added javadoc, minor changes - * David Dykstal (IBM) - [226561] Add API markup to RSE javadocs for extend / implement - *******************************************************************************/ - -package org.eclipse.rse.core.model; - -/** - * The standard implementation of {@link IPropertyType}. Use the static factory - * methods to return instances. - * - * @noextend This class is not intended to be subclassed by clients. - */ -public class PropertyType implements IPropertyType { - - private int _type = 0; - private String[] _enumValues; - - private static final String ENUMERATION_STR = "enumeration:"; //$NON-NLS-1$ - - private static IPropertyType _booleanPropertyType = new PropertyType(TYPE_BOOLEAN); - private static IPropertyType _integerPropertyType = new PropertyType(TYPE_INTEGER); - private static IPropertyType _stringPropertyType = new PropertyType(TYPE_STRING); - - private PropertyType(int type) { - _type = type; - } - - /** - * Returns an instance of boolean property type. - * @return IPropertyType - */ - public static IPropertyType getBooleanPropertyType() { - return _booleanPropertyType; - } - - /** - * Returns an instance of integer property type. - * @return IPropertyType - */ - public static IPropertyType getIntegerPropertyType() { - return _integerPropertyType; - } - - /** - * Returns an instance of string property type. - * @return IPropertyType - */ - public static IPropertyType getStringPropertyType() { - return _stringPropertyType; - } - - /** - * Returns an instance of enum property type. - * @param values String[] array of allowed enumerator values. - * @return IPropertyType - */ - public static IPropertyType getEnumPropertyType(String[] values) { - PropertyType type = new PropertyType(TYPE_ENUM); - type._enumValues = values; - return type; - } - - /** - * Returns an instance of property type based on the String specification. - * This is the reverse of PropertyType.toString(). - * @return IPropertyType instance based on String specification. - */ - public static IPropertyType fromString(String typeStr) { - if (typeStr.equals(String.class.toString())) { - return getStringPropertyType(); - } else if (typeStr.equals(Integer.class.toString())) { - return getIntegerPropertyType(); - } else if (typeStr.startsWith(ENUMERATION_STR)) { - String subString = typeStr.substring(ENUMERATION_STR.length()); - String[] enumValues = subString.split(","); //$NON-NLS-1$ - return getEnumPropertyType(enumValues); - } else if (typeStr.equals(Boolean.class.toString())) { - return getBooleanPropertyType(); - } else { - return getStringPropertyType(); - } - } - - /* (non-Javadoc) - * @see org.eclipse.rse.core.model.IPropertyType#getType() - */ - public int getType() { - return _type; - } - - /* (non-Javadoc) - * @see org.eclipse.rse.core.model.IPropertyType#isString() - */ - public boolean isString() { - return _type == TYPE_STRING; - } - - /* (non-Javadoc) - * @see org.eclipse.rse.core.model.IPropertyType#isInteger() - */ - public boolean isInteger() { - return _type == TYPE_INTEGER; - } - - /* (non-Javadoc) - * @see org.eclipse.rse.core.model.IPropertyType#isEnum() - */ - public boolean isEnum() { - return _type == TYPE_ENUM; - } - - /* (non-Javadoc) - * @see org.eclipse.rse.core.model.IPropertyType#isBoolean() - */ - public boolean isBoolean() { - return _type == TYPE_BOOLEAN; - } - - /* (non-Javadoc) - * @see org.eclipse.rse.core.model.IPropertyType#getEnumValues() - */ - public String[] getEnumValues() { - return _enumValues; - } - - /* (non-Javadoc) - * @see java.lang.Object#toString() - */ - public String toString() { - if (isString()) { - return String.class.getName(); - } else if (isInteger()) { - return Integer.class.getName(); - } else if (isEnum()) { - StringBuffer buf = new StringBuffer(); - buf.append(ENUMERATION_STR); - String[] enumValues = getEnumValues(); - for (int i = 0; i < enumValues.length; i++) { - buf.append(enumValues[i]); - if (i + 1 < enumValues.length) { - buf.append(","); //$NON-NLS-1$ - } - } - return buf.toString(); - } else if (isBoolean()) { - return Boolean.class.getName(); - } - return super.toString(); - } - -} diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/RSEModelObject.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/RSEModelObject.java deleted file mode 100644 index e18e998ae..000000000 --- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/RSEModelObject.java +++ /dev/null @@ -1,33 +0,0 @@ -/******************************************************************************** - * Copyright (c) 2006, 2008 IBM Corporation and others. All rights reserved. - * This program and the accompanying materials are made available under the terms - * of the Eclipse Public License v1.0 which accompanies this distribution, and is - * available at 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) - 142806: refactoring persistence framework - * Martin Oberhuber (Wind River) - [184095] Replace systemTypeName by IRSESystemType - * David Dykstal (IBM) - [226561] Add API markup to RSE javadocs for extend / implement - ********************************************************************************/ - -package org.eclipse.rse.core.model; - -import org.eclipse.rse.internal.core.RSECoreMessages; - -/** - * Provides common support for local RSE model objects. - * Extenders inherit property set support. - */ -public abstract class RSEModelObject extends PropertySetContainer implements IRSEModelObject { - - public String getDescription() { - return RSECoreMessages.RESID_MODELOBJECTS_MODELOBJECT_DESCRIPTION; - } - -}
\ No newline at end of file diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/RSEModelOperation.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/RSEModelOperation.java deleted file mode 100644 index 8734c6284..000000000 --- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/RSEModelOperation.java +++ /dev/null @@ -1,138 +0,0 @@ -/******************************************************************************** - * Copyright (c) 2006, 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 - * - * Initial Contributors: - * David Dykstal (IBM) - initial API and implementation - * Martin Oberhuber (Wind River) - [177523] Unify singleton getter methods - ********************************************************************************/ - -package org.eclipse.rse.core.model; - -import java.util.HashMap; -import java.util.Map; - -import org.eclipse.rse.core.RSECorePlugin; -import org.eclipse.rse.logging.Logger; -import org.eclipse.rse.persistence.IRSEPersistenceManager; - -/** - * Provides a transaction boundary for RSE model operations. All operations that - * modify model objects should be done within an RSEModelOperation. These operations - * may be nested. Changes made to the model will be persisted when the outermost - * operation of a particular thread is exited. - * <p> - * The usage idiom is to create an anonymous subclass of this class just prior to - * use, overriding the {@link #execute()} method, and then invoke the {@link #run()} method. - * <pre> - * RSEModelOperation m = new RSEModelOperation() { - * public void execute() { - * ... do work here ... - * } - * }; - * m.run(); - * </pre> - * <p> - * under development - provisional - * @since RSE 2.0 - */ -public abstract class RSEModelOperation { - - private static Map threads = new HashMap(); - - /** - * Checks the current thread to see if there is a model transaction in progress. - * Should be used inside model objects prior to a change to a persistent property. - */ - public static void check() { - if (getDepth() == 0) { - Logger logger = RSECorePlugin.getDefault().getLogger(); - logger.logInfo("not inside transaction"); //$NON-NLS-1$ - } - } - - /** - * @return the depth of the nesting for transactions in the current thread - */ - private static int getDepth() { - Thread myThread = Thread.currentThread(); - if (threads.get(myThread) == null) { - threads.put(myThread, new Integer(0)); - } - int depth = ((Integer) threads.get(myThread)).intValue(); - return depth; - } - - /** - * Begins a transaction. - */ - private static void beginTransaction() { - } - - /** - * Ends a transaction. Schedules all changed profiles for save. - */ - private static void endTransaction() { - IRSEPersistenceManager persistenceManager = RSECorePlugin.getThePersistenceManager(); - persistenceManager.commitProfiles(5000); - } - - /** - * Enters a new nested level of operation. - */ - private static void enterLevel() { - int depth = getDepth(); - try { - if (depth == 0) { - beginTransaction(); - } - } finally { - Thread myThread = Thread.currentThread(); - threads.put(myThread, new Integer(depth + 1)); - } - } - - /** - * Leaves the current nesting level. If leaving the outermost nesting level then - * ends the transaction. - */ - private static void leaveLevel() { - int depth = getDepth(); - try { - if (depth == 1) { - endTransaction(); - } - } finally { - Thread myThread = Thread.currentThread(); - threads.put(myThread, new Integer(depth - 1)); - } - } - - /** - * Create a new operation scoped to the current thread. - */ - public RSEModelOperation() { - } - - /** - * Perform the work of this operation. This is where the work of modifying several model - * properties or objects can be done. - */ - public abstract void execute(); - - /** - * Runs this operation. This will cause the {@link #execute()} method to be invoked inside - * a transaction boundary. - */ - public void run() { - enterLevel(); - try { - execute(); - } finally { - leaveLevel(); - } - } - -} diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/RSEPersistableObject.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/RSEPersistableObject.java deleted file mode 100644 index fbe0004bc..000000000 --- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/RSEPersistableObject.java +++ /dev/null @@ -1,77 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007, 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: - * IBM Corporation - initial API and implementation - * David Dykstal (IBM) - [226561] Add API markup to RSE javadocs for extend / implement - *******************************************************************************/ -package org.eclipse.rse.core.model; - -/** - * An object that keeps track of its persistable state: - * whether it is dirty or not and whether or not - * any of its progeny are marked dirty. - * @noextend This class is not intended to be subclassed by clients. - * The standard extensions are included in the framework. - */ -public abstract class RSEPersistableObject implements IRSEPersistableContainer { - - private boolean _isDirty = false; - private boolean _wasRestored = false; - private boolean _isTainted = false; - - public RSEPersistableObject() { - super(); - } - - public final boolean isDirty() { - return _isDirty; - } - - public final void setDirty(boolean flag) { - _isDirty = flag; - setTainted(flag); - } - - public final boolean wasRestored() { - return _wasRestored; - } - - public final void setWasRestored(boolean flag) { - _wasRestored = flag; - } - - public final boolean isTainted() { - return _isTainted; - } - - public final void setTainted(boolean flag) { - boolean taintParent = flag && !_isTainted; - _isTainted = flag; - if (taintParent) { - IRSEPersistableContainer parent = getPersistableParent(); - if (parent != null) { - parent.setTainted(true); - } - } - } - - /** - * Does a null-aware string comparison. Two strings that are - * <code>null</code> will compare equal. Otherwise the result is - * the same as s1.equals(s2), if s1 is not null. - * @param s1 The first string to compare - * @param s2 the second string - * @return true if the strings are equal or both null. - */ - protected boolean compareStrings(String s1, String s2) { - if (s1 == s2) return true; - if (s1 == null) return false; - return s1.equals(s2); - } - -}
\ No newline at end of file diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/SystemChildrenContentsType.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/SystemChildrenContentsType.java deleted file mode 100644 index 83c6c92c5..000000000 --- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/SystemChildrenContentsType.java +++ /dev/null @@ -1,48 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006, 2008 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * 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) - [226561] Add API markup to RSE javadocs for extend / implement - *******************************************************************************/ - -package org.eclipse.rse.core.model; - -/** - * Represents contents that are children of a container. - * This is a singleton class representing a contents type. - * @noextend This class is not intended to be subclassed by clients. - * @noinstantiate This class is not intended to be instantiated by clients. - */ -public class SystemChildrenContentsType implements ISystemContentsType { - public static String CONTENTS_TYPE_CHILDREN = "contents_children"; //$NON-NLS-1$ - public static SystemChildrenContentsType _instance = new SystemChildrenContentsType(); - - public static SystemChildrenContentsType getInstance() { - return _instance; - } - - /* (non-Javadoc) - * @see org.eclipse.rse.model.IRemoteContentsType#getType() - */ - public String getType() { - return CONTENTS_TYPE_CHILDREN; - } - - /* (non-Javadoc) - * @see org.eclipse.rse.model.IRemoteContentsType#isPersistent() - */ - public boolean isPersistent() { - return false; - } - -} diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/SystemEscapeCharHelper.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/SystemEscapeCharHelper.java deleted file mode 100644 index 1eb596b14..000000000 --- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/SystemEscapeCharHelper.java +++ /dev/null @@ -1,182 +0,0 @@ -/******************************************************************************** - * Copyright (c) 2002, 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 - * - * 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: - * Martin Oberhuber (Wind River) - [168975] Move RSE Events API to Core - * David Dykstal (IBM) - [226561] Add API markup to RSE javadocs for extend / implement - ********************************************************************************/ - -package org.eclipse.rse.core.model; - -/** - * This is a utility class used in the construction of file names. - * @noextend This class is not intended to be subclassed by clients. - */ -public class SystemEscapeCharHelper { - - private static char ESCAPE_CHAR = '#'; - - private char changedChars[]; - private int escapeStringLength; - - /** - * Constructor. - * @param chars array of chars to be escaped. - */ - public SystemEscapeCharHelper (char[] chars) - { - changedChars = new char[chars.length+1]; - - for (int i = 0; i < chars.length; i++) - { - changedChars[i]=chars[i]; - } - - // add the escape character itself so that it itself can be escaped - changedChars[chars.length]=ESCAPE_CHAR; - - escapeStringLength = 4; - - } - - public String getStringForFileName(String name) - { - String fileName = name; - - int i = 0; - while (i < fileName.length()) - { - for (int j = 0; j < changedChars.length; j++) - { - if (fileName.charAt(i) == changedChars[j]) - { - if ((fileName.length()-1) >= i) - { - fileName = fileName.substring(0, i) + escapeString(changedChars[j]) + fileName.substring(i+1); - } - else - { - fileName = fileName.substring(0, i) + escapeString(changedChars[j]); - } - i = i + escapeStringLength-1; - } - } - i++; - } - - return fileName; - - } - - public String getStringFromFileName(String fileName) - { - String name = fileName; - - int i = 0; - while (i < name.length()) - { - if (name.charAt(i) == ESCAPE_CHAR) - { - if ((name.length()-2) >= i) - { - name = name.substring(0, i) + originalString(name.substring(i+1, i+escapeStringLength)) + name.substring(i+escapeStringLength); - } - else - { - name = name.substring(0, i) + originalString(name.substring(i+1)); - } - } - i++; - } - - return name; - } - - private String escapeString(char c) - { - /* for (int i = 0; i < changedChars.length; i++) - { - if (changedChars[i]== c) - { - return ""+ESCAPE_CHAR+i; - } - } - return ""+c; - */ - - int intValue = c; - String returnStr=""+ESCAPE_CHAR; //$NON-NLS-1$ - - if (intValue < 10) - returnStr = returnStr+"00"; //$NON-NLS-1$ - else if (intValue < 100) - returnStr = returnStr+"0"; //$NON-NLS-1$ - - return returnStr + intValue; - - } - - private String originalString(String s) - { - // return ""+changedChars[Integer.parseInt(s)]; - - char c = (char)Integer.parseInt(s); - - return ""+c; //$NON-NLS-1$ - } - - - -/* TEST HARNESS */ -/* public static void main(String[] args) - { - try { - char [] charArray = new char[1]; - - charArray[0]='\''; - SystemEscapeCharHelper helper = new -SystemEscapeCharHelper(charArray); - - System.out.println(">>>>>start>>>>>"); - - - String[] strings = {"'hello_world'", "'", "'abc'", "bca", "ca'_'b"}; - for (int i = 0; i < strings.length; i++) - { - String escaped = helper.getStringForFileName(strings[i]); - - System.out.println("escaped:"+escaped+":"); - - String unescaped = helper.getStringFromFileName(escaped); - - System.out.println("unescaped:"+unescaped+":"); - System.out.println("***"); - } - System.out.println("*****end*****"); - - - } catch (Exception e){ - System.out.println(""+e.toString()); - -// try{ -// System.in.read(); -// }catch(Exception ex) -// { -// } - - } -// try{ -// System.in.read(); -// }catch(Exception e) -// {} -}*/ -}
\ No newline at end of file diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/SystemFilterStringContentsType.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/SystemFilterStringContentsType.java deleted file mode 100644 index 85b4a19e2..000000000 --- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/SystemFilterStringContentsType.java +++ /dev/null @@ -1,48 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2004, 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 - * - * 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) - [226561] Add API markup to RSE javadocs for extend / implement - *******************************************************************************/ - -package org.eclipse.rse.core.model; - -/** - * Represents contents that are children of a container. - * This is a singleton class representing a contents type. - * @noextend This class is not intended to be subclassed by clients. - * @noinstantiate This class is not intended to be instantiated by clients. - */ -public class SystemFilterStringContentsType implements ISystemContentsType { - public static String CONTENTS_TYPE_CHILDREN_PARENTS = "contents_children_parents"; //$NON-NLS-1$ - public static SystemFilterStringContentsType _instance = new SystemFilterStringContentsType(); - - public static SystemFilterStringContentsType getInstance() { - return _instance; - } - - /* (non-Javadoc) - * @see org.eclipse.rse.model.IRemoteContentsType#getType() - */ - public String getType() { - return CONTENTS_TYPE_CHILDREN_PARENTS; - } - - /* (non-Javadoc) - * @see org.eclipse.rse.model.IRemoteContentsType#isPersistent() - */ - public boolean isPersistent() { - return false; - } - -} diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/SystemMessageObject.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/SystemMessageObject.java deleted file mode 100644 index 4afa5f329..000000000 --- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/SystemMessageObject.java +++ /dev/null @@ -1,101 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2002, 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 - * - * 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) - [226561] Add API markup to RSE javadocs for extend / implement - *******************************************************************************/ - -package org.eclipse.rse.core.model; - -import org.eclipse.core.runtime.IAdaptable; -import org.eclipse.core.runtime.Platform; -import org.eclipse.rse.services.clientserver.messages.SystemMessage; - -/** - * This class captures a message we wish to display as child node in the tree view. - * @noextend This class is not intended to be subclassed by clients. - */ -public class SystemMessageObject implements ISystemMessageObject, IAdaptable, Comparable { - - SystemMessage systemMessage; - protected String message; - protected int type; - protected Object parent; - - /** - * Constructor when using SystemMessage - * @param msgObj The system message from which to retrieve text to show in the tree viewer - * @param type The message severity, dictating the icon. - * @param parent The parent node of this within the tree view - * @see org.eclipse.rse.core.model.ISystemMessageObject - */ - public SystemMessageObject(SystemMessage msgObj, int type, Object parent) { - this.systemMessage = msgObj; - this.message = msgObj.getLevelOneText(); - this.type = type; - this.parent = parent; - } - - /** - * Get the message to display in the tree viewer - */ - public String getMessage() { - return message; - } - - /** - * Message type. - * @see org.eclipse.rse.core.model.ISystemMessageObject - */ - public int getType() { - return type; - } - - /** - * Get the parent object (within tree view) - */ - public Object getParent() { - return parent; - } - - /** - * This is the method required by the IAdaptable interface. - * Given an adapter class type, return an object castable to the type, or - * null if this is not possible. - */ - public Object getAdapter(Class adapterType) { - return Platform.getAdapterManager().getAdapter(this, adapterType); - } - - /** - * @see ISystemMessageObject#isTransient() - */ - public boolean isTransient() { - return true; - } - - /** - * Return the SystemMessage for this SystemMessageObject. - */ - public SystemMessage getSystemMessage() { - return systemMessage; - } - - /** - * @see java.lang.Comparable#compareTo(java.lang.Object) - */ - public int compareTo(Object o) { - ISystemMessageObject other = (ISystemMessageObject) o; - return getMessage().compareTo(other.getMessage()); - } -} diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/SystemRemoteResourceSet.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/SystemRemoteResourceSet.java deleted file mode 100644 index 38d6e243c..000000000 --- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/SystemRemoteResourceSet.java +++ /dev/null @@ -1,95 +0,0 @@ -/******************************************************************************** - * Copyright (c) 2004, 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 - * - * 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: - * Martin Oberhuber (Wind River) - [168975] Move RSE Events API to Core - * David Dykstal (IBM) - [226561] Add API markup to RSE javadocs for extend / implement - ********************************************************************************/ - -package org.eclipse.rse.core.model; -import java.util.List; - -import org.eclipse.core.runtime.IAdaptable; -import org.eclipse.rse.core.subsystems.ISubSystem; -import org.eclipse.rse.core.subsystems.ISystemDragDropAdapter; - - -/** - * An ISystemResourceSet containing remote resources. - * @noextend This class is not intended to be subclassed by clients. - */ -public class SystemRemoteResourceSet extends AbstractSystemResourceSet -{ - private ISubSystem _subSystem; - private ISystemDragDropAdapter _adapter; - - public SystemRemoteResourceSet(ISubSystem subSystem) - { - super(); - _subSystem = subSystem; - } - - public SystemRemoteResourceSet(ISubSystem subSystem, ISystemDragDropAdapter adapter) - { - super(); - _subSystem = subSystem; - _adapter = adapter; - } - - public SystemRemoteResourceSet(ISubSystem subSystem, ISystemDragDropAdapter adapter, Object[] objects) - { - super(objects); - _subSystem = subSystem; - _adapter = adapter; - } - - public SystemRemoteResourceSet(ISubSystem subSystem, ISystemDragDropAdapter adapter, List objects) - { - super(objects); - _subSystem = subSystem; - _adapter = adapter; - } - - public SystemRemoteResourceSet(ISubSystem subSystem, Object[] objects) - { - super(objects); - _subSystem = subSystem; - } - - public SystemRemoteResourceSet(ISubSystem subSystem, List objects) - { - super(objects); - _subSystem = subSystem; - } - - public ISystemDragDropAdapter getAdapter() - { - return _adapter; - } - - public ISubSystem getSubSystem() - { - return _subSystem; - } - - public String pathFor(Object resource) - { - if (_adapter == null) - { - _adapter = (ISystemDragDropAdapter)((IAdaptable)resource).getAdapter(ISystemDragDropAdapter.class); - } - - return _adapter.getAbsoluteName(resource); - } - - -}
\ No newline at end of file diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/SystemSignonInformation.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/SystemSignonInformation.java deleted file mode 100644 index 86b6e5d1f..000000000 --- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/SystemSignonInformation.java +++ /dev/null @@ -1,125 +0,0 @@ -/******************************************************************************** - * Copyright (c) 2002, 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 - * - * 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) - 168977: refactoring IConnectorService and ServerLauncher hierarchies - * Martin Oberhuber (Wind River) - [175262] IHost.getSystemType() should return IRSESystemType - * Martin Oberhuber (Wind River) - [184095] Replace systemTypeName by IRSESystemType - * David Dykstal (IBM) - [226561] Add API markup to RSE javadocs for extend / implement - ********************************************************************************/ - -package org.eclipse.rse.core.model; - -import org.eclipse.rse.core.IRSESystemType; -import org.eclipse.rse.core.subsystems.ICredentials; - -/** - * This class encapsulates the signon information required for a remote system. This class - * must be secure and never disclose the password for the remote system in its unencrypted form. - * However the encrypted form of the password is not considered secret information and can be - * accessed by anyone. - */ -public final class SystemSignonInformation implements ICredentials { - - private IRSESystemType _systemType; - private String _hostname; - private String _userId; - private String _password; - - /** - * Default no-arg constructor - */ - public SystemSignonInformation() { - } - - /** - * Constructor for SystemSignonInformation. - */ - public SystemSignonInformation(String hostname, String userid, IRSESystemType systemType) { - _hostname = hostname;//RSEUIPlugin.getQualifiedHostName(hostname).toUpperCase(); - _userId = userid; - _systemType = systemType; - } - - /** - * Constructor for SystemSignonInformation. - */ - public SystemSignonInformation(String hostname, String userid, String password, IRSESystemType systemType) { - _hostname = hostname;//RSEUIPlugin.getQualifiedHostName(hostname).toUpperCase(); - _userId = userid; - _password = password; - _systemType = systemType; - } - - /** - * Returns the hostname of the remote system - * @return String - */ - public String getHostname() { - return _hostname; - } - - /** - * Returns the systemType of the remote system. - * @return the systemType object. - */ - public IRSESystemType getSystemType() { - return _systemType; - } - - /** - * Returns the userid for the remote system - * @return the user ID. - */ - public String getUserId() { - return _userId; - } - - /** - * Return the password for the remote system - */ - public String getPassword() { - return _password; - } - - /** - * Sets the password for the remote system - */ - public void setPassword(String string) { - _password = string; - } - - /** - * Sets the hostname. - * @param hostname The hostname to set - */ - public void setHostname(String hostname) { - _hostname = hostname;//RSEUIPlugin.getQualifiedHostName(hostname).toUpperCase(); - } - - /** - * Sets the systemType. - * @param systemType The systemType to set - */ - public void setSystemType(IRSESystemType systemType) { - _systemType = systemType; - } - - /** - * Sets the userid. - * @param userId The userid to set - */ - public void setUserId(String userId) { - _userId = userId; - } - -}
\ No newline at end of file diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/SystemStartHere.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/SystemStartHere.java deleted file mode 100644 index 87833284a..000000000 --- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/SystemStartHere.java +++ /dev/null @@ -1,201 +0,0 @@ -/******************************************************************************** - * Copyright (c) 2002, 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 - * - * 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: - * Martin Oberhuber (Wind River) - [168975] Move RSE Events API to Core - * 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) - [175680] Deprecate obsolete ISystemRegistry methods - * Martin Oberhuber (Wind River) - [cleanup] Avoid using SystemStartHere in production code - * David Dykstal (IBM) - [226561] Add API markup to RSE javadocs for extend / implement - ********************************************************************************/ - -package org.eclipse.rse.core.model; -import org.eclipse.rse.core.IRSECoreRegistry; -import org.eclipse.rse.core.IRSESystemType; -import org.eclipse.rse.core.RSECorePlugin; -import org.eclipse.rse.core.subsystems.ISubSystem; -import org.eclipse.rse.core.subsystems.ISubSystemConfiguration; - - -/** - * A utility class, composed of static methods, that can be used to begin RSE processing. - * @noextend This class is not intended to be subclassed by clients. - * @noinstantiate This class is not intended to be instantiated by clients. - */ -public class SystemStartHere -{ - /** - * STEP 1. Get system registry singleton - * <p> - * SAME AS: <code>RSECorePlugin.getSystemRegistry</code> - */ - public static ISystemRegistry getSystemRegistry() - { - return RSECorePlugin.getTheSystemRegistry(); - } - - /** - * STEP 2a. Get connections for all system types - * <p> - * SAME AS: <code>getSystemRegistry().getConnections()</code> - * @see #getConnectionsBySystemType(String) - */ - public static IHost[] getConnections() - { - return getSystemRegistry().getHosts(); - } - - /** - * STEP 2b. Get all connections for the given system type. - * <p> - * SAME AS: <code>getSystemRegistry().getHostsBySystemType(systemType)</code> - * @param systemTypeId One of the system types IDs defined via system type extension point: - * <ul> - * <li>"org.eclipse.rse.systemtype.iseries" ({@link IRSESystemType#SYSTEMTYPE_ISERIES_ID}) - * <li>"org.eclipse.rse.systemtype.windows" ({@link IRSESystemType#SYSTEMTYPE_WINDOWS_ID}) - * <li>"org.eclipse.rse.systemtype.zseries" ({@link IRSESystemType#SYSTEMTYPE_ZSERIES_ID}) - * <li>"org.eclipse.rse.systemtype.unix" ({@link IRSESystemType#SYSTEMTYPE_UNIX_ID}) - * <li>"org.eclipse.rse.systemtype.linux" ({@link IRSESystemType#SYSTEMTYPE_LINUX_ID}) - * <li>"org.eclipse.rse.systemtype.aix" ({@link IRSESystemType#SYSTEMTYPE_AIX_ID}) - * <li>"org.eclipse.rse.systemtype.local" ({@link IRSESystemType#SYSTEMTYPE_LOCAL_ID}) - * <li>"org.eclipse.rse.systemtype.ftp" ({@link IRSESystemType#SYSTEMTYPE_FTP_ONLY_ID}) - * <li>"org.eclipse.rse.systemtype.ssh" ({@link IRSESystemType#SYSTEMTYPE_SSH_ONLY_ID}) - * <li>"org.eclipse.rse.systemtype.telnet" ({@link IRSESystemType#SYSTEMTYPE_TELNET_ONLY_ID}) - * </ul> - * @see org.eclipse.rse.core.IRSESystemType - * @see IRSECoreRegistry#getSystemTypeById(String) - * @see org.eclipse.rse.core.model.ISystemRegistry#getHostsBySystemType(IRSESystemType) - * - */ - public static IHost[] getConnectionsBySystemType(String systemTypeId) - { - IRSESystemType systemType = RSECorePlugin.getTheCoreRegistry().getSystemTypeById(systemTypeId); - return getSystemRegistry().getHostsBySystemType(systemType); - } - - /** - * STEP 2c. Get all connections for your subsystem configuration - * <p> - * SAME AS: <code>getSystemRegistry().getConnectionsBySubSystemConfiguration(subsystemConfiguration)</code> - * @param subsystemConfiguration A subsystem configuration object. - * @see org.eclipse.rse.core.model.ISystemRegistry#getHostsBySubSystemConfiguration(ISubSystemConfiguration) - * @see #getConnectionsBySubSystemConfiguration(String) - */ - public static IHost[] getConnectionsBySubSystemConfiguration(ISubSystemConfiguration subsystemConfiguration) - { - return getSystemRegistry().getHostsBySubSystemConfiguration(subsystemConfiguration); - } - /** - * STEP 2d. Get all connections for your subsystem configuration, identified by subsystemConfigurationId. - * <p> - * SAME AS: <code>getSystemRegistry().getConnectionsBySubSystemConfiguration(getSubSystemConfiguration(subsystemConfigurationId))</code> - * @param subsystemConfigurationId The id of the subsystem configuration as given in its plugin.xml id attribute for the subsystemConfigurations extension point - * @see #getSubSystemConfiguration(String) - * @see #getConnectionsBySubSystemConfiguration(ISubSystemConfiguration) - */ - public static IHost[] getConnectionsBySubSystemConfiguration(String subsystemConfigurationId) - { - return getSystemRegistry().getHostsBySubSystemConfiguration(getSubSystemConfiguration(subsystemConfigurationId)); - } - - /** - * STEP 3a. Get all subsystems for all connections for your subsystem configuration, identified by subsystemConfigurationId. - * <p> - * SAME AS: <code>getSystemRegistry().getSubSystems(subsystemConfigurationId)</code> - * @param subsystemConfigurationId The subsystem configuration id as given in its plugin.xml id attribute for the subsystemConfigurations extension point - * @see ISystemRegistry#getSubSystemConfiguration(String) - * @see ISubSystemConfiguration#getSubSystems(boolean) - * @see ISubSystemConfiguration#getId() - */ - public static ISubSystem[] getSubSystems(String subsystemConfigurationId) - { - ISystemRegistry sr = getSystemRegistry(); - ISubSystemConfiguration config = sr.getSubSystemConfiguration(subsystemConfigurationId); - if (config == null) - return (new ISubSystem[0]); - return config.getSubSystems(true); - } - /** - * STEP 3b. Get all subsystems for the given connection for your subsystem configuration, identified by subsystemConfigurationId. - * <p> - * SAME AS: <code>getSystemRegistry().getSubSystems(subsystemConfigurationId, connection)</code> - * @param subsystemConfigurationId The subsystem configuration id as given in its plugin.xml id attribute for the subsystemConfigurations extension point - * @param connection The connection object you wish to get the subsystems for. Typically there is only one subsystem per object. - * @see ISystemRegistry#getSubSystemConfiguration(String) - * @see ISubSystemConfiguration#getSubSystems(IHost, boolean) - */ - public static ISubSystem[] getSubSystems(String subsystemConfigurationId, IHost connection) - { - ISystemRegistry sr = getSystemRegistry(); - ISubSystemConfiguration config = sr.getSubSystemConfiguration(subsystemConfigurationId); - if (config == null) - return (new ISubSystem[0]); - return config.getSubSystems(connection, true); - } - /** - * STEP 3c. Same as {@link #getSubSystems(String,IHost)} by used when you know - * the subsystem configuration only supports a single subsystem per connection. - * @param subsystemConfigurationId The subsystem configuration id as given in its plugin.xml id attribute for the subsystemConfigurations extension point - * @param connection The connection object you wish to get the subsystems for. Typically there is only one subsystem per object. - * @see #getSubSystems(String, IHost) - * @see org.eclipse.rse.core.subsystems.ISubSystemConfiguration#getId() - */ - public static ISubSystem getSubSystem(String subsystemConfigurationId, IHost connection) - { - ISubSystem[] subsystems = getSubSystems(subsystemConfigurationId, connection); - if ((subsystems == null) || (subsystems.length==0)) - return null; - else - return subsystems[0]; - } - - - - // ---------------------------- - // MISCELLANEOUS: - // ---------------------------- - /** - * Miscellaneous Helper - return the subsystem configuration object for the given subsystemConfigurationId. - * <p> - * SAME AS: <code>getSystemRegistry().getSubSystemConfiguration(subsystemConfigurationId)</code> - * @param subsystemConfigurationId The id of the subsystem configuration as given in its plugin.xml id attribute for the subsystemConfigurations extension point - */ - public static ISubSystemConfiguration getSubSystemConfiguration(String subsystemConfigurationId) - { - return getSystemRegistry().getSubSystemConfiguration(subsystemConfigurationId); - } - - /** - * Miscellaneous Helper - Return the singleton profile manager. - * SAME AS: <code>getSystemRegistry().getSystemProfileManager()</code> - */ - public static ISystemProfileManager getSystemProfileManager() - { - return RSECorePlugin.getTheSystemProfileManager(); - } - - /** - * Return all active profiles. - * <p> - * A team might have many profiles, at least one per developer. - * However, typically only one or two are activated at a time, and - * we only return connections for those which are active. - * <p> - * SAME AS: <code>getSystemRegistry().getActiveSystemProfiles()</code> - */ - public static ISystemProfile[] getActiveSystemProfiles() - { - return getSystemRegistry().getActiveSystemProfiles(); - } -}
\ No newline at end of file diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/SystemWorkspaceResourceSet.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/SystemWorkspaceResourceSet.java deleted file mode 100644 index dc4b0338e..000000000 --- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/SystemWorkspaceResourceSet.java +++ /dev/null @@ -1,41 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2004, 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 - * - * 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) - [226561] Add API markup to RSE javadocs for extend / implement - *******************************************************************************/ - -package org.eclipse.rse.core.model; - -import java.util.List; - -import org.eclipse.core.resources.IResource; - -/** - * An ISystemResourceSet containing workspace resources. - * @noextend This class is not intended to be subclassed by clients. - */ -public class SystemWorkspaceResourceSet extends AbstractSystemResourceSet { - - public SystemWorkspaceResourceSet() { - super(); - } - - public SystemWorkspaceResourceSet(List resources) { - super(resources); - } - - public SystemWorkspaceResourceSet(IResource[] resources) { - super(resources); - } -} diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/references/IRSEBasePersistableReferenceManager.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/references/IRSEBasePersistableReferenceManager.java deleted file mode 100644 index 6558e0165..000000000 --- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/references/IRSEBasePersistableReferenceManager.java +++ /dev/null @@ -1,158 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2002, 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 - * - * 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) - [226561] Add API markup for noextend / noimplement where needed - *******************************************************************************/ - -package org.eclipse.rse.core.references; - - -/** - * A class for managing a list of shadow objects that reference master objects. - * <p> - * Sometimes we have a master list of objects, and we let the user select - * a subset of that list and we wish to persist that users selections. To - * accomplish this, in your Rose model, follow these steps: - * <ol> - * <li>Include the references package from the SystemReferences .cat file - * <li>Ensure the class for the master objects subclass SystemPersistableReferencedObject, - * or implement IRSEPersistableReferencedObject. - * <b>YOU MUST OVERRIDE getReferenceName() IN SYSTEMPERSISTABLEREFERENCEDOBJECT!</b> - * <li>Create a class subclassing SystemPersistableReferencingObject to hold a reference - * to the master object. This will hold a transient pointer, and a persistable - * name, of the master object. The name must be sufficient to be able to re-create - * the pointer upon restoration from disk. When you set the pointer via the - * setReferencedObject method, it will automatically extract the name of that - * object (by calling its getReferenceName method) and store it in the mof-modelled - * attribute of the SystemPersistableReferencingObject class. - * <li>Create a class subclassing this class (SystemPersistableReferenceManager) - * to manage the list of referencing objects. Each time you instantiate a reference - * object, add it to the referencingObjects list managed by this class. - * <b>YOU MUST OVERRIDE resolveReferencesAfterRestore() IN SYSTEMPERSISTABLEREFERENCEMANAGERIMPL!</b> - * </ol> - * <p> - * Once you have an instantiated and populated instance of this class, you can either - * choose to save it to disk in its own file (save/restore methods are supplied for this) - * or you can simply choose to store it as part of your own class via your own save - * and restore methods. If using MOF, and the containment of the manager class is modelled in - * your own containing class, this will happen automatically when you use mof to save - * your containing class instance. - * @noimplement This interface is not intended to be implemented by clients. - * The standard implementations are included in the framework. - */ -public interface IRSEBasePersistableReferenceManager { - - /** - * Return an array of the referencing objects currently being managed. - * @return array of the referencing objects currently in this list. - */ - public IRSEBasePersistableReferencingObject[] getReferencingObjects(); - - /** - * Set in one shot the list of referencing objects. Replaces current list. - * @param objects An array of referencing objects which is to become the new list. - * @param deReference true to first de-reference all objects in the existing list. - */ - public void setReferencingObjects(IRSEBasePersistableReferencingObject[] objects, boolean deReference); - - /** - * Add a referencing object to the managed list. - * @return new count of referenced objects being managed. - */ - public int addReferencingObject(IRSEBasePersistableReferencingObject object); - - /** - * Remove a referencing object from the managed list. - * <p>Does NOT call removeReference on the master referenced object. - * @return new count of referenced objects being managed. - */ - public int removeReferencingObject(IRSEBasePersistableReferencingObject object); - - /** - * Remove and dereferences a referencing object from the managed list. - * <p>DOES call removeReference on the master referenced object. - * @return new count of referenced objects being managed. - */ - public int removeAndDeReferenceReferencingObject(IRSEBasePersistableReferencingObject object); - - /** - * Remove all objects from the list. - * <p>Does NOT call removeReference on the master referenced objects. - */ - public void removeAllReferencingObjects(); - - /** - * Remove and dereference all objects from the list. - * <p>DOES call removeReference on the master referenced objects. - */ - public void removeAndDeReferenceAllReferencingObjects(); - - /** - * Return how many referencing objects are currently in the list. - * @return current count of referenced objects being managed. - */ - public int getReferencingObjectCount(); - - /** - * Return the zero-based position of the given referencing object within the list. - * Does a memory address comparison (==) to find the object. - * @param object The referencing object to find position of. - * @return zero-based position within the list. If not found, returns -1 - */ - public int getReferencingObjectPosition(IRSEBasePersistableReferencingObject object); - - /** - * Move the given referencing object to a new zero-based position in the list. - * @param newPosition New zero-based position - * @param object The referencing object to move - */ - public void moveReferencingObjectPosition(int newPosition, IRSEBasePersistableReferencingObject object); - - /** - * Return true if the given referencable object is indeed referenced by a referencing object - * in the current list. This is done by comparing the reference names of each, not the - * in-memory pointers. - * @param object The referencable object to which to search for a referencing object within this list - * @return true if found in list, false otherwise. - */ - public boolean isReferenced(IRSEBasePersistableReferencedObject object); - - /** - * Search list of referencing objects to see if one of them references the given referencable object. - * This is done by comparing the reference names of each, not the in-memory pointers. - * @param object The referencable object to which to search for a referencing object within this list - * @return the referencing object within this list which references the given referencable object, or - * null if no reference found. - */ - public IRSEBasePersistableReferencingObject getReferencedObject(IRSEBasePersistableReferencedObject object); - - /** - * @generated This field/method will be replaced during code generation - * @return The value of the Name attribute - */ - String getName(); - - /** - * @generated This field/method will be replaced during code generation - * @param value The new value of the Name attribute - */ - void setName(String value); - - /** - * @generated This field/method will be replaced during code generation - * @return The list of ReferencingObjectList references - */ - java.util.List getReferencingObjectList(); - -} diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/references/IRSEBasePersistableReferencedObject.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/references/IRSEBasePersistableReferencedObject.java deleted file mode 100644 index 8e024144d..000000000 --- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/references/IRSEBasePersistableReferencedObject.java +++ /dev/null @@ -1,51 +0,0 @@ -/******************************************************************************** - * Copyright (c) 2002, 2008 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 - * - * 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) - [226561] Add API markup for noextend / noimplement where needed - ********************************************************************************/ - -package org.eclipse.rse.core.references; - -/** - * Referenced objects are objects that have shadow objects (referencing objects) - * of them. Typically, references are created to enable a UI which does not - * allow the same real object to appear multiple times. In these cases, a unique - * reference object is created for each unique instance of the real object. - * <p> - * The parent interface IRSEReferencedObject captures the simple set of methods - * an object that supports such a real object implement. - * <p> - * This interface specializes that for the case of real objects that support - * references that must be persisted. Typically, we build the references in - * memory at runtime to satisfy the UI. However, occasionally we build the list - * of references for a more permanent reason, such as when we let a user choose - * a subset from a master list. - * <p> - * When we persist such a reference, we can't persist the memory reference to - * the master object. Instead, we persist the unique name of that object, and - * upon restoring from disk we then resolve that into a runtime reference to a - * real memory object. - * <p> - * This interface supplies the method to allow a referencing object to query - * that unique name or key from this real object. - * - * @noimplement This interface is not intended to be implemented by clients. The - * standard implementations are included in the framework. - */ -public interface IRSEBasePersistableReferencedObject extends IRSEBaseReferencedObject { - - /** - * @return the unique name or key of this master object to record in the referencing object. - */ - public String getReferenceName(); -}
\ No newline at end of file diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/references/IRSEBasePersistableReferencingObject.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/references/IRSEBasePersistableReferencingObject.java deleted file mode 100644 index f01dbdae0..000000000 --- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/references/IRSEBasePersistableReferencingObject.java +++ /dev/null @@ -1,57 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2002, 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 - * - * 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) - [226561] Add API markup for noextend / noimplement where needed - *******************************************************************************/ - -package org.eclipse.rse.core.references; - -/** - * Referencing objects are shadows of real objects. Typically, shadows are - * created to enable a GUI which does not allow the same real object to appear - * multiple times. In these cases, a unique shadow object is created for each - * unique instance of the real object. - * <p> - * The parent interface ISystemReferencingObject captures the simple set of - * methods such a shadow must implement. - * <p> - * This interface specializes that for the case of references that must be - * persisted. Typically, we build the references in memory at runtime just to - * satisfy the GUI. However, occasionally we build the list of references for a - * more permanent reason, such as when we let a user choose a subset from a - * master list. - * <p> - * When we persist such a reference, we can't persist the memory reference to - * the master object. Instead, we persist the unique name or key of that object, - * and upon restoring from disk we then resolve that into a runtime reference to - * a real memory object. - * <p> - * This interface captures the methods to set and query that name or key. - * - * @noimplement This interface is not intended to be implemented by clients. The - * standard implementations are included in the framework. - */ -public interface IRSEBasePersistableReferencingObject extends IRSEBaseReferencingObject { - /** - * Set the object to which we reference. This is an overload of the parent - * interface method of the same name. This one takes an object of which we - * can query its unique name for the purpose of saving that to disk. - */ - public void setReferencedObject(IRSEBasePersistableReferencedObject obj); - - /** - * Query the unique name or key of the object we are referencing. - */ - public String getReferencedObjectName(); -} diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/references/IRSEBaseReferencedObject.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/references/IRSEBaseReferencedObject.java deleted file mode 100644 index d9e1728a7..000000000 --- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/references/IRSEBaseReferencedObject.java +++ /dev/null @@ -1,55 +0,0 @@ -/******************************************************************************** - * Copyright (c) 2002, 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 - * - * 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: - * Martin Oberhuber (Wind River) - Cleanup Javadoc. - * David Dykstal (IBM) - [226561] Add API markup for noextend / noimplement where needed - ********************************************************************************/ - -package org.eclipse.rse.core.references; - -/** - * Interface that any master object that is referenced must implement. - * @noimplement This interface is not intended to be implemented by clients. - * The standard implementations are included in the framework. - */ -public interface IRSEBaseReferencedObject { - /** - * Add a reference, increment reference count, return new count - * @param ref the referencing object from which this object will now be referenced. - * @return new count of how many referencing objects reference this object. - */ - public int addReference(IRSEBaseReferencingObject ref); - - /** - * Remove a reference, decrement reference count, return new count - * @param ref the referencing object from which this object is no longer referenced. - * @return new count of how many referencing objects reference this object. - */ - public int removeReference(IRSEBaseReferencingObject ref); - - /** - * Return a count of how many referencing objects reference this object. - * @return a count of how many referencing objects reference this object. - */ - public int getReferenceCount(); - - /** - * Clear the list of referenced objects. - */ - public void removeAllReferences(); - - /** - * @return a list of all referencing objects of this object - */ - public IRSEBaseReferencingObject[] getReferencingObjects(); -}
\ No newline at end of file diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/references/IRSEBaseReferencingObject.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/references/IRSEBaseReferencingObject.java deleted file mode 100644 index 6fb93c2f6..000000000 --- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/references/IRSEBaseReferencingObject.java +++ /dev/null @@ -1,58 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2002, 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 - * - * 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) - [226561] Add API markup for noextend / noimplement where needed - *******************************************************************************/ - -package org.eclipse.rse.core.references; - -/** - * Referencing objects are shadows of real objects. Typically, shadows are created - * to enable a GUI which does not allow the same real object to appear multiple times. - * In these cases, a unique shadow object is created for each unique instance of the - * real object. - * <p> - * This interface captures the simple set of methods such a shadow must implement. - * @noimplement This interface is not intended to be implemented by clients. - * The standard implementations are included in the framework. - */ -public interface IRSEBaseReferencingObject { - /** - * Set the object to which we reference - * @param obj the object to reference - */ - public void setReferencedObject(IRSEBaseReferencedObject obj); - - /** - * @return the object which we reference - */ - public IRSEBaseReferencedObject getReferencedObject(); - - /** - * Fastpath to getReferencedObject().removeReference(this). - * @return new reference count of master object - */ - public int removeReference(); - - /** - * @param broken true if this reference is currently broken/unresolved - */ - public void setReferenceBroken(boolean broken); - - /** - * @return true if this reference is currently broken/unresolved - */ - public boolean isReferenceBroken(); - -} diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/references/IRSEPersistableReferencedObject.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/references/IRSEPersistableReferencedObject.java deleted file mode 100644 index 1610d2640..000000000 --- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/references/IRSEPersistableReferencedObject.java +++ /dev/null @@ -1,28 +0,0 @@ -/******************************************************************************** - * Copyright (c) 2002, 2008 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 - * - * 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) - [226561] Add API markup for noextend / noimplement where needed - ********************************************************************************/ - -package org.eclipse.rse.core.references; - -/** - * This is an object that can have shadow (reference) objects, which simply - * point to this object, and a copy of this object's unique name or key (for storing on disk). - * @noimplement This interface is not intended to be implemented by clients. - * The standard implementations are included in the framework. - */ - -public interface IRSEPersistableReferencedObject extends IRSEReferencedObject, IRSEBasePersistableReferencedObject { - -}
\ No newline at end of file diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/references/IRSEPersistableReferencingObject.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/references/IRSEPersistableReferencingObject.java deleted file mode 100644 index b018a2941..000000000 --- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/references/IRSEPersistableReferencingObject.java +++ /dev/null @@ -1,66 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2002, 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 - * - * 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) - [226561] Add API markup for noextend / noimplement where needed - *******************************************************************************/ - -package org.eclipse.rse.core.references; - -/** - * A simple class that implements IRSEPersistableReferencingObject. - * This is an object that is a shadow (reference) of a real master object - * (IRSEPersistableReferencedObject). - * <p> - * Objects of this class contain a pointer (in memory) to the master object, - * and a copy of this object's unique name or key (for storing on disk). - * <p> - * Only the name is saved to disk, and after restoring from disk, that name - * is used to set the actual object reference. - * <p> - * The intention is that in your Rose model, your class extends this class. - * Do this for any shadow/reference class which you want to persist. Use - * a subclass of SystemPersistableReferenceManager to manage a list of these, - * and manage the saving/restoring of that list. - * <p> - * <b>YOU MUST OVERRIDE resolveReferencesAfterRestore IN YOUR REFERENCE MANAGER SUBCLASS</b> - * @noimplement This interface is not intended to be implemented by clients. - * The standard implementations are included in the framework. - */ -public interface IRSEPersistableReferencingObject extends IRSEReferencingObject, IRSEBasePersistableReferencingObject { - - /** - * @generated This field/method will be replaced during code generation - * @return The value of the ReferencedObjectName attribute - */ - String getReferencedObjectName(); - - /** - * @generated This field/method will be replaced during code generation - * @param value The new value of the ReferencedObjectName attribute - */ - void setReferencedObjectName(String value); - - /** - * @generated This field/method will be replaced during code generation - * @return The ParentReferenceManager reference - */ - IRSEBasePersistableReferenceManager getParentReferenceManager(); - - /** - * @generated This field/method will be replaced during code generation - * @param l The new value of the ParentReferenceManager reference - */ - void setParentReferenceManager(IRSEBasePersistableReferenceManager value); - -} diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/references/IRSEReferencedObject.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/references/IRSEReferencedObject.java deleted file mode 100644 index e51907bf6..000000000 --- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/references/IRSEReferencedObject.java +++ /dev/null @@ -1,33 +0,0 @@ -/******************************************************************************** - * Copyright (c) 2002, 2008 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 - * - * 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) - [226561] Add API markup for noextend / noimplement where needed - ********************************************************************************/ - -package org.eclipse.rse.core.references; - -/** - * An interface to encapsulate the operations required of an object which - * supports references to it by other objects (IRSEReferencingObject). - * This type of class needs to support maintaining an in-memory list of - * all who reference it so that list can be following on delete and - * rename operations. - * <p> - * These references are not persistent. Persistent references are managed - * by the subtype IRSEPersistableReferencedObject. - * @noimplement This interface is not intended to be implemented by clients. - * The standard implementations are included in the framework. - */ -public interface IRSEReferencedObject extends IRSEBaseReferencedObject { - -}
\ No newline at end of file diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/references/IRSEReferencingObject.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/references/IRSEReferencingObject.java deleted file mode 100644 index bd22ed2b1..000000000 --- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/references/IRSEReferencingObject.java +++ /dev/null @@ -1,35 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2002, 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 - * - * 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) - [226561] Add API markup for noextend / noimplement where needed - *******************************************************************************/ - -package org.eclipse.rse.core.references; - -/** - * A class to encapsulate the operations required of an object which - * is merely a reference to another object, something we call a shadow. - * Such shadows are needed to support a GUI which displays the same - * object in multiple places. To enable that, it is necessary not to - * use the same physical object in each UI representation as the UI - * will only know how to update/refresh the first one it finds. - * <p> - * These references are not persistent. Persistent references are managed - * by the subclass SystemPersistableReferencingObject. - * @noimplement This interface is not intended to be implemented by clients. - * The standard implementations are included in the framework. - */ -public interface IRSEReferencingObject extends IRSEBaseReferencingObject { - -} diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/references/SystemReferencedObject.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/references/SystemReferencedObject.java deleted file mode 100644 index 221c5aa89..000000000 --- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/references/SystemReferencedObject.java +++ /dev/null @@ -1,83 +0,0 @@ -/******************************************************************************** - * Copyright (c) 2002, 2008 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 - * - * 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) - [224671] [api] org.eclipse.rse.core API leaks non-API types - * David Dykstal (IBM) - [226561] Add API markup for noextend / noimplement where needed - ********************************************************************************/ - -package org.eclipse.rse.core.references; - -import org.eclipse.rse.core.model.RSEModelObject; - -/** - * A class to encapsulate the operations required of an object which supports - * references to it by other objects ({@link SystemReferencingObject}). This - * type of class needs to support maintaining an in-memory list of all who - * reference it so that list can be following on delete and rename operations. - * - * @noextend This class is not intended to be subclassed by clients. The - * standard extensions are included in the framework. - * - * @since org.eclipse.rse.core 3.0 - */ -public abstract class SystemReferencedObject extends RSEModelObject implements IRSEReferencedObject { - - protected SystemReferencedObjectHelper helper = null; - - /** - * Default constructor. Typically called by EMF factory method. - */ - protected SystemReferencedObject() { - helper = new SystemReferencedObjectHelper(); - } - - /** - * Add a reference, increment reference count, return new count - * @param ref the referencing object - * @return new count of how many referencing objects reference this object. - */ - public int addReference(IRSEBaseReferencingObject ref) { - return helper.addReference(ref); - } - - /** - * Remove a reference, decrement reference count, return new count - * @param ref the referencing object - * @return new count of how many referencing objects reference this object. - */ - public int removeReference(IRSEBaseReferencingObject ref) { - return helper.removeReference(ref); - } - - /** - * @return a count of how many referencing objects reference this object. - */ - public int getReferenceCount() { - return helper.getReferenceCount(); - } - - /** - * Clear the list of referenced objects. - */ - public void removeAllReferences() { - helper.removeAllReferences(); - } - - /** - * @return a list of all referencing objects of this object - */ - public IRSEBaseReferencingObject[] getReferencingObjects() { - return helper.getReferencingObjects(); - } - -}
\ No newline at end of file diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/references/SystemReferencedObjectHelper.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/references/SystemReferencedObjectHelper.java deleted file mode 100644 index 56dd67d8a..000000000 --- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/references/SystemReferencedObjectHelper.java +++ /dev/null @@ -1,78 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2002, 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 - * - * 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) - [224671] [api] org.eclipse.rse.core API leaks non-API types - * David Dykstal (IBM) - [226561] Add API markup for noextend / noimplement where needed - *******************************************************************************/ - -package org.eclipse.rse.core.references; - -import java.util.Vector; - -/** - * The class should be used by subclasses of {@link SystemReferencedObject} by - * instantiating it and delegating to it. - * - * @noextend This class is not intended to be subclassed by clients. The - * standard extensions are included in the framework. - * @since org.eclipse.rse.core 3.0 - */ -public class SystemReferencedObjectHelper { - - private Vector referencingObjects = new Vector(); - - /** - * @see IRSEBaseReferencedObject#addReference(IRSEBaseReferencingObject) - */ - public int addReference(IRSEBaseReferencingObject ref) { - referencingObjects.addElement(ref); - return referencingObjects.size(); - } - - /** - * @see IRSEBaseReferencedObject#removeReference(IRSEBaseReferencingObject) - */ - public int removeReference(IRSEBaseReferencingObject ref) { - referencingObjects.removeElement(ref); - return referencingObjects.size(); - } - - /** - * @see IRSEBaseReferencedObject#getReferenceCount() - */ - public int getReferenceCount() { - return referencingObjects.size(); - } - - /** - * Clear the list of referenced objects. - */ - public void removeAllReferences() { - IRSEBaseReferencingObject[] references = getReferencingObjects(); - for (int i = 0; i < references.length; i++) { - IRSEBaseReferencingObject reference = references[i]; - removeReference(reference); - } - } - - /** - * @see IRSEBaseReferencedObject#getReferencingObjects() - */ - public IRSEBaseReferencingObject[] getReferencingObjects() { - IRSEBaseReferencingObject[] references = new IRSEBaseReferencingObject[referencingObjects.size()]; - referencingObjects.toArray(references); - return references; - } - -} diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/references/SystemReferencingObject.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/references/SystemReferencingObject.java deleted file mode 100644 index 151bf811b..000000000 --- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/references/SystemReferencingObject.java +++ /dev/null @@ -1,93 +0,0 @@ -/******************************************************************************** - * Copyright (c) 2002, 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 - * - * 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: - * Martin Oberhuber (Wind River) - [184095] Replace systemTypeName by IRSESystemType - * David Dykstal (IBM) - [224671] [api] org.eclipse.rse.core API leaks non-API types - * David Dykstal (IBM) - [226561] Add API markup for noextend / noimplement where needed - ********************************************************************************/ - -package org.eclipse.rse.core.references; - -import org.eclipse.rse.core.model.RSEModelObject; -import org.eclipse.rse.internal.core.RSECoreMessages; - -/** - * A class to encapsulate the operations required of an object which is merely a - * reference to another object, something we call a shadow. Such shadows are - * needed to support a UI which displays the same object in multiple places. To - * enable that, it is necessary not to use the same physical object in each UI - * representation as the UI will only know how to update/refresh the first one - * it finds. - * - * @noextend This class is not intended to be subclassed by clients. The - * standard extensions are included in the framework. - * @since org.eclipse.rse.core 3.0 - */ -public abstract class SystemReferencingObject extends RSEModelObject implements IRSEReferencingObject { - private SystemReferencingObjectHelper helper = null; - protected boolean referenceBroken = false; - - /** - * Default constructor. - */ - protected SystemReferencingObject() { - super(); - helper = new SystemReferencingObjectHelper(this); - } - - /* - * (non-Javadoc) - * @see org.eclipse.rse.core.references.IRSEBaseReferencingObject#setReferencedObject(org.eclipse.rse.core.references.IRSEBaseReferencedObject) - */ - public void setReferencedObject(IRSEBaseReferencedObject obj) { - helper.setReferencedObject(obj); - } - - /* - * (non-Javadoc) - * @see org.eclipse.rse.core.references.IRSEBaseReferencingObject#getReferencedObject() - */ - public IRSEBaseReferencedObject getReferencedObject() { - return helper.getReferencedObject(); - } - - /* - * (non-Javadoc) - * @see org.eclipse.rse.core.references.IRSEBaseReferencingObject#removeReference() - */ - public int removeReference() { - return helper.removeReference(); - } - - /** - * Set to true if this reference is currently broken/unresolved - */ - public void setReferenceBroken(boolean broken) { - referenceBroken = broken; - } - - /** - * Return true if this reference is currently broken/unresolved - */ - public boolean isReferenceBroken() { - return referenceBroken; - } - - public String getDescription() { - return RSECoreMessages.RESID_MODELOBJECTS_REFERENCINGOBJECT_DESCRIPTION; - } - - protected final SystemReferencingObjectHelper getHelper() { - return helper; - } -}
\ No newline at end of file diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/references/SystemReferencingObjectHelper.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/references/SystemReferencingObjectHelper.java deleted file mode 100644 index c93afd870..000000000 --- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/references/SystemReferencingObjectHelper.java +++ /dev/null @@ -1,88 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2002, 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 - * - * 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) - [224671] [api] org.eclipse.rse.core API leaks non-API types - * David Dykstal (IBM) - [226561] Add API markup for noextend / noimplement where needed - *******************************************************************************/ - -package org.eclipse.rse.core.references; - - -/** - * The class should be used by subclasses of {@link SystemReferencingObject} by - * instantiating it and delegating to it. - * - * @noextend This class is not intended to be subclassed by clients. The - * standard extensions are included in the framework. - * @noinstantiate This class is not intended to be instantiated by clients. The - * standard instances are created by the framework. - * @since org.eclipse.rse.core 3.0 - */ -public class SystemReferencingObjectHelper { - - private IRSEBaseReferencedObject masterObject = null; - private IRSEBaseReferencingObject caller = null; - - /** - * Default constructor. - * @param caller the reference that this object is helping. - */ - public SystemReferencingObjectHelper(IRSEBaseReferencingObject caller) { - super(); - this.caller = caller; - } - - /** - * Constructor that saves effort of calling setReferencedObject. - * @param caller the reference that this object is helping. - * @param obj the object to which this reference will point. - */ - public SystemReferencingObjectHelper(IRSEBaseReferencingObject caller, IRSEBaseReferencedObject obj) { - this(caller); - setReferencedObject(obj); - } - - /** - * Set the object to which this reference will point. - * Stores the reference in memory, replacing whatever was there. - * Also calls obj.addReference(caller); - * @param obj the object to which this reference will point. - */ - public void setReferencedObject(IRSEBaseReferencedObject obj) { - this.masterObject = obj; - if (obj != null) obj.addReference(caller); - } - - /** - * Get the object which is referenced. May be null if the reference is not set or has not been resolved. - * @return the referenced object. - */ - public IRSEBaseReferencedObject getReferencedObject() { - return masterObject; - } - - /** - * Removes this reference from the referenced object and clears this reference. - * Also, nulls out our memory reference. - * @return new reference count of master object - */ - public int removeReference() { - int newCount = 0; - IRSEBaseReferencedObject masterObject = getReferencedObject(); - if (masterObject != null) newCount = masterObject.removeReference(caller); - masterObject = null; - return newCount; - } - -} diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/subsystems/AbstractConnectorService.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/subsystems/AbstractConnectorService.java deleted file mode 100644 index dc33b5a20..000000000 --- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/subsystems/AbstractConnectorService.java +++ /dev/null @@ -1,508 +0,0 @@ -/******************************************************************************** - * Copyright (c) 2002, 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 - * - * 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) - 168977: refactoring IConnectorService and ServerLauncher hierarchies - * Martin Oberhuber (Wind River) - [175262] IHost.getSystemType() should return IRSESystemType - * David Dykstal (IBM) - 142806: refactoring persistence framework - * Martin Oberhuber (Wind River) - [185750] Remove IConnectorService.getHostType() - * David Dykstal (IBM) - [189483] fix spelling in initialize/uninitialize method signatures - * David Dykstal (IBM) - [210474] Deny save password function missing - ********************************************************************************/ -package org.eclipse.rse.core.subsystems; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.Vector; - -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.rse.core.IRSESystemType; -import org.eclipse.rse.core.RSEPreferencesManager; -import org.eclipse.rse.core.model.IHost; -import org.eclipse.rse.core.model.IRSEPersistableContainer; -import org.eclipse.rse.core.model.RSEModelObject; - -/** - * This is a base class to make it easier to create connector services. - * <p> - * An {@link org.eclipse.rse.core.subsystems.IConnectorService} object - * is returned from a subsystem object via getConnectorService(), and - * it is used to maintain the connection to a particular set of subsystems. - * <p> - * This class implements the protocol for much of the - * standard bookkeeping for connector services including - * server launchers (if none are required), event handling, - * hosts, ports, addresses, descriptions, and registered subsystems. - * Subclasses must concern themselves with actually authenticating and connecting. - */ -public abstract class AbstractConnectorService extends RSEModelObject implements IConnectorService { - - private Vector commListeners = new Vector(5); - private ISubSystem _primarySubSystem = null; - private List _registeredSubSystems = new ArrayList(); - private IHost _host; - private String _description; - private String _name; - private int _port; - private boolean _usingSSL; - - /** - * Construct a new connector service. This should be called during the construction - * of any subclasses. - * @param name The name of the connector service. - * @param description A description of the connector service. - * @param host The host associated with this connector service. A host may have multiple - * connector services. - * @param port The port associated with this connector service if this connector service - * is IP based. If not IP based this can be used for some other purpose. - */ - public AbstractConnectorService(String name, String description, IHost host, int port) { - _name = name; - _description = description; - _host = host; - _port = port; - } - - /* (non-Javadoc) - * @see org.eclipse.rse.core.subsystems.IConnectorService#isServerLaunchTypeEnabled(org.eclipse.rse.core.subsystems.ISubSystem, org.eclipse.rse.core.subsystems.ServerLaunchType) - */ - public final boolean isServerLaunchTypeEnabled(ISubSystem subsystem, ServerLaunchType serverLaunchType) { - IServerLauncher sl = getRemoteServerLauncher(); - if (sl instanceof RemoteServerLauncher) { - RemoteServerLauncher isl = (RemoteServerLauncher) sl; - return isl.isEnabledServerLaunchType(serverLaunchType); - } else - return subsystem.getSubSystemConfiguration().supportsServerLaunchType(serverLaunchType); - } - - /** - * @return null, may be overriden - * @see IConnectorService#getRemoteServerLauncher() - */ - public IServerLauncher getRemoteServerLauncher() { - return null; - } - - /** - * @return false, may be overridden - * @see IConnectorService#supportsRemoteServerLaunching() - */ - public boolean supportsRemoteServerLaunching() { - return false; - } - - /** - * @return false, may be overridden - * @see IConnectorService#supportsServerLaunchProperties() - */ - public boolean supportsServerLaunchProperties() { - return false; - } - - /** - * @return null, may be overridden - * @see IConnectorService#getRemoteServerLauncherProperties() - */ - public IServerLauncherProperties getRemoteServerLauncherProperties() { - return null; - } - - /** - * Do nothing, may be overridden - * @param newRemoteServerLauncher the server launcher properties - * @see IConnectorService#setRemoteServerLauncherProperties(IServerLauncherProperties) - */ - public void setRemoteServerLauncherProperties(IServerLauncherProperties newRemoteServerLauncher) { - } - - /* (non-Javadoc) - * @see org.eclipse.rse.core.subsystems.IConnectorService#hasRemoteServerLauncherProperties() - */ - public final boolean hasRemoteServerLauncherProperties() { - return getRemoteServerLauncherProperties() != null; - } - - /* (non-Javadoc) - * @see org.eclipse.rse.core.subsystems.IConnectorService#addCommunicationsListener(org.eclipse.rse.core.subsystems.ICommunicationsListener) - */ - public final void addCommunicationsListener(ICommunicationsListener listener) { - if (!commListeners.contains(listener)) { - commListeners.add(listener); - } - } - - /* (non-Javadoc) - * @see org.eclipse.rse.core.subsystems.IConnectorService#removeCommunicationsListener(org.eclipse.rse.core.subsystems.ICommunicationsListener) - */ - public final void removeCommunicationsListener(ICommunicationsListener listener) { - commListeners.remove(listener); - } - - /** - * Fires the communication event mentioned in the eventType. - * @param eventType the communications event to fire. - */ - final protected void fireCommunicationsEvent(int eventType) { - CommunicationsEvent e = new CommunicationsEvent(this, eventType); - Object[] items = commListeners.toArray(); - for (int loop=0; loop < items.length; loop++) { - ((ICommunicationsListener) items[loop]).communicationsStateChange(e); - } - } - - /* (non-Javadoc) - * @see org.eclipse.rse.core.subsystems.IConnectorService#getHost() - */ - public final IHost getHost() { - return _host; - } - - /* (non-Javadoc) - * @see org.eclipse.rse.core.subsystems.IConnectorService#setHost(org.eclipse.rse.core.model.IHost) - */ - public final void setHost(IHost host) { - _host = host; - } - - /* (non-Javadoc) - * @see org.eclipse.rse.core.model.RSEModelObject#getDescription() - */ - public final String getDescription() { - return _description; - } - - /* (non-Javadoc) - * @see org.eclipse.rse.core.model.IRSEModelObject#getName() - */ - public final String getName() { - return _name; - } - - /* (non-Javadoc) - * @see org.eclipse.rse.core.subsystems.IConnectorService#setPort(int) - */ - public final void setPort(int port) { - if (port != _port) - { - _port = port; - setDirty(true); - } - } - - /* (non-Javadoc) - * @see org.eclipse.rse.core.subsystems.IConnectorService#getPort() - */ - public final int getPort() { - return _port; - } - - /* (non-Javadoc) - * @see org.eclipse.rse.core.subsystems.IConnectorService#getPrimarySubSystem() - */ - public final ISubSystem getPrimarySubSystem() { - if (_primarySubSystem == null) - { - if (_registeredSubSystems.size() == 0) - { - - } - else - { - ISubSystem ss = (ISubSystem)_registeredSubSystems.get(0); - _primarySubSystem = ss.getPrimarySubSystem(); - } - } - return _primarySubSystem; - } - - /* (non-Javadoc) - * @see org.eclipse.rse.core.subsystems.IConnectorService#registerSubSystem(org.eclipse.rse.core.subsystems.ISubSystem) - */ - public final void registerSubSystem(ISubSystem ss) { - if (!_registeredSubSystems.contains(ss)) - { - _registeredSubSystems.add(ss); - } - } - - /* (non-Javadoc) - * @see org.eclipse.rse.core.subsystems.IConnectorService#deregisterSubSystem(org.eclipse.rse.core.subsystems.ISubSystem) - */ - public final void deregisterSubSystem(ISubSystem ss) { - _registeredSubSystems.remove(ss); - } - - /* (non-Javadoc) - * @see org.eclipse.rse.core.model.IRSEPersistableContainer#commit() - */ - public final boolean commit() { - return getHost().commit(); - } - - /* (non-Javadoc) - * @see org.eclipse.rse.core.model.IRSEPersistableContainer#getPersistableParent() - */ - public final IRSEPersistableContainer getPersistableParent() { - return _host; - } - - public IRSEPersistableContainer[] getPersistableChildren() { - List children = new ArrayList(20); - IServerLauncherProperties launcherProperties = getRemoteServerLauncherProperties(); - if (launcherProperties != null) { - children.add(getRemoteServerLauncherProperties()); - } - children.addAll(_registeredSubSystems); |
