May 2010 - jbosstools-commits - Jboss List Archives

JBoss Tools SVN: r21854 - branches/modular_build/site.

by jbosstools-commits＠lists.jboss.org

Author: nickboldt Date: 2010-05-03 11:33:40 -0400 (Mon, 03 May 2010) New Revision: 21854 Modified: branches/modular_build/site/ Log: svn:ignore Property changes on: branches/modular_build/site ___________________________________________________________________ Name: svn:ignore + plugins/ features/ content.* artifacts.* target/ bin/ buildlog.latest.txt

14 years, 8 months

1
0
0 / 0

JBoss Tools SVN: r21853 - trunk/jst/tests/org.jboss.tools.jst.web.ui.test/src/org/jboss/tools/jst/web/ui/test.

by jbosstools-commits＠lists.jboss.org

Author: mareshkau Date: 2010-05-03 09:57:35 -0400 (Mon, 03 May 2010) New Revision: 21853 Modified: trunk/jst/tests/org.jboss.tools.jst.web.ui.test/src/org/jboss/tools/jst/web/ui/test/WebWizardsTest.java Log: https://jira.jboss.org/jira/browse/JBIDE-6216, https://jira.jboss.org/jira/browse/JBIDE-6190 Modified: trunk/jst/tests/org.jboss.tools.jst.web.ui.test/src/org/jboss/tools/jst/web/ui/test/WebWizardsTest.java =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.web.ui.test/src/org/jboss/tools/jst/web/ui/test/WebWizardsTest.java 2010-05-03 11:31:35 UTC (rev 21852) +++ trunk/jst/tests/org.jboss.tools.jst.web.ui.test/src/org/jboss/tools/jst/web/ui/test/WebWizardsTest.java 2010-05-03 13:57:35 UTC (rev 21853) @@ -10,15 +10,25 @@ ******************************************************************************/ package org.jboss.tools.jst.web.ui.test; +import org.eclipse.jface.viewers.ISelection; +import org.eclipse.jface.viewers.IStructuredSelection; +import org.eclipse.jface.wizard.IWizardPage; +import org.eclipse.jface.wizard.WizardDialog; +import org.eclipse.ui.ISelectionService; +import org.eclipse.ui.IWorkbenchWizard; +import org.eclipse.ui.PartInitException; +import org.eclipse.ui.PlatformUI; import org.jboss.tools.common.model.ui.test.AbstractModelNewWizardTest; import org.jboss.tools.common.model.ui.wizard.newfile.NewHTMLFileWizard; import org.jboss.tools.common.model.ui.wizard.newfile.NewJSPFileWizard; import org.jboss.tools.common.model.ui.wizard.newfile.NewPropertiesFileWizard; +import org.jboss.tools.common.model.ui.wizards.standard.DefaultStandardStep; import org.jboss.tools.jst.web.ui.wizards.newfile.NewCSSFileWizard; import org.jboss.tools.jst.web.ui.wizards.newfile.NewJSFileWizard; import org.jboss.tools.jst.web.ui.wizards.newfile.NewTLDFileWizard; import org.jboss.tools.jst.web.ui.wizards.newfile.NewWebFileWizard; import org.jboss.tools.jst.web.ui.wizards.newfile.NewXHTMLWizard; +import org.jboss.tools.test.util.WorkbenchUtils; /** * @author eskimo @@ -41,9 +51,38 @@ public void testNewJspWizardInstanceIsCreated() { testNewWizardInstanceIsCreated(NewJSPFileWizard.class.getName()); } - + //rewritten by Maksim Areshkau, as fix for https://jira.jboss.org/jira/browse/JBIDE-6216, + //https://jira.jboss.org/jira/browse/JBIDE-6190 public void testNewXhtmlWizardInstanceIsCreated() { - testNewWizardInstanceIsCreated(NewXHTMLWizard.class.getName()); + //commented by Maksim Areshkau, because in this methid not called + //init for wizard + //testNewWizardInstanceIsCreated(NewXHTMLWizard.class.getName()); + IWorkbenchWizard + aWizard = (IWorkbenchWizard) WorkbenchUtils.findWizardByDefId( + NewXHTMLWizard.class.getName()); + WizardDialog dialog = new WizardDialog( + PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), + aWizard); + try { + //here we show view to get initialized selection + PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().showView("org.eclipse.jdt.ui.PackageExplorer"); //$NON-NLS-1$ + } catch (PartInitException e) { + fail(e.toString()); + } + ISelectionService selectionService = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getSelectionService(); + ISelection eclipseSelection = selectionService.getSelection(); + aWizard.init(PlatformUI.getWorkbench(), (IStructuredSelection) eclipseSelection); + dialog.setBlockOnOpen(false); + try { + dialog.open(); + IWizardPage htmlWizardNewFileCreationPage = dialog.getCurrentPage(); + assertEquals("The Page should be","HTMLWizardNewFileCreationPage", htmlWizardNewFileCreationPage.getName()); //$NON-NLS-1$//$NON-NLS-2$ + IWizardPage newXHTMLTemplatesWizardPage=htmlWizardNewFileCreationPage.getNextPage(); + assertEquals("The Page should be","NewXHTMLTemplatesWizardPage", newXHTMLTemplatesWizardPage.getName()); //$NON-NLS-1$//$NON-NLS-2$ + assertTrue("Start page is not loaded",newXHTMLTemplatesWizardPage.getNextPage() instanceof DefaultStandardStep); //$NON-NLS-1$ + } finally { + dialog.close(); + } } public void testNewHtmlWizardInstanceIsCreated() {

14 years, 8 months

1
0
0 / 0

JBoss Tools SVN: r21852 - trunk/drools/docs/guvnor_ref/en-US.

by jbosstools-commits＠lists.jboss.org

Author: abogachuk Date: 2010-05-03 07:31:35 -0400 (Mon, 03 May 2010) New Revision: 21852 Modified: trunk/drools/docs/guvnor_ref/en-US/functionality_overview.xml trunk/drools/docs/guvnor_ref/en-US/introduction.xml Log: https://jira.jboss.org/jira/browse/TOOLSDOC-6 Show java-doc is shown for EL content assist item. Screenshot has been made. TOOLSDOC-63 Eclipse Guvnor Tools Reference Guide restructureing and update. Text was updated. Modified: trunk/drools/docs/guvnor_ref/en-US/functionality_overview.xml =================================================================== --- trunk/drools/docs/guvnor_ref/en-US/functionality_overview.xml 2010-05-03 09:58:56 UTC (rev 21851) +++ trunk/drools/docs/guvnor_ref/en-US/functionality_overview.xml 2010-05-03 11:31:35 UTC (rev 21852) @@ -266,7 +266,7 @@ <para>As mentioned in the <link linkend="introduction">"Introduction"</link>, the main purpose of the <property>EGT</property> is to allow development using resources held in a Guvnor - repository. There are two method of getting local copies of Guvnor repository + repository. There are two methods of getting local copies of Guvnor repository resources:</para> <orderedlist> @@ -305,10 +305,10 @@ above you can see the <emphasis> <property>Dummy rule.drl</property></emphasis> file with the decoration in the <property>Resource Navigator</property>. The Guvnor icon decorator is on the top right of the file image, and the Guvnor revision details are appended to the file name. (The presence/location of these can be - changed the <link linkend="resource_decoration_preferences">Guvnor + changed in the <link linkend="resource_decoration_preferences">Guvnor Preferences</link>.)</para> - <para>Here we see that, <emphasis><property>Dummy role.drl</property></emphasis> is associated with a Guvnor repository + <para>Here we see that, <emphasis><property>Dummy rule.drl</property></emphasis> is associated with a Guvnor repository resource and the local copy is based on revision 0, with a <code>02-10-2008, 4:21:53</code> date/time stamp. The file <emphasis><property>Sample.drl</property>,</emphasis> however, is not associated with a Guvnor repository file. Further details about the association can be found in the standard Eclipse @@ -496,7 +496,7 @@ <para>The <emphasis> <property>Show History</property> - </emphasis> action is enable for one Guvnor repository associated file and causes + </emphasis> action is enabled for one Guvnor repository associated file and causes the <link linkend="guvnor_history_view">Guvnor Resource History view</link> to be populated with revision history for the selected file.</para> </section> @@ -634,7 +634,7 @@ <para>Here we see that the file <emphasis> <property>test.txt</property> - </emphasis> has three revisions. Double clicking on a revision row (or the context menu <emphasis> + </emphasis> has seven revisions. Double clicking on a revision row (or the context menu <emphasis> <property>Open (Read only)</property>)</emphasis> opens an Eclipse read-only editor with the revision contents.</para> Modified: trunk/drools/docs/guvnor_ref/en-US/introduction.xml =================================================================== --- trunk/drools/docs/guvnor_ref/en-US/introduction.xml 2010-05-03 09:58:56 UTC (rev 21851) +++ trunk/drools/docs/guvnor_ref/en-US/introduction.xml 2010-05-03 11:31:35 UTC (rev 21852) @@ -119,7 +119,7 @@ <title>How to start with Guvnor Tools</title> <para><property>Guvnor Tools</property> is a part of the <property>JBoss Tools</property> - project. Thus to get started with <property>Guvnor Tools</property>, you should have the following:</para> + project. Thus to get started with Guvnor Tools, you should have the following:</para> <itemizedlist> <listitem> @@ -128,14 +128,35 @@ </listitem> <listitem> - <para>JBoss Server 4.2 or higher with Guvnor repository deployed. Thus, you should - download <ulink - url="http://download.jboss.org/drools/release/5.0.0.25561.CR1/drools-5.0.0.CR1..." - >Guvnor CR1</ulink> and extract it to the deploy directory of the - server.</para> + <para>JBoss Server 4.2 or higher with Guvnor repository deployed.</para> </listitem> </itemizedlist> - + <para>To have JBoss Server with Guvnor repository deployed, you should + download <ulink url="http://www.jboss.org/drools/downloads.html">Guvnor</ulink>. + When downloading you may choose either web based Guvnor to deploy to your + JBoss Server or Standalone Guvnor with JBoss AS.</para> + <para>If you use a JBoss AS 5 and a <property>Guvnor Tools</property> doesn't work when deployed to the server, + you should do the following to get Guvnor Tools running:</para> + <orderedlist> + <listitem> + <para>Remove the JBoss Security libraries (authorization-spi-2.0.2.CR6.jar, + identity-*, acl-spi-2.0.2.CR6.jar) from drools WAR file (not the app server itself). + The JBoss Security libraries are provided in AS 5.</para> + </listitem> + <listitem> + <para>Remove the JAXP libraries (xercesImpl-2.8.0.jar, xml-apis-2.*)</para> + </listitem> + <listitem> + <para>Remove the EL libraries (el-*)</para> + </listitem> + </orderedlist> + <para>After this, Guvnor should operate as normal. + During deployment, you would see the following exception in the log which indicates that the experiemental + JBoss Security based ACL integration has defined some EJB3/JPA stuff in guvnor that has not been configured.</para> + <programlisting>ERROR [AbstractKernelController] Error installing to Start: name=persistence.unit:unitName=#ACL state=Create +java.lang.RuntimeException: Specification violation [EJB3 JPA 6.2.1.2] - You have not defined a non-jta-data-source +for a RESOURCE_LOCAL enabled persistence context named: ACL + </programlisting> <para>Now refer to the <link linkend="functionality_overview">"Functionality Overview"</link> section to find out what you can do with Guvnor and Eclipse synchronisation tool.</para>

14 years, 8 months

1
0
0 / 0

JBoss Tools SVN: r21851 - trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test.

by jbosstools-commits＠lists.jboss.org

