JBoss Tools SVN: r19467 - trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2009-12-18 11:24:22 -0500 (Fri, 18 Dec 2009)
New Revision: 19467
Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/ObjectMultiPageEditor.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-5446
Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/ObjectMultiPageEditor.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/ObjectMultiPageEditor.java 2009-12-18 16:10:52 UTC (rev 19466)
+++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/ObjectMultiPageEditor.java 2009-12-18 16:24:22 UTC (rev 19467)
@@ -41,6 +41,8 @@
import org.eclipse.ui.part.MultiPageEditorPart;
import org.eclipse.ui.part.MultiPageEditorSite;
import org.eclipse.ui.texteditor.AbstractTextEditor;
+import org.eclipse.ui.texteditor.IDocumentProvider;
+import org.eclipse.ui.texteditor.IDocumentProviderExtension;
import org.eclipse.ui.texteditor.ITextEditor;
import org.eclipse.ui.views.contentoutline.IContentOutlinePage;
import org.eclipse.wst.sse.ui.StructuredTextEditor;
@@ -811,6 +813,25 @@
IFile file = ((IFileEditorInput)input).getFile();
if(file.isSynchronized(IResource.DEPTH_ZERO)) return;
f.updateChildFile(o, file.getLocation().toFile());
+ if(textEditor instanceof ITextEditor) {
+ IDocumentProvider provider = ((ITextEditor)textEditor).getDocumentProvider();
+ if(provider instanceof IDocumentProviderExtension) {
+ IDocumentProviderExtension extension= (IDocumentProviderExtension) provider;
+ try {
+ extension.synchronize(input);
+ } catch (CoreException e) {
+ ModelUIPlugin.getDefault().logError(e);
+ }
+ }
+ } else {
+ try {
+ file.refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor());
+ } catch (CoreException e) {
+ ModelUIPlugin.getDefault().logError(e);
+ }
+ }
+ f.setModified(false);
+ firePropertyChange(ITextEditor.PROP_DIRTY);
}
}
15 years
JBoss Tools SVN: r19466 - documentation/trunk/movies/index/en.
by jbosstools-commits＠lists.jboss.org
Author: ochikvina
Date: 2009-12-18 11:10:52 -0500 (Fri, 18 Dec 2009)
New Revision: 19466
Modified:
documentation/trunk/movies/index/en/master.xml
Log:
https://jira.jboss.org/jira/browse/JBDS-814 - added the reverence to the new demo and its short description;
Modified: documentation/trunk/movies/index/en/master.xml
===================================================================
--- documentation/trunk/movies/index/en/master.xml 2009-12-18 16:08:00 UTC (rev 19465)
+++ documentation/trunk/movies/index/en/master.xml 2009-12-18 16:10:52 UTC (rev 19466)
@@ -84,6 +84,13 @@
</para>
<para>This demo covers a creation of a jsf application with simple content using the RichFaces components</para>
</listitem>
+
+ <listitem>
+ <para>
+ <ulink url="demos/facelets_support_in_vpe/facelets_support_in_vpe.htm">Support of custom Facelets components in the VPE</ulink>
+ </para>
+ <para>This movie demonstrates a new feature of the Visual Page Editor to support custom Facelets components</para>
+ </listitem>
</itemizedlist>
15 years
JBoss Tools SVN: r19465 - in documentation/trunk/movies: facelets_support_in_vpe and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: ochikvina
Date: 2009-12-18 11:08:00 -0500 (Fri, 18 Dec 2009)
New Revision: 19465
Added:
documentation/trunk/movies/facelets_support_in_vpe/
documentation/trunk/movies/facelets_support_in_vpe/facelets_support_in_vpe.wnk
documentation/trunk/movies/facelets_support_in_vpe/readme.txt
Log:
https://jira.jboss.org/jira/browse/JBDS-814 - adding new demo;
Added: documentation/trunk/movies/facelets_support_in_vpe/facelets_support_in_vpe.wnk
===================================================================
(Binary files differ)
Property changes on: documentation/trunk/movies/facelets_support_in_vpe/facelets_support_in_vpe.wnk
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: documentation/trunk/movies/facelets_support_in_vpe/readme.txt
===================================================================
--- documentation/trunk/movies/facelets_support_in_vpe/readme.txt (rev 0)
+++ documentation/trunk/movies/facelets_support_in_vpe/readme.txt 2009-12-18 16:08:00 UTC (rev 19465)
@@ -0,0 +1,25 @@
+To apply Jboss org styles to the generated HTML file, you should do next:
+
+
+- first, add the HEAD of the HTML document to attach a style sheet, a tab icon and a title of the page:
+
+ <head>
+ <title>Support of Custom Facelets Components in the Visual Page Editor</title>
+ <link rel="stylesheet" href="../resources/tools.css"
+ type="text/css"/>
+ <link xmlns="" rel="shortcut icon" type="image/vnd.microsoft.icon" href="../resources/images/favicon.ico"/>
+ </head>
+
+
+- place the generated by Wink OBJECT inside this block element:
+
+ <div class="book">
+ <p id="title"><a href="http://www.jboss.org" class="site_href">
+ <strong>JBoss.org</strong></a><a href="http://docs.jboss.org/" class="doc_href">
+ <strong>Community Demos</strong></a></p>
+
+ <--! Place the OBJECT generated by Wink here. -->
+
+ </div>
+
+
\ No newline at end of file
15 years
JBoss Tools SVN: r19464 - trunk/esb/docs/esb_ref_guide/en/modules.
by jbosstools-commits＠lists.jboss.org
Author: smukhina
Date: 2009-12-18 10:16:10 -0500 (Fri, 18 Dec 2009)
New Revision: 19464
Modified:
trunk/esb/docs/esb_ref_guide/en/modules/esb_editor.xml
Log:
https://jira.jboss.org/jira/browse/JBDS-981 ESB Editor - linking in other editors is appropriate - esb editor section is updated
Modified: trunk/esb/docs/esb_ref_guide/en/modules/esb_editor.xml
===================================================================
--- trunk/esb/docs/esb_ref_guide/en/modules/esb_editor.xml 2009-12-18 14:45:16 UTC (rev 19463)
+++ trunk/esb/docs/esb_ref_guide/en/modules/esb_editor.xml 2009-12-18 15:16:10 UTC (rev 19464)
@@ -34,6 +34,18 @@
</imageobject>
</mediaobject>
</figure>
+
+ <para>Some properties are represented as links to the associated editors.</para>
+
+ <figure id="TreeViewLink">
+ <title>Property Link to the Associated Editor</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/esb_editor/01a_esb_tree_view_and_links.png"/>
+ </imageobject>
+ </mediaobject>
+ </figure>
+
<para>You can easily switch from Tree to Source by selecting the Source tab at the bottom of
the editor and work in <property>Source view</property>.</para>
15 years
JBoss Tools SVN: r19463 - trunk/jst/plugins/org.jboss.tools.jst.web/resources/meta.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2009-12-18 09:45:16 -0500 (Fri, 18 Dec 2009)
New Revision: 19463
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web/resources/meta/strutswebapp.meta
Log:
https://jira.jboss.org/jira/browse/JBIDE-5521
Modified: trunk/jst/plugins/org.jboss.tools.jst.web/resources/meta/strutswebapp.meta
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web/resources/meta/strutswebapp.meta 2009-12-18 14:43:51 UTC (rev 19462)
+++ trunk/jst/plugins/org.jboss.tools.jst.web/resources/meta/strutswebapp.meta 2009-12-18 14:45:16 UTC (rev 19463)
@@ -2530,7 +2530,10 @@
<XModelAttribute default="servlet mapping" loader="ElementType" name="element type">
<Editor name="Uneditable"/>
</XModelAttribute>
- <XModelAttribute PROPERTIES="id=true;save=always" name="servlet-name" xmlname="servlet-name.#text"/>
+ <XModelAttribute PROPERTIES="id=true;save=always" name="servlet-name" xmlname="servlet-name.#text">
+ <Constraint loader="ListString"/>
+ <Editor name="ServletList"/>
+ </XModelAttribute>
<XModelAttribute PROPERTIES="save=always" name="url-pattern" xmlname="url-pattern.#text"/>
<XModelAttribute name="id" visibility="false" xmlname="id"/>
<XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment">
15 years
JBoss Tools SVN: r19462 - in trunk/jst/plugins/org.jboss.tools.jst.web.ui: src/org/jboss/tools/jst/web/ui/attribute/adapter and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2009-12-18 09:43:51 -0500 (Fri, 18 Dec 2009)
New Revision: 19462
Added:
trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/attribute/adapter/ServletNameListAdapter.java
trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/attribute/adapter/ServletNameListContentProvider.java
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web.ui/plugin.xml
Log:
https://jira.jboss.org/jira/browse/JBIDE-5521
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.ui/plugin.xml
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.ui/plugin.xml 2009-12-18 13:57:23 UTC (rev 19461)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.ui/plugin.xml 2009-12-18 14:43:51 UTC (rev 19462)
@@ -15,6 +15,8 @@
</attributeAdapter>
<attributeAdapter class="org.jboss.tools.jst.web.ui.attribute.adapter.LibrarySetListAdapter" id="LibrarySetList">
</attributeAdapter>
+ <attributeAdapter class="org.jboss.tools.jst.web.ui.attribute.adapter.ServletNameListAdapter" id="ServletList">
+ </attributeAdapter>
</extension>
<extension point="org.jboss.tools.common.model.ui.attributeEditor">
<attributeEditor class="org.jboss.tools.common.model.ui.attribute.editor.ComboBoxEditor" id="WebRoleList">
@@ -23,6 +25,8 @@
</attributeEditor>
<attributeEditor class="org.jboss.tools.common.model.ui.attribute.editor.ComboBoxEditor" id="LibrarySetList">
</attributeEditor>
+ <attributeEditor class="org.jboss.tools.common.model.ui.attribute.editor.ComboBoxEditor" id="ServletList">
+ </attributeEditor>
</extension>
<extension id="e" name="XML Editors" point="org.jboss.tools.common.model.ui.xmlEditor">
Added: trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/attribute/adapter/ServletNameListAdapter.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/attribute/adapter/ServletNameListAdapter.java (rev 0)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/attribute/adapter/ServletNameListAdapter.java 2009-12-18 14:43:51 UTC (rev 19462)
@@ -0,0 +1,31 @@
+/*******************************************************************************
+ * 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.jst.web.ui.attribute.adapter;
+
+import org.jboss.tools.common.model.ui.attribute.*;
+import org.jboss.tools.common.model.ui.attribute.adapter.*;
+import org.jboss.tools.common.meta.XAttribute;
+
+/**
+ *
+ * @author Viacheslav Kabanovich
+ *
+ */
+public class ServletNameListAdapter extends DefaultComboBoxValueAdapter {
+
+ protected IListContentProvider createListContentProvider(XAttribute attribute) {
+ ServletNameListContentProvider p = new ServletNameListContentProvider();
+ p.setModel(model, modelObject);
+ p.setAttribute(attribute);
+ return p;
+ }
+
+}
Property changes on: trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/attribute/adapter/ServletNameListAdapter.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/attribute/adapter/ServletNameListContentProvider.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/attribute/adapter/ServletNameListContentProvider.java (rev 0)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/attribute/adapter/ServletNameListContentProvider.java 2009-12-18 14:43:51 UTC (rev 19462)
@@ -0,0 +1,46 @@
+/*******************************************************************************
+ * 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.jst.web.ui.attribute.adapter;
+
+import org.jboss.tools.common.model.*;
+import org.jboss.tools.jst.web.model.helpers.WebAppHelper;
+
+import org.jboss.tools.common.model.ui.attribute.adapter.DefaultXAttributeListContentProvider;
+
+/**
+ *
+ * @author Viacheslav Kabanovich
+ *
+ */
+public class ServletNameListContentProvider extends DefaultXAttributeListContentProvider {
+ private XModel model;
+ private XModelObject object;
+
+ public void setModel(XModel model, XModelObject context) {
+ this.model = model;
+ object = context;
+ }
+
+ protected void loadTags() {
+ XModelObject webxml = null;
+ if(object != null) {
+ XModelObject f = object;
+ while(f != null && f.getFileType() != XModelObject.FILE) f = f.getParent();
+ if(f != null) webxml = f;
+ }
+ if(webxml == null) webxml = WebAppHelper.getWebApp(model);
+ if(webxml == null) return;
+ XModelObject[] os = WebAppHelper.getServlets(webxml);
+ tags = new String[os.length];
+ for (int i = 0; i < tags.length; i++) tags[i] = os[i].getAttributeValue("servlet-name"); //$NON-NLS-1$
+ }
+
+}
Property changes on: trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/attribute/adapter/ServletNameListContentProvider.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
15 years
JBoss Tools SVN: r19461 - in trunk: jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web and 8 other directories.
by jbosstools-commits＠lists.jboss.org
Author: mareshkau
Date: 2009-12-18 08:57:23 -0500 (Fri, 18 Dec 2009)
New Revision: 19461
Added:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/pages/JBIDE/5516/
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/pages/JBIDE/5516/jbide5516.xhtml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/pages/JBIDE/5516/jbide5516.xhtml.xml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/taglibs/
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/taglibs/components/
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/taglibs/components/paginator.xhtml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/taglibs/mareshkau.taglib.xml
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/pv/JSFProjectTagLibs.java
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/JSFWebHelper.java
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/WEB-INF/web.xml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/TestForUsingComponentsLibrariesWithDefaultNamespace.java
trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tld/TaglibMapping.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-5516 javax.faces.FACELETS_LIBRARIES processing has been added
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/pv/JSFProjectTagLibs.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/pv/JSFProjectTagLibs.java 2009-12-18 13:41:32 UTC (rev 19460)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/pv/JSFProjectTagLibs.java 2009-12-18 13:57:23 UTC (rev 19461)
@@ -71,6 +71,7 @@
XModelObject webRoot = FileSystemsHelper.getWebRoot(getModel());
if(webxml == null || webRoot == null) return null;
XModelObject cp = WebAppHelper.findWebAppContextParam(webxml, "facelets.LIBRARIES");
+ if(cp == null) cp = WebAppHelper.findWebAppContextParam(webxml, "javax.faces.FACELETS_LIBRARIES");
if(cp == null) return null;
String value = cp.getAttributeValue("param-value");
if(value == null || value.length() == 0) return null;
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/JSFWebHelper.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/JSFWebHelper.java 2009-12-18 13:41:32 UTC (rev 19460)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/JSFWebHelper.java 2009-12-18 13:57:23 UTC (rev 19461)
@@ -38,6 +38,13 @@
";"
);
+ public static ConfigFilesData FACELETS_LIBRARIES =
+ new ConfigFilesData(
+ "javax.faces.FACELETS_LIBRARIES",
+ new String[]{},
+ ";"
+ );
+
static {
FACES_CONFIG_DATA.usesDefaultWithoutRegistration = true;
}
@@ -68,8 +75,9 @@
public static void registerFaceletsTaglib(XModel model, String path) throws XModelException {
registerConfigFile(model, path, FACELET_TAGLIB_DATA);
+ registerConfigFile(model, path, FACELETS_LIBRARIES);
}
-
+
public static XModelObject findInitParam(XModelObject webxml) {
return findInitParam(webxml, FACES_CONFIG_DATA.param);
}
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/WEB-INF/web.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/WEB-INF/web.xml 2009-12-18 13:41:32 UTC (rev 19460)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/WEB-INF/web.xml 2009-12-18 13:57:23 UTC (rev 19461)
@@ -8,7 +8,12 @@
<display-name>
JavaServer Faces 2.0 Test Application
</display-name>
-
+
+ <context-param>
+ <param-name>javax.faces.FACELETS_LIBRARIES</param-name>
+ <param-value>/taglibs/mareshkau.taglib.xml</param-value>
+ </context-param>
+
<servlet>
<servlet-name>Faces Servlet</servlet-name>
<servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/pages/JBIDE/5516/jbide5516.xhtml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/pages/JBIDE/5516/jbide5516.xhtml (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/pages/JBIDE/5516/jbide5516.xhtml 2009-12-18 13:57:23 UTC (rev 19461)
@@ -0,0 +1,11 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:aj="https://javaserverfaces.dev.java.net/demo/ajax"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:ma="http://mareshkau/tags">
+<h:body id="jbide5516">
+<ma:paginator />
+</h:body>
+</html>
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/pages/JBIDE/5516/jbide5516.xhtml.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/pages/JBIDE/5516/jbide5516.xhtml.xml (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/pages/JBIDE/5516/jbide5516.xhtml.xml 2009-12-18 13:57:23 UTC (rev 19461)
@@ -0,0 +1,30 @@
+<tests>
+<test id="jbide5516">
+<DIV ID="jbide5516">
+<DIV VPE:INCLUDE-ELEMENT="yes" STYLE="-moz-user-modify: read-only;">
+<TABLE BORDER="0" STYLE="margin-right: auto; margin-left: auto; -moz-user-modify: read-only;">
+<TBODY>
+<TR>
+<TD>
+<INPUT TYPE="submit" VALUE="1" STYLE="-moz-user-modify: read-only;"/>
+
+</TD>
+<TD>
+<INPUT TYPE="submit" VALUE="2" STYLE="-moz-user-modify: read-only;"/>
+
+</TD>
+<TD>
+<INPUT TYPE="submit" VALUE="3" STYLE="-moz-user-modify: read-only;"/>
+
+</TD>
+<TD>
+<INPUT TYPE="submit" VALUE="4" STYLE="-moz-user-modify: read-only;"/>
+
+</TD>
+</TR>
+</TBODY>
+</TABLE>
+</DIV>
+</DIV>
+</test>
+</tests>
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/taglibs/components/paginator.xhtml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/taglibs/components/paginator.xhtml (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/taglibs/components/paginator.xhtml 2009-12-18 13:57:23 UTC (rev 19461)
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core">
+<ui:component>
+ <h:panelGrid style="margin-right:auto;margin-left:auto;" columns="4">
+ <h:commandButton value="1" type="submit" >
+ </h:commandButton>
+ <h:commandButton value="2" type="submit" >
+ </h:commandButton>
+ <h:commandButton value="3" type="submit" >
+ </h:commandButton>
+ <h:commandButton value="4" type="submit">
+ </h:commandButton>
+ </h:panelGrid>
+</ui:component>
+</html>
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/taglibs/mareshkau.taglib.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/taglibs/mareshkau.taglib.xml (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/taglibs/mareshkau.taglib.xml 2009-12-18 13:57:23 UTC (rev 19461)
@@ -0,0 +1,10 @@
+<!DOCTYPE facelet-taglib PUBLIC
+ "-//Sun Microsystems, Inc.//DTD Facelet Taglib 1.0//EN"
+ "http://java.sun.com/dtd/web-facesconfig_1_0.dtd">
+<facelet-taglib>
+ <namespace>http://mareshkau/tags</namespace>
+ <tag>
+ <tag-name>paginator</tag-name>
+ <source>components/paginator.xhtml</source>
+ </tag>
+</facelet-taglib>
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/TestForUsingComponentsLibrariesWithDefaultNamespace.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/TestForUsingComponentsLibrariesWithDefaultNamespace.java 2009-12-18 13:41:32 UTC (rev 19460)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/TestForUsingComponentsLibrariesWithDefaultNamespace.java 2009-12-18 13:57:23 UTC (rev 19461)
@@ -28,7 +28,13 @@
performContentTest("JBIDE/5352/jbide5352.xhtml"); //$NON-NLS-1$
}
-
+ /**
+ * Test Case for https://jira.jboss.org/jira/browse/JBIDE-5516
+ * @throws Throwable
+ */
+ public void testFaceletsLibrariesSupport() throws Throwable{
+ performContentTest("JBIDE/5516/jbide5516.xhtml"); //$NON-NLS-1$
+ }
@Override
protected String getTestProjectName() {
return JsfAllTests.IMPORT_JSF_20_PROJECT_NAME;
Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tld/TaglibMapping.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tld/TaglibMapping.java 2009-12-18 13:41:32 UTC (rev 19460)
+++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tld/TaglibMapping.java 2009-12-18 13:57:23 UTC (rev 19461)
@@ -90,6 +90,7 @@
XModelObject webRoot = FileSystemsHelper.getWebRoot(model);
if(webxml == null || webRoot == null) return;
XModelObject cp = WebAppHelper.findWebAppContextParam(webxml, "facelets.LIBRARIES"); //$NON-NLS-1$
+ if(cp == null) cp = WebAppHelper.findWebAppContextParam(webxml, "javax.faces.FACELETS_LIBRARIES");
if(cp == null) return;
String paths = cp.getAttributeValue("param-value"); //$NON-NLS-1$
if(paths == null || paths.length() == 0) return;
15 years
JBoss Tools SVN: r19460 - trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute.
by jbosstools-commits＠lists.jboss.org
Author: yzhishko
Date: 2009-12-18 08:41:32 -0500 (Fri, 18 Dec 2009)
New Revision: 19460
Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/XAttributeSupport.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-5474 unused imports were deleted
Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/XAttributeSupport.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/XAttributeSupport.java 2009-12-18 13:37:15 UTC (rev 19459)
+++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/XAttributeSupport.java 2009-12-18 13:41:32 UTC (rev 19460)
@@ -28,7 +28,6 @@
import org.jboss.tools.common.model.ui.attribute.editor.ExtendedFieldEditor;
import org.jboss.tools.common.model.ui.attribute.editor.IFieldEditor;
import org.jboss.tools.common.model.ui.attribute.editor.IPropertyEditor;
-import org.jboss.tools.common.model.ui.attribute.editor.JavaHyperlinkLineFieldEditor;
import org.jboss.tools.common.model.ui.attribute.editor.NoteEditor;
import org.jboss.tools.common.model.ui.attribute.editor.NoteFieldEditor;
import org.jboss.tools.common.model.ui.attribute.editor.PropertyEditor;
@@ -42,7 +41,6 @@
import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Layout;
import org.eclipse.ui.actions.ActionFactory;
-
import org.jboss.tools.common.meta.XAttribute;
import org.jboss.tools.common.meta.action.XAttributeData;
import org.jboss.tools.common.meta.action.XEntityData;
@@ -51,7 +49,6 @@
import org.jboss.tools.common.model.ui.ModelUIPlugin;
import org.jboss.tools.common.model.ui.widgets.DefaultSettings;
import org.jboss.tools.common.model.ui.widgets.IWidgetSettings;
-import org.jboss.tools.common.model.ui.wizards.OneStepWizard;
/**
* @author eskimo
15 years
JBoss Tools SVN: r19459 - trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute.
by jbosstools-commits＠lists.jboss.org
Author: yzhishko
Date: 2009-12-18 08:37:15 -0500 (Fri, 18 Dec 2009)
New Revision: 19459
Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/XAttributeSupport.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-5474
Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/XAttributeSupport.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/XAttributeSupport.java 2009-12-18 06:53:24 UTC (rev 19458)
+++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/XAttributeSupport.java 2009-12-18 13:37:15 UTC (rev 19459)
@@ -29,6 +29,8 @@
import org.jboss.tools.common.model.ui.attribute.editor.IFieldEditor;
import org.jboss.tools.common.model.ui.attribute.editor.IPropertyEditor;
import org.jboss.tools.common.model.ui.attribute.editor.JavaHyperlinkLineFieldEditor;
+import org.jboss.tools.common.model.ui.attribute.editor.NoteEditor;
+import org.jboss.tools.common.model.ui.attribute.editor.NoteFieldEditor;
import org.jboss.tools.common.model.ui.attribute.editor.PropertyEditor;
import org.jboss.tools.common.model.ui.attribute.editor.PropertyEditorFactory;
import org.jboss.tools.common.model.ui.attribute.editor.StringButtonFieldEditorEx;
@@ -49,6 +51,7 @@
import org.jboss.tools.common.model.ui.ModelUIPlugin;
import org.jboss.tools.common.model.ui.widgets.DefaultSettings;
import org.jboss.tools.common.model.ui.widgets.IWidgetSettings;
+import org.jboss.tools.common.model.ui.wizards.OneStepWizard;
/**
* @author eskimo
@@ -256,6 +259,9 @@
if(greedy) {
int h = control.computeSize(SWT.DEFAULT, SWT.DEFAULT).y;
if(h > 300) gd.heightHint = 300;
+ if (fieldEditor instanceof NoteFieldEditor) {
+ gd.heightHint = 100;
+ }
}
control.setLayoutData(gd);
} else if (controls.length==1) {
@@ -278,6 +284,7 @@
composite.setBackgroundMode(SWT.INHERIT_DEFAULT);
int greedyCount = 0;
+ sortEditors();
for (int i = 0; i < editors.size(); i++) {
PropertyEditor editor = (PropertyEditor)editors.get(i);
if(editor.isGreedyEditor()) ++greedyCount;
@@ -287,7 +294,7 @@
//editor.setLabelText(support.getAttributeMessage(id, ads[i].getAttribute().getName()));
ExtendedFieldEditor fieldEditor = null;
boolean greedy = editor.isGreedyEditor();
- if(!greedy || keepGreedy(editor.getAttributeName(), i, greedyCount)) {
+ if(!greedy || keepGreedy(editor.getAttributeName(), i, greedyCount) || editor instanceof NoteEditor) {
fieldEditor = editor.getFieldEditor(composite);
} else {
StringButtonFieldEditorEx sb;
@@ -313,50 +320,64 @@
}
}
}
+
+ private void sortEditors(){
+ PropertyEditor editor = null;
+ for (int i = 0; i < editors.size(); i++) {
+ editor = editors.get(i);
+ if ("description".equalsIgnoreCase(editor.getAttributeName())) {
+ editors.remove(editor);
+ editors.add(editor);
+ return;
+ }
+ }
+ }
public Composite createControl(Composite parent) {
Composite composite = new Composite(parent, SWT.NONE);
- composite.setBackgroundMode(SWT.INHERIT_DEFAULT);
+// composite.setBackgroundMode(SWT.INHERIT_DEFAULT);
// composite.setBackground(parent.getBackground());
- composite.setLayout(getLayout());
- int greedyCount = 0;
- for (int i = 0; i < editors.size(); i++) {
- PropertyEditor editor = (PropertyEditor)editors.get(i);
- if(editor.isGreedyEditor()) ++greedyCount;
- }
-
- for (int i = 0; i < editors.size(); i++) {
- PropertyEditor editor = (PropertyEditor)editors.get(i);
- //editor.setLabelText(support.getAttributeMessage(id, ads[i].getAttribute().getName()));
- ExtendedFieldEditor fieldEditor = null;
- boolean greedy = editor.isGreedyEditor();
- if(!greedy || keepGreedy(editor.getAttributeName(), i, greedyCount)) {
- fieldEditor = editor.getFieldEditor(composite);
- } else {
- StringButtonFieldEditorEx sb = null;
-
- sb = new StringButtonFieldEditorEx(settings);
-
- sb.setLabelText(editor.getLabelText());
- String changeButtonName = editor.getChangeButtonName();
- if(changeButtonName != null) {
- sb.setChangeButtonText(changeButtonName);
- }
- sb.setPropertyEditor(editor);
- fieldEditor = sb;
- greedy = false;
- }
- registerFieldEditor(editor.getAttributeName(), fieldEditor);
- if (!enabled) {
- fieldEditor.setEnabled(enabled);
- }
- fillComposite(composite, fieldEditor, greedy);
- if(fieldEditor instanceof StringButtonFieldEditorEx) {
- ((StringButtonFieldEditorEx)fieldEditor).setStringValue("" + editor.getValue()); //$NON-NLS-1$
- }
- }
+ composite.setLayout(getLayout());
+ fillComposite(composite);
+// int greedyCount = 0;
+// sortEditors();
+// for (int i = 0; i < editors.size(); i++) {
+// PropertyEditor editor = (PropertyEditor)editors.get(i);
+// if(editor.isGreedyEditor()) ++greedyCount;
+// }
+//
+// for (int i = 0; i < editors.size(); i++) {
+// PropertyEditor editor = (PropertyEditor)editors.get(i);
+// //editor.setLabelText(support.getAttributeMessage(id, ads[i].getAttribute().getName()));
+// ExtendedFieldEditor fieldEditor = null;
+// boolean greedy = editor.isGreedyEditor();
+// if(!greedy || keepGreedy(editor.getAttributeName(), i, greedyCount) || editor instanceof NoteEditor) {
+// fieldEditor = editor.getFieldEditor(composite);
+// } else {
+// StringButtonFieldEditorEx sb = null;
+//
+// sb = new StringButtonFieldEditorEx(settings);
+//
+// sb.setLabelText(editor.getLabelText());
+// String changeButtonName = editor.getChangeButtonName();
+// if(changeButtonName != null) {
+// sb.setChangeButtonText(changeButtonName);
+// }
+// sb.setPropertyEditor(editor);
+// fieldEditor = sb;
+// greedy = false;
+// }
+// registerFieldEditor(editor.getAttributeName(), fieldEditor);
+// if (!enabled) {
+// fieldEditor.setEnabled(enabled);
+// }
+// fillComposite(composite, fieldEditor, greedy);
+// if(fieldEditor instanceof StringButtonFieldEditorEx) {
+// ((StringButtonFieldEditorEx)fieldEditor).setStringValue("" + editor.getValue()); //$NON-NLS-1$
+// }
+// }
return composite;
}
15 years
JBoss Tools SVN: r19458 - in branches/jbosstools-3.1.0.RC1/esb/plugins: org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/messages and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: dennyxu
Date: 2009-12-18 01:53:24 -0500 (Fri, 18 Dec 2009)
New Revision: 19458
Modified:
branches/jbosstools-3.1.0.RC1/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/runtime/AbstractESBRuntimeResolver.java
branches/jbosstools-3.1.0.RC1/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/runtime/IESBRuntimeResolver.java
branches/jbosstools-3.1.0.RC1/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/runtime/JBossRuntimeManager.java
branches/jbosstools-3.1.0.RC1/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/messages/JBossESBUI.properties
branches/jbosstools-3.1.0.RC1/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/messages/JBossESBUIMessages.java
branches/jbosstools-3.1.0.RC1/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/preference/controls/JBossRuntimeListFieldEditor.java
Log:
JBIDE-5496:new runtime wizard very annoying, version not updated,
update it to be able to set version number automatically if there is version number in jbossesb-rosetta.jar
Modified: branches/jbosstools-3.1.0.RC1/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/runtime/AbstractESBRuntimeResolver.java
===================================================================
--- branches/jbosstools-3.1.0.RC1/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/runtime/AbstractESBRuntimeResolver.java 2009-12-18 06:48:32 UTC (rev 19457)
+++ branches/jbosstools-3.1.0.RC1/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/runtime/AbstractESBRuntimeResolver.java 2009-12-18 06:53:24 UTC (rev 19458)
@@ -44,6 +44,17 @@
return directories;
}
+ public File getRosettaJar(String runtimeLocation , String configuration){
+ List<File> jars = getAllRuntimeJars(runtimeLocation, configuration);
+ for(File file : jars){
+ if(file.getName().equals(ROSETTA_JAR)){
+ return file;
+ }
+ }
+
+ return null;
+ }
+
public List<File> getAllRuntimeJars(String runtimeLocation, String configuration) {
List<File> jarList = new ArrayList<File>();
Modified: branches/jbosstools-3.1.0.RC1/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/runtime/IESBRuntimeResolver.java
===================================================================
--- branches/jbosstools-3.1.0.RC1/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/runtime/IESBRuntimeResolver.java 2009-12-18 06:48:32 UTC (rev 19457)
+++ branches/jbosstools-3.1.0.RC1/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/runtime/IESBRuntimeResolver.java 2009-12-18 06:53:24 UTC (rev 19458)
@@ -13,4 +13,6 @@
public List<IPath> getJarDirectories(String runtimeLocation, String configuration);
public List<File> getAllRuntimeJars(String runtimeLocation, String configuration);
+
+ public File getRosettaJar(String runtimeLocation , String configuration);
}
Modified: branches/jbosstools-3.1.0.RC1/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/runtime/JBossRuntimeManager.java
===================================================================
--- branches/jbosstools-3.1.0.RC1/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/runtime/JBossRuntimeManager.java 2009-12-18 06:48:32 UTC (rev 19457)
+++ branches/jbosstools-3.1.0.RC1/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/runtime/JBossRuntimeManager.java 2009-12-18 06:53:24 UTC (rev 19458)
@@ -13,12 +13,17 @@
import java.io.File;
import java.io.IOException;
+import java.io.InputStream;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.Properties;
import java.util.Set;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipException;
+import java.util.zip.ZipFile;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IConfigurationElement;
@@ -31,6 +36,7 @@
import org.eclipse.wst.common.project.facet.core.IFacetedProject;
import org.eclipse.wst.common.project.facet.core.IProjectFacet;
import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
+import org.eclipse.wst.common.project.facet.core.runtime.RuntimeManager;
import org.jboss.tools.esb.core.ESBProjectCorePlugin;
import org.jboss.tools.esb.core.facet.IJBossESBFacetDataModelProperties;
import org.jboss.tools.esb.core.messages.JBossFacetCoreMessages;
@@ -50,7 +56,12 @@
static String ATT_VERSION = "esbVersion"; //$NON-NLS-1$
static String ATT_ID = "id";
static String VERSION_SEPARATOR = ",";
+ static String VERSION_FILE_NAME = "VERSION";
+ static String VERSION_PROPERTIES_KEY = "Version";
+ static String VERSION_PROPERTIES_SEPERATOR = "_";
+
+
static Map<String, IESBRuntimeResolver> parserMap = new HashMap<String, IESBRuntimeResolver>();
@@ -455,5 +466,62 @@
}
}
}
+
+ public String getVersion(String location, String configuration){
+ String version = "";
+ File rosettaJar = null;
+ Collection<IESBRuntimeResolver> resolvers = parserMap.values();
+ for(IESBRuntimeResolver resolver : resolvers){
+ rosettaJar = resolver.getRosettaJar(location, configuration);
+ if(rosettaJar != null && rosettaJar.exists()){
+ break;
+ }
+ }
+
+ if(rosettaJar == null || !rosettaJar.exists()){
+ return "";
+ }
+
+ try {
+ ZipFile zfile = new ZipFile(rosettaJar);
+ ZipEntry entry = zfile.getEntry(VERSION_FILE_NAME);
+
+ if(entry == null) return "";
+
+ InputStream input = zfile.getInputStream(entry);
+ Properties properties = new Properties();
+ properties.load(input);
+ version = properties.getProperty(VERSION_PROPERTIES_KEY);
+
+
+ if(version == null){
+ return "";
+ }
+ // soa-p5.0 and higher
+ else if(version.indexOf(VERSION_PROPERTIES_SEPERATOR) > 0){
+ version = version.substring(0, version.indexOf(VERSION_PROPERTIES_SEPERATOR));
+ }
+ //soa-p 4.3
+ else if(version.equals("4.3.0")) {
+ version = "4.4";
+ }
+ else if(version.length() > 3){
+ version = version.substring(0,3);
+ }
+
+ } catch (ZipException e) {
+ ESBProjectCorePlugin.log(e.getLocalizedMessage(), e);
+ } catch (IOException e) {
+ ESBProjectCorePlugin.log(e.getLocalizedMessage(), e);
+ }
+
+ return version;
+ }
+
+ public static void main(String[] args){
+ File file = new File("/home/fugang/jboss-all/jboss-soa-p.5.0.0/");
+ JBossRuntimeManager.getInstance().getVersion(file.getAbsolutePath().toString(), "default");
+ }
+
}
\ No newline at end of file
Modified: branches/jbosstools-3.1.0.RC1/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/messages/JBossESBUI.properties
===================================================================
--- branches/jbosstools-3.1.0.RC1/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/messages/JBossESBUI.properties 2009-12-18 06:48:32 UTC (rev 19457)
+++ branches/jbosstools-3.1.0.RC1/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/messages/JBossESBUI.properties 2009-12-18 06:53:24 UTC (rev 19458)
@@ -66,7 +66,9 @@
ESBFacetInstallationPage_Label_Source_Directory=Java Source Directory
ESBFacetInstallationPage_Title=Install ESB Facet
+ESBRuntimeContainerPage_Button_Text=Create an ESB Runtime
+
ESBProjectFirstPage_Description=Create a new JBoss ESB project.
ESBProjectFirstPage_Title=JBoss ESB Project
Modified: branches/jbosstools-3.1.0.RC1/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/messages/JBossESBUIMessages.java
===================================================================
--- branches/jbosstools-3.1.0.RC1/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/messages/JBossESBUIMessages.java 2009-12-18 06:48:32 UTC (rev 19457)
+++ branches/jbosstools-3.1.0.RC1/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/messages/JBossESBUIMessages.java 2009-12-18 06:53:24 UTC (rev 19458)
@@ -53,6 +53,8 @@
public static String JBoss_Button_Field_Editor_Browse;
public static String JBoss_ESBRuntime_Classpath_Container_5;
public static String JBoss_Runtime_List_Field_Editor_Configuration;
+
+ public static String ESBRuntimeContainerPage_Button_Text;
public static String JBoss_ESBRuntime_Classpath_Container_Description;
Modified: branches/jbosstools-3.1.0.RC1/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/preference/controls/JBossRuntimeListFieldEditor.java
===================================================================
--- branches/jbosstools-3.1.0.RC1/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/preference/controls/JBossRuntimeListFieldEditor.java 2009-12-18 06:48:32 UTC (rev 19457)
+++ branches/jbosstools-3.1.0.RC1/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/preference/controls/JBossRuntimeListFieldEditor.java 2009-12-18 06:53:24 UTC (rev 19458)
@@ -625,6 +625,8 @@
for(IProjectFacetVersion version: esbfacet.getVersions()){
versions.add(version.getVersionString());
}
+ versions.add("");
+
Collections.sort(versions);
Collections.reverse(versions);
return versions;
@@ -678,10 +680,21 @@
configuration.setText(source.getConfiguration());
}
}
+
+ // set version automatically according esb home location and configuration
+ updateDefaultVersion();
return configList;
}
+
+ private void updateDefaultVersion(){
+ String homeLocation = homeDir.getValueAsString();
+ String config = configuration.getText();
+ String defaultVersion = JBossRuntimeManager.getInstance().getVersion(homeLocation, config);
+ version.setValue(defaultVersion);
+
+ }
/**
* Return JBossWS Runtime instance initialized by user input
*
15 years