From b5dee61f251f914e0f150848061218b315b46dd0 Mon Sep 17 00:00:00 2001
From: Martin Oberhuber < martin.oberhuber@windriver.com>
Date: Fri, 19 Mar 2010 23:21:29 +0000
Subject: [PATCH] [releng] Fix dstore.core version 3.2

---
 releng/org.eclipse.rse.build/maps/rse.map                   | 6 +++---
 .../org.eclipse.rse.dstore-feature/feature.properties       | 4 ++--
 rse/features/org.eclipse.rse.dstore-feature/feature.xml     | 4 ++--
 .../sourceTemplateFeature/feature.properties                | 4 ++--
 .../sourceTemplatePlugin/about.properties                   | 4 ++--
 rse/plugins/org.eclipse.dstore.core/META-INF/MANIFEST.MF    | 2 +-
 .../src/org/eclipse/dstore/core/server/IServerLogger.java   | 2 +-
 .../src/org/eclipse/dstore/core/server/ServerLogger.java    | 3 ++-
 .../org.eclipse.rse.services.dstore/about.properties        | 4 ++--
 9 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/releng/org.eclipse.rse.build/maps/rse.map b/releng/org.eclipse.rse.build/maps/rse.map
index 3e37fcae08d..5b2277aae89 100644
--- a/releng/org.eclipse.rse.build/maps/rse.map
+++ b/releng/org.eclipse.rse.build/maps/rse.map
@@ -2,7 +2,7 @@
 !*** Project's plugins, features and fragments
 feature@org.eclipse.rse=v201003151933,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/features/org.eclipse.rse-feature
 feature@org.eclipse.rse.core=v201003151933,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/features/org.eclipse.rse.core-feature
-feature@org.eclipse.rse.dstore=v201003010830,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/features/org.eclipse.rse.dstore-feature
+feature@org.eclipse.rse.dstore=v201003192220,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/features/org.eclipse.rse.dstore-feature
 feature@org.eclipse.rse.examples=v200905272300,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/examples/org.eclipse.rse.examples-feature
 feature@org.eclipse.rse.ftp=v201003151933,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/features/org.eclipse.rse.ftp-feature
 feature@org.eclipse.rse.local=v201003010830,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/features/org.eclipse.rse.local-feature
@@ -14,7 +14,7 @@ feature@org.eclipse.rse.tests=v201003151933,:pserver:anonymous:none@dev.eclipse.
 feature@org.eclipse.rse.useractions=v200905272300,: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=v201003010830,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.dstore.core
+plugin@org.eclipse.dstore.core=v201003192220,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.dstore.core
 plugin@org.eclipse.dstore.doc.isv=v200905272300,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/doc/org.eclipse.dstore.doc.isv
 plugin@org.eclipse.dstore.extra=v200907301400,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.dstore.extra
 plugin@org.eclipse.rse=v201003151933,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse
@@ -34,7 +34,7 @@ plugin@org.eclipse.rse.files.ui=v201003010830,:pserver:anonymous:none@dev.eclips
 plugin@org.eclipse.rse.importexport=v201003010830,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.importexport
 plugin@org.eclipse.rse.processes.ui=v201003010830,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.processes.ui
 plugin@org.eclipse.rse.sdk=v201003151933,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.sdk
-plugin@org.eclipse.rse.services.dstore=v201003151238,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.services.dstore
+plugin@org.eclipse.rse.services.dstore=v201003192220,: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=v201003152220,: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=v201003010830,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.services.local
 plugin@org.eclipse.rse.services.ssh=v200909160005,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.services.ssh
diff --git a/rse/features/org.eclipse.rse.dstore-feature/feature.properties b/rse/features/org.eclipse.rse.dstore-feature/feature.properties
index d6f88ca7cc6..f63c13518b7 100644
--- a/rse/features/org.eclipse.rse.dstore-feature/feature.properties
+++ b/rse/features/org.eclipse.rse.dstore-feature/feature.properties
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2006, 2009 IBM Corporation and others.
+# Copyright (c) 2006, 2010 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License v1.0
 # which accompanies this distribution, and is available at
@@ -26,7 +26,7 @@ description=RSE DStore is an extensible tooling communication layer.
 
 # "copyright" property - text of the "Feature Update Copyright"
 copyright=\
-Copyright (c) 2000, 2009 IBM Corporation and others. All rights reserved.\n\
+Copyright (c) 2000, 2010 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\
diff --git a/rse/features/org.eclipse.rse.dstore-feature/feature.xml b/rse/features/org.eclipse.rse.dstore-feature/feature.xml
index ad174f9f537..ff6c07e2588 100644
--- a/rse/features/org.eclipse.rse.dstore-feature/feature.xml
+++ b/rse/features/org.eclipse.rse.dstore-feature/feature.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-    Copyright (c) 2006, 2009 IBM Corporation and others.
+    Copyright (c) 2006, 2010 IBM Corporation and others.
     All rights reserved. This program and the accompanying materials
     are made available under the terms of the Eclipse Public License v1.0
     which accompanies this distribution, and is available at
