April 2010 - jbosstools-commits - Jboss List Archives

JBoss Tools SVN: r21684 - in branches/jbosstools-3.1.x/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common: model/ui/editor and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: scabanovich Date: 2010-04-26 08:02:03 -0400 (Mon, 26 Apr 2010) New Revision: 21684 Modified: branches/jbosstools-3.1.x/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/core/resources/XModelObjectEditorInput.java branches/jbosstools-3.1.x/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/core/resources/XModelObjectEditorInputFactory.java branches/jbosstools-3.1.x/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/editor/ModelObjectStorageEditorInput.java Log: https://jira.jboss.org/jira/browse/JBIDE-5854 Modified: branches/jbosstools-3.1.x/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/core/resources/XModelObjectEditorInput.java =================================================================== --- branches/jbosstools-3.1.x/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/core/resources/XModelObjectEditorInput.java 2010-04-26 11:56:32 UTC (rev 21683) +++ branches/jbosstools-3.1.x/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/core/resources/XModelObjectEditorInput.java 2010-04-26 12:02:03 UTC (rev 21684) @@ -12,23 +12,23 @@ import java.io.File; import java.lang.reflect.Field; -import java.net.MalformedURLException; import java.net.URI; -import java.net.URL; import org.eclipse.core.resources.*; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.Path; +import org.eclipse.jdt.core.IJarEntryResource; +import org.eclipse.jdt.core.IJavaProject; import org.eclipse.jdt.core.IPackageFragment; -import org.eclipse.jdt.internal.core.JarEntryFile; -import org.eclipse.jdt.internal.core.JarEntryResource; +import org.eclipse.jdt.core.IPackageFragmentRoot; import org.eclipse.jdt.internal.ui.javaeditor.JarEntryEditorInput; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.ui.*; import org.eclipse.ui.editors.text.ILocationProvider; import org.eclipse.ui.internal.part.NullEditorInput; import org.eclipse.ui.part.FileEditorInput; +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.filesystems.impl.*; @@ -217,35 +217,48 @@ private static IEditorInput convertStorageEditorInput(IStorageEditorInput input) { if(input instanceof JarEntryEditorInput) { + IProject project = null; JarEntryEditorInput j = (JarEntryEditorInput)input; - JarEntryFile file = (JarEntryFile)j.getStorage(); - String jarFile = file.getPackageFragmentRoot().getPath().toString(); - String entry = file.getName(); - JarEntryResource r = file; - while(r != null && r.getParent() instanceof JarEntryResource) { - r = (JarEntryResource)r.getParent(); - entry = r.getName() + "/" + entry; - } - if(r != null && r.getParent() instanceof IPackageFragment) { - IPackageFragment pf = (IPackageFragment)r.getParent(); - while(pf != null) { - String p = pf.getElementName(); - entry = p + "/" + entry; - if(pf.getParent() instanceof IPackageFragment) { - pf = (IPackageFragment)pf.getParent(); - } else { - pf = null; + if(j.getStorage() instanceof IJarEntryResource) { + IJarEntryResource file = (IJarEntryResource)j.getStorage(); + String jarFile = file.getPackageFragmentRoot().getPath().toString(); + if(file.getPackageFragmentRoot().getResource() != null) { + jarFile = file.getPackageFragmentRoot().getResource().getLocation().toString(); + } + String entry = file.getName(); + IJarEntryResource r = file; + while(r != null && r.getParent() instanceof IJarEntryResource) { + r = (IJarEntryResource)r.getParent(); + entry = r.getName() + "/" + entry; + } + if(r != null && r.getParent() instanceof IPackageFragment) { + IPackageFragment pf = (IPackageFragment)r.getParent(); + IJavaProject jp = pf.getJavaProject(); + if(jp != null) project = jp.getProject(); + while(pf != null) { + String p = pf.getElementName(); + entry = p + "/" + entry; + if(pf.getParent() instanceof IPackageFragment) { + pf = (IPackageFragment)pf.getParent(); + } else { + pf = null; + } } + } else if(r != null && r.getPackageFragmentRoot() != null) { + IPackageFragmentRoot root = r.getPackageFragmentRoot(); + if(root.getJavaProject() != null) { + project = root.getJavaProject().getProject(); + } } + IEditorInput result = createJarEntryEditorInput(project, jarFile, entry); + if(result != null) return result; } - IEditorInput result = createJarEntryEditorInput(jarFile, entry); - if(result != null) return result; } String[] entryInfo = parseJarEntryFileInput(input); if(entryInfo == null) return input; String jarFile = entryInfo[0]; String entry = entryInfo[1]; - IEditorInput result = createJarEntryEditorInput(jarFile, entry); + IEditorInput result = createJarEntryEditorInput(null, jarFile, entry); return (result == null || result instanceof NullEditorInput) ? input : result; } @@ -271,19 +284,37 @@ return new String[]{jarFile, entry}; } - public static XModelObject getJarEntryObject(String jarFile, String entry) { - IFile f = EclipseResourceUtil.getFile(jarFile); - if(f == null) return null; - IProject p = f.getProject(); + public static XModelObject getJarEntryObject(IProject p, String jarFile, String entry) { + if(p == null) { + IFile f = EclipseResourceUtil.getFile(jarFile); + if(f == null) return null; + p = f.getProject(); + } + if(p == null) return null; IModelNature n = EclipseResourceUtil.getModelNature(p); - if(n == null) return null; - XModelObject[] fs = FileSystemsHelper.getFileSystems(n.getModel()).getChildren(); + XModel model = null; + if(n != null) { + model = n.getModel(); + } else { + XModelObject o = EclipseResourceUtil.createObjectForResource(p); + if(o != null) model = o.getModel(); + } + if(model == null) return null; + XModelObject[] fs = FileSystemsHelper.getFileSystems(model).getChildren(); for (XModelObject s: fs) { if(s instanceof JarSystemImpl) { JarSystemImpl j = (JarSystemImpl)s; String loc = j.getLocation(); if(new File(loc).equals(new File(jarFile))) { XModelObject result = s.getChildByPath(entry); + if(result == null && entry != null) { + int q = entry.indexOf('/'); + int d = entry.indexOf('.'); + if(q > d && d >= 0) { + String entry1 = entry.substring(0, q).replace('.', '/') + entry.substring(q); + result = s.getChildByPath(entry1); + } + } if(result != null) return result; } } @@ -291,8 +322,8 @@ return (n == null) ? null : n.getModel().getByPath("/" + entry); //$NON-NLS-1$ } - public static IEditorInput createJarEntryEditorInput(String jarFile, final String entry) { - XModelObject o = getJarEntryObject(jarFile, entry); + public static IEditorInput createJarEntryEditorInput(IProject project, String jarFile, final String entry) { + XModelObject o = getJarEntryObject(project, jarFile, entry); if(o != null) return new ModelObjectJarEntryEditorInput(o, jarFile, entry); return XModelObjectEditorInputFactory.createNullEditorInput(entry); } Modified: branches/jbosstools-3.1.x/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/core/resources/XModelObjectEditorInputFactory.java =================================================================== --- branches/jbosstools-3.1.x/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/core/resources/XModelObjectEditorInputFactory.java 2010-04-26 11:56:32 UTC (rev 21683) +++ branches/jbosstools-3.1.x/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/core/resources/XModelObjectEditorInputFactory.java 2010-04-26 12:02:03 UTC (rev 21684) @@ -68,9 +68,10 @@ } } } else if(memento.getString(TAG_ENTRY) != null) { + IProject project = (IProject)ResourcesPlugin.getWorkspace().getRoot().findMember(new Path(projectPath)); String fileLocation = memento.getString(TAG_FILE_LOCATION); String entry = memento.getString(TAG_ENTRY); - return XModelObjectEditorInput.createJarEntryEditorInput(fileLocation, entry); + return XModelObjectEditorInput.createJarEntryEditorInput(project, fileLocation, entry); } else { IProject project = (IProject)ResourcesPlugin.getWorkspace().getRoot().findMember(new Path(projectPath)); String objectPath = memento.getString(TAG_PATH); Modified: branches/jbosstools-3.1.x/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/editor/ModelObjectStorageEditorInput.java =================================================================== --- branches/jbosstools-3.1.x/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/editor/ModelObjectStorageEditorInput.java 2010-04-26 11:56:32 UTC (rev 21683) +++ branches/jbosstools-3.1.x/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/editor/ModelObjectStorageEditorInput.java 2010-04-26 12:02:03 UTC (rev 21684) @@ -183,7 +183,7 @@ } String[] entryInfo = XModelObjectEditorInput.parseJarEntryFileInput((IStorageEditorInput)o); if(entryInfo == null) return false; - XModelObject mo = XModelObjectEditorInput.getJarEntryObject(entryInfo[0], entryInfo[1]); + XModelObject mo = XModelObjectEditorInput.getJarEntryObject(null, entryInfo[0], entryInfo[1]); return mo != null && mo.equals(object); } return false;

