From 5eac1a4896175065065133dbc8d213dacba201b3 Mon Sep 17 00:00:00 2001 From: Robin Rosenberg Date: Sun, 10 Jan 2010 13:46:33 +0100 Subject: [PATCH] Partial revert "Switch build to Apache Felix maven-bundle-plugin" This restores the ability to build using just Eclipse without strange procedures, extra plugins and it is again possible to work on both JGit and EGit in the same Eclipse workspace with ease. Change-Id: I0af08127d507fbce186f428f1cdeff280f0ddcda Signed-off-by: Robin Rosenberg --- .gitignore | 2 - org.eclipse.jgit-feature/.project | 17 +++++ org.eclipse.jgit-feature/build.properties | 2 + org.eclipse.jgit-feature/feature.properties | 71 +++++++++++++++++++ org.eclipse.jgit-feature/feature.xml | 35 +++++++++ org.eclipse.jgit.console/.classpath | 7 ++ org.eclipse.jgit.console/.project | 34 +++++++++ org.eclipse.jgit.console/META-INF/MANIFEST.MF | 12 ++++ org.eclipse.jgit.console/build.properties | 5 ++ org.eclipse.jgit.console/plugin.properties | 3 +- org.eclipse.jgit.console/pom.xml | 9 --- org.eclipse.jgit.junit/.classpath | 7 ++ org.eclipse.jgit.junit/.project | 28 ++++++++ org.eclipse.jgit.junit/META-INF/MANIFEST.MF | 27 +++++++ org.eclipse.jgit.junit/build.properties | 5 ++ org.eclipse.jgit.junit/plugin.properties | 3 +- org.eclipse.jgit.junit/pom.xml | 9 --- org.eclipse.jgit.pgm/.classpath | 7 ++ org.eclipse.jgit.pgm/.project | 28 ++++++++ org.eclipse.jgit.pgm/META-INF/MANIFEST.MF | 25 +++++++ org.eclipse.jgit.pgm/build.properties | 5 ++ org.eclipse.jgit.pgm/plugin.properties | 2 + org.eclipse.jgit.test/.classpath | 9 +++ org.eclipse.jgit.test/.project | 28 ++++++++ org.eclipse.jgit.test/META-INF/MANIFEST.MF | 28 ++++++++ org.eclipse.jgit.test/build.properties | 6 ++ ...t.core--All-External-Tests (Java 6).launch | 22 +++--- ...lipse.jgit.core--All-External-Tests.launch | 20 +++--- ...lipse.jgit.core--All-Tests (Java 6).launch | 2 - .../org.eclipse.jgit.core--All-Tests.launch | 20 +++--- org.eclipse.jgit.test/plugin.properties | 2 + org.eclipse.jgit.ui/.classpath | 7 ++ org.eclipse.jgit.ui/.project | 34 +++++++++ org.eclipse.jgit.ui/META-INF/MANIFEST.MF | 15 ++++ org.eclipse.jgit.ui/build.properties | 5 ++ org.eclipse.jgit.ui/plugin.properties | 3 +- org.eclipse.jgit.ui/pom.xml | 9 --- org.eclipse.jgit/.classpath | 7 ++ org.eclipse.jgit/.project | 28 ++++++++ org.eclipse.jgit/META-INF/MANIFEST.MF | 25 +++++++ org.eclipse.jgit/build.properties | 5 ++ org.eclipse.jgit/plugin.properties | 3 +- org.eclipse.jgit/pom.xml | 9 --- 43 files changed, 548 insertions(+), 82 deletions(-) delete mode 100644 .gitignore create mode 100644 org.eclipse.jgit-feature/.project create mode 100644 org.eclipse.jgit-feature/build.properties create mode 100644 org.eclipse.jgit-feature/feature.properties create mode 100644 org.eclipse.jgit-feature/feature.xml create mode 100644 org.eclipse.jgit.console/.classpath create mode 100644 org.eclipse.jgit.console/.project create mode 100644 org.eclipse.jgit.console/META-INF/MANIFEST.MF create mode 100644 org.eclipse.jgit.console/build.properties create mode 100644 org.eclipse.jgit.junit/.classpath create mode 100644 org.eclipse.jgit.junit/.project create mode 100644 org.eclipse.jgit.junit/META-INF/MANIFEST.MF create mode 100644 org.eclipse.jgit.junit/build.properties create mode 100644 org.eclipse.jgit.pgm/.classpath create mode 100644 org.eclipse.jgit.pgm/.project create mode 100644 org.eclipse.jgit.pgm/META-INF/MANIFEST.MF create mode 100644 org.eclipse.jgit.pgm/build.properties create mode 100644 org.eclipse.jgit.pgm/plugin.properties create mode 100644 org.eclipse.jgit.test/.classpath create mode 100644 org.eclipse.jgit.test/.project create mode 100644 org.eclipse.jgit.test/META-INF/MANIFEST.MF create mode 100644 org.eclipse.jgit.test/build.properties create mode 100644 org.eclipse.jgit.test/plugin.properties create mode 100644 org.eclipse.jgit.ui/.classpath create mode 100644 org.eclipse.jgit.ui/.project create mode 100644 org.eclipse.jgit.ui/META-INF/MANIFEST.MF create mode 100644 org.eclipse.jgit.ui/build.properties create mode 100644 org.eclipse.jgit/.classpath create mode 100644 org.eclipse.jgit/.project create mode 100644 org.eclipse.jgit/META-INF/MANIFEST.MF create mode 100644 org.eclipse.jgit/build.properties diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 3af100d8ca..0000000000 --- a/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -/.project -/.settings/org.maven.ide.eclipse.prefs diff --git a/org.eclipse.jgit-feature/.project b/org.eclipse.jgit-feature/.project new file mode 100644 index 0000000000..80b09533cc --- /dev/null +++ b/org.eclipse.jgit-feature/.project @@ -0,0 +1,17 @@ + + + org.eclipse.jgit-feature + + + + + + org.eclipse.pde.FeatureBuilder + + + + + + org.eclipse.pde.FeatureNature + + diff --git a/org.eclipse.jgit-feature/build.properties b/org.eclipse.jgit-feature/build.properties new file mode 100644 index 0000000000..b3a611b5c9 --- /dev/null +++ b/org.eclipse.jgit-feature/build.properties @@ -0,0 +1,2 @@ +bin.includes = feature.xml,\ + feature.properties diff --git a/org.eclipse.jgit-feature/feature.properties b/org.eclipse.jgit-feature/feature.properties new file mode 100644 index 0000000000..eba9a59e30 --- /dev/null +++ b/org.eclipse.jgit-feature/feature.properties @@ -0,0 +1,71 @@ +############################################################################### +# Copyright (c) 2000, 2009 IBM Corporation and others. +# +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Eclipse Public License v1.0 +# which accompanies this distribution, and is available at +# http://www.eclipse.org/legal/epl-v10.html +# +############################################################################### + +featureName=Eclipse JGit Feature (Incubation) +providerName=eclipse.org + +updateSiteName=Eclipse Update Site (experimental) + +# description property - text of the "Feature Descrption" +description=\ +A pure Java implementation of the Git version control system.\n +################ end of description property ################################## + +# "copyright" property - text of the "Feature Update Copyright" +copyright=\ +Copyright (c) 2005, 2009 Shawn Pearce, Robin Rosenberg, et.al.\n\ +All rights reserved. This program and the accompanying materials\n\ +are made available under the terms of the Eclipse Distribution License v1.0\n\ +which accompanies this distribution, and is available at\n\ +http://www.eclipse.org/org/documents/edl-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=http://www.eclipse.org/org/documents/edl-v10.html + +# "license" property - text of the "Feature Update License" +# should be plain text version of license agreement pointed to be "licenseURL" +license=\ +Eclipse Distribution License - v 1.0\n\ +\n\ +Copyright (c) 2007, Eclipse Foundation, Inc. and its licensors.\n\ +\n\ +All rights reserved.\n\ +\n\ +Redistribution and use in source and binary forms, with or without\n\ +modification, are permitted provided that the following conditions are\n\ +met:\n\ +\n\ + * Redistributions of source code must retain the above copyright\n\ + notice, this list of conditions and the following disclaimer.\n\ +\n\ + * Redistributions in binary form must reproduce the above\n\ + copyright notice, this list of conditions and the following\n\ + disclaimer in the documentation and/or other materials provided\n\ + with the distribution.\n\ +\n\ + * Neither the name of the Eclipse Foundation, Inc. nor the names\n\ + of its contributors may be used to endorse or promote products\n\ + derived from this software without specific prior written\n\ + permission.\n\ +\n\ +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS\n\ +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT\n\ +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR\n\ +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT\n\ +OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,\n\ +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT\n\ +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,\n\ +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY\n\ +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT\n\ +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE\n\ +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n +########### end of license property ########################################## diff --git a/org.eclipse.jgit-feature/feature.xml b/org.eclipse.jgit-feature/feature.xml new file mode 100644 index 0000000000..9facbe0d90 --- /dev/null +++ b/org.eclipse.jgit-feature/feature.xml @@ -0,0 +1,35 @@ + + + + + %description + + + + %copyright + + + + %license + + + + + + + + + + + + + diff --git a/org.eclipse.jgit.console/.classpath b/org.eclipse.jgit.console/.classpath new file mode 100644 index 0000000000..ad32c83a78 --- /dev/null +++ b/org.eclipse.jgit.console/.classpath @@ -0,0 +1,7 @@ + + + + + + + diff --git a/org.eclipse.jgit.console/.project b/org.eclipse.jgit.console/.project new file mode 100644 index 0000000000..4f272a7ccc --- /dev/null +++ b/org.eclipse.jgit.console/.project @@ -0,0 +1,34 @@ + + + org.eclipse.jgit.console + + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.pde.ManifestBuilder + + + + + org.eclipse.pde.SchemaBuilder + + + + + org.eclipse.pde.api.tools.apiAnalysisBuilder + + + + + + org.eclipse.pde.PluginNature + org.eclipse.jdt.core.javanature + org.eclipse.pde.api.tools.apiAnalysisNature + + diff --git a/org.eclipse.jgit.console/META-INF/MANIFEST.MF b/org.eclipse.jgit.console/META-INF/MANIFEST.MF new file mode 100644 index 0000000000..ed12693f0c --- /dev/null +++ b/org.eclipse.jgit.console/META-INF/MANIFEST.MF @@ -0,0 +1,12 @@ +Bundle-Localization: plugin +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: %plugin_name +Bundle-SymbolicName: org.eclipse.jgit.console +Bundle-Version: 0.6.0.qualifier +Bundle-Vendor: %provider_name +Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Export-Package: org.eclipse.jgit.console;version="0.6.0" +Import-Package: com.jcraft.jsch;version="0.1.41", + org.eclipse.jgit.transport;version="0.6.0", + org.eclipse.jgit.util diff --git a/org.eclipse.jgit.console/build.properties b/org.eclipse.jgit.console/build.properties new file mode 100644 index 0000000000..aa1a008269 --- /dev/null +++ b/org.eclipse.jgit.console/build.properties @@ -0,0 +1,5 @@ +source.. = src/ +output.. = bin/ +bin.includes = META-INF/,\ + .,\ + plugin.properties diff --git a/org.eclipse.jgit.console/plugin.properties b/org.eclipse.jgit.console/plugin.properties index bce4263a49..a86bcd86b8 100644 --- a/org.eclipse.jgit.console/plugin.properties +++ b/org.eclipse.jgit.console/plugin.properties @@ -1,3 +1,2 @@ plugin_name=Java Git Console User Interface (Incubation) -provider_name=Eclipse.org -plugin_description=Console based user interface support +provider_name=eclipse.org diff --git a/org.eclipse.jgit.console/pom.xml b/org.eclipse.jgit.console/pom.xml index 94fe3afef0..c84587a5a0 100644 --- a/org.eclipse.jgit.console/pom.xml +++ b/org.eclipse.jgit.console/pom.xml @@ -94,15 +94,6 @@ - - - bundle-manifest - process-classes - - manifest - - - diff --git a/org.eclipse.jgit.junit/.classpath b/org.eclipse.jgit.junit/.classpath new file mode 100644 index 0000000000..64c5e31b7a --- /dev/null +++ b/org.eclipse.jgit.junit/.classpath @@ -0,0 +1,7 @@ + + + + + + + diff --git a/org.eclipse.jgit.junit/.project b/org.eclipse.jgit.junit/.project new file mode 100644 index 0000000000..90325d8fa2 --- /dev/null +++ b/org.eclipse.jgit.junit/.project @@ -0,0 +1,28 @@ + + + org.eclipse.jgit.junit + + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.pde.ManifestBuilder + + + + + org.eclipse.pde.SchemaBuilder + + + + + + org.eclipse.jdt.core.javanature + org.eclipse.pde.PluginNature + + diff --git a/org.eclipse.jgit.junit/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit/META-INF/MANIFEST.MF new file mode 100644 index 0000000000..0ff1c0f96a --- /dev/null +++ b/org.eclipse.jgit.junit/META-INF/MANIFEST.MF @@ -0,0 +1,27 @@ +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: %plugin_name +Bundle-SymbolicName: org.eclipse.jgit.junit +Bundle-Version: 0.6.0.qualifier +Bundle-Localization: plugin +Bundle-Vendor: %provider_name +Bundle-ActivationPolicy: lazy +Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Import-Package: com.jcraft.jsch, + junit.framework, + 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 +Export-Package: org.eclipse.jgit.junit;version="0.6.0" diff --git a/org.eclipse.jgit.junit/build.properties b/org.eclipse.jgit.junit/build.properties new file mode 100644 index 0000000000..aa1a008269 --- /dev/null +++ b/org.eclipse.jgit.junit/build.properties @@ -0,0 +1,5 @@ +source.. = src/ +output.. = bin/ +bin.includes = META-INF/,\ + .,\ + plugin.properties diff --git a/org.eclipse.jgit.junit/plugin.properties b/org.eclipse.jgit.junit/plugin.properties index 5a5dfade09..d137bd4980 100644 --- a/org.eclipse.jgit.junit/plugin.properties +++ b/org.eclipse.jgit.junit/plugin.properties @@ -1,3 +1,2 @@ plugin_name=Java Git JUnit Utility Classes (Incubation) -provider_name=Eclipse.org -plugin_description=Utility classes supporting testing under JUnit +provider_name=eclipse.org diff --git a/org.eclipse.jgit.junit/pom.xml b/org.eclipse.jgit.junit/pom.xml index 692b8b762d..3680bdde37 100644 --- a/org.eclipse.jgit.junit/pom.xml +++ b/org.eclipse.jgit.junit/pom.xml @@ -99,15 +99,6 @@ - - - bundle-manifest - process-classes - - manifest - - - diff --git a/org.eclipse.jgit.pgm/.classpath b/org.eclipse.jgit.pgm/.classpath new file mode 100644 index 0000000000..304e86186a --- /dev/null +++ b/org.eclipse.jgit.pgm/.classpath @@ -0,0 +1,7 @@ + + + + + + + diff --git a/org.eclipse.jgit.pgm/.project b/org.eclipse.jgit.pgm/.project new file mode 100644 index 0000000000..6fc89ae5e6 --- /dev/null +++ b/org.eclipse.jgit.pgm/.project @@ -0,0 +1,28 @@ + + + org.eclipse.jgit.pgm + + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.pde.ManifestBuilder + + + + + org.eclipse.pde.SchemaBuilder + + + + + + org.eclipse.jdt.core.javanature + org.eclipse.pde.PluginNature + + diff --git a/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF b/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF new file mode 100644 index 0000000000..fe59357ab8 --- /dev/null +++ b/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF @@ -0,0 +1,25 @@ +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.eclipse.jgit.util, + org.kohsuke.args4j, + org.kohsuke.args4j.spi +Bundle-ActivationPolicy: lazy +Export-Package: org.eclipse.jgit.pgm +Main-Class: org.eclipse.jgit.pgm.Main +Implementation-Title: JGit Command Line Interface diff --git a/org.eclipse.jgit.pgm/build.properties b/org.eclipse.jgit.pgm/build.properties new file mode 100644 index 0000000000..aa1a008269 --- /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 index 0000000000..f8fbd725c1 --- /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.test/.classpath b/org.eclipse.jgit.test/.classpath new file mode 100644 index 0000000000..ea41285773 --- /dev/null +++ b/org.eclipse.jgit.test/.classpath @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/org.eclipse.jgit.test/.project b/org.eclipse.jgit.test/.project new file mode 100644 index 0000000000..84c971100e --- /dev/null +++ b/org.eclipse.jgit.test/.project @@ -0,0 +1,28 @@ + + + org.eclipse.jgit.test + + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.pde.ManifestBuilder + + + + + org.eclipse.pde.SchemaBuilder + + + + + + org.eclipse.jdt.core.javanature + org.eclipse.pde.PluginNature + + diff --git a/org.eclipse.jgit.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.test/META-INF/MANIFEST.MF new file mode 100644 index 0000000000..32d5efdfc4 --- /dev/null +++ b/org.eclipse.jgit.test/META-INF/MANIFEST.MF @@ -0,0 +1,28 @@ +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: %plugin_name +Bundle-SymbolicName: org.eclipse.jgit.test +Bundle-Version: 0.6.0.qualifier +Bundle-Localization: plugin +Bundle-Vendor: %provider_name +Bundle-ActivationPolicy: lazy +Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Import-Package: com.jcraft.jsch, + junit.framework, + junit.textui, + org.eclipse.jgit.junit, + 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 diff --git a/org.eclipse.jgit.test/build.properties b/org.eclipse.jgit.test/build.properties new file mode 100644 index 0000000000..afc4855d67 --- /dev/null +++ b/org.eclipse.jgit.test/build.properties @@ -0,0 +1,6 @@ +source.. = tst/,\ + tst-rsrc/,\ + exttst/ +bin.includes = META-INF/,\ + .,\ + plugin.properties diff --git a/org.eclipse.jgit.test/org.eclipse.jgit.core--All-External-Tests (Java 6).launch b/org.eclipse.jgit.test/org.eclipse.jgit.core--All-External-Tests (Java 6).launch index 6ef8132d05..9a9ca124d3 100644 --- a/org.eclipse.jgit.test/org.eclipse.jgit.core--All-External-Tests (Java 6).launch +++ b/org.eclipse.jgit.test/org.eclipse.jgit.core--All-External-Tests (Java 6).launch @@ -1,23 +1,21 @@ - + - - - + + + - + + + + + - - + - - - - - diff --git a/org.eclipse.jgit.test/org.eclipse.jgit.core--All-External-Tests.launch b/org.eclipse.jgit.test/org.eclipse.jgit.core--All-External-Tests.launch index abdb965028..6735fb0a26 100644 --- a/org.eclipse.jgit.test/org.eclipse.jgit.core--All-External-Tests.launch +++ b/org.eclipse.jgit.test/org.eclipse.jgit.core--All-External-Tests.launch @@ -1,22 +1,20 @@ - + - - - + + + - + + + + - - + - - - - diff --git a/org.eclipse.jgit.test/org.eclipse.jgit.core--All-Tests (Java 6).launch b/org.eclipse.jgit.test/org.eclipse.jgit.core--All-Tests (Java 6).launch index 075f47b8fe..a0aecf920c 100644 --- a/org.eclipse.jgit.test/org.eclipse.jgit.core--All-Tests (Java 6).launch +++ b/org.eclipse.jgit.test/org.eclipse.jgit.core--All-Tests (Java 6).launch @@ -15,9 +15,7 @@ - - diff --git a/org.eclipse.jgit.test/org.eclipse.jgit.core--All-Tests.launch b/org.eclipse.jgit.test/org.eclipse.jgit.core--All-Tests.launch index 5735df0396..bff41ecf07 100644 --- a/org.eclipse.jgit.test/org.eclipse.jgit.core--All-Tests.launch +++ b/org.eclipse.jgit.test/org.eclipse.jgit.core--All-Tests.launch @@ -1,22 +1,20 @@ - + - - - + + + - + + + + - - + - - - - diff --git a/org.eclipse.jgit.test/plugin.properties b/org.eclipse.jgit.test/plugin.properties new file mode 100644 index 0000000000..68e67f8107 --- /dev/null +++ b/org.eclipse.jgit.test/plugin.properties @@ -0,0 +1,2 @@ +plugin_name=Java Git Core Tests (Incubation) +provider_name=eclipse.org diff --git a/org.eclipse.jgit.ui/.classpath b/org.eclipse.jgit.ui/.classpath new file mode 100644 index 0000000000..64c5e31b7a --- /dev/null +++ b/org.eclipse.jgit.ui/.classpath @@ -0,0 +1,7 @@ + + + + + + + diff --git a/org.eclipse.jgit.ui/.project b/org.eclipse.jgit.ui/.project new file mode 100644 index 0000000000..59e2e097b6 --- /dev/null +++ b/org.eclipse.jgit.ui/.project @@ -0,0 +1,34 @@ + + + org.eclipse.jgit.ui + + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.pde.ManifestBuilder + + + + + org.eclipse.pde.SchemaBuilder + + + + + org.eclipse.pde.api.tools.apiAnalysisBuilder + + + + + + org.eclipse.pde.PluginNature + org.eclipse.jdt.core.javanature + org.eclipse.pde.api.tools.apiAnalysisNature + + diff --git a/org.eclipse.jgit.ui/META-INF/MANIFEST.MF b/org.eclipse.jgit.ui/META-INF/MANIFEST.MF new file mode 100644 index 0000000000..a6710cd526 --- /dev/null +++ b/org.eclipse.jgit.ui/META-INF/MANIFEST.MF @@ -0,0 +1,15 @@ +Bundle-Localization: plugin +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: %plugin_name +Bundle-SymbolicName: org.eclipse.jgit.ui +Bundle-Version: 0.6.0.qualifier +Bundle-Vendor: %provider_name +Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Export-Package: org.eclipse.jgit.awtui;version="0.6.0" +Import-Package: com.jcraft.jsch, + org.eclipse.jgit.lib;version="0.6.0", + org.eclipse.jgit.transport, + org.eclipse.jgit.revplot, + org.eclipse.jgit.revwalk, + org.eclipse.jgit.util diff --git a/org.eclipse.jgit.ui/build.properties b/org.eclipse.jgit.ui/build.properties new file mode 100644 index 0000000000..aa1a008269 --- /dev/null +++ b/org.eclipse.jgit.ui/build.properties @@ -0,0 +1,5 @@ +source.. = src/ +output.. = bin/ +bin.includes = META-INF/,\ + .,\ + plugin.properties diff --git a/org.eclipse.jgit.ui/plugin.properties b/org.eclipse.jgit.ui/plugin.properties index c359669db1..b9acc51512 100644 --- a/org.eclipse.jgit.ui/plugin.properties +++ b/org.eclipse.jgit.ui/plugin.properties @@ -1,3 +1,2 @@ plugin_name=Java Git AWT User Interface (Incubation) -provider_name=Eclipse.org -plugin_description=AWT/Swing based user interface support +provider_name=eclipse.org diff --git a/org.eclipse.jgit.ui/pom.xml b/org.eclipse.jgit.ui/pom.xml index a910cb645a..bc47ed3d05 100644 --- a/org.eclipse.jgit.ui/pom.xml +++ b/org.eclipse.jgit.ui/pom.xml @@ -94,15 +94,6 @@ - - - bundle-manifest - process-classes - - manifest - - - diff --git a/org.eclipse.jgit/.classpath b/org.eclipse.jgit/.classpath new file mode 100644 index 0000000000..304e86186a --- /dev/null +++ b/org.eclipse.jgit/.classpath @@ -0,0 +1,7 @@ + + + + + + + diff --git a/org.eclipse.jgit/.project b/org.eclipse.jgit/.project new file mode 100644 index 0000000000..19aeef1fb8 --- /dev/null +++ b/org.eclipse.jgit/.project @@ -0,0 +1,28 @@ + + + org.eclipse.jgit + + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.pde.ManifestBuilder + + + + + org.eclipse.pde.SchemaBuilder + + + + + + org.eclipse.jdt.core.javanature + org.eclipse.pde.PluginNature + + diff --git a/org.eclipse.jgit/META-INF/MANIFEST.MF b/org.eclipse.jgit/META-INF/MANIFEST.MF new file mode 100644 index 0000000000..5c7f111fb9 --- /dev/null +++ b/org.eclipse.jgit/META-INF/MANIFEST.MF @@ -0,0 +1,25 @@ +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: %plugin_name +Bundle-SymbolicName: org.eclipse.jgit +Bundle-Version: 0.6.0.qualifier +Bundle-Localization: plugin +Bundle-Vendor: %provider_name +Export-Package: org.eclipse.jgit.diff;version="0.6.0", + org.eclipse.jgit.dircache;version="0.6.0", + org.eclipse.jgit.errors;version="0.6.0", + org.eclipse.jgit.fnmatch;version="0.6.0", + org.eclipse.jgit.lib;version="0.6.0", + org.eclipse.jgit.merge;version="0.6.0", + org.eclipse.jgit.patch;version="0.6.0", + org.eclipse.jgit.revplot;version="0.6.0", + org.eclipse.jgit.revwalk;version="0.6.0", + org.eclipse.jgit.revwalk.filter;version="0.6.0", + org.eclipse.jgit.transport;version="0.6.0", + org.eclipse.jgit.treewalk;version="0.6.0", + org.eclipse.jgit.treewalk.filter;version="0.6.0", + org.eclipse.jgit.util;version="0.6.0", + org.eclipse.jgit.util.io;version="0.6.0" +Bundle-ActivationPolicy: lazy +Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Import-Package: com.jcraft.jsch diff --git a/org.eclipse.jgit/build.properties b/org.eclipse.jgit/build.properties new file mode 100644 index 0000000000..aa1a008269 --- /dev/null +++ b/org.eclipse.jgit/build.properties @@ -0,0 +1,5 @@ +source.. = src/ +output.. = bin/ +bin.includes = META-INF/,\ + .,\ + plugin.properties diff --git a/org.eclipse.jgit/plugin.properties b/org.eclipse.jgit/plugin.properties index c11ccea45c..d8e4703b67 100644 --- a/org.eclipse.jgit/plugin.properties +++ b/org.eclipse.jgit/plugin.properties @@ -1,3 +1,2 @@ plugin_name=Java Git Core (Incubation) -provider_name=Eclipse.org -plugin_description=Git file access and network transport +provider_name=eclipse.org diff --git a/org.eclipse.jgit/pom.xml b/org.eclipse.jgit/pom.xml index b3d1ee6a3d..a751da3fa3 100644 --- a/org.eclipse.jgit/pom.xml +++ b/org.eclipse.jgit/pom.xml @@ -95,15 +95,6 @@ - - - bundle-manifest - process-classes - - manifest - - - -- 2.39.5