JBoss Tools SVN: r32630 - trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2011-07-06 00:43:54 -0400 (Wed, 06 Jul 2011)
New Revision: 32630
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/AbstractServerToolsPublisher.java
Log:
JBIDE-9206 - local publisher does not clean up temp zips.
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/AbstractServerToolsPublisher.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/AbstractServerToolsPublisher.java 2011-07-06 03:47:09 UTC (rev 32629)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/AbstractServerToolsPublisher.java 2011-07-06 04:43:54 UTC (rev 32630)
@@ -205,6 +205,7 @@
handler.makeDirectoryIfRequired(new Path(parentFolder), getSubMon(monitor, 200));
ModuleFile mf = new ModuleFile(tempFile.toFile(), tempFile.lastSegment(), tempFile);
handler.copyFile(mf, deployPath, getSubMon(monitor, 500));
+ tempFile.toFile().delete();
} catch( IOException ioe) {
list.add(new Status(IStatus.ERROR, JBossServerCorePlugin.PLUGIN_ID, ioe.getMessage(), ioe));
}
14 years, 5 months
JBoss Tools SVN: r32629 - in trunk/as/plugins: org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2011-07-05 23:47:09 -0400 (Tue, 05 Jul 2011)
New Revision: 32629
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBossServerBehavior.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/ServerListener.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ServerConverter.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.properties
Log:
JBIDE-9277 - cleanup of 'externally managed' servers.
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBossServerBehavior.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBossServerBehavior.java 2011-07-06 00:14:18 UTC (rev 32628)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBossServerBehavior.java 2011-07-06 03:47:09 UTC (rev 32629)
@@ -17,6 +17,7 @@
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.debug.core.ILaunchConfigurationWorkingCopy;
import org.eclipse.wst.server.core.IModule;
import org.eclipse.wst.server.core.IServer;
@@ -30,6 +31,7 @@
import org.jboss.ide.eclipse.as.core.server.internal.launch.JBossServerStartupLaunchConfiguration;
import org.jboss.ide.eclipse.as.core.server.xpl.PublishCopyUtil.IPublishCopyCallbackHandler;
import org.jboss.ide.eclipse.as.core.util.DeploymentPreferenceLoader;
+import org.jboss.ide.eclipse.as.core.util.IJBossToolingConstants;
import org.jboss.ide.eclipse.as.core.util.ServerConverter;
import org.jboss.ide.eclipse.as.wtp.core.util.ServerModelUtilities;
@@ -152,6 +154,10 @@
return canChangeState(launchMode);
}
protected IStatus canChangeState(String launchMode) {
+ String ignoreLaunch = getServer().getAttribute(IJBossToolingConstants.IGNORE_LAUNCH_COMMANDS, Boolean.toString(false));
+ if( new Boolean(ignoreLaunch).booleanValue()) {
+ return Status.CANCEL_STATUS;
+ }
return getDelegate().canChangeState(launchMode);
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/ServerListener.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/ServerListener.java 2011-07-06 00:14:18 UTC (rev 32628)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/ServerListener.java 2011-07-06 03:47:09 UTC (rev 32629)
@@ -14,9 +14,12 @@
import org.eclipse.wst.server.core.IServer;
import org.jboss.ide.eclipse.as.core.JBossServerCorePlugin;
+import org.jboss.ide.eclipse.as.core.server.IDeployableServer;
import org.jboss.ide.eclipse.as.core.server.UnitedServerListener;
import org.jboss.ide.eclipse.as.core.server.UnitedServerListenerManager;
import org.jboss.ide.eclipse.as.core.util.FileUtil;
+import org.jboss.ide.eclipse.as.core.util.IJBossToolingConstants;
+import org.jboss.ide.eclipse.as.core.util.ServerConverter;
import org.jboss.ide.eclipse.as.core.util.ServerUtil;
public class ServerListener extends UnitedServerListener {
@@ -31,8 +34,28 @@
return true;
}
+ public void init(IServer server) {
+ initUnmanagedServerState(server);
+ }
+
+ protected void initUnmanagedServerState(IServer server) {
+ JBossServerBehavior beh = ServerConverter.getJBossServerBehavior(server);
+ if( beh != null ) {
+ String ignoreLaunch = server.getAttribute(IJBossToolingConstants.IGNORE_LAUNCH_COMMANDS, Boolean.toString(false));
+ if( new Boolean(ignoreLaunch).booleanValue()) {
+ // Assume started already
+ beh.setServerStarted();
+ }
+ }
+ }
+ public void serverChanged(IServer server) {
+ // double check if the user toggled the 'assume started' flag to true
+ initUnmanagedServerState(server);
+ }
+
public void serverAdded(IServer server) {
ServerUtil.createStandardFolders(server);
+ initUnmanagedServerState(server);
}
public void serverRemoved(IServer server) {
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ServerConverter.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ServerConverter.java 2011-07-06 00:14:18 UTC (rev 32628)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ServerConverter.java 2011-07-06 03:47:09 UTC (rev 32629)
@@ -27,6 +27,7 @@
import org.jboss.ide.eclipse.as.core.server.IJBossServerRuntime;
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.server.internal.JBossServerBehavior;
import org.jboss.ide.eclipse.as.core.server.internal.v7.JBoss7ServerBehavior;
/**
@@ -127,6 +128,12 @@
return (JBoss7ServerBehavior) server.loadAdapter(
JBoss7ServerBehavior.class, new NullProgressMonitor());
}
+ public static JBossServerBehavior getJBossServerBehavior(IServer server) {
+ if (server == null)
+ return null;
+ return (JBossServerBehavior) server.loadAdapter(
+ JBossServerBehavior.class, new NullProgressMonitor());
+ }
/**
* Return all JBossServer instances from the ServerCore
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.properties
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.properties 2011-07-06 00:14:18 UTC (rev 32628)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.properties 2011-07-06 03:47:09 UTC (rev 32629)
@@ -161,7 +161,7 @@
EditorSetRadioClicked=Set Deploy Location
EditorDeployDNE=The deploy directory "{0}" does not exist.
EditorTempDeployDNE=The temporary deploy directory "{0}" does not exist.
-EditorDoNotLaunch=Do not execute startup or shutdown commands.
+EditorDoNotLaunch=Server is externally managed. Assume server is started.
EditorDoNotLaunchCommand=Toggle Startup and Shutdown scripts
EditorChangeServerMode=Change server mode
EditorStartupPollerLabel=Startup Poller
14 years, 5 months
JBoss Tools SVN: r32628 - trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-07-05 20:14:18 -0400 (Tue, 05 Jul 2011)
New Revision: 32628
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDICoreBuilder.java
Log:
JBIDE-9289
https://issues.jboss.org/browse/JBIDE-9289
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDICoreBuilder.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDICoreBuilder.java 2011-07-05 22:57:13 UTC (rev 32627)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDICoreBuilder.java 2011-07-06 00:14:18 UTC (rev 32628)
@@ -240,7 +240,6 @@
rv.incremental = true;
delta.accept(new SampleDeltaVisitor());
FileSet fs = rv.fileSet;
-// fs.getPackages().
invokeBuilderDelegates(fs, getCDICoreNature());
}
@@ -361,11 +360,11 @@
FileSet fileSet = new FileSet();
IPath[] outs = new IPath[0];
IPath[] srcs = new IPath[0];
- IPath webinf = null;
- Set<IPath> visited = new HashSet<IPath>();
+ IPath[] webinfs = new IPath[0];
+ Set<IPath> visited = new HashSet<IPath>();
CDIResourceVisitor() {
- webinf = ProjectHome.getWebInfPath(getProject());
+ webinfs = ProjectHome.getWebInfPaths(getProject());
getJavaSourceRoots(getProject());
}
@@ -444,11 +443,13 @@
return false;
}
}
- if(webinf != null && webinf.isPrefixOf(path)) {
- if(webinf.segmentCount() == path.segmentCount() - 1) {
- addBeansXML(f, fileSet);
+ for (IPath webinf: webinfs) {
+ if(webinf.isPrefixOf(path)) {
+ if(webinf.segmentCount() == path.segmentCount() - 1) {
+ addBeansXML(f, fileSet);
+ }
+ for (IBuildParticipantFeature p: buildParticipants) p.visit(f, null, webinf);
}
- for (IBuildParticipantFeature p: buildParticipants) p.visit(f, null, webinf);
}
Set<IFile> ds = getDependentFiles(path, visited);
@@ -456,17 +457,17 @@
}
if(resource instanceof IFolder) {
- for (int i = 0; i < outs.length; i++) {
- if(outs[i].isPrefixOf(path)) {
+ for (IPath out: outs) {
+ if(out.isPrefixOf(path)) {
return false;
}
}
- for (int i = 0; i < srcs.length; i++) {
- if(srcs[i].isPrefixOf(path) || path.isPrefixOf(srcs[i])) {
+ for (IPath src: srcs) {
+ if(src.isPrefixOf(path) || path.isPrefixOf(src)) {
return true;
}
}
- if(webinf != null) {
+ for (IPath webinf: webinfs) {
if(webinf.isPrefixOf(path) || path.isPrefixOf(webinf)) {
return true;
}
14 years, 5 months
JBoss Tools SVN: r32627 - trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-07-05 18:57:13 -0400 (Tue, 05 Jul 2011)
New Revision: 32627
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/KbResourceVisitor.java
Log:
JBIDE-9289
https://issues.jboss.org/browse/JBIDE-9289
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/KbResourceVisitor.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/KbResourceVisitor.java 2011-07-05 22:48:29 UTC (rev 32626)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/KbResourceVisitor.java 2011-07-05 22:57:13 UTC (rev 32627)
@@ -1,8 +1,10 @@
package org.jboss.tools.jst.web.kb.internal;
import java.util.ArrayList;
+import java.util.HashSet;
import java.util.List;
import java.util.Map;
+import java.util.Set;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IFolder;
@@ -15,9 +17,8 @@
import org.eclipse.jdt.core.IClasspathEntry;
import org.eclipse.jdt.core.IJavaProject;
import org.jboss.tools.common.model.XModel;
-import org.jboss.tools.common.model.XModelObject;
-import org.jboss.tools.common.model.filesystems.FileSystemsHelper;
import org.jboss.tools.common.model.plugin.ModelPlugin;
+import org.jboss.tools.common.model.project.ProjectHome;
import org.jboss.tools.common.model.util.EclipseResourceUtil;
import org.jboss.tools.jst.web.kb.WebKbPlugin;
import org.jboss.tools.jst.web.kb.internal.scanner.IFileScanner;
@@ -39,10 +40,9 @@
IPath[] outs = new IPath[0];
IPath[] srcs = new IPath[0];
- IPath webinf = null;
- IPath jsf2resources = null; //JSF 2
- IResource jsf2resourcesFolder = null;
- boolean jsf2resourcesProcessed = false;
+ IPath[] webinfs = new IPath[0];
+ IPath[] jsf2resources = new IPath[0];
+ Set<IPath> jsf2resourcesProcessed = new HashSet<IPath>();
public KbResourceVisitor(KbProject p) {
this.p = p;
@@ -52,20 +52,17 @@
XModel model = InnerModelHelper.createXModel(p.getProject());
if(model != null) {
- XModelObject wio = FileSystemsHelper.getWebInf(model);
- if(wio != null) {
- IResource wir = (IResource)wio.getAdapter(IResource.class);
- if(wir != null) {
- webinf = wir.getFullPath();
- jsf2resources = webinf.removeLastSegments(1).append("resources"); //$NON-NLS-1$
- IResource rf = ResourcesPlugin.getWorkspace().getRoot().getFolder(jsf2resources);
- if(rf == null || !rf.exists()) {
- jsf2resources = null;
- } else {
- jsf2resourcesFolder = rf;
- }
+ webinfs = ProjectHome.getWebInfPaths(p.getProject());
+ IPath[] webContents = ProjectHome.getWebContentPaths(p.getProject());
+ List<IPath> jsf2rs = new ArrayList<IPath>();
+ for (IPath webcontent: webContents) {
+ IPath jsf2r = webcontent.append("resources"); //$NON-NLS-1$
+ IResource rf = ResourcesPlugin.getWorkspace().getRoot().getFolder(jsf2r);
+ if(rf.exists()) {
+ jsf2rs.add(jsf2r);
}
}
+ jsf2resources = jsf2rs.toArray(new IPath[0]);
}
}
}
@@ -75,7 +72,7 @@
}
public void init() {
- jsf2resourcesProcessed = false;
+ jsf2resourcesProcessed.clear();
}
public boolean visit(IResource resource) {
@@ -89,7 +86,7 @@
for (int i = 0; i < FILE_SCANNERS.length; i++) {
IFileScanner scanner = FILE_SCANNERS[i];
if(scanner.isRelevant(f)) {
- long t = System.currentTimeMillis();
+// long t = System.currentTimeMillis();
if(!scanner.isLikelyComponentSource(f)) {
p.pathRemoved(f.getFullPath());
return false;
@@ -101,14 +98,17 @@
WebKbPlugin.getDefault().logError(e);
}
if(c != null) componentsLoaded(c, f);
- long dt = System.currentTimeMillis() - t;
+// long dt = System.currentTimeMillis() - t;
// timeUsed += dt;
// System.out.println("Time=" + timeUsed);
break;
}
}
- if(jsf2resources != null && jsf2resources.isPrefixOf(f.getFullPath()) && jsf2scanner.isLikelyComponentSource(f)) {
- processJSF2Resources();
+ for (IPath jsf2resource: jsf2resources) {
+ if(jsf2resource.isPrefixOf(f.getFullPath()) && jsf2scanner.isLikelyComponentSource(f)) {
+ processJSF2Resources(jsf2resource);
+ break;
+ }
}
}
if(resource instanceof IFolder) {
@@ -123,16 +123,16 @@
return true;
}
}
- if(jsf2resources != null) {
- if (jsf2resources.isPrefixOf(path)) {
- processJSF2Resources();
+ for (IPath jsf2resource: jsf2resources) {
+ if (jsf2resource.isPrefixOf(path)) {
+ processJSF2Resources(jsf2resource);
return false;
}
- if(path.isPrefixOf(jsf2resources)) {
+ if(path.isPrefixOf(jsf2resource)) {
return true;
}
}
- if(webinf != null) {
+ for (IPath webinf: webinfs) {
if(webinf.isPrefixOf(path) || path.isPrefixOf(webinf)
|| webinf.removeLastSegments(1).isPrefixOf(path) //Webroot
) {
@@ -149,9 +149,13 @@
return true;
}
- void processJSF2Resources() {
- if (jsf2resourcesFolder == null || jsf2resourcesProcessed) return;
- jsf2resourcesProcessed = true;
+ void processJSF2Resources(IPath jsf2resource) {
+ if (jsf2resourcesProcessed.contains(jsf2resource)) return;
+ jsf2resourcesProcessed.add(jsf2resource);
+ IResource jsf2resourcesFolder = ResourcesPlugin.getWorkspace().getRoot().getFolder(jsf2resource);
+ if(!jsf2resourcesFolder.exists()) {
+ return;
+ }
JSF2ResourcesScanner scanner = new JSF2ResourcesScanner();
Map<IPath,LoadedDeclarations> result = null;
try {
14 years, 5 months
JBoss Tools SVN: r32626 - trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/project.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-07-05 18:48:29 -0400 (Tue, 05 Jul 2011)
New Revision: 32626
Modified:
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/project/ProjectHome.java
Log:
JBIDE-9289
https://issues.jboss.org/browse/JBIDE-9289
Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/project/ProjectHome.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/project/ProjectHome.java 2011-07-05 22:38:26 UTC (rev 32625)
+++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/project/ProjectHome.java 2011-07-05 22:48:29 UTC (rev 32626)
@@ -11,8 +11,11 @@
package org.jboss.tools.common.model.project;
import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
import java.util.Properties;
+import org.eclipse.core.resources.IContainer;
import org.eclipse.core.resources.IFolder;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.ResourcesPlugin;
@@ -103,6 +106,42 @@
return (!webInfDir.exists()) ? null : modulePath;
}
+ public static IPath[] getWebInfPaths(IProject project) {
+ IVirtualComponent component = ComponentCore.createComponent(project);
+ if(component != null && component.getRootFolder() != null) {
+ IVirtualFolder webInfDir = component.getRootFolder().getFolder(new Path("/WEB-INF")); //$NON-NLS-1$
+ if(webInfDir.exists()) {
+ IContainer[] cs = webInfDir.getUnderlyingFolders();
+ List<IPath> ps = new ArrayList<IPath>();
+ for (IContainer c: cs) {
+ if(c.exists()) {
+ ps.add(c.getFullPath());
+ }
+ }
+ return ps.toArray(new IPath[0]);
+ }
+ }
+ return new IPath[0];
+ }
+
+ public static IPath[] getWebContentPaths(IProject project) {
+ IVirtualComponent component = ComponentCore.createComponent(project);
+ if(component != null && component.getRootFolder() != null) {
+ IVirtualFolder webDir = component.getRootFolder().getFolder(new Path("/")); //$NON-NLS-1$
+ if(webDir.exists()) {
+ IContainer[] cs = webDir.getUnderlyingFolders();
+ List<IPath> ps = new ArrayList<IPath>();
+ for (IContainer c: cs) {
+ if(c.exists()) {
+ ps.add(c.getFullPath());
+ }
+ }
+ return ps.toArray(new IPath[0]);
+ }
+ }
+ return new IPath[0];
+ }
+
public static IPath getFirstWebContentPath(IProject project) {
IPath modulePath = null;
IVirtualComponent vc = ComponentCore.createComponent(project);
14 years, 5 months
JBoss Tools SVN: r32625 - trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/jsf2/util.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-07-05 18:38:26 -0400 (Tue, 05 Jul 2011)
New Revision: 32625
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/jsf2/util/JSF2ResourceUtil.java
Log:
JBIDE-9289
https://issues.jboss.org/browse/JBIDE-9289
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/jsf2/util/JSF2ResourceUtil.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/jsf2/util/JSF2ResourceUtil.java 2011-07-05 20:37:52 UTC (rev 32624)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/jsf2/util/JSF2ResourceUtil.java 2011-07-05 22:38:26 UTC (rev 32625)
@@ -76,12 +76,14 @@
if (component != null) {
IVirtualFolder webRootFolder = component.getRootFolder().getFolder(
new Path("/")); //$NON-NLS-1$
- IContainer folder = webRootFolder.getUnderlyingFolder();
- IPath path = folder.getFullPath().append(relativeLocation).append(
+ IContainer[] folders = webRootFolder.getUnderlyingFolders();
+ for (IContainer folder: folders) {
+ IPath path = folder.getFullPath().append(relativeLocation).append(
"/" + nodeName + ".xhtml"); //$NON-NLS-1$ //$NON-NLS-2$
- IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(path);
- if (file.isAccessible()) {
- return file;
+ IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(path);
+ if (file.isAccessible()) {
+ return file;
+ }
}
}
String classPathResource = "META-INF" + relativeLocation //$NON-NLS-1$
@@ -172,12 +174,14 @@
if (component != null) {
IVirtualFolder webRootFolder = component.getRootFolder().getFolder(
new Path("/")); //$NON-NLS-1$
- IContainer folder = webRootFolder.getUnderlyingFolder();
- IPath path = folder.getFullPath().append(relativeLocation);
- IFolder resFolder = ResourcesPlugin.getWorkspace().getRoot()
+ IContainer[] folders = webRootFolder.getUnderlyingFolders();
+ for (IContainer folder: folders) {
+ IPath path = folder.getFullPath().append(relativeLocation);
+ IFolder resFolder = ResourcesPlugin.getWorkspace().getRoot()
.getFolder(path);
- if (resFolder.isAccessible()) {
- return resFolder;
+ if (resFolder.isAccessible()) {
+ return resFolder;
+ }
}
}
String classPathResource = "META-INF" + relativeLocation; //$NON-NLS-1$
14 years, 5 months
JBoss Tools SVN: r32624 - in trunk/ws: features and 26 other directories.
by jbosstools-commits＠lists.jboss.org
Author: max.andersen(a)jboss.com
Date: 2011-07-05 16:37:52 -0400 (Tue, 05 Jul 2011)
New Revision: 32624
Modified:
trunk/ws/features/org.jboss.tools.ws.feature/pom.xml
trunk/ws/features/org.jboss.tools.ws.jaxrs.feature/feature.xml
trunk/ws/features/org.jboss.tools.ws.jaxrs.feature/pom.xml
trunk/ws/features/pom.xml
trunk/ws/plugins/org.jboss.tools.ws.core/META-INF/MANIFEST.MF
trunk/ws/plugins/org.jboss.tools.ws.core/pom.xml
trunk/ws/plugins/org.jboss.tools.ws.creation.core/META-INF/MANIFEST.MF
trunk/ws/plugins/org.jboss.tools.ws.creation.core/pom.xml
trunk/ws/plugins/org.jboss.tools.ws.creation.ui/META-INF/MANIFEST.MF
trunk/ws/plugins/org.jboss.tools.ws.creation.ui/pom.xml
trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/META-INF/MANIFEST.MF
trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/pom.xml
trunk/ws/plugins/org.jboss.tools.ws.jaxrs.ui/META-INF/MANIFEST.MF
trunk/ws/plugins/org.jboss.tools.ws.jaxrs.ui/pom.xml
trunk/ws/plugins/org.jboss.tools.ws.ui/pom.xml
trunk/ws/plugins/pom.xml
trunk/ws/pom.xml
trunk/ws/site/pom.xml
trunk/ws/tests/org.jboss.tools.ws.core.test/META-INF/MANIFEST.MF
trunk/ws/tests/org.jboss.tools.ws.core.test/pom.xml
trunk/ws/tests/org.jboss.tools.ws.creation.core.test/META-INF/MANIFEST.MF
trunk/ws/tests/org.jboss.tools.ws.creation.core.test/pom.xml
trunk/ws/tests/org.jboss.tools.ws.jaxrs.core.test/META-INF/MANIFEST.MF
trunk/ws/tests/org.jboss.tools.ws.jaxrs.core.test/pom.xml
trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/META-INF/MANIFEST.MF
trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/pom.xml
trunk/ws/tests/org.jboss.tools.ws.ui.test/META-INF/MANIFEST.MF
trunk/ws/tests/org.jboss.tools.ws.ui.test/pom.xml
trunk/ws/tests/pom.xml
Log:
JBIDE-9260 ws bumped to 1.2.2.qualifier/snapshot consistently
Modified: trunk/ws/features/org.jboss.tools.ws.feature/pom.xml
===================================================================
--- trunk/ws/features/org.jboss.tools.ws.feature/pom.xml 2011-07-05 17:10:57 UTC (rev 32623)
+++ trunk/ws/features/org.jboss.tools.ws.feature/pom.xml 2011-07-05 20:37:52 UTC (rev 32624)
@@ -5,10 +5,10 @@
<parent>
<groupId>org.jboss.tools.ws</groupId>
<artifactId>features</artifactId>
- <version>0.0.1-SNAPSHOT</version>
+ <version>1.2.2-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.ws.features</groupId>
<artifactId>org.jboss.tools.ws.feature</artifactId>
- <version>1.2.2-SNAPSHOT</version>
+
<packaging>eclipse-feature</packaging>
</project>
\ No newline at end of file
Modified: trunk/ws/features/org.jboss.tools.ws.jaxrs.feature/feature.xml
===================================================================
--- trunk/ws/features/org.jboss.tools.ws.jaxrs.feature/feature.xml 2011-07-05 17:10:57 UTC (rev 32623)
+++ trunk/ws/features/org.jboss.tools.ws.jaxrs.feature/feature.xml 2011-07-05 20:37:52 UTC (rev 32624)
@@ -2,7 +2,7 @@
<feature
id="org.jboss.tools.ws.jaxrs.feature"
label="%featureName"
- version="1.2.0.qualifier"
+ version="1.2.2.qualifier"
provider-name="JBoss by Red Hat">
<description>
Modified: trunk/ws/features/org.jboss.tools.ws.jaxrs.feature/pom.xml
===================================================================
--- trunk/ws/features/org.jboss.tools.ws.jaxrs.feature/pom.xml 2011-07-05 17:10:57 UTC (rev 32623)
+++ trunk/ws/features/org.jboss.tools.ws.jaxrs.feature/pom.xml 2011-07-05 20:37:52 UTC (rev 32624)
@@ -6,10 +6,10 @@
<parent>
<groupId>org.jboss.tools.ws</groupId>
<artifactId>features</artifactId>
- <version>0.0.1-SNAPSHOT</version>
+ <version>1.2.2-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.ws.features</groupId>
<artifactId>org.jboss.tools.ws.jaxrs.feature</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+
<packaging>eclipse-feature</packaging>
</project>
Modified: trunk/ws/features/pom.xml
===================================================================
--- trunk/ws/features/pom.xml 2011-07-05 17:10:57 UTC (rev 32623)
+++ trunk/ws/features/pom.xml 2011-07-05 20:37:52 UTC (rev 32624)
@@ -5,11 +5,11 @@
<parent>
<groupId>org.jboss.tools</groupId>
<artifactId>ws</artifactId>
- <version>0.0.1-SNAPSHOT</version>
+ <version>1.2.2-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.ws</groupId>
<artifactId>features</artifactId>
- <version>0.0.1-SNAPSHOT</version>
+
<name>ws.features</name>
<packaging>pom</packaging>
<modules>
Modified: trunk/ws/plugins/org.jboss.tools.ws.core/META-INF/MANIFEST.MF
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.core/META-INF/MANIFEST.MF 2011-07-05 17:10:57 UTC (rev 32623)
+++ trunk/ws/plugins/org.jboss.tools.ws.core/META-INF/MANIFEST.MF 2011-07-05 20:37:52 UTC (rev 32624)
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %PLUGIN_NAME
Bundle-SymbolicName: org.jboss.tools.ws.core;singleton:=true
-Bundle-Version: 1.2.0.qualifier
+Bundle-Version: 1.2.2.qualifier
Bundle-Localization: plugin
Bundle-Activator: org.jboss.tools.ws.core.JBossWSCorePlugin
Require-Bundle: org.eclipse.ui,
Modified: trunk/ws/plugins/org.jboss.tools.ws.core/pom.xml
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.core/pom.xml 2011-07-05 17:10:57 UTC (rev 32623)
+++ trunk/ws/plugins/org.jboss.tools.ws.core/pom.xml 2011-07-05 20:37:52 UTC (rev 32624)
@@ -5,10 +5,10 @@
<parent>
<groupId>org.jboss.tools.ws</groupId>
<artifactId>plugins</artifactId>
- <version>0.0.1-SNAPSHOT</version>
+ <version>1.2.2-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.ws.plugins</groupId>
<artifactId>org.jboss.tools.ws.core</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+
<packaging>eclipse-plugin</packaging>
</project>
\ No newline at end of file
Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.core/META-INF/MANIFEST.MF
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.creation.core/META-INF/MANIFEST.MF 2011-07-05 17:10:57 UTC (rev 32623)
+++ trunk/ws/plugins/org.jboss.tools.ws.creation.core/META-INF/MANIFEST.MF 2011-07-05 20:37:52 UTC (rev 32624)
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name.0
Bundle-SymbolicName: org.jboss.tools.ws.creation.core;singleton:=true
-Bundle-Version: 1.2.0.qualifier
+Bundle-Version: 1.2.2.qualifier
Bundle-Activator: org.jboss.tools.ws.creation.core.JBossWSCreationCorePlugin
Bundle-Vendor: %Bundle-Vendor.0
Require-Bundle: org.eclipse.ui,
Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.core/pom.xml
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.creation.core/pom.xml 2011-07-05 17:10:57 UTC (rev 32623)
+++ trunk/ws/plugins/org.jboss.tools.ws.creation.core/pom.xml 2011-07-05 20:37:52 UTC (rev 32624)
@@ -5,10 +5,10 @@
<parent>
<groupId>org.jboss.tools.ws</groupId>
<artifactId>plugins</artifactId>
- <version>0.0.1-SNAPSHOT</version>
+ <version>1.2.2-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.ws.plugins</groupId>
<artifactId>org.jboss.tools.ws.creation.core</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+
<packaging>eclipse-plugin</packaging>
</project>
\ No newline at end of file
Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.ui/META-INF/MANIFEST.MF
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.creation.ui/META-INF/MANIFEST.MF 2011-07-05 17:10:57 UTC (rev 32623)
+++ trunk/ws/plugins/org.jboss.tools.ws.creation.ui/META-INF/MANIFEST.MF 2011-07-05 20:37:52 UTC (rev 32624)
@@ -3,7 +3,7 @@
Bundle-Name: %PLUGIN_NAME
Bundle-Localization: plugin
Bundle-SymbolicName: org.jboss.tools.ws.creation.ui;singleton:=true
-Bundle-Version: 1.2.0.qualifier
+Bundle-Version: 1.2.2.qualifier
Bundle-Activator: org.jboss.tools.ws.creation.ui.JBossWSCreationUIPlugin
Bundle-Vendor: %PLUGIN_PROVIDER
Require-Bundle: org.eclipse.ui,
Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.ui/pom.xml
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.creation.ui/pom.xml 2011-07-05 17:10:57 UTC (rev 32623)
+++ trunk/ws/plugins/org.jboss.tools.ws.creation.ui/pom.xml 2011-07-05 20:37:52 UTC (rev 32624)
@@ -5,10 +5,10 @@
<parent>
<groupId>org.jboss.tools.ws</groupId>
<artifactId>plugins</artifactId>
- <version>0.0.1-SNAPSHOT</version>
+ <version>1.2.2-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.ws.plugins</groupId>
<artifactId>org.jboss.tools.ws.creation.ui</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+
<packaging>eclipse-plugin</packaging>
</project>
\ No newline at end of file
Modified: trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/META-INF/MANIFEST.MF
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/META-INF/MANIFEST.MF 2011-07-05 17:10:57 UTC (rev 32623)
+++ trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/META-INF/MANIFEST.MF 2011-07-05 20:37:52 UTC (rev 32624)
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %PLUGIN_NAME
Bundle-SymbolicName: org.jboss.tools.ws.jaxrs.core;singleton:=true
-Bundle-Version: 1.2.0.qualifier
+Bundle-Version: 1.2.2.qualifier
Bundle-Activator: org.jboss.tools.ws.jaxrs.core.JBossJaxrsCorePlugin
Bundle-Vendor: %PLUGIN_PROVIDER
Require-Bundle: org.eclipse.core.runtime;bundle-version="3.7.0";visibility:=reexport,
Modified: trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/pom.xml
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/pom.xml 2011-07-05 17:10:57 UTC (rev 32623)
+++ trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/pom.xml 2011-07-05 20:37:52 UTC (rev 32624)
@@ -6,10 +6,10 @@
<parent>
<groupId>org.jboss.tools.ws</groupId>
<artifactId>plugins</artifactId>
- <version>0.0.1-SNAPSHOT</version>
+ <version>1.2.2-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.ws.plugins</groupId>
<artifactId>org.jboss.tools.ws.jaxrs.core</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+
<packaging>eclipse-plugin</packaging>
</project>
Modified: trunk/ws/plugins/org.jboss.tools.ws.jaxrs.ui/META-INF/MANIFEST.MF
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.jaxrs.ui/META-INF/MANIFEST.MF 2011-07-05 17:10:57 UTC (rev 32623)
+++ trunk/ws/plugins/org.jboss.tools.ws.jaxrs.ui/META-INF/MANIFEST.MF 2011-07-05 20:37:52 UTC (rev 32624)
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %PLUGIN_NAME
Bundle-SymbolicName: org.jboss.tools.ws.jaxrs.ui;singleton:=true
-Bundle-Version: 1.2.0.qualifier
+Bundle-Version: 1.2.2.qualifier
Bundle-Activator: org.jboss.tools.ws.jaxrs.ui.JBossJaxrsUIPlugin
Require-Bundle: org.eclipse.ui;bundle-version="3.6.0",
org.eclipse.core.runtime;visibility:=reexport,
Modified: trunk/ws/plugins/org.jboss.tools.ws.jaxrs.ui/pom.xml
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.jaxrs.ui/pom.xml 2011-07-05 17:10:57 UTC (rev 32623)
+++ trunk/ws/plugins/org.jboss.tools.ws.jaxrs.ui/pom.xml 2011-07-05 20:37:52 UTC (rev 32624)
@@ -6,10 +6,10 @@
<parent>
<groupId>org.jboss.tools.ws</groupId>
<artifactId>plugins</artifactId>
- <version>0.0.1-SNAPSHOT</version>
+ <version>1.2.2-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.ws.plugins</groupId>
<artifactId>org.jboss.tools.ws.jaxrs.ui</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+
<packaging>eclipse-plugin</packaging>
</project>
Modified: trunk/ws/plugins/org.jboss.tools.ws.ui/pom.xml
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.ui/pom.xml 2011-07-05 17:10:57 UTC (rev 32623)
+++ trunk/ws/plugins/org.jboss.tools.ws.ui/pom.xml 2011-07-05 20:37:52 UTC (rev 32624)
@@ -5,10 +5,10 @@
<parent>
<groupId>org.jboss.tools.ws</groupId>
<artifactId>plugins</artifactId>
- <version>0.0.1-SNAPSHOT</version>
+ <version>1.2.2-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.ws.plugins</groupId>
<artifactId>org.jboss.tools.ws.ui</artifactId>
- <version>1.2.2-SNAPSHOT</version>
+
<packaging>eclipse-plugin</packaging>
</project>
\ No newline at end of file
Modified: trunk/ws/plugins/pom.xml
===================================================================
--- trunk/ws/plugins/pom.xml 2011-07-05 17:10:57 UTC (rev 32623)
+++ trunk/ws/plugins/pom.xml 2011-07-05 20:37:52 UTC (rev 32624)
@@ -5,11 +5,11 @@
<parent>
<groupId>org.jboss.tools</groupId>
<artifactId>ws</artifactId>
- <version>0.0.1-SNAPSHOT</version>
+ <version>1.2.2-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.ws</groupId>
<artifactId>plugins</artifactId>
- <version>0.0.1-SNAPSHOT</version>
+
<name>ws.plugins</name>
<packaging>pom</packaging>
<modules>
Modified: trunk/ws/pom.xml
===================================================================
--- trunk/ws/pom.xml 2011-07-05 17:10:57 UTC (rev 32623)
+++ trunk/ws/pom.xml 2011-07-05 20:37:52 UTC (rev 32624)
@@ -10,7 +10,7 @@
</parent>
<groupId>org.jboss.tools</groupId>
<artifactId>ws</artifactId>
- <version>0.0.1-SNAPSHOT</version>
+ <version>1.2.2-SNAPSHOT</version>
<name>ws.all</name>
<packaging>pom</packaging>
<modules>
Modified: trunk/ws/site/pom.xml
===================================================================
--- trunk/ws/site/pom.xml 2011-07-05 17:10:57 UTC (rev 32623)
+++ trunk/ws/site/pom.xml 2011-07-05 20:37:52 UTC (rev 32624)
@@ -5,11 +5,11 @@
<parent>
<groupId>org.jboss.tools</groupId>
<artifactId>ws</artifactId>
- <version>0.0.1-SNAPSHOT</version>
+ <version>1.2.2-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.ws</groupId>
<artifactId>ws.site</artifactId>
<name>ws.site</name>
- <version>0.0.1-SNAPSHOT</version>
+
<packaging>eclipse-update-site</packaging>
</project>
\ No newline at end of file
Modified: trunk/ws/tests/org.jboss.tools.ws.core.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.core.test/META-INF/MANIFEST.MF 2011-07-05 17:10:57 UTC (rev 32623)
+++ trunk/ws/tests/org.jboss.tools.ws.core.test/META-INF/MANIFEST.MF 2011-07-05 20:37:52 UTC (rev 32624)
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name.0
Bundle-SymbolicName: org.jboss.tools.ws.core.test
-Bundle-Version: 1.2.0.qualifier
+Bundle-Version: 1.2.2.qualifier
Bundle-Activator: org.jboss.tools.ws.core.test.Activator
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
Modified: trunk/ws/tests/org.jboss.tools.ws.core.test/pom.xml
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.core.test/pom.xml 2011-07-05 17:10:57 UTC (rev 32623)
+++ trunk/ws/tests/org.jboss.tools.ws.core.test/pom.xml 2011-07-05 20:37:52 UTC (rev 32624)
@@ -5,11 +5,11 @@
<parent>
<groupId>org.jboss.tools.ws</groupId>
<artifactId>tests</artifactId>
- <version>0.0.1-SNAPSHOT</version>
+ <version>1.2.2-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.ws.tests</groupId>
<artifactId>org.jboss.tools.ws.core.test</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+
<packaging>eclipse-test-plugin</packaging>
<properties>
Modified: trunk/ws/tests/org.jboss.tools.ws.creation.core.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.creation.core.test/META-INF/MANIFEST.MF 2011-07-05 17:10:57 UTC (rev 32623)
+++ trunk/ws/tests/org.jboss.tools.ws.creation.core.test/META-INF/MANIFEST.MF 2011-07-05 20:37:52 UTC (rev 32624)
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name.0
Bundle-SymbolicName: org.jboss.tools.ws.creation.core.test
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 1.2.2.qualifier
Bundle-Activator: org.jboss.tools.ws.creation.core.test.Activator
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
Modified: trunk/ws/tests/org.jboss.tools.ws.creation.core.test/pom.xml
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.creation.core.test/pom.xml 2011-07-05 17:10:57 UTC (rev 32623)
+++ trunk/ws/tests/org.jboss.tools.ws.creation.core.test/pom.xml 2011-07-05 20:37:52 UTC (rev 32624)
@@ -5,11 +5,11 @@
<parent>
<groupId>org.jboss.tools.ws</groupId>
<artifactId>tests</artifactId>
- <version>0.0.1-SNAPSHOT</version>
+ <version>1.2.2-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.ws.tests</groupId>
<artifactId>org.jboss.tools.ws.creation.core.test</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+
<packaging>eclipse-test-plugin</packaging>
<properties>
@@ -32,7 +32,7 @@
<plugin>
<groupId>org.sonatype.tycho</groupId>
<artifactId>maven-osgi-test-plugin</artifactId>
- <version>${tychoVersion}</version>
+
<configuration>
<!-- timeout in seconds -->
<surefire.timeout>3600</surefire.timeout>
@@ -42,4 +42,4 @@
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
Modified: trunk/ws/tests/org.jboss.tools.ws.jaxrs.core.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.jaxrs.core.test/META-INF/MANIFEST.MF 2011-07-05 17:10:57 UTC (rev 32623)
+++ trunk/ws/tests/org.jboss.tools.ws.jaxrs.core.test/META-INF/MANIFEST.MF 2011-07-05 20:37:52 UTC (rev 32624)
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: Tests
Bundle-SymbolicName: org.jboss.tools.ws.jaxrs.core.test;singleton:=true
-Bundle-Version: 1.2.0.qualifier
+Bundle-Version: 1.2.2.qualifier
Bundle-Activator: org.jboss.tools.ws.jaxrs.core.JBossJaxrsCoreTestsPlugin
Require-Bundle: org.jboss.tools.ws.jaxrs.core;bundle-version="1.2.0",
org.eclipse.ui.ide;bundle-version="3.7.0";visibility:=reexport,
Modified: trunk/ws/tests/org.jboss.tools.ws.jaxrs.core.test/pom.xml
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.jaxrs.core.test/pom.xml 2011-07-05 17:10:57 UTC (rev 32623)
+++ trunk/ws/tests/org.jboss.tools.ws.jaxrs.core.test/pom.xml 2011-07-05 20:37:52 UTC (rev 32624)
@@ -6,11 +6,10 @@
<parent>
<groupId>org.jboss.tools.ws</groupId>
<artifactId>tests</artifactId>
- <version>0.0.1-SNAPSHOT</version>
+ <version>1.2.2-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.ws.tests</groupId>
<artifactId>org.jboss.tools.ws.jaxrs.core.test</artifactId>
- <version>1.2.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
<properties>
@@ -30,7 +29,7 @@
</configuration>
</plugin>
<!-- plugin> <groupId>org.sonatype.tycho</groupId> <artifactId>maven-osgi-test-plugin</artifactId>
- <version>${tychoVersion}</version> <configuration> <useUIHarness>false</useUIHarness>
+ <configuration> <useUIHarness>false</useUIHarness>
<surefire.timeout>3600</surefire.timeout> <forkedProcessTimeoutInSeconds>3600</forkedProcessTimeoutInSeconds>
<includes> <include>**/TestCase.class</include> <include>**/*TestSuite*.class</include>
</includes> </configuration> </plugin -->
Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/META-INF/MANIFEST.MF 2011-07-05 17:10:57 UTC (rev 32623)
+++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/META-INF/MANIFEST.MF 2011-07-05 20:37:52 UTC (rev 32624)
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: WebService SWTBot Tests
Bundle-SymbolicName: org.jboss.tools.ws.ui.bot.test
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 1.2.2.qualifier
Bundle-Activator: org.jboss.tools.ws.ui.bot.test.Activator
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/pom.xml
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/pom.xml 2011-07-05 17:10:57 UTC (rev 32623)
+++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/pom.xml 2011-07-05 20:37:52 UTC (rev 32624)
@@ -5,10 +5,10 @@
<parent>
<groupId>org.jboss.tools.ws</groupId>
<artifactId>tests</artifactId>
- <version>0.0.1-SNAPSHOT</version>
+ <version>1.2.2-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.ws.tests</groupId>
<artifactId>org.jboss.tools.ws.ui.bot.test</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+
<packaging>eclipse-test-plugin</packaging>
</project>
\ No newline at end of file
Modified: trunk/ws/tests/org.jboss.tools.ws.ui.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.ui.test/META-INF/MANIFEST.MF 2011-07-05 17:10:57 UTC (rev 32623)
+++ trunk/ws/tests/org.jboss.tools.ws.ui.test/META-INF/MANIFEST.MF 2011-07-05 20:37:52 UTC (rev 32624)
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name.0
Bundle-SymbolicName: org.jboss.tools.ws.ui.test
-Bundle-Version: 1.2.0.qualifier
+Bundle-Version: 1.2.2.qualifier
Bundle-Activator: org.jboss.tools.ws.ui.test.Activator
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
Modified: trunk/ws/tests/org.jboss.tools.ws.ui.test/pom.xml
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.ui.test/pom.xml 2011-07-05 17:10:57 UTC (rev 32623)
+++ trunk/ws/tests/org.jboss.tools.ws.ui.test/pom.xml 2011-07-05 20:37:52 UTC (rev 32624)
@@ -5,11 +5,11 @@
<parent>
<groupId>org.jboss.tools.ws</groupId>
<artifactId>tests</artifactId>
- <version>0.0.1-SNAPSHOT</version>
+ <version>1.2.2-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.ws.tests</groupId>
<artifactId>org.jboss.tools.ws.ui.test</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+
<packaging>eclipse-test-plugin</packaging>
<properties>
Modified: trunk/ws/tests/pom.xml
===================================================================
--- trunk/ws/tests/pom.xml 2011-07-05 17:10:57 UTC (rev 32623)
+++ trunk/ws/tests/pom.xml 2011-07-05 20:37:52 UTC (rev 32624)
@@ -5,11 +5,11 @@
<parent>
<groupId>org.jboss.tools</groupId>
<artifactId>ws</artifactId>
- <version>0.0.1-SNAPSHOT</version>
+ <version>1.2.2-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.ws</groupId>
<artifactId>tests</artifactId>
- <version>0.0.1-SNAPSHOT</version>
+
<name>ws.tests</name>
<packaging>pom</packaging>
<modules>
14 years, 5 months
JBoss Tools SVN: r32623 - in trunk/forge: features and 6 other directories.
by jbosstools-commits＠lists.jboss.org
Author: max.andersen(a)jboss.com
Date: 2011-07-05 13:10:57 -0400 (Tue, 05 Jul 2011)
New Revision: 32623
Modified:
trunk/forge/features/org.jboss.tools.forge.feature/pom.xml
trunk/forge/features/pom.xml
trunk/forge/plugins/org.jboss.tools.forge.core/pom.xml
trunk/forge/plugins/org.jboss.tools.forge.runtime/pom.xml
trunk/forge/plugins/org.jboss.tools.forge.ui/pom.xml
trunk/forge/plugins/pom.xml
trunk/forge/pom.xml
trunk/forge/site/pom.xml
Log:
JBIDE-9260 forge bumped to 1.0.0.qualifier/snapshot consistently
Modified: trunk/forge/features/org.jboss.tools.forge.feature/pom.xml
===================================================================
--- trunk/forge/features/org.jboss.tools.forge.feature/pom.xml 2011-07-05 17:01:15 UTC (rev 32622)
+++ trunk/forge/features/org.jboss.tools.forge.feature/pom.xml 2011-07-05 17:10:57 UTC (rev 32623)
@@ -5,10 +5,10 @@
<parent>
<groupId>org.jboss.tools.forge</groupId>
<artifactId>features</artifactId>
- <version>0.0.2-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.forge.features</groupId>
<artifactId>org.jboss.tools.forge.feature</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+
<packaging>eclipse-feature</packaging>
</project>
Modified: trunk/forge/features/pom.xml
===================================================================
--- trunk/forge/features/pom.xml 2011-07-05 17:01:15 UTC (rev 32622)
+++ trunk/forge/features/pom.xml 2011-07-05 17:10:57 UTC (rev 32623)
@@ -5,11 +5,11 @@
<parent>
<groupId>org.jboss.tools</groupId>
<artifactId>forge</artifactId>
- <version>0.0.2-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.forge</groupId>
<artifactId>features</artifactId>
- <version>0.0.2-SNAPSHOT</version>
+
<name>forge.features</name>
<packaging>pom</packaging>
<modules>
Modified: trunk/forge/plugins/org.jboss.tools.forge.core/pom.xml
===================================================================
--- trunk/forge/plugins/org.jboss.tools.forge.core/pom.xml 2011-07-05 17:01:15 UTC (rev 32622)
+++ trunk/forge/plugins/org.jboss.tools.forge.core/pom.xml 2011-07-05 17:10:57 UTC (rev 32623)
@@ -4,10 +4,10 @@
<parent>
<groupId>org.jboss.tools.forge</groupId>
<artifactId>forge.plugins</artifactId>
- <version>0.0.2-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.forge.plugins</groupId>
<artifactId>org.jboss.tools.forge.core</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+
<packaging>eclipse-plugin</packaging>
</project>
Modified: trunk/forge/plugins/org.jboss.tools.forge.runtime/pom.xml
===================================================================
--- trunk/forge/plugins/org.jboss.tools.forge.runtime/pom.xml 2011-07-05 17:01:15 UTC (rev 32622)
+++ trunk/forge/plugins/org.jboss.tools.forge.runtime/pom.xml 2011-07-05 17:10:57 UTC (rev 32623)
@@ -4,10 +4,10 @@
<parent>
<groupId>org.jboss.tools.forge</groupId>
<artifactId>forge.plugins</artifactId>
- <version>0.0.2-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.forge.plugins</groupId>
<artifactId>org.jboss.tools.forge.runtime</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+
<packaging>eclipse-plugin</packaging>
</project>
Modified: trunk/forge/plugins/org.jboss.tools.forge.ui/pom.xml
===================================================================
--- trunk/forge/plugins/org.jboss.tools.forge.ui/pom.xml 2011-07-05 17:01:15 UTC (rev 32622)
+++ trunk/forge/plugins/org.jboss.tools.forge.ui/pom.xml 2011-07-05 17:10:57 UTC (rev 32623)
@@ -4,10 +4,9 @@
<parent>
<groupId>org.jboss.tools.forge</groupId>
<artifactId>forge.plugins</artifactId>
- <version>0.0.2-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.forge.plugins</groupId>
- <artifactId>org.jboss.tools.forge.ui</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <artifactId>org.jboss.tools.forge.ui</artifactId>
<packaging>eclipse-plugin</packaging>
</project>
Modified: trunk/forge/plugins/pom.xml
===================================================================
--- trunk/forge/plugins/pom.xml 2011-07-05 17:01:15 UTC (rev 32622)
+++ trunk/forge/plugins/pom.xml 2011-07-05 17:10:57 UTC (rev 32623)
@@ -5,11 +5,11 @@
<parent>
<groupId>org.jboss.tools</groupId>
<artifactId>forge</artifactId>
- <version>0.0.2-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.forge</groupId>
<artifactId>forge.plugins</artifactId>
- <version>0.0.2-SNAPSHOT</version>
+
<name>forge.plugins</name>
<packaging>pom</packaging>
<modules>
Modified: trunk/forge/pom.xml
===================================================================
--- trunk/forge/pom.xml 2011-07-05 17:01:15 UTC (rev 32622)
+++ trunk/forge/pom.xml 2011-07-05 17:10:57 UTC (rev 32623)
@@ -10,7 +10,7 @@
</parent>
<groupId>org.jboss.tools</groupId>
<artifactId>forge</artifactId>
- <version>0.0.2-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<name>forge.all</name>
<packaging>pom</packaging>
<modules>
Modified: trunk/forge/site/pom.xml
===================================================================
--- trunk/forge/site/pom.xml 2011-07-05 17:01:15 UTC (rev 32622)
+++ trunk/forge/site/pom.xml 2011-07-05 17:10:57 UTC (rev 32623)
@@ -5,11 +5,11 @@
<parent>
<groupId>org.jboss.tools</groupId>
<artifactId>forge</artifactId>
- <version>0.0.2-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.forge</groupId>
<artifactId>forge.site</artifactId>
<name>forge.site</name>
- <version>0.0.2-SNAPSHOT</version>
+
<packaging>eclipse-update-site</packaging>
</project>
14 years, 5 months
JBoss Tools SVN: r32622 - in trunk: as/tests/org.jboss.ide.eclipse.as.management.as7.tests/META-INF and 6 other directories.
by jbosstools-commits＠lists.jboss.org
Author: max.andersen(a)jboss.com
Date: 2011-07-05 13:01:15 -0400 (Tue, 05 Jul 2011)
New Revision: 32622
Modified:
trunk/as/tests/org.jboss.ide.eclipse.as.management.as7.tests/
trunk/as/tests/org.jboss.ide.eclipse.as.management.as7.tests/META-INF/MANIFEST.MF
trunk/as/tests/org.jboss.ide.eclipse.as.management.as7.tests/pom.xml
trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.ui/
trunk/cdi/tests/org.jboss.tools.cdi.seam.config.ui.test/
trunk/common/plugins/org.jboss.tools.common.base.test/
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.docs/
trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/
trunk/deltacloud/tests/org.jboss.tools.deltacloud.ui.bot.test/
Log:
fix more svnignores
Property changes on: trunk/as/tests/org.jboss.ide.eclipse.as.management.as7.tests
___________________________________________________________________
Modified: svn:ignore
- target
+ target
buildlog.latest.txt
bin
build
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.management.as7.tests/META-INF/MANIFEST.MF
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.management.as7.tests/META-INF/MANIFEST.MF 2011-07-05 16:56:15 UTC (rev 32621)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.management.as7.tests/META-INF/MANIFEST.MF 2011-07-05 17:01:15 UTC (rev 32622)
@@ -2,10 +2,10 @@
Bundle-ManifestVersion: 2
Bundle-Name: Tests
Bundle-SymbolicName: org.jboss.ide.eclipse.as.management.as7.tests
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 2.3.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Require-Bundle: org.jboss.ide.eclipse.as.core;bundle-version="[2.2.0,3.0.0)",
- org.jboss.ide.eclipse.as.management.as7;bundle-version="[0.2.0,1.0.0)",
+ org.jboss.ide.eclipse.as.management.as7;bundle-version="[2.3.0,3.0.0)",
org.junit;bundle-version="[4.8.1,5.0.0)",
org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
org.hamcrest;bundle-version="[1.1.0,2.0.0)"
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.management.as7.tests/pom.xml
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.management.as7.tests/pom.xml 2011-07-05 16:56:15 UTC (rev 32621)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.management.as7.tests/pom.xml 2011-07-05 17:01:15 UTC (rev 32622)
@@ -4,13 +4,11 @@
<parent>
<groupId>org.jboss.tools.as</groupId>
<artifactId>tests</artifactId>
- <version>0.0.1-SNAPSHOT</version>
+ <version>2.3.0-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.as.tests</groupId>
<artifactId>org.jboss.ide.eclipse.as.management.as7.tests</artifactId>
- <version>1.0.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
-
<build>
<plugins>
<plugin>
Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.ui
___________________________________________________________________
Modified: svn:ignore
- target
+ target
buildlog.latest.txt
bin
build
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.config.ui.test
___________________________________________________________________
Modified: svn:ignore
- target
+ target
buildlog.latest.txt
bin
build
Property changes on: trunk/common/plugins/org.jboss.tools.common.base.test
___________________________________________________________________
Modified: svn:ignore
- target
+ target
buildlog.latest.txt
bin
build
Property changes on: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.docs
___________________________________________________________________
Modified: svn:ignore
- target
+ target
buildlog.latest.txt
bin
build
Property changes on: trunk/deltacloud/tests/org.jboss.tools.deltacloud.test
___________________________________________________________________
Modified: svn:ignore
- target
+ target
buildlog.latest.txt
bin
build
Property changes on: trunk/deltacloud/tests/org.jboss.tools.deltacloud.ui.bot.test
___________________________________________________________________
Added: svn:ignore
+ target
buildlog.latest.txt
bin
build
14 years, 5 months
JBoss Tools SVN: r32621 - in trunk: cdi/tests/org.jboss.tools.cdi.seam.core.test and 8 other directories.
by jbosstools-commits＠lists.jboss.org
Author: max.andersen(a)jboss.com
Date: 2011-07-05 12:56:15 -0400 (Tue, 05 Jul 2011)
New Revision: 32621
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.seam.core/
trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/
trunk/runtime/features/org.jboss.tools.runtime.as.detector.feature/
trunk/runtime/features/org.jboss.tools.runtime.drools.detector.feature/
trunk/runtime/features/org.jboss.tools.runtime.jbpm.detector.feature/
trunk/runtime/features/org.jboss.tools.runtime.seam.detector.feature/
trunk/runtime/plugins/org.jboss.tools.runtime.as.detector/
trunk/runtime/plugins/org.jboss.tools.runtime.drools.detector/
trunk/runtime/plugins/org.jboss.tools.runtime.jbpm.detector/
trunk/runtime/plugins/org.jboss.tools.runtime.seam.detector/
Log:
fix svnignores
Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.seam.core
___________________________________________________________________
Added: svn:ignore
+ target
buildlog.latest.txt
bin
build
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test
___________________________________________________________________
Added: svn:ignore
+ target
buildlog.latest.txt
bin
build
Property changes on: trunk/runtime/features/org.jboss.tools.runtime.as.detector.feature
___________________________________________________________________
Added: svn:ignore
+ target
buildlog.latest.txt
bin
build
Property changes on: trunk/runtime/features/org.jboss.tools.runtime.drools.detector.feature
___________________________________________________________________
Added: svn:ignore
+ target
buildlog.latest.txt
bin
build
Property changes on: trunk/runtime/features/org.jboss.tools.runtime.jbpm.detector.feature
___________________________________________________________________
Added: svn:ignore
+ target
buildlog.latest.txt
bin
build
Property changes on: trunk/runtime/features/org.jboss.tools.runtime.seam.detector.feature
___________________________________________________________________
Added: svn:ignore
+ target
buildlog.latest.txt
bin
build
Property changes on: trunk/runtime/plugins/org.jboss.tools.runtime.as.detector
___________________________________________________________________
Added: svn:ignore
+ target
buildlog.latest.txt
bin
build
Property changes on: trunk/runtime/plugins/org.jboss.tools.runtime.drools.detector
___________________________________________________________________
Added: svn:ignore
+ target
buildlog.latest.txt
bin
build
Property changes on: trunk/runtime/plugins/org.jboss.tools.runtime.jbpm.detector
___________________________________________________________________
Added: svn:ignore
+ target
buildlog.latest.txt
bin
build
Property changes on: trunk/runtime/plugins/org.jboss.tools.runtime.seam.detector
___________________________________________________________________
Added: svn:ignore
+ target
buildlog.latest.txt
bin
build
14 years, 5 months