14 years, 8 months

1
0
0 / 0

JBoss Tools SVN: r21683 - in trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common: model/ui/editor and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: scabanovich Date: 2010-04-26 07:56:32 -0400 (Mon, 26 Apr 2010) New Revision: 21683 Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/core/resources/XModelObjectEditorInput.java trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/core/resources/XModelObjectEditorInputFactory.java trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/editor/ModelObjectStorageEditorInput.java Log: https://jira.jboss.org/jira/browse/JBIDE-5854 Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/core/resources/XModelObjectEditorInput.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/core/resources/XModelObjectEditorInput.java 2010-04-26 09:21:21 UTC (rev 21682) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/core/resources/XModelObjectEditorInput.java 2010-04-26 11:56:32 UTC (rev 21683) @@ -12,23 +12,23 @@ import java.io.File; import java.lang.reflect.Field; -import java.net.MalformedURLException; import java.net.URI; -import java.net.URL; import org.eclipse.core.resources.*; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.Path; +import org.eclipse.jdt.core.IJarEntryResource; +import org.eclipse.jdt.core.IJavaProject; import org.eclipse.jdt.core.IPackageFragment; -import org.eclipse.jdt.internal.core.JarEntryFile; -import org.eclipse.jdt.internal.core.JarEntryResource; +import org.eclipse.jdt.core.IPackageFragmentRoot; import org.eclipse.jdt.internal.ui.javaeditor.JarEntryEditorInput; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.ui.*; import org.eclipse.ui.editors.text.ILocationProvider; import org.eclipse.ui.internal.part.NullEditorInput; import org.eclipse.ui.part.FileEditorInput; +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.filesystems.impl.*; @@ -217,35 +217,48 @@ private static IEditorInput convertStorageEditorInput(IStorageEditorInput input) { if(input instanceof JarEntryEditorInput) { + IProject project = null; JarEntryEditorInput j = (JarEntryEditorInput)input; - JarEntryFile file = (JarEntryFile)j.getStorage(); - String jarFile = file.getPackageFragmentRoot().getPath().toString(); - String entry = file.getName(); - JarEntryResource r = file; - while(r != null && r.getParent() instanceof JarEntryResource) { - r = (JarEntryResource)r.getParent(); - entry = r.getName() + "/" + entry; - } - if(r != null && r.getParent() instanceof IPackageFragment) { - IPackageFragment pf = (IPackageFragment)r.getParent(); - while(pf != null) { - String p = pf.getElementName(); - entry = p + "/" + entry; - if(pf.getParent() instanceof IPackageFragment) { - pf = (IPackageFragment)pf.getParent(); - } else { - pf = null; + if(j.getStorage() instanceof IJarEntryResource) { + IJarEntryResource file = (IJarEntryResource)j.getStorage(); + String jarFile = file.getPackageFragmentRoot().getPath().toString(); + if(file.getPackageFragmentRoot().getResource() != null) { + jarFile = file.getPackageFragmentRoot().getResource().getLocation().toString(); + } + String entry = file.getName(); + IJarEntryResource r = file; + while(r != null && r.getParent() instanceof IJarEntryResource) { + r = (IJarEntryResource)r.getParent(); + entry = r.getName() + "/" + entry; + } + if(r != null && r.getParent() instanceof IPackageFragment) { + IPackageFragment pf = (IPackageFragment)r.getParent(); + IJavaProject jp = pf.getJavaProject(); + if(jp != null) project = jp.getProject(); + while(pf != null) { + String p = pf.getElementName(); + entry = p + "/" + entry; + if(pf.getParent() instanceof IPackageFragment) { + pf = (IPackageFragment)pf.getParent(); + } else { + pf = null; + } } + } else if(r != null && r.getPackageFragmentRoot() != null) { + IPackageFragmentRoot root = r.getPackageFragmentRoot(); + if(root.getJavaProject() != null) { + project = root.getJavaProject().getProject(); + } } + IEditorInput result = createJarEntryEditorInput(project, jarFile, entry); + if(result != null) return result; } - IEditorInput result = createJarEntryEditorInput(jarFile, entry); - if(result != null) return result; } String[] entryInfo = parseJarEntryFileInput(input); if(entryInfo == null) return input; String jarFile = entryInfo[0]; String entry = entryInfo[1]; - IEditorInput result = createJarEntryEditorInput(jarFile, entry); + IEditorInput result = createJarEntryEditorInput(null, jarFile, entry); return (result == null || result instanceof NullEditorInput) ? input : result; } @@ -271,19 +284,37 @@ return new String[]{jarFile, entry}; } - public static XModelObject getJarEntryObject(String jarFile, String entry) { - IFile f = EclipseResourceUtil.getFile(jarFile); - if(f == null) return null; - IProject p = f.getProject(); + public static XModelObject getJarEntryObject(IProject p, String jarFile, String entry) { + if(p == null) { + IFile f = EclipseResourceUtil.getFile(jarFile); + if(f == null) return null; + p = f.getProject(); + } + if(p == null) return null; IModelNature n = EclipseResourceUtil.getModelNature(p); - if(n == null) return null; - XModelObject[] fs = FileSystemsHelper.getFileSystems(n.getModel()).getChildren(); + XModel model = null; + if(n != null) { + model = n.getModel(); + } else { + XModelObject o = EclipseResourceUtil.createObjectForResource(p); + if(o != null) model = o.getModel(); + } + if(model == null) return null; + XModelObject[] fs = FileSystemsHelper.getFileSystems(model).getChildren(); for (XModelObject s: fs) { if(s instanceof JarSystemImpl) { JarSystemImpl j = (JarSystemImpl)s; String loc = j.getLocation(); if(new File(loc).equals(new File(jarFile))) { XModelObject result = s.getChildByPath(entry); + if(result == null && entry != null) { + int q = entry.indexOf('/'); + int d = entry.indexOf('.'); + if(q > d && d >= 0) { + String entry1 = entry.substring(0, q).replace('.', '/') + entry.substring(q); + result = s.getChildByPath(entry1); + } + } if(result != null) return result; } } @@ -291,8 +322,8 @@ return (n == null) ? null : n.getModel().getByPath("/" + entry); //$NON-NLS-1$ } - public static IEditorInput createJarEntryEditorInput(String jarFile, final String entry) { - XModelObject o = getJarEntryObject(jarFile, entry); + public static IEditorInput createJarEntryEditorInput(IProject project, String jarFile, final String entry) { + XModelObject o = getJarEntryObject(project, jarFile, entry); if(o != null) return new ModelObjectJarEntryEditorInput(o, jarFile, entry); return XModelObjectEditorInputFactory.createNullEditorInput(entry); } Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/core/resources/XModelObjectEditorInputFactory.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/core/resources/XModelObjectEditorInputFactory.java 2010-04-26 09:21:21 UTC (rev 21682) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/core/resources/XModelObjectEditorInputFactory.java 2010-04-26 11:56:32 UTC (rev 21683) @@ -68,9 +68,10 @@ } } } else if(memento.getString(TAG_ENTRY) != null) { + IProject project = (IProject)ResourcesPlugin.getWorkspace().getRoot().findMember(new Path(projectPath)); String fileLocation = memento.getString(TAG_FILE_LOCATION); String entry = memento.getString(TAG_ENTRY); - return XModelObjectEditorInput.createJarEntryEditorInput(fileLocation, entry); + return XModelObjectEditorInput.createJarEntryEditorInput(project, fileLocation, entry); } else { IProject project = (IProject)ResourcesPlugin.getWorkspace().getRoot().findMember(new Path(projectPath)); String objectPath = memento.getString(TAG_PATH); Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/editor/ModelObjectStorageEditorInput.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/editor/ModelObjectStorageEditorInput.java 2010-04-26 09:21:21 UTC (rev 21682) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/editor/ModelObjectStorageEditorInput.java 2010-04-26 11:56:32 UTC (rev 21683) @@ -183,7 +183,7 @@ } String[] entryInfo = XModelObjectEditorInput.parseJarEntryFileInput((IStorageEditorInput)o); if(entryInfo == null) return false; - XModelObject mo = XModelObjectEditorInput.getJarEntryObject(entryInfo[0], entryInfo[1]); + XModelObject mo = XModelObjectEditorInput.getJarEntryObject(null, entryInfo[0], entryInfo[1]); return mo != null && mo.equals(object); } return false;

