JBoss Tools SVN: r20189 - trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/project/facet.
by jbosstools-commits@lists.jboss.org
Author: snjeza
Date: 2010-02-08 19:08:03 -0500 (Mon, 08 Feb 2010)
New Revision: 20189
Modified:
trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/project/facet/JSFPortletFacetInstallDelegate.java
trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/project/facet/PortletPostInstallListener.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-5758 Portal Faset Installer doesn't support projects with more than one faces configs declared in web.xml
Modified: trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/project/facet/JSFPortletFacetInstallDelegate.java
===================================================================
--- trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/project/facet/JSFPortletFacetInstallDelegate.java 2010-02-08 18:46:05 UTC (rev 20188)
+++ trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/project/facet/JSFPortletFacetInstallDelegate.java 2010-02-09 00:08:03 UTC (rev 20189)
@@ -16,6 +16,7 @@
import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.List;
+import java.util.StringTokenizer;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IProject;
@@ -137,67 +138,51 @@
IProgressMonitor monitor, IDataModel config) {
String facesConfigString = getFacesConfigFile(project, monitor);
+ if (facesConfigString == null || facesConfigString.trim().length() <= 0) {
+ return;
+ }
+ StringTokenizer tokenizer = new StringTokenizer(facesConfigString, ","); //$NON-NLS-1$
+ List<String> facesConfigs = new ArrayList<String>();
+ while (tokenizer.hasMoreTokens()) {
+ facesConfigs.add(tokenizer.nextToken().trim());
+ }
+ FacesState state = checkState(project, facesConfigs);
+ if (state.applicationExists && state.viewHandlerExists && state.stateManagerExists) {
+ return;
+ }
+ if (!state.applicationExists) {
+ FacesConfigArtifactEdit facesConfigEdit = null;
+ try {
+ facesConfigEdit = FacesConfigArtifactEdit
+ .getFacesConfigArtifactEditForWrite(project,
+ facesConfigs.get(0));
+ FacesConfigType facesConfig = facesConfigEdit.getFacesConfig();
+ EList applications = facesConfig.getApplication();
+ ApplicationType application = FacesConfigFactory.eINSTANCE.createApplicationType();
+ state.application = application;
+ state.facesConfigString = facesConfigs.get(0);
+ facesConfig.getApplication().add(application);
+ facesConfigEdit.save(monitor);
+ } finally {
+ if (facesConfigEdit != null) {
+ facesConfigEdit.dispose();
+ }
+ }
+ }
FacesConfigArtifactEdit facesConfigEdit = null;
try {
- facesConfigEdit = FacesConfigArtifactEdit
- .getFacesConfigArtifactEditForWrite(project,
- facesConfigString);
+ facesConfigEdit = FacesConfigArtifactEdit.getFacesConfigArtifactEditForWrite(project,state.facesConfigString);
FacesConfigType facesConfig = facesConfigEdit.getFacesConfig();
- EList applications = facesConfig.getApplication();
- ApplicationType applicationType = null;
- boolean applicationExists = false;
- if (applications.size() <= 0) {
- applicationType = FacesConfigFactory.eINSTANCE
- .createApplicationType();
- } else {
- applicationType = (ApplicationType) applications.get(0);
- applicationExists = true;
- }
- boolean viewHandlerExists = false;
- for (Iterator iterator = applications.iterator(); iterator
- .hasNext();) {
- ApplicationType application = (ApplicationType) iterator.next();
- EList viewHandlers = applicationType.getViewHandler();
- for (Iterator iterator2 = viewHandlers.iterator(); iterator2
- .hasNext();) {
- ViewHandlerType viewHandler = (ViewHandlerType) iterator2
- .next();
- if (ORG_JBOSS_PORTLET_VIEW_HANDLER.equals(viewHandler
- .getTextContent())) {
- viewHandlerExists = true;
- }
- }
- }
- if (!viewHandlerExists) {
- ViewHandlerType viewHandler = FacesConfigFactory.eINSTANCE
- .createViewHandlerType();
+ if (!state.viewHandlerExists) {
+ ViewHandlerType viewHandler = FacesConfigFactory.eINSTANCE.createViewHandlerType();
viewHandler.setTextContent(ORG_JBOSS_PORTLET_VIEW_HANDLER);
- applicationType.getViewHandler().add(viewHandler);
+ state.application.getViewHandler().add(viewHandler);
}
- boolean stateManagerExists = false;
- for (Iterator iterator = applications.iterator(); iterator
- .hasNext();) {
- ApplicationType application = (ApplicationType) iterator.next();
- EList stateManagers = applicationType.getStateManager();
- for (Iterator iterator2 = stateManagers.iterator(); iterator2
- .hasNext();) {
- StateManagerType stateManager = (StateManagerType) iterator2
- .next();
- if (ORG_JBOSS_PORTLET_STATE_MANAGER.equals(stateManager
- .getTextContent())) {
- stateManagerExists = true;
- }
- }
- }
- if (!stateManagerExists) {
- StateManagerType stateManager = FacesConfigFactory.eINSTANCE
- .createStateManagerType();
+ if (!state.stateManagerExists) {
+ StateManagerType stateManager = FacesConfigFactory.eINSTANCE.createStateManagerType();
stateManager.setTextContent(ORG_JBOSS_PORTLET_STATE_MANAGER);
- applicationType.getStateManager().add(stateManager);
+ state.application.getStateManager().add(stateManager);
}
- if (!applicationExists) {
- facesConfig.getApplication().add(applicationType);
- }
facesConfigEdit.save(monitor);
} finally {
@@ -207,6 +192,53 @@
}
}
+ private FacesState checkState(IProject project, List<String> facesConfigs) {
+ FacesState facesState = new FacesState();
+ for (String facesConfigString : facesConfigs) {
+ FacesConfigArtifactEdit facesConfigEdit = null;
+ try {
+ facesConfigEdit = FacesConfigArtifactEdit.getFacesConfigArtifactEditForRead(project,facesConfigString);
+ FacesConfigType facesConfig = facesConfigEdit.getFacesConfig();
+ EList applications = facesConfig.getApplication();
+ if (applications.size() <= 0) {
+ continue;
+ } else {
+ facesState.applicationExists = true;
+ facesState.application = (ApplicationType) applications.get(0);
+ facesState.facesConfigString = facesConfigString;
+ }
+ for (Iterator iterator = applications.iterator(); iterator.hasNext();) {
+ ApplicationType application = (ApplicationType) iterator.next();
+ EList viewHandlers = application.getViewHandler();
+ for (Iterator iterator2 = viewHandlers.iterator(); iterator2.hasNext();) {
+ ViewHandlerType viewHandler = (ViewHandlerType) iterator2.next();
+ if (ORG_JBOSS_PORTLET_VIEW_HANDLER.equals(viewHandler.getTextContent())) {
+ facesState.viewHandlerExists = true;
+ }
+ }
+ }
+ for (Iterator iterator = applications.iterator(); iterator.hasNext();) {
+ ApplicationType application = (ApplicationType) iterator.next();
+ EList stateManagers = application.getStateManager();
+ for (Iterator iterator2 = stateManagers.iterator(); iterator2.hasNext();) {
+ StateManagerType stateManager = (StateManagerType) iterator2.next();
+ if (ORG_JBOSS_PORTLET_STATE_MANAGER.equals(stateManager.getTextContent())) {
+ facesState.stateManagerExists = true;
+ }
+ }
+ }
+ if (facesState.applicationExists && facesState.viewHandlerExists && facesState.stateManagerExists) {
+ break;
+ }
+ } finally {
+ if (facesConfigEdit != null) {
+ facesConfigEdit.dispose();
+ }
+ }
+ }
+ return facesState;
+ }
+
private String getFacesConfigFile(IProject project, IProgressMonitor monitor) {
final IModelProvider provider = PortletCoreActivator
.getModelProvider(project);
@@ -461,4 +493,12 @@
return true;
return false;
}
+
+ private class FacesState {
+ private boolean applicationExists = false;
+ private boolean viewHandlerExists = false;
+ private boolean stateManagerExists = false;
+ private ApplicationType application = null;
+ private String facesConfigString = null;
+ }
}
Modified: trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/project/facet/PortletPostInstallListener.java
===================================================================
--- trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/project/facet/PortletPostInstallListener.java 2010-02-08 18:46:05 UTC (rev 20188)
+++ trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/project/facet/PortletPostInstallListener.java 2010-02-09 00:08:03 UTC (rev 20189)
@@ -1,7 +1,6 @@
package org.jboss.tools.portlet.core.internal.project.facet;
import java.io.File;
-import java.io.FileFilter;
import java.io.FilenameFilter;
import java.io.IOException;
import java.util.ArrayList;
@@ -54,7 +53,7 @@
public class PortletPostInstallListener implements IFacetedProjectListener {
- private static final String JSFPORTLET_LIBRARY_PROVIDER = "jsfportlet-library-provider";
+ private static final String JSFPORTLET_LIBRARY_PROVIDER = "jsfportlet-library-provider"; //$NON-NLS-1$
private static final String JSFPORTLETBRIDGE_LIBRARY_PROVIDER = "jsfportletbridge-library-provider"; //$NON-NLS-1$
private static final IProjectFacet seamFacet = ProjectFacetsManager.getProjectFacet("jst.seam"); //$NON-NLS-1$
private static final IOverwriteQuery OVERWRITE_NONE_QUERY = new IOverwriteQuery()
14 years, 9 months
JBoss Tools SVN: r20188 - in trunk/vpe: plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/wizards and 3 other directories.
by jbosstools-commits@lists.jboss.org
Author: dmaliarevich
Date: 2010-02-08 13:46:05 -0500 (Mon, 08 Feb 2010)
New Revision: 20188
Added:
trunk/vpe/tests/org.jboss.tools.vpe.ui.test/resources/TestProject/WebContent/pages/storedTags.xml
trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/wizard/
trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/wizard/VpeImportExportUnknownTagsWizardsTest.java
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe/META-INF/MANIFEST.MF
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/wizards/ExportUnknownTagsTemplatesWizardPage.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/wizards/ImportUnknownTagsTemplatesWizardPage.java
trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/VpeUiTests.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-2795, JUnits were added.
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/META-INF/MANIFEST.MF
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/META-INF/MANIFEST.MF 2010-02-08 18:24:25 UTC (rev 20187)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/META-INF/MANIFEST.MF 2010-02-08 18:46:05 UTC (rev 20188)
@@ -35,6 +35,7 @@
org.jboss.tools.vpe.editor.toolbar.format.css,
org.jboss.tools.vpe.editor.toolbar.format.handler,
org.jboss.tools.vpe.editor.util,
+ org.jboss.tools.vpe.editor.wizards,
org.jboss.tools.vpe.editor.xpl,
org.jboss.tools.vpe.messages,
org.jboss.tools.vpe.selbar
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/wizards/ExportUnknownTagsTemplatesWizardPage.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/wizards/ExportUnknownTagsTemplatesWizardPage.java 2010-02-08 18:24:25 UTC (rev 20187)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/wizards/ExportUnknownTagsTemplatesWizardPage.java 2010-02-08 18:46:05 UTC (rev 20188)
@@ -248,7 +248,7 @@
public String getValueAt(int row, int column) {
String result = "List is empty"; //$NON-NLS-1$
- if (null != tagsList) {
+ if ((null != tagsList) && ((row >= 0) && (tagsList.size() > 0) && (row < tagsList.size()))) {
VpeAnyData tagItem = (VpeAnyData)tagsList.get(row);
switch(column){
case 0:
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/wizards/ImportUnknownTagsTemplatesWizardPage.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/wizards/ImportUnknownTagsTemplatesWizardPage.java 2010-02-08 18:24:25 UTC (rev 20187)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/wizards/ImportUnknownTagsTemplatesWizardPage.java 2010-02-08 18:46:05 UTC (rev 20188)
@@ -83,10 +83,7 @@
setDescription(VpeUIMessages.IMPORT_UNKNOWN_TAGS_PAGE_DESCRIPTION);
setImageDescriptor(ReferenceWizardPage.getImageDescriptor());
}
-
-
-
@Override
public void createControl(Composite parent) {
/*
@@ -258,7 +255,7 @@
public String getValueAt(int row, int column) {
String result = "List is empty"; //$NON-NLS-1$
- if (null != tagsList) {
+ if ((null != tagsList) && ((row >= 0) && (tagsList.size() > 0) && (row < tagsList.size()))) {
VpeAnyData tagItem = (VpeAnyData)tagsList.get(row);
switch(column){
case 0:
@@ -302,7 +299,6 @@
return isPageComplete;
}
-
public boolean finish() {
/*
* Currently used templates list
Added: trunk/vpe/tests/org.jboss.tools.vpe.ui.test/resources/TestProject/WebContent/pages/storedTags.xml
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.test/resources/TestProject/WebContent/pages/storedTags.xml (rev 0)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.test/resources/TestProject/WebContent/pages/storedTags.xml 2010-02-08 18:46:05 UTC (rev 20188)
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<vpe:templates>
+ <vpe:template-taglib prefix="lib" uri="someuri"/>
+ <vpe:template-taglib prefix="taglibName" uri="http://some/tag/uri"/>
+ <vpe:tag case-sensitive="no" name="taglibName:tagName">
+ <vpe:template children="yes" modify="no">
+ <vpe:any tag-for-display="b"/>
+ </vpe:template>
+ </vpe:tag>
+ <vpe:tag case-sensitive="no" name="lib:tag">
+ <vpe:template children="yes" modify="no">
+ <vpe:any style="s" tag-for-display="a" value="v"/>
+ </vpe:template>
+ </vpe:tag>
+</vpe:templates>
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/VpeUiTests.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/VpeUiTests.java 2010-02-08 18:24:25 UTC (rev 20187)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/VpeUiTests.java 2010-02-08 18:46:05 UTC (rev 20188)
@@ -19,6 +19,7 @@
import org.jboss.tools.vpe.ui.test.dialog.VpeResourcesDialogTest;
import org.jboss.tools.vpe.ui.test.editor.CustomSashFormTest;
import org.jboss.tools.vpe.ui.test.preferences.VpeEditorPreferencesPageTest;
+import org.jboss.tools.vpe.ui.test.wizard.VpeImportExportUnknownTagsWizardsTest;
import junit.framework.Test;
import junit.framework.TestSuite;
@@ -36,6 +37,7 @@
suite.addTestSuite(CustomSashFormTest.class);
suite.addTestSuite(VpePopupMenuTest.class);
suite.addTestSuite(VpeEditAnyDialogTest.class);
+ suite.addTestSuite(VpeImportExportUnknownTagsWizardsTest.class);
/*
* Add projects that will be used in junit tests.
Added: trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/wizard/VpeImportExportUnknownTagsWizardsTest.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/wizard/VpeImportExportUnknownTagsWizardsTest.java (rev 0)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/wizard/VpeImportExportUnknownTagsWizardsTest.java 2010-02-08 18:46:05 UTC (rev 20188)
@@ -0,0 +1,139 @@
+/*******************************************************************************
+ * Copyright (c) 2007-2010 Exadel, Inc. and Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Exadel, Inc. and Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.vpe.ui.test.wizard;
+
+import java.util.List;
+
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.jface.wizard.WizardDialog;
+import org.eclipse.ui.PlatformUI;
+import org.jboss.tools.vpe.editor.template.VpeAnyData;
+import org.jboss.tools.vpe.editor.template.VpeTemplateManager;
+import org.jboss.tools.vpe.editor.wizards.ExportUnknownTagsTemplatesWizard;
+import org.jboss.tools.vpe.editor.wizards.ExportUnknownTagsTemplatesWizardPage;
+import org.jboss.tools.vpe.editor.wizards.ImportUnknownTagsTemplatesWizard;
+import org.jboss.tools.vpe.editor.wizards.ImportUnknownTagsTemplatesWizardPage;
+import org.jboss.tools.vpe.messages.VpeUIMessages;
+import org.jboss.tools.vpe.ui.test.TestUtil;
+import org.jboss.tools.vpe.ui.test.VpeTest;
+import org.jboss.tools.vpe.ui.test.VpeUiTests;
+
+public class VpeImportExportUnknownTagsWizardsTest extends VpeTest {
+
+ private final String EMPTY_RESULT = "List is empty"; //$NON-NLS-1$
+ private final String TEMPLATES_FILE_PATH = "storedTags.xml"; //$NON-NLS-1$
+ private List<VpeAnyData> tagsList;
+
+ public VpeImportExportUnknownTagsWizardsTest(String name) {
+ super(name);
+ }
+
+ public void testExport() throws Throwable {
+ ExportUnknownTagsTemplatesWizard wizard = new ExportUnknownTagsTemplatesWizard();
+ wizard.init(PlatformUI.getWorkbench(), new StructuredSelection());
+ wizard.addPages();
+ ExportUnknownTagsTemplatesWizardPage page = (ExportUnknownTagsTemplatesWizardPage) wizard
+ .getPage(VpeUIMessages.EXPORT_UNKNOWN_TAGS_TEMPLATES_WIZARD_PAGE);
+
+ WizardDialog dialog = new WizardDialog(PlatformUI.getWorkbench()
+ .getActiveWorkbenchWindow().getShell(), wizard);
+ dialog.setBlockOnOpen(false);
+ dialog.open();
+ /*
+ * Cannot flip to next page
+ */
+ assertFalse(page.canFlipToNextPage());
+ /*
+ * Cannot finish the wizard
+ */
+ assertFalse(wizard.canFinish());
+ /*
+ * Check that templates list is empty
+ */
+ String taglib = page.getValueAt(0, 0);
+ assertEquals(EMPTY_RESULT, taglib);
+ /*
+ * Close the dialog
+ */
+ dialog.close();
+
+ /*
+ * Load stored templates to the JBDS.
+ */
+ IPath path = TestUtil.getComponentPath(TEMPLATES_FILE_PATH,
+ VpeUiTests.IMPORT_PROJECT_NAME).getLocation();
+ tagsList = VpeTemplateManager.getInstance().getAnyTemplates(path);
+ VpeTemplateManager.getInstance().setAnyTemplates(tagsList);
+
+ /*
+ * Open the dialog once again
+ */
+ wizard = new ExportUnknownTagsTemplatesWizard();
+ wizard.init(PlatformUI.getWorkbench(), new StructuredSelection());
+ wizard.addPages();
+ page = (ExportUnknownTagsTemplatesWizardPage) wizard
+ .getPage(VpeUIMessages.EXPORT_UNKNOWN_TAGS_TEMPLATES_WIZARD_PAGE);
+ dialog = new WizardDialog(PlatformUI.getWorkbench()
+ .getActiveWorkbenchWindow().getShell(), wizard);
+ dialog.setBlockOnOpen(false);
+ dialog.open();
+ /*
+ * Cannot flip to next page
+ */
+ assertFalse(page.canFlipToNextPage());
+ /*
+ * Cannot finish the wizard
+ */
+ assertFalse(wizard.canFinish());
+ /*
+ * Check that templates list has some values
+ */
+ taglib = page.getValueAt(0, 0);
+ assertEquals("taglibName:tagName", taglib); //$NON-NLS-1$
+
+ taglib = page.getValueAt(1, 0);
+ assertEquals("lib:tag", taglib); //$NON-NLS-1$
+ /*
+ * Close the dialog
+ */
+ dialog.close();
+ }
+
+ public void testImport() throws Throwable {
+ ImportUnknownTagsTemplatesWizard wizard = new ImportUnknownTagsTemplatesWizard();
+ wizard.init(PlatformUI.getWorkbench(), new StructuredSelection());
+ wizard.addPages();
+ ImportUnknownTagsTemplatesWizardPage page = (ImportUnknownTagsTemplatesWizardPage) wizard
+ .getPage(VpeUIMessages.IMPORT_UNKNOWN_TAGS_TEMPLATES_WIZARD_PAGE);
+
+ WizardDialog dialog = new WizardDialog(PlatformUI.getWorkbench()
+ .getActiveWorkbenchWindow().getShell(), wizard);
+ dialog.setBlockOnOpen(false);
+ dialog.open();
+ /*
+ * Cannot flip to next page
+ */
+ assertFalse(page.canFlipToNextPage());
+ /*
+ * Cannot finish the wizard
+ */
+ assertFalse(wizard.canFinish());
+ /*
+ * Check that templates list is empty
+ */
+ String taglib = page.getValueAt(0, 0);
+ assertEquals(EMPTY_RESULT, taglib);
+ /*
+ * Close the dialog
+ */
+ dialog.close();
+ }
+}
14 years, 9 months
JBoss Tools SVN: r20187 - trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor.
by jbosstools-commits@lists.jboss.org
Author: mareshkau
Date: 2010-02-08 13:24:25 -0500 (Mon, 08 Feb 2010)
New Revision: 20187
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-5812
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java 2010-02-08 18:19:21 UTC (rev 20186)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java 2010-02-08 18:24:25 UTC (rev 20187)
@@ -526,6 +526,8 @@
// refresh job in time, so we just ignore
// this exception
}
+ } catch(ClassCastException ex) {
+ VpePlugin.getDefault().reportProblem(ex);
}
getChangeEvents().remove(eventBean);
}
@@ -652,7 +654,7 @@
* comment node adding, it is already updated in {@code
* INodeNotifier.REMOVE} case.
*/
- if (Node.COMMENT_NODE != ((Node) newValue).getNodeType()) {
+ if (newValue instanceof Node && Node.COMMENT_NODE != ((Node) newValue).getNodeType()) {
/*
* we should remove all parent nodes from vpe cash
*/
14 years, 9 months
JBoss Tools SVN: r20186 - branches/hibernatetools-switch-to-hibernate-core-3.3/hibernatetools/plugins/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/utils.
by jbosstools-commits@lists.jboss.org
Author: vyemialyanchyk
Date: 2010-02-08 13:19:21 -0500 (Mon, 08 Feb 2010)
New Revision: 20186
Modified:
branches/hibernatetools-switch-to-hibernate-core-3.3/hibernatetools/plugins/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/utils/FilesTransfer.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-5706 - make files transfer operation more stable
Modified: branches/hibernatetools-switch-to-hibernate-core-3.3/hibernatetools/plugins/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/utils/FilesTransfer.java
===================================================================
--- branches/hibernatetools-switch-to-hibernate-core-3.3/hibernatetools/plugins/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/utils/FilesTransfer.java 2010-02-08 18:15:41 UTC (rev 20185)
+++ branches/hibernatetools-switch-to-hibernate-core-3.3/hibernatetools/plugins/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/utils/FilesTransfer.java 2010-02-08 18:19:21 UTC (rev 20186)
@@ -87,18 +87,34 @@
BufferedInputStream bis = null;
try {
if (iFile.exists()) {
- iFile.delete(true, null);
+ try {
+ iFile.delete(true, null);
+ } catch (CoreException e) {
+ e.printStackTrace();
+ }
}
fis = new FileInputStream(file);
bis = new BufferedInputStream(fis);
- iFile.create(bis, IResource.FORCE, null);
+ int nTryCounter = 5;
+ while (nTryCounter > 0) {
+ try {
+ iFile.create(bis, IResource.FORCE, null);
+ nTryCounter = 0;
+ } catch (CoreException e) {
+ e.printStackTrace();
+ nTryCounter--;
+ try {
+ Thread.sleep(500);
+ } catch (InterruptedException e1) {
+ // ignore
+ }
+ }
+ }
if (filesList != null) {
filesList.add(iFile.getFullPath());
}
} catch (FileNotFoundException e) {
e.printStackTrace();
- } catch (CoreException e) {
- e.printStackTrace();
} finally {
if (bis != null) {
try {
14 years, 9 months
JBoss Tools SVN: r20185 - trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/utils.
by jbosstools-commits@lists.jboss.org
Author: vyemialyanchyk
Date: 2010-02-08 13:15:41 -0500 (Mon, 08 Feb 2010)
New Revision: 20185
Modified:
trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/utils/FilesTransfer.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-5706 - make files transfer operation more stable
Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/utils/FilesTransfer.java
===================================================================
--- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/utils/FilesTransfer.java 2010-02-08 18:08:29 UTC (rev 20184)
+++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/utils/FilesTransfer.java 2010-02-08 18:15:41 UTC (rev 20185)
@@ -87,18 +87,34 @@
BufferedInputStream bis = null;
try {
if (iFile.exists()) {
- iFile.delete(true, null);
+ try {
+ iFile.delete(true, null);
+ } catch (CoreException e) {
+ e.printStackTrace();
+ }
}
fis = new FileInputStream(file);
bis = new BufferedInputStream(fis);
- iFile.create(bis, IResource.FORCE, null);
+ int nTryCounter = 5;
+ while (nTryCounter > 0) {
+ try {
+ iFile.create(bis, IResource.FORCE, null);
+ nTryCounter = 0;
+ } catch (CoreException e) {
+ e.printStackTrace();
+ nTryCounter--;
+ try {
+ Thread.sleep(500);
+ } catch (InterruptedException e1) {
+ // ignore
+ }
+ }
+ }
if (filesList != null) {
filesList.add(iFile.getFullPath());
}
} catch (FileNotFoundException e) {
e.printStackTrace();
- } catch (CoreException e) {
- e.printStackTrace();
} finally {
if (bis != null) {
try {
14 years, 9 months
JBoss Tools SVN: r20184 - trunk/seam/plugins/org.jboss.tools.seam.xml.ui/src/org/jboss/tools/seam/xml/ui/editor/form.
by jbosstools-commits@lists.jboss.org
Author: dgolovin
Date: 2010-02-08 13:08:29 -0500 (Mon, 08 Feb 2010)
New Revision: 20184
Modified:
trunk/seam/plugins/org.jboss.tools.seam.xml.ui/src/org/jboss/tools/seam/xml/ui/editor/form/SeamXMLFormLayoutData.java
Log:
revert temp fix for compilation errors in seam.xml.ui plugin
Modified: trunk/seam/plugins/org.jboss.tools.seam.xml.ui/src/org/jboss/tools/seam/xml/ui/editor/form/SeamXMLFormLayoutData.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.xml.ui/src/org/jboss/tools/seam/xml/ui/editor/form/SeamXMLFormLayoutData.java 2010-02-08 17:31:54 UTC (rev 20183)
+++ trunk/seam/plugins/org.jboss.tools.seam.xml.ui/src/org/jboss/tools/seam/xml/ui/editor/form/SeamXMLFormLayoutData.java 2010-02-08 18:08:29 UTC (rev 20184)
@@ -22,11 +22,11 @@
public static String EMPTY_DESCRIPTION = ""; //$NON-NLS-1$
private final static IFormData[] FORM_LAYOUT_DEFINITIONS = new IFormData[] {
-// SeamComponentsFileFormLayoutData.FILE_11_FORM_DEFINITION,
-// SeamComponentsFileFormLayoutData.FILE_12_FORM_DEFINITION,
-// SeamComponentsFileFormLayoutData.FILE_20_FORM_DEFINITION,
-// SeamComponentsFileFormLayoutData.FILE_21_FORM_DEFINITION,
-// SeamComponentsFileFormLayoutData.FILE_22_FORM_DEFINITION,
+ SeamComponentsFileFormLayoutData.FILE_11_FORM_DEFINITION,
+ SeamComponentsFileFormLayoutData.FILE_12_FORM_DEFINITION,
+ SeamComponentsFileFormLayoutData.FILE_20_FORM_DEFINITION,
+ SeamComponentsFileFormLayoutData.FILE_21_FORM_DEFINITION,
+ SeamComponentsFileFormLayoutData.FILE_22_FORM_DEFINITION,
SeamComponentFormLayoutData.SEAM_COMPONENT_FILE_FORM_DEFINITION,
SeamComponentFormLayoutData.SEAM_COMPONENT_FILE_20_FORM_DEFINITION,
SeamComponentFormLayoutData.SEAM_COMPONENT_FILE_21_FORM_DEFINITION,
14 years, 9 months
JBoss Tools SVN: r20183 - in trunk: jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources and 17 other directories.
by jbosstools-commits@lists.jboss.org
Author: yzhishko
Date: 2010-02-08 12:31:54 -0500 (Mon, 08 Feb 2010)
New Revision: 20183
Added:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/JBIDE5460TestProject/
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/JBIDE5460TestProject/.classpath
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/JBIDE5460TestProject/.metadata/
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/JBIDE5460TestProject/.metadata/WebContent/
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/JBIDE5460TestProject/.metadata/WebContent/WEB-INF/
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/JBIDE5460TestProject/.metadata/WebContent/WEB-INF/faces-config.pageflow
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/JBIDE5460TestProject/.project
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/JBIDE5460TestProject/.settings/
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/JBIDE5460TestProject/.settings/org.eclipse.jdt.core.prefs
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/JBIDE5460TestProject/.settings/org.eclipse.jdt.ui.prefs
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/JBIDE5460TestProject/.settings/org.eclipse.jst.common.project.facet.core.prefs
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/JBIDE5460TestProject/.settings/org.eclipse.wst.common.component
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/JBIDE5460TestProject/.settings/org.eclipse.wst.common.project.facet.core.xml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/JBIDE5460TestProject/.settings/org.eclipse.wst.validation.prefs
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/JBIDE5460TestProject/.settings/org.maven.ide.eclipse.prefs
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/JBIDE5460TestProject/WebContent/
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/JBIDE5460TestProject/WebContent/META-INF/
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/JBIDE5460TestProject/WebContent/META-INF/MANIFEST.MF
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/JBIDE5460TestProject/WebContent/WEB-INF/
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/JBIDE5460TestProject/WebContent/WEB-INF/classes/
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/JBIDE5460TestProject/WebContent/WEB-INF/faces-config.xml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/JBIDE5460TestProject/WebContent/WEB-INF/lib/
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/JBIDE5460TestProject/WebContent/WEB-INF/web.xml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/JBIDE5460TestProject/WebContent/html/
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/JBIDE5460TestProject/WebContent/html/tableBasic/
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/JBIDE5460TestProject/WebContent/html/tableBasic/tableBasic.xhtml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/JBIDE5460TestProject/as_lib/
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/JBIDE5460TestProject/maven-settings.xml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/JBIDE5460TestProject/pom.xml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/JBIDE5460TestProject/src/
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/JBIDE5460TestProject/src/log4j.dtd
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/JBIDE5460TestProject/src/log4j.xml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/JBIDE5460TestProject/src/npedemoResources.properties
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/JBIDE5460TestProject/target/
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/JBIDE5460TestProject/target/classes/
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/JBIDE5460TestProject/target/classes/log4j.dtd
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/JBIDE5460TestProject/target/classes/log4j.xml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/JBIDE5460TestProject/target/classes/npedemoResources.properties
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/JBIDE5460TestProject/test/
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/JBIDE5460TestProject/test/src/
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/RefreshBundles_JBIDE5460.java
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/i18n/JsfLocaleProvider.java
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllTests.java
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/NaturesChecker_JBIDE5701.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/bundle/BundleMap.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-5460 - fixed
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/i18n/JsfLocaleProvider.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/i18n/JsfLocaleProvider.java 2010-02-08 15:49:52 UTC (rev 20182)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/i18n/JsfLocaleProvider.java 2010-02-08 17:31:54 UTC (rev 20183)
@@ -17,6 +17,7 @@
import org.eclipse.ui.IFileEditorInput;
import org.eclipse.wst.sse.ui.StructuredTextEditor;
import org.jboss.tools.common.model.XModel;
+import org.jboss.tools.common.model.project.IModelNature;
import org.jboss.tools.common.model.util.EclipseResourceUtil;
import org.jboss.tools.jsf.model.helpers.converter.OpenKeyHelper;
import org.jboss.tools.vpe.editor.i18n.ILocaleProvider;
@@ -42,8 +43,11 @@
if (editorInput instanceof IFileEditorInput) {
IProject project = ((IFileEditorInput)editorInput)
.getFile().getProject();
- XModel model = EclipseResourceUtil.getModelNature(project)
- .getModel();
+ IModelNature modelNature = EclipseResourceUtil.getModelNature(project);
+ if (modelNature == null) {
+ return null;
+ }
+ XModel model = modelNature.getModel();
localeString = OpenKeyHelper.getDeafultLocaleFromFacesConfig(model);
return new Locale(localeString);
} else {
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/JBIDE5460TestProject/.classpath
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/JBIDE5460TestProject/.classpath (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/JBIDE5460TestProject/.classpath 2010-02-08 17:31:54 UTC (rev 20183)
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="src" path="test/src"/>
+ <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
+ <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry exported="true" kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER">
+ <attributes>
+ <attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="con" path="org.eclipse.jst.server.core.container/org.eclipse.jst.server.tomcat.runtimeTarget/Apache Tomcat v6.0"/>
+ <classpathentry kind="output" path="target/classes"/>
+</classpath>
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/JBIDE5460TestProject/.metadata/WebContent/WEB-INF/faces-config.pageflow
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/JBIDE5460TestProject/.metadata/WebContent/WEB-INF/faces-config.pageflow (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/JBIDE5460TestProject/.metadata/WebContent/WEB-INF/faces-config.pageflow 2010-02-08 17:31:54 UTC (rev 20183)
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<pageflow:Pageflow xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:pageflow="http://www.sybase.com/suade/pageflow" id="pf12015070253210" configfile="/calypso-showcase/WebContent/WEB-INF/faces-config.xml">
+ <nodes xsi:type="pageflow:PFPage" name="html/basicWizard/basicWizardPage1" id="pf12337618848080" referenceLink="//@navigationRule.6/@navigationCase.0/(a)toViewId|" outlinks="pf12337618848081 pf12337618848082" inlinks="pf12337618848083 pf12337618848084" path="/html/basicWizard/basicWizardPage1.xhtml"/>
+ <nodes xsi:type="pageflow:PFPage" name="html/basicWizard/basicWizardPage2" id="pf12337618848085" referenceLink="//@navigationRule.4/(a)fromViewId|" outlinks="pf12337618848086 pf12337618848083" inlinks="pf12337618848081 pf12337618848087" path="/html/basicWizard/basicWizardPage2.xhtml"/>
+ <nodes xsi:type="pageflow:PFPage" name="html/basicWizard/basicWizardPage3" id="pf12337618848088" referenceLink="//@navigationRule.6/(a)fromViewId|" outlinks="pf12337618848089 pf12337618848087 pf12337618848084" inlinks="pf12337618848086 pf12337618848082" path="/html/basicWizard/basicWizardPage3.xhtml"/>
+ <nodes xsi:type="pageflow:PFPage" name="html/basicWizard/summary.xhtml" id="pf123376188480810" referenceLink="//@navigationRule.2/@navigationCase.0/(a)toViewId|" inlinks="pf12337618848089" path="/html/basicWizard/summary.xhtml"/>
+ <nodes xsi:type="pageflow:PFPage" name="*" id="pf123376188480811" outlinks="pf123376188480812" path="*"/>
+ <nodes xsi:type="pageflow:PFPage" name="html/tableCreate/details.xhtml" id="pf123376188480813" referenceLink="//@navigationRule.7/@navigationCase.0/(a)toViewId|" inlinks="pf123376188480812" path="/html/tableCreate/details.xhtml"/>
+ <nodes xsi:type="pageflow:PFPage" name="html/components/navigationModel/navigationModel.xhtml" id="pf123376188480814" referenceLink="//@navigationRule.9/(a)fromViewId|" outlinks="pf123376188480815 pf123376188480816" path="/html/components/navigationModel/navigationModel.xhtml"/>
+ <nodes xsi:type="pageflow:PFPage" name="html/components/navigationModel/navigationModel2.xhtml" id="pf123376188480817" referenceLink="//@navigationRule.9/@navigationCase.0/(a)toViewId|" inlinks="pf123376188480815 pf123376188480816" path="/html/components/navigationModel/navigationModel2.xhtml"/>
+ <nodes xsi:type="pageflow:PFPage" name="html/tableForm/tableForm.xhtml" id="pf123376188480818" referenceLink="//@navigationRule.10/(a)fromViewId|" outlinks="pf123376188480819" path="/html/tableForm/tableForm.xhtml"/>
+ <nodes xsi:type="pageflow:PFPage" name="html/tableForm/tableShow.xhtml" id="pf123376188480820" referenceLink="//@navigationRule.10/@navigationCase.0/(a)toViewId|" inlinks="pf123376188480819" path="/html/tableForm/tableShow.xhtml"/>
+ <links id="pf12337618848081" target="pf12337618848085" source="pf12337618848080" outcome="toPage2"/>
+ <links id="pf12337618848086" target="pf12337618848088" source="pf12337618848085" outcome="toPage3"/>
+ <links id="pf12337618848089" target="pf123376188480810" source="pf12337618848088" outcome="toSummary"/>
+ <links id="pf12337618848087" target="pf12337618848085" source="pf12337618848088" outcome="toPage2"/>
+ <links id="pf12337618848083" target="pf12337618848080" source="pf12337618848085" outcome="toPage1"/>
+ <links id="pf12337618848082" target="pf12337618848088" source="pf12337618848080" outcome="toPage3"/>
+ <links id="pf12337618848084" target="pf12337618848080" source="pf12337618848088" outcome="toPage1"/>
+ <links id="pf123376188480812" target="pf123376188480813" source="pf123376188480811" outcome="tablecreate_detail"/>
+ <links id="pf123376188480815" target="pf123376188480817" source="pf123376188480814" outcome="success" fromaction="#{navigationModelBean.submit}"/>
+ <links id="pf123376188480816" target="pf123376188480817" source="pf123376188480814" outcome="success"/>
+ <links id="pf123376188480819" target="pf123376188480820" source="pf123376188480818" outcome="showTable"/>
+</pageflow:Pageflow>
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/JBIDE5460TestProject/.project
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/JBIDE5460TestProject/.project (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/JBIDE5460TestProject/.project 2010-02-08 17:31:54 UTC (rev 20183)
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>JBIDE5460TestProject</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.wst.common.project.facet.core.builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.wst.validation.validationbuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.maven.ide.eclipse.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.jboss.tools.common.verification.verifybuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.jboss.tools.jst.web.kb.kbbuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.maven.ide.eclipse.maven2Nature</nature>
+ <nature>org.eclipse.wst.common.project.facet.core.nature</nature>
+ <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
+ <nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
+ <nature>org.jboss.tools.jsf.jsfnature</nature>
+ <nature>org.jboss.tools.jst.web.kb.kbnature</nature>
+ </natures>
+</projectDescription>
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/JBIDE5460TestProject/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/JBIDE5460TestProject/.settings/org.eclipse.jdt.core.prefs (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/JBIDE5460TestProject/.settings/org.eclipse.jdt.core.prefs 2010-02-08 17:31:54 UTC (rev 20183)
@@ -0,0 +1,12 @@
+#Mon Mar 09 10:27:04 CET 2009
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.5
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/JBIDE5460TestProject/.settings/org.eclipse.jdt.ui.prefs
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/JBIDE5460TestProject/.settings/org.eclipse.jdt.ui.prefs (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/JBIDE5460TestProject/.settings/org.eclipse.jdt.ui.prefs 2010-02-08 17:31:54 UTC (rev 20183)
@@ -0,0 +1,3 @@
+#Thu Feb 14 10:14:27 EET 2008
+eclipse.preferences.version=1
+org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates/>
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/JBIDE5460TestProject/.settings/org.eclipse.jst.common.project.facet.core.prefs
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/JBIDE5460TestProject/.settings/org.eclipse.jst.common.project.facet.core.prefs (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/JBIDE5460TestProject/.settings/org.eclipse.jst.common.project.facet.core.prefs 2010-02-08 17:31:54 UTC (rev 20183)
@@ -0,0 +1,5 @@
+#Mon Mar 09 10:27:21 CET 2009
+classpath.helper/org.eclipse.jdt.launching.JRE_CONTAINER/owners=jst.java\:5.0
+classpath.helper/org.eclipse.jst.server.core.container\:\:org.eclipse.jst.server.tomcat.runtimeTarget\:\:Apache\ Tomcat\ v5.5/owners=jst.web\:2.4
+eclipse.preferences.version=1
+instance/org.eclipse.core.net/org.eclipse.core.net.hasMigrated=true
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/JBIDE5460TestProject/.settings/org.eclipse.wst.common.component
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/JBIDE5460TestProject/.settings/org.eclipse.wst.common.component (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/JBIDE5460TestProject/.settings/org.eclipse.wst.common.component 2010-02-08 17:31:54 UTC (rev 20183)
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project-modules id="moduleCoreId" project-version="1.5.0">
+ <wb-module deploy-name="JBIDE5460TestProject">
+ <wb-resource deploy-path="/" source-path="/WebContent"/>
+ <wb-resource deploy-path="/WEB-INF/classes" source-path="/src"/>
+ <wb-resource deploy-path="/WEB-INF/classes" source-path="/test/src"/>
+ <property name="java-output-path" value="target/classes"/>
+<property name="context-root" value="JBIDE5460TestProject"/>
+ </wb-module>
+</project-modules>
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/JBIDE5460TestProject/.settings/org.eclipse.wst.common.project.facet.core.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/JBIDE5460TestProject/.settings/org.eclipse.wst.common.project.facet.core.xml (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/JBIDE5460TestProject/.settings/org.eclipse.wst.common.project.facet.core.xml 2010-02-08 17:31:54 UTC (rev 20183)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<faceted-project>
+ <runtime name="Apache Tomcat v5.5"/>
+ <fixed facet="jst.web"/>
+ <fixed facet="jst.java"/>
+ <installed facet="jst.web" version="2.4"/>
+ <installed facet="jst.jsf" version="1.1"/>
+ <installed facet="jst.java" version="5.0"/>
+</faceted-project>
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/JBIDE5460TestProject/.settings/org.eclipse.wst.validation.prefs
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/JBIDE5460TestProject/.settings/org.eclipse.wst.validation.prefs (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/JBIDE5460TestProject/.settings/org.eclipse.wst.validation.prefs 2010-02-08 17:31:54 UTC (rev 20183)
@@ -0,0 +1,9 @@
+#Fri Jan 23 17:06:31 CET 2009
+DELEGATES_PREFERENCE=delegateValidatorList
+USER_BUILD_PREFERENCE=enabledBuildValidatorListorg.eclipse.wst.wsi.ui.internal.WSIMessageValidator;org.eclipse.jst.j2ee.internal.web.validation.UIWarValidator;org.eclipse.jst.j2ee.internal.classpathdep.ClasspathDependencyValidator;org.eclipse.wst.common.componentcore.internal.ModuleCoreValidator;
+USER_MANUAL_PREFERENCE=enabledManualValidatorListorg.eclipse.wst.wsi.ui.internal.WSIMessageValidator;org.eclipse.jst.j2ee.internal.web.validation.UIWarValidator;org.eclipse.jst.j2ee.internal.classpathdep.ClasspathDependencyValidator;org.eclipse.wst.common.componentcore.internal.ModuleCoreValidator;
+USER_PREFERENCE=overrideGlobalPreferencestruedisableAllValidationtrueversion1.2.2.v200809050219
+eclipse.preferences.version=1
+override=true
+suspend=true
+vf.version=3
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/JBIDE5460TestProject/.settings/org.maven.ide.eclipse.prefs
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/JBIDE5460TestProject/.settings/org.maven.ide.eclipse.prefs (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/JBIDE5460TestProject/.settings/org.maven.ide.eclipse.prefs 2010-02-08 17:31:54 UTC (rev 20183)
@@ -0,0 +1,8 @@
+#Wed Jun 25 10:16:08 CEST 2008
+activeProfiles=
+eclipse.preferences.version=1
+fullBuildGoals=process-test-resources
+includeModules=false
+resolveWorkspaceProjects=true
+resourceFilterGoals=process-resources resources\:testResources
+version=1
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/JBIDE5460TestProject/WebContent/META-INF/MANIFEST.MF
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/JBIDE5460TestProject/WebContent/META-INF/MANIFEST.MF (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/JBIDE5460TestProject/WebContent/META-INF/MANIFEST.MF 2010-02-08 17:31:54 UTC (rev 20183)
@@ -0,0 +1,6 @@
+Manifest-Version: 1.0
+Archiver-Version: Plexus Archiver
+Created-By: Apache Maven
+Built-By: 811054
+Build-Jdk: 1.5.0_19
+
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/JBIDE5460TestProject/WebContent/WEB-INF/faces-config.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/JBIDE5460TestProject/WebContent/WEB-INF/faces-config.xml (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/JBIDE5460TestProject/WebContent/WEB-INF/faces-config.xml 2010-02-08 17:31:54 UTC (rev 20183)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!DOCTYPE faces-config PUBLIC
+ "-//Sun Microsystems, Inc.//DTD JavaServer Faces Config 1.1//EN"
+ "http://java.sun.com/dtd/web-facesconfig_1_1.dtd">
+
+<faces-config>
+
+</faces-config>
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/JBIDE5460TestProject/WebContent/WEB-INF/web.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/JBIDE5460TestProject/WebContent/WEB-INF/web.xml (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/JBIDE5460TestProject/WebContent/WEB-INF/web.xml 2010-02-08 17:31:54 UTC (rev 20183)
@@ -0,0 +1,189 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app id="WebApp_ID" version="2.4"
+ xmlns="http://java.sun.com/xml/ns/j2ee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
+ <display-name>JBIDE5460TestProject</display-name>
+ <context-param>
+ <param-name>CombineApplication</param-name>
+ <param-value>false</param-value>
+ </context-param>
+ <context-param>
+ <param-name>ApplicationGroupName</param-name>
+ <param-value></param-value>
+ </context-param>
+ <context-param>
+ <param-name>NavigationStyle</param-name>
+ <param-value>menu</param-value>
+ </context-param>
+ <context-param>
+ <param-name>HelpStyle</param-name>
+ <param-value>
+ %context%/help/%language%/%help_id%.htm#%key%
+ </param-value>
+ </context-param>
+ <context-param>
+ <param-name>SupportedLocales</param-name>
+ <param-value>en_GB,fi_FI</param-value>
+ </context-param>
+ <context-param>
+ <param-name>DefaultHelpId</param-name>
+ <param-value>sample_help_page</param-value>
+ </context-param>
+ <context-param>
+ <param-name>DefaultHelpKey</param-name>
+ <param-value></param-value>
+ </context-param>
+ <context-param>
+ <param-name>LoginScreenStyle</param-name>
+ <!-- <param-value>small</param-value> -->
+ <param-value>normal</param-value>
+ </context-param>
+ <context-param>
+ <param-name>EnableSecurity</param-name>
+ <param-value>true</param-value>
+ </context-param>
+ <context-param>
+ <param-name>org.ajax4jsf.VIEW_HANDLERS</param-name>
+ <param-value>com.sun.facelets.FaceletViewHandler</param-value>
+ </context-param>
+ <context-param>
+ <param-name>org.ajax4jsf.COMPRESS_SCRIPT</param-name>
+ <param-value>false</param-value>
+ </context-param>
+<context-param>
+ <param-name>org.richfaces.ExcludeScripts</param-name>
+ <param-value>Prototype,PrototypeScript</param-value>
+</context-param> <context-param>
+ <param-name>javax.faces.DEFAULT_SUFFIX</param-name>
+ <param-value>.xhtml</param-value>
+ </context-param>
+ <context-param>
+ <param-name>
+ org.apache.myfaces.RESOURCE_VIRTUAL_PATH
+ </param-name>
+ <param-value>/faces/extensionResource</param-value>
+ </context-param>
+ <context-param>
+ <param-name>org.richfaces.SKIN</param-name>
+ <param-value>DEFAULT</param-value>
+ </context-param>
+ <context-param>
+ <param-name>
+ net.sf.jsfcomp.chartcreator.USE_CHARTLET
+ </param-name>
+ <param-value>true</param-value>
+ </context-param>
+ <context-param>
+ <param-name>
+ org.jboss.jbossfaces.WAR_BUNDLES_JSF_IMPL
+ </param-name>
+ <param-value>true</param-value>
+ </context-param>
+ <context-param>
+ <param-name>contextConfigLocation</param-name>
+ <param-value>/WEB-INF/spring-config.xml</param-value>
+ </context-param>
+ <context-param>
+ <param-name>onload-listener-config</param-name>
+ <param-value>/WEB-INF/onload-config.xml</param-value>
+ </context-param>
+ <security-constraint>
+ <web-resource-collection>
+ <web-resource-name>protected pages</web-resource-name>
+ <url-pattern>*.html</url-pattern>
+ <url-pattern>*.htm</url-pattern>
+ <url-pattern>*.jsp</url-pattern>
+ <url-pattern>*.jsf</url-pattern>
+ <url-pattern>*.xml</url-pattern>
+ <url-pattern>*.js</url-pattern>
+ <http-method>GET</http-method>
+ <http-method>PUT</http-method>
+ <http-method>HEAD</http-method>
+ <http-method>TRACE</http-method>
+ <http-method>POST</http-method>
+ <http-method>DELETE</http-method>
+ <http-method>OPTIONS</http-method>
+ </web-resource-collection>
+ <auth-constraint>
+ <role-name>tomcat</role-name>
+ </auth-constraint>
+ </security-constraint>
+ <security-role>
+ <role-name>tomcat</role-name>
+ </security-role>
+ <welcome-file-list>
+ <welcome-file>index.html</welcome-file>
+ </welcome-file-list>
+ <listener>
+ <listener-class>
+ org.springframework.web.context.ContextLoaderListener
+ </listener-class>
+ </listener>
+ <filter>
+ <filter-name>ajax4jsf</filter-name>
+ <filter-class>org.ajax4jsf.Filter</filter-class>
+ </filter>
+ <filter-mapping>
+ <filter-name>ajax4jsf</filter-name>
+ <url-pattern>/*</url-pattern>
+ </filter-mapping>
+ <filter>
+ <filter-name>extensionsFilter</filter-name>
+ <filter-class>
+ org.apache.myfaces.webapp.filter.ExtensionsFilter
+ </filter-class>
+ <init-param>
+ <param-name>uploadMaxFileSize</param-name>
+ <param-value>100m</param-value>
+ </init-param>
+ <init-param>
+ <param-name>uploadThresholdSize</param-name>
+ <param-value>100k</param-value>
+ </init-param>
+ </filter>
+ <filter-mapping>
+ <filter-name>extensionsFilter</filter-name>
+ <url-pattern>*.jsf</url-pattern>
+ </filter-mapping>
+ <filter-mapping>
+ <filter-name>extensionsFilter</filter-name>
+ <url-pattern>/faces/extensionResource/*</url-pattern>
+ </filter-mapping>
+ <filter>
+ <filter-name>sitemesh</filter-name>
+ <filter-class>
+ com.opensymphony.module.sitemesh.filter.PageFilter
+ </filter-class>
+ </filter>
+ <filter-mapping>
+ <filter-name>sitemesh</filter-name>
+ <url-pattern>/*</url-pattern>
+ </filter-mapping>
+ <servlet>
+ <servlet-name>facesServlet</servlet-name>
+ <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
+ <load-on-startup>1</load-on-startup>
+ </servlet>
+ <servlet-mapping>
+ <servlet-name>facesServlet</servlet-name>
+ <url-pattern>*.jsf</url-pattern>
+ </servlet-mapping>
+
+
+ <resource-ref>
+ <description>Derby Datasource example</description>
+ <res-ref-name>jdbc/derby</res-ref-name>
+ <res-type>javax.sql.DataSource</res-type>
+ <res-auth>Container</res-auth>
+ </resource-ref>
+ <error-page>
+ <error-code>500</error-code>
+ <location>/error.jsp</location>
+ </error-page>
+ <error-page>
+ <error-code>408</error-code>
+ <location>/logon.jsp</location>
+ </error-page>
+
+</web-app>
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/JBIDE5460TestProject/WebContent/html/tableBasic/tableBasic.xhtml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/JBIDE5460TestProject/WebContent/html/tableBasic/tableBasic.xhtml (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/JBIDE5460TestProject/WebContent/html/tableBasic/tableBasic.xhtml 2010-02-08 17:31:54 UTC (rev 20183)
@@ -0,0 +1,45 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:a4j="https://ajax4jsf.dev.java.net/ajax"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:t="http://myfaces.apache.org/tomahawk"
+ xmlns:c="http://java.sun.com/jstl/core" >
+<ui:composition>
+
+<f:view locale="#{sessionScope.WW_TRANS_I18N_LOCALE}">
+ <f:loadBundle basename="npedemoResources" var="bundle" />
+
+ <h:panelGrid columns="1">
+ <h:outputText value="#{bundle.tableBasic_title}" styleClass="applicationTitle" />
+ <h:outputText value="#{bundle.tableBasic_description}" />
+ </h:panelGrid>
+
+ <h:form>
+ <h:panelGrid columns="1" width="600">
+ <h:dataTable id="dataTable" var="user"
+ value="#{tableBasicBean.tableModel.wrappedData}">
+ <h:column>
+ <f:facet name="header">
+ <h:outputText value="#{bundle.user_firstName}" />
+ </f:facet>
+ <h:outputText value="#{user.firstName}" />
+ </h:column>
+ <h:column>
+ <f:facet name="header">
+ <h:outputText value="#{bundle.user_lastName}" />
+ </f:facet>
+ <h:outputText value="#{user.lastName}" />
+ </h:column>
+ </h:dataTable>
+ </h:panelGrid>
+ </h:form>
+
+</f:view>
+
+
+</ui:composition>
+</html>
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/JBIDE5460TestProject/maven-settings.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/JBIDE5460TestProject/maven-settings.xml (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/JBIDE5460TestProject/maven-settings.xml 2010-02-08 17:31:54 UTC (rev 20183)
@@ -0,0 +1,15 @@
+<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0
+ http://maven.apache.org/xsd/settings-1.0.0.xsd">
+ <localRepository>C:\caltools\repository</localRepository>
+ <proxies>
+ <proxy><active>true</active>
+ <protocol>http</protocol>
+ <host>10.102.8.5</host>
+ <port>8080</port>
+ </proxy>
+ </proxies>
+ <mirrors>
+ </mirrors>
+</settings>
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/JBIDE5460TestProject/pom.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/JBIDE5460TestProject/pom.xml (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/JBIDE5460TestProject/pom.xml 2010-02-08 17:31:54 UTC (rev 20183)
@@ -0,0 +1,539 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>npedemo</artifactId>
+ <packaging>war</packaging>
+ <name>NPE application</name>
+ <groupId>com.demo.npe</groupId>
+ <version>2.7.0</version>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>net.sf.jsf-comp</groupId>
+ <artifactId>chartcreator</artifactId>
+ <version>2.7.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-impl</artifactId>
+ <version>1.2.5</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-api</artifactId>
+ <version>1.2.5</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.myfaces.tomahawk</groupId>
+ <artifactId>tomahawk</artifactId>
+ <version>1.1.8</version>
+ <exclusions>
+ <exclusion>
+ <groupId>xml-apis</groupId>
+ <artifactId>xmlParserAPIs</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>jstl</artifactId>
+ <version>1.2</version>
+ </dependency>
+ <dependency>
+ <groupId>taglibs</groupId>
+ <artifactId>standard</artifactId>
+ <version>1.1.2</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet.jsp</groupId>
+ <artifactId>jsp-api</artifactId>
+ <version>2.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.4</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-fileupload</groupId>
+ <artifactId>commons-fileupload</artifactId>
+ <version>1.2</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-digester</groupId>
+ <artifactId>commons-digester</artifactId>
+ <version>1.8</version>
+ </dependency>
+ <dependency>
+ <groupId>opensymphony</groupId>
+ <artifactId>sitemesh</artifactId>
+ <version>2.4.1</version>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.14</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>net.sourceforge.cobertura</groupId>
+ <artifactId>cobertura</artifactId>
+ <version>1.9rc1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.shale</groupId>
+ <artifactId>shale-test</artifactId>
+ <version>1.0.4</version>
+ </dependency>
+ <dependency>
+ <groupId>org.openqa.selenium.client-drivers</groupId>
+ <artifactId>selenium-java-client-driver</artifactId>
+ <version>0.9.2</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring</artifactId>
+ <version>2.5.4</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.security</groupId>
+ <artifactId>spring-security-taglibs</artifactId>
+ <version>2.0.2</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-beans</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-jdbc</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-dao</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-web</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-aop</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-support</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.security</groupId>
+ <artifactId>spring-security-core</artifactId>
+ <version>2.0.2</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-beans</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-jdbc</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-dao</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-web</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-aop</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-support</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.aspectj</groupId>
+ <artifactId>aspectjrt</artifactId>
+ <version>1.5.4</version>
+ </dependency>
+ <dependency>
+ <groupId>net.sf.ehcache</groupId>
+ <artifactId>ehcache</artifactId>
+ <version>1.4.1</version>
+ </dependency>
+ <dependency>
+ <groupId>jfree</groupId>
+ <artifactId>jfreechart</artifactId>
+ <version>1.0.13</version>
+ </dependency>
+ <dependency>
+ <groupId>batik</groupId>
+ <artifactId>batik-xml</artifactId>
+ <version>1.6-1</version>
+ </dependency>
+ <dependency>
+ <groupId>batik</groupId>
+ <artifactId>batik-awt-util</artifactId>
+ <version>1.6-1</version>
+ </dependency>
+ <dependency>
+ <groupId>batik</groupId>
+ <artifactId>batik-svggen</artifactId>
+ <version>1.6-1</version>
+ </dependency>
+ <dependency>
+ <groupId>batik</groupId>
+ <artifactId>batik-dom</artifactId>
+ <version>1.6-1</version>
+ </dependency>
+ <dependency>
+ <groupId>batik</groupId>
+ <artifactId>batik-util</artifactId>
+ <version>1.6-1</version>
+ <exclusions>
+ <exclusion>
+ <groupId>xml-apis</groupId>
+ <artifactId>xmlParserAPIs</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>batik</groupId>
+ <artifactId>batik-ext</artifactId>
+ <version>1.6-1</version>
+ <exclusions>
+ <exclusion>
+ <groupId>xml-apis</groupId>
+ <artifactId>xmlParserAPIs</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>cewolf</groupId>
+ <artifactId>cewolf</artifactId>
+ <version>1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>taglibs</groupId>
+ <artifactId>log</artifactId>
+ <version>1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.richfaces.ui</groupId>
+ <artifactId>richfaces-ui</artifactId>
+ <version>3.3.1.GA</version>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-impl</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.shale</groupId>
+ <artifactId>shale-test</artifactId>
+ <version>1.0.4</version>
+ <type>test</type>
+ </dependency>
+ <dependency>
+ <groupId>net.sourceforge.jexcelapi</groupId>
+ <artifactId>jxl</artifactId>
+ <version>2.6</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.el</groupId>
+ <artifactId>el-api</artifactId>
+ <version>1.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.glassfish.web</groupId>
+ <artifactId>el-impl</artifactId>
+ <version>1.1</version>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.servlet.jsp</groupId>
+ <artifactId>jsp-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.facelets</groupId>
+ <artifactId>jsf-facelets</artifactId>
+ <version>1.1.14</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.poi</groupId>
+ <artifactId>poi</artifactId>
+ <version>3.2-FINAL</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.portletbridge</groupId>
+ <artifactId>portletbridge-impl</artifactId>
+ <version>2.0.0.BETA</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.portletbridge</groupId>
+ <artifactId>portletbridge-api</artifactId>
+ <version>2.0.0.BETA</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-impl</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.myfaces.tomahawk</groupId>
+ <artifactId>tomahawk</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.richfaces.ui</groupId>
+ <artifactId>richfaces-ui</artifactId>
+ </dependency>
+ <!-- needed for Tomcat5 -->
+ <dependency>
+ <groupId>javax.servlet.jsp</groupId>
+ <artifactId>jsp-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>jstl</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>taglibs</groupId>
+ <artifactId>standard</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-fileupload</groupId>
+ <artifactId>commons-fileupload</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.openqa.selenium.client-drivers</groupId>
+ <artifactId>selenium-java-client-driver</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.security</groupId>
+ <artifactId>spring-security-taglibs</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.aspectj</groupId>
+ <artifactId>aspectjrt</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>net.sf.ehcache</groupId>
+ <artifactId>ehcache</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>net.sf.jsf-comp</groupId>
+ <artifactId>chartcreator</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>taglibs</groupId>
+ <artifactId>log</artifactId>
+ </dependency>
+ </dependencies>
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>cobertura-maven-plugin</artifactId>
+ <version>2.0</version>
+ </plugin>
+ </plugins>
+ </reporting>
+ <build>
+ <finalName>${artifactId}</finalName>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.1</version>
+ <executions>
+ <execution>
+ <id>RemoveSVN</id>
+ <phase>compile</phase>
+ <configuration>
+ <tasks>
+ <echo message="Removing SVN from output" />
+ <delete includeemptydirs="true">
+ <fileset dir="target" defaultexcludes="false">
+ <include name="**/*svn*/**" />
+ </fileset>
+ </delete>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>RemoveTestSVN</id>
+ <phase>test-compile</phase>
+ <configuration>
+ <tasks>
+ <echo message="Removing SVN from output" />
+ <delete includeemptydirs="true">
+ <fileset dir="target" defaultexcludes="false">
+ <include name="**/*svn*/**" />
+ </fileset>
+ </delete>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>RemoveMAVEN</id>
+ <phase>package</phase>
+ <configuration>
+ <tasks>
+ <echo message="Removing unwanted elements from WAR" />
+ <unzip src="target/${artifactId}.war" dest="target/${artifactId}"
+ overwrite="false">
+ <patternset>
+ <exclude name="**/*.jar" />
+ </patternset>
+ </unzip>
+
+ <delete dir="target/${artifactId}/META-INF/maven" />
+ <zip destfile="target/${artifactId}_filtered.war"
+ basedir="target/${artifactId}" includes="**/*">
+ </zip>
+ <delete file="target/${artifactId}.war" />
+ <move file="target/${artifactId}_filtered.war" tofile="target/${artifactId}.war" />
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+
+ <repositories>
+ <repository>
+ <!-- org.openqa.selenium.client-drivers is not in central repository -->
+ <id>openqa</id>
+ <name>OpenQA Repository</name>
+ <url>http://nexus.openqa.org/content/repositories/releases</url>
+ <layout>default</layout>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </repository>
+ <repository>
+ <id>repository.jboss.com</id>
+ <name>Jboss Repository for Maven</name>
+ <url>http://repository.jboss.com/maven2/</url>
+ </repository>
+ <repository>
+ <id>download.java.net</id>
+ <name>Sun repository for Glassfish components</name>
+ <url>http://download.java.net/maven/glassfish</url>
+ </repository>
+ <repository>
+ <id>maven2-repository.dev.java.net</id>
+ <name>Java.net Repository for Maven</name>
+ <url>http://download.java.net/maven/1</url>
+ <layout>legacy</layout>
+ </repository>
+ </repositories>
+ <pluginRepositories>
+ <pluginRepository>
+ <id>maven.jboss.org</id>
+ <name>JBoss Repository for Maven Snapshots</name>
+ <url>http://snapshots.jboss.org/maven2/</url>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ <updatePolicy>always</updatePolicy>
+ </snapshots>
+ </pluginRepository>
+ <pluginRepository>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ <updatePolicy>never</updatePolicy>
+ </snapshots>
+ <id>repository.jboss.com</id>
+ <name>Jboss Repository for Maven</name>
+ <url>http://repository.jboss.com/maven2/ </url>
+ <layout>default</layout>
+ </pluginRepository>
+ </pluginRepositories>
+
+</project>
+
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/JBIDE5460TestProject/src/log4j.dtd
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/JBIDE5460TestProject/src/log4j.dtd (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/JBIDE5460TestProject/src/log4j.dtd 2010-02-08 17:31:54 UTC (rev 20183)
@@ -0,0 +1,166 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<!-- Authors: Chris Taylor, Ceki Gulcu. -->
+
+<!-- Version: 1.2 -->
+
+<!-- A configuration element consists of optional renderer
+elements,appender elements, categories and an optional root
+element. -->
+
+<!ELEMENT log4j:configuration (renderer*, appender*,(category|logger)*,root?,
+ categoryFactory?)>
+
+<!-- The "threshold" attribute takes a level value such that all -->
+<!-- logging statements with a level equal or below this value are -->
+<!-- disabled. -->
+
+<!-- Setting the "debug" enable the printing of internal log4j logging -->
+<!-- statements. -->
+
+<!-- By default, debug attribute is "null", meaning that we not do touch -->
+<!-- internal log4j logging settings. The "null" value for the threshold -->
+<!-- attribute can be misleading. The threshold field of a repository -->
+<!-- cannot be set to null. The "null" value for the threshold attribute -->
+<!-- simply means don't touch the threshold field, the threshold field -->
+<!-- keeps its old value. -->
+
+<!ATTLIST log4j:configuration
+ xmlns:log4j CDATA #FIXED "http://jakarta.apache.org/log4j/"
+ threshold (all|debug|info|warn|error|fatal|off|null) "null"
+ debug (true|false|null) "null"
+>
+
+<!-- renderer elements allow the user to customize the conversion of -->
+<!-- message objects to String. -->
+
+<!ELEMENT renderer EMPTY>
+<!ATTLIST renderer
+ renderedClass CDATA #REQUIRED
+ renderingClass CDATA #REQUIRED
+>
+
+<!-- Appenders must have a name and a class. -->
+<!-- Appenders may contain an error handler, a layout, optional parameters -->
+<!-- and filters. They may also reference (or include) other appenders. -->
+<!ELEMENT appender (errorHandler?, param*, layout?, filter*, appender-ref*)>
+<!ATTLIST appender
+ name ID #REQUIRED
+ class CDATA #REQUIRED
+>
+
+<!ELEMENT layout (param*)>
+<!ATTLIST layout
+ class CDATA #REQUIRED
+>
+
+<!ELEMENT filter (param*)>
+<!ATTLIST filter
+ class CDATA #REQUIRED
+>
+
+<!-- ErrorHandlers can be of any class. They can admit any number of -->
+<!-- parameters. -->
+
+<!ELEMENT errorHandler (param*, root-ref?, logger-ref*, appender-ref?)>
+<!ATTLIST errorHandler
+ class CDATA #REQUIRED
+>
+
+<!ELEMENT root-ref EMPTY>
+
+<!ELEMENT logger-ref EMPTY>
+<!ATTLIST logger-ref
+ ref IDREF #REQUIRED
+>
+
+<!ELEMENT param EMPTY>
+<!ATTLIST param
+ name CDATA #REQUIRED
+ value CDATA #REQUIRED
+>
+
+
+<!-- The priority class is org.apache.log4j.Level by default -->
+<!ELEMENT priority (param*)>
+<!ATTLIST priority
+ class CDATA #IMPLIED
+ value CDATA #REQUIRED
+>
+
+<!-- The level class is org.apache.log4j.Level by default -->
+<!ELEMENT level (param*)>
+<!ATTLIST level
+ class CDATA #IMPLIED
+ value CDATA #REQUIRED
+>
+
+
+<!-- If no level element is specified, then the configurator MUST not -->
+<!-- touch the level of the named category. -->
+<!ELEMENT category (param*,(priority|level)?,appender-ref*)>
+<!ATTLIST category
+ class CDATA #IMPLIED
+ name CDATA #REQUIRED
+ additivity (true|false) "true"
+>
+
+<!-- If no level element is specified, then the configurator MUST not -->
+<!-- touch the level of the named logger. -->
+<!ELEMENT logger (level?,appender-ref*)>
+<!ATTLIST logger
+ name ID #REQUIRED
+ additivity (true|false) "true"
+>
+
+
+<!ELEMENT categoryFactory (param*)>
+<!ATTLIST categoryFactory
+ class CDATA #REQUIRED>
+
+<!ELEMENT appender-ref EMPTY>
+<!ATTLIST appender-ref
+ ref IDREF #REQUIRED
+>
+
+<!-- If no priority element is specified, then the configurator MUST not -->
+<!-- touch the priority of root. -->
+<!-- The root category always exists and cannot be subclassed. -->
+<!ELEMENT root (param*, (priority|level)?, appender-ref*)>
+
+
+<!-- ==================================================================== -->
+<!-- A logging event -->
+<!-- ==================================================================== -->
+<!ELEMENT log4j:eventSet (log4j:event*)>
+<!ATTLIST log4j:eventSet
+ xmlns:log4j CDATA #FIXED "http://jakarta.apache.org/log4j/"
+ version (1.1|1.2) "1.2"
+ includesLocationInfo (true|false) "true"
+>
+
+
+
+<!ELEMENT log4j:event (log4j:message, log4j:NDC?, log4j:throwable?,
+ log4j:locationInfo?) >
+
+<!-- The timestamp format is application dependent. -->
+<!ATTLIST log4j:event
+ logger CDATA #REQUIRED
+ level CDATA #REQUIRED
+ thread CDATA #REQUIRED
+ timestamp CDATA #REQUIRED
+>
+
+<!ELEMENT log4j:message (#PCDATA)>
+<!ELEMENT log4j:NDC (#PCDATA)>
+
+<!ELEMENT log4j:throwable (#PCDATA)>
+
+<!ELEMENT log4j:locationInfo EMPTY>
+<!ATTLIST log4j:locationInfo
+ class CDATA #REQUIRED
+ method CDATA #REQUIRED
+ file CDATA #REQUIRED
+ line CDATA #REQUIRED
+>
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/JBIDE5460TestProject/src/log4j.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/JBIDE5460TestProject/src/log4j.xml (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/JBIDE5460TestProject/src/log4j.xml 2010-02-08 17:31:54 UTC (rev 20183)
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
+ <appender name="ConsoleAppender" class="org.apache.log4j.ConsoleAppender">
+ <layout class="org.apache.log4j.SimpleLayout" />
+ </appender>
+ <category name="com.nsn" additivity="false">
+ <priority value="debug" />
+ <appender-ref ref="ConsoleAppender" />
+ </category>
+ <root>
+ <priority value="warn" />
+ <appender-ref ref="ConsoleAppender" />
+ </root>
+</log4j:configuration>
\ No newline at end of file
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/JBIDE5460TestProject/src/npedemoResources.properties
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/JBIDE5460TestProject/src/npedemoResources.properties (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/JBIDE5460TestProject/src/npedemoResources.properties 2010-02-08 17:31:54 UTC (rev 20183)
@@ -0,0 +1,522 @@
+#Generated by Eclipse Messages Editor (Eclipse Babel)
+#Tue Jun 10 15:53:48 EEST 2008
+
+ajaxGetTime_description =
+
+ajaxGetTime_title = Automatic Refresh (ajaxGetTime)
+
+ajax_menu = AJAX
+
+alarm_msg = Alarm Message
+
+alarm_type = Alarm Type
+
+basicPopup_btn = Button (text from the page)
+
+basicPopup_btn2 = Button (text from a resource file)
+
+basicPopup_btn_tt1 = Button with tooltip (text from the page)
+
+basicPopup_btn_tt2 = Button with tooltip (text from a resource file)
+
+basicPopup_btnpopup = Show Popup
+
+basicPopup_description =
+
+basicPopup_firstName = FirstName
+
+basicPopup_image1 = Image (default)
+
+basicPopup_image2 = Image (custom)
+
+basicPopup_image_tt1 = Image with tooltip (text from the page)
+
+basicPopup_image_tt2 = Image with tooltip (text from a resource file)
+
+basicPopup_ink2 =
+
+basicPopup_ink_tt1 =
+
+basicPopup_lastName = LastName
+
+basicPopup_lesssize = Decrease Size
+
+basicPopup_link = Link (text from the page)
+
+basicPopup_link2 = Link (text from a resource file)
+
+basicPopup_link_tt1 = Link with tooltip (text from the page)
+
+basicPopup_link_tt2 = Link with tooltip (text from a resource file)
+
+basicPopup_location = Show location bar
+
+basicPopup_moresize = Increase size
+
+basicPopup_msg_close = Press Ok to close this dialog.
+
+basicPopup_res = Resizable
+
+basicPopup_scroll = Show scrollbars
+
+basicPopup_status = Show status bar
+
+basicPopup_title = Creating basic popup (basicPopup)
+
+basicPopup_toolbar = Show toolbar
+
+basicTree_description = Sample of basic JSF tree
+
+basicTree_title = Tree
+
+basicWizard_breadCrumbPage1 = Basic Information
+
+basicWizard_breadCrumbPage2 = Delivery Address
+
+basicWizard_breadCrumbPage3 = Payment Method
+
+basicWizard_button_finish = Finish
+
+basicWizard_button_next = Next >
+
+basicWizard_button_previous = < Previous
+
+basicWizard_city = City:
+
+basicWizard_description =
+
+basicWizard_firstName = Firstname:
+
+basicWizard_lastName = Lastname:
+
+basicWizard_paymentMethod = Payment Method:
+
+basicWizard_postalCode = Postalcode:
+
+basicWizard_street = Street:
+
+basicWizard_title = Creating basic wizard (basicWizard)
+
+button_ok = Ok
+
+button_text = Say Hello
+
+calendarCreate_dateseparator = /
+
+calendarCreate_description =
+
+calendarCreate_head1 = Default calendar
+
+calendarCreate_head10 = Year-select calendar
+
+calendarCreate_head11 = Default calendar, but results are split into multiple fields (m/d/yyyy)
+
+calendarCreate_head12 = Calendar with popup pre-selected to be January 29, 1974 (EU style on the page)
+
+calendarCreate_head13 = Calendar with popup pre-selected to be August 1, 1969 (US style on the page)
+
+calendarCreate_head14 = Calendar with tooltip on image (from a resource bundle)
+
+calendarCreate_head15 = Calendar with tooltip on image (from the page)
+
+calendarCreate_head16 = Calendar opening from button
+
+calendarCreate_head17 = Calendar opening from link
+
+calendarCreate_head18 = Submitting calendar value
+
+calendarCreate_head19 = Changing the inputfield size
+
+calendarCreate_head2 = Default calendar with navigation drop-downs enabled
+
+calendarCreate_head3 = Some dates manually disabled from selection
+
+calendarCreate_head4 = Weekend select
+
+calendarCreate_head5 = Calendar with year navigation enabled
+
+calendarCreate_head6 = Calendar with year navigation enabled and year navigation input enabled to allow manual entering of years
+
+calendarCreate_head7 = Calendar with only Saturdays allowed to be selected
+
+calendarCreate_head8 = Month-select calendar
+
+calendarCreate_head9 = Quarter-select calendar
+
+calendarCreate_title = Creating calendar (calendarCreate)
+
+calendarCreate_tooltip = Open Calendar
+
+calendarScheduling_description =
+
+calendarScheduling_label_end = Choose end time
+
+calendarScheduling_label_start = Choose start time
+
+calendarScheduling_title = Scheduling (calendarScheduling)
+
+calendar_menu = Calendar
+
+collapsible_panel_description = Example page that demonstrates the use of the collapsible panel.
+
+collapsible_panel_menu = Collapsible Panel
+
+collapsible_panel_title = Collapsible Panel
+
+components_menu = JSF Components
+
+dataScroller_pages = {0} Cars found, displaying {1} cars, from {2} to {3}. Page {4} / {5}
+
+dynamicList_description =
+
+dynamicList_label1 = Role
+
+dynamicList_label2 = Actor
+
+dynamicList_label3 = Movie
+
+dynamicList_menu = Dynamic List
+
+dynamicList_title = Creating dynamic list (dynamicList)
+
+errorValidation_age = Age (number field with range validator)
+
+errorValidation_description = Validation with standard JSF components using custom message component and calypso.css
+
+errorValidation_email = E-mail (field with custom validator)
+
+errorValidation_error = Generate error on server
+
+errorValidation_firstName = First name (required field with minimum 5 character length)
+
+errorValidation_lastName = Last name (required field)
+
+errorValidation_password = Password (required field)
+
+errorValidation_submitLabel = Submit
+
+errorValidation_title = Error Validation (errorValidation)
+
+errorValidation_type = Type (required select field)
+
+event_actionListenerLabel = Proper ActionListener
+
+event_actionMethodLabel = Action listener using method
+
+event_chainedActionListener = Chained ActionListener
+
+event_description = Sample of event usage
+
+event_submitLabel = Submit method
+
+event_title = Events
+
+extendedTable_title = A JSF Table with hide/show columns support
+
+filter = Filter:
+
+form_comment = Comment (h:inputTextArea)
+
+form_description = Sample of JSF form and basic form components
+
+form_menu = Form
+
+form_name = Name (h:inputText)
+
+form_password = Password (h:inputSecret)
+
+form_submitLabel = Submit (h:commandButton)
+
+form_title = h:form sample
+
+form_username = Username (h:inputText)
+
+graphCreate_description =
+
+graphCreate_title = Creating graph (graphCreate)
+
+graphXYCreate_description =
+
+graphXYCreate_title = Creating XY graph (graphXYCreate)
+
+graphs_menu = Graphs
+
+groupCreate_description = Layout using the standard panelGrid and panelGroup tags
+
+groupCreate_title = Creating Group (groupCreate)
+
+group_menu = Group
+
+gthen = >
+
+helpCreate_autohide = Automatic Hide
+
+helpCreate_btn = Button (text from the page)
+
+helpCreate_btn2 = Button (text from a resource file)
+
+helpCreate_btn_tt1 = Button with tooltip (text from the page)
+
+helpCreate_btn_tt2 = Button with tooltip (text from a resource file)
+
+helpCreate_btnpopup = Show Help
+
+helpCreate_description = Help dialog box example page
+
+helpCreate_image1 = Image (default)
+
+helpCreate_image2 = Image (custom)
+
+helpCreate_image_tt1 = Image with tooltip (text from the page)
+
+helpCreate_image_tt2 = Image with tooltip (text from a resource file)
+
+helpCreate_lesssize = Decrease Size
+
+helpCreate_link = Link (text from the page)
+
+helpCreate_link2 = Link (text from a resource file)
+
+helpCreate_link_tt1 = Link with tooltip (text from the page)
+
+helpCreate_link_tt2 = Link with tooltip (text from a resource file)
+
+helpCreate_location = Show location bar
+
+helpCreate_moresize = Increase size
+
+helpCreate_res = Resizable
+
+helpCreate_scroll = Show scrollbars
+
+helpCreate_status = Show status bar
+
+helpCreate_title = Create Help for Page (helpCreate)
+
+helpCreate_toolbar = Show toolbar
+
+help_menu = Help
+
+lthen = <
+
+menuitem_restrictedaccess = Restricted Acess
+
+menuitem_restrictedfunctionality = Restricted Functionality
+
+menuitem_security = Security
+
+navigationModel_description = Sample of JSF Navigation Model and commandLink
+
+navigationModel_linkLabel = Link to page2
+
+navigationModel_submitLabel = Submit
+
+navigationModel_title = Navigation Model
+
+onload_phase_listener = Onload Phase Listener Action
+
+onload_phase_listener_view1 = No Navigation
+
+onload_phase_listener_view2 = Navigate to view3
+
+onload_phase_listener_view4 = Invoke for Ajax requests
+
+outputText_description = This is a sample of h:outputText component
+
+outputText_message = This is a localized message from OutputTextBean
+
+outputText_title = h:outputText sample
+
+popupPickingValue_description =
+
+popupPickingValue_title = Picking Values from Popup
+
+popup_menu = Popup
+
+prompt = Tell us your name:
+
+restrictedFunctionality_adminButton = ROLE_ADMIN only
+
+restrictedFunctionality_adminText = This text can be only seen by user with role ROLE_ADMIN.
+
+restrictedFunctionality_description = It is possible to hide some content on the page. It is possible to have a single JSP page that for example shows some items to all users, but allows editing of items only for admins.
+
+restrictedFunctionality_description2 = Spring security framework also allows restricting access to some Spring beans. This button, although visible to all users, tries to access a Spring bean which is accessible to admins only.
+
+restrictedFunctionality_title = Restricted functionality
+
+restrictedaccess_description = Only users that have a role ROLE_ADMIN can access this page. Also, the link in menu that leads to this page is not shown to other users. To demonstrate this, logout and login as user. The menu link will not be shown and this page cannot be accessed by typing the URL to browser.
+
+restrictedaccess_title = Restricted Access
+
+richTable_description = Sample of how to filter data in table using a RichFaces table instead
+
+richTable_title = Rich Table Filter
+
+richTreeMulti_title = RichTree Multiple Selection
+
+richTreeSimple_title = RichTree simple example
+
+sample_menu = Samples
+
+scrollableDataTable_description = Sample of basic JSF Table with Scrolling Support
+
+scrollableDataTable_title = Basic JSF Table with Scrolling Support
+
+select_description = Sample of differenct select components in JSF
+
+select_menu = Select
+
+select_selectBooleanCheckbox = selectBooleanCheckbox
+
+select_selectManyCheckbox = selectManyCheckbox
+
+select_selectManyListbox = selectManyListbox
+
+select_selectOneListbox = selectOneListbox
+
+select_selectOneMenu = selectOneMenu
+
+select_selectOneRadio = selectOneRadio
+
+select_submitLabel = Submit
+
+select_title = Select components
+
+shuttleSelect_description = ShuttleSelect with selectOneListbox
+
+shuttleSelect_submit = Submit
+
+shuttleSelect_title = Creating shuttle select (shuttleSelect)
+
+tabbedPane_description = Tabbed pane using Tomahawk panelTabbedPane and server side tab switching. Tomahawk tabbed pane does not support Ajax components or MyFaces table or Tomahawk tree2.
+
+tabbedPane_menu = Tabbed pane
+
+tabbedPane_title = Server side tabbed pane (tabbedPane)
+
+tableAjax_description = This table is refreshed using AJAX.
+
+tableAjax_title = Automatically refreshing table (tableAjax)
+
+tableBasicTooltip_description = Sample of basic JSF table without paging or sorting, using tooltips
+
+tableBasicTooltip_title = Basic JSF Table with Tooltips Support
+
+tableBasic_description = Sample of basic JSF table without paging or sorting
+
+tableBasic_title = Basic JSF Table
+
+tableComplete_title = Table Filtering with Autocomplete
+
+tableCreate_description =
+
+tableCreate_title = Creating Table (tableCreate)
+
+tableEdit_description =
+
+tableEdit_title = Editable Table (tableEdit)
+
+tableExport_description = Sample of JSF table that offers Excel and CVS export
+
+tableExport_title = JSF Table with Excel Export Support
+
+tableFilterAJAX_description = Sample of how to filter data in table, now an AJAX call refreshes only the form and table
+
+tableFilterAJAX_title = Refreshing by user action (tableFilter)
+
+tableFilter_description = Sample of how to filter data in table
+
+tableFilter_title = Filtering Table (tableFilter)
+
+tableForm_description = Sample of basic JSF table using form components
+
+tableForm_form_changes = Confirm Changes
+
+tableForm_form_enabled = Enabled
+
+tableForm_form_id = Id
+
+tableForm_form_locations = Locations
+
+tableForm_form_name = Name
+
+tableForm_form_save = Save
+
+tableForm_form_state = Working Mode
+
+tableForm_form_url = Module Description
+
+tableForm_title = Basic JSF Table with Form Elements Support
+
+tableLazyLoad_description = Creating the table with paging support which provides lazyLoading
+
+tableLazyLoad_title = Create Table (lazyLoading)
+
+tablePage_description = Sample of basic JSF table using paging
+
+tablePage_title = Basic JSF Table with Paging Support
+
+table_menu = Table
+
+timeTicker_title = ATimeTickerDemo
+
+tooltipTable_title = Tooltips in a Table
+
+tooltipTree_description = This sample shows how to create NSN Look&Feel compliant tree with tooltips, using Tomahawk tree2 component. Facet name is 'document' and it renders all nodes that have 'document' as their type. Calypso tree already contains this facet. Calypso and Tomahawk trees can be customized and extended by adding facets. More information about tree2 in http://wiki.apache.org/myfaces/Tree2
+
+tooltipTree_title = Custom Tree with Tooltips
+
+tooltip_menu = Tooltip
+
+tooltip_title = Tooltips in Form Components
+
+tooltips_form_button_tooltip = Submit data into the system.
+
+tooltips_form_name = Network Element:
+
+tooltips_form_name_tooltip = Provide the network element's name.
+
+tooltips_form_state = State:
+
+tooltips_form_state_tooltip = Current working state.
+
+tooltips_form_title = Form with Tooltips
+
+tooltips_form_type = Type:
+
+tooltips_form_type_tooltip = The network element type deployed.
+
+tooltips_sample_title = Tooltips Form Example
+
+treeCreate_description = This sample shows how to use Calypso tree. It extends Tomahawk tree2 component, but contains NSN Look&Feel compliant rendering by default.
+
+treeCreate_title = Creating Tree (treeCreate)
+
+treeCustom_description = This sample shows how to create NSN Look&Feel compliant tree using Tomahawk tree2 component. Facet name is 'document' and it renders all nodes that have 'document' as their type. Calypso tree already contains this facet. Calypso and Tomahawk trees can be customized and extended by adding facets. More information about tree2 in http://wiki.apache.org/myfaces/Tree2
+
+treeCustom_selected = Selected:
+
+treeCustom_title = Custom Tree (treeCustom)
+
+treeSort_description =
+
+treeSort_label1 = Sort continents by
+
+treeSort_label2 = Sort countries by
+
+treeSort_title = Sorted Tree (treeSort)
+
+tree_menu = Tree
+
+user_firstName = First Name
+
+user_group = Group
+
+user_id = username
+
+user_lastName = Last Name
+
+validation_firstname = First name:
+
+wizards_menu = Wizards
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/JBIDE5460TestProject/target/classes/log4j.dtd
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/JBIDE5460TestProject/target/classes/log4j.dtd (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/JBIDE5460TestProject/target/classes/log4j.dtd 2010-02-08 17:31:54 UTC (rev 20183)
@@ -0,0 +1,166 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<!-- Authors: Chris Taylor, Ceki Gulcu. -->
+
+<!-- Version: 1.2 -->
+
+<!-- A configuration element consists of optional renderer
+elements,appender elements, categories and an optional root
+element. -->
+
+<!ELEMENT log4j:configuration (renderer*, appender*,(category|logger)*,root?,
+ categoryFactory?)>
+
+<!-- The "threshold" attribute takes a level value such that all -->
+<!-- logging statements with a level equal or below this value are -->
+<!-- disabled. -->
+
+<!-- Setting the "debug" enable the printing of internal log4j logging -->
+<!-- statements. -->
+
+<!-- By default, debug attribute is "null", meaning that we not do touch -->
+<!-- internal log4j logging settings. The "null" value for the threshold -->
+<!-- attribute can be misleading. The threshold field of a repository -->
+<!-- cannot be set to null. The "null" value for the threshold attribute -->
+<!-- simply means don't touch the threshold field, the threshold field -->
+<!-- keeps its old value. -->
+
+<!ATTLIST log4j:configuration
+ xmlns:log4j CDATA #FIXED "http://jakarta.apache.org/log4j/"
+ threshold (all|debug|info|warn|error|fatal|off|null) "null"
+ debug (true|false|null) "null"
+>
+
+<!-- renderer elements allow the user to customize the conversion of -->
+<!-- message objects to String. -->
+
+<!ELEMENT renderer EMPTY>
+<!ATTLIST renderer
+ renderedClass CDATA #REQUIRED
+ renderingClass CDATA #REQUIRED
+>
+
+<!-- Appenders must have a name and a class. -->
+<!-- Appenders may contain an error handler, a layout, optional parameters -->
+<!-- and filters. They may also reference (or include) other appenders. -->
+<!ELEMENT appender (errorHandler?, param*, layout?, filter*, appender-ref*)>
+<!ATTLIST appender
+ name ID #REQUIRED
+ class CDATA #REQUIRED
+>
+
+<!ELEMENT layout (param*)>
+<!ATTLIST layout
+ class CDATA #REQUIRED
+>
+
+<!ELEMENT filter (param*)>
+<!ATTLIST filter
+ class CDATA #REQUIRED
+>
+
+<!-- ErrorHandlers can be of any class. They can admit any number of -->
+<!-- parameters. -->
+
+<!ELEMENT errorHandler (param*, root-ref?, logger-ref*, appender-ref?)>
+<!ATTLIST errorHandler
+ class CDATA #REQUIRED
+>
+
+<!ELEMENT root-ref EMPTY>
+
+<!ELEMENT logger-ref EMPTY>
+<!ATTLIST logger-ref
+ ref IDREF #REQUIRED
+>
+
+<!ELEMENT param EMPTY>
+<!ATTLIST param
+ name CDATA #REQUIRED
+ value CDATA #REQUIRED
+>
+
+
+<!-- The priority class is org.apache.log4j.Level by default -->
+<!ELEMENT priority (param*)>
+<!ATTLIST priority
+ class CDATA #IMPLIED
+ value CDATA #REQUIRED
+>
+
+<!-- The level class is org.apache.log4j.Level by default -->
+<!ELEMENT level (param*)>
+<!ATTLIST level
+ class CDATA #IMPLIED
+ value CDATA #REQUIRED
+>
+
+
+<!-- If no level element is specified, then the configurator MUST not -->
+<!-- touch the level of the named category. -->
+<!ELEMENT category (param*,(priority|level)?,appender-ref*)>
+<!ATTLIST category
+ class CDATA #IMPLIED
+ name CDATA #REQUIRED
+ additivity (true|false) "true"
+>
+
+<!-- If no level element is specified, then the configurator MUST not -->
+<!-- touch the level of the named logger. -->
+<!ELEMENT logger (level?,appender-ref*)>
+<!ATTLIST logger
+ name ID #REQUIRED
+ additivity (true|false) "true"
+>
+
+
+<!ELEMENT categoryFactory (param*)>
+<!ATTLIST categoryFactory
+ class CDATA #REQUIRED>
+
+<!ELEMENT appender-ref EMPTY>
+<!ATTLIST appender-ref
+ ref IDREF #REQUIRED
+>
+
+<!-- If no priority element is specified, then the configurator MUST not -->
+<!-- touch the priority of root. -->
+<!-- The root category always exists and cannot be subclassed. -->
+<!ELEMENT root (param*, (priority|level)?, appender-ref*)>
+
+
+<!-- ==================================================================== -->
+<!-- A logging event -->
+<!-- ==================================================================== -->
+<!ELEMENT log4j:eventSet (log4j:event*)>
+<!ATTLIST log4j:eventSet
+ xmlns:log4j CDATA #FIXED "http://jakarta.apache.org/log4j/"
+ version (1.1|1.2) "1.2"
+ includesLocationInfo (true|false) "true"
+>
+
+
+
+<!ELEMENT log4j:event (log4j:message, log4j:NDC?, log4j:throwable?,
+ log4j:locationInfo?) >
+
+<!-- The timestamp format is application dependent. -->
+<!ATTLIST log4j:event
+ logger CDATA #REQUIRED
+ level CDATA #REQUIRED
+ thread CDATA #REQUIRED
+ timestamp CDATA #REQUIRED
+>
+
+<!ELEMENT log4j:message (#PCDATA)>
+<!ELEMENT log4j:NDC (#PCDATA)>
+
+<!ELEMENT log4j:throwable (#PCDATA)>
+
+<!ELEMENT log4j:locationInfo EMPTY>
+<!ATTLIST log4j:locationInfo
+ class CDATA #REQUIRED
+ method CDATA #REQUIRED
+ file CDATA #REQUIRED
+ line CDATA #REQUIRED
+>
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/JBIDE5460TestProject/target/classes/log4j.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/JBIDE5460TestProject/target/classes/log4j.xml (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/JBIDE5460TestProject/target/classes/log4j.xml 2010-02-08 17:31:54 UTC (rev 20183)
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
+ <appender name="ConsoleAppender" class="org.apache.log4j.ConsoleAppender">
+ <layout class="org.apache.log4j.SimpleLayout" />
+ </appender>
+ <category name="com.nsn" additivity="false">
+ <priority value="debug" />
+ <appender-ref ref="ConsoleAppender" />
+ </category>
+ <root>
+ <priority value="warn" />
+ <appender-ref ref="ConsoleAppender" />
+ </root>
+</log4j:configuration>
\ No newline at end of file
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/JBIDE5460TestProject/target/classes/npedemoResources.properties
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/JBIDE5460TestProject/target/classes/npedemoResources.properties (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/JBIDE5460TestProject/target/classes/npedemoResources.properties 2010-02-08 17:31:54 UTC (rev 20183)
@@ -0,0 +1,522 @@
+#Generated by Eclipse Messages Editor (Eclipse Babel)
+#Tue Jun 10 15:53:48 EEST 2008
+
+ajaxGetTime_description =
+
+ajaxGetTime_title = Automatic Refresh (ajaxGetTime)
+
+ajax_menu = AJAX
+
+alarm_msg = Alarm Message
+
+alarm_type = Alarm Type
+
+basicPopup_btn = Button (text from the page)
+
+basicPopup_btn2 = Button (text from a resource file)
+
+basicPopup_btn_tt1 = Button with tooltip (text from the page)
+
+basicPopup_btn_tt2 = Button with tooltip (text from a resource file)
+
+basicPopup_btnpopup = Show Popup
+
+basicPopup_description =
+
+basicPopup_firstName = FirstName
+
+basicPopup_image1 = Image (default)
+
+basicPopup_image2 = Image (custom)
+
+basicPopup_image_tt1 = Image with tooltip (text from the page)
+
+basicPopup_image_tt2 = Image with tooltip (text from a resource file)
+
+basicPopup_ink2 =
+
+basicPopup_ink_tt1 =
+
+basicPopup_lastName = LastName
+
+basicPopup_lesssize = Decrease Size
+
+basicPopup_link = Link (text from the page)
+
+basicPopup_link2 = Link (text from a resource file)
+
+basicPopup_link_tt1 = Link with tooltip (text from the page)
+
+basicPopup_link_tt2 = Link with tooltip (text from a resource file)
+
+basicPopup_location = Show location bar
+
+basicPopup_moresize = Increase size
+
+basicPopup_msg_close = Press Ok to close this dialog.
+
+basicPopup_res = Resizable
+
+basicPopup_scroll = Show scrollbars
+
+basicPopup_status = Show status bar
+
+basicPopup_title = Creating basic popup (basicPopup)
+
+basicPopup_toolbar = Show toolbar
+
+basicTree_description = Sample of basic JSF tree
+
+basicTree_title = Tree
+
+basicWizard_breadCrumbPage1 = Basic Information
+
+basicWizard_breadCrumbPage2 = Delivery Address
+
+basicWizard_breadCrumbPage3 = Payment Method
+
+basicWizard_button_finish = Finish
+
+basicWizard_button_next = Next >
+
+basicWizard_button_previous = < Previous
+
+basicWizard_city = City:
+
+basicWizard_description =
+
+basicWizard_firstName = Firstname:
+
+basicWizard_lastName = Lastname:
+
+basicWizard_paymentMethod = Payment Method:
+
+basicWizard_postalCode = Postalcode:
+
+basicWizard_street = Street:
+
+basicWizard_title = Creating basic wizard (basicWizard)
+
+button_ok = Ok
+
+button_text = Say Hello
+
+calendarCreate_dateseparator = /
+
+calendarCreate_description =
+
+calendarCreate_head1 = Default calendar
+
+calendarCreate_head10 = Year-select calendar
+
+calendarCreate_head11 = Default calendar, but results are split into multiple fields (m/d/yyyy)
+
+calendarCreate_head12 = Calendar with popup pre-selected to be January 29, 1974 (EU style on the page)
+
+calendarCreate_head13 = Calendar with popup pre-selected to be August 1, 1969 (US style on the page)
+
+calendarCreate_head14 = Calendar with tooltip on image (from a resource bundle)
+
+calendarCreate_head15 = Calendar with tooltip on image (from the page)
+
+calendarCreate_head16 = Calendar opening from button
+
+calendarCreate_head17 = Calendar opening from link
+
+calendarCreate_head18 = Submitting calendar value
+
+calendarCreate_head19 = Changing the inputfield size
+
+calendarCreate_head2 = Default calendar with navigation drop-downs enabled
+
+calendarCreate_head3 = Some dates manually disabled from selection
+
+calendarCreate_head4 = Weekend select
+
+calendarCreate_head5 = Calendar with year navigation enabled
+
+calendarCreate_head6 = Calendar with year navigation enabled and year navigation input enabled to allow manual entering of years
+
+calendarCreate_head7 = Calendar with only Saturdays allowed to be selected
+
+calendarCreate_head8 = Month-select calendar
+
+calendarCreate_head9 = Quarter-select calendar
+
+calendarCreate_title = Creating calendar (calendarCreate)
+
+calendarCreate_tooltip = Open Calendar
+
+calendarScheduling_description =
+
+calendarScheduling_label_end = Choose end time
+
+calendarScheduling_label_start = Choose start time
+
+calendarScheduling_title = Scheduling (calendarScheduling)
+
+calendar_menu = Calendar
+
+collapsible_panel_description = Example page that demonstrates the use of the collapsible panel.
+
+collapsible_panel_menu = Collapsible Panel
+
+collapsible_panel_title = Collapsible Panel
+
+components_menu = JSF Components
+
+dataScroller_pages = {0} Cars found, displaying {1} cars, from {2} to {3}. Page {4} / {5}
+
+dynamicList_description =
+
+dynamicList_label1 = Role
+
+dynamicList_label2 = Actor
+
+dynamicList_label3 = Movie
+
+dynamicList_menu = Dynamic List
+
+dynamicList_title = Creating dynamic list (dynamicList)
+
+errorValidation_age = Age (number field with range validator)
+
+errorValidation_description = Validation with standard JSF components using custom message component and calypso.css
+
+errorValidation_email = E-mail (field with custom validator)
+
+errorValidation_error = Generate error on server
+
+errorValidation_firstName = First name (required field with minimum 5 character length)
+
+errorValidation_lastName = Last name (required field)
+
+errorValidation_password = Password (required field)
+
+errorValidation_submitLabel = Submit
+
+errorValidation_title = Error Validation (errorValidation)
+
+errorValidation_type = Type (required select field)
+
+event_actionListenerLabel = Proper ActionListener
+
+event_actionMethodLabel = Action listener using method
+
+event_chainedActionListener = Chained ActionListener
+
+event_description = Sample of event usage
+
+event_submitLabel = Submit method
+
+event_title = Events
+
+extendedTable_title = A JSF Table with hide/show columns support
+
+filter = Filter:
+
+form_comment = Comment (h:inputTextArea)
+
+form_description = Sample of JSF form and basic form components
+
+form_menu = Form
+
+form_name = Name (h:inputText)
+
+form_password = Password (h:inputSecret)
+
+form_submitLabel = Submit (h:commandButton)
+
+form_title = h:form sample
+
+form_username = Username (h:inputText)
+
+graphCreate_description =
+
+graphCreate_title = Creating graph (graphCreate)
+
+graphXYCreate_description =
+
+graphXYCreate_title = Creating XY graph (graphXYCreate)
+
+graphs_menu = Graphs
+
+groupCreate_description = Layout using the standard panelGrid and panelGroup tags
+
+groupCreate_title = Creating Group (groupCreate)
+
+group_menu = Group
+
+gthen = >
+
+helpCreate_autohide = Automatic Hide
+
+helpCreate_btn = Button (text from the page)
+
+helpCreate_btn2 = Button (text from a resource file)
+
+helpCreate_btn_tt1 = Button with tooltip (text from the page)
+
+helpCreate_btn_tt2 = Button with tooltip (text from a resource file)
+
+helpCreate_btnpopup = Show Help
+
+helpCreate_description = Help dialog box example page
+
+helpCreate_image1 = Image (default)
+
+helpCreate_image2 = Image (custom)
+
+helpCreate_image_tt1 = Image with tooltip (text from the page)
+
+helpCreate_image_tt2 = Image with tooltip (text from a resource file)
+
+helpCreate_lesssize = Decrease Size
+
+helpCreate_link = Link (text from the page)
+
+helpCreate_link2 = Link (text from a resource file)
+
+helpCreate_link_tt1 = Link with tooltip (text from the page)
+
+helpCreate_link_tt2 = Link with tooltip (text from a resource file)
+
+helpCreate_location = Show location bar
+
+helpCreate_moresize = Increase size
+
+helpCreate_res = Resizable
+
+helpCreate_scroll = Show scrollbars
+
+helpCreate_status = Show status bar
+
+helpCreate_title = Create Help for Page (helpCreate)
+
+helpCreate_toolbar = Show toolbar
+
+help_menu = Help
+
+lthen = <
+
+menuitem_restrictedaccess = Restricted Acess
+
+menuitem_restrictedfunctionality = Restricted Functionality
+
+menuitem_security = Security
+
+navigationModel_description = Sample of JSF Navigation Model and commandLink
+
+navigationModel_linkLabel = Link to page2
+
+navigationModel_submitLabel = Submit
+
+navigationModel_title = Navigation Model
+
+onload_phase_listener = Onload Phase Listener Action
+
+onload_phase_listener_view1 = No Navigation
+
+onload_phase_listener_view2 = Navigate to view3
+
+onload_phase_listener_view4 = Invoke for Ajax requests
+
+outputText_description = This is a sample of h:outputText component
+
+outputText_message = This is a localized message from OutputTextBean
+
+outputText_title = h:outputText sample
+
+popupPickingValue_description =
+
+popupPickingValue_title = Picking Values from Popup
+
+popup_menu = Popup
+
+prompt = Tell us your name:
+
+restrictedFunctionality_adminButton = ROLE_ADMIN only
+
+restrictedFunctionality_adminText = This text can be only seen by user with role ROLE_ADMIN.
+
+restrictedFunctionality_description = It is possible to hide some content on the page. It is possible to have a single JSP page that for example shows some items to all users, but allows editing of items only for admins.
+
+restrictedFunctionality_description2 = Spring security framework also allows restricting access to some Spring beans. This button, although visible to all users, tries to access a Spring bean which is accessible to admins only.
+
+restrictedFunctionality_title = Restricted functionality
+
+restrictedaccess_description = Only users that have a role ROLE_ADMIN can access this page. Also, the link in menu that leads to this page is not shown to other users. To demonstrate this, logout and login as user. The menu link will not be shown and this page cannot be accessed by typing the URL to browser.
+
+restrictedaccess_title = Restricted Access
+
+richTable_description = Sample of how to filter data in table using a RichFaces table instead
+
+richTable_title = Rich Table Filter
+
+richTreeMulti_title = RichTree Multiple Selection
+
+richTreeSimple_title = RichTree simple example
+
+sample_menu = Samples
+
+scrollableDataTable_description = Sample of basic JSF Table with Scrolling Support
+
+scrollableDataTable_title = Basic JSF Table with Scrolling Support
+
+select_description = Sample of differenct select components in JSF
+
+select_menu = Select
+
+select_selectBooleanCheckbox = selectBooleanCheckbox
+
+select_selectManyCheckbox = selectManyCheckbox
+
+select_selectManyListbox = selectManyListbox
+
+select_selectOneListbox = selectOneListbox
+
+select_selectOneMenu = selectOneMenu
+
+select_selectOneRadio = selectOneRadio
+
+select_submitLabel = Submit
+
+select_title = Select components
+
+shuttleSelect_description = ShuttleSelect with selectOneListbox
+
+shuttleSelect_submit = Submit
+
+shuttleSelect_title = Creating shuttle select (shuttleSelect)
+
+tabbedPane_description = Tabbed pane using Tomahawk panelTabbedPane and server side tab switching. Tomahawk tabbed pane does not support Ajax components or MyFaces table or Tomahawk tree2.
+
+tabbedPane_menu = Tabbed pane
+
+tabbedPane_title = Server side tabbed pane (tabbedPane)
+
+tableAjax_description = This table is refreshed using AJAX.
+
+tableAjax_title = Automatically refreshing table (tableAjax)
+
+tableBasicTooltip_description = Sample of basic JSF table without paging or sorting, using tooltips
+
+tableBasicTooltip_title = Basic JSF Table with Tooltips Support
+
+tableBasic_description = Sample of basic JSF table without paging or sorting
+
+tableBasic_title = Basic JSF Table
+
+tableComplete_title = Table Filtering with Autocomplete
+
+tableCreate_description =
+
+tableCreate_title = Creating Table (tableCreate)
+
+tableEdit_description =
+
+tableEdit_title = Editable Table (tableEdit)
+
+tableExport_description = Sample of JSF table that offers Excel and CVS export
+
+tableExport_title = JSF Table with Excel Export Support
+
+tableFilterAJAX_description = Sample of how to filter data in table, now an AJAX call refreshes only the form and table
+
+tableFilterAJAX_title = Refreshing by user action (tableFilter)
+
+tableFilter_description = Sample of how to filter data in table
+
+tableFilter_title = Filtering Table (tableFilter)
+
+tableForm_description = Sample of basic JSF table using form components
+
+tableForm_form_changes = Confirm Changes
+
+tableForm_form_enabled = Enabled
+
+tableForm_form_id = Id
+
+tableForm_form_locations = Locations
+
+tableForm_form_name = Name
+
+tableForm_form_save = Save
+
+tableForm_form_state = Working Mode
+
+tableForm_form_url = Module Description
+
+tableForm_title = Basic JSF Table with Form Elements Support
+
+tableLazyLoad_description = Creating the table with paging support which provides lazyLoading
+
+tableLazyLoad_title = Create Table (lazyLoading)
+
+tablePage_description = Sample of basic JSF table using paging
+
+tablePage_title = Basic JSF Table with Paging Support
+
+table_menu = Table
+
+timeTicker_title = ATimeTickerDemo
+
+tooltipTable_title = Tooltips in a Table
+
+tooltipTree_description = This sample shows how to create NSN Look&Feel compliant tree with tooltips, using Tomahawk tree2 component. Facet name is 'document' and it renders all nodes that have 'document' as their type. Calypso tree already contains this facet. Calypso and Tomahawk trees can be customized and extended by adding facets. More information about tree2 in http://wiki.apache.org/myfaces/Tree2
+
+tooltipTree_title = Custom Tree with Tooltips
+
+tooltip_menu = Tooltip
+
+tooltip_title = Tooltips in Form Components
+
+tooltips_form_button_tooltip = Submit data into the system.
+
+tooltips_form_name = Network Element:
+
+tooltips_form_name_tooltip = Provide the network element's name.
+
+tooltips_form_state = State:
+
+tooltips_form_state_tooltip = Current working state.
+
+tooltips_form_title = Form with Tooltips
+
+tooltips_form_type = Type:
+
+tooltips_form_type_tooltip = The network element type deployed.
+
+tooltips_sample_title = Tooltips Form Example
+
+treeCreate_description = This sample shows how to use Calypso tree. It extends Tomahawk tree2 component, but contains NSN Look&Feel compliant rendering by default.
+
+treeCreate_title = Creating Tree (treeCreate)
+
+treeCustom_description = This sample shows how to create NSN Look&Feel compliant tree using Tomahawk tree2 component. Facet name is 'document' and it renders all nodes that have 'document' as their type. Calypso tree already contains this facet. Calypso and Tomahawk trees can be customized and extended by adding facets. More information about tree2 in http://wiki.apache.org/myfaces/Tree2
+
+treeCustom_selected = Selected:
+
+treeCustom_title = Custom Tree (treeCustom)
+
+treeSort_description =
+
+treeSort_label1 = Sort continents by
+
+treeSort_label2 = Sort countries by
+
+treeSort_title = Sorted Tree (treeSort)
+
+tree_menu = Tree
+
+user_firstName = First Name
+
+user_group = Group
+
+user_id = username
+
+user_lastName = Last Name
+
+validation_firstname = First name:
+
+wizards_menu = Wizards
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllTests.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllTests.java 2010-02-08 15:49:52 UTC (rev 20182)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllTests.java 2010-02-08 17:31:54 UTC (rev 20183)
@@ -74,6 +74,7 @@
import org.jboss.tools.jsf.vpe.jsf.test.jbide.OpenOnJsf20Test_JBIDE5382;
import org.jboss.tools.jsf.vpe.jsf.test.jbide.OpenOnTLDPackedInJar_JBIDE5693;
import org.jboss.tools.jsf.vpe.jsf.test.jbide.PreferencesForEditors_JBIDE5692;
+import org.jboss.tools.jsf.vpe.jsf.test.jbide.RefreshBundles_JBIDE5460;
import org.jboss.tools.jsf.vpe.jsf.test.jbide.TaglibXMLUnformatedDTD_JBIDE5642;
import org.jboss.tools.jsf.vpe.jsf.test.jbide.TestFViewLocaleAttribute_JBIDE5218;
import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE675Test;
@@ -114,6 +115,7 @@
public static final String IMPORT_I18N_PROJECT_NAME = "i18nTest"; //$NON-NLS-1$
public static final String IMPORT_NATURES_CHECKER_PROJECT = "naturesCheckTest"; //$NON-NLS-1$
public static final String IMPORT_JSF_LOCALES_PROJECT_NAME = "jsfLocales"; //$NON-NLS-1$
+ public static final String IMPORT_JBIDE5460_PROJECT_NAME = "JBIDE5460TestProject"; //$NON-NLS-1$
public static Test suite() {
@@ -202,6 +204,7 @@
suite.addTestSuite(PreferencesForEditors_JBIDE5692.class);
suite.addTestSuite(NaturesChecker_JBIDE5701.class);
suite.addTestSuite(FacetProcessingTest.class);
+ suite.addTestSuite(RefreshBundles_JBIDE5460.class);
// $JUnit-END$
// added by Max Areshkau
@@ -212,6 +215,11 @@
importBeanJsf1.setImportProjectPath(JsfTestPlugin.getPluginResourcePath());
projectToImport.add(importBeanJsf1);
+ ImportBean importBeanJBIDE5460 = new ImportBean();
+ importBeanJBIDE5460.setImportProjectName(JsfAllTests.IMPORT_JBIDE5460_PROJECT_NAME);
+ importBeanJBIDE5460.setImportProjectPath(JsfTestPlugin.getPluginResourcePath());
+ projectToImport.add(importBeanJBIDE5460);
+
ImportBean importBeanJsf20 = new ImportBean();
importBeanJsf20.setImportProjectName(JsfAllTests.IMPORT_JSF_20_PROJECT_NAME);
importBeanJsf20.setImportProjectPath(JsfTestPlugin.getPluginResourcePath());
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/NaturesChecker_JBIDE5701.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/NaturesChecker_JBIDE5701.java 2010-02-08 15:49:52 UTC (rev 20182)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/NaturesChecker_JBIDE5701.java 2010-02-08 17:31:54 UTC (rev 20183)
@@ -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
+ *
+ * Contributor:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+
package org.jboss.tools.jsf.vpe.jsf.test.jbide;
import org.eclipse.core.resources.IFile;
@@ -13,6 +24,12 @@
import org.jboss.tools.vpe.ui.test.TestUtil;
import org.jboss.tools.vpe.ui.test.VpeTest;
+/**
+ *
+ * @author yzhishko
+ *
+ */
+
public class NaturesChecker_JBIDE5701 extends VpeTest {
private static final String FIRST_TEST_PAGE_NAME = "inputUserName.jsp"; //$NON-NLS-1$
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/RefreshBundles_JBIDE5460.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/RefreshBundles_JBIDE5460.java (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/RefreshBundles_JBIDE5460.java 2010-02-08 17:31:54 UTC (rev 20183)
@@ -0,0 +1,69 @@
+/*******************************************************************************
+ * 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.jsf.vpe.jsf.test.jbide;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.ui.IEditorInput;
+import org.eclipse.ui.part.FileEditorInput;
+import org.jboss.tools.jsf.vpe.jsf.test.JsfAllTests;
+import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor;
+import org.jboss.tools.vpe.ui.test.TestUtil;
+import org.jboss.tools.vpe.ui.test.VpeTest;
+
+/**
+ *
+ * @author yzhishko
+ *
+ */
+
+public class RefreshBundles_JBIDE5460 extends VpeTest {
+
+ private static String TEST_PAGE = "tableBasic/tableBasic.xhtml"; //$NON-NLS-1$
+
+ public RefreshBundles_JBIDE5460(String name) {
+ super(name);
+ }
+
+ public void testRefreshBundles() throws Throwable{
+ IFile file = (IFile) getFile(TEST_PAGE, JsfAllTests.IMPORT_JBIDE5460_PROJECT_NAME);
+
+ assertNotNull("Could not open specified file. componentPage = " //$NON-NLS-1$
+ + TEST_PAGE
+ + ";projectName = " + JsfAllTests.IMPORT_JBIDE5460_PROJECT_NAME, file);//$NON-NLS-1$
+
+ IEditorInput input = new FileEditorInput(file);
+
+ assertNotNull("Editor input is null", input); //$NON-NLS-1$
+ // open and get editor
+
+ JSPMultiPageEditor part = openEditor(input);
+
+ assertNotNull("Editor is not opened", part); //$NON-NLS-1$
+
+ TestUtil.delay(2000);
+ }
+
+ private IResource getFile(String pagePath, String projectName) throws CoreException{
+ IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(
+ projectName);
+ if (project != null) {
+ return project.getFolder("WebContent/html").findMember(pagePath);
+
+ }
+ return null;
+ }
+
+}
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/bundle/BundleMap.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/bundle/BundleMap.java 2010-02-08 15:49:52 UTC (rev 20182)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/bundle/BundleMap.java 2010-02-08 17:31:54 UTC (rev 20183)
@@ -97,7 +97,11 @@
}
IProject project = ((IFileEditorInput) editor.getEditorInput())
.getFile().getProject();
- XModel model = EclipseResourceUtil.getModelNature(project).getModel();
+ IModelNature modelNature = EclipseResourceUtil.getModelNature(project);
+ if (modelNature == null) {
+ return;
+ }
+ XModel model = modelNature.getModel();
List<Object> l = WebPromptingProvider.getInstance().getList(model,
WebPromptingProvider.JSF_REGISTERED_BUNDLES, null, null);
if (l == null || l.size() < 2 || !(l.get(1) instanceof Map)) {
14 years, 9 months
JBoss Tools SVN: r20182 - in trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test: src/org/jboss/tools/jsf/vpe/jsf/test and 1 other directories.
by jbosstools-commits@lists.jboss.org
Author: mareshkau
Date: 2010-02-08 10:49:52 -0500 (Mon, 08 Feb 2010)
New Revision: 20182
Added:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/FacetProcessingTest.java
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/5768/test.xhtml.xml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllTests.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-5768
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/5768/test.xhtml.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/5768/test.xhtml.xml 2010-02-08 15:34:50 UTC (rev 20181)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/5768/test.xhtml.xml 2010-02-08 15:49:52 UTC (rev 20182)
@@ -1,8 +1,54 @@
<tests>
<test id="footerIsMissing">
-
+<TABLE BORDER="1" ID="footerIsMissing" CLASS="dr-table rich-table ">
+<COLGROUP SPAN="0">
+</COLGROUP>
+<THEAD>
+<TR CLASS="dr-table-header rich-table-header " STYLE="/background-image: url\(.*/resources/common/background.gif\);/">
+<TD CLASS="dr-table-headercell rich-table-headercell " COLSPAN="100" SCOPE="colgroup">
+<SPAN CLASS="vpe-text">
+HEADER
+</SPAN>
+</TD>
+</TR>
+</THEAD>
+<TFOOT>
+<TR CLASS="dr-table-footer rich-table-footer " STYLE="/background-image: url\(.*/resources/common/background.gif\);/">
+<TD CLASS="dr-table-footercell rich-table-footercell " COLSPAN="100" SCOPE="colgroup">
+<SPAN CLASS="vpe-text">
+FOOTER
+</SPAN>
+</TD>
+</TR>
+</TFOOT>
+</TABLE>
</test>
<test id="headermIsMissingAsWell">
-
+<TABLE BORDER="1" ID="headermIsMissingAsWell" CLASS="dr-table rich-table ">
+<COLGROUP SPAN="0">
+</COLGROUP>
+<TR>
+<TD COLSPAN="100">
+<DIV VPE:INCLUDE-ELEMENT="yes" STYLE="-moz-user-modify: read-only;">
+<DIV STYLE="-moz-user-modify: read-only;">
+<SPAN CLASS="vpe-text" STYLE="-moz-user-modify: read-only;">
+HEADER
+</SPAN>
+</DIV>
+</DIV>
+</TD>
+</TR>
+<TR>
+<TD COLSPAN="100">
+<DIV VPE:INCLUDE-ELEMENT="yes" STYLE="-moz-user-modify: read-only;">
+<DIV STYLE="-moz-user-modify: read-only;">
+<SPAN CLASS="vpe-text" STYLE="-moz-user-modify: read-only;">
+FOOTER
+</SPAN>
+</DIV>
+</DIV>
+</TD>
+</TR>
+</TABLE>
</test>
</tests>
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllTests.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllTests.java 2010-02-08 15:34:50 UTC (rev 20181)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllTests.java 2010-02-08 15:49:52 UTC (rev 20182)
@@ -17,6 +17,7 @@
import junit.framework.TestSuite;
import org.jboss.tools.jsf.vpe.jsf.test.jbide.ContextMenuDoubleInsertionTest_JBIDE3888;
+import org.jboss.tools.jsf.vpe.jsf.test.jbide.FacetProcessingTest;
import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE1105Test;
import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE1460Test;
import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE1479Test;
@@ -200,6 +201,7 @@
suite.addTestSuite(OpenOnTLDPackedInJar_JBIDE5693.class);
suite.addTestSuite(PreferencesForEditors_JBIDE5692.class);
suite.addTestSuite(NaturesChecker_JBIDE5701.class);
+ suite.addTestSuite(FacetProcessingTest.class);
// $JUnit-END$
// added by Max Areshkau
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/FacetProcessingTest.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/FacetProcessingTest.java (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/FacetProcessingTest.java 2010-02-08 15:49:52 UTC (rev 20182)
@@ -0,0 +1,38 @@
+/*******************************************************************************
+ * 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.vpe.jsf.test.jbide;
+
+import org.jboss.tools.jsf.vpe.jsf.test.JsfAllTests;
+import org.jboss.tools.vpe.ui.test.ComponentContentTest;
+
+/**
+ *JUnit for https://jira.jboss.org/jira/browse/JBIDE-5768
+ *
+ * @author mareshkau
+ *
+ */
+public class FacetProcessingTest extends ComponentContentTest {
+
+ public FacetProcessingTest(String name) {
+ super(name);
+ }
+
+ public void testFacetProcessingTest() throws Throwable{
+ performContentTest("JBIDE/5768/test.xhtml"); //$NON-NLS-1$
+
+
+ }
+ @Override
+ protected String getTestProjectName() {
+ return JsfAllTests.IMPORT_PROJECT_NAME;
+ }
+
+}
14 years, 9 months
JBoss Tools SVN: r20181 - in branches/hibernatetools-switch-to-hibernate-core-3.3/hibernatetools/plugins/org.hibernate.eclipse.console.test: src/org/hibernate/eclipse/console/test/utils/tests and 1 other directory.
by jbosstools-commits@lists.jboss.org
Author: vyemialyanchyk
Date: 2010-02-08 10:34:50 -0500 (Mon, 08 Feb 2010)
New Revision: 20181
Removed:
branches/hibernatetools-switch-to-hibernate-core-3.3/hibernatetools/plugins/org.hibernate.eclipse.console.test/testresources/
Modified:
branches/hibernatetools-switch-to-hibernate-core-3.3/hibernatetools/plugins/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/utils/tests/DriverDeleteTest.java
Log:
delete mysql jar - replace hsqldb - cause it suitable for the test & has suitable licence - same as in trunc
Modified: branches/hibernatetools-switch-to-hibernate-core-3.3/hibernatetools/plugins/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/utils/tests/DriverDeleteTest.java
===================================================================
--- branches/hibernatetools-switch-to-hibernate-core-3.3/hibernatetools/plugins/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/utils/tests/DriverDeleteTest.java 2010-02-08 15:28:27 UTC (rev 20180)
+++ branches/hibernatetools-switch-to-hibernate-core-3.3/hibernatetools/plugins/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/utils/tests/DriverDeleteTest.java 2010-02-08 15:34:50 UTC (rev 20181)
@@ -21,19 +21,15 @@
import java.net.URL;
import java.net.URLClassLoader;
import java.security.AccessController;
+import java.sql.Connection;
import java.sql.Driver;
+import java.sql.SQLException;
import java.security.PrivilegedAction;
import java.sql.DriverManager;
import java.util.ArrayList;
import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.Iterator;
import java.util.List;
-import java.util.Locale;
-import java.util.PropertyResourceBundle;
-import java.util.ResourceBundle;
import java.util.Vector;
-import java.util.jar.JarFile;
import org.eclipse.core.runtime.FileLocator;
import org.eclipse.core.runtime.IPath;
@@ -46,8 +42,6 @@
import org.hibernate.eclipse.console.test.utils.GarbageCollectionUtil;
import org.hibernate.util.ReflectHelper;
-//import sun.reflect.FieldAccessor;
-
import junit.framework.TestCase;
/**
@@ -60,8 +54,17 @@
@SuppressWarnings("restriction")
public class DriverDeleteTest extends TestCase {
- public static final String DRIVER_TEST_NAME = "mysql-connector-java-5.0.7-bin.jar"; //$NON-NLS-1$
- public static final String DRIVER_GET_PATH = "testresources/".replaceAll("//", File.separator) + DRIVER_TEST_NAME; //$NON-NLS-1$ //$NON-NLS-2$
+ //public static final String DRIVER_TEST_NAME = "mysql-connector-java-5.0.7-bin.jar"; //$NON-NLS-1$
+ public static final String DRIVER_TEST_NAME = "hsqldb.jar"; //$NON-NLS-1$
+ //public static final String DRIVER_TEST_CLASS = "com.mysql.jdbc.Driver"; //$NON-NLS-1$
+ public static final String DRIVER_TEST_CLASS = "org.hsqldb.jdbcDriver"; //$NON-NLS-1$
+ //public static final String CONNECTION_USERNAME = "root"; //$NON-NLS-1$
+ public static final String CONNECTION_USERNAME = "sa"; //$NON-NLS-1$
+ //public static final String CONNECTION_PASSWORD = "p@ssw0rd"; //$NON-NLS-1$
+ public static final String CONNECTION_PASSWORD = ""; //$NON-NLS-1$
+ //public static final String CONNECTION_URL = "jdbc:mysql://localhost:3306/jpa"; //$NON-NLS-1$
+ public static final String CONNECTION_URL = "jdbc:hsqldb:."; //$NON-NLS-1$
+ public static final String DRIVER_GET_PATH = "lib/".replaceAll("//", File.separator) + DRIVER_TEST_NAME; //$NON-NLS-1$ //$NON-NLS-2$
public static final String DRIVER_PUT_PATH = "res/".replaceAll("//", File.separator) + DRIVER_TEST_NAME; //$NON-NLS-1$ //$NON-NLS-2$
public static final String PUT_PATH = "res"; //$NON-NLS-1$
@@ -317,20 +320,6 @@
//URLClassLoader urlClassLoader = createClassLoader();
//JarClassLoader urlClassLoader = createJarClassLoader();
final ConsoleConfigClassLoader urlClassLoader = createJarClassLoader2();
- /** /
- prevClassLoader = Thread.currentThread().getContextClassLoader();
- Thread.currentThread().setContextClassLoader(urlClassLoader);
- ClassLoader prevClassLoader22 = Thread.currentThread().getContextClassLoader();
- //
- Class<Driver> driverClass22 = null;
- Class<Driver> driverClass = null;
- try {
- driverClass = (Class<Driver>)urlClassLoader.loadClass("com.mysql.jdbc.Driver"); //$NON-NLS-1$
- } catch (ClassNotFoundException e) {
- e.printStackTrace();
- }
- assertNotNull(driverClass);
- /**/
int numRedDrivers = 0;
//StringWriter wr = new StringWriter();
//PrintWriter pw = new PrintWriter(wr);
@@ -342,7 +331,7 @@
try {
driver = driverClass.newInstance();
//DriverManager.registerDriver(driver);
- //driverClass = ReflectHelper.classForName("com.mysql.jdbc.Driver"); //$NON-NLS-1$
+ //driverClass = ReflectHelper.classForName(DRIVER_TEST_CLASS);
//driver = driverClass.newInstance();
//DriverManager.registerDriver(driver);
//DriverManager.deregisterDriver(driver);
@@ -353,10 +342,10 @@
numRedDrivers++;
}
java.util.Properties info = new java.util.Properties();
- info.put("user", "root");
- info.put("password", "p@ssw0rd2");
- connection = driver.connect("jdbc:mysql://localhost:3306/jpa", info);
- //connection = DriverManager.getConnection("jdbc:mysql://localhost:3306/jpa", "root", "p@ssw0rd");
+ info.put("user", CONNECTION_USERNAME);
+ info.put("password", CONNECTION_PASSWORD);
+ connection = driver.connect(CONNECTION_URL, info);
+ //connection = DriverManager.getConnection(CONNECTION_URL, CONNECTION_USERNAME, CONNECTION_PASSWORD);
test = connection.getCatalog();
connection.close();
DriverManager.deregisterDriver(driver);
@@ -381,31 +370,29 @@
public Object execute() {
try {
Class<Driver> driverClass = null;
- //Class.forName("com.mysql.jdbc.Driver"); //$NON-NLS-1$
+ //Class.forName(DRIVER_TEST_CLASS);
//if (driverClass != null) {
- driverClass = ReflectHelper.classForName("com.mysql.jdbc.Driver"); //$NON-NLS-1$
+ driverClass = ReflectHelper.classForName(DRIVER_TEST_CLASS);
Driver driver2 = driverClass.newInstance();
//DriverManager.registerDriver(driver2);
ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader();
if (contextClassLoader != null) {
- driverClass = (Class<Driver>)contextClassLoader.loadClass("com.mysql.jdbc.Driver"); //$NON-NLS-1$
+ driverClass = (Class<Driver>)contextClassLoader.loadClass(DRIVER_TEST_CLASS);
}
//if (driverClass == null) {
//driverClass.newInstance();
//DriverManager.registerDriver(driverClass.newInstance());
//}
java.util.Properties info = new java.util.Properties();
- info.put("user", "root");
- info.put("password", "p@ssw0rd2");
+ info.put("user", CONNECTION_USERNAME);
+ info.put("password", CONNECTION_PASSWORD);
- /** /
+ /**/
try {
- Connection connection = driver2.connect("jdbc:mysql://localhost:3306/jpa", info);
- //Connection connection = DriverManager.getConnection("jdbc:mysql://localhost:3306/jpa", "root", "p@ssw0rd"); //$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$
+ Connection connection = driver2.connect(CONNECTION_URL, info);
+ //Connection connection = DriverManager.getConnection(CONNECTION_URL, CONNECTION_USERNAME, CONNECTION_PASSWORD); //$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$
//String test = connection.getCatalog();
-
//System.out.println(test);
- //System.out.println(test);
connection.close();
} catch (SQLException e) {
e.printStackTrace();
@@ -415,167 +402,17 @@
Object obj = null;
Field f = null;
- /**/
- Class<com.mysql.jdbc.Connection> connClass = ReflectHelper.classForName("com.mysql.jdbc.Connection"); //$NON-NLS-1$
- f = connClass.getDeclaredField("cancelTimer");
- f.setAccessible(true);
- java.util.Timer timer = (java.util.Timer)f.get(null);
- if (timer != null) {
- timer.cancel();
- timer.purge();
- }
- f.set(null, null);
-
- Class<com.mysql.jdbc.LoadBalancingConnectionProxy> classLoadBalancingConnectionProxyClass = ReflectHelper.classForName("com.mysql.jdbc.LoadBalancingConnectionProxy"); //$NON-NLS-1$
- f = classLoadBalancingConnectionProxyClass.getDeclaredField("getLocalTimeMethod");
- f.setAccessible(true);
- obj = f.get(null);
- f.set(null, null);
-
- Class<com.mysql.jdbc.StandardSocketFactory> classStandardSocketFactory = ReflectHelper.classForName("com.mysql.jdbc.StandardSocketFactory"); //$NON-NLS-1$
- f = classStandardSocketFactory.getDeclaredField("setTraficClassMethod");
- f.setAccessible(true);
- obj = f.get(null);
- f.set(null, null);
-
- Class<com.mysql.jdbc.StringUtils> classStringUtils = ReflectHelper.classForName("com.mysql.jdbc.StringUtils"); //$NON-NLS-1$
- f = classStringUtils.getDeclaredField("toPlainStringMethod");
- f.setAccessible(true);
- obj = f.get(null);
- f.set(null, null);
- /**/
-
- Class<com.mysql.jdbc.Util> classUtil = ReflectHelper.classForName("com.mysql.jdbc.Util"); //$NON-NLS-1$
- f = classUtil.getDeclaredField("systemNanoTimeMethod");
- f.setAccessible(true);
- obj = f.get(null);
- f.set(null, null);
- /** /
- //
- f = classUtil.getDeclaredField("DEFAULT_TIMEZONE");
- f.setAccessible(true);
- obj = f.get(null);
- setStaticFinalField(f, null);
- //
- f = classUtil.getDeclaredField("enclosingInstance");
- f.setAccessible(true);
- obj = f.get(null);
- f.set(null, null);
- /** /
- testStaticObj = Locale.getDefault();
- /**/
- ResourceBundle temp = ResourceBundle.getBundle("com.mysql.jdbc.LocalizedErrorMessages", Locale.getDefault(),
- urlClassLoader);
- /**/
- final String resName = "com.mysql.jdbc.LocalizedErrorMessages".replace('.', '/') + ".properties";
- InputStream stream = (InputStream)java.security.AccessController.doPrivileged(
- new java.security.PrivilegedAction() {
- public Object run() {
- if (urlClassLoader != null) {
- return urlClassLoader.getResourceAsStream(resName);
- } else {
- return ClassLoader.getSystemResourceAsStream(resName);
- }
- }
- }
- );
-
- if (stream != null) {
- // make sure it is buffered
- stream = new java.io.BufferedInputStream(stream);
- java.util.PropertyResourceBundle prb = new PropertyResourceBundle(stream);
- stream.close();
- }
- //
- /**/
- //
- Class<com.mysql.jdbc.Messages> classMessages = ReflectHelper.classForName("com.mysql.jdbc.Messages"); //$NON-NLS-1$
- f = classMessages.getDeclaredField("BUNDLE_NAME");
- f.setAccessible(true);
- obj = f.get(null);
- setStaticFinalField(f, null);
- //
- f = classMessages.getDeclaredField("RESOURCE_BUNDLE");
- f.setAccessible(true);
- obj = f.get(null);
- setStaticFinalField(f, null);
- /**/
- //Class<java.util.ResourceBundle> classResourceBundle = ReflectHelper.classForName("java.util.ResourceBundle"); //$NON-NLS-1$
- //Class<java.util.PropertyResourceBundle> classPropertyResourceBundle = (Class<java.util.PropertyResourceBundle>)obj.getClass();
- Class<java.util.PropertyResourceBundle> classPropertyResourceBundle = (Class<java.util.PropertyResourceBundle>)temp.getClass();
- Class<java.util.ResourceBundle> classResourceBundle = (Class<ResourceBundle>)classPropertyResourceBundle.getSuperclass(); //$NON-NLS-1$
- f = classResourceBundle.getDeclaredField("cacheKey");
- f.setAccessible(true);
- obj = f.get(null);
- setStaticFinalField(f, null);
- //
- f = classResourceBundle.getDeclaredField("underConstruction");
- f.setAccessible(true);
- obj = f.get(null);
- setStaticFinalField(f, null);
- //
- f = classResourceBundle.getDeclaredField("NOT_FOUND");
- f.setAccessible(true);
- obj = f.get(null);
- setStaticFinalField(f, null);
- //
- f = classResourceBundle.getDeclaredField("cacheList");
- f.setAccessible(true);
- obj = f.get(null);
- setStaticFinalField(f, null);
- //
- f = classResourceBundle.getDeclaredField("referenceQueue");
- f.setAccessible(true);
- obj = f.get(null);
- setStaticFinalField(f, null);
- /**/
-
- /**/
- //Class<sun.net.www.protocol.jar.JarURLConnection> classJarURLConnection = ReflectHelper.classForName("sun.net.www.protocol.jar.JarURLConnection"); //$NON-NLS-1$
- //f = classJarURLConnection.getDeclaredField("factory");
- //f.setAccessible(true);
- //obj = f.get(null);
- //f.set(null, null);
- //
- Class classJarFileFactory = obj.getClass();
- f = classJarFileFactory.getDeclaredField("fileCache");
- f.setAccessible(true);
- obj = f.get(null);
- HashMap fileCache = (HashMap)obj;
- f.set(null, null);
- //
- f = classJarFileFactory.getDeclaredField("urlCache");
- f.setAccessible(true);
- obj = f.get(null);
- HashMap urlCache = (HashMap)obj;
- f.set(null, null);
- //
- Iterator it = urlCache.keySet().iterator();
- while (it.hasNext()) {
- JarFile jarFile = (JarFile)it.next();
- if (jarFile.getName().equals(DRIVER_TEST_NAME)) {
- jarFile.close();
- }
- }
- /**/
- //DriverManager.deregisterDriver(driver2);
//}
//contextClassLoader = null;
//driverClass = null;
- } catch (IOException e) {
- e.printStackTrace();
} catch (SecurityException e) {
e.printStackTrace();
- } catch (NoSuchFieldException e) {
- e.printStackTrace();
} catch (InstantiationException e) {
e.printStackTrace();
} catch (IllegalAccessException e) {
e.printStackTrace();
} catch (ClassNotFoundException e) {
e.printStackTrace();
- //} catch (SQLException e) {
- // e.printStackTrace();
}
return null;
}
@@ -595,24 +432,6 @@
urlClassLoader.close();
}
- private static final String MODIFIERS_FIELD = "modifiers";
-
- public static void setStaticFinalField(Field field, Object value)
- throws NoSuchFieldException, IllegalAccessException {
- /** /
- field.setAccessible(true);
- Field modifiersField = Field.class.getDeclaredField(MODIFIERS_FIELD);
- modifiersField.setAccessible(true);
- int modifiers = modifiersField.getInt(field);
- modifiers &= ~Modifier.FINAL;
- modifiersField.setInt(field, modifiers);
- sun.reflect.ReflectionFactory reflection =
- sun.reflect.ReflectionFactory.getReflectionFactory();
- FieldAccessor fa = reflection.newFieldAccessor(field, false);
- fa.set(null, value);
- /**/
- }
-
public void cleanupExecutionContext() {
/** /
if (executionContext != null && executionContext.get() != null) {
@@ -621,7 +440,7 @@
@SuppressWarnings("unchecked")
public Object execute() {
try {
- Class<Driver> driverClass = ReflectHelper.classForName("com.mysql.jdbc.Driver"); //$NON-NLS-1$
+ Class<Driver> driverClass = ReflectHelper.classForName(DRIVER_TEST_CLASS);
DriverManager.deregisterDriver(driverClass.newInstance());
} catch (InstantiationException e) {
e.printStackTrace();
14 years, 9 months
JBoss Tools SVN: r20180 - in trunk/hibernatetools/tests/org.hibernate.eclipse.console.test: src/org/hibernate/eclipse/console/test/utils/tests and 1 other directory.
by jbosstools-commits@lists.jboss.org
Author: vyemialyanchyk
Date: 2010-02-08 10:28:27 -0500 (Mon, 08 Feb 2010)
New Revision: 20180
Removed:
trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/testresources/
Modified:
trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/utils/tests/DriverDeleteTest.java
Log:
delete mysql jar - replace hsqldb - cause it suitable for the test & has suitable licence
Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/utils/tests/DriverDeleteTest.java
===================================================================
--- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/utils/tests/DriverDeleteTest.java 2010-02-08 15:11:24 UTC (rev 20179)
+++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/utils/tests/DriverDeleteTest.java 2010-02-08 15:28:27 UTC (rev 20180)
@@ -21,19 +21,15 @@
import java.net.URL;
import java.net.URLClassLoader;
import java.security.AccessController;
+import java.sql.Connection;
import java.sql.Driver;
+import java.sql.SQLException;
import java.security.PrivilegedAction;
import java.sql.DriverManager;
import java.util.ArrayList;
import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.Iterator;
import java.util.List;
-import java.util.Locale;
-import java.util.PropertyResourceBundle;
-import java.util.ResourceBundle;
import java.util.Vector;
-import java.util.jar.JarFile;
import org.eclipse.core.runtime.FileLocator;
import org.eclipse.core.runtime.IPath;
@@ -46,8 +42,6 @@
import org.hibernate.eclipse.console.test.utils.GarbageCollectionUtil;
import org.hibernate.util.ReflectHelper;
-//import sun.reflect.FieldAccessor;
-
import junit.framework.TestCase;
/**
@@ -60,8 +54,17 @@
@SuppressWarnings("restriction")
public class DriverDeleteTest extends TestCase {
- public static final String DRIVER_TEST_NAME = "mysql-connector-java-5.0.7-bin.jar"; //$NON-NLS-1$
- public static final String DRIVER_GET_PATH = "testresources/".replaceAll("//", File.separator) + DRIVER_TEST_NAME; //$NON-NLS-1$ //$NON-NLS-2$
+ //public static final String DRIVER_TEST_NAME = "mysql-connector-java-5.0.7-bin.jar"; //$NON-NLS-1$
+ public static final String DRIVER_TEST_NAME = "hsqldb.jar"; //$NON-NLS-1$
+ //public static final String DRIVER_TEST_CLASS = "com.mysql.jdbc.Driver"; //$NON-NLS-1$
+ public static final String DRIVER_TEST_CLASS = "org.hsqldb.jdbcDriver"; //$NON-NLS-1$
+ //public static final String CONNECTION_USERNAME = "root"; //$NON-NLS-1$
+ public static final String CONNECTION_USERNAME = "sa"; //$NON-NLS-1$
+ //public static final String CONNECTION_PASSWORD = "p@ssw0rd"; //$NON-NLS-1$
+ public static final String CONNECTION_PASSWORD = ""; //$NON-NLS-1$
+ //public static final String CONNECTION_URL = "jdbc:mysql://localhost:3306/jpa"; //$NON-NLS-1$
+ public static final String CONNECTION_URL = "jdbc:hsqldb:."; //$NON-NLS-1$
+ public static final String DRIVER_GET_PATH = "lib/".replaceAll("//", File.separator) + DRIVER_TEST_NAME; //$NON-NLS-1$ //$NON-NLS-2$
public static final String DRIVER_PUT_PATH = "res/".replaceAll("//", File.separator) + DRIVER_TEST_NAME; //$NON-NLS-1$ //$NON-NLS-2$
public static final String PUT_PATH = "res"; //$NON-NLS-1$
@@ -317,20 +320,6 @@
//URLClassLoader urlClassLoader = createClassLoader();
//JarClassLoader urlClassLoader = createJarClassLoader();
final ConsoleConfigClassLoader urlClassLoader = createJarClassLoader2();
- /** /
- prevClassLoader = Thread.currentThread().getContextClassLoader();
- Thread.currentThread().setContextClassLoader(urlClassLoader);
- ClassLoader prevClassLoader22 = Thread.currentThread().getContextClassLoader();
- //
- Class<Driver> driverClass22 = null;
- Class<Driver> driverClass = null;
- try {
- driverClass = (Class<Driver>)urlClassLoader.loadClass("com.mysql.jdbc.Driver"); //$NON-NLS-1$
- } catch (ClassNotFoundException e) {
- e.printStackTrace();
- }
- assertNotNull(driverClass);
- /**/
int numRedDrivers = 0;
//StringWriter wr = new StringWriter();
//PrintWriter pw = new PrintWriter(wr);
@@ -342,7 +331,7 @@
try {
driver = driverClass.newInstance();
//DriverManager.registerDriver(driver);
- //driverClass = ReflectHelper.classForName("com.mysql.jdbc.Driver"); //$NON-NLS-1$
+ //driverClass = ReflectHelper.classForName(DRIVER_TEST_CLASS);
//driver = driverClass.newInstance();
//DriverManager.registerDriver(driver);
//DriverManager.deregisterDriver(driver);
@@ -353,10 +342,10 @@
numRedDrivers++;
}
java.util.Properties info = new java.util.Properties();
- info.put("user", "root");
- info.put("password", "p@ssw0rd2");
- connection = driver.connect("jdbc:mysql://localhost:3306/jpa", info);
- //connection = DriverManager.getConnection("jdbc:mysql://localhost:3306/jpa", "root", "p@ssw0rd");
+ info.put("user", CONNECTION_USERNAME);
+ info.put("password", CONNECTION_PASSWORD);
+ connection = driver.connect(CONNECTION_URL, info);
+ //connection = DriverManager.getConnection(CONNECTION_URL, CONNECTION_USERNAME, CONNECTION_PASSWORD);
test = connection.getCatalog();
connection.close();
DriverManager.deregisterDriver(driver);
@@ -381,31 +370,29 @@
public Object execute() {
try {
Class<Driver> driverClass = null;
- //Class.forName("com.mysql.jdbc.Driver"); //$NON-NLS-1$
+ //Class.forName(DRIVER_TEST_CLASS);
//if (driverClass != null) {
- driverClass = ReflectHelper.classForName("com.mysql.jdbc.Driver"); //$NON-NLS-1$
+ driverClass = ReflectHelper.classForName(DRIVER_TEST_CLASS);
Driver driver2 = driverClass.newInstance();
//DriverManager.registerDriver(driver2);
ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader();
if (contextClassLoader != null) {
- driverClass = (Class<Driver>)contextClassLoader.loadClass("com.mysql.jdbc.Driver"); //$NON-NLS-1$
+ driverClass = (Class<Driver>)contextClassLoader.loadClass(DRIVER_TEST_CLASS);
}
//if (driverClass == null) {
//driverClass.newInstance();
//DriverManager.registerDriver(driverClass.newInstance());
//}
java.util.Properties info = new java.util.Properties();
- info.put("user", "root");
- info.put("password", "p@ssw0rd2");
+ info.put("user", CONNECTION_USERNAME);
+ info.put("password", CONNECTION_PASSWORD);
- /** /
+ /**/
try {
- Connection connection = driver2.connect("jdbc:mysql://localhost:3306/jpa", info);
- //Connection connection = DriverManager.getConnection("jdbc:mysql://localhost:3306/jpa", "root", "p@ssw0rd"); //$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$
+ Connection connection = driver2.connect(CONNECTION_URL, info);
+ //Connection connection = DriverManager.getConnection(CONNECTION_URL, CONNECTION_USERNAME, CONNECTION_PASSWORD); //$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$
//String test = connection.getCatalog();
-
//System.out.println(test);
- //System.out.println(test);
connection.close();
} catch (SQLException e) {
e.printStackTrace();
@@ -415,167 +402,17 @@
Object obj = null;
Field f = null;
- /**/
- Class<com.mysql.jdbc.Connection> connClass = ReflectHelper.classForName("com.mysql.jdbc.Connection"); //$NON-NLS-1$
- f = connClass.getDeclaredField("cancelTimer");
- f.setAccessible(true);
- java.util.Timer timer = (java.util.Timer)f.get(null);
- if (timer != null) {
- timer.cancel();
- timer.purge();
- }
- f.set(null, null);
-
- Class<com.mysql.jdbc.LoadBalancingConnectionProxy> classLoadBalancingConnectionProxyClass = ReflectHelper.classForName("com.mysql.jdbc.LoadBalancingConnectionProxy"); //$NON-NLS-1$
- f = classLoadBalancingConnectionProxyClass.getDeclaredField("getLocalTimeMethod");
- f.setAccessible(true);
- obj = f.get(null);
- f.set(null, null);
-
- Class<com.mysql.jdbc.StandardSocketFactory> classStandardSocketFactory = ReflectHelper.classForName("com.mysql.jdbc.StandardSocketFactory"); //$NON-NLS-1$
- f = classStandardSocketFactory.getDeclaredField("setTraficClassMethod");
- f.setAccessible(true);
- obj = f.get(null);
- f.set(null, null);
-
- Class<com.mysql.jdbc.StringUtils> classStringUtils = ReflectHelper.classForName("com.mysql.jdbc.StringUtils"); //$NON-NLS-1$
- f = classStringUtils.getDeclaredField("toPlainStringMethod");
- f.setAccessible(true);
- obj = f.get(null);
- f.set(null, null);
- /**/
-
- Class<com.mysql.jdbc.Util> classUtil = ReflectHelper.classForName("com.mysql.jdbc.Util"); //$NON-NLS-1$
- f = classUtil.getDeclaredField("systemNanoTimeMethod");
- f.setAccessible(true);
- obj = f.get(null);
- f.set(null, null);
- /** /
- //
- f = classUtil.getDeclaredField("DEFAULT_TIMEZONE");
- f.setAccessible(true);
- obj = f.get(null);
- setStaticFinalField(f, null);
- //
- f = classUtil.getDeclaredField("enclosingInstance");
- f.setAccessible(true);
- obj = f.get(null);
- f.set(null, null);
- /** /
- testStaticObj = Locale.getDefault();
- /**/
- ResourceBundle temp = ResourceBundle.getBundle("com.mysql.jdbc.LocalizedErrorMessages", Locale.getDefault(),
- urlClassLoader);
- /**/
- final String resName = "com.mysql.jdbc.LocalizedErrorMessages".replace('.', '/') + ".properties";
- InputStream stream = (InputStream)java.security.AccessController.doPrivileged(
- new java.security.PrivilegedAction() {
- public Object run() {
- if (urlClassLoader != null) {
- return urlClassLoader.getResourceAsStream(resName);
- } else {
- return ClassLoader.getSystemResourceAsStream(resName);
- }
- }
- }
- );
-
- if (stream != null) {
- // make sure it is buffered
- stream = new java.io.BufferedInputStream(stream);
- java.util.PropertyResourceBundle prb = new PropertyResourceBundle(stream);
- stream.close();
- }
- //
- /**/
- //
- Class<com.mysql.jdbc.Messages> classMessages = ReflectHelper.classForName("com.mysql.jdbc.Messages"); //$NON-NLS-1$
- f = classMessages.getDeclaredField("BUNDLE_NAME");
- f.setAccessible(true);
- obj = f.get(null);
- setStaticFinalField(f, null);
- //
- f = classMessages.getDeclaredField("RESOURCE_BUNDLE");
- f.setAccessible(true);
- obj = f.get(null);
- setStaticFinalField(f, null);
- /**/
- //Class<java.util.ResourceBundle> classResourceBundle = ReflectHelper.classForName("java.util.ResourceBundle"); //$NON-NLS-1$
- //Class<java.util.PropertyResourceBundle> classPropertyResourceBundle = (Class<java.util.PropertyResourceBundle>)obj.getClass();
- Class<java.util.PropertyResourceBundle> classPropertyResourceBundle = (Class<java.util.PropertyResourceBundle>)temp.getClass();
- Class<java.util.ResourceBundle> classResourceBundle = (Class<ResourceBundle>)classPropertyResourceBundle.getSuperclass(); //$NON-NLS-1$
- f = classResourceBundle.getDeclaredField("cacheKey");
- f.setAccessible(true);
- obj = f.get(null);
- setStaticFinalField(f, null);
- //
- f = classResourceBundle.getDeclaredField("underConstruction");
- f.setAccessible(true);
- obj = f.get(null);
- setStaticFinalField(f, null);
- //
- f = classResourceBundle.getDeclaredField("NOT_FOUND");
- f.setAccessible(true);
- obj = f.get(null);
- setStaticFinalField(f, null);
- //
- f = classResourceBundle.getDeclaredField("cacheList");
- f.setAccessible(true);
- obj = f.get(null);
- setStaticFinalField(f, null);
- //
- f = classResourceBundle.getDeclaredField("referenceQueue");
- f.setAccessible(true);
- obj = f.get(null);
- setStaticFinalField(f, null);
- /**/
-
- /**/
- //Class<sun.net.www.protocol.jar.JarURLConnection> classJarURLConnection = ReflectHelper.classForName("sun.net.www.protocol.jar.JarURLConnection"); //$NON-NLS-1$
- //f = classJarURLConnection.getDeclaredField("factory");
- //f.setAccessible(true);
- //obj = f.get(null);
- //f.set(null, null);
- //
- Class classJarFileFactory = obj.getClass();
- f = classJarFileFactory.getDeclaredField("fileCache");
- f.setAccessible(true);
- obj = f.get(null);
- HashMap fileCache = (HashMap)obj;
- f.set(null, null);
- //
- f = classJarFileFactory.getDeclaredField("urlCache");
- f.setAccessible(true);
- obj = f.get(null);
- HashMap urlCache = (HashMap)obj;
- f.set(null, null);
- //
- Iterator it = urlCache.keySet().iterator();
- while (it.hasNext()) {
- JarFile jarFile = (JarFile)it.next();
- if (jarFile.getName().equals(DRIVER_TEST_NAME)) {
- jarFile.close();
- }
- }
- /**/
- //DriverManager.deregisterDriver(driver2);
//}
//contextClassLoader = null;
//driverClass = null;
- } catch (IOException e) {
- e.printStackTrace();
} catch (SecurityException e) {
e.printStackTrace();
- } catch (NoSuchFieldException e) {
- e.printStackTrace();
} catch (InstantiationException e) {
e.printStackTrace();
} catch (IllegalAccessException e) {
e.printStackTrace();
} catch (ClassNotFoundException e) {
e.printStackTrace();
- //} catch (SQLException e) {
- // e.printStackTrace();
}
return null;
}
@@ -595,24 +432,6 @@
urlClassLoader.close();
}
- private static final String MODIFIERS_FIELD = "modifiers";
-
- public static void setStaticFinalField(Field field, Object value)
- throws NoSuchFieldException, IllegalAccessException {
- /** /
- field.setAccessible(true);
- Field modifiersField = Field.class.getDeclaredField(MODIFIERS_FIELD);
- modifiersField.setAccessible(true);
- int modifiers = modifiersField.getInt(field);
- modifiers &= ~Modifier.FINAL;
- modifiersField.setInt(field, modifiers);
- sun.reflect.ReflectionFactory reflection =
- sun.reflect.ReflectionFactory.getReflectionFactory();
- FieldAccessor fa = reflection.newFieldAccessor(field, false);
- fa.set(null, value);
- /**/
- }
-
public void cleanupExecutionContext() {
/** /
if (executionContext != null && executionContext.get() != null) {
@@ -621,7 +440,7 @@
@SuppressWarnings("unchecked")
public Object execute() {
try {
- Class<Driver> driverClass = ReflectHelper.classForName("com.mysql.jdbc.Driver"); //$NON-NLS-1$
+ Class<Driver> driverClass = ReflectHelper.classForName(DRIVER_TEST_CLASS);
DriverManager.deregisterDriver(driverClass.newInstance());
} catch (InstantiationException e) {
e.printStackTrace();
14 years, 9 months