JBoss Tools SVN: r43987 - trunk/maven/plugins/org.jboss.tools.maven.conversion.ui/src/org/jboss/tools/maven/conversion/ui/internal/jobs.
by jbosstools-commits＠lists.jboss.org
Author: fbricon
Date: 2012-09-25 06:22:19 -0400 (Tue, 25 Sep 2012)
New Revision: 43987
Modified:
trunk/maven/plugins/org.jboss.tools.maven.conversion.ui/src/org/jboss/tools/maven/conversion/ui/internal/jobs/IdentificationJob.java
Log:
JBIDE-12707 : be quiet about unresolved dependencies
Modified: trunk/maven/plugins/org.jboss.tools.maven.conversion.ui/src/org/jboss/tools/maven/conversion/ui/internal/jobs/IdentificationJob.java
===================================================================
--- trunk/maven/plugins/org.jboss.tools.maven.conversion.ui/src/org/jboss/tools/maven/conversion/ui/internal/jobs/IdentificationJob.java 2012-09-25 10:00:13 UTC (rev 43986)
+++ trunk/maven/plugins/org.jboss.tools.maven.conversion.ui/src/org/jboss/tools/maven/conversion/ui/internal/jobs/IdentificationJob.java 2012-09-25 10:22:19 UTC (rev 43987)
@@ -94,6 +94,7 @@
if (monitor.isCanceled()) {
return;
}
+ resolvable = Boolean.FALSE;
String groupId = dependency.getGroupId();
String artifactId = dependency.getArtifactId();
String version = dependency.getVersion();
@@ -102,7 +103,12 @@
IMaven maven = MavenPlugin.getMaven();
List<ArtifactRepository> artifactRepositories = maven.getArtifactRepositories();
- Artifact a = maven.resolve(groupId , artifactId , version , type , classifier , artifactRepositories , monitor);
+ Artifact a = null;
+ try {
+ a = maven.resolve(groupId , artifactId , version , type , classifier , artifactRepositories , monitor);
+ } catch (CoreException e) {
+ //Expected
+ }
resolvable = (a != null && a.isResolved());
}
12 years, 3 months
JBoss Tools SVN: r43986 - trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2012-09-25 06:00:13 -0400 (Tue, 25 Sep 2012)
New Revision: 43986
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEPublishMethod.java
Log:
JBIDE-12706 to trunk
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEPublishMethod.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEPublishMethod.java 2012-09-25 09:53:57 UTC (rev 43985)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEPublishMethod.java 2012-09-25 10:00:13 UTC (rev 43986)
@@ -31,12 +31,12 @@
import org.jboss.ide.eclipse.as.core.extensions.events.ServerLogger;
import org.jboss.ide.eclipse.as.core.publishers.AbstractPublishMethod;
import org.jboss.ide.eclipse.as.core.publishers.AbstractServerToolsPublisher;
+import org.jboss.ide.eclipse.as.core.server.IDelegatingServerBehavior;
import org.jboss.ide.eclipse.as.core.server.IDeployableServer;
import org.jboss.ide.eclipse.as.core.server.IDeployableServerBehaviour;
import org.jboss.ide.eclipse.as.core.server.IJBoss6Server;
import org.jboss.ide.eclipse.as.core.server.IPublishCopyCallbackHandler;
import org.jboss.ide.eclipse.as.core.server.internal.DelegatingServerBehavior;
-import org.jboss.ide.eclipse.as.core.server.internal.DeployableServerBehavior;
import org.jboss.ide.eclipse.as.core.server.internal.JBossServer;
import org.jboss.ide.eclipse.as.core.util.IEventCodes;
import org.jboss.ide.eclipse.as.core.util.IJBossRuntimeResourceConstants;
@@ -67,7 +67,8 @@
private IFileServiceSubSystem fileSubSystem = null;
private IPath remoteRootFolder;
- public void publishStart(DeployableServerBehavior behaviour,
+ @Override
+ public void publishStart(IDeployableServerBehaviour behaviour,
IProgressMonitor monitor) throws CoreException {
monitor.beginTask("Beginning Publish for server " + behaviour.getServer().getName(), 300);
super.publishStart(behaviour, AbstractServerToolsPublisher.getSubMon(monitor, 100));
@@ -85,10 +86,11 @@
Trace.trace(Trace.STRING_FINER, "Finished publish start for server " + getServer().getName());
}
- public int publishFinish(DeployableServerBehavior behaviour,
+ @Override
+ public int publishFinish(IDeployableServerBehaviour behaviour,
IProgressMonitor monitor) throws CoreException {
Trace.trace(Trace.STRING_FINER, "Beginning publishFinish for server " + getServer().getName());
- DelegatingServerBehavior b = (DelegatingServerBehavior) behaviour.getServer().loadAdapter(DelegatingServerBehavior.class, new NullProgressMonitor());
+ IDelegatingServerBehavior b = (IDelegatingServerBehavior) behaviour.getServer().loadAdapter(IDelegatingServerBehavior.class, new NullProgressMonitor());
if( b != null && getServer().getServerState() == IServer.STATE_STARTED ) {
startDeploymentScanner();
}
@@ -99,7 +101,7 @@
Trace.trace(Trace.STRING_FINER, "Starting remote deployment scanner for server " + getServer().getName());
String cmd = getDeploymentScannerCommand(new NullProgressMonitor(), true);
if( cmd != null )
- launchCommandNoResult((DelegatingServerBehavior)behaviour, 3000, cmd);
+ launchCommandNoResult((IDelegatingServerBehavior)behaviour, 3000, cmd);
}
protected void stopDeploymentScanner() {
@@ -242,6 +244,7 @@
}
public String getPublishDefaultRootFolder(IServer server) {
+ this.behaviour = ServerConverter.getDeployableServerBehavior(server);
return getRemoteRootFolder().toString();
}
public String getPublishDefaultRootTempFolder(IServer server) {
@@ -249,7 +252,7 @@
return getPublishDefaultRootFolder(server);
}
- private void launchCommandNoResult(DelegatingServerBehavior behaviour, int delay, String command) {
+ private void launchCommandNoResult(IDelegatingServerBehavior behaviour, int delay, String command) {
Trace.trace(Trace.STRING_FINER, "Launching remote command: " + command);
try {
ServerShellModel model = RSEHostShellModel.getInstance().getModel(behaviour.getServer());
12 years, 3 months
JBoss Tools SVN: r43985 - trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2012-09-25 05:53:57 -0400 (Tue, 25 Sep 2012)
New Revision: 43985
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSERemotePublishHandler.java
Log:
JBIDE-12585 part1 to trunk
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSERemotePublishHandler.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSERemotePublishHandler.java 2012-09-25 09:52:00 UTC (rev 43984)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSERemotePublishHandler.java 2012-09-25 09:53:57 UTC (rev 43985)
@@ -26,11 +26,11 @@
import org.eclipse.rse.core.model.IHost;
import org.eclipse.rse.services.clientserver.messages.SystemMessageException;
import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFile;
-import org.eclipse.wst.common.project.facet.core.util.internal.ProgressMonitorUtil;
import org.eclipse.wst.server.core.model.IModuleFile;
import org.jboss.ide.eclipse.as.core.publishers.PublishUtil;
import org.jboss.ide.eclipse.as.core.server.IPublishCopyCallbackHandler;
import org.jboss.ide.eclipse.as.core.util.IEventCodes;
+import org.jboss.ide.eclipse.as.core.util.ProgressMonitorUtil;
public class RSERemotePublishHandler implements IPublishCopyCallbackHandler {
protected IPath root;
@@ -57,6 +57,10 @@
}
protected static IStatus generateFailStatus(String message, String resource, RSEPublishMethod method, Exception sme) {
+ String exceptionMsg = sme.getMessage();
+ if( "Missing element for : ''".equals(exceptionMsg)) {
+ sme = new Exception("The requested path is not found on the remote system.", sme);
+ }
String connectionName = method == null ? null : RSEUtils.getRSEConnectionName(method.getBehaviour().getServer());
IHost host = connectionName == null ? null : RSEUtils.findHost(connectionName);
IStatus s = new Status(IStatus.ERROR, RSECorePlugin.PLUGIN_ID, IEventCodes.JST_PUB_FAIL,
12 years, 3 months
JBoss Tools SVN: r43984 - in trunk/maven/plugins/org.jboss.tools.maven.conversion.ui/src/org/jboss/tools/maven/conversion/ui: handlers and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: fbricon
Date: 2012-09-25 05:52:00 -0400 (Tue, 25 Sep 2012)
New Revision: 43984
Added:
trunk/maven/plugins/org.jboss.tools.maven.conversion.ui/src/org/jboss/tools/maven/conversion/ui/internal/jobs/
trunk/maven/plugins/org.jboss.tools.maven.conversion.ui/src/org/jboss/tools/maven/conversion/ui/internal/jobs/DependencyResolutionJob.java
trunk/maven/plugins/org.jboss.tools.maven.conversion.ui/src/org/jboss/tools/maven/conversion/ui/internal/jobs/IdentificationJob.java
trunk/maven/plugins/org.jboss.tools.maven.conversion.ui/src/org/jboss/tools/maven/conversion/ui/internal/jobs/IdentifyJarJob.java
trunk/maven/plugins/org.jboss.tools.maven.conversion.ui/src/org/jboss/tools/maven/conversion/ui/internal/jobs/IdentifyProjectJob.java
Removed:
trunk/maven/plugins/org.jboss.tools.maven.conversion.ui/src/org/jboss/tools/maven/conversion/ui/handlers/IdentifyJarJob.java
Modified:
trunk/maven/plugins/org.jboss.tools.maven.conversion.ui/src/org/jboss/tools/maven/conversion/ui/dialog/IdentifyMavenDependencyPage.java
Log:
JBIDE-12707 : identify maven project dependencies
Modified: trunk/maven/plugins/org.jboss.tools.maven.conversion.ui/src/org/jboss/tools/maven/conversion/ui/dialog/IdentifyMavenDependencyPage.java
===================================================================
--- trunk/maven/plugins/org.jboss.tools.maven.conversion.ui/src/org/jboss/tools/maven/conversion/ui/dialog/IdentifyMavenDependencyPage.java 2012-09-25 01:50:49 UTC (rev 43983)
+++ trunk/maven/plugins/org.jboss.tools.maven.conversion.ui/src/org/jboss/tools/maven/conversion/ui/dialog/IdentifyMavenDependencyPage.java 2012-09-25 09:52:00 UTC (rev 43984)
@@ -55,10 +55,13 @@
import org.eclipse.swt.widgets.TableItem;
import org.jboss.tools.maven.conversion.ui.dialog.xpl.ConversionUtils;
import org.jboss.tools.maven.conversion.ui.dialog.xpl.EditDependencyDialog;
-import org.jboss.tools.maven.conversion.ui.handlers.IdentifyJarJob;
-import org.jboss.tools.maven.conversion.ui.handlers.IdentifyJarJob.Task;
import org.jboss.tools.maven.conversion.ui.internal.CellListener;
import org.jboss.tools.maven.conversion.ui.internal.MavenDependencyConversionActivator;
+import org.jboss.tools.maven.conversion.ui.internal.jobs.DependencyResolutionJob;
+import org.jboss.tools.maven.conversion.ui.internal.jobs.IdentificationJob;
+import org.jboss.tools.maven.conversion.ui.internal.jobs.IdentifyJarJob;
+import org.jboss.tools.maven.conversion.ui.internal.jobs.IdentifyProjectJob;
+import org.jboss.tools.maven.conversion.ui.internal.jobs.IdentificationJob.Task;
import org.jboss.tools.maven.core.identification.IFileIdentificationManager;
import org.jboss.tools.maven.core.identification.IdentificationUtil;
import org.jboss.tools.maven.core.internal.identification.FileIdentificationManager;
@@ -75,7 +78,7 @@
private Map<IClasspathEntry, Dependency> dependencyMap;
- private Map<IClasspathEntry, IdentifyJarJob> identificationJobs;
+ private Map<IClasspathEntry, IdentificationJob> identificationJobs;
private Set<IClasspathEntry> initialEntries;
@@ -260,7 +263,7 @@
if (columnIndex == DEPENDENCY_COLUMN) {
IClasspathEntry cpe = (IClasspathEntry) item.getData();
- IdentifyJarJob job = identificationJobs.get(cpe);
+ IdentificationJob job = identificationJobs.get(cpe);
if (Job.RUNNING == job.getState()) {
return;
}
@@ -302,7 +305,7 @@
private void resolve(IClasspathEntry cpe, Dependency d) {
if (d != null) {
- IdentifyJarJob job = identificationJobs.get(cpe);
+ IdentificationJob job = identificationJobs.get(cpe);
job.setDependency(d);
job.setRequestedProcess(Task.RESOLUTION_ONLY);
job.schedule();
@@ -310,7 +313,7 @@
}
public boolean hasNoRunningJobs() {
- for (IdentifyJarJob job : identificationJobs.values()) {
+ for (IdentificationJob job : identificationJobs.values()) {
if (job.getState() == Job.RUNNING){
return false;
}
@@ -386,7 +389,7 @@
//don't need to run identification
//continue;
}
- IdentifyJarJob job = identificationJobs.get(entry.getKey());
+ IdentificationJob job = identificationJobs.get(entry.getKey());
if (job != null) {
job.setProgressGroup(monitor, 1);
int jobState = job.getState();
@@ -427,7 +430,7 @@
private void initJobs() {
if (identificationJobs == null) {
- identificationJobs = new HashMap<IClasspathEntry, IdentifyJarJob>(dependencyMap.size());
+ identificationJobs = new HashMap<IClasspathEntry, IdentificationJob>(dependencyMap.size());
Table t = dependenciesViewer.getTable();
IFileIdentificationManager fileIdentificationManager = new FileIdentificationManager();
@@ -441,9 +444,16 @@
}
File jar;
try {
- jar = ConversionUtils.getFile(cpe);
+ final IdentificationJob job;
+ if (cpe.getEntryKind() == IClasspathEntry.CPE_PROJECT) {
+ job = new IdentifyProjectJob("Search the Maven coordinates for "+cpe.getPath(), cpe.getPath());
+ } else if (cpe.getEntryKind() == IClasspathEntry.CPE_LIBRARY) {
+ jar = ConversionUtils.getFile(cpe);
+ job = new IdentifyJarJob("Search the Maven coordinates for "+jar.getAbsolutePath(), fileIdentificationManager, jar);
+ } else {
+ job = new DependencyResolutionJob("Resolve the Maven dependency for "+cpe.getPath());
+ }
- final IdentifyJarJob job = new IdentifyJarJob("Search the Maven coordinates for "+jar.getAbsolutePath(), fileIdentificationManager, jar);
job.addJobChangeListener(new IJobChangeListener() {
@Override
@@ -508,6 +518,13 @@
final IClasspathEntry cpe = (IClasspathEntry)item.getData();
if (cpe.equals(key)) {
dependenciesViewer.refresh(cpe, false);
+ //Don't force check when there's an existing dependency, only uncheck if they're is not.
+ if (dependencyMap.get(cpe) == null) {
+ Job job = identificationJobs.get(cpe);
+ if (job != null && job.getState() == Job.NONE) {
+ dependenciesViewer.setChecked(cpe, false);
+ }
+ }
setPageComplete(hasNoRunningJobs());
return;
}
@@ -530,7 +547,6 @@
return dependencies;
}
-
public boolean isDeleteJars() {
return deleteJars;
}
@@ -548,7 +564,7 @@
@SuppressWarnings("unchecked")
public String getText(Object element) {
IClasspathEntry cpe = (IClasspathEntry) element;
- IdentifyJarJob job = identificationJobs ==null? null:identificationJobs.get(cpe);
+ IdentificationJob job = identificationJobs ==null? null:identificationJobs.get(cpe);
if (job != null) {
int jobState = job.getState();
if (jobState == Job.RUNNING || jobState == Job.WAITING) {
@@ -563,7 +579,7 @@
@SuppressWarnings("unchecked")
public Image getImage(Object element) {
IClasspathEntry cpe = (IClasspathEntry) element;
- IdentifyJarJob job = identificationJobs ==null? null:identificationJobs.get(cpe);
+ IdentificationJob job = identificationJobs ==null? null:identificationJobs.get(cpe);
if (job != null) {
int jobState = job.getState();
if (jobState == Job.RUNNING || jobState == Job.WAITING) {
@@ -588,7 +604,7 @@
}
public void cancel() {
- for (IdentifyJarJob job : identificationJobs.values()) {
+ for (IdentificationJob job : identificationJobs.values()) {
job.cancel();
}
}
Deleted: trunk/maven/plugins/org.jboss.tools.maven.conversion.ui/src/org/jboss/tools/maven/conversion/ui/handlers/IdentifyJarJob.java
===================================================================
--- trunk/maven/plugins/org.jboss.tools.maven.conversion.ui/src/org/jboss/tools/maven/conversion/ui/handlers/IdentifyJarJob.java 2012-09-25 01:50:49 UTC (rev 43983)
+++ trunk/maven/plugins/org.jboss.tools.maven.conversion.ui/src/org/jboss/tools/maven/conversion/ui/handlers/IdentifyJarJob.java 2012-09-25 09:52:00 UTC (rev 43984)
@@ -1,130 +0,0 @@
-/*************************************************************************************
- * Copyright (c) 2012 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.maven.conversion.ui.handlers;
-
-import java.io.File;
-import java.util.List;
-
-import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.apache.maven.model.Dependency;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.m2e.core.MavenPlugin;
-import org.eclipse.m2e.core.embedder.ArtifactKey;
-import org.eclipse.m2e.core.embedder.IMaven;
-import org.jboss.tools.maven.conversion.ui.internal.MavenDependencyConversionActivator;
-import org.jboss.tools.maven.core.identification.IFileIdentificationManager;
-
-public class IdentifyJarJob extends Job {
-
- public enum Task {
- ALL, IDENTIFICATION_ONLY, RESOLUTION_ONLY
- }
-
- private File file;
-
- private IFileIdentificationManager fileIdentificationManager;
-
- private Dependency dependency;
-
- private Boolean resolvable;
-
- private Task task;
-
- public IdentifyJarJob(String name, IFileIdentificationManager fileIdentificationManager, File file) {
- super(name);
- this.fileIdentificationManager = fileIdentificationManager;
- this.file = file;
- setRequestedProcess(Task.ALL);
- }
-
- @Override
- protected IStatus run(IProgressMonitor monitor) {
- if (monitor == null) {
- monitor = new NullProgressMonitor();
- }
-
- if (monitor.isCanceled()) {
- return Status.OK_STATUS;
- }
-
- if (Task.ALL.equals(task)
- || Task.IDENTIFICATION_ONLY.equals(task)) {
-
- monitor.subTask("Identifying "+ file);
- ArtifactKey artifactKey;
- try {
- artifactKey = fileIdentificationManager.identify(file, monitor);
- } catch (CoreException e) {
- monitor.worked(1);
- return new Status(IStatus.ERROR, MavenDependencyConversionActivator.PLUGIN_ID, e.getMessage(), e);
- }
- if (artifactKey != null) {
- dependency = new Dependency();
- dependency.setArtifactId(artifactKey.getArtifactId());
- dependency.setGroupId(artifactKey.getGroupId());
- dependency.setVersion(artifactKey.getVersion());
- dependency.setClassifier(artifactKey.getClassifier());
- }
- }
-
-
- if (dependency != null && (Task.ALL.equals(task)
- || Task.RESOLUTION_ONLY.equals(task))) {
- resolvable = checkResolution(dependency, monitor);
- }
- monitor.worked(1);
- return Status.OK_STATUS;
- }
-
- private static boolean checkResolution(Dependency d, IProgressMonitor monitor) {
- if (monitor.isCanceled()) {
- return false;
- }
- String groupId = d.getGroupId();
- String artifactId = d.getArtifactId();
- String version = d.getVersion();
- String type = d.getType();
- String classifier = d.getClassifier();
- IMaven maven = MavenPlugin.getMaven();
- Artifact a =null;
- try {
- List<ArtifactRepository> artifactRepositories = maven.getArtifactRepositories();
- a = maven.resolve(groupId , artifactId , version , type , classifier , artifactRepositories , monitor);
- } catch(CoreException e) {
- //ignore
- }
- boolean resolved = a != null && a.isResolved();
- return resolved;
- }
-
- public Dependency getDependency() {
- return dependency;
- }
-
- public void setDependency(Dependency dependency) {
- this.dependency = dependency;
- }
-
- public Boolean isResolvable() {
- return resolvable;
- }
-
- public void setRequestedProcess(Task requestedProcess) {
- this.task = requestedProcess;
- }
-
-}
Added: trunk/maven/plugins/org.jboss.tools.maven.conversion.ui/src/org/jboss/tools/maven/conversion/ui/internal/jobs/DependencyResolutionJob.java
===================================================================
--- trunk/maven/plugins/org.jboss.tools.maven.conversion.ui/src/org/jboss/tools/maven/conversion/ui/internal/jobs/DependencyResolutionJob.java (rev 0)
+++ trunk/maven/plugins/org.jboss.tools.maven.conversion.ui/src/org/jboss/tools/maven/conversion/ui/internal/jobs/DependencyResolutionJob.java 2012-09-25 09:52:00 UTC (rev 43984)
@@ -0,0 +1,27 @@
+/*************************************************************************************
+ * Copyright (c) 2012 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.maven.conversion.ui.internal.jobs;
+
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IProgressMonitor;
+
+public class DependencyResolutionJob extends IdentificationJob {
+
+ public DependencyResolutionJob(String name) {
+ super(name);
+ }
+
+ @Override
+ protected void identifyDependency(IProgressMonitor monitor) throws CoreException {
+ //Ignore identification
+ }
+
+}
Added: trunk/maven/plugins/org.jboss.tools.maven.conversion.ui/src/org/jboss/tools/maven/conversion/ui/internal/jobs/IdentificationJob.java
===================================================================
--- trunk/maven/plugins/org.jboss.tools.maven.conversion.ui/src/org/jboss/tools/maven/conversion/ui/internal/jobs/IdentificationJob.java (rev 0)
+++ trunk/maven/plugins/org.jboss.tools.maven.conversion.ui/src/org/jboss/tools/maven/conversion/ui/internal/jobs/IdentificationJob.java 2012-09-25 09:52:00 UTC (rev 43984)
@@ -0,0 +1,110 @@
+/*************************************************************************************
+ * Copyright (c) 2012 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.maven.conversion.ui.internal.jobs;
+
+import java.util.List;
+
+import org.apache.maven.artifact.Artifact;
+import org.apache.maven.artifact.repository.ArtifactRepository;
+import org.apache.maven.model.Dependency;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.core.runtime.jobs.Job;
+import org.eclipse.m2e.core.MavenPlugin;
+import org.eclipse.m2e.core.embedder.IMaven;
+import org.jboss.tools.maven.conversion.ui.internal.MavenDependencyConversionActivator;
+
+public abstract class IdentificationJob extends Job {
+
+ public enum Task {
+ ALL, IDENTIFICATION_ONLY, RESOLUTION_ONLY
+ }
+
+ protected Boolean resolvable;
+
+ protected Task task;
+
+ protected Dependency dependency;
+
+ public IdentificationJob(String name) {
+ super(name);
+ }
+
+ public Dependency getDependency() {
+ return dependency;
+ }
+
+ public void setDependency(Dependency dependency) {
+ this.dependency = dependency;
+ }
+
+ public Boolean isResolvable() {
+ return resolvable;
+ }
+
+ public void setRequestedProcess(Task requestedProcess) {
+ this.task = requestedProcess;
+ }
+
+ @Override
+ protected IStatus run(IProgressMonitor monitor) {
+ if (monitor == null) {
+ monitor = new NullProgressMonitor();
+ }
+
+ if (monitor.isCanceled()) {
+ return Status.OK_STATUS;
+ }
+ resolvable = null;
+ try {
+ if (Task.ALL.equals(task)
+ || Task.IDENTIFICATION_ONLY.equals(task)) {
+ dependency = null;
+ identifyDependency(monitor);
+ }
+
+ if (dependency != null && (Task.ALL.equals(task)
+ || Task.RESOLUTION_ONLY.equals(task))) {
+ checkResolution(monitor);
+ }
+
+ } catch (CoreException e) {
+ monitor.worked(1);
+ return new Status(IStatus.ERROR, MavenDependencyConversionActivator.PLUGIN_ID, e.getMessage(), e);
+ }
+
+ monitor.worked(1);
+ return Status.OK_STATUS;
+ }
+
+ protected abstract void identifyDependency(IProgressMonitor monitor) throws CoreException;
+
+ protected void checkResolution(IProgressMonitor monitor) throws CoreException {
+ if (monitor.isCanceled()) {
+ return;
+ }
+ String groupId = dependency.getGroupId();
+ String artifactId = dependency.getArtifactId();
+ String version = dependency.getVersion();
+ String type = dependency.getType();
+ String classifier = dependency.getClassifier();
+ IMaven maven = MavenPlugin.getMaven();
+
+ List<ArtifactRepository> artifactRepositories = maven.getArtifactRepositories();
+ Artifact a = maven.resolve(groupId , artifactId , version , type , classifier , artifactRepositories , monitor);
+ resolvable = (a != null && a.isResolved());
+ }
+
+
+}
Copied: trunk/maven/plugins/org.jboss.tools.maven.conversion.ui/src/org/jboss/tools/maven/conversion/ui/internal/jobs/IdentifyJarJob.java (from rev 43947, trunk/maven/plugins/org.jboss.tools.maven.conversion.ui/src/org/jboss/tools/maven/conversion/ui/handlers/IdentifyJarJob.java)
===================================================================
--- trunk/maven/plugins/org.jboss.tools.maven.conversion.ui/src/org/jboss/tools/maven/conversion/ui/internal/jobs/IdentifyJarJob.java (rev 0)
+++ trunk/maven/plugins/org.jboss.tools.maven.conversion.ui/src/org/jboss/tools/maven/conversion/ui/internal/jobs/IdentifyJarJob.java 2012-09-25 09:52:00 UTC (rev 43984)
@@ -0,0 +1,46 @@
+/*************************************************************************************
+ * Copyright (c) 2012 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.maven.conversion.ui.internal.jobs;
+
+import java.io.File;
+
+import org.apache.maven.model.Dependency;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.m2e.core.embedder.ArtifactKey;
+import org.jboss.tools.maven.core.identification.IFileIdentificationManager;
+
+public class IdentifyJarJob extends IdentificationJob {
+
+ private File file;
+
+ private IFileIdentificationManager fileIdentificationManager;
+
+ public IdentifyJarJob(String name, IFileIdentificationManager fileIdentificationManager, File file) {
+ super(name);
+ this.fileIdentificationManager = fileIdentificationManager;
+ this.file = file;
+ setRequestedProcess(Task.ALL);
+ }
+
+ @Override
+ protected void identifyDependency(IProgressMonitor monitor) throws CoreException {
+ monitor.subTask("Identifying "+ file);
+ ArtifactKey artifactKey = fileIdentificationManager.identify(file, monitor);
+ if (artifactKey != null) {
+ dependency = new Dependency();
+ dependency.setArtifactId(artifactKey.getArtifactId());
+ dependency.setGroupId(artifactKey.getGroupId());
+ dependency.setVersion(artifactKey.getVersion());
+ dependency.setClassifier(artifactKey.getClassifier());
+ }
+ }
+}
Added: trunk/maven/plugins/org.jboss.tools.maven.conversion.ui/src/org/jboss/tools/maven/conversion/ui/internal/jobs/IdentifyProjectJob.java
===================================================================
--- trunk/maven/plugins/org.jboss.tools.maven.conversion.ui/src/org/jboss/tools/maven/conversion/ui/internal/jobs/IdentifyProjectJob.java (rev 0)
+++ trunk/maven/plugins/org.jboss.tools.maven.conversion.ui/src/org/jboss/tools/maven/conversion/ui/internal/jobs/IdentifyProjectJob.java 2012-09-25 09:52:00 UTC (rev 43984)
@@ -0,0 +1,77 @@
+/*************************************************************************************
+ * Copyright (c) 2012 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.maven.conversion.ui.internal.jobs;
+
+import org.apache.maven.artifact.Artifact;
+import org.apache.maven.model.Dependency;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.m2e.core.MavenPlugin;
+import org.eclipse.m2e.core.project.IMavenProjectFacade;
+
+public class IdentifyProjectJob extends IdentificationJob {
+
+ private IPath projectPath;
+
+ private IMavenProjectFacade facade;
+
+ public IdentifyProjectJob(String name, IPath projectPath) {
+ super(name);
+ this.projectPath = projectPath;
+ }
+
+ @Override
+ protected void identifyDependency(IProgressMonitor monitor) throws CoreException {
+ IProject project = getProject(projectPath);
+ if (project != null) {
+ facade = MavenPlugin.getMavenProjectRegistry().getProject(project );
+ if (facade != null &&
+ facade.getMavenProject() != null &&
+ facade.getMavenProject().getArtifact() != null) {
+ Artifact a = facade.getMavenProject().getArtifact();
+ dependency = new Dependency();
+ dependency.setArtifactId(a.getArtifactId());
+ dependency.setGroupId(a.getGroupId());
+ dependency.setVersion(a.getVersion());
+ if (a.getArtifactHandler() != null &&
+ a.getArtifactHandler().getPackaging() != null) {
+ String type = a.getArtifactHandler().getPackaging();
+ //case where classpath dependency is a war : it usually corresponds to
+ //a jar of the war classes, having the "classes" classifier.
+ if ("war".equals(type)) {
+ type = "jar";
+ dependency.setClassifier("classes");
+ }
+
+ dependency.setType(type);
+ }
+ }
+ }
+ }
+
+ @Override
+ protected void checkResolution(IProgressMonitor monitor) throws CoreException {
+ resolvable = facade != null &&
+ facade.getMavenProject() != null &&
+ facade.getMavenProject().getArtifact() != null &&
+ facade.getProject() != null &&
+ facade.getProject().isAccessible();
+ }
+
+ private IProject getProject(IPath projectPath) {
+ IProject p = ResourcesPlugin.getWorkspace().getRoot().getProject(projectPath.lastSegment());
+ return p;
+ }
+}
+
12 years, 3 months
JBoss Tools SVN: r43983 - branches/jbosstools-4.0.0.Alpha2/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/util.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2012-09-24 21:50:49 -0400 (Mon, 24 Sep 2012)
New Revision: 43983
Modified:
branches/jbosstools-4.0.0.Alpha2/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/util/PathUtils.java
Log:
fix for unit test regressions caused by JBIDE-12494
Modified: branches/jbosstools-4.0.0.Alpha2/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/util/PathUtils.java
===================================================================
--- branches/jbosstools-4.0.0.Alpha2/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/util/PathUtils.java 2012-09-25 01:36:57 UTC (rev 43982)
+++ branches/jbosstools-4.0.0.Alpha2/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/util/PathUtils.java 2012-09-25 01:50:49 UTC (rev 43983)
@@ -66,9 +66,6 @@
// Get an absolute path, workspace-absolute or fs-absolute
public static String getAbsoluteLocation(String expression,
String projectName, boolean inWorkspace, double version) {
- if( inWorkspace && projectName == null )
- return null;
-
if( inWorkspace && ("".equals(expression) || ".".equals(expression))) //$NON-NLS-1$ //$NON-NLS-2$
return new Path(projectName).makeAbsolute().toString();
12 years, 3 months
JBoss Tools SVN: r43982 - in trunk/archives/plugins: org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/wizards/pages and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2012-09-24 21:36:57 -0400 (Mon, 24 Sep 2012)
New Revision: 43982
Modified:
trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/util/PathUtils.java
trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/wizards/pages/FilesetInfoWizardPage.java
Log:
JBIDE-12494 to trunk
Modified: trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/util/PathUtils.java
===================================================================
--- trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/util/PathUtils.java 2012-09-24 19:04:33 UTC (rev 43981)
+++ trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/util/PathUtils.java 2012-09-25 01:36:57 UTC (rev 43982)
@@ -66,9 +66,6 @@
// Get an absolute path, workspace-absolute or fs-absolute
public static String getAbsoluteLocation(String expression,
String projectName, boolean inWorkspace, double version) {
- if( inWorkspace && projectName == null )
- return null;
-
if( inWorkspace && ("".equals(expression) || ".".equals(expression))) //$NON-NLS-1$ //$NON-NLS-2$
return new Path(projectName).makeAbsolute().toString();
Modified: trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/wizards/pages/FilesetInfoWizardPage.java
===================================================================
--- trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/wizards/pages/FilesetInfoWizardPage.java 2012-09-24 19:04:33 UTC (rev 43981)
+++ trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/wizards/pages/FilesetInfoWizardPage.java 2012-09-25 01:36:57 UTC (rev 43982)
@@ -303,7 +303,6 @@
if( parentNode.getRootArchive().isDestinationInWorkspace()) {
effectiveExcludes += "," + parentNode.getRootArchive().getRawDestinationPath(); //$NON-NLS-1$
}
- System.out.println(6);
IPath parentRelativeToRoot = parentNode.getRootArchiveRelativePath();
ds = DirectoryScannerFactory.createDirectoryScanner(
replaceVariables(), parentRelativeToRoot, includes, effectiveExcludes, parentNode.getProjectName(),
12 years, 3 months
JBoss Tools SVN: r43981 - branches/jbosstools-4.0.0.Alpha2/ws/plugins/org.jboss.tools.ws.jaxrs.core/META-INF.
by jbosstools-commits＠lists.jboss.org
Author: xcoulon
Date: 2012-09-24 15:04:33 -0400 (Mon, 24 Sep 2012)
New Revision: 43981
Modified:
branches/jbosstools-4.0.0.Alpha2/ws/plugins/org.jboss.tools.ws.jaxrs.core/META-INF/MANIFEST.MF
Log:
Applying fix for https://issues.jboss.org/browse/JBIDE-10287
Add support for JAX-RS Application
Modified: branches/jbosstools-4.0.0.Alpha2/ws/plugins/org.jboss.tools.ws.jaxrs.core/META-INF/MANIFEST.MF
===================================================================
--- branches/jbosstools-4.0.0.Alpha2/ws/plugins/org.jboss.tools.ws.jaxrs.core/META-INF/MANIFEST.MF 2012-09-24 16:49:08 UTC (rev 43980)
+++ branches/jbosstools-4.0.0.Alpha2/ws/plugins/org.jboss.tools.ws.jaxrs.core/META-INF/MANIFEST.MF 2012-09-24 19:04:33 UTC (rev 43981)
@@ -29,8 +29,7 @@
org.eclipse.wst.common.frameworks.ui;bundle-version="1.1.301",
org.eclipse.jface.text;bundle-version="3.7.1",
org.jboss.tools.common.validation;bundle-version="3.4.0",
- org.jboss.tools.common;bundle-version="3.4.0",
- org.eclipse.wst.sse.core;bundle-version="1.1.701"
+ org.jboss.tools.common;bundle-version="3.4.0"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
Export-Package: org.jboss.tools.ws.jaxrs.core,
12 years, 3 months
JBoss Tools SVN: r43980 - in trunk/download.jboss.org/jbosstools/updates: development and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-09-24 12:49:08 -0400 (Mon, 24 Sep 2012)
New Revision: 43980
Modified:
trunk/download.jboss.org/jbosstools/updates/development/index.html
trunk/download.jboss.org/jbosstools/updates/index.html
trunk/download.jboss.org/jbosstools/updates/juno/index.html
trunk/download.jboss.org/jbosstools/updates/stable/index.html
Log:
update index pages to fix/update/remove links
Modified: trunk/download.jboss.org/jbosstools/updates/development/index.html
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/development/index.html 2012-09-24 16:48:41 UTC (rev 43979)
+++ trunk/download.jboss.org/jbosstools/updates/development/index.html 2012-09-24 16:49:08 UTC (rev 43980)
@@ -39,8 +39,8 @@
</p>
<ul>
+ <li><a href="juno">JBoss Tools 4.0 Development Milestone</a> (requires Eclipse 4.2 Juno)</li>
<li><a href="indigo">JBoss Tools 3.3 Development Milestone</a> (requires Eclipse 3.7.2 Indigo SR2)</li>
- <li><a href="helios">JBoss Tools 3.2 Development Milestone</a> (requires Eclipse 3.6.2 Helios SR2)</li>
</ul>
</td>
</tr>
Modified: trunk/download.jboss.org/jbosstools/updates/index.html
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/index.html 2012-09-24 16:48:41 UTC (rev 43979)
+++ trunk/download.jboss.org/jbosstools/updates/index.html 2012-09-24 16:49:08 UTC (rev 43980)
@@ -48,21 +48,21 @@
Stable Releases
</h4><ul>
+<!-- <li><a class=link href=http://download.jboss.org/jbosstools/updates/stable/juno>JBoss Tools 4.0, Eclipse 4.2 (Juno)</a></li> -->
<li><a class=link href=http://download.jboss.org/jbosstools/updates/stable/indigo>JBoss Tools 3.3, Eclipse 3.7.2 (Indigo)</a></li>
-<li><a class=link href=http://download.jboss.org/jbosstools/updates/stable/helios>JBoss Tools 3.2, Eclipse 3.6.2 (Helios)</a></li>
</ul><h4 style="margin-left:10px">
Other Updates
</h4><ul>
-<li><a class=link href=stable>Stable Builds</a></li>
-<li><a class=link href=development>Development Milestones</a></li>
+<li><a class=link href=development>Development Milestones</a> for <a class=link href=development/juno>Eclipse 4.2 (Juno)</a></li>
<li><a class=link href=nightly>Nightly Builds</a></li>
</ul>
<h4 style="margin-left:10px">
Archived Stable Releases
</h4><ul>
+<li><a class=link href=http://download.jboss.org/jbosstools/updates/stable/helios>JBoss Tools 3.2, Eclipse 3.6.2 (Helios)</a></li>
<li><a class=link href=http://download.jboss.org/jbosstools/updates/stable/galileo>JBoss Tools 3.1, Eclipse 3.5.2 (Galileo)</a></li>
<li><a class=link href=http://download.jboss.org/jbosstools/updates/stable/ganymede>JBoss Tools 3.0, Eclipse 3.4.2 (Ganymede)</a></li>
<li><a class=link href=http://download.jboss.org/jbosstools/updates/JBossTools-3.0.3.GA.zip>JBossTools-3.0.3.GA.zip</a></li>
@@ -79,7 +79,7 @@
Dependencies & Requirements <span style="font-weight:normal"> : <a class=link href=requirements>superset of all dependencies</a> in a <b>composite</b> update site, for installation or development
</span></h4><ul>
-<li><a class=link href=juno>JBoss Tools 4.0</a> :: <b>Eclipse 4.2</b> <i>-- forthcoming</i></li>
+<li><a class=link href=juno>JBoss Tools 4.0</a> :: <b>Eclipse 4.2</b></li>
<li><a class=link href=indigo>JBoss Tools 3.3</a> :: <b>Eclipse 3.7.2</b></li>
<li><a class=link href=helios>JBoss Tools 3.2</a> :: <b>Eclipse 3.6.2</b></li>
@@ -87,7 +87,8 @@
JBT Target Platforms<span style="font-weight:normal"> : exact dependencies in an <b>aggregate</b> update site/zip, for installation or development
</span></h4><ul>
-<li><a class=link href=http://download.jboss.org/jbosstools/updates/target-platform_4.0.jun...>JBoss Tools 4.0</a> :: <b>Eclipse 4.2.0</b> <i>-- forthcoming</i></li>
+<li><a class=link href=http://download.jboss.org/jbosstools/updates/target-platform_4.0.jun...>JBoss Tools 4.0</a> :: <b>Eclipse 4.2.1+</b></li>
+<li><a class=link href=http://download.jboss.org/jbosstools/updates/target-platform_4.0.jun...>JBoss Tools 4.0</a> :: <b>Eclipse 4.2.0</b></li>
<li><a class=link href=http://download.jboss.org/jbosstools/updates/target-platform_3.3.ind...>JBoss Tools 3.3</a> :: <b>Eclipse 3.7.2</b></li>
<li><a class=link href=http://download.jboss.org/jbosstools/updates/target-platform>JBoss Tools 3.2</a> :: <b>Eclipse 3.6.2</b></li>
@@ -95,7 +96,8 @@
JBDS Target Platforms<span style="font-weight:normal"> : exact dependencies in an <b>aggregate</b> update site/zip, for installation or development
</span></h4><ul>
-<li><a style="color: red" class=link href=http://www.qa.jboss.com/binaries/RHDS/updates/jbds-target-platform_4...>JBoss Developer Studio 6.0</a> :: <b>Eclipse 4.2.0</b><i> -- forthcoming</i></li>
+<li><a style="color: red" class=link href=http://www.qa.jboss.com/binaries/RHDS/updates/jbds-target-platform_4...>JBoss Developer Studio 6.0</a> :: <b>Eclipse 4.2.1+</b></li>
+<li><a style="color: red" class=link href=http://www.qa.jboss.com/binaries/RHDS/updates/jbds-target-platform_4...>JBoss Developer Studio 6.0</a> :: <b>Eclipse 4.2.0</b></li>
<li><a style="color: red" class=link href=http://www.qa.jboss.com/binaries/RHDS/updates/jbds-target-platform_3...>JBoss Developer Studio 5.x</a> :: <b>Eclipse 3.7.2</b></li>
<li><a style="color: red" class=link href=http://www.qa.jboss.com/binaries/RHDS/updates/jbds-target-platform>JBoss Developer Studio 4.x</a> :: <b>Eclipse 3.6.2</b></li>
<br/>
Modified: trunk/download.jboss.org/jbosstools/updates/juno/index.html
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/juno/index.html 2012-09-24 16:48:41 UTC (rev 43979)
+++ trunk/download.jboss.org/jbosstools/updates/juno/index.html 2012-09-24 16:49:08 UTC (rev 43980)
@@ -29,15 +29,13 @@
<p class="bodyText">Available Versions - <b style="color:green">Core</b>:
<ul>
- <li><a href=SR0>Juno SR0</a></li>
- <ul><li><a href=extras>Juno Extras</a> (currently the same as the <a href="../indigo/extras/">Indigo extras</a>)</li></ul>
- <li><a href=M6>Juno M6</a></li>
+ <li><a href=SR0a>Juno SR0a</a> - <a href=extras/SR0a>Extras</a></li>
+ <li><a href=SR0>Juno SR0</a> - <a href=extras/SR0>Extras</a></li>
</ul>
</p>
<p class="bodyText">Available Versions - <b style="color:blue">SOA</b>:
<ul>
<li><a href=soa-tooling/SR0>Juno SR0</a></li>
- <li><a href=soa-tooling/M6>Juno M6</a></li>
</ul>
</p>
Modified: trunk/download.jboss.org/jbosstools/updates/stable/index.html
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/stable/index.html 2012-09-24 16:48:41 UTC (rev 43979)
+++ trunk/download.jboss.org/jbosstools/updates/stable/index.html 2012-09-24 16:49:08 UTC (rev 43980)
@@ -24,7 +24,7 @@
<tr class="light-row" style="height: 30px">
<td class="bodyText">
- <p class="bodyText">This is the <b>Development Milestone</b>
+ <p class="bodyText">This is the <b>Stable Release</b>
Update Site for JBoss Tools. See <a class="link"
href="http://www.jboss.org/tools/download/update">Installation
Instructions</a>.</p>
@@ -35,12 +35,12 @@
<tr class="dark-row" style="height: 90px">
<td class="bodyText">
<p class="bodyText"><b class="bodyText" style="color: red;">
-Choose your development stream:</b>
+Choose your release stream:</b>
</p>
<ul>
- <li><a href="indigo">JBoss Tools 3.3 Development Milestone</a> (requires Eclipse 3.7.2 Indigo SR2)</li>
- <li><a href="helios">JBoss Tools 3.2 Development Milestone</a> (requires Eclipse 3.6.2 Helios SR2)</li>
+ <!-- <li><a href="juno">JBoss Tools 4.0 Stable Release</a> (requires Eclipse 4.2 Juno)</li> -->
+ <li><a href="indigo">JBoss Tools 3.3 Stable Release</a> (requires Eclipse 3.7.2 Indigo SR2)</li>
</ul>
</td>
</tr>
12 years, 3 months
JBoss Tools SVN: r43979 - branches/jbosstools-4.0.0.Alpha2/build/aggregate/webtools-site.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-09-24 12:48:41 -0400 (Mon, 24 Sep 2012)
New Revision: 43979
Modified:
branches/jbosstools-4.0.0.Alpha2/build/aggregate/webtools-site/site.xml
Log:
JBIDE-12691 add common.core feature to webtools site; needed by runtime.core
Modified: branches/jbosstools-4.0.0.Alpha2/build/aggregate/webtools-site/site.xml
===================================================================
--- branches/jbosstools-4.0.0.Alpha2/build/aggregate/webtools-site/site.xml 2012-09-24 16:48:24 UTC (rev 43978)
+++ branches/jbosstools-4.0.0.Alpha2/build/aggregate/webtools-site/site.xml 2012-09-24 16:48:41 UTC (rev 43979)
@@ -5,7 +5,8 @@
<feature url="features/org.jboss.ide.eclipse.as.feature_0.0.0.jar" id="org.jboss.ide.eclipse.as.feature" version="0.0.0">
<category name="org.eclipse.wst.server.core.serverAdapter"/>
</feature>
- <feature url="features/org.jboss.ide.eclipse.archives.feature_0.0.0.jar" id="org.jboss.ide.eclipse.archives.feature" version="0.0.0"></feature>
- <feature url="features/org.jboss.tools.jmx.feature_0.0.0.jar" id="org.jboss.tools.jmx.feature" version="0.0.0"></feature>
+ <feature url="features/org.jboss.ide.eclipse.archives.feature_0.0.0.jar" id="org.jboss.ide.eclipse.archives.feature" version="0.0.0"></feature>
+ <feature url="features/org.jboss.tools.jmx.feature_0.0.0.jar" id="org.jboss.tools.jmx.feature" version="0.0.0"></feature>
<feature url="features/org.jboss.tools.runtime.core.feature_0.0.0.jar" id="org.jboss.tools.runtime.core.feature" version="0.0.0"></feature>
+ <feature url="features/org.jboss.tools.common.core.feature_0.0.0.jar" id="org.jboss.tools.common.core.feature" version="0.0.0"></feature>
</site>
12 years, 3 months
JBoss Tools SVN: r43978 - trunk/build/aggregate/webtools-site.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-09-24 12:48:24 -0400 (Mon, 24 Sep 2012)
New Revision: 43978
Modified:
trunk/build/aggregate/webtools-site/index.html
trunk/build/aggregate/webtools-site/site.xml
Log:
JBIDE-12691 add common.core feature to webtools site; needed by runtime.core
Modified: trunk/build/aggregate/webtools-site/index.html
===================================================================
--- trunk/build/aggregate/webtools-site/index.html 2012-09-24 16:16:27 UTC (rev 43977)
+++ trunk/build/aggregate/webtools-site/index.html 2012-09-24 16:48:24 UTC (rev 43978)
@@ -92,11 +92,16 @@
org.eclipse.wst.server.core.serverAdapter</span></td>
</tr>
<tr style="background-color:
							#EEEEEE
						">
+ <td class="rowLine"><a href="features/org.jboss.tools.common.core.feature_3.4.0.Beta1-v20120924-1453-B59.jar" style="font-size:x-small">org.jboss.tools.common.core.feature</a></td>
+ <td><span style="font-size:x-small">3.4.0.Beta1-v20120924-1453-B59</span></td>
+ <td></td>
+ </tr>
+ <tr style="background-color:
							#FFFFFF
						">
<td class="rowLine"><a href="features/org.jboss.tools.jmx.feature_1.4.0.Beta1-v20120924-1502-B40.jar" style="font-size:x-small">org.jboss.tools.jmx.feature</a></td>
<td><span style="font-size:x-small">1.4.0.Beta1-v20120924-1502-B40</span></td>
<td></td>
</tr>
- <tr style="background-color:
							#FFFFFF
						">
+ <tr style="background-color:
							#EEEEEE
						">
<td class="rowLine"><a href="features/org.jboss.tools.runtime.core.feature_2.0.0.Beta1-v20120924-1506-B48.jar" style="font-size:x-small">org.jboss.tools.runtime.core.feature</a></td>
<td><span style="font-size:x-small">2.0.0.Beta1-v20120924-1506-B48</span></td>
<td></td>
Modified: trunk/build/aggregate/webtools-site/site.xml
===================================================================
--- trunk/build/aggregate/webtools-site/site.xml 2012-09-24 16:16:27 UTC (rev 43977)
+++ trunk/build/aggregate/webtools-site/site.xml 2012-09-24 16:48:24 UTC (rev 43978)
@@ -5,7 +5,8 @@
<feature url="features/org.jboss.ide.eclipse.as.feature_0.0.0.jar" id="org.jboss.ide.eclipse.as.feature" version="0.0.0">
<category name="org.eclipse.wst.server.core.serverAdapter"/>
</feature>
- <feature url="features/org.jboss.ide.eclipse.archives.feature_0.0.0.jar" id="org.jboss.ide.eclipse.archives.feature" version="0.0.0"></feature>
- <feature url="features/org.jboss.tools.jmx.feature_0.0.0.jar" id="org.jboss.tools.jmx.feature" version="0.0.0"></feature>
+ <feature url="features/org.jboss.ide.eclipse.archives.feature_0.0.0.jar" id="org.jboss.ide.eclipse.archives.feature" version="0.0.0"></feature>
+ <feature url="features/org.jboss.tools.jmx.feature_0.0.0.jar" id="org.jboss.tools.jmx.feature" version="0.0.0"></feature>
<feature url="features/org.jboss.tools.runtime.core.feature_0.0.0.jar" id="org.jboss.tools.runtime.core.feature" version="0.0.0"></feature>
+ <feature url="features/org.jboss.tools.common.core.feature_0.0.0.jar" id="org.jboss.tools.common.core.feature" version="0.0.0"></feature>
</site>
12 years, 3 months