JBoss Tools SVN: r24016 - in trunk: jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide and 5 other directories.
by jbosstools-commits＠lists.jboss.org
Author: mareshkau
Date: 2010-08-10 04:55:09 -0400 (Tue, 10 Aug 2010)
New Revision: 24016
Added:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/DocBookTemplatesTest.java
trunk/jst/plugins/org.jboss.tools.jst.jsp/images/xstudio/editors/xmldoc.gif
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllTests.java
trunk/jst/plugins/org.jboss.tools.jst.jsp/plugin.properties
trunk/jst/plugins/org.jboss.tools.jst.jsp/plugin.xml
trunk/vpe/plugins/org.jboss.tools.vpe.docbook/templates/vpe-templates-docbook.xml
trunk/vpe/plugins/org.jboss.tools.vpe.docbook/templates/vpe-templates-xinclude.xml
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTemplateManager.java
trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/ComponentContentTest.java
trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/VpeTest.java
Log:
https://jira.jboss.org/browse/JBIDE-6600
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllTests.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllTests.java 2010-08-10 06:37:49 UTC (rev 24015)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllTests.java 2010-08-10 08:55:09 UTC (rev 24016)
@@ -16,6 +16,7 @@
import org.jboss.tools.jsf.vpe.jsf.test.jbide.ChangeMessageBundleTest_JBIDE5818;
import org.jboss.tools.jsf.vpe.jsf.test.jbide.ContextMenuDoubleInsertionTest_JBIDE3888;
import org.jboss.tools.jsf.vpe.jsf.test.jbide.DnD_JBIDE5042_JBIDE6229_Test;
+import org.jboss.tools.jsf.vpe.jsf.test.jbide.DocBookTemplatesTest;
import org.jboss.tools.jsf.vpe.jsf.test.jbide.EditFontFamilyTest_JBIDE5872;
import org.jboss.tools.jsf.vpe.jsf.test.jbide.ExceptionInVPEComments_JBIDE5143;
import org.jboss.tools.jsf.vpe.jsf.test.jbide.FacetProcessingTest;
@@ -125,6 +126,7 @@
TestSuite suite = new TestSuite("Tests for Vpe Jsf components"); //$NON-NLS-1$
// $JUnit-BEGIN$
+ suite.addTestSuite(DocBookTemplatesTest.class);
suite.addTestSuite(DnD_JBIDE5042_JBIDE6229_Test.class);
suite.addTestSuite(UnclosedELExpressionTest.class);
suite.addTestSuite(TestContextPathResolution.class);
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/DocBookTemplatesTest.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/DocBookTemplatesTest.java (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/DocBookTemplatesTest.java 2010-08-10 08:55:09 UTC (rev 24016)
@@ -0,0 +1,48 @@
+/**
+ *
+ */
+package org.jboss.tools.jsf.vpe.jsf.test.jbide;
+
+import org.jboss.tools.jsf.vpe.jsf.test.JsfAllTests;
+import org.jboss.tools.vpe.ui.test.ComponentContentTest;
+import org.jboss.tools.vpe.ui.test.VpeTest;
+
+/**
+ * Junit test class for https://jira.jboss.org/browse/JBIDE-6600
+ * @author mareshkau
+ *
+ */
+public class DocBookTemplatesTest extends ComponentContentTest{
+
+ private static String VPE_EDITOR_ID=VpeTest.EDITOR_ID;
+
+ private static String DOC_BOOK_EDITOR_ID="org.jboss.tools.jst.jsp.jspeditor.DocBookEditor";
+
+ private String activeEditorID;
+ public DocBookTemplatesTest(String name) {
+ super(name);
+ }
+
+ public void testCheckHtmlTitle() throws Throwable {
+ setActiveEditorID(VPE_EDITOR_ID);
+ performInvisibleTagTest("JBIDE/6600/jbide6600.html","title");
+ }
+
+ public void testCheckDocBookTitle() throws Throwable {
+ setActiveEditorID(DOC_BOOK_EDITOR_ID);
+ performContentTest("JBIDE/6600/jbide6600.xml");
+ }
+
+ @Override
+ protected String getTestProjectName() {
+ return JsfAllTests.IMPORT_PROJECT_NAME;
+ }
+
+ private void setActiveEditorID(String editorID){
+ this.activeEditorID = editorID;
+ }
+
+ protected String getEditorID(){
+ return this.activeEditorID;
+ }
+}
Added: trunk/jst/plugins/org.jboss.tools.jst.jsp/images/xstudio/editors/xmldoc.gif
===================================================================
(Binary files differ)
Property changes on: trunk/jst/plugins/org.jboss.tools.jst.jsp/images/xstudio/editors/xmldoc.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/plugin.properties
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/plugin.properties 2010-08-10 06:37:49 UTC (rev 24015)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/plugin.properties 2010-08-10 08:55:09 UTC (rev 24016)
@@ -2,6 +2,7 @@
jsp.page.name=JSP Syntax Colors
editors.jsp.name=JBoss Tools JSP Editor
editors.html.name=JBoss Tools HTML Editor
+editors.docbook.name=JBoss Tools Docbook Editor
JSP_Occurrences.name= JSP Occurrences
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/plugin.xml
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/plugin.xml 2010-08-10 06:37:49 UTC (rev 24015)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/plugin.xml 2010-08-10 08:55:09 UTC (rev 24016)
@@ -208,6 +208,15 @@
<contentTypeBinding contentTypeId="org.eclipse.wst.html.core.htmlsource"/>
<contentTypeBinding contentTypeId="jsf.facelet"/>
</editor>
+ <editor
+ class="org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor"
+ contributorClass="org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageContributor"
+ extensions="xml"
+ icon="$nl$/images/xstudio/editors/xmldoc.gif"
+ id="org.jboss.tools.jst.jsp.jspeditor.DocBookEditor"
+ name="%editors.docbook.name">
+ <contentTypeBinding contentTypeId="org.eclipse.wst.html.core.htmlsource"/>
+ </editor>
</extension>
<extension point="org.eclipse.ui.editorActions">
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTemplateManager.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTemplateManager.java 2010-08-10 06:37:49 UTC (rev 24015)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTemplateManager.java 2010-08-10 08:55:09 UTC (rev 24016)
@@ -255,6 +255,11 @@
private Map<String,VpeTemplateSet> caseSensitiveTags = new HashMap<String,VpeTemplateSet>();
private Map<String,VpeTemplateSet> ignoreSensitiveTags = new HashMap<String,VpeTemplateSet>();
+ //added by Maksim Areshkau, docbook tags stored separately, because name duality
+ private Map<String,VpeTemplateSet> docbookTags = new HashMap<String,VpeTemplateSet>();
+
+ private static final String ATTR_DOCBOOK_NAME = "docbook";
+
private VpeTemplate defTemplate;
private VpeTemplateListener[] templateListeners = new VpeTemplateListener[0];
private VpeTemplateFileList templateFileList = new VpeTemplateFileList();
@@ -287,6 +292,8 @@
* Property which indicates that with this tag will be added default formats
*/
public static final String ATTR_USE_DEFAULT_FORMATS = "use-default-formats"; //$NON-NLS-1$
+
+ private static final String DOCBOOKEDITORID="org.jboss.tools.jst.jsp.jspeditor.DocBookEditor";
/*
* Added by Max Areshkau(mareshkau(a)exadel.com)
*/
@@ -337,7 +344,17 @@
if (name == null) {
return null;
}
- VpeTemplateSet set = caseSensitiveTags.get(name);
+ //added by Maksim Areshkau, as fix for docbook templates
+ //see JBIDE-6600
+ VpeTemplateSet set=null;
+ if(DOCBOOKEDITORID.equals(pageContext.getEditPart().getSite().getId())){
+ set = docbookTags.get(name);
+ if (set != null) {
+ return set.getTemplate(pageContext, sourceNode, dependencySet);
+ }
+ }
+
+ set = caseSensitiveTags.get(name);
if (set != null) {
return set.getTemplate(pageContext, sourceNode, dependencySet);
}
@@ -480,9 +497,12 @@
private void setTagElement(Element tagElement,IConfigurationElement confElement) {
String name = tagElement.getAttribute(ATTR_TAG_NAME);
if (name.length() > 0) {
+ boolean docbookTemplate = ATTR_VALUE_YES.equalsIgnoreCase(tagElement.getAttribute(VpeTemplateManager.ATTR_DOCBOOK_NAME));
boolean caseSensitive = !ATTR_VALUE_NO.equals(tagElement.getAttribute(ATTR_TAG_CASE_SENSITIVE));
Map<String,VpeTemplateSet> tags;
- if (caseSensitive) {
+ if(docbookTemplate){
+ tags = docbookTags;
+ }else if (caseSensitive) {
tags = caseSensitiveTags;
} else {
name = name.toLowerCase();
Modified: trunk/vpe/plugins/org.jboss.tools.vpe.docbook/templates/vpe-templates-docbook.xml
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.docbook/templates/vpe-templates-docbook.xml 2010-08-10 06:37:49 UTC (rev 24015)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.docbook/templates/vpe-templates-docbook.xml 2010-08-10 08:55:09 UTC (rev 24016)
@@ -3,126 +3,126 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<!--vpe:template-taglib uri="-//OASIS//DTD DocBook XML V4.3CR3//EN"/-->
- <vpe:tag name="chapter" case-sensitive="yes">
+ <vpe:tag name="chapter" case-sensitive="yes" docbook="yes">
<vpe:template children="yes" modify="yes">
<div />
</vpe:template>
</vpe:tag>
- <vpe:tag name="section" case-sensitive="yes">
+ <vpe:tag name="section" case-sensitive="yes" docbook="yes">
<vpe:template children="yes" modify="yes">
<div />
</vpe:template>
</vpe:tag>
- <vpe:tag name="sect1" case-sensitive="yes">
+ <vpe:tag name="sect1" case-sensitive="yes" docbook="yes">
<vpe:template children="yes" modify="yes">
<div />
</vpe:template>
</vpe:tag>
- <vpe:tag name="sect2" case-sensitive="yes">
+ <vpe:tag name="sect2" case-sensitive="yes" docbook="yes">
<vpe:template children="yes" modify="yes">
<div />
</vpe:template>
</vpe:tag>
- <vpe:tag name="title" case-sensitive="yes">
+ <vpe:tag name="title" case-sensitive="yes" docbook="yes">
<vpe:template children="no" modify="yes">
<h1>
<vpe:value expr="{tagtext()}" />
</h1>
</vpe:template>
</vpe:tag>
- <vpe:tag name="para" case-sensitive="yes">
+ <vpe:tag name="para" case-sensitive="yes" docbook="yes">
<vpe:template children="yes" modify="yes">
<p />
</vpe:template>
</vpe:tag>
- <vpe:tag name="itemizedlist" case-sensitive="yes">
+ <vpe:tag name="itemizedlist" case-sensitive="yes" docbook="yes">
<vpe:template children="yes" modify="yes">
<ul />
</vpe:template>
</vpe:tag>
- <vpe:tag name="listitem" case-sensitive="yes">
+ <vpe:tag name="listitem" case-sensitive="yes" docbook="yes">
<vpe:template children="yes" modify="yes">
<li />
</vpe:template>
</vpe:tag>
- <vpe:tag name="ulink" case-sensitive="yes">
+ <vpe:tag name="ulink" case-sensitive="yes" docbook="yes">
<vpe:template children="yes" modify="yes">
<a href="{@url}" />
</vpe:template>
</vpe:tag>
- <vpe:tag name="programlisting" case-sensitive="yes">
+ <vpe:tag name="programlisting" case-sensitive="yes" docbook="yes">
<vpe:template children="yes" modify="yes">
<pre />
</vpe:template>
</vpe:tag>
- <vpe:tag name="emphasis" case-sensitive="yes">
+ <vpe:tag name="emphasis" case-sensitive="yes" docbook="yes">
<vpe:template children="yes" modify="yes">
<em />
</vpe:template>
</vpe:tag>
- <vpe:tag name="tgroup" case-sensitive="yes">
+ <vpe:tag name="tgroup" case-sensitive="yes" docbook="yes">
<vpe:template children="yes" modify="yes">
<table border="1px" />
</vpe:template>
</vpe:tag>
- <vpe:tag name="row" case-sensitive="yes">
+ <vpe:tag name="row" case-sensitive="yes" docbook="yes">
<vpe:template children="yes" modify="yes">
<tr />
</vpe:template>
</vpe:tag>
- <vpe:tag name="entry" case-sensitive="yes">
+ <vpe:tag name="entry" case-sensitive="yes" docbook="yes">
<vpe:template children="yes" modify="yes">
<td />
</vpe:template>
</vpe:tag>
- <vpe:tag name="property" case-sensitive="yes">
+ <vpe:tag name="property" case-sensitive="yes" docbook="yes">
<vpe:template children="yes" modify="yes">
<i />
</vpe:template>
</vpe:tag>
- <vpe:tag name="imagedata" case-sensitive="yes">
+ <vpe:tag name="imagedata" case-sensitive="yes" docbook="yes">
<vpe:template children="yes" modify="yes">
<img src="{src(@fileref)}" />
</vpe:template>
</vpe:tag>
- <vpe:tag name="mediaobject" case-sensitive="yes">
+ <vpe:tag name="mediaobject" case-sensitive="yes" docbook="yes">
<vpe:template children="yes" modify="yes">
<div />
</vpe:template>
</vpe:tag>
- <vpe:tag name="imageobject" case-sensitive="yes">
+ <vpe:tag name="imageobject" case-sensitive="yes" docbook="yes">
<vpe:template children="yes" modify="yes">
<div />
</vpe:template>
</vpe:tag>
- <vpe:tag name="figure" case-sensitive="yes">
+ <vpe:tag name="figure" case-sensitive="yes" docbook="yes">
<vpe:template children="yes" modify="yes">
<div />
</vpe:template>
</vpe:tag>
- <vpe:tag name="orderedlist" case-sensitive="yes">
+ <vpe:tag name="orderedlist" case-sensitive="yes" docbook="yes">
<vpe:template children="yes" modify="yes">
<ol />
</vpe:template>
</vpe:tag>
- <vpe:tag case-sensitive="yes" name="chapterinfo">
+ <vpe:tag case-sensitive="yes" name="chapterinfo" docbook="yes">
<vpe:template children="yes" modify="yes">
<vpe:any display="none" icon="no" value="{name()}" />
</vpe:template>
</vpe:tag>
- <vpe:tag case-sensitive="yes" name="note">
+ <vpe:tag case-sensitive="yes" name="note" docbook="yes">
<vpe:template children="yes" modify="yes">
<vpe:any background-color="yellow" border="blue" icon="no" />
</vpe:template>
Modified: trunk/vpe/plugins/org.jboss.tools.vpe.docbook/templates/vpe-templates-xinclude.xml
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.docbook/templates/vpe-templates-xinclude.xml 2010-08-10 06:37:49 UTC (rev 24015)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.docbook/templates/vpe-templates-xinclude.xml 2010-08-10 08:55:09 UTC (rev 24016)
@@ -3,7 +3,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<vpe:template-taglib uri="http://www.w3.org/2001/XInclude" prefix="xi" />
- <vpe:tag name="xi:include" case-sensitive="yes">
+ <vpe:tag name="xi:include" case-sensitive="yes" docbook="yes">
<vpe:template children="yes" file="{@href}" class="org.jboss.tools.vpe.editor.template.VpeIncludeTemplate"/>
</vpe:tag>
</vpe:templates>
\ No newline at end of file
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/ComponentContentTest.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/ComponentContentTest.java 2010-08-10 06:37:49 UTC (rev 24015)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/ComponentContentTest.java 2010-08-10 08:55:09 UTC (rev 24016)
@@ -77,7 +77,7 @@
*/
assertNotNull("Could not find component file '"+elementPagePath+"'", elementPageFile); //$NON-NLS-1$ //$NON-NLS-2$
- IEditorPart editor = WorkbenchUtils.openEditor(elementPageFile,EDITOR_ID);
+ IEditorPart editor = WorkbenchUtils.openEditor(elementPageFile,getEditorID());
assertNotNull("Editor should be opened.", editor); //$NON-NLS-1$
VpeController controller = TestUtil.getVpeController((JSPMultiPageEditor) editor);
/*
@@ -189,7 +189,7 @@
TestUtil.waitForJobs();
IEditorPart editor = PlatformUI.getWorkbench()
.getActiveWorkbenchWindow().getActivePage().openEditor(input,
- EDITOR_ID, true);
+ getEditorID(), true);
assertNotNull("Editor should be opened.", editor); //$NON-NLS-1$
TestUtil.waitForJobs();
/*
@@ -262,7 +262,7 @@
IEditorPart editor = PlatformUI.getWorkbench()
.getActiveWorkbenchWindow().getActivePage().openEditor(input,
- EDITOR_ID, true);
+ getEditorID(), true);
assertNotNull(editor);
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/VpeTest.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/VpeTest.java 2010-08-10 06:37:49 UTC (rev 24015)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/VpeTest.java 2010-08-10 08:55:09 UTC (rev 24016)
@@ -22,7 +22,6 @@
import org.eclipse.core.runtime.ILogListener;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.swt.custom.StyledText;
import org.eclipse.ui.IEditorInput;
import org.eclipse.ui.IEditorPart;
@@ -31,7 +30,6 @@
import org.eclipse.ui.PartInitException;
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.part.FileEditorInput;
-import org.eclipse.wst.sse.ui.internal.reconcile.StructuredRegionProcessor;
import org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocument;
import org.jboss.tools.common.model.util.ClassLoaderUtil;
import org.jboss.tools.jst.jsp.JspEditorPlugin;
@@ -229,7 +227,7 @@
IEditorPart editor = PlatformUI.getWorkbench()
.getActiveWorkbenchWindow().getActivePage().openEditor(input,
- EDITOR_ID, true);
+ getEditorID(), true);
// here we wait for inintialization VPE controller
TestUtil.getVpeController((JSPMultiPageEditor) editor);
@@ -264,7 +262,7 @@
// get editor
JSPMultiPageEditor part = (JSPMultiPageEditor) PlatformUI
.getWorkbench().getActiveWorkbenchWindow().getActivePage()
- .openEditor(input, EDITOR_ID, true);
+ .openEditor(input, getEditorID(), true);
assertNotNull(part);
return part;
@@ -437,4 +435,8 @@
return (nsIDOMElement) nodeMapping.getVisualNode();
}
+
+ protected String getEditorID(){
+ return EDITOR_ID;
+ }
}
15 years, 5 months
JBoss Tools SVN: r24015 - trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/utils.
by jbosstools-commits＠lists.jboss.org
Author: Grid.Qian
Date: 2010-08-10 02:37:49 -0400 (Tue, 10 Aug 2010)
New Revision: 24015
Modified:
trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/utils/JBossWSUIUtils.java
Log:
JBIDE-6795: commit to trunk
Modified: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/utils/JBossWSUIUtils.java
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/utils/JBossWSUIUtils.java 2010-08-09 23:44:14 UTC (rev 24014)
+++ trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/utils/JBossWSUIUtils.java 2010-08-10 06:37:49 UTC (rev 24015)
@@ -16,6 +16,7 @@
import org.eclipse.core.filesystem.EFS;
import org.eclipse.core.filesystem.IFileStore;
+import org.eclipse.core.resources.IResource;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IStatus;
@@ -27,6 +28,7 @@
import org.eclipse.jdt.core.JavaCore;
import org.eclipse.jdt.core.JavaModelException;
import org.jboss.tools.ws.core.utils.StatusUtils;
+import org.jboss.tools.ws.creation.core.utils.JBossWSCreationUtils;
import org.jboss.tools.ws.ui.JBossWSUIPlugin;
import org.jboss.tools.ws.ui.messages.JBossWSUIMessages;
@@ -50,20 +52,29 @@
public static IStatus validatePackageName(String name, IJavaElement context) {
IStatus status = null;
if (context == null || !context.exists()) {
- status = JavaConventions.validatePackageName(name,JavaCore.VERSION_1_3, JavaCore.VERSION_1_3);
+ status = JavaConventions.validatePackageName(name,
+ JavaCore.VERSION_1_3, JavaCore.VERSION_1_3);
if (status != null && !status.isOK()) {
return status;
}
}
String[] sourceComplianceLevels = getSourceComplianceLevels(context);
- status = JavaConventions.validatePackageName(name,sourceComplianceLevels[0], sourceComplianceLevels[1]);
+ status = JavaConventions.validatePackageName(name,
+ sourceComplianceLevels[0], sourceComplianceLevels[1]);
if (status != null && status.getSeverity() == IStatus.ERROR) {
return status;
}
IPackageFragmentRoot[] roots = null;
try {
- roots = context.getJavaProject().getPackageFragmentRoots();
+ IResource[] srcFolders = JBossWSCreationUtils
+ .getJavaSourceRoots(context.getJavaProject().getProject());
+ roots = new IPackageFragmentRoot[srcFolders.length];
+ int i = 0;
+ for (IResource src : srcFolders) {
+ roots[i] = context.getJavaProject().getPackageFragmentRoot(src);
+ i++;
+ }
} catch (JavaModelException e) {
JBossWSUIPlugin.log(e);
}
@@ -97,7 +108,7 @@
}
return status;
} else {
- if(pack.getResource() == null){
+ if (pack.getResource() == null) {
continue;
}
URI location = pack.getResource().getLocationURI();
15 years, 5 months
JBoss Tools SVN: r24014 - in trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core: src/org/jboss/tools/deltacloud/core and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: jjohnstn
Date: 2010-08-09 19:44:14 -0400 (Mon, 09 Aug 2010)
New Revision: 24014
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/ChangeLog
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudInstance.java
Log:
2010-08-09 Jeff Johnston <jjohnstn(a)redhat.com>
* src/org/jboss/tools/deltacloud/core/DeltaCloudInstance.java (getHostName): New method.
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/ChangeLog
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/ChangeLog 2010-08-09 22:24:56 UTC (rev 24013)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/ChangeLog 2010-08-09 23:44:14 UTC (rev 24014)
@@ -1,3 +1,7 @@
+2010-08-09 Jeff Johnston <jjohnstn(a)redhat.com>
+
+ * src/org/jboss/tools/deltacloud/core/DeltaCloudInstance.java (getHostName): New method.
+
2010-08-06 Jeff Johnston <jjohnstn(a)redhat.com>
* src/org/jboss/tools/deltacloud/core/client/DeltaCloudClient.java (sendRequest): Add
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudInstance.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudInstance.java 2010-08-09 22:24:56 UTC (rev 24013)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudInstance.java 2010-08-09 23:44:14 UTC (rev 24014)
@@ -40,4 +40,11 @@
public List<String> getHostNames() {
return instance.getPublicAddresses();
}
+
+ public String getHostName() {
+ List<String> hostNames = getHostNames();
+ if (hostNames != null && hostNames.size() > 0)
+ return hostNames.get(0);
+ return null;
+ }
}
15 years, 5 months
JBoss Tools SVN: r24013 - in trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui: editparts and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: bbrodt
Date: 2010-08-09 18:24:56 -0400 (Mon, 09 Aug 2010)
New Revision: 24013
Modified:
trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/BPELEditor.java
trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/FlowEditPart.java
Log:
https://jira.jboss.org/browse/JBIDE-6784
Revert fix from JBIDE-6032. The right place to do an initial auto layout if the *.bpelex model is missing, is in BPELEditor.arrangeEditParts()
Modified: trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/BPELEditor.java
===================================================================
--- trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/BPELEditor.java 2010-08-09 22:23:04 UTC (rev 24012)
+++ trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/BPELEditor.java 2010-08-09 22:24:56 UTC (rev 24013)
@@ -679,6 +679,7 @@
public void arrangeEditParts(GraphicalViewer graphicalViewer) {
// Make a list of all FlowEditParts whose children all have no positional metadata
List<FlowEditPart> flowsToArrange = new ArrayList<FlowEditPart>();
+ List<Point> flowChildlocations = new ArrayList<Point>();
for (TreeIterator<EObject> it = getProcess().eAllContents(); it.hasNext(); ) {
EObject model = it.next();
@@ -691,7 +692,29 @@
if (child == null) continue;
Point loc = ModelHelper.getLocation(child);
if (loc.x == Integer.MIN_VALUE) missingLoc = true;
+ flowChildlocations.add(new Point(loc));
}
+ // https://jira.jboss.org/browse/JBIDE-6784
+ // The problem with the above check for a "missing location" of Flow
+ // children is that the default x & y values are zero if the extension
+ // model is missing. This would be the case if the BPEL process was
+ // imported as text from somewhere. In this case, all x/y coordinates
+ // of all Flow children will be 0, so it suffices to check if two children
+ // have the same x & y coordinates.
+ if (flowChildlocations.size()>1)
+ {
+ for ( int i=0; !missingLoc && i<flowChildlocations.size(); ++i )
+ {
+ int x = flowChildlocations.get(i).x;
+ int y = flowChildlocations.get(i).y;
+ for ( int j=i+1; !missingLoc && j<flowChildlocations.size(); ++j )
+ {
+ Point loc = flowChildlocations.get(j);
+ if (loc.x == x && loc.y==y)
+ missingLoc = true;
+ }
+ }
+ }
if (missingLoc) {
EditPart editPart = (EditPart)graphicalViewer.getEditPartRegistry().get(model);
if (editPart instanceof FlowEditPart) flowsToArrange.add((FlowEditPart) editPart);
Modified: trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/FlowEditPart.java
===================================================================
--- trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/FlowEditPart.java 2010-08-09 22:23:04 UTC (rev 24012)
+++ trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/FlowEditPart.java 2010-08-09 22:24:56 UTC (rev 24013)
@@ -235,9 +235,14 @@
IFigure child = ((GraphicalEditPart) childEditPart).getFigure();
getContentPane().add(child,
getFigure().getLayoutManager().getConstraint(child), index);
+ //https://jira.jboss.org/browse/JBIDE-6784
+ // addChildVisual() is also called by reorderChild() to rearrange the order of children.
+ // This causes auto layout to reference a child object with a model that has no parent.
+ // The right place to auto arrange Flow children if no *.bpelex exists yet, is in
+ // BPELEditor.arrangeEditParts() after the model is loaded
// JBIDE-6032: force an auto layout at startup
- if (getShowFreeformFlow() && getAutoLayout())
- doAutoLayout(false);
+// if (getShowFreeformFlow() && getAutoLayout())
+// doAutoLayout(false);
}
protected void setFlowEditPolicies() {
15 years, 5 months
JBoss Tools SVN: r24012 - trunk/build/target-platform.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2010-08-09 18:23:04 -0400 (Mon, 09 Aug 2010)
New Revision: 24012
Modified:
trunk/build/target-platform/e36-wtp32.target
Log:
use xulrunner 1.9.1.2 and thirdparty update sites instead of 1.9.2 and Orbit sites
Modified: trunk/build/target-platform/e36-wtp32.target
===================================================================
--- trunk/build/target-platform/e36-wtp32.target 2010-08-09 22:20:44 UTC (rev 24011)
+++ trunk/build/target-platform/e36-wtp32.target 2010-08-09 22:23:04 UTC (rev 24012)
@@ -20,15 +20,25 @@
<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
<repository location="http://download.eclipse.org/technology/subversive/0.7/update-site/"/>
</location>
+<!-- <location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
+<unit id="javax.wsdl" version="1.6.2.v201005080631"/>
+<unit id="org.apache.oro" version="2.0.8.v201005080400"/>
+<repository location="http://download.jboss.org/jbosstools/updates/orbit/R20100519200754/"/>
+</location> -->
<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
<unit id="javax.wsdl" version="1.6.2.v201005080631"/>
<unit id="org.apache.oro" version="2.0.8.v201005080400"/>
-<repository location="http://download.jboss.org/jbosstools/updates/orbit/R20100519200754/"/>
+<repository location="http://download.jboss.org/jbosstools/updates/thirdparty/"/>
</location>
-<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
+<!-- <location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
<unit id="org.mozilla.xulrunner.feature.feature.group" version="1.9.2"/>
<unit id="org.mozilla.xpcom.feature.feature.group" version="1.9.2"/>
<repository location="http://download.jboss.org/jbosstools/updates/xulrunner-1.9.2/"/>
+</location> -->
+<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
+<unit id="org.mozilla.xulrunner.feature.feature.group" version="1.9.1.2"/>
+<unit id="org.mozilla.xpcom.feature.feature.group" version="1.9.1.2a"/>
+<repository location="http://download.jboss.org/jbosstools/updates/xulrunner-1.9.1.2/"/>
</location>
<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
<repository location="http://download.eclipse.org/rt/ecf/3.2/3.6/site.p2"/>
15 years, 5 months
JBoss Tools SVN: r24010 - trunk/build/target-platform.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2010-08-09 18:13:00 -0400 (Mon, 09 Aug 2010)
New Revision: 24010
Modified:
trunk/build/target-platform/e36-wtp32.target
Log:
resolve all missing and broken IUs. TP now validates in workspace (though still takes FOREVER)
Modified: trunk/build/target-platform/e36-wtp32.target
===================================================================
--- trunk/build/target-platform/e36-wtp32.target 2010-08-09 20:05:21 UTC (rev 24009)
+++ trunk/build/target-platform/e36-wtp32.target 2010-08-09 22:13:00 UTC (rev 24010)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde version="3.6"?>
<target includeMode="feature" name="e36-wtp32">
@@ -8,23 +8,6 @@
<repository location="http://m2eclipse.sonatype.org/sites/m2e/"/>
</location>
<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
-<unit id="org.eclipse.swtbot.eclipse.feature.group" version="2.0.0.595-dev-e36"/>
-<unit id="org.eclipse.swtbot.eclipse.gef.feature.group" version="2.0.0.595-dev-e36"/>
-<unit id="org.eclipse.swtbot.feature.group" version="2.0.0.595-dev-e36"/>
-<unit id="org.eclipse.swtbot.ide.feature.group" version="2.0.0.595-dev-e36"/>
-<unit id="org.eclipse.swtbot.eclipse.test.junit4.feature.group" version="2.0.0.595-dev-e36"/>
-<repository location="http://download.eclipse.org/technology/swtbot/helios/dev-build/update-site/"/>
-</location>
-<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
-<unit id="org.eclipse.birt.integration.wtp.feature.group" version="2.6.0.v20100617-1315-35-7w3121172802426"/>
-<unit id="org.eclipse.birt.osgi.runtime.sdk.feature.group" version="2.6.0.v20100427-57B-85wFdAHO16f8kRo1_ft1IUwD"/>
-<unit id="org.eclipse.birt.feature.group" version="2.6.0.v20100531-9gF727DGKb0yl9AwWxpmbo35PwQ_"/>
-<repository location="http://download.eclipse.org/birt/update-site/2.6/"/>
-</location>
-<!-- <location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
-<repository location="http://download.eclipse.org/birt/update-site/2.6-interim/"/>
-</location> -->
-<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
<unit id="org.maven.ide.eclipse.wtp.feature.feature.group" version="0.10.0.20100209-0800"/>
<repository location="http://m2eclipse.sonatype.org/sites/m2e-extras/"/>
</location>
@@ -37,9 +20,9 @@
<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
<repository location="http://download.eclipse.org/technology/subversive/0.7/update-site/"/>
</location>
-<location includeAllPlatforms="true" includeMode="planner" type="InstallableUnit">
+<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
<unit id="javax.wsdl" version="1.6.2.v201005080631"/>
-<unit id="org.apache.oro" version="2.0.8.v201005080400"/>
+<unit id="org.apache.oro" version="2.0.8.v201005080400"/>
<repository location="http://download.jboss.org/jbosstools/updates/orbit/R20100519200754/"/>
</location>
<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
@@ -48,56 +31,13 @@
<repository location="http://download.jboss.org/jbosstools/updates/xulrunner-1.9.2/"/>
</location>
<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
-<unit id="org.eclipse.birt.feature.group" version="2.6.0.v20100531-9gF727DGKb0yl9AwWxpmbo35PwQ_"/>
-<unit id="org.eclipse.ecf.core.feature.group" version="3.3.0.v20100607-0607"/>
-<unit id="org.eclipse.datatools.sdk.feature.feature.group" version="1.8.0.v201005280400-7P9i0FDxNYrk4QYG-9qpz0N-vbEp"/>
-<unit id="org.eclipse.birt.osgi.runtime.sdk.feature.group" version="2.6.0.v20100427-57B-85wFdAHO16f8kRo1_ft1IUwD"/>
-<unit id="org.eclipse.emf.sdk.feature.group" version="2.6.0.v20100607-0756"/>
-<unit id="org.eclipse.pde.junit.runtime.standalone.feature.group" version="1.0.0.v20100526"/>
-<unit id="org.eclipse.pde.api.tools.ee.fragments.feature.group" version="1.0.0.v20100427-7C-7BF9JgLWLMBMMAMsLL"/>
-<unit id="org.eclipse.gef.sdk.feature.group" version="3.6.0.v20100519-2050-7G7R-A5WNc7QL_fXBGjRZPUUiKPJ"/>
-<unit id="org.eclipse.zest.sdk.feature.group" version="1.2.0.v20100519-2050-679-8COKLDAKOXIET_YWTacZM9XR"/>
-<unit id="org.eclipse.xsd.sdk.feature.group" version="2.6.0.v20100607-0756"/>
-<unit id="org.eclipse.jdt.feature.group" version="3.6.0.v20100526-0800-7z8XFUJFMTfCWGoVuHImpms9H155"/>
-<unit id="org.eclipse.wst.xml_ui.feature.feature.group" version="3.2.0.v201005241510-7H7AFUIDxumQGOb7ocjUR2Pvz-28"/>
-<unit id="org.eclipse.wst.jsdt.feature.feature.group" version="1.2.0.v201005270528-7C78FGDF9JgLWLMBWz-Ose6"/>
-<unit id="org.eclipse.tptp.platform.runtime.feature.group" version="4.7.0.v201005032111-7u84-8ksiNsksbQ6UTB7dcy3RUlT"/>
-<unit id="org.eclipse.jst.jsf.apache.trinidad.tagsupport.feature.feature.group" version="2.2.100.v20100526-208Z7w312114252964"/>
-<unit id="org.eclipse.jst.ws.axis2tools.feature.feature.group" version="1.1.100.v201005241530-78-FF0DZRDKDDePSKwHj"/>
-<unit id="org.eclipse.jst.ws.cxf.feature.feature.group" version="1.0.0.v201005241530-7H777BFAKlOiOX8lGdLp-67BD"/>
-<unit id="org.eclipse.jpt.feature.feature.group" version="2.3.0.v201005260000-7N7UEwFD3wTgbU_dxVnWV"/>
-<unit id="org.eclipse.jpt.eclipselink.feature.feature.group" version="2.3.0.v201005260000-7778BgBgJ9E99RIX999A"/>
-<unit id="org.eclipse.wst.common.fproj.feature.group" version="3.2.0.v201005290030-377A78s73533D5L355B"/>
-<unit id="org.eclipse.jst.common.fproj.enablement.jdt.feature.group" version="3.2.0.v201005241600-377A78s73533C6A6B39"/>
-<unit id="org.eclipse.jst.enterprise_ui.feature.feature.group" version="3.2.0.v201005241530-7b7GHTYFSK2W9kPaFClvz0O_NQmN"/>
-<unit id="org.eclipse.wst.web_ui.feature.feature.group" version="3.2.0.v201005241510-7O7CFb3EMf84nP-FHuc10NTz--M3"/>
-<unit id="org.eclipse.wst.xsl.feature.feature.group" version="1.1.0.v201005241600-7S7WFAKFIpS---NRIS1pbfYBUIQ"/>
-<unit id="org.eclipse.jsf.feature.feature.group" version="3.2.0.v20100526-7E7I-F9JgLWLMBYy3114"/>
-<unit id="org.eclipse.jpt.feature.feature.group" version="2.3.0.v201005260000-7N7UEwFD3wTgbU_dxVnWV"/>
-<unit id="org.eclipse.jpt.eclipselink.feature.feature.group" version="2.3.0.v201005260000-7778BgBgJ9E99RIX999A"/>
-<unit id="org.eclipse.jdt.feature.group" version="3.6.0.v20100526-0800-7z8XFUJFMTfCWGoVuHImpms9H155"/>
-<unit id="org.eclipse.gef.sdk.feature.group" version="3.6.0.v20100519-2050-7G7R-A5WNc7QL_fXBGjRZPUUiKPJ"/>
-<unit id="org.eclipse.emf.sdk.feature.group" version="2.6.0.v20100607-0756"/>
-<unit id="org.eclipse.ecf.core.feature.group" version="3.3.0.v20100607-0607"/>
-<unit id="org.eclipse.datatools.sdk.feature.feature.group" version="1.8.0.v201005280400-7P9i0FDxNYrk4QYG-9qpz0N-vbEp"/>
-<!-- <repository location="http://download.eclipse.org/releases/helios/"/> -->
-<repository location="http://download.jboss.org/jbosstools/updates/helios/"/>
-</location>
-<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
<repository location="http://download.eclipse.org/rt/ecf/3.2/3.6/site.p2"/>
</location>
<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
<repository location="http://download.eclipse.org/tptp/4.7.0/TPTP-4.7.0/repo/"/>
</location>
<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
-<unit id="org.eclipse.platform" version="3.6.0.v201006240800"/>
-<unit id="org.eclipse.core.runtime" version="3.6.0.v20100505"/>
-<repository location="http://download.eclipse.org/eclipse/updates/3.6.x/"/>
-</location>
-<!-- <location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
-<repository location="http://download.eclipse.org/eclipse/updates/3.6milestones/"/>
-</location> -->
-<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
+<unit id="org.eclipse.emf.ecore" version="2.6.0.v20100614-1136"/>
<unit id="org.eclipse.emf.feature.group" version="2.6.0.v20100614-1136"/>
<unit id="org.eclipse.emf.codegen.feature.group" version="2.6.0.v20100614-1136"/>
<unit id="org.eclipse.emf.common.feature.group" version="2.6.0.v20100614-1136"/>
@@ -111,8 +51,106 @@
<repository location="http://download.eclipse.org/modeling/emf/emf/updates/2.6/"/>
</location>
<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
+<unit id="org.eclipse.swtbot.eclipse.feature.group" version="2.0.0.595-dev-e36"/>
+<unit id="org.eclipse.swtbot.eclipse.gef.feature.group" version="2.0.0.595-dev-e36"/>
+<unit id="org.eclipse.swtbot.ide.feature.group" version="2.0.0.595-dev-e36"/>
+<unit id="org.eclipse.swtbot.eclipse.test.junit4.feature.group" version="2.0.0.595-dev-e36"/>
+<unit id="org.eclipse.swtbot.feature.group" version="2.0.0.595-dev-e36"/>
+<repository location="http://download.eclipse.org/technology/swtbot/helios/dev-build/update-site/"/>
+</location>
+<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
+<unit id="org.eclipse.birt.osgi.runtime.sdk.feature.group" version="2.6.0.v20100617-57B-85wFdAHP-Cf8kRo1_ft1IUwD"/>
+<unit id="org.eclipse.birt.feature.group" version="2.6.0.v20100617-9gF727DGKb0yl9AwWxpmbo35PwQ_"/>
+<unit id="org.eclipse.birt.integration.wtp.ui" version="2.6.0.v20100617-1315"/>
+<repository location="http://download.eclipse.org/birt/update-site/2.6/"/>
+</location>
+<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
+<unit id="com.ibm.icu.base.feature.group" version="1.1.0.v20090119-79318s73533B57"/>
+<unit id="org.eclipse.equinox.server.core.feature.group" version="1.0.0.v20100510-7K7QEoF7RZHQHHz-Jr"/>
+<unit id="org.eclipse.cvs.feature.group" version="1.2.0.v20100427-7B77FKs8sF7B77SDX4GW85"/>
+<unit id="org.eclipse.help.feature.group" version="1.2.0.v20100427-7e7jEKFEx2XlnZinYPtgz03"/>
+<unit id="org.eclipse.jdt.feature.group" version="3.6.0.v20100526-0800-7z8XFUJFMTfCWGoVuHImpms9H155"/>
+<unit id="org.eclipse.platform.feature.group" version="3.6.0.v20100602-9gF78GpqFt6trOGhL60z0oEx3fz-JKNwxPY"/>
+<unit id="org.eclipse.platform.ide" version="3.6.0.I20100608-0911"/>
+<unit id="org.eclipse.equinox.executable.feature.group" version="3.4.0.v20100524-7M7K-FIhIez-egBko15H73"/>
+<unit id="org.eclipse.equinox.executable" version="3.4.0.v20100524-7M7K-FIhIez-egBko15H73"/>
+<unit id="org.eclipse.platform.sdk" version="3.6.0.I20100608-0911"/>
+<unit id="org.eclipse.pde.feature.group" version="3.6.0.v20100525-7b7mFKtFEx2XmfZ4_B7NUJA"/>
+<unit id="org.eclipse.sdk.feature.group" version="3.6.0.v20100427-7Q7m-DPY2dP0s7TnP1vxqsprbrvrHJwHMVz0mb8mhRXmu"/>
+<unit id="org.eclipse.rcp.feature.group" version="3.6.0.v20100519-9OArFKvFtsd7WLUKh-DcYTS"/>
+<unit id="org.eclipse.rcp.id" version="3.6.0.I20100608-0911"/>
+<unit id="org.eclipse.rcp.sdk.id" version="3.6.0.I20100608-0911"/>
+<unit id="org.eclipse.releng.tools.feature.group" version="3.3.0.v20100427-44A77w31211642"/>
+<unit id="org.eclipse.sdk.ide" version="3.6.0.I20100608-0911"/>
+<unit id="org.eclipse.sdk.examples.feature.group" version="3.3.0.v20100527-817fFcfFEdcVbpRlgyBRcVX"/>
+<unit id="org.eclipse.sdk.examples.source.feature.group" version="3.3.0.v20100527"/>
+<unit id="org.eclipse.equinox.compendium.sdk.feature.group" version="3.6.0.v20100421-7V7RFisFNObpCoqow"/>
+<unit id="org.eclipse.equinox.core.sdk.feature.group" version="3.6.0.v20100603-7sF99FsFFUu63a35g6s"/>
+<unit id="org.eclipse.equinox.p2.discovery.feature.feature.group" version="1.0.0.v20100510-4--9oB5855K7P"/>
+<unit id="org.eclipse.equinox.p2.user.ui.feature.group" version="2.0.0.v20100503-897HFZ-FdHjO2NQo0sD_Nt"/>
+<unit id="org.eclipse.equinox.p2.sdk.feature.group" version="3.6.0.v20100503-9I7VGA7GJYarNd6yCqyUvA"/>
+<unit id="org.eclipse.equinox.serverside.sdk.feature.group" version="3.6.0.v20100421-7u7NFVgFN5JdPKM_N9VZwrdLT4m2"/>
+<unit id="org.eclipse.equinox.sdk.feature.group" version="3.6.0.v20100601-7H7R-7v8rtGVR34XkO3kfH3DUO07"/>
+<unit id="org.eclipse.equinox.weaving.sdk.feature.group" version="1.0.0.v20100421-79--EVVFNFFsFc"/>
+<unit id="org.eclipse.equinox.server.jetty.feature.group" version="1.0.0.v20100510-7I777iBgJ9DIARGH8IIQ"/>
+<unit id="org.eclipse.equinox.server.p2.feature.group" version="1.0.0.v20100503-7x7IFGFFT0z0-V-1UUj-XDpu"/>
+<unit id="org.eclipse.pde.api.tools.ee.fragments.feature.group" version="1.0.0.v20100427-7C-7BF9JgLWLMBMMAMsLL"/>
+<unit id="org.eclipse.equinox.p2.ui.admin.rcp.product" version="1.1.0.I20100608-0911"/>
+<unit id="org.eclipse.equinox.server.servletbridge.feature.group" version="1.0.0.v20100510-42A79oB5855K5E"/>
+<unit id="org.eclipse.equinox.server.simple.feature.group" version="1.0.0.v20100510-44DF8s734C48662444"/>
+<repository location="http://download.eclipse.org/eclipse/updates/3.6"/>
+</location>
+<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
+<unit id="org.eclipse.birt.feature.group" version="2.6.0.v20100617-9gF727DGKb0yl9AwWxpmbo35PwQ_"/>
+<unit id="org.eclipse.datatools.connectivity.feature.feature.group" version="1.8.0.v201005280400-7C7b8cEt1ZvsifWcrT8a-F-sz05R"/>
+<unit id="org.eclipse.datatools.enablement.feature.feature.group" version="1.8.0.v201005280400-7J8x0BWwUK6x2yoco_A-q71HMuLt"/>
+<unit id="org.eclipse.datatools.sdk.feature.feature.group" version="1.8.0.v201005280400-7P9i0FDxNYrk4QYG-9qpz0N-vbEp"/>
+<unit id="org.eclipse.datatools.enablement.jdt.feature.feature.group" version="1.8.0.v201005280400-2-07w31211518181A"/>
+<unit id="org.eclipse.datatools.modelbase.feature.feature.group" version="1.8.0.v201005280400-77077CcNBGKBWJ_HWVi"/>
+<unit id="org.eclipse.draw2d.feature.group" version="3.6.0.v20100519-2050-45-7w3121163602336"/>
+<unit id="org.eclipse.gef.feature.group" version="3.6.0.v20100519-2050-777B-81A2Bz-69793A8B83447"/>
+<unit id="org.eclipse.zest.feature.group" version="1.2.0.v20100519-2050-678-8yE4F-8HAH4DFEF3447"/>
+<repository location="http://download.jboss.org/jbosstools/updates/helios/"/>
+</location>
+<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
+<unit id="org.eclipse.jst.jee" version="1.0.300.v201005191301"/>
+<unit id="org.eclipse.wst.common.frameworks" version="1.2.0.v201003040800"/>
+<unit id="org.eclipse.wst.common.project.facet.ui" version="1.4.100.v201005190114"/>
+<unit id="org.eclipse.jst.jee.web" version="1.0.300.v201004280739"/>
+<unit id="org.eclipse.jst.common.fproj.enablement.jdt.feature.group" version="3.2.0.v201005241600-377A78s73533C6A6B39"/>
+
+<unit id="org.eclipse.jst.ws.axis2tools.feature.feature.group" version="1.1.100.v201005241530-78-FF0DZRDKDDePSKwHj"/>
+<unit id="org.eclipse.jst.ws.cxf.feature.feature.group" version="1.0.0.v201005241530-7H777BFAKlOiOX8lGdLp-67BD"/>
+<unit id="org.eclipse.jpt.feature.feature.group" version="2.3.0.v201005260000-7N7UEwFD3wTgbU_dxVnWV"/>
+<unit id="org.eclipse.wst.common.fproj.feature.group" version="3.2.0.v201005290030-377A78s73533D5L355B"/>
+<unit id="org.eclipse.jst.enterprise_ui.feature.feature.group" version="3.2.0.v201005241530-7b7GHTYFSK2W9kPaFClvz0O_NQmN"/>
+<unit id="org.eclipse.wst.web_ui.feature.feature.group" version="3.2.0.v201005241510-7O7CFb3EMf84nP-FHuc10NTz--M3"/>
+<unit id="org.eclipse.wst.xml_ui.feature.feature.group" version="3.2.0.v201005241510-7H7AFUIDxumQGOb7ocjUR2Pvz-28"/>
+<unit id="org.eclipse.wst.xsl.feature.feature.group" version="1.1.0.v201005241600-7S7WFAKFIpS---NRIS1pbfYBUIQ"/>
+<unit id="org.eclipse.jst.jsf.tests.feature.feature.group" version="3.2.0.v20100524-7E7W1FBBoPbPQIiTa3454"/>
+<unit id="org.eclipse.wst.jsdt.feature.feature.group" version="1.2.0.v201005270528-7C78FGDF9JgLWLMBWz-Ose6"/>
+<unit id="org.eclipse.jsf.feature.feature.group" version="3.2.0.v20100526-7E7I-F9JgLWLMBYy3114"/>
+<unit id="org.eclipse.jst.ws.jaxws.dom.feature.feature.group" version="1.0.0.v201005241530-5--AkF7B77NBZBgBg"/>
+<unit id="org.eclipse.jst.ws.jaxws.feature.feature.group" version="1.0.0.v201005241530-7E777BF8NcJSSJxUETx_l"/>
+<unit id="org.eclipse.jst.enterprise_core.feature.feature.group" version="3.2.0.v201005241530-52FMRAkF7B77PDV8V97"/>
+<unit id="org.eclipse.jst.server_adapters.ext.feature.feature.group" version="3.2.0.v201005241530-777HFGPCcNBDiBgIc4BA8"/>
+<unit id="org.eclipse.jst.server_adapters.feature.feature.group" version="3.2.0.v201005241530-208Z7w31211419"/>
+<unit id="org.eclipse.jst.server_core.feature.feature.group" version="3.2.0.v201005241530-31FA28s73533C66"/>
+<unit id="org.eclipse.jst.server_ui.feature.feature.group" version="3.2.0.v201005241530-7A5FEh9xFc7RCGLRBAIOJC43A"/>
+<unit id="org.eclipse.jst.web_ui.feature.feature.group" version="3.2.0.v201005250611-7F77FJJC25Skdw1pheuO_q6p-Idh"/>
+<unit id="org.eclipse.jsf.feature.source.feature.group" version="3.2.0.v20100526-7E7I-F9JgLWLMBYy3114"/>
+<unit id="org.eclipse.wst.xml.xpath2.processor.feature.feature.group" version="1.1.3.v201006151143-67K0BgJ9DIATEXATHP"/>
+<unit id="org.eclipse.jst.webpageeditor.feature.feature.group" version="2.3.0.v20100526-46-9oB5855H7H"/>
+<unit id="org.eclipse.wst.ws_wsdl15.feature.feature.group" version="1.5.300.v201005241450-2407w312116191741"/>
+<unit id="org.eclipse.wst.common_core.feature.feature.group" version="3.2.0.v201005241600-7B7DFEdF7RZHOZIvUqM4NJ"/>
+<unit id="org.eclipse.wst.common_ui.feature.feature.group" version="3.2.0.v201005241600-7C78FPcEdhO_mXOgHjYfp_JwVrN5"/>
+<unit id="org.eclipse.wst.server_adapters.feature.feature.group" version="3.2.0.v201005241510-51EoAkF77g8HBSc"/>
+<unit id="org.eclipse.wst.server_core.feature.feature.group" version="3.2.0.v201005241510-30F8T8s734C3E4K"/>
+<unit id="org.eclipse.wst.server_ui.feature.feature.group" version="3.2.0.v201005241510-7B4FBmAtJb1lEOKcCJHLHQ347"/>
+<unit id="org.eclipse.wst.web_core.feature.feature.group" version="3.2.0.v201005241510-7E7AFHkAJrn5NL_6wTQDqKL5RwiQ"/>
+<unit id="org.eclipse.wst.ws_ui.feature.feature.group" version="3.2.0.v201005241510-7I78FXbEtEoKvbtBtJ4fGNrH2oBH"/>
+<unit id="org.eclipse.wst.xml_core.feature.feature.group" version="3.2.0.v201005241510-7C7OFXTF7RZHQHHxO4IuKe"/>
<repository location="http://download.eclipse.org/webtools/downloads/drops/R3.2.0/R-3.2.0-20100..."/>
-<unit id="org.eclipse.wst.common.emfworkbench.integration" version="1.2.0.v201004110600"/>
</location>
</locations>
<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
15 years, 5 months
JBoss Tools SVN: r24009 - trunk.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2010-08-09 16:05:21 -0400 (Mon, 09 Aug 2010)
New Revision: 24009
Added:
trunk/xulrunner-1.9.1.2/
Log:
copy xulrunner 1.9.1.2 builder from 3.2.helios branch into trunk for reuse in M2 builds
Copied: trunk/xulrunner-1.9.1.2 (from rev 24008, branches/3.2.helios/xulrunner)
15 years, 5 months
JBoss Tools SVN: r24008 - trunk/build/parent.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2010-08-09 13:39:29 -0400 (Mon, 09 Aug 2010)
New Revision: 24008
Modified:
trunk/build/parent/pom.xml
Log:
add xulrunner 1.9.1.2 site into helios-no-target profile
Modified: trunk/build/parent/pom.xml
===================================================================
--- trunk/build/parent/pom.xml 2010-08-09 17:27:27 UTC (rev 24007)
+++ trunk/build/parent/pom.xml 2010-08-09 17:39:29 UTC (rev 24008)
@@ -275,6 +275,18 @@
<enabled>true</enabled>
</releases>
</repository>
+ <repository>
+ <id>jboss-xulrunner-1.9.1.2</id>
+ <url>http://download.jboss.org/jbosstools/updates/xulrunner/
+ </url>
+ <layout>p2</layout>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </repository>
<!--repository>
<id>jboss-xulrunner-1.9.2</id>
<url>http://download.jboss.org/jbosstools/updates/xulrunner-1.9.2/
15 years, 5 months
JBoss Tools SVN: r24007 - trunk/tests/features/org.jboss.tools.test.sdk.feature.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2010-08-09 13:27:27 -0400 (Mon, 09 Aug 2010)
New Revision: 24007
Modified:
trunk/tests/features/org.jboss.tools.test.sdk.feature/feature.xml
Log:
add org.jboss.tools.ui.bot.ext(.test) to rt feature
Modified: trunk/tests/features/org.jboss.tools.test.sdk.feature/feature.xml
===================================================================
--- trunk/tests/features/org.jboss.tools.test.sdk.feature/feature.xml 2010-08-09 17:25:48 UTC (rev 24006)
+++ trunk/tests/features/org.jboss.tools.test.sdk.feature/feature.xml 2010-08-09 17:27:27 UTC (rev 24007)
@@ -299,6 +299,13 @@
install-size="0"
version="0.0.0"
unpack="false"/>
+
+ <plugin
+ id="org.jboss.tools.ui.bot.ext.test"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
<plugin
id="org.jboss.tools.struts.ui.bot.test"
15 years, 5 months
JBoss Tools SVN: r24006 - trunk/tests/features/org.jboss.tools.test.feature.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2010-08-09 13:25:48 -0400 (Mon, 09 Aug 2010)
New Revision: 24006
Modified:
trunk/tests/features/org.jboss.tools.test.feature/feature.xml
Log:
add org.jboss.tools.ui.bot.ext(.test) to rt feature
Modified: trunk/tests/features/org.jboss.tools.test.feature/feature.xml
===================================================================
--- trunk/tests/features/org.jboss.tools.test.feature/feature.xml 2010-08-09 17:24:18 UTC (rev 24005)
+++ trunk/tests/features/org.jboss.tools.test.feature/feature.xml 2010-08-09 17:25:48 UTC (rev 24006)
@@ -34,4 +34,16 @@
install-size="0"
version="0.0.0"/>
+ <plugin
+ id="org.jboss.tools.ui.bot.ext"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"/>
+
+ <plugin
+ id="org.jboss.tools.ui.bot.ext.test"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"/>
+
</feature>
15 years, 5 months