@@ -19,7 +19,7 @@
 <feature
       id="org.eclipse.rse.dstore"
       label="%featureName"
-      version="3.1.100.qualifier"
+      version="3.2.0.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.rse.services.dstore">
 
diff --git a/rse/features/org.eclipse.rse.dstore-feature/sourceTemplateFeature/feature.properties b/rse/features/org.eclipse.rse.dstore-feature/sourceTemplateFeature/feature.properties
index e5a2db16821..5b3be814848 100644
--- a/rse/features/org.eclipse.rse.dstore-feature/sourceTemplateFeature/feature.properties
+++ b/rse/features/org.eclipse.rse.dstore-feature/sourceTemplateFeature/feature.properties
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2006, 2009 IBM Corporation and others.
+# Copyright (c) 2006, 2010 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License v1.0
 # which accompanies this distribution, and is available at
@@ -28,7 +28,7 @@ description=RSE DStore is an extensible tooling communication layer.
 
 # "copyright" property - text of the "Feature Update Copyright"
 copyright=\
-Copyright (c) 2000, 2009 IBM Corporation and others. All rights reserved.\n\
+Copyright (c) 2000, 2010 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\
diff --git a/rse/features/org.eclipse.rse.dstore-feature/sourceTemplatePlugin/about.properties b/rse/features/org.eclipse.rse.dstore-feature/sourceTemplatePlugin/about.properties
index 1955fbc6644..b5421183e6d 100644
--- a/rse/features/org.eclipse.rse.dstore-feature/sourceTemplatePlugin/about.properties
+++ b/rse/features/org.eclipse.rse.dstore-feature/sourceTemplatePlugin/about.properties
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2000, 2009 IBM Corporation and others.
+# Copyright (c) 2000, 2010 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License v1.0
 # which accompanies this distribution, and is available at
@@ -21,5 +21,5 @@ blurb=RSE DStore Services Source\n\
 Version: {featureVersion}\n\
 Build id: {0}\n\
 \n\
-(c) Copyright IBM Corporation and others 2000, 2009.  All rights reserved.\n\
+(c) Copyright IBM Corporation and others 2000, 2010.  All rights reserved.\n\
 Visit http://www.eclipse.org/dsdp/tm
diff --git a/rse/plugins/org.eclipse.dstore.core/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.dstore.core/META-INF/MANIFEST.MF
index e1b24f63321..876df23abf1 100644
--- a/rse/plugins/org.eclipse.dstore.core/META-INF/MANIFEST.MF
+++ b/rse/plugins/org.eclipse.dstore.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.dstore.core
-Bundle-Version: 3.1.100.qualifier
+Bundle-Version: 3.2.0.qualifier
 Bundle-Activator: org.eclipse.dstore.core.Activator
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.ui,
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
index 3bde8033478..e8d4e7cb87d 100644
--- 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
@@ -59,7 +59,7 @@ public interface IServerLogger
 	
 	/**
 	 * closeLogFileStream
-	 * @since 3.1
+	 * @since 3.2
 	 */
 	public void closeLogFileStream();
 }
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
index 1f2f3b8e996..377f386297f 100644
--- 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
@@ -107,7 +107,8 @@ public class ServerLogger implements IServerLogger
 	}
 
 	/**
-	 * @since 3.1
+	 * closeLogFileStream
+	 * @since 3.2
 	 */
 	public void closeLogFileStream(){
 		if (_logFileStream != null){
diff --git a/rse/plugins/org.eclipse.rse.services.dstore/about.properties b/rse/plugins/org.eclipse.rse.services.dstore/about.properties
index 5af114e35f5..8c271884859 100644
--- a/rse/plugins/org.eclipse.rse.services.dstore/about.properties
+++ b/rse/plugins/org.eclipse.rse.services.dstore/about.properties
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2000, 2009 IBM Corporation and others.
+# Copyright (c) 2000, 2010 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License v1.0
 # which accompanies this distribution, and is available at
@@ -25,5 +25,5 @@ blurb=RSE DStore Services\n\
 Version: {featureVersion}\n\
 Build id: {0}\n\
 \n\
-(c) Copyright IBM Corporation and others 2000, 2009.  All rights reserved.\n\
+(c) Copyright IBM Corporation and others 2000, 2010.  All rights reserved.\n\
 Visit http://www.eclipse.org/dsdp/tm
\ No newline at end of file