14 years, 8 months

1
0
0 / 0

JBoss Tools SVN: r21682 - trunk/jsf/plugins/org.jboss.tools.jsf.ui.

by jbosstools-commits＠lists.jboss.org

Author: scabanovich Date: 2010-04-26 05:21:21 -0400 (Mon, 26 Apr 2010) New Revision: 21682 Modified: trunk/jsf/plugins/org.jboss.tools.jsf.ui/plugin.xml Log: https://jira.jboss.org/jira/browse/JBIDE-5946 Modified: trunk/jsf/plugins/org.jboss.tools.jsf.ui/plugin.xml =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.ui/plugin.xml 2010-04-26 09:19:43 UTC (rev 21681) +++ trunk/jsf/plugins/org.jboss.tools.jsf.ui/plugin.xml 2010-04-26 09:21:21 UTC (rev 21682) @@ -511,4 +511,12 @@ translations="src/templates/xhtmldefault-templates.properties"> </include> </extension> + + <extension point="org.eclipse.ui.perspectiveExtensions"> + <perspectiveExtension targetID="org.jboss.tools.jst.web.ui.WebDevelopmentPerspective"> + <newWizardShortcut id="org.jboss.tools.jsf.ui.wizard.newfile.NewXHTMLWizard"> + </newWizardShortcut> + </perspectiveExtension> + </extension> + </plugin>