Author: yzhishko Date: 2010-05-03 05:58:56 -0400 (Mon, 03 May 2010) New Revision: 21851 Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/VpeTest.java Log: https://jira.jboss.org/jira/browse/JBIDE-6197 - changes were reverted due to test failing on hudson Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/VpeTest.java =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/VpeTest.java 2010-05-03 08:37:11 UTC (rev 21850) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/VpeTest.java 2010-05-03 09:58:56 UTC (rev 21851) @@ -9,10 +9,8 @@ * Red Hat, Inc. - initial API and implementation ******************************************************************************/ - package org.jboss.tools.vpe.ui.test; - import java.io.IOException; import java.util.Collection; import java.util.Map; @@ -51,143 +49,151 @@ import org.w3c.dom.Element; import org.w3c.dom.Node; - /** * The Class VpeTest. * * @author Max Areshkau * - * Base Class for VPE tests + * Base Class for VPE tests */ public class VpeTest extends TestCase implements ILogListener { - /** Editor in which we open visual page. */ - protected final static String EDITOR_ID = "org.jboss.tools.jst.jsp.jspeditor.JSPTextEditor"; //$NON-NLS-1$ + /** Editor in which we open visual page. */ + protected final static String EDITOR_ID = "org.jboss.tools.jst.jsp.jspeditor.JSPTextEditor"; //$NON-NLS-1$ - /** Collects exceptions. */ - private Throwable exception; + /** Collects exceptions. */ + private Throwable exception; - /** check warning log. */ - private boolean checkWarning = false; - - // FIX for JBIDE-1628 - static { - ClassLoaderUtil.init(); - // wait for initialization - TestUtil.delay(3000); - JspEditorPlugin.getDefault().getPreferenceStore().setValue(IVpePreferencesPage.INFORM_WHEN_PROJECT_MIGHT_NOT_BE_CONFIGURED_PROPERLY_FOR_VPE, false); - } + /** check warning log. */ + private boolean checkWarning = false; - /** - * The Constructor. - * - * @param importProjectName * @param name the name - */ + // FIX for JBIDE-1628 + static { + ClassLoaderUtil.init(); + // wait for initialization + TestUtil.delay(3000); + JspEditorPlugin + .getDefault() + .getPreferenceStore() + .setValue( + IVpePreferencesPage.INFORM_WHEN_PROJECT_MIGHT_NOT_BE_CONFIGURED_PROPERLY_FOR_VPE, + false); + } - public VpeTest(String name) { - super(name); + /** + * The Constructor. + * + * @param importProjectName + * * @param name the name + */ - } + public VpeTest(String name) { + super(name); - /** - * Perform pre-test initialization. - * - * @throws Exception the exception - * - * @see TestCase#setUp() - */ - @Override + } + + /** + * Perform pre-test initialization. + * + * @throws Exception + * the exception + * + * @see TestCase#setUp() + */ + @Override protected void setUp() throws Exception { - super.setUp(); - Platform.addLogListener(this); - // String jbossPath = System.getProperty( - // "jbosstools.test.jboss.home.4.2", "C:\\java\\jboss-4.2.2.GA"); - // JBossASAdapterInitializer.initJBossAS(jbossPath, new - // NullProgressMonitor()); - closeEditors(); - } + super.setUp(); + Platform.addLogListener(this); + // String jbossPath = System.getProperty( + // "jbosstools.test.jboss.home.4.2", "C:\\java\\jboss-4.2.2.GA"); + // JBossASAdapterInitializer.initJBossAS(jbossPath, new + // NullProgressMonitor()); + closeEditors(); + } - /** - * Perform post-test cleanup. - * - * @throws Exception the exception - * - * @see TestCase#tearDown() - */ - @Override + /** + * Perform post-test cleanup. + * + * @throws Exception + * the exception + * + * @see TestCase#tearDown() + */ + @Override protected void tearDown() throws Exception { - - boolean isJobsCheck = true; - while (isJobsCheck){ + + boolean isJobsCheck = true; + while (isJobsCheck) { isJobsCheck = false; - Job[] jobs = Job.getJobManager().find(null); + Job[] jobs = Job.getJobManager().find(null); for (Job job : jobs) { if (job instanceof StructuredRegionProcessor) { - if (job.getState() == Job.RUNNING) { - TestUtil.delay(50); - isJobsCheck = true; - break; - } + TestUtil.delay(50); + isJobsCheck = true; + break; } } } - - closeEditors(); - - Platform.removeLogListener(this); - - if (getException() != null) { + + closeEditors(); + + Platform.removeLogListener(this); + + if (getException() != null) { throw new Exception(getException()); } - - super.tearDown(); - } + super.tearDown(); - /* - * (non-Javadoc) - * - * @see - * org.eclipse.core.runtime.ILogListener#logging(org.eclipse.core.runtime - * .IStatus, java.lang.String) - */ - /** - * Logging. - * - * @param status the status - * @param plugin the plugin - */ - public void logging(IStatus status, String plugin) { - switch (status.getSeverity()) { - case IStatus.ERROR: - setException(status.getException()); - break; - case IStatus.WARNING: - if (isCheckWarning()) - setException(status.getException()); - break; - default: - break; - } + } - } + /* + * (non-Javadoc) + * + * @see + * org.eclipse.core.runtime.ILogListener#logging(org.eclipse.core.runtime + * .IStatus, java.lang.String) + */ + /** + * Logging. + * + * @param status + * the status + * @param plugin + * the plugin + */ + public void logging(IStatus status, String plugin) { + switch (status.getSeverity()) { + case IStatus.ERROR: + setException(status.getException()); + break; + case IStatus.WARNING: + if (isCheckWarning()) + setException(status.getException()); + break; + default: + break; + } - /** - * close all opened editors. - */ - protected void closeEditors() { + } - // wait -// TestUtil.waitForJobs(); - IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage(); - IWorkbenchPart part = page.getViewReferences()[0].getPart(false); - page.activate(part); - // close - page.closeAllEditors(false); + /** + * close all opened editors. + */ + protected void closeEditors() { - } - - /** + // wait + // TestUtil.waitForJobs(); + IWorkbenchPage page = PlatformUI.getWorkbench() + .getActiveWorkbenchWindow().getActivePage(); + IWorkbenchPart part = page.getViewReferences()[0].getPart(false); + page.activate(part); + // close + page.closeAllEditors(false); + + } + + /** * * @return source document */ @@ -197,102 +203,118 @@ } - /** - * Perfoms test for some page. - * - * @param componentPage the component page - * - * @throws Throwable the throwable - * @throws PartInitException the part init exception - */ - protected void performTestForVpeComponent(IFile componentPage) throws PartInitException, Throwable { - TestUtil.waitForJobs(); + /** + * Perfoms test for some page. + * + * @param componentPage + * the component page + * + * @throws Throwable + * the throwable + * @throws PartInitException + * the part init exception + */ + protected void performTestForVpeComponent(IFile componentPage) + throws PartInitException, Throwable { + TestUtil.waitForJobs(); - setException(null); + setException(null); - // IFile file = (IFile) - // TestUtil.getComponentPath(componentPage,getImportProjectName()); - IEditorInput input = new FileEditorInput(componentPage); + // IFile file = (IFile) + // TestUtil.getComponentPath(componentPage,getImportProjectName()); + IEditorInput input = new FileEditorInput(componentPage); - TestUtil.waitForJobs(); + TestUtil.waitForJobs(); - IEditorPart editor = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().openEditor(input, EDITOR_ID, true); - //here we wait for inintialization VPE controller - TestUtil.getVpeController((JSPMultiPageEditor) editor); - - assertNotNull(editor); + IEditorPart editor = PlatformUI.getWorkbench() + .getActiveWorkbenchWindow().getActivePage().openEditor(input, + EDITOR_ID, true); + // here we wait for inintialization VPE controller + TestUtil.getVpeController((JSPMultiPageEditor) editor); - TestUtil.waitForJobs(); - //JBIDE-1628 -// TestUtil.delay(1000); + assertNotNull(editor); - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().closeAllEditors(true); + TestUtil.waitForJobs(); + // JBIDE-1628 + // TestUtil.delay(1000); - if (getException() != null) { - throw getException(); - } - } + PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage() + .closeAllEditors(true); - /** - * Open JSPMultiPageEditor editor. - * - * @param input the input - * - * @return the JSP multi page editor - * - * @throws PartInitException the part init exception - */ - protected JSPMultiPageEditor openEditor(IEditorInput input) throws PartInitException { + if (getException() != null) { + throw getException(); + } + } - // get editor - JSPMultiPageEditor part = (JSPMultiPageEditor) PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().openEditor( - input, EDITOR_ID, true); + /** + * Open JSPMultiPageEditor editor. + * + * @param input + * the input + * + * @return the JSP multi page editor + * + * @throws PartInitException + * the part init exception + */ + protected JSPMultiPageEditor openEditor(IEditorInput input) + throws PartInitException { - assertNotNull(part); - return part; + // get editor + JSPMultiPageEditor part = (JSPMultiPageEditor) PlatformUI + .getWorkbench().getActiveWorkbenchWindow().getActivePage() + .openEditor(input, EDITOR_ID, true); - } + assertNotNull(part); + return part; - /** - * Gets the exception. - * - * @return the exception - */ - protected Throwable getException() { - return exception; - } + } - /** - * Sets the exception. - * - * @param exception the exception to set - */ - protected void setException(Throwable exception) { - this.exception = exception; - } + /** + * Gets the exception. + * + * @return the exception + */ + protected Throwable getException() { + return exception; + } - /** - * Checks if is check warning. - * - * @return the checkWarning - */ - protected boolean isCheckWarning() { - return checkWarning; - } + /** + * Sets the exception. + * + * @param exception + * the exception to set + */ + protected void setException(Throwable exception) { + this.exception = exception; + } - /** - * Sets the check warning. - * - * @param checkWarning the checkWarning to set - */ - protected void setCheckWarning(boolean checkWarning) { - this.checkWarning = checkWarning; - } - /** - * Compares source nodes selection and visual selection - * @param VPE Editor part - */ - protected void checkSourceSelection(JSPMultiPageEditor part) { + /** + * Checks if is check warning. + * + * @return the checkWarning + */ + protected boolean isCheckWarning() { + return checkWarning; + } + + /** + * Sets the check warning. + * + * @param checkWarning + * the checkWarning to set + */ + protected void setCheckWarning(boolean checkWarning) { + this.checkWarning = checkWarning; + } + + /** + * Compares source nodes selection and visual selection + * + * @param VPE + * Editor part + */ + protected void checkSourceSelection(JSPMultiPageEditor part) { // get controller VpeController controller = TestUtil.getVpeController(part); assertNotNull(controller); @@ -334,44 +356,45 @@ TestUtil.delay(50); assertNotNull(xulRunnerEditor.getLastSelectedNode()); - + nsIDOMNode sample; if (nodeMapping.getSourceNode().getNodeType() == Node.TEXT_NODE && ((VpeElementMapping) nodeMapping).getElementData() != null) { - sample = ((VpeElementMapping) nodeMapping).getElementData().getNodesData().get(0).getVisualNode(); - } - else { + sample = ((VpeElementMapping) nodeMapping).getElementData() + .getNodesData().get(0).getVisualNode(); + } else { sample = nodeMapping.getVisualNode(); } - - assertEquals(sample, xulRunnerEditor - .getLastSelectedNode()); + + assertEquals(sample, xulRunnerEditor.getLastSelectedNode()); } } - } + } /** * Opens specified file in the VPE editor. * - * @param projectName the name of the project - * @param fileName the name of the file + * @param projectName + * the name of the project + * @param fileName + * the name of the file * * @return VpeController - * @throws CoreException - * @throws IOException + * @throws CoreException + * @throws IOException */ protected VpeController openInVpe(String projectName, String fileName) throws CoreException, IOException { // get test page path - final IFile file = - (IFile) TestUtil.getComponentPath(fileName, projectName); - assertNotNull("Could not open specified file." //$NON-NLS-1$ - + " componentPage = " + fileName //$NON-NLS-1$ - + ";projectName = " + projectName, file); //$NON-NLS-1$ + final IFile file = (IFile) TestUtil.getComponentPath(fileName, + projectName); + assertNotNull("Could not open specified file." //$NON-NLS-1$ + + " componentPage = " + fileName //$NON-NLS-1$ + + ";projectName = " + projectName, file); //$NON-NLS-1$ final IEditorInput input = new FileEditorInput(file); - assertNotNull("Editor input is null", input); //$NON-NLS-1$ + assertNotNull("Editor input is null", input); //$NON-NLS-1$ // open and get the editor final JSPMultiPageEditor part = openEditor(input); @@ -379,7 +402,7 @@ final VpeController vpeController = TestUtil.getVpeController(part); return vpeController; } - + /** * find source element by "id" * @@ -392,7 +415,7 @@ return getSourceDocument(controller).getElementById(elementId); } - + /** * find visual element by "id" entered in source part of vpe *

14 years, 8 months

1
0
0 / 0

JBoss Tools SVN: r21850 - in trunk/jsf/plugins/org.jboss.tools.jsf: src/org/jboss/tools/jsf/web/validation/jsf2 and 3 other directories.

by jbosstools-commits＠lists.jboss.org

