Bug 474254 - Move CVS cheetsheet entries to org.eclipse.cvs
The two CVS cheetsheet entries, "Check out a CVS project" and "Merge CVS
branches" which had been included in org.eclipse.platform bundle are
moved to org.eclipse.cvs.
Change-Id: I2e40e59a43d5b10aea15840966ee9aab1f480af3
Signed-off-by: Wayne Beaton <wayne@eclipse.org>
Also-by: Dejan Glozic <dejan>
diff --git a/bundles/org.eclipse.cvs/cheatsheets/cvs_checkout.xml b/bundles/org.eclipse.cvs/cheatsheets/cvs_checkout.xml
new file mode 100644
index 0000000..af369e4
--- /dev/null
+++ b/bundles/org.eclipse.cvs/cheatsheets/cvs_checkout.xml
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<cheatsheet title="Check out a CVS project">
+
+ <intro
+ href="/org.eclipse.platform.doc.user/reference/ref-cheatsheets.htm">
+ <description>
+ This cheat sheet shows you how to explore a CVS repository and check out
+ a project. If you need help at any step, click on the (?) icon to the
+ right.
+ </description>
+ </intro>
+
+ <item
+ title="Open the CVS Repository Exploring perspective"
+ href="/org.eclipse.platform.doc.user/tasks/tasks-1h.htm">
+ <description>
+ From the main menu, select Window > Open Perspective > Other...,
+ then select the <b>CVS Repository Exploring</b> perspective.
+ </description>
+ <command
+ serialization="org.eclipse.ui.perspectives.showPerspective(org.eclipse.ui.perspectives.showPerspective.perspectiveId=org.eclipse.team.cvs.ui.cvsPerspective)"
+ confirm="true" translate="" >
+ </command>
+ </item>
+
+ <item
+ title="Add a CVS repository"
+ href="/org.eclipse.platform.doc.user/tasks/tasks-92.htm">
+ <description>
+ In the CVS Repositories view, click on the <b>Add CVS Repository</b>
+ toolbar button. Enter the location and authentication information for
+ the repository. For example, for the <b>eclipse</b> repository, enter the
+ following:<br/>
+ <br/>
+ Host: dev.eclipse.org<br/>
+ Repository path: /cvsroot/eclipse<br/>
+ User: anonymous<br/>
+ Connection type: pserver<br/>
+ <br/>
+ Use defaults for the rest, then click Finish.
+ </description>
+ </item>
+
+ <item
+ title="Locate the project"
+ href="/org.eclipse.platform.doc.user/tasks/tasks-1i.htm">
+ <description>
+ Expand the <b>HEAD</b> node under the newly added repository, and locate
+ the project you wish to check out (e.g. to find the source code for the
+ cheat sheet view, this is in org.eclipse.ui.cheatsheets)
+ </description>
+ </item>
+
+ <item
+ title="Check out the project"
+ href="/org.eclipse.platform.doc.user/tasks/tasks-96.htm">
+ <description>
+ Right click on the project you wish to check out and select <b>Check
+ Out</b>. This will download the latest content from the repository into
+ your workspace.
+ </description>
+ </item>
+
+ <item
+ title="View the workspace"
+ href="/org.eclipse.platform.doc.isv/guide/resInt_workspace.htm">
+ <description>
+ To see the project in your workspace, switch to the <b>Resource</b>
+ perspective via Window > Open Perspective > Resource to see the
+ project in the <b>Project Explorer</b> view. You can now view and work with the
+ contents of the project.
+ </description>
+ </item>
+
+</cheatsheet>
diff --git a/bundles/org.eclipse.cvs/cheatsheets/cvs_merge.xml b/bundles/org.eclipse.cvs/cheatsheets/cvs_merge.xml
new file mode 100644
index 0000000..a33f50b
--- /dev/null
+++ b/bundles/org.eclipse.cvs/cheatsheets/cvs_merge.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<cheatsheet title="Merge CVS branches">
+
+ <intro
+ href="/org.eclipse.platform.doc.user/reference/ref-cheatsheets.htm">
+ <description>
+ This cheat sheet shows you the steps to merge changes from one CVS branch
+ into another, or into HEAD. If you need help at any step, click on the (?)
+ icon to the right.
+ </description>
+ </intro>
+
+ <item
+ href="/org.eclipse.platform.doc.user/tasks/tasks-100b.htm"
+ title="Determine branch and version information">
+ <description>
+ The first step is to decide <b>which</b> two branches will be merged, at
+ which <b>version</b> the content was branched, and what the
+ <b>destination</b> branch will be (where the result of the merge will go).
+ Once you have this information, you can move on to the next step.
+ </description>
+ </item>
+
+ <item
+ href="/org.eclipse.platform.doc.user/tasks/tasks-96.htm"
+ title="Check out the project">
+ <description>
+ Before merging, you must <b>check out</b> the project you wish to merge
+ and bring it into your workspace. You can do this either via the import
+ wizard or by adding your repository from the CVS Repository Exploring
+ perspective, or click the (?) button for help.
+ </description>
+ </item>
+
+ <item
+ href="/org.eclipse.platform.doc.user/tasks/tasks-103.htm"
+ title="Load the destination into your workspace">
+ <description>
+ In the navigator, right-click on the project and select Replace With >
+ Another Branch or Version. Select the destination branch. This will load
+ the branch's latest content into your workspace.
+ </description>
+ </item>
+
+ <item
+ href="/org.eclipse.platform.doc.user/tasks/tasks-100b.htm"
+ title="Merge details">
+ <description>
+ Again in the navigator, right-click on the project and select <b>Team</b>
+ > <b>Merge</b> and complete the steps in the wizard. In this wizard you
+ specify the details of the merge.
+ </description>
+ </item>
+
+ <item
+ href="/org.eclipse.platform.doc.user/tasks/tasks-100b.htm"
+ title="Work with the Merge editor">
+ <description>
+ In the Merge editor manually merge the changes. This step loads the
+ required changes into the workspace. Once you've merged all the changes
+ and are satisfied with the result, move on to the next step.
+ </description>
+ </item>
+
+ <item
+ href="/org.eclipse.platform.doc.user/tasks/tasks-114.htm"
+ title="Commit your changes">
+ <description>
+ Right-click on the project and select <b>Team</b> > <b>Synchronize with
+ Repository</b> and then commit all the changes to the repository. This
+ step finalizes the transfer of the changes from the workspace to the CVS
+ repository, and finalizes the merge.
+ </description>
+ </item>
+
+</cheatsheet>
diff --git a/bundles/org.eclipse.cvs/images/topiclabel/ov_teamsup48.gif b/bundles/org.eclipse.cvs/images/topiclabel/ov_teamsup48.gif
new file mode 100644
index 0000000..ed93db0
--- /dev/null
+++ b/bundles/org.eclipse.cvs/images/topiclabel/ov_teamsup48.gif
Binary files differ
diff --git a/bundles/org.eclipse.cvs/images/topiclabel/ov_teamsup48_hov.gif b/bundles/org.eclipse.cvs/images/topiclabel/ov_teamsup48_hov.gif
new file mode 100644
index 0000000..464e9af
--- /dev/null
+++ b/bundles/org.eclipse.cvs/images/topiclabel/ov_teamsup48_hov.gif
Binary files differ
diff --git a/bundles/org.eclipse.cvs/images/topiclabel/tu_checkout48.gif b/bundles/org.eclipse.cvs/images/topiclabel/tu_checkout48.gif
new file mode 100644
index 0000000..f3de4d2
--- /dev/null
+++ b/bundles/org.eclipse.cvs/images/topiclabel/tu_checkout48.gif
Binary files differ
diff --git a/bundles/org.eclipse.cvs/images/topiclabel/tu_checkout48_hov.gif b/bundles/org.eclipse.cvs/images/topiclabel/tu_checkout48_hov.gif
new file mode 100644
index 0000000..ffa86f9
--- /dev/null
+++ b/bundles/org.eclipse.cvs/images/topiclabel/tu_checkout48_hov.gif
Binary files differ
diff --git a/bundles/org.eclipse.cvs/images/topiclabel/tu_merge48.gif b/bundles/org.eclipse.cvs/images/topiclabel/tu_merge48.gif
new file mode 100644
index 0000000..ed93db0
--- /dev/null
+++ b/bundles/org.eclipse.cvs/images/topiclabel/tu_merge48.gif
Binary files differ
diff --git a/bundles/org.eclipse.cvs/images/topiclabel/tu_merge48_hov.gif b/bundles/org.eclipse.cvs/images/topiclabel/tu_merge48_hov.gif
new file mode 100644
index 0000000..464e9af
--- /dev/null
+++ b/bundles/org.eclipse.cvs/images/topiclabel/tu_merge48_hov.gif
Binary files differ
diff --git a/bundles/org.eclipse.cvs/intro/css/overview.css b/bundles/org.eclipse.cvs/intro/css/overview.css
new file mode 100644
index 0000000..dfaafe3
--- /dev/null
+++ b/bundles/org.eclipse.cvs/intro/css/overview.css
@@ -0,0 +1,2 @@
+a#team img { background-image : url('../../images/topiclabel/ov_teamsup48.gif'); }
+a#team:hover img { background-image : url('../../images/topiclabel/ov_teamsup48_hov.gif'); }
\ No newline at end of file
diff --git a/bundles/org.eclipse.cvs/intro/css/overview.properties b/bundles/org.eclipse.cvs/intro/css/overview.properties
new file mode 100644
index 0000000..dea27c7
--- /dev/null
+++ b/bundles/org.eclipse.cvs/intro/css/overview.properties
@@ -0,0 +1,12 @@
+###############################################################################
+# 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
+###############################################################################
+overview.team.link-icon = images/topiclabel/ov_teamsup48.gif
+overview.team.hover-icon = images/topiclabel/ov_teamsup48_hov.gif
\ No newline at end of file
diff --git a/bundles/org.eclipse.cvs/intro/css/tutorials.css b/bundles/org.eclipse.cvs/intro/css/tutorials.css
new file mode 100644
index 0000000..92770e2
--- /dev/null
+++ b/bundles/org.eclipse.cvs/intro/css/tutorials.css
@@ -0,0 +1,5 @@
+a#cvs_checkout img { background-image : url('../../images/topiclabel/tu_checkout48.gif'); }
+a#cvs_checkout:hover img { background-image : url('../../images/topiclabel/tu_checkout48_hov.gif'); }
+
+a#cvs_merge img { background-image : url('../../images/topiclabel/tu_merge48.gif'); }
+a#cvs_merge:hover img { background-image : url('../../images/topiclabel/tu_merge48_hov.gif'); }
diff --git a/bundles/org.eclipse.cvs/intro/css/tutorials.properties b/bundles/org.eclipse.cvs/intro/css/tutorials.properties
new file mode 100644
index 0000000..d065463
--- /dev/null
+++ b/bundles/org.eclipse.cvs/intro/css/tutorials.properties
@@ -0,0 +1,19 @@
+###############################################################################
+# 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
+###############################################################################
+
+tutorials.cvs_checkout.link-icon = images/topiclabel/tu_checkout48.gif
+tutorials.cvs_checkout.hover-icon = images/topiclabel/tu_checkout48_hov.gif
+
+tutorials.cvs_merge.link-icon = images/topiclabel/tu_merge48.gif
+tutorials.cvs_merge.hover-icon = images/topiclabel/tu_merge48_hov.gif
+
+tutorials.subtitle-id = tutorials/page-content/page-title
+tutorials.description-id = tutorials/page-content/page-description
diff --git a/bundles/org.eclipse.cvs/intro/overviewExtensionContent.xml b/bundles/org.eclipse.cvs/intro/overviewExtensionContent.xml
new file mode 100644
index 0000000..123d794
--- /dev/null
+++ b/bundles/org.eclipse.cvs/intro/overviewExtensionContent.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<introContent>
+ <extensionContent id="org.eclipse.team" name="CVS" alt-style="css/overview.properties" style="css/overview.css" path="overview/@">
+ <group style-id="content-group" id="content-group">
+ <link style-id="content-link" label="Team support with CVS" url="http://org.eclipse.ui.intro/showHelpTopic?id=/org.eclipse.platform.doc.user/concepts/concepts-26.htm" id="team">
+ <text>Find out how to collaborate with other developers using CVS</text>
+ </link>
+ </group>
+ </extensionContent>
+</introContent>
diff --git a/bundles/org.eclipse.cvs/intro/tutorialsExtensionContent.xml b/bundles/org.eclipse.cvs/intro/tutorialsExtensionContent.xml
new file mode 100644
index 0000000..28c6145
--- /dev/null
+++ b/bundles/org.eclipse.cvs/intro/tutorialsExtensionContent.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<introContent>
+ <!-- Extension to the SDK Tutorials Page. -->
+ <extensionContent id="org.eclipse.team" name="Team/CVS" alt-style="css/tutorials.properties" style="css/tutorials.css" path="tutorials/@">
+ <group label="Team/CVS" id="team" style-id="content-group">
+ <link url="http://org.eclipse.ui.intro/showStandby?partId=org.eclipse.platform.cheatsheet&input=org.eclipse.platform.cvs.checkout" label="Check out a CVS project" id="cvs_checkout" style-id="content-link">
+ <text>Learn how to connect to a CVS repository and check out a project.</text>
+ </link>
+ <link url="http://org.eclipse.ui.intro/showStandby?partId=org.eclipse.platform.cheatsheet&input=org.eclipse.platform.cvs.merge" label="Merge CVS branches" id="cvs_merge" style-id="content-link">
+ <text>Follow the steps for merging changes from one CVS branch into another.</text>
+ </link>
+ </group>
+ </extensionContent>
+</introContent>
diff --git a/bundles/org.eclipse.cvs/plugin.properties b/bundles/org.eclipse.cvs/plugin.properties
index da475c0..dafb40d 100644
--- a/bundles/org.eclipse.cvs/plugin.properties
+++ b/bundles/org.eclipse.cvs/plugin.properties
@@ -1,5 +1,5 @@
###############################################################################
-# Copyright (c) 2000, 2007 IBM Corporation and others.
+# Copyright (c) 2000, 2015 IBM Corporation and others.
# All rights reserved. This program and the accompanying materials
# are made available under the terms of the Eclipse Public License v1.0
# which accompanies this distribution, and is available at
@@ -7,6 +7,13 @@
#
# Contributors:
# IBM Corporation - initial API and implementation
+# Wayne Beaton (Eclipse Foundation) - Bug 474254
###############################################################################
pluginName=Eclipse CVS Client
providerName=Eclipse.org
+
+cheatsheet.category.team = Team/CVS
+cheatsheet.cvs.checkout.name= Check out a CVS project
+cheatsheet.cvs.checkout.desc= Learn how to connect to a CVS repository and check out a project.
+cheatsheet.cvs.merge.name= Merge CVS branches
+cheatsheet.cvs.merge.desc= Follow the steps for merging changes from one CVS branch into another.
diff --git a/bundles/org.eclipse.cvs/plugin.xml b/bundles/org.eclipse.cvs/plugin.xml
new file mode 100644
index 0000000..11a2283
--- /dev/null
+++ b/bundles/org.eclipse.cvs/plugin.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
+<plugin>
+ <extension
+ point="org.eclipse.ui.cheatsheets.cheatSheetContent">
+ <category
+ id="org.eclipse.platform.team"
+ name="%cheatsheet.category.team">
+ </category>
+ <cheatsheet
+ category="org.eclipse.platform.team"
+ contentFile="$nl$/cheatsheets/cvs_checkout.xml"
+ id="org.eclipse.platform.cvs.checkout"
+ name="%cheatsheet.cvs.checkout.name">
+ <description>
+ %cheatsheet.cvs.checkout.desc
+ </description>
+ </cheatsheet>
+ <cheatsheet
+ category="org.eclipse.platform.team"
+ contentFile="$nl$/cheatsheets/cvs_merge.xml"
+ id="org.eclipse.platform.cvs.merge"
+ name="%cheatsheet.cvs.merge.name">
+ <description>
+ %cheatsheet.cvs.merge.desc
+ </description>
+ </cheatsheet>
+ </extension>
+ <!-- ===================================================== -->
+ <!-- Standby Content Part contributions -->
+ <!-- ===================================================== -->
+ <extension point="org.eclipse.ui.intro.configExtension">
+ <configExtension
+ configId="org.eclipse.ui.intro.universalConfig"
+ content="$nl$/intro/overviewExtensionContent.xml"/>
+ <configExtension
+ configId="org.eclipse.ui.intro.universalConfig"
+ content="$nl$/intro/tutorialsExtensionContent.xml"/>
+ </extension>
+</plugin>
