diff options
author | Shawn Pearce | 2010-02-15 16:40:24 +0000 |
---|---|---|
committer | Code Review | 2010-02-15 16:40:24 +0000 |
commit | 44ab43de5eaeb1d5b2af3996af3a51c464e211d6 (patch) | |
tree | 4b0d70d4f419f95e43a178447f39f486db815aad | |
parent | c3535743e3d5ebcd8795b84c0fd418a6597c356e (diff) | |
parent | 058456865a75ff36d85d63105650d3897ee21105 (diff) | |
download | egit-44ab43de5eaeb1d5b2af3996af3a51c464e211d6.tar.gz egit-44ab43de5eaeb1d5b2af3996af3a51c464e211d6.tar.xz egit-44ab43de5eaeb1d5b2af3996af3a51c464e211d6.zip |
Merge "Fix build and test failures"
9 files changed, 40 insertions, 38 deletions
diff --git a/org.eclipse.egit-feature/feature.xml b/org.eclipse.egit-feature/feature.xml index 30fd126e19..ee62e45b03 100644 --- a/org.eclipse.egit-feature/feature.xml +++ b/org.eclipse.egit-feature/feature.xml @@ -26,14 +26,14 @@ <requires> <import plugin="org.eclipse.core.runtime" version="3.4" match="compatible"/> <import plugin="org.eclipse.core.resources" version="3.4.0" match="compatible"/> - <import plugin="org.eclipse.core.filesystem" version="3.4.0" match="compatible"/> + <import plugin="org.eclipse.core.filesystem" version="1.1.0" match="compatible"/> <import plugin="org.eclipse.ui" version="3.4.0" match="compatible"/> <import plugin="org.eclipse.team.ui" version="3.4.0" match="compatible"/> <import plugin="org.eclipse.jface.text" version="3.4.0" match="compatible"/> <import plugin="org.eclipse.ui.ide" version="3.4.0" match="compatible"/> <import plugin="org.eclipse.ui.workbench.texteditor" version="3.4.0" match="compatible"/> <import plugin="org.eclipse.compare" version="3.4.0" match="compatible"/> - <import plugin="org.eclipse.core.net" version="3.4.0" match="compatible"/> + <import plugin="org.eclipse.core.net" version="1.1.0" match="compatible"/> <import plugin="org.eclipse.team.core" version="3.4.0" match="compatible"/> <import plugin="org.eclipse.jsch.ui" version="1.1.100" match="compatible"/> <import plugin="org.eclipse.jsch.core" version="1.1.100" match="compatible"/> diff --git a/org.eclipse.egit.core.test/META-INF/MANIFEST.MF b/org.eclipse.egit.core.test/META-INF/MANIFEST.MF index 2eb3311881..196c2b1046 100644 --- a/org.eclipse.egit.core.test/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.core.test/META-INF/MANIFEST.MF @@ -5,12 +5,12 @@ Bundle-Vendor: Eclipse.org Bundle-SymbolicName: org.eclipse.egit.core.test Bundle-Version: 0.6.0.qualifier Bundle-Activator: org.eclipse.egit.core.test.Activator -Require-Bundle: org.eclipse.core.runtime;version="[3.4.0,4.0.0)", - org.eclipse.core.filesystem;version="[3.4.0,4.0.0)", - org.eclipse.core.resources;version="[3.4.0,4.0.0)", - org.eclipse.team.core;version="[3.4.0,4.0.0)", - org.eclipse.jdt.core;version="[3.4.0,4.0.0)", - org.eclipse.jdt.launching;version="[3.4.0,4.0.0)" +Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)", + org.eclipse.core.filesystem;bundle-version="[1.1.0,2.0.0)", + org.eclipse.core.resources;bundle-version="[3.4.0,4.0.0)", + org.eclipse.team.core;bundle-version="[3.4.0,4.0.0)", + org.eclipse.jdt.core;bundle-version="[3.4.0,4.0.0)", + org.eclipse.jdt.launching;bundle-version="[3.4.0,4.0.0)" Bundle-ActivationPolicy: lazy Import-Package: junit.framework;version="[4.3.1,5.0.0)", org.eclipse.egit.core;version="[0.6.0,0.7.0)", diff --git a/org.eclipse.egit.core.test/org.eclipse.egit.core--All-Tests.launch b/org.eclipse.egit.core.test/org.eclipse.egit.core--All-Tests.launch index 061874a29e..82bcb3c181 100644 --- a/org.eclipse.egit.core.test/org.eclipse.egit.core--All-Tests.launch +++ b/org.eclipse.egit.core.test/org.eclipse.egit.core--All-Tests.launch @@ -26,7 +26,7 @@ <stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value="=org.eclipse.egit.core.test"/> <booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/> <stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/> -<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit3"/> +<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/> <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value=""/> <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.egit.core.test"/> <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/> diff --git a/org.eclipse.egit.core.test/src/org/eclipse/egit/core/T0003_AdaptableFileTreeIteratorTest.java b/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/T0003_AdaptableFileTreeIteratorTest.java index 9a52f330d0..f401b6d96f 100644 --- a/org.eclipse.egit.core.test/src/org/eclipse/egit/core/T0003_AdaptableFileTreeIteratorTest.java +++ b/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/T0003_AdaptableFileTreeIteratorTest.java @@ -6,7 +6,7 @@ * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html *******************************************************************************/ -package org.eclipse.egit.core; +package org.eclipse.egit.core.test; import java.io.File; import java.io.FileWriter; @@ -16,10 +16,10 @@ import java.util.Set; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IWorkspaceRoot; +import org.eclipse.egit.core.AdaptableFileTreeIterator; +import org.eclipse.egit.core.ContainerTreeIterator; import org.eclipse.egit.core.op.ConnectProviderOperation; import org.eclipse.egit.core.project.RepositoryMapping; -import org.eclipse.egit.core.test.GitTestCase; -import org.eclipse.jgit.lib.Constants; import org.eclipse.jgit.lib.Repository; import org.eclipse.jgit.treewalk.TreeWalk; import org.eclipse.jgit.treewalk.WorkingTreeIterator; @@ -46,7 +46,7 @@ public class T0003_AdaptableFileTreeIteratorTest extends GitTestCase { fileWriter.close(); final ConnectProviderOperation operation = new ConnectProviderOperation( - project.getProject(), new File("..", Constants.DOT_GIT)); + project.getProject(), gitDir); operation.run(null); } diff --git a/org.eclipse.egit.core.test/src/org/eclipse/egit/core/internal/mapping/T0002_history.java b/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/internal/mapping/T0002_history.java index e3855bd52d..2c748ab255 100644 --- a/org.eclipse.egit.core.test/src/org/eclipse/egit/core/internal/mapping/T0002_history.java +++ b/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/internal/mapping/T0002_history.java @@ -7,7 +7,7 @@ * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html *******************************************************************************/ -package org.eclipse.egit.core.internal.mapping; +package org.eclipse.egit.core.test.internal.mapping; import java.io.File; import java.io.FileWriter; @@ -102,7 +102,7 @@ public class T0002_history extends GitTestCase { assertEquals(RefUpdate.Result.NEW, lck.forceUpdate()); ConnectProviderOperation operation = new ConnectProviderOperation( - project.getProject(), new File("..", Constants.DOT_GIT)); + project.getProject(), gitDir); operation.run(null); } diff --git a/org.eclipse.egit.core.test/src/org/eclipse/egit/core/op/T0001_ConnectProviderOperationTest.java b/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/op/T0001_ConnectProviderOperationTest.java index 045c46626d..593a5246e7 100644 --- a/org.eclipse.egit.core.test/src/org/eclipse/egit/core/op/T0001_ConnectProviderOperationTest.java +++ b/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/op/T0001_ConnectProviderOperationTest.java @@ -7,7 +7,7 @@ * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html *******************************************************************************/ -package org.eclipse.egit.core.op; +package org.eclipse.egit.core.test.op; import java.io.ByteArrayInputStream; import java.io.File; @@ -53,7 +53,7 @@ public class T0001_ConnectProviderOperationTest extends GitTestCase { repository.create(); repository.close(); ConnectProviderOperation operation = new ConnectProviderOperation( - project.getProject(), new File("..", Constants.DOT_GIT)); + project.getProject(), gitDir); operation.run(null); assertTrue(RepositoryProvider.isShared(project.getProject())); @@ -95,7 +95,7 @@ public class T0001_ConnectProviderOperationTest extends GitTestCase { assertEquals(RefUpdate.Result.NEW, lck.forceUpdate()); ConnectProviderOperation operation = new ConnectProviderOperation( - project.getProject(), new File("..", Constants.DOT_GIT)); + project.getProject(), gitDir); operation.run(null); final boolean f[] = new boolean[1]; diff --git a/org.eclipse.egit.core/META-INF/MANIFEST.MF b/org.eclipse.egit.core/META-INF/MANIFEST.MF index efd21183f3..757f06a78e 100644 --- a/org.eclipse.egit.core/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.core/META-INF/MANIFEST.MF @@ -6,11 +6,11 @@ Bundle-Version: 0.6.0.qualifier Bundle-Activator: org.eclipse.egit.core.Activator Bundle-Vendor: %provider_name Bundle-Localization: plugin -Require-Bundle: org.eclipse.core.runtime;version="[3.4.0,4.0.0)", - org.eclipse.team.core;version="[3.4.0,4.0.0)", - org.eclipse.core.resources;version="[3.4.0,4.0.0)", - org.eclipse.core.filesystem;version="[3.4.0,4.0.0)", - org.eclipse.ui;version="[3.4.0,4.0.0)" +Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)", + org.eclipse.team.core;bundle-version="[3.4.0,4.0.0)", + org.eclipse.core.resources;bundle-version="[3.4.0,4.0.0)", + org.eclipse.core.filesystem;bundle-version="[1.2.0,2.0.0)", + org.eclipse.ui;bundle-version="[3.4.0,4.0.0)" Export-Package: org.eclipse.egit.core;version="0.6.0", org.eclipse.egit.core.internal.storage;version="0.6.0";x-friends:="org.eclipse.egit.ui", org.eclipse.egit.core.internal.util;version="0.6.0";x-friends:="org.eclipse.egit.ui", diff --git a/org.eclipse.egit.core/src/org/eclipse/egit/core/op/ConnectProviderOperation.java b/org.eclipse.egit.core/src/org/eclipse/egit/core/op/ConnectProviderOperation.java index 5913f30d46..d61a0b37e6 100644 --- a/org.eclipse.egit.core/src/org/eclipse/egit/core/op/ConnectProviderOperation.java +++ b/org.eclipse.egit.core/src/org/eclipse/egit/core/op/ConnectProviderOperation.java @@ -51,7 +51,7 @@ public class ConnectProviderOperation implements IWorkspaceRunnable { * the project to connect to the Git team provider. */ public ConnectProviderOperation(final IProject proj) { - this(proj, new File(Constants.DOT_GIT)); + this(proj, proj.getLocation().append("/").append(Constants.DOT_GIT).toFile()); } /** @@ -60,7 +60,7 @@ public class ConnectProviderOperation implements IWorkspaceRunnable { * @param proj * the project to connect to the Git team provider. * @param pathToRepo - * relative path to the repository + * absolute path to the repository */ public ConnectProviderOperation(final IProject proj, File pathToRepo) { this.projects.put(proj, pathToRepo); diff --git a/org.eclipse.egit.ui/META-INF/MANIFEST.MF b/org.eclipse.egit.ui/META-INF/MANIFEST.MF index 3035d3bf88..8428503d4e 100644 --- a/org.eclipse.egit.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.ui/META-INF/MANIFEST.MF @@ -6,24 +6,26 @@ Bundle-Version: 0.6.0.qualifier Bundle-Activator: org.eclipse.egit.ui.Activator Bundle-Vendor: %provider_name Bundle-Localization: plugin -Require-Bundle: org.eclipse.core.runtime;version="[3.4.0,4.0.0)", - org.eclipse.core.filesystem;version="[3.4.0,4.0.0)", - org.eclipse.core.resources;version="[3.4.0,4.0.0)", - org.eclipse.core.net;version="[3.4.0,4.0.0)", - org.eclipse.ui;version="[3.4.0,4.0.0)", - org.eclipse.team.core;bundle-version="3.4.0", - org.eclipse.team.ui;version="[3.4.0,4.0.0)", - org.eclipse.jface.text;version="[3.4.0,4.0.0)", - org.eclipse.ui.ide;version="[3.4.0,4.0.0)", - org.eclipse.ui.workbench.texteditor;version="[3.4.0,4.0.0)", - org.eclipse.compare;version="[3.4.0,4.0.0)", - org.eclipse.ui.ide;version="[3.4.0,4.0.0)", - org.eclipse.jsch.ui;bundle-version="1.1.100", +Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)", + org.eclipse.core.filesystem;bundle-version="[1.1.0,2.0.0)", + org.eclipse.core.resources;bundle-version="[3.4.0,4.0.0)", + org.eclipse.core.net;bundle-version="[1.1.0,2.0.0)", + org.eclipse.ui;bundle-version="[3.4.0,4.0.0)", + org.eclipse.team.core;bundle-version="[3.4.0,4.0.0)", + org.eclipse.team.ui;bundle-version="[3.4.0,4.0.0)", + org.eclipse.jface.text;bundle-version="[3.4.0,4.0.0)", + org.eclipse.ui.ide;bundle-version="[3.4.0,4.0.0)", + org.eclipse.ui.workbench.texteditor;bundle-version="[3.4.0,4.0.0)", + org.eclipse.compare;bundle-version="[3.4.0,4.0.0)", + org.eclipse.ui.ide;bundle-version="[3.4.0,4.0.0)", + org.eclipse.jsch.ui;bundle-version="[1.1.100,2.0.0)", org.eclipse.jsch.core;bundle-version="[1.1.100,2.0.0)" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: J2SE-1.5 Import-Package: com.jcraft.jsch;version="[0.1.41,0.2.0)", org.eclipse.egit.core;version="[0.6.0,0.7.0)", + org.eclipse.egit.core.internal.storage;version="[0.6.0,0.7.0)", + org.eclipse.egit.core.internal.util;version="[0.6.0,0.7.0)", org.eclipse.egit.core.op;version="[0.6.0,0.7.0)", org.eclipse.egit.core.project;version="[0.6.0,0.7.0)", org.eclipse.jgit.diff;version="0.6.0", |