JBoss Tools SVN: r41455 - in trunk/build: publish and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-05-26 01:17:46 -0400 (Sat, 26 May 2012)
New Revision: 41455
Modified:
trunk/build/publish.sh
trunk/build/publish/publish.sh
Log:
update build/publish/publish.sh from changes to build/publish.sh -- not sure why we have duplicate copies now, however.
Modified: trunk/build/publish/publish.sh
===================================================================
--- trunk/build/publish/publish.sh 2012-05-26 01:38:57 UTC (rev 41454)
+++ trunk/build/publish/publish.sh 2012-05-26 05:17:46 UTC (rev 41455)
@@ -144,6 +144,12 @@
fi
done
+# if installer jars exist (should be 2 installers, 2 md5sums)
+for z in $(find ${WORKSPACE}/sources/product/installer/target -type f -name "jbdevstudio-product*-universal*.jar*"); do
+ mkdir -p ${STAGINGDIR}/installer/
+ rsync -aq $z ${STAGINGDIR}/installer/
+done
+
# if zips exist produced & renamed by ant script, copy them too
if [[ ! -f ${STAGINGDIR}/all/${SNAPNAME} ]]; then
for z in $(find ${WORKSPACE} -maxdepth 5 -mindepth 3 -name "*Update*.zip" | sort | tail -1); do
@@ -305,6 +311,13 @@
if [[ ${JOB_NAME/.aggregate} != ${JOB_NAME} ]]; then
echo "<meta http-equiv=\"refresh\" content=\"0;url=${BUILD_ID}-H${BUILD_NUMBER}/\">" > $tmpdir/latestBuild.html
if [[ ${PUBLISHPATHSUFFIX} ]]; then
+ date
+ # create folders if not already there
+ if [[ ${DESTINATION##*@*:*} == "" ]]; then # user@server, do remote op
+ seg="."; for d in ${PUBLISHPATHSUFFIX/\// }; do seg=$seg/$d; echo -e "mkdir ${seg:2}" | sftp $DESTINATION/builds/nightly/; done; seg=""
+ else
+ mkdir -p $DESTINATION/builds/nightly/${PUBLISHPATHSUFFIX}
+ fi
date; rsync -arzq --protocol=28 --delete ${STAGINGDIR}/* $DESTINATION/builds/nightly/${PUBLISHPATHSUFFIX}/${BUILD_ID}-H${BUILD_NUMBER}/
# sftp only works with user@server, not with local $DESTINATIONS, so use rsync to push symlink instead
# echo -e "rm latest\nln ${BUILD_ID}-H${BUILD_NUMBER} latest" | sftp ${DESTINATIONREDUX}/builds/nightly/${PUBLISHPATHSUFFIX}/
@@ -426,6 +439,12 @@
# extra publish step for aggregate update sites ONLY
if [[ ${JOB_NAME/.aggregate} != ${JOB_NAME} ]]; then
if [[ ${PUBLISHPATHSUFFIX} ]]; then
+ # create folders if not already there
+ if [[ ${DESTINATION##*@*:*} == "" ]]; then # user@server, do remote op
+ seg="."; for d in ${PUBLISHPATHSUFFIX/\// }; do seg=$seg/$d; echo -e "mkdir ${seg:2}" | sftp $DESTINATION/updates/nightly/; done; seg=""
+ else
+ mkdir -p $DESTINATION/updates/nightly/${PUBLISHPATHSUFFIX}
+ fi
date; rsync -arzq --protocol=28 --delete ${STAGINGDIR}/all/repo/* $DESTINATION/updates/nightly/${PUBLISHPATHSUFFIX}/
else
date; rsync -arzq --protocol=28 --delete ${STAGINGDIR}/all/repo/* $DESTINATION/updates/nightly/${JOBNAMEREDUX}/
Modified: trunk/build/publish.sh
===================================================================
--- trunk/build/publish.sh 2012-05-26 01:38:57 UTC (rev 41454)
+++ trunk/build/publish.sh 2012-05-26 05:17:46 UTC (rev 41455)
@@ -445,7 +445,7 @@
else
mkdir -p $DESTINATION/updates/nightly/${PUBLISHPATHSUFFIX}
fi
- date; rsync -arzq --protocol=28 --delete ${STAGINGDIR}/all/repo/* $DESTINATION/updates/nightly/${PUBLISHPATHSUFFIX}/
+ date; rsync -arzq --protocol=28 --delete ${STAGINGDIR}/all/repo/* $DESTINATION/updates/nightly/${PUBLISHPATHSUFFIX}/
else
date; rsync -arzq --protocol=28 --delete ${STAGINGDIR}/all/repo/* $DESTINATION/updates/nightly/${JOBNAMEREDUX}/
fi
13 years, 10 months
JBoss Tools SVN: r41454 - trunk/build.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-05-25 21:38:57 -0400 (Fri, 25 May 2012)
New Revision: 41454
Modified:
trunk/build/publish.sh
Log:
add support for discovery of {WORKSPACE}/sources/product/installer/target/jbdevstudio-product*-universal*.jar*; copy new installers into {STAGINGDIR}/installer/
Modified: trunk/build/publish.sh
===================================================================
--- trunk/build/publish.sh 2012-05-26 00:30:46 UTC (rev 41453)
+++ trunk/build/publish.sh 2012-05-26 01:38:57 UTC (rev 41454)
@@ -144,6 +144,12 @@
fi
done
+# if installer jars exist (should be 2 installers, 2 md5sums)
+for z in $(find ${WORKSPACE}/sources/product/installer/target -type f -name "jbdevstudio-product*-universal*.jar*"); do
+ mkdir -p ${STAGINGDIR}/installer/
+ rsync -aq $z ${STAGINGDIR}/installer/
+done
+
# if zips exist produced & renamed by ant script, copy them too
if [[ ! -f ${STAGINGDIR}/all/${SNAPNAME} ]]; then
for z in $(find ${WORKSPACE} -maxdepth 5 -mindepth 3 -name "*Update*.zip" | sort | tail -1); do
13 years, 10 months
JBoss Tools SVN: r41453 - trunk/cdi/plugins/org.jboss.tools.cdi.deltaspike.core/src/org/jboss/tools/cdi/deltaspike/core.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2012-05-25 20:30:46 -0400 (Fri, 25 May 2012)
New Revision: 41453
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.deltaspike.core/src/org/jboss/tools/cdi/deltaspike/core/DeltaspikeAuthorityMethod.java
trunk/cdi/plugins/org.jboss.tools.cdi.deltaspike.core/src/org/jboss/tools/cdi/deltaspike/core/DeltaspikeSecurityExtension.java
Log:
JBIDE-11552
https://issues.jboss.org/browse/JBIDE-11552
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.deltaspike.core/src/org/jboss/tools/cdi/deltaspike/core/DeltaspikeAuthorityMethod.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.deltaspike.core/src/org/jboss/tools/cdi/deltaspike/core/DeltaspikeAuthorityMethod.java 2012-05-25 23:21:41 UTC (rev 41452)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.deltaspike.core/src/org/jboss/tools/cdi/deltaspike/core/DeltaspikeAuthorityMethod.java 2012-05-26 00:30:46 UTC (rev 41453)
@@ -77,29 +77,22 @@
return false;
}
+ public String getKey() {
+ String separator = ":"; //$NON-NLS-1$
+ String result = declaringTypeName + separator + method.getMethod().getElementName();
+ try {
+ result += separator + method.getMethod().getSignature();
+ } catch (JavaModelException e) {
+ DeltaspikeCorePlugin.getDefault().logError(e);
+ }
+ return result;
+ }
+
public boolean equals(Object o) {
if(!(o instanceof DeltaspikeAuthorityMethod)) {
return false;
}
DeltaspikeAuthorityMethod other = (DeltaspikeAuthorityMethod)o;
- if(!other.declaringTypeName.equals(declaringTypeName)) {
- return false;
- }
- if(!other.path.equals(path)) {
- return false;
- }
- if(!method.getMethod().getElementName().equals(other.getMethod().getMethod().getElementName())) {
- return false;
- }
- try {
- String kThis = method.getMethod().getSignature();
- String kThat = other.method.getMethod().getSignature();
- if(!kThis.equals(kThat)) {
- return false;
- }
- } catch (JavaModelException e) {
- DeltaspikeCorePlugin.getDefault().logError(e);
- }
- return true;
+ return getKey().equals(other.getKey());
}
}
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.deltaspike.core/src/org/jboss/tools/cdi/deltaspike/core/DeltaspikeSecurityExtension.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.deltaspike.core/src/org/jboss/tools/cdi/deltaspike/core/DeltaspikeSecurityExtension.java 2012-05-25 23:21:41 UTC (rev 41452)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.deltaspike.core/src/org/jboss/tools/cdi/deltaspike/core/DeltaspikeSecurityExtension.java 2012-05-26 00:30:46 UTC (rev 41453)
@@ -13,6 +13,7 @@
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashSet;
+import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -248,6 +249,17 @@
}
Set<DeltaspikeAuthorityMethod> authorizers2 = collectAuthorizerMethods(parents, c.getSecurityBindingTypeName());
authorizers2.addAll(c.getAuthorizerMembers());
+ Set<String> x = new HashSet<String>();
+ Iterator<DeltaspikeAuthorityMethod> it = authorizers2.iterator();
+ while(it.hasNext()) {
+ DeltaspikeAuthorityMethod a = it.next();
+ String key = a.getKey();
+ if(x.contains(key)) {
+ it.remove();
+ } else {
+ x.add(key);
+ }
+ }
Map<AbstractMemberDefinition, SecurityBindingDeclaration> bound = c.getBoundMembers();
for (AbstractMemberDefinition d: bound.keySet()) {
String name = d instanceof MethodDefinition ? ((MethodDefinition)d).getMethod().getElementName()
13 years, 10 months
JBoss Tools SVN: r41452 - 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-05-25 19:21:41 -0400 (Fri, 25 May 2012)
New Revision: 41452
Modified:
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/OpenShiftExpressApplicationWizard.java
Log:
increased timeout for app-creation and app-waiting since the handle timeouts internally with dialogs that allow the user to continue/cancel
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/OpenShiftExpressApplicationWizard.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/OpenShiftExpressApplicationWizard.java 2012-05-25 22:00:05 UTC (rev 41451)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/OpenShiftExpressApplicationWizard.java 2012-05-25 23:21:41 UTC (rev 41452)
@@ -26,7 +26,9 @@
import org.eclipse.jface.dialogs.ErrorDialog;
import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.wizard.IWizardContainer;
import org.eclipse.jface.wizard.Wizard;
+import org.eclipse.jface.wizard.WizardDialog;
import org.eclipse.jgit.api.errors.JGitInternalException;
import org.eclipse.jgit.errors.TransportException;
import org.eclipse.osgi.util.NLS;
@@ -56,8 +58,8 @@
*/
public abstract class OpenShiftExpressApplicationWizard extends Wizard implements IImportWizard, INewWizard {
- private static final int APP_CREATE_TIMEOUT = 2 * 60 * 1000;
- private static final int APP_WAIT_TIMEOUT = 3 * 60 * 1000;
+ private static final int APP_CREATE_TIMEOUT = 5 * 60 * 1000;
+ private static final int APP_WAIT_TIMEOUT = 5 * 60 * 1000;
private static final long EMBED_CARTRIDGES_TIMEOUT = 2 * 60 * 1000;
private static final int IMPORT_TIMEOUT = 1 * 60 * 1000;
@@ -170,7 +172,7 @@
private boolean processStatus(String operation, IStatus status) {
if (JobUtils.isCancel(status)) {
if (AbstractDelegatingMonitorJob.TIMEOUTED_CANCELLED == status.getCode()) {
- getContainer().getShell().close();
+ closeWizard();
} else {
new ErrorDialog(getShell(),
NLS.bind("Operation was cancelled", operation),
@@ -188,6 +190,13 @@
return true;
}
+ private void closeWizard() {
+ IWizardContainer container = getContainer();
+ if (container instanceof WizardDialog) {
+ ((WizardDialog) container).close();
+ }
+ }
+
private IStatus waitForApplication(IApplication application) {
try {
AbstractDelegatingMonitorJob job = new WaitForApplicationJob(application, getShell());
13 years, 10 months
JBoss Tools SVN: r41451 - in trunk/maven/plugins/org.jboss.tools.maven.ui: src/org/jboss/tools/maven/ui/internal/markers and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2012-05-25 18:00:05 -0400 (Fri, 25 May 2012)
New Revision: 41451
Added:
trunk/maven/plugins/org.jboss.tools.maven.ui/icons/resolved.gif
trunk/maven/plugins/org.jboss.tools.maven.ui/icons/unresolved.gif
Modified:
trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/internal/markers/ConfigureMavenRepositoriesMarkerResolution.java
trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/internal/markers/MavenDependencyMarkerResolutionGenerator.java
trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/wizard/AddRepositoryDialog.java
trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/wizard/ConfigureMavenRepositoriesWizard.java
trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/wizard/ConfigureMavenRepositoriesWizardPage.java
Log:
JBIDE-11953 - UI challenges with "Configure maven repositories"
Added: trunk/maven/plugins/org.jboss.tools.maven.ui/icons/resolved.gif
===================================================================
(Binary files differ)
Property changes on: trunk/maven/plugins/org.jboss.tools.maven.ui/icons/resolved.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/maven/plugins/org.jboss.tools.maven.ui/icons/unresolved.gif
===================================================================
(Binary files differ)
Property changes on: trunk/maven/plugins/org.jboss.tools.maven.ui/icons/unresolved.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/internal/markers/ConfigureMavenRepositoriesMarkerResolution.java
===================================================================
--- trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/internal/markers/ConfigureMavenRepositoriesMarkerResolution.java 2012-05-25 21:50:12 UTC (rev 41450)
+++ trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/internal/markers/ConfigureMavenRepositoriesMarkerResolution.java 2012-05-25 22:00:05 UTC (rev 41451)
@@ -12,6 +12,7 @@
import org.eclipse.core.resources.IMarker;
import org.eclipse.jface.wizard.WizardDialog;
+import org.eclipse.m2e.core.embedder.ArtifactKey;
import org.eclipse.swt.graphics.Image;
import org.eclipse.swt.widgets.Display;
import org.eclipse.ui.IMarkerResolution;
@@ -22,9 +23,15 @@
IMarkerResolution2 {
+ private ArtifactKey artifactKey;
+
public ConfigureMavenRepositoriesMarkerResolution() {
}
+ public ConfigureMavenRepositoriesMarkerResolution(ArtifactKey artifactKey) {
+ this.artifactKey = artifactKey;
+ }
+
public String getDescription() {
return getLabel();
}
@@ -37,9 +44,9 @@
return "Configure Maven Repositories";
}
- public void run(IMarker arg0) {
+ public void run(IMarker marker) {
- ConfigureMavenRepositoriesWizard wizard = new ConfigureMavenRepositoriesWizard();
+ ConfigureMavenRepositoriesWizard wizard = new ConfigureMavenRepositoriesWizard(artifactKey);
WizardDialog dialog = new WizardDialog(Display.getDefault().getActiveShell(), wizard);
dialog.create();
dialog.open();
Modified: trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/internal/markers/MavenDependencyMarkerResolutionGenerator.java
===================================================================
--- trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/internal/markers/MavenDependencyMarkerResolutionGenerator.java 2012-05-25 21:50:12 UTC (rev 41450)
+++ trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/internal/markers/MavenDependencyMarkerResolutionGenerator.java 2012-05-25 22:00:05 UTC (rev 41451)
@@ -16,6 +16,7 @@
import org.eclipse.m2e.core.internal.IMavenConstants;
import org.eclipse.ui.IMarkerResolution;
import org.eclipse.ui.IMarkerResolutionGenerator2;
+import org.jboss.tools.maven.ui.Activator;
import org.jboss.tools.maven.ui.Messages;
@SuppressWarnings("nls")
@@ -34,6 +35,8 @@
private static final String FAILURE_TO_FIND_STRING = "Failure to find "; //$NON-NLS-1$
+ private static final String COULD_NOT_FIND_STRING = "Could not find artifact "; //$NON-NLS-1$
+
enum ResolutionType {
JBOSS_REPO, EAP_REPO, UNSUPPORTED
}
@@ -44,16 +47,17 @@
public IMarkerResolution[] getResolutions(IMarker marker) {
ResolutionType type = getResolutionType(marker);
+ ArtifactKey key = getArtifactKey(marker);
switch (type) {
case JBOSS_REPO:
return new IMarkerResolution[] {
- new ConfigureMavenRepositoriesMarkerResolution(),
+ new ConfigureMavenRepositoriesMarkerResolution(key),
new OpenPageInBrowserMarkerResolution(Messages.Quickfix_setupCommunityRepo,
JBOSS_COMMUNITY_REPO_SETUP_GUIDE_URL)
};
case EAP_REPO:
return new IMarkerResolution[] {
- new ConfigureMavenRepositoriesMarkerResolution(),
+ new ConfigureMavenRepositoriesMarkerResolution(key),
new OpenPageInBrowserMarkerResolution(Messages.Quickfix_setupEnterpriseRepo,
JBOSS_ENTERPRISE_REPO_SETUP_GUIDE_URL)
};
@@ -93,7 +97,7 @@
}
}
} catch (CoreException e) {
- e.printStackTrace();
+ Activator.log(e);
}
return key;
}
@@ -108,10 +112,18 @@
}
private ArtifactKey parsePomLoadingErrorMessage(String message) {
+ ArtifactKey key = parseMessage(message, FAILURE_TO_FIND_STRING);
+ if (key == null) {
+ key = parseMessage(message, COULD_NOT_FIND_STRING);
+ }
+ return key;
+ }
+
+ protected ArtifactKey parseMessage(String message, String text) {
+ int start = message.indexOf(text);
ArtifactKey key = null;
- int start = message.indexOf(FAILURE_TO_FIND_STRING);
if (start > -1) {
- int from = FAILURE_TO_FIND_STRING.length()+start;
+ int from = text.length()+start;
String keyString = message.substring(from, message.indexOf(" ", from));
key = extractKey(key, keyString);
}
@@ -120,16 +132,16 @@
private ArtifactKey extractKey(ArtifactKey key, String keyString) {
String[] keyAsArray = keyString.trim().split(":"); //$NON-NLS-1$
- if (keyAsArray.length > 3) {
+ if (keyAsArray.length >= 3) {
String groupId = keyAsArray[0];
String artifactId = keyAsArray[1];
String classifier = null;
String version;
- if (keyAsArray.length > 4) {
- classifier = keyAsArray[3];
- version = keyAsArray[4];
+ if (keyAsArray.length > 3) {
+ classifier = keyAsArray[2];
+ version = keyAsArray[3];
} else {
- version = keyAsArray[3];
+ version = keyAsArray[2];
}
key = new ArtifactKey(groupId, artifactId, version, classifier);
}
Modified: trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/wizard/AddRepositoryDialog.java
===================================================================
--- trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/wizard/AddRepositoryDialog.java 2012-05-25 21:50:12 UTC (rev 41450)
+++ trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/wizard/AddRepositoryDialog.java 2012-05-25 22:00:05 UTC (rev 41451)
@@ -10,13 +10,18 @@
import java.util.TreeSet;
import org.apache.maven.repository.RepositorySystem;
+import org.apache.maven.repository.internal.MavenRepositorySystemSession;
import org.apache.maven.settings.Profile;
import org.apache.maven.settings.Repository;
import org.apache.maven.settings.Settings;
+import org.codehaus.plexus.DefaultPlexusContainer;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Path;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.jface.dialogs.IDialogConstants;
import org.eclipse.jface.dialogs.IDialogSettings;
import org.eclipse.jface.dialogs.IMessageProvider;
@@ -29,6 +34,7 @@
import org.eclipse.jface.operation.IRunnableWithProgress;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.m2e.core.MavenPlugin;
+import org.eclipse.m2e.core.embedder.ArtifactKey;
import org.eclipse.m2e.core.embedder.IMaven;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.ModifyEvent;
@@ -43,11 +49,19 @@
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.DirectoryDialog;
+import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Group;
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.swt.widgets.Text;
import org.jboss.tools.maven.ui.Activator;
+import org.sonatype.aether.artifact.Artifact;
+import org.sonatype.aether.repository.LocalRepository;
+import org.sonatype.aether.repository.RemoteRepository;
+import org.sonatype.aether.resolution.ArtifactRequest;
+import org.sonatype.aether.resolution.ArtifactResolutionException;
+import org.sonatype.aether.resolution.ArtifactResult;
+import org.sonatype.aether.util.artifact.DefaultArtifact;
public class AddRepositoryDialog extends TitleAreaDialog {
@@ -76,7 +90,7 @@
private Text idText;
private Text urlText;
private Text nameText;
- private Image jbossImage;
+ private Image jbossImage, resolvedImage, unresolvedImage;
private IDialogSettings dialogSettings;
private String localRepository;
private ControlDecoration profileComboDecoration;
@@ -87,16 +101,21 @@
private ControlDecoration urlExistsTextDecoration;
private RepositoryWrapper repositoryWrapper;
+ private ArtifactKey artifactKey;
+ private Label artifactLabel;
+ private String coords;
+ private Label artifactImageLabel;
public AddRepositoryDialog(Shell parentShell,
Set<RepositoryWrapper> availableRepositories,
- Set<RepositoryWrapper> includedRepositories, IMaven maven) {
+ Set<RepositoryWrapper> includedRepositories, IMaven maven, ArtifactKey artifactKey) {
super(parentShell);
setShellStyle(SWT.CLOSE | SWT.MAX | SWT.TITLE | SWT.BORDER | SWT.RESIZE
| getDefaultOrientation());
this.availableRepositories = availableRepositories;
this.includedRepositories = includedRepositories;
this.maven = maven;
+ this.artifactKey = artifactKey;
}
@Override
@@ -202,7 +221,6 @@
urlTextDecoration = addDecoration(urlText, FieldDecorationRegistry.DEC_REQUIRED, REPOSITORY_URL_IS_REQUIRED);
urlValidTextDecoration = addDecoration(urlText, FieldDecorationRegistry.DEC_ERROR, URL_IS_NOT_VALID);
urlExistsTextDecoration = addDecoration(urlText, FieldDecorationRegistry.DEC_ERROR, URL_ALREADY_EXISTS);
-
Button recognizeButton = new Button(contents, SWT.PUSH);
recognizeButton.setLayoutData(new GridData(SWT.BEGINNING, SWT.FILL, true, false));
recognizeButton.setText("Recognize JBoss Maven Enterprise Repositories...");
@@ -303,9 +321,120 @@
}
});
+ if (artifactKey != null) {
+ String message = "The '" + getCoords() + "' artifact";
+ final String unresolvedMessage = message + " is not resolved.";
+ final String resolvedMessage = message + " is resolved.";
+ Composite labelComposite = new Composite(contents, SWT.NONE);
+ labelComposite.setLayout(new GridLayout(2, false));
+ labelComposite.setLayoutData(new GridData(GridData.FILL, GridData.FILL, true, false));
+ artifactImageLabel = createLabel(labelComposite, ""); //$NON-NLS-1$
+ artifactLabel = createLabel(labelComposite, unresolvedMessage );
+ artifactImageLabel.setImage(getUnresolvedImage());
+ urlText.addModifyListener(new ModifyListener() {
+
+ public void modifyText(ModifyEvent e) {
+ if (getErrorMessage() != null) {
+ return;
+ }
+ final String id = idText.getText().trim();
+ final String url = urlText.getText().trim();
+ Job job = new Job("Resolving artifact ...") {
+
+ @Override
+ protected IStatus run(IProgressMonitor monitor) {
+ final boolean resolved = resolveArtifact(id, url);
+ Display.getDefault().asyncExec(new Runnable() {
+
+ public void run() {
+ if (resolved) {
+ artifactImageLabel.setImage(getResolvedImage());
+ artifactLabel.setText(resolvedMessage);
+ } else {
+ artifactImageLabel.setImage(getUnresolvedImage());
+ artifactLabel.setText(unresolvedMessage);
+ }
+ }
+ });
+
+ return Status.OK_STATUS;
+ }
+
+ };
+ job.setUser(true);
+ job.schedule();
+ }
+ });
+ }
+
return area;
}
+ private String getCoords() {
+ if (coords == null && artifactKey != null) {
+ StringBuilder builder = new StringBuilder();
+ builder.append(artifactKey.getGroupId());
+ builder.append(":");
+ builder.append(artifactKey.getArtifactId());
+ builder.append(":");
+ if (artifactKey.getClassifier() != null) {
+ builder.append(artifactKey.getClassifier());
+ builder.append(":");
+ }
+ builder.append(artifactKey.getVersion());
+ coords = builder.toString();
+ }
+ return coords;
+ }
+
+ private boolean resolveArtifact(String id, String url) {
+
+ org.sonatype.aether.RepositorySystem system;
+ try {
+ system = new DefaultPlexusContainer()
+ .lookup(org.sonatype.aether.RepositorySystem.class);
+ } catch (Exception e) {
+ Activator.log(e);
+ return false;
+ }
+ MavenRepositorySystemSession session = new MavenRepositorySystemSession();
+ IMaven maven = MavenPlugin.getMaven();
+ String localRepoHome = maven.getLocalRepositoryPath();
+ LocalRepository localRepo = new LocalRepository(localRepoHome);
+ session.setLocalRepositoryManager(system.newLocalRepositoryManager(localRepo));
+
+ ArtifactRequest artifactRequest = new ArtifactRequest();
+ artifactRequest.setArtifact(new DefaultArtifact(getCoords()));
+
+ RemoteRepository centralRepo = new RemoteRepository( "central", "default", "http://repo1.maven.org/maven2/" ); //$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$
+ artifactRequest.addRepository(centralRepo);
+ RemoteRepository remoteRepo = new RemoteRepository(id,
+ "default", url); //$NON-NLS-1$
+ artifactRequest.addRepository(remoteRepo);
+ for (RepositoryWrapper wrapper : includedRepositories) {
+ Repository repo = wrapper.getRepository();
+ if (repo == null) {
+ continue;
+ }
+ remoteRepo = new RemoteRepository(repo.getId(),
+ "default", repo.getUrl()); //$NON-NLS-1$
+ artifactRequest.addRepository(remoteRepo);
+ }
+
+ try {
+ ArtifactResult artifactResult = system.resolveArtifact(session,
+ artifactRequest);
+ Artifact artifact = artifactResult.getArtifact();
+ return artifact != null;
+ } catch (ArtifactResolutionException e) {
+ if (Activator.getDefault().isDebugging()) {
+ Activator.log(e);
+ }
+ }
+
+ return false;
+ }
+
private Text createText(Composite parent) {
Text text = new Text(parent, SWT.SINGLE|SWT.BORDER);
text.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL));
@@ -402,8 +531,8 @@
}
}
- private Label createLabel(Composite repositoryComposite, String text) {
- Label label = new Label(repositoryComposite, SWT.NONE);
+ private Label createLabel(Composite parent, String text) {
+ Label label = new Label(parent, SWT.NONE);
label.setLayoutData(new GridData(GridData.FILL, GridData.FILL, false,
false));
label.setText(text);
@@ -452,6 +581,24 @@
return jbossImage;
}
+ private Image getResolvedImage() {
+ if (resolvedImage == null) {
+ ImageDescriptor desc = Activator.imageDescriptorFromPlugin(Activator.PLUGIN_ID,
+ "icons/resolved.gif"); //$NON-NLS-1$
+ resolvedImage = desc.createImage();
+ }
+ return resolvedImage;
+ }
+
+ private Image getUnresolvedImage() {
+ if (unresolvedImage == null) {
+ ImageDescriptor desc = Activator.imageDescriptorFromPlugin(Activator.PLUGIN_ID,
+ "icons/unresolved.gif"); //$NON-NLS-1$
+ unresolvedImage = desc.createImage();
+ }
+ return unresolvedImage;
+ }
+
private void searchForRepositories(IPath path,
Set<RepositoryWrapper> repos, IProgressMonitor monitor) {
File[] files = null;
@@ -652,6 +799,12 @@
if (jbossImage != null) {
jbossImage.dispose();
}
+ if (resolvedImage != null) {
+ resolvedImage.dispose();
+ }
+ if (unresolvedImage != null) {
+ unresolvedImage.dispose();
+ }
return super.close();
}
Modified: trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/wizard/ConfigureMavenRepositoriesWizard.java
===================================================================
--- trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/wizard/ConfigureMavenRepositoriesWizard.java 2012-05-25 21:50:12 UTC (rev 41450)
+++ trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/wizard/ConfigureMavenRepositoriesWizard.java 2012-05-25 22:00:05 UTC (rev 41451)
@@ -13,6 +13,7 @@
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.wizard.Wizard;
+import org.eclipse.m2e.core.embedder.ArtifactKey;
import org.eclipse.ui.INewWizard;
import org.eclipse.ui.IWorkbench;
import org.jboss.tools.maven.ui.Activator;
@@ -26,12 +27,18 @@
INewWizard {
private ConfigureMavenRepositoriesWizardPage page;
+ private ArtifactKey artifactKey;
public ConfigureMavenRepositoriesWizard() {
super();
setWindowTitle("Maven Repositories");
}
+ public ConfigureMavenRepositoriesWizard(ArtifactKey artifactKey) {
+ this();
+ this.artifactKey = artifactKey;
+ }
+
public void init(IWorkbench workbench, IStructuredSelection selection) {
initializeDefaultPageImageDescriptor();
}
@@ -49,7 +56,7 @@
@Override
public void addPages() {
- page = new ConfigureMavenRepositoriesWizardPage();
+ page = new ConfigureMavenRepositoriesWizardPage(artifactKey);
addPage(page);
}
}
Modified: trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/wizard/ConfigureMavenRepositoriesWizardPage.java
===================================================================
--- trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/wizard/ConfigureMavenRepositoriesWizardPage.java 2012-05-25 21:50:12 UTC (rev 41450)
+++ trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/wizard/ConfigureMavenRepositoriesWizardPage.java 2012-05-25 22:00:05 UTC (rev 41451)
@@ -49,7 +49,14 @@
import org.eclipse.compare.contentmergeviewer.TextMergeViewer;
import org.eclipse.compare.structuremergeviewer.DiffNode;
import org.eclipse.compare.structuremergeviewer.Differencer;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.core.runtime.SubProgressMonitor;
+import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.jface.viewers.ArrayContentProvider;
@@ -70,7 +77,13 @@
import org.eclipse.jface.window.Window;
import org.eclipse.jface.wizard.WizardPage;
import org.eclipse.m2e.core.MavenPlugin;
+import org.eclipse.m2e.core.embedder.ArtifactKey;
import org.eclipse.m2e.core.embedder.IMaven;
+import org.eclipse.m2e.core.embedder.IMavenConfiguration;
+import org.eclipse.m2e.core.internal.IMavenConstants;
+import org.eclipse.m2e.core.internal.index.IndexManager;
+import org.eclipse.m2e.core.project.IMavenProjectFacade;
+import org.eclipse.m2e.core.project.MavenUpdateRequest;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.DisposeEvent;
import org.eclipse.swt.events.DisposeListener;
@@ -184,16 +197,14 @@
private String newSettings;
private String oldSettings;
+
+ private ArtifactKey artifactKey;
- public ConfigureMavenRepositoriesWizardPage() {
+ public ConfigureMavenRepositoriesWizardPage(ArtifactKey artifactKey) {
super(PAGE_NAME);
setTitle("Configure Maven Repositories");
maven = MavenPlugin.getMaven();
-// try {
-// maven.reloadSettings();
-// } catch (CoreException e) {
-// Activator.log(e);
-// }
+ this.artifactKey = artifactKey;
}
public void createControl(Composite parent) {
@@ -361,7 +372,7 @@
@Override
public void widgetSelected(SelectionEvent e) {
- AddRepositoryDialog dialog = new AddRepositoryDialog(getShell(), availableRepositories, includedRepositories, maven);
+ AddRepositoryDialog dialog = new AddRepositoryDialog(getShell(), availableRepositories, includedRepositories, maven, artifactKey);
int ok = dialog.open();
if (ok == Window.OK) {
RepositoryWrapper wrapper = dialog.getRepositoryWrapper();
@@ -1000,7 +1011,7 @@
byte[] bytes = outputString.getBytes(UTF_8);
out.write(bytes);
out.flush();
- maven.reloadSettings();
+ updateSettings();
} catch (Exception e) {
MessageDialog.openError(getShell(), ERROR_TITLE, e.getMessage());
Activator.log(e);
@@ -1017,7 +1028,50 @@
return true;
}
- protected boolean getMessageDialog(Set<RepositoryWrapper> repos) {
+ protected void updateSettings() {
+ final String userSettings = getUserSettings();
+
+ Job job = new Job("Updating Maven settings...") {
+ protected IStatus run(IProgressMonitor monitor) {
+ try {
+ MavenPlugin.getMaven().reloadSettings();
+ final File localRepositoryDir = new File(maven
+ .getLocalRepository().getBasedir());
+
+ IMavenConfiguration mavenConfiguration = MavenPlugin
+ .getMavenConfiguration();
+ if (userSettings.length() > 0) {
+ mavenConfiguration.setUserSettingsFile(userSettings);
+ } else {
+ mavenConfiguration.setUserSettingsFile(null);
+ }
+
+ File newRepositoryDir = new File(maven.getLocalRepository()
+ .getBasedir());
+ if (!newRepositoryDir.equals(localRepositoryDir)) {
+ IndexManager indexManager = MavenPlugin
+ .getIndexManager();
+ indexManager.getWorkspaceIndex().updateIndex(true, monitor);
+ }
+
+ List<IMavenProjectFacade> facades = new ArrayList<IMavenProjectFacade>();
+ IProject[] projects = ResourcesPlugin.getWorkspace().getRoot().getProjects();
+
+ if (projects != null && projects.length > 0) {
+ MavenUpdateRequest updateRequest = new MavenUpdateRequest(projects, mavenConfiguration.isOffline(),true);
+ MavenPlugin.getMavenProjectRegistry().refresh(updateRequest);
+ }
+ return Status.OK_STATUS;
+ } catch (CoreException e) {
+ Activator.log(e);
+ return e.getStatus();
+ }
+ }
+ };
+ job.schedule();
+ }
+
+ private boolean getMessageDialog(Set<RepositoryWrapper> repos) {
if (repos.size() == 0) {
return false;
}
13 years, 10 months
JBoss Tools SVN: r41450 - in trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui: serverviewer/actionDelegate and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: xcoulon
Date: 2012-05-25 17:50:12 -0400 (Fri, 25 May 2012)
New Revision: 41450
Modified:
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/CreateApplicationAction.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/serverviewer/actionDelegate/AbstractServerViewerActionProvider.java
Log:
Fixed - JBIDE-12014
Credentials page appears twice when creating new application and user is not connected
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/CreateApplicationAction.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/CreateApplicationAction.java 2012-05-25 21:26:12 UTC (rev 41449)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/CreateApplicationAction.java 2012-05-25 21:50:12 UTC (rev 41450)
@@ -43,6 +43,7 @@
Object sel = ((ITreeSelection) selection).getFirstElement();
if (sel instanceof UserDelegate) {
final UserDelegate user = (UserDelegate) sel;
+ user.checkForPassword();
final OpenShiftExpressApplicationWizard wizard = new NewOpenShiftExpressApplicationWizard(user);
final WizardDialog wizardDialog = new WizardDialog(new Shell(), wizard);
wizardDialog.open();
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/serverviewer/actionDelegate/AbstractServerViewerActionProvider.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/serverviewer/actionDelegate/AbstractServerViewerActionProvider.java 2012-05-25 21:26:12 UTC (rev 41449)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/serverviewer/actionDelegate/AbstractServerViewerActionProvider.java 2012-05-25 21:50:12 UTC (rev 41450)
@@ -76,7 +76,7 @@
return (MenuManager) item;
}
}
- MenuManager openshiftMenu = new MenuManager("Openshift...",
+ MenuManager openshiftMenu = new MenuManager("OpenShift",
OPENSHIFT_SERVER_ADAPTER_MENU);
menu.add(openshiftMenu);
menu.insertBefore(ServerActionProvider.TOP_SECTION_END_SEPARATOR, openshiftMenu);
13 years, 10 months
JBoss Tools SVN: r41449 - in trunk/build/aggregate: soatests-site and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-05-25 17:26:12 -0400 (Fri, 25 May 2012)
New Revision: 41449
Modified:
trunk/build/aggregate/soa-site/pom.xml
trunk/build/aggregate/soatests-site/pom.xml
Log:
https://issues.jboss.org/browse/JBDS-1763 add jboss-requirements-composite-soa-tooling-mirror to SOA Tooling agg sites
Modified: trunk/build/aggregate/soa-site/pom.xml
===================================================================
--- trunk/build/aggregate/soa-site/pom.xml 2012-05-25 21:25:26 UTC (rev 41448)
+++ trunk/build/aggregate/soa-site/pom.xml 2012-05-25 21:26:12 UTC (rev 41449)
@@ -58,5 +58,16 @@
<enabled>true</enabled>
</releases>
</repository>
+ <repository>
+ <id>jboss-requirements-composite-soa-tooling-mirror</id>
+ <url>${jboss-requirements-composite-soa-tooling-mirror}</url>
+ <layout>p2</layout>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </repository>
</repositories>
</project>
Modified: trunk/build/aggregate/soatests-site/pom.xml
===================================================================
--- trunk/build/aggregate/soatests-site/pom.xml 2012-05-25 21:25:26 UTC (rev 41448)
+++ trunk/build/aggregate/soatests-site/pom.xml 2012-05-25 21:26:12 UTC (rev 41449)
@@ -58,5 +58,16 @@
<enabled>true</enabled>
</releases>
</repository>
+ <repository>
+ <id>jboss-requirements-composite-soa-tooling-mirror</id>
+ <url>${jboss-requirements-composite-soa-tooling-mirror}</url>
+ <layout>p2</layout>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </repository>
</repositories>
</project>
13 years, 10 months
JBoss Tools SVN: r41448 - trunk/build/parent.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-05-25 17:25:26 -0400 (Fri, 25 May 2012)
New Revision: 41448
Modified:
trunk/build/parent/pom.xml
Log:
https://issues.jboss.org/browse/JBIDE-11536 add jboss-requirements-composite-soa-tooling-mirror for use by BPEL
Modified: trunk/build/parent/pom.xml
===================================================================
--- trunk/build/parent/pom.xml 2012-05-25 21:25:20 UTC (rev 41447)
+++ trunk/build/parent/pom.xml 2012-05-25 21:25:26 UTC (rev 41448)
@@ -56,6 +56,7 @@
<!-- 3a. URL of latest JBT requirements composite mirror -->
<!-- TODO: don't forget to update this in ../aggregate/*/associate.properties too (5 files)! -->
<jboss-requirements-composite-mirror>http://download.jboss.org/jbosstools/updates/indigo/SR2/</jboss-requirements-composite-mirror>
+ <jboss-requirements-composite-soa-tooling-mirror>http://download.jboss.org/jbosstools/updates/indigo/soa-tooling/SR2/</jboss-requirements-composite-soa-tooling-mirror>
<!-- 3b., or use -Plocal.requirements -Dlocal.requirements=file:///path/to/mirror/of/composite/requirements/site -->
<local.requirements>file:///qa/services/http/binaries/RHDS/updates/indigo/</local.requirements>
13 years, 10 months
JBoss Tools SVN: r41447 - in trunk/bpel: features/org.jboss.tools.bpel.feature and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-05-25 17:25:20 -0400 (Fri, 25 May 2012)
New Revision: 41447
Modified:
trunk/bpel/features/org.jboss.tools.bpel.feature/feature.xml
trunk/bpel/pom.xml
Log:
https://issues.jboss.org/browse/JBIDE-11536 add jboss-requirements-composite-soa-tooling-mirror so site can build; change org.eclipse.bpel.feature v from 0.8 to 1.0
Modified: trunk/bpel/features/org.jboss.tools.bpel.feature/feature.xml
===================================================================
--- trunk/bpel/features/org.jboss.tools.bpel.feature/feature.xml 2012-05-25 21:23:32 UTC (rev 41446)
+++ trunk/bpel/features/org.jboss.tools.bpel.feature/feature.xml 2012-05-25 21:25:20 UTC (rev 41447)
@@ -58,7 +58,7 @@
<import plugin="org.eclipse.ui.navigator" />
<import plugin="org.eclipse.ui" version="3.4.0" match="compatible" />
<import plugin="org.eclipse.gef" version="3.4.0" match="compatible" />
- <import feature="org.eclipse.bpel.feature" version="0.8.0" match="compatible" />
+ <import feature="org.eclipse.bpel.feature" version="1.0.0" match="compatible" />
<import feature="org.eclipse.bpel.common.feature" version="1.0.0" match="compatible" />
<import feature="org.eclipse.bpel.apache.ode.runtime.feature" version="1.0.0" match="compatible" />
</requires>
Modified: trunk/bpel/pom.xml
===================================================================
--- trunk/bpel/pom.xml 2012-05-25 21:23:32 UTC (rev 41446)
+++ trunk/bpel/pom.xml 2012-05-25 21:25:20 UTC (rev 41447)
@@ -18,5 +18,18 @@
<module>site</module>
<module>tests</module>
</modules>
+ <repositories>
+ <repository>
+ <id>jboss-requirements-composite-soa-tooling-mirror</id>
+ <url>${jboss-requirements-composite-soa-tooling-mirror}</url>
+ <layout>p2</layout>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </repository>
+ </repositories>
</project>
13 years, 10 months
JBoss Tools SVN: r41446 - trunk/cdi/tests/org.jboss.tools.cdi.deltaspike.core.test/src/org/jboss/tools/cdi/deltaspike/core/test.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2012-05-25 17:23:32 -0400 (Fri, 25 May 2012)
New Revision: 41446
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.deltaspike.core.test/src/org/jboss/tools/cdi/deltaspike/core/test/DeltaspikeCoreAllTests.java
trunk/cdi/tests/org.jboss.tools.cdi.deltaspike.core.test/src/org/jboss/tools/cdi/deltaspike/core/test/DeltaspikeCoreTestSetup.java
Log:
JBIDE-11552
https://issues.jboss.org/browse/JBIDE-11552
Tests are added.
Modified: trunk/cdi/tests/org.jboss.tools.cdi.deltaspike.core.test/src/org/jboss/tools/cdi/deltaspike/core/test/DeltaspikeCoreAllTests.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.deltaspike.core.test/src/org/jboss/tools/cdi/deltaspike/core/test/DeltaspikeCoreAllTests.java 2012-05-25 21:23:16 UTC (rev 41445)
+++ trunk/cdi/tests/org.jboss.tools.cdi.deltaspike.core.test/src/org/jboss/tools/cdi/deltaspike/core/test/DeltaspikeCoreAllTests.java 2012-05-25 21:23:32 UTC (rev 41446)
@@ -22,7 +22,7 @@
* @author Alexey Kazakov
*/
public class DeltaspikeCoreAllTests {
- public static String PLUGIN_ID = "org.jboss.tools.cdi.deltaspike.core.test";
+ public static String PLUGIN_ID = "org.jboss.tools.cdi.deltaspike.core.test"; //$NON-NLS-1$
public static Test suite() {
JavaModelManager.getIndexManager().disable();
@@ -31,9 +31,9 @@
ValidationExceptionTest.initLogger();
- TestSuite suiteAll = new TestSuite("Deltasipke Core Tests");
+ TestSuite suiteAll = new TestSuite("Deltasipke Core Tests"); //$NON-NLS-1$
- TestSuite suite = new TestSuite("Deltaspike Core Project Tests");
+ TestSuite suite = new TestSuite("Deltaspike Core Project Tests"); //$NON-NLS-1$
suite.addTestSuite(DeltaspikeBeansTest.class);
suite.addTestSuite(DeltaspikeValidationTest.class);
Modified: trunk/cdi/tests/org.jboss.tools.cdi.deltaspike.core.test/src/org/jboss/tools/cdi/deltaspike/core/test/DeltaspikeCoreTestSetup.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.deltaspike.core.test/src/org/jboss/tools/cdi/deltaspike/core/test/DeltaspikeCoreTestSetup.java 2012-05-25 21:23:16 UTC (rev 41445)
+++ trunk/cdi/tests/org.jboss.tools.cdi.deltaspike.core.test/src/org/jboss/tools/cdi/deltaspike/core/test/DeltaspikeCoreTestSetup.java 2012-05-25 21:23:32 UTC (rev 41446)
@@ -24,11 +24,11 @@
*/
public class DeltaspikeCoreTestSetup extends TestSetup {
- public static final String PLUGIN_ID = "org.jboss.tools.cdi.deltaspike.core.test";
- public static final String PROJECT_NAME = "DeltaspikeCoreTest";
- public static final String PROJECT_PATH = "/projects/DeltaspikeCoreTest";
- public static final String ROOT_PROJECT_NAME = "DeltaspikeCoreRootTest";
- public static final String ROOT_PROJECT_PATH = "/projects/DeltaspikeCoreRootTest";
+ public static final String PLUGIN_ID = "org.jboss.tools.cdi.deltaspike.core.test"; //$NON-NLS-1$
+ public static final String PROJECT_NAME = "DeltaspikeCoreTest"; //$NON-NLS-1$
+ public static final String PROJECT_PATH = "/projects/DeltaspikeCoreTest"; //$NON-NLS-1$
+ public static final String ROOT_PROJECT_NAME = "DeltaspikeCoreRootTest"; //$NON-NLS-1$
+ public static final String ROOT_PROJECT_PATH = "/projects/DeltaspikeCoreRootTest"; //$NON-NLS-1$
protected IProject project;
protected IProject rootProject;
13 years, 10 months