JBoss Tools SVN: r35582 - in trunk/cdi/plugins/org.jboss.tools.cdi.ui: src/org/jboss/tools/cdi/ui/preferences and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2011-10-12 16:24:56 -0400 (Wed, 12 Oct 2011)
New Revision: 35582
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.ui/plugin.properties
trunk/cdi/plugins/org.jboss.tools.cdi.ui/plugin.xml
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/preferences/CDIPreferencesMessages.properties
Log:
https://issues.jboss.org/browse/JBIDE-9895 Move CDI Preferences from JBoss Tools->Web to JBoss Tools
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/plugin.properties
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/plugin.properties 2011-10-12 19:09:24 UTC (rev 35581)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/plugin.properties 2011-10-12 20:24:56 UTC (rev 35582)
@@ -3,7 +3,7 @@
ConfigureMenu_AddCDISupport=Add CDI (Context and Dependency Injection) support...
ConfigureMenu_RemoveCDISupport=Remove CDI (Context and Dependency Injection) support...
-PreferencePage_Validator=Validator
+PreferencePage_Validator=CDI Validator
PreferencePage_CDI=CDI (Context and Dependency Injection)
Bundle-Vendor.0 = JBoss by Red Hat
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/plugin.xml
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/plugin.xml 2011-10-12 19:09:24 UTC (rev 35581)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/plugin.xml 2011-10-12 20:24:56 UTC (rev 35582)
@@ -37,7 +37,7 @@
name="%PreferencePage_Validator">
</page>
<page
- category="org.jboss.tools.common.model.ui"
+ category="org.jboss.tools.common.model.ui.MainPreferencePage"
class="org.jboss.tools.cdi.ui.preferences.CDIPreferencePage"
id="org.jboss.tools.common.model.ui.cdi"
name="%PreferencePage_CDI">
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/preferences/CDIPreferencesMessages.properties
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/preferences/CDIPreferencesMessages.properties 2011-10-12 19:09:24 UTC (rev 35581)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/preferences/CDIPreferencesMessages.properties 2011-10-12 20:24:56 UTC (rev 35582)
@@ -18,7 +18,7 @@
CDIValidatorConfigurationBlock_needsprojectbuild_message=The CDI Validator settings have changed. A rebuild of the project is required for changes to take effect. Build the project now?
## Root section JSR-299
-CDIValidatorConfigurationBlock_section_jsr299=JSR-299
+CDIValidatorConfigurationBlock_section_jsr299=Specification
##Root Section Extensions
CDIValidatorConfigurationBlock_section_extensions=Extensions
13 years, 3 months
- 1
- 0
JBoss Tools SVN: r35581 - trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/internal/client.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-10-12 15:09:24 -0400 (Wed, 12 Oct 2011)
New Revision: 35581
Modified:
trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/internal/client/Application.java
Log:
Modified: trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/internal/client/Application.java
===================================================================
--- trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/internal/client/Application.java 2011-10-12 18:54:36 UTC (rev 35580)
+++ trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/internal/client/Application.java 2011-10-12 19:09:24 UTC (rev 35581)
@@ -26,7 +26,7 @@
public class Application extends UserInfoAware implements IApplication {
private static final String GIT_URI_PATTERN = "ssh://{0}@{1}-{2}.{3}/~/git/{1}.git/";
- private static final String APPLICATION_URL_PATTERN = "http://{0}-{1}.{2}/";
+ private static final String APPLICATION_URL_PATTERN = "https://{0}-{1}.{2}/";
private String name;
private ICartridge cartridge;
13 years, 3 months
- 1
- 0
JBoss Tools SVN: r35580 - in trunk/as/plugins/org.jboss.tools.openshift.express.ui: src/org/jboss/tools/openshift/express/internal/ui/wizard and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-10-12 14:54:36 -0400 (Wed, 12 Oct 2011)
New Revision: 35580
Modified:
trunk/as/plugins/org.jboss.tools.openshift.express.ui/META-INF/MANIFEST.MF
trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationWizardModel.java
trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/projectimport/GeneralProjectImportOperation.java
Log:
[JBIDE-9793] corrected git connection operation after project import
Modified: trunk/as/plugins/org.jboss.tools.openshift.express.ui/META-INF/MANIFEST.MF
===================================================================
--- trunk/as/plugins/org.jboss.tools.openshift.express.ui/META-INF/MANIFEST.MF 2011-10-12 17:11:57 UTC (rev 35579)
+++ trunk/as/plugins/org.jboss.tools.openshift.express.ui/META-INF/MANIFEST.MF 2011-10-12 18:54:36 UTC (rev 35580)
@@ -11,7 +11,7 @@
org.eclipse.jgit;bundle-version="[1.1.0,2.1.0)",
com.jcraft.jsch;bundle-version="0.1.44",
org.jboss.ide.eclipse.as.core;bundle-version="2.3.0",
- org.eclipse.m2e.core;bundle-version="1.0.0",
+ org.eclipse.m2e.core;bundle-version="1.0.100",
org.eclipse.ui,
org.eclipse.core.runtime,
org.eclipse.core.databinding;bundle-version="1.4.0",
Modified: trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationWizardModel.java
===================================================================
--- trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationWizardModel.java 2011-10-12 17:11:57 UTC (rev 35579)
+++ trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationWizardModel.java 2011-10-12 18:54:36 UTC (rev 35580)
@@ -11,7 +11,6 @@
package org.jboss.tools.openshift.express.internal.ui.wizard;
import java.io.File;
-import java.io.IOException;
import java.lang.reflect.InvocationTargetException;
import java.net.URISyntaxException;
import java.util.Collections;
@@ -19,31 +18,25 @@
import java.util.List;
import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.resources.WorkspaceJob;
import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.egit.core.RepositoryUtil;
import org.eclipse.egit.core.op.CloneOperation;
import org.eclipse.egit.core.op.ConnectProviderOperation;
import org.eclipse.egit.ui.Activator;
-import org.eclipse.jgit.api.Git;
-import org.eclipse.jgit.api.InitCommand;
-import org.eclipse.jgit.api.errors.CheckoutConflictException;
-import org.eclipse.jgit.api.errors.ConcurrentRefUpdateException;
-import org.eclipse.jgit.api.errors.InvalidMergeHeadsException;
-import org.eclipse.jgit.api.errors.NoHeadException;
-import org.eclipse.jgit.api.errors.NoMessageException;
-import org.eclipse.jgit.api.errors.WrongRepositoryStateException;
import org.eclipse.jgit.lib.Constants;
-import org.eclipse.jgit.lib.ObjectId;
-import org.eclipse.jgit.lib.Repository;
-import org.eclipse.jgit.merge.MergeStrategy;
+import org.eclipse.jgit.transport.JschConfigSessionFactory;
import org.eclipse.jgit.transport.URIish;
+import org.eclipse.osgi.util.NLS;
import org.jboss.ide.eclipse.as.core.util.FileUtil;
import org.jboss.tools.common.ui.databinding.ObservableUIPojo;
import org.jboss.tools.openshift.express.client.IApplication;
import org.jboss.tools.openshift.express.client.IUser;
import org.jboss.tools.openshift.express.client.OpenshiftException;
+import org.jboss.tools.openshift.express.internal.ui.OpenshiftUIActivator;
import org.jboss.tools.openshift.express.internal.ui.wizard.projectimport.GeneralProjectImportOperation;
import org.jboss.tools.openshift.express.internal.ui.wizard.projectimport.MavenProjectImportOperation;
@@ -81,28 +74,45 @@
dataModel.put(APPLICATION, application);
}
- public void importProject(File projectFolder, IProgressMonitor monitor) throws OpenshiftException, CoreException,
+ public void importProject(final File projectFolder, IProgressMonitor monitor) throws OpenshiftException,
+ CoreException,
InterruptedException {
- MavenProjectImportOperation mavenImport = new MavenProjectImportOperation(projectFolder);
- List<IProject> importedProjects = Collections.emptyList();
- if (mavenImport.isMavenProject()) {
- importedProjects = mavenImport.importToWorkspace(monitor);
- } else {
- importedProjects = new GeneralProjectImportOperation(projectFolder).importToWorkspace(monitor);
- }
+ new WorkspaceJob(NLS.bind("Importing projects from {0}", projectFolder.getAbsolutePath())) {
- connectToGitRepo(importedProjects, monitor);
+ @Override
+ public IStatus runInWorkspace(IProgressMonitor monitor) throws CoreException {
+ try {
+ MavenProjectImportOperation mavenImport = new MavenProjectImportOperation(projectFolder);
+ List<IProject> importedProjects = Collections.emptyList();
+ if (mavenImport.isMavenProject()) {
+ importedProjects = mavenImport.importToWorkspace(monitor);
+ } else {
+ importedProjects = new GeneralProjectImportOperation(projectFolder).importToWorkspace(monitor);
+ }
- createServerAdapterIfRequired();
+ File gitFolder = new File(projectFolder, Constants.DOT_GIT);
+ connectToGitRepo(importedProjects, gitFolder, monitor);
+
+ createServerAdapterIfRequired();
+ return Status.OK_STATUS;
+ } catch (Exception e) {
+ IStatus status = new Status(IStatus.ERROR, OpenshiftUIActivator.PLUGIN_ID,
+ NLS.bind("Could not import projects from {0}", projectFolder.getAbsolutePath()), e);
+ OpenshiftUIActivator.log(status);
+ return status;
+ }
+ }
+ }.schedule();
}
- private void connectToGitRepo(List<IProject> projects, IProgressMonitor monitor) throws CoreException {
+ private void connectToGitRepo(List<IProject> projects, File gitFolder, IProgressMonitor monitor)
+ throws CoreException {
for (IProject project : projects) {
- connectToGitRepo(project, monitor);
+ connectToGitRepo(project, gitFolder, monitor);
}
}
- private void connectToGitRepo(IProject project, IProgressMonitor monitor) throws CoreException {
+ private void connectToGitRepo(IProject project, File gitFolder, IProgressMonitor monitor) throws CoreException {
new ConnectProviderOperation(project).execute(monitor);
}
@@ -123,24 +133,29 @@
}
ensureEgitUIIsStarted();
URIish gitUri = new URIish(uri);
+ RepositoryUtil repositoryUtil = Activator.getDefault().getRepositoryUtil();
CloneOperation cloneOperation =
new CloneOperation(gitUri, true, null, destination, Constants.HEAD, "origin", 10 * 1024);
cloneOperation.run(null);
File gitDirectory = new File(destination, Constants.DOT_GIT);
- Activator.getDefault().getRepositoryUtil().addConfiguredRepository(gitDirectory);
+ repositoryUtil.addConfiguredRepository(gitDirectory);
}
/**
- * The Egit UI {@link Activator#start} initializes the SshSessionFactory
- * with the EclipseSshSessionFactory. The EclipseSshSessionFactory overrides
- * JschConfigSessionFactory#configure to present a UserInfoPrompter if the
- * key passphrase was give entered before. Without this initialization, the
- * ssh connection would simply fail with a TransportException (Auth
- * failure). We therefore have to make sure that the EGit UI plugin is
- * started and initializes the JschConfigSessionFactory.
+ * The EGit UI plugin initializes the ssh factory to present the user a
+ * passphrase prompt if the ssh key was not read yet. If this initialization
+ * is not executed, the ssh connection to the git repo would just fail with
+ * an authentication error. We therefore have to make sure that the EGit UI
+ * plugin is started and initializes the JSchConfigSessionFactory.
+ * <p>
+ * EGit initializes the SshSessionFactory with the EclipseSshSessionFactory.
+ * The EclipseSshSessionFactory overrides JschConfigSessionFactory#configure
+ * to present a UserInfoPrompter if the key passphrase was not entered
+ * before.
*
* @see Activator#start(org.osgi.framework.BundleContext)
* @see Activator#setupSSH
+ * @see JschConfigSessionFactory#configure
* @see EclipseSshSessionFactory#configure
*/
private void ensureEgitUIIsStarted() {
@@ -156,30 +171,7 @@
return new File(userHome, applicationDirectory);
}
- private void mergeWithRemote(Git git, String remoteName) throws CoreException, NoHeadException,
- ConcurrentRefUpdateException, CheckoutConflictException, InvalidMergeHeadsException,
- WrongRepositoryStateException, NoMessageException, IOException {
- Repository repository = git.getRepository();
- ObjectId objectId = repository.resolve("HEAD");
- git.merge().include(objectId).setStrategy(MergeStrategy.OURS).call();
- }
-
private void createServerAdapterIfRequired() {
// TODO
}
-
- private Git createGit(File repositoryFile) throws IOException {
- InitCommand init = Git.init();
- init.setDirectory(repositoryFile);
- init.setBare(false);
- return init.call();
- }
-
- private File createRepositoryFile(String name) {
- IPath workspace = ResourcesPlugin.getWorkspace().getRoot().getLocation();
- IPath gitRepoProject = workspace.append(name);
- File repositoryFile = new File(gitRepoProject.toFile(), Constants.DOT_GIT);
- return repositoryFile;
- }
-
}
Modified: trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/projectimport/GeneralProjectImportOperation.java
===================================================================
--- trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/projectimport/GeneralProjectImportOperation.java 2011-10-12 17:11:57 UTC (rev 35579)
+++ trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/projectimport/GeneralProjectImportOperation.java 2011-10-12 18:54:36 UTC (rev 35580)
@@ -23,8 +23,6 @@
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.Path;
import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.m2e.core.internal.jobs.IBackgroundProcessingQueue;
-import org.eclipse.m2e.core.project.configurator.ProjectConfigurationRequest;
import org.eclipse.osgi.util.NLS;
import org.eclipse.swt.widgets.Display;
import org.eclipse.ui.PlatformUI;
@@ -44,36 +42,22 @@
IWorkspace workspace = ResourcesPlugin.getWorkspace();
IProject project = workspace.getRoot().getProject(getProjectDirectory().getName());
- overwriteExistingProject(project, monitor);
+ overwriteExistingProject(project, workspace, monitor);
importToWorkspace(getProjectDirectory(), workspace, monitor);
return Collections.singletonList(project);
}
- private void importToWorkspace(File projectDirectory, IWorkspace workspace, IProgressMonitor monitor) throws CoreException {
+ private void importToWorkspace(File projectDirectory, IWorkspace workspace, IProgressMonitor monitor)
+ throws CoreException {
String projectName = projectDirectory.getName();
IProjectDescription description = workspace.newProjectDescription(projectName);
- description.setLocation(new Path(projectDirectory.toString()));
+ description.setLocation(Path.fromOSString(projectDirectory.getAbsolutePath()));
IProject project = workspace.getRoot().getProject(projectName);
project.create(description, monitor);
project.open(IResource.BACKGROUND_REFRESH, monitor);
- // project.create(monitor);
- // project.open(IResource.BACKGROUND_REFRESH, monitor);
- // ImportOperation operation =
- // new ImportOperation(
- // project.getFullPath()
- // , projectDirectory
- // , FileSystemStructureProvider.INSTANCE
- // , new IOverwriteQuery() {
- // public String queryOverwrite(String file) {
- // return IOverwriteQuery.ALL;
- // }
- // });
- // operation.setCreateContainerStructure(false);
- // operation.run(monitor);
-
}
- private void overwriteExistingProject(final IProject project, IProgressMonitor monitor)
+ private void overwriteExistingProject(final IProject project, IWorkspace workspace, IProgressMonitor monitor)
throws CoreException {
if (project == null
|| !project.exists()) {
13 years, 3 months
- 1
- 0
JBoss Tools SVN: r35579 - in trunk/cdi/plugins: org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/search and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2011-10-12 13:11:57 -0400 (Wed, 12 Oct 2011)
New Revision: 35579
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/util/BeanPresentationUtil.java
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/search/InjectionPointQueryParticipant.java
Log:
Updated CDI Query Participants in order to search in related projects and check search scope https://issues.jboss.org/browse/JBIDE-9801
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/util/BeanPresentationUtil.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/util/BeanPresentationUtil.java 2011-10-12 16:58:31 UTC (rev 35578)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/util/BeanPresentationUtil.java 2011-10-12 17:11:57 UTC (rev 35579)
@@ -13,15 +13,20 @@
import org.eclipse.core.runtime.IPath;
import org.jboss.tools.cdi.core.CDIConstants;
import org.jboss.tools.cdi.core.IBean;
-import org.jboss.tools.cdi.core.IBeanField;
import org.jboss.tools.cdi.core.IBeanMember;
-import org.jboss.tools.cdi.core.IBeanMethod;
import org.jboss.tools.cdi.core.ICDIElement;
-import org.jboss.tools.cdi.core.IInitializerMethod;
import org.jboss.tools.cdi.core.IInjectionPoint;
+import org.jboss.tools.cdi.core.IInjectionPointField;
+import org.jboss.tools.cdi.core.IInjectionPointParameter;
import org.jboss.tools.cdi.core.IParameter;
import org.jboss.tools.cdi.core.IProducer;
import org.jboss.tools.cdi.internal.core.impl.AbstractBeanElement;
+import org.jboss.tools.cdi.internal.core.impl.DisposerMethod;
+import org.jboss.tools.cdi.internal.core.impl.EventBean;
+import org.jboss.tools.cdi.internal.core.impl.InitializerMethod;
+import org.jboss.tools.cdi.internal.core.impl.ObserverMethod;
+import org.jboss.tools.cdi.internal.core.impl.ProducerField;
+import org.jboss.tools.cdi.internal.core.impl.ProducerMethod;
import org.jboss.tools.common.text.ITextSourceReference;
/**
@@ -53,14 +58,22 @@
if(bean instanceof IProducer) {
return "@Produces";
}
+ if(bean instanceof EventBean) {
+ return "Event";
+ }
return null;
}
public static String getBeanLocation(IBean bean, boolean includeElementName) {
StringBuilder sb = new StringBuilder();
sb.append(SEPARATOR);
- AbstractBeanElement e = (AbstractBeanElement)bean;
- ITextSourceReference origin = e.getDefinition().getOriginalDefinition();
+
+ ITextSourceReference origin = null;
+ if(bean instanceof AbstractBeanElement){
+ AbstractBeanElement e = (AbstractBeanElement)bean;
+ origin = e.getDefinition().getOriginalDefinition();
+ }
+
if(origin != null) {
//If toString() is not enough, another interface should be introduced.
sb.append(origin.toString());
@@ -86,14 +99,20 @@
public static String getCDIElementKind(ICDIElement element){
if(element instanceof IBean){
return getBeanKind((IBean)element);
- }else if(element instanceof IInjectionPoint){
- return "Injection Point";
- }else if(element instanceof IInitializerMethod){
- return "Injection Point";
- }else if(element instanceof IBeanMethod){
- return "Bean Method";
- }else if(element instanceof IBeanField){
- return "Bean Field";
+ }else if(element instanceof IInjectionPointField){
+ return "Injection Point Field";
+ }else if(element instanceof IInjectionPointParameter){
+ return "Injection Point Parameter";
+ }else if(element instanceof DisposerMethod){
+ return "Disposer Method";
+ }else if(element instanceof InitializerMethod){
+ return "Initializer Method";
+ }else if(element instanceof ObserverMethod){
+ return "Observer Method";
+ }else if(element instanceof ProducerMethod){
+ return "Producer Method";
+ }else if(element instanceof ProducerField){
+ return "Producer Field";
}else if(element instanceof IParameter){
return "Parameter";
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/search/InjectionPointQueryParticipant.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/search/InjectionPointQueryParticipant.java 2011-10-12 16:58:31 UTC (rev 35578)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/search/InjectionPointQueryParticipant.java 2011-10-12 17:11:57 UTC (rev 35579)
@@ -15,7 +15,6 @@
import java.util.Set;
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.IProgressMonitor;
@@ -110,38 +109,62 @@
}
}
}
- Set<IObserverMethod> observerMethods = cdiProject.resolveObserverMethods(injectionPoint);
- for(IObserverMethod observerMethod : observerMethods){
- if(containsInSearchScope(querySpecification, observerMethod)){
- // match observer method
- CDIMatch match = new CDIMatch(observerMethod);
- if(!objects.contains(match.getPath())){
- requestor.reportMatch(match);
- objects.add(match.getPath());
- }
- }
+ Set<CDICoreNature> natures = cdiProject.getNature().getCDIProjects(true);
+ for(CDICoreNature nature : natures){
+ resolveObserverMethods(nature.getDelegate(), injectionPoint, requestor, querySpecification);
}
+ CDICoreNature[] naturesArray = cdiProject.getNature().getAllDependentProjects();
+ for(CDICoreNature nature : naturesArray){
+ resolveObserverMethods(nature.getDelegate(), injectionPoint, requestor, querySpecification);
+ }
}
if(element instanceof IMethod){
IParameter param = findObserverParameter(beans, (IMethod)element);
if(param != null){
- Set<IInjectionPoint> events = cdiProject.findObservedEvents(param);
- for(IInjectionPoint event : events){
- if(containsInSearchScope(querySpecification, event)){
- // match event
- CDIMatch match = new CDIMatch(event);
- if(!objects.contains(match.getPath())){
- requestor.reportMatch(match);
- objects.add(match.getPath());
- }
- }
+ Set<CDICoreNature> natures = cdiProject.getNature().getCDIProjects(true);
+ for(CDICoreNature nature : natures){
+ findObservedEvents(nature.getDelegate(), param, requestor, querySpecification);
}
+ CDICoreNature[] naturesArray = cdiProject.getNature().getAllDependentProjects();
+ for(CDICoreNature nature : naturesArray){
+ findObservedEvents(nature.getDelegate(), param, requestor, querySpecification);
+ }
}
}
}
}
}
+ private void resolveObserverMethods(ICDIProject cdiProject, IInjectionPoint injectionPoint, ISearchRequestor requestor,
+ QuerySpecification querySpecification){
+ Set<IObserverMethod> observerMethods = cdiProject.resolveObserverMethods(injectionPoint);
+ for(IObserverMethod observerMethod : observerMethods){
+ if(containsInSearchScope(querySpecification, observerMethod)){
+ // match observer method
+ CDIMatch match = new CDIMatch(observerMethod);
+ if(!objects.contains(match.getPath())){
+ requestor.reportMatch(match);
+ objects.add(match.getPath());
+ }
+ }
+ }
+ }
+
+ private void findObservedEvents(ICDIProject cdiProject, IParameter param, ISearchRequestor requestor,
+ QuerySpecification querySpecification){
+ Set<IInjectionPoint> events = cdiProject.findObservedEvents(param);
+ for(IInjectionPoint event : events){
+ if(containsInSearchScope(querySpecification, event)){
+ // match event
+ CDIMatch match = new CDIMatch(event);
+ if(!objects.contains(match.getPath())){
+ requestor.reportMatch(match);
+ objects.add(match.getPath());
+ }
+ }
+ }
+ }
+
private IParameter findObserverParameter(Set<IBean> beans, IMethod method) throws JavaModelException {
for (IBean bean: beans) {
if(bean instanceof IClassBean) {
13 years, 3 months
- 1
- 0
JBoss Tools SVN: r35578 - in trunk: jsf/tests/org.jboss.tools.jsf.text.ext.test/projects/jsfHyperlinkTests/WebContent/JBIDE-5385 and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: vrubezhny
Date: 2011-10-12 12:58:31 -0400 (Wed, 12 Oct 2011)
New Revision: 35578
Added:
trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/projects/jsfHyperlinkTests/WebContent/JBIDE-5385/
trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/projects/jsfHyperlinkTests/WebContent/JBIDE-5385/jbide5385.xhtml
trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/projects/jsfHyperlinkTests/WebContent/JBIDE-5385/main.css
trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/src/org/jboss/tools/jsf/text/ext/test/JSPStylesheetRelLinkHyperlinkTest.java
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/src/org/jboss/tools/jsf/text/ext/test/JsfTextExtAllTests.java
trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/jst/text/ext/hyperlink/jsp/JSPLinkHyperlinkPartitioner.java
trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/jst/text/ext/hyperlink/jsp/JSPStylesheetRelLinkHyperlinkPartitioner.java
Log:
JBIDE-5385 Incorrect openOn region for tag link when href attribute have el expression
Issue is fixed. JUnit Test is added.
Added: trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/projects/jsfHyperlinkTests/WebContent/JBIDE-5385/jbide5385.xhtml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/projects/jsfHyperlinkTests/WebContent/JBIDE-5385/jbide5385.xhtml (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/projects/jsfHyperlinkTests/WebContent/JBIDE-5385/jbide5385.xhtml 2011-10-12 16:58:31 UTC (rev 35578)
@@ -0,0 +1,276 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<ui:composition xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:rich="http://richfaces.org/rich"
+ xmlns:a4j="http://richfaces.org/a4j">
+<f:loadBundle var="msg" basename="dataTable.columns.messages"/>
+<f:loadBundle var="message" basename="extendedDataTable.messages"/>
+
+<link rel="stylesheet" href="${facesContext.externalContext.requestContextPath}/JBIDE-5385/main.css"
+type="text/css"/>
+ <a4j:form>
+ <rich:panel style="width : 1087px; height : 4012px;" styleClass="btn">
+ <f:facet name="header">
+ <h:outputText value="Main Table"/>
+ </f:facet>
+ <f:facet name="footer">
+ <h:outputText value="End of components" />
+ </f:facet>
+ <table>
+ <tr>
+ <td width="30%">Component</td>
+ <td align="center" style="background-color: black; font: bold; color: white;">Problems</td>
+ </tr>
+ <tr>
+ <td>
+ <rich:panel>
+ <f:facet name="header">
+ <h:outputText value="Tooltip" />
+ </f:facet>
+ <h:panelGrid columns="2">
+ <rich:panel id="sample1" styleClass="tooltip-text" bodyClass="rich-laguna-panel-no-header">
+ <p>
+ Here you can see <b>default client-side</b> tool-tip
+ </p>
+ <rich:toolTip>
+ <span style="white-space:nowrap">
+ This tool-tip content was <strong>pre-rendered</strong> to the page.<br/>
+ The look of this tool-tip is 100% defined by skin.
+ </span>
+ </rich:toolTip>
+ </rich:panel>
+ <rich:panel id="sample2" styleClass="tooltip-text" bodyClass="rich-laguna-panel-no-header">
+ <p>
+ This tool-tip will <b>follow mouse</b>. Also this tool-tip has a <b>delay 0.5 sec</b>,
+ so be patient!
+ </p>
+ <rich:toolTip followMouse="true" direction="top-right" showDelay="500" styleClass="tooltip">
+ <span style="white-space:nowrap">
+ This tool-tip content also <strong>pre-rendered</strong> to the page.<br/>
+ However, the look of this tool-tip is customized<br/>
+ by styleClass attribute.
+ </span>
+ </rich:toolTip>
+ </rich:panel>
+ <h:form>
+ <rich:panel id="sample3" styleClass="tooltip-text" bodyClass="rich-laguna-panel-no-header">
+ <p>
+ This tool-tip rendered on server <b>in separate request</b>.
+ </p>
+ <rich:toolTip direction="top-right" mode="ajax" styleClass="tooltip" layout="block">
+ <f:facet name="defaultContent">
+ <strong>Wait...</strong>
+ </f:facet>
+ <span style="white-space:nowrap">This tool-tip content was <strong>rendered on server</strong>
+ </span>
+ <h:panelGrid columns="2">
+ <h:outputText style="white-space:nowrap" value="tooltips requested:" />
+ <h:outputText value="#{toolTipData.tooltipCounter}" styleClass="tooltipData" />
+ </h:panelGrid>
+ </rich:toolTip>
+ </rich:panel>
+ </h:form>
+ <h:form>
+ <rich:panel id="sample4" styleClass="tooltip-text" bodyClass="rich-laguna-panel-no-header">
+ <p>
+ This tool-tip will be <b>activated on mouse click</b>. It also has a <b>bottom-left</b> position.
+ </p>
+ <rich:toolTip showEvent="onclick" direction="bottom-left" mode="ajax" styleClass="tooltip" layout="block">
+ <f:facet name="defaultContent">
+ <strong>Wait...</strong>
+ </f:facet>
+ <span style="white-space:nowrap">This tool-tip content was <strong>rendered on server</strong><br/></span>
+ <h:panelGrid columns="2">
+ <h:outputText style="white-space:nowrap" value="tooltips requested:" />
+ <h:outputText value="#{toolTipData.tooltipCounter}" styleClass="tooltipData" />
+ </h:panelGrid>
+ </rich:toolTip>
+ </rich:panel>
+ </h:form>
+ </h:panelGrid>
+ </rich:panel>
+ </td>
+ <td>
+ <ul>
+ <li>
+ There no problems
+ </li>
+ </ul>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <rich:panel>
+ <f:facet name="header">
+ <h:outputText value="Tool Bar & Tool Bar Group" />
+ </f:facet>
+ <rich:toolBar contentClass="btn" height="26" itemSeparator="line" separatorClass="btn" styleClass="btn">
+ <rich:toolBarGroup style="font-style:italic;background-color:Cornsilk;text-decoration:overline;font-family:Arial Narrow;font-weight:bolder;" width="500">
+ <h:graphicImage value="images/icons/create_doc.gif" styleClass="pic"/>
+ <h:graphicImage value="images/icons/create_folder.gif" styleClass="pic"/>
+ <h:graphicImage value="images/icons/copy.gif" styleClass="pic"/>
+ </rich:toolBarGroup>
+ <rich:toolBarGroup location="right">
+ <h:graphicImage value="images/icons/save.gif" styleClass="pic"/>
+ <h:graphicImage value="images/icons/save_as.gif" styleClass="pic"/>
+ <h:graphicImage value="images/icons/save_all.gif" styleClass="pic"/>
+ </rich:toolBarGroup>
+ <rich:toolBarGroup location="right">
+ <h:graphicImage value="images/icons/find.gif" styleClass="pic"/>
+ <h:graphicImage value="images/icons/filter.gif" styleClass="pic"/>
+ </rich:toolBarGroup>
+ </rich:toolBar>
+ <h:form>
+ <rich:toolBar height="34" contentStyle="color:PaleVioletRed;font-size:medium;font-style:italic;background-color:FloralWhite;font-family:Arial TUR;font-weight:bolder;"
+ itemSeparator="line" styleClass="evenRow" separatorClass="btn">
+ <rich:toolBarGroup itemSeparator="grid">
+ <h:graphicImage id="edit" value="images/icons/edit.gif" />
+ <h:outputLabel value="Edit" for="edit" />
+ </rich:toolBarGroup>
+ <rich:toolBarGroup>
+ <h:graphicImage id="find" value="images/icons/find.gif" />
+ <h:outputLabel value="Find" for="find" />
+ </rich:toolBarGroup>
+ <rich:toolBarGroup>
+ <h:graphicImage id="filter" value="images/icons/filter.gif" />
+ <h:outputLabel value="Filter" for="filter" />
+ </rich:toolBarGroup>
+ <rich:toolBarGroup location="right">
+ <h:inputText styleClass="barsearch" />
+ <h:commandButton styleClass="barsearchbutton" onclick="return false;" value="Search" />
+ </rich:toolBarGroup>
+ </rich:toolBar>
+ </h:form>
+ <h:form>
+ <h:panelGrid columns="3" width="100%" cellpadding="0" cellspacing="0" style="margin-bottom : 4px">
+ <rich:panel bodyClass="rich-laguna-panel-no-header">
+ <h:panelGrid columns="8">
+ <h:outputText value="Group Separator:" />
+ <a4j:commandLink value="Line" reRender="bar">
+ <a4j:actionparam name="gs" value="line" assignTo="#{tbBean.groupSeparator}" />
+ </a4j:commandLink>
+
+ <a4j:commandLink value="Grid" reRender="bar">
+ <a4j:actionparam name="gs" value="grid" assignTo="#{tbBean.groupSeparator}" />
+ </a4j:commandLink>
+
+ <a4j:commandLink value="Disc" reRender="bar">
+ <a4j:actionparam name="gs" value="disc" assignTo="#{tbBean.groupSeparator}" />
+ </a4j:commandLink>
+
+ <a4j:commandLink value="Square" reRender="bar">
+ <a4j:actionparam name="gs" value="square" assignTo="#{tbBean.groupSeparator}" />
+ </a4j:commandLink>
+
+ <a4j:commandLink value="None" reRender="bar">
+ <a4j:actionparam name="gs" value="none" assignTo="#{tbBean.groupSeparator}" />
+ </a4j:commandLink>
+ </h:panelGrid>
+ </rich:panel>
+ <h:panelGroup style="padding-left : 4px">
+ <br/>
+ </h:panelGroup>
+ <rich:panel bodyClass="rich-laguna-panel-no-header">
+ <h:panelGrid columns="8">
+ <h:outputText value="Group Item Separator:" />
+ <a4j:commandLink value="Line" reRender="bar">
+ <a4j:actionparam name="gs" value="line" assignTo="#{tbBean.groupItemSeparator}" />
+ </a4j:commandLink>
+
+ <a4j:commandLink value="Grid" reRender="bar">
+ <a4j:actionparam name="gs" value="grid" assignTo="#{tbBean.groupItemSeparator}" />
+ </a4j:commandLink>
+
+ <a4j:commandLink value="Disc" reRender="bar">
+ <a4j:actionparam name="gs" value="disc" assignTo="#{tbBean.groupItemSeparator}" />
+ </a4j:commandLink>
+
+ <a4j:commandLink value="Square" reRender="bar">
+ <a4j:actionparam name="gs" value="square" assignTo="#{tbBean.groupItemSeparator}" />
+ </a4j:commandLink>
+
+ <a4j:commandLink value="None" reRender="bar">
+ <a4j:actionparam name="gs" value="none" assignTo="#{tbBean.groupItemSeparator}" />
+ </a4j:commandLink>
+ </h:panelGrid>
+ </rich:panel>
+ </h:panelGrid>
+ </h:form>
+
+ <rich:toolBar contentClass="btn" contentStyle="color:PaleVioletRed;font-size:medium;font-style:italic;background-color:FloralWhite;font-family:Arial TUR;font-weight:bolder;" id="bar" height="30" itemSeparator="#{tbBean.groupSeparator}" style="color:Cornsilk;font-style:italic;background-color:Orchid;text-decoration:underline;font-family:Arial Narrow,Bodoni MT;font-weight:bold;">
+ <rich:toolBarGroup itemSeparator="#{tbBean.groupItemSeparator}">
+ <h:outputText value="Group1.1"></h:outputText>
+ <h:outputText value="Group1.2"></h:outputText>
+ <h:outputText value="Group1.3"></h:outputText>
+ </rich:toolBarGroup>
+ <rich:toolBarGroup itemSeparator="#{tbBean.groupItemSeparator}">
+ <h:outputText value="Group2.1"></h:outputText>
+ <h:outputText value="Group2.2"></h:outputText>
+ </rich:toolBarGroup>
+ <rich:toolBarGroup location="right" itemSeparator="#{tbBean.groupItemSeparator}">
+ <h:outputText value="Group3.1"></h:outputText>
+ <h:outputText value="Group3.2"></h:outputText>
+ </rich:toolBarGroup>
+ </rich:toolBar>
+ </rich:panel>
+ </td>
+ <td>
+ <ul>
+ <li>
+ There no problems
+ </li>
+ </ul>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <rich:panel>
+ <f:facet name="header">
+ <h:outputText value="Tooltip" />
+ </f:facet>
+ <rich:togglePanel id="panel" initialState="panelB" switchType="client"
+
+ stateOrder="panelA,panelB,panelC">
+
+ <f:facet name="panelA">
+
+ ...
+
+ </f:facet>
+
+ <f:facet name="panelB">
+
+ ...
+
+ </f:facet>
+
+ <f:facet name="panelC">
+
+ ...
+
+ </f:facet>
+
+ </rich:togglePanel>
+
+ <rich:toggleControl for="panel" value="Switch" style=""/>
+ </rich:panel>
+ </td>
+ <td>
+ <ul>
+ <li>
+ There no problems
+ </li>
+ </ul>
+ </td>
+ </tr>
+ </table>
+ </rich:panel>
+ <rich:panel style="text-align:center">
+ <h:outputLink value="${facesContext.externalContext.requestContextPath}/pages/allComponents3.jsf">
+ <f:verbatim>PREVIUOS PAGE</f:verbatim>
+ </h:outputLink>
+ </rich:panel>
+ </a4j:form>
+</ui:composition>
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/projects/jsfHyperlinkTests/WebContent/JBIDE-5385/jbide5385.xhtml
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/projects/jsfHyperlinkTests/WebContent/JBIDE-5385/main.css
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/projects/jsfHyperlinkTests/WebContent/JBIDE-5385/main.css (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/projects/jsfHyperlinkTests/WebContent/JBIDE-5385/main.css 2011-10-12 16:58:31 UTC (rev 35578)
@@ -0,0 +1,40 @@
+.evenRow {
+ text-align: center;
+ background-color: green;
+ font-style: italic;
+
+}
+
+.oddRow{
+ text-align: right;
+ background-color: blue;
+ font-style: oblique;
+
+}
+
+.btn {
+ text-align: center;
+ color: DodgerBlue;
+ font-size: x-large;
+ font-style: italic;
+ background-color: Turquoise;
+ border-style: ridge;
+ border-color: DarkViolet;
+ text-decoration: overline;
+ font-weight: bolder;
+ border-width: thick;
+}
+
+
+.btn {
+
+}
+
+.vpe-text {
+ color:red;
+}
+
+#editor {
+ background-color: red;
+
+}
\ No newline at end of file
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/projects/jsfHyperlinkTests/WebContent/JBIDE-5385/main.css
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/src/org/jboss/tools/jsf/text/ext/test/JSPStylesheetRelLinkHyperlinkTest.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/src/org/jboss/tools/jsf/text/ext/test/JSPStylesheetRelLinkHyperlinkTest.java (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/src/org/jboss/tools/jsf/text/ext/test/JSPStylesheetRelLinkHyperlinkTest.java 2011-10-12 16:58:31 UTC (rev 35578)
@@ -0,0 +1,97 @@
+/*******************************************************************************
+ * Copyright (c) 2011 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is 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:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.jsf.text.ext.test;
+
+import junit.framework.TestCase;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.jface.text.BadLocationException;
+import org.eclipse.jface.text.FindReplaceDocumentAdapter;
+import org.eclipse.jface.text.IDocument;
+import org.eclipse.jface.text.IRegion;
+import org.eclipse.jface.text.hyperlink.IHyperlink;
+import org.eclipse.jface.text.source.ISourceViewer;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.PartInitException;
+import org.eclipse.ui.PlatformUI;
+import org.jboss.tools.common.text.ext.hyperlink.HyperlinkDetector;
+import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor;
+import org.jboss.tools.test.util.WorkbenchUtils;
+
+/**
+ * The JUnit test cases for JBIDE-5385 issue
+ *
+ * @author Victor Rubezhny
+ */
+public class JSPStylesheetRelLinkHyperlinkTest extends TestCase {
+ private static final String PROJECT_NAME = "jsfHyperlinkTests";
+ private static final String PAGE_NAME = PROJECT_NAME+"/WebContent/JBIDE-5385/jbide5385.xhtml";
+
+ public IProject project = null;
+ public String naturesCheckProperty;
+
+ protected void setUp() {
+ naturesCheckProperty = System.getProperty("org.jboss.tools.vpe.ENABLE_PROJECT_NATURES_CHECKER"); //$NON-NLS-1$ //$NON-NLS-2$
+ System.setProperty("org.jboss.tools.vpe.ENABLE_PROJECT_NATURES_CHECKER", "false"); //$NON-NLS-1$ //$NON-NLS-2$
+ project = ResourcesPlugin.getWorkspace().getRoot().getProject(
+ PROJECT_NAME);
+ PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().closeAllEditors(false);
+ }
+
+ protected void tearDown() {
+ PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().closeAllEditors(false);
+ System.setProperty("org.jboss.tools.vpe.ENABLE_PROJECT_NATURES_CHECKER", naturesCheckProperty == null ? "null" : naturesCheckProperty); //$NON-NLS-1$
+ }
+
+ public JSPStylesheetRelLinkHyperlinkTest() {
+ super("JSF OpenOn on CSS Stylesheet Rel Link test");
+ }
+
+ public void testJSF2CSSStylesheetOpenOn() throws PartInitException, BadLocationException {
+ final String editorName = "main.css";
+ final String tagName = "link";
+ final String valueToFind = "main.css";
+ IEditorPart editor = WorkbenchUtils.openEditor(PAGE_NAME);
+ assertTrue(editor instanceof JSPMultiPageEditor);
+ JSPMultiPageEditor jspMultyPageEditor = (JSPMultiPageEditor) editor;
+ ISourceViewer viewer = jspMultyPageEditor.getSourceEditor().getTextViewer();
+
+ IDocument document = viewer.getDocument();
+ IRegion reg = new FindReplaceDocumentAdapter(document).find(0,
+ tagName, true, true, false, false);
+ assertNotNull("Tag:"+tagName+" not found",reg);
+
+ reg = new FindReplaceDocumentAdapter(document).find(reg.getOffset(),
+ valueToFind, true, true, false, false);
+ assertNotNull("Value to find:"+valueToFind+" not found",reg);
+
+ IHyperlink[] links = HyperlinkDetector.getInstance().detectHyperlinks(viewer, reg, true);
+
+ assertNotNull("Hyperlinks for value:"+valueToFind+" are not found",links);
+
+ assertTrue("Hyperlinks for value:"+valueToFind+" are not found",links.length!=0);
+
+ boolean found = false;
+ for(IHyperlink link : links){
+ assertNotNull(link.toString());
+
+ link.open();
+
+ IEditorPart resultEditor = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor();
+ if(editorName.equals(resultEditor.getTitle())){
+ found = true;
+ return;
+ }
+ }
+ assertTrue("OpenOn have not opened "+editorName+" editor",found);
+ }
+}
\ No newline at end of file
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/src/org/jboss/tools/jsf/text/ext/test/JSPStylesheetRelLinkHyperlinkTest.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/src/org/jboss/tools/jsf/text/ext/test/JsfTextExtAllTests.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/src/org/jboss/tools/jsf/text/ext/test/JsfTextExtAllTests.java 2011-10-12 16:30:00 UTC (rev 35577)
+++ trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/src/org/jboss/tools/jsf/text/ext/test/JsfTextExtAllTests.java 2011-10-12 16:58:31 UTC (rev 35578)
@@ -19,20 +19,28 @@
public static Test suite() {
TestSuite suite = new TestSuite(JsfTextExtAllTests.class.getName());
+
suite.addTest(new ProjectImportTestSetup(new TestSuite(OpenOnsTest.class),
"org.jboss.tools.jsf.text.ext.test",
new String[]{"projects/HiperlinksTestProject"},
new String[]{"HiperlinksTestProject"}));
suite.addTest(new ProjectImportTestSetup(new TestSuite(
- JSF2CompositeOpenOnTest.class,
- JSF2CompositeLibOpenOnTest.class,
- JSF2MessagesOpenOnTest.class,
- JSF2CSSStylesheetOpenOnTest.class,
- JSF2CCAttrsOpenOnTest.class,
- JSF2XMLOpenOnTest.class),
- "org.jboss.tools.jsf.text.ext.test",
- new String[]{"projects/JSF2CompositeOpenOn"},
- new String[]{"JSF2CompositeOpenOn"}));
+ JSF2CompositeOpenOnTest.class,
+ JSF2CompositeLibOpenOnTest.class,
+ JSF2MessagesOpenOnTest.class,
+ JSF2CSSStylesheetOpenOnTest.class,
+ JSF2CCAttrsOpenOnTest.class,
+ JSF2XMLOpenOnTest.class),
+ "org.jboss.tools.jsf.text.ext.test",
+ new String[]{"projects/JSF2CompositeOpenOn"},
+ new String[]{"JSF2CompositeOpenOn"}));
+
+ suite.addTest(new ProjectImportTestSetup(new TestSuite(
+ JSPStylesheetRelLinkHyperlinkTest.class),
+ "org.jboss.tools.jsf.text.ext.test",
+ new String[]{"projects/jsfHyperlinkTests"},
+ new String[]{"jsfHyperlinkTests"}));
+
return suite;
}
}
\ No newline at end of file
Modified: trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/jst/text/ext/hyperlink/jsp/JSPLinkHyperlinkPartitioner.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/jst/text/ext/hyperlink/jsp/JSPLinkHyperlinkPartitioner.java 2011-10-12 16:30:00 UTC (rev 35577)
+++ trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/jst/text/ext/hyperlink/jsp/JSPLinkHyperlinkPartitioner.java 2011-10-12 16:58:31 UTC (rev 35578)
@@ -1,26 +1,26 @@
/*******************************************************************************
- * Copyright (c) 2007 Exadel, Inc. and Red Hat, Inc.
+ * Copyright (c) 2007-2011 Red Hat, Inc.
* Distributed under license by Red Hat, Inc. All rights reserved.
* This program is 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:
- * Exadel, Inc. and Red Hat, Inc. - initial API and implementation
+ * Red Hat, Inc. - initial API and implementation
******************************************************************************/
package org.jboss.tools.jst.text.ext.hyperlink.jsp;
import org.eclipse.jface.text.IDocument;
-
+import org.jboss.tools.common.text.ext.hyperlink.IExclusiblePartitionerRecognition;
import org.jboss.tools.common.text.ext.hyperlink.IHyperlinkRegion;
import org.jboss.tools.common.text.ext.hyperlink.xml.XMLLinkHyperlinkPartitioner;
/**
* @author Jeremy
*/
-public class JSPLinkHyperlinkPartitioner extends XMLLinkHyperlinkPartitioner {
+public class JSPLinkHyperlinkPartitioner extends XMLLinkHyperlinkPartitioner implements IExclusiblePartitionerRecognition {
public static final String JSP_LINK_PARTITION = "org.jboss.tools.common.text.ext.jsp.JSP_LINK"; //$NON-NLS-1$
-
+
/* (non-Javadoc)
* @see org.jboss.tools.common.text.ext.hyperlink.XMLLinkHyperlinkPartitioner#getPartitionType()
*/
@@ -41,4 +41,13 @@
}
return superRegion.getAxis();
}
+
+ public String getExclusionPartitionType() {
+ return JSPStylesheetRelLinkHyperlinkPartitioner.JSP_STYLESHEET_REL_LINK_PARTITION;
+ }
+
+ public boolean excludes(String partitionType, IDocument document,
+ IHyperlinkRegion superRegion) {
+ return false;
+ }
}
Modified: trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/jst/text/ext/hyperlink/jsp/JSPStylesheetRelLinkHyperlinkPartitioner.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/jst/text/ext/hyperlink/jsp/JSPStylesheetRelLinkHyperlinkPartitioner.java 2011-10-12 16:30:00 UTC (rev 35577)
+++ trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/jst/text/ext/hyperlink/jsp/JSPStylesheetRelLinkHyperlinkPartitioner.java 2011-10-12 16:58:31 UTC (rev 35578)
@@ -1,12 +1,12 @@
/*******************************************************************************
- * Copyright (c) 2007 Exadel, Inc. and Red Hat, Inc.
+ * Copyright (c) 2007-2011 Red Hat, Inc.
* Distributed under license by Red Hat, Inc. All rights reserved.
* This program is 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:
- * Exadel, Inc. and Red Hat, Inc. - initial API and implementation
+ * Red Hat, Inc. - initial API and implementation
******************************************************************************/
package org.jboss.tools.jst.text.ext.hyperlink.jsp;
@@ -14,23 +14,23 @@
import org.eclipse.jface.text.IDocument;
import org.eclipse.jface.text.IRegion;
import org.eclipse.jface.text.Region;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.Text;
-
import org.jboss.tools.common.text.ext.hyperlink.AbstractHyperlinkPartitioner;
import org.jboss.tools.common.text.ext.hyperlink.HyperlinkRegion;
+import org.jboss.tools.common.text.ext.hyperlink.IExclusiblePartitionerRecognition;
import org.jboss.tools.common.text.ext.hyperlink.IHyperlinkPartitionRecognizer;
import org.jboss.tools.common.text.ext.hyperlink.IHyperlinkRegion;
import org.jboss.tools.common.text.ext.util.StructuredModelWrapper;
import org.jboss.tools.common.text.ext.util.Utils;
+import org.w3c.dom.Attr;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.Text;
/**
* @author Jeremy
*/
-public class JSPStylesheetRelLinkHyperlinkPartitioner extends AbstractHyperlinkPartitioner implements IHyperlinkPartitionRecognizer {
+public class JSPStylesheetRelLinkHyperlinkPartitioner extends AbstractHyperlinkPartitioner implements IHyperlinkPartitionRecognizer, IExclusiblePartitionerRecognition {
public static final String JSP_STYLESHEET_REL_LINK_PARTITION = "org.jboss.tools.common.text.ext.jsp.JSP_STYLESHEET_REL_LINK"; //$NON-NLS-1$
private static final String LINK_TAGNAME = "link"; //$NON-NLS-1$
@@ -234,4 +234,13 @@
}
}
+ public String getExclusionPartitionType() {
+ return null;
+ }
+
+ public boolean excludes(String partitionType, IDocument document,
+ IHyperlinkRegion superRegion) {
+ return (JSP_STYLESHEET_REL_LINK_PARTITION.equals(partitionType) && recognize(document, superRegion));
+ }
+
}
13 years, 3 months
- 1
- 0
JBoss Tools SVN: r35577 - trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-10-12 12:30:00 -0400 (Wed, 12 Oct 2011)
New Revision: 35577
Modified:
trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationWizardModel.java
Log:
[JBIDE-9793] fixed bug: auth error when cloning remote repo (due to Egit UI plugin not started yet and the ssh session not initialized yet. )
Modified: trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationWizardModel.java
===================================================================
--- trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationWizardModel.java 2011-10-12 15:30:01 UTC (rev 35576)
+++ trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationWizardModel.java 2011-10-12 16:30:00 UTC (rev 35577)
@@ -56,15 +56,15 @@
private static final String USER = "user";
private static final String APPLICATION = "application";
-
+
public void setProperty(String key, Object value) {
dataModel.put(key, value);
}
-
+
public Object getProperty(String key) {
return dataModel.get(key);
}
-
+
public void setUser(IUser user) {
dataModel.put(USER, user);
}
@@ -74,14 +74,15 @@
}
public IApplication getApplication() {
- return (IApplication)dataModel.get(APPLICATION);
+ return (IApplication) dataModel.get(APPLICATION);
}
public void setApplication(IApplication application) {
dataModel.put(APPLICATION, application);
}
- public void importProject(File projectFolder, IProgressMonitor monitor) throws OpenshiftException, CoreException, InterruptedException {
+ public void importProject(File projectFolder, IProgressMonitor monitor) throws OpenshiftException, CoreException,
+ InterruptedException {
MavenProjectImportOperation mavenImport = new MavenProjectImportOperation(projectFolder);
List<IProject> importedProjects = Collections.emptyList();
if (mavenImport.isMavenProject()) {
@@ -120,6 +121,7 @@
if (destination.exists()) {
FileUtil.completeDelete(destination);
}
+ ensureEgitUIIsStarted();
URIish gitUri = new URIish(uri);
CloneOperation cloneOperation =
new CloneOperation(gitUri, true, null, destination, Constants.HEAD, "origin", 10 * 1024);
@@ -128,8 +130,25 @@
Activator.getDefault().getRepositoryUtil().addConfiguredRepository(gitDirectory);
}
+ /**
+ * The Egit UI {@link Activator#start} initializes the SshSessionFactory
+ * with the EclipseSshSessionFactory. The EclipseSshSessionFactory overrides
+ * JschConfigSessionFactory#configure to present a UserInfoPrompter if the
+ * key passphrase was give entered before. Without this initialization, the
+ * ssh connection would simply fail with a TransportException (Auth
+ * failure). We therefore have to make sure that the EGit UI plugin is
+ * started and initializes the JschConfigSessionFactory.
+ *
+ * @see Activator#start(org.osgi.framework.BundleContext)
+ * @see Activator#setupSSH
+ * @see EclipseSshSessionFactory#configure
+ */
+ private void ensureEgitUIIsStarted() {
+ Activator.getDefault();
+ }
+
private File getDestinationDirectory(IApplication application) {
- String applicationDirectory = "openshift-" + application.getName();
+ String applicationDirectory = application.getName();
// File workspace =
// ResourcesPlugin.getWorkspace().getRoot().getLocation().toFile();
String userHome = System.getProperty("java.io.tmpdir");
@@ -163,5 +182,4 @@
return repositoryFile;
}
-
}
13 years, 3 months
- 1
- 0
JBoss Tools SVN: r35576 - in trunk: as and 41 other directories.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-10-12 11:30:01 -0400 (Wed, 12 Oct 2011)
New Revision: 35576
Modified:
trunk/archives/pom.xml
trunk/as/pom.xml
trunk/birt/pom.xml
trunk/bpel/pom.xml
trunk/bpmn/pom.xml
trunk/build/aggregate/bottests-site/pom.xml
trunk/build/aggregate/pom.xml
trunk/build/aggregate/site/pom.xml
trunk/build/aggregate/soa-site/pom.xml
trunk/build/aggregate/webtools-site/pom.xml
trunk/cdi/pom.xml
trunk/central/pom.xml
trunk/common/pom.xml
trunk/deltacloud/pom.xml
trunk/drools/pom.xml
trunk/drools/site/pom.xml
trunk/esb/pom.xml
trunk/examples/pom.xml
trunk/flow/pom.xml
trunk/forge/pom.xml
trunk/freemarker/pom.xml
trunk/gwt/pom.xml
trunk/hibernatetools/pom.xml
trunk/jbpm/pom.xml
trunk/jmx/pom.xml
trunk/jsf/pom.xml
trunk/jst/pom.xml
trunk/maven/pom.xml
trunk/modeshape/pom.xml
trunk/portlet/pom.xml
trunk/profiler/pom.xml
trunk/runtime/pom.xml
trunk/seam/pom.xml
trunk/site/pom.xml
trunk/smooks/pom.xml
trunk/struts/pom.xml
trunk/tests/pom.xml
trunk/usage/pom.xml
trunk/vpe/pom.xml
trunk/workingset/pom.xml
trunk/ws/pom.xml
trunk/ws/site/pom.xml
trunk/xulrunner/pom.xml
Log:
JBIDE-9140 upversion parent pom references to 0.0.3
Modified: trunk/archives/pom.xml
===================================================================
--- trunk/archives/pom.xml 2011-10-12 15:29:19 UTC (rev 35575)
+++ trunk/archives/pom.xml 2011-10-12 15:30:01 UTC (rev 35576)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.jboss.tools</groupId>
<artifactId>org.jboss.tools.parent.pom</artifactId>
- <version>0.0.2-SNAPSHOT</version>
+ <version>0.0.3-SNAPSHOT</version>
<relativePath>../build/parent/pom.xml</relativePath>
</parent>
<groupId>org.jboss.tools</groupId>
Modified: trunk/as/pom.xml
===================================================================
--- trunk/as/pom.xml 2011-10-12 15:29:19 UTC (rev 35575)
+++ trunk/as/pom.xml 2011-10-12 15:30:01 UTC (rev 35576)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.jboss.tools</groupId>
<artifactId>org.jboss.tools.parent.pom</artifactId>
- <version>0.0.2-SNAPSHOT</version>
+ <version>0.0.3-SNAPSHOT</version>
<relativePath>../build/parent/pom.xml</relativePath>
</parent>
<groupId>org.jboss.tools</groupId>
Modified: trunk/birt/pom.xml
===================================================================
--- trunk/birt/pom.xml 2011-10-12 15:29:19 UTC (rev 35575)
+++ trunk/birt/pom.xml 2011-10-12 15:30:01 UTC (rev 35576)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.jboss.tools</groupId>
<artifactId>org.jboss.tools.parent.pom</artifactId>
- <version>0.0.2-SNAPSHOT</version>
+ <version>0.0.3-SNAPSHOT</version>
<relativePath>../build/parent/pom.xml</relativePath>
</parent>
<groupId>org.jboss.tools</groupId>
Modified: trunk/bpel/pom.xml
===================================================================
--- trunk/bpel/pom.xml 2011-10-12 15:29:19 UTC (rev 35575)
+++ trunk/bpel/pom.xml 2011-10-12 15:30:01 UTC (rev 35576)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.jboss.tools</groupId>
<artifactId>org.jboss.tools.parent.pom</artifactId>
- <version>0.0.2-SNAPSHOT</version>
+ <version>0.0.3-SNAPSHOT</version>
<relativePath>../build/parent/pom.xml</relativePath>
</parent>
<groupId>org.jboss.tools</groupId>
Modified: trunk/bpmn/pom.xml
===================================================================
--- trunk/bpmn/pom.xml 2011-10-12 15:29:19 UTC (rev 35575)
+++ trunk/bpmn/pom.xml 2011-10-12 15:30:01 UTC (rev 35576)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.jboss.tools</groupId>
<artifactId>org.jboss.tools.parent.pom</artifactId>
- <version>0.0.2-SNAPSHOT</version>
+ <version>0.0.3-SNAPSHOT</version>
<relativePath>../build/parent/pom.xml</relativePath>
</parent>
<groupId>org.jboss.tools</groupId>
Modified: trunk/build/aggregate/bottests-site/pom.xml
===================================================================
--- trunk/build/aggregate/bottests-site/pom.xml 2011-10-12 15:29:19 UTC (rev 35575)
+++ trunk/build/aggregate/bottests-site/pom.xml 2011-10-12 15:30:01 UTC (rev 35576)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.jboss.tools</groupId>
<artifactId>org.jboss.tools.parent.pom</artifactId>
- <version>0.0.2-SNAPSHOT</version>
+ <version>0.0.3-SNAPSHOT</version>
<relativePath>../build/parent/pom.xml</relativePath>
</parent>
<groupId>org.jboss.tools</groupId>
Modified: trunk/build/aggregate/pom.xml
===================================================================
--- trunk/build/aggregate/pom.xml 2011-10-12 15:29:19 UTC (rev 35575)
+++ trunk/build/aggregate/pom.xml 2011-10-12 15:30:01 UTC (rev 35576)
@@ -1,18 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
-<parent>
+ <parent>
+ <groupId>org.jboss.tools</groupId>
+ <artifactId>org.jboss.tools.parent.pom</artifactId>
+ <version>0.0.3-SNAPSHOT</version>
+ </parent>
<groupId>org.jboss.tools</groupId>
- <artifactId>org.jboss.tools.parent.pom</artifactId>
- <version>0.0.2-SNAPSHOT</version>
-</parent>
-<groupId>org.jboss.tools</groupId>
-<artifactId>org.jboss.tools.aggregate.site</artifactId>
-<name>JBoss Tools Aggregate Site Build</name>
-<version>0.0.1-SNAPSHOT</version>
-<packaging>pom</packaging>
-<modules>
- <module>../target-platform</module>
- <module>site</module>
-</modules>
-</project>
\ No newline at end of file
+ <artifactId>org.jboss.tools.aggregate.site</artifactId>
+ <name>JBoss Tools Aggregate Site Build</name>
+ <version>0.0.1-SNAPSHOT</version>
+ <packaging>pom</packaging>
+ <modules>
+ <module>../target-platform</module>
+ <module>site</module>
+ </modules>
+</project>
Modified: trunk/build/aggregate/site/pom.xml
===================================================================
--- trunk/build/aggregate/site/pom.xml 2011-10-12 15:29:19 UTC (rev 35575)
+++ trunk/build/aggregate/site/pom.xml 2011-10-12 15:30:01 UTC (rev 35576)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.jboss.tools</groupId>
<artifactId>org.jboss.tools.parent.pom</artifactId>
- <version>0.0.2-SNAPSHOT</version>
+ <version>0.0.3-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools</groupId>
<artifactId>org.jboss.tools.site.aggregate</artifactId>
Modified: trunk/build/aggregate/soa-site/pom.xml
===================================================================
--- trunk/build/aggregate/soa-site/pom.xml 2011-10-12 15:29:19 UTC (rev 35575)
+++ trunk/build/aggregate/soa-site/pom.xml 2011-10-12 15:30:01 UTC (rev 35576)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.jboss.tools</groupId>
<artifactId>org.jboss.tools.parent.pom</artifactId>
- <version>0.0.2-SNAPSHOT</version>
+ <version>0.0.3-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools</groupId>
<artifactId>org.jboss.tools.site.aggregate.soa-tooling</artifactId>
Modified: trunk/build/aggregate/webtools-site/pom.xml
===================================================================
--- trunk/build/aggregate/webtools-site/pom.xml 2011-10-12 15:29:19 UTC (rev 35575)
+++ trunk/build/aggregate/webtools-site/pom.xml 2011-10-12 15:30:01 UTC (rev 35576)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.jboss.tools</groupId>
<artifactId>org.jboss.tools.parent.pom</artifactId>
- <version>0.0.2-SNAPSHOT</version>
+ <version>0.0.3-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.webtools</groupId>
<artifactId>org.jboss.tools.webtools.site</artifactId>
Modified: trunk/cdi/pom.xml
===================================================================
--- trunk/cdi/pom.xml 2011-10-12 15:29:19 UTC (rev 35575)
+++ trunk/cdi/pom.xml 2011-10-12 15:30:01 UTC (rev 35576)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.jboss.tools</groupId>
<artifactId>org.jboss.tools.parent.pom</artifactId>
- <version>0.0.2-SNAPSHOT</version>
+ <version>0.0.3-SNAPSHOT</version>
<relativePath>../build/parent/pom.xml</relativePath>
</parent>
<groupId>org.jboss.tools</groupId>
Modified: trunk/central/pom.xml
===================================================================
--- trunk/central/pom.xml 2011-10-12 15:29:19 UTC (rev 35575)
+++ trunk/central/pom.xml 2011-10-12 15:30:01 UTC (rev 35576)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.jboss.tools</groupId>
<artifactId>org.jboss.tools.parent.pom</artifactId>
- <version>0.0.2-SNAPSHOT</version>
+ <version>0.0.3-SNAPSHOT</version>
<relativePath>../build/parent/pom.xml</relativePath>
</parent>
<groupId>org.jboss.tools</groupId>
Modified: trunk/common/pom.xml
===================================================================
--- trunk/common/pom.xml 2011-10-12 15:29:19 UTC (rev 35575)
+++ trunk/common/pom.xml 2011-10-12 15:30:01 UTC (rev 35576)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.jboss.tools</groupId>
<artifactId>org.jboss.tools.parent.pom</artifactId>
- <version>0.0.2-SNAPSHOT</version>
+ <version>0.0.3-SNAPSHOT</version>
<relativePath>../build/parent/pom.xml</relativePath>
</parent>
<groupId>org.jboss.tools</groupId>
Modified: trunk/deltacloud/pom.xml
===================================================================
--- trunk/deltacloud/pom.xml 2011-10-12 15:29:19 UTC (rev 35575)
+++ trunk/deltacloud/pom.xml 2011-10-12 15:30:01 UTC (rev 35576)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.jboss.tools</groupId>
<artifactId>org.jboss.tools.parent.pom</artifactId>
- <version>0.0.2-SNAPSHOT</version>
+ <version>0.0.3-SNAPSHOT</version>
<relativePath>../build/parent/pom.xml</relativePath>
</parent>
<groupId>org.jboss.tools</groupId>
Modified: trunk/drools/pom.xml
===================================================================
--- trunk/drools/pom.xml 2011-10-12 15:29:19 UTC (rev 35575)
+++ trunk/drools/pom.xml 2011-10-12 15:30:01 UTC (rev 35576)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.jboss.tools</groupId>
<artifactId>org.jboss.tools.parent.pom</artifactId>
- <version>0.0.2-SNAPSHOT</version>
+ <version>0.0.3-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools</groupId>
<artifactId>org.jboss.tools.drools.all</artifactId>
@@ -20,4 +20,4 @@
<module>tests</module>
</modules>
-</project>
\ No newline at end of file
+</project>
Modified: trunk/drools/site/pom.xml
===================================================================
--- trunk/drools/site/pom.xml 2011-10-12 15:29:19 UTC (rev 35575)
+++ trunk/drools/site/pom.xml 2011-10-12 15:30:01 UTC (rev 35576)
@@ -4,11 +4,11 @@
<parent>
<groupId>org.jboss.tools</groupId>
<artifactId>org.jboss.tools.parent.pom</artifactId>
- <version>0.0.2-SNAPSHOT</version>
+ <version>0.0.3-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.drools</groupId>
<artifactId>org.jboss.tools.drools.site</artifactId>
<name>org.jboss.tools.drools.site</name>
<version>0.0.1-SNAPSHOT</version>
<packaging>eclipse-update-site</packaging>
-</project>
\ No newline at end of file
+</project>
Modified: trunk/esb/pom.xml
===================================================================
--- trunk/esb/pom.xml 2011-10-12 15:29:19 UTC (rev 35575)
+++ trunk/esb/pom.xml 2011-10-12 15:30:01 UTC (rev 35576)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.jboss.tools</groupId>
<artifactId>org.jboss.tools.parent.pom</artifactId>
- <version>0.0.2-SNAPSHOT</version>
+ <version>0.0.3-SNAPSHOT</version>
<relativePath>../build/parent/pom.xml</relativePath>
</parent>
<groupId>org.jboss.tools</groupId>
Modified: trunk/examples/pom.xml
===================================================================
--- trunk/examples/pom.xml 2011-10-12 15:29:19 UTC (rev 35575)
+++ trunk/examples/pom.xml 2011-10-12 15:30:01 UTC (rev 35576)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.jboss.tools</groupId>
<artifactId>org.jboss.tools.parent.pom</artifactId>
- <version>0.0.2-SNAPSHOT</version>
+ <version>0.0.3-SNAPSHOT</version>
<relativePath>../build/parent/pom.xml</relativePath>
</parent>
<groupId>org.jboss.tools</groupId>
Modified: trunk/flow/pom.xml
===================================================================
--- trunk/flow/pom.xml 2011-10-12 15:29:19 UTC (rev 35575)
+++ trunk/flow/pom.xml 2011-10-12 15:30:01 UTC (rev 35576)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.jboss.tools</groupId>
<artifactId>org.jboss.tools.parent.pom</artifactId>
- <version>0.0.2-SNAPSHOT</version>
+ <version>0.0.3-SNAPSHOT</version>
<relativePath>../build/parent/pom.xml</relativePath>
</parent>
<groupId>org.jboss.tools</groupId>
Modified: trunk/forge/pom.xml
===================================================================
--- trunk/forge/pom.xml 2011-10-12 15:29:19 UTC (rev 35575)
+++ trunk/forge/pom.xml 2011-10-12 15:30:01 UTC (rev 35576)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.jboss.tools</groupId>
<artifactId>org.jboss.tools.parent.pom</artifactId>
- <version>0.0.2-SNAPSHOT</version>
+ <version>0.0.3-SNAPSHOT</version>
<relativePath>../build/parent/pom.xml</relativePath>
</parent>
<groupId>org.jboss.tools</groupId>
Modified: trunk/freemarker/pom.xml
===================================================================
--- trunk/freemarker/pom.xml 2011-10-12 15:29:19 UTC (rev 35575)
+++ trunk/freemarker/pom.xml 2011-10-12 15:30:01 UTC (rev 35576)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.jboss.tools</groupId>
<artifactId>org.jboss.tools.parent.pom</artifactId>
- <version>0.0.2-SNAPSHOT</version>
+ <version>0.0.3-SNAPSHOT</version>
<relativePath>../build/parent/pom.xml</relativePath>
</parent>
<groupId>org.jboss.tools</groupId>
Modified: trunk/gwt/pom.xml
===================================================================
--- trunk/gwt/pom.xml 2011-10-12 15:29:19 UTC (rev 35575)
+++ trunk/gwt/pom.xml 2011-10-12 15:30:01 UTC (rev 35576)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.jboss.tools</groupId>
<artifactId>org.jboss.tools.parent.pom</artifactId>
- <version>0.0.2-SNAPSHOT</version>
+ <version>0.0.3-SNAPSHOT</version>
<relativePath>../build/parent/pom.xml</relativePath>
</parent>
<groupId>org.jboss.tools</groupId>
Modified: trunk/hibernatetools/pom.xml
===================================================================
--- trunk/hibernatetools/pom.xml 2011-10-12 15:29:19 UTC (rev 35575)
+++ trunk/hibernatetools/pom.xml 2011-10-12 15:30:01 UTC (rev 35576)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.jboss.tools</groupId>
<artifactId>org.jboss.tools.parent.pom</artifactId>
- <version>0.0.2-SNAPSHOT</version>
+ <version>0.0.3-SNAPSHOT</version>
<relativePath>../build/parent/pom.xml</relativePath>
</parent>
<groupId>org.jboss.tools</groupId>
Modified: trunk/jbpm/pom.xml
===================================================================
--- trunk/jbpm/pom.xml 2011-10-12 15:29:19 UTC (rev 35575)
+++ trunk/jbpm/pom.xml 2011-10-12 15:30:01 UTC (rev 35576)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.jboss.tools</groupId>
<artifactId>org.jboss.tools.parent.pom</artifactId>
- <version>0.0.2-SNAPSHOT</version>
+ <version>0.0.3-SNAPSHOT</version>
<relativePath>../build/parent/pom.xml</relativePath>
</parent>
<groupId>org.jboss.tools</groupId>
Modified: trunk/jmx/pom.xml
===================================================================
--- trunk/jmx/pom.xml 2011-10-12 15:29:19 UTC (rev 35575)
+++ trunk/jmx/pom.xml 2011-10-12 15:30:01 UTC (rev 35576)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.jboss.tools</groupId>
<artifactId>org.jboss.tools.parent.pom</artifactId>
- <version>0.0.2-SNAPSHOT</version>
+ <version>0.0.3-SNAPSHOT</version>
<relativePath>../build/parent/pom.xml</relativePath>
</parent>
<groupId>org.jboss.tools</groupId>
Modified: trunk/jsf/pom.xml
===================================================================
--- trunk/jsf/pom.xml 2011-10-12 15:29:19 UTC (rev 35575)
+++ trunk/jsf/pom.xml 2011-10-12 15:30:01 UTC (rev 35576)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.jboss.tools</groupId>
<artifactId>org.jboss.tools.parent.pom</artifactId>
- <version>0.0.2-SNAPSHOT</version>
+ <version>0.0.3-SNAPSHOT</version>
<relativePath>../build/parent/pom.xml</relativePath>
</parent>
<groupId>org.jboss.tools</groupId>
Modified: trunk/jst/pom.xml
===================================================================
--- trunk/jst/pom.xml 2011-10-12 15:29:19 UTC (rev 35575)
+++ trunk/jst/pom.xml 2011-10-12 15:30:01 UTC (rev 35576)
@@ -7,7 +7,7 @@
<parent>
<groupId>org.jboss.tools</groupId>
<artifactId>org.jboss.tools.parent.pom</artifactId>
- <version>0.0.2-SNAPSHOT</version>
+ <version>0.0.3-SNAPSHOT</version>
<relativePath>../build/parent/pom.xml</relativePath>
</parent>
<packaging>pom</packaging>
Modified: trunk/maven/pom.xml
===================================================================
--- trunk/maven/pom.xml 2011-10-12 15:29:19 UTC (rev 35575)
+++ trunk/maven/pom.xml 2011-10-12 15:30:01 UTC (rev 35576)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.jboss.tools</groupId>
<artifactId>org.jboss.tools.parent.pom</artifactId>
- <version>0.0.2-SNAPSHOT</version>
+ <version>0.0.3-SNAPSHOT</version>
<relativePath>../build/parent/pom.xml</relativePath>
</parent>
<groupId>org.jboss.tools</groupId>
Modified: trunk/modeshape/pom.xml
===================================================================
--- trunk/modeshape/pom.xml 2011-10-12 15:29:19 UTC (rev 35575)
+++ trunk/modeshape/pom.xml 2011-10-12 15:30:01 UTC (rev 35576)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.jboss.tools</groupId>
<artifactId>org.jboss.tools.parent.pom</artifactId>
- <version>0.0.2-SNAPSHOT</version>
+ <version>0.0.3-SNAPSHOT</version>
<relativePath>../build/parent/pom.xml</relativePath>
</parent>
<groupId>org.jboss.tools</groupId>
Modified: trunk/portlet/pom.xml
===================================================================
--- trunk/portlet/pom.xml 2011-10-12 15:29:19 UTC (rev 35575)
+++ trunk/portlet/pom.xml 2011-10-12 15:30:01 UTC (rev 35576)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.jboss.tools</groupId>
<artifactId>org.jboss.tools.parent.pom</artifactId>
- <version>0.0.2-SNAPSHOT</version>
+ <version>0.0.3-SNAPSHOT</version>
<relativePath>../build/parent/pom.xml</relativePath>
</parent>
<groupId>org.jboss.tools</groupId>
Modified: trunk/profiler/pom.xml
===================================================================
--- trunk/profiler/pom.xml 2011-10-12 15:29:19 UTC (rev 35575)
+++ trunk/profiler/pom.xml 2011-10-12 15:30:01 UTC (rev 35576)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.jboss.tools</groupId>
<artifactId>org.jboss.tools.parent.pom</artifactId>
- <version>0.0.2-SNAPSHOT</version>
+ <version>0.0.3-SNAPSHOT</version>
<relativePath>../build/parent/pom.xml</relativePath>
</parent>
<groupId>org.jboss.tools</groupId>
Modified: trunk/runtime/pom.xml
===================================================================
--- trunk/runtime/pom.xml 2011-10-12 15:29:19 UTC (rev 35575)
+++ trunk/runtime/pom.xml 2011-10-12 15:30:01 UTC (rev 35576)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.jboss.tools</groupId>
<artifactId>org.jboss.tools.parent.pom</artifactId>
- <version>0.0.2-SNAPSHOT</version>
+ <version>0.0.3-SNAPSHOT</version>
<relativePath>../build/parent/pom.xml</relativePath>
</parent>
<groupId>org.jboss.tools</groupId>
Modified: trunk/seam/pom.xml
===================================================================
--- trunk/seam/pom.xml 2011-10-12 15:29:19 UTC (rev 35575)
+++ trunk/seam/pom.xml 2011-10-12 15:30:01 UTC (rev 35576)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.jboss.tools</groupId>
<artifactId>org.jboss.tools.parent.pom</artifactId>
- <version>0.0.2-SNAPSHOT</version>
+ <version>0.0.3-SNAPSHOT</version>
<relativePath>../build/parent/pom.xml</relativePath>
</parent>
<groupId>org.jboss.tools</groupId>
Modified: trunk/site/pom.xml
===================================================================
--- trunk/site/pom.xml 2011-10-12 15:29:19 UTC (rev 35575)
+++ trunk/site/pom.xml 2011-10-12 15:30:01 UTC (rev 35576)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.jboss.tools</groupId>
<artifactId>org.jboss.tools.parent.pom</artifactId>
- <version>0.0.2-SNAPSHOT</version>
+ <version>0.0.3-SNAPSHOT</version>
<relativePath>../build/parent/pom.xml</relativePath>
</parent>
<!-- :: DEPRECATED :: SEE README -->
Modified: trunk/smooks/pom.xml
===================================================================
--- trunk/smooks/pom.xml 2011-10-12 15:29:19 UTC (rev 35575)
+++ trunk/smooks/pom.xml 2011-10-12 15:30:01 UTC (rev 35576)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.jboss.tools</groupId>
<artifactId>org.jboss.tools.parent.pom</artifactId>
- <version>0.0.2-SNAPSHOT</version>
+ <version>0.0.3-SNAPSHOT</version>
<relativePath>../build/parent/pom.xml</relativePath>
</parent>
<groupId>org.jboss.tools</groupId>
Modified: trunk/struts/pom.xml
===================================================================
--- trunk/struts/pom.xml 2011-10-12 15:29:19 UTC (rev 35575)
+++ trunk/struts/pom.xml 2011-10-12 15:30:01 UTC (rev 35576)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.jboss.tools</groupId>
<artifactId>org.jboss.tools.parent.pom</artifactId>
- <version>0.0.2-SNAPSHOT</version>
+ <version>0.0.3-SNAPSHOT</version>
<relativePath>../build/parent/pom.xml</relativePath>
</parent>
<groupId>org.jboss.tools</groupId>
Modified: trunk/tests/pom.xml
===================================================================
--- trunk/tests/pom.xml 2011-10-12 15:29:19 UTC (rev 35575)
+++ trunk/tests/pom.xml 2011-10-12 15:30:01 UTC (rev 35576)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.jboss.tools</groupId>
<artifactId>org.jboss.tools.parent.pom</artifactId>
- <version>0.0.2-SNAPSHOT</version>
+ <version>0.0.3-SNAPSHOT</version>
<relativePath>../build/parent/pom.xml</relativePath>
</parent>
<groupId>org.jboss.tools</groupId>
Modified: trunk/usage/pom.xml
===================================================================
--- trunk/usage/pom.xml 2011-10-12 15:29:19 UTC (rev 35575)
+++ trunk/usage/pom.xml 2011-10-12 15:30:01 UTC (rev 35576)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.jboss.tools</groupId>
<artifactId>org.jboss.tools.parent.pom</artifactId>
- <version>0.0.2-SNAPSHOT</version>
+ <version>0.0.3-SNAPSHOT</version>
<relativePath>../build/parent/pom.xml</relativePath>
</parent>
<groupId>org.jboss.tools</groupId>
Modified: trunk/vpe/pom.xml
===================================================================
--- trunk/vpe/pom.xml 2011-10-12 15:29:19 UTC (rev 35575)
+++ trunk/vpe/pom.xml 2011-10-12 15:30:01 UTC (rev 35576)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.jboss.tools</groupId>
<artifactId>org.jboss.tools.parent.pom</artifactId>
- <version>0.0.2-SNAPSHOT</version>
+ <version>0.0.3-SNAPSHOT</version>
<relativePath>../build/parent/pom.xml</relativePath>
</parent>
<groupId>org.jboss.tools</groupId>
Modified: trunk/workingset/pom.xml
===================================================================
--- trunk/workingset/pom.xml 2011-10-12 15:29:19 UTC (rev 35575)
+++ trunk/workingset/pom.xml 2011-10-12 15:30:01 UTC (rev 35576)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.jboss.tools</groupId>
<artifactId>org.jboss.tools.parent.pom</artifactId>
- <version>0.0.2-SNAPSHOT</version>
+ <version>0.0.3-SNAPSHOT</version>
<relativePath>../build/parent/pom.xml</relativePath>
</parent>
<groupId>org.jboss.tools</groupId>
Modified: trunk/ws/pom.xml
===================================================================
--- trunk/ws/pom.xml 2011-10-12 15:29:19 UTC (rev 35575)
+++ trunk/ws/pom.xml 2011-10-12 15:30:01 UTC (rev 35576)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.jboss.tools</groupId>
<artifactId>org.jboss.tools.parent.pom</artifactId>
- <version>0.0.2-SNAPSHOT</version>
+ <version>0.0.3-SNAPSHOT</version>
<relativePath>../build/parent/pom.xml</relativePath>
</parent>
<groupId>org.jboss.tools</groupId>
Modified: trunk/ws/site/pom.xml
===================================================================
--- trunk/ws/site/pom.xml 2011-10-12 15:29:19 UTC (rev 35575)
+++ trunk/ws/site/pom.xml 2011-10-12 15:30:01 UTC (rev 35576)
@@ -12,4 +12,4 @@
<name>ws.site</name>
<packaging>eclipse-update-site</packaging>
-</project>
\ No newline at end of file
+</project>
Modified: trunk/xulrunner/pom.xml
===================================================================
--- trunk/xulrunner/pom.xml 2011-10-12 15:29:19 UTC (rev 35575)
+++ trunk/xulrunner/pom.xml 2011-10-12 15:30:01 UTC (rev 35576)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.jboss.tools</groupId>
<artifactId>org.jboss.tools.parent.pom</artifactId>
- <version>0.0.2-SNAPSHOT</version>
+ <version>0.0.3-SNAPSHOT</version>
<relativePath>../build/parent/pom.xml</relativePath>
</parent>
<groupId>org.jboss.tools</groupId>
13 years, 3 months
- 1
- 0
JBoss Tools SVN: r35575 - trunk/build/parent.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-10-12 11:29:19 -0400 (Wed, 12 Oct 2011)
New Revision: 35575
Modified:
trunk/build/parent/pom.xml
Log:
JBIDE-9140 upversion parent pom to 0.0.3 and tychoVersion to 0.13.0
Modified: trunk/build/parent/pom.xml
===================================================================
--- trunk/build/parent/pom.xml 2011-10-12 15:24:10 UTC (rev 35574)
+++ trunk/build/parent/pom.xml 2011-10-12 15:29:19 UTC (rev 35575)
@@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.tools</groupId>
<artifactId>org.jboss.tools.parent.pom</artifactId>
- <version>0.0.2-SNAPSHOT</version>
+ <version>0.0.3-SNAPSHOT</version>
<name>JBoss Tools Parent</name>
<packaging>pom</packaging>
<modules>
@@ -12,9 +12,9 @@
</modules>
<properties>
- <!-- to build w/ latest 0.13.0-SNAPSHOT, run `mvn install -DtychoVersion=0.13.0-SNAPSHOT`,
- or uncomment this property: <tychoVersion>0.13.0-SNAPSHOT</tychoVersion> -->
- <tychoVersion>0.12.0</tychoVersion>
+ <!-- to build w/ latest 0.14.0-SNAPSHOT, run `mvn install -DtychoVersion=0.14.0-SNAPSHOT`,
+ or uncomment this property: <tychoVersion>0.14.0-SNAPSHOT</tychoVersion> -->
+ <tychoVersion>0.13.0</tychoVersion>
<scmBranch>trunk</scmBranch>
<JBT_VERSION>3.3.0</JBT_VERSION>
<JBDS_VERSION>5.0.0</JBDS_VERSION>
@@ -36,7 +36,7 @@
<jbosstools-target-site>http://download.jboss.org/jbosstools/updates/target-platform_3.3.indigo/l...</jbosstools-target-site>
<!-- 1b. or use -Plocal.site -Dlocal.site=file:///home/$user/trunk/build/target-platform/REPO/ -->
- <local.site>file:///home/hudson/static_build_env/jbds/target-platform_3.3.indigo/e370-wtp330.target/</local.site>
+ <local.site>file:///home/hudson/static_build_env/jbds/target-platform_3.3.indigo/e371-wtp331.target/</local.site>
<!-- 2a. URL of latest JBT nightly staging composite site (all the components
in once place) -->
13 years, 3 months
- 1
- 0
JBoss Tools SVN: r35574 - in trunk/as/plugins/org.jboss.tools.openshift.express.ui: src/org/jboss/tools/openshift/express/internal/ui/wizard and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-10-12 11:24:10 -0400 (Wed, 12 Oct 2011)
New Revision: 35574
Added:
trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationWizard.java
trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationWizardModel.java
Removed:
trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ServerAdapterWizard.java
Modified:
trunk/as/plugins/org.jboss.tools.openshift.express.ui/plugin.xml
trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/AdapterWizardPage.java
trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/AdapterWizardPageModel.java
trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationWizardPage.java
trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationWizardPageModel.java
trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/CredentialsWizardPage.java
trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/CredentialsWizardPageModel.java
trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewDomainDialog.java
trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/projectimport/GeneralProjectImportOperation.java
Log:
[JBIDE-9793] renamed serveradapter wizard to application wizard
Modified: trunk/as/plugins/org.jboss.tools.openshift.express.ui/plugin.xml
===================================================================
--- trunk/as/plugins/org.jboss.tools.openshift.express.ui/plugin.xml 2011-10-12 14:57:03 UTC (rev 35573)
+++ trunk/as/plugins/org.jboss.tools.openshift.express.ui/plugin.xml 2011-10-12 15:24:10 UTC (rev 35574)
@@ -9,7 +9,7 @@
</category>
<wizard
category="org.jboss.ide.eclipse.as.openshift.express.ui.wizard.category"
- class="org.jboss.tools.openshift.express.internal.ui.wizard.ServerAdapterWizard"
+ class="org.jboss.tools.openshift.express.internal.ui.wizard.ApplicationWizard"
icon="icons/openshift-logo-white-icon.png"
id="org.jboss.ide.eclipse.as.openshift.express.ui.wizard.NewServerAdapter"
name="OpenShift Express Application">
Modified: trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/AdapterWizardPage.java
===================================================================
--- trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/AdapterWizardPage.java 2011-10-12 14:57:03 UTC (rev 35573)
+++ trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/AdapterWizardPage.java 2011-10-12 15:24:10 UTC (rev 35574)
@@ -62,7 +62,7 @@
private Label domainLabel;
private Label modeLabel;
- public AdapterWizardPage(ServerAdapterWizard wizard, ServerAdapterWizardModel model) {
+ public AdapterWizardPage(ApplicationWizard wizard, ApplicationWizardModel model) {
super("Server Adapter", "...", "Server Adapter", wizard);
this.model = new AdapterWizardPageModel(model);
}
Modified: trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/AdapterWizardPageModel.java
===================================================================
--- trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/AdapterWizardPageModel.java 2011-10-12 14:57:03 UTC (rev 35573)
+++ trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/AdapterWizardPageModel.java 2011-10-12 15:24:10 UTC (rev 35574)
@@ -13,7 +13,7 @@
import org.jboss.tools.common.ui.databinding.ObservableUIPojo;
/**
- * @author André Dietisheim
+ * @author Rob Stryker
*/
public class AdapterWizardPageModel extends ObservableUIPojo {
public static final String CREATE_SERVER = "createServer";
@@ -24,14 +24,14 @@
public static final String SERVER_TYPE = "serverType";
- private ServerAdapterWizardModel wizardModel;
+ private ApplicationWizardModel wizardModel;
- public AdapterWizardPageModel(ServerAdapterWizardModel wizardModel) {
+ public AdapterWizardPageModel(ApplicationWizardModel wizardModel) {
this.wizardModel = wizardModel;
}
// TODO is this the best way? Or should we expose ONLY getters to the parent model?
- public ServerAdapterWizardModel getParentModel() {
+ public ApplicationWizardModel getParentModel() {
return wizardModel;
}
Copied: trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationWizard.java (from rev 35563, trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ServerAdapterWizard.java)
===================================================================
--- trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationWizard.java (rev 0)
+++ trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationWizard.java 2011-10-12 15:24:10 UTC (rev 35574)
@@ -0,0 +1,85 @@
+/*******************************************************************************
+ * Copyright (c) 2011 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is 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:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.openshift.express.internal.ui.wizard;
+
+import java.io.File;
+import java.net.URISyntaxException;
+
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.core.runtime.jobs.Job;
+import org.eclipse.jface.dialogs.ErrorDialog;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.wizard.Wizard;
+import org.eclipse.ui.INewWizard;
+import org.eclipse.ui.IWorkbench;
+import org.jboss.tools.common.ui.WizardUtils;
+import org.jboss.tools.openshift.express.client.OpenshiftException;
+import org.jboss.tools.openshift.express.internal.ui.OpenshiftUIActivator;
+
+/**
+ * @author André Dietisheim
+ */
+public class ApplicationWizard extends Wizard implements INewWizard {
+
+ private ApplicationWizardModel model;
+
+ public ApplicationWizard() {
+ }
+
+ @Override
+ public void init(IWorkbench workbench, IStructuredSelection selection) {
+ setWindowTitle("OpenShift application wizard");
+ setNeedsProgressMonitor(true);
+ }
+
+ @Override
+ public boolean performFinish() {
+ try {
+ WizardUtils.runInWizard(
+ new Job("Creating local git repo...") {
+
+ @Override
+ protected IStatus run(IProgressMonitor monitor) {
+ try {
+ File repositoryFile = model.cloneRepository(monitor);
+ model.importProject(repositoryFile, monitor);
+ return Status.OK_STATUS;
+ } catch (OpenshiftException e) {
+ return new Status(IStatus.ERROR, OpenshiftUIActivator.PLUGIN_ID,
+ "An exception occurred while creating local git repository.", e);
+ } catch (URISyntaxException e) {
+ return new Status(IStatus.ERROR, OpenshiftUIActivator.PLUGIN_ID,
+ "The url of the remote git repository is not valid", e);
+ } catch (Exception e) {
+ return new Status(IStatus.ERROR, OpenshiftUIActivator.PLUGIN_ID,
+ "An exception occurred while creating local git repository.", e);
+ }
+ }
+ }, getContainer());
+ return true;
+ } catch (Exception e) {
+ ErrorDialog.openError(getShell(), "Error", "Could not create local git repository.",
+ new Status(IStatus.ERROR, OpenshiftUIActivator.PLUGIN_ID,
+ "An exception occurred while creating local git repository.", e));
+ return false;
+ }
+ }
+
+ @Override
+ public void addPages() {
+ this.model = new ApplicationWizardModel();
+ addPage(new CredentialsWizardPage(this, model));
+ addPage(new ApplicationWizardPage(this, model));
+ addPage(new AdapterWizardPage(this, model));
+ }
+}
Property changes on: trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationWizard.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Copied: trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationWizardModel.java (from rev 35569, trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ServerAdapterWizardModel.java)
===================================================================
--- trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationWizardModel.java (rev 0)
+++ trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationWizardModel.java 2011-10-12 15:24:10 UTC (rev 35574)
@@ -0,0 +1,167 @@
+/*******************************************************************************
+ * Copyright (c) 2011 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is 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:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.openshift.express.internal.ui.wizard;
+
+import java.io.File;
+import java.io.IOException;
+import java.lang.reflect.InvocationTargetException;
+import java.net.URISyntaxException;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.egit.core.op.CloneOperation;
+import org.eclipse.egit.core.op.ConnectProviderOperation;
+import org.eclipse.egit.ui.Activator;
+import org.eclipse.jgit.api.Git;
+import org.eclipse.jgit.api.InitCommand;
+import org.eclipse.jgit.api.errors.CheckoutConflictException;
+import org.eclipse.jgit.api.errors.ConcurrentRefUpdateException;
+import org.eclipse.jgit.api.errors.InvalidMergeHeadsException;
+import org.eclipse.jgit.api.errors.NoHeadException;
+import org.eclipse.jgit.api.errors.NoMessageException;
+import org.eclipse.jgit.api.errors.WrongRepositoryStateException;
+import org.eclipse.jgit.lib.Constants;
+import org.eclipse.jgit.lib.ObjectId;
+import org.eclipse.jgit.lib.Repository;
+import org.eclipse.jgit.merge.MergeStrategy;
+import org.eclipse.jgit.transport.URIish;
+import org.jboss.ide.eclipse.as.core.util.FileUtil;
+import org.jboss.tools.common.ui.databinding.ObservableUIPojo;
+import org.jboss.tools.openshift.express.client.IApplication;
+import org.jboss.tools.openshift.express.client.IUser;
+import org.jboss.tools.openshift.express.client.OpenshiftException;
+import org.jboss.tools.openshift.express.internal.ui.wizard.projectimport.GeneralProjectImportOperation;
+import org.jboss.tools.openshift.express.internal.ui.wizard.projectimport.MavenProjectImportOperation;
+
+/**
+ * @author André Dietisheim <adietish(a)redhat.com>
+ */
+public class ApplicationWizardModel extends ObservableUIPojo {
+
+ private HashMap<String, Object> dataModel = new HashMap<String, Object>();
+
+ private static final String USER = "user";
+ private static final String APPLICATION = "application";
+
+ public void setProperty(String key, Object value) {
+ dataModel.put(key, value);
+ }
+
+ public Object getProperty(String key) {
+ return dataModel.get(key);
+ }
+
+ public void setUser(IUser user) {
+ dataModel.put(USER, user);
+ }
+
+ public IUser getUser() {
+ return (IUser) dataModel.get(USER);
+ }
+
+ public IApplication getApplication() {
+ return (IApplication)dataModel.get(APPLICATION);
+ }
+
+ public void setApplication(IApplication application) {
+ dataModel.put(APPLICATION, application);
+ }
+
+ public void importProject(File projectFolder, IProgressMonitor monitor) throws OpenshiftException, CoreException, InterruptedException {
+ MavenProjectImportOperation mavenImport = new MavenProjectImportOperation(projectFolder);
+ List<IProject> importedProjects = Collections.emptyList();
+ if (mavenImport.isMavenProject()) {
+ importedProjects = mavenImport.importToWorkspace(monitor);
+ } else {
+ importedProjects = new GeneralProjectImportOperation(projectFolder).importToWorkspace(monitor);
+ }
+
+ connectToGitRepo(importedProjects, monitor);
+
+ createServerAdapterIfRequired();
+ }
+
+ private void connectToGitRepo(List<IProject> projects, IProgressMonitor monitor) throws CoreException {
+ for (IProject project : projects) {
+ connectToGitRepo(project, monitor);
+ }
+ }
+
+ private void connectToGitRepo(IProject project, IProgressMonitor monitor) throws CoreException {
+ new ConnectProviderOperation(project).execute(monitor);
+ }
+
+ public File cloneRepository(IProgressMonitor monitor) throws URISyntaxException, OpenshiftException,
+ InvocationTargetException,
+ InterruptedException {
+ File destination = getDestinationDirectory(getApplication());
+ cloneRepository(getApplication().getGitUri(), destination, monitor);
+ return destination;
+ }
+
+ private void cloneRepository(String uri, File destination, IProgressMonitor monitor) throws URISyntaxException,
+ OpenshiftException,
+ InvocationTargetException,
+ InterruptedException {
+ if (destination.exists()) {
+ FileUtil.completeDelete(destination);
+ }
+ URIish gitUri = new URIish(uri);
+ CloneOperation cloneOperation =
+ new CloneOperation(gitUri, true, null, destination, Constants.HEAD, "origin", 10 * 1024);
+ cloneOperation.run(null);
+ File gitDirectory = new File(destination, Constants.DOT_GIT);
+ Activator.getDefault().getRepositoryUtil().addConfiguredRepository(gitDirectory);
+ }
+
+ private File getDestinationDirectory(IApplication application) {
+ String applicationDirectory = "openshift-" + application.getName();
+ // File workspace =
+ // ResourcesPlugin.getWorkspace().getRoot().getLocation().toFile();
+ String userHome = System.getProperty("java.io.tmpdir");
+ // File workDir = new File(workspace, applicationWorkingdir);
+ return new File(userHome, applicationDirectory);
+ }
+
+ private void mergeWithRemote(Git git, String remoteName) throws CoreException, NoHeadException,
+ ConcurrentRefUpdateException, CheckoutConflictException, InvalidMergeHeadsException,
+ WrongRepositoryStateException, NoMessageException, IOException {
+ Repository repository = git.getRepository();
+ ObjectId objectId = repository.resolve("HEAD");
+ git.merge().include(objectId).setStrategy(MergeStrategy.OURS).call();
+ }
+
+ private void createServerAdapterIfRequired() {
+ // TODO
+ }
+
+ private Git createGit(File repositoryFile) throws IOException {
+ InitCommand init = Git.init();
+ init.setDirectory(repositoryFile);
+ init.setBare(false);
+ return init.call();
+ }
+
+ private File createRepositoryFile(String name) {
+ IPath workspace = ResourcesPlugin.getWorkspace().getRoot().getLocation();
+ IPath gitRepoProject = workspace.append(name);
+ File repositoryFile = new File(gitRepoProject.toFile(), Constants.DOT_GIT);
+ return repositoryFile;
+ }
+
+
+}
Property changes on: trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationWizardModel.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationWizardPage.java
===================================================================
--- trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationWizardPage.java 2011-10-12 14:57:03 UTC (rev 35573)
+++ trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationWizardPage.java 2011-10-12 15:24:10 UTC (rev 35574)
@@ -68,9 +68,9 @@
private TableViewer viewer;
private ApplicationWizardPageModel model;
- private ServerAdapterWizardModel wizardModel;
+ private ApplicationWizardModel wizardModel;
- protected ApplicationWizardPage(IWizard wizard, ServerAdapterWizardModel wizardModel) {
+ protected ApplicationWizardPage(IWizard wizard, ApplicationWizardModel wizardModel) {
super("Application selection", "Please select an Openshift Express application",
"Application selection", wizard);
this.wizardModel = wizardModel;
Modified: trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationWizardPageModel.java
===================================================================
--- trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationWizardPageModel.java 2011-10-12 14:57:03 UTC (rev 35573)
+++ trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationWizardPageModel.java 2011-10-12 15:24:10 UTC (rev 35574)
@@ -32,9 +32,9 @@
private String namespace;
private IDomain domain;
private IApplication selectedApplication;
- private ServerAdapterWizardModel wizardModel;
+ private ApplicationWizardModel wizardModel;
- public ApplicationWizardPageModel(ServerAdapterWizardModel wizardModel) {
+ public ApplicationWizardPageModel(ApplicationWizardModel wizardModel) {
this.wizardModel = wizardModel;
}
Modified: trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/CredentialsWizardPage.java
===================================================================
--- trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/CredentialsWizardPage.java 2011-10-12 14:57:03 UTC (rev 35573)
+++ trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/CredentialsWizardPage.java 2011-10-12 15:24:10 UTC (rev 35574)
@@ -47,7 +47,7 @@
private CredentialsWizardPageModel model;
- public CredentialsWizardPage(IWizard wizard, ServerAdapterWizardModel wizardModel) {
+ public CredentialsWizardPage(IWizard wizard, ApplicationWizardModel wizardModel) {
super("Server connetion", "Please provide the credentails of your user account on Openshift Express",
"Server Connection", wizard);
this.model = new CredentialsWizardPageModel(wizardModel);
@@ -71,8 +71,8 @@
// dbc.bindValue(
// WidgetProperties.text(SWT.Modify).observe(serverUrlText),
// BeanProperties.value(
- // ServerAdapterWizardModel.class,
- // ServerAdapterWizardModel.PROPERTY_SERVER_URL).observe(model),
+ // ApplicationWizardModel.class,
+ // ApplicationWizardModel.PROPERTY_SERVER_URL).observe(model),
// new UpdateValueStrategy()
// .setAfterGetValidator(new
// MandatoryStringValidator("You have to provide a value for the server url."))
Modified: trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/CredentialsWizardPageModel.java
===================================================================
--- trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/CredentialsWizardPageModel.java 2011-10-12 14:57:03 UTC (rev 35573)
+++ trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/CredentialsWizardPageModel.java 2011-10-12 15:24:10 UTC (rev 35574)
@@ -44,9 +44,9 @@
private IUser user;
private StringPreferenceValue rhLoginPreferenceValue;
- private ServerAdapterWizardModel wizardModel;
+ private ApplicationWizardModel wizardModel;
- public CredentialsWizardPageModel(ServerAdapterWizardModel model) {
+ public CredentialsWizardPageModel(ApplicationWizardModel model) {
this.wizardModel = model;
this.serverUrl = IOpenshiftService.BASE_URL;
this.rhLoginPreferenceValue = new StringPreferenceValue(RHLOGIN_PREFS_KEY, OpenshiftUIActivator.PLUGIN_ID);
Modified: trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewDomainDialog.java
===================================================================
--- trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewDomainDialog.java 2011-10-12 14:57:03 UTC (rev 35573)
+++ trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewDomainDialog.java 2011-10-12 15:24:10 UTC (rev 35574)
@@ -29,7 +29,7 @@
private String namespace;
private NewDomainWizardModel model;
- public NewDomainDialog(String namespace, ServerAdapterWizardModel wizardModel) {
+ public NewDomainDialog(String namespace, ApplicationWizardModel wizardModel) {
this.namespace = namespace;
this.model = new NewDomainWizardModel(namespace, wizardModel.getUser());
setNeedsProgressMonitor(true);
Deleted: trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ServerAdapterWizard.java
===================================================================
--- trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ServerAdapterWizard.java 2011-10-12 14:57:03 UTC (rev 35573)
+++ trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ServerAdapterWizard.java 2011-10-12 15:24:10 UTC (rev 35574)
@@ -1,85 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011 Red Hat, Inc.
- * Distributed under license by Red Hat, Inc. All rights reserved.
- * This program is 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:
- * Red Hat, Inc. - initial API and implementation
- ******************************************************************************/
-package org.jboss.tools.openshift.express.internal.ui.wizard;
-
-import java.io.File;
-import java.net.URISyntaxException;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.jface.dialogs.ErrorDialog;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.ui.INewWizard;
-import org.eclipse.ui.IWorkbench;
-import org.jboss.tools.common.ui.WizardUtils;
-import org.jboss.tools.openshift.express.client.OpenshiftException;
-import org.jboss.tools.openshift.express.internal.ui.OpenshiftUIActivator;
-
-/**
- * @author André Dietisheim
- */
-public class ServerAdapterWizard extends Wizard implements INewWizard {
-
- private ServerAdapterWizardModel model;
-
- public ServerAdapterWizard() {
- }
-
- @Override
- public void init(IWorkbench workbench, IStructuredSelection selection) {
- setWindowTitle("OpenShift application wizard");
- setNeedsProgressMonitor(true);
- }
-
- @Override
- public boolean performFinish() {
- try {
- WizardUtils.runInWizard(
- new Job("Creating local git repo...") {
-
- @Override
- protected IStatus run(IProgressMonitor monitor) {
- try {
- File repositoryFile = model.cloneRepository(monitor);
- model.importProject(repositoryFile, monitor);
- return Status.OK_STATUS;
- } catch (OpenshiftException e) {
- return new Status(IStatus.ERROR, OpenshiftUIActivator.PLUGIN_ID,
- "An exception occurred while creating local git repository.", e);
- } catch (URISyntaxException e) {
- return new Status(IStatus.ERROR, OpenshiftUIActivator.PLUGIN_ID,
- "The url of the remote git repository is not valid", e);
- } catch (Exception e) {
- return new Status(IStatus.ERROR, OpenshiftUIActivator.PLUGIN_ID,
- "An exception occurred while creating local git repository.", e);
- }
- }
- }, getContainer());
- return true;
- } catch (Exception e) {
- ErrorDialog.openError(getShell(), "Error", "Could not create local git repository.",
- new Status(IStatus.ERROR, OpenshiftUIActivator.PLUGIN_ID,
- "An exception occurred while creating local git repository.", e));
- return false;
- }
- }
-
- @Override
- public void addPages() {
- this.model = new ServerAdapterWizardModel();
- addPage(new CredentialsWizardPage(this, model));
- addPage(new ApplicationWizardPage(this, model));
- addPage(new AdapterWizardPage(this, model));
- }
-}
Modified: trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/projectimport/GeneralProjectImportOperation.java
===================================================================
--- trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/projectimport/GeneralProjectImportOperation.java 2011-10-12 14:57:03 UTC (rev 35573)
+++ trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/projectimport/GeneralProjectImportOperation.java 2011-10-12 15:24:10 UTC (rev 35574)
@@ -11,22 +11,23 @@
package org.jboss.tools.openshift.express.internal.ui.wizard.projectimport;
import java.io.File;
-import java.lang.reflect.InvocationTargetException;
import java.util.Collections;
import java.util.List;
import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IWorkspaceRoot;
+import org.eclipse.core.resources.IProjectDescription;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.IWorkspace;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.Path;
import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.m2e.core.internal.jobs.IBackgroundProcessingQueue;
+import org.eclipse.m2e.core.project.configurator.ProjectConfigurationRequest;
import org.eclipse.osgi.util.NLS;
import org.eclipse.swt.widgets.Display;
import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.dialogs.IOverwriteQuery;
-import org.eclipse.ui.wizards.datatransfer.FileSystemStructureProvider;
-import org.eclipse.ui.wizards.datatransfer.ImportOperation;
/**
* @author Andre Dietisheim <adietish(a)redhat.com>
@@ -40,29 +41,36 @@
public List<IProject> importToWorkspace(IProgressMonitor monitor)
throws CoreException, InterruptedException {
-
- IWorkspaceRoot workspaceRoot = ResourcesPlugin.getWorkspace().getRoot();
- IProject project = workspaceRoot.getProject(getProjectDirectory().getName());
+
+ IWorkspace workspace = ResourcesPlugin.getWorkspace();
+ IProject project = workspace.getRoot().getProject(getProjectDirectory().getName());
overwriteExistingProject(project, monitor);
+ importToWorkspace(getProjectDirectory(), workspace, monitor);
return Collections.singletonList(project);
}
- private void importToNewProject(File projectDirectory, IProject project, IProgressMonitor monitor)
- throws CoreException, InvocationTargetException, InterruptedException {
- project.create(monitor);
- project.open(monitor);
- ImportOperation operation =
- new ImportOperation(
- project.getFullPath()
- , projectDirectory
- , FileSystemStructureProvider.INSTANCE
- , new IOverwriteQuery() {
- public String queryOverwrite(String file) {
- return IOverwriteQuery.ALL;
- }
- });
- operation.setCreateContainerStructure(false);
- operation.run(monitor);
+ private void importToWorkspace(File projectDirectory, IWorkspace workspace, IProgressMonitor monitor) throws CoreException {
+ String projectName = projectDirectory.getName();
+ IProjectDescription description = workspace.newProjectDescription(projectName);
+ description.setLocation(new Path(projectDirectory.toString()));
+ IProject project = workspace.getRoot().getProject(projectName);
+ project.create(description, monitor);
+ project.open(IResource.BACKGROUND_REFRESH, monitor);
+ // project.create(monitor);
+ // project.open(IResource.BACKGROUND_REFRESH, monitor);
+ // ImportOperation operation =
+ // new ImportOperation(
+ // project.getFullPath()
+ // , projectDirectory
+ // , FileSystemStructureProvider.INSTANCE
+ // , new IOverwriteQuery() {
+ // public String queryOverwrite(String file) {
+ // return IOverwriteQuery.ALL;
+ // }
+ // });
+ // operation.setCreateContainerStructure(false);
+ // operation.run(monitor);
+
}
private void overwriteExistingProject(final IProject project, IProgressMonitor monitor)
13 years, 3 months
- 1
- 0
JBoss Tools SVN: r35573 - in trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal: ui/wizard and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2011-10-12 10:57:03 -0400 (Wed, 12 Oct 2011)
New Revision: 35573
Modified:
trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressBehaviourDelegate.java
trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressServerUtils.java
trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ServerAdapterWizardModel.java
Log:
JBIDE-9793 - removed NPE for server trying to start, updated one of the data models to have a hashmap, log an error, etc
Modified: trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressBehaviourDelegate.java
===================================================================
--- trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressBehaviourDelegate.java 2011-10-12 14:44:01 UTC (rev 35572)
+++ trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressBehaviourDelegate.java 2011-10-12 14:57:03 UTC (rev 35573)
@@ -3,6 +3,7 @@
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
import org.jboss.ide.eclipse.as.core.server.internal.DelegatingServerBehavior;
import org.jboss.ide.eclipse.as.core.server.internal.IJBossBehaviourDelegate;
@@ -56,8 +57,7 @@
@Override
public IStatus canChangeState(String launchMode) {
- // TODO Auto-generated method stub
- return null;
+ return Status.CANCEL_STATUS;
}
@Override
Modified: trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressServerUtils.java
===================================================================
--- trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressServerUtils.java 2011-10-12 14:44:01 UTC (rev 35572)
+++ trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressServerUtils.java 2011-10-12 14:57:03 UTC (rev 35573)
@@ -5,7 +5,9 @@
import org.eclipse.wst.server.core.IRuntime;
import org.eclipse.wst.server.core.IServer;
import org.eclipse.wst.server.core.IServerAttributes;
+import org.eclipse.wst.server.core.IServerType;
import org.eclipse.wst.server.core.IServerWorkingCopy;
+import org.jboss.ide.eclipse.as.core.server.IDeployableServer;
import org.jboss.ide.eclipse.as.core.util.IJBossToolingConstants;
import org.jboss.ide.eclipse.as.core.util.RuntimeUtils;
import org.jboss.ide.eclipse.as.core.util.ServerCreationUtils;
@@ -94,7 +96,8 @@
*/
public static IServer createAS7OpenshiftServer(
String host, String username, String password,
- String domain, String app, String sourceOrBinary,
+ String domain, String app,
+ String sourceOrBinary,
String localRuntimeHomeDir) throws CoreException {
IServer server = createServerAndRuntime(IJBossToolingConstants.AS_70,
IJBossToolingConstants.SERVER_AS_70,
@@ -138,15 +141,16 @@
* @throws CoreException
*/
public static IServer fillServerWithOpenshiftDetails(IServer server,
- String host, String username, String password,
- String domain, String app, String sourceOrBinary) throws CoreException {
+ String host, String username, String password, String domain, String app,
+ String mode) throws CoreException {
IServerWorkingCopy wc = server.createWorkingCopy();
wc.setHost(host);
+ wc.setAttribute(IDeployableServer.SERVER_MODE, "openshift");
wc.setAttribute(ATTRIBUTE_USERNAME, username);
wc.setAttribute(ATTRIBUTE_PASSWORD, password);
wc.setAttribute(ATTRIBUTE_DOMAIN, domain);
wc.setAttribute(ATTRIBUTE_APPLICATION, app);
- wc.setAttribute(ATTRIBUTE_EXPRESS_MODE, sourceOrBinary);
+ wc.setAttribute(ATTRIBUTE_EXPRESS_MODE, mode);
return wc.save(true, new NullProgressMonitor());
}
@@ -160,5 +164,9 @@
public static IServer createServer(IRuntime runtime, String serverID) throws CoreException {
return ServerCreationUtils.createServer2(runtime, serverID);
}
+
+ public static IServer createServer(IRuntime runtime, IServerType serverType, String serverName) throws CoreException {
+ return ServerCreationUtils.createServer2(runtime, serverType, serverName);
+ }
}
Modified: trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ServerAdapterWizardModel.java
===================================================================
--- trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ServerAdapterWizardModel.java 2011-10-12 14:44:01 UTC (rev 35572)
+++ trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ServerAdapterWizardModel.java 2011-10-12 14:57:03 UTC (rev 35573)
@@ -15,6 +15,7 @@
import java.lang.reflect.InvocationTargetException;
import java.net.URISyntaxException;
import java.util.Collections;
+import java.util.HashMap;
import java.util.List;
import org.eclipse.core.resources.IProject;
@@ -51,23 +52,33 @@
*/
public class ServerAdapterWizardModel extends ObservableUIPojo {
- private IUser user;
- private IApplication application;
+ private HashMap<String, Object> dataModel = new HashMap<String, Object>();
+ private static final String USER = "user";
+ private static final String APPLICATION = "application";
+
+ public void setProperty(String key, Object value) {
+ dataModel.put(key, value);
+ }
+
+ public Object getProperty(String key) {
+ return dataModel.get(key);
+ }
+
public void setUser(IUser user) {
- this.user = user;
+ dataModel.put(USER, user);
}
public IUser getUser() {
- return user;
+ return (IUser) dataModel.get(USER);
}
public IApplication getApplication() {
- return application;
+ return (IApplication)dataModel.get(APPLICATION);
}
public void setApplication(IApplication application) {
- this.application = application;
+ dataModel.put(APPLICATION, application);
}
public void importProject(File projectFolder, IProgressMonitor monitor) throws OpenshiftException, CoreException, InterruptedException {
@@ -97,8 +108,8 @@
public File cloneRepository(IProgressMonitor monitor) throws URISyntaxException, OpenshiftException,
InvocationTargetException,
InterruptedException {
- File destination = getDestinationDirectory(application);
- cloneRepository(application.getGitUri(), destination, monitor);
+ File destination = getDestinationDirectory(getApplication());
+ cloneRepository(getApplication().getGitUri(), destination, monitor);
return destination;
}
13 years, 3 months
- 1
- 0