14 years, 8 months

1
0
0 / 0

JBoss Tools SVN: r21681 - trunk/jst/plugins/org.jboss.tools.jst.web.ui.

by jbosstools-commits＠lists.jboss.org

Author: scabanovich Date: 2010-04-26 05:19:43 -0400 (Mon, 26 Apr 2010) New Revision: 21681 Modified: trunk/jst/plugins/org.jboss.tools.jst.web.ui/plugin.xml Log: https://jira.jboss.org/jira/browse/JBIDE-5946 Modified: trunk/jst/plugins/org.jboss.tools.jst.web.ui/plugin.xml =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web.ui/plugin.xml 2010-04-26 08:00:45 UTC (rev 21680) +++ trunk/jst/plugins/org.jboss.tools.jst.web.ui/plugin.xml 2010-04-26 09:19:43 UTC (rev 21681) @@ -360,8 +360,8 @@ </newWizardShortcut> <newWizardShortcut id="org.jboss.tools.common.model.ui.wizard.newfile.NewJSPFileWizard"> </newWizardShortcut> - <newWizardShortcut id="org.jboss.tools.common.model.ui.wizard.newfile.NewXHTMLFileWizard"> - </newWizardShortcut> +  <newWizardShortcut id="org.jboss.tools.common.model.ui.wizard.newfile.NewHTMLFileWizard"> </newWizardShortcut> <newWizardShortcut id="org.jboss.tools.jst.web.ui.wizards.newfile.NewCSSFileWizard">

