Switch pgm, test to proper plugin projects

This way we depend upon the MANIFEST.MF to define our classpath
and our build will act more like any other OSGI bundle build.

Change-Id: I9e1f1f5a0bccb0ab0e39e49b75fb400fea446619
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>

diff --git a/org.eclipse.jgit.pgm/.classpath b/org.eclipse.jgit.pgm/.classpath
index 058848cf207adfdc9e84df3fbb1f9d6b49e0efbd..304e86186aa0aecc956652a558f33921111ab213 100644 (file)
--- a/org.eclipse.jgit.pgm/.classpath
+++ b/org.eclipse.jgit.pgm/.classpath
@@ -2,8 +2,6 @@
 <classpath>
        <classpathentry kind="src" path="src"/>
        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-       <classpathentry combineaccessrules="false" exported="true" kind="src" path="/org.eclipse.jgit"/>
-       <classpathentry combineaccessrules="false" kind="lib" path="/org.kohsuke.args4j"/>
-       <classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.jgit.ui"/>
+       <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
        <classpathentry kind="output" path="bin"/>
 </classpath>

diff --git a/org.eclipse.jgit.pgm/.project b/org.eclipse.jgit.pgm/.project
index bbaafc261266db10b9e8ff6ca0b41da64fafc79f..6fc89ae5e60b211173a9628f8891de5bb9773982 100644 (file)
--- a/org.eclipse.jgit.pgm/.project
+++ b/org.eclipse.jgit.pgm/.project
@@ -10,8 +10,19 @@
                        <arguments>
                        </arguments>
                </buildCommand>
+               <buildCommand>
+                       <name>org.eclipse.pde.ManifestBuilder</name>
+                       <arguments>
+                       </arguments>
+               </buildCommand>
+               <buildCommand>
+                       <name>org.eclipse.pde.SchemaBuilder</name>
+                       <arguments>
+                       </arguments>
+               </buildCommand>
        </buildSpec>
        <natures>
                <nature>org.eclipse.jdt.core.javanature</nature>
+               <nature>org.eclipse.pde.PluginNature</nature>
        </natures>
 </projectDescription>

diff --git a/org.eclipse.jgit.pgm/.settings/org.eclipse.pde.core.prefs b/org.eclipse.jgit.pgm/.settings/org.eclipse.pde.core.prefs
new file mode 100644 (file)
index 0000000..75c779a
--- /dev/null
+++ b/org.eclipse.jgit.pgm/.settings/org.eclipse.pde.core.prefs
@@ -0,0 +1,3 @@
+#Sat Oct 31 18:40:07 PDT 2009
+eclipse.preferences.version=1
+resolve.requirebundle=false

diff --git a/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF b/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF
new file mode 100644 (file)
index 0000000..5100d14
--- /dev/null
+++ b/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF
@@ -0,0 +1,22 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %plugin_name
+Bundle-SymbolicName: org.eclipse.jgit.pgm
+Bundle-Version: 0.6.0.qualifier
+Bundle-Vendor: %provider_name
+Bundle-Localization: plugin
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Import-Package: org.eclipse.jgit.awtui,
+ org.eclipse.jgit.dircache,
+ org.eclipse.jgit.errors,
+ org.eclipse.jgit.lib,
+ org.eclipse.jgit.revplot,
+ org.eclipse.jgit.revwalk,
+ org.eclipse.jgit.revwalk.filter,
+ org.eclipse.jgit.transport,
+ org.eclipse.jgit.treewalk,
+ org.eclipse.jgit.treewalk.filter,
+ org.kohsuke.args4j,
+ org.kohsuke.args4j.spi
+Bundle-ActivationPolicy: lazy
+Export-Package: org.eclipse.jgit.pgm

diff --git a/org.eclipse.jgit.pgm/META-INF/services/org.eclipse.jgit.pgm.TextBuiltin b/org.eclipse.jgit.pgm/META-INF/services/org.eclipse.jgit.pgm.TextBuiltin
new file mode 100644 (file)
index 0000000..6c2a653
--- /dev/null
+++ b/org.eclipse.jgit.pgm/META-INF/services/org.eclipse.jgit.pgm.TextBuiltin
@@ -0,0 +1,31 @@
+org.eclipse.jgit.pgm.AmazonS3Client
+org.eclipse.jgit.pgm.Branch
+org.eclipse.jgit.pgm.Clone
+org.eclipse.jgit.pgm.Daemon
+org.eclipse.jgit.pgm.DiffTree
+org.eclipse.jgit.pgm.Fetch
+org.eclipse.jgit.pgm.Glog
+org.eclipse.jgit.pgm.IndexPack
+org.eclipse.jgit.pgm.Init
+org.eclipse.jgit.pgm.Log
+org.eclipse.jgit.pgm.LsRemote
+org.eclipse.jgit.pgm.LsTree
+org.eclipse.jgit.pgm.MergeBase
+org.eclipse.jgit.pgm.Push
+org.eclipse.jgit.pgm.ReceivePack
+org.eclipse.jgit.pgm.RevList
+org.eclipse.jgit.pgm.RevParse
+org.eclipse.jgit.pgm.Rm
+org.eclipse.jgit.pgm.ShowRev
+org.eclipse.jgit.pgm.ShowRef
+org.eclipse.jgit.pgm.Tag
+org.eclipse.jgit.pgm.UploadPack
+org.eclipse.jgit.pgm.Version
+
+org.eclipse.jgit.pgm.debug.MakeCacheTree
+org.eclipse.jgit.pgm.debug.ReadDirCache
+org.eclipse.jgit.pgm.debug.RebuildCommitGraph
+org.eclipse.jgit.pgm.debug.ShowCacheTree
+org.eclipse.jgit.pgm.debug.ShowCommands
+org.eclipse.jgit.pgm.debug.ShowDirCache
+org.eclipse.jgit.pgm.debug.WriteDirCache

