JBoss Tools SVN: r22245 - trunk/jsf/docs/userguide/en-US.
by jbosstools-commits＠lists.jboss.org
Author: abogachuk
Date: 2010-05-21 10:09:56 -0400 (Fri, 21 May 2010)
New Revision: 22245
Modified:
trunk/jsf/docs/userguide/en-US/editors.xml
Log:
https://jira.jboss.org/browse/TOOLSDOC-8 - updated "Visual Templates" section with new screenshots and info.
Modified: trunk/jsf/docs/userguide/en-US/editors.xml
===================================================================
--- trunk/jsf/docs/userguide/en-US/editors.xml 2010-05-21 14:08:55 UTC (rev 22244)
+++ trunk/jsf/docs/userguide/en-US/editors.xml 2010-05-21 14:09:56 UTC (rev 22245)
@@ -1503,11 +1503,11 @@
</section>
</section>
<section id="vpe_templating">
- <title>Templating</title>
- <para>The VPE also makes it possible to create templates for unknown tags.</para>
+ <title>Visual Templates</title>
+ <para>The VPE also makes it possible to create visual templates for unknown tags.</para>
<para>To call the <property>Template dialog</property> for a tag, right-click on it in
Visual mode and select <emphasis>
- <property>Setup Template for <tag name></property>
+ <property>Setup Visual Template for <tag name></property>
</emphasis> option.</para>
<figure>
<title>Calling Template Dialog</title>
@@ -1527,6 +1527,24 @@
</imageobject>
</mediaobject>
</figure>
+
+ <para>The <emphasis>
+ <property>Tag Name</property></emphasis> field is for setting the name of the unknown tag.</para>
+ <note>
+ <title>Note:</title>
+ <para>The given field should be filled in according to the pattern: "taglib:tag". Also make sure
+ you do not surround the name with angle brackets
+ which will cause the validation error (see the figure below).</para>
+ </note>
+ <figure>
+ <title>Validation Error in the Template Dialog</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/visual_page/validation_error.png"/>
+ </imageobject>
+ </mediaobject>
+ </figure>
+
<para><emphasis>
<property>Tag for Display</property>
</emphasis> field in the <property>Template dialog</property> requires specifying a
@@ -1542,8 +1560,14 @@
the field to bring the <link linkend="css_dialog">CSS Dialog</link> for editing
styles.</para>
<para>You can observe all defined templates in the <link linkend="VisualPageEditor2">VPE
- Preferences</link> on the Templates tab which you can quickly access by pressing
- <link linkend="AdvancedSettings954">Preferences button</link>.</para>
+ Preferences</link> on the <emphasis>
+ <property>Visual Templates</property>
+ </emphasis> tab which you can quickly access by pressing
+ <link linkend="AdvancedSettings954">Preferences</link> ( <inlinemediaobject>
+ <imageobject>
+ <imagedata fileref="images/visual_page/icon_1.png"/>
+ </imageobject>
+ </inlinemediaobject> ).</para>
<figure>
<title>Templates Tab of the VPE Preferences Page</title>
<mediaobject>
15 years, 11 months
JBoss Tools SVN: r22244 - trunk/jsf/docs/userguide/en-US.
by jbosstools-commits＠lists.jboss.org
Author: abogachuk
Date: 2010-05-21 10:08:55 -0400 (Fri, 21 May 2010)
New Revision: 22244
Modified:
trunk/jsf/docs/userguide/en-US/preferences.xml
Log:
https://jira.jboss.org/browse/TOOLSDOC-8 - added "VPE Code Templates" section, updated "VPE Preferences" section
Modified: trunk/jsf/docs/userguide/en-US/preferences.xml
===================================================================
--- trunk/jsf/docs/userguide/en-US/preferences.xml 2010-05-21 14:07:48 UTC (rev 22243)
+++ trunk/jsf/docs/userguide/en-US/preferences.xml 2010-05-21 14:08:55 UTC (rev 22244)
@@ -390,7 +390,7 @@
<table>
- <title>VPE Preferences</title>
+ <title>VPE General Preferences</title>
<tgroup cols="3">
<colspec colnum="1" align="left" colwidth="2*"/>
@@ -477,8 +477,8 @@
</tgroup>
</table>
- <para>On the <property>Templates tab</property> you can add, edit or remove <link
- linkend="vpe_templating">VPE templates</link>.</para>
+ <para>On the <property>Visual Templates</property> tab you can add, edit or remove <link
+ linkend="vpe_templating">VPE visual templates</link>.</para>
<figure>
<title>Visual Page Editor Templates</title>
<mediaobject>
@@ -493,6 +493,89 @@
</emphasis> button. It will pick up the <link linkend="template_dialog">Template
dialog</link> where you can adjust new settings.</para>
</section>
+
+ <section id="vpe_code_templates">
+ <title>Visual Page Editor Code Templates</title>
+ <para>On the <emphasis>
+ <property>JBoss Tools > Web > Editors > Visual Page Editor > Code Templates</property></emphasis>
+ preferences page you can create new and edit existing XHTML templates. Such a template allows you to
+ quickly insert an often used snippet of XHTML code.
+ </para>
+
+ <figure>
+ <title>Visual Page Editor Code Templates</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/preferences/preferences_8a.png"/>
+ </imageobject>
+ </mediaobject>
+ </figure>
+
+ <para>VPE provides four predefined templates:</para>
+ <itemizedlist>
+ <listitem><para>XHTML blank facelet page template</para></listitem>
+ <listitem><para>Common facelet page template</para></listitem>
+ <listitem><para>Form facelet page template</para></listitem>
+ <listitem><para>New JSF composite component template</para></listitem>
+ </itemizedlist>
+
+ <para>The following table lists the configuration options for the code templates.</para>
+ <table>
+
+ <title>VPE Code Templates Options</title>
+ <tgroup cols="2">
+
+ <colspec colnum="1" align="left" colwidth="2*"/>
+ <colspec colnum="2" colwidth="4*"/>
+
+ <thead>
+ <row>
+ <entry>Option</entry>
+ <entry>Description</entry>
+ </row>
+ </thead>
+
+ <tbody>
+ <row>
+ <entry>New</entry>
+ <entry>Opens the dialog to create a new template. </entry>
+ </row>
+
+ <row>
+ <entry>Edit</entry>
+ <entry>Opens the dialog to edit the currently selected template. </entry>
+ </row>
+
+ <row>
+ <entry>Remove</entry>
+ <entry>Removes all selected templates. </entry>
+ </row>
+
+ <row>
+ <entry>Restore Removed</entry>
+ <entry>Restores the removed templates.</entry>
+ </row>
+
+ <row>
+ <entry>Revert to Default</entry>
+ <entry>Reverts the code templates list to default.</entry>
+ </row>
+
+ <row>
+ <entry>Import</entry>
+ <entry>Allows you to import templates from the file system. </entry>
+ </row>
+
+ <row>
+ <entry>Edit</entry>
+ <entry>Allows you to export all selected templates to the file system. </entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </table>
+
+ </section>
+
<section id="el_variables">
<?dbhtml filename="el_variables.html"?>
15 years, 11 months
JBoss Tools SVN: r22243 - trunk/jsf/docs/userguide/en-US/images/preferences.
by jbosstools-commits＠lists.jboss.org
Author: abogachuk
Date: 2010-05-21 10:07:48 -0400 (Fri, 21 May 2010)
New Revision: 22243
Modified:
trunk/jsf/docs/userguide/en-US/images/preferences/preferences_7.png
trunk/jsf/docs/userguide/en-US/images/preferences/preferences_8.png
Log:
https://jira.jboss.org/browse/TOOLSDOC-8 - updated images for the "VPE Preferences" chapter.
Modified: trunk/jsf/docs/userguide/en-US/images/preferences/preferences_7.png
===================================================================
(Binary files differ)
Modified: trunk/jsf/docs/userguide/en-US/images/preferences/preferences_8.png
===================================================================
(Binary files differ)
15 years, 11 months
JBoss Tools SVN: r22242 - in branches/jbosstools-3.1.x/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core: internal/project/facet and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2010-05-21 10:07:39 -0400 (Fri, 21 May 2010)
New Revision: 22242
Modified:
branches/jbosstools-3.1.x/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/PortletCoreActivator.java
branches/jbosstools-3.1.x/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/project/facet/JSFPortletFacetInstallDelegate.java
branches/jbosstools-3.1.x/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/project/facet/PortletPostInstallListener.java
Log:
https://jira.jboss.org/browse/JBIDE-5968 JSF Portlet Facet always adds richfaces fragments to web.xml
Modified: branches/jbosstools-3.1.x/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/PortletCoreActivator.java
===================================================================
--- branches/jbosstools-3.1.x/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/PortletCoreActivator.java 2010-05-21 14:07:15 UTC (rev 22241)
+++ branches/jbosstools-3.1.x/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/PortletCoreActivator.java 2010-05-21 14:07:39 UTC (rev 22242)
@@ -38,6 +38,9 @@
public static final String CHECK_RUNTIMES = "checkRuntimes"; //$NON-NLS-1$
public static final boolean DEFAULT_CHECK_RUNTIMES = true;
+ public static final String JSFPORTLET_LIBRARY_PROVIDER = "jsfportlet-library-provider"; //$NON-NLS-1$
+ public static final String JSFPORTLETBRIDGE_LIBRARY_PROVIDER = "jsfportletbridge-library-provider"; //$NON-NLS-1$
+
public static final IOverwriteQuery OVERWRITE_ALL_QUERY = new IOverwriteQuery() {
public String queryOverwrite(String pathString) {
return IOverwriteQuery.ALL;
Modified: branches/jbosstools-3.1.x/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/project/facet/JSFPortletFacetInstallDelegate.java
===================================================================
--- branches/jbosstools-3.1.x/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/project/facet/JSFPortletFacetInstallDelegate.java 2010-05-21 14:07:15 UTC (rev 22241)
+++ branches/jbosstools-3.1.x/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/project/facet/JSFPortletFacetInstallDelegate.java 2010-05-21 14:07:39 UTC (rev 22242)
@@ -31,6 +31,7 @@
import org.eclipse.jdt.core.IJavaProject;
import org.eclipse.jdt.core.JavaCore;
import org.eclipse.jdt.core.JavaModelException;
+import org.eclipse.jst.common.project.facet.core.libprov.ILibraryProvider;
import org.eclipse.jst.common.project.facet.core.libprov.LibraryInstallDelegate;
import org.eclipse.jst.j2ee.classpathdep.ClasspathDependencyUtil;
import org.eclipse.jst.j2ee.classpathdep.IClasspathDependencyConstants;
@@ -50,6 +51,7 @@
import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
import org.eclipse.wst.common.componentcore.resources.IVirtualFile;
import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
+import org.eclipse.wst.common.project.facet.core.FacetedProjectFramework;
import org.eclipse.wst.common.project.facet.core.IDelegate;
import org.eclipse.wst.common.project.facet.core.IFacetedProjectWorkingCopy;
import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
@@ -62,6 +64,8 @@
import org.jboss.tools.portlet.core.JBossWebUtil25;
import org.jboss.tools.portlet.core.Messages;
import org.jboss.tools.portlet.core.PortletCoreActivator;
+import org.jboss.tools.portlet.core.libprov.AbstractLibraryProviderInstallOperationConfig;
+import org.jboss.tools.portlet.core.libprov.JSFPortletbridgeRuntimeLibraryProviderInstallOperationConfig;
/**
* @author snjeza
@@ -69,6 +73,7 @@
*/
public class JSFPortletFacetInstallDelegate implements IDelegate {
+ private static final String JST_SEAM_FACET = "jst.seam"; //$NON-NLS-1$
private static final String ORG_JBOSS_PORTLET_STATE_MANAGER = "org.jboss.portletbridge.application.PortletStateManager"; //$NON-NLS-1$
private static final String ORG_JBOSS_PORTLET_VIEW_HANDLER = "org.jboss.portletbridge.application.PortletViewHandler"; //$NON-NLS-1$
@@ -249,7 +254,7 @@
}
private void configureWebApp(final IProject project,
- final IProgressMonitor monitor, IDataModel config) {
+ final IProgressMonitor monitor, final IDataModel config) {
final IModelProvider provider = PortletCoreActivator
.getModelProvider(project);
IPath modelPath = new Path("WEB-INF").append("web.xml"); //$NON-NLS-1$ //$NON-NLS-2$
@@ -267,55 +272,92 @@
} else {
util = new JBossWebUtil();
}
- String name = "org.ajax4jsf.VIEW_HANDLERS"; //$NON-NLS-1$
- String value = "org.jboss.portletbridge.application.FaceletPortletViewHandler"; //$NON-NLS-1$
- String description = null;
- util.configureContextParam(project, monitor, name, value,
+ if (addRichfacesLibraries(config, project)) {
+
+ String name = "org.ajax4jsf.VIEW_HANDLERS"; //$NON-NLS-1$
+ String value = "org.jboss.portletbridge.application.FaceletPortletViewHandler"; //$NON-NLS-1$
+ String description = null;
+ util.configureContextParam(project, monitor, name, value,
description);
- name = "javax.portlet.faces.renderPolicy"; //$NON-NLS-1$
- value = "ALWAYS_DELEGATE"; //$NON-NLS-1$
- util.configureContextParam(project, monitor, name, value,
+ name = "javax.portlet.faces.renderPolicy"; //$NON-NLS-1$
+ value = "ALWAYS_DELEGATE"; //$NON-NLS-1$
+ util.configureContextParam(project, monitor, name, value,
description);
// RichFaces settings
- name = "org.richfaces.LoadStyleStrategy"; //$NON-NLS-1$
- value = "NONE"; //$NON-NLS-1$
- util.configureContextParam(project, monitor, name, value,
+
+ name = "org.richfaces.LoadStyleStrategy"; //$NON-NLS-1$
+ value = "NONE"; //$NON-NLS-1$
+ util.configureContextParam(project, monitor, name, value,
description);
- name = "org.richfaces.LoadScriptStrategy"; //$NON-NLS-1$
- value = "NONE"; //$NON-NLS-1$
- util.configureContextParam(project, monitor, name, value,
+ name = "org.richfaces.LoadScriptStrategy"; //$NON-NLS-1$
+ value = "NONE"; //$NON-NLS-1$
+ util.configureContextParam(project, monitor, name, value,
description);
- name = "org.ajax4jsf.RESOURCE_URI_PREFIX"; //$NON-NLS-1$
- value = "rfRes"; //$NON-NLS-1$
- util.configureContextParam(project, monitor, name, value,
+ name = "org.ajax4jsf.RESOURCE_URI_PREFIX"; //$NON-NLS-1$
+ value = "rfRes"; //$NON-NLS-1$
+ util.configureContextParam(project, monitor, name, value,
description);
- String displayName = "Ajax4jsf Filter"; //$NON-NLS-1$
- String filterName = "ajax4jsf"; //$NON-NLS-1$
- String className = "org.ajax4jsf.Filter"; //$NON-NLS-1$
- util.configureFilter(project, monitor, filterName, className,
+ String displayName = "Ajax4jsf Filter"; //$NON-NLS-1$
+ String filterName = "ajax4jsf"; //$NON-NLS-1$
+ String className = "org.ajax4jsf.Filter"; //$NON-NLS-1$
+ util.configureFilter(project, monitor, filterName, className,
displayName, description);
- String servletName = util.findJsfServlet(provider
+ String servletName = util.findJsfServlet(provider
.getModelObject());
- if (servletName == null) {
- RuntimeException e = new RuntimeException(
+ if (servletName == null) {
+ RuntimeException e = new RuntimeException(
Messages.JSFPortletFacetInstallDelegate_Cannot_find_the_JSF_servlet);
- PortletCoreActivator.log(e);
- throw e;
+ PortletCoreActivator.log(e);
+ throw e;
+ }
+ util.configureFilterMapping(project, monitor, filterName,
+ servletName);
+ } else {
+ String name = "javax.portlet.faces.renderPolicy"; //$NON-NLS-1$
+ String value = "NEVER_DELEGATE"; //$NON-NLS-1$
+ String description = null;
+ util.configureContextParam(project, monitor, name, value,
+ description);
}
- util.configureFilterMapping(project, monitor, filterName,
- servletName);
-
}
}, modelPath);
}
+ private boolean addRichfacesLibraries(IDataModel config, IProject project) {
+ LibraryInstallDelegate libraryDelegate = ( (LibraryInstallDelegate) config.getProperty( IPortletConstants.JSFPORTLET_LIBRARY_PROVIDER_DELEGATE ) );
+ if (libraryDelegate != null) {
+ ILibraryProvider libraryProvider = libraryDelegate
+ .getLibraryProvider();
+ String providerId = libraryProvider.getId();
+ if (PortletCoreActivator.JSFPORTLETBRIDGE_LIBRARY_PROVIDER.equals(providerId)
+ || PortletCoreActivator.JSFPORTLET_LIBRARY_PROVIDER.equals(providerId)) {
+ AbstractLibraryProviderInstallOperationConfig libraryConfig = (AbstractLibraryProviderInstallOperationConfig) libraryDelegate.getLibraryProviderOperationConfig(libraryProvider);
+
+ boolean isSeamFacet = false;
+ try {
+ isSeamFacet = FacetedProjectFramework.hasProjectFacet(project, JST_SEAM_FACET);
+ } catch (CoreException e) {
+ PortletCoreActivator.log(e);
+ }
+ if (isSeamFacet) {
+ return true;
+ }
+ if (!libraryConfig.isAddRichfacesCapabilities()) {
+ return false;
+ }
+ }
+
+ }
+ return false;
+ }
+
private void configureClassPath(final IProject project,
final IProgressMonitor monitor, IDataModel config)
throws JavaModelException {
Modified: branches/jbosstools-3.1.x/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/project/facet/PortletPostInstallListener.java
===================================================================
--- branches/jbosstools-3.1.x/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/project/facet/PortletPostInstallListener.java 2010-05-21 14:07:15 UTC (rev 22241)
+++ branches/jbosstools-3.1.x/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/project/facet/PortletPostInstallListener.java 2010-05-21 14:07:39 UTC (rev 22242)
@@ -53,8 +53,6 @@
public class PortletPostInstallListener implements IFacetedProjectListener {
- private static final String JSFPORTLET_LIBRARY_PROVIDER = "jsfportlet-library-provider"; //$NON-NLS-1$
- private static final String JSFPORTLETBRIDGE_LIBRARY_PROVIDER = "jsfportletbridge-library-provider"; //$NON-NLS-1$
private static final IProjectFacet seamFacet = ProjectFacetsManager.getProjectFacet("jst.seam"); //$NON-NLS-1$
private static final IOverwriteQuery OVERWRITE_NONE_QUERY = new IOverwriteQuery()
{
@@ -104,17 +102,17 @@
ILibraryProvider libraryProvider = libraryDelegate
.getLibraryProvider();
String providerId = libraryProvider.getId();
- if (JSFPORTLETBRIDGE_LIBRARY_PROVIDER.equals(providerId)) {
+ if (PortletCoreActivator.JSFPORTLETBRIDGE_LIBRARY_PROVIDER.equals(providerId)) {
JSFPortletbridgeRuntimeLibraryProviderInstallOperationConfig libraryConfig = (JSFPortletbridgeRuntimeLibraryProviderInstallOperationConfig) libraryDelegate
.getLibraryProviderOperationConfig(libraryProvider);
portletbridgeRuntime = libraryConfig.getPortletbridgeHome();
} else {
portletbridgeRuntime = null;
}
- richfacesFromServerRuntime = JSFPORTLET_LIBRARY_PROVIDER.equals(providerId); //$NON-NLS-1$
+ richfacesFromServerRuntime = PortletCoreActivator.JSFPORTLET_LIBRARY_PROVIDER.equals(providerId); //$NON-NLS-1$
- if (JSFPORTLETBRIDGE_LIBRARY_PROVIDER.equals(providerId)
- || JSFPORTLET_LIBRARY_PROVIDER.equals(providerId)) {
+ if (PortletCoreActivator.JSFPORTLETBRIDGE_LIBRARY_PROVIDER.equals(providerId)
+ || PortletCoreActivator.JSFPORTLET_LIBRARY_PROVIDER.equals(providerId)) {
AbstractLibraryProviderInstallOperationConfig libraryConfig = (AbstractLibraryProviderInstallOperationConfig) libraryDelegate.getLibraryProviderOperationConfig(libraryProvider);
richfacesCapabilities = libraryConfig.isAddRichfacesCapabilities();
richfacesRuntime = libraryConfig.getRichfacesRuntime();
@@ -259,6 +257,9 @@
private void addRichfacesFromRichfacesRuntime(
IFacetedProject facetedProject) {
final boolean isSeamProject = facetedProject.hasProjectFacet(seamFacet);
+ if (!isSeamProject && !richfacesCapabilities) {
+ return;
+ }
File richfacesRuntimeHome = new File(richfacesRuntime);
File richfacesLib = new File(richfacesRuntimeHome, "lib"); //$NON-NLS-1$
if (!richfacesLib.exists()) {
@@ -543,6 +544,10 @@
return null;
}
List<ZipEntry> list = new ArrayList<ZipEntry>();
+ if (!isSeamProject && !richfacesCapabilities) {
+ return list;
+ }
+
Enumeration<? extends ZipEntry> entries = rootEntry.entries();
IProject earProject = getEarProject(facetedProject.getProject(),isSeamProject);
15 years, 11 months
JBoss Tools SVN: r22241 - trunk/jsf/docs/userguide/en-US/images/preferences.
by jbosstools-commits＠lists.jboss.org
Author: abogachuk
Date: 2010-05-21 10:07:15 -0400 (Fri, 21 May 2010)
New Revision: 22241
Added:
trunk/jsf/docs/userguide/en-US/images/preferences/preferences_8a.png
Log:
https://jira.jboss.org/browse/TOOLSDOC-8 - add new image for the "VPE Code Templates" section.
Added: trunk/jsf/docs/userguide/en-US/images/preferences/preferences_8a.png
===================================================================
(Binary files differ)
Property changes on: trunk/jsf/docs/userguide/en-US/images/preferences/preferences_8a.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
15 years, 11 months
JBoss Tools SVN: r22240 - trunk/jsf/docs/userguide/en-US/images/visual_page.
by jbosstools-commits＠lists.jboss.org
Author: abogachuk
Date: 2010-05-21 10:06:31 -0400 (Fri, 21 May 2010)
New Revision: 22240
Modified:
trunk/jsf/docs/userguide/en-US/images/visual_page/visual_page_7a.png
trunk/jsf/docs/userguide/en-US/images/visual_page/visual_page_7b.png
trunk/jsf/docs/userguide/en-US/images/visual_page/visual_page_7c.png
Log:
https://jira.jboss.org/browse/TOOLSDOC-8 - updated images for the "Visual Templates" section.
Modified: trunk/jsf/docs/userguide/en-US/images/visual_page/visual_page_7a.png
===================================================================
(Binary files differ)
Modified: trunk/jsf/docs/userguide/en-US/images/visual_page/visual_page_7b.png
===================================================================
(Binary files differ)
Modified: trunk/jsf/docs/userguide/en-US/images/visual_page/visual_page_7c.png
===================================================================
(Binary files differ)
15 years, 11 months
JBoss Tools SVN: r22239 - trunk/jsf/docs/userguide/en-US/images/visual_page.
by jbosstools-commits＠lists.jboss.org
Author: abogachuk
Date: 2010-05-21 10:05:03 -0400 (Fri, 21 May 2010)
New Revision: 22239
Added:
trunk/jsf/docs/userguide/en-US/images/visual_page/validation_error.png
Log:
https://jira.jboss.org/browse/TOOLSDOC-8 - new images for the "Visual Templates" section.
Added: trunk/jsf/docs/userguide/en-US/images/visual_page/validation_error.png
===================================================================
(Binary files differ)
Property changes on: trunk/jsf/docs/userguide/en-US/images/visual_page/validation_error.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
15 years, 11 months
JBoss Tools SVN: r22238 - trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2010-05-21 09:57:34 -0400 (Fri, 21 May 2010)
New Revision: 22238
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/ProducerMethodDefinitionTest.java
Log:
https://jira.jboss.org/browse/JBIDE-6310
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/ProducerMethodDefinitionTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/ProducerMethodDefinitionTest.java 2010-05-21 13:40:29 UTC (rev 22237)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/ProducerMethodDefinitionTest.java 2010-05-21 13:57:34 UTC (rev 22238)
@@ -33,8 +33,8 @@
Set<IInjectionPoint> injections = bean.getInjectionPoints();
assertEquals("Wrong number of injection points in the producer.", 2, injections.size());
// TODO use real location for injection points.
- assertLocationEquals(injections, 0, 0);
- assertLocationEquals(injections, 0, 0);
+ assertLocationEquals(injections, 1287, 29);
+ assertLocationEquals(injections, 1328, 19);
}
// TODO continue implementing producer tests.
15 years, 11 months
JBoss Tools SVN: r22237 - in trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl: definition and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2010-05-21 09:40:29 -0400 (Fri, 21 May 2010)
New Revision: 22237
Added:
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/InjectionPointParameter.java
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/BeanMethod.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIProject.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ProducerMethod.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/MethodDefinition.java
Log:
https://jira.jboss.org/browse/JBIDE-6310
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/BeanMethod.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/BeanMethod.java 2010-05-21 13:10:34 UTC (rev 22236)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/BeanMethod.java 2010-05-21 13:40:29 UTC (rev 22237)
@@ -41,13 +41,17 @@
List<ParameterDefinition> ps = definition.getParameters();
for (ParameterDefinition p: ps) {
- Parameter parameter = new Parameter();
+ Parameter parameter = newParameter();
parameter.setBeanMethod(this);
parameter.setDefinition(p);
parameters.add(parameter);
}
}
+ protected Parameter newParameter() {
+ return new Parameter();
+ }
+
public IMethod getMethod() {
return method;
}
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIProject.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIProject.java 2010-05-21 13:10:34 UTC (rev 22236)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIProject.java 2010-05-21 13:40:29 UTC (rev 22237)
@@ -44,6 +44,7 @@
import org.jboss.tools.cdi.core.IParameter;
import org.jboss.tools.cdi.core.IProducer;
import org.jboss.tools.cdi.core.IProducerMethod;
+import org.jboss.tools.cdi.core.IQualifier;
import org.jboss.tools.cdi.core.IQualifierDeclaration;
import org.jboss.tools.cdi.core.IStereotype;
import org.jboss.tools.cdi.internal.core.impl.definition.AnnotationDefinition;
@@ -245,8 +246,19 @@
if(type == null) {
return result;
}
+
+ boolean isParameter = injectionPoints instanceof InjectionPointParameter;
Set<IQualifierDeclaration> qs = injectionPoints.getQualifierDeclarations();
+ List<IType> qs2 = null;
+ if(isParameter) {
+ qs2 = new ArrayList<IType>();
+ Set<IQualifier> qs_ = ((InjectionPointParameter)injectionPoints).getQualifiers();
+ for (IQualifier q: qs_) {
+ IType t = q.getSourceType();
+ if(t != null) qs2.add(t);
+ }
+ }
Set<IBean> beans = new HashSet<IBean>();
synchronized(allBeans) {
@@ -257,8 +269,14 @@
if(containsType(types, type)) {
try {
Set<IQualifierDeclaration> qsb = b.getQualifierDeclarations(true);
- if(areMatchingQualifiers(qsb, qs)) {
- result.add(b);
+ if(isParameter) {
+ if(areMatchingQualifiers(qsb, qs2.toArray(new IType[0]))) {
+ result.add(b);
+ }
+ } else {
+ if(areMatchingQualifiers(qsb, qs)) {
+ result.add(b);
+ }
}
} catch (CoreException e) {
CDICorePlugin.getDefault().logError(e);
Added: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/InjectionPointParameter.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/InjectionPointParameter.java (rev 0)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/InjectionPointParameter.java 2010-05-21 13:40:29 UTC (rev 22237)
@@ -0,0 +1,54 @@
+/*******************************************************************************
+ * 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.cdi.internal.core.impl;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import org.jboss.tools.cdi.core.CDIConstants;
+import org.jboss.tools.cdi.core.IAnnotationDeclaration;
+import org.jboss.tools.cdi.core.IInjectionPointParameter;
+import org.jboss.tools.cdi.core.IQualifier;
+import org.jboss.tools.cdi.core.IQualifierDeclaration;
+
+/**
+ *
+ * @author Viacheslav Kabanovich
+ *
+ */
+public class InjectionPointParameter extends Parameter implements
+ IInjectionPointParameter {
+
+ public IAnnotationDeclaration getDelegateAnnotation() {
+ return null;
+ }
+
+ public Set<IQualifierDeclaration> getQualifierDeclarations() {
+ Set<IQualifierDeclaration> result = new HashSet<IQualifierDeclaration>();
+ //cannot implement
+ return result;
+ }
+
+ public Set<IQualifier> getQualifiers() {
+ Set<IQualifier> result = new HashSet<IQualifier>();
+ Set<String> as = getAnnotationTypes();
+ for (String s: as) {
+ IQualifier q = getCDIProject().getQualifier(s);
+ if (q != null) result.add(q);
+ }
+ return result;
+ }
+
+ public boolean isDelegate() {
+ return isAnnotationPresent(CDIConstants.DELEGATE_STEREOTYPE_TYPE_NAME);
+ }
+
+}
Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/InjectionPointParameter.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ProducerMethod.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ProducerMethod.java 2010-05-21 13:10:34 UTC (rev 22236)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ProducerMethod.java 2010-05-21 13:40:29 UTC (rev 22237)
@@ -22,6 +22,7 @@
import org.jboss.tools.cdi.core.IAnnotationDeclaration;
import org.jboss.tools.cdi.core.IInjectionPoint;
import org.jboss.tools.cdi.core.IParametedType;
+import org.jboss.tools.cdi.core.IParameter;
import org.jboss.tools.cdi.core.IProducerMethod;
import org.jboss.tools.cdi.core.IScope;
import org.jboss.tools.cdi.core.IScopeDeclaration;
@@ -50,6 +51,10 @@
produces = definition.getProducesAnnotation();
}
+ protected Parameter newParameter() {
+ return new InjectionPointParameter();
+ }
+
public Set<ITypeDeclaration> getAllTypeDeclarations() {
Set<ITypeDeclaration> result = new HashSet<ITypeDeclaration>();
if(typeDeclaration != null && typeDeclaration.getStartPosition() > 0) {
@@ -67,7 +72,13 @@
}
public Set<IInjectionPoint> getInjectionPoints() {
- return new HashSet<IInjectionPoint>();
+ HashSet<IInjectionPoint> result = new HashSet<IInjectionPoint>();
+ for (IParameter p: parameters) {
+ if(p instanceof IInjectionPoint) {
+ result.add((IInjectionPoint)p);
+ }
+ }
+ return result;
}
public Set<IParametedType> getLegalTypes() {
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/MethodDefinition.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/MethodDefinition.java 2010-05-21 13:10:34 UTC (rev 22236)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/MethodDefinition.java 2010-05-21 13:40:29 UTC (rev 22237)
@@ -12,6 +12,7 @@
import java.util.ArrayList;
import java.util.List;
+import java.util.StringTokenizer;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.jdt.core.IMethod;
@@ -59,6 +60,7 @@
void loadParamDefinitions(IType contextType, DefinitionContext context) throws CoreException {
if(method == null) return;
+ boolean isProducer = getProducesAnnotation() != null;
String[] parameterNames = method.getParameterNames();
if(parameterNames == null || parameterNames.length == 0) return;
if(contextType == null || contextType.isBinary()) return;
@@ -78,7 +80,7 @@
int start = paramStart + 1;
for (int i = 0; i < params.length; i++) {
- if(params[i].indexOf('@') < 0) {
+ if(params[i].indexOf('@') < 0 && !isProducer) {
start += params[i].length() + 1;
continue; //do not need parameters without annotation
}
@@ -91,14 +93,19 @@
pd.name = parameterNames[i];
pd.index = i;
pd.type = type;
+
+ String p = params[i].trim();
+ int pi = params[i].indexOf(p);
+
ValueInfo v = new ValueInfo();
v.setValue(params[i]);
- v.valueStartPosition = start;
- v.valueLength = params[i].length();
+ v.valueStartPosition = start + pi;
+ v.valueLength = p.length();
pd.setPosition(v);
- String[] tokens = params[i].split(" ");
- for (String q: tokens) {
+ StringTokenizer tokens = new StringTokenizer(p, " \r\n\t");
+ while (tokens.hasMoreElements()) {
+ String q = tokens.nextToken();
if(!q.startsWith("@")) continue;
v = new ValueInfo();
v.setValue(q);
15 years, 11 months
JBoss Tools SVN: r22236 - in trunk/bpel/docs/reference/en-US: images/reference and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: ochikvina
Date: 2010-05-21 09:10:34 -0400 (Fri, 21 May 2010)
New Revision: 22236
Added:
trunk/bpel/docs/reference/en-US/images/reference/bpel_ref_13.png
trunk/bpel/docs/reference/en-US/images/reference/bpel_ref_2a.png
Modified:
trunk/bpel/docs/reference/en-US/master.xml
trunk/bpel/docs/reference/en-US/modules/detail.xml
trunk/bpel/docs/reference/en-US/modules/reference.xml
Log:
<html><head><meta name="qrichtext" content="1" /></head><body style="font-size:9pt;font-family:Sans Serif">
<p>https://jira.jboss.org/browse/TOOLSDOC-23 - Created Reference chapter,added description of different BPEL wizards and editors.</p>
</body></html>
Added: trunk/bpel/docs/reference/en-US/images/reference/bpel_ref_13.png
===================================================================
(Binary files differ)
Property changes on: trunk/bpel/docs/reference/en-US/images/reference/bpel_ref_13.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/bpel/docs/reference/en-US/images/reference/bpel_ref_2a.png
===================================================================
(Binary files differ)
Property changes on: trunk/bpel/docs/reference/en-US/images/reference/bpel_ref_2a.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/bpel/docs/reference/en-US/master.xml
===================================================================
--- trunk/bpel/docs/reference/en-US/master.xml 2010-05-21 11:31:51 UTC (rev 22235)
+++ trunk/bpel/docs/reference/en-US/master.xml 2010-05-21 13:10:34 UTC (rev 22236)
@@ -7,7 +7,7 @@
<!ENTITY detail SYSTEM "modules/detail.xml">
<!ENTITY deploy SYSTEM "modules/deploy.xml">
<!ENTITY reference SYSTEM "modules/reference.xml">
-
+<!ENTITY summary SYSTEM "modules/summary.xml">
]>
<book>
@@ -51,4 +51,5 @@
&detail;
&deploy;
&reference;
+ &summary;
</book>
Modified: trunk/bpel/docs/reference/en-US/modules/detail.xml
===================================================================
--- trunk/bpel/docs/reference/en-US/modules/detail.xml 2010-05-21 11:31:51 UTC (rev 22235)
+++ trunk/bpel/docs/reference/en-US/modules/detail.xml 2010-05-21 13:10:34 UTC (rev 22236)
@@ -2,7 +2,11 @@
<chapter id="detail">
<title>Creating and editing a BPEL project</title>
<para>In the chapter we describe the necessary steps to create a new BPEL project and edit the BPEL files.
- First of all, you should create a BPEL project.
+ Here and further in the guide we will create
+ a simple echo example, used to respond to a sent message with a
+ modified version of the request message being returned in a response.
+ First of all, you should create a BPEL project.
+
</para>
<section id="createproject">
<title>Creating a BPEL project</title>
Modified: trunk/bpel/docs/reference/en-US/modules/reference.xml
===================================================================
--- trunk/bpel/docs/reference/en-US/modules/reference.xml 2010-05-21 11:31:51 UTC (rev 22235)
+++ trunk/bpel/docs/reference/en-US/modules/reference.xml 2010-05-21 13:10:34 UTC (rev 22236)
@@ -41,6 +41,23 @@
</itemizedlist>
</section>
<section>
+ <title>Apache ODE Deployment Descriptor Wizard</title>
+ <para>Using this wizard user can create ODE deployment descriptor (deploy.xml) and place it in the temporary directory.It is available with clicking
+ <property>File->New->Other->Apache ODE Deployment Descriptor Wizard</property> in the menu bar.</para>
+ <figure>
+ <title>New BPEL Project Wizard</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/reference/bpel_ref_2a.png"/>
+ </imageobject>
+ </mediaobject>
+ </figure>
+ <para>On the page you can adjust the name of the deployment descriptor and
+ the directory where it will be created.Note,that you should use <property>
+ /PROJECT_NAME/bpelContent</property> directory as an output one.</para>
+
+ </section>
+ <section>
<title>New BPEL Process file Wizard</title>
<para>Using <property>New BPEL Process file Wizard</property>
user can create BPEL process file and WSDL file if it is necessary.
@@ -229,7 +246,7 @@
<para>If the user wants to disable/unable validation he can do it by following
<property>Window->Preferences->Validation</property>.</para>
<figure>
- <title>Validation error in Source tab</title>
+ <title>Validation configuration</title>
<mediaobject>
<imageobject>
<imagedata fileref="images/reference/bpel_ref_12.png"/>
@@ -238,6 +255,129 @@
</figure>
</section>
</section>
+ <section>
+ <title>ODE Deployment Descriptor Editor</title>
+ <para>To deploy your process in Ode you need to create a
+ simple deployment descriptor with basic information and
+ <property>ODE Deployment Descriptor Editor</property> facilitates the process of descriptor configuration.
+ You can see how the descriptor file,opened in the editor looks like on the picture below:
+ </para>
+ <figure>
+ <title>ODE Deployment Descriptor Editor</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/reference/bpel_ref_13.png"/>
+ </imageobject>
+ </mediaobject>
+ </figure>
+ <para>The table below describes the configuration options of the
+ ODE Deployment Descriptor Editor:</para>
+ <table>
+ <title>ODE Deployment Descriptor Editor.Options.</title>
+ <tgroup cols="3">
+ <colspec colnum="1" align="left" colwidth="1*"/>
+ <colspec colnum="2" align="left" colwidth="3*"/>
+ <colspec colnum="3" align="left" colwidth="1*"/>
+
+ <thead>
+ <row>
+ <entry>Section</entry>
+ <entry>Options</entry>
+ <entry>Description</entry>
+ </row>
+ </thead>
+ <tbody>
+ <row>
+ <entry morerows='1' valign='middle'><para>
+ General</para></entry>
+
+ <entry>This process is</entry>
+ <entry>Select one of the provided options:
+ <itemizedlist>
+ <listitem>
+ <para><emphasis>activated</emphasis>
+ </para>
+ </listitem>
+ <listitem>
+ <para><emphasis>deactivated</emphasis></para>
+ </listitem>
+ <listitem>
+ <para><emphasis>retired</emphasis>
+ </para>
+ </listitem>
+ </itemizedlist></entry>
+
+ </row>
+ <row><entry>Run this process in memory</entry>
+ <entry>for performance purposes,
+ you can define the process as being
+ executed only in-memory.</entry>
+ </row>
+
+ <row>
+ <entry>Inbound Interfaces(Services)</entry>
+ <entry>Associated Port</entry>
+ <entry>Click Associated Port and the dropdown list with all available port names will appear.
+ Select the one you need ,other fields will be filled automatically.
+ This action configure the services
+ provided by the process and
+ bind each service to an endpoint
+ </entry>
+
+ </row>
+
+ <row>
+ <entry>Outbound Interfaces(Invokes)</entry>
+ <entry>Associated Port</entry>
+ <entry>Click Associated Port and the dropdown list with all available port names will appear.
+ Select the one you need, other fields will be filled automatically.
+ This action configure the services
+ invoked by the process</entry>
+ </row>
+ <row>
+ <entry>Process-level Monitoring Events</entry>
+ <entry> <itemizedlist>
+ <listitem><para>
+ <emphasis>None</emphasis>
+ </para></listitem>
+ <listitem>
+ <para>
+ <emphasis>All</emphasis>
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <emphasis>Selected</emphasis>:
+ </para>
+ <itemizedlist>
+ <listitem><para>Instance life cycle</para></listitem>
+ <listitem><para>Activity life cycle</para></listitem>
+ <listitem><para>Data handling</para></listitem>
+ <listitem><para>Scope handling</para></listitem>
+ <listitem><para>Correlation</para></listitem>
+
+ </itemizedlist>
+
+ </listitem>
+ </itemizedlist>
+ </entry>
+ <entry>Using ODE's deployment descriptor, it's also
+ possible to make events generation to
+ filtrate which ones get created.
+ All option just duplicates the default behaviour,
+ when nothing is specified in the deployment.</entry>
+ </row>
+ <row>
+ <entry>Scope-level Monitoring Events</entry>
+ <entry>Scope</entry>
+ <entry>This section makes it possible to
+ define filtering for each scope of your process.
+ </entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </table>
+ </section>
</section>
15 years, 11 months