JBoss Tools SVN: r44078 - in trunk/runtime/plugins: org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/download and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2012-09-27 03:43:04 -0400 (Thu, 27 Sep 2012)
New Revision: 44078
Modified:
trunk/runtime/plugins/org.jboss.tools.runtime.core/src/org/jboss/tools/runtime/core/internal/RuntimeExtensionManager.java
trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/download/DownloadRuntimeViewerDialog.java
Log:
JBIDE-12582 to trunk
Modified: trunk/runtime/plugins/org.jboss.tools.runtime.core/src/org/jboss/tools/runtime/core/internal/RuntimeExtensionManager.java
===================================================================
--- trunk/runtime/plugins/org.jboss.tools.runtime.core/src/org/jboss/tools/runtime/core/internal/RuntimeExtensionManager.java 2012-09-27 05:37:06 UTC (rev 44077)
+++ trunk/runtime/plugins/org.jboss.tools.runtime.core/src/org/jboss/tools/runtime/core/internal/RuntimeExtensionManager.java 2012-09-27 07:43:04 UTC (rev 44078)
@@ -284,11 +284,12 @@
Node node = runtimes.item(i);
if (node.getNodeType() == Node.ELEMENT_NODE) {
Element element = (Element) node;
- String id = element.getAttribute("id"); //$NON-NLS-1$
- String name = element.getAttribute("name"); //$NON-NLS-1$
- String version = element.getAttribute("version"); //$NON-NLS-1$
- String url = element.getAttribute("url"); //$NON-NLS-1$
- String disclaimer = element.getAttribute("disclaimer"); //$NON-NLS-1$
+ String id = element.getAttribute(ID);
+ String name = element.getAttribute(NAME);
+ String version = element.getAttribute(VERSION);
+ String url = element.getAttribute(URL);
+ String disclaimer = element.getAttribute(DISCLAIMER);
+ String licenseUrl = element.getAttribute(LICENSE_URL);
if (id == null || name == null || version == null || url == null) {
IStatus status = new Status(IStatus.WARNING,
RuntimeCoreActivator.PLUGIN_ID,
@@ -297,7 +298,8 @@
RuntimeCoreActivator.getDefault().getLog().log(status);
} else {
DownloadRuntime runtime = new DownloadRuntime(id, name, version, url);
- runtime.setDisclaimer("true".equals(disclaimer)); //$NON-NLS-1$
+ runtime.setLicenseURL(licenseUrl);
+ runtime.setDisclaimer(Boolean.parseBoolean(disclaimer));
map.put(id, runtime);
}
}
Modified: trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/download/DownloadRuntimeViewerDialog.java
===================================================================
--- trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/download/DownloadRuntimeViewerDialog.java 2012-09-27 05:37:06 UTC (rev 44077)
+++ trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/download/DownloadRuntimeViewerDialog.java 2012-09-27 07:43:04 UTC (rev 44078)
@@ -234,6 +234,8 @@
if( licenseApproved(downloadRuntime)) {
saveLocationDialog = new DownloadRuntimeDialog(getShell(), downloadRuntime);
saveLocationDialog.open();
+ } else {
+ return;
}
}
}
13 years
JBoss Tools SVN: r44077 - in trunk: runtime/plugins/org.jboss.tools.runtime.core/src/org/jboss/tools/runtime/core/model and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2012-09-27 01:37:06 -0400 (Thu, 27 Sep 2012)
New Revision: 44077
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeWizardFragment.java
trunk/runtime/plugins/org.jboss.tools.runtime.core/src/org/jboss/tools/runtime/core/model/IDownloadRuntimes.java
trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/download/DownloadRuntimeDialog.java
trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/download/DownloadRuntimeViewerDialog.java
trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/download/DownloadRuntimes.java
Log:
JBIDE-12730 to trunk runtime download workflow
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeWizardFragment.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeWizardFragment.java 2012-09-27 05:04:31 UTC (rev 44076)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeWizardFragment.java 2012-09-27 05:37:06 UTC (rev 44077)
@@ -38,6 +38,7 @@
import org.eclipse.jface.viewers.SelectionChangedEvent;
import org.eclipse.jface.viewers.StructuredSelection;
import org.eclipse.jface.window.Window;
+import org.eclipse.jface.wizard.IWizardPage;
import org.eclipse.osgi.util.NLS;
import org.eclipse.swt.SWT;
import org.eclipse.swt.custom.BusyIndicator;
@@ -378,6 +379,11 @@
IRuntimeType type = getRuntimeType();
data.put(IDownloadRuntimes.RUNTIME_FILTER, new JBossASDownloadRuntimeFilter(type));
downloader.execute(data);
+ Boolean launched = (Boolean)data.get(IDownloadRuntimes.DOWNLOAD_LAUNCHED);
+ if( launched != null && launched.booleanValue()) {
+ ((IWizardPage)handle).getWizard().performCancel();
+ ((IWizardPage)handle).getWizard().getContainer().getShell().close();
+ }
}
}
}
Modified: trunk/runtime/plugins/org.jboss.tools.runtime.core/src/org/jboss/tools/runtime/core/model/IDownloadRuntimes.java
===================================================================
--- trunk/runtime/plugins/org.jboss.tools.runtime.core/src/org/jboss/tools/runtime/core/model/IDownloadRuntimes.java 2012-09-27 05:04:31 UTC (rev 44076)
+++ trunk/runtime/plugins/org.jboss.tools.runtime.core/src/org/jboss/tools/runtime/core/model/IDownloadRuntimes.java 2012-09-27 05:37:06 UTC (rev 44077)
@@ -14,5 +14,11 @@
*/
public static final String RUNTIME_FILTER = "download.runtimes.filter";
- void execute(HashMap<String, Object> data);
+ /**
+ * Is the download initialized (true) or canceled (false)?
+ */
+ public static final String DOWNLOAD_LAUNCHED = "is.download.launched";
+
+
+ public void execute(HashMap<String, Object> data);
}
Modified: trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/download/DownloadRuntimeDialog.java
===================================================================
--- trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/download/DownloadRuntimeDialog.java 2012-09-27 05:04:31 UTC (rev 44076)
+++ trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/download/DownloadRuntimeDialog.java 2012-09-27 05:37:06 UTC (rev 44077)
@@ -493,7 +493,7 @@
downloadJob.setUser(false);
downloadJob.schedule();
IProgressService progressService= PlatformUI.getWorkbench().getProgressService();
- progressService.showInDialog(getActiveShell(), downloadJob);
+ progressService.showInDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), downloadJob);
}
private IStatus downloadAndInstall(String selectedDirectory, String destinationDirectory, boolean deleteOnExit, IProgressMonitor monitor) {
Modified: trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/download/DownloadRuntimeViewerDialog.java
===================================================================
--- trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/download/DownloadRuntimeViewerDialog.java 2012-09-27 05:04:31 UTC (rev 44076)
+++ trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/download/DownloadRuntimeViewerDialog.java 2012-09-27 05:37:06 UTC (rev 44077)
@@ -59,7 +59,8 @@
private TableViewer viewer;
private Map<String, DownloadRuntime> downloadRuntimes;
-
+ private DownloadRuntimeDialog saveLocationDialog;
+
public DownloadRuntimeViewerDialog(Shell parentShell) {
this(parentShell, null);
}
@@ -231,8 +232,8 @@
if (object instanceof DownloadRuntime) {
DownloadRuntime downloadRuntime = (DownloadRuntime) object;
if( licenseApproved(downloadRuntime)) {
- DownloadRuntimeDialog dialog = new DownloadRuntimeDialog(getShell(), downloadRuntime);
- dialog.open();
+ saveLocationDialog = new DownloadRuntimeDialog(getShell(), downloadRuntime);
+ saveLocationDialog.open();
}
}
}
@@ -275,4 +276,7 @@
getButton(IDialogConstants.OK_ID).setEnabled(viewer.getSelection() != null);
}
+ public boolean isDownloading() {
+ return saveLocationDialog != null && saveLocationDialog.getReturnCode() == saveLocationDialog.OK;
+ }
}
Modified: trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/download/DownloadRuntimes.java
===================================================================
--- trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/download/DownloadRuntimes.java 2012-09-27 05:04:31 UTC (rev 44076)
+++ trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/download/DownloadRuntimes.java 2012-09-27 05:37:06 UTC (rev 44077)
@@ -9,6 +9,7 @@
public class DownloadRuntimes implements IDownloadRuntimes {
public static final String SHELL = IDownloadRuntimes.SHELL;
+ public static final String DOWNLOAD_LAUNCHED = IDownloadRuntimes.DOWNLOAD_LAUNCHED;
public DownloadRuntimes() {
@@ -24,6 +25,7 @@
// THis should also be done via a display.asynchexec
DownloadRuntimeViewerDialog dialog = new DownloadRuntimeViewerDialog(shell2, (IDownloadRuntimeFilter)filter);
dialog.open();
+ map.put(DOWNLOAD_LAUNCHED, dialog.isDownloading());
}
}
13 years
JBoss Tools SVN: r44075 - in trunk: common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/marker and 10 other directories.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2012-09-26 20:26:37 -0400 (Wed, 26 Sep 2012)
New Revision: 44075
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java
trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/marker/ConfigureProblemSeverityResolutionGenerator.java
trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/TempMarkerManager.java
trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/ValidationErrorManager.java
trunk/common/tests/org.jboss.tools.common.base.test/src/org/jboss/tools/common/base/test/QuickFixTestUtil.java
trunk/common/tests/org.jboss.tools.common.validation.test/src/org/jboss/tools/common/validation/test/TestValidator.java
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/FacesConfigValidator.java
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/composite/CompositeComponentValidator.java
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/validation/ELValidator.java
trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/validation/WebXMLCoreValidator.java
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamValidationErrorManager.java
trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/validation/StrutsCoreValidator.java
trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/validation/JaxrsMetamodelValidator.java
Log:
Configure Problem Severity should open project settings if they are enabled for the project https://issues.jboss.org/browse/JBIDE-12538
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java 2012-09-27 00:02:00 UTC (rev 44074)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java 2012-09-27 00:26:37 UTC (rev 44075)
@@ -2705,15 +2705,6 @@
}
}
- /*
- * (non-Javadoc)
- * @see org.jboss.tools.common.validation.ValidationErrorManager#getPreferencePageId()
- */
- @Override
- protected String getPreferencePageId() {
- return PREFERENCE_PAGE_ID;
- }
-
private static final String BUNDLE_NAME = "org.jboss.tools.cdi.internal.core.validation.messages";
/*
Modified: trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/marker/ConfigureProblemSeverityResolutionGenerator.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/marker/ConfigureProblemSeverityResolutionGenerator.java 2012-09-27 00:02:00 UTC (rev 44074)
+++ trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/marker/ConfigureProblemSeverityResolutionGenerator.java 2012-09-27 00:26:37 UTC (rev 44075)
@@ -155,11 +155,6 @@
return null;
}
- private String getPreferencePageId(IMarker marker)throws CoreException{
- String attribute = marker.getAttribute(ValidationErrorManager.PREFERENCE_PAGE_ID_NAME, null);
- return attribute;
- }
-
private String getPreferenceKey(Annotation annotation){
if(annotation instanceof TemporaryAnnotation){
if(((TemporaryAnnotation)annotation).getAttributes() != null){
@@ -175,21 +170,6 @@
return null;
}
- private String getPreferencePageId(Annotation annotation){
- if(annotation instanceof TemporaryAnnotation){
- if(((TemporaryAnnotation)annotation).getAttributes() != null){
- String attribute = (String)((TemporaryAnnotation)annotation).getAttributes().get(ValidationErrorManager.PREFERENCE_PAGE_ID_NAME);
- return attribute;
- }
- }else if(annotation instanceof TempJavaProblemAnnotation){
- if(((TempJavaProblemAnnotation)annotation).getAttributes() != null){
- String attribute = (String)((TempJavaProblemAnnotation)annotation).getAttributes().get(ValidationErrorManager.PREFERENCE_PAGE_ID_NAME);
- return attribute;
- }
- }
- return null;
- }
-
@Override
public boolean hasProposals(Annotation annotation, Position position) {
String preferenceKey = getPreferenceKey(annotation);
Modified: trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/TempMarkerManager.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/TempMarkerManager.java 2012-09-27 00:02:00 UTC (rev 44074)
+++ trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/TempMarkerManager.java 2012-09-27 00:26:37 UTC (rev 44075)
@@ -186,10 +186,8 @@
message.setAttribute(MESSAGE_ID_ATTRIBUTE_NAME, quickFixId);
}
messageCounter++;
- String preferencePageId = getPreferencePageId();
- if(preferencePageId != null && preferenceKey != null){
+ if(preferenceKey != null){
message.setAttribute(PREFERENCE_KEY_ATTRIBUTE_NAME, preferenceKey);
- message.setAttribute(PREFERENCE_PAGE_ID_NAME, preferencePageId);
}
String type = getMarkerType();
if(type!=null) {
Modified: trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/ValidationErrorManager.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/ValidationErrorManager.java 2012-09-27 00:02:00 UTC (rev 44074)
+++ trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/ValidationErrorManager.java 2012-09-27 00:26:37 UTC (rev 44075)
@@ -326,8 +326,6 @@
markers.clear();
}
- abstract protected String getPreferencePageId();
-
protected int getSeverity(String preferenceKey, IResource target) {
String preferenceValue = getPreference(target.getProject(), preferenceKey);
int severity = -1;
@@ -354,10 +352,8 @@
}
try {
if(marker!=null) {
- String preferencePageId = getPreferencePageId();
- if(preferencePageId != null && preferenceKey != null){
+ if(preferenceKey != null){
marker.setAttribute(PREFERENCE_KEY_ATTRIBUTE_NAME, preferenceKey);
- marker.setAttribute(PREFERENCE_PAGE_ID_NAME, preferencePageId);
}
}
} catch(CoreException e) {
Modified: trunk/common/tests/org.jboss.tools.common.base.test/src/org/jboss/tools/common/base/test/QuickFixTestUtil.java
===================================================================
--- trunk/common/tests/org.jboss.tools.common.base.test/src/org/jboss/tools/common/base/test/QuickFixTestUtil.java 2012-09-27 00:02:00 UTC (rev 44074)
+++ trunk/common/tests/org.jboss.tools.common.base.test/src/org/jboss/tools/common/base/test/QuickFixTestUtil.java 2012-09-27 00:26:37 UTC (rev 44075)
@@ -214,7 +214,6 @@
message.setAttribute(TempMarkerManager.AS_YOU_TYPE_VALIDATION_ANNOTATION_ATTRIBUTE, Boolean.TRUE);
message.setAttribute(TempMarkerManager.MESSAGE_ID_ATTRIBUTE_NAME, quickFixId);
message.setAttribute(TempMarkerManager.PREFERENCE_KEY_ATTRIBUTE_NAME, "preferenceKey");
- message.setAttribute(TempMarkerManager.PREFERENCE_PAGE_ID_NAME, "pref_page_id");
message.setAttribute(TempMarkerManager.MESSAGE_TYPE_ATTRIBUTE_NAME, problemType);
TempJavaProblem problem = new TempJavaProblem(message, "origin");
@@ -228,7 +227,6 @@
attributes.put(TempMarkerManager.AS_YOU_TYPE_VALIDATION_ANNOTATION_ATTRIBUTE, Boolean.TRUE);
attributes.put(TempMarkerManager.MESSAGE_ID_ATTRIBUTE_NAME, quickFixId);
attributes.put(TempMarkerManager.PREFERENCE_KEY_ATTRIBUTE_NAME, "preferenceKey");
- attributes.put(TempMarkerManager.PREFERENCE_PAGE_ID_NAME, "pref_page_id");
attributes.put(TempMarkerManager.MESSAGE_TYPE_ATTRIBUTE_NAME, problemType);
annotation.setAttributes(attributes);
Modified: trunk/common/tests/org.jboss.tools.common.validation.test/src/org/jboss/tools/common/validation/test/TestValidator.java
===================================================================
--- trunk/common/tests/org.jboss.tools.common.validation.test/src/org/jboss/tools/common/validation/test/TestValidator.java 2012-09-27 00:02:00 UTC (rev 44074)
+++ trunk/common/tests/org.jboss.tools.common.validation.test/src/org/jboss/tools/common/validation/test/TestValidator.java 2012-09-27 00:26:37 UTC (rev 44075)
@@ -102,11 +102,6 @@
}
@Override
- protected String getPreferencePageId() {
- return null;
- }
-
- @Override
protected void registerPreferenceInfo() {
// TODO Auto-generated method stub
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/FacesConfigValidator.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/FacesConfigValidator.java 2012-09-27 00:02:00 UTC (rev 44074)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/FacesConfigValidator.java 2012-09-27 00:26:37 UTC (rev 44075)
@@ -356,11 +356,6 @@
return JSFSeverityPreferences.isValidationEnabled(project);
}
- @Override
- protected String getPreferencePageId() {
- return PREFERENCE_PAGE_ID;
- }
-
private Set<IFile> collectFiles(IProject project, Set<IFile> changedFiles, IProjectValidationContext context) {
Set<IFile> files = new HashSet<IFile>();
if(context == null) {
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/composite/CompositeComponentValidator.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/composite/CompositeComponentValidator.java 2012-09-27 00:02:00 UTC (rev 44074)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/composite/CompositeComponentValidator.java 2012-09-27 00:26:37 UTC (rev 44075)
@@ -383,15 +383,6 @@
/*
* (non-Javadoc)
- * @see org.jboss.tools.common.validation.ValidationErrorManager#getPreferencePageId()
- */
- @Override
- protected String getPreferencePageId() {
- return PREFERENCE_PAGE_ID;
- }
-
- /*
- * (non-Javadoc)
* @see org.jboss.tools.common.validation.TempMarkerManager#getMessageBundleName()
*/
@Override
Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/validation/WebXMLCoreValidator.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/validation/WebXMLCoreValidator.java 2012-09-27 00:02:00 UTC (rev 44074)
+++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/validation/WebXMLCoreValidator.java 2012-09-27 00:26:37 UTC (rev 44075)
@@ -289,11 +289,6 @@
}
@Override
- protected String getPreferencePageId() {
- return PREFERENCE_PAGE_ID;
- }
-
- @Override
protected void registerPreferenceInfo() {
if(PreferenceInfoManager.getPreferenceInfo(PROBLEM_TYPE) == null){
PreferenceInfoManager.register(PROBLEM_TYPE, new WebXMLPreferenceInfo());
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/validation/ELValidator.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/validation/ELValidator.java 2012-09-27 00:02:00 UTC (rev 44074)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/validation/ELValidator.java 2012-09-27 00:26:37 UTC (rev 44075)
@@ -38,7 +38,6 @@
import org.eclipse.wst.validation.internal.provisional.core.IReporter;
import org.eclipse.wst.validation.internal.provisional.core.IValidationContext;
import org.eclipse.wst.validation.internal.provisional.core.IValidator;
-import org.jboss.tools.common.CommonPlugin;
import org.jboss.tools.common.EclipseUtil;
import org.jboss.tools.common.el.core.ELReference;
import org.jboss.tools.common.el.core.model.ELExpression;
@@ -661,15 +660,6 @@
return true;
}
- /*
- * (non-Javadoc)
- * @see org.jboss.tools.common.validation.ValidationErrorManager#getPreferencePageId()
- */
- @Override
- protected String getPreferencePageId() {
- return PREFERENCE_PAGE_ID;
- }
-
private static final String BUNDLE_NAME = "org.jboss.tools.jst.web.kb.internal.validation.messages";
/*
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamValidationErrorManager.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamValidationErrorManager.java 2012-09-27 00:02:00 UTC (rev 44074)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamValidationErrorManager.java 2012-09-27 00:26:37 UTC (rev 44075)
@@ -40,9 +40,4 @@
public int getMaxNumberOfMarkersPerFile(IProject project) {
return SeamPreferences.getMaxNumberOfProblemMarkersPerFile(project);
}
-
- @Override
- protected String getPreferencePageId() {
- return PREFERENCE_PAGE_ID;
- }
}
\ No newline at end of file
Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/validation/StrutsCoreValidator.java
===================================================================
--- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/validation/StrutsCoreValidator.java 2012-09-27 00:02:00 UTC (rev 44074)
+++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/validation/StrutsCoreValidator.java 2012-09-27 00:26:37 UTC (rev 44075)
@@ -274,11 +274,6 @@
}
@Override
- protected String getPreferencePageId() {
- return PREFERENCE_PAGE_ID;
- }
-
- @Override
protected void registerPreferenceInfo() {
if(PreferenceInfoManager.getPreferenceInfo(PROBLEM_TYPE) == null){
PreferenceInfoManager.register(PROBLEM_TYPE, new StrutsPreferenceInfo());
Modified: trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/validation/JaxrsMetamodelValidator.java
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/validation/JaxrsMetamodelValidator.java 2012-09-27 00:02:00 UTC (rev 44074)
+++ trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/validation/JaxrsMetamodelValidator.java 2012-09-27 00:26:37 UTC (rev 44075)
@@ -272,12 +272,6 @@
return JaxrsPreferences.getInstance().getProjectPreference(project, preferenceKey);
}
- @Override
- protected String getPreferencePageId() {
- return PREFERENCE_PAGE_ID;
- }
-
- @Override
public int getMaxNumberOfMarkersPerFile(IProject project) {
return JaxrsPreferences.getMaxNumberOfProblemMarkersPerFile(project);
}
13 years
JBoss Tools SVN: r44074 - in trunk: common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/marker and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2012-09-26 20:02:00 -0400 (Wed, 26 Sep 2012)
New Revision: 44074
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/marker/CDIQuickFixTest.java
trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/marker/ConfigureProblemSeverityResolutionGenerator.java
trunk/common/tests/org.jboss.tools.common.base.test/src/org/jboss/tools/common/base/test/QuickFixTestUtil.java
Log:
Configure Problem Severity should open project settings if they are enabled for the project https://issues.jboss.org/browse/JBIDE-12538
Modified: trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/marker/CDIQuickFixTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/marker/CDIQuickFixTest.java 2012-09-26 23:45:28 UTC (rev 44073)
+++ trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/marker/CDIQuickFixTest.java 2012-09-27 00:02:00 UTC (rev 44074)
@@ -2,6 +2,7 @@
import org.eclipse.core.runtime.CoreException;
import org.jboss.tools.cdi.core.test.tck.TCKTest;
+import org.jboss.tools.cdi.internal.core.validation.CDICoreValidator;
import org.jboss.tools.cdi.internal.core.validation.CDIValidationErrorManager;
import org.jboss.tools.cdi.ui.marker.AddAnnotationMarkerResolution;
import org.jboss.tools.cdi.ui.marker.AddLocalBeanMarkerResolution;
@@ -18,27 +19,23 @@
public class CDIQuickFixTest extends TCKTest {
private QuickFixTestUtil util = new QuickFixTestUtil();
-// private static boolean isSuspendedValidationDefaultValue;
-// public void setUp() throws Exception {
-// super.setUp();
-// isSuspendedValidationDefaultValue = ValidationFramework.getDefault().isSuspended();
-// ValidationFramework.getDefault().suspendAllValidation(false);
-// tckProject.refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor());
-// tckProject.build(IncrementalProjectBuilder.FULL_BUILD, new NullProgressMonitor());
-// }
-//
-// public void tearDown() throws Exception {
-// ValidationFramework.getDefault().suspendAllValidation(isSuspendedValidationDefaultValue);
-// super.tearDown();
-// }
+ public void setUp() throws Exception {
+ super.setUp();
+
+ // register Preference Info
+ new CDICoreValidator();
+ }
+
public void testMakeFieldStatic() throws CoreException {
util.checkProposal(tckProject,
"JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/MakeFieldStatic.java",
"JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/MakeFieldStatic.qfxresult",
"@Produces",
CDIValidationErrorManager.ILLEGAL_PRODUCER_FIELD_IN_SESSION_BEAN_ID,
- MakeFieldStaticMarkerResolution.class, true);
+ MakeFieldStaticMarkerResolution.class,
+ true,
+ CDICoreValidator.PROBLEM_TYPE);
}
public void testAddLocalBeanResolution() throws CoreException {
@@ -47,7 +44,10 @@
"JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/AddLocalBean.qfxresult",
"@Produces",
CDIValidationErrorManager.ILLEGAL_PRODUCER_METHOD_IN_SESSION_BEAN_ID,
- AddLocalBeanMarkerResolution.class, true);
+ AddLocalBeanMarkerResolution.class,
+ true,
+ CDICoreValidator.PROBLEM_TYPE);
+
}
public void testMakeProducerMethodPublicResolution() throws CoreException {
@@ -56,8 +56,10 @@
"JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/MakeMethodPublic.qfxresult",
"@Produces",
CDIValidationErrorManager.ILLEGAL_PRODUCER_METHOD_IN_SESSION_BEAN_ID,
- MakeMethodPublicMarkerResolution.class, true);
- }
+ MakeMethodPublicMarkerResolution.class,
+ true,
+ CDICoreValidator.PROBLEM_TYPE);
+}
public void testAddSerializableInterfaceResolution() throws CoreException{
@@ -66,7 +68,9 @@
"JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/AddSerializable.qfxresult",
"AddSerializable",
CDIValidationErrorManager.NOT_PASSIVATION_CAPABLE_BEAN_ID,
- AddSerializableInterfaceMarkerResolution.class, true);
+ AddSerializableInterfaceMarkerResolution.class,
+ true,
+ CDICoreValidator.PROBLEM_TYPE);
}
public void testAddRetentionToQualifierResolution() throws CoreException{
@@ -75,7 +79,9 @@
"JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/AddRetention.qfxresult",
"AddRetention",
CDIValidationErrorManager.MISSING_RETENTION_ANNOTATION_IN_QUALIFIER_TYPE_ID,
- AddRetentionAnnotationMarkerResolution.class, true);
+ AddRetentionAnnotationMarkerResolution.class,
+ true,
+ CDICoreValidator.PROBLEM_TYPE);
}
public void testChangeRetentionToQualifierResolution() throws CoreException{
@@ -84,7 +90,9 @@
"JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/ChangeAnnotation.qfxresult",
"@Retention(value = null)",
CDIValidationErrorManager.MISSING_RETENTION_ANNOTATION_IN_QUALIFIER_TYPE_ID,
- ChangeAnnotationMarkerResolution.class, true);
+ ChangeAnnotationMarkerResolution.class,
+ true,
+ CDICoreValidator.PROBLEM_TYPE);
}
public void testAddTargetToScopeResolution() throws CoreException{
@@ -93,7 +101,9 @@
"JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/AddTarget.qfxresult",
"AddTarget",
CDIValidationErrorManager.MISSING_TARGET_ANNOTATION_IN_SCOPE_TYPE_ID,
- AddTargetAnnotationMarkerResolution.class, true);
+ AddTargetAnnotationMarkerResolution.class,
+ true,
+ CDICoreValidator.PROBLEM_TYPE);
}
public void testAddNonbindingToAnnotationMemberOfQualifierResolution() throws CoreException{
@@ -102,7 +112,9 @@
"JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/AddAnnotation.qfxresult",
"abc",
CDIValidationErrorManager.MISSING_NONBINDING_FOR_ANNOTATION_VALUE_IN_QUALIFIER_TYPE_MEMBER_ID,
- AddAnnotationMarkerResolution.class, true);
+ AddAnnotationMarkerResolution.class,
+ true,
+ CDICoreValidator.PROBLEM_TYPE);
}
public void testDeleteDisposesAnnotationFromParameterResolution() throws CoreException{
@@ -111,7 +123,9 @@
"JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/DeleteAnnotation.qfxresult",
"@Inject",
CDIValidationErrorManager.CONSTRUCTOR_PARAMETER_ANNOTATED_DISPOSES_ID,
- DeleteAnnotationMarkerResolution.class, true);
+ DeleteAnnotationMarkerResolution.class,
+ true,
+ CDICoreValidator.PROBLEM_TYPE);
}
public void testCreateBeanClassResolution() throws CoreException{
@@ -120,7 +134,9 @@
"JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/NonExistingAlternative.qfxresult",
"com.acme.NonExistingClass",
CDIValidationErrorManager.UNKNOWN_ALTERNATIVE_BEAN_CLASS_NAME_ID,
- CreateCDIElementMarkerResolution.class, false);
+ CreateCDIElementMarkerResolution.class,
+ true,
+ CDICoreValidator.PROBLEM_TYPE);
}
public void testCreateStereotypeResolution() throws CoreException{
@@ -129,7 +145,9 @@
"JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/NonExistingStereotype.qfxresult",
"com.acme.NotExistingStereotype",
CDIValidationErrorManager.UNKNOWN_ALTERNATIVE_ANNOTATION_NAME_ID,
- CreateCDIElementMarkerResolution.class, false);
+ CreateCDIElementMarkerResolution.class,
+ false,
+ CDICoreValidator.PROBLEM_TYPE);
}
public void testCreateDecoratorResolution() throws CoreException{
@@ -138,7 +156,9 @@
"JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/NonExistingDecorator.qfxresult",
"com.acme.NonExistingDecoratorClass",
CDIValidationErrorManager.UNKNOWN_DECORATOR_BEAN_CLASS_NAME_ID,
- CreateCDIElementMarkerResolution.class, false);
+ CreateCDIElementMarkerResolution.class,
+ false,
+ CDICoreValidator.PROBLEM_TYPE);
}
public void testCreateInterceptorResolution() throws CoreException{
@@ -147,6 +167,8 @@
"JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/NonExistingInterceptor.qfxresult",
"com.acme.NonExistingInterceptorClass",
CDIValidationErrorManager.UNKNOWN_INTERCEPTOR_CLASS_NAME_ID,
- CreateCDIElementMarkerResolution.class, false);
+ CreateCDIElementMarkerResolution.class,
+ false,
+ CDICoreValidator.PROBLEM_TYPE);
}
}
Modified: trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/marker/ConfigureProblemSeverityResolutionGenerator.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/marker/ConfigureProblemSeverityResolutionGenerator.java 2012-09-26 23:45:28 UTC (rev 44073)
+++ trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/marker/ConfigureProblemSeverityResolutionGenerator.java 2012-09-27 00:02:00 UTC (rev 44074)
@@ -33,6 +33,7 @@
import org.jboss.tools.common.ui.CommonUIPlugin;
import org.jboss.tools.common.validation.IPreferenceInfo;
import org.jboss.tools.common.validation.PreferenceInfoManager;
+import org.jboss.tools.common.validation.TempMarkerManager;
import org.jboss.tools.common.validation.ValidationErrorManager;
import org.jboss.tools.common.validation.java.TempJavaProblemAnnotation;
@@ -118,6 +119,15 @@
@Override
public boolean hasResolutions(IMarker marker) {
+ try {
+ String preferenceKey = getPreferenceKey(marker);
+ String markerType = getProblemType(marker);
+ IPreferenceInfo info = PreferenceInfoManager.getPreferenceInfo(markerType);
+ if(preferenceKey != null && markerType != null && info != null)
+ return true;
+ } catch (CoreException e) {
+ CommonUIPlugin.getDefault().logError(e);
+ }
return true;
}
@@ -131,7 +141,18 @@
}
private String getProblemType(Annotation annotation){
- return annotation.getType();
+ if(annotation instanceof TemporaryAnnotation){
+ if(((TemporaryAnnotation)annotation).getAttributes() != null){
+ String attribute = (String)((TemporaryAnnotation)annotation).getAttributes().get(TempMarkerManager.MESSAGE_TYPE_ATTRIBUTE_NAME);
+ return attribute;
+ }
+ }else if(annotation instanceof TempJavaProblemAnnotation){
+ if(((TempJavaProblemAnnotation)annotation).getAttributes() != null){
+ String attribute = (String)((TempJavaProblemAnnotation)annotation).getAttributes().get(TempMarkerManager.MESSAGE_TYPE_ATTRIBUTE_NAME);
+ return attribute;
+ }
+ }
+ return null;
}
private String getPreferencePageId(IMarker marker)throws CoreException{
@@ -171,7 +192,14 @@
@Override
public boolean hasProposals(Annotation annotation, Position position) {
- return true;
+ String preferenceKey = getPreferenceKey(annotation);
+ String problemType = getProblemType(annotation);
+ IPreferenceInfo info = PreferenceInfoManager.getPreferenceInfo(problemType);
+
+ if(preferenceKey != null && problemType != null && info != null)
+ return true;
+
+ return false;
}
@Override
@@ -185,14 +213,19 @@
String propertyPageId = info.getPropertyPageId();
String pluginId = info.getPluginId();
if(preferenceKey != null && preferencePageId != null && propertyPageId != null && pluginId != null){
- IFile file = MarkerResolutionUtils.getFile();
+ IFile file = null;
if(annotation instanceof TempJavaProblemAnnotation){
TempJavaProblemAnnotation tAnnotation = (TempJavaProblemAnnotation)annotation;
- if(JavaMarkerAnnotation.WARNING_ANNOTATION_TYPE.equals(tAnnotation.getType())){
- int offset = position.getOffset();
-
- if(file != null){
+ try {
+ file = (IFile) tAnnotation.getCompilationUnit().getUnderlyingResource();
+ } catch (JavaModelException e) {
+ CommonUIPlugin.getDefault().logError(e);
+ }
+ if(file != null){
+ if(JavaMarkerAnnotation.WARNING_ANNOTATION_TYPE.equals(tAnnotation.getType())){
+ int offset = position.getOffset();
+
IJavaElement element = findJavaElement(tAnnotation, offset);
if(element != null){
if(element instanceof IMethod){
@@ -208,9 +241,14 @@
proposals.add(new AddSuppressWarningsMarkerResolution(file, element, preferenceKey, tAnnotation.getCompilationUnit()));
}
}
+
}
+ }else{
+ file = MarkerResolutionUtils.getFile();
}
- proposals.add(new ConfigureProblemSeverityMarkerResolution(file.getProject(), preferencePageId, propertyPageId, preferenceKey, pluginId));
+ if(file != null){
+ proposals.add(new ConfigureProblemSeverityMarkerResolution(file.getProject(), preferencePageId, propertyPageId, preferenceKey, pluginId));
+ }
}
}
return proposals.toArray(new IJavaCompletionProposal[]{});
Modified: trunk/common/tests/org.jboss.tools.common.base.test/src/org/jboss/tools/common/base/test/QuickFixTestUtil.java
===================================================================
--- trunk/common/tests/org.jboss.tools.common.base.test/src/org/jboss/tools/common/base/test/QuickFixTestUtil.java 2012-09-26 23:45:28 UTC (rev 44073)
+++ trunk/common/tests/org.jboss.tools.common.base.test/src/org/jboss/tools/common/base/test/QuickFixTestUtil.java 2012-09-27 00:02:00 UTC (rev 44074)
@@ -104,7 +104,7 @@
}
}
- public void checkProposal(IProject project, String fileName, String newFile, String str, int id, Class<? extends IJavaCompletionProposal> proposalClass, boolean checkResult) throws CoreException {
+ public void checkProposal(IProject project, String fileName, String newFile, String str, int id, Class<? extends IJavaCompletionProposal> proposalClass, boolean checkResult, String problemType) throws CoreException {
IFile file = project.getFile(fileName);
IFile nFile = project.getFile(newFile);
@@ -131,7 +131,7 @@
Assert.assertTrue("String - "+str+" not found", offset > 0);
int length = str.length();
- Annotation annotation = createAnnotation(file, id, offset, length);
+ Annotation annotation = createAnnotation(problemType, file, id, offset, length);
Position position = new Position(offset, length);
IJavaCompletionProposal[] proposals = getCompletionProposals(annotation, position);
@@ -193,7 +193,7 @@
Assert.assertEquals("Wrong result of resolution", fileContent, text);
}
- protected Annotation createAnnotation(IFile file, int quickFixId, int offset, int length){
+ protected Annotation createAnnotation(String problemType, IFile file, int quickFixId, int offset, int length){
if("java".equals(file.getFileExtension())){
ICompilationUnit compilationUnit = EclipseUtil.getCompilationUnit(file);
@@ -215,7 +215,7 @@
message.setAttribute(TempMarkerManager.MESSAGE_ID_ATTRIBUTE_NAME, quickFixId);
message.setAttribute(TempMarkerManager.PREFERENCE_KEY_ATTRIBUTE_NAME, "preferenceKey");
message.setAttribute(TempMarkerManager.PREFERENCE_PAGE_ID_NAME, "pref_page_id");
- message.setAttribute(TempMarkerManager.MESSAGE_TYPE_ATTRIBUTE_NAME, JavaMarkerAnnotation.WARNING_ANNOTATION_TYPE);
+ message.setAttribute(TempMarkerManager.MESSAGE_TYPE_ATTRIBUTE_NAME, problemType);
TempJavaProblem problem = new TempJavaProblem(message, "origin");
@@ -229,7 +229,7 @@
attributes.put(TempMarkerManager.MESSAGE_ID_ATTRIBUTE_NAME, quickFixId);
attributes.put(TempMarkerManager.PREFERENCE_KEY_ATTRIBUTE_NAME, "preferenceKey");
attributes.put(TempMarkerManager.PREFERENCE_PAGE_ID_NAME, "pref_page_id");
- attributes.put(TempMarkerManager.MESSAGE_TYPE_ATTRIBUTE_NAME, JavaMarkerAnnotation.WARNING_ANNOTATION_TYPE);
+ attributes.put(TempMarkerManager.MESSAGE_TYPE_ATTRIBUTE_NAME, problemType);
annotation.setAttributes(attributes);
return annotation;
13 years
JBoss Tools SVN: r44073 - trunk/common/tests/org.jboss.tools.common.ui.test/src/org/jboss/tools/common/ui.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2012-09-26 19:45:28 -0400 (Wed, 26 Sep 2012)
New Revision: 44073
Modified:
trunk/common/tests/org.jboss.tools.common.ui.test/src/org/jboss/tools/common/ui/NewServiceProviderWizardTest.java
Log:
JBIDE-9443
https://issues.jboss.org/browse/JBIDE-9443
New Service Provider wizard. Test.
Modified: trunk/common/tests/org.jboss.tools.common.ui.test/src/org/jboss/tools/common/ui/NewServiceProviderWizardTest.java
===================================================================
--- trunk/common/tests/org.jboss.tools.common.ui.test/src/org/jboss/tools/common/ui/NewServiceProviderWizardTest.java 2012-09-26 23:42:45 UTC (rev 44072)
+++ trunk/common/tests/org.jboss.tools.common.ui.test/src/org/jboss/tools/common/ui/NewServiceProviderWizardTest.java 2012-09-26 23:45:28 UTC (rev 44073)
@@ -119,11 +119,15 @@
try {
NewServiceWizardPage page = (NewServiceWizardPage)context.page;
-
+
+ String message = page.getErrorMessage();
+ String expectedMessage = CommonUIMessages.NEW_SERVICE_WIZARD_SERVICE_TYPE_EMPTY;
+ assertEquals(expectedMessage, message);
+
String serviceType = "java.util.List111";
page.setServiceType(serviceType);
- String message = page.getErrorMessage();
- String expectedMessage = NLS.bind(CommonUIMessages.NEW_SERVICE_WIZARD_SERVICE_TYPE_NOT_EXISTS, serviceType);
+ message = page.getErrorMessage();
+ expectedMessage = NLS.bind(CommonUIMessages.NEW_SERVICE_WIZARD_SERVICE_TYPE_NOT_EXISTS, serviceType);
assertEquals(expectedMessage, message);
serviceType = "java.util.List";
13 years
JBoss Tools SVN: r44072 - in trunk/common/tests/org.jboss.tools.common.ui.test: META-INF and 5 other directories.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2012-09-26 19:42:45 -0400 (Wed, 26 Sep 2012)
New Revision: 44072
Added:
trunk/common/tests/org.jboss.tools.common.ui.test/projects/
trunk/common/tests/org.jboss.tools.common.ui.test/projects/Test/
trunk/common/tests/org.jboss.tools.common.ui.test/projects/Test/.classpath
trunk/common/tests/org.jboss.tools.common.ui.test/projects/Test/.project
trunk/common/tests/org.jboss.tools.common.ui.test/projects/Test/.settings/
trunk/common/tests/org.jboss.tools.common.ui.test/projects/Test/.settings/org.eclipse.jdt.core.prefs
trunk/common/tests/org.jboss.tools.common.ui.test/projects/Test/bin/
trunk/common/tests/org.jboss.tools.common.ui.test/projects/Test/src/
trunk/common/tests/org.jboss.tools.common.ui.test/projects/Test/src/test/
trunk/common/tests/org.jboss.tools.common.ui.test/src/org/jboss/tools/common/ui/NewServiceProviderWizardTest.java
Modified:
trunk/common/tests/org.jboss.tools.common.ui.test/META-INF/MANIFEST.MF
trunk/common/tests/org.jboss.tools.common.ui.test/build.properties
trunk/common/tests/org.jboss.tools.common.ui.test/src/org/jboss/tools/common/ui/CommonUITestSuite.java
Log:
JBIDE-9443
https://issues.jboss.org/browse/JBIDE-9443
New Service Provider wizard. Test.
Modified: trunk/common/tests/org.jboss.tools.common.ui.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/common/tests/org.jboss.tools.common.ui.test/META-INF/MANIFEST.MF 2012-09-26 23:36:13 UTC (rev 44071)
+++ trunk/common/tests/org.jboss.tools.common.ui.test/META-INF/MANIFEST.MF 2012-09-26 23:42:45 UTC (rev 44072)
@@ -8,7 +8,10 @@
org.eclipse.core.runtime,
org.eclipse.core.resources,
org.eclipse.jdt.core,
+ org.eclipse.ui.ide,
org.junit,
+ org.jboss.tools.common.core,
+ org.jboss.tools.common,
org.jboss.tools.common.ui,
org.jboss.tools.tests
Import-Package: org.jboss.tools.common.ui.preferencevalue
Modified: trunk/common/tests/org.jboss.tools.common.ui.test/build.properties
===================================================================
--- trunk/common/tests/org.jboss.tools.common.ui.test/build.properties 2012-09-26 23:36:13 UTC (rev 44071)
+++ trunk/common/tests/org.jboss.tools.common.ui.test/build.properties 2012-09-26 23:42:45 UTC (rev 44072)
@@ -1,5 +1,6 @@
source.. = src/
bin.includes = META-INF/,\
.,\
+ projects/,\
plugin.properties
src.includes = pom.xml
Added: trunk/common/tests/org.jboss.tools.common.ui.test/projects/Test/.classpath
===================================================================
--- trunk/common/tests/org.jboss.tools.common.ui.test/projects/Test/.classpath (rev 0)
+++ trunk/common/tests/org.jboss.tools.common.ui.test/projects/Test/.classpath 2012-09-26 23:42:45 UTC (rev 44072)
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
Property changes on: trunk/common/tests/org.jboss.tools.common.ui.test/projects/Test/.classpath
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/common/tests/org.jboss.tools.common.ui.test/projects/Test/.project
===================================================================
--- trunk/common/tests/org.jboss.tools.common.ui.test/projects/Test/.project (rev 0)
+++ trunk/common/tests/org.jboss.tools.common.ui.test/projects/Test/.project 2012-09-26 23:42:45 UTC (rev 44072)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>Test</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
Property changes on: trunk/common/tests/org.jboss.tools.common.ui.test/projects/Test/.project
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/common/tests/org.jboss.tools.common.ui.test/projects/Test/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- trunk/common/tests/org.jboss.tools.common.ui.test/projects/Test/.settings/org.eclipse.jdt.core.prefs (rev 0)
+++ trunk/common/tests/org.jboss.tools.common.ui.test/projects/Test/.settings/org.eclipse.jdt.core.prefs 2012-09-26 23:42:45 UTC (rev 44072)
@@ -0,0 +1,11 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.6
Property changes on: trunk/common/tests/org.jboss.tools.common.ui.test/projects/Test/.settings/org.eclipse.jdt.core.prefs
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/common/tests/org.jboss.tools.common.ui.test/src/org/jboss/tools/common/ui/CommonUITestSuite.java
===================================================================
--- trunk/common/tests/org.jboss.tools.common.ui.test/src/org/jboss/tools/common/ui/CommonUITestSuite.java 2012-09-26 23:36:13 UTC (rev 44071)
+++ trunk/common/tests/org.jboss.tools.common.ui.test/src/org/jboss/tools/common/ui/CommonUITestSuite.java 2012-09-26 23:42:45 UTC (rev 44072)
@@ -18,7 +18,8 @@
@RunWith(Suite.class)
@Suite.SuiteClasses({
StringsPreferenceValueTest.class,
- JBossPerspectiveTest.class
+ JBossPerspectiveTest.class,
+ NewServiceProviderWizardTest.class
})
/**
* @author André Dietisheim
Added: trunk/common/tests/org.jboss.tools.common.ui.test/src/org/jboss/tools/common/ui/NewServiceProviderWizardTest.java
===================================================================
--- trunk/common/tests/org.jboss.tools.common.ui.test/src/org/jboss/tools/common/ui/NewServiceProviderWizardTest.java (rev 0)
+++ trunk/common/tests/org.jboss.tools.common.ui.test/src/org/jboss/tools/common/ui/NewServiceProviderWizardTest.java 2012-09-26 23:42:45 UTC (rev 44072)
@@ -0,0 +1,166 @@
+/*******************************************************************************
+ * Copyright (c) 2007 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.common.ui;
+
+import java.lang.reflect.Modifier;
+
+import junit.framework.TestCase;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IFolder;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.jdt.core.IJavaProject;
+import org.eclipse.jdt.core.IPackageFragment;
+import org.eclipse.jdt.core.IType;
+import org.eclipse.jdt.core.JavaModelException;
+import org.eclipse.jdt.internal.ui.wizards.NewElementWizard;
+import org.eclipse.jdt.ui.wizards.NewTypeWizardPage;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.jface.wizard.WizardDialog;
+import org.eclipse.osgi.util.NLS;
+import org.eclipse.ui.PlatformUI;
+import org.jboss.tools.common.EclipseUtil;
+import org.jboss.tools.common.ui.wizard.service.NewServiceCreationWizard;
+import org.jboss.tools.common.ui.wizard.service.NewServiceWizardPage;
+import org.jboss.tools.common.util.EclipseJavaUtil;
+import org.jboss.tools.common.util.FileUtil;
+import org.jboss.tools.test.util.JUnitUtils;
+import org.jboss.tools.test.util.ResourcesUtils;
+import org.jboss.tools.test.util.WorkbenchUtils;
+
+/**
+ * @author Viacheslav Kabanovich
+ *
+ */
+public class NewServiceProviderWizardTest extends TestCase {
+
+ static String PACK_NAME = "test";
+ static String EXISTING_PACK_NAME = "org.jboss.jsr299.tck.tests.jbt.validation.target";
+ static String EXISTING_INTERCEPTOR_BINDING_NAME = "InterceptorBindingWTypeTarget"; // @Inherited @Target({TYPE})
+ static String SERVICE_NAME = "MyService";
+
+ static class WizardContext {
+ NewElementWizard wizard;
+ IProject tck;
+ IJavaProject jp;
+ WizardDialog dialog;
+ NewTypeWizardPage page;
+ String packName;
+ String typeName;
+
+
+ public void init(String wizardId, String packName, String typeName) {
+ this.packName = packName;
+ this.typeName = typeName;
+ wizard = (NewElementWizard)WorkbenchUtils.findWizardByDefId(wizardId);
+ tck = ResourcesPlugin.getWorkspace().getRoot().getProject("Test");
+ jp = EclipseUtil.getJavaProject(tck);
+ wizard.init(CommonUIPlugin.getDefault().getWorkbench(), new StructuredSelection(jp));
+ if(wizard instanceof NewServiceCreationWizard) {
+ ((NewServiceCreationWizard)wizard).setOpenEditorAfterFinish(false);
+ }
+ dialog = new WizardDialog(
+ PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(),
+ wizard);
+ dialog.setBlockOnOpen(false);
+ dialog.open();
+
+ page = (NewTypeWizardPage)dialog.getSelectedPage();
+
+ page.setTypeName(typeName, true);
+ IPackageFragment pack = page.getPackageFragmentRoot().getPackageFragment(PACK_NAME);
+ page.setPackageFragment(pack, true);
+ }
+
+ public String getNewTypeContent() {
+ IType type = null;
+ try {
+ String tn = typeName;
+ int q = tn.indexOf("<");
+ if(q >= 0) tn = tn.substring(0, q);
+ type = jp.findType(packName + "." + tn);
+ } catch (JavaModelException e) {
+ JUnitUtils.fail("Cannot find type " + typeName, e);
+ }
+
+ IFile file = (IFile)type.getResource();
+ assertNotNull(file);
+ String text = null;
+ try {
+ text = FileUtil.readStream(file.getContents());
+ } catch (CoreException e) {
+ JUnitUtils.fail("Cannot read from " + file, e);
+ }
+ return text;
+ }
+
+ public void close() {
+ dialog.close();
+ }
+
+ }
+
+ public void testNewServiceWizard() throws Exception {
+ WizardContext context = new WizardContext();
+ context.init("org.jboss.tools.common.ui.wizard.service.NewServiceCreationWizard",
+ PACK_NAME, SERVICE_NAME);
+
+ try {
+ NewServiceWizardPage page = (NewServiceWizardPage)context.page;
+
+ String serviceType = "java.util.List111";
+ page.setServiceType(serviceType);
+ String message = page.getErrorMessage();
+ String expectedMessage = NLS.bind(CommonUIMessages.NEW_SERVICE_WIZARD_SERVICE_TYPE_NOT_EXISTS, serviceType);
+ assertEquals(expectedMessage, message);
+
+ serviceType = "java.util.List";
+ page.setServiceType(serviceType);
+ assertNull(page.getErrorMessage());
+
+ context.wizard.performFinish();
+
+ String text = context.getNewTypeContent();
+
+ assertTrue(text.contains("@Override"));
+ assertTrue(text.contains("iterator()"));
+
+ IType type = (IType)context.wizard.getCreatedElement();
+ int f = type.getFlags();
+ assertTrue(Modifier.isPublic(f));
+ assertFalse(Modifier.isAbstract(f));
+ String[] is = type.getSuperInterfaceNames();
+ assertEquals(1, is.length);
+ assertEquals("List", is[0]);
+
+ IResource[] srcs = EclipseUtil.getJavaSourceRoots(type.getJavaProject().getProject());
+ IFile file = ((IFolder)srcs[0]).getFile(new Path("META-INF/services/java.util.List"));
+ assertTrue(file.exists());
+ String content = FileUtil.readStream(file);
+ assertEquals(type.getFullyQualifiedName(), content.trim());
+ } finally {
+ context.close();
+ }
+ }
+
+ public void setUp() {
+ try {
+ IProject p = ResourcesUtils.importProject("org.jboss.tools.common.ui.test", "projects/Test");
+ System.out.println(p);
+ } catch (Exception e) {
+ fail();
+ }
+ }
+}
\ No newline at end of file
Property changes on: trunk/common/tests/org.jboss.tools.common.ui.test/src/org/jboss/tools/common/ui/NewServiceProviderWizardTest.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
13 years
JBoss Tools SVN: r44071 - in trunk/common/plugins/org.jboss.tools.common.ui: src/org/jboss/tools/common/ui/wizard/service and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2012-09-26 19:36:13 -0400 (Wed, 26 Sep 2012)
New Revision: 44071
Modified:
trunk/common/plugins/org.jboss.tools.common.ui/META-INF/MANIFEST.MF
trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/wizard/service/NewServiceCreationWizard.java
trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/wizard/service/NewServiceWizardPage.java
Log:
JBIDE-9443
https://issues.jboss.org/browse/JBIDE-9443
New Service Provider wizard.
Modified: trunk/common/plugins/org.jboss.tools.common.ui/META-INF/MANIFEST.MF
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.ui/META-INF/MANIFEST.MF 2012-09-26 23:04:29 UTC (rev 44070)
+++ trunk/common/plugins/org.jboss.tools.common.ui/META-INF/MANIFEST.MF 2012-09-26 23:36:13 UTC (rev 44071)
@@ -10,7 +10,7 @@
org.eclipse.ui;bundle-version="3.7.0",
org.eclipse.core.runtime;bundle-version="3.7.0",
org.eclipse.jdt.core;bundle-version="3.7.0",
- org.eclipse.jdt.ui;bundle-version="3.7.0",
+ org.eclipse.jdt.ui;bundle-version="3.7.0";visibility:=reexport,
org.eclipse.core.resources;bundle-version="3.7.100",
org.eclipse.ui.ide;bundle-version="3.7.0",
org.eclipse.jst.j2ee.ui;bundle-version="1.1.500",
@@ -45,6 +45,7 @@
org.jboss.tools.common.ui.widget.editor,
org.jboss.tools.common.ui.widget.field,
org.jboss.tools.common.ui.wizard,
+ org.jboss.tools.common.ui.wizard.service,
org.jboss.tools.common.ui.xpl
Bundle-Vendor: %Bundle-Vendor.0
Bundle-Localization: plugin
Modified: trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/wizard/service/NewServiceCreationWizard.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/wizard/service/NewServiceCreationWizard.java 2012-09-26 23:04:29 UTC (rev 44070)
+++ trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/wizard/service/NewServiceCreationWizard.java 2012-09-26 23:36:13 UTC (rev 44071)
@@ -38,11 +38,16 @@
*/
public class NewServiceCreationWizard extends NewElementWizard {
protected NewTypeWizardPage fPage;
+ boolean openEditorAfterFinish = true;
public NewServiceCreationWizard() {
setWindowTitle(CommonUIMessages.NEW_SERVICE_WIZARD_TITLE);
}
+ public void setOpenEditorAfterFinish(boolean b) {
+ openEditorAfterFinish = b;
+ }
+
/*
* @see Wizard#createPages
*/
@@ -72,7 +77,7 @@
CommonUIPlugin.getDefault().logError(e);
}
}
- if (res) {
+ if (res && openEditorAfterFinish) {
IResource resource= fPage.getModifiedResource();
if (resource != null) {
selectAndReveal(resource);
Modified: trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/wizard/service/NewServiceWizardPage.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/wizard/service/NewServiceWizardPage.java 2012-09-26 23:04:29 UTC (rev 44070)
+++ trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/wizard/service/NewServiceWizardPage.java 2012-09-26 23:36:13 UTC (rev 44071)
@@ -229,6 +229,10 @@
});
}
+ public void setServiceType(String typeName) {
+ interfaceField.setValue(typeName);
+ }
+
protected void onInterfaceChange() {
interfaceNameStatus = new StatusInfo();
String q = interfaceField == null ? "" : interfaceField.getValue().toString().trim();
13 years
JBoss Tools SVN: r44070 - in trunk/build: scripts and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-09-26 19:04:29 -0400 (Wed, 26 Sep 2012)
New Revision: 44070
Added:
trunk/build/scripts/
trunk/build/scripts/checkout.sh
Log:
JBIDE-12475 script to fetch git repo and its upstream repos (if desired) by parsing <moduleName>/pom.xml for a bootstrap profile
Added: trunk/build/scripts/checkout.sh
===================================================================
--- trunk/build/scripts/checkout.sh (rev 0)
+++ trunk/build/scripts/checkout.sh 2012-09-26 23:04:29 UTC (rev 44070)
@@ -0,0 +1,100 @@
+#!/bin/bash
+
+if [[ $# -lt 1 ]]; then
+ echo "Usage: $0 <moduleName> [-b branch (assumes master if omitted)] [-n|--no-upstream]"
+ echo "Example: $0 openshift"
+ echo "Example: $0 openshift -b jbosstools-4.0.x -n"
+ exit 1;
+fi
+
+dbg=":" # debug off
+#dbg="echo -e" # debug on
+debug ()
+{
+ $dbg "${grey}${1}${norm}"
+}
+
+moduleName=""
+branch="master"
+noUpstreamClone=0
+
+# colours!
+norm="\033[0;39m";
+grey="\033[1;30m";
+green="\033[1;32m";
+brown="\033[0;33m";
+yellow="\033[1;33m";
+blue="\033[1;34m";
+cyan="\033[1;36m";
+red="\033[1;31m";
+
+# read commandline args
+while [[ "$#" -gt 0 ]]; do
+ case $1 in
+ '-n'|'--no-upstream') noUpstreamClone=1;;
+ '-b') branch="$2"; shift 1;;
+ *) moduleName="$1";;
+ esac
+ shift 1
+done
+
+# TODO: make this actually delete or update; rather than just echoing
+readOp ()
+{
+ echo -e "There is already a folder in this directory called ${blue}${module}${norm}. Would you like to ${red}DELETE${norm} (d), ${yellow}UPDATE${norm} (u), or ${green}SKIP${norm} (s)?"
+ read op
+ case $op in
+ 'd'|'DELETE') echo " >> rm -fr ./${module}; git clone git@github.com:jbosstools/jbosstools-${module}.git";;
+ 'u'|'UPDATE') echo " >> cd ${module}; git pull; git checkout ${branch}; cd -";;
+ 's'|'SKIP') debug "Module ${module} skipped.";;
+ *) readOp;;
+ esac
+}
+
+# TODO: make this actually fetch instead of just echoing
+gitClone ()
+{
+ module=$1
+ if [[ -d ${module} ]]; then
+ readOp;
+ else
+ echo " >> git clone git@github.com:jbosstools/jbosstools-${module}.git"
+ fi
+
+}
+
+# parse
+gitCloneUpstream ()
+{
+ if [[ -f ${moduleName}/pom.xml ]]; then
+ SEQ=/usr/bin/seq
+ a=( $( cat ${moduleName}/pom.xml ) )
+ for i in $($SEQ 0 $((${#a[@]} - 1))); do
+ line="${a[$i]}"
+ if [[ ${line//<id>bootstrap<\/id>} != $line ]]; then # begin processing actual content
+ #debug "Found bootstrap entry on line $i: $line"
+ i=$(( $i + 1 )); nextLine="${a[$i]}";
+ while [[ ${nextLine//\/modules} == ${nextLine} ]]; do # collect upstream repos
+ nextModule=$nextLine
+ if [[ ${nextModule//module>} != ${nextModule} ]]; then # want this one
+ nextModule=$(echo ${nextModule} | sed -e "s#<module>../\(.\+\)</module>#\1#")
+ gitClone $nextModule
+ fi
+ i=$(( $i + 1 )); nextLine="${a[$i]}"
+ done
+ fi
+ done
+ else
+ debug "File ${moduleName}/pom.xml not found in current directory. Did the previous step fail to git clone?"
+ fi
+}
+
+if [[ ${noUpstreamClone} == "1" ]]; then
+ debug "Fetching module ${moduleName} from branch ${branch} (no upstream modules will be fetched) ..."
+ gitClone ${moduleName}
+else
+ debug "Fetching module ${moduleName} from branch ${branch} (and upstream modules) ..."
+ gitClone ${moduleName}
+ # next step will only do something useful if the previous step completed; without it there's no ${moduleName}/pom.xml to parse
+ gitCloneUpstream ${moduleName}
+fi
Property changes on: trunk/build/scripts/checkout.sh
___________________________________________________________________
Added: svn:executable
+ *
13 years
JBoss Tools SVN: r44069 - in trunk: ws and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-09-26 17:44:55 -0400 (Wed, 26 Sep 2012)
New Revision: 44069
Modified:
trunk/openshift/pom.xml
trunk/ws/pom.xml
Log:
add bootstrap profiles for openshift and ws components, depending on the upstream base and server github repos (forthcoming); also add temporary equivalent bootstrap-svn profiles which can be used today w/ svn (JBIDE-12475)
Modified: trunk/openshift/pom.xml
===================================================================
--- trunk/openshift/pom.xml 2012-09-26 21:27:36 UTC (rev 44068)
+++ trunk/openshift/pom.xml 2012-09-26 21:44:55 UTC (rev 44069)
@@ -18,5 +18,29 @@
<module>features</module>
<module>site</module>
</modules>
+ <profiles>
+ <!-- use with github repos -->
+ <profile>
+ <id>bootstrap</id>
+ <modules>
+ <module>../base</module>
+ <module>../server</module>
+ </modules>
+ </profile>
+ <!-- deprecated; use with svn repos -->
+ <profile>
+ <id>bootstrap-svn</id>
+ <modules>
+ <module>../tests</module>
+ <module>../common</module>
+ <module>../runtime</module>
+ <module>../usage</module>
+
+ <module>../jmx</module>
+ <module>../archives</module>
+ <module>../as</module>
+ </modules>
+ </profile>
+ </profiles>
</project>
Modified: trunk/ws/pom.xml
===================================================================
--- trunk/ws/pom.xml 2012-09-26 21:27:36 UTC (rev 44068)
+++ trunk/ws/pom.xml 2012-09-26 21:44:55 UTC (rev 44069)
@@ -10,8 +10,8 @@
</parent>
<groupId>org.jboss.tools</groupId>
<artifactId>ws</artifactId>
+ <name>ws.all</name>
<version>1.4.0-SNAPSHOT</version>
- <name>ws.all</name>
<packaging>pom</packaging>
<modules>
<module>plugins</module>
@@ -19,5 +19,29 @@
<module>features</module>
<module>site</module>
</modules>
+ <profiles>
+ <!-- use with github repos -->
+ <profile>
+ <id>bootstrap</id>
+ <modules>
+ <module>../base</module>
+ <module>../server</module>
+ </modules>
+ </profile>
+ <!-- deprecated; use with svn repos -->
+ <profile>
+ <id>bootstrap-svn</id>
+ <modules>
+ <module>../tests</module>
+ <module>../common</module>
+ <module>../runtime</module>
+ <module>../usage</module>
+
+ <module>../jmx</module>
+ <module>../archives</module>
+ <module>../as</module>
+ </modules>
+ </profile>
+ </profiles>
</project>
13 years