JBoss Tools SVN: r37592 - trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/ext.
by jbosstools-commits＠lists.jboss.org
Author: dgeraskov
Date: 2011-12-30 07:28:55 -0500 (Fri, 30 Dec 2011)
New Revision: 37592
Modified:
trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/ext/HibernateExtension.java
Log:
https://issues.jboss.org/browse/JBIDE-10501
Added missed class
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/ext/HibernateExtension.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/ext/HibernateExtension.java 2011-12-30 11:34:52 UTC (rev 37591)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/ext/HibernateExtension.java 2011-12-30 12:28:55 UTC (rev 37592)
@@ -47,7 +47,7 @@
*/
public Object execute(Command command);
+
+ public boolean isSessionFactoryCreated();
-
-
}
12 years, 4 months
- 1
- 0
JBoss Tools SVN: r37591 - in trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples: preferences and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2011-12-30 06:34:52 -0500 (Fri, 30 Dec 2011)
New Revision: 37591
Modified:
trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/Messages.java
trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/messages.properties
trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/preferences/ProjectExamplesPreferencePage.java
trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard/NewProjectExamplesWizardPage.java
Log:
JBIDE-10421 "output directory" is shown on the project example wizard before even choosing a project
Modified: trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/Messages.java
===================================================================
--- trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/Messages.java 2011-12-30 11:11:21 UTC (rev 37590)
+++ trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/Messages.java 2011-12-30 11:34:52 UTC (rev 37591)
@@ -52,6 +52,7 @@
public static String NewProjectExamplesWizardPage_Invalid_Sites;
public static String NewProjectExamplesWizardPage_Note;
public static String NewProjectExamplesWizardPage_Project_Example;
+ public static String NewProjectExamplesWizardPage_Project_Examples_Preferences;
public static String NewProjectExamplesWizardPage_Project_name;
public static String NewProjectExamplesWizardPage_Project_size;
public static String NewProjectExamplesWizardPage_Projects;
Modified: trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/messages.properties
===================================================================
--- trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/messages.properties 2011-12-30 11:11:21 UTC (rev 37590)
+++ trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/messages.properties 2011-12-30 11:34:52 UTC (rev 37591)
@@ -39,6 +39,7 @@
NewProjectExamplesWizardPage_Invalid_Sites=Invalid Sites
NewProjectExamplesWizardPage_Note=This example has some requirements that could not be automatically configured. When importing the example you might see some errors which would need fixing manually or via Quick Fixes. Click "Details" to see more.
NewProjectExamplesWizardPage_Project_Example=Project Example
+NewProjectExamplesWizardPage_Project_Examples_Preferences=<a>Project Examples Preferences</a>
NewProjectExamplesWizardPage_Project_name=Project name:
NewProjectExamplesWizardPage_Project_size=Project size:
NewProjectExamplesWizardPage_Projects=Projects:
Modified: trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/preferences/ProjectExamplesPreferencePage.java
===================================================================
--- trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/preferences/ProjectExamplesPreferencePage.java 2011-12-30 11:11:21 UTC (rev 37590)
+++ trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/preferences/ProjectExamplesPreferencePage.java 2011-12-30 11:34:52 UTC (rev 37591)
@@ -55,6 +55,7 @@
public class ProjectExamplesPreferencePage extends PreferencePage implements
IWorkbenchPreferencePage {
+ public static final String ID = "org.jboss.tools.project.examples.preferences.projectExamplesPreferencePage"; //$NON-NLS-1$
private Button showExperimentalSites;
private Sites sites;
private TreeViewer viewer;
Modified: trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard/NewProjectExamplesWizardPage.java
===================================================================
--- trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard/NewProjectExamplesWizardPage.java 2011-12-30 11:11:21 UTC (rev 37590)
+++ trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard/NewProjectExamplesWizardPage.java 2011-12-30 11:34:52 UTC (rev 37591)
@@ -25,6 +25,7 @@
import org.eclipse.jface.dialogs.ProgressMonitorDialog;
import org.eclipse.jface.operation.IRunnableWithProgress;
import org.eclipse.jface.preference.IPreferenceStore;
+import org.eclipse.jface.preference.PreferenceDialog;
import org.eclipse.jface.resource.JFaceResources;
import org.eclipse.jface.util.Geometry;
import org.eclipse.jface.viewers.ISelectionChangedListener;
@@ -37,8 +38,6 @@
import org.eclipse.jface.wizard.WizardPage;
import org.eclipse.osgi.util.NLS;
import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
import org.eclipse.swt.events.SelectionAdapter;
import org.eclipse.swt.events.SelectionEvent;
import org.eclipse.swt.graphics.GC;
@@ -54,11 +53,13 @@
import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Group;
import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Link;
import org.eclipse.swt.widgets.Monitor;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.swt.widgets.Text;
import org.eclipse.swt.widgets.Tree;
import org.eclipse.ui.dialogs.FilteredTree;
+import org.eclipse.ui.dialogs.PreferencesUtil;
import org.eclipse.ui.model.AdaptableList;
import org.eclipse.ui.part.PageBook;
import org.jboss.tools.project.examples.Messages;
@@ -70,6 +71,7 @@
import org.jboss.tools.project.examples.model.Project;
import org.jboss.tools.project.examples.model.ProjectFix;
import org.jboss.tools.project.examples.model.ProjectUtil;
+import org.jboss.tools.project.examples.preferences.ProjectExamplesPreferencePage;
/**
* @author snjeza
@@ -105,60 +107,8 @@
GridData gd = new GridData(SWT.FILL, SWT.FILL, false, false);
composite.setLayoutData(gd);
- Group outputDirectoryGroup = new Group(composite, SWT.NONE);
- GridLayout layout = new GridLayout(2, false);
- outputDirectoryGroup.setLayout(layout);
- outputDirectoryGroup.setText(Messages.ProjectExamplesPreferencePage_Output_directory);
- gd = new GridData(SWT.FILL, SWT.FILL, true, false);
- outputDirectoryGroup.setLayoutData(gd);
+ //createOutputDirectoryGroup(composite);
- isWorkspace = new Button(outputDirectoryGroup, SWT.CHECK);
- gd = new GridData(SWT.FILL, SWT.FILL, true, false);
- gd.horizontalSpan = 2;
- isWorkspace.setLayoutData(gd);
- isWorkspace.setText(Messages.ProjectExamplesPreferencePage_Use_default_workspace_location);
- isWorkspace.setSelection(ProjectExamplesActivator.getDefault().getPreferenceStore().getBoolean(ProjectExamplesActivator.PROJECT_EXAMPLES_DEFAULT));
-
- outputDirectoryText = new Text(outputDirectoryGroup, SWT.SINGLE|SWT.BORDER);
- gd = new GridData(SWT.FILL, SWT.FILL, true, false);
- gd.verticalAlignment = SWT.CENTER;
- outputDirectoryText.setLayoutData(gd);
- final IPreferenceStore store = ProjectExamplesActivator.getDefault().getPreferenceStore();
- String outputDirectoryValue = store.getString(ProjectExamplesActivator.PROJECT_EXAMPLES_OUTPUT_DIRECTORY);
- outputDirectoryText.setText(outputDirectoryValue == null ? "" : outputDirectoryValue); //$NON-NLS-1$
- final Button outputDirectoryBrowse = new Button(outputDirectoryGroup, SWT.PUSH);
- outputDirectoryBrowse.setText(Messages.Browse);
- outputDirectoryBrowse.addSelectionListener(new SelectionAdapter(){
-
- @Override
- public void widgetSelected(SelectionEvent e) {
- DirectoryDialog dialog = new DirectoryDialog(getShell(), SWT.SINGLE);
- String value = outputDirectoryText.getText();
- if (value.trim().length() == 0) {
- value = Platform.getLocation().toOSString();
- }
- dialog.setFilterPath(value);
-
- String result = dialog.open();
- if (result == null || result.trim().length() == 0) {
- return;
- }
- outputDirectoryText.setText(result);
-
- }
-
- });
- enableControls(outputDirectoryBrowse);
-
- isWorkspace.addSelectionListener(new SelectionAdapter() {
-
- @Override
- public void widgetSelected(SelectionEvent e) {
- enableControls(outputDirectoryBrowse);
- }
-
- });
-
Composite siteComposite = new Composite(composite,SWT.NONE);
GridLayout gridLayout = new GridLayout(2,false);
gridLayout.marginHeight = 0;
@@ -169,11 +119,24 @@
final Button button = new Button(siteComposite,SWT.CHECK);
gd = new GridData(SWT.FILL, SWT.BEGINNING, false, false);
- gd.horizontalSpan = 2;
+ //gd.horizontalSpan = 2;
button.setLayoutData(gd);
button.setText(Messages.ProjectExamplesPreferencePage_Show_experimental_sites);
+ final IPreferenceStore store = ProjectExamplesActivator.getDefault().getPreferenceStore();
button.setSelection(store.getBoolean(ProjectExamplesActivator.SHOW_EXPERIMENTAL_SITES));
+ Link prefLink = new Link(siteComposite, SWT.NONE);
+ gd = new GridData(SWT.END, SWT.BEGINNING, false, false);
+ //gd.horizontalSpan = 2;
+ prefLink.setLayoutData(gd);
+ prefLink.setText(Messages.NewProjectExamplesWizardPage_Project_Examples_Preferences);
+ prefLink.addSelectionListener(new SelectionAdapter() {
+ public void widgetSelected(SelectionEvent e) {
+ PreferenceDialog dialog = PreferencesUtil.createPreferenceDialogOn(getShell(),ProjectExamplesPreferencePage.ID, null, null);
+ dialog.open();
+ }
+ });
+
new Label(siteComposite,SWT.NONE).setText(Messages.NewProjectExamplesWizardPage_Site);
siteCombo = new Combo(siteComposite,SWT.READ_ONLY);
siteCombo.setLayoutData(new GridData(SWT.FILL, SWT.BEGINNING, true, false));
@@ -361,6 +324,63 @@
refresh(viewer, true);
siteCombo.setText(ProjectExamplesActivator.ALL_SITES);
}
+
+ private void createOutputDirectoryGroup(Composite composite) {
+ GridData gd;
+ Group outputDirectoryGroup = new Group(composite, SWT.NONE);
+ GridLayout layout = new GridLayout(2, false);
+ outputDirectoryGroup.setLayout(layout);
+ outputDirectoryGroup.setText(Messages.ProjectExamplesPreferencePage_Output_directory);
+ gd = new GridData(SWT.FILL, SWT.FILL, true, false);
+ outputDirectoryGroup.setLayoutData(gd);
+
+ isWorkspace = new Button(outputDirectoryGroup, SWT.CHECK);
+ gd = new GridData(SWT.FILL, SWT.FILL, true, false);
+ gd.horizontalSpan = 2;
+ isWorkspace.setLayoutData(gd);
+ isWorkspace.setText(Messages.ProjectExamplesPreferencePage_Use_default_workspace_location);
+ isWorkspace.setSelection(ProjectExamplesActivator.getDefault().getPreferenceStore().getBoolean(ProjectExamplesActivator.PROJECT_EXAMPLES_DEFAULT));
+
+ outputDirectoryText = new Text(outputDirectoryGroup, SWT.SINGLE|SWT.BORDER);
+ gd = new GridData(SWT.FILL, SWT.FILL, true, false);
+ gd.verticalAlignment = SWT.CENTER;
+ outputDirectoryText.setLayoutData(gd);
+ final IPreferenceStore store = ProjectExamplesActivator.getDefault().getPreferenceStore();
+ String outputDirectoryValue = store.getString(ProjectExamplesActivator.PROJECT_EXAMPLES_OUTPUT_DIRECTORY);
+ outputDirectoryText.setText(outputDirectoryValue == null ? "" : outputDirectoryValue); //$NON-NLS-1$
+ final Button outputDirectoryBrowse = new Button(outputDirectoryGroup, SWT.PUSH);
+ outputDirectoryBrowse.setText(Messages.Browse);
+ outputDirectoryBrowse.addSelectionListener(new SelectionAdapter(){
+
+ @Override
+ public void widgetSelected(SelectionEvent e) {
+ DirectoryDialog dialog = new DirectoryDialog(getShell(), SWT.SINGLE);
+ String value = outputDirectoryText.getText();
+ if (value.trim().length() == 0) {
+ value = Platform.getLocation().toOSString();
+ }
+ dialog.setFilterPath(value);
+
+ String result = dialog.open();
+ if (result == null || result.trim().length() == 0) {
+ return;
+ }
+ outputDirectoryText.setText(result);
+
+ }
+
+ });
+ enableControls(outputDirectoryBrowse);
+
+ isWorkspace.addSelectionListener(new SelectionAdapter() {
+
+ @Override
+ public void widgetSelected(SelectionEvent e) {
+ enableControls(outputDirectoryBrowse);
+ }
+
+ });
+ }
protected void enableControls(Button outputDirectoryBrowse) {
outputDirectoryText.setEnabled(!isWorkspace.getSelection());
12 years, 4 months
- 1
- 0
JBoss Tools SVN: r37590 - in trunk/hibernatetools/plugins: org.jboss.tools.hibernate3_5/src/org/jboss/tools/hibernate3_5 and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: dgeraskov
Date: 2011-12-30 06:11:21 -0500 (Fri, 30 Dec 2011)
New Revision: 37590
Modified:
trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/actions/ExecuteQueryAction.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate3_5/src/org/jboss/tools/hibernate3_5/HibernateExtension3_5.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate4_0/src/org/jboss/tools/hibernate4_0/HibernateExtension4_0.java
Log:
https://issues.jboss.org/browse/JBIDE-10501
Check extension session factory for null instead of console configuration.
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/actions/ExecuteQueryAction.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/actions/ExecuteQueryAction.java 2011-12-30 01:05:24 UTC (rev 37589)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/actions/ExecuteQueryAction.java 2011-12-30 11:11:21 UTC (rev 37590)
@@ -63,9 +63,9 @@
ConsoleConfiguration cfg = queryEditor.getConsoleConfiguration();
if (cfg != null) {
- if (!cfg.isSessionFactoryCreated()) {
+ if (!cfg.getHibernateExtension().isSessionFactoryCreated()) {
if (queryEditor.askUserForConfiguration(cfg.getName())) {
- if (cfg.getConfiguration() == null) {
+ if (!cfg.getHibernateExtension().hasConfiguration()) {
try {
cfg.build();
} catch (HibernateException he) {
@@ -75,7 +75,7 @@
' ' + cfg.getName(), he);
}
}
- if (cfg.getConfiguration() != null) {
+ if (cfg.getHibernateExtension().hasConfiguration()) {
cfg.buildSessionFactory();
queryEditor.executeQuery(cfg);
}
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate3_5/src/org/jboss/tools/hibernate3_5/HibernateExtension3_5.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate3_5/src/org/jboss/tools/hibernate3_5/HibernateExtension3_5.java 2011-12-30 01:05:24 UTC (rev 37589)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate3_5/src/org/jboss/tools/hibernate3_5/HibernateExtension3_5.java 2011-12-30 11:11:21 UTC (rev 37590)
@@ -315,4 +315,9 @@
}
});
}
+
+ @Override
+ public boolean isSessionFactoryCreated() {
+ return sessionFactory != null;
+ }
}
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate4_0/src/org/jboss/tools/hibernate4_0/HibernateExtension4_0.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate4_0/src/org/jboss/tools/hibernate4_0/HibernateExtension4_0.java 2011-12-30 01:05:24 UTC (rev 37589)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate4_0/src/org/jboss/tools/hibernate4_0/HibernateExtension4_0.java 2011-12-30 11:11:21 UTC (rev 37590)
@@ -329,4 +329,8 @@
});
}
+ @Override
+ public boolean isSessionFactoryCreated() {
+ return sessionFactory != null;
+ }
}
\ No newline at end of file
12 years, 4 months
- 1
- 0
JBoss Tools SVN: r37589 - trunk/common/plugins/org.jboss.tools.common.meta.ui/resources/meta.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-12-29 20:05:24 -0500 (Thu, 29 Dec 2011)
New Revision: 37589
Modified:
trunk/common/plugins/org.jboss.tools.common.meta.ui/resources/meta/meta.meta
Log:
Inconsistent definition removed.
Modified: trunk/common/plugins/org.jboss.tools.common.meta.ui/resources/meta/meta.meta
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.meta.ui/resources/meta/meta.meta 2011-12-30 01:04:18 UTC (rev 37588)
+++ trunk/common/plugins/org.jboss.tools.common.meta.ui/resources/meta/meta.meta 2011-12-30 01:05:24 UTC (rev 37589)
@@ -289,9 +289,6 @@
</XEntityRenderer>
<XModelAttributes>
<XModelAttribute default="action item reference" loader="ElementType" name="element type">
- <Constraint loader="List">
- <value name="attribute"/>
- </Constraint>
<Editor name="Uneditable"/>
</XModelAttribute>
<XModelAttribute PROPERTIES="category=general" name="name" xmlname="name"/>
@@ -719,9 +716,6 @@
</XEntityRenderer>
<XModelAttributes>
<XModelAttribute default="attribute reference" loader="ElementType" name="element type">
- <Constraint loader="List">
- <value name="attribute"/>
- </Constraint>
<Editor name="Uneditable"/>
</XModelAttribute>
<XModelAttribute PROPERTIES="category=general" name="name" xmlname="name"/>
12 years, 4 months
- 1
- 0
JBoss Tools SVN: r37588 - in trunk/esb/tests/org.jboss.tools.esb.validator.test: src/org/jboss/tools/esb/validator/test and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-12-29 20:04:18 -0500 (Thu, 29 Dec 2011)
New Revision: 37588
Added:
trunk/esb/tests/org.jboss.tools.esb.validator.test/projects/esbTest/esbcontent/META-INF/jboss-esb-02.xml
Modified:
trunk/esb/tests/org.jboss.tools.esb.validator.test/src/org/jboss/tools/esb/validator/test/ValidationTest.java
Log:
JBIDE-10573
https://issues.jboss.org/browse/JBIDE-10573
Test is added for attribute 'scheduleidref' validation.
Added: trunk/esb/tests/org.jboss.tools.esb.validator.test/projects/esbTest/esbcontent/META-INF/jboss-esb-02.xml
===================================================================
--- trunk/esb/tests/org.jboss.tools.esb.validator.test/projects/esbTest/esbcontent/META-INF/jboss-esb-02.xml (rev 0)
+++ trunk/esb/tests/org.jboss.tools.esb.validator.test/projects/esbTest/esbcontent/META-INF/jboss-esb-02.xml 2011-12-30 01:04:18 UTC (rev 37588)
@@ -0,0 +1,36 @@
+<?xml version="1.0"?>
+<jbossesb parameterReloadSecs="5"
+ xmlns="http://anonsvn.labs.jboss.com/labs/jbossesb/trunk/product/etc/schemas/xml..."
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://anonsvn.labs.jboss.com/labs/jbossesb/trunk/product/etc/schemas/xml... http://anonsvn.jboss.org/repos/labs/labs/jbossesb/trunk/product/etc/schem...">
+ <providers>
+ <fs-provider name="fsProvider">
+ <fs-bus busid="fsChannel"/>
+ </fs-provider>
+ <ftp-provider hostname="myhost" name="ftpProvider">
+ <ftp-bus busid="ftpChannel"/>
+ </ftp-provider>
+ <schedule-provider name="scheduleProvider1">
+ <simple-schedule scheduleid="simpleSchedule1"/>
+ <cron-schedule scheduleid="cronSchedule1"/>
+ </schedule-provider>
+ <schedule-provider name="scheduleProvider2">
+ <simple-schedule scheduleid="simpleSchedule2"/>
+ <cron-schedule scheduleid="cronSchedule2"/>
+ </schedule-provider>
+ </providers>
+ <services>
+ <service category="c1" description="d1" name="s1">
+ <listeners>
+ <ftp-listener busidref="ftpChannel" name="ftpListener1" scheduleidref="cronSchedule1"/>
+ <ftp-listener busidref="ftpChannel" name="ftpListener2" scheduleidref="cronSchedule2"/>
+ <ftp-listener busidref="ftpChannel" name="ftpListener3" scheduleidref="cronSchedule3"/>
+ <fs-listener busidref="fsChannel" name="fsListener1" scheduleidref="simpleSchedule1"/>
+ <fs-listener busidref="fsChannel" name="fsListener2" scheduleidref="simpleSchedule2"/>
+ <fs-listener busidref="fsChannel" name="fsListener3" scheduleidref="simpleSchedule3"/>
+ <scheduled-listener event-processor="pp" name="scheduledListener1" scheduleidref="cronSchedule1"/>
+ <scheduled-listener event-processor="pp" name="scheduledListener2"/>
+ <scheduled-listener event-processor="pp" name="scheduledListener3" scheduleidref="simpleSchedule3"/>
+ </listeners>
+ </service>
+ </services>
+</jbossesb>
Property changes on: trunk/esb/tests/org.jboss.tools.esb.validator.test/projects/esbTest/esbcontent/META-INF/jboss-esb-02.xml
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/esb/tests/org.jboss.tools.esb.validator.test/src/org/jboss/tools/esb/validator/test/ValidationTest.java
===================================================================
--- trunk/esb/tests/org.jboss.tools.esb.validator.test/src/org/jboss/tools/esb/validator/test/ValidationTest.java 2011-12-30 01:03:44 UTC (rev 37587)
+++ trunk/esb/tests/org.jboss.tools.esb.validator.test/src/org/jboss/tools/esb/validator/test/ValidationTest.java 2011-12-30 01:04:18 UTC (rev 37588)
@@ -34,6 +34,14 @@
assertEquals("jboss-esb-01.xml should have one error marker.", markerNumbers, 1);
}
+ public void testScheduleReference() throws Exception {
+ IProject project = ESBTest.findTestProject();
+ IFile file = project.getFile("esbcontent/META-INF/jboss-esb-02.xml");
+ AbstractResourceMarkerTest.assertMarkerIsCreated(file, AbstractResourceMarkerTest.MARKER_TYPE, ESBValidatorMessages.LISTENER_REFERENCES_NON_EXISTENT_SCHEDULE, 26, 29, 32);
+ int markerNumbers = getMarkersNumber(file);
+ assertEquals("jboss-esb-01.xml should have one error marker.", markerNumbers, 3);
+ }
+
public void testBusenessRulesProcessor() throws Exception {
IProject project = ESBTest.findTestProject();
IFile file = project.getFile("esbcontent/META-INF/jboss-esb-brp-broken.xml"); //$NON-NLS-1$
12 years, 4 months
- 1
- 0
JBoss Tools SVN: r37587 - in jsf/tests/org.jboss.tools.jsf.base.test: .settings and 17 other directories.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2011-12-29 20:03:44 -0500 (Thu, 29 Dec 2011)
New Revision: 37587
Added:
jsf/tests/org.jboss.tools.jsf.base.test/.classpath
jsf/tests/org.jboss.tools.jsf.base.test/.project
jsf/tests/org.jboss.tools.jsf.base.test/.settings/
jsf/tests/org.jboss.tools.jsf.base.test/.settings/org.eclipse.jdt.core.prefs
jsf/tests/org.jboss.tools.jsf.base.test/META-INF/
jsf/tests/org.jboss.tools.jsf.base.test/META-INF/MANIFEST.MF
jsf/tests/org.jboss.tools.jsf.base.test/build.properties
jsf/tests/org.jboss.tools.jsf.base.test/pom.xml
jsf/tests/org.jboss.tools.jsf.base.test/projects/
jsf/tests/org.jboss.tools.jsf.base.test/projects/JSF2Beans/
jsf/tests/org.jboss.tools.jsf.base.test/projects/JSF2Beans/.classpath
jsf/tests/org.jboss.tools.jsf.base.test/projects/JSF2Beans/.project
jsf/tests/org.jboss.tools.jsf.base.test/projects/JSF2Beans/.settings/
jsf/tests/org.jboss.tools.jsf.base.test/projects/JSF2Beans/.settings/org.eclipse.jdt.core.prefs
jsf/tests/org.jboss.tools.jsf.base.test/projects/JSF2Beans/lib/
jsf/tests/org.jboss.tools.jsf.base.test/projects/JSF2Beans/lib/jsf-api-2.0.3.jar
jsf/tests/org.jboss.tools.jsf.base.test/projects/JSF2Beans/src/
jsf/tests/org.jboss.tools.jsf.base.test/projects/JSF2Beans/src/test/
jsf/tests/org.jboss.tools.jsf.base.test/projects/JSF2Beans/src/test/beans/
jsf/tests/org.jboss.tools.jsf.base.test/projects/JSF2Beans/src/test/beans/Bean1.java
jsf/tests/org.jboss.tools.jsf.base.test/projects/JSF2Beans/src/test/beans/Bean2.java
jsf/tests/org.jboss.tools.jsf.base.test/projects/JSF2Beans/src/test/beans/Bean3.java
jsf/tests/org.jboss.tools.jsf.base.test/projects/JSF2Beans/src/test/beans/Bean4.java
jsf/tests/org.jboss.tools.jsf.base.test/projects/JSF2Beans/src/test/beans/Bean5.java
jsf/tests/org.jboss.tools.jsf.base.test/projects/JSF2Beans/src/test/beans/inputname.xhtml
jsf/tests/org.jboss.tools.jsf.base.test/projects/JSF2Web/
jsf/tests/org.jboss.tools.jsf.base.test/projects/JSF2Web/.classpath
jsf/tests/org.jboss.tools.jsf.base.test/projects/JSF2Web/.project
jsf/tests/org.jboss.tools.jsf.base.test/projects/JSF2Web/.settings/
jsf/tests/org.jboss.tools.jsf.base.test/projects/JSF2Web/.settings/.jsdtscope
jsf/tests/org.jboss.tools.jsf.base.test/projects/JSF2Web/.settings/org.eclipse.jdt.core.prefs
jsf/tests/org.jboss.tools.jsf.base.test/projects/JSF2Web/.settings/org.eclipse.wst.common.component
jsf/tests/org.jboss.tools.jsf.base.test/projects/JSF2Web/.settings/org.eclipse.wst.common.project.facet.core.xml
jsf/tests/org.jboss.tools.jsf.base.test/projects/JSF2Web/.settings/org.eclipse.wst.jsdt.ui.superType.container
jsf/tests/org.jboss.tools.jsf.base.test/projects/JSF2Web/.settings/org.eclipse.wst.jsdt.ui.superType.name
jsf/tests/org.jboss.tools.jsf.base.test/projects/JSF2Web/WebContent/
jsf/tests/org.jboss.tools.jsf.base.test/projects/JSF2Web/WebContent/META-INF/
jsf/tests/org.jboss.tools.jsf.base.test/projects/JSF2Web/WebContent/META-INF/MANIFEST.MF
jsf/tests/org.jboss.tools.jsf.base.test/projects/JSF2Web/WebContent/WEB-INF/
jsf/tests/org.jboss.tools.jsf.base.test/projects/JSF2Web/WebContent/WEB-INF/.faces-config.xml.jsfdia
jsf/tests/org.jboss.tools.jsf.base.test/projects/JSF2Web/WebContent/WEB-INF/faces-config.complete
jsf/tests/org.jboss.tools.jsf.base.test/projects/JSF2Web/WebContent/WEB-INF/faces-config.original
jsf/tests/org.jboss.tools.jsf.base.test/projects/JSF2Web/WebContent/WEB-INF/faces-config.xml
jsf/tests/org.jboss.tools.jsf.base.test/projects/JSF2Web/WebContent/WEB-INF/lib/
jsf/tests/org.jboss.tools.jsf.base.test/projects/JSF2Web/WebContent/WEB-INF/lib/jsf-api-2.0.3.jar
jsf/tests/org.jboss.tools.jsf.base.test/projects/JSF2Web/src/
jsf/tests/org.jboss.tools.jsf.base.test/projects/JSF2Web/src/test/
jsf/tests/org.jboss.tools.jsf.base.test/projects/JSF2Web/src/test/beans/
jsf/tests/org.jboss.tools.jsf.base.test/projects/JSF2Web/src/test/beans/Bean1.java
jsf/tests/org.jboss.tools.jsf.base.test/projects/JSF2Web/src/test/beans/Bean2.java
jsf/tests/org.jboss.tools.jsf.base.test/projects/JSF2Web/src/test/beans/Bean3.java
jsf/tests/org.jboss.tools.jsf.base.test/projects/JSF2Web/src/test/beans/inputname.xhtml
jsf/tests/org.jboss.tools.jsf.base.test/src/
Log:
plug-in to share common code an resources among jsf tests. it is required to avoid dependencies between test plugins. if one test plugin depends on another there is possibility of skipping tests execution for dependent plug-ins.
Added: jsf/tests/org.jboss.tools.jsf.base.test/.classpath
===================================================================
--- jsf/tests/org.jboss.tools.jsf.base.test/.classpath (rev 0)
+++ jsf/tests/org.jboss.tools.jsf.base.test/.classpath 2011-12-30 01:03:44 UTC (rev 37587)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
Property changes on: jsf/tests/org.jboss.tools.jsf.base.test/.classpath
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: jsf/tests/org.jboss.tools.jsf.base.test/.project
===================================================================
--- jsf/tests/org.jboss.tools.jsf.base.test/.project (rev 0)
+++ jsf/tests/org.jboss.tools.jsf.base.test/.project 2011-12-30 01:03:44 UTC (rev 37587)
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.jboss.tools.jsf.base.test</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.ManifestBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.SchemaBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.pde.PluginNature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
Property changes on: jsf/tests/org.jboss.tools.jsf.base.test/.project
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: jsf/tests/org.jboss.tools.jsf.base.test/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- jsf/tests/org.jboss.tools.jsf.base.test/.settings/org.eclipse.jdt.core.prefs (rev 0)
+++ jsf/tests/org.jboss.tools.jsf.base.test/.settings/org.eclipse.jdt.core.prefs 2011-12-30 01:03:44 UTC (rev 37587)
@@ -0,0 +1,8 @@
+#Thu Dec 29 16:12:21 PST 2011
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.6
Property changes on: jsf/tests/org.jboss.tools.jsf.base.test/.settings/org.eclipse.jdt.core.prefs
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: jsf/tests/org.jboss.tools.jsf.base.test/META-INF/MANIFEST.MF
===================================================================
--- jsf/tests/org.jboss.tools.jsf.base.test/META-INF/MANIFEST.MF (rev 0)
+++ jsf/tests/org.jboss.tools.jsf.base.test/META-INF/MANIFEST.MF 2011-12-30 01:03:44 UTC (rev 37587)
@@ -0,0 +1,9 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: JSF Base Test Plugin
+Bundle-SymbolicName: org.jboss.tools.jsf.base.test
+Bundle-Version: 3.3.0.qualifier
+Bundle-Vendor: JBoss by RedHat
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Eclipse-BundleShape: dir
+Bundle-ClassPath: .
Property changes on: jsf/tests/org.jboss.tools.jsf.base.test/META-INF/MANIFEST.MF
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: jsf/tests/org.jboss.tools.jsf.base.test/build.properties
===================================================================
--- jsf/tests/org.jboss.tools.jsf.base.test/build.properties (rev 0)
+++ jsf/tests/org.jboss.tools.jsf.base.test/build.properties 2011-12-30 01:03:44 UTC (rev 37587)
@@ -0,0 +1,10 @@
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+ .,\
+ projects/
+src.includes = projects/,\
+ pom.xml,\
+ META-INF/,\
+ .settings/,\
+ .project
Property changes on: jsf/tests/org.jboss.tools.jsf.base.test/build.properties
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: jsf/tests/org.jboss.tools.jsf.base.test/pom.xml
===================================================================
--- jsf/tests/org.jboss.tools.jsf.base.test/pom.xml (rev 0)
+++ jsf/tests/org.jboss.tools.jsf.base.test/pom.xml 2011-12-30 01:03:44 UTC (rev 37587)
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.jboss.tools.jsf</groupId>
+ <artifactId>tests</artifactId>
+ <version>3.3.0-SNAPSHOT</version>
+ </parent>
+ <groupId>org.jboss.tools.jsf.tests</groupId>
+ <artifactId>org.jboss.tools.jsf.base.test</artifactId>
+
+ <packaging>eclipse-plugin</packaging>
+</project>
Property changes on: jsf/tests/org.jboss.tools.jsf.base.test/pom.xml
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: jsf/tests/org.jboss.tools.jsf.base.test/projects/JSF2Beans/.classpath
===================================================================
--- jsf/tests/org.jboss.tools.jsf.base.test/projects/JSF2Beans/.classpath (rev 0)
+++ jsf/tests/org.jboss.tools.jsf.base.test/projects/JSF2Beans/.classpath 2011-12-30 01:03:44 UTC (rev 37587)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="lib" path="lib/jsf-api-2.0.3.jar"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
Property changes on: jsf/tests/org.jboss.tools.jsf.base.test/projects/JSF2Beans/.classpath
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: jsf/tests/org.jboss.tools.jsf.base.test/projects/JSF2Beans/.project
===================================================================
--- jsf/tests/org.jboss.tools.jsf.base.test/projects/JSF2Beans/.project (rev 0)
+++ jsf/tests/org.jboss.tools.jsf.base.test/projects/JSF2Beans/.project 2011-12-30 01:03:44 UTC (rev 37587)
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>JSF2Beans</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.jboss.tools.jst.web.kb.kbbuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.jboss.tools.jst.web.kb.kbnature</nature>
+ </natures>
+</projectDescription>
Property changes on: jsf/tests/org.jboss.tools.jsf.base.test/projects/JSF2Beans/.project
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: jsf/tests/org.jboss.tools.jsf.base.test/projects/JSF2Beans/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- jsf/tests/org.jboss.tools.jsf.base.test/projects/JSF2Beans/.settings/org.eclipse.jdt.core.prefs (rev 0)
+++ jsf/tests/org.jboss.tools.jsf.base.test/projects/JSF2Beans/.settings/org.eclipse.jdt.core.prefs 2011-12-30 01:03:44 UTC (rev 37587)
@@ -0,0 +1,12 @@
+#Fri Jul 15 10:03:53 PDT 2011
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.6
Property changes on: jsf/tests/org.jboss.tools.jsf.base.test/projects/JSF2Beans/.settings/org.eclipse.jdt.core.prefs
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: jsf/tests/org.jboss.tools.jsf.base.test/projects/JSF2Beans/lib/jsf-api-2.0.3.jar
===================================================================
(Binary files differ)
Property changes on: jsf/tests/org.jboss.tools.jsf.base.test/projects/JSF2Beans/lib/jsf-api-2.0.3.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: jsf/tests/org.jboss.tools.jsf.base.test/projects/JSF2Beans/src/test/beans/Bean1.java
===================================================================
--- jsf/tests/org.jboss.tools.jsf.base.test/projects/JSF2Beans/src/test/beans/Bean1.java (rev 0)
+++ jsf/tests/org.jboss.tools.jsf.base.test/projects/JSF2Beans/src/test/beans/Bean1.java 2011-12-30 01:03:44 UTC (rev 37587)
@@ -0,0 +1,15 @@
+package test.beans;
+
+import javax.faces.bean.ManagedBean;
+
+@ManagedBean(name="mybean1")
+public class Bean1 {
+ public String getName() {
+ return "#{}";
+ }
+
+ String s1 = "#{ mybean1}";
+ String s2 = "#{ mybean1. }";
+ String s3 = "#{ mybean1 }";
+
+}
Property changes on: jsf/tests/org.jboss.tools.jsf.base.test/projects/JSF2Beans/src/test/beans/Bean1.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: jsf/tests/org.jboss.tools.jsf.base.test/projects/JSF2Beans/src/test/beans/Bean2.java
===================================================================
--- jsf/tests/org.jboss.tools.jsf.base.test/projects/JSF2Beans/src/test/beans/Bean2.java (rev 0)
+++ jsf/tests/org.jboss.tools.jsf.base.test/projects/JSF2Beans/src/test/beans/Bean2.java 2011-12-30 01:03:44 UTC (rev 37587)
@@ -0,0 +1,8 @@
+package test.beans;
+
+import javax.faces.bean.ManagedBean;
+
+@ManagedBean(name="mybean2")
+public class Bean2 {
+
+}
Property changes on: jsf/tests/org.jboss.tools.jsf.base.test/projects/JSF2Beans/src/test/beans/Bean2.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: jsf/tests/org.jboss.tools.jsf.base.test/projects/JSF2Beans/src/test/beans/Bean3.java
===================================================================
--- jsf/tests/org.jboss.tools.jsf.base.test/projects/JSF2Beans/src/test/beans/Bean3.java (rev 0)
+++ jsf/tests/org.jboss.tools.jsf.base.test/projects/JSF2Beans/src/test/beans/Bean3.java 2011-12-30 01:03:44 UTC (rev 37587)
@@ -0,0 +1,8 @@
+package test.beans;
+
+import javax.faces.bean.ManagedBean;
+
+@ManagedBean(name="mybean2")
+public class Bean3 {
+
+}
Property changes on: jsf/tests/org.jboss.tools.jsf.base.test/projects/JSF2Beans/src/test/beans/Bean3.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: jsf/tests/org.jboss.tools.jsf.base.test/projects/JSF2Beans/src/test/beans/Bean4.java
===================================================================
--- jsf/tests/org.jboss.tools.jsf.base.test/projects/JSF2Beans/src/test/beans/Bean4.java (rev 0)
+++ jsf/tests/org.jboss.tools.jsf.base.test/projects/JSF2Beans/src/test/beans/Bean4.java 2011-12-30 01:03:44 UTC (rev 37587)
@@ -0,0 +1,8 @@
+package test.beans;
+
+import javax.faces.bean.ManagedBean;
+
+@ManagedBean(name="")
+public class Bean4 {
+
+}
Property changes on: jsf/tests/org.jboss.tools.jsf.base.test/projects/JSF2Beans/src/test/beans/Bean4.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: jsf/tests/org.jboss.tools.jsf.base.test/projects/JSF2Beans/src/test/beans/Bean5.java
===================================================================
--- jsf/tests/org.jboss.tools.jsf.base.test/projects/JSF2Beans/src/test/beans/Bean5.java (rev 0)
+++ jsf/tests/org.jboss.tools.jsf.base.test/projects/JSF2Beans/src/test/beans/Bean5.java 2011-12-30 01:03:44 UTC (rev 37587)
@@ -0,0 +1,8 @@
+package test.beans;
+
+import javax.faces.bean.ManagedBean;
+
+@ManagedBean
+public class Bean5 {
+
+}
Property changes on: jsf/tests/org.jboss.tools.jsf.base.test/projects/JSF2Beans/src/test/beans/Bean5.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: jsf/tests/org.jboss.tools.jsf.base.test/projects/JSF2Beans/src/test/beans/inputname.xhtml
===================================================================
--- jsf/tests/org.jboss.tools.jsf.base.test/projects/JSF2Beans/src/test/beans/inputname.xhtml (rev 0)
+++ jsf/tests/org.jboss.tools.jsf.base.test/projects/JSF2Beans/src/test/beans/inputname.xhtml 2011-12-30 01:03:44 UTC (rev 37587)
@@ -0,0 +1,11 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core"
+ >
+
+<f:loadBundle basename="demo.resources2" var="mmm"/>
+<h:outputText value="#{myb}"/>
+<h:outputText value="#{mybean1}"/>
+</html>
\ No newline at end of file
Added: jsf/tests/org.jboss.tools.jsf.base.test/projects/JSF2Web/.classpath
===================================================================
--- jsf/tests/org.jboss.tools.jsf.base.test/projects/JSF2Web/.classpath (rev 0)
+++ jsf/tests/org.jboss.tools.jsf.base.test/projects/JSF2Web/.classpath 2011-12-30 01:03:44 UTC (rev 37587)
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
+ <attributes>
+ <attribute name="owner.project.facets" value="java"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
+ <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
+ <classpathentry kind="output" path="build/classes"/>
+</classpath>
Property changes on: jsf/tests/org.jboss.tools.jsf.base.test/projects/JSF2Web/.classpath
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: jsf/tests/org.jboss.tools.jsf.base.test/projects/JSF2Web/.project
===================================================================
--- jsf/tests/org.jboss.tools.jsf.base.test/projects/JSF2Web/.project (rev 0)
+++ jsf/tests/org.jboss.tools.jsf.base.test/projects/JSF2Web/.project 2011-12-30 01:03:44 UTC (rev 37587)
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>JSF2Web</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.wst.jsdt.core.javascriptValidator</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.wst.common.project.facet.core.builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.jboss.tools.jst.web.kb.kbbuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.wst.validation.validationbuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
+ <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
+ <nature>org.eclipse.wst.common.project.facet.core.nature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.eclipse.wst.jsdt.core.jsNature</nature>
+ <nature>org.jboss.tools.jst.web.kb.kbnature</nature>
+ </natures>
+</projectDescription>
Property changes on: jsf/tests/org.jboss.tools.jsf.base.test/projects/JSF2Web/.project
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: jsf/tests/org.jboss.tools.jsf.base.test/projects/JSF2Web/.settings/.jsdtscope
===================================================================
--- jsf/tests/org.jboss.tools.jsf.base.test/projects/JSF2Web/.settings/.jsdtscope (rev 0)
+++ jsf/tests/org.jboss.tools.jsf.base.test/projects/JSF2Web/.settings/.jsdtscope 2011-12-30 01:03:44 UTC (rev 37587)
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="WebContent"/>
+ <classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.WebProject">
+ <attributes>
+ <attribute name="hide" value="true"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.baseBrowserLibrary"/>
+ <classpathentry kind="output" path=""/>
+</classpath>
Added: jsf/tests/org.jboss.tools.jsf.base.test/projects/JSF2Web/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- jsf/tests/org.jboss.tools.jsf.base.test/projects/JSF2Web/.settings/org.eclipse.jdt.core.prefs (rev 0)
+++ jsf/tests/org.jboss.tools.jsf.base.test/projects/JSF2Web/.settings/org.eclipse.jdt.core.prefs 2011-12-30 01:03:44 UTC (rev 37587)
@@ -0,0 +1,8 @@
+#Mon Aug 15 14:39:16 PDT 2011
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.6
Property changes on: jsf/tests/org.jboss.tools.jsf.base.test/projects/JSF2Web/.settings/org.eclipse.jdt.core.prefs
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: jsf/tests/org.jboss.tools.jsf.base.test/projects/JSF2Web/.settings/org.eclipse.wst.common.component
===================================================================
--- jsf/tests/org.jboss.tools.jsf.base.test/projects/JSF2Web/.settings/org.eclipse.wst.common.component (rev 0)
+++ jsf/tests/org.jboss.tools.jsf.base.test/projects/JSF2Web/.settings/org.eclipse.wst.common.component 2011-12-30 01:03:44 UTC (rev 37587)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project-modules id="moduleCoreId" project-version="1.5.0">
+ <wb-module deploy-name="JSF2Web">
+ <wb-resource deploy-path="/" source-path="/WebContent"/>
+ <wb-resource deploy-path="/WEB-INF/classes" source-path="/src"/>
+ <property name="context-root" value="JSF2Web"/>
+ <property name="java-output-path" value="/JSF2Web/build/classes"/>
+ </wb-module>
+</project-modules>
Added: jsf/tests/org.jboss.tools.jsf.base.test/projects/JSF2Web/.settings/org.eclipse.wst.common.project.facet.core.xml
===================================================================
--- jsf/tests/org.jboss.tools.jsf.base.test/projects/JSF2Web/.settings/org.eclipse.wst.common.project.facet.core.xml (rev 0)
+++ jsf/tests/org.jboss.tools.jsf.base.test/projects/JSF2Web/.settings/org.eclipse.wst.common.project.facet.core.xml 2011-12-30 01:03:44 UTC (rev 37587)
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<faceted-project>
+ <runtime name="JBoss 7.0 Runtime"/>
+ <fixed facet="wst.jsdt.web"/>
+ <fixed facet="jst.web"/>
+ <fixed facet="java"/>
+ <installed facet="java" version="1.6"/>
+ <installed facet="jst.web" version="3.0"/>
+ <installed facet="wst.jsdt.web" version="1.0"/>
+</faceted-project>
Property changes on: jsf/tests/org.jboss.tools.jsf.base.test/projects/JSF2Web/.settings/org.eclipse.wst.common.project.facet.core.xml
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: jsf/tests/org.jboss.tools.jsf.base.test/projects/JSF2Web/.settings/org.eclipse.wst.jsdt.ui.superType.container
===================================================================
--- jsf/tests/org.jboss.tools.jsf.base.test/projects/JSF2Web/.settings/org.eclipse.wst.jsdt.ui.superType.container (rev 0)
+++ jsf/tests/org.jboss.tools.jsf.base.test/projects/JSF2Web/.settings/org.eclipse.wst.jsdt.ui.superType.container 2011-12-30 01:03:44 UTC (rev 37587)
@@ -0,0 +1 @@
+org.eclipse.wst.jsdt.launching.baseBrowserLibrary
\ No newline at end of file
Added: jsf/tests/org.jboss.tools.jsf.base.test/projects/JSF2Web/.settings/org.eclipse.wst.jsdt.ui.superType.name
===================================================================
--- jsf/tests/org.jboss.tools.jsf.base.test/projects/JSF2Web/.settings/org.eclipse.wst.jsdt.ui.superType.name (rev 0)
+++ jsf/tests/org.jboss.tools.jsf.base.test/projects/JSF2Web/.settings/org.eclipse.wst.jsdt.ui.superType.name 2011-12-30 01:03:44 UTC (rev 37587)
@@ -0,0 +1 @@
+Window
\ No newline at end of file
Added: jsf/tests/org.jboss.tools.jsf.base.test/projects/JSF2Web/WebContent/META-INF/MANIFEST.MF
===================================================================
--- jsf/tests/org.jboss.tools.jsf.base.test/projects/JSF2Web/WebContent/META-INF/MANIFEST.MF (rev 0)
+++ jsf/tests/org.jboss.tools.jsf.base.test/projects/JSF2Web/WebContent/META-INF/MANIFEST.MF 2011-12-30 01:03:44 UTC (rev 37587)
@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+Class-Path:
+
Property changes on: jsf/tests/org.jboss.tools.jsf.base.test/projects/JSF2Web/WebContent/META-INF/MANIFEST.MF
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: jsf/tests/org.jboss.tools.jsf.base.test/projects/JSF2Web/WebContent/WEB-INF/.faces-config.xml.jsfdia
===================================================================
--- jsf/tests/org.jboss.tools.jsf.base.test/projects/JSF2Web/WebContent/WEB-INF/.faces-config.xml.jsfdia (rev 0)
+++ jsf/tests/org.jboss.tools.jsf.base.test/projects/JSF2Web/WebContent/WEB-INF/.faces-config.xml.jsfdia 2011-12-30 01:03:44 UTC (rev 37587)
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<PROCESS model-entity="JSFProcess"/>
Added: jsf/tests/org.jboss.tools.jsf.base.test/projects/JSF2Web/WebContent/WEB-INF/faces-config.complete
===================================================================
--- jsf/tests/org.jboss.tools.jsf.base.test/projects/JSF2Web/WebContent/WEB-INF/faces-config.complete (rev 0)
+++ jsf/tests/org.jboss.tools.jsf.base.test/projects/JSF2Web/WebContent/WEB-INF/faces-config.complete 2011-12-30 01:03:44 UTC (rev 37587)
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<faces-config metadata-complete="true" version="2.0"
+ xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xi="http://www.w3.org/2001/XInclude"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_2_0.xsd"/>
Added: jsf/tests/org.jboss.tools.jsf.base.test/projects/JSF2Web/WebContent/WEB-INF/faces-config.original
===================================================================
--- jsf/tests/org.jboss.tools.jsf.base.test/projects/JSF2Web/WebContent/WEB-INF/faces-config.original (rev 0)
+++ jsf/tests/org.jboss.tools.jsf.base.test/projects/JSF2Web/WebContent/WEB-INF/faces-config.original 2011-12-30 01:03:44 UTC (rev 37587)
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<faces-config version="2.0" xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xi="http://www.w3.org/2001/XInclude"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_2_0.xsd"/>
Added: jsf/tests/org.jboss.tools.jsf.base.test/projects/JSF2Web/WebContent/WEB-INF/faces-config.xml
===================================================================
--- jsf/tests/org.jboss.tools.jsf.base.test/projects/JSF2Web/WebContent/WEB-INF/faces-config.xml (rev 0)
+++ jsf/tests/org.jboss.tools.jsf.base.test/projects/JSF2Web/WebContent/WEB-INF/faces-config.xml 2011-12-30 01:03:44 UTC (rev 37587)
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<faces-config version="2.0" xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xi="http://www.w3.org/2001/XInclude"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_2_0.xsd"/>
Property changes on: jsf/tests/org.jboss.tools.jsf.base.test/projects/JSF2Web/WebContent/WEB-INF/faces-config.xml
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: jsf/tests/org.jboss.tools.jsf.base.test/projects/JSF2Web/WebContent/WEB-INF/lib/jsf-api-2.0.3.jar
===================================================================
(Binary files differ)
Property changes on: jsf/tests/org.jboss.tools.jsf.base.test/projects/JSF2Web/WebContent/WEB-INF/lib/jsf-api-2.0.3.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: jsf/tests/org.jboss.tools.jsf.base.test/projects/JSF2Web/src/test/beans/Bean1.java
===================================================================
--- jsf/tests/org.jboss.tools.jsf.base.test/projects/JSF2Web/src/test/beans/Bean1.java (rev 0)
+++ jsf/tests/org.jboss.tools.jsf.base.test/projects/JSF2Web/src/test/beans/Bean1.java 2011-12-30 01:03:44 UTC (rev 37587)
@@ -0,0 +1,11 @@
+package test.beans;
+
+import javax.faces.bean.ManagedBean;
+
+@ManagedBean(name="mybean1")
+public class Bean1 {
+ public String getName() {
+ return "#{}";
+ }
+
+}
Property changes on: jsf/tests/org.jboss.tools.jsf.base.test/projects/JSF2Web/src/test/beans/Bean1.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: jsf/tests/org.jboss.tools.jsf.base.test/projects/JSF2Web/src/test/beans/Bean2.java
===================================================================
--- jsf/tests/org.jboss.tools.jsf.base.test/projects/JSF2Web/src/test/beans/Bean2.java (rev 0)
+++ jsf/tests/org.jboss.tools.jsf.base.test/projects/JSF2Web/src/test/beans/Bean2.java 2011-12-30 01:03:44 UTC (rev 37587)
@@ -0,0 +1,8 @@
+package test.beans;
+
+import javax.faces.bean.ManagedBean;
+
+@ManagedBean(name="mybean2")
+public class Bean2 {
+
+}
Property changes on: jsf/tests/org.jboss.tools.jsf.base.test/projects/JSF2Web/src/test/beans/Bean2.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: jsf/tests/org.jboss.tools.jsf.base.test/projects/JSF2Web/src/test/beans/Bean3.java
===================================================================
--- jsf/tests/org.jboss.tools.jsf.base.test/projects/JSF2Web/src/test/beans/Bean3.java (rev 0)
+++ jsf/tests/org.jboss.tools.jsf.base.test/projects/JSF2Web/src/test/beans/Bean3.java 2011-12-30 01:03:44 UTC (rev 37587)
@@ -0,0 +1,8 @@
+package test.beans;
+
+import javax.faces.bean.ManagedBean;
+
+@ManagedBean(name="mybean2")
+public class Bean3 {
+
+}
Property changes on: jsf/tests/org.jboss.tools.jsf.base.test/projects/JSF2Web/src/test/beans/Bean3.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: jsf/tests/org.jboss.tools.jsf.base.test/projects/JSF2Web/src/test/beans/inputname.xhtml
===================================================================
--- jsf/tests/org.jboss.tools.jsf.base.test/projects/JSF2Web/src/test/beans/inputname.xhtml (rev 0)
+++ jsf/tests/org.jboss.tools.jsf.base.test/projects/JSF2Web/src/test/beans/inputname.xhtml 2011-12-30 01:03:44 UTC (rev 37587)
@@ -0,0 +1,11 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core"
+ >
+
+<f:loadBundle basename="demo.resources2" var="mmm"/>
+<h:outputText value="#{myb}"/>
+<h:outputText value="#{mybean1}"/>
+</html>
\ No newline at end of file
12 years, 4 months
- 1
- 0
JBoss Tools SVN: r37586 - in trunk/esb/plugins/org.jboss.tools.esb.validator/src/org/jboss/tools/esb/validator: ui and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-12-29 20:02:44 -0500 (Thu, 29 Dec 2011)
New Revision: 37586
Modified:
trunk/esb/plugins/org.jboss.tools.esb.validator/src/org/jboss/tools/esb/validator/ESBCoreValidator.java
trunk/esb/plugins/org.jboss.tools.esb.validator/src/org/jboss/tools/esb/validator/ESBPreferences.java
trunk/esb/plugins/org.jboss.tools.esb.validator/src/org/jboss/tools/esb/validator/ESBValidatorMessages.java
trunk/esb/plugins/org.jboss.tools.esb.validator/src/org/jboss/tools/esb/validator/messages.properties
trunk/esb/plugins/org.jboss.tools.esb.validator/src/org/jboss/tools/esb/validator/ui/ESBConfigurationBlock.java
trunk/esb/plugins/org.jboss.tools.esb.validator/src/org/jboss/tools/esb/validator/ui/ESBPreferencesMessages.java
trunk/esb/plugins/org.jboss.tools.esb.validator/src/org/jboss/tools/esb/validator/ui/ESBPreferencesMessages.properties
Log:
JBIDE-10573
https://issues.jboss.org/browse/JBIDE-10573
Attribute 'scheduleidref' validation.
Modified: trunk/esb/plugins/org.jboss.tools.esb.validator/src/org/jboss/tools/esb/validator/ESBCoreValidator.java
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.validator/src/org/jboss/tools/esb/validator/ESBCoreValidator.java 2011-12-30 01:00:56 UTC (rev 37585)
+++ trunk/esb/plugins/org.jboss.tools.esb.validator/src/org/jboss/tools/esb/validator/ESBCoreValidator.java 2011-12-30 01:02:44 UTC (rev 37586)
@@ -148,6 +148,7 @@
private void validateESBConfigFile(XModelObject object, IFile file) {
validateChannelIDRefs(object, file);
+ validateScheduleIDRefs(object, file);
validateActions(object, file);
}
@@ -267,6 +268,53 @@
return result;
}
+ void validateScheduleIDRefs(XModelObject object, IFile file) {
+ XModelObject servicesFolder = object.getChildByPath("Services"); //$NON-NLS-1$
+ if(servicesFolder == null) return;
+ Set<String> ids = getAllScheduleRefIDs(object);
+ XModelObject[] services = servicesFolder.getChildren();
+ for (XModelObject service: services) {
+ XModelObject listenersFolder = service.getChildByPath("Listeners"); //$NON-NLS-1$
+ XModelObject[] listeners = listenersFolder.getChildren();
+ for (XModelObject listener: listeners) {
+ String scheduleIDRef = listener.getAttributeValue(ESBConstants.ATTR_SCHEDULE_ID_REF);
+ if(scheduleIDRef == null) continue;
+ if(scheduleIDRef.length() == 0) {
+ //no id set, it is not an error
+ } else if(!ids.contains(scheduleIDRef)) {
+ //addError - no id found
+ IMarker marker = addError(ESBValidatorMessages.LISTENER_REFERENCES_NON_EXISTENT_SCHEDULE,
+ ESBPreferences.LISTENER_REFERENCES_NON_EXISTENT_SCHEDULE, getSourceReference(listener, ESBConstants.ATTR_SCHEDULE_ID_REF), file);
+ if(marker != null) try {
+ marker.setAttribute(ATTR_PATH, listener.getPath());
+ marker.setAttribute(ATTR_ATTRIBUTE, ESBConstants.ATTR_SCHEDULE_ID_REF);
+ } catch (CoreException e) {
+ e.printStackTrace();
+ }
+ }
+ }
+ }
+ }
+
+ private Set<String> getAllScheduleRefIDs(XModelObject object) {
+ Set<String> result = new HashSet<String>();
+ XModelObject[] ps = object.getChildByPath("Providers").getChildren(); //$NON-NLS-1$
+ for (int i = 0; i < ps.length; i++) {
+ XModelObject[] cs = ps[i].getChildren();
+ for (int j = 0; j < cs.length; j++) {
+ if(cs[j].getModelEntity().getAttribute(ESBConstants.ATTR_SCHEDULE_ID) != null) {
+ String v = cs[j].getAttributeValue(ESBConstants.ATTR_SCHEDULE_ID);
+ if(v != null && v.length() > 0) {
+ result.add(v);
+ }
+ }
+ }
+ }
+
+ return result;
+ }
+
+
ITextSourceReference getSourceReference(XModelObject o, String attr) {
return new XMLValueInfo(o, attr);
}
Modified: trunk/esb/plugins/org.jboss.tools.esb.validator/src/org/jboss/tools/esb/validator/ESBPreferences.java
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.validator/src/org/jboss/tools/esb/validator/ESBPreferences.java 2011-12-30 01:00:56 UTC (rev 37585)
+++ trunk/esb/plugins/org.jboss.tools.esb.validator/src/org/jboss/tools/esb/validator/ESBPreferences.java 2011-12-30 01:02:44 UTC (rev 37586)
@@ -29,6 +29,12 @@
public static final String LISTENER_REFERENCES_NON_EXISTENT_CHANNEL = INSTANCE.createSeverityOption("listenerReferencesNonExistentChannel"); //$NON-NLS-1$
public static final String LISTENER_REFERENCES_INCOMPATIBLE_CHANNEL = INSTANCE.createSeverityOption("listenerReferencesIncompatibleChannel"); //$NON-NLS-1$
+
+ //Schedule ID ref group
+
+ public static final String LISTENER_REFERENCES_NON_EXISTENT_SCHEDULE = INSTANCE.createSeverityOption("listenerReferencesNonExistentSchedule"); //$NON-NLS-1$
+
+ //Actions
public static final String BUSINESS_RULES_PROCESSOR_PROBLEMS = INSTANCE.createSeverityOption("businessRulesProcessorProblems"); //$NON-NLS-1$
/**
Modified: trunk/esb/plugins/org.jboss.tools.esb.validator/src/org/jboss/tools/esb/validator/ESBValidatorMessages.java
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.validator/src/org/jboss/tools/esb/validator/ESBValidatorMessages.java 2011-12-30 01:00:56 UTC (rev 37585)
+++ trunk/esb/plugins/org.jboss.tools.esb.validator/src/org/jboss/tools/esb/validator/ESBValidatorMessages.java 2011-12-30 01:02:44 UTC (rev 37586)
@@ -23,6 +23,8 @@
public static String LISTENER_REFERENCES_NON_EXISTENT_CHANNEL;
public static String LISTENER_REFERENCES_INCOMPATIBLE_CHANNEL;
+ public static String LISTENER_REFERENCES_NON_EXISTENT_SCHEDULE;
+
public static String INVALID_RULE_SET_FOR_RULE_LANGUAGE;
public static String INVALID_RULE_AUDIT_TYPE_AND_INTERVAL;
Modified: trunk/esb/plugins/org.jboss.tools.esb.validator/src/org/jboss/tools/esb/validator/messages.properties
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.validator/src/org/jboss/tools/esb/validator/messages.properties 2011-12-30 01:00:56 UTC (rev 37585)
+++ trunk/esb/plugins/org.jboss.tools.esb.validator/src/org/jboss/tools/esb/validator/messages.properties 2011-12-30 01:02:44 UTC (rev 37586)
@@ -5,6 +5,8 @@
LISTENER_REFERENCES_NON_EXISTENT_CHANNEL=Listener references non-existent channel
LISTENER_REFERENCES_INCOMPATIBLE_CHANNEL=Listener references incompatible channel
+LISTENER_REFERENCES_NON_EXISTENT_SCHEDULE=Listener references non-existent schedule
+
INVALID_RULE_SET_FOR_RULE_LANGUAGE=If "ruleLanguage" is specified, the file in "ruleSet" should be a ".dslr" file
INVALID_RULE_AUDIT_TYPE_AND_INTERVAL=If "ruleAuditInterval" is specified, it only applies for a "ruleAuditType" of "THREADED_FILE"
INVALID_OBJECT_PATH_WRONG_LOCATION=Invalid object-path: location should be one of body, header, properties, attachment
Modified: trunk/esb/plugins/org.jboss.tools.esb.validator/src/org/jboss/tools/esb/validator/ui/ESBConfigurationBlock.java
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.validator/src/org/jboss/tools/esb/validator/ui/ESBConfigurationBlock.java 2011-12-30 01:00:56 UTC (rev 37585)
+++ trunk/esb/plugins/org.jboss.tools.esb.validator/src/org/jboss/tools/esb/validator/ui/ESBConfigurationBlock.java 2011-12-30 01:02:44 UTC (rev 37586)
@@ -26,7 +26,7 @@
*/
public class ESBConfigurationBlock extends SeverityConfigurationBlock {
- private static final String SETTINGS_SECTION_NAME = "CDIValidatorConfigurationBlock";
+ private static final String SETTINGS_SECTION_NAME = "CDIValidatorConfigurationBlock"; //$NON-NLS-1$
private static SectionDescription SECTION_CHANNEL_ID_REF = new SectionDescription(
ESBPreferencesMessages.ESBValidatorConfigurationBlock_section_channelidref,
@@ -37,16 +37,25 @@
ESBValidatorPlugin.PLUGIN_ID
);
+ private static SectionDescription SECTION_SCHEDULE_ID_REF = new SectionDescription(
+ ESBPreferencesMessages.ESBValidatorConfigurationBlock_section_scheduleidref,
+ new String[][]{
+ {ESBPreferences.LISTENER_REFERENCES_NON_EXISTENT_SCHEDULE, ESBPreferencesMessages.ESBValidatorConfigurationBlock_pb_listenerReferencesNonExistentSchedule_label},
+ },
+ ESBValidatorPlugin.PLUGIN_ID
+ );
+
private static SectionDescription SECTION_ACTION_DEFINITIONS = new SectionDescription(
- ESBPreferencesMessages.ESBValidatorConfigurationBlock_section_actions,
- new String[][]{
- {ESBPreferences.BUSINESS_RULES_PROCESSOR_PROBLEMS, ESBPreferencesMessages.ESBValidatorConfigurationBlock_pb_businessRulesProcessorProblems_label},
- },
- ESBValidatorPlugin.PLUGIN_ID
- );
+ ESBPreferencesMessages.ESBValidatorConfigurationBlock_section_actions,
+ new String[][]{
+ {ESBPreferences.BUSINESS_RULES_PROCESSOR_PROBLEMS, ESBPreferencesMessages.ESBValidatorConfigurationBlock_pb_businessRulesProcessorProblems_label},
+ },
+ ESBValidatorPlugin.PLUGIN_ID
+ );
public static SectionDescription[] ALL_SECTIONS = new SectionDescription[]{
SECTION_CHANNEL_ID_REF,
+ SECTION_SCHEDULE_ID_REF,
SECTION_ACTION_DEFINITIONS,
};
Modified: trunk/esb/plugins/org.jboss.tools.esb.validator/src/org/jboss/tools/esb/validator/ui/ESBPreferencesMessages.java
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.validator/src/org/jboss/tools/esb/validator/ui/ESBPreferencesMessages.java 2011-12-30 01:00:56 UTC (rev 37585)
+++ trunk/esb/plugins/org.jboss.tools.esb.validator/src/org/jboss/tools/esb/validator/ui/ESBPreferencesMessages.java 2011-12-30 01:02:44 UTC (rev 37586)
@@ -22,11 +22,15 @@
// Validator Preference page
public static String ESBValidatorConfigurationBlock_common_description;
- // Section Name
+ // Section Channel ID Ref
public static String ESBValidatorConfigurationBlock_section_channelidref;
public static String ESBValidatorConfigurationBlock_pb_listenerReferencesNonExistentChannel_label;
public static String ESBValidatorConfigurationBlock_pb_listenerReferencesIncompatibleChannel_label;
+ // Section Schedule ID Ref
+ public static String ESBValidatorConfigurationBlock_section_scheduleidref;
+ public static String ESBValidatorConfigurationBlock_pb_listenerReferencesNonExistentSchedule_label;
+
public static String ESBValidatorConfigurationBlock_section_actions;
public static String ESBValidatorConfigurationBlock_pb_businessRulesProcessorProblems_label;
Modified: trunk/esb/plugins/org.jboss.tools.esb.validator/src/org/jboss/tools/esb/validator/ui/ESBPreferencesMessages.properties
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.validator/src/org/jboss/tools/esb/validator/ui/ESBPreferencesMessages.properties 2011-12-30 01:00:56 UTC (rev 37585)
+++ trunk/esb/plugins/org.jboss.tools.esb.validator/src/org/jboss/tools/esb/validator/ui/ESBPreferencesMessages.properties 2011-12-30 01:02:44 UTC (rev 37586)
@@ -16,6 +16,10 @@
ESBValidatorConfigurationBlock_pb_listenerReferencesNonExistentChannel_label=Listener References Non-existent Channel:
ESBValidatorConfigurationBlock_pb_listenerReferencesIncompatibleChannel_label=Listener References Incompatible Channel:
+##Section Schedule ID Ref
+ESBValidatorConfigurationBlock_section_scheduleidref=Schedule ID Ref
+ESBValidatorConfigurationBlock_pb_listenerReferencesNonExistentSchedule_label=Listener References Non-existent Schedule:
+
ESBValidatorConfigurationBlock_section_actions=Action Definitions
ESBValidatorConfigurationBlock_pb_businessRulesProcessorProblems_label=Business Rules Processor Problems:
12 years, 4 months
- 1
- 0
JBoss Tools SVN: r37585 - in trunk/esb/plugins/org.jboss.tools.esb.ui: src/org/jboss/tools/esb/ui/editor/attribute/adapter and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-12-29 20:00:56 -0500 (Thu, 29 Dec 2011)
New Revision: 37585
Added:
trunk/esb/plugins/org.jboss.tools.esb.ui/src/org/jboss/tools/esb/ui/editor/attribute/adapter/ScheduleListAdapter.java
Modified:
trunk/esb/plugins/org.jboss.tools.esb.ui/plugin.xml
trunk/esb/plugins/org.jboss.tools.esb.ui/src/org/jboss/tools/esb/ui/editor/attribute/adapter/BusListAdapter.java
Log:
JBIDE-10573
https://issues.jboss.org/browse/JBIDE-10573
Attribute 'scheduleidref' validation.
Modified: trunk/esb/plugins/org.jboss.tools.esb.ui/plugin.xml
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.ui/plugin.xml 2011-12-30 01:00:06 UTC (rev 37584)
+++ trunk/esb/plugins/org.jboss.tools.esb.ui/plugin.xml 2011-12-30 01:00:56 UTC (rev 37585)
@@ -64,12 +64,14 @@
<extension point="org.jboss.tools.common.model.ui.attributeAdapter">
<attributeAdapter class="org.jboss.tools.esb.ui.editor.attribute.adapter.BusListAdapter" id="ESBBusList"/>
+ <attributeAdapter class="org.jboss.tools.esb.ui.editor.attribute.adapter.ScheduleListAdapter" id="ESBScheduleList"/>
<attributeAdapter class="org.jboss.tools.esb.ui.editor.attribute.adapter.ServiceCategoryListAdapter" id="ESBServiceCategoryList"/>
<attributeAdapter class="org.jboss.tools.esb.ui.editor.attribute.adapter.ServiceNameListAdapter" id="ESBServiceNameList"/>
</extension>
<extension point="org.jboss.tools.common.model.ui.attributeEditor">
<attributeEditor class="org.jboss.tools.common.model.ui.attribute.editor.ComboBoxEditor" id="ESBBusList"/>
+ <attributeEditor class="org.jboss.tools.common.model.ui.attribute.editor.ComboBoxEditor" id="ESBScheduleList"/>
<attributeEditor class="org.jboss.tools.common.model.ui.attribute.editor.ComboBoxEditor" id="ESBServiceCategoryList"/>
<attributeEditor class="org.jboss.tools.common.model.ui.attribute.editor.ComboBoxEditor" id="ESBServiceNameList"/>
</extension>
Modified: trunk/esb/plugins/org.jboss.tools.esb.ui/src/org/jboss/tools/esb/ui/editor/attribute/adapter/BusListAdapter.java
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.ui/src/org/jboss/tools/esb/ui/editor/attribute/adapter/BusListAdapter.java 2011-12-30 01:00:06 UTC (rev 37584)
+++ trunk/esb/plugins/org.jboss.tools.esb.ui/src/org/jboss/tools/esb/ui/editor/attribute/adapter/BusListAdapter.java 2011-12-30 01:00:56 UTC (rev 37585)
@@ -4,6 +4,7 @@
import org.jboss.tools.common.meta.XAttribute;
import org.jboss.tools.common.model.XModelObject;
+import org.jboss.tools.common.model.filesystems.FileSystemsHelper;
import org.jboss.tools.common.model.ui.attribute.IListContentProvider;
import org.jboss.tools.common.model.ui.attribute.adapter.DefaultComboBoxValueAdapter;
import org.jboss.tools.common.model.ui.attribute.adapter.DefaultXAttributeListContentProvider;
@@ -28,8 +29,7 @@
}
protected void loadTags() {
- XModelObject f = context;
- while(f != null && f.getFileType() != XModelObject.FILE) f = f.getParent();
+ XModelObject f = FileSystemsHelper.getFile(context);
if(f == null) return;
String listenerEntity = attribute.getModelEntity().getName();
String prefix = getBusEntityPrefix(listenerEntity);
Added: trunk/esb/plugins/org.jboss.tools.esb.ui/src/org/jboss/tools/esb/ui/editor/attribute/adapter/ScheduleListAdapter.java
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.ui/src/org/jboss/tools/esb/ui/editor/attribute/adapter/ScheduleListAdapter.java (rev 0)
+++ trunk/esb/plugins/org.jboss.tools.esb.ui/src/org/jboss/tools/esb/ui/editor/attribute/adapter/ScheduleListAdapter.java 2011-12-30 01:00:56 UTC (rev 37585)
@@ -0,0 +1,68 @@
+/*******************************************************************************
+ * Copyright (c) 2011 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.esb.ui.editor.attribute.adapter;
+
+import java.util.TreeSet;
+
+import org.jboss.tools.common.meta.XAttribute;
+import org.jboss.tools.common.model.XModelObject;
+import org.jboss.tools.common.model.filesystems.FileSystemsHelper;
+import org.jboss.tools.common.model.ui.attribute.IListContentProvider;
+import org.jboss.tools.common.model.ui.attribute.adapter.DefaultComboBoxValueAdapter;
+import org.jboss.tools.common.model.ui.attribute.adapter.DefaultXAttributeListContentProvider;
+import org.jboss.tools.esb.core.model.ESBConstants;
+
+/**
+ *
+ * @author Viacheslav Kabanovich
+ *
+ */
+public class ScheduleListAdapter extends DefaultComboBoxValueAdapter {
+
+ protected IListContentProvider createListContentProvider(XAttribute attribute) {
+ ScheduleListContentProvider p = new ScheduleListContentProvider();
+ p.setContext(modelObject);
+ p.setAttribute(attribute);
+ return p;
+ }
+
+}
+
+class ScheduleListContentProvider extends DefaultXAttributeListContentProvider {
+ private XModelObject context;
+
+ public void setContext(XModelObject context) {
+ this.context = context;
+ }
+
+ protected void loadTags() {
+ XModelObject f = FileSystemsHelper.getFile(context);
+ if(f == null) return;
+ XModelObject[] ps = f.getChildByPath("Providers").getChildren();
+ TreeSet<String> set = new TreeSet<String>();
+ for (int i = 0; i < ps.length; i++) {
+ if("schedule-provider".equals(ps[i].getModelEntity().getXMLSubPath())) {
+ XModelObject[] cs = ps[i].getChildren();
+ for (int j = 0; j < cs.length; j++) {
+ if(cs[j].getModelEntity().getAttribute(ESBConstants.ATTR_SCHEDULE_ID) != null) {
+ String v = cs[j].getAttributeValue(ESBConstants.ATTR_SCHEDULE_ID);
+ if(v != null && v.length() > 0) {
+ set.add(v);
+ }
+ }
+ }
+ }
+ }
+ tags = set.toArray(new String[0]);
+
+ }
+}
+
Property changes on: trunk/esb/plugins/org.jboss.tools.esb.ui/src/org/jboss/tools/esb/ui/editor/attribute/adapter/ScheduleListAdapter.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
12 years, 4 months
- 1
- 0
JBoss Tools SVN: r37584 - trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-12-29 20:00:06 -0500 (Thu, 29 Dec 2011)
New Revision: 37584
Modified:
trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb.meta
Log:
JBIDE-10573
https://issues.jboss.org/browse/JBIDE-10573
Attribute 'scheduleidref' validation.
Modified: trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb.meta
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb.meta 2011-12-30 00:59:54 UTC (rev 37583)
+++ trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb.meta 2011-12-30 01:00:06 UTC (rev 37584)
@@ -2420,7 +2420,10 @@
<Constraint loader="%IntEL%"/>
</XModelAttribute>
<XModelAttribute PROPERTIES="category=advanced"
- name="schedule id ref" xmlname="scheduleidref"/>
+ name="schedule id ref" xmlname="scheduleidref">
+ <Constraint loader="ListString"/>
+ <Editor name="ESBScheduleList"/>
+ </XModelAttribute>
<XModelAttribute PROPERTIES="category=general;save=always"
name="event processor" xmlname="event-processor">
<Editor name="AccessibleJava"/>
12 years, 4 months
- 1
- 0
JBoss Tools SVN: r37583 - jsf and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2011-12-29 19:59:54 -0500 (Thu, 29 Dec 2011)
New Revision: 37583
Added:
jsf/
jsf/tests/
jsf/tests/org.jboss.tools.jsf.base.test/
Log:
Share project "org.jboss.tools.jsf.base.test" into "https://svn.jboss.org/repos/jbosstools"
12 years, 4 months
- 1
- 0