Author: yzhishko Date: 2010-05-03 04:37:11 -0400 (Mon, 03 May 2010) New Revision: 21850 Modified: trunk/jsf/plugins/org.jboss.tools.jsf/META-INF/MANIFEST.MF trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/jsf2/JSF2SourceValidator.java trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/jsf2/JSF2XMLValidator.java trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/jsf2/action/CreateJSF2ResourcesFolder.java trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/jsf2/action/JSF2ComponentResolutionGenerator.java trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/jsf2/components/JSF2AttrTempComponent.java trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/jsf2/components/JSF2ComponentFactory.java trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/jsf2/components/JSF2CompositeTempComponent.java trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/jsf2/util/JSF2ComponentModelManager.java trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/jsf2/util/JSF2ComponentRecognizer.java trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/jsf2/util/JSF2ComponentUtil.java trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/jsf2/util/JSF2ResourceUtil.java Log: https://jira.jboss.org/jira/browse/JBIDE-5930 main functionality was added only tests and demos remain. Modified: trunk/jsf/plugins/org.jboss.tools.jsf/META-INF/MANIFEST.MF =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf/META-INF/MANIFEST.MF 2010-05-03 07:42:31 UTC (rev 21849) +++ trunk/jsf/plugins/org.jboss.tools.jsf/META-INF/MANIFEST.MF 2010-05-03 08:37:11 UTC (rev 21850) @@ -45,7 +45,8 @@ org.eclipse.wst.validation, org.eclipse.jdt.core.manipulation, org.eclipse.jst.j2ee, - org.eclipse.ui.ide + org.eclipse.ui.ide, + org.eclipse.wst.html.core;bundle-version="1.1.300" Bundle-Version: 3.1.0.qualifier Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: J2SE-1.5 Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/jsf2/JSF2SourceValidator.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/jsf2/JSF2SourceValidator.java 2010-05-03 07:42:31 UTC (rev 21849) +++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/jsf2/JSF2SourceValidator.java 2010-05-03 08:37:11 UTC (rev 21850) @@ -17,9 +17,6 @@ import org.eclipse.core.resources.IResource; import org.eclipse.jface.text.IDocument; import org.eclipse.jface.text.IRegion; -import org.eclipse.wst.sse.core.StructuredModelManager; -import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel; -import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument; import org.eclipse.wst.sse.ui.internal.reconcile.validator.ISourceValidator; import org.eclipse.wst.sse.ui.internal.reconcile.validator.IncrementalHelper; import org.eclipse.wst.validation.internal.core.Message; @@ -30,8 +27,8 @@ import org.eclipse.wst.validation.internal.provisional.core.IValidator; import org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocument; import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement; -import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel; import org.jboss.tools.jsf.web.validation.jsf2.components.IJSF2ValidationComponent; +import org.jboss.tools.jsf.web.validation.jsf2.util.JSF2ComponentModelManager; import org.w3c.dom.Element; import org.w3c.dom.Node; import org.w3c.dom.NodeList; @@ -76,19 +73,8 @@ } public void connect(IDocument document) { - if (document instanceof IStructuredDocument) { - IStructuredModel model = StructuredModelManager.getModelManager() - .getExistingModelForRead(document); - try { - if (model instanceof IDOMModel) { - this.document = ((IDOMModel) model).getDocument(); - } - } finally { - if(model!=null) { - model.releaseFromRead(); - } - } - } + this.document = JSF2ComponentModelManager + .getReadableDOMDocument(document); } public void disconnect(IDocument document) { @@ -208,4 +194,4 @@ return element.getStartOffset() == offSet; } -} +} \ No newline at end of file Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/jsf2/JSF2XMLValidator.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/jsf2/JSF2XMLValidator.java 2010-05-03 07:42:31 UTC (rev 21849) +++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/jsf2/JSF2XMLValidator.java 2010-05-03 08:37:11 UTC (rev 21850) @@ -25,6 +25,7 @@ import org.jboss.tools.common.el.core.resolver.ELContext; import org.jboss.tools.jsf.JSFModelPlugin; import org.jboss.tools.jsf.web.validation.jsf2.components.IJSF2ValidationComponent; +import org.jboss.tools.jsf.web.validation.jsf2.util.JSF2ComponentModelManager; import org.jboss.tools.jsf.web.validation.jsf2.util.JSF2ComponentRecognizer; import org.jboss.tools.jsf.web.validation.jsf2.util.JSF2ComponentUtil; import org.jboss.tools.jst.web.kb.IPageContext; @@ -75,8 +76,8 @@ } private void validateAsDOM(IFile file) { - IDOMDocument document = JSF2ComponentUtil - .getReadableDocumentForFile(file); + IDOMDocument document = JSF2ComponentModelManager + .getReadableDOMDocument(file); IJSF2ValidationComponent[] components = getValidationComponents( document, file); if (components != null) { @@ -98,7 +99,6 @@ IFile file) { List<IJSF2ValidationComponent> components = new ArrayList<IJSF2ValidationComponent>( 0); - Set<String> tagNameSet = new HashSet<String>(0); Map<String, List<Element>> compositeComponentsMap = JSF2ComponentUtil .findCompositeComponents(node); Set<Entry<String, List<Element>>> entries = compositeComponentsMap @@ -106,14 +106,11 @@ for (Entry<String, List<Element>> entry : entries) { List<Element> elements = entry.getValue(); for (Element element : elements) { - if (!(tagNameSet.contains(element.getNodeName()))) { - tagNameSet.add(element.getNodeName()); - IJSF2ValidationComponent[] validationComponents = JSF2ComponentRecognizer - .recognizeCompositeValidationComponents(file, - (IDOMElement) element); - for (int i = 0; i < validationComponents.length; i++) { - components.add(validationComponents[i]); - } + IJSF2ValidationComponent[] validationComponents = JSF2ComponentRecognizer + .recognizeCompositeValidationComponents(file, + (IDOMElement) element); + for (int i = 0; i < validationComponents.length; i++) { + components.add(validationComponents[i]); } } } Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/jsf2/action/CreateJSF2ResourcesFolder.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/jsf2/action/CreateJSF2ResourcesFolder.java 2010-05-03 07:42:31 UTC (rev 21849) +++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/jsf2/action/CreateJSF2ResourcesFolder.java 2010-05-03 08:37:11 UTC (rev 21850) @@ -31,7 +31,7 @@ /** * * @author yzhishko - * + * */ public class CreateJSF2ResourcesFolder implements IMarkerResolution { Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/jsf2/action/JSF2ComponentResolutionGenerator.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/jsf2/action/JSF2ComponentResolutionGenerator.java 2010-05-03 07:42:31 UTC (rev 21849) +++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/jsf2/action/JSF2ComponentResolutionGenerator.java 2010-05-03 08:37:11 UTC (rev 21850) @@ -53,7 +53,7 @@ } catch (CoreException e) { JSFModelPlugin.getPluginLog().logError(e); } - return new CreateJSF2CompositeComponent[] { new CreateJSF2CompositeComponent() }; + return new IMarkerResolution[0]; } } Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/jsf2/components/JSF2AttrTempComponent.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/jsf2/components/JSF2AttrTempComponent.java 2010-05-03 07:42:31 UTC (rev 21849) +++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/jsf2/components/JSF2AttrTempComponent.java 2010-05-03 08:37:11 UTC (rev 21850) @@ -68,10 +68,7 @@ } void createValidationMessage() { - String nodeName = parentEl.getNodeName(); - if (nodeName.indexOf(':') > -1) { - nodeName = nodeName.substring(nodeName.lastIndexOf(':') + 1); - } + String nodeName = parentEl.getLocalName(); this.validationMessage = MessageFormat.format( JSFUIMessages.Missing_JSF_2_Component_Attr, attr.getName(), nodeName); @@ -106,10 +103,7 @@ String uriString = parentEl.getNamespaceURI(); String relativeLocation = uriString.replaceFirst( JSF2ResourceUtil.JSF2_URI_PREFIX, ""); //$NON-NLS-1$ - String nodeName = parentEl.getNodeName(); - if (nodeName.indexOf(':') > -1) { - nodeName = nodeName.substring(nodeName.lastIndexOf(':') + 1); - } + String nodeName = parentEl.getLocalName(); componentResLocation = relativeLocation + "/" + nodeName + ".xhtml"; //$NON-NLS-1$ //$NON-NLS-2$ } return componentResLocation; Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/jsf2/components/JSF2ComponentFactory.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/jsf2/components/JSF2ComponentFactory.java 2010-05-03 07:42:31 UTC (rev 21849) +++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/jsf2/components/JSF2ComponentFactory.java 2010-05-03 08:37:11 UTC (rev 21850) @@ -12,15 +12,17 @@ package org.jboss.tools.jsf.web.validation.jsf2.components; import java.util.ArrayList; +import java.util.HashSet; import java.util.List; -import java.util.zip.ZipEntry; +import java.util.Set; + import org.eclipse.core.resources.IFile; +import org.eclipse.jdt.internal.core.JarEntryFile; import org.eclipse.wst.xml.core.internal.document.ElementImpl; import org.eclipse.wst.xml.core.internal.provisional.document.IDOMAttr; import org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocument; import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement; import org.jboss.tools.jsf.web.validation.jsf2.util.JSF2ComponentModelManager; -import org.jboss.tools.jsf.web.validation.jsf2.util.JSF2ComponentUtil; import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; import org.w3c.dom.NodeList; @@ -34,6 +36,12 @@ @SuppressWarnings("restriction") public class JSF2ComponentFactory { + private static Set<String> uncheckedAttrs = new HashSet<String>(0); + + static { + uncheckedAttrs.add("id"); //$NON-NLS-1$ + } + public static IJSF2ValidationComponent createCompositeTempComponent( IDOMElement element) { JSF2CompositeTempComponent component = new JSF2CompositeTempComponent( @@ -49,19 +57,45 @@ } public static IJSF2ValidationComponent[] createUnfixableAttrTempComponents( - ZipEntry zipContainer, IDOMElement elementWithAttrs) { - return null; + JarEntryFile container, IDOMElement elementWithAttrs) { + List<IJSF2ValidationComponent> validationComponents = new ArrayList<IJSF2ValidationComponent>( + 0); + IDOMDocument containerDocument = JSF2ComponentModelManager + .getReadableDOMDocument(container); + IDOMElement interfaceElement = JSF2ComponentModelManager.getManager() + .checkCompositeInterface(containerDocument); + Set<String> interfaceAttrs = getInterfaceAttrs(interfaceElement); + interfaceAttrs.addAll(uncheckedAttrs); + IDOMAttr[] existingAttrs = getExistingAttrs(elementWithAttrs); + for (int i = 0; i < existingAttrs.length; i++) { + if (!interfaceAttrs.contains(existingAttrs[i].getName())) { + IDOMAttr attr = existingAttrs[i]; + JSF2AttrTempComponent component = new JSF2AttrTempComponent( + attr, (ElementImpl) elementWithAttrs); + component + .setType(IJSF2ValidationComponent.JSF2_UNFIXABLE_ATTR_TYPE); + component.setStartOffSet(attr.getStartOffset()); + component.setLine(attr.getStructuredDocument().getLineOfOffset( + component.getStartOffSet()) + 1); + component.setLength(attr.getName().length()); + component.createValidationMessage(); + component.createMessageParams(); + validationComponents.add(component); + } + } + return validationComponents.toArray(new IJSF2ValidationComponent[0]); } public static IJSF2ValidationComponent[] createFixableAttrTempComponents( IFile compContainerFile, IDOMElement elementWithAttrs) { List<IJSF2ValidationComponent> components = new ArrayList<IJSF2ValidationComponent>( 0); - IDOMDocument document = JSF2ComponentUtil - .getReadableDocumentForFile(compContainerFile); + IDOMDocument document = JSF2ComponentModelManager + .getReadableDOMDocument(compContainerFile); IDOMElement interfaceElement = JSF2ComponentModelManager.getManager() .checkCompositeInterface(document); - List<String> interfaceAttrs = getInterfaceAttrs(interfaceElement); + Set<String> interfaceAttrs = getInterfaceAttrs(interfaceElement); + interfaceAttrs.addAll(uncheckedAttrs); IDOMAttr[] existingAttrs = getExistingAttrs(elementWithAttrs); for (int i = 0; i < existingAttrs.length; i++) { if (!interfaceAttrs.contains(existingAttrs[i].getName())) { @@ -97,8 +131,8 @@ return component; } - private static List<String> getInterfaceAttrs(IDOMElement interfaceElement) { - List<String> interfaceAttrs = new ArrayList<String>(0); + private static Set<String> getInterfaceAttrs(IDOMElement interfaceElement) { + Set<String> interfaceAttrs = new HashSet<String>(0); if (interfaceElement != null) { String prefix = interfaceElement.getPrefix(); String nodeName = "attribute"; //$NON-NLS-1$ Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/jsf2/components/JSF2CompositeTempComponent.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/jsf2/components/JSF2CompositeTempComponent.java 2010-05-03 07:42:31 UTC (rev 21849) +++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/jsf2/components/JSF2CompositeTempComponent.java 2010-05-03 08:37:11 UTC (rev 21850) @@ -1,3 +1,14 @@ +/******************************************************************************* + * 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 + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ + package org.jboss.tools.jsf.web.validation.jsf2.components; import java.text.MessageFormat; @@ -10,6 +21,12 @@ import org.jboss.tools.jsf.web.validation.jsf2.util.JSF2ResourceUtil; import org.w3c.dom.NamedNodeMap; +/** + * + * @author yzhishko + * + */ + @SuppressWarnings("restriction") public class JSF2CompositeTempComponent implements IJSF2ValidationComponent { private int length; @@ -50,10 +67,7 @@ } void createValidationMessage() { - String nodeName = element.getNodeName(); - if (nodeName.indexOf(':') > -1) { - nodeName = nodeName.substring(nodeName.lastIndexOf(':') + 1); - } + String nodeName = element.getLocalName(); this.validationMessage = MessageFormat.format( JSFUIMessages.Missing_JSF_2_Composite_Component, nodeName); } @@ -90,10 +104,7 @@ String uriString = element.getNamespaceURI(); String relativeLocation = uriString.replaceFirst( JSF2ResourceUtil.JSF2_URI_PREFIX, ""); //$NON-NLS-1$ - String nodeName = element.getNodeName(); - if (nodeName.indexOf(':') > -1) { - nodeName = nodeName.substring(nodeName.lastIndexOf(':') + 1); - } + String nodeName = element.getLocalName(); componentResLoc = relativeLocation + "/" + nodeName + ".xhtml"; //$NON-NLS-1$ //$NON-NLS-2$ } return componentResLoc; Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/jsf2/util/JSF2ComponentModelManager.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/jsf2/util/JSF2ComponentModelManager.java 2010-05-03 07:42:31 UTC (rev 21849) +++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/jsf2/util/JSF2ComponentModelManager.java 2010-05-03 08:37:11 UTC (rev 21850) @@ -13,14 +13,21 @@ import java.io.ByteArrayInputStream; import java.io.IOException; - +import java.io.InputStream; +import java.util.Scanner; import org.eclipse.core.resources.IFile; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.NullProgressMonitor; +import org.eclipse.jdt.internal.core.JarEntryFile; +import org.eclipse.jface.text.IDocument; +import org.eclipse.wst.html.core.internal.encoding.HTMLModelLoader; import org.eclipse.wst.sse.core.StructuredModelManager; import org.eclipse.wst.sse.core.internal.provisional.IModelManager; import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel; +import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument; +import org.eclipse.wst.sse.core.internal.text.JobSafeStructuredDocument; import org.eclipse.wst.xml.core.internal.document.ElementImpl; +import org.eclipse.wst.xml.core.internal.parser.XMLSourceParser; import org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocument; import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement; import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel; @@ -65,15 +72,9 @@ model.reload(componentFileContatiner.getContents()); document = domModel.getDocument(); updateJSF2CompositeComponent(document, attrNames); - try { - componentFileContatiner.setContents( - new ByteArrayInputStream(document - .getStructuredDocument().getText() - .getBytes()), true, false, - new NullProgressMonitor()); - } catch (CoreException e) { - JSFModelPlugin.getPluginLog().logError(e); - } + componentFileContatiner.setContents(new ByteArrayInputStream( + document.getStructuredDocument().getText().getBytes()), + true, false, new NullProgressMonitor()); } } catch (CoreException e) { JSFModelPlugin.getPluginLog().logError(e); @@ -105,10 +106,8 @@ ElementImpl impl = (ElementImpl) node; String nameSpace = impl.getNamespaceURI(); if (JSF2ResourceUtil.JSF2_URI_PREFIX.equals(nameSpace)) { - String nodeName = impl.getNodeName(); - String compName = nodeName.substring( - nodeName.lastIndexOf(':') + 1).trim(); - if ("interface".equals(compName)) { //$NON-NLS-1$ + String nodeName = impl.getLocalName(); + if ("interface".equals(nodeName)) { //$NON-NLS-1$ interfaceElement[0] = impl; return; } @@ -149,8 +148,7 @@ } public IFile revalidateCompositeComponentFile(IFile file) { - IDOMDocument document = JSF2ComponentUtil - .getReadableDocumentForFile(file); + IDOMDocument document = getReadableDOMDocument(file); if (document == null) { return null; } @@ -176,27 +174,86 @@ if (!"http://www.w3.org/1999/xhtml".equals(elementImpl.getNamespaceURI())) { //$NON-NLS-1$ return null; } - NodeList children = element.getChildNodes(); - if (children == null) { - return null; + IDOMElement[] interfaceElement = new IDOMElement[1]; + findInterfaceComponent(document, interfaceElement); + return interfaceElement[0]; + } + + public static IDOMDocument getReadableDOMDocument(IFile file) { + IDOMDocument document = null; + IModelManager manager = StructuredModelManager.getModelManager(); + if (manager == null) { + return document; } - for (int i = 0; i < children.getLength(); i++) { - if (children.item(i) instanceof Element) { - Element el = (Element) children.item(i); - String nodeName = el.getNodeName(); - if (nodeName.indexOf(':') > -1) { - nodeName = nodeName - .substring(nodeName.lastIndexOf(":") + 1); //$NON-NLS-1$ + IStructuredModel model = null; + try { + model = manager.getModelForRead(file); + if (model instanceof IDOMModel) { + IDOMModel domModel = (IDOMModel) model; + document = domModel.getDocument(); + } + } catch (CoreException e) { + JSFModelPlugin.getPluginLog().logError(e); + } catch (IOException e) { + JSFModelPlugin.getPluginLog().logError(e); + } finally { + if (model != null) { + model.releaseFromRead(); + } + } + return document; + } + + public static IDOMDocument getReadableDOMDocument(JarEntryFile file) { + IDOMDocument document = null; + IStructuredModel model = null; + InputStream inputStream; + try { + inputStream = file.getContents(); + if (inputStream != null) { + StringBuffer buffer = new StringBuffer(""); //$NON-NLS-1$ + Scanner in = new Scanner(inputStream); + while (in.hasNextLine()) { + buffer.append(in.nextLine()); } - if ("interface".equals(nodeName)) { //$NON-NLS-1$ - if (JSF2ResourceUtil.JSF2_URI_PREFIX - .equals(((ElementImpl) el).getNamespaceURI())) { - return (IDOMElement) el; - } + model = new HTMLModelLoader().newModel(); + model.setStructuredDocument(new JobSafeStructuredDocument( + new XMLSourceParser())); + model.getStructuredDocument().set(buffer.toString()); + if (model instanceof IDOMModel) { + document = ((IDOMModel) model).getDocument(); } } + } catch (CoreException e) { + JSFModelPlugin.getPluginLog().logError(e); + } finally { + model = null; } - return null; + return document; } + public static IDOMDocument getReadableDOMDocument(IDocument textDocument) { + IDOMDocument document = null; + if (!(textDocument instanceof IStructuredDocument)) { + return document; + } + IModelManager manager = StructuredModelManager.getModelManager(); + if (manager == null) { + return document; + } + IStructuredModel model = null; + try { + model = manager.getModelForRead((IStructuredDocument) textDocument); + if (model instanceof IDOMModel) { + IDOMModel domModel = (IDOMModel) model; + document = domModel.getDocument(); + } + } finally { + if (model != null) { + model.releaseFromRead(); + } + } + return document; + } + } Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/jsf2/util/JSF2ComponentRecognizer.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/jsf2/util/JSF2ComponentRecognizer.java 2010-05-03 07:42:31 UTC (rev 21849) +++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/jsf2/util/JSF2ComponentRecognizer.java 2010-05-03 08:37:11 UTC (rev 21850) @@ -12,9 +12,9 @@ import java.util.ArrayList; import java.util.List; -import java.util.zip.ZipEntry; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IProject; +import org.eclipse.jdt.internal.core.JarEntryFile; import org.eclipse.wst.xml.core.internal.provisional.document.IDOMAttr; import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement; import org.jboss.tools.jsf.web.validation.jsf2.components.IJSF2ValidationComponent; @@ -45,10 +45,10 @@ for (int i = 0; i < components.length; i++) { validationComponents.add(components[i]); } - } else if (container instanceof ZipEntry) { + } else if (container instanceof JarEntryFile) { IJSF2ValidationComponent[] components = JSF2ComponentFactory - .createUnfixableAttrTempComponents((ZipEntry) container, - element); + .createUnfixableAttrTempComponents( + (JarEntryFile) container, element); for (int i = 0; i < components.length; i++) { validationComponents.add(components[i]); } Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/jsf2/util/JSF2ComponentUtil.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/jsf2/util/JSF2ComponentUtil.java 2010-05-03 07:42:31 UTC (rev 21849) +++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/jsf2/util/JSF2ComponentUtil.java 2010-05-03 08:37:11 UTC (rev 21850) @@ -11,23 +11,14 @@ package org.jboss.tools.jsf.web.validation.jsf2.util; -import java.io.IOException; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; - -import org.eclipse.core.resources.IFile; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.wst.sse.core.StructuredModelManager; -import org.eclipse.wst.sse.core.internal.provisional.IModelManager; -import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel; import org.eclipse.wst.xml.core.internal.document.ElementImpl; import org.eclipse.wst.xml.core.internal.provisional.document.IDOMAttr; import org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocument; -import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel; import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode; -import org.jboss.tools.jsf.JSFModelPlugin; import org.w3c.dom.Element; import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; @@ -77,31 +68,6 @@ } } - public static IDOMDocument getReadableDocumentForFile(IFile file) { - IDOMDocument document = null; - IModelManager manager = StructuredModelManager.getModelManager(); - if (manager == null) { - return document; - } - IStructuredModel model = null; - try { - model = manager.getModelForRead(file); - if (model instanceof IDOMModel) { - IDOMModel domModel = (IDOMModel) model; - document = domModel.getDocument(); - } - } catch (CoreException e) { - JSFModelPlugin.getPluginLog().logError(e); - } catch (IOException e) { - JSFModelPlugin.getPluginLog().logError(e); - } finally { - if (model != null) { - model.releaseFromRead(); - } - } - return document; - } - public static IDOMAttr[] findURIContainers(Node scanNode) { List<IDOMAttr> attrs = new ArrayList<IDOMAttr>(0); findChildURIContainers(scanNode, attrs); Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/jsf2/util/JSF2ResourceUtil.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/jsf2/util/JSF2ResourceUtil.java 2010-05-03 07:42:31 UTC (rev 21849) +++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/jsf2/util/JSF2ResourceUtil.java 2010-05-03 08:37:11 UTC (rev 21850) @@ -25,6 +25,9 @@ import org.eclipse.jdt.core.IPackageFragmentRoot; import org.eclipse.jdt.core.JavaCore; import org.eclipse.jdt.core.JavaModelException; +import org.eclipse.jdt.internal.core.JarEntryDirectory; +import org.eclipse.jdt.internal.core.JarEntryFile; +import org.eclipse.jdt.internal.core.JarEntryResource; import org.eclipse.jdt.internal.core.JarPackageFragmentRoot; import org.eclipse.wst.common.componentcore.ComponentCore; import org.eclipse.wst.common.componentcore.resources.IVirtualComponent; @@ -46,6 +49,10 @@ public static final String COMPONENT_RESOURCE_PATH_KEY = "component_resource_path_key"; //$NON-NLS-1$ + public static final int JAR_FILE_RESOURCE_TYPE = 1; + + public static final int JAR_DIRECTORY_RESOURCE_TYPE = JAR_FILE_RESOURCE_TYPE << 1; + public static Object findCompositeComponentContainer(IProject project, IDOMElement jsf2Element) { ElementImpl elementImpl = (ElementImpl) jsf2Element; @@ -53,10 +60,7 @@ if (nameSpaceURI == null || nameSpaceURI.indexOf(JSF2_URI_PREFIX) == -1) { return null; } - String nodeName = jsf2Element.getNodeName(); - if (nodeName.lastIndexOf(':') != -1) { - nodeName = nodeName.substring(nodeName.lastIndexOf(':') + 1); - } + String nodeName = jsf2Element.getLocalName(); String relativeLocation = "/resources" + nameSpaceURI.replaceFirst( //$NON-NLS-1$ JSF2ResourceUtil.JSF2_URI_PREFIX, ""); //$NON-NLS-1$ IVirtualComponent component = ComponentCore.createComponent(project); @@ -67,16 +71,16 @@ IPath path = folder.getFullPath().append(relativeLocation).append( "/" + nodeName + ".xhtml"); //$NON-NLS-1$ //$NON-NLS-2$ IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(path); - if (file.exists()) { + if (file.isAccessible()) { return file; } } return searchInClassPath(project, "META-INF" + relativeLocation //$NON-NLS-1$ - + "/" + nodeName + ".xhtml"); //$NON-NLS-1$ //$NON-NLS-2$ + + "/" + nodeName + ".xhtml", JAR_FILE_RESOURCE_TYPE); //$NON-NLS-1$ //$NON-NLS-2$ } - private static ZipEntry searchInClassPath(IProject project, - String classPathResource) { + private static JarEntryResource searchInClassPath(IProject project, + String classPathResource, int jarResourceType) { IJavaProject javaProject = JavaCore.create(project); try { for (IPackageFragmentRoot fragmentRoot : javaProject @@ -86,7 +90,18 @@ ZipEntry zipEntry = jarPackageFragmentRoot.getJar() .getEntry(classPathResource); if (zipEntry != null) { - return zipEntry; + if (jarResourceType == JAR_FILE_RESOURCE_TYPE) { + JarEntryFile fileInJar = new JarEntryFile( + classPathResource); + fileInJar.setParent(jarPackageFragmentRoot); + return fileInJar; + } + if (jarResourceType == JAR_DIRECTORY_RESOURCE_TYPE) { + JarEntryDirectory directoryInJar = new JarEntryDirectory( + classPathResource); + directoryInJar.setParent(jarPackageFragmentRoot); + return directoryInJar; + } } } } @@ -98,8 +113,8 @@ return null; } - public static IPath findResourcesFolderByNameSpace(IProject project, - String nameSpaceURI) { + public static Object findResourcesFolderContainerByNameSpace( + IProject project, String nameSpaceURI) { if (nameSpaceURI == null || nameSpaceURI.indexOf(JSF2_URI_PREFIX) == -1) { return null; } @@ -113,16 +128,17 @@ IPath path = folder.getFullPath().append(relativeLocation); IFolder resFolder = ResourcesPlugin.getWorkspace().getRoot() .getFolder(path); - if (resFolder.exists()) { - return resFolder.getFullPath(); + if (resFolder.isAccessible()) { + return resFolder; } } - return null; + return searchInClassPath(project, + "META-INF" + relativeLocation, JAR_DIRECTORY_RESOURCE_TYPE); //$NON-NLS-1$ } public static boolean isResourcesFolderExists(IProject project, String nameSpaceURI) { - return findResourcesFolderByNameSpace(project, nameSpaceURI) == null ? false + return findResourcesFolderContainerByNameSpace(project, nameSpaceURI) == null ? false : true; }