diff --git a/org.eclipse.jgit.pgm/build.properties b/org.eclipse.jgit.pgm/build.properties
new file mode 100644 (file)
index 0000000..aa1a008
--- /dev/null
+++ b/org.eclipse.jgit.pgm/build.properties
@@ -0,0 +1,5 @@
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+               .,\
+               plugin.properties

diff --git a/org.eclipse.jgit.pgm/plugin.properties b/org.eclipse.jgit.pgm/plugin.properties
new file mode 100644 (file)
index 0000000..f8fbd72
--- /dev/null
+++ b/org.eclipse.jgit.pgm/plugin.properties
@@ -0,0 +1,2 @@
+plugin_name=Java Git Command Line Interface (Incubation)
+provider_name=eclipse.org

diff --git a/org.eclipse.jgit.pgm/src/META-INF/services/org.eclipse.jgit.pgm.TextBuiltin b/org.eclipse.jgit.pgm/src/META-INF/services/org.eclipse.jgit.pgm.TextBuiltin
deleted file mode 100644 (file)
index 6c2a653..0000000
--- a/org.eclipse.jgit.pgm/src/META-INF/services/org.eclipse.jgit.pgm.TextBuiltin
+++ /dev/null
@@ -1,31 +0,0 @@
-org.eclipse.jgit.pgm.AmazonS3Client
-org.eclipse.jgit.pgm.Branch
-org.eclipse.jgit.pgm.Clone
-org.eclipse.jgit.pgm.Daemon
-org.eclipse.jgit.pgm.DiffTree
-org.eclipse.jgit.pgm.Fetch
-org.eclipse.jgit.pgm.Glog
-org.eclipse.jgit.pgm.IndexPack
-org.eclipse.jgit.pgm.Init
-org.eclipse.jgit.pgm.Log
-org.eclipse.jgit.pgm.LsRemote
-org.eclipse.jgit.pgm.LsTree
-org.eclipse.jgit.pgm.MergeBase
-org.eclipse.jgit.pgm.Push
-org.eclipse.jgit.pgm.ReceivePack
-org.eclipse.jgit.pgm.RevList
-org.eclipse.jgit.pgm.RevParse
-org.eclipse.jgit.pgm.Rm
-org.eclipse.jgit.pgm.ShowRev
-org.eclipse.jgit.pgm.ShowRef
-org.eclipse.jgit.pgm.Tag
-org.eclipse.jgit.pgm.UploadPack
-org.eclipse.jgit.pgm.Version
-
-org.eclipse.jgit.pgm.debug.MakeCacheTree
-org.eclipse.jgit.pgm.debug.ReadDirCache
-org.eclipse.jgit.pgm.debug.RebuildCommitGraph
-org.eclipse.jgit.pgm.debug.ShowCacheTree
-org.eclipse.jgit.pgm.debug.ShowCommands
-org.eclipse.jgit.pgm.debug.ShowDirCache
-org.eclipse.jgit.pgm.debug.WriteDirCache

diff --git a/org.eclipse.jgit.test/.classpath b/org.eclipse.jgit.test/.classpath
index 3c42728dbfaa35f58b6ed4d3539cd4208cb7799a..ea412857733163c8b469a1e0183161d2e826df21 100644 (file)
--- a/org.eclipse.jgit.test/.classpath
+++ b/org.eclipse.jgit.test/.classpath
@@ -4,7 +4,6 @@
        <classpathentry kind="src" path="tst-rsrc"/>
        <classpathentry kind="src" path="exttst"/>
        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-       <classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.jgit"/>
        <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
        <classpathentry kind="output" path="bin"/>
 </classpath>

diff --git a/org.eclipse.jgit.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.test/META-INF/MANIFEST.MF
index 8c89f045cf6c568c8dac10031fc94c108fbb0ada..225611ba9b878401caf4e028fcc748b23098da01 100644 (file)
--- a/org.eclipse.jgit.test/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.test/META-INF/MANIFEST.MF
@@ -9,4 +9,19 @@ Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Import-Package: com.jcraft.jsch,
  junit.framework,
- junit.textui
+ junit.textui,
+ org.eclipse.jgit.diff,
+ org.eclipse.jgit.dircache,
+ org.eclipse.jgit.errors,
+ org.eclipse.jgit.fnmatch,
+ org.eclipse.jgit.lib,
+ org.eclipse.jgit.merge,
+ org.eclipse.jgit.patch,
+ org.eclipse.jgit.revplot,
+ org.eclipse.jgit.revwalk,
+ org.eclipse.jgit.revwalk.filter,
+ org.eclipse.jgit.transport,
+ org.eclipse.jgit.treewalk,
+ org.eclipse.jgit.treewalk.filter,
+ org.eclipse.jgit.util,
+ org.eclipse.jgit.util.io