JBoss Tools SVN: r22828 - trunk/bpel/features/org.jboss.tools.bpel.tests.feature.
by jbosstools-commits＠lists.jboss.org
Author: max.andersen(a)jboss.com
Date: 2010-06-16 03:31:13 -0400 (Wed, 16 Jun 2010)
New Revision: 22828
Modified:
trunk/bpel/features/org.jboss.tools.bpel.tests.feature/
Log:
target svn ignore
Property changes on: trunk/bpel/features/org.jboss.tools.bpel.tests.feature
___________________________________________________________________
Name: svn:ignore
+ target
15 years, 10 months
JBoss Tools SVN: r22827 - trunk/as/site.
by jbosstools-commits＠lists.jboss.org
Author: max.andersen(a)jboss.com
Date: 2010-06-16 03:14:24 -0400 (Wed, 16 Jun 2010)
New Revision: 22827
Modified:
trunk/as/site/
Log:
target svn ignore
Property changes on: trunk/as/site
___________________________________________________________________
Name: svn:ignore
+ target
15 years, 10 months
JBoss Tools SVN: r22826 - trunk/archives/site.
by jbosstools-commits＠lists.jboss.org
Author: max.andersen(a)jboss.com
Date: 2010-06-16 03:13:47 -0400 (Wed, 16 Jun 2010)
New Revision: 22826
Modified:
trunk/archives/site/
Log:
target svn ignore
Property changes on: trunk/archives/site
___________________________________________________________________
Name: svn:ignore
+ target
15 years, 10 months
JBoss Tools SVN: r22825 - in trunk/build/product: images and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2010-06-15 13:04:27 -0400 (Tue, 15 Jun 2010)
New Revision: 22825
Added:
trunk/build/product/images/
trunk/build/product/images/48-jbds_icon.png
trunk/build/product/images/jbds.ico
Log:
add images needed for .product definition - will need to redo them into correct format for different platforms, however
Added: trunk/build/product/images/48-jbds_icon.png
===================================================================
(Binary files differ)
Property changes on: trunk/build/product/images/48-jbds_icon.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/build/product/images/jbds.ico
===================================================================
(Binary files differ)
Property changes on: trunk/build/product/images/jbds.ico
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
15 years, 10 months
JBoss Tools SVN: r22824 - trunk/build/target-platform.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2010-06-15 13:03:35 -0400 (Tue, 15 Jun 2010)
New Revision: 22824
Modified:
trunk/build/target-platform/install.xml
Log:
move temporary p2.mirror.xml script into /tmp
Modified: trunk/build/target-platform/install.xml
===================================================================
--- trunk/build/target-platform/install.xml 2010-06-15 17:01:18 UTC (rev 22823)
+++ trunk/build/target-platform/install.xml 2010-06-15 17:03:35 UTC (rev 22824)
@@ -19,7 +19,7 @@
<property name="target.to.install" value="e36-wtp32.target" />
<!-- where to download and create mirror repo -->
- <property name="repo.dir" value="/tmp/p2.mirror" />
+ <property name="repo.dir" value="${java.io.tmpdir}/p2.mirror" />
<!-- where to install target: into ${eclipse.home} or /path/to/eclipse -->
<!-- <property name="install.dir" value="${eclipse.home}" /> -->
@@ -28,7 +28,7 @@
<target name="init" unless="install.dir">
<fail>Must set these properties:
-Dtarget.to.install=e36-wtp32.target
- -Drepo.dir=/tmp/p2.mirror
+ -Drepo.dir=${java.io.tmpdir}/p2.mirror
-Dinstall.dir=/home/nboldt/eclipse/36clean2/eclipse
</fail>
</target>
@@ -37,7 +37,7 @@
<mkdir dir="${repo.dir}" />
<!-- create p2.mirror ant script -->
- <property name="mirror" value="p2.mirror.xml" />
+ <property name="mirror" value="${java.io.tmpdir}/p2.mirror.xml" />
<xslt style="target2ant.xsl" in="${target.to.install}" out="${mirror}" force="true" />
<!-- run generated p2.mirror ant script -->
15 years, 10 months
JBoss Tools SVN: r22823 - trunk/build/target-platform.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2010-06-15 13:01:18 -0400 (Tue, 15 Jun 2010)
New Revision: 22823
Modified:
trunk/build/target-platform/install.xml
Log:
delete downloaded metadata before regenerating it
Modified: trunk/build/target-platform/install.xml
===================================================================
--- trunk/build/target-platform/install.xml 2010-06-15 16:57:34 UTC (rev 22822)
+++ trunk/build/target-platform/install.xml 2010-06-15 17:01:18 UTC (rev 22823)
@@ -48,6 +48,9 @@
<!-- generate a site.xml for all the features available -->
<antcall target="buildSiteXml" />
+ <!-- TODO: delete existing metadata in ${repo.dir} before regenerating it? -->
+ <delete dir="${repo.dir}" includes="artifacts.xml, artifacts.jar, content.xml, content.jar" />
+
<!-- generate metadata -->
<!-- TODO: switch to use Publisher: http://wiki.eclipse.org/Equinox/p2/Publisher#Features_and_Bundles_Publish...
<p2.publish.featuresAndBundles
15 years, 10 months
JBoss Tools SVN: r22822 - trunk.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2010-06-15 12:57:34 -0400 (Tue, 15 Jun 2010)
New Revision: 22822
Modified:
trunk/parent-pom.xml
Log:
new line removed from -X options
Modified: trunk/parent-pom.xml
===================================================================
--- trunk/parent-pom.xml 2010-06-15 15:29:05 UTC (rev 22821)
+++ trunk/parent-pom.xml 2010-06-15 16:57:34 UTC (rev 22822)
@@ -11,8 +11,7 @@
<tychoVersion>0.9.0-SNAPSHOT</tychoVersion>
<scmBranch>trunk</scmBranch>
<BUILD_ALIAS>M1</BUILD_ALIAS>
- <memoryOptions>-Xms512m -Xmx1024m -XX:PermSize=256m
- -XX:MaxPermSize=256m</memoryOptions>
+ <memoryOptions>-Xms512m -Xmx1024m -XX:PermSize=256m -XX:MaxPermSize=256m</memoryOptions>
<target.platform>e36-wtp32</target.platform>
</properties>
15 years, 10 months
JBoss Tools SVN: r22821 - trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences.
by jbosstools-commits＠lists.jboss.org
Author: vpakan(a)redhat.com
Date: 2010-06-15 11:29:05 -0400 (Tue, 15 Jun 2010)
New Revision: 22821
Modified:
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/AlwaysHideSelectionBarWithoutPromptTest.java
Log:
Added test if Confirmation Dialog is displayed when hiding Selection Bar
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/AlwaysHideSelectionBarWithoutPromptTest.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/AlwaysHideSelectionBarWithoutPromptTest.java 2010-06-15 14:23:08 UTC (rev 22820)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/AlwaysHideSelectionBarWithoutPromptTest.java 2010-06-15 15:29:05 UTC (rev 22821)
@@ -1,6 +1,7 @@
package org.jboss.tools.vpe.ui.bot.test.editor.preferences;
import org.eclipse.swtbot.swt.finder.exceptions.WidgetNotFoundException;
+import org.jboss.tools.ui.bot.ext.types.IDELabel;
public class AlwaysHideSelectionBarWithoutPromptTest extends PreferencesTestCase{
@@ -41,6 +42,14 @@
closePage();
openPage();
checkIsShow();
+
+ //Test Hide Selection Bar button with confirm
+
+ selectPrompt();
+ bot.toolbarButtonWithTooltip(HID_SEL_BAR).click();
+ bot.shell("Confirm hide selection bar").activate();
+ bot.button(IDELabel.Button.OK).click();
+ checkIsHide();
}
private void checkIsHide(){
15 years, 10 months
JBoss Tools SVN: r22820 - branches/jbosstools-3.1.x/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: 2010-06-15 10:23:08 -0400 (Tue, 15 Jun 2010)
New Revision: 22820
Modified:
branches/jbosstools-3.1.x/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/KbProject.java
Log:
https://jira.jboss.org/browse/JBIDE-6372
Modified: branches/jbosstools-3.1.x/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/KbProject.java
===================================================================
--- branches/jbosstools-3.1.x/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/KbProject.java 2010-06-15 14:20:23 UTC (rev 22819)
+++ branches/jbosstools-3.1.x/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/KbProject.java 2010-06-15 14:23:08 UTC (rev 22820)
@@ -156,7 +156,7 @@
*/
public void addKbProject(KbProject p) {
if(dependsOn.contains(p)) return;
- dependsOn.add(p);
+ addUsedKbProject(p);
p.addDependentKbProject(this);
if(!p.isStorageResolved) {
p.resolve();
@@ -187,17 +187,49 @@
* @param p
*/
public void addDependentKbProject(KbProject p) {
- usedBy.add(p);
+ synchronized (usedBy) {
+ usedBy.add(p);
+ }
}
+ void removeDependentKbProject(KbProject p) {
+ synchronized (usedBy) {
+ usedBy.remove(p);
+ }
+ }
+
+ KbProject[] getDependentKbProjects() {
+ synchronized (usedBy) {
+ return usedBy.toArray(new KbProject[0]);
+ }
+ }
+
+ void addUsedKbProject(KbProject p) {
+ synchronized (dependsOn) {
+ dependsOn.add(p);
+ }
+ }
+
+ void removeUsedKbProject(KbProject p) {
+ synchronized (dependsOn) {
+ dependsOn.remove(p);
+ }
+ }
+
+ KbProject[] getUsedKbProjects() {
+ synchronized (dependsOn) {
+ return dependsOn.toArray(new KbProject[0]);
+ }
+ }
+
/**
*
* @param p
*/
public void removeKbProject(KbProject p) {
if(!dependsOn.contains(p)) return;
- p.usedBy.remove(this);
- dependsOn.remove(p);
+ p.removeDependentKbProject(this);
+ removeUsedKbProject(p);
IPath[] ps = null;
synchronized(sourcePaths2) {
ps = sourcePaths2.keySet().toArray(new IPath[0]);
@@ -319,8 +351,12 @@
sourcePaths2.clear();
}
isStorageResolved = false;
- dependsOn.clear();
- usedBy.clear();
+ synchronized (dependsOn) {
+ dependsOn.clear();
+ }
+ synchronized (usedBy) {
+ usedBy.clear();
+ }
libraries.clear();
long begin = System.currentTimeMillis();
@@ -399,7 +435,7 @@
if(sp.isMock) {
addKbProject(sp);
} else {
- dependsOn.add(sp);
+ addUsedKbProject(sp);
sp.addDependentKbProject(this);
}
}
@@ -415,7 +451,9 @@
IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(p);
if(project == null || !project.isAccessible()) continue;
KbProject sp = (KbProject)KbProjectFactory.getKbProject(project, false);
- if(sp != null) usedBy.add(sp);
+ if(sp != null) {
+ addDependentKbProject(sp);
+ }
}
}
@@ -523,13 +561,15 @@
*/
private void storeProjectDependencies(Element root) {
Element dependsOnElement = XMLUtilities.createElement(root, "depends-on-projects"); //$NON-NLS-1$
- for (IKbProject p : dependsOn) {
+ KbProject[] ds = getUsedKbProjects();
+ for (IKbProject p : ds) {
if(!p.getProject().isAccessible()) continue;
Element pathElement = XMLUtilities.createElement(dependsOnElement, "project"); //$NON-NLS-1$
pathElement.setAttribute("name", p.getProject().getName()); //$NON-NLS-1$
}
Element usedElement = XMLUtilities.createElement(root, "used-by-projects"); //$NON-NLS-1$
- for (IKbProject p : usedBy) {
+ KbProject[] ps = getDependentKbProjects();
+ for (IKbProject p : ps) {
if(!p.getProject().isAccessible()) continue;
Element pathElement = XMLUtilities.createElement(usedElement, "project"); //$NON-NLS-1$
pathElement.setAttribute("name", p.getProject().getName()); //$NON-NLS-1$
@@ -682,7 +722,8 @@
if(usedBy.isEmpty()) return;
if(EclipseResourceUtil.isJar(source.toString())) return;
- for (KbProject p : usedBy) {
+ KbProject[] ps = getDependentKbProjects();
+ for (KbProject p : ps) {
p.resolve();
LoadedDeclarations ds1 = new LoadedDeclarations();
for (ITagLibrary f : ds.getLibraries()) {
@@ -722,7 +763,8 @@
if(usedBy.isEmpty()) return;
if(EclipseResourceUtil.isJar(source.toString())) return;
- for (KbProject p : usedBy) {
+ KbProject[] ps = getDependentKbProjects();
+ for (KbProject p : ps) {
p.resolve();
p.pathRemoved(source);
}
@@ -818,13 +860,11 @@
// Find existing KBNATURE problem marker and kill it if exists
IMarker[] markers = getOwnedMarkers(project);
if (markers != null && markers.length > 0) {
- for (IMarker m : markers) {
- try {
- project.deleteMarkers(KB_PROBLEM_MARKER_TYPE, true, IResource.DEPTH_ONE);
- project.setPersistentProperty(KbProjectFactory.NATURE_MOCK, null);
- } catch (CoreException ex) {
- WebKbPlugin.getDefault().logError(ex);
- }
+ try {
+ project.deleteMarkers(KB_PROBLEM_MARKER_TYPE, true, IResource.DEPTH_ONE);
+ project.setPersistentProperty(KbProjectFactory.NATURE_MOCK, null);
+ } catch (CoreException ex) {
+ WebKbPlugin.getDefault().logError(ex);
}
}
return true;
15 years, 10 months
JBoss Tools SVN: r22819 - 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: 2010-06-15 10:20:23 -0400 (Tue, 15 Jun 2010)
New Revision: 22819
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/KbProject.java
Log:
https://jira.jboss.org/browse/JBIDE-6372
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/KbProject.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/KbProject.java 2010-06-15 13:57:44 UTC (rev 22818)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/KbProject.java 2010-06-15 14:20:23 UTC (rev 22819)
@@ -156,7 +156,7 @@
*/
public void addKbProject(KbProject p) {
if(dependsOn.contains(p)) return;
- dependsOn.add(p);
+ addUsedKbProject(p);
p.addDependentKbProject(this);
if(!p.isStorageResolved) {
p.resolve();
@@ -187,17 +187,49 @@
* @param p
*/
public void addDependentKbProject(KbProject p) {
- usedBy.add(p);
+ synchronized (usedBy) {
+ usedBy.add(p);
+ }
}
+ void removeDependentKbProject(KbProject p) {
+ synchronized (usedBy) {
+ usedBy.remove(p);
+ }
+ }
+
+ KbProject[] getDependentKbProjects() {
+ synchronized (usedBy) {
+ return usedBy.toArray(new KbProject[0]);
+ }
+ }
+
+ void addUsedKbProject(KbProject p) {
+ synchronized (dependsOn) {
+ dependsOn.add(p);
+ }
+ }
+
+ void removeUsedKbProject(KbProject p) {
+ synchronized (dependsOn) {
+ dependsOn.remove(p);
+ }
+ }
+
+ KbProject[] getUsedKbProjects() {
+ synchronized (dependsOn) {
+ return dependsOn.toArray(new KbProject[0]);
+ }
+ }
+
/**
*
* @param p
*/
public void removeKbProject(KbProject p) {
if(!dependsOn.contains(p)) return;
- p.usedBy.remove(this);
- dependsOn.remove(p);
+ p.removeDependentKbProject(this);
+ removeUsedKbProject(p);
IPath[] ps = null;
synchronized(sourcePaths2) {
ps = sourcePaths2.keySet().toArray(new IPath[0]);
@@ -319,8 +351,12 @@
sourcePaths2.clear();
}
isStorageResolved = false;
- dependsOn.clear();
- usedBy.clear();
+ synchronized (dependsOn) {
+ dependsOn.clear();
+ }
+ synchronized (usedBy) {
+ usedBy.clear();
+ }
libraries.clear();
long begin = System.currentTimeMillis();
@@ -399,7 +435,7 @@
if(sp.isMock) {
addKbProject(sp);
} else {
- dependsOn.add(sp);
+ addUsedKbProject(sp);
sp.addDependentKbProject(this);
}
}
@@ -415,7 +451,9 @@
IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(p);
if(project == null || !project.isAccessible()) continue;
KbProject sp = (KbProject)KbProjectFactory.getKbProject(project, false);
- if(sp != null) usedBy.add(sp);
+ if(sp != null) {
+ addDependentKbProject(sp);
+ }
}
}
@@ -523,13 +561,15 @@
*/
private void storeProjectDependencies(Element root) {
Element dependsOnElement = XMLUtilities.createElement(root, "depends-on-projects"); //$NON-NLS-1$
- for (IKbProject p : dependsOn) {
+ KbProject[] ds = getUsedKbProjects();
+ for (IKbProject p : ds) {
if(!p.getProject().isAccessible()) continue;
Element pathElement = XMLUtilities.createElement(dependsOnElement, "project"); //$NON-NLS-1$
pathElement.setAttribute("name", p.getProject().getName()); //$NON-NLS-1$
}
Element usedElement = XMLUtilities.createElement(root, "used-by-projects"); //$NON-NLS-1$
- for (IKbProject p : usedBy) {
+ KbProject[] ps = getDependentKbProjects();
+ for (IKbProject p : ps) {
if(!p.getProject().isAccessible()) continue;
Element pathElement = XMLUtilities.createElement(usedElement, "project"); //$NON-NLS-1$
pathElement.setAttribute("name", p.getProject().getName()); //$NON-NLS-1$
@@ -682,7 +722,8 @@
if(usedBy.isEmpty()) return;
if(EclipseResourceUtil.isJar(source.toString())) return;
- for (KbProject p : usedBy) {
+ KbProject[] ps = getDependentKbProjects();
+ for (KbProject p : ps) {
p.resolve();
LoadedDeclarations ds1 = new LoadedDeclarations();
for (ITagLibrary f : ds.getLibraries()) {
@@ -722,7 +763,8 @@
if(usedBy.isEmpty()) return;
if(EclipseResourceUtil.isJar(source.toString())) return;
- for (KbProject p : usedBy) {
+ KbProject[] ps = getDependentKbProjects();
+ for (KbProject p : ps) {
p.resolve();
p.pathRemoved(source);
}
@@ -818,13 +860,11 @@
// Find existing KBNATURE problem marker and kill it if exists
IMarker[] markers = getOwnedMarkers(project);
if (markers != null && markers.length > 0) {
- for (IMarker m : markers) {
- try {
- project.deleteMarkers(KB_PROBLEM_MARKER_TYPE, true, IResource.DEPTH_ONE);
- project.setPersistentProperty(KbProjectFactory.NATURE_MOCK, null);
- } catch (CoreException ex) {
- WebKbPlugin.getDefault().logError(ex);
- }
+ try {
+ project.deleteMarkers(KB_PROBLEM_MARKER_TYPE, true, IResource.DEPTH_ONE);
+ project.setPersistentProperty(KbProjectFactory.NATURE_MOCK, null);
+ } catch (CoreException ex) {
+ WebKbPlugin.getDefault().logError(ex);
}
}
return true;
15 years, 10 months