14 years, 8 months

1
0
0 / 0

JBoss Tools SVN: r21849 - in trunk: drools/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/tools/drools/ui/bot/test and 2 other directories.

by jbosstools-commits＠lists.jboss.org

Author: vpakan(a)redhat.com Date: 2010-05-03 03:42:31 -0400 (Mon, 03 May 2010) New Revision: 21849 Added: trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/tools/drools/ui/bot/test/smoke/DecisionTableTest.java trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/tools/drools/ui/bot/test/smoke/RuleFlowTest.java Modified: trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/META-INF/MANIFEST.MF trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/tools/drools/ui/bot/test/DroolsAllBotTests.java trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTUtilExt.java Log: Added DecisionTableTest and RuleFlowTest to SWTBot Drools Test Suite. Modified: trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/META-INF/MANIFEST.MF =================================================================== --- trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/META-INF/MANIFEST.MF 2010-05-01 15:16:44 UTC (rev 21848) +++ trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/META-INF/MANIFEST.MF 2010-05-03 07:42:31 UTC (rev 21849) @@ -12,7 +12,8 @@ org.eclipse.swtbot.swt.finder;bundle-version="2.0.0", org.junit4;bundle-version="4.5.0", org.jboss.tools.ui.bot.ext;bundle-version="1.0.0", - org.drools.eclipse;bundle-version="5.1.0" + org.drools.eclipse;bundle-version="5.1.0", + org.eclipse.swtbot.eclipse.gef.finder;bundle-version="0.1.0" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: J2SE-1.5 Bundle-Vendor: JBoss by Red Hat Modified: trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/tools/drools/ui/bot/test/DroolsAllBotTests.java =================================================================== --- trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/tools/drools/ui/bot/test/DroolsAllBotTests.java 2010-05-01 15:16:44 UTC (rev 21848) +++ trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/tools/drools/ui/bot/test/DroolsAllBotTests.java 2010-05-03 07:42:31 UTC (rev 21849) @@ -14,12 +14,14 @@ import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotView; import org.eclipse.swtbot.swt.finder.exceptions.WidgetNotFoundException; +import org.jboss.tools.drools.ui.bot.test.smoke.DecisionTableTest; import org.jboss.tools.drools.ui.bot.test.smoke.DomainSpecificLanguageEditorTest; import org.jboss.tools.drools.ui.bot.test.smoke.GuidedDroolsRulesEditorTest; import org.jboss.tools.drools.ui.bot.test.smoke.ManageDroolsRuntime; import org.jboss.tools.drools.ui.bot.test.smoke.ManageDroolsProject; import org.jboss.tools.drools.ui.bot.test.smoke.ManageDroolsRules; import org.jboss.tools.drools.ui.bot.test.smoke.DroolsRulesEditorTest; +import org.jboss.tools.drools.ui.bot.test.smoke.RuleFlowTest; import org.jboss.tools.ui.bot.ext.SWTTestExt; import org.jboss.tools.ui.bot.ext.SWTUtilExt; import org.jboss.tools.ui.bot.ext.types.IDELabel; @@ -43,7 +45,9 @@ ManageDroolsRules.class, DroolsRulesEditorTest.class, GuidedDroolsRulesEditorTest.class, - DomainSpecificLanguageEditorTest.class}) + DomainSpecificLanguageEditorTest.class, + RuleFlowTest.class, + DecisionTableTest.class}) public class DroolsAllBotTests extends SWTTestExt { public static final String DROOLS_PROJECT_NAME = "droolsTest"; public static final String DROOLS_RUNTIME_NAME = "Drools Test Runtime"; @@ -57,6 +61,9 @@ public static final String SAMPLE_DROOLS_RULE_NAME = "Sample.drl"; public static final String GUIDED_DROOLS_RULE_NAME = "GuidedRule.brl"; public static final String DOMAIN_SPECIFIC_LANGUAGE_FILE_NAME = "DslTest.dsl"; + public static final String RULE_FLOW_JAVA_TEST_FILE_NAME = "ProcessTest.java"; + public static final String RULE_FLOW_RF_FILE_NAME = "ruleflow.rf"; + public static final String DECISION_TABLE_JAVA_TEST_FILE_NAME = "DecisionTableTest.java"; private static String testDroolsRuntimeName = null; public static String getTestDroolsRuntimeName() { return testDroolsRuntimeName; Added: trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/tools/drools/ui/bot/test/smoke/DecisionTableTest.java =================================================================== --- trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/tools/drools/ui/bot/test/smoke/DecisionTableTest.java (rev 0) +++ trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/tools/drools/ui/bot/test/smoke/DecisionTableTest.java 2010-05-03 07:42:31 UTC (rev 21849) @@ -0,0 +1,53 @@ + /******************************************************************************* + * 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.drools.ui.bot.test.smoke; + +import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem; +import org.jboss.tools.drools.ui.bot.test.DroolsAllBotTests; +import org.jboss.tools.ui.bot.ext.SWTTestExt; +import org.junit.Test; +/** + * Tests Decision Table + * @author Vladimir Pakan + * + */ +public class DecisionTableTest extends SWTTestExt{ + /** + * Tests Decision Table + */ + @Test + public void testRuleFlow() { + runDecisionTable(DroolsAllBotTests.DECISION_TABLE_JAVA_TEST_FILE_NAME); + } + /** + * Runs newly created Drools project and check result + * @param decisionTableFileName + */ + private void runDecisionTable(String decisionTableFileName){ + console.clearConsole(); + bot.sleep(5000L); + + SWTBotTreeItem tiTestFile = packageExplorer.selectTreeItem(decisionTableFileName, + new String[] {DroolsAllBotTests.DROOLS_PROJECT_NAME, + DroolsAllBotTests.SRC_MAIN_JAVA_TREE_NODE, + DroolsAllBotTests.COM_SAMPLE_TREE_NODE}); + + eclipse.runTreeItemAsJavaApplication(tiTestFile); + + String consoleText = console.getConsoleText(3*1000L,60*1000L,true); + + assertTrue(decisionTableFileName + " didn't run properly.\n" + + "Console Text was: " + consoleText + "\n" + + "Expected console text is: Hello World\nGoodbye cruel world\n", + "Hello World\nGoodbye cruel world\n".equals(consoleText)); + } +} \ No newline at end of file Property changes on: trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/tools/drools/ui/bot/test/smoke/DecisionTableTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/tools/drools/ui/bot/test/smoke/RuleFlowTest.java =================================================================== --- trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/tools/drools/ui/bot/test/smoke/RuleFlowTest.java (rev 0) +++ trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/tools/drools/ui/bot/test/smoke/RuleFlowTest.java 2010-05-03 07:42:31 UTC (rev 21849) @@ -0,0 +1,402 @@ + /******************************************************************************* + * 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.drools.ui.bot.test.smoke; + +import java.io.File; +import java.io.IOException; +import java.util.Iterator; +import java.util.LinkedList; +import java.util.List; + +import javax.xml.parsers.DocumentBuilder; +import javax.xml.parsers.DocumentBuilderFactory; +import javax.xml.parsers.ParserConfigurationException; + +import org.eclipse.swt.SWT; +import org.eclipse.swt.graphics.Rectangle; +import org.eclipse.swt.widgets.Control; +import org.eclipse.swtbot.eclipse.gef.finder.SWTGefBot; +import org.eclipse.swtbot.eclipse.gef.finder.widgets.SWTBotGefEditor; +import org.eclipse.swtbot.swt.finder.finders.UIThreadRunnable; +import org.eclipse.swtbot.swt.finder.results.Result; +import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem; +import org.jboss.tools.drools.ui.bot.test.DroolsAllBotTests; +import org.jboss.tools.ui.bot.ext.SWTEclipseExt; +import org.jboss.tools.ui.bot.ext.SWTTestExt; +import org.jboss.tools.ui.bot.ext.SWTUtilExt; +import org.jboss.tools.ui.bot.ext.helper.KeyboardHelper; +import org.junit.Test; +import org.w3c.dom.Document; +import org.w3c.dom.Element; +import org.w3c.dom.Node; +import org.w3c.dom.NodeList; +import org.xml.sax.SAXException; +/** + * Tests Rule Flow + * @author Vladimir Pakan + * + */ +public class RuleFlowTest extends SWTTestExt{ + private static final String RULE_FLOW_FILE_DIRECTORY = "src" + File.separator + + "main" + File.separator + + "rules"; + private static final String ROOT_NODE_NAME = "process"; + private static final String HEADER_NODE_NAME = "header"; + private static final String NODES_NODE_NAME = "nodes"; + private static final String CONNECTIONS_NODE_NAME = "connections"; + private static final String CONNECTION_NODE_NAME = "connection"; + private static final int NODES_NODE_CHILDREN_COUNT = 14; + private static final int CONNECTIONS_NODE_CHILDREN_COUNT = 1; + private static final int ROOT_NODE_CHILDREN_COUNT = 3; + /** + * Tests Rule Flow + */ + @Test + public void testRuleFlow() { + runRuleFlowCheck(DroolsAllBotTests.RULE_FLOW_JAVA_TEST_FILE_NAME); + ruleFlowEditorCheck(DroolsAllBotTests.RULE_FLOW_RF_FILE_NAME); + } + /** + * Runs newly created Drools project and check result + * @param droolsProjectName + */ + private void runRuleFlowCheck(String droolsRuleTestFileName){ + console.clearConsole(); + bot.sleep(5000L); + + SWTBotTreeItem tiTestFile = packageExplorer.selectTreeItem(droolsRuleTestFileName, + new String[] {DroolsAllBotTests.DROOLS_PROJECT_NAME, + DroolsAllBotTests.SRC_MAIN_JAVA_TREE_NODE, + DroolsAllBotTests.COM_SAMPLE_TREE_NODE}); + + eclipse.runTreeItemAsJavaApplication(tiTestFile); + + String consoleText = console.getConsoleText(3*1000L,60*1000L,true); + + assertTrue(droolsRuleTestFileName + " didn't run properly.\n" + + "Console Text was: " + consoleText + "\n" + + "Expected console text is: " + "Hello World\n", + "Hello World\n".equals(consoleText)); + } + /** + * Add all possible object to RF diagram and then remove them + * @param ruleFlowRfFileName + */ + private void ruleFlowEditorCheck (String ruleFlowFileName){ + packageExplorer.show(); + packageExplorer.openFile(DroolsAllBotTests.DROOLS_PROJECT_NAME , + DroolsAllBotTests.SRC_MAIN_RULES_TREE_NODE, + DroolsAllBotTests.RULE_FLOW_RF_FILE_NAME); + // Test if Rule Flow RF File is opened in editor + assertTrue("Rule Flow RF File is not opened properly. File " + ruleFlowFileName + " is not opened in editor", + SWTEclipseExt.existEditorWithLabel(bot,ruleFlowFileName)); + + SWTGefBot gefBot = new SWTGefBot(); + SWTBotGefEditor gefEditor = gefBot.gefEditor(ruleFlowFileName); + final Control editorControl = (Control)gefEditor.getWidget(); + Rectangle editorBounds = UIThreadRunnable.syncExec(new Result<Rectangle>() { + public Rectangle run() { + return editorControl.getBounds(); + } + }); + // Clear Editor + gefEditor.activateTool("Marquee"); + gefEditor.mouseDrag(0,0,editorBounds.width - editorBounds.x, editorBounds.height - editorBounds.y); + KeyboardHelper.pressKeyCode(bot.getDisplay(),(int)SWT.DEL); + // Draw each component + String[] tools = new String[]{"Start Event","End Event","Rule Task", + "Gateway [diverge]","Gateway [converge]","Reusable Sub-Process", + "Script Task","Timer Event","Error Event","Message Event","User Task", + "Embedded Sub-Process","Log","Email"}; + int xspacing = 100; + int xoffset = 10; + int yspacing = 100; + int yoffset = 10; + for (int toolIndex = 0;toolIndex < tools.length;toolIndex++){ + gefEditor.activateTool(tools[toolIndex]); + gefEditor.mouseMoveLeftClick(xspacing * (toolIndex % 3) + xoffset, + yspacing * (toolIndex / 3) + yoffset); + } + // Add Sequence Flow between Start and End Node + gefEditor.activateTool("Sequence Flow"); + // Click on Start Node + gefEditor.mouseMoveLeftClick(xoffset + 5, yoffset + 5); + // Click on End Node + gefEditor.mouseMoveLeftClick(xspacing + xoffset + 5, yoffset + 5); + gefEditor.save(); + checkFullRFFile(DroolsAllBotTests.DROOLS_PROJECT_NAME , ruleFlowFileName); + // Delete each component + gefEditor.activateTool("Select"); + for (int toolIndex = 0;toolIndex < tools.length;toolIndex++){ + gefEditor.mouseMoveLeftClick(xspacing * (toolIndex % 3) + xoffset + 5, + yspacing * (toolIndex / 3) + yoffset + 5); + KeyboardHelper.pressKeyCode(bot.getDisplay(),(int)SWT.DEL); + } + gefEditor.save(); + checkEmptyRFFile(DroolsAllBotTests.DROOLS_PROJECT_NAME , ruleFlowFileName); + } + /** + * Check content of Rule Flow file containing all possible objects + * + * @param projectName + * @param ruleFlowFileName + */ + private void checkFullRFFile(String projectName, String ruleFlowFileName) { + + Document doc = loadXmlFile(SWTUtilExt.getPathToProject(projectName) + + File.separator + RuleFlowTest.RULE_FLOW_FILE_DIRECTORY + + File.separator + ruleFlowFileName); + + String errorDescription = null; + Element rootNode = doc.getDocumentElement(); + doc.normalizeDocument(); + if (rootNode.getNodeName().equals(ROOT_NODE_NAME)) { + NodeList rootNodeList = rootNode.getChildNodes(); + List<Node> rootNodes = removeTextNodes(rootNodeList); + if (rootNodes.size() == ROOT_NODE_CHILDREN_COUNT) { + Node header = rootNodes.get(0); + errorDescription = checkEmptyFileNode(header, HEADER_NODE_NAME); + if (errorDescription == null) { + Node nodesNode = rootNodes.get(1); + errorDescription = checkNodeName(nodesNode, NODES_NODE_NAME); + if (errorDescription == null) { + errorDescription = checkNodesFileNodes(removeTextNodes(nodesNode + .getChildNodes())); + if (errorDescription == null) { + Node connectionsNode = rootNodes.get(2); + errorDescription = checkNodeName(connectionsNode, + CONNECTIONS_NODE_NAME); + if (errorDescription == null) { + errorDescription = checkConnectionsFileNodes(removeTextNodes(connectionsNode + .getChildNodes())); + } + } + } + } + } else { + errorDescription = "Root node has to have " + ROOT_NODE_CHILDREN_COUNT + + " child nodes but it has " + rootNodeList.getLength(); + } + } else { + errorDescription = "Root node has to have name '" + ROOT_NODE_NAME + + "' but it has name '" + rootNode.getNodeName() + "'"; + } + assertNull(errorDescription,errorDescription); + } + /** + * Check content of empty Rule Flow file + * @param projectName + * @param ruleFlowRfFileName + */ + private void checkEmptyRFFile(String projectName, String ruleFlowFileName){ + + Document doc = loadXmlFile(SWTUtilExt.getPathToProject(projectName) + + File.separator + RuleFlowTest.RULE_FLOW_FILE_DIRECTORY + File.separator + + ruleFlowFileName); + + String errorDescription = null; + + Element rootNode = doc.getDocumentElement(); + doc.normalizeDocument(); + if (rootNode.getNodeName().equals(ROOT_NODE_NAME)) { + NodeList rootNodeList = rootNode.getChildNodes(); + List<Node> nodes = removeTextNodes(rootNodeList); + if (nodes.size() == ROOT_NODE_CHILDREN_COUNT) { + Node header = nodes.get(0); + errorDescription = checkEmptyFileNode(header, HEADER_NODE_NAME); + if (errorDescription == null) { + Node nodesNode = nodes.get(1); + errorDescription = checkEmptyFileNode(nodesNode, NODES_NODE_NAME); + if (errorDescription == null) { + Node connnections = nodes.get(2); + errorDescription = checkEmptyFileNode(connnections, CONNECTIONS_NODE_NAME); + } + } + } else { + errorDescription = "Root node has to have " + + ROOT_NODE_CHILDREN_COUNT + + " child nodes but it has " + + rootNodeList.getLength(); + } + } else { + errorDescription = "Root node has to have name '" + ROOT_NODE_NAME + + "' but it has name '" + rootNode.getNodeName() + "'"; + } + assertNull(errorDescription,errorDescription); + + } + /** + * Loads and parse XML file with fileName from file system + * @param fileName - full path to XML file + * @return + */ + private Document loadXmlFile (String fileName){ + File file = new File(fileName); + DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance(); + DocumentBuilder db; + Document doc = null; + try { + db = dbf.newDocumentBuilder(); + doc = db.parse(file); + } catch (ParserConfigurationException pce) { + throw new RuntimeException(pce); + } catch (SAXException saxe) { + throw new RuntimeException(saxe); + } catch (IOException ioe) { + throw new RuntimeException(ioe); + } + return doc; + } + private static List<Node> removeTextNodes(NodeList rootNodeList){ + LinkedList<Node> nodes = new LinkedList<Node>(); + for (int index = 0 ; index < rootNodeList.getLength(); index++){ + Node node = rootNodeList.item(index); + if (!node.getNodeName().equals("#text")){ + nodes.add(node); + } + } + return nodes; + } + /** + * Check if node is correct for empty file + * @param node + * @param expectedNodeName + * @return + */ + private static String checkEmptyFileNode (Node node,String expectedNodeName){ + String errorDescription = null; + if (node.getNodeName().equals(expectedNodeName)){ + if (removeTextNodes(node.getChildNodes()).size() == 0){ + if(node.getTextContent().trim().length() != 0){ + errorDescription = expectedNodeName + " node has to have no text value but it has " + + node.getTextContent(); + } + } + else{ + errorDescription = expectedNodeName + " node has to have no children but is has " + + removeTextNodes(node.getChildNodes()).size(); + + } + } + else{ + errorDescription = checkNodeName(node, expectedNodeName); + } + + return errorDescription; + + } + /** + * Check nodes of Nodes children. + * @param nodes - list of nodes of nodes node stripped from text nodes + * @return + */ + private static String checkNodesFileNodes(List<Node> nodes){ + String errorDescription = null; + + if (nodes.size() == NODES_NODE_CHILDREN_COUNT){ + List<String> mandatoryNodes = getMandatoryNodesOfNodesNode(); + int index = 0; + Iterator<Node> iterator = nodes.iterator(); + while (index < nodes.size() && errorDescription == null){ + String nodeName = iterator.next().getNodeName(); + if (mandatoryNodes.contains(nodeName)){ + mandatoryNodes.remove(nodeName); + } + else{ + errorDescription = "Nodes node cannot contain node " + nodeName; + } + index++; + } + if (errorDescription == null && mandatoryNodes.size() > 0) { + StringBuilder sb = new StringBuilder(""); + for (String nodeName : mandatoryNodes){ + if (sb.length() != 0){ + sb.append(", "); + } + sb.append(nodeName); + } + errorDescription = "Nodes node doesn't contain all necesarry nodes.\n" + + "These node(s) are missing within nodes node: " + + sb.toString(); + } + } + else{ + errorDescription = "Nodes node has to have " + + NODES_NODE_CHILDREN_COUNT + + " child nodes but it has " + + nodes.size(); + } + + return errorDescription; + } + /** + * Returns list of mandatory nodes of nodes node + * @return + */ + private static List<String> getMandatoryNodesOfNodesNode(){ + LinkedList<String> allowedNodes = new LinkedList<String>(); + allowedNodes.add("split"); + allowedNodes.add("timerNode"); + allowedNodes.add("humanTask"); + allowedNodes.add("ruleSet"); + allowedNodes.add("actionNode"); + allowedNodes.add("composite"); + allowedNodes.add("end"); + allowedNodes.add("workItem"); + allowedNodes.add("fault"); + allowedNodes.add("subProcess"); + allowedNodes.add("start"); + allowedNodes.add("workItem"); + allowedNodes.add("eventNode"); + allowedNodes.add("join"); + return allowedNodes; + } + + /** + * Check nodes of connections children. + * @param nodes - list of nodes of connections node stripped from text nodes + * @return + */ + private static String checkConnectionsFileNodes(List<Node> nodes){ + String errorDescription = null; + + if (nodes.size() == CONNECTIONS_NODE_CHILDREN_COUNT){ + Node connectioNode = nodes.get(0); + errorDescription = checkEmptyFileNode(connectioNode, CONNECTION_NODE_NAME); + } + else{ + errorDescription = "Conections node has to have " + + CONNECTIONS_NODE_CHILDREN_COUNT + + " child nodes but it has " + + nodes.size(); + } + + return errorDescription; + } + /** + * Check if node has expected name + * @param node + * @param expectedNodeName + * @return + */ + private static String checkNodeName (Node node, String expectedNodeName){ + String errorDescription = null; + + if (!node.getNodeName().equals(expectedNodeName)){ + errorDescription = "Node has to have name '" + + expectedNodeName + "' but it has name '" + + node.getNodeName() + "'"; + } + + return errorDescription; + } +} \ No newline at end of file Property changes on: trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/tools/drools/ui/bot/test/smoke/RuleFlowTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTUtilExt.java =================================================================== --- trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTUtilExt.java 2010-05-01 15:16:44 UTC (rev 21848) +++ trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTUtilExt.java 2010-05-03 07:42:31 UTC (rev 21849) @@ -23,6 +23,7 @@ import java.util.Properties; import org.apache.log4j.Logger; +import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.FileLocator; import org.eclipse.core.runtime.Platform; import org.eclipse.core.runtime.jobs.Job; @@ -692,5 +693,36 @@ return result; } - + /** + * Returns location of file within plugin + * @param pluginId + * @param fileName + * @return + */ + public static String getPathToFileWithinPlugin(String pluginId, + String fileName) { + + String filePath = null; + try { + filePath = FileLocator.toFileURL( + Platform.getBundle(pluginId).getEntry("/")).getFile() + + fileName; + } catch (IOException e) { + // do nothing filePath is null + e.printStackTrace(); + } + + return filePath; + } + /** + * Returns path to project with projectName + * @param projectName + * @return + */ + public static String getPathToProject(String projectName) { + return ResourcesPlugin.getWorkspace().getRoot().getLocation().toString() + + File.separator + + projectName; + } + } \ No newline at end of file

14 years, 8 months

1
0
0 / 0

JBoss Tools SVN: r21848 - branches/modular_build/build.

by jbosstools-commits＠lists.jboss.org

Author: nickboldt Date: 2010-05-01 11:16:44 -0400 (Sat, 01 May 2010) New Revision: 21848 Modified: branches/modular_build/build/build.xml Log: add site component to lilst of default components Modified: branches/modular_build/build/build.xml =================================================================== --- branches/modular_build/build/build.xml 2010-05-01 15:13:35 UTC (rev 21847) +++ branches/modular_build/build/build.xml 2010-05-01 15:16:44 UTC (rev 21848) @@ -13,7 +13,8 @@ esb,tptp,ws; cdi,struts,hibernatetools,seam; examples,birt; - maven" + maven; +site" />

14 years, 8 months

1
0
0 / 0

JBoss Tools SVN: r21847 - branches/modular_build/build.

by jbosstools-commits＠lists.jboss.org

Author: nickboldt Date: 2010-05-01 11:13:35 -0400 (Sat, 01 May 2010) New Revision: 21847 Modified: branches/modular_build/build/build.xml Log: rename update site zip Modified: branches/modular_build/build/build.xml =================================================================== --- branches/modular_build/build/build.xml 2010-05-01 15:11:28 UTC (rev 21846) +++ branches/modular_build/build/build.xml 2010-05-01 15:13:35 UTC (rev 21847) @@ -565,7 +565,7 @@ <delete file="${WORKINGDIR}/site/target/site.zip"/>  - <zip destfile="${WORKINGDIR}/site/target/JBossTools-Update.zip" basedir="${WORKINGDIR}/site/target/site" update="false"/> + <zip destfile="${WORKINGDIR}/site/target/JBossTools-Update-SNAPSHOT.zip" basedir="${WORKINGDIR}/site/target/site" update="false"/> </target> <!-- TODO: figure out why this fails with error:

14 years, 8 months

1
0
0 / 0

JBoss Tools SVN: r21846 - in branches/modular_build: build and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: nickboldt Date: 2010-05-01 11:11:28 -0400 (Sat, 01 May 2010) New Revision: 21846 Modified: branches/modular_build/build/build.xml branches/modular_build/genpom.xml Log: prelim update site : fix support for genpom for update site; include update site generation at end of build process Modified: branches/modular_build/build/build.xml =================================================================== --- branches/modular_build/build/build.xml 2010-05-01 15:10:04 UTC (rev 21845) +++ branches/modular_build/build/build.xml 2010-05-01 15:11:28 UTC (rev 21846) @@ -59,6 +59,7 @@ </for> </target> +  <target name="run" depends="init, get.bootstrap.scripts, get.sources, get.components.to.build, run.build, collect.all.test.results" /> @@ -342,7 +343,7 @@ <target name="run.build">  - <property name="MAVEN_FLAGS" value="clean install -B -fn -q" /> + <property name="MAVEN_FLAGS" value="install -B -fn -q" /> <for param="COMPONENT" list="${COMPONENTS.to.build}" delimiter=", "> <sequential> @@ -531,11 +532,40 @@ </if> </target> +  + <target name="create.update.site"> + </target> -  -  - <target name="zip.sites"> +  + <target name="create.overall.update.site" depends="init"> + <delete dir="${WORKINGDIR}/site/target/site" includes="artifacts.*, content.*" quiet="true" /> + <delete dir="${WORKINGDIR}/site/target/site/features" includeemptydirs="true" quiet="true" /> + <mkdir dir="${WORKINGDIR}/site/target/site/features" /> + <copy todir="${WORKINGDIR}/site/target/site/features" flatten="true"> + <fileset dir="${WORKINGDIR}" includes="**/target/*feature_*.jar,**/target/*feature*SNAPSHOT.jar" /> + </copy> + + <delete dir="${WORKINGDIR}/site/target/site/plugins" includeemptydirs="true" quiet="true" /> + <mkdir dir="${WORKINGDIR}/site/target/site/plugins" /> + <copy todir="${WORKINGDIR}/site/target/site/plugins" flatten="true"> + <fileset dir="${WORKINGDIR}" + excludes="**/target/*feature_*.jar,**/target/*feature*SNAPSHOT.jar" + includes="**/target/*_*.jar,**/target/*-SNAPSHOT.jar" + /> + </copy> + +  + <antcall target="run.build"> + <param name="COMPONENTS.to.build" value="site" /> + <param name="MAVEN_FLAGS" value="verify -B -fae -Dmaven.test.skip" /> + </antcall> + +  + <delete file="${WORKINGDIR}/site/target/site.zip"/> + +  + <zip destfile="${WORKINGDIR}/site/target/JBossTools-Update.zip" basedir="${WORKINGDIR}/site/target/site" update="false"/> </target>  <available file="@{subdir}/META-INF/MANIFEST.MF" type="file" /> <available file="@{subdir}/feature.xml" type="file" /> - <available file="@{subdir}/site.xml" type="file" /> </or> <then>  <writeModulePom dir="@{subdir}" parentpom="../${pathToParentPom}@{parentpom}" /> </then> + <elseif> + <available file="@{subdir}/site.xml" type="file" /> + <then> +  + <echo level="debug">writeModulePom dir="@{subdir}" parentpom="${pathToParentPom}@{parentpom}"</echo> + <writeModulePom dir="@{subdir}" parentpom="${pathToParentPom}@{parentpom}" /> + </then> + </elseif> <else> <for list="plugins tests features site" param="type" delimiter=" "> <sequential> @@ -753,17 +771,17 @@ <property name="ant.enable.asserts" value="true" />  - <property name="artifactVersion.esb/features/org.jboss.tools.esb.feature" value="1.0.0" /> - <property name="artifactVersion.as/tests/org.jboss.ide.eclipse.as.archives.integration.test" value="1.0.0" /> - <property name="artifactVersion.esb/plugins/org.jboss.tools.esb.core" value="2.0.0" /> + <property name="artifactVersion.esb/features/org.jboss.tools.esb.feature" value="1.3.0-SNAPSHOT" /> + <property name="artifactVersion.as/tests/org.jboss.ide.eclipse.as.archives.integration.test" value="2.1.0-SNAPSHOT" /> + <property name="artifactVersion.esb/plugins/org.jboss.tools.esb.core" value="1.3.0-SNAPSHOT" /> <property name="artifactVersion.bpel/plugins/org.eclipse.bpel.apache.ode.deploy.ui" value="0.5.0-SNAPSHOT" /> <property name="artifactVersion.bpel/features/org.jboss.tools.bpel.sdk.feature" value="1.0.0-SNAPSHOT" /> <property name="artifactVersion.bpel/plugins/org.eclipse.bpel.xpath10" value="0.5.0-SNAPSHOT" /> - <property name="artifactVersion.vpe/plugins/org.jboss.tools.vpe.ui.palette" value="2.1.0" /> - <property name="artifactVersion.tests/features/org.jboss.tools.test.feature" value="2.0.0" /> - <property name="artifactVersion.portlet/features/org.jboss.tools.portlet.test.feature" value="1.0.0" /> - <property name="artifactVersion.jst/features/org.jboss.tools.jst.feature" value="2.0.0" /> - <property name="artifactVersion.jst/features/org.jboss.tools.jst.web.tiles.feature" value="2.0.0" /> + <property name="artifactVersion.vpe/plugins/org.jboss.tools.vpe.ui.palette" value="3.1.0-SNAPSHOT" /> + <property name="artifactVersion.tests/features/org.jboss.tools.test.feature" value="3.1.0-SNAPSHOT" /> + <property name="artifactVersion.portlet/features/org.jboss.tools.portlet.test.feature" value="1.1.0-SNAPSHOT" /> + <property name="artifactVersion.jst/features/org.jboss.tools.jst.feature" value="3.1.0-SNAPSHOT" /> + <property name="artifactVersion.jst/features/org.jboss.tools.jst.web.tiles.feature" value="3.1.0-SNAPSHOT" />  <property name="artifactId.esb/features/org.jboss.tools.esb.feature" value="org.jboss.tools.esb.feature" />

14 years, 8 months

1
0
0 / 0

JBoss Tools SVN: r21845 - in branches/modular_build: site and 1 other directories.

by jbosstools-commits＠lists.jboss.org

Author: nickboldt Date: 2010-05-01 11:10:04 -0400 (Sat, 01 May 2010) New Revision: 21845 Added: branches/modular_build/site/ branches/modular_build/site/index.html branches/modular_build/site/pom.xml branches/modular_build/site/site.xml branches/modular_build/site/site.xml.jbds.template branches/modular_build/site/site.xml.jbosstools.template branches/modular_build/site/web/ branches/modular_build/site/web/site.css Log: prelim update site dir w/ pom.xml Added: branches/modular_build/site/index.html =================================================================== --- branches/modular_build/site/index.html (rev 0) +++ branches/modular_build/site/index.html 2010-05-01 15:10:04 UTC (rev 21845) @@ -0,0 +1,135 @@ +<html> +<head> +<title>JBoss Tools ${update.site.description} Update Site: ${product.versionTag}</title> +<style> +@import url("web/site.css"); +</style> +</head> +<body marginheight="0" marginwidth="0" leftmargin="0" topmargin="0"> +<table marginheight="0" marginwidth="0" leftmargin="0" topmargin="0" + cellspacing="0" cellpadding="0"> + <tr> + <td colspan="2"><img + src="https://www.jboss.org/dms/tools/images/tools-banner.png" /></td> + </tr> + <tr> + <td>  </td> + </tr> + <tr> + <td>  </td> + <td> + <h2 class="title">JBoss Tools ${update.site.description} Update Site</h2> + <table width="100%"> + <tr class="header"> + <td class="sub-header" width="100%"><span>Latest Build: + ${product.versionTag}</span></td> + </tr> + + <tr class="light-row" style="height: 30px"> + <td class="bodyText"> + <p class="bodyText">This is the <b>${update.site.description}</b> + Update Site for JBoss Tools. See <a class="link" + href="http://www.jboss.org/tools/download/update">Installation + Instructions</a>.</p> + </td> + </tr> + + <tr class="dark-row" style="height: 90px"> + <td class="bodyText"> + <p class="bodyText"><b class="bodyText" style="color: red;">NOTE:</b> Some + features (such as BIRT and Maven) require additional third-party + prerequisites not available from Eclipse.org or JBoss.org. These can + be installed from the following update sites, which may already be + listed - but not enabled - in your Eclipse's list of Available + Software Sites:</p> + <ul> + <li><a class="link" href="http://download.eclipse.org/birt/update-site/2.5/">BIRT 2.5 Update Site</a></li> + <li><a href="http://m2eclipse.sonatype.org/sites/m2e/">m2eclipse 0.10 Release</a></li> + </ul> + </td> + </tr> + + <tr class="light-row" style="height: 30px"> + <td class="bodyText"> + <p class="bodyText">You can also download JBoss Tools as + individual zips for offline installation. See <a class="link" + href="http://www.jboss.org/tools/download">JBoss Tools + Downloads</a>.</p> + </td> + </tr> + + <tr class="dark-row" style="height: 30px"> + <td class="bodyText"> + <p class="bodyText">For more information, see <a + href="http://www.jboss.org/tools/download/installation">Installation + methods</a>.</p> + </td> + </tr> + <tr> + <td class="spacer"><br /> + </td> + <td class="spacer"><br /> + </td> + </tr> + </table> + </td> + </tr> + <tr> + <td></td> + <td> + <table width="100%"> + <tr class="header"> + <td class="sub-header" width="100%"><span> Installation + Types</span></td> + </tr> + <tr class="light-row" style="height: 30px"> + <td class="bodyText"> + <p class="bodyText">Depending on how close to the bleeding edge + you like to be, there are several types of releases available.</p> + <br /> + + </td> + </tr> + + <tr class="dark-row" style="height: 30px"> + <td class="bodyText"> + <h4>Stable Releases</h4> + + <p><a href="https://www.jboss.org/tools/download/stable.html">Stable + releases</a> are - as indicated by their name - stable.</p><br/> + + </td> + </tr> + + <tr class="light-row" style="height: 30px"> + <td class="bodyText"> + <h4>Development Milestones</h4> + + <p><a href="https://www.jboss.org/tools/download/dev.html">Development + builds</a>, released once per milestone and only a few times a year, are + fairly stable, but there may be some things which do not yet work. + If you would like to try one of these milestones, we'd greatly + appreciate the assistance in testing and <a + href="https://jira.jboss.org/jira/browse/JBIDE">reporting of + issues in our issue tracker</a>.</p><br/> + + </td> + </tr> + + <tr class="dark-row" style="height: 30px"> + <td class="bodyText"> + <h4>Nightly Builds</h4> + + <p>The <a + href="https://www.jboss.org/tools/download/nightly.html">bleeding + edge</a> contains the latest and greatest new features, but nothing is + stable or guaranteed - yet. If you're using a Milestone and need a + fix, you can update to the latest Nightly, or wait for the next + Milestone.</p><br/> + </td> + </tr> + </table> + </td> + </tr> +</table> +</html> Property changes on: branches/modular_build/site/index.html ___________________________________________________________________ Name: svn:mime-type + text/plain Added: branches/modular_build/site/pom.xml =================================================================== --- branches/modular_build/site/pom.xml (rev 0) +++ branches/modular_build/site/pom.xml 2010-05-01 15:10:04 UTC (rev 21845) @@ -0,0 +1,14 @@ +<project +xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <modelVersion>4.0.0</modelVersion> + <parent> + <relativePath>../site/../parent-pom.xml</relativePath> + <groupId>org.jboss.tools</groupId> + <artifactId>org.jboss.tools.parent.pom</artifactId> + <version>0.0.1-SNAPSHOT</version> + </parent> + <groupId>org.jboss.tools</groupId> + <artifactId>site</artifactId> + <version>0.0.1-SNAPSHOT</version> + <packaging>eclipse-update-site</packaging> +</project> Property changes on: branches/modular_build/site/pom.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Added: branches/modular_build/site/site.xml =================================================================== --- branches/modular_build/site/site.xml (rev 0) +++ branches/modular_build/site/site.xml 2010-05-01 15:10:04 UTC (rev 21845) @@ -0,0 +1,168 @@ +<?xml version="1.0" encoding="UTF-8"?> +<site pack200="true"> + <description> + This is the 0.0.0 Update Site for JBoss Tools. + </description> + <feature url="features/org.jboss.tools.richfaces.feature_0.0.0.jar" id="org.jboss.tools.richfaces.feature" version="0.0.0"> + <category name="AllTools"/> + <category name="WebTools"/> + </feature> + <feature url="features/org.jboss.tools.seam.feature_0.0.0.jar" id="org.jboss.tools.seam.feature" version="0.0.0"> + <category name="AllTools"/> + <category name="WebTools"/> + </feature> + <feature url="features/org.jboss.tools.cdi.feature_0.0.0.jar" id="org.jboss.tools.cdi.feature" version="0.0.0"> + <category name="AllTools"/> + <category name="WebTools"/> + <category name="GeneralTools"/> + </feature> + <feature url="features/org.jboss.tools.jmx.feature_0.0.0.jar" id="org.jboss.tools.jmx.feature" version="0.0.0"> + <category name="AllTools"/> + <category name="GeneralTools"/> + </feature> + <feature url="features/org.jboss.ide.eclipse.as.feature_0.0.0.jar" id="org.jboss.ide.eclipse.as.feature" version="0.0.0"> + <category name="AllTools"/> + <category name="WebTools"/> + </feature> + <feature url="features/org.jboss.ide.eclipse.archives.feature_0.0.0.jar" id="org.jboss.ide.eclipse.archives.feature" version="0.0.0"> + <category name="AllTools"/> + <category name="GeneralTools"/> + </feature> + <feature url="features/org.hibernate.eclipse.feature_0.0.0.jar" id="org.hibernate.eclipse.feature" version="0.0.0"> + <category name="AllTools"/> + <category name="WebTools"/> + <category name="DataTools"/> + <category name="GeneralTools"/> + </feature> + <feature url="features/org.jboss.ide.eclipse.freemarker.feature_0.0.0.jar" id="org.jboss.ide.eclipse.freemarker.feature" version="0.0.0"> + <category name="AllTools"/> + <category name="GeneralTools"/> + </feature> + <feature url="features/org.jboss.tools.struts.feature_0.0.0.jar" id="org.jboss.tools.struts.feature" version="0.0.0"> + <category name="AllTools"/> + <category name="WebTools"/> + </feature> + <feature url="features/org.jboss.tools.esb.feature_0.0.0.jar" id="org.jboss.tools.esb.feature" version="0.0.0"> + <category name="AllTools"/> + <category name="SOATools"/> + </feature> + <feature url="features/org.jboss.tools.ws.feature_0.0.0.jar" id="org.jboss.tools.ws.feature" version="0.0.0"> + <category name="AllTools"/> + <category name="SOATools"/> + </feature> + <feature url="features/org.jboss.tools.birt.feature_0.0.0.jar" id="org.jboss.tools.birt.feature" version="0.0.0"> + <category name="ReportTools"/> + </feature> + <feature url="features/org.jboss.tools.portlet.feature_0.0.0.jar" id="org.jboss.tools.portlet.feature" version="0.0.0"> + <category name="AllTools"/> + <category name="WebTools"/> + </feature> + <feature url="features/org.jboss.tools.tptp.feature_0.0.0.jar" id="org.jboss.tools.tptp.feature" version="0.0.0"> + <category name="TestPerfTools"/> + </feature> + <feature url="features/org.jboss.tools.smooks.feature_0.0.0.jar" id="org.jboss.tools.smooks.feature" version="0.0.0"> + <category name="AllTools"/> + <category name="SOATools"/> + <category name="DataTools"/> + <category name="GeneralTools"/> + </feature> + + <feature url="features/org.jboss.tools.project.examples.feature_0.0.0.jar" id="org.jboss.tools.project.examples.feature" version="0.0.0"> + <category name="AllTools"/> + <category name="GeneralTools"/> + </feature> +  + <feature url="features/org.jboss.tools.community.project.examples.feature_0.0.0.jar" id="org.jboss.tools.community.project.examples.feature" version="0.0.0"> + <category name="AllTools"/> + <category name="GeneralTools"/> + </feature> +  + <feature url="features/org.jboss.tools.maven.feature_0.0.0.jar" id="org.jboss.tools.maven.feature" version="0.0.0"> + <category name="MavenTools"/> + </feature> + <feature url="features/org.jboss.tools.maven.seam.feature_0.0.0.jar" id="org.jboss.tools.maven.seam.feature" version="0.0.0"> + <category name="MavenTools"/> + </feature> + <feature url="features/org.jboss.tools.xulrunner.feature_0.0.0.jar" id="org.jboss.tools.xulrunner.feature" version="0.0.0"> + <category name="AllTools"/> + <category name="WebTools"/> + </feature> + +  +  + +  + <feature url="features/org.jboss.tools.jbpm.convert.feature_0.0.0.jar" id="org.jboss.tools.jbpm.convert.feature" version="0.0.0"> + <category name="AllTools"/> + <category name="SOATools"/> + </feature> + +  + <category-def name="SDKTools" label="JBoss Tools SDK"> + <description>JBoss Tools SDK contains plugins where an SDK package exists. These contain both source and runtimes. Use these if you want to debug and/or provide patches to JBoss Tools plugins. + </description> + </category-def> + + <category-def name="AllTools" label="All JBoss Tools - 0.0.0"> + <description> + Contains ALL the plugins that are available from JBoss Tools except those related to integration with 3rd party plugins. Selecting this category will give you all tools needed for both Web, Seam and SOA Development. + </description> + </category-def> + + <category-def name="SOATools" label="SOA Development"> + <description> + Tools to help create SOA applications. Use these if you work with jBPM, Drools, JBoss ESB, JBoss WebServices or Smooks. + </description> + </category-def> + + <category-def name="WebTools" label="Web and Java EE Development"> + <description> + Tools to help create web and enterprise applications, using JSF, Facelets, Seam, Hibernate/JPA, CSS, Webservices and more. + </description> + </category-def> + + <category-def name="GeneralTools" label="Application Development"> + <description>Tools for general application development.</description> + </category-def> + + <category-def name="DataTools" label="Data Services"> + <description>Tools related to data services such as persistence and transformation.</description> + </category-def> + + <category-def name="MavenTools" label="Maven Support"> + <description>Plugins related to Maven and m2eclipse support. Use these to enable use of Maven.</description> + </category-def> + + <category-def name="ReportTools" label="Business Intelligence, Reporting and Charting"> + <description>Business Intelligence, Reporting and Charting. Use these if you plan to integrate Hibernate or Seam with Eclipse BIRT.</description> + </category-def> + + <category-def name="TestPerfTools" label="Test and Performance"> + <description>Tools used to improve testing and performance.</description> + </category-def> + +</site> Property changes on: branches/modular_build/site/site.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Added: branches/modular_build/site/site.xml.jbds.template =================================================================== --- branches/modular_build/site/site.xml.jbds.template (rev 0) +++ branches/modular_build/site/site.xml.jbds.template 2010-05-01 15:10:04 UTC (rev 21845) @@ -0,0 +1,181 @@ +<?xml version="1.0" encoding="UTF-8"?> +<site pack200="true"> + + <description> + This is the ${update.site.description} Update Site for JBoss Developer Studio. + </description> + +  + <feature url="features/com.jboss.jbds.product.feature_${product.versionTag}.jar" id="com.jboss.jbds.product.feature" version="${product.versionTag}" patch="false"> + <category name="AllTools"/> + </feature> + <feature url="features/org.jboss.tools.runtime.feature_${runtime.versionTag}.jar" id="org.jboss.tools.runtime.feature" version="${runtime.versionTag}" patch="false"> + <category name="AllTools"/> + </feature> + + <feature url="features/org.jboss.tools.richfaces.feature_${richfaces.versionTag}.jar" id="org.jboss.tools.richfaces.feature" version="${richfaces.versionTag}"> + <category name="AllTools"/> + <category name="WebTools"/> + </feature> + <feature url="features/org.jboss.tools.seam.feature_${seam.versionTag}.jar" id="org.jboss.tools.seam.feature" version="${seam.versionTag}"> + <category name="AllTools"/> + <category name="WebTools"/> + </feature> + <feature url="features/org.jboss.tools.cdi.feature_${cdi.versionTag}.jar" id="org.jboss.tools.cdi.feature" version="${cdi.versionTag}"> + <category name="AllTools"/> + <category name="WebTools"/> + <category name="GeneralTools"/> + </feature> + <feature url="features/org.jboss.tools.jmx.feature_${jmx.versionTag}.jar" id="org.jboss.tools.jmx.feature" version="${jmx.versionTag}"> + <category name="AllTools"/> + <category name="GeneralTools"/> + </feature> + <feature url="features/org.jboss.ide.eclipse.as.feature_${as.versionTag}.jar" id="org.jboss.ide.eclipse.as.feature" version="${as.versionTag}"> + <category name="AllTools"/> + <category name="WebTools"/> + </feature> + <feature url="features/org.jboss.ide.eclipse.archives.feature_${archives.versionTag}.jar" id="org.jboss.ide.eclipse.archives.feature" version="${archives.versionTag}"> + <category name="AllTools"/> + <category name="GeneralTools"/> + </feature> + <feature url="features/org.hibernate.eclipse.feature_${hibernate-tools.versionTag}.jar" id="org.hibernate.eclipse.feature" version="${hibernate-tools.versionTag}"> + <category name="AllTools"/> + <category name="WebTools"/> + <category name="DataTools"/> + <category name="GeneralTools"/> + </feature> + <feature url="features/org.jboss.ide.eclipse.freemarker.feature_${freemarker.versionTag}.jar" id="org.jboss.ide.eclipse.freemarker.feature" version="${freemarker.versionTag}"> + <category name="AllTools"/> + <category name="GeneralTools"/> + </feature> + <feature url="features/org.jboss.tools.struts_feature_${struts.versionTag}.jar" id="org.jboss.tools.struts_feature" version="${struts.versionTag}"> + <category name="AllTools"/> + <category name="WebTools"/> + </feature> + <feature url="features/org.jboss.tools.esb.feature_${esb.versionTag}.jar" id="org.jboss.tools.esb.feature" version="${esb.versionTag}"> + <category name="AllTools"/> + <category name="SOATools"/> + </feature> + <feature url="features/org.jboss.tools.ws.feature_${ws.versionTag}.jar" id="org.jboss.tools.ws.feature" version="${ws.versionTag}"> + <category name="AllTools"/> + <category name="SOATools"/> + </feature> +  + <feature url="features/org.jboss.tools.portlet.feature_${portlet.versionTag}.jar" id="org.jboss.tools.portlet.feature" version="${portlet.versionTag}"> + <category name="AllTools"/> + <category name="WebTools"/> + </feature> + <feature url="features/org.jboss.tools.tptp.feature_${tptp.versionTag}.jar" id="org.jboss.tools.tptp.feature" version="${tptp.versionTag}"> + <category name="TestPerfTools"/> + </feature> + <feature url="features/org.jboss.tools.smooks.feature_${smooks.versionTag}.jar" id="org.jboss.tools.smooks.feature" version="${smooks.versionTag}"> + <category name="AllTools"/> + <category name="SOATools"/> + <category name="DataTools"/> + <category name="GeneralTools"/> + </feature> + <feature url="features/org.drools.eclipse.feature_${drools-ide.versionTag}.jar" id="org.drools.eclipse.feature" version="${drools-ide.versionTag}"> + <category name="AllTools"/> + <category name="SOATools"/> + <category name="GeneralTools"/> + </feature> + <feature url="features/org.drools.eclipse.task.feature_${drools-ide.versionTag}.jar" id="org.drools.eclipse.task.feature" version="${drools-ide.versionTag}"> + <category name="AllTools"/> + <category name="SOATools"/> + </feature> + <feature url="features/org.guvnor.tools.feature_${drools-ide.versionTag}.jar" id="org.guvnor.tools.feature" version="${drools-ide.versionTag}"> + <category name="AllTools"/> + <category name="SOATools"/> + </feature> + <feature url="features/org.jboss.tools.project.examples.feature_${examples.versionTag}.jar" id="org.jboss.tools.project.examples.feature" version="${examples.versionTag}"> + <category name="AllTools"/> + <category name="GeneralTools"/> + </feature> +  +  + <feature url="features/org.jboss.tools.xulrunner.feature_${xulrunner.version}_${product.buildQualifier}.jar" id="org.jboss.tools.xulrunner.feature" version="${xulrunner.version}_${product.buildQualifier}"> + <category name="AllTools"/> + <category name="WebTools"/> + </feature> + +  + <feature url="features/org.jboss.tools.jmx.sdk.feature_${jmx.versionTag}.jar" id="org.jboss.tools.jmx.sdk.feature" version="${jmx.versionTag}"> + <category name="SDKTools"/> + </feature> + <feature url="features/org.jboss.ide.eclipse.freemarker.sdk.feature_${freemarker.versionTag}.jar" id="org.jboss.ide.eclipse.freemarker.sdk.feature" version="${freemarker.versionTag}"> + <category name="SDKTools"/> + </feature> +  + +  + <feature url="features/org.jboss.tools.jbpm.convert.feature_${jbpm-convert.versionTag}.jar" id="org.jboss.tools.jbpm.convert.feature" version="${jbpm-convert.versionTag}"> + <category name="AllTools"/> + <category name="SOATools"/> + </feature> + +  + <category-def name="SDKTools" label="JBoss Developer Studio SDK"> + <description>JBoss Developer Studio SDK contains plugins where an SDK package exists. These contain both source and runtimes. Use these if you want to debug and/or provide patches to JBoss Developer Studio plugins. + </description> + </category-def> + + <category-def name="AllTools" label="All JBoss Developer Studio Tools - ${product.versionTag}"> + <description> + Contains ALL the plugins that are available from JBoss Developer Studio except those related to integration with 3rd party plugins. Selecting this category will give you all tools needed for both Web, Seam and SOA Development. + </description> + </category-def> + + <category-def name="SOATools" label="SOA Development"> + <description> + Tools to help create SOA applications. Use these if you work with jBPM, Drools, JBoss ESB, JBoss WebServices or Smooks. + </description> + </category-def> + + <category-def name="WebTools" label="Web and Java EE Development"> + <description> + Tools to help create web and enterprise applications, using JSF, Facelets, Seam, Hibernate/JPA, CSS, Webservices and more. + </description> + </category-def> + + <category-def name="GeneralTools" label="Application Development"> + <description>Tools for general application development.</description> + </category-def> + + <category-def name="DataTools" label="Data Services"> + <description>Tools related to data services such as persistence and transformation.</description> + </category-def> + +  + +  + + <category-def name="TestPerfTools" label="Test and Performance"> + <description>Tools used to improve testing and performance.</description> + </category-def> + +</site> Added: branches/modular_build/site/site.xml.jbosstools.template =================================================================== --- branches/modular_build/site/site.xml.jbosstools.template (rev 0) +++ branches/modular_build/site/site.xml.jbosstools.template 2010-05-01 15:10:04 UTC (rev 21845) @@ -0,0 +1,166 @@ +<?xml version="1.0" encoding="UTF-8"?> +<site pack200="true"> + <description> + This is the ${update.site.description} Update Site for JBoss Tools. + </description> + <feature url="features/org.jboss.tools.richfaces.feature_${richfaces.versionTag}.jar" id="org.jboss.tools.richfaces.feature" version="${richfaces.versionTag}"> + <category name="AllTools"/> + <category name="WebTools"/> + </feature> + <feature url="features/org.jboss.tools.seam.feature_${seam.versionTag}.jar" id="org.jboss.tools.seam.feature" version="${seam.versionTag}"> + <category name="AllTools"/> + <category name="WebTools"/> + </feature> + <feature url="features/org.jboss.tools.cdi.feature_${cdi.versionTag}.jar" id="org.jboss.tools.cdi.feature" version="${cdi.versionTag}"> + <category name="AllTools"/> + <category name="WebTools"/> + <category name="GeneralTools"/> + </feature> + <feature url="features/org.jboss.tools.jmx.feature_${jmx.versionTag}.jar" id="org.jboss.tools.jmx.feature" version="${jmx.versionTag}"> + <category name="AllTools"/> + <category name="GeneralTools"/> + </feature> + <feature url="features/org.jboss.ide.eclipse.as.feature_${as.versionTag}.jar" id="org.jboss.ide.eclipse.as.feature" version="${as.versionTag}"> + <category name="AllTools"/> + <category name="WebTools"/> + </feature> + <feature url="features/org.jboss.ide.eclipse.archives.feature_${archives.versionTag}.jar" id="org.jboss.ide.eclipse.archives.feature" version="${archives.versionTag}"> + <category name="AllTools"/> + <category name="GeneralTools"/> + </feature> + <feature url="features/org.hibernate.eclipse.feature_${hibernate-tools.versionTag}.jar" id="org.hibernate.eclipse.feature" version="${hibernate-tools.versionTag}"> + <category name="AllTools"/> + <category name="WebTools"/> + <category name="DataTools"/> + <category name="GeneralTools"/> + </feature> + <feature url="features/org.jboss.ide.eclipse.freemarker.feature_${freemarker.versionTag}.jar" id="org.jboss.ide.eclipse.freemarker.feature" version="${freemarker.versionTag}"> + <category name="AllTools"/> + <category name="GeneralTools"/> + </feature> + <feature url="features/org.jboss.tools.struts_feature_${struts.versionTag}.jar" id="org.jboss.tools.struts_feature" version="${struts.versionTag}"> + <category name="AllTools"/> + <category name="WebTools"/> + </feature> + <feature url="features/org.jboss.tools.esb.feature_${esb.versionTag}.jar" id="org.jboss.tools.esb.feature" version="${esb.versionTag}"> + <category name="AllTools"/> + <category name="SOATools"/> + </feature> + <feature url="features/org.jboss.tools.ws.feature_${ws.versionTag}.jar" id="org.jboss.tools.ws.feature" version="${ws.versionTag}"> + <category name="AllTools"/> + <category name="SOATools"/> + </feature> + <feature url="features/org.jboss.tools.birt.feature_${birt.versionTag}.jar" id="org.jboss.tools.birt.feature" version="${birt.versionTag}"> + <category name="ReportTools"/> + </feature> + <feature url="features/org.jboss.tools.portlet.feature_${portlet.versionTag}.jar" id="org.jboss.tools.portlet.feature" version="${portlet.versionTag}"> + <category name="AllTools"/> + <category name="WebTools"/> + </feature> + <feature url="features/org.jboss.tools.tptp.feature_${tptp.versionTag}.jar" id="org.jboss.tools.tptp.feature" version="${tptp.versionTag}"> + <category name="TestPerfTools"/> + </feature> + <feature url="features/org.jboss.tools.smooks.feature_${smooks.versionTag}.jar" id="org.jboss.tools.smooks.feature" version="${smooks.versionTag}"> + <category name="AllTools"/> + <category name="SOATools"/> + <category name="DataTools"/> + <category name="GeneralTools"/> + </feature> + <feature url="features/org.drools.eclipse.feature_${drools-ide.versionTag}.jar" id="org.drools.eclipse.feature" version="${drools-ide.versionTag}"> + <category name="AllTools"/> + <category name="SOATools"/> + <category name="GeneralTools"/> + </feature> + <feature url="features/org.drools.eclipse.task.feature_${drools-ide.versionTag}.jar" id="org.drools.eclipse.task.feature" version="${drools-ide.versionTag}"> + <category name="AllTools"/> + <category name="SOATools"/> + </feature> + <feature url="features/org.guvnor.tools.feature_${drools-ide.versionTag}.jar" id="org.guvnor.tools.feature" version="${drools-ide.versionTag}"> + <category name="AllTools"/> + <category name="SOATools"/> + </feature> + <feature url="features/org.jboss.tools.project.examples.feature_${examples.versionTag}.jar" id="org.jboss.tools.project.examples.feature" version="${examples.versionTag}"> + <category name="AllTools"/> + <category name="GeneralTools"/> + </feature> +  + <feature url="features/org.jboss.tools.community.project.examples.feature_${examples.community.versionTag}.jar" id="org.jboss.tools.community.project.examples.feature" version="${examples.community.versionTag}"> + <category name="AllTools"/> + <category name="GeneralTools"/> + </feature> +  + <feature url="features/org.jboss.tools.maven.feature_${maven.versionTag}.jar" id="org.jboss.tools.maven.feature" version="${maven.versionTag}"> + <category name="MavenTools"/> + </feature> + <feature url="features/org.jboss.tools.maven.seam.feature_${maven.versionTag}.jar" id="org.jboss.tools.maven.seam.feature" version="${maven.versionTag}"> + <category name="MavenTools"/> + </feature> + <feature url="features/org.jboss.tools.xulrunner.feature_${xulrunner.version}_${product.buildQualifier}.jar" id="org.jboss.tools.xulrunner.feature" version="${xulrunner.version}_${product.buildQualifier}"> + <category name="AllTools"/> + <category name="WebTools"/> + </feature> + +  + <feature url="features/org.jboss.tools.jmx.sdk.feature_${jmx.versionTag}.jar" id="org.jboss.tools.jmx.sdk.feature" version="${jmx.versionTag}"> + <category name="SDKTools"/> + </feature> + <feature url="features/org.jboss.ide.eclipse.freemarker.sdk.feature_${freemarker.versionTag}.jar" id="org.jboss.ide.eclipse.freemarker.sdk.feature" version="${freemarker.versionTag}"> + <category name="SDKTools"/> + </feature> + <feature url="features/org.jboss.tools.maven.sdk.feature_${maven.versionTag}.jar" id="org.jboss.tools.maven.sdk.feature" version="${maven.versionTag}"> + <category name="SDKTools"/> + </feature> + +  + <feature url="features/org.jboss.tools.jbpm.convert.feature_${jbpm-convert.versionTag}.jar" id="org.jboss.tools.jbpm.convert.feature" version="${jbpm-convert.versionTag}"> + <category name="AllTools"/> + <category name="SOATools"/> + </feature> + +  + <category-def name="SDKTools" label="JBoss Tools SDK"> + <description>JBoss Tools SDK contains plugins where an SDK package exists. These contain both source and runtimes. Use these if you want to debug and/or provide patches to JBoss Tools plugins. + </description> + </category-def> + + <category-def name="AllTools" label="All JBoss Tools - ${product.versionTag}"> + <description> + Contains ALL the plugins that are available from JBoss Tools except those related to integration with 3rd party plugins. Selecting this category will give you all tools needed for both Web, Seam and SOA Development. + </description> + </category-def> + + <category-def name="SOATools" label="SOA Development"> + <description> + Tools to help create SOA applications. Use these if you work with jBPM, Drools, JBoss ESB, JBoss WebServices or Smooks. + </description> + </category-def> + + <category-def name="WebTools" label="Web and Java EE Development"> + <description> + Tools to help create web and enterprise applications, using JSF, Facelets, Seam, Hibernate/JPA, CSS, Webservices and more. + </description> + </category-def> + + <category-def name="GeneralTools" label="Application Development"> + <description>Tools for general application development.</description> + </category-def> + + <category-def name="DataTools" label="Data Services"> + <description>Tools related to data services such as persistence and transformation.</description> + </category-def> + + <category-def name="MavenTools" label="Maven Support"> + <description>Plugins related to Maven and m2eclipse support. Use these to enable use of Maven.</description> + </category-def> + + <category-def name="ReportTools" label="Business Intelligence, Reporting and Charting"> + <description>Business Intelligence, Reporting and Charting. Use these if you plan to integrate Hibernate or Seam with Eclipse BIRT.</description> + </category-def> + + <category-def name="TestPerfTools" label="Test and Performance"> + <description>Tools used to improve testing and performance.</description> + </category-def> + +</site> Added: branches/modular_build/site/web/site.css =================================================================== --- branches/modular_build/site/web/site.css (rev 0) +++ branches/modular_build/site/web/site.css 2010-05-01 15:10:04 UTC (rev 21845) @@ -0,0 +1,66 @@ +< +STYLE type ="text/css">td.spacer { + padding-bottom: 10px; + padding-top: 10px; +} + +.title { + font-family: sans-serif; + color: #1778be; +} + +.bodyText { + font-family: sans-serif; + font-size: 9pt; + color: #000000; +} + +.sub-header { + font-family: sans-serif; + font-style: normal; + font-weight: bold; + font-size: 9pt; + color: white; +} + +.log-text { + font-family: sans-serif; + font-style: normal; + font-weight: lighter; + font-size: 8pt; + color: black; +} + +.big-header { + font-family: sans-serif; + font-style: normal; + font-weight: bold; + font-size: 9pt; + color: white; + border-top: 10px solid white; +} + +.light-row { + background: #FFFFFF +} + +.dark-row { + background: #EEEEEE +} + +.header { + background: #445562 +} + +#indent { + word-wrap: break-word; + width: 300px; + text-indent: 10px; +} + +.link { + color: #187dc6; +} +</ +STYLE +> \ No newline at end of file

14 years, 8 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

jbosstools-commits May 2010