JBoss Tools SVN: r38489 - trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/editors.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2012-02-07 18:49:15 -0500 (Tue, 07 Feb 2012)
New Revision: 38489
Modified:
trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/editors/SoftwarePage.java
Log:
JBIDE-10804 Add some notification after clicking on "Install" on Software/Update page
Modified: trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/editors/SoftwarePage.java
===================================================================
--- trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/editors/SoftwarePage.java 2012-02-07 22:52:17 UTC (rev 38488)
+++ trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/editors/SoftwarePage.java 2012-02-07 23:49:15 UTC (rev 38489)
@@ -33,6 +33,7 @@
import org.eclipse.swt.events.ControlEvent;
import org.eclipse.swt.events.SelectionEvent;
import org.eclipse.swt.events.SelectionListener;
+import org.eclipse.swt.graphics.Cursor;
import org.eclipse.swt.graphics.Point;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout;
@@ -42,6 +43,8 @@
import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Event;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.forms.IManagedForm;
import org.eclipse.ui.forms.editor.FormEditor;
import org.eclipse.ui.forms.widgets.ExpandableComposite;
@@ -184,7 +187,23 @@
@Override
public void widgetSelected(SelectionEvent e) {
- installAction.run();
+ Display display = Display.getCurrent();
+ Shell shell = display.getActiveShell();
+ Cursor cursor = shell == null ? null : shell.getCursor();
+ try {
+ if (shell != null) {
+ shell.setCursor(display.getSystemCursor(SWT.CURSOR_WAIT));
+ }
+ installAction.setEnabled(false);
+ installButton.setEnabled(false);
+ installAction.run();
+ } finally {
+ if (shell != null) {
+ shell.setCursor(cursor);
+ }
+ installAction.setEnabled(true);
+ installButton.setEnabled(true);
+ }
}
@Override
14 years, 2 months
JBoss Tools SVN: r38488 - in trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard: appimport and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2012-02-07 17:52:17 -0500 (Tue, 07 Feb 2012)
New Revision: 38488
Modified:
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/GitCloningSettingsWizardPage.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/GitCloningSettingsWizardPageModel.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/ConfigureGitSharedProject.java
Log:
[JBIDE-10479] added validator to the remote name so that it errors if the existing project already has a remote with the very same name
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/GitCloningSettingsWizardPage.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/GitCloningSettingsWizardPage.java 2012-02-07 21:47:05 UTC (rev 38487)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/GitCloningSettingsWizardPage.java 2012-02-07 22:52:17 UTC (rev 38488)
@@ -59,7 +59,7 @@
this.pageModel = new GitCloningSettingsWizardPageModel(model);
setPageComplete(false);
}
-
+
public GitCloningSettingsWizardPage(ImportExistingApplicationWizard wizard, IOpenShiftWizardModel model) {
super(
"Import an existing OpenShift application",
@@ -82,8 +82,9 @@
Group cloneGroup = new Group(parent, SWT.BORDER);
cloneGroup.setText("Cloning settings");
cloneGroup.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true, false));
- GridLayoutFactory.fillDefaults().numColumns(3).equalWidth(false).margins(10, 10)// .extendedMargins(0, 0, 0, 10)
- .applyTo(cloneGroup);
+ GridLayoutFactory.fillDefaults()
+ .numColumns(3).equalWidth(false).margins(10, 10).applyTo(cloneGroup);
+
// Repo Path Management
useDefaultRepoPathButton = new Button(cloneGroup, SWT.CHECK);
useDefaultRepoPathButton.setText("Use default location");
@@ -97,17 +98,18 @@
GridDataFactory.fillDefaults().align(SWT.LEFT, SWT.CENTER).align(SWT.FILL, SWT.CENTER).grab(true, false)
.applyTo(repoPathText);
final IObservableValue repoPathTextObservable = WidgetProperties.text(SWT.Modify).observe(repoPathText);
- final IObservableValue repoPathModelObservable = BeanProperties.value(
- GitCloningSettingsWizardPageModel.PROPERTY_REPO_PATH).observe(pageModel);
+ final IObservableValue repoPathModelObservable =
+ BeanProperties.value(GitCloningSettingsWizardPageModel.PROPERTY_REPO_PATH).observe(pageModel);
ValueBindingBuilder.bind(repoPathTextObservable).to(repoPathModelObservable).in(dbc);
Button browseRepoPathButton = new Button(cloneGroup, SWT.PUSH);
browseRepoPathButton.setText("Browse");
- GridDataFactory.fillDefaults().align(SWT.LEFT, SWT.CENTER).hint(100, SWT.DEFAULT).applyTo(browseRepoPathButton);
+ GridDataFactory.fillDefaults()
+ .align(SWT.LEFT, SWT.CENTER).hint(100, SWT.DEFAULT).applyTo(browseRepoPathButton);
browseRepoPathButton.addSelectionListener(onRepoPath());
- final IObservableValue useDefaultRepoButtonSelectionObservable = WidgetProperties.selection().observe(
- useDefaultRepoPathButton);
+ final IObservableValue useDefaultRepoButtonSelectionObservable =
+ WidgetProperties.selection().observe(useDefaultRepoPathButton);
final IObservableValue useDefaultRepoModelObservable = BeanProperties.value(
GitCloningSettingsWizardPageModel.PROPERTY_USE_DEFAULT_REPO_PATH).observe(pageModel);
ValueBindingBuilder.bind(useDefaultRepoButtonSelectionObservable).to(useDefaultRepoModelObservable).in(dbc);
@@ -115,25 +117,21 @@
.notUpdating(useDefaultRepoModelObservable).converting(new InvertingBooleanConverter()).in(dbc);
ValueBindingBuilder.bind(WidgetProperties.enabled().observe(browseRepoPathButton))
.notUpdating(useDefaultRepoModelObservable).converting(new InvertingBooleanConverter()).in(dbc);
- // move focus to the project location text control when not choosing the 'Use default location' option.
- useDefaultRepoPathButton.addSelectionListener(new SelectionListener() {
+ // move focus to the project location text control when not choosing the
+ // 'Use default location' option.
+ useDefaultRepoPathButton.addSelectionListener(new SelectionAdapter() {
@Override
public void widgetSelected(SelectionEvent e) {
repoPathText.setFocus();
repoPathText.selectAll();
}
+ });
- @Override
- public void widgetDefaultSelected(SelectionEvent e) {
- }
- });
-
IObservableValue repoPathValidityObservable = BeanProperties.value(
GitCloningSettingsWizardPageModel.PROPERTY_CUSTOM_REPO_PATH_VALIDITY).observe(pageModel);
dbc.addValidationStatusProvider(new RepoPathValidationStatusProvider(repoPathValidityObservable,
repoPathTextObservable));
-
// Remote Name Management
useDefaultRemoteNameButton = new Button(cloneGroup, SWT.CHECK);
useDefaultRemoteNameButton.setText("Use default remote name");
@@ -149,20 +147,23 @@
.grab(true, false).applyTo(remoteNameText);
final IObservableValue remoteNameTextObservable = WidgetProperties.text(SWT.Modify).observe(remoteNameText);
- final IObservableValue remoteNameModelObservable = BeanProperties.value(
- GitCloningSettingsWizardPageModel.PROPERTY_REMOTE_NAME).observe(pageModel);
+ final IObservableValue remoteNameModelObservable =
+ BeanProperties.value(GitCloningSettingsWizardPageModel.PROPERTY_REMOTE_NAME).observe(pageModel);
ValueBindingBuilder.bind(remoteNameTextObservable).to(remoteNameModelObservable).in(dbc);
- final IObservableValue useDefaultRemoteNameButtonSelectionObservable = WidgetProperties.selection().observe(
- useDefaultRemoteNameButton);
- final IObservableValue useDefaultRemoteNameModelObservable = BeanProperties.value(
- GitCloningSettingsWizardPageModel.PROPERTY_USE_DEFAULT_REMOTE_NAME).observe(pageModel);
+ final IObservableValue useDefaultRemoteNameButtonSelectionObservable =
+ WidgetProperties.selection().observe(useDefaultRemoteNameButton);
+ final IObservableValue useDefaultRemoteNameModelObservable =
+ BeanProperties.value(GitCloningSettingsWizardPageModel.PROPERTY_USE_DEFAULT_REMOTE_NAME).observe(
+ pageModel);
ValueBindingBuilder.bind(useDefaultRemoteNameButtonSelectionObservable).to(useDefaultRemoteNameModelObservable)
.in(dbc);
- ValueBindingBuilder.bind(WidgetProperties.enabled().observe(remoteNameText))
+ ValueBindingBuilder
+ .bind(WidgetProperties.enabled().observe(remoteNameText))
.notUpdating(useDefaultRemoteNameModelObservable).converting(new InvertingBooleanConverter()).in(dbc);
- // move focus to the project name text control when choosing the 'Use an existing project' option.
+ // move focus to the project name text control when choosing the 'Use an
+ // existing project' option.
useDefaultRemoteNameButton.addSelectionListener(onDefaultRemoteNameUnchecked());
IObservableValue remoteNameValidityObservable = BeanProperties.value(
GitCloningSettingsWizardPageModel.PROPERTY_CUSTOM_REMOTE_NAME_VALIDITY).observe(pageModel);
@@ -224,7 +225,8 @@
protected void onPageActivated(DataBindingContext dbc) {
// allow to enable a proj only for as7 openshift applications
- // setTitle(NLS.bind("Import OpenShift application {0}", pageModel.getApplicationName()));
+ // setTitle(NLS.bind("Import OpenShift application {0}",
+ // pageModel.getApplicationName()));
pageModel.resetRepositoryPath();
pageModel.resetRemoteName();
if (pageModel.isNewProject()) {
@@ -237,16 +239,20 @@
useDefaultRemoteNameButton.setEnabled(true);
remoteNameText.setEnabled(!useDefaultRemoteNameButton.getSelection());
}
- // pageModel.getWizardModel().setProperty(AdapterWizardPageModel.MODE, AdapterWizardPageModel.MODE_SOURCE);
+ // pageModel.getWizardModel().setProperty(AdapterWizardPageModel.MODE,
+ // AdapterWizardPageModel.MODE_SOURCE);
onPageActivatedBackground(dbc);
}
protected void onPageActivatedBackground(final DataBindingContext dbc) {
/*
- * new Job("Loading remote OpenShift application") { public IStatus run(IProgressMonitor monitor) { try {
- * pageModel.loadGitUri(); pageModel.loadApplicationUrl(); } catch (OpenShiftException e) { IStatus status =
- * OpenShiftUIActivator.createErrorStatus(e.getMessage(), e); OpenShiftUIActivator.log(status); return status; }
- * return Status.OK_STATUS; } }.schedule();
+ * new Job("Loading remote OpenShift application") { public IStatus
+ * run(IProgressMonitor monitor) { try { pageModel.loadGitUri();
+ * pageModel.loadApplicationUrl(); } catch (OpenShiftException e) {
+ * IStatus status =
+ * OpenShiftUIActivator.createErrorStatus(e.getMessage(), e);
+ * OpenShiftUIActivator.log(status); return status; } return
+ * Status.OK_STATUS; } }.schedule();
*/
}
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/GitCloningSettingsWizardPageModel.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/GitCloningSettingsWizardPageModel.java 2012-02-07 21:47:05 UTC (rev 38487)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/GitCloningSettingsWizardPageModel.java 2012-02-07 22:52:17 UTC (rev 38488)
@@ -10,12 +10,19 @@
******************************************************************************/
package org.jboss.tools.openshift.express.internal.ui.wizard;
-import static org.jboss.tools.openshift.express.internal.ui.wizard.AbstractOpenShiftApplicationWizardModel.*;
+import static org.jboss.tools.openshift.express.internal.ui.wizard.IOpenShiftWizardModel.EXISTING_PROJECT_REMOTE_NAME_DEFAULT;
+import static org.jboss.tools.openshift.express.internal.ui.wizard.IOpenShiftWizardModel.NEW_PROJECT_REMOTE_NAME_DEFAULT;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Path;
import org.eclipse.core.runtime.Status;
+import org.eclipse.jgit.lib.Repository;
+import org.eclipse.osgi.util.NLS;
import org.jboss.tools.common.ui.databinding.ObservableUIPojo;
+import org.jboss.tools.openshift.egit.core.EGitUtils;
import org.jboss.tools.openshift.egit.ui.util.EGitUIUtils;
import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator;
@@ -24,7 +31,7 @@
import com.openshift.express.client.OpenShiftException;
/**
- * @author Andr� Dietisheim
+ * @author Andre Dietisheim
* @author Rob Stryker
* @author Xavier Coulon
*/
@@ -33,7 +40,6 @@
public static final String PROPERTY_NEW_PROJECT = "newProject";
public static final String PROPERTY_CLONE_URI = "cloneUri";
// public static final String PROPERTY_MERGE_URI = "mergeUri";
- public static final String PROPERTY_PROJECT_NAME = "projectName";
public static final String PROPERTY_APPLICATION_URL = "applicationUrl";
public static final String PROPERTY_REPO_PATH = "repositoryPath";
public static final String PROPERTY_REMOTE_NAME = "remoteName";
@@ -347,12 +353,39 @@
status = new Status(IStatus.ERROR, OpenShiftUIActivator.PLUGIN_ID, "The custom remote name must not be empty.");
} else if(!remoteName.matches("\\S+")) {
status = new Status(IStatus.ERROR, OpenShiftUIActivator.PLUGIN_ID, "The custom remote name must not contain spaces.");
+ } else if (hasRemoteName(remoteName, getProject())) {
+ status = new Status(IStatus.ERROR,
+ OpenShiftUIActivator.PLUGIN_ID, NLS.bind("The existing project already has a remote named {0}.", remoteName));
}
}
setCustomRemoteNameValidity(status);
return status;
}
+ private boolean hasRemoteName(String remoteName, IProject project) {
+ try {
+ if (project == null
+ || !project.isAccessible()) {
+ return false;
+ }
+
+ Repository repository = EGitUtils.getRepository(project);
+ return EGitUtils.hasRemote(remoteName, repository);
+ } catch (Exception e) {
+ OpenShiftUIActivator.log(OpenShiftUIActivator.createErrorStatus(e.getMessage(), e));
+ return false;
+ }
+ }
+
+ private IProject getProject() {
+ String projectName = wizardModel.getProjectName();
+ if (projectName == null) {
+ return null;
+ }
+
+ return ResourcesPlugin.getWorkspace().getRoot().getProject(projectName);
+ }
+
public void setCustomRemoteNameValidity(IStatus status) {
firePropertyChange(PROPERTY_CUSTOM_REMOTE_NAME_VALIDITY, this.customRemoteNameValidity,
this.customRemoteNameValidity = status);
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/ConfigureGitSharedProject.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/ConfigureGitSharedProject.java 2012-02-07 21:47:05 UTC (rev 38487)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/ConfigureGitSharedProject.java 2012-02-07 22:52:17 UTC (rev 38488)
@@ -33,6 +33,7 @@
import org.jboss.tools.openshift.egit.core.EGitUtils;
import org.jboss.tools.openshift.egit.core.GitIgnore;
import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator;
+import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIException;
import org.jboss.tools.openshift.express.internal.ui.UnCommittedChangesException;
import org.jboss.tools.openshift.express.internal.ui.utils.FileUtils;
import org.jboss.tools.openshift.express.internal.ui.utils.ResourceUtils;
@@ -49,7 +50,7 @@
*/
public class ConfigureGitSharedProject extends AbstractImportApplicationOperation {
- private ArrayList<IResource> modifiedResources;
+ private List<IResource> modifiedResources;
public ConfigureGitSharedProject(String projectName, IApplication application, String remoteName,
IUser user) {
@@ -114,18 +115,20 @@
return Collections.singletonList(project);
}
- private void addRemote(String remoteName, String uuid, IProject project) throws MalformedURLException, URISyntaxException, IOException, OpenShiftException, CoreException {
+ private void addRemote(String remoteName, String uuid, IProject project)
+ throws MalformedURLException, URISyntaxException, IOException, OpenShiftException, CoreException {
Repository repository = EGitUtils.getRepository(project);
Assert.isTrue(repository != null);
-
-// if (EGitUtils.hasRemoteUrl("rhcloud.com", repository)) {
-// return;
-// }
-
- EGitUtils.addRemoteTo(
- getRemoteName(),
- getApplication().getGitUri(),
- repository);
+
+ if (EGitUtils.hasRemote(remoteName, repository)) {
+ // we shouldn't get here, the UI should validate the remote name and
+ // inform about an error in this case
+ throw new OpenShiftUIException(
+ "Could not enable OpenShift on project {0}. There's already a a remote called {1}.",
+ project.getName(), remoteName);
+ }
+
+ EGitUtils.addRemoteTo(getRemoteName(), getApplication().getGitUri(), repository);
}
private void addAndCommitModifiedResource(IProject project, IProgressMonitor monitor) throws CoreException {
14 years, 2 months
JBoss Tools SVN: r38487 - trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/refactoring.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2012-02-07 16:47:05 -0500 (Tue, 07 Feb 2012)
New Revision: 38487
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/refactoring/ValuedQualifier.java
Log:
Wizard 'Specify CDI Bean for the Injection Point' does not compute correctly condition 'can finish' https://issues.jboss.org/browse/JBIDE-10637
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/refactoring/ValuedQualifier.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/refactoring/ValuedQualifier.java 2012-02-07 20:55:30 UTC (rev 38486)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/refactoring/ValuedQualifier.java 2012-02-07 21:47:05 UTC (rev 38487)
@@ -131,7 +131,7 @@
text += ", ";
}
if(!"value".equals(pair.name) || pairs.size() > 1){
- text += pair.name+"=";
+ text += pair.name+" = ";
}
if("char".equals(pair.type)){
text += "\'"+pair.value+"\'";
14 years, 2 months
JBoss Tools SVN: r38486 - in trunk/cdi/plugins: org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/xpl and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2012-02-07 15:55:30 -0500 (Tue, 07 Feb 2012)
New Revision: 38486
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/refactoring/CDIMarkerResolutionUtils.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/refactoring/ValuedQualifier.java
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/xpl/AddQualifiersToBeanComposite.java
Log:
Wizard 'Specify CDI Bean for the Injection Point' does not compute correctly condition 'can finish' https://issues.jboss.org/browse/JBIDE-10637
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/refactoring/CDIMarkerResolutionUtils.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/refactoring/CDIMarkerResolutionUtils.java 2012-02-07 20:31:15 UTC (rev 38485)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/refactoring/CDIMarkerResolutionUtils.java 2012-02-07 20:55:30 UTC (rev 38486)
@@ -66,7 +66,7 @@
String shortName = getShortName(qualifiedName);
if(!value.isEmpty())
- value = "(\""+value+"\")";
+ value = "("+value+")";
if(duplicateShortName)
shortName = qualifiedName;
@@ -107,7 +107,7 @@
String shortName = getShortName(qualifiedName);
if(!value.isEmpty())
- value = "(\""+value+"\")";
+ value = "("+value+")";
if(duplicateShortName)
shortName = qualifiedName;
@@ -180,7 +180,7 @@
String value = declaration.getValue();
if(!value.isEmpty())
- value = "(\""+value+"\")";
+ value = "("+value+")";
if(!qualifierName.equals(CDIConstants.ANY_QUALIFIER_TYPE_NAME) && !qualifierName.equals(CDIConstants.DEFAULT_QUALIFIER_TYPE_NAME)){
boolean duplicant = duplicants.get(declaration.getQualifier()).booleanValue();
@@ -287,7 +287,7 @@
String elName = getELName(bean);
if(!value.isEmpty() && (!value.equals(elName) || !qualifierName.equals(CDIConstants.NAMED_QUALIFIER_TYPE_NAME))){
- value = "(\""+value+"\")";
+ value = "("+value+")";
}else{
value = "";
}
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/refactoring/ValuedQualifier.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/refactoring/ValuedQualifier.java 2012-02-07 20:31:15 UTC (rev 38485)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/refactoring/ValuedQualifier.java 2012-02-07 20:55:30 UTC (rev 38486)
@@ -10,32 +10,148 @@
******************************************************************************/
package org.jboss.tools.cdi.internal.core.refactoring;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.jdt.core.IMemberValuePair;
+import org.eclipse.jdt.core.IMethod;
+import org.eclipse.jdt.core.IType;
+import org.eclipse.jdt.core.JavaModelException;
+import org.eclipse.jdt.core.Signature;
import org.jboss.tools.cdi.core.IQualifier;
+import org.jboss.tools.cdi.core.IQualifierDeclaration;
public class ValuedQualifier{
+ public static final int STATE_NONE = -1;
+ public static final int STATE_NEW_QUALIFIER = 0;
+ public static final int STATE_NEW_QUALIFIER_CHANGED_VALUE = 1;
+ public static final int STATE_BEAN_QUALIFIER = 2;
+ public static final int STATE_BEAN_QUALIFIER_CHANGED_VALUE = 3;
+
+ private int state = STATE_NONE;
private IQualifier qualifier;
- private String value="";
+ private List<Pair> pairs = new ArrayList<Pair>();
- public ValuedQualifier(IQualifier qualifier){
+ public ValuedQualifier(IQualifier qualifier, IQualifierDeclaration declaration){
this.qualifier = qualifier;
+ if(declaration != null){
+ // copy pairs from qualifier declaration
+ for(IMemberValuePair mvp : declaration.getMemberValuePairs()){
+ Pair pair = new Pair();
+ pair.name = mvp.getMemberName();
+ pair.value = mvp.getValue();
+ if(mvp.getValueKind() == IMemberValuePair.K_STRING){
+ pair.type = "String";
+ }
+ pairs.add(pair);
+ }
+ }else{
+ IType type = qualifier.getSourceType();
+ try {
+ if(type.isAnnotation()){
+ for(IMethod method : type.getMethods()){
+ IMemberValuePair mvp = method.getDefaultValue();
+ Pair pair = new Pair();
+ pair.type = Signature.getSignatureSimpleName(method.getReturnType());
+ pair.name = method.getElementName();
+ if(mvp != null && mvp.getValue() != null){
+ pair.required = false;
+ pair.value = mvp.getValue();
+ }else{
+ pair.required = true;
+ if(pair.type.equals("boolean")){
+ pair.value = "false";
+ }else if(pair.type.equals("int") || pair.type.equals("short") || pair.type.equals("long")){
+ pair.value = "0";
+ }else if(pair.type.equals("float")){
+ pair.value = "0";
+ }else if(pair.type.equals("double")){
+ pair.value = "0.0";
+ }else if(pair.type.equals("char")){
+ pair.value = ' ';
+ }else if(pair.type.equals("byte")){
+ pair.value = "0";
+ }else if(pair.type.equals("String")){
+ pair.value = "default";
+ }else{
+ pair.value = "String.class";
+ }
+ }
+ pairs.add(pair);
+ }
+ }
+ } catch (JavaModelException e) {
+ }
+ }
}
- public ValuedQualifier(IQualifier qualifier, String value){
- this(qualifier);
- this.value = value;
+ public ValuedQualifier(IQualifier qualifier){
+ this(qualifier, null);
}
+ public boolean isEditable(){
+ for(Pair pair : pairs){
+ if(pair.name.equals("value") && pair.type.equals("String")){
+ return true;
+ }
+ }
+ return false;
+ }
+
+ public int getState(){
+ return state;
+ }
+
+ public List<Pair> getValuePairs(){
+ return pairs;
+ }
+
public IQualifier getQualifier(){
return qualifier;
}
public String getValue(){
- return value;
+ return generateValue();
}
- public void setValue(String value){
- this.value = value;
+ public String getStringValue(){
+ for(Pair pair : pairs){
+ if(pair.name.equals("value") && pair.type.equals("String")){
+ return (String)pair.value;
+ }
+ }
+ return "";
}
+
+ private String generateValue(){
+ String text = "";
+ boolean first = true;
+ for(Pair pair : pairs){
+ if(!first){
+ text += ", ";
+ }
+ if(!"value".equals(pair.name) || pairs.size() > 1){
+ text += pair.name+"=";
+ }
+ if("char".equals(pair.type)){
+ text += "\'"+pair.value+"\'";
+ }else if("String".equals(pair.type)){
+ text += "\""+pair.value+"\"";
+ }else{
+ text += pair.value;
+ }
+ first = false;
+ }
+ return text;
+ }
+
+ public void setValue(String name, String value){
+ for(Pair pair : pairs){
+ if(pair.name.equals(name)){
+ pair.value = value;
+ }
+ }
+ }
@Override
public boolean equals(Object obj) {
@@ -43,4 +159,12 @@
return getQualifier().getSourceType().getFullyQualifiedName().equals(((ValuedQualifier)obj).getQualifier().getSourceType().getFullyQualifiedName());
return false;
}
+
+ static class Pair{
+ public boolean required;
+ public String type="";
+ public String name="";
+ public Object value;
+ }
+
}
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/xpl/AddQualifiersToBeanComposite.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/xpl/AddQualifiersToBeanComposite.java 2012-02-07 20:31:15 UTC (rev 38485)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/xpl/AddQualifiersToBeanComposite.java 2012-02-07 20:55:30 UTC (rev 38486)
@@ -24,7 +24,6 @@
import org.eclipse.draw2d.ColorConstants;
import org.eclipse.jdt.core.Flags;
import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IMethod;
import org.eclipse.jdt.core.JavaModelException;
import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.jface.dialogs.IMessageProvider;
@@ -138,19 +137,20 @@
originalQualifiers.clear();
deployed.clear();
for(IQualifier q : bean.getQualifiers()){
+
IQualifierDeclaration declaration = CDIMarkerResolutionUtils.findQualifierDeclaration(bean, q);
if(declaration != null){
- String value = CDIMarkerResolutionUtils.findQualifierValue(bean, declaration);
- ValuedQualifier vq = new ValuedQualifier(q, value);
+ //String value = CDIMarkerResolutionUtils.findQualifierValue(bean, declaration);
+ ValuedQualifier vq = new ValuedQualifier(q, declaration);
deployed.add(vq);
}else{
- originalQualifiers.add(new ValuedQualifier(q, ""));
+ originalQualifiers.add(new ValuedQualifier(q));
}
}
defaultQualifier = new ValuedQualifier(bean.getCDIProject().getQualifier(CDIConstants.DEFAULT_QUALIFIER_TYPE_NAME));
namedQualifier = new ValuedQualifier(bean.getCDIProject().getQualifier(CDIConstants.NAMED_QUALIFIER_TYPE_NAME));
- namedQualifier.setValue(beanName);
+ namedQualifier.setValue("value", beanName);
for(ValuedQualifier q : originalQualifiers){
if(q.equals(defaultQualifier)){
@@ -203,7 +203,7 @@
if((isPublic || (samePackage && injectionPointPackage.equals(qualifierPackage))) ){
if(beanJavaProject.findType(qualifierTypeName) != null && injectionPointJavaProject.findType(qualifierTypeName) != null){
if(q.getSourceType().getFullyQualifiedName().equals(CDIConstants.NAMED_QUALIFIER_TYPE_NAME))
- vq.setValue(beanName);
+ vq.setValue("value", beanName);
qualifiers.add(vq);
availableTableViewer.add(vq);
lastQualifier = vq;
@@ -492,10 +492,10 @@
@Override
public void widgetSelected(SelectionEvent event) {
ValuedQualifier[] vq = getDeployedSelection();
- ValueDialog d = new ValueDialog(getShell(), vq[0].getValue());
+ ValueDialog d = new ValueDialog(getShell(), vq[0].getStringValue());
int result = d.open();
if(result == MessageDialog.OK){
- vq[0].setValue(d.getValue());
+ vq[0].setValue("value", d.getValue());
}
}
});
@@ -566,7 +566,7 @@
}
remove.setEnabled(enabled);
- if(enabled && ms.length == 1 && isEditEnabled(ms[0].getQualifier())){
+ if(enabled && ms.length == 1 && isEditEnabled(ms[0])){
editQualifierValue.setEnabled(true);
}else{
editQualifierValue.setEnabled(false);
@@ -584,18 +584,8 @@
page.setPageComplete(isComplete);
}
- private boolean isEditEnabled(IQualifier qualifier){
- IMethod method = qualifier.getSourceType().getMethod("value", new String[]{});
- try{
- if(method.exists()){
- if(method.getReturnType().equals("Ljava.lang.String;"))
- return true;
- }
- }catch(JavaModelException ex){
- CDIUIPlugin.getDefault().logError(ex);
- }
-
- return false;
+ private boolean isEditEnabled(ValuedQualifier valuedQualifier){
+ return valuedQualifier.isEditable();
}
protected void add(boolean all) {
14 years, 2 months
JBoss Tools SVN: r38485 - trunk/central/plugins/org.jboss.tools.central.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-02-07 15:31:15 -0500 (Tue, 07 Feb 2012)
New Revision: 38485
Modified:
trunk/central/plugins/org.jboss.tools.central/pom.xml
Log:
JBIDE-10401 generate correct URL in DefaultJBossCentralConfigurator.java via pom.xml
Modified: trunk/central/plugins/org.jboss.tools.central/pom.xml
===================================================================
--- trunk/central/plugins/org.jboss.tools.central/pom.xml 2012-02-07 20:28:49 UTC (rev 38484)
+++ trunk/central/plugins/org.jboss.tools.central/pom.xml 2012-02-07 20:31:15 UTC (rev 38485)
@@ -15,8 +15,8 @@
<jboss.discovery.directory.url>http://download.jboss.org/jbosstools/updates/development/indigo/jbosstool...</jboss.discovery.directory.url>
</properties>
- <!-- _stable_branch jobs could use this profile but the above default (last stable milestone) is probably better -->
<profiles>
+ <!-- _stable_branch jobs could use this profile but the above default (last stable milestone) is probably better -->
<profile>
<id>3.3.indigo</id>
<activation>
@@ -26,10 +26,8 @@
<jboss.discovery.directory.url>http://download.jboss.org/jbosstools/updates/nightly/core/3.3.indigo/jbos...</jboss.discovery.directory.url>
</properties>
</profile>
- </profiles>
- <!-- _trunk jobs should use this profile -->
- <profiles>
+ <!-- _trunk jobs should use this profile -->
<profile>
<id>trunk</id>
<activation>
14 years, 2 months
JBoss Tools SVN: r38484 - trunk/esb/plugins/org.jboss.tools.esb.validator/.settings.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2012-02-07 15:28:49 -0500 (Tue, 07 Feb 2012)
New Revision: 38484
Removed:
trunk/esb/plugins/org.jboss.tools.esb.validator/.settings/org.eclipse.jdt.core.prefs
Log:
JBIDE-10820
https://issues.jboss.org/browse/JBIDE-10820
Deleted: trunk/esb/plugins/org.jboss.tools.esb.validator/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.validator/.settings/org.eclipse.jdt.core.prefs 2012-02-07 20:27:02 UTC (rev 38483)
+++ trunk/esb/plugins/org.jboss.tools.esb.validator/.settings/org.eclipse.jdt.core.prefs 2012-02-07 20:28:49 UTC (rev 38484)
@@ -1,9 +0,0 @@
-#Wed Feb 17 16:00:33 GMT+03:00 2010
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning
-org.eclipse.jdt.core.compiler.source=1.5
14 years, 2 months
JBoss Tools SVN: r38483 - in trunk/central/plugins/org.jboss.tools.central: src/org/jboss/tools/central/configurators and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-02-07 15:27:02 -0500 (Tue, 07 Feb 2012)
New Revision: 38483
Added:
trunk/central/plugins/org.jboss.tools.central/template/
trunk/central/plugins/org.jboss.tools.central/template/DefaultJBossCentralConfigurator.java
trunk/central/plugins/org.jboss.tools.central/template/README.txt
Modified:
trunk/central/plugins/org.jboss.tools.central/pom.xml
trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/configurators/DefaultJBossCentralConfigurator.java
Log:
JBIDE-10401 generate correct URL in DefaultJBossCentralConfigurator.java via pom.xml
Modified: trunk/central/plugins/org.jboss.tools.central/pom.xml
===================================================================
--- trunk/central/plugins/org.jboss.tools.central/pom.xml 2012-02-07 20:03:52 UTC (rev 38482)
+++ trunk/central/plugins/org.jboss.tools.central/pom.xml 2012-02-07 20:27:02 UTC (rev 38483)
@@ -1,13 +1,100 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.jboss.tools.central</groupId>
<artifactId>plugins</artifactId>
<version>1.0.0-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.central.plugins</groupId>
- <artifactId>org.jboss.tools.central</artifactId>
-
+ <artifactId>org.jboss.tools.central</artifactId>
+
+ <properties>
+ <!-- TODO: for GA, change this from /development/indigo/ to /stable/indigo/ -->
+ <jboss.discovery.directory.url>http://download.jboss.org/jbosstools/updates/development/indigo/jbosstool...</jboss.discovery.directory.url>
+ </properties>
+
+ <!-- _stable_branch jobs could use this profile but the above default (last stable milestone) is probably better -->
+ <profiles>
+ <profile>
+ <id>3.3.indigo</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <properties>
+ <jboss.discovery.directory.url>http://download.jboss.org/jbosstools/updates/nightly/core/3.3.indigo/jbos...</jboss.discovery.directory.url>
+ </properties>
+ </profile>
+ </profiles>
+
+ <!-- _trunk jobs should use this profile -->
+ <profiles>
+ <profile>
+ <id>trunk</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <properties>
+ <jboss.discovery.directory.url>http://download.jboss.org/jbosstools/updates/nightly/core/trunk/jbosstool...</jboss.discovery.directory.url>
+ </properties>
+ </profile>
+ </profiles>
+
<packaging>eclipse-plugin</packaging>
+ <build>
+ <plugins>
+ <!-- This will copy from the source folder to the template folder. Use only if no filtering/replacement has already been done in source folder
+ <plugin>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>2.5</version>
+ <executions>
+ <execution>
+ <id>copy-resources</id>
+ <phase>validate</phase>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${basedir}/template/</outputDirectory>
+ <resources>
+ <resource>
+ <directory>src/org/jboss/tools/central/configurators/</directory>
+ <includes>
+ <include>**/DefaultJBossCentralConfigurator.java</include>
+ </includes>
+ <filtering>true</filtering>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin> -->
+ <plugin>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>2.5</version>
+ <executions>
+ <execution>
+ <id>copy-resources</id>
+ <phase>validate</phase>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${basedir}/src/org/jboss/tools/central/configurators/</outputDirectory>
+ <resources>
+ <resource>
+ <directory>template/</directory>
+ <includes>
+ <include>**/DefaultJBossCentralConfigurator.java</include>
+ </includes>
+ <filtering>true</filtering>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</project>
Modified: trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/configurators/DefaultJBossCentralConfigurator.java
===================================================================
--- trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/configurators/DefaultJBossCentralConfigurator.java 2012-02-07 20:03:52 UTC (rev 38482)
+++ trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/configurators/DefaultJBossCentralConfigurator.java 2012-02-07 20:27:02 UTC (rev 38483)
@@ -18,13 +18,17 @@
/**
*
- * @author snjeza
+ * @author snjeza, nboldt
*
*/
public class DefaultJBossCentralConfigurator implements
IJBossCentralConfigurator {
+
+ // TODO: for GA, change this from /development/indigo/ to /stable/indigo/
+ private static final String JBOSS_DIRECTORY_URL_DEFAULT = "http://download.jboss.org/jbosstools/updates/development/indigo/jbosstool...";
- private static final String JBOSS_DISCOVERY_DIRECTORY_3_3_0_XML = "http://download.jboss.org/jbosstools/updates/nightly/core/trunk/jbosstool..."; // published URL
+ // see pom.xml for actual value -- this is passed it at build-time via Maven
+ private static final String JBOSS_DIRECTORY_URL = "${jboss.discovery.directory.url}";
private static final String TWITTER_LINK ="http://twitter.com/#!/jbosstools";
@@ -43,9 +47,11 @@
@Override
public String getJBossDiscoveryDirectory() {
+ // use commandline override -Djboss.discovery.directory.url
String directory = System.getProperty(JBossCentralActivator.JBOSS_DISCOVERY_DIRECTORY, null);
if (directory == null) {
- return JBOSS_DISCOVERY_DIRECTORY_3_3_0_XML;
+ // else use Maven-generated value; fall back to default
+ return JBOSS_DIRECTORY_URL.equals("${" + "jboss.discovery.directory.url" + "}") ? JBOSS_DIRECTORY_URL_DEFAULT : JBOSS_DIRECTORY_URL;
}
return directory;
}
Copied: trunk/central/plugins/org.jboss.tools.central/template/DefaultJBossCentralConfigurator.java (from rev 38482, trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/configurators/DefaultJBossCentralConfigurator.java)
===================================================================
--- trunk/central/plugins/org.jboss.tools.central/template/DefaultJBossCentralConfigurator.java (rev 0)
+++ trunk/central/plugins/org.jboss.tools.central/template/DefaultJBossCentralConfigurator.java 2012-02-07 20:27:02 UTC (rev 38483)
@@ -0,0 +1,93 @@
+/*************************************************************************************
+ * Copyright (c) 2011 Red Hat, Inc. and others.
+ * All rights reserved. This program and the accompanying materials
+ * are 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:
+ * JBoss by Red Hat - Initial implementation.
+ ************************************************************************************/
+package org.jboss.tools.central.configurators;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.swt.graphics.Image;
+import org.jboss.tools.central.JBossCentralActivator;
+
+/**
+ *
+ * @author snjeza, nboldt
+ *
+ */
+public class DefaultJBossCentralConfigurator implements
+ IJBossCentralConfigurator {
+
+ // TODO: for GA, change this from /development/indigo/ to /stable/indigo/
+ private static final String JBOSS_DIRECTORY_URL_DEFAULT = "http://download.jboss.org/jbosstools/updates/development/indigo/jbosstool...";
+
+ // see pom.xml for actual value -- this is passed it at build-time via Maven
+ private static final String JBOSS_DIRECTORY_URL = "${jboss.discovery.directory.url}";
+
+ private static final String TWITTER_LINK ="http://twitter.com/#!/jbosstools";
+
+ private static final String BLOGS_URL = "http://planet.jboss.org/feeds/blogs";
+
+ private static final String NEWS_URL = "http://planet.jboss.org/feeds/news";
+
+ private Image headerImage;
+
+ @Override
+ public String[] getMainToolbarCommandIds() {
+ return new String[] {"org.jboss.tools.central.openJBossToolsHome",
+ "org.jboss.tools.central.favoriteAtEclipseMarketplace",
+ "org.jboss.tools.central.preferences"};
+ }
+
+ @Override
+ public String getJBossDiscoveryDirectory() {
+ // use commandline override -Djboss.discovery.directory.url
+ String directory = System.getProperty(JBossCentralActivator.JBOSS_DISCOVERY_DIRECTORY, null);
+ if (directory == null) {
+ // else use Maven-generated value; fall back to default
+ return JBOSS_DIRECTORY_URL.equals("${" + "jboss.discovery.directory.url" + "}") ? JBOSS_DIRECTORY_URL_DEFAULT : JBOSS_DIRECTORY_URL;
+ }
+ return directory;
+ }
+
+ @Override
+ public String getTwitterLink() {
+ return TWITTER_LINK;
+ }
+
+ @Override
+ public String getBlogsUrl() {
+ return BLOGS_URL;
+ }
+
+ @Override
+ public String getNewsUrl() {
+ return NEWS_URL;
+ }
+
+ @Override
+ public List<String> getWizardIds() {
+ List<String> wizardIds = new ArrayList<String>();
+ //wizardIDs.add("org.jboss.ide.eclipse.as.openshift.express.ui.wizard.NewServerAdapter");
+ wizardIds.add("org.eclipse.jst.servlet.ui.project.facet.WebProjectWizard");
+ //wizardIds.add("org.jboss.tools.seam.ui.wizards.SeamProjectWizard");
+ //wizardIds.add("org.eclipse.m2e.core.wizards.Maven2ProjectWizard");
+ //wizardIds.add(JBossCentralActivator.NEW_PROJECT_EXAMPLES_WIZARD_ID);
+ wizardIds.add("org.jboss.ide.eclipse.as.openshift.express.ui.wizard.createNewApplicationWizard");
+ return wizardIds;
+ }
+
+ @Override
+ public Image getHeaderImage() {
+ if (headerImage == null) {
+ headerImage = JBossCentralActivator.getDefault().getImage("/icons/jboss.png");
+ }
+ return headerImage;
+ }
+}
Added: trunk/central/plugins/org.jboss.tools.central/template/README.txt
===================================================================
--- trunk/central/plugins/org.jboss.tools.central/template/README.txt (rev 0)
+++ trunk/central/plugins/org.jboss.tools.central/template/README.txt 2012-02-07 20:27:02 UTC (rev 38483)
@@ -0,0 +1,4 @@
+This folder is used to dynamically replace ${jboss.discovery.directory.url} in DefaultJBossCentralConfigurator
+with a valid URL as defined in this plugin's pom.xml.
+
+If you change src/org/jboss/tools/central/configurators/DefaultJBossCentralConfigurator.java, copy your changes into here too.
14 years, 2 months
JBoss Tools SVN: r38482 - trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2012-02-07 15:03:52 -0500 (Tue, 07 Feb 2012)
New Revision: 38482
Modified:
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPage.java
Log:
[JBIDE-10419] corrected validator text so that it matches the required text
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPage.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPage.java 2012-02-07 19:59:10 UTC (rev 38481)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPage.java 2012-02-07 20:03:52 UTC (rev 38482)
@@ -541,7 +541,7 @@
if (applicationName == null || applicationName.isEmpty() || applicationType == null
|| applicationType.isEmpty()) {
return ValidationStatus
- .cancel("Please input a name and select a type for the OpenShift application you want to create.");
+ .cancel("Please enter a name and select a type for the OpenShift application you want to create.");
}
return ValidationStatus.ok();
}
14 years, 2 months
JBoss Tools SVN: r38481 - in trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test: src/org/jboss/tools/jsf/ui/bot/test/cssdialog/jbide and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: vpakan(a)redhat.com
Date: 2012-02-07 14:59:10 -0500 (Tue, 07 Feb 2012)
New Revision: 38481
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/resources/templates/RemoveUnknownTemplate.xml
trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/resources/templates/SetTemplateForUnknownTag.xml
trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/resources/templates/UnknownTemplate.xml
trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/cssdialog/jbide/JBIDE3148and4441Test.java
trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/cssdialog/jbide/JBIDE3577Test.java
trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/cssdialog/jbide/JBIDE3579Test.java
trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/cssdialog/jbide/JBIDE3920Test.java
trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/cssdialog/jbide/JBIDE4391Test.java
trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/smoke/CodeCompletionTest.java
Log:
Fixes for 3.3.Beta1
Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/resources/templates/RemoveUnknownTemplate.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/resources/templates/RemoveUnknownTemplate.xml 2012-02-07 19:32:48 UTC (rev 38480)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/resources/templates/RemoveUnknownTemplate.xml 2012-02-07 19:59:10 UTC (rev 38481)
@@ -16,7 +16,7 @@
<DIV class="__any__tag__caption" style="" title="h:unknowntag" >
h:unknowntag
</DIV>
-<BR style="font-style: italic; color: green; -moz-user-modify: read-only;" >
+<BR vpe:pseudo-element="yes" style="-moz-user-modify: read-only;" >
</BR>
</DIV>
<UL style="color: red; -moz-user-modify: read-only;" title="h:messages style: color: red" >
@@ -43,6 +43,6 @@
</TABLE>
</DIV>
</DIV>
-<IMG vpetemporarydndelement="true" id="dragIcon" src="file:////opt/jbdevstudio5.0.0.M3/studio/plugins/org.jboss.tools.vpe_3.3.0.v20110901-0136-H11-M3/ve/dragIcon.gif" style="position: absolute; cursor: move; left: 16px ! important; top: 78px ! important;" >
+<IMG vpetemporarydndelement="true" id="dragIcon" src="file:////opt/eclipse/eclipse/plugins/org.jboss.tools.vpe_3.3.0.v20120205-0530-H776-Beta1/ve/dragIcon.gif" style="position: absolute; cursor: move; left: 16px ! important; top: 78px ! important;" >
</IMG>
</BODY>
\ No newline at end of file
Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/resources/templates/SetTemplateForUnknownTag.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/resources/templates/SetTemplateForUnknownTag.xml 2012-02-07 19:32:48 UTC (rev 38480)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/resources/templates/SetTemplateForUnknownTag.xml 2012-02-07 19:59:10 UTC (rev 38481)
@@ -16,7 +16,7 @@
<B class="__any__tag__caption" style="color: black; font-family: Arial;" title="h:unknowntag" >
myValue
</B>
-<BR style="font-style: italic; color: green; -moz-user-modify: read-only;" >
+<BR vpe:pseudo-element="yes" style="-moz-user-modify: read-only;" >
</BR>
</B>
<UL style="color: red; -moz-user-modify: read-only;" title="h:messages style: color: red" >
@@ -43,6 +43,6 @@
</TABLE>
</DIV>
</DIV>
-<IMG vpetemporarydndelement="true" id="dragIcon" src="file:////opt/jbdevstudio5.0.0.M3/studio/plugins/org.jboss.tools.vpe_3.3.0.v20110901-0136-H11-M3/ve/dragIcon.gif" style="position: absolute; cursor: move; left: 16px ! important; top: 77px ! important;" >
+<IMG vpetemporarydndelement="true" id="dragIcon" src="file:////opt/eclipse/eclipse/plugins/org.jboss.tools.vpe_3.3.0.v20120205-0530-H776-Beta1/ve/dragIcon.gif" style="position: absolute; cursor: move; left: 16px ! important; top: 77px ! important;" >
</IMG>
</BODY>
\ No newline at end of file
Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/resources/templates/UnknownTemplate.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/resources/templates/UnknownTemplate.xml 2012-02-07 19:32:48 UTC (rev 38480)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/resources/templates/UnknownTemplate.xml 2012-02-07 19:59:10 UTC (rev 38481)
@@ -9,14 +9,14 @@
<DIV title="f:view" >
<H1 style="-moz-user-modify: read-write;" title="h1" >
<SPAN class="vpe-text" title="h:outputText value: #{Message.header}" >
- Hello Demo Application
+Hello Demo Application
</SPAN>
</H1>
<DIV style="-moz-user-modify: read-only; border: 1px solid green;" title="h:unknowntag" >
<DIV class="__any__tag__caption" style="" title="h:unknowntag" >
h:unknowntag
</DIV>
-<BR style="font-style: italic; color: green; -moz-user-modify: read-only;" >
+<BR vpe:pseudo-element="yes" style="-moz-user-modify: read-only;" >
</BR>
</DIV>
<UL style="color: red; -moz-user-modify: read-only;" title="h:messages style: color: red" >
@@ -43,6 +43,6 @@
</TABLE>
</DIV>
</DIV>
-<IMG vpetemporarydndelement="true" id="dragIcon" src="file:////opt/jbdevstudio5.0.0.M3/studio/plugins/org.jboss.tools.vpe_3.3.0.v20110901-0136-H11-M3/ve/dragIcon.gif" style="position: absolute; cursor: move; left: 16px ! important; top: 17px ! important;" >
+<IMG vpetemporarydndelement="true" id="dragIcon" src="file:////opt/eclipse/eclipse/plugins/org.jboss.tools.vpe_3.3.0.v20120205-0530-H776-Beta1/ve/dragIcon.gif" style="position: absolute; cursor: move; left: 16px ! important; top: 17px ! important;" >
</IMG>
</BODY>
\ No newline at end of file
Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/cssdialog/jbide/JBIDE3148and4441Test.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/cssdialog/jbide/JBIDE3148and4441Test.java 2012-02-07 19:32:48 UTC (rev 38480)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/cssdialog/jbide/JBIDE3148and4441Test.java 2012-02-07 19:59:10 UTC (rev 38481)
@@ -20,11 +20,9 @@
SWTBot innerBot = bot.viewByTitle(WidgetVariables.PACKAGE_EXPLORER).bot();
SWTBotTree tree = innerBot.tree();
try {
- tree.expandNode(JBT_TEST_PROJECT_NAME). //$NON-NLS-1$
- getNode(CSS_FILE_NAME+".css").doubleClick(); //$NON-NLS-1$
- bot.editorByTitle(CSS_FILE_NAME+".css").setFocus(); //$NON-NLS-1$
- bot.menu("Edit").menu("Select All").click(); //$NON-NLS-1$//$NON-NLS-2$
- bot.menu("Edit").menu("Delete").click(); //$NON-NLS-1$ //$NON-NLS-2$
+ tree.expandNode(JBT_TEST_PROJECT_NAME).expandNode("WebContent"). //$NON-NLS-1$
+ getNode(CSS_FILE_NAME+".css").doubleClick(); //$NON-NLS-1$
+ bot.editorByTitle(CSS_FILE_NAME+".css").toTextEditor().setText("@CHARSET \"UTF-8\";");
} catch (WidgetNotFoundException e) {
tree.getTreeItem(JBT_TEST_PROJECT_NAME).select(); //$NON-NLS-1$
open.newObject(ActionItem.NewObject.WebCSS.LABEL);
@@ -41,7 +39,6 @@
eclipseEditor.save();
eclipseEditor.contextMenu("Open CSS Dialog").click(); //$NON-NLS-1$
//Test edit attrs of the first Class
-
bot.shell("CSS Class").activate(); //$NON-NLS-1$
bot.comboBoxWithLabel("Style class:").setSelection(CSS_CLASS_NAME); //$NON-NLS-1$
bot.tabItem("Text/Font").activate(); //$NON-NLS-1$
Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/cssdialog/jbide/JBIDE3577Test.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/cssdialog/jbide/JBIDE3577Test.java 2012-02-07 19:32:48 UTC (rev 38480)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/cssdialog/jbide/JBIDE3577Test.java 2012-02-07 19:59:10 UTC (rev 38481)
@@ -20,11 +20,9 @@
SWTBot innerBot = bot.viewByTitle(WidgetVariables.PACKAGE_EXPLORER).bot();
SWTBotTree tree = innerBot.tree();
try {
- tree.expandNode(JBT_TEST_PROJECT_NAME). //$NON-NLS-1$
- getNode(CSS_FILE_NAME+".css").doubleClick(); //$NON-NLS-1$
- bot.editorByTitle(CSS_FILE_NAME+".css").setFocus(); //$NON-NLS-1$
- bot.menu("Edit").menu("Select All").click(); //$NON-NLS-1$ //$NON-NLS-2$
- bot.menu("Edit").menu("Delete").click(); //$NON-NLS-1$//$NON-NLS-2$
+ tree.expandNode(JBT_TEST_PROJECT_NAME).expandNode("WebContent"). //$NON-NLS-1$
+ getNode(CSS_FILE_NAME+".css").doubleClick(); //$NON-NLS-1$
+ bot.editorByTitle(CSS_FILE_NAME+".css").toTextEditor().setText("@CHARSET \"UTF-8\";");
} catch (WidgetNotFoundException e) {
tree.getTreeItem(JBT_TEST_PROJECT_NAME).select(); //$NON-NLS-1$
open.newObject(ActionItem.NewObject.WebCSS.LABEL);
Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/cssdialog/jbide/JBIDE3579Test.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/cssdialog/jbide/JBIDE3579Test.java 2012-02-07 19:32:48 UTC (rev 38480)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/cssdialog/jbide/JBIDE3579Test.java 2012-02-07 19:59:10 UTC (rev 38481)
@@ -20,11 +20,9 @@
SWTBot innerBot = bot.viewByTitle(WidgetVariables.PACKAGE_EXPLORER).bot();
SWTBotTree tree = innerBot.tree();
try {
- tree.expandNode(JBT_TEST_PROJECT_NAME). //$NON-NLS-1$
- getNode(CSS_FILE_NAME+".css").doubleClick(); //$NON-NLS-1$
- bot.editorByTitle(CSS_FILE_NAME+".css").setFocus(); //$NON-NLS-1$
- bot.menu("Edit").menu("Select All").click(); //$NON-NLS-1$//$NON-NLS-2$
- bot.menu("Edit").menu("Delete").click(); //$NON-NLS-1$ //$NON-NLS-2$
+ tree.expandNode(JBT_TEST_PROJECT_NAME).expandNode("WebContent"). //$NON-NLS-1$
+ getNode(CSS_FILE_NAME+".css").doubleClick(); //$NON-NLS-1$
+ bot.editorByTitle(CSS_FILE_NAME+".css").toTextEditor().setText("@CHARSET \"UTF-8\";");
} catch (WidgetNotFoundException e) {
tree.getTreeItem(JBT_TEST_PROJECT_NAME).select(); //$NON-NLS-1$
open.newObject(ActionItem.NewObject.WebCSS.LABEL); //$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$
Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/cssdialog/jbide/JBIDE3920Test.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/cssdialog/jbide/JBIDE3920Test.java 2012-02-07 19:32:48 UTC (rev 38480)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/cssdialog/jbide/JBIDE3920Test.java 2012-02-07 19:59:10 UTC (rev 38481)
@@ -17,11 +17,9 @@
SWTBot innerBot = bot.viewByTitle(WidgetVariables.PACKAGE_EXPLORER).bot();
SWTBotTree tree = innerBot.tree();
try {
- tree.expandNode(JBT_TEST_PROJECT_NAME). //$NON-NLS-1$
- getNode(CSS_FILE_NAME+".css").doubleClick(); //$NON-NLS-1$
- bot.editorByTitle(CSS_FILE_NAME+".css").setFocus(); //$NON-NLS-1$
- bot.menu("Edit").menu("Select All").click(); //$NON-NLS-1$//$NON-NLS-2$
- bot.menu("Edit").menu("Delete").click(); //$NON-NLS-1$ //$NON-NLS-2$
+ tree.expandNode(JBT_TEST_PROJECT_NAME).expandNode("WebContent"). //$NON-NLS-1$
+ getNode(CSS_FILE_NAME+".css").doubleClick(); //$NON-NLS-1$
+ bot.editorByTitle(CSS_FILE_NAME+".css").toTextEditor().setText("@CHARSET \"UTF-8\";");
} catch (WidgetNotFoundException e) {
tree.getTreeItem(JBT_TEST_PROJECT_NAME).select(); //$NON-NLS-1$
open.newObject(ActionItem.NewObject.WebCSS.LABEL); //$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$
Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/cssdialog/jbide/JBIDE4391Test.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/cssdialog/jbide/JBIDE4391Test.java 2012-02-07 19:32:48 UTC (rev 38480)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/cssdialog/jbide/JBIDE4391Test.java 2012-02-07 19:59:10 UTC (rev 38481)
@@ -14,17 +14,14 @@
private static String CSS_CLASS_NAME = "cssclass"; //$NON-NLS-1$
public void testJBIDE4391(){
-
//Test Create new CSS file
SWTBot innerBot= bot.viewByTitle(WidgetVariables.PACKAGE_EXPLORER).bot();
SWTBotTree tree = innerBot.tree();
try {
- tree.expandNode(JBT_TEST_PROJECT_NAME). //$NON-NLS-1$
- getNode(CSS_FILE_NAME+".css").doubleClick(); //$NON-NLS-1$
- bot.editorByTitle(CSS_FILE_NAME+".css").setFocus(); //$NON-NLS-1$
- bot.menu("Edit").menu("Select All").click(); //$NON-NLS-1$ //$NON-NLS-2$
- bot.menu("Edit").menu("Delete").click(); //$NON-NLS-1$ //$NON-NLS-2$
+ tree.expandNode(JBT_TEST_PROJECT_NAME).expandNode("WebContent"). //$NON-NLS-1$
+ getNode(CSS_FILE_NAME+".css").doubleClick(); //$NON-NLS-1$
+ bot.editorByTitle(CSS_FILE_NAME+".css").toTextEditor().setText("@CHARSET \"UTF-8\";");
} catch (WidgetNotFoundException e) {
tree.getTreeItem(JBT_TEST_PROJECT_NAME).select(); //$NON-NLS-1$
open.newObject(ActionItem.NewObject.WebCSS.LABEL);; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
@@ -40,7 +37,6 @@
eclipseEditor.contextMenu("Open CSS Dialog").click(); //$NON-NLS-1$
//Test incorrect attribute
-
bot.shell("CSS Class").activate(); //$NON-NLS-1$
bot.comboBoxWithLabel("Style class:").setSelection(CSS_CLASS_NAME); //$NON-NLS-1$
bot.tabItem("Text/Font").activate(); //$NON-NLS-1$
@@ -50,7 +46,6 @@
assertEquals(JSFAutoTestCase.stripCSSText("cssclass{\r\tcolor:red;\r\t" + "background-color:green;\r}@CHARSET \"UTF-8\";"),
JSFAutoTestCase.stripCSSText(bot.editorByTitle(CSS_FILE_NAME+".css").toTextEditor().getText())); //$NON-NLS-1$ //$NON-NLS-2$
bot.editorByTitle(CSS_FILE_NAME+".css").close(); //$NON-NLS-1$
-
}
@Override
Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/smoke/CodeCompletionTest.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/smoke/CodeCompletionTest.java 2012-02-07 19:32:48 UTC (rev 38480)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/smoke/CodeCompletionTest.java 2012-02-07 19:59:10 UTC (rev 38481)
@@ -347,7 +347,7 @@
editor.save();
bot.sleep(Timing.time1S());
Assertions.assertSourceEditorContains(editor.getText(),
- textToInsert + useCodeAssist + "}" + textToInsertAtEnd,
+ textToInsert + useCodeAssist + "}\"" + textToInsertAtEnd,
FACELETS_TEST_PAGE);
}
/**
14 years, 2 months
JBoss Tools SVN: r38480 - trunk/requirements/soap.
by jbosstools-commits＠lists.jboss.org
Author: ldimaggio
Date: 2012-02-07 14:32:48 -0500 (Tue, 07 Feb 2012)
New Revision: 38480
Modified:
trunk/requirements/soap/build.properties
trunk/requirements/soap/buildRequirement.xml
Log:
JBDS-2003 - ldimaggi - updated to reflect support for latest SOA and 4.3 (CP05) and 5 (5.2) - removed references to other (5.0.1, 5.1) SOA releases
Modified: trunk/requirements/soap/build.properties
===================================================================
--- trunk/requirements/soap/build.properties 2012-02-07 19:07:02 UTC (rev 38479)
+++ trunk/requirements/soap/build.properties 2012-02-07 19:32:48 UTC (rev 38480)
@@ -1,32 +1,11 @@
-soap43.build.uri=http://download.devel.redhat.com/released/JBossSOAP/4.3.0/GA
-soap43.build.name=soa-4.3.0.GA
+# JBDS-2003 - ldimaggi - updated to reflect support for latest SOA and 4.3 (CP05) and 5 (5.2)
+soap43.build.uri=http://download.devel.redhat.com/released/JBossSOAP/4.3.0/CP05
+soap43.build.name=soa-4.3.0.GA_CP05
soap43.build.archive=${soap43.build.name}.zip
-soap43.build.archive.md5=9d19284caf81b96d93c21148477df2fd
+soap43.build.archive.md5=91ce2b24015178cda02878d0abe38ac7
soap43.build.archive.root=jboss-soa-p.4.3.0
-soap50.build.uri=http://download.devel.redhat.com/released/JBossSOAP/5.0.1/
-soap50.build.name=soa-5.0.1.GA-signed
-soap50.build.archive=${soap50.build.name}.zip
-soap50.build.archive.md5=b9088f7884c7464419623c596dafe25f
-soap50.build.archive.root=jboss-soa-p.5.0.0
-
-# JBDS-1374, JBIDE-8055, JBIDE-8403 update SOA-P 5.1 - http://jawa05.englab.brq.redhat.com/released/SOA-5.1.GA/unsigned/soa-5.1....
-# DO NOT USE stuff in http://porkchop.devel.redhat.com/released/JBossSOAP/5.1/5.1.0/ (not sure why different, but different; also no modeshape/teiid jars)
-soap51.build.uri=http://jawa05.englab.brq.redhat.com/released/SOA-5.1.GA/unsigned/
-soap51.build.name=soa-5.1.0.GA
-soap51.build.archive=${soap51.build.name}.zip
-soap51.build.archive.md5=f3cb81c4c7493a6255620d15233a5671
-soap51.build.archive.root=jboss-soa-p.5.1.0
-
-# http://jawa05.englab.brq.redhat.com/candidate/soa-5.2.0.ER6/soa-p-5.2.0.E...
-#soap52.build.uri=http://jawa05.englab.brq.redhat.com/candidate/soa-5.2.0.ER6/
-#soap52.build.name=soa-p-5.2.0.ER6
-#soap52.build.archive=${soap51.build.name}.zip
-#soap52.build.archive.md5=abc110a6e71c0c93713a350dacfcec46
-#soap52.build.archive.root=jboss-soa-p.5.2.0
-
# Added Dec 2 2011 - ldimaggi
-# http://download.devel.redhat.com/released/JBossSOAP/5.2.0/
soap52.build.uri=http://download.devel.redhat.com/released/JBossSOAP/5.2.0/
soap52.build.name=soa-p-5.2.0.GA
soap52.build.archive=${soap52.build.name}.zip
Modified: trunk/requirements/soap/buildRequirement.xml
===================================================================
--- trunk/requirements/soap/buildRequirement.xml 2012-02-07 19:07:02 UTC (rev 38479)
+++ trunk/requirements/soap/buildRequirement.xml 2012-02-07 19:32:48 UTC (rev 38480)
@@ -19,15 +19,10 @@
<param name="md5" value="${soap43.build.archive.md5}" />
</antcall>
<antcall target="build.soap">
- <param name="build.uri" value="${soap50.build.uri}"/>
- <param name="build.archive" value="${soap50.build.archive}"/>
- <param name="md5" value="${soap50.build.archive.md5}" />
+ <param name="build.uri" value="${soap52.build.uri}"/>
+ <param name="build.archive" value="${soap52.build.archive}"/>
+ <param name="md5" value="${soap52.build.archive.md5}" />
</antcall>
- <antcall target="build.soap">
- <param name="build.uri" value="${soap51.build.uri}"/>
- <param name="build.archive" value="${soap51.build.archive}"/>
- <param name="md5" value="${soap51.build.archive.md5}" />
- </antcall>
</target>
</project>
14 years, 2 months