JBoss Tools SVN: r24709 - in trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui: src/org/jboss/tools/internal/deltacloud/ui/wizards and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: jjohnstn
Date: 2010-09-03 12:35:55 -0400 (Fri, 03 Sep 2010)
New Revision: 24709
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstance.java
Log:
2010-09-03 Jeff Johnston <jjohnstn(a)redhat.com>
* src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstance.java (WatchCreateJob.run): Add
instance logic fixed.
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog 2010-09-03 16:16:40 UTC (rev 24708)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog 2010-09-03 16:35:55 UTC (rev 24709)
@@ -1,3 +1,8 @@
+2010-09-03 Jeff Johnston <jjohnstn(a)redhat.com>
+
+ * src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstance.java (WatchCreateJob.run): Add
+ instance logic fixed.
+
2010-09-01 Jeff Johnston <jjohnstn(a)redhat.com>
* src/org/jboss/tools/internal/deltacloud/ui/wizards/CustomWizardDialog.java: New file.
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstance.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstance.java 2010-09-03 16:16:40 UTC (rev 24708)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstance.java 2010-09-03 16:35:55 UTC (rev 24709)
@@ -81,12 +81,13 @@
public IStatus run(IProgressMonitor pm) {
if (!pm.isCanceled()){
+ DeltaCloudInstance instance = null;
try {
pm.beginTask(WizardMessages.getFormattedString(STARTING_INSTANCE_MSG, new String[] {instanceName}), IProgressMonitor.UNKNOWN);
pm.worked(1);
boolean finished = false;
while (!finished && !pm.isCanceled()) {
- DeltaCloudInstance instance = cloud.refreshInstance(instanceId);
+ instance = cloud.refreshInstance(instanceId);
if (instance != null && !instance.getState().equals(DeltaCloudInstance.PENDING))
break;
Thread.sleep(400);
@@ -96,12 +97,7 @@
// do nothing
} finally {
if (!pm.isCanceled()) {
- // cause a refresh to occur to all instance watchers
- // NOTE: this could be done also by getting current
- // instances and refreshing the one instance, but this
- // method is already being run in a job and we might
- // as well get updates for all instances
- cloud.getInstances();
+ cloud.addReplaceInstance(instance);
}
pm.done();
}
15 years, 7 months
JBoss Tools SVN: r24708 - branches/jbosstools-3.2.0.M2/usage/features.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2010-09-03 12:16:40 -0400 (Fri, 03 Sep 2010)
New Revision: 24708
Modified:
branches/jbosstools-3.2.0.M2/usage/features/pom.xml
Log:
test feature and test plugin magically back in SVN; reenable in pom
Modified: branches/jbosstools-3.2.0.M2/usage/features/pom.xml
===================================================================
--- branches/jbosstools-3.2.0.M2/usage/features/pom.xml 2010-09-03 16:15:42 UTC (rev 24707)
+++ branches/jbosstools-3.2.0.M2/usage/features/pom.xml 2010-09-03 16:16:40 UTC (rev 24708)
@@ -8,7 +8,7 @@
<packaging>pom</packaging>
<modules>
<module>org.jboss.tools.usage.feature</module>
- <!-- <module>org.jboss.tools.usage.test.feature</module> -->
+ <module>org.jboss.tools.usage.test.feature</module>
</modules>
</project>
15 years, 7 months
JBoss Tools SVN: r24706 - in trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui: views and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: bfitzpat
Date: 2010-09-03 12:12:28 -0400 (Fri, 03 Sep 2010)
New Revision: 24706
Modified:
trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/messages/JBossWSUI.properties
trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/messages/JBossWSUIMessages.java
trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/views/WSDLBrowseDialog.java
Log:
OPEN - issue JBIDE-6999: [Tester] Can't test a valid WSDL with no services, but user gets no feedback in WSDL browse dialog
https://jira.jboss.org/browse/JBIDE-6999
Modified: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/messages/JBossWSUI.properties
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/messages/JBossWSUI.properties 2010-09-03 16:07:40 UTC (rev 24705)
+++ trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/messages/JBossWSUI.properties 2010-09-03 16:12:28 UTC (rev 24706)
@@ -153,6 +153,8 @@
WSDLBrowseDialog_FS_Browse=File system...
WSDLBrowseDialog_Group_Title=Select the service operation:
WSDLBrowseDialog_Message=Select the source WSDL in the workspace or file system, or provide a URL from which to download the WSDL.
+WSDLBrowseDialog_No_Services_Available=No Services Available in WSDL
+WSDLBrowseDialog_No_Services_Available_Warning=There are no services available in the selected WSDL. Please select a WSDL with services to test against.
WSDLBrowseDialog_Operation_Field=Operation:
WSDLBrowseDialog_Port_Field=Port:
WSDLBrowseDialog_Service_Field=Service:
Modified: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/messages/JBossWSUIMessages.java
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/messages/JBossWSUIMessages.java 2010-09-03 16:07:40 UTC (rev 24705)
+++ trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/messages/JBossWSUIMessages.java 2010-09-03 16:12:28 UTC (rev 24706)
@@ -114,6 +114,24 @@
public static String JBossWS_DelimitedStringList_EditValue_Dialog_Title;
public static String JBossWS_DelimitedStringList_EditValue_Dialog_Message;
+ public static String JBossWSAnnotatedClassWizard_Annotated_Class_WS_Wizard_Title;
+ public static String JBossWSAnnotatedClassWizardPage_Application_Class_Browse_btn;
+ public static String JBossWSAnnotatedClassWizardPage_Application_Class_field;
+ public static String JBossWSAnnotatedClassWizardPage_JAXRS_Button;
+ public static String JBossWSAnnotatedClassWizardPage_JAXWS_Button;
+ public static String JBossWSAnnotatedClassWizardPage_package_browse_btn;
+ public static String JBossWSAnnotatedClassWizardPage_package_name_field;
+ public static String JBossWSAnnotatedClassWizardPage_PageDescription;
+ public static String JBossWSAnnotatedClassWizardPage_PageTitle;
+ public static String JBossWSAnnotatedClassWizardPage_Project_Group;
+ public static String JBossWSAnnotatedClassWizardPage_Projects_Combo_Tooltip;
+ public static String JBossWSAnnotatedClassWizardPage_Service_class_Browse_btn;
+ public static String JBossWSAnnotatedClassWizardPage_Service_class_field;
+ public static String JBossWSAnnotatedClassWizardPage_Service_implementation_group;
+ public static String JBossWSAnnotatedClassWizardPage_Service_Name_field;
+ public static String JBossWSAnnotatedClassWizardPage_Update_Web_xml_checkbox;
+ public static String JBossWSAnnotatedClassWizardPage_Web_Service_Group;
+ public static String JBossWSAnnotatedClassWizardPage_WS_Tech_Group;
public static String JAXRSWSTestView_Action_URL_Label;
public static String JAXRSWSTestView_Button_Get_From_WSDL;
public static String JAXRSWSTestView_Configure_Monitor_Button;
@@ -173,6 +191,8 @@
public static String WSDLBrowseDialog_FS_Browse;
public static String WSDLBrowseDialog_Group_Title;
public static String WSDLBrowseDialog_Message;
+ public static String WSDLBrowseDialog_No_Services_Available;
+ public static String WSDLBrowseDialog_No_Services_Available_Warning;
public static String WSDLBrowseDialog_Operation_Field;
public static String WSDLBrowseDialog_Port_Field;
public static String WSDLBrowseDialog_Service_Field;
Modified: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/views/WSDLBrowseDialog.java
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/views/WSDLBrowseDialog.java 2010-09-03 16:07:40 UTC (rev 24705)
+++ trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/views/WSDLBrowseDialog.java 2010-09-03 16:12:28 UTC (rev 24706)
@@ -567,9 +567,13 @@
}
private void updateServiceCombo () {
+ serviceCombo.setEnabled(true);
+ portCombo.setEnabled(true);
+ opList.setEnabled(true);
serviceCombo.removeAll();
portCombo.removeAll();
opList.removeAll();
+ getButton(IDialogConstants.OK_ID).setEnabled(true);
if (wsdlDefinition != null && wsdlDefinition.getServices() != null && !wsdlDefinition.getServices().isEmpty()) {
Iterator<?> iter = wsdlDefinition.getServices().values().iterator();
@@ -583,6 +587,15 @@
serviceTextValue = serviceCombo.getText();
}
updatePortCombo();
+ } else {
+ // no services
+ serviceCombo.add(JBossWSUIMessages.WSDLBrowseDialog_No_Services_Available);
+ serviceCombo.select(0);
+ setMessage(JBossWSUIMessages.WSDLBrowseDialog_No_Services_Available_Warning, IMessageProvider.WARNING);
+ serviceCombo.setEnabled(false);
+ portCombo.setEnabled(false);
+ opList.setEnabled(false);
+ getButton(IDialogConstants.OK_ID).setEnabled(false);
}
}
15 years, 7 months
JBoss Tools SVN: r24705 - in branches/jbosstools-3.2.0.M2/gwt/plugins/org.jboss.tools.gwt.core: src/org/jboss/tools/gwt/core and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2010-09-03 12:07:40 -0400 (Fri, 03 Sep 2010)
New Revision: 24705
Modified:
branches/jbosstools-3.2.0.M2/gwt/plugins/org.jboss.tools.gwt.core/META-INF/MANIFEST.MF
branches/jbosstools-3.2.0.M2/gwt/plugins/org.jboss.tools.gwt.core/src/org/jboss/tools/gwt/core/GWTInstallFacetDelegate.java
branches/jbosstools-3.2.0.M2/gwt/plugins/org.jboss.tools.gwt.core/src/org/jboss/tools/gwt/core/util/ProjectUtils.java
Log:
[JBIDE-6954] various cleanups, proper exception handling now
Modified: branches/jbosstools-3.2.0.M2/gwt/plugins/org.jboss.tools.gwt.core/META-INF/MANIFEST.MF
===================================================================
--- branches/jbosstools-3.2.0.M2/gwt/plugins/org.jboss.tools.gwt.core/META-INF/MANIFEST.MF 2010-09-03 16:03:16 UTC (rev 24704)
+++ branches/jbosstools-3.2.0.M2/gwt/plugins/org.jboss.tools.gwt.core/META-INF/MANIFEST.MF 2010-09-03 16:07:40 UTC (rev 24705)
@@ -26,4 +26,5 @@
Export-Package: org.jboss.tools.gwt.core,
org.jboss.tools.gwt.core.util
Bundle-ActivationPolicy: lazy
+Import-Package: org.jboss.tools.common.model.project
Modified: branches/jbosstools-3.2.0.M2/gwt/plugins/org.jboss.tools.gwt.core/src/org/jboss/tools/gwt/core/GWTInstallFacetDelegate.java
===================================================================
--- branches/jbosstools-3.2.0.M2/gwt/plugins/org.jboss.tools.gwt.core/src/org/jboss/tools/gwt/core/GWTInstallFacetDelegate.java 2010-09-03 16:03:16 UTC (rev 24704)
+++ branches/jbosstools-3.2.0.M2/gwt/plugins/org.jboss.tools.gwt.core/src/org/jboss/tools/gwt/core/GWTInstallFacetDelegate.java 2010-09-03 16:07:40 UTC (rev 24705)
@@ -25,7 +25,6 @@
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.core.runtime.Path;
import org.eclipse.core.runtime.preferences.IEclipsePreferences;
import org.eclipse.core.runtime.preferences.IScopeContext;
@@ -44,54 +43,64 @@
import org.eclipse.jst.javaee.web.WebApp;
import org.eclipse.jst.javaee.web.WebFactory;
import org.eclipse.jst.javaee.web.WelcomeFileList;
+import org.eclipse.wst.common.componentcore.ModuleCoreNature;
import org.eclipse.wst.common.project.facet.core.IDelegate;
import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
import org.jboss.tools.common.EclipseUtil;
import org.jboss.tools.common.log.LogHelper;
+import org.jboss.tools.common.model.project.ProjectHome;
import org.jboss.tools.gwt.core.internal.GWTCoreActivator;
import org.jboss.tools.gwt.core.util.ProjectUtils;
import org.jboss.tools.usage.util.StatusUtils;
import org.osgi.service.prefs.BackingStoreException;
/**
- * @author adietish
+ * @author Andre Dietisheim
*/
public class GWTInstallFacetDelegate implements IDelegate {
public void execute(IProject project, IProjectFacetVersion projectFacetVersion, Object config,
IProgressMonitor monitor) throws CoreException {
- try {
- IJavaProject javaProject = JavaCore.create(project);
+ IJavaProject javaProject = JavaCore.create(project);
- addNature(javaProject, monitor);
- addClasspathContainer(javaProject, monitor);
+ addGwtNature(javaProject, monitor);
+ addClasspathContainer(javaProject, monitor);
- IPath webContentPath = ProjectUtils.getWebContentRootPath(javaProject.getProject());
- Assert.isTrue(webContentPath != null && !webContentPath.isEmpty(),
- MessageFormat
- .format("no web content folder was found in project {0}", javaProject.getElementName()));
+ addModuleCoreNature(project, monitor);
+ IPath webContentPath = getWebContentFolder(project, monitor);
- createWebApplicationPreferences(project, webContentPath, javaProject, monitor);
- configureOutputFolder(webContentPath, javaProject, monitor);
+ createWebApplicationPreferences(project, webContentPath, javaProject, monitor);
+ configureOutputFolder(webContentPath, javaProject, monitor);
- List<IPath> srcFolderPaths = ProjectUtils.getSourceFolders(javaProject);
- GWTInstallDataModelProvider dataModel = (GWTInstallDataModelProvider) config;
- createSample(srcFolderPaths, webContentPath, dataModel, javaProject, monitor);
+ List<IPath> srcFolderPaths = ProjectUtils.getSourceFolders(javaProject);
+ GWTInstallDataModelProvider dataModel = (GWTInstallDataModelProvider) config;
+ createSample(srcFolderPaths, webContentPath, dataModel, javaProject, monitor);
- configureWebXml(project, monitor);
- } catch (Exception e) {
- throw new CoreException(StatusUtils.getErrorStatus(GWTCoreActivator.PLUGIN_ID, "Could not create gwt facet.", e));
- }
+ configureWebXml(project, monitor);
}
- private void addNature(IJavaProject javaProject, IProgressMonitor monitor) throws CoreException {
- monitor.subTask("adding gwt nature");
+ private IPath getWebContentFolder(IProject project, IProgressMonitor monitor) throws CoreException {
+ IPath webContentPath = ProjectHome.getFirstWebContentPath(project);
+ Assert.isTrue(webContentPath != null && !webContentPath.isEmpty(),
+ MessageFormat
+ .format("No web content folder was found in project {0}", project.getName()));
+ return webContentPath;
+ }
+ private void addGwtNature(IJavaProject javaProject, IProgressMonitor monitor) throws CoreException {
+ monitor.subTask("Adding GWT nature");
+
EclipseUtil.addNatureToProject(javaProject.getProject(), IGoogleEclipsePluginConstants.GWT_NATURE);
}
+ private void addModuleCoreNature(IProject project, IProgressMonitor monitor) throws CoreException {
+ monitor.subTask("Adding module core nature");
+
+ ModuleCoreNature.addModuleCoreNatureIfNecessary(project, monitor);
+ }
+
private void addClasspathContainer(IJavaProject javaProject, IProgressMonitor monitor) throws CoreException {
- monitor.subTask("adding gwt container to classpath");
+ monitor.subTask("Adding gwt container to classpath");
IClasspathEntry entry = JavaCore.newContainerEntry(new Path(IGoogleEclipsePluginConstants.GWT_CONTAINER_ID),
false);
@@ -99,43 +108,52 @@
}
private void createWebApplicationPreferences(IProject project, IPath webContentPath,
- IJavaProject javaProject, IProgressMonitor monitor) throws BackingStoreException, CoreException {
- monitor.subTask("creating web application preferences");
+ IJavaProject javaProject, IProgressMonitor monitor) throws CoreException {
+ try {
+ monitor.subTask("creating web application preferences");
- IScopeContext projectScope = new ProjectScope(project);
- IEclipsePreferences preferences = projectScope.getNode(IGoogleEclipsePluginConstants.GDT_PLUGIN_ID);
+ IScopeContext projectScope = new ProjectScope(project);
+ IEclipsePreferences preferences = projectScope.getNode(IGoogleEclipsePluginConstants.GDT_PLUGIN_ID);
- preferences.put(IGoogleEclipsePluginConstants.WAR_SRCDIR_KEY,
- webContentPath.makeRelativeTo(javaProject.getPath()).toString());
- preferences.put(IGoogleEclipsePluginConstants.WAR_SRCDIR_ISOUTPUT_KEY,
- IGoogleEclipsePluginConstants.WAR_SRCDIR_ISOUTPUT_DEFAULTVALUE);
- preferences.flush();
+ preferences.put(IGoogleEclipsePluginConstants.WAR_SRCDIR_KEY, webContentPath.makeRelativeTo(project.getFullPath()).toString());
+ preferences.put(IGoogleEclipsePluginConstants.WAR_SRCDIR_ISOUTPUT_KEY,
+ IGoogleEclipsePluginConstants.WAR_SRCDIR_ISOUTPUT_DEFAULTVALUE);
+ preferences.flush();
+ } catch (BackingStoreException e) {
+ throw new CoreException(StatusUtils.getErrorStatus(GWTCoreActivator.PLUGIN_ID,
+ "Could not save project preferences", e));
+ }
}
- private void configureOutputFolder(IPath webContentProjectPath, IJavaProject javaProject, IProgressMonitor monitor)
+ private void configureOutputFolder(IPath webContentProjectPath, final IJavaProject javaProject, IProgressMonitor monitor)
throws CoreException, JavaModelException {
- monitor.subTask("configuring output folder");
- IPath outputFolderProjectPath = webContentProjectPath.append(new Path(
- IGoogleEclipsePluginConstants.OUTPUT_FOLDER_DEFAULTVALUE));
- IFolder outputWorkspaceFolder = javaProject.getProject().getWorkspace().getRoot().getFolder(
- outputFolderProjectPath);
- if (!outputWorkspaceFolder.exists()) {
- outputWorkspaceFolder.create(true, true, monitor);
- }
- javaProject.setOutputLocation(outputWorkspaceFolder.getFullPath(), new NullProgressMonitor());
+ IProject project = javaProject.getProject();
+ monitor.subTask("Configuring output folder");
+ IPath outputFolderProjectPath = webContentProjectPath.append(new Path(IGoogleEclipsePluginConstants.OUTPUT_FOLDER_DEFAULTVALUE));
+ final IFolder outputWorkspaceFolder = project.getWorkspace().getRoot().getFolder(outputFolderProjectPath);
+ project.getWorkspace().run(
+ new IWorkspaceRunnable() {
+ public void run(IProgressMonitor monitor) throws CoreException {
+ if (!outputWorkspaceFolder.exists()) {
+ ProjectUtils.create(outputWorkspaceFolder, monitor);
+ }
+ javaProject.setOutputLocation(outputWorkspaceFolder.getFullPath(), monitor);
+ }
+ }, monitor);
}
private void createSample(final List<IPath> srcPaths, final IPath webContentPath,
GWTInstallDataModelProvider dataModel, final IJavaProject javaProject, IProgressMonitor monitor)
- throws IOException, CoreException {
+ throws CoreException {
if (srcPaths.size() <= 0) {
- LogHelper.logWarning(GWTCoreActivator.PLUGIN_ID, MessageFormat.format("no source folders were found in project {0}", javaProject.getElementName()));
+ LogHelper.logWarning(GWTCoreActivator.PLUGIN_ID,
+ MessageFormat.format("No source folders were found in project {0}", javaProject.getElementName()));
return;
}
if (dataModel.isGenerateSampleCode()) {
- monitor.subTask("creating sample code");
+ monitor.subTask("Creating sample code");
javaProject.getProject().getWorkspace().run(new IWorkspaceRunnable() {
public void run(IProgressMonitor monitor) throws CoreException {
@@ -149,7 +167,8 @@
unzipWebContent(webContentPath, javaProject);
} catch (IOException e) {
- LogHelper.logError(GWTCoreActivator.PLUGIN_ID, "Could not create gwt facet", e);
+ throw new CoreException(StatusUtils.getErrorStatus(GWTCoreActivator.PLUGIN_ID,
+ "Could not unzip samples", e));
}
}
Modified: branches/jbosstools-3.2.0.M2/gwt/plugins/org.jboss.tools.gwt.core/src/org/jboss/tools/gwt/core/util/ProjectUtils.java
===================================================================
--- branches/jbosstools-3.2.0.M2/gwt/plugins/org.jboss.tools.gwt.core/src/org/jboss/tools/gwt/core/util/ProjectUtils.java 2010-09-03 16:03:16 UTC (rev 24704)
+++ branches/jbosstools-3.2.0.M2/gwt/plugins/org.jboss.tools.gwt.core/src/org/jboss/tools/gwt/core/util/ProjectUtils.java 2010-09-03 16:07:40 UTC (rev 24705)
@@ -24,8 +24,10 @@
import org.eclipse.core.resources.IFolder;
import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
import org.eclipse.core.runtime.Assert;
import org.eclipse.core.runtime.AssertionFailedException;
+import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.Path;
@@ -81,27 +83,6 @@
javaProject.setRawClasspath(newClasspath, monitor);
}
- /**
- * Returns the path of the web content folder in the given project. The path
- * returned is relative to the workspace.
- *
- * @param project
- * the project to return the web content folder for
- * @return the path of the web content folder (relative to the workspace)
- */
- public static IPath getWebContentRootPath(IProject project) {
- if (!ModuleCoreNature.isFlexibleProject(project)) {
- return project.getFullPath();
- }
- IPath path = null;
- IVirtualComponent component = ComponentCore.createComponent(project);
- if (component != null && component.exists()) {
- path = component.getRootFolder().getWorkspaceRelativePath();
- } else {
- path = project.getFullPath();
- }
- return path;
- }
/**
* Unzips the given ZipInputStream to the given folder.
@@ -203,5 +184,27 @@
return inputStream;
}
+ /**
+ * Creates the given resource and all its parents (recursively)
+ *
+ * @param resource
+ * @param monitor
+ * @throws CoreException
+ */
+ public static void create(IResource resource, IProgressMonitor monitor) throws CoreException {
+ if (resource.exists())
+ return;
+ create(resource.getParent(), monitor);
+ switch (resource.getType()) {
+ case IResource.FOLDER:
+ ((IFolder) resource).create(IResource.NONE, true, null);
+ break;
+ case IResource.PROJECT:
+ ((IProject) resource).create(monitor);
+ ((IProject) resource).open(monitor);
+ break;
+ }
+ }
+
}
15 years, 7 months
JBoss Tools SVN: r24704 - trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/src/action/org/domain/SeamWebWarTestProject/session.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2010-09-03 12:03:16 -0400 (Fri, 03 Sep 2010)
New Revision: 24704
Added:
trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/src/action/org/domain/SeamWebWarTestProject/session/NonComponentWithCreateMethod.java
trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/src/action/org/domain/SeamWebWarTestProject/session/NonComponentWithObserverMethod.java
trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/src/action/org/domain/SeamWebWarTestProject/session/NonComponentWithUnwrapMethod.java
Log:
https://jira.jboss.org/browse/JBIDE-6877
Added: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/src/action/org/domain/SeamWebWarTestProject/session/NonComponentWithCreateMethod.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/src/action/org/domain/SeamWebWarTestProject/session/NonComponentWithCreateMethod.java (rev 0)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/src/action/org/domain/SeamWebWarTestProject/session/NonComponentWithCreateMethod.java 2010-09-03 16:03:16 UTC (rev 24704)
@@ -0,0 +1,20 @@
+package org.domain.SeamWebWarTestProject.session;
+
+import org.jboss.seam.annotations.Create;
+
+public class NonComponentWithCreateMethod {
+
+ private String abc;
+
+ @Create
+ public void createMethod(){
+
+ }
+ public String getAbc() {
+ return abc;
+ }
+
+ public void setAbc(String abc) {
+ this.abc = abc;
+ }
+}
\ No newline at end of file
Property changes on: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/src/action/org/domain/SeamWebWarTestProject/session/NonComponentWithCreateMethod.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/src/action/org/domain/SeamWebWarTestProject/session/NonComponentWithObserverMethod.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/src/action/org/domain/SeamWebWarTestProject/session/NonComponentWithObserverMethod.java (rev 0)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/src/action/org/domain/SeamWebWarTestProject/session/NonComponentWithObserverMethod.java 2010-09-03 16:03:16 UTC (rev 24704)
@@ -0,0 +1,20 @@
+package org.domain.SeamWebWarTestProject.session;
+
+import org.jboss.seam.annotations.Observer;
+
+public class NonComponentWithObserverMethod {
+
+ private String abc;
+
+ @Observer
+ public void observerMethod(){
+
+ }
+ public String getAbc() {
+ return abc;
+ }
+
+ public void setAbc(String abc) {
+ this.abc = abc;
+ }
+}
\ No newline at end of file
Property changes on: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/src/action/org/domain/SeamWebWarTestProject/session/NonComponentWithObserverMethod.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/src/action/org/domain/SeamWebWarTestProject/session/NonComponentWithUnwrapMethod.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/src/action/org/domain/SeamWebWarTestProject/session/NonComponentWithUnwrapMethod.java (rev 0)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/src/action/org/domain/SeamWebWarTestProject/session/NonComponentWithUnwrapMethod.java 2010-09-03 16:03:16 UTC (rev 24704)
@@ -0,0 +1,20 @@
+package org.domain.SeamWebWarTestProject.session;
+
+import org.jboss.seam.annotations.Unwrap;
+
+public class NonComponentWithUnwrapMethod {
+
+ private String abc;
+
+ @Unwrap
+ public void unwrapMethod(){
+
+ }
+ public String getAbc() {
+ return abc;
+ }
+
+ public void setAbc(String abc) {
+ this.abc = abc;
+ }
+}
\ No newline at end of file
Property changes on: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/src/action/org/domain/SeamWebWarTestProject/session/NonComponentWithUnwrapMethod.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
15 years, 7 months
JBoss Tools SVN: r24703 - in trunk/seam: tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/marker and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2010-09-03 12:02:37 -0400 (Fri, 03 Sep 2010)
New Revision: 24703
Modified:
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/marker/AbstractSeamMarkerResolution.java
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/marker/AddAnnotaionMarkerResolution.java
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/marker/DeleteAnnotaionMarkerResolution.java
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/marker/SeamProblemMarkerResolutionGenerator.java
trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/marker/SeamMarkerResolutionTest.java
Log:
https://jira.jboss.org/browse/JBIDE-6877
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/marker/AbstractSeamMarkerResolution.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/marker/AbstractSeamMarkerResolution.java 2010-09-03 15:55:04 UTC (rev 24702)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/marker/AbstractSeamMarkerResolution.java 2010-09-03 16:02:37 UTC (rev 24703)
@@ -10,12 +10,14 @@
******************************************************************************/
package org.jboss.tools.seam.ui.marker;
+import java.util.Map;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IMarker;
import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.jdt.core.IAnnotatable;
import org.eclipse.jdt.core.IAnnotation;
@@ -30,17 +32,25 @@
import org.eclipse.ui.IMarkerResolution2;
import org.jboss.tools.common.EclipseUtil;
import org.jboss.tools.common.model.util.EclipseJavaUtil;
+import org.jboss.tools.seam.core.ISeamProject;
+import org.jboss.tools.seam.core.SeamCorePlugin;
import org.jboss.tools.seam.ui.SeamGuiPlugin;
+import org.jboss.tools.seam.ui.internal.project.facet.SeamValidatorFactory;
/**
* @author Daniel Azarov
*/
public abstract class AbstractSeamMarkerResolution implements
IMarkerResolution2 {
+ protected String label;
+ protected String qualifiedName;
+
protected IFile file;
protected int start, end;
- public AbstractSeamMarkerResolution(IFile file, int start, int end){
+ public AbstractSeamMarkerResolution(String label, String qualifiedName, IFile file, int start, int end){
+ this.label = label;
+ this.qualifiedName = qualifiedName;
this.file = file;
this.start = start;
this.end = end;
@@ -109,7 +119,33 @@
return name;
}
- protected void addAnnotation(String annotationTypeName, String annotationString){
+ protected boolean validateComponentName(String value){
+ ISeamProject seamProject = getSeamProject();
+ Map<String, IStatus> errors = SeamValidatorFactory.SEAM_COMPONENT_NAME_VALIDATOR.validate(value, seamProject);
+ if(errors.isEmpty())
+ return true;
+
+ return false;
+ }
+
+ protected ISeamProject getSeamProject(){
+ return SeamCorePlugin.getSeamProject(file.getProject(), true);
+ }
+
+ protected String generateComponentName(String className){
+ String componentName = className.toLowerCase();
+ if(validateComponentName(componentName))
+ return componentName;
+ int index = 2;
+ String name = componentName;
+ while(!validateComponentName(componentName) && index < 100){
+ name = componentName+index;
+ index++;
+ }
+ return name;
+ }
+
+ protected void addAnnotation(String annotationTypeName, String annotationString, boolean insertName){
try{
ICompilationUnit original = EclipseUtil.getCompilationUnit(file);
ICompilationUnit compilationUnit = original.getWorkingCopy(new NullProgressMonitor());
@@ -117,13 +153,18 @@
IJavaElement javaElement = compilationUnit.getElementAt(start);
IType type = getType(javaElement);
if(type != null){
- if(compilationUnit.getImport(annotationTypeName) == null){
+ IImportDeclaration importDeclaration = compilationUnit.getImport(annotationTypeName);
+ if(importDeclaration == null || !importDeclaration.exists())
compilationUnit.createImport(annotationTypeName, null, new NullProgressMonitor());
- }
IBuffer buffer = compilationUnit.getBuffer();
- buffer.replace(type.getSourceRange().getOffset(), 0, annotationString+'\n');
+ String name="";
+ if(insertName){
+ name="(\""+generateComponentName(compilationUnit.findPrimaryType().getElementName())+"\")";
+ }
+
+ buffer.replace(type.getSourceRange().getOffset(), 0, annotationString+name+'\n');
compilationUnit.commitWorkingCopy(false, new NullProgressMonitor());
}
}catch(CoreException ex){
@@ -161,7 +202,7 @@
}
public String getLabel() {
- return null;
+ return label;
}
public void run(IMarker marker) {
@@ -174,4 +215,13 @@
public Image getImage() {
return null;
}
+
+ /**
+ * Returns qualified name for test purpose
+ * @return
+ */
+ public String getQualifiedName(){
+ return qualifiedName;
+ }
+
}
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/marker/AddAnnotaionMarkerResolution.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/marker/AddAnnotaionMarkerResolution.java 2010-09-03 15:55:04 UTC (rev 24702)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/marker/AddAnnotaionMarkerResolution.java 2010-09-03 16:02:37 UTC (rev 24703)
@@ -18,21 +18,15 @@
*/
public class AddAnnotaionMarkerResolution extends
AbstractSeamMarkerResolution {
- private String label;
- private String qualifiedName;
+ boolean insertName;
- public AddAnnotaionMarkerResolution(String label, String qualifiedName, IFile file, int start, int end){
- super(file, start, end);
- this.label = label;
- this.qualifiedName = qualifiedName;
+ public AddAnnotaionMarkerResolution(String label, String qualifiedName, IFile file, int start, int end, boolean insertName){
+ super(label, qualifiedName, file, start, end);
+ this.insertName = insertName;
}
- public String getLabel() {
- return label;
- }
-
public void run(IMarker marker) {
- addAnnotation(qualifiedName,"@"+getShortName(qualifiedName)); //$NON-NLS-1$
+ addAnnotation(qualifiedName,"@"+getShortName(qualifiedName), insertName); //$NON-NLS-1$
}
}
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/marker/DeleteAnnotaionMarkerResolution.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/marker/DeleteAnnotaionMarkerResolution.java 2010-09-03 15:55:04 UTC (rev 24702)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/marker/DeleteAnnotaionMarkerResolution.java 2010-09-03 16:02:37 UTC (rev 24703)
@@ -18,13 +18,9 @@
*/
public class DeleteAnnotaionMarkerResolution extends
AbstractSeamMarkerResolution {
- private String label;
- private String qualifiedName;
public DeleteAnnotaionMarkerResolution(String label, String qualifiedName, IFile file, int start, int end){
- super(file, start, end);
- this.label = label;
- this.qualifiedName = qualifiedName;
+ super(label, qualifiedName, file, start, end);
}
public String getLabel() {
@@ -34,13 +30,4 @@
public void run(IMarker marker) {
deleteAnnotation(qualifiedName);
}
-
- /**
- * Returns qualified name for test purpose
- * @return
- */
- public String getQualifiedName(){
- return qualifiedName;
- }
-
}
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/marker/SeamProblemMarkerResolutionGenerator.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/marker/SeamProblemMarkerResolutionGenerator.java 2010-09-03 15:55:04 UTC (rev 24702)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/marker/SeamProblemMarkerResolutionGenerator.java 2010-09-03 16:02:37 UTC (rev 24703)
@@ -66,17 +66,17 @@
return new IMarkerResolution[]{new DeleteAnnotaionMarkerResolution(SeamUIMessages.DELETE_DESTROY_ANNOTATION_MARKER_RESOLUTION_TITLE, "org.jboss.seam.annotations.Destroy", file, start, end)};
else if(messageId == SeamCoreValidator.CREATE_DOESNT_BELONG_TO_COMPONENT_MESSAGE_ID)
return new IMarkerResolution[]{
- new AddAnnotaionMarkerResolution(SeamUIMessages.ADD_NAME_ANNOTATION_MARKER_RESOLUTION_TITLE, "org.jboss.seam.annotations.Name", file, start, end),
+ new AddAnnotaionMarkerResolution(SeamUIMessages.ADD_NAME_ANNOTATION_MARKER_RESOLUTION_TITLE, "org.jboss.seam.annotations.Name", file, start, end, true),
new DeleteAnnotaionMarkerResolution(SeamUIMessages.DELETE_CREATE_ANNOTATION_MARKER_RESOLUTION_TITLE, "org.jboss.seam.annotations.Create", file, start, end)
};
else if(messageId == SeamCoreValidator.UNWRAP_DOESNT_BELONG_TO_COMPONENT_MESSAGE_ID)
return new IMarkerResolution[]{
- new AddAnnotaionMarkerResolution(SeamUIMessages.ADD_NAME_ANNOTATION_MARKER_RESOLUTION_TITLE, "org.jboss.seam.annotations.Name", file, start, end),
+ new AddAnnotaionMarkerResolution(SeamUIMessages.ADD_NAME_ANNOTATION_MARKER_RESOLUTION_TITLE, "org.jboss.seam.annotations.Name", file, start, end, true),
new DeleteAnnotaionMarkerResolution(SeamUIMessages.DELETE_UNWRAP_ANNOTATION_MARKER_RESOLUTION_TITLE, "org.jboss.seam.annotations.Unwrap", file, start, end)
};
else if(messageId == SeamCoreValidator.OBSERVER_DOESNT_BELONG_TO_COMPONENT_MESSAGE_ID)
return new IMarkerResolution[]{
- new AddAnnotaionMarkerResolution(SeamUIMessages.ADD_NAME_ANNOTATION_MARKER_RESOLUTION_TITLE, "org.jboss.seam.annotations.Name", file, start, end),
+ new AddAnnotaionMarkerResolution(SeamUIMessages.ADD_NAME_ANNOTATION_MARKER_RESOLUTION_TITLE, "org.jboss.seam.annotations.Name", file, start, end, true),
new DeleteAnnotaionMarkerResolution(SeamUIMessages.DELETE_OBSERVER_ANNOTATION_MARKER_RESOLUTION_TITLE, "org.jboss.seam.annotations.Observer", file, start, end)
};
Modified: trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/marker/SeamMarkerResolutionTest.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/marker/SeamMarkerResolutionTest.java 2010-09-03 15:55:04 UTC (rev 24702)
+++ trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/marker/SeamMarkerResolutionTest.java 2010-09-03 16:02:37 UTC (rev 24703)
@@ -21,6 +21,7 @@
import org.eclipse.core.runtime.CoreException;
import org.eclipse.ui.IMarkerResolution;
import org.eclipse.ui.ide.IDE;
+import org.jboss.tools.seam.ui.marker.AddAnnotaionMarkerResolution;
import org.jboss.tools.seam.ui.marker.DeleteAnnotaionMarkerResolution;
import org.jboss.tools.test.util.JobUtils;
@@ -183,5 +184,104 @@
}
assertTrue("The quickfix \"Delete @Unwrap annotation\" doesn't exist.", found);
}
+
+ public void testOnlyComponentClassCanHaveCreateMethodResolution() throws CoreException {
+ String TARGET_FILE_NAME = "src/action/org/domain/SeamWebWarTestProject/session/NonComponentWithCreateMethod.java";
+ IFile file = project.getFile(TARGET_FILE_NAME);
+
+ assertTrue("File - "+TARGET_FILE_NAME+" must be exists",file.exists());
+
+ IMarker[] markers = file.findMarkers(MARKER_TYPE, true, IResource.DEPTH_INFINITE);
+
+ boolean dFound = false;
+ boolean cFound = false;
+ for (int i = 0; i < markers.length; i++) {
+ IMarker marker = markers[i];
+ IMarkerResolution[] resolutions = IDE.getMarkerHelpRegistry()
+ .getResolutions(marker);
+ for (int j = 0; j < resolutions.length; j++) {
+ IMarkerResolution resolution = resolutions[j];
+ if (resolution instanceof DeleteAnnotaionMarkerResolution) {
+ assertEquals("org.jboss.seam.annotations.Create", ((DeleteAnnotaionMarkerResolution)resolution).getQualifiedName());
+ dFound = true;
+ }
+ if (resolution instanceof AddAnnotaionMarkerResolution) {
+ assertEquals("org.jboss.seam.annotations.Name", ((AddAnnotaionMarkerResolution)resolution).getQualifiedName());
+ cFound = true;
+ }
+ }
+ if (dFound && cFound) {
+ break;
+ }
+ }
+ assertTrue("The quickfix \"Delete @Create annotation\" doesn't exist.", dFound);
+ assertTrue("The quickfix \"Add @Name annotation\" doesn't exist.", cFound);
+ }
+
+ public void testOnlyComponentClassCanHaveUnwrapMethodResolution() throws CoreException {
+ String TARGET_FILE_NAME = "src/action/org/domain/SeamWebWarTestProject/session/NonComponentWithUnwrapMethod.java";
+ IFile file = project.getFile(TARGET_FILE_NAME);
+
+ assertTrue("File - "+TARGET_FILE_NAME+" must be exists",file.exists());
+
+ IMarker[] markers = file.findMarkers(MARKER_TYPE, true, IResource.DEPTH_INFINITE);
+
+ boolean dFound = false;
+ boolean cFound = false;
+ for (int i = 0; i < markers.length; i++) {
+ IMarker marker = markers[i];
+ IMarkerResolution[] resolutions = IDE.getMarkerHelpRegistry()
+ .getResolutions(marker);
+ for (int j = 0; j < resolutions.length; j++) {
+ IMarkerResolution resolution = resolutions[j];
+ if (resolution instanceof DeleteAnnotaionMarkerResolution) {
+ assertEquals("org.jboss.seam.annotations.Unwrap", ((DeleteAnnotaionMarkerResolution)resolution).getQualifiedName());
+ dFound = true;
+ }
+ if (resolution instanceof AddAnnotaionMarkerResolution) {
+ assertEquals("org.jboss.seam.annotations.Name", ((AddAnnotaionMarkerResolution)resolution).getQualifiedName());
+ cFound = true;
+ }
+ }
+ if (dFound && cFound) {
+ break;
+ }
+ }
+ assertTrue("The quickfix \"Delete @Unwrap annotation\" doesn't exist.", dFound);
+ assertTrue("The quickfix \"Add @Name annotation\" doesn't exist.", cFound);
+ }
+
+ public void testOnlyComponentClassCanHaveObserverMethodResolution() throws CoreException {
+ String TARGET_FILE_NAME = "src/action/org/domain/SeamWebWarTestProject/session/NonComponentWithObserverMethod.java";
+ IFile file = project.getFile(TARGET_FILE_NAME);
+
+ assertTrue("File - "+TARGET_FILE_NAME+" must be exists",file.exists());
+
+ IMarker[] markers = file.findMarkers(MARKER_TYPE, true, IResource.DEPTH_INFINITE);
+
+ boolean dFound = false;
+ boolean cFound = false;
+ for (int i = 0; i < markers.length; i++) {
+ IMarker marker = markers[i];
+ IMarkerResolution[] resolutions = IDE.getMarkerHelpRegistry()
+ .getResolutions(marker);
+ for (int j = 0; j < resolutions.length; j++) {
+ IMarkerResolution resolution = resolutions[j];
+ if (resolution instanceof DeleteAnnotaionMarkerResolution) {
+ assertEquals("org.jboss.seam.annotations.Observer", ((DeleteAnnotaionMarkerResolution)resolution).getQualifiedName());
+ dFound = true;
+ }
+ if (resolution instanceof AddAnnotaionMarkerResolution) {
+ assertEquals("org.jboss.seam.annotations.Name", ((AddAnnotaionMarkerResolution)resolution).getQualifiedName());
+ cFound = true;
+ }
+ }
+ if (dFound && cFound) {
+ break;
+ }
+ }
+ assertTrue("The quickfix \"Delete @Observer annotation\" doesn't exist.", dFound);
+ assertTrue("The quickfix \"Add @Name annotation\" doesn't exist.", cFound);
+ }
}
15 years, 7 months
JBoss Tools SVN: r24702 - branches/jbosstools-3.2.0.M2/usage/features.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2010-09-03 11:55:04 -0400 (Fri, 03 Sep 2010)
New Revision: 24702
Modified:
branches/jbosstools-3.2.0.M2/usage/features/pom.xml
Log:
if test plugin is gone, no point building test feature on which it depends (contains). Remove test feature from aggregation pom
Modified: branches/jbosstools-3.2.0.M2/usage/features/pom.xml
===================================================================
--- branches/jbosstools-3.2.0.M2/usage/features/pom.xml 2010-09-03 15:47:37 UTC (rev 24701)
+++ branches/jbosstools-3.2.0.M2/usage/features/pom.xml 2010-09-03 15:55:04 UTC (rev 24702)
@@ -8,7 +8,7 @@
<packaging>pom</packaging>
<modules>
<module>org.jboss.tools.usage.feature</module>
- <module>org.jboss.tools.usage.test.feature</module>
+ <!-- <module>org.jboss.tools.usage.test.feature</module> -->
</modules>
</project>
15 years, 7 months
JBoss Tools SVN: r24701 - branches/jbosstools-3.2.0.M2/gwt/plugins/org.jboss.tools.gwt.core.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2010-09-03 11:47:37 -0400 (Fri, 03 Sep 2010)
New Revision: 24701
Modified:
branches/jbosstools-3.2.0.M2/gwt/plugins/org.jboss.tools.gwt.core/plugin.xml
Log:
[JBIDE-6954] changed constraint OR to AND (jst.web AND jst.java)
Modified: branches/jbosstools-3.2.0.M2/gwt/plugins/org.jboss.tools.gwt.core/plugin.xml
===================================================================
--- branches/jbosstools-3.2.0.M2/gwt/plugins/org.jboss.tools.gwt.core/plugin.xml 2010-09-03 15:36:19 UTC (rev 24700)
+++ branches/jbosstools-3.2.0.M2/gwt/plugins/org.jboss.tools.gwt.core/plugin.xml 2010-09-03 15:47:37 UTC (rev 24701)
@@ -23,7 +23,7 @@
</requires>
<requires
facet="jst.java"
- version="5.0">
+ version="[5.0">
</requires>
</and>
</constraint>
@@ -32,16 +32,16 @@
facet="jboss.gwt"
version="1.4.0">
<constraint>
- <or>
+ <and>
<requires
facet="jst.web"
version="[2.4">
</requires>
<requires
facet="jst.java"
- version="5.0">
+ version="[5.0">
</requires>
- </or>
+ </and>
</constraint>
</project-facet-version>
<action
15 years, 7 months
JBoss Tools SVN: r24700 - branches/jbosstools-3.2.0.M2/gwt/plugins/org.jboss.tools.gwt.core.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2010-09-03 11:36:19 -0400 (Fri, 03 Sep 2010)
New Revision: 24700
Modified:
branches/jbosstools-3.2.0.M2/gwt/plugins/org.jboss.tools.gwt.core/plugin.xml
Log:
[JBIDE-6954] changed constraint OR to AND (jst.web AND jst.java)
Modified: branches/jbosstools-3.2.0.M2/gwt/plugins/org.jboss.tools.gwt.core/plugin.xml
===================================================================
--- branches/jbosstools-3.2.0.M2/gwt/plugins/org.jboss.tools.gwt.core/plugin.xml 2010-09-03 15:15:21 UTC (rev 24699)
+++ branches/jbosstools-3.2.0.M2/gwt/plugins/org.jboss.tools.gwt.core/plugin.xml 2010-09-03 15:36:19 UTC (rev 24700)
@@ -16,7 +16,7 @@
facet="jboss.gwt"
version="1.3.3">
<constraint>
- <or>
+ <and>
<requires
facet="jst.web"
version="[2.4">
@@ -25,7 +25,7 @@
facet="jst.java"
version="5.0">
</requires>
- </or>
+ </and>
</constraint>
</project-facet-version>
<project-facet-version
15 years, 7 months