JBoss Tools SVN: r19747 - trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/launch.
by jbosstools-commits＠lists.jboss.org
Author: tfennelly
Date: 2010-01-14 09:42:10 -0500 (Thu, 14 Jan 2010)
New Revision: 19747
Modified:
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/launch/SmooksLaunchConfigurationDelegate.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-5680
SmooksLaunchConfigurationDelegate not able to see correct project classpath
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/launch/SmooksLaunchConfigurationDelegate.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/launch/SmooksLaunchConfigurationDelegate.java 2010-01-14 12:49:34 UTC (rev 19746)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/launch/SmooksLaunchConfigurationDelegate.java 2010-01-14 14:42:10 UTC (rev 19747)
@@ -22,12 +22,11 @@
import java.io.File;
import java.io.FileNotFoundException;
import java.io.FileOutputStream;
-import java.io.FileWriter;
import java.io.IOException;
import java.io.InputStream;
-import java.io.PrintWriter;
-import java.io.StringWriter;
+import java.net.MalformedURLException;
import java.net.URL;
+import java.net.URLClassLoader;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
@@ -48,14 +47,12 @@
import org.eclipse.jdt.launching.IVMRunner;
import org.eclipse.jdt.launching.VMRunnerConfiguration;
import org.eclipse.jface.dialogs.ErrorDialog;
-import org.eclipse.osgi.util.NLS;
import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.ui.PlatformUI;
import org.jboss.tools.smooks.configuration.ProcessNodeType;
import org.jboss.tools.smooks.configuration.RuntimeDependency;
import org.jboss.tools.smooks.configuration.RuntimeMetadata;
-import org.jboss.tools.smooks.configuration.editors.uitls.ProjectClassLoader;
import org.jboss.tools.smooks.core.SmooksInputType;
import org.jboss.tools.smooks.launch.serialize.MarshallingStrategy;
import org.jboss.tools.smooks.launch.serialize.ObjectSerializer;
@@ -77,6 +74,7 @@
IJavaProject javaProject = getJavaProject(launchConfig);
IProject project = javaProject.getProject();
final String smooksConfigName = launchConfig.getAttribute(IJavaLaunchConfigurationConstants.ATTR_MAIN_TYPE_NAME, ""); //$NON-NLS-1$
+ String[] baseClasspath = getClasspath(launchConfig);
final RuntimeMetadata launchMetadata = new RuntimeMetadata();
launchMetadata.setSmooksConfig(project.findMember(smooksConfigName));
@@ -86,7 +84,7 @@
return;
} else {
List<RuntimeDependency> dependencies = launchMetadata.getDependencies();
- ProjectClassLoader projectClassLoader = new ProjectClassLoader(javaProject);
+ URLClassLoader projectClassLoader = toURLClassLoader(baseClasspath);
for(RuntimeDependency dependency : dependencies) {
if(!dependency.isOnProjectClasspath(projectClassLoader)) {
@@ -97,7 +95,7 @@
}
IVMRunner runner= getVMRunner(launchConfig, mode);
- VMRunnerConfiguration runConfig = buildRunnerConfig(launchConfig);
+ VMRunnerConfiguration runConfig = buildRunnerConfig(launchConfig, baseClasspath);
// check for cancellation
if (monitor.isCanceled()) {
@@ -123,8 +121,8 @@
});
}
- private VMRunnerConfiguration buildRunnerConfig(ILaunchConfiguration launchConfig) throws CoreException {
- List<String> classpath = new ArrayList<String>(Arrays.asList(getClasspath(launchConfig)));
+ private VMRunnerConfiguration buildRunnerConfig(ILaunchConfiguration launchConfig, String[] baseClasspath) throws CoreException {
+ List<String> classpath = new ArrayList<String>(Arrays.asList(baseClasspath));
// We need to add the SmooksLauncher to the launch classpath because it will not be part of the projects
// classpath. Bit of a hack... there's probably a nicer way of doing this!!!
@@ -244,4 +242,19 @@
return new FileOutputStream(resourceOutFile);
}
+
+ private URLClassLoader toURLClassLoader(String[] baseClasspath) {
+ URL[] classPathURLs = new URL[baseClasspath.length];
+
+ for(int i = 0; i < baseClasspath.length; i++) {
+ try {
+ File cpEntry = new File(baseClasspath[i]);
+ classPathURLs[i] = cpEntry.toURL();
+ } catch (MalformedURLException e) {
+ e.printStackTrace();
+ }
+ }
+
+ return new URLClassLoader(classPathURLs);
+ }
}
14 years, 5 months
- 1
- 0
JBoss Tools SVN: r19746 - trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2010-01-14 07:49:34 -0500 (Thu, 14 Jan 2010)
New Revision: 19746
Modified:
trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/ESBConstants.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-5668
Modified: trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/ESBConstants.java
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/ESBConstants.java 2010-01-14 12:49:07 UTC (rev 19745)
+++ trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/ESBConstants.java 2010-01-14 12:49:34 UTC (rev 19746)
@@ -40,6 +40,7 @@
public String ENT_ESB_SECURITY = "ESBSecurity101P"; //$NON-NLS-1$
public String ENT_ESB_PROVIDER = "ESBBusProvider101"; //$NON-NLS-1$
public String ENT_ESB_JBR_PROVIDER = "ESBJBRProvider101"; //$NON-NLS-1$
+ public String ENT_ESB_JBR_PROVIDER_120 = "ESBJBRProvider120"; //$NON-NLS-1$
public String ENT_ESB_SCHEDULE_PROVIDER = "ESBScheduleProvider101"; //$NON-NLS-1$
public String ENT_ESB_JMS_PROVIDER = "ESBJMSProvider101"; //$NON-NLS-1$
public String ENT_ESB_JCA_PROVIDER = "ESBJCAProvider101"; //$NON-NLS-1$
@@ -54,7 +55,7 @@
public String[] PROVIDERS_101 = {
ENT_ESB_PROVIDER,
- ENT_ESB_JBR_PROVIDER,
+ ENT_ESB_JBR_PROVIDER, ENT_ESB_JBR_PROVIDER_120,
ENT_ESB_SCHEDULE_PROVIDER,
ENT_ESB_JMS_PROVIDER,
ENT_ESB_JCA_PROVIDER,
@@ -62,8 +63,7 @@
ENT_ESB_FTP_PROVIDER,
ENT_ESB_SQL_PROVIDER,
ENT_ESB_HIBERNATE_PROVIDER,
- ENT_ESB_HTTP_PROVIDER,
- ENT_ESB_HTTP_PROVIDER_120,
+ ENT_ESB_HTTP_PROVIDER, ENT_ESB_HTTP_PROVIDER_120,
};
@@ -85,38 +85,43 @@
ENT_ESB_JMS_BUS,
ENT_ESB_HIBERNATE_BUS,
ENT_ESB_SQL_BUS,
- ENT_ESB_HTTP_BUS,
- ENT_ESB_HTTP_BUS_120,
+ ENT_ESB_HTTP_BUS, ENT_ESB_HTTP_BUS_120,
};
//prefix
public String ENT_ESB_LISTENERS = "ESBListeners"; //$NON-NLS-1$
public String ENT_ESB_LISTENER = "ESBListener101"; //$NON-NLS-1$
+ public String ENT_ESB_LISTENER_120 = "ESBListener120"; //$NON-NLS-1$
public String ENT_ESB_SH_LISTENER = "ESBScheduledListener101"; //$NON-NLS-1$
public String ENT_ESB_GATEWAY = "ESBJCAGateway101"; //$NON-NLS-1$
+ public String ENT_ESB_GATEWAY_120 = "ESBJCAGateway120"; //$NON-NLS-1$
public String ENT_ESB_JMS_LISTENER = "ESBJMSListener101"; //$NON-NLS-1$
public String ENT_ESB_FS_LISTENER = "ESBFSListener101"; //$NON-NLS-1$
public String ENT_ESB_FTP_LISTENER = "ESBFTPListener101"; //$NON-NLS-1$
+ public String ENT_ESB_FTP_LISTENER_120 = "ESBFTPListener120"; //$NON-NLS-1$
public String ENT_ESB_SQL_LISTENER = "ESBSQLListener101"; //$NON-NLS-1$
+ public String ENT_ESB_SQL_LISTENER_120 = "ESBSQLListener120"; //$NON-NLS-1$
public String ENT_ESB_HIB_LISTENER = "ESBHibernateListener101"; //$NON-NLS-1$
public String ENT_ESB_JBR_LISTENER = "ESBJBRListener101"; //$NON-NLS-1$
+ public String ENT_ESB_JBR_LISTENER_120 = "ESBJBRListener120"; //$NON-NLS-1$
public String ENT_ESB_GROOVY_LISTENER = "ESBGroovyListener101"; //$NON-NLS-1$
public String ENT_ESB_HTTP_LISTENER = "ESBHTTPListener110"; //$NON-NLS-1$
+ public String ENT_ESB_HTTP_GATEWAY = "ESBHTTPGateway120"; //$NON-NLS-1$
public String ENT_ESB_UDP_LISTENER = "ESBUDPListener110"; //$NON-NLS-1$
public String[] LISTENERS_101 = {
- ENT_ESB_LISTENER,
+ ENT_ESB_LISTENER, ENT_ESB_LISTENER_120,
ENT_ESB_SH_LISTENER,
- ENT_ESB_GATEWAY,
+ ENT_ESB_GATEWAY, ENT_ESB_GATEWAY_120,
ENT_ESB_JMS_LISTENER,
ENT_ESB_FS_LISTENER,
- ENT_ESB_FTP_LISTENER,
- ENT_ESB_SQL_LISTENER,
+ ENT_ESB_FTP_LISTENER, ENT_ESB_FTP_LISTENER_120,
+ ENT_ESB_SQL_LISTENER, ENT_ESB_SQL_LISTENER_120,
ENT_ESB_HIB_LISTENER,
- ENT_ESB_JBR_LISTENER,
+ ENT_ESB_JBR_LISTENER, ENT_ESB_JBR_LISTENER_120,
ENT_ESB_GROOVY_LISTENER,
- ENT_ESB_HTTP_LISTENER,
+ ENT_ESB_HTTP_LISTENER, ENT_ESB_HTTP_GATEWAY,
ENT_ESB_UDP_LISTENER,
};
14 years, 5 months
- 1
- 0
JBoss Tools SVN: r19745 - trunk/esb/plugins/org.jboss.tools.esb.ui/src/org/jboss/tools/esb/ui/editor/form.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2010-01-14 07:49:07 -0500 (Thu, 14 Jan 2010)
New Revision: 19745
Modified:
trunk/esb/plugins/org.jboss.tools.esb.ui/src/org/jboss/tools/esb/ui/editor/form/ESBListsFormLayoutData.java
trunk/esb/plugins/org.jboss.tools.esb.ui/src/org/jboss/tools/esb/ui/editor/form/ESBXMLFormLayoutData.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-5668
Modified: trunk/esb/plugins/org.jboss.tools.esb.ui/src/org/jboss/tools/esb/ui/editor/form/ESBListsFormLayoutData.java
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.ui/src/org/jboss/tools/esb/ui/editor/form/ESBListsFormLayoutData.java 2010-01-14 10:45:39 UTC (rev 19744)
+++ trunk/esb/plugins/org.jboss.tools.esb.ui/src/org/jboss/tools/esb/ui/editor/form/ESBListsFormLayoutData.java 2010-01-14 12:49:07 UTC (rev 19745)
@@ -104,7 +104,7 @@
"Services", //$NON-NLS-1$
ModelFormLayoutData.EMPTY_DESCRIPTION,
new FormAttributeData[]{new FormAttributeData(ATTR_NAME, 100)},
- new String[]{ENT_ESB_SERVICE_101, ENT_ESB_SERVICE_110},
+ new String[]{ENT_ESB_SERVICE_101, ENT_ESB_SERVICE_110, ENT_ESB_SERVICE_120},
FormLayoutDataUtil.createDefaultFormActionData("CreateActions.AddService") //$NON-NLS-1$
);
@@ -113,7 +113,7 @@
ModelFormLayoutData.EMPTY_DESCRIPTION,
"Services", //$NON-NLS-1$
new FormAttributeData[]{new FormAttributeData(ATTR_NAME, 100)},
- new String[]{ENT_ESB_SERVICE_101, ENT_ESB_SERVICE_110},
+ new String[]{ENT_ESB_SERVICE_101, ENT_ESB_SERVICE_110, ENT_ESB_SERVICE_120},
FormLayoutDataUtil.createDefaultFormActionData("CreateActions.AddService") //$NON-NLS-1$
);
Modified: trunk/esb/plugins/org.jboss.tools.esb.ui/src/org/jboss/tools/esb/ui/editor/form/ESBXMLFormLayoutData.java
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.ui/src/org/jboss/tools/esb/ui/editor/form/ESBXMLFormLayoutData.java 2010-01-14 10:45:39 UTC (rev 19744)
+++ trunk/esb/plugins/org.jboss.tools.esb.ui/src/org/jboss/tools/esb/ui/editor/form/ESBXMLFormLayoutData.java 2010-01-14 12:49:07 UTC (rev 19745)
@@ -137,7 +137,7 @@
IFormData a = ModelFormLayoutData.createAdvancedFormData(entityName);
if(a != null) list.add(a);
IFormData[] ds = list.toArray(new IFormData[0]);
- IFormData data = new FormData(entityName, (String[])(null), ds);
+ IFormData data = new FormData(entityName, new String[0], ds);
return data;
}
14 years, 5 months
- 1
- 0
JBoss Tools SVN: r19744 - trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor.
by jbosstools-commits＠lists.jboss.org
Author: dmaliarevich
Date: 2010-01-14 05:45:39 -0500 (Thu, 14 Jan 2010)
New Revision: 19744
Modified:
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/JSPMultiPageEditor.java
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/JSPMultiPageEditorPart.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-5666, JSPMultiPageEditorPart was updated to standard eclipse MultiPageEditorPart.
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/JSPMultiPageEditor.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/JSPMultiPageEditor.java 2010-01-14 10:35:37 UTC (rev 19743)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/JSPMultiPageEditor.java 2010-01-14 10:45:39 UTC (rev 19744)
@@ -35,6 +35,7 @@
import org.eclipse.jface.viewers.ISelectionChangedListener;
import org.eclipse.jface.viewers.ISelectionProvider;
import org.eclipse.jface.viewers.SelectionChangedEvent;
+import org.eclipse.swt.custom.CTabFolder;
import org.eclipse.swt.events.DisposeEvent;
import org.eclipse.swt.events.DisposeListener;
import org.eclipse.swt.widgets.Composite;
@@ -789,7 +790,11 @@
.getString(IVpePreferencesPage.DEFAULT_VPE_TAB);
try {
int ind = Integer.parseInt(tabIndex);
- getTabFolder().setSelection(ind);
+ /*
+ * After fixing https://jira.jboss.org/jira/browse/JBIDE-5666
+ * Getting a multipage container should return CTabFolder.
+ */
+ ((CTabFolder)getContainer()).setSelection(ind);
pageChange(ind);
} catch (NumberFormatException e) {
JspEditorPlugin.getPluginLog().logError(e);
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/JSPMultiPageEditorPart.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/JSPMultiPageEditorPart.java 2010-01-14 10:35:37 UTC (rev 19743)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/JSPMultiPageEditorPart.java 2010-01-14 10:45:39 UTC (rev 19744)
@@ -10,197 +10,27 @@
******************************************************************************/
package org.jboss.tools.jst.jsp.jspeditor;
-import java.util.ArrayList;
-import java.util.Iterator;
-import org.eclipse.core.runtime.SafeRunner;
-import org.eclipse.jface.util.Assert;
-import org.eclipse.jface.util.SafeRunnable;
-import org.eclipse.jface.viewers.ISelectionProvider;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.CTabFolder;
-import org.eclipse.swt.custom.CTabItem;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.FillLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Item;
-import org.eclipse.ui.IEditorActionBarContributor;
import org.eclipse.ui.IEditorInput;
import org.eclipse.ui.IEditorPart;
import org.eclipse.ui.IEditorSite;
-import org.eclipse.ui.IKeyBindingService;
-import org.eclipse.ui.INestableKeyBindingService;
-import org.eclipse.ui.IPropertyListener;
-import org.eclipse.ui.IWorkbenchPart;
import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.part.EditorPart;
-import org.eclipse.ui.part.MultiPageEditorActionBarContributor;
-import org.eclipse.ui.part.MultiPageEditorSite;
-import org.eclipse.ui.part.MultiPageSelectionProvider;
+import org.eclipse.ui.part.MultiPageEditorPart;
import org.jboss.tools.common.core.resources.XModelObjectEditorInput;
/**
*
*/
-public abstract class JSPMultiPageEditorPart extends EditorPart {
+public abstract class JSPMultiPageEditorPart extends MultiPageEditorPart {
- private CTabFolder container;
-
- private ArrayList nestedEditors = new ArrayList(3);
-
protected JSPMultiPageEditorPart() {
super();
}
- public int addPage(Control control) {
- createItem(control);
- return getPageCount() - 1;
- }
-
- /**
- *
- */
-
- Composite ppp = null;
-
- public int addPage(IEditorPart editor, IEditorInput input)
- throws PartInitException {
- Composite parent2;
- if (ppp == null) {
- IEditorSite site = createSite(editor);
- editor.init(site, input);
- parent2 = new Composite(getContainer(), SWT.NONE);
- ppp = parent2;
- parent2.setLayout(new FillLayout());
- editor.createPartControl(parent2);
- editor.addPropertyListener(new IPropertyListener() {
- public void propertyChanged(Object source, int propertyId) {
- JSPMultiPageEditorPart.this
- .handlePropertyChange(propertyId);
- }
- });
- nestedEditors.add(editor);
- } else {
- parent2 = ppp;
- }
- Item item = createItem(parent2);
- item.setData(editor);
- return getPageCount() - 1;
- }
-
- /**
- *
- * @param parent
- * @return
- */
- private CTabFolder createContainer(Composite parent) {
- final CTabFolder newContainer = new CTabFolder(parent, SWT.BOTTOM
- | SWT.FLAT);
- newContainer.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- int newPageIndex = newContainer.indexOf((CTabItem) e.item);
- pageChange(newPageIndex);
- }
- });
- return newContainer;
- }
-
- /*
- *
- */
- private CTabItem createItem(Control control) {
- CTabItem item = new CTabItem(getTabFolder(), SWT.NONE);
- item.setControl(control);
- return item;
- }
-
- protected abstract void createPages();
-
- public final void createPartControl(Composite parent) {
- this.container = createContainer(parent);
- createPages();
- // set the active page (page 0 by default), unless it has already been
- // done
- if (getActivePage() == -1)
- setActivePage(0);
- }
-
- protected abstract IEditorSite createSite(IEditorPart editor);
-
- public void dispose() {
- getSite().setSelectionProvider(null);
- for (int i = 0; i < nestedEditors.size(); ++i) {
- IEditorPart editor = (IEditorPart) nestedEditors.get(i);
- disposePart(editor);
- }
- nestedEditors.clear();
- }
-
protected IEditorPart getActiveEditor() {
- int index = getActivePage();
- if (index != -1)
- return getEditor(0);
- return null;
+ return super.getActiveEditor();
}
- protected int getActivePage() {
- CTabFolder tabFolder = getTabFolder();
- if (tabFolder != null && !tabFolder.isDisposed())
- return tabFolder.getSelectionIndex();
- return -1;
- }
-
- protected Composite getContainer() {
- return container;
- }
-
- protected Control getControl(int pageIndex) {
- return getItem(0).getControl();
- }
-
- protected IEditorPart getEditor(int pageIndex) {
- Item item = getItem(pageIndex);
- if (item != null) {
- Object data = item.getData();
- if (data instanceof IEditorPart) {
- return (IEditorPart) data;
- }
- }
- return null;
- }
-
- private CTabItem getItem(int pageIndex) {
- return getTabFolder().getItem(pageIndex);
- }
-
- protected int getPageCount() {
- CTabFolder folder = getTabFolder();
- // May not have been created yet, or may have been disposed.
- if (folder != null && !folder.isDisposed())
- return folder.getItemCount();
- return 0;
- }
-
- protected Image getPageImage(int pageIndex) {
- return getItem(pageIndex).getImage();
- }
-
- protected String getPageText(int pageIndex) {
- return getItem(pageIndex).getText();
- }
-
- protected CTabFolder getTabFolder() {
- return container;
- }
-
- protected void handlePropertyChange(int propertyId) {
- firePropertyChange(propertyId);
- }
-
public void init(IEditorSite site, IEditorInput input)
throws PartInitException {
setSite(site);
@@ -208,123 +38,4 @@
site.setSelectionProvider(new JSPMultiPageSelectionProvider(this));
}
- public boolean isDirty() {
- // use nestedEditors to avoid SWT requests; see bug 12996
- for (Iterator i = nestedEditors.iterator(); i.hasNext();) {
- IEditorPart editor = (IEditorPart) i.next();
- if (editor.isDirty()) {
- return true;
- }
- }
- return false;
- }
-
- protected void pageChange(int newPageIndex) {
- Control control = getControl(newPageIndex);
- if (control != null) {
- control.setVisible(true);
- }
-
- setFocus();
- IEditorPart activeEditor = getEditor(newPageIndex);
- IEditorActionBarContributor contributor = getEditorSite()
- .getActionBarContributor();
- if (contributor != null
- && contributor instanceof MultiPageEditorActionBarContributor) {
- ((MultiPageEditorActionBarContributor) contributor)
- .setActivePage(activeEditor);
- }
- if (activeEditor != null) {
- ISelectionProvider selectionProvider = activeEditor.getSite()
- .getSelectionProvider();
- if (selectionProvider != null) {
- SelectionChangedEvent event = new SelectionChangedEvent(
- selectionProvider, selectionProvider.getSelection());
- ((MultiPageSelectionProvider) getSite().getSelectionProvider())
- .fireSelectionChanged(event);
- }
- }
- }
-
- private void disposePart(final IWorkbenchPart part) {
- SafeRunner.run(new SafeRunnable() {
- public void run() {
- if (part.getSite() instanceof MultiPageEditorSite) {
- MultiPageEditorSite partSite = (MultiPageEditorSite) part
- .getSite();
- partSite.dispose();
- }
- part.dispose();
- }
-
- public void handleException(Throwable e) {
- }
- });
- }
-
- public void removePage(int pageIndex) {
- Assert.isTrue(pageIndex >= 0 && pageIndex < getPageCount());
- IEditorPart editor = getEditor(pageIndex);
- getItem(pageIndex).dispose();
- if (editor != null) {
- nestedEditors.remove(editor);
- disposePart(editor);
- }
- }
-
- protected void setActivePage(int pageIndex) {
- Assert.isTrue(pageIndex >= 0 && pageIndex < getPageCount());
- getTabFolder().setSelection(pageIndex);
- }
-
- protected void setControl(int pageIndex, Control control) {
- getItem(pageIndex).setControl(control);
- }
-
- public void setFocus() {
- setFocus(getActivePage());
- }
-
- private void setFocus(int pageIndex) {
- final IKeyBindingService service = getSite().getKeyBindingService();
- if (pageIndex < 0 || pageIndex >= getPageCount()) {
- if (service instanceof INestableKeyBindingService) {
- final INestableKeyBindingService nestableService = (INestableKeyBindingService) service;
- nestableService.activateKeyBindingService(null);
- }
- return;
- }
-
- IEditorPart editor = getEditor(pageIndex);
- if (editor != null) {
- editor.setFocus();
- if (service instanceof INestableKeyBindingService) {
- INestableKeyBindingService nestableService = (INestableKeyBindingService) service;
- if (editor != null) {
- nestableService.activateKeyBindingService(editor
- .getEditorSite());
- } else {
- nestableService.activateKeyBindingService(null);
- }
- }
- } else {
- if (service instanceof INestableKeyBindingService) {
- INestableKeyBindingService nestableService = (INestableKeyBindingService) service;
- nestableService.activateKeyBindingService(null);
- }
-
- Control control = getControl(pageIndex);
- if (control != null) {
- control.setFocus();
- }
- }
- }
-
- protected void setPageImage(int pageIndex, Image image) {
- getItem(pageIndex).setImage(image);
- }
-
- protected void setPageText(int pageIndex, String text) {
- getItem(pageIndex).setText(text);
- }
}
14 years, 5 months
- 1
- 0
JBoss Tools SVN: r19743 - trunk/drools/docs/guvnor_ref.
by jbosstools-commits＠lists.jboss.org
Author: ochikvina
Date: 2010-01-14 05:35:37 -0500 (Thu, 14 Jan 2010)
New Revision: 19743
Modified:
trunk/drools/docs/guvnor_ref/pom.xml
Log:
<html><head><meta name="qrichtext" content="1" /></head><body style="font-size:9pt;font-family:Sans Serif">
<p>https://jira.jboss.org/jira/browse/JBDS-1052 updated the pom.xml,because the previous version was too old and the guide didn't build.</p>
</body></html>
Modified: trunk/drools/docs/guvnor_ref/pom.xml
===================================================================
--- trunk/drools/docs/guvnor_ref/pom.xml 2010-01-14 10:29:39 UTC (rev 19742)
+++ trunk/drools/docs/guvnor_ref/pom.xml 2010-01-14 10:35:37 UTC (rev 19743)
@@ -9,7 +9,45 @@
<version>1.0-SNAPSHOT</version>
<packaging>jdocbook</packaging>
<name>Guvnor_Tools_Reference_Guide</name>
-
+ <profiles>
+ <profile>
+ <id>release</id>
+ <properties>
+ <master>master_output.xml</master>
+ <xsl-single>classpath:/xslt/org/jboss/tools/xhtml-single-release.xsl</xsl-single>
+ <xsl-chunked>classpath:/xslt/org/jboss/tools/xhtml-release.xsl</xsl-chunked>
+ <xsl-pdf>classpath:/xslt/org/jboss/tools/pdf.xsl</xsl-pdf>
+ </properties>
+ </profile>
+ <profile>
+ <id>releaseTest</id>
+ <properties>
+ <master>master_output.xml</master>
+ <xsl-single>classpath:/xslt/org/jboss/tools/xhtml-single-release-nomarker.xsl</xsl-single>
+ <xsl-chunked>classpath:/xslt/org/jboss/tools/xhtml-release-nomarker.xsl</xsl-chunked>
+ <xsl-pdf>classpath:/xslt/org/jboss/tools/pdf.xsl</xsl-pdf>
+ </properties>
+ </profile>
+ <profile>
+ <id>releaseJBDS</id>
+ <properties>
+ <master>master_output.xml</master>
+ <xsl-single>classpath:/xslt/com/jboss/tools/xhtml-single-release.xsl</xsl-single>
+ <xsl-chunked>classpath:/xslt/com/jboss/tools/xhtml-release.xsl</xsl-chunked>
+ <xsl-pdf>classpath:/xslt/com/jboss/tools/pdf.xsl</xsl-pdf>
+ <cssdir>../../../documentation/jbosstools-jdocbook-style/src/main/com/css/</cssdir>
+ </properties>
+ </profile>
+ <profile>
+ <id>diffmk</id>
+ <properties>
+ <master>master_output.xml</master>
+ <xsl-single>classpath:/xslt/org/jboss/tools/xhtml-single-diff.xsl</xsl-single>
+ <xsl-chunked>classpath:/xslt/org/jboss/tools/xhtml-diff.xsl</xsl-chunked>
+ <xsl-pdf>classpath:/xslt/org/jboss/tools/pdf-diff.xsl</xsl-pdf>
+ </properties>
+ </profile>
+ </profiles>
<build>
<plugins>
<plugin>
@@ -19,8 +57,24 @@
<extensions>true</extensions>
- <dependencies>
+ <dependencies>
<dependency>
+ <groupId>org.jboss.tools</groupId>
+ <artifactId>jbosstools-docbook-xslt</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>com.jboss</groupId>
+ <artifactId>jbossent-docbook-xslt</artifactId>
+ <version>1.0.0</version>
+ </dependency>
+ <dependency>
+ <groupId>com.jboss</groupId>
+ <artifactId>jbossent-jdocbook-style</artifactId>
+ <version>1.0.0</version>
+ <type>jdocbook-style</type>
+ </dependency>
+ <dependency>
<groupId>org.jboss</groupId>
<artifactId>jbossorg-docbook-xslt</artifactId>
<version>1.1.0</version>
@@ -31,6 +85,11 @@
<version>1.1.0</version>
<type>jdocbook-style</type>
</dependency>
+ <dependency>
+ <groupId>org.apache.xmlgraphics</groupId>
+ <artifactId>fop</artifactId>
+ <version>0.95</version>
+ </dependency>
</dependencies>
<configuration>
@@ -49,22 +108,22 @@
<formats>
<format>
<formatName>pdf</formatName>
- <stylesheetResource>file:${pom.basedir}/${stylesdir}/xslt/org/jboss/tools/pdf.xsl</stylesheetResource>
+ <stylesheetResource>${xsl-pdf}</stylesheetResource>
<finalName>${pom.name}.pdf</finalName>
</format>
<format>
<formatName>html</formatName>
- <stylesheetResource>file:${pom.basedir}/${stylesdir}/xslt/org/jboss/tools/xhtml.xsl</stylesheetResource>
+ <stylesheetResource>${xsl-chunked}</stylesheetResource>
<finalName>index.html</finalName>
</format>
<format>
<formatName>html_single</formatName>
- <stylesheetResource>file:${pom.basedir}/${stylesdir}/xslt/org/jboss/tools/xhtml-single.xsl</stylesheetResource>
+ <stylesheetResource>${xsl-single}</stylesheetResource>
<finalName>index.html</finalName>
</format>
<format>
<formatName>eclipse</formatName>
- <stylesheetResource>file:${pom.basedir}/${stylesdir}/xslt/org/jboss/tools/eclipse.xsl</stylesheetResource>
+ <stylesheetResource>classpath:/xslt/org/jboss/eclipse.xsl</stylesheetResource>
<finalName>index.html</finalName>
</format>
</formats>
@@ -98,10 +157,12 @@
</snapshotRepository>
</distributionManagement>
- <properties>
- <stylesdir>../../../documentation/jbosstools-docbook-xslt/src/main/resources/</stylesdir>
+ <properties>
+ <xsl-single>classpath:/xslt/org/jboss/tools/xhtml-single.xsl</xsl-single>
+ <xsl-chunked>classpath:/xslt/org/jboss/tools/xhtml.xsl</xsl-chunked>
+ <xsl-pdf>classpath:/xslt/org/jboss/tools/pdf.xsl</xsl-pdf>
<cssdir>../../../documentation/jbosstools-jdocbook-style/src/main/org/css/</cssdir>
+ <master>master.xml</master>
<translation>en-US</translation>
</properties>
-
</project>
14 years, 5 months
- 1
- 0
JBoss Tools SVN: r19742 - in trunk: jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent and 9 other directories.
by jbosstools-commits＠lists.jboss.org
Author: yradtsevich
Date: 2010-01-14 05:29:39 -0500 (Thu, 14 Jan 2010)
New Revision: 19742
Added:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/pages/components/graphicImage.xhtml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/pages/components/graphicImage.xhtml.xml
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeFunctionJsf2Resource.java
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/templates/vpe-templates-jsf.xml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/WEB-INF/lib/jbide2550.jar
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/index.html
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/pages/JBIDE/2550/jbide2550.xhtml.xml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/pages/components/outputStylesheet.xhtml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/pages/components/outputStylesheet.xhtml.xml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/resources/css/stylesBlue.css
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/resources/css/stylesRed.css
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/Jsf20ComponentContentTest.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeLinkCreator.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/custom/CustomTLDReference.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeFunctionFactory.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/FileUtil.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/Jsf2ResourceUtil.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-5638
- implemented support of the attributes "name" and "library" for the tags h:graphicImage and h:outputStylesheet.
- created JUnits for the functionality
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/templates/vpe-templates-jsf.xml
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/templates/vpe-templates-jsf.xml 2010-01-14 07:01:52 UTC (rev 19741)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/templates/vpe-templates-jsf.xml 2010-01-14 10:29:39 UTC (rev 19742)
@@ -154,6 +154,20 @@
</vpe:template>
</vpe:tag>
<vpe:tag name="h:graphicImage" case-sensitive="yes">
+ <vpe:if test="attrpresent('name')">
+ <vpe:template children="no" modify="yes">
+ <img src="{href(jsf2resource(@library,@name))}" width="{@width}"
+ height="{@height}" class="{@styleClass}" style="{@style}"
+ title="{tagstring()}" alt="{jsfvalue(@alt)}"/>
+ <vpe:dnd>
+ <vpe:drag start-enable="yes" />
+ </vpe:dnd>
+ <vpe:resize>
+ <vpe:width width-attr="style.width" />
+ <vpe:height height-attr="style.height" />
+ </vpe:resize>
+ </vpe:template>
+ </vpe:if>
<vpe:if test="attrpresent('value')">
<vpe:template children="no" modify="yes">
<img src="{src(jsfvalue(@value))}" width="{@width}"
@@ -947,7 +961,7 @@
becouse it's not specified correctly in jsf lib, mareshkau -->
<!-- <vpe:if test="tld_version('min=2.0')"> -->
<vpe:template children="no" modify="no">
- <vpe:link rel="stylesheet" href="{href(@name)}" />
+ <vpe:link rel="stylesheet" href="{href(jsf2resource(@library,@name))}" />
</vpe:template>
<!-- </vpe:if> -->
</vpe:tag>
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/WEB-INF/lib/jbide2550.jar
===================================================================
(Binary files differ)
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/index.html
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/index.html 2010-01-14 07:01:52 UTC (rev 19741)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/index.html 2010-01-14 10:29:39 UTC (rev 19742)
@@ -9,6 +9,7 @@
<a href="pages/components/body2.jsf">h:body (2st)</a><br>
<a href="pages/components/outputScript.jsf">h:outputScript</a><br>
<a href="pages/components/outputStylesheet.jsf">h:outputStylesheet</a><br>
+ <a href="pages/components/graphicImage.jsf">h:graphicImage</a><br>
<a href="pages/JBIDE/2550/jbide2550.jsf">Resource Test Page</a><br>
<a href="pages/JBIDE/5352/jbide5352.jsf">Test Page with template name resolving for default tags</a><br>
<a href="pages/JBIDE/localization_versioning/resource-handling-1.jsf">Resource localization and versioning</a><br>
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/pages/JBIDE/2550/jbide2550.xhtml.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/pages/JBIDE/2550/jbide2550.xhtml.xml 2010-01-14 07:01:52 UTC (rev 19741)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/pages/JBIDE/2550/jbide2550.xhtml.xml 2010-01-14 10:29:39 UTC (rev 19742)
@@ -108,7 +108,7 @@
</LABEL>
</TD>
<TD>
-<IMG SRC="/.*/org.jboss.tools.vpe/img.*.gif/" STYLE="-moz-user-modify: read-write;"/>
+<IMG SRC="/.*[/\\]org.jboss.tools.vpe[/\\]img.*.gif/" STYLE="-moz-user-modify: read-write;"/>
</TD>
</TR>
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/pages/components/graphicImage.xhtml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/pages/components/graphicImage.xhtml (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/pages/components/graphicImage.xhtml 2010-01-14 10:29:39 UTC (rev 19742)
@@ -0,0 +1,21 @@
+<!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">
+<f:view contentType="text/html" />
+
+<h:head>
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+ <title>First JSF 2.0 application</title>
+</h:head>
+
+
+<h:body>
+ <h:form>
+ <p><h:graphicImage name="img/img.gif" id="graphicImageNameOnly"/></p>
+ <p><h:graphicImage library="img" name="img.gif" id="graphicImageNameAndLib"/></p>
+ <p><h:graphicImage name="jarimg/img.gif" id="graphicImageNameOnlyJar"/></p>
+ <p><h:graphicImage library="jarimg" name="img.gif" id="graphicImageNameAndLibJar"/></p>
+ </h:form>
+</h:body>
+</html>
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/pages/components/graphicImage.xhtml.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/pages/components/graphicImage.xhtml.xml (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/pages/components/graphicImage.xhtml.xml 2010-01-14 10:29:39 UTC (rev 19742)
@@ -0,0 +1,14 @@
+<tests>
+ <test id="graphicImageNameOnly">
+ <IMG SRC="/.*jsf2test/WebContent/resources/img/img.gif/" />
+ </test>
+ <test id="graphicImageNameAndLib">
+ <IMG SRC="/.*jsf2test/WebContent/resources/img/img.gif/" />
+ </test>
+ <test id="graphicImageNameOnlyJar">
+ <IMG SRC="/.*[/\\]org.jboss.tools.vpe[/\\]img.*.gif/" />
+ </test>
+ <test id="graphicImageNameAndLibJar">
+ <IMG SRC="/.*[/\\]org.jboss.tools.vpe[/\\]img.*.gif/" />
+ </test>
+</tests>
\ No newline at end of file
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/pages/components/outputStylesheet.xhtml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/pages/components/outputStylesheet.xhtml 2010-01-14 07:01:52 UTC (rev 19741)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/pages/components/outputStylesheet.xhtml 2010-01-14 10:29:39 UTC (rev 19742)
@@ -4,8 +4,10 @@
xmlns:h="http://java.sun.com/jsf/html">
<h:head />
<h:body>
- <h:outputStylesheet name="/resources/css/stylesRed.css" id="outputStylesheetRed"/>
- <h:outputStylesheet name="/resources/css/stylesBlue.css" id="outputStylesheetBlue"/>
- <span>Blue text</span>
+ <h:outputStylesheet name="css/stylesRed.css" id="outputStylesheetRed"/>
+ <h:outputStylesheet library="css" name="stylesBlue.css" id="outputStylesheetBlue"/>
+ <h:outputStylesheet library="jarcss" name="stylesYellowBold.css" id="outputStylesheetYellowBold"/>
+
+ <span>Yellow bold italic text on black background</span>
</h:body>
</html>
\ No newline at end of file
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/pages/components/outputStylesheet.xhtml.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/pages/components/outputStylesheet.xhtml.xml 2010-01-14 07:01:52 UTC (rev 19741)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/pages/components/outputStylesheet.xhtml.xml 2010-01-14 10:29:39 UTC (rev 19742)
@@ -1,12 +1,17 @@
<tests>
<test id="outputStylesheetRed">
<style>
- span { color: red;}
+ span { color: red; background-color: black;}
</style>
</test>
<test id="outputStylesheetBlue">
<style>
- span { color: blue;}
+ span { color: blue; font-style: italic;}
</style>
</test>
-</tests>
\ No newline at end of file
+ <test id="outputStylesheetYellowBold">
+ <style>
+ span { color: yellow; font-weight: bold;}
+ </style>
+ </test>
+</tests>
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/resources/css/stylesBlue.css
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/resources/css/stylesBlue.css 2010-01-14 07:01:52 UTC (rev 19741)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/resources/css/stylesBlue.css 2010-01-14 10:29:39 UTC (rev 19742)
@@ -1,4 +1,4 @@
span {
color: blue;
-
+ font-style: italic;
}
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/resources/css/stylesRed.css
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/resources/css/stylesRed.css 2010-01-14 07:01:52 UTC (rev 19741)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/resources/css/stylesRed.css 2010-01-14 10:29:39 UTC (rev 19742)
@@ -1,4 +1,4 @@
span {
color: red;
- background-color: #80FF00
+ background-color: black;
}
\ No newline at end of file
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/Jsf20ComponentContentTest.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/Jsf20ComponentContentTest.java 2010-01-14 07:01:52 UTC (rev 19741)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/Jsf20ComponentContentTest.java 2010-01-14 10:29:39 UTC (rev 19742)
@@ -61,6 +61,10 @@
public void testBody2() throws Throwable {
performContentTest("components/body2.xhtml"); //$NON-NLS-1$
}
+
+ public void testGraphicImage() throws Throwable {
+ performContentTest("components/graphicImage.xhtml"); //$NON-NLS-1$
+ }
public void testHead1() throws Throwable {
performContentTest("components/head1.xhtml"); //$NON-NLS-1$
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeLinkCreator.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeLinkCreator.java 2010-01-14 07:01:52 UTC (rev 19741)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeLinkCreator.java 2010-01-14 10:29:39 UTC (rev 19742)
@@ -29,9 +29,6 @@
private boolean caseSensitive;
private VpeExpression hrefExpr;
- private String hrefStr;
-
-
VpeLinkCreator(Element taglibElement, VpeDependencyMap dependencyMap, boolean caseSensitive) {
this.caseSensitive = caseSensitive;
build(taglibElement, dependencyMap);
@@ -41,7 +38,7 @@
Attr hrefAttr = element.getAttributeNode(VpeTemplateManager.ATTR_LINK_HREF);
if (hrefAttr != null) {
try {
- hrefStr = hrefAttr.getValue();
+ String hrefStr = hrefAttr.getValue();
VpeExpressionInfo info = VpeExpressionBuilder.buildCompletedExpression(hrefStr, caseSensitive);
hrefExpr = info.getExpression();
dependencyMap.setCreator(this, info.getDependencySet());
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/custom/CustomTLDReference.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/custom/CustomTLDReference.java 2010-01-14 07:01:52 UTC (rev 19741)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/custom/CustomTLDReference.java 2010-01-14 10:29:39 UTC (rev 19742)
@@ -160,7 +160,7 @@
jsfComponentExtension = fileExtension;
}
jsfComponentResourcePath=jsfComponentResourcePath+'/'+sourceNodeName+jsfComponentExtension;
- String fullResourcePath = FileUtil.processJSF2Resource(pageContext, jsfComponentResourcePath);
+ String fullResourcePath = FileUtil.getJSF2ResourcePath(pageContext, jsfComponentResourcePath);
result = FileUtil.getFile(pageContext.getEditPart().getEditorInput(), fullResourcePath);
if(result!=null) {
return result;
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeFunctionFactory.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeFunctionFactory.java 2010-01-14 07:01:52 UTC (rev 19741)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeFunctionFactory.java 2010-01-14 10:29:39 UTC (rev 19742)
@@ -16,6 +16,7 @@
public class VpeFunctionFactory {
private static final String FUNC_JSF_VALUE = "jsfvalue";//$NON-NLS-1$
+ private static final String FUNC_JSF2_RESOURCE = "jsf2resource";//$NON-NLS-1$
private static final String FUNC_NAME = "name";//$NON-NLS-1$
private static final String FUNC_NOT = "not";//$NON-NLS-1$
private static final String FUNC_IIF = "iif";//$NON-NLS-1$
@@ -55,6 +56,8 @@
private static Class<?> createCls(String name) {
if (FUNC_JSF_VALUE.equals(name)) {
return VpeFunctionJsfValue.class;
+ } else if (FUNC_JSF2_RESOURCE.equals(name)) {
+ return VpeFunctionJsf2Resource.class;
} else if (FUNC_NAME.equals(name)) {
return VpeFunctionName.class;
} else if (FUNC_NOT.equals(name)) {
Added: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeFunctionJsf2Resource.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeFunctionJsf2Resource.java (rev 0)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeFunctionJsf2Resource.java 2010-01-14 10:29:39 UTC (rev 19742)
@@ -0,0 +1,42 @@
+/*******************************************************************************
+ * Copyright (c) 2007-2010 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
+ *
+ * Contributor:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.vpe.editor.template.expression;
+
+import org.jboss.tools.vpe.editor.context.VpePageContext;
+import org.jboss.tools.vpe.editor.util.FileUtil;
+import org.w3c.dom.Node;
+
+/**
+ * Implementation of the function {@code jsf2resource(library, name)}.
+ *
+ * @author yradtsevich
+ */
+public class VpeFunctionJsf2Resource extends VpeFunction {
+
+ /**
+ * Returns the path to the resource specified by the {@code library}
+ * and the {@code name}.
+ *
+ * @see FileUtil#getJSF2ResourcePath(VpePageContext, String, String)
+ */
+ public VpeValue exec(VpePageContext pageContext, Node sourceNode)
+ throws VpeExpressionException {
+ String library = getParameter(0).exec(pageContext, sourceNode).stringValue();
+ if ("".equals(library)) { //$NON-NLS-1$
+ library = null;
+ }
+
+ String name = getParameter(1).exec(pageContext, sourceNode).stringValue();
+
+ String resourcePath = FileUtil.getJSF2ResourcePath(pageContext, library, name);
+ return new VpeValue(resourcePath);
+ }
+}
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/FileUtil.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/FileUtil.java 2010-01-14 07:01:52 UTC (rev 19741)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/FileUtil.java 2010-01-14 10:29:39 UTC (rev 19742)
@@ -17,6 +17,7 @@
import java.io.InputStream;
import java.io.OutputStream;
import java.util.zip.ZipEntry;
+
import org.eclipse.core.resources.IContainer;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IProject;
@@ -54,20 +55,49 @@
public class FileUtil {
private static final String JSF2_RESOURCES = "/resources/"; //$NON-NLS-1$
- /**
- * See JBIDE-2550
- * @author mareshkau
- * @param matcher
- * @return
- */
- public static final String processJSF2Resource(VpePageContext pageContext, String resStr){
- String tempString = resStr;
- tempString=tempString.replaceAll(":", "/"); //$NON-NLS-1$//$NON-NLS-2$
- tempString = FileUtil.JSF2_RESOURCES+tempString;
+ /**
+ * Returns the path to the resource {@code #{resource[resourceStr]}, where
+ * {@code resourceStr} is in the form {@code 'library:name'}.
+ *
+ * See JBIDE-2550
+ *
+ * @author mareshkau
+ * @author yradtsevich
+ */
+ public static final String getJSF2ResourcePath(VpePageContext pageContext,
+ String resourceStr) {
+ if (resourceStr.contains(":")) { //$NON-NLS-1$
+ String[] parts = resourceStr.split(":"); //$NON-NLS-1$
+ return getJSF2ResourcePath(pageContext, parts[0], parts[1]);
+ } else {
+ return getJSF2ResourcePath(pageContext, null, resourceStr);
+ }
+ }
+
+ /**
+ * Returns the path to the resource specified by the {@code library}
+ * and the {@code name}.
+ *
+ * See JBIDE-5638
+ *
+ * @param library may be {@code null}
+ *
+ * @author mareshkau
+ * @author yradtsevich
+ *
+ * @see <a href="http://java.sun.com/javaee/javaserverfaces/2.0/docs/api/javax/faces/appli...">javax.faces.application.ResourceHandler</a>
+ */
+ public static final String getJSF2ResourcePath(VpePageContext pageContext,
+ String library, String name) {
+ String tempString = library == null ? name
+ : library + '/' + name;
+
+ tempString = FileUtil.JSF2_RESOURCES + tempString;
String result = ""; //$NON-NLS-1$
// if file not accessible and try to search in jar files
if(VpeCreatorUtil.getFile(tempString, pageContext)==null) {
- String tempEntryPath =seachResourceInClassPath(pageContext, "META-INF"+tempString); //$NON-NLS-1$
+ String tempEntryPath =seachResourceInClassPath(pageContext,
+ "META-INF" + tempString); //$NON-NLS-1$
if(tempEntryPath!=null) {
result = tempEntryPath;
}
@@ -75,7 +105,7 @@
result = tempString;
}
return result;
- }
+ }
public static boolean isExistsInJSF2Resources(VpePageContext pageContext, String resStr) {
String resourceString = resStr;
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/Jsf2ResourceUtil.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/Jsf2ResourceUtil.java 2010-01-14 07:01:52 UTC (rev 19741)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/Jsf2ResourceUtil.java 2010-01-14 10:29:39 UTC (rev 19742)
@@ -71,9 +71,9 @@
Matcher singleCoatMatcher = resourcePatternWithSinglCoat.matcher(value);
Matcher doubleCoatMatcher = resourcePatternWithDoableCoat.matcher(value);
if(doubleCoatMatcher.find()) {
- result = FileUtil.processJSF2Resource(pageContext, doubleCoatMatcher.group(1));
+ result = FileUtil.getJSF2ResourcePath(pageContext, doubleCoatMatcher.group(1));
}else if(singleCoatMatcher.find()){
- result = FileUtil.processJSF2Resource(pageContext, singleCoatMatcher.group(1));
+ result = FileUtil.getJSF2ResourcePath(pageContext, singleCoatMatcher.group(1));
}
return result;
14 years, 5 months
- 1
- 0
JBoss Tools SVN: r19741 - trunk/tests/tests/org.jboss.tools.tests/src/org/jboss/tools/test/util.
by jbosstools-commits＠lists.jboss.org
Author: Grid.Qian
Date: 2010-01-14 02:01:52 -0500 (Thu, 14 Jan 2010)
New Revision: 19741
Modified:
trunk/tests/tests/org.jboss.tools.tests/src/org/jboss/tools/test/util/JobUtils.java
Log:
JBIDE-5678: meet a long task exception when running a unit test
Modified: trunk/tests/tests/org.jboss.tools.tests/src/org/jboss/tools/test/util/JobUtils.java
===================================================================
--- trunk/tests/tests/org.jboss.tools.tests/src/org/jboss/tools/test/util/JobUtils.java 2010-01-13 16:54:57 UTC (rev 19740)
+++ trunk/tests/tests/org.jboss.tools.tests/src/org/jboss/tools/test/util/JobUtils.java 2010-01-14 07:01:52 UTC (rev 19741)
@@ -7,7 +7,7 @@
*
* Contributors:
* Red Hat, Inc. - initial API and implementation
- ******************************************************************************/
+ ******************************************************************************/
package org.jboss.tools.test.util;
@@ -16,30 +16,43 @@
/**
* @author eskimo
- *
+ *
*/
public class JobUtils {
-
- private static final long MAX_IDLE = 20*60*1000L;
+
+ private static final long MAX_IDLE = 20 * 60 * 1000L;
private static final long DEFAULT_DELAY = 500;
public static void waitForIdle() {
waitForIdle(DEFAULT_DELAY);
}
-
+
public static void waitForIdle(long delay) {
long start = System.currentTimeMillis();
- // Job.getJobManager().isIdle() is more efficient than EditorTestHelper.allJobsQuiet()
+ // Job.getJobManager().isIdle() is more efficient than
+ // EditorTestHelper.allJobsQuiet()
// EditorTestHelper.allJobsQuiet() isn't thread-safe
- // https://bugs.eclipse.org/bugs/show_bug.cgi?id=198241 is fixed
- //while (!EditorTestHelper.allJobsQuiet()) {
+ // https://bugs.eclipse.org/bugs/show_bug.cgi?id=198241 is fixed
+ // while (!EditorTestHelper.allJobsQuiet()) {
while (!Job.getJobManager().isIdle()) {
delay(delay);
- if ( (System.currentTimeMillis()-start) > MAX_IDLE )
- throw new RuntimeException("A long running task detected"); //$NON-NLS-1$
+ if ((System.currentTimeMillis() - start) > MAX_IDLE) {
+ Job[] jobs = Job.getJobManager().find(null);
+ if (jobs != null) {
+ StringBuffer str = new StringBuffer();
+ for (Job job : jobs) {
+ if (job.getThread() != null) {
+ str.append("\n").append(job.getName()).append(" (")
+ .append(job.getClass()).append(")");
+ }
+ }
+ throw new RuntimeException(
+ "Long running tasks detected:" + str.toString()); //$NON-NLS-1$
+ }
+ }
}
}
-
+
public static void delay(long waitTimeMillis) {
Display display = Display.getCurrent();
if (display != null) {
14 years, 5 months
- 1
- 0
JBoss Tools SVN: r19740 - in trunk: documentation/guides/GettingStartedGuide/en and 16 other directories.
by jbosstools-commits＠lists.jboss.org
Author: ochikvina
Date: 2010-01-13 11:54:57 -0500 (Wed, 13 Jan 2010)
New Revision: 19740
Modified:
trunk/documentation/guides/Exadel-migration/en/master.xml
trunk/documentation/guides/GettingStartedGuide/en/master.xml
trunk/drools/docs/guvnor_ref/en/master.xml
trunk/drools/docs/reference/en/master.xml
trunk/esb/docs/esb_ref_guide/en/master.xml
trunk/hibernatetools/docs/reference/en/master.xml
trunk/jbpm/docs/converter_ref/en-US/master.xml
trunk/jbpm/docs/reference/en/master.xml
trunk/jmx/docs/reference/en/master.xml
trunk/jmx/docs/reference/en/master_output.xml
trunk/jsf/docs/jsf_tools_ref_guide/en/master.xml
trunk/jsf/docs/jsf_tools_tutorial/en/master.xml
trunk/jsf/docs/userguide/en/master.xml
trunk/portlet/docs/reference/en/master.xml
trunk/seam/docs/reference/en/master.xml
trunk/smooks/docs/reference/en/master.xml
trunk/struts/docs/struts_tools_ref_guide/en/master.xml
trunk/struts/docs/struts_tools_tutorial/en/master.xml
trunk/ws/docs/reference/en/master.xml
Log:
<html><head><meta name="qrichtext" content="1" /></head><body style="font-size:9pt;font-family:Sans Serif">
<p>https://jira.jboss.org/jira/browse/JBDS-1052 updated the versions and copyright info</p>
</body></html>
Modified: trunk/documentation/guides/Exadel-migration/en/master.xml
===================================================================
--- trunk/documentation/guides/Exadel-migration/en/master.xml 2010-01-13 16:53:22 UTC (rev 19739)
+++ trunk/documentation/guides/Exadel-migration/en/master.xml 2010-01-13 16:54:57 UTC (rev 19740)
@@ -26,14 +26,16 @@
<bookinfo>
<title>Exadel Studio Migration Guide</title>
- <pubdate>April 2008</pubdate>
+
<copyright>
- <year>2007</year>
- <year>2009</year>
+ <year>2007</year>
+ <year>2008</year>
+ <year>2009</year>
+ <year>2010</year>
<holder>JBoss by Red Hat</holder>
</copyright>
<releaseinfo>
-Version: 3.1.0.CR1
+Version: 3.0.0.GA
</releaseinfo>
<abstract>
Modified: trunk/documentation/guides/GettingStartedGuide/en/master.xml
===================================================================
--- trunk/documentation/guides/GettingStartedGuide/en/master.xml 2010-01-13 16:53:22 UTC (rev 19739)
+++ trunk/documentation/guides/GettingStartedGuide/en/master.xml 2010-01-13 16:54:57 UTC (rev 19740)
@@ -37,13 +37,15 @@
<book>
<bookinfo>
<title>Getting Started with JBoss Developer Studio</title>
- <pubdate>April 2008</pubdate>
+
<copyright>
- <year>2007</year>
- <year>2009</year>
+ <year>2007</year>
+ <year>2008</year>
+ <year>2009</year>
+ <year>2010</year>
<holder>JBoss by Red Hat</holder>
</copyright>
- <releaseinfo>Version: 3.1.0.CR1</releaseinfo>
+ <releaseinfo>Version: 3.0.0.GA</releaseinfo>
<abstract>
<title/>
<para>
Modified: trunk/drools/docs/guvnor_ref/en/master.xml
===================================================================
--- trunk/drools/docs/guvnor_ref/en/master.xml 2010-01-13 16:53:22 UTC (rev 19739)
+++ trunk/drools/docs/guvnor_ref/en/master.xml 2010-01-13 16:54:57 UTC (rev 19740)
@@ -39,9 +39,9 @@
<author><firstname>John</firstname><surname>Graham</surname><email>jgraham(a)redhat.com</email></author>
<author><firstname>Olga</firstname><surname>Chikvina</surname></author>
- <pubdate>April 2008</pubdate>
<copyright>
- <year>2009</year>
+ <year>2009</year>
+ <year>2010</year>
<holder>JBoss by Red Hat</holder>
</copyright>
<releaseinfo>
Modified: trunk/drools/docs/reference/en/master.xml
===================================================================
--- trunk/drools/docs/reference/en/master.xml 2010-01-13 16:53:22 UTC (rev 19739)
+++ trunk/drools/docs/reference/en/master.xml 2010-01-13 16:54:57 UTC (rev 19740)
@@ -39,10 +39,11 @@
</corpauthor>
<author><firstname>Olga</firstname><surname>Chikvina</surname></author>
- <pubdate>April 2008</pubdate>
<copyright>
- <year>2007</year>
- <year>2009</year>
+ <year>2007</year>
+ <year>2008</year>
+ <year>2009</year>
+ <year>2010</year>
<holder>JBoss by Red Hat</holder>
</copyright>
<releaseinfo>
Modified: trunk/esb/docs/esb_ref_guide/en/master.xml
===================================================================
--- trunk/esb/docs/esb_ref_guide/en/master.xml 2010-01-13 16:53:22 UTC (rev 19739)
+++ trunk/esb/docs/esb_ref_guide/en/master.xml 2010-01-13 16:54:57 UTC (rev 19740)
@@ -36,11 +36,12 @@
</corpauthor>
<author><firstname>Svetlana</firstname><surname>Mukhina</surname><email>smukhina(a)exadel.com</email></author>
<author><firstname>Tatyana</firstname><surname>Romanovich</surname></author>
-
- <pubdate>April 2008</pubdate>
+
<copyright>
- <year>2007</year>
- <year>2009</year>
+ <year>2007</year>
+ <year>2008</year>
+ <year>2009</year>
+ <year>2010</year>
<holder>JBoss by Red Hat</holder>
</copyright>
<releaseinfo>
@@ -61,4 +62,4 @@
&esb_support;
&esb_editor;
-</book>
\ No newline at end of file
+</book>
Modified: trunk/hibernatetools/docs/reference/en/master.xml
===================================================================
--- trunk/hibernatetools/docs/reference/en/master.xml 2010-01-13 16:53:22 UTC (rev 19739)
+++ trunk/hibernatetools/docs/reference/en/master.xml 2010-01-13 16:54:57 UTC (rev 19740)
@@ -40,11 +40,12 @@
<author><firstname>Max</firstname><surname>Andersen</surname><email>max.andersen(a)jboss.com</email></author>
<author><firstname>Olga</firstname><surname>Chikvina</surname></author>
<author><firstname>Svetlana</firstname><surname>Mukhina</surname><email>smukhina(a)exadel.com</email></author>
-
- <pubdate>April 2008</pubdate>
+
<copyright>
<year>2007</year>
+ <year>2008</year>
<year>2009</year>
+ <year>2010</year>
<holder>JBoss by Red Hat</holder>
</copyright>
Modified: trunk/jbpm/docs/converter_ref/en-US/master.xml
===================================================================
--- trunk/jbpm/docs/converter_ref/en-US/master.xml 2010-01-13 16:53:22 UTC (rev 19739)
+++ trunk/jbpm/docs/converter_ref/en-US/master.xml 2010-01-13 16:54:57 UTC (rev 19740)
@@ -22,10 +22,11 @@
</corpauthor>
<author><firstname>Grid</firstname><surname>Qian</surname><email>fqian(a)redhat.com</email></author>
- <pubdate>October 2008</pubdate>
+
<copyright>
<year>2008</year>
<year>2009</year>
+ <year>2010</year>
<holder>JBoss by Red Hat</holder>
</copyright>
<releaseinfo>
Modified: trunk/jbpm/docs/reference/en/master.xml
===================================================================
--- trunk/jbpm/docs/reference/en/master.xml 2010-01-13 16:53:22 UTC (rev 19739)
+++ trunk/jbpm/docs/reference/en/master.xml 2010-01-13 16:54:57 UTC (rev 19740)
@@ -62,11 +62,10 @@
<email>tom.baeyens(a)jboss.com</email>
</author>
-
- <pubdate>April 2008</pubdate>
<copyright>
<year>2007</year>
- <year>2009</year>
+ <year>2009</year>
+ <year>2010</year>
<holder>JBoss by Red Hat</holder>
</copyright>
<releaseinfo> Version: 4.0.0.CR1</releaseinfo>
Modified: trunk/jmx/docs/reference/en/master.xml
===================================================================
--- trunk/jmx/docs/reference/en/master.xml 2010-01-13 16:53:22 UTC (rev 19739)
+++ trunk/jmx/docs/reference/en/master.xml 2010-01-13 16:54:57 UTC (rev 19740)
@@ -40,11 +40,12 @@
</imageobject>
</inlinemediaobject>
</corpauthor>
-
- <pubdate>December 2008</pubdate>
+
<copyright>
- <year>2007</year>
- <year>2009</year>
+ <year>2007</year>
+ <year>2008</year>
+ <year>2009</year>
+ <year>2010</year>
<holder>JBoss by Red Hat</holder>
</copyright>
<releaseinfo>
Modified: trunk/jmx/docs/reference/en/master_output.xml
===================================================================
--- trunk/jmx/docs/reference/en/master_output.xml 2010-01-13 16:53:22 UTC (rev 19739)
+++ trunk/jmx/docs/reference/en/master_output.xml 2010-01-13 16:54:57 UTC (rev 19740)
@@ -39,10 +39,12 @@
</inlinemediaobject>
</corpauthor>
- <pubdate>December 2008</pubdate>
+
<copyright>
<year>2007</year>
+ <year>2008</year>
<year>2009</year>
+ <year>2010</year>
<holder>JBoss by Red Hat</holder>
</copyright>
<releaseinfo><diffmk:wrapper diffmk:change="changed">
Modified: trunk/jsf/docs/jsf_tools_ref_guide/en/master.xml
===================================================================
--- trunk/jsf/docs/jsf_tools_ref_guide/en/master.xml 2010-01-13 16:53:22 UTC (rev 19739)
+++ trunk/jsf/docs/jsf_tools_ref_guide/en/master.xml 2010-01-13 16:54:57 UTC (rev 19740)
@@ -44,10 +44,11 @@
<author><firstname>Olga</firstname><surname>Chikvina</surname></author>
<author><firstname>Svetlana</firstname><surname>Mukhina</surname><email>smukhina(a)exadel.com</email></author>
- <pubdate>April 2008</pubdate>
<copyright>
- <year>2007</year>
- <year>2009</year>
+ <year>2007</year>
+ <year>2008</year>
+ <year>2009</year>
+ <year>2010</year>
<holder>JBoss by Red Hat</holder>
</copyright>
<releaseinfo>
@@ -73,4 +74,4 @@
&managed_beans;
&creation_and_registration;
&jsf_project_verification;
-</book>
\ No newline at end of file
+</book>
Modified: trunk/jsf/docs/jsf_tools_tutorial/en/master.xml
===================================================================
--- trunk/jsf/docs/jsf_tools_tutorial/en/master.xml 2010-01-13 16:53:22 UTC (rev 19739)
+++ trunk/jsf/docs/jsf_tools_tutorial/en/master.xml 2010-01-13 16:54:57 UTC (rev 19740)
@@ -42,11 +42,12 @@
<author><firstname>Anatoly</firstname><surname>Fedosik</surname></author>
<author><firstname>Olga</firstname><surname>Chikvina</surname></author>
<author><firstname>Svetlana</firstname><surname>Mukhina</surname><email>smukhina(a)exadel.com</email></author>
-
- <pubdate>April 2008</pubdate>
+
<copyright>
- <year>2007</year>
- <year>2009</year>
+ <year>2007</year>
+ <year>2008</year>
+ <year>2009</year>
+ <year>2010</year>
<holder>JBoss by Red Hat</holder>
</copyright>
Modified: trunk/jsf/docs/userguide/en/master.xml
===================================================================
--- trunk/jsf/docs/userguide/en/master.xml 2010-01-13 16:53:22 UTC (rev 19739)
+++ trunk/jsf/docs/userguide/en/master.xml 2010-01-13 16:54:57 UTC (rev 19740)
@@ -33,14 +33,15 @@
<bookinfo>
<title>Visual Web Tools Reference Guide</title>
- <pubdate>April 2008</pubdate>
<copyright>
- <year>2007</year>
- <year>2009</year>
+ <year>2007</year>
+ <year>2008</year>
+ <year>2009</year>
+ <year>2010</year>
<holder>JBoss by Red Hat</holder>
</copyright>
<releaseinfo>
- Version: 3.1.0.CR1
+ Version: 3.0.0.GA
</releaseinfo>
<abstract>
<title/>
Modified: trunk/portlet/docs/reference/en/master.xml
===================================================================
--- trunk/portlet/docs/reference/en/master.xml 2010-01-13 16:53:22 UTC (rev 19739)
+++ trunk/portlet/docs/reference/en/master.xml 2010-01-13 16:54:57 UTC (rev 19740)
@@ -42,11 +42,11 @@
<author><firstname>Snjezana</firstname><surname>Peco</surname><email>snjezana.peco(a)redhat.com</email></author>
<author><firstname>Svetlana</firstname><surname>Mukhina</surname><email>smukhina(a)exadel.com</email></author>
<author><firstname>Thomas</firstname><surname>Heute</surname><email>theute(a)jboss.org</email></author>
-
- <pubdate>September 2008</pubdate>
+
<copyright>
<year>2008</year>
- <year>2009</year>
+ <year>2009</year>
+ <year>2010</year>
<holder>JBoss by Red Hat</holder>
</copyright>
<releaseinfo>
Modified: trunk/seam/docs/reference/en/master.xml
===================================================================
--- trunk/seam/docs/reference/en/master.xml 2010-01-13 16:53:22 UTC (rev 19739)
+++ trunk/seam/docs/reference/en/master.xml 2010-01-13 16:54:57 UTC (rev 19740)
@@ -55,10 +55,11 @@
<author><firstname>Svetlana</firstname><surname>Mukhina</surname><email>smukhina(a)exadel.com</email></author>
- <pubdate>April 2008</pubdate>
<copyright>
- <year>2007</year>
- <year>2009</year>
+ <year>2007</year>
+ <year>2008</year>
+ <year>2009</year>
+ <year>2010</year>
<holder>JBoss by Red Hat</holder>
</copyright>
<releaseinfo>
Modified: trunk/smooks/docs/reference/en/master.xml
===================================================================
--- trunk/smooks/docs/reference/en/master.xml 2010-01-13 16:53:22 UTC (rev 19739)
+++ trunk/smooks/docs/reference/en/master.xml 2010-01-13 16:54:57 UTC (rev 19740)
@@ -29,9 +29,9 @@
<surname>Peng</surname>
</author>
- <pubdate>November 2008</pubdate>
<copyright>
- <year>2009</year>
+ <year>2009</year>
+ <year>2010</year>
<holder>JBoss by Red Hat</holder>
</copyright>
<releaseinfo>
Modified: trunk/struts/docs/struts_tools_ref_guide/en/master.xml
===================================================================
--- trunk/struts/docs/struts_tools_ref_guide/en/master.xml 2010-01-13 16:53:22 UTC (rev 19739)
+++ trunk/struts/docs/struts_tools_ref_guide/en/master.xml 2010-01-13 16:54:57 UTC (rev 19740)
@@ -45,10 +45,11 @@
<author><firstname>Olga</firstname><surname>Chikvina</surname></author>
<author><firstname>Svetlana</firstname><surname>Mukhina</surname><email>smukhina(a)exadel.com</email></author>
- <pubdate>April 2008</pubdate>
<copyright>
- <year>2007</year>
- <year>2009</year>
+ <year>2007</year>
+ <year>2008</year>
+ <year>2009</year>
+ <year>2010</year>
<holder>JBoss by Red Hat</holder>
</copyright>
<releaseinfo>
@@ -76,4 +77,4 @@
&page_links_recognizer;
&project_verification;
&rel_resources_links;
-</book>
\ No newline at end of file
+</book>
Modified: trunk/struts/docs/struts_tools_tutorial/en/master.xml
===================================================================
--- trunk/struts/docs/struts_tools_tutorial/en/master.xml 2010-01-13 16:53:22 UTC (rev 19739)
+++ trunk/struts/docs/struts_tools_tutorial/en/master.xml 2010-01-13 16:54:57 UTC (rev 19740)
@@ -42,10 +42,11 @@
<author><firstname>Olga</firstname><surname>Chikvina</surname></author>
<author><firstname>Svetlana</firstname><surname>Mukhina</surname><email>smukhina(a)exadel.com</email></author>
- <pubdate>April 2008</pubdate>
<copyright>
- <year>2007</year>
- <year>2009</year>
+ <year>2007</year>
+ <year>2008</year>
+ <year>2009</year>
+ <year>2010</year>
<holder>JBoss by Red Hat</holder>
</copyright>
<releaseinfo>
Modified: trunk/ws/docs/reference/en/master.xml
===================================================================
--- trunk/ws/docs/reference/en/master.xml 2010-01-13 16:53:22 UTC (rev 19739)
+++ trunk/ws/docs/reference/en/master.xml 2010-01-13 16:54:57 UTC (rev 19740)
@@ -26,10 +26,11 @@
</corpauthor>
<author><firstname>Denny</firstname><surname>Xu</surname><email>dxu(a)redhat.com</email></author>
<author><firstname>Grid</firstname><surname>Qian</surname><email>fqian(a)redhat.com</email></author>
- <pubdate>July 2008</pubdate>
+
<copyright>
<year>2008</year>
- <year>2009</year>
+ <year>2009</year>
+ <year>2010</year>
<holder>JBoss by Red Hat</holder>
</copyright>
<releaseinfo>
14 years, 5 months
- 1
- 0
JBoss Tools SVN: r19739 - in trunk/esb/plugins/org.jboss.tools.esb.core: src/org/jboss/tools/esb/core/model/handlers and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2010-01-13 11:53:22 -0500 (Wed, 13 Jan 2010)
New Revision: 19739
Modified:
trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb-actions.meta
trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/handlers/AddContentBasedRouterSupport.java
trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/impl/ContentBasedRouter.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-5653
Modified: trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb-actions.meta
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb-actions.meta 2010-01-13 16:47:05 UTC (rev 19738)
+++ trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb-actions.meta 2010-01-13 16:53:22 UTC (rev 19739)
@@ -3529,12 +3529,13 @@
<AttributeData AttributeName="rule reload" Mandatory="no"/>
</EntityData>
</XActionItem>
- <XActionItem HandlerClassName="%Create%" ICON="action.empty"
- PROPERTIES="validator.add=true" WizardClassName="%Default%"
+ <XActionItem HandlerClassName="%SpecialWizard%"
+ ICON="action.empty"
+ PROPERTIES="validator.add=true;support=org.jboss.tools.esb.core.model.handlers.AddContentBasedRouterSupport"
displayName="Content Based Router (Generic)..." kind="action" name="AddContentBasedRouter">
<EntityData EntityName="ESBPreActionContentBasedRouter120">
<AttributeData AttributeName="name"/>
- <AttributeData AttributeName="cbr alias" Mandatory="no"/>
+ <AttributeData AttributeName="cbr alias"/>
<AttributeData AttributeName="process" Mandatory="no"/>
<AttributeData AttributeName="rule set" Mandatory="no"/>
<AttributeData AttributeName="rule language" Mandatory="no"/>
Modified: trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/handlers/AddContentBasedRouterSupport.java
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/handlers/AddContentBasedRouterSupport.java 2010-01-13 16:47:05 UTC (rev 19738)
+++ trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/handlers/AddContentBasedRouterSupport.java 2010-01-13 16:53:22 UTC (rev 19739)
@@ -2,11 +2,14 @@
import java.util.Properties;
+import org.jboss.tools.common.meta.action.impl.DefaultWizardDataValidator;
+import org.jboss.tools.common.meta.action.impl.WizardDataValidator;
import org.jboss.tools.common.meta.action.impl.handlers.DefaultCreateHandler;
import org.jboss.tools.common.meta.action.impl.handlers.DefaultCreateSupport;
import org.jboss.tools.common.model.XModelException;
import org.jboss.tools.common.model.XModelObject;
import org.jboss.tools.common.model.util.XModelObjectLoaderUtil;
+import org.jboss.tools.esb.core.model.impl.ContentBasedRouter;
public class AddContentBasedRouterSupport extends DefaultCreateSupport {
@@ -17,10 +20,57 @@
Properties p = extractStepData(0);
String cbrAlias = action.getProperty("cbrAlias");
if(cbrAlias != null) {
- p.setProperty("cbr alias", cbrAlias);
+ p.setProperty(ContentBasedRouter.ATTR_CBR_ALIAS, cbrAlias);
}
+ String ruleSet = p.getProperty(ContentBasedRouter.ATTR_RULE_SET);
+ if(ruleSet == null || ruleSet.length() == 0) {
+ p.remove(ContentBasedRouter.ATTR_RULE_RELOAD);
+ }
XModelObject action = XModelObjectLoaderUtil.createValidObject(getTarget().getModel(), entity, p);
DefaultCreateHandler.addCreatedObject(getTarget(), action, getProperties());
}
+ public boolean isFieldEditorEnabled(int stepId, String name, Properties values) {
+ if(ContentBasedRouter.ATTR_RULE_RELOAD.equals(name)) {
+ String ruleSet = values.getProperty(ContentBasedRouter.ATTR_RULE_SET);
+ if(ruleSet == null || ruleSet.trim().length() == 0) {
+ return false;
+ }
+ } else if(ContentBasedRouter.ATTR_RULE_LANGUAGE.equals(name)) {
+ String alias = values.getProperty(ContentBasedRouter.ATTR_CBR_ALIAS);
+ if(alias == null) alias = action.getProperty("cbrAlias");
+ if(isRegexOrXPathOrEmpty(alias)) {
+ return false;
+ }
+ }
+ return true;
+ }
+
+ private boolean isRegexOrXPathOrEmpty(String alias) {
+ return (alias == null || alias.length() == 0 || "Regex".equalsIgnoreCase(alias) || "Xpath".equalsIgnoreCase(alias));
+ }
+
+ protected DefaultWizardDataValidator cbrValidator = new CBRValidator();
+
+ public WizardDataValidator getValidator(int step) {
+ cbrValidator.setSupport(this, step);
+ return cbrValidator;
+ }
+
+ class CBRValidator extends DefaultWizardDataValidator {
+ public void validate(Properties data) {
+ message = null;
+ super.validate(data);
+ if(message != null) return;
+ String alias = data.getProperty(ContentBasedRouter.ATTR_CBR_ALIAS);
+ if("Drools".equalsIgnoreCase(alias)) {
+ String ruleSet = data.getProperty(ContentBasedRouter.ATTR_RULE_SET);
+ if(ruleSet == null || ruleSet.length() == 0) {
+ message = "Rule Set must be set for Drools Router";
+ return;
+ }
+ }
+ }
+ }
+
}
Modified: trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/impl/ContentBasedRouter.java
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/impl/ContentBasedRouter.java 2010-01-13 16:47:05 UTC (rev 19738)
+++ trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/impl/ContentBasedRouter.java 2010-01-13 16:53:22 UTC (rev 19739)
@@ -18,8 +18,10 @@
*/
public class ContentBasedRouter extends ESBCustomizedObjectImpl {
private static final long serialVersionUID = 1L;
- static String ATTR_CBR_ALIAS = "cbr alias";
- static String ATTR_RULE_LANGUAGE = "rule language";
+ public static String ATTR_CBR_ALIAS = "cbr alias";
+ public static String ATTR_RULE_LANGUAGE = "rule language";
+ public static String ATTR_RULE_SET = "rule set";
+ public static String ATTR_RULE_RELOAD = "rule reload";
public ContentBasedRouter() {}
@@ -30,6 +32,11 @@
if(isRegexOrXPath(alias)) {
return false;
}
+ } else if(ATTR_RULE_RELOAD.equals(name)) {
+ String ruleSet = getAttributeValue(ATTR_RULE_SET);
+ if(ruleSet == null || ruleSet.length() == 0) {
+ return false;
+ }
}
return super.isAttributeEditable(name);
}
@@ -45,6 +52,10 @@
if(isRegexOrXPath(newValue)) {
setAttributeValue(ATTR_RULE_LANGUAGE, "");
}
+ } else if(ATTR_RULE_SET.equals(name)) {
+ if(newValue == null || newValue.length() == 0) {
+ setAttributeValue(ATTR_RULE_RELOAD, getModelEntity().getAttribute(ATTR_RULE_RELOAD).getDefaultValue());
+ }
}
}
14 years, 5 months
- 1
- 0
JBoss Tools SVN: r19738 - trunk/birt/docs/en.
by jbosstools-commits＠lists.jboss.org
Author: ochikvina
Date: 2010-01-13 11:47:05 -0500 (Wed, 13 Jan 2010)
New Revision: 19738
Modified:
trunk/birt/docs/en/master.xml
Log:
<html><head><meta name="qrichtext" content="1" /></head><body style="font-size:9pt;font-family:Sans Serif">
<p>https://jira.jboss.org/jira/browse/JBDS-1052 updated the versions and copyright info</p>
</body></html>
Modified: trunk/birt/docs/en/master.xml
===================================================================
--- trunk/birt/docs/en/master.xml 2010-01-13 16:45:43 UTC (rev 19737)
+++ trunk/birt/docs/en/master.xml 2010-01-13 16:47:05 UTC (rev 19738)
@@ -53,7 +53,8 @@
<copyright>
<year>2008</year>
- <year>2009</year>
+ <year>2009</year>
+ <year>2010</year>
<holder>JBoss by Red Hat</holder>
</copyright>
@@ -80,4 +81,4 @@
&links;
-</book>
\ No newline at end of file
+</book>
14 years, 5 months
- 1
- 0