JBoss Tools SVN: r34135 - in trunk/as/plugins/org.jboss.ide.eclipse.as.egit.ui: src/org/jboss/ide/eclipse/as/egit/internal/ui/commands and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2011-08-22 07:02:45 -0400 (Mon, 22 Aug 2011)
New Revision: 34135
Removed:
trunk/as/plugins/org.jboss.ide.eclipse.as.egit.ui/src/org/jboss/ide/eclipse/as/egit/internal/ui/commands/EGitUtilsCommitAndPushHandler.java
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.egit.ui/plugin.xml
Log:
JBIDE-9510 - removing test handler
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.egit.ui/plugin.xml
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.egit.ui/plugin.xml 2011-08-22 09:44:03 UTC (rev 34134)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.egit.ui/plugin.xml 2011-08-22 11:02:45 UTC (rev 34135)
@@ -39,30 +39,6 @@
</and>
</activeWhen>
</handler>
- <handler
- class="org.jboss.ide.eclipse.as.egit.internal.ui.commands.EGitUtilsCommitAndPushHandler"
- commandId="org.jboss.ide.eclipse.as.egit.ui.commands.EGitUtilsCommitAndPushCommand">
- <activeWhen>
- <and>
- <count
- value="+">
- </count>
- <iterate>
- <or>
- <adapt
- type="org.eclipse.core.resources.IResource">
- </adapt>
- <adapt
- type="org.eclipse.core.resources.mapping.ResourceMapping">
- </adapt>
- <adapt
- type="org.eclipse.ui.IContributorResourceAdapter">
- </adapt>
- </or>
- </iterate>
- </and>
- </activeWhen>
- </handler>
</extension>
<extension
point="org.eclipse.ui.menus">
@@ -94,34 +70,6 @@
</visibleWhen>
</command>
</menuContribution>
- <menuContribution
- allPopups="true"
- locationURI="popup:team.main?after=group1">
- <command
- commandId="org.jboss.ide.eclipse.as.egit.ui.commands.EGitUtilsCommitAndPushCommand"
- label="EGit utils Commit and Push --- REMOVE ME ---"
- style="push"
- tooltip="EGit utils Commit And Push">
- <visibleWhen
- checkEnabled="false">
- <and>
- <count
- value="1">
- </count>
- <iterate>
- <and>
- <adapt
- type="org.eclipse.core.resources.IProject">
- <test
- property="GitResource.isShared">
- </test>
- </adapt>
- </and>
- </iterate>
- </and>
- </visibleWhen>
- </command>
- </menuContribution>
</extension>
<extension
point="org.eclipse.core.expressions.propertyTesters">
Deleted: trunk/as/plugins/org.jboss.ide.eclipse.as.egit.ui/src/org/jboss/ide/eclipse/as/egit/internal/ui/commands/EGitUtilsCommitAndPushHandler.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.egit.ui/src/org/jboss/ide/eclipse/as/egit/internal/ui/commands/EGitUtilsCommitAndPushHandler.java 2011-08-22 09:44:03 UTC (rev 34134)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.egit.ui/src/org/jboss/ide/eclipse/as/egit/internal/ui/commands/EGitUtilsCommitAndPushHandler.java 2011-08-22 11:02:45 UTC (rev 34135)
@@ -1,39 +0,0 @@
-package org.jboss.ide.eclipse.as.egit.internal.ui.commands;
-
-import org.eclipse.core.commands.AbstractHandler;
-import org.eclipse.core.commands.ExecutionEvent;
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.Assert;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.ui.handlers.HandlerUtil;
-import org.jboss.ide.eclipse.as.egit.core.EGitUtils;
-
-/**
- *
- * This is a test handler that should be removed in the finaly Milestone!
- *
- * @author André Dietisheim
- *
- */
-public class EGitUtilsCommitAndPushHandler extends AbstractHandler {
-
- @Override
- public Object execute(ExecutionEvent event) throws ExecutionException {
- ISelection selection = HandlerUtil.getCurrentSelection(event);
- Assert.isTrue(selection instanceof IStructuredSelection);
- IStructuredSelection structuredSelection = (IStructuredSelection) selection;
- Object selectedElement = structuredSelection.getFirstElement();
- IProject project = (IProject) Platform.getAdapterManager().getAdapter(selectedElement, IProject.class);
- try {
- EGitUtils.commit(project, null);
- EGitUtils.push(EGitUtils.getRepository(project), null);
- } catch (CoreException e) {
- throw new ExecutionException(e.getStatus().getMessage(), e.getStatus().getException());
- }
- return null;
- }
-}
14 years, 7 months
JBoss Tools SVN: r34134 - trunk/as/tests/org.jboss.ide.eclipse.as.egit.test/src/org/jboss/ide/eclipse/as/egit/internal/test.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-08-22 05:44:03 -0400 (Mon, 22 Aug 2011)
New Revision: 34134
Modified:
trunk/as/tests/org.jboss.ide.eclipse.as.egit.test/src/org/jboss/ide/eclipse/as/egit/internal/test/EGitUtilsTest.java
Log:
[JBIDE-9513] cleaned push test
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.egit.test/src/org/jboss/ide/eclipse/as/egit/internal/test/EGitUtilsTest.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.egit.test/src/org/jboss/ide/eclipse/as/egit/internal/test/EGitUtilsTest.java 2011-08-22 09:42:21 UTC (rev 34133)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.egit.test/src/org/jboss/ide/eclipse/as/egit/internal/test/EGitUtilsTest.java 2011-08-22 09:44:03 UTC (rev 34134)
@@ -7,14 +7,10 @@
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IPath;
import org.eclipse.egit.core.Activator;
import org.eclipse.jgit.api.Git;
-import org.eclipse.jgit.lib.Constants;
import org.eclipse.jgit.lib.Repository;
-import org.eclipse.jgit.util.SystemReader;
import org.jboss.ide.eclipse.as.egit.core.EGitUtils;
-import org.jboss.ide.eclipse.as.egit.internal.test.util.MockSystemReader;
import org.jboss.ide.eclipse.as.egit.internal.test.util.TestProject;
import org.jboss.ide.eclipse.as.egit.internal.test.util.TestRepository;
import org.jboss.ide.eclipse.as.egit.internal.test.util.TestUtils;
14 years, 7 months
JBoss Tools SVN: r34133 - in trunk/as/tests/org.jboss.ide.eclipse.as.egit.test: src/org/jboss/ide/eclipse/as/egit/internal/test and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-08-22 05:42:21 -0400 (Mon, 22 Aug 2011)
New Revision: 34133
Modified:
trunk/as/tests/org.jboss.ide.eclipse.as.egit.test/
trunk/as/tests/org.jboss.ide.eclipse.as.egit.test/src/org/jboss/ide/eclipse/as/egit/internal/test/EGitUtilsTest.java
trunk/as/tests/org.jboss.ide.eclipse.as.egit.test/src/org/jboss/ide/eclipse/as/egit/internal/test/util/TestRepository.java
trunk/as/tests/org.jboss.ide.eclipse.as.egit.test/src/org/jboss/ide/eclipse/as/egit/internal/test/util/TestUtils.java
Log:
[JBIDE-9513] cleaned push test
Property changes on: trunk/as/tests/org.jboss.ide.eclipse.as.egit.test
___________________________________________________________________
Added: svn:ignore
+ bin
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.egit.test/src/org/jboss/ide/eclipse/as/egit/internal/test/EGitUtilsTest.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.egit.test/src/org/jboss/ide/eclipse/as/egit/internal/test/EGitUtilsTest.java 2011-08-22 09:38:33 UTC (rev 34132)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.egit.test/src/org/jboss/ide/eclipse/as/egit/internal/test/EGitUtilsTest.java 2011-08-22 09:42:21 UTC (rev 34133)
@@ -1,26 +1,17 @@
package org.jboss.ide.eclipse.as.egit.internal.test;
import java.io.File;
-import java.io.FileOutputStream;
import java.io.IOException;
-import java.io.OutputStreamWriter;
-import java.io.Writer;
import java.lang.reflect.InvocationTargetException;
import java.net.URISyntaxException;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
import org.eclipse.egit.core.Activator;
-import org.eclipse.egit.core.RepositoryCache;
-import org.eclipse.egit.core.op.CloneOperation;
import org.eclipse.jgit.api.Git;
-import org.eclipse.jgit.lib.ConfigConstants;
import org.eclipse.jgit.lib.Constants;
import org.eclipse.jgit.lib.Repository;
-import org.eclipse.jgit.lib.StoredConfig;
-import org.eclipse.jgit.transport.URIish;
-import org.eclipse.jgit.util.FileUtils;
import org.eclipse.jgit.util.SystemReader;
import org.jboss.ide.eclipse.as.egit.core.EGitUtils;
import org.jboss.ide.eclipse.as.egit.internal.test.util.MockSystemReader;
@@ -48,104 +39,58 @@
public void setUp() throws Exception {
Activator.getDefault().getRepositoryCache().clear();
- createMockSystemReader();
-
this.testProject = new TestProject(true);
- this.gitDir = createGitDir(testProject);
+ this.gitDir = TestUtils.createGitDir(testProject);
this.testRepository = new TestRepository(gitDir);
- setUserAndEmail(testRepository);
+ testRepository.createMockSystemReader(ResourcesPlugin.getWorkspace().getRoot().getLocation());
+ testRepository.setUserAndEmail(GIT_USER, GIT_EMAIL);
testRepository.connect(testProject.getProject());
- this.clonedTestRepository = cloneRepository(testRepository.getRepository());
+ this.clonedTestRepository = cloneRepository(testRepository);
}
- private void setUserAndEmail(TestRepository testRepository) {
- StoredConfig config = testRepository.getRepository().getConfig();
- config.setString(ConfigConstants.CONFIG_USER_SECTION, null, ConfigConstants.CONFIG_KEY_NAME,
- GIT_USER);
- config.setString(ConfigConstants.CONFIG_USER_SECTION, null, ConfigConstants.CONFIG_KEY_EMAIL,
- GIT_EMAIL);
- }
-
- private TestRepository cloneRepository(Repository repository) throws URISyntaxException, InvocationTargetException,
- InterruptedException, IOException {
- URIish uri = new URIish("file:///" + repository.getDirectory().toString());
+ private TestRepository cloneRepository(TestRepository repository) throws URISyntaxException, InvocationTargetException, InterruptedException, IOException {
File workspaceDir = ResourcesPlugin.getWorkspace().getRoot().getLocation().toFile();
File clonedRepositoryFile =
new File(workspaceDir, "clonedRepository-" + String.valueOf(System.currentTimeMillis()));
- CloneOperation clop =
- new CloneOperation(uri, true, null, clonedRepositoryFile, Constants.R_HEADS + Constants.MASTER,
- Constants.DEFAULT_REMOTE_NAME, 0);
- clop.run(null);
- RepositoryCache repositoryCache = Activator.getDefault().getRepositoryCache();
- Repository clonedRepository = repositoryCache
- .lookupRepository(new File(clonedRepositoryFile, Constants.DOT_GIT));
- TestRepository testRepository = new TestRepository(clonedRepository);
- // Repository clonedRepository = new FileRepository(new
- // File(clonedRepositoryFile, Constants.DOT_GIT));
- // TestRepository testRepository = new TestRepository(clonedRepository);
- // we push to branch "test" of repository2
- // RefUpdate createBranch = testRepository.getRepository().updateRef(
- // "refs/heads/test");
- // createBranch.setNewObjectId(testRepository.getRepository().resolve(
- // "refs/heads/master"));
- // createBranch.update();
-
- return testRepository;
+ return testRepository.cloneRepository(clonedRepositoryFile);
}
- private void createMockSystemReader() {
- MockSystemReader mockSystemReader = new MockSystemReader();
- SystemReader.setInstance(mockSystemReader);
- File workspaceFile = ResourcesPlugin.getWorkspace().getRoot().getLocation().toFile()
- .getAbsoluteFile();
- mockSystemReader.setProperty(Constants.GIT_CEILING_DIRECTORIES_KEY,
- workspaceFile.toString());
- }
-
- private File createGitDir(TestProject testProject) throws IOException {
- return new File(testProject.getProject().getLocation().toFile(), Constants.DOT_GIT);
- }
-
@After
public void tearDown() throws Exception {
- cleanupRepository(testRepository);
- cleanupRepository(clonedTestRepository);
+ testRepository.dispose();
+ clonedTestRepository.dispose();
testProject.dispose();
Activator.getDefault().getRepositoryCache().clear();
}
- private static void cleanupRepository(TestRepository testRepository) throws IOException {
- File repositoryDirectory = testRepository.getRepository().getDirectory();
- File repositoryParent = repositoryDirectory.getParentFile();
- if (repositoryParent.exists()) {
- FileUtils.delete(repositoryParent, FileUtils.RECURSIVE | FileUtils.RETRY);
- }
- testRepository.dispose();
- }
-
@Test
public void canCommitFileInProject() throws Exception {
+ String fileName = "a.txt";
+ String fileContent = "adietish(a)redhat.com";
+
IFile file = testUtils.addFileToProject(
testProject.getProject(),
- "a.txt", "some text");
- addToRepository(file, testRepository);
+ fileName,
+ fileContent);
+ testRepository.track(file);
EGitUtils.commit(testProject.getProject(), null);
- testUtils.assertRepositoryContainsFiles(
+ testUtils.assertRepositoryContainsFilesWithContent(
testRepository.getRepository(),
- new String[] { testUtils.getRepositoryPath(file) });
+ new String[] { testUtils.getPathInRepository(file), fileContent });
}
@Test
public void fileAddedToCloneIsInOriginAfterPush() throws Exception {
String fileName = "b.txt";
String fileContent = "adietish(a)redhat.com";
+
+ clonedTestRepository.createFile(fileName, fileContent);
Repository clonedRepository = clonedTestRepository.getRepository();
- newRepositoryFile(fileName, fileContent, clonedRepository);
Git git = new Git(clonedRepository);
git.add().addFilepattern(fileName).call();
git.commit().setCommitter(GIT_USER, GIT_EMAIL).setMessage("adding a new file").call();
@@ -158,27 +103,4 @@
fileName,
fileContent);
}
-
- private void addToRepository(IFile file, TestRepository testRepository) throws IOException, CoreException {
- // List<IResource> resources = new ArrayList<IResource>();
- // resources.add(file);
- // new AddToIndexOperation(resources).execute(null);
- testRepository.track(new File(file.getLocation().toOSString()));
- }
-
- private static void newRepositoryFile(String name, String data, Repository repository) throws IOException {
- File file = new File(repository.getWorkTree(), name);
- write(file, data);
- }
-
- private static void write(final File file, final String body) throws IOException {
- FileUtils.mkdirs(file.getParentFile(), true);
- Writer w = new OutputStreamWriter(new FileOutputStream(file), "UTF-8");
- try {
- w.write(body);
- } finally {
- w.close();
- }
- }
-
}
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.egit.test/src/org/jboss/ide/eclipse/as/egit/internal/test/util/TestRepository.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.egit.test/src/org/jboss/ide/eclipse/as/egit/internal/test/util/TestRepository.java 2011-08-22 09:38:33 UTC (rev 34132)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.egit.test/src/org/jboss/ide/eclipse/as/egit/internal/test/util/TestRepository.java 2011-08-22 09:42:21 UTC (rev 34133)
@@ -10,8 +10,13 @@
package org.jboss.ide.eclipse.as.egit.internal.test.util;
import java.io.File;
+import java.io.FileOutputStream;
import java.io.FileWriter;
import java.io.IOException;
+import java.io.OutputStreamWriter;
+import java.io.Writer;
+import java.lang.reflect.InvocationTargetException;
+import java.net.URISyntaxException;
import java.util.Collection;
import java.util.Collections;
import java.util.regex.Pattern;
@@ -19,9 +24,12 @@
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.Path;
import org.eclipse.egit.core.Activator;
+import org.eclipse.egit.core.RepositoryCache;
import org.eclipse.egit.core.op.BranchOperation;
+import org.eclipse.egit.core.op.CloneOperation;
import org.eclipse.egit.core.op.ConnectProviderOperation;
import org.eclipse.egit.core.op.DisconnectProviderOperation;
import org.eclipse.jgit.api.CommitCommand;
@@ -35,16 +43,20 @@
import org.eclipse.jgit.dircache.DirCache;
import org.eclipse.jgit.dircache.DirCacheEntry;
import org.eclipse.jgit.errors.UnmergedPathException;
+import org.eclipse.jgit.lib.ConfigConstants;
import org.eclipse.jgit.lib.Constants;
import org.eclipse.jgit.lib.ObjectId;
import org.eclipse.jgit.lib.Ref;
import org.eclipse.jgit.lib.RefUpdate;
import org.eclipse.jgit.lib.Repository;
+import org.eclipse.jgit.lib.StoredConfig;
import org.eclipse.jgit.revwalk.RevCommit;
import org.eclipse.jgit.revwalk.RevWalk;
import org.eclipse.jgit.storage.file.FileRepository;
+import org.eclipse.jgit.transport.URIish;
import org.eclipse.jgit.treewalk.TreeWalk;
import org.eclipse.jgit.util.FileUtils;
+import org.eclipse.jgit.util.SystemReader;
/**
* Helper class for creating and filling a test repository
@@ -149,6 +161,21 @@
return file;
}
+ public void createFile(String name, String data) throws IOException {
+ File file = new File(repository.getWorkTree(), name);
+ write(file, data);
+ }
+
+ private void write(final File file, final String data) throws IOException {
+ FileUtils.mkdirs(file.getParentFile(), true);
+ Writer w = new OutputStreamWriter(new FileOutputStream(file), "UTF-8");
+ try {
+ w.write(data);
+ } finally {
+ w.close();
+ }
+ }
+
/**
* Track, add to index and finally commit given file
*
@@ -229,6 +256,10 @@
return commitCommand.call();
}
+ public void track(IFile file) throws IOException {
+ track(new File(file.getLocation().toOSString()));
+ }
+
/**
* Adds file to version control
*
@@ -456,11 +487,20 @@
return iFile;
}
- public void dispose() {
+ public void dispose() throws IOException {
repository.close();
+ remove();
repository = null;
}
+ public void remove() throws IOException {
+ File repositoryDirectory = repository.getDirectory();
+ File repositoryParent = repositoryDirectory.getParentFile();
+ if (repositoryParent.exists()) {
+ FileUtils.delete(repositoryParent, FileUtils.RECURSIVE | FileUtils.RETRY);
+ }
+ }
+
/**
* Connect a project to this repository
*
@@ -493,4 +533,31 @@
return dc.getEntry(repoPath);
}
+
+ public TestRepository cloneRepository(File path) throws URISyntaxException, InvocationTargetException,
+ InterruptedException, IOException {
+ URIish uri = new URIish("file:///" + repository.getDirectory().toString());
+ CloneOperation clop =
+ new CloneOperation(uri, true, null, path, Constants.R_HEADS + Constants.MASTER,
+ Constants.DEFAULT_REMOTE_NAME, 0);
+ clop.run(null);
+ RepositoryCache repositoryCache = Activator.getDefault().getRepositoryCache();
+ Repository clonedRepository = repositoryCache
+ .lookupRepository(new File(path, Constants.DOT_GIT));
+ return new TestRepository(clonedRepository);
+ }
+
+ public void setUserAndEmail(String user, String email) {
+ StoredConfig config = repository.getConfig();
+ config.setString(
+ ConfigConstants.CONFIG_USER_SECTION, null, ConfigConstants.CONFIG_KEY_NAME, user);
+ config.setString(
+ ConfigConstants.CONFIG_USER_SECTION, null, ConfigConstants.CONFIG_KEY_EMAIL, email);
+ }
+
+ public void createMockSystemReader(IPath ceilingPath) {
+ MockSystemReader mockSystemReader = new MockSystemReader();
+ SystemReader.setInstance(mockSystemReader);
+ mockSystemReader.setProperty(Constants.GIT_CEILING_DIRECTORIES_KEY, ceilingPath.toOSString());
+ }
}
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.egit.test/src/org/jboss/ide/eclipse/as/egit/internal/test/util/TestUtils.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.egit.test/src/org/jboss/ide/eclipse/as/egit/internal/test/util/TestUtils.java 2011-08-22 09:38:33 UTC (rev 34132)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.egit.test/src/org/jboss/ide/eclipse/as/egit/internal/test/util/TestUtils.java 2011-08-22 09:42:21 UTC (rev 34133)
@@ -31,6 +31,7 @@
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.Path;
import org.eclipse.egit.core.project.RepositoryMapping;
+import org.eclipse.jgit.lib.Constants;
import org.eclipse.jgit.lib.ObjectId;
import org.eclipse.jgit.lib.Repository;
import org.eclipse.jgit.treewalk.TreeWalk;
@@ -61,6 +62,10 @@
return result;
}
+ public static File createGitDir(TestProject testProject) throws IOException {
+ return new File(testProject.getProject().getLocation().toFile(), Constants.DOT_GIT);
+ }
+
/**
* Cleanup: delete the "temporary" folder and all children
*
@@ -255,7 +260,7 @@
return map;
}
- public String getRepositoryPath(IResource resource) {
+ public String getPathInRepository(IResource resource) {
RepositoryMapping mapping = RepositoryMapping.getMapping(resource);
if (mapping == null) {
throw new IllegalArgumentException(resource + " is not in any repository");
14 years, 7 months
JBoss Tools SVN: r34132 - in trunk/as/plugins/org.jboss.ide.eclipse.as.egit.core: META-INF and 3 other directories.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2011-08-22 05:38:33 -0400 (Mon, 22 Aug 2011)
New Revision: 34132
Added:
trunk/as/plugins/org.jboss.ide.eclipse.as.egit.core/src/org/jboss/ide/eclipse/as/egit/core/.EgitUtils.java.swp
trunk/as/plugins/org.jboss.ide.eclipse.as.egit.core/src/org/jboss/ide/eclipse/as/egit/core/EgitPublishMethod.java
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.egit.core/META-INF/MANIFEST.MF
trunk/as/plugins/org.jboss.ide.eclipse.as.egit.core/plugin.xml
trunk/as/plugins/org.jboss.ide.eclipse.as.egit.core/src/org/jboss/ide/eclipse/as/egit/core/EgitBehaviourDelegate.java
trunk/as/plugins/org.jboss.ide.eclipse.as.egit.core/src/org/jboss/ide/eclipse/as/egit/core/internal/EGitCoreActivator.java
trunk/as/plugins/org.jboss.ide.eclipse.as.egit.core/src/org/jboss/ide/eclipse/as/egit/core/module/GitProjectModuleFactoryDelegate.java
Log:
JBIDE-9510 - linking the actions to deployment
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.egit.core/META-INF/MANIFEST.MF
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.egit.core/META-INF/MANIFEST.MF 2011-08-22 06:30:32 UTC (rev 34131)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.egit.core/META-INF/MANIFEST.MF 2011-08-22 09:38:33 UTC (rev 34132)
@@ -5,7 +5,7 @@
Bundle-Version: 0.0.1.qualifier
Bundle-Activator: org.jboss.ide.eclipse.as.egit.core.internal.EGitCoreActivator
Require-Bundle: org.jboss.ide.eclipse.as.core;bundle-version="2.3.0",
- org.eclipse.jgit;bundle-version="[1.1.0,2.0.0)",
+ org.eclipse.jgit;bundle-version="[1.1.0,2.1.0)",
org.eclipse.egit;bundle-version="[1.1.0,2.0.0)",
org.eclipse.egit.core;bundle-version="[1.1.0,2.0.0)",
org.eclipse.egit.ui;bundle-version="[1.1.0,2.0.0)",
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.egit.core/plugin.xml
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.egit.core/plugin.xml 2011-08-22 06:30:32 UTC (rev 34131)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.egit.core/plugin.xml 2011-08-22 09:38:33 UTC (rev 34132)
@@ -4,7 +4,7 @@
<extension
point="org.eclipse.wst.server.core.moduleFactories">
<moduleFactory
- class="org.jboss.ide.eclipse.as.egit.core.internal.module.GitProjectModuleFactoryDelegate"
+ class="org.jboss.ide.eclipse.as.egit.core.module.GitProjectModuleFactoryDelegate"
id="org.jboss.ide.eclipse.as.egit.core.module.gitProjectModuleFactory"
projects="true">
<moduleType
@@ -20,4 +20,14 @@
name="Egit">
</moduleType>
</extension>
+ <extension
+ point="org.jboss.ide.eclipse.as.core.publishMethod">
+ <publishMethod
+ class="org.jboss.ide.eclipse.as.egit.core.EgitPublishMethod"
+ id="egit"
+ name="Egit Publish Method"
+ serverTypes="org.jboss.ide.eclipse.as.systemCopyServer">
+ </publishMethod>
+ </extension>
+
</plugin>
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.egit.core/src/org/jboss/ide/eclipse/as/egit/core/.EgitUtils.java.swp
===================================================================
(Binary files differ)
Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.egit.core/src/org/jboss/ide/eclipse/as/egit/core/.EgitUtils.java.swp
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.egit.core/src/org/jboss/ide/eclipse/as/egit/core/EgitBehaviourDelegate.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.egit.core/src/org/jboss/ide/eclipse/as/egit/core/EgitBehaviourDelegate.java 2011-08-22 06:30:32 UTC (rev 34131)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.egit.core/src/org/jboss/ide/eclipse/as/egit/core/EgitBehaviourDelegate.java 2011-08-22 09:38:33 UTC (rev 34132)
@@ -19,7 +19,7 @@
public class EgitBehaviourDelegate implements IJBossBehaviourDelegate {
- private static final String ID = "egit";
+ public static final String ID = "egit";
@Override
public String getBehaviourTypeId() {
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.egit.core/src/org/jboss/ide/eclipse/as/egit/core/EgitPublishMethod.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.egit.core/src/org/jboss/ide/eclipse/as/egit/core/EgitPublishMethod.java (rev 0)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.egit.core/src/org/jboss/ide/eclipse/as/egit/core/EgitPublishMethod.java 2011-08-22 09:38:33 UTC (rev 34132)
@@ -0,0 +1,65 @@
+package org.jboss.ide.eclipse.as.egit.core;
+
+import java.util.concurrent.ExecutionException;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.wst.server.core.IModule;
+import org.eclipse.wst.server.core.IServer;
+import org.jboss.ide.eclipse.as.core.ExtensionManager;
+import org.jboss.ide.eclipse.as.core.server.IJBossServerPublishMethod;
+import org.jboss.ide.eclipse.as.core.server.IJBossServerPublishMethodType;
+import org.jboss.ide.eclipse.as.core.server.internal.DeployableServerBehavior;
+import org.jboss.ide.eclipse.as.core.server.xpl.PublishCopyUtil.IPublishCopyCallbackHandler;
+
+public class EgitPublishMethod implements IJBossServerPublishMethod {
+ @Override
+ public IJBossServerPublishMethodType getPublishMethodType() {
+ return ExtensionManager.getDefault().getPublishMethod(getPublishMethodId());
+ }
+
+ public String getPublishMethodId() {
+ return EgitBehaviourDelegate.ID;
+ }
+
+ @Override
+ public void publishStart(DeployableServerBehavior behaviour,
+ IProgressMonitor monitor) throws CoreException {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public int publishFinish(DeployableServerBehavior behaviour,
+ IProgressMonitor monitor) throws CoreException {
+ // TODO Auto-generated method stub
+ return 0;
+ }
+
+ @Override
+ public int publishModule(DeployableServerBehavior behaviour, int kind,
+ int deltaKind, IModule[] module, IProgressMonitor monitor)
+ throws CoreException {
+ // TODO Auto-generated method stub
+ IProject project = module[0].getProject();
+ EGitUtils.commit(project, null);
+ EGitUtils.push(EGitUtils.getRepository(project), null);
+ return IServer.PUBLISH_STATE_NONE;
+ }
+
+ @Override
+ public IPublishCopyCallbackHandler getCallbackHandler(IPath path,
+ IServer server) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public String getPublishDefaultRootFolder(IServer server) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.egit.core/src/org/jboss/ide/eclipse/as/egit/core/internal/EGitCoreActivator.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.egit.core/src/org/jboss/ide/eclipse/as/egit/core/internal/EGitCoreActivator.java 2011-08-22 06:30:32 UTC (rev 34131)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.egit.core/src/org/jboss/ide/eclipse/as/egit/core/internal/EGitCoreActivator.java 2011-08-22 09:38:33 UTC (rev 34132)
@@ -10,6 +10,8 @@
******************************************************************************/
package org.jboss.ide.eclipse.as.egit.core.internal;
+import org.jboss.ide.eclipse.as.core.server.internal.v7.DelegatingJBoss7ServerBehavior;
+import org.jboss.ide.eclipse.as.egit.core.EgitBehaviourDelegate;
import org.osgi.framework.BundleActivator;
import org.osgi.framework.BundleContext;
@@ -26,6 +28,7 @@
public void start(BundleContext bundleContext) throws Exception {
EGitCoreActivator.context = bundleContext;
+ DelegatingJBoss7ServerBehavior.addDelegateMapping(EgitBehaviourDelegate.ID, EgitBehaviourDelegate.class);
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.egit.core/src/org/jboss/ide/eclipse/as/egit/core/module/GitProjectModuleFactoryDelegate.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.egit.core/src/org/jboss/ide/eclipse/as/egit/core/module/GitProjectModuleFactoryDelegate.java 2011-08-22 06:30:32 UTC (rev 34131)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.egit.core/src/org/jboss/ide/eclipse/as/egit/core/module/GitProjectModuleFactoryDelegate.java 2011-08-22 09:38:33 UTC (rev 34132)
@@ -31,6 +31,7 @@
private HashMap<IModule, GitProjectModuleDelegate> moduleToDelegate;
private IResourceChangeListener resourceListener;
public GitProjectModuleFactoryDelegate() {
+ System.out.println("test");
}
public void initialize() {
moduleIdToModule = new HashMap<String, IModule>();
@@ -42,7 +43,14 @@
public boolean visit(IResourceDelta delta) throws CoreException {
IResource r = delta.getResource();
if( r instanceof IProject ) {
- incrementChanged((IProject)r);
+ IResourceDelta[] kids = delta.getAffectedChildren();
+ if( kids.length > 1 )
+ incrementChanged((IProject)r);
+ else if( kids.length == 1 ) {
+ String changedkid = kids[0].getResource().getName();
+ if( !changedkid.equals(".git"))
+ incrementChanged((IProject)r);
+ }
}
return !(r instanceof IProject);
}
14 years, 7 months
JBoss Tools SVN: r34131 - trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/hyperlinks.
by jbosstools-commits＠lists.jboss.org
Author: jjankovi
Date: 2011-08-22 02:30:32 -0400 (Mon, 22 Aug 2011)
New Revision: 34131
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/hyperlinks/CDIHyperlinksTest.java
Log:
HyperLink test completion
Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/hyperlinks/CDIHyperlinksTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/hyperlinks/CDIHyperlinksTest.java 2011-08-22 01:46:45 UTC (rev 34130)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/hyperlinks/CDIHyperlinksTest.java 2011-08-22 06:30:32 UTC (rev 34131)
@@ -5,7 +5,9 @@
import org.jboss.tools.cdi.bot.test.CDIAllBotTests;
import org.jboss.tools.cdi.bot.test.uiutils.actions.CDIUtil;
import org.jboss.tools.ui.bot.ext.RequirementAwareSuite;
+import org.jboss.tools.ui.bot.ext.SWTJBTExt;
import org.jboss.tools.ui.bot.ext.SWTTestExt;
+import org.jboss.tools.ui.bot.ext.Timing;
import org.jboss.tools.ui.bot.ext.config.Annotations.Require;
import org.jboss.tools.ui.bot.ext.config.Annotations.Server;
import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState;
@@ -48,6 +50,7 @@
public void testInjectHyperlink() {
CDIUtil.bean(PACKAGE_NAME, "Animal", true, false, false, false, null,
null, null, null).finish();
+ bot.sleep(Timing.time3S());
util.waitForNonIgnoredJobs();
CDIUtil.bean(PACKAGE_NAME, "BrokenFarm", true, false, false, false, null,
@@ -56,12 +59,16 @@
SWTBotEditor ed = bot.activeEditor();
CDIUtil.copyResourceToClass(ed, CDIHyperlinksTest.class
.getResourceAsStream("/resources/cdi/BrokenFarm.java.cdi"), false);
+
SWTBotTreeItem warningNode = ProblemsView.getWarningsNode(bot);
assertNull("Warnings node should be empty.", warningNode);
- /*
- * TODO - hyperlink on @Inject should redirect to correct class
- */
-
+ String openOnString = "@Inject";
+ ed = SWTJBTExt.selectTextInSourcePane(bot, "BrokenFarm.java", openOnString, 1, openOnString.length()-1);
+ ed.setFocus();
+ bot.menu("Navigate").menu("Open Hyperlink").click();
+ bot.activeShell().bot().table(0).click(1, 0);
+ bot.sleep(Timing.time1S());
+ ed = bot.activeEditor();
+ assertTrue("ERROR: redirected to " + ed.getTitle(), ed.getTitle().equals("Animal.java"));
}
-
}
\ No newline at end of file
14 years, 7 months
JBoss Tools SVN: r34130 - trunk/jsf/docs/jsf_tools_tutorial.
by jbosstools-commits＠lists.jboss.org
Author: irooskov(a)redhat.com
Date: 2011-08-21 21:46:45 -0400 (Sun, 21 Aug 2011)
New Revision: 34130
Modified:
trunk/jsf/docs/jsf_tools_tutorial/pom.xml
Log:
updated pom to build correctly
Modified: trunk/jsf/docs/jsf_tools_tutorial/pom.xml
===================================================================
--- trunk/jsf/docs/jsf_tools_tutorial/pom.xml 2011-08-22 01:46:15 UTC (rev 34129)
+++ trunk/jsf/docs/jsf_tools_tutorial/pom.xml 2011-08-22 01:46:45 UTC (rev 34130)
@@ -185,7 +185,7 @@
<configuration>
<sourceDirectory>${project.basedir}</sourceDirectory>
<!-- <sourceDocumentName>${docname}.xml</sourceDocumentName> -->
- <sourceDocumentName>{master}</sourceDocumentName>
+ <sourceDocumentName>master.xml</sourceDocumentName>
<masterTranslation>en-US</masterTranslation>
<imageResource>
<directory>${project.basedir}/en-US</directory>
14 years, 7 months
JBoss Tools SVN: r34129 - branches/jbosstools-3.2.x/jsf/docs/jsf_tools_tutorial.
by jbosstools-commits＠lists.jboss.org
Author: irooskov(a)redhat.com
Date: 2011-08-21 21:46:15 -0400 (Sun, 21 Aug 2011)
New Revision: 34129
Modified:
branches/jbosstools-3.2.x/jsf/docs/jsf_tools_tutorial/pom.xml
Log:
updated pom to build correctly
Modified: branches/jbosstools-3.2.x/jsf/docs/jsf_tools_tutorial/pom.xml
===================================================================
--- branches/jbosstools-3.2.x/jsf/docs/jsf_tools_tutorial/pom.xml 2011-08-22 00:31:36 UTC (rev 34128)
+++ branches/jbosstools-3.2.x/jsf/docs/jsf_tools_tutorial/pom.xml 2011-08-22 01:46:15 UTC (rev 34129)
@@ -185,7 +185,7 @@
<configuration>
<sourceDirectory>${project.basedir}</sourceDirectory>
<!-- <sourceDocumentName>${docname}.xml</sourceDocumentName> -->
- <sourceDocumentName>{master}</sourceDocumentName>
+ <sourceDocumentName>master.xml</sourceDocumentName>
<masterTranslation>en-US</masterTranslation>
<imageResource>
<directory>${project.basedir}/en-US</directory>
14 years, 7 months
JBoss Tools SVN: r34128 - branches/jbosstools-3.2.x/jsf/docs/jsf_tools_tutorial/en-US.
by jbosstools-commits＠lists.jboss.org
Author: irooskov(a)redhat.com
Date: 2011-08-21 20:31:36 -0400 (Sun, 21 Aug 2011)
New Revision: 34128
Modified:
branches/jbosstools-3.2.x/jsf/docs/jsf_tools_tutorial/en-US/master.xml
Log:
updated for community release
Modified: branches/jbosstools-3.2.x/jsf/docs/jsf_tools_tutorial/en-US/master.xml
===================================================================
--- branches/jbosstools-3.2.x/jsf/docs/jsf_tools_tutorial/en-US/master.xml 2011-08-21 23:22:42 UTC (rev 34127)
+++ branches/jbosstools-3.2.x/jsf/docs/jsf_tools_tutorial/en-US/master.xml 2011-08-22 00:31:36 UTC (rev 34128)
@@ -44,15 +44,12 @@
<author><firstname>Svetlana</firstname><surname>Mukhina</surname><email>smukhina(a)exadel.com</email></author>
<copyright>
- <year>2007</year>
- <year>2008</year>
- <year>2009</year>
- <year>2010</year>
+ <year>2011</year>
<holder>JBoss by Red Hat</holder>
</copyright>
<releaseinfo>
- Version: 3.1.1.GA
+ Version: 3.2.1.GA
</releaseinfo>
14 years, 7 months
JBoss Tools SVN: r34127 - branches/jbosstools-3.2.x/modeshape/docs/ModeShape_Tools_Reference_Guide/en-US.
by jbosstools-commits＠lists.jboss.org
Author: irooskov(a)redhat.com
Date: 2011-08-21 19:22:42 -0400 (Sun, 21 Aug 2011)
New Revision: 34127
Modified:
branches/jbosstools-3.2.x/modeshape/docs/ModeShape_Tools_Reference_Guide/en-US/master.xml
Log:
updated for community release
Modified: branches/jbosstools-3.2.x/modeshape/docs/ModeShape_Tools_Reference_Guide/en-US/master.xml
===================================================================
--- branches/jbosstools-3.2.x/modeshape/docs/ModeShape_Tools_Reference_Guide/en-US/master.xml 2011-08-21 23:02:51 UTC (rev 34126)
+++ branches/jbosstools-3.2.x/modeshape/docs/ModeShape_Tools_Reference_Guide/en-US/master.xml 2011-08-21 23:22:42 UTC (rev 34127)
@@ -30,11 +30,11 @@
<email>irooskov(a)redhat.com</email>
</author>
<copyright>
- <year>2010</year>
+ <year>2011</year>
<holder>JBoss by Red Hat</holder>
</copyright>
<releaseinfo>
- Version: 3.2.0.GA
+ Version: 3.2.1.GA
</releaseinfo>
<!--<abstract>
<title/>
14 years, 7 months
JBoss Tools SVN: r34126 - branches/jbosstools-3.2.x/jsf/docs/userguide/en-US.
by jbosstools-commits＠lists.jboss.org
Author: irooskov(a)redhat.com
Date: 2011-08-21 19:02:51 -0400 (Sun, 21 Aug 2011)
New Revision: 34126
Modified:
branches/jbosstools-3.2.x/jsf/docs/userguide/en-US/master.xml
Log:
updated for community release
Modified: branches/jbosstools-3.2.x/jsf/docs/userguide/en-US/master.xml
===================================================================
--- branches/jbosstools-3.2.x/jsf/docs/userguide/en-US/master.xml 2011-08-21 22:54:09 UTC (rev 34125)
+++ branches/jbosstools-3.2.x/jsf/docs/userguide/en-US/master.xml 2011-08-21 23:02:51 UTC (rev 34126)
@@ -34,14 +34,11 @@
<title>Visual Web Tools Reference Guide</title>
<copyright>
- <year>2007</year>
- <year>2008</year>
- <year>2009</year>
- <year>2010</year>
+ <year>2011</year>
<holder>JBoss by Red Hat</holder>
</copyright>
<releaseinfo>
- Version: 3.0.1.GA
+ Version: 3.2.1.GA
</releaseinfo>
<!--<abstract>
<title/>
14 years, 7 months