14 years, 8 months

1
0
0 / 0

JBoss Tools SVN: r21680 - trunk/vpe/features/org.jboss.tools.vpe.feature.

by jbosstools-commits＠lists.jboss.org

Author: max.andersen(a)jboss.com Date: 2010-04-26 04:00:45 -0400 (Mon, 26 Apr 2010) New Revision: 21680 Modified: trunk/vpe/features/org.jboss.tools.vpe.feature/feature.xml Log: updated vpe feature for proper version. JBDS-468. Modified: trunk/vpe/features/org.jboss.tools.vpe.feature/feature.xml =================================================================== --- trunk/vpe/features/org.jboss.tools.vpe.feature/feature.xml 2010-04-26 04:51:49 UTC (rev 21679) +++ trunk/vpe/features/org.jboss.tools.vpe.feature/feature.xml 2010-04-26 08:00:45 UTC (rev 21680) @@ -2,7 +2,7 @@ <feature id="org.jboss.tools.vpe_feature" label="%featureName" - version="2.0.0"> + version="3.1.0.qualifier"> <description url="http://www.jboss.org/tools"> %description @@ -29,47 +29,45 @@ version="0.0.0"/> <plugin - id="org.jboss.tools.vpe.mozilla" + id="org.jboss.tools.vpe.docbook" download-size="0" install-size="0" - version="0.0.0"/> + version="0.0.0" + unpack="false"/> <plugin - id="org.jboss.tools.vpe.mozilla.gtk" + id="org.jboss.tools.vpe.html" download-size="0" install-size="0" version="0.0.0" - fragment="true"/> + unpack="false"/> <plugin - id="org.jboss.tools.vpe.mozilla.win32" + id="org.jboss.tools.vpe.jsp" download-size="0" install-size="0" version="0.0.0" - fragment="true"/> + unpack="false"/> <plugin - id="org.jboss.tools.vpe.ui" + id="org.jboss.tools.vpe.resref" download-size="0" install-size="0" - version="0.0.0"/> + version="0.0.0" + unpack="false"/> <plugin id="org.jboss.tools.vpe.ui.palette" download-size="0" install-size="0" - version="0.0.0"/> + version="0.0.0" + unpack="false"/> <plugin - id="org.jboss.tools.vpe.html" + id="org.jboss.tools.vpe.xulrunner" download-size="0" install-size="0" - version="0.0.0"/> + version="0.0.0" + unpack="false"/> - <plugin - id="org.jboss.tools.vpe.jsp" - download-size="0" - install-size="0" - version="0.0.0"/> - </feature>

