JBoss Tools SVN: r10613 - trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/providers.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2008-10-01 15:07:54 -0400 (Wed, 01 Oct 2008)
New Revision: 10613
Modified:
trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/providers/ArchivesRootBridgeContentProvider.java
Log:
JBIDE-2649
Modified: trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/providers/ArchivesRootBridgeContentProvider.java
===================================================================
--- trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/providers/ArchivesRootBridgeContentProvider.java 2008-10-01 19:01:01 UTC (rev 10612)
+++ trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/providers/ArchivesRootBridgeContentProvider.java 2008-10-01 19:07:54 UTC (rev 10613)
@@ -34,8 +34,11 @@
}
public Object[] getChildren(Object parentElement) {
- if( parentElement instanceof IProject )
- return new Object[] { new WrappedProject((IProject)parentElement, WrappedProject.CATEGORY) };
+ if( parentElement instanceof IProject) {
+ if( ((IProject)parentElement).isOpen())
+ return new Object[] { new WrappedProject((IProject)parentElement, WrappedProject.CATEGORY) };
+ return new Object[]{};
+ }
return delegate.getChildren(parentElement);
}
15 years, 7 months
JBoss Tools SVN: r10612 - trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/providers.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2008-10-01 15:01:01 -0400 (Wed, 01 Oct 2008)
New Revision: 10612
Modified:
trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/providers/ArchivesContentProviderDelegate.java
Log:
JBIDE-2664 - NPE
Modified: trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/providers/ArchivesContentProviderDelegate.java
===================================================================
--- trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/providers/ArchivesContentProviderDelegate.java 2008-10-01 18:15:35 UTC (rev 10611)
+++ trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/providers/ArchivesContentProviderDelegate.java 2008-10-01 19:01:01 UTC (rev 10612)
@@ -93,7 +93,10 @@
// if currently loading, always send a delay
if( loadingProjects.contains(p))
return new Object[]{new DelayProxy(wp)};
-
+
+ if( !p.isOpen())
+ return new Object[]{};
+
if( ArchivesModel.instance().isProjectRegistered(p.getLocation()))
return ArchivesModel.instance().getRoot(p.getLocation()).getAllChildren();
if( ArchivesModel.instance().canReregister(p.getLocation())) {
@@ -125,7 +128,8 @@
}
protected boolean shouldRefreshProject() {
- if( viewerInUse == ProjectArchivesCommonView.getInstance().getCommonViewer() &&
+ if( ProjectArchivesCommonView.getInstance() != null &&
+ viewerInUse == ProjectArchivesCommonView.getInstance().getCommonViewer() &&
!PrefsInitializer.getBoolean(PrefsInitializer.PREF_SHOW_PROJECT_ROOT))
return true;
return false;
@@ -139,7 +143,9 @@
if( element instanceof IArchiveNode )
return getChildren(element).length > 0;
if( element instanceof IResource )
- return ArchivesModel.instance().canReregister(((IResource)element).getLocation());
+ return
+ ((IResource)element).getProject().isOpen() &&
+ ArchivesModel.instance().canReregister(((IResource)element).getLocation());
if( element == ArchivesRootContentProvider.NO_PROJECT)
return false;
if( element instanceof DelayProxy)
15 years, 7 months
JBoss Tools SVN: r10611 - in trunk/archives/plugins: org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/util/composites and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2008-10-01 14:15:35 -0400 (Wed, 01 Oct 2008)
New Revision: 10611
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/util/composites/ArchiveSourceDestinationComposite.java
Log:
JBIDE-2649
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 2008-10-01 18:03:21 UTC (rev 10610)
+++ trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/util/PathUtils.java 2008-10-01 18:15:35 UTC (rev 10611)
@@ -72,7 +72,7 @@
return new Path(translated).makeAbsolute().toString();
}
} catch( CoreException ce ) {
- ce.printStackTrace();
+ // ignore, just return null ce.printStackTrace();
}
return null;
}
Modified: trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/util/composites/ArchiveSourceDestinationComposite.java
===================================================================
--- trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/util/composites/ArchiveSourceDestinationComposite.java 2008-10-01 18:03:21 UTC (rev 10610)
+++ trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/util/composites/ArchiveSourceDestinationComposite.java 2008-10-01 18:15:35 UTC (rev 10611)
@@ -246,12 +246,10 @@
}
- String translated;
+ String translated=""; //$NON-NLS-1$
Image img=null;
try {
- if( destinationNode != null ) {
- translated=""; img=null; //$NON-NLS-1$
- } else {
+ if( destinationNode == null ) {
translated = getTranslatedGlobalPath();
if( translated == null || !new Path(translated).toFile().exists()) {
translated= NLS.bind(ArchivesUIMessages.PathDoesNotExistInFilesystem,translated);
@@ -269,6 +267,7 @@
} else if( ce.getStatus().getSeverity() == IStatus.WARNING)
img = PlatformUI.getWorkbench().getSharedImages().getImage(ISharedImages.IMG_OBJS_WARN_TSK);
}
+
translatedPathImage.setImage(img);
translatedPath.setText(translated);
fireChange();
@@ -281,11 +280,11 @@
if( workspaceRelative ) {
IPath p = ArchivesCore.getInstance().getVFS().workspacePathToAbsolutePath(new Path(postSub));
if( p != null ) return p.toString();
- return NLS.bind(postSub, ArchivesUIMessages.ErrorConvertingPaths);
+ return NLS.bind(ArchivesUIMessages.ErrorConvertingPaths, postSub);
}
return postSub;
} catch( CoreException e ) {
- return NLS.bind(e.getMessage(), ArchivesUIMessages.ErrorStringSubstitution);
+ return NLS.bind(ArchivesUIMessages.ErrorStringSubstitution, e.getMessage());
}
}
@@ -294,12 +293,12 @@
try {
IPath p = PathUtils.getGlobalLocation(path, projectName, workspaceRelative, getDescriptorVersion());
if( p != null ) return p.toString();
- String ERROR = NLS.bind(p.toOSString(), ArchivesUIMessages.ErrorConvertingPaths);
+ String ERROR = NLS.bind(ArchivesUIMessages.ErrorConvertingPaths, path);
Status s = new Status(IStatus.WARNING, PackagesUIPlugin.PLUGIN_ID, ERROR);
throw new CoreException(s);
} catch( CoreException e ) {
- String ERROR = NLS.bind(e.getMessage(), ArchivesUIMessages.ErrorStringSubstitution);
+ String ERROR = NLS.bind(ArchivesUIMessages.ErrorStringSubstitution, e.getMessage());
Status s = new Status(IStatus.ERROR, PackagesUIPlugin.PLUGIN_ID, ERROR, e);
throw new CoreException(s);
}
15 years, 7 months
JBoss Tools SVN: r10610 - in trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui: util/composites and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2008-10-01 14:03:21 -0400 (Wed, 01 Oct 2008)
New Revision: 10610
Modified:
trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/ArchivesUIMessages.java
trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/ArchivesUIMessages.properties
trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/util/composites/ArchiveSourceDestinationComposite.java
Log:
JBIDE-2649
Modified: trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/ArchivesUIMessages.java
===================================================================
--- trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/ArchivesUIMessages.java 2008-10-01 17:46:06 UTC (rev 10609)
+++ trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/ArchivesUIMessages.java 2008-10-01 18:03:21 UTC (rev 10610)
@@ -23,8 +23,9 @@
public static String Filesystem;
public static String Workspace;
public static String Variables;
- public static String WorkspaceRelative;
- public static String FilesystemRelative;
+ public static String Workspace2;
+ public static String Filesystem2;
+ public static String RelativeTo;
public static String PathDoesNotExistInFilesystem;
public static String ErrorConvertingPaths;
public static String ErrorStringSubstitution;
Modified: trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/ArchivesUIMessages.properties
===================================================================
--- trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/ArchivesUIMessages.properties 2008-10-01 17:46:06 UTC (rev 10609)
+++ trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/ArchivesUIMessages.properties 2008-10-01 18:03:21 UTC (rev 10610)
@@ -8,8 +8,9 @@
Filesystem=Filesystem...
Workspace=Workspace...
Variables=Variables...
-WorkspaceRelative=Workspace Relative
-FilesystemRelative=Filesystem Relative
+RelativeTo=Relative to
+Workspace2=workspace
+Filesystem2=file system
PathDoesNotExistInFilesystem={0} does not exist in the filesystem
ErrorConvertingPaths=Unable to convert workspace path into global path: {0}
ErrorStringSubstitution=Error during string substitution: {0}
Modified: trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/util/composites/ArchiveSourceDestinationComposite.java
===================================================================
--- trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/util/composites/ArchiveSourceDestinationComposite.java 2008-10-01 17:46:06 UTC (rev 10609)
+++ trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/util/composites/ArchiveSourceDestinationComposite.java 2008-10-01 18:03:21 UTC (rev 10610)
@@ -60,7 +60,7 @@
*/
public class ArchiveSourceDestinationComposite extends Composite {
private Text text;
- private Label pathImage, translatedPath, translatedPathImage;
+ private Label pathImage, translatedPath, translatedPathImage, relativeTo;
private Button workspaceButton, filesystemButton, variablesButton,
wsRadioButton, fsRadioButton;
@@ -94,6 +94,7 @@
variablesButton = new Button(this, SWT.PUSH);
wsRadioButton = new Button(this, SWT.RADIO);
fsRadioButton = new Button(this, SWT.RADIO);
+ relativeTo = new Label(this, SWT.NONE);
}
protected void layoutWidgets() {
@@ -104,6 +105,7 @@
variablesButton.setLayoutData(createFormData(text,5,null,0,null,0,workspaceButton,-5));
fsRadioButton.setLayoutData(createFormData(text,5,null,0,null,0,variablesButton,-5));
wsRadioButton.setLayoutData(createFormData(text,5,null,0,null,0,fsRadioButton,-5));
+ relativeTo.setLayoutData(createFormData(text,8,null,0,null,0,wsRadioButton,-5));
translatedPathImage.setLayoutData(createFormData(filesystemButton,5,null,0,0,0,0,20));
translatedPath.setLayoutData(createFormData(filesystemButton,5,null,0,translatedPathImage,5,100,-5));
}
@@ -112,8 +114,9 @@
filesystemButton.setText(ArchivesUIMessages.Filesystem);
workspaceButton.setText(ArchivesUIMessages.Workspace);
variablesButton.setText(ArchivesUIMessages.Variables);
- wsRadioButton.setText(ArchivesUIMessages.WorkspaceRelative);
- fsRadioButton.setText(ArchivesUIMessages.FilesystemRelative);
+ wsRadioButton.setText(ArchivesUIMessages.Workspace2);
+ fsRadioButton.setText(ArchivesUIMessages.Filesystem2);
+ relativeTo.setText(ArchivesUIMessages.RelativeTo);
pathImage.setImage(PlatformUI.getWorkbench().getSharedImages().getImage(ISharedImages.IMG_OBJ_FOLDER));
FontData[] translatedPathData = translatedPath.getFont().getFontData();
for( int i = 0; i < translatedPathData.length; i++ )
@@ -251,7 +254,7 @@
} else {
translated = getTranslatedGlobalPath();
if( translated == null || !new Path(translated).toFile().exists()) {
- translated= NLS.bind(translated, ArchivesUIMessages.PathDoesNotExistInFilesystem);
+ translated= NLS.bind(ArchivesUIMessages.PathDoesNotExistInFilesystem,translated);
img = PlatformUI.getWorkbench().getSharedImages().getImage(ISharedImages.IMG_OBJS_WARN_TSK);
} else {
img = null;
15 years, 7 months
JBoss Tools SVN: r10609 - trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2008-10-01 13:46:06 -0400 (Wed, 01 Oct 2008)
New Revision: 10609
Modified:
trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/plugin.xml
Log:
JBIDE-2650 "Project Archives" in project explorer should show up above resources
Modified: trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/plugin.xml
===================================================================
--- trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/plugin.xml 2008-10-01 17:11:06 UTC (rev 10608)
+++ trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/plugin.xml 2008-10-01 17:46:06 UTC (rev 10609)
@@ -148,7 +148,7 @@
id="org.jboss.ide.eclipse.archives.ui.archivesRootBridgeContent"
labelProvider="org.jboss.ide.eclipse.archives.ui.providers.ArchivesLabelProvider"
name="Project Archives"
- priority="lower">
+ priority="highest">
<triggerPoints>
<instanceof
value="org.eclipse.core.resources.IProject">
15 years, 7 months
JBoss Tools SVN: r10608 - in trunk: tests/features/org.jboss.tools.test.feature and 4 other directories.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2008-10-01 13:11:06 -0400 (Wed, 01 Oct 2008)
New Revision: 10608
Added:
trunk/tests/tests/org.jboss.tools.test/src/org/jboss/tools/test/util/JobUtils.java
Modified:
trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/project/facet/AbstractSeamFacetTest.java
trunk/tests/features/org.jboss.tools.test.feature/feature.xml
trunk/ws/tests/org.jboss.tools.ws.core.test/META-INF/MANIFEST.MF
trunk/ws/tests/org.jboss.tools.ws.core.test/build.properties
trunk/ws/tests/org.jboss.tools.ws.core.test/src/org/jboss/tools/ws/core/test/command/AbstractJBossWSCommandTest.java
Log:
ws tests included in build.
ws dearDown() changed to avoid hanging during removing test projects from workspace: disabling Auto Build and waiting for background activities is ended after removing the project.
Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/project/facet/AbstractSeamFacetTest.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/project/facet/AbstractSeamFacetTest.java 2008-10-01 16:19:23 UTC (rev 10607)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/project/facet/AbstractSeamFacetTest.java 2008-10-01 17:11:06 UTC (rev 10608)
@@ -27,6 +27,7 @@
import org.jboss.tools.seam.core.project.facet.SeamVersion;
import org.jboss.tools.seam.internal.core.project.facet.ISeamFacetDataModelProperties;
import org.jboss.tools.seam.internal.core.project.facet.SeamFacetInstallDataModelProvider;
+import org.jboss.tools.test.util.JobUtils;
import org.jboss.tools.test.util.ResourcesUtils;
import org.jboss.tools.test.util.xpl.EditorTestHelper;
@@ -107,15 +108,12 @@
try {
oldAutoBuilding = ResourcesUtils.setBuildAutomatically(false);
ResourcesPlugin.getWorkspace().getRoot().refreshLocal(IResource.DEPTH_INFINITE, null);
- waitForIdle();
+ JobUtils.waitForIdle();
for (IResource r : this.resourcesToCleanup) {
try {
- //System.out.println("Deleting " + r);
- //r.getProject().close(null);
r.delete(true, null);
- waitForIdle();
+ JobUtils.waitForIdle();
} catch(Exception e) {
- System.out.println("Error deleting " + r);
e.printStackTrace();
last = e;
}
@@ -131,19 +129,6 @@
if(last!=null) throw last;
}
- public static void waitForIdle() {
- long start = System.currentTimeMillis();
- // Job.getJobManager().isIdle() is more efficient than EditorTestHelper.allJobsQuiet()
- // EditorTestHelper.allJobsQuiet() isn't thread-safe
- // https://bugs.eclipse.org/bugs/show_bug.cgi?id=198241 is fixed
- //while (!EditorTestHelper.allJobsQuiet()) {
- while (!Job.getJobManager().isIdle()) {
- delay(500);
- if ( (System.currentTimeMillis()-start) > MAX_IDLE )
- throw new RuntimeException("A long running task detected"); //$NON-NLS-1$
- }
- }
-
protected final void addResourceToCleanup(final IResource resource) {
this.resourcesToCleanup.add(resource);
}
@@ -270,24 +255,4 @@
}
- public static void delay(long waitTimeMillis) {
- Display display = Display.getCurrent();
- if (display != null) {
- long endTimeMillis = System.currentTimeMillis() + waitTimeMillis;
- while (System.currentTimeMillis() < endTimeMillis) {
- if (!display.readAndDispatch())
- display.sleep();
- }
- display.update();
- }
- // Otherwise, perform a simple sleep.
- else {
- try {
- Thread.sleep(waitTimeMillis);
- } catch (InterruptedException e) {
- // Ignored.
- }
- }
- }
-
}
\ No newline at end of file
Modified: trunk/tests/features/org.jboss.tools.test.feature/feature.xml
===================================================================
--- trunk/tests/features/org.jboss.tools.test.feature/feature.xml 2008-10-01 16:19:23 UTC (rev 10607)
+++ trunk/tests/features/org.jboss.tools.test.feature/feature.xml 2008-10-01 17:11:06 UTC (rev 10608)
@@ -381,4 +381,17 @@
install-size="0"
version="0.0.0"/>
+ <plugin
+ id="org.jboss.tools.ws.core.test"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"/>
+
+ <plugin
+ id="org.jboss.tools.ws.ui.test"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
</feature>
Added: trunk/tests/tests/org.jboss.tools.test/src/org/jboss/tools/test/util/JobUtils.java
===================================================================
--- trunk/tests/tests/org.jboss.tools.test/src/org/jboss/tools/test/util/JobUtils.java (rev 0)
+++ trunk/tests/tests/org.jboss.tools.test/src/org/jboss/tools/test/util/JobUtils.java 2008-10-01 17:11:06 UTC (rev 10608)
@@ -0,0 +1,57 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is 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:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+
+package org.jboss.tools.test.util;
+
+import org.eclipse.core.runtime.jobs.Job;
+import org.eclipse.swt.widgets.Display;
+
+/**
+ * @author eskimo
+ *
+ */
+public class JobUtils {
+
+ private static final long MAX_IDLE = 30*60*1000L;
+
+ public static void waitForIdle() {
+ long start = System.currentTimeMillis();
+ // Job.getJobManager().isIdle() is more efficient than EditorTestHelper.allJobsQuiet()
+ // EditorTestHelper.allJobsQuiet() isn't thread-safe
+ // https://bugs.eclipse.org/bugs/show_bug.cgi?id=198241 is fixed
+ //while (!EditorTestHelper.allJobsQuiet()) {
+ while (!Job.getJobManager().isIdle()) {
+ delay(500);
+ if ( (System.currentTimeMillis()-start) > MAX_IDLE )
+ throw new RuntimeException("A long running task detected"); //$NON-NLS-1$
+ }
+ }
+
+ public static void delay(long waitTimeMillis) {
+ Display display = Display.getCurrent();
+ if (display != null) {
+ long endTimeMillis = System.currentTimeMillis() + waitTimeMillis;
+ while (System.currentTimeMillis() < endTimeMillis) {
+ if (!display.readAndDispatch())
+ display.sleep();
+ }
+ display.update();
+ }
+ // Otherwise, perform a simple sleep.
+ else {
+ try {
+ Thread.sleep(waitTimeMillis);
+ } catch (InterruptedException e) {
+ // Ignored.
+ }
+ }
+ }
+}
Property changes on: trunk/tests/tests/org.jboss.tools.test/src/org/jboss/tools/test/util/JobUtils.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
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 2008-10-01 16:19:23 UTC (rev 10607)
+++ trunk/ws/tests/org.jboss.tools.ws.core.test/META-INF/MANIFEST.MF 2008-10-01 17:11:06 UTC (rev 10608)
@@ -1,6 +1,6 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
-Bundle-Name: Test Plug-in
+Bundle-Name: WS Test Plug-in
Bundle-SymbolicName: org.jboss.tools.ws.core.test
Bundle-Version: 1.0.0
Bundle-Activator: org.jboss.tools.ws.core.test.Activator
@@ -31,3 +31,7 @@
org.eclipse.ui.console;bundle-version="3.3.0",
org.eclipse.jface.text;bundle-version="3.4.0"
Bundle-ActivationPolicy: lazy
+Bundle-ClassPath: ws-core-test.jar
+Export-Package: org.jboss.tools.ws.core.test,
+ org.jboss.tools.ws.core.test.classpath,
+ org.jboss.tools.ws.core.test.command
Modified: trunk/ws/tests/org.jboss.tools.ws.core.test/build.properties
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.core.test/build.properties 2008-10-01 16:19:23 UTC (rev 10607)
+++ trunk/ws/tests/org.jboss.tools.ws.core.test/build.properties 2008-10-01 17:11:06 UTC (rev 10608)
@@ -1,4 +1,6 @@
-source.. = src/
-output.. = bin/
+source.ws-core-test.jar = src/
+output.ws-core-test.jar = bin/
bin.includes = META-INF/,\
- .
+ ws-core-test.jar,\
+ projects/
+source.ws-core-test.jar = src/
Modified: trunk/ws/tests/org.jboss.tools.ws.core.test/src/org/jboss/tools/ws/core/test/command/AbstractJBossWSCommandTest.java
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.core.test/src/org/jboss/tools/ws/core/test/command/AbstractJBossWSCommandTest.java 2008-10-01 16:19:23 UTC (rev 10607)
+++ trunk/ws/tests/org.jboss.tools.ws.core.test/src/org/jboss/tools/ws/core/test/command/AbstractJBossWSCommandTest.java 2008-10-01 17:11:06 UTC (rev 10608)
@@ -58,6 +58,8 @@
import org.jboss.ide.eclipse.as.core.server.internal.JBossServerBehavior;
import org.jboss.tools.common.test.util.TestProjectProvider;
import org.jboss.tools.test.util.JUnitUtils;
+import org.jboss.tools.test.util.JobUtils;
+import org.jboss.tools.test.util.ResourcesUtils;
import org.jboss.tools.test.util.xpl.EditorTestHelper;
import org.jboss.tools.ws.creation.core.data.ServiceModel;
@@ -69,8 +71,9 @@
protected static final int DEFAULT_SHUTDOWN_TIME = 90000;
protected static final String JBOSSWS_HOME_DEFAULT = "D:/softinstall/jboss-4.2.2.GA/jboss-4.2.2.GA";
+ public static final String JBOSSWS_42_HOME="jbosstools.test.jboss.home.4.2";
public static final String JBOSS_RUNTIME_42 = "org.jboss.ide.eclipse.as.runtime.42";
- public static final String JBOSS_AS_42_HOME = System.getProperty(JBOSS_RUNTIME_42, JBOSSWS_HOME_DEFAULT);
+ public static final String JBOSS_AS_42_HOME = System.getProperty(JBOSSWS_42_HOME, JBOSSWS_HOME_DEFAULT);
public static final String JBOSS_SERVER_42 = "org.jboss.ide.eclipse.as.42";
protected final Set<IResource> resourcesToCleanup = new HashSet<IResource>();
@@ -126,20 +129,27 @@
undeployWebProject();
- EditorTestHelper.joinBackgroundActivities();
- EditorTestHelper.runEventQueue(3000);
- Exception last = null;
- for (IResource r : this.resourcesToCleanup) {
- try {
- System.out.println("Deleting " + r);
- r.delete(true, null);
- } catch(Exception e) {
- System.out.println("Error deleting " + r);
- e.printStackTrace();
- last = e;
+ boolean oldAutoBuilding = ResourcesUtils.setBuildAutomatically(false);
+ Exception last = null;
+
+ try {
+ JobUtils.waitForIdle();
+
+ for (IResource r : this.resourcesToCleanup) {
+ try {
+ System.out.println("Deleting " + r);
+ r.delete(true, null);
+ JobUtils.waitForIdle();
+ } catch(Exception e) {
+ System.out.println("Error deleting " + r);
+ e.printStackTrace();
+ last = e;
+ }
}
- }
-
+ } finally {
+ ResourcesUtils.setBuildAutomatically(oldAutoBuilding);
+ }
+
if(last!=null) throw last;
resourcesToCleanup.clear();
@@ -259,9 +269,9 @@
protected File getJBossWSHomeFolder() {
- String jbosshome = System.getProperty(JBOSS_RUNTIME_42, JBOSSWS_HOME_DEFAULT);
+ String jbosshome = System.getProperty(JBOSSWS_42_HOME, JBOSSWS_HOME_DEFAULT);
File runtimelocation = new File(jbosshome);
- assertTrue("Please set JBoss EAP Home in system property:" + JBOSS_RUNTIME_42, runtimelocation.exists());
+ assertTrue("Please set JBoss EAP Home in system property:" + JBOSSWS_42_HOME, runtimelocation.exists());
String cmdFileLocation = jbosshome + File.separator + "bin" + File.separator + "wsconsume.sh";
assertTrue(jbosshome + " is not a valid jboss EAP home", new File(cmdFileLocation).exists());
15 years, 7 months
JBoss Tools SVN: r10607 - trunk/birt/docs/en/images/BirtSupport.
by jbosstools-commits＠lists.jboss.org
Author: abogachuk
Date: 2008-10-01 12:19:23 -0400 (Wed, 01 Oct 2008)
New Revision: 10607
Added:
trunk/birt/docs/en/images/BirtSupport/09NewDataSource.png
trunk/birt/docs/en/images/BirtSupport/10NewSampleDateSource.png
Log:
Added: trunk/birt/docs/en/images/BirtSupport/09NewDataSource.png
===================================================================
(Binary files differ)
Property changes on: trunk/birt/docs/en/images/BirtSupport/09NewDataSource.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/birt/docs/en/images/BirtSupport/10NewSampleDateSource.png
===================================================================
(Binary files differ)
Property changes on: trunk/birt/docs/en/images/BirtSupport/10NewSampleDateSource.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
15 years, 7 months
JBoss Tools SVN: r10606 - trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/bundle.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2008-10-01 11:58:20 -0400 (Wed, 01 Oct 2008)
New Revision: 10606
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/bundle/BundleMap.java
Log:
JBIDE-1497.
Refactoring
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/bundle/BundleMap.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/bundle/BundleMap.java 2008-10-01 15:47:20 UTC (rev 10605)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/bundle/BundleMap.java 2008-10-01 15:58:20 UTC (rev 10606)
@@ -42,6 +42,7 @@
import org.jboss.tools.common.el.core.model.ELUtil;
import org.jboss.tools.common.el.core.parser.ELParser;
import org.jboss.tools.common.el.core.parser.ELParserFactory;
+import org.jboss.tools.common.el.core.parser.ELParserUtil;
import org.jboss.tools.common.model.XModel;
import org.jboss.tools.common.model.event.XModelTreeEvent;
import org.jboss.tools.common.model.event.XModelTreeListener;
@@ -346,7 +347,7 @@
}
private List<ELInstance> parseJSFExpression(String expression){
- ELParser parser = ELParserFactory.createDefaultParser();
+ ELParser parser = ELParserUtil.getDefaultFactory().createParser();
ELModel model = parser.parse(expression);
List<ELInstance> is = model.getInstances();
return is;
15 years, 7 months
JBoss Tools SVN: r10605 - trunk/birt/docs/en/images/BirtSupport.
by jbosstools-commits＠lists.jboss.org
Author: abogachuk
Date: 2008-10-01 11:47:20 -0400 (Wed, 01 Oct 2008)
New Revision: 10605
Added:
trunk/birt/docs/en/images/BirtSupport/08DataSource.png
Log:
https://jira.jboss.org/jira/browse/JBDS-388 - new image added
Added: trunk/birt/docs/en/images/BirtSupport/08DataSource.png
===================================================================
(Binary files differ)
Property changes on: trunk/birt/docs/en/images/BirtSupport/08DataSource.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
15 years, 7 months
JBoss Tools SVN: r10604 - trunk/jsf/docs/userguide/en/modules.
by jbosstools-commits＠lists.jboss.org
Author: smukhina
Date: 2008-10-01 11:36:13 -0400 (Wed, 01 Oct 2008)
New Revision: 10604
Modified:
trunk/jsf/docs/userguide/en/modules/Visual_Web_Tools.xml
Log:
https://jira.jboss.org/jira/browse/JBDS-359
text alignment in first chapter table is corrected
Modified: trunk/jsf/docs/userguide/en/modules/Visual_Web_Tools.xml
===================================================================
--- trunk/jsf/docs/userguide/en/modules/Visual_Web_Tools.xml 2008-10-01 15:35:28 UTC (rev 10603)
+++ trunk/jsf/docs/userguide/en/modules/Visual_Web_Tools.xml 2008-10-01 15:36:13 UTC (rev 10604)
@@ -54,7 +54,7 @@
<colspec colnum="1" align="left" colwidth="2*"/>
<colspec colnum="2" colwidth="4*"/>
- <colspec colnum="3" colwidth="2*"/>
+ <colspec colnum="3" colwidth="2*" align="left" />
<thead>
<row>
15 years, 7 months