14 years, 8 months

1
0
0 / 0

JBoss Tools SVN: r21679 - branches/modular_build/build.

by jbosstools-commits＠lists.jboss.org

Author: nickboldt Date: 2010-04-26 00:51:49 -0400 (Mon, 26 Apr 2010) New Revision: 21679 Modified: branches/modular_build/build/build.xml Log: collect test results into workspace so Hudson can see them Modified: branches/modular_build/build/build.xml =================================================================== --- branches/modular_build/build/build.xml 2010-04-26 04:41:59 UTC (rev 21678) +++ branches/modular_build/build/build.xml 2010-04-26 04:51:49 UTC (rev 21679) @@ -37,7 +37,9 @@ cd /home/nboldt/workspace36/jbosstools-modular_build; ant -DCOMPONENTS=tests,common -Dbuild.if.sources.unchanged=true --> - <target name="run" depends="init, get.bootstrap.scripts, get.sources, get.components.to.build, run.build" /> + <target name="run" + depends="init, get.bootstrap.scripts, get.sources, get.components.to.build, run.build, collect.test.results" + />  <condition property="isInHudson" value="true"> @@ -304,6 +306,16 @@ </for> </target> + <target name="collect.test.results"> +  + <delete dir="${basedir}/surefire-reports/" includeemptydirs="true" /> + <mkdir dir="${basedir}/surefire-reports/" /> + <copy todir="${basedir}/surefire-reports/"> + <fileset dir="${WORKINGDIR}" includes="**/target/surefire-reports/*.xml" /> + </copy> +  + </target> +   <target name="zip.sites"> @@ -515,6 +527,7 @@ 3/6: Test update</echo> <delete file="${WORKINGDIR}/svn.info-tests.txt" /> <delete file="${WORKINGDIR}/svn.info-xulrunner.txt" /> + <touch file="${WORKINGDIR}/common/pom.xml" /> <antcall target="get.sources" /> <for param="expected.dir" list="${get.sources.expected.dirs}" delimiter=", ">

14 years, 8 months

1
0
0 / 0

JBoss Tools SVN: r21678 - branches/modular_build.

by jbosstools-commits＠lists.jboss.org

Author: nickboldt Date: 2010-04-26 00:41:59 -0400 (Mon, 26 Apr 2010) New Revision: 21678 Modified: branches/modular_build/genpom.xml Log: add path in which summary is relevant Modified: branches/modular_build/genpom.xml =================================================================== --- branches/modular_build/genpom.xml 2010-04-26 04:34:43 UTC (rev 21677) +++ branches/modular_build/genpom.xml 2010-04-26 04:41:59 UTC (rev 21678) @@ -454,7 +454,7 @@  <length string="${modulecountstring}" property="modulecount" /> <length string="${aggregatorcountstring}" property="aggregatorcount" /> - <echo level="info">Modules: ${modulecount} Aggregations: ${aggregatorcount}</echo> + <echo level="info">${WORKINGDIR}/${COMPONENT} :: Modules: ${modulecount}, Aggregations: ${aggregatorcount}</echo> </target>

14 years, 8 months

1
0
0 / 0

JBoss Tools SVN: r21677 - trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/util.

by jbosstools-commits＠lists.jboss.org

Author: rob.stryker(a)jboss.com Date: 2010-04-26 00:34:43 -0400 (Mon, 26 Apr 2010) New Revision: 21677 Modified: trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/util/ServerRuntimeUtils.java Log: Adding some asserts for better debugging to figure out whats failing during test suite on server Modified: trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/util/ServerRuntimeUtils.java =================================================================== --- trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/util/ServerRuntimeUtils.java 2010-04-26 01:19:20 UTC (rev 21676) +++ trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/util/ServerRuntimeUtils.java 2010-04-26 04:34:43 UTC (rev 21677) @@ -84,7 +84,7 @@ public static IServer createServer(String runtimeID, String serverID, String location, String configuration) throws CoreException { // if file doesnt exist, abort immediately. - assertTrue(new Path(location).toFile().exists()); + assertTrue("path \"" + location + "\" does not exist", new Path(location).toFile().exists()); IRuntime currentRuntime = createRuntime(runtimeID, location, configuration); @@ -129,6 +129,7 @@ public static void deleteAllRuntimes() throws CoreException { IRuntime[] runtimes = ServerCore.getRuntimes(); for( int i = 0; i < runtimes.length; i++ ) { + assertNotNull("runtime " + runtimes[i].getName() + " has a null location", runtimes[i].getLocation()); if( mockedServers.isPrefixOf(runtimes[i].getLocation())) { FileUtil.completeDelete(runtimes[i].getLocation().toFile()); }

14 years, 8 months

1
0
0 / 0

JBoss Tools SVN: r21675 - in trunk/bpel/features: org.jboss.tools.bpel.feature and 2 other directories.

by jbosstools-commits＠lists.jboss.org

Author: max.andersen(a)jboss.com Date: 2010-04-25 19:48:41 -0400 (Sun, 25 Apr 2010) New Revision: 21675 Added: trunk/bpel/features/org.jboss.tools.bpel.tests.sdk.feature/ trunk/bpel/features/org.jboss.tools.bpel.tests.sdk.feature/sourceTemplatePlugin/ Removed: trunk/bpel/features/org.jboss.tools.bpel.tests.sdk.feature/sourceTemplatePlugin/ Modified: trunk/bpel/features/org.jboss.tools.bpel.feature/ trunk/bpel/features/org.jboss.tools.bpel.tests.sdk.feature/.cvsignore trunk/bpel/features/org.jboss.tools.bpel.tests.sdk.feature/.project trunk/bpel/features/org.jboss.tools.bpel.tests.sdk.feature/build.properties trunk/bpel/features/org.jboss.tools.bpel.tests.sdk.feature/feature.properties trunk/bpel/features/org.jboss.tools.bpel.tests.sdk.feature/license.html trunk/bpel/features/org.jboss.tools.bpel.tests.sdk.feature/sourceTemplatePlugin/about.ini trunk/bpel/features/org.jboss.tools.bpel.tests.sdk.feature/sourceTemplatePlugin/about.mappings trunk/bpel/features/org.jboss.tools.bpel.tests.sdk.feature/sourceTemplatePlugin/about.properties trunk/bpel/features/org.jboss.tools.bpel.tests.sdk.feature/sourceTemplatePlugin/build.properties trunk/bpel/features/org.jboss.tools.bpel.tests.sdk.feature/sourceTemplatePlugin/plugin.properties Log: fix bpel to be able to commit Property changes on: trunk/bpel/features/org.jboss.tools.bpel.feature ___________________________________________________________________ Name: svn:ignore + bin build target Copied: trunk/bpel/features/org.jboss.tools.bpel.tests.sdk.feature (from rev 21642, branches/modular_build/bpel/features/org.jboss.tools.bpel.tests.sdk.feature) Modified: trunk/bpel/features/org.jboss.tools.bpel.tests.sdk.feature/.cvsignore =================================================================== Modified: trunk/bpel/features/org.jboss.tools.bpel.tests.sdk.feature/.project =================================================================== Modified: trunk/bpel/features/org.jboss.tools.bpel.tests.sdk.feature/build.properties =================================================================== Modified: trunk/bpel/features/org.jboss.tools.bpel.tests.sdk.feature/feature.properties =================================================================== Modified: trunk/bpel/features/org.jboss.tools.bpel.tests.sdk.feature/license.html =================================================================== Copied: trunk/bpel/features/org.jboss.tools.bpel.tests.sdk.feature/sourceTemplatePlugin (from rev 21642, branches/modular_build/bpel/features/org.jboss.tools.bpel.tests.sdk.feature/sourceTemplatePlugin) Modified: trunk/bpel/features/org.jboss.tools.bpel.tests.sdk.feature/sourceTemplatePlugin/about.ini =================================================================== Modified: trunk/bpel/features/org.jboss.tools.bpel.tests.sdk.feature/sourceTemplatePlugin/about.mappings =================================================================== Modified: trunk/bpel/features/org.jboss.tools.bpel.tests.sdk.feature/sourceTemplatePlugin/about.properties =================================================================== Modified: trunk/bpel/features/org.jboss.tools.bpel.tests.sdk.feature/sourceTemplatePlugin/build.properties =================================================================== Modified: trunk/bpel/features/org.jboss.tools.bpel.tests.sdk.feature/sourceTemplatePlugin/plugin.properties ===================================================================

14 years, 8 months

1
0
0 / 0

JBoss Tools SVN: r21674 - trunk/struts/tests/org.jboss.tools.struts.ui.bot.test.

by jbosstools-commits＠lists.jboss.org

Author: max.andersen(a)jboss.com Date: 2010-04-25 19:12:09 -0400 (Sun, 25 Apr 2010) New Revision: 21674 Removed: trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/bin/ Log: remove bin

14 years, 8 months

1
0
0 / 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

jbosstools-commits April 2010