JBoss Tools SVN: r32241 - trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/project/facet.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-06-20 20:32:01 -0400 (Mon, 20 Jun 2011)
New Revision: 32241
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/project/facet/PostInstallJsfFacetDelegate.java
Log:
JBIDE-9207
https://issues.jboss.org/browse/JBIDE-9207
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/project/facet/PostInstallJsfFacetDelegate.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/project/facet/PostInstallJsfFacetDelegate.java 2011-06-21 00:30:30 UTC (rev 32240)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/project/facet/PostInstallJsfFacetDelegate.java 2011-06-21 00:32:01 UTC (rev 32241)
@@ -7,7 +7,9 @@
import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
import org.jboss.tools.common.model.util.EclipseResourceUtil;
import org.jboss.tools.jsf.project.JSFNature;
+import org.jboss.tools.jst.web.WebModelPlugin;
import org.jboss.tools.jst.web.kb.IKbProject;
+import org.jboss.tools.jst.web.kb.internal.KbBuilder;
/**
*
@@ -21,8 +23,8 @@
*/
public void execute(IProject project, IProjectFacetVersion fv,
Object config, IProgressMonitor monitor) throws CoreException {
- EclipseResourceUtil.addNatureToProject(project, JSFNature.NATURE_ID);
- EclipseResourceUtil.addNatureToProject(project, IKbProject.NATURE_ID);
+ WebModelPlugin.addNatureToProjectWithValidationSupport(project, KbBuilder.BUILDER_ID, IKbProject.NATURE_ID);
+ EclipseResourceUtil.addNatureToProject(project, JSFNature.NATURE_ID);
}
}
14 years, 9 months
JBoss Tools SVN: r32240 - in trunk/jsf/tests/org.jboss.tools.jsf.test: .settings and 11 other directories.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-06-20 20:30:30 -0400 (Mon, 20 Jun 2011)
New Revision: 32240
Added:
trunk/jsf/tests/org.jboss.tools.jsf.test/.repository/
trunk/jsf/tests/org.jboss.tools.jsf.test/.settings/
trunk/jsf/tests/org.jboss.tools.jsf.test/.settings/org.eclipse.jdt.core.prefs
trunk/jsf/tests/org.jboss.tools.jsf.test/projects/web/
trunk/jsf/tests/org.jboss.tools.jsf.test/projects/web/.classpath
trunk/jsf/tests/org.jboss.tools.jsf.test/projects/web/.project
trunk/jsf/tests/org.jboss.tools.jsf.test/projects/web/.settings/
trunk/jsf/tests/org.jboss.tools.jsf.test/projects/web/.settings/.jsdtscope
trunk/jsf/tests/org.jboss.tools.jsf.test/projects/web/.settings/org.eclipse.jdt.core.prefs
trunk/jsf/tests/org.jboss.tools.jsf.test/projects/web/.settings/org.eclipse.wst.common.component
trunk/jsf/tests/org.jboss.tools.jsf.test/projects/web/.settings/org.eclipse.wst.common.project.facet.core.xml
trunk/jsf/tests/org.jboss.tools.jsf.test/projects/web/.settings/org.eclipse.wst.jsdt.ui.superType.container
trunk/jsf/tests/org.jboss.tools.jsf.test/projects/web/.settings/org.eclipse.wst.jsdt.ui.superType.name
trunk/jsf/tests/org.jboss.tools.jsf.test/projects/web/WebContent/
trunk/jsf/tests/org.jboss.tools.jsf.test/projects/web/WebContent/META-INF/
trunk/jsf/tests/org.jboss.tools.jsf.test/projects/web/WebContent/META-INF/MANIFEST.MF
trunk/jsf/tests/org.jboss.tools.jsf.test/projects/web/WebContent/WEB-INF/
trunk/jsf/tests/org.jboss.tools.jsf.test/projects/web/WebContent/WEB-INF/lib/
trunk/jsf/tests/org.jboss.tools.jsf.test/projects/web/WebContent/WEB-INF/web.xml
trunk/jsf/tests/org.jboss.tools.jsf.test/projects/web/build/
trunk/jsf/tests/org.jboss.tools.jsf.test/projects/web/build/classes/
trunk/jsf/tests/org.jboss.tools.jsf.test/projects/web/src/
trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/project/
trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/project/facet/
trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/project/facet/JSFFacetOnExistingProjectTest.java
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.test/.classpath
trunk/jsf/tests/org.jboss.tools.jsf.test/META-INF/MANIFEST.MF
trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/JsfAllTests.java
Log:
JBIDE-9207
https://issues.jboss.org/browse/JBIDE-9207
Modified: trunk/jsf/tests/org.jboss.tools.jsf.test/.classpath
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.test/.classpath 2011-06-20 23:30:17 UTC (rev 32239)
+++ trunk/jsf/tests/org.jboss.tools.jsf.test/.classpath 2011-06-21 00:30:30 UTC (rev 32240)
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="src" path="src"/>
- <classpathentry exported="true" kind="lib" path="lib/xmlunit1.0.jar"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry exported="true" kind="lib" path="lib/xmlunit1.0.jar"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
Added: trunk/jsf/tests/org.jboss.tools.jsf.test/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.test/.settings/org.eclipse.jdt.core.prefs (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.test/.settings/org.eclipse.jdt.core.prefs 2011-06-21 00:30:30 UTC (rev 32240)
@@ -0,0 +1,8 @@
+#Fri Jun 03 11:51:29 PDT 2011
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.6
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.test/.settings/org.eclipse.jdt.core.prefs
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/jsf/tests/org.jboss.tools.jsf.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.test/META-INF/MANIFEST.MF 2011-06-20 23:30:17 UTC (rev 32239)
+++ trunk/jsf/tests/org.jboss.tools.jsf.test/META-INF/MANIFEST.MF 2011-06-21 00:30:30 UTC (rev 32240)
@@ -11,6 +11,7 @@
org.jboss.tools.jsf.model.pv.test,
org.jboss.tools.jsf.plugin,
org.jboss.tools.jsf.test,
+ org.jboss.tools.jsf.test.project.facet,
org.jboss.tools.jsf.test.refactoring,
org.jboss.tools.jsf.test.validation
Require-Bundle:
@@ -35,7 +36,9 @@
org.eclipse.wst.validation,
org.jboss.tools.common.el.core,
org.jboss.tools.jst.jsp,
- org.jboss.tools.common.model.test
+ org.jboss.tools.common.model.test,
+ org.eclipse.wst.common.project.facet.core,
+ org.eclipse.jst.jsf.core
Bundle-Activator: org.jboss.tools.jsf.plugin.JsfTestPlugin
Bundle-ActivationPolicy: lazy
Bundle-Localization: plugin
Added: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/web/.classpath
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.test/projects/web/.classpath (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/web/.classpath 2011-06-21 00:30:30 UTC (rev 32240)
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5">
+ <attributes>
+ <attribute name="owner.project.facets" value="java"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
+ <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
+ <classpathentry kind="output" path="build/classes"/>
+</classpath>
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/web/.classpath
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/web/.project
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.test/projects/web/.project (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/web/.project 2011-06-21 00:30:30 UTC (rev 32240)
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>web</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.wst.jsdt.core.javascriptValidator</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.wst.common.project.facet.core.builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.wst.validation.validationbuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
+ <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
+ <nature>org.eclipse.wst.common.project.facet.core.nature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.eclipse.wst.jsdt.core.jsNature</nature>
+ </natures>
+</projectDescription>
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/web/.project
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/web/.settings/.jsdtscope
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.test/projects/web/.settings/.jsdtscope (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/web/.settings/.jsdtscope 2011-06-21 00:30:30 UTC (rev 32240)
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="WebContent"/>
+ <classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.WebProject">
+ <attributes>
+ <attribute name="hide" value="true"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.baseBrowserLibrary"/>
+ <classpathentry kind="output" path=""/>
+</classpath>
Added: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/web/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.test/projects/web/.settings/org.eclipse.jdt.core.prefs (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/web/.settings/org.eclipse.jdt.core.prefs 2011-06-21 00:30:30 UTC (rev 32240)
@@ -0,0 +1,8 @@
+#Mon Jun 20 16:47:05 PDT 2011
+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.compliance=1.5
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.5
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/web/.settings/org.eclipse.jdt.core.prefs
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/web/.settings/org.eclipse.wst.common.component
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.test/projects/web/.settings/org.eclipse.wst.common.component (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/web/.settings/org.eclipse.wst.common.component 2011-06-21 00:30:30 UTC (rev 32240)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project-modules id="moduleCoreId" project-version="1.5.0">
+ <wb-module deploy-name="web">
+ <wb-resource deploy-path="/" source-path="/WebContent"/>
+ <wb-resource deploy-path="/WEB-INF/classes" source-path="/src"/>
+ <property name="context-root" value="web"/>
+ <property name="java-output-path" value="/web/build/classes"/>
+ </wb-module>
+</project-modules>
Added: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/web/.settings/org.eclipse.wst.common.project.facet.core.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.test/projects/web/.settings/org.eclipse.wst.common.project.facet.core.xml (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/web/.settings/org.eclipse.wst.common.project.facet.core.xml 2011-06-21 00:30:30 UTC (rev 32240)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<faceted-project>
+ <fixed facet="java"/>
+ <fixed facet="wst.jsdt.web"/>
+ <fixed facet="jst.web"/>
+ <installed facet="java" version="1.5"/>
+ <installed facet="jst.web" version="2.5"/>
+ <installed facet="wst.jsdt.web" version="1.0"/>
+</faceted-project>
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/web/.settings/org.eclipse.wst.common.project.facet.core.xml
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/web/.settings/org.eclipse.wst.jsdt.ui.superType.container
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.test/projects/web/.settings/org.eclipse.wst.jsdt.ui.superType.container (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/web/.settings/org.eclipse.wst.jsdt.ui.superType.container 2011-06-21 00:30:30 UTC (rev 32240)
@@ -0,0 +1 @@
+org.eclipse.wst.jsdt.launching.baseBrowserLibrary
\ No newline at end of file
Added: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/web/.settings/org.eclipse.wst.jsdt.ui.superType.name
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.test/projects/web/.settings/org.eclipse.wst.jsdt.ui.superType.name (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/web/.settings/org.eclipse.wst.jsdt.ui.superType.name 2011-06-21 00:30:30 UTC (rev 32240)
@@ -0,0 +1 @@
+Window
\ No newline at end of file
Added: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/web/WebContent/META-INF/MANIFEST.MF
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.test/projects/web/WebContent/META-INF/MANIFEST.MF (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/web/WebContent/META-INF/MANIFEST.MF 2011-06-21 00:30:30 UTC (rev 32240)
@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+Class-Path:
+
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/web/WebContent/META-INF/MANIFEST.MF
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/web/WebContent/WEB-INF/web.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.test/projects/web/WebContent/WEB-INF/web.xml (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/web/WebContent/WEB-INF/web.xml 2011-06-21 00:30:30 UTC (rev 32240)
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" id="WebApp_ID" version="2.5">
+ <display-name>web</display-name>
+ <welcome-file-list>
+ <welcome-file>index.html</welcome-file>
+ <welcome-file>index.htm</welcome-file>
+ <welcome-file>index.jsp</welcome-file>
+ <welcome-file>default.html</welcome-file>
+ <welcome-file>default.htm</welcome-file>
+ <welcome-file>default.jsp</welcome-file>
+ </welcome-file-list>
+</web-app>
\ No newline at end of file
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/web/WebContent/WEB-INF/web.xml
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/JsfAllTests.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/JsfAllTests.java 2011-06-20 23:30:17 UTC (rev 32239)
+++ trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/JsfAllTests.java 2011-06-21 00:30:30 UTC (rev 32240)
@@ -25,6 +25,7 @@
import org.eclipse.wst.validation.internal.operations.ValidatorManager;
import org.jboss.tools.jsf.model.pv.test.JSFPromptingProviderTest;
import org.jboss.tools.jsf.model.pv.test.JsfJbide7975Test;
+import org.jboss.tools.jsf.test.project.facet.JSFFacetOnExistingProjectTest;
import org.jboss.tools.jsf.test.refactoring.ELVariableRefactoringTest;
import org.jboss.tools.jsf.test.refactoring.JSF2RefactoringTest;
import org.jboss.tools.jsf.test.refactoring.MessagePropertyRefactoringTest;
@@ -42,6 +43,7 @@
public static Test suite() {
TestSuite suite = new TestSuite("Test model loading for JSF projects"); //$NON-NLS-1$
suite.addTestSuite(JSFTemplateTest.class);
+ suite.addTestSuite(JSFFacetOnExistingProjectTest.class);
TestSuite old = new TestSuite("Tests are using JSFKickStartOldFormat"); //$NON-NLS-1$
old.addTestSuite(JSFModelTest.class);
old.addTestSuite(ModelFormat_2_0_0_Test.class);
Added: trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/project/facet/JSFFacetOnExistingProjectTest.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/project/facet/JSFFacetOnExistingProjectTest.java (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/project/facet/JSFFacetOnExistingProjectTest.java 2011-06-21 00:30:30 UTC (rev 32240)
@@ -0,0 +1,77 @@
+/*******************************************************************************
+ * Copyright (c) 2011 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.jsf.test.project.facet;
+
+import junit.framework.TestCase;
+
+import org.eclipse.core.resources.ICommand;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.jst.jsf.core.internal.project.facet.JSFFacetInstallDataModelProvider;
+import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
+import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
+import org.eclipse.wst.common.project.facet.core.IFacetedProject;
+import org.eclipse.wst.common.project.facet.core.IProjectFacet;
+import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
+import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
+import org.eclipse.wst.validation.internal.plugin.ValidationPlugin;
+import org.jboss.tools.jst.web.kb.internal.KbBuilder;
+import org.jboss.tools.test.util.JobUtils;
+import org.jboss.tools.test.util.ResourcesUtils;
+
+/**
+ * @author Alexey Kazakov and Viacheslav Kabanovich
+ */
+public class JSFFacetOnExistingProjectTest extends TestCase {
+
+ IProject project;
+
+ @Override
+ protected void setUp() throws Exception {
+ project = ResourcesUtils.importProject("org.jboss.tools.jsf.test", "projects/web");
+ JobUtils.waitForIdle();
+
+ IFacetedProject fproj = ProjectFacetsManager.create(project);
+
+ IProjectFacet jsfFacet = ProjectFacetsManager.getProjectFacet("jst.jsf");
+ IProjectFacetVersion jsfFacetVersion = jsfFacet.getVersion("1.2");
+
+ fproj.installProjectFacet(jsfFacetVersion, createJSFDataModel(), null);
+ JobUtils.waitForIdle();
+ }
+
+ public void testJSFProjectBuilders() throws CoreException {
+ ICommand[] cs = project.getDescription().getBuildSpec();
+ int validation = -1;
+ int kb = -1;
+ for (int i = 0; i < cs.length; i++) {
+ ICommand c = cs[i];
+ if(ValidationPlugin.VALIDATION_BUILDER_ID.equals(c.getBuilderName())) {
+ validation = i;
+ } else if(KbBuilder.BUILDER_ID.equals(c.getBuilderName())) {
+ kb = i;
+ }
+ }
+ assertTrue(kb >= 0);
+ assertTrue(validation > kb);
+ }
+
+ @Override
+ protected void tearDown() throws Exception {
+ ResourcesUtils.deleteProject(project.getName());
+ JobUtils.waitForIdle();
+ }
+
+ protected IDataModel createJSFDataModel() {
+ IDataModel config = DataModelFactory.createDataModel(new JSFFacetInstallDataModelProvider());
+ return config;
+ }
+}
\ No newline at end of file
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/project/facet/JSFFacetOnExistingProjectTest.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
14 years, 9 months
JBoss Tools SVN: r32239 - trunk/documentation/guides/Document_Conventions/en-US.
by jbosstools-commits＠lists.jboss.org
Author: irooskov(a)redhat.com
Date: 2011-06-20 19:30:17 -0400 (Mon, 20 Jun 2011)
New Revision: 32239
Modified:
trunk/documentation/guides/Document_Conventions/en-US/Document_Conventions.xml
Log:
updated
Modified: trunk/documentation/guides/Document_Conventions/en-US/Document_Conventions.xml
===================================================================
--- trunk/documentation/guides/Document_Conventions/en-US/Document_Conventions.xml 2011-06-20 23:28:32 UTC (rev 32238)
+++ trunk/documentation/guides/Document_Conventions/en-US/Document_Conventions.xml 2011-06-20 23:30:17 UTC (rev 32239)
@@ -6,8 +6,6 @@
<book>
<xi:include href="Book_Info.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
<xi:include href="Preface.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- <!--xi:include href="Chapter.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /-->
<xi:include href="Revision_History.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- <index />
</book>
14 years, 9 months
JBoss Tools SVN: r32238 - trunk/documentation/guides/Document_Conventions/en-US.
by jbosstools-commits＠lists.jboss.org
Author: irooskov(a)redhat.com
Date: 2011-06-20 19:28:32 -0400 (Mon, 20 Jun 2011)
New Revision: 32238
Modified:
trunk/documentation/guides/Document_Conventions/en-US/Author_Group.xml
trunk/documentation/guides/Document_Conventions/en-US/Book_Info.xml
trunk/documentation/guides/Document_Conventions/en-US/Revision_History.xml
Log:
updated with removal of feedback file - feedback information is now in every book
Modified: trunk/documentation/guides/Document_Conventions/en-US/Author_Group.xml
===================================================================
--- trunk/documentation/guides/Document_Conventions/en-US/Author_Group.xml 2011-06-20 21:00:20 UTC (rev 32237)
+++ trunk/documentation/guides/Document_Conventions/en-US/Author_Group.xml 2011-06-20 23:28:32 UTC (rev 32238)
@@ -5,9 +5,7 @@
]>
<authorgroup>
<author>
- <firstname>Matthew</firstname>
- <surname>Casperson</surname>
- <email>mcaspers(a)example.com</email>
+ <firstname>Red Hat Documentation Group</firstname>
</author>
</authorgroup>
Modified: trunk/documentation/guides/Document_Conventions/en-US/Book_Info.xml
===================================================================
--- trunk/documentation/guides/Document_Conventions/en-US/Book_Info.xml 2011-06-20 21:00:20 UTC (rev 32237)
+++ trunk/documentation/guides/Document_Conventions/en-US/Book_Info.xml 2011-06-20 23:28:32 UTC (rev 32238)
@@ -7,9 +7,9 @@
<title>Document Conventions</title>
<subtitle>An overview of the document conventions used by the JBoss Developer Studio documentation</subtitle>
<productname>JBoss Developer Studio</productname>
- <productnumber>4.0</productnumber>
- <edition>0</edition>
- <pubsnumber>5</pubsnumber>
+ <productnumber>4.1</productnumber>
+ <edition>4.1.0</edition>
+ <pubsnumber>1</pubsnumber>
<abstract>
<para>
This book lists the document typographic conventions used by the JBoss Developer Studio documentation.
Modified: trunk/documentation/guides/Document_Conventions/en-US/Revision_History.xml
===================================================================
--- trunk/documentation/guides/Document_Conventions/en-US/Revision_History.xml 2011-06-20 21:00:20 UTC (rev 32237)
+++ trunk/documentation/guides/Document_Conventions/en-US/Revision_History.xml 2011-06-20 23:28:32 UTC (rev 32238)
@@ -8,7 +8,21 @@
<simpara>
<revhistory>
<revision>
- <revnumber>0-0</revnumber>
+ <revnumber>1</revnumber>
+ <date>Fri Apr 1 2011</date>
+ <author>
+ <firstname>Isaac</firstname>
+ <surname>Rooskov</surname>
+ <email>irooskov(a)redhat.com</email>
+ </author>
+ <revdescription>
+ <simplelist>
+ <member>Removed unnecessary information</member>
+ </simplelist>
+ </revdescription>
+ </revision>
+ <revision>
+ <revnumber>0</revnumber>
<date>Wed Jan 5 2011</date>
<author>
<firstname>Matthew</firstname>
14 years, 9 months
JBoss Tools SVN: r32237 - trunk/cdi/features/org.jboss.tools.cdi.seam.feature.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2011-06-20 17:00:20 -0400 (Mon, 20 Jun 2011)
New Revision: 32237
Modified:
trunk/cdi/features/org.jboss.tools.cdi.seam.feature/feature.properties
Log:
https://issues.jboss.org/browse/JBIDE-9205
Modified: trunk/cdi/features/org.jboss.tools.cdi.seam.feature/feature.properties
===================================================================
--- trunk/cdi/features/org.jboss.tools.cdi.seam.feature/feature.properties 2011-06-20 19:16:41 UTC (rev 32236)
+++ trunk/cdi/features/org.jboss.tools.cdi.seam.feature/feature.properties 2011-06-20 21:00:20 UTC (rev 32237)
@@ -5,7 +5,7 @@
updateSiteName=JBossTools Update Site
# "description" property - description of the feature
-description=Context and Dependency Injection Tools
+description=Seam 3 Tools
# "licenseURL" property - URL of the "Feature License"
# do not translate value - just change to point to a locale-specific HTML page
14 years, 9 months
JBoss Tools SVN: r32236 - trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/validation.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-06-20 15:16:41 -0400 (Mon, 20 Jun 2011)
New Revision: 32236
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/validation/messages.properties
Log:
JBIDE-9185
https://issues.jboss.org/browse/JBIDE-9185
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/validation/messages.properties
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/validation/messages.properties 2011-06-20 19:15:56 UTC (rev 32235)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/validation/messages.properties 2011-06-20 19:16:41 UTC (rev 32236)
@@ -1,2 +1,2 @@
-AMBIGUOUS_GENERIC_CONFIGURATION_POINT=Several generic configuration points for the same generic configuration have the same set of qualifiers.
+AMBIGUOUS_GENERIC_CONFIGURATION_POINT=Duplicate generic configuration point.
WRONG_TYPE_OF_GENERIC_CONFIGURATION_POINT=Type of generic configuration point must be assignable to the generic configuration type.
14 years, 9 months
JBoss Tools SVN: r32235 - trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.ui/src/org/jboss/tools/cdi/seam/config/ui/preferences.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-06-20 15:15:56 -0400 (Mon, 20 Jun 2011)
New Revision: 32235
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.ui/src/org/jboss/tools/cdi/seam/config/ui/preferences/CDISeamPreferencesMessages.properties
Log:
JBIDE-9185
https://issues.jboss.org/browse/JBIDE-9185
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.ui/src/org/jboss/tools/cdi/seam/config/ui/preferences/CDISeamPreferencesMessages.properties
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.ui/src/org/jboss/tools/cdi/seam/config/ui/preferences/CDISeamPreferencesMessages.properties 2011-06-20 18:51:50 UTC (rev 32234)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.ui/src/org/jboss/tools/cdi/seam/config/ui/preferences/CDISeamPreferencesMessages.properties 2011-06-20 19:15:56 UTC (rev 32235)
@@ -10,5 +10,5 @@
##Section Seam Solder
CDIValidatorConfigurationBlock_section_solder=Seam Solder
-CDIValidatorConfigurationBlock_pb_ambiguousGenericConfigurationPoint_label=Ambiguous generic Configuration Point:
+CDIValidatorConfigurationBlock_pb_ambiguousGenericConfigurationPoint_label=Duplicate Generic Configuration Point:
CDIValidatorConfigurationBlock_pb_wrongTypeOfGenericConfigurationPoint_label=Wrong Type of Generic Configuration Point:
\ No newline at end of file
14 years, 9 months
JBoss Tools SVN: r32234 - in trunk/documentation/whatsnew: forge and 3 other directories.
by jbosstools-commits＠lists.jboss.org
Author: koen.aers(a)jboss.com
Date: 2011-06-20 14:51:50 -0400 (Mon, 20 Jun 2011)
New Revision: 32234
Added:
trunk/documentation/whatsnew/forge/forge-news-3.3.0.M2.html
trunk/documentation/whatsnew/jbpm/images/conditional-transition-warning.png
trunk/documentation/whatsnew/jbpm/images/suppress-condition-warning.png
trunk/documentation/whatsnew/jbpm/jbpm-news-3.3.0.M2.html
Modified:
trunk/documentation/whatsnew/index.html
trunk/documentation/whatsnew/maven/maven-news-3.3.0.M2.html
Log:
JBIDE-9163 & JBIDE-9194
Added: trunk/documentation/whatsnew/forge/forge-news-3.3.0.M2.html
===================================================================
--- trunk/documentation/whatsnew/forge/forge-news-3.3.0.M2.html (rev 0)
+++ trunk/documentation/whatsnew/forge/forge-news-3.3.0.M2.html 2011-06-20 18:51:50 UTC (rev 32234)
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!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">
+<head>
+<meta http-equiv="Content-Language" content="en-us" />
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+<link rel="stylesheet" href="../whatsnew.css"/>
+<title>Forge Tools 3.3.0.M2 What's New</title>
+<script type="text/javascript">
+
+ var _gaq = _gaq || [];
+ _gaq.push(['_setAccount', 'UA-17645367-5']);
+ _gaq.push(['_trackPageview']);
+
+ (function() {
+ var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+ ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+ var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+ })();
+
+</script></head>
+<body>
+<h1>Forge Tools 3.3.0.M2 What's New</h1>
+
+ <p align="right"><a href="../index.html">< Main Index</a> </p>
+
+
+<table border="0" cellpadding="10" cellspacing="0" width="80%">
+
+ <tr>
+ <td colspan="2">
+ <hr/>
+ </td>
+ </tr>
+ <tr>
+ <td valign="top" align="right"><a name="itemname3" id="itemname3"></a><b>Name Change</b></td>
+ <td valign="top">
+ <p>Not a lot of new work has been done in the Forge Tools area for M2. The most important thing is a change of the
+ names of the plugin, feature and Java packages to remove the 'seam' reference. This means that if you upgrade from M1
+ the normal update mechanism will not work as expected for the Forge Tools. Two possible workarounds are to either manually
+ delete the old forge plugin and feature (that is the one that has 'seam' in the name) or else to just create a
+ complete new JBoss Tools installation based on 3.3.0.M2.</p>
+ </td>
+ </tr>
+ <tr>
+ <td colspan="2">
+ <hr/>
+ </td>
+ </tr>
+</table>
+
+</body>
+
+</html>
+
+
Modified: trunk/documentation/whatsnew/index.html
===================================================================
--- trunk/documentation/whatsnew/index.html 2011-06-20 18:50:06 UTC (rev 32233)
+++ trunk/documentation/whatsnew/index.html 2011-06-20 18:51:50 UTC (rev 32234)
@@ -51,6 +51,8 @@
<p><a href="ws/ws-news-1.2.2.M2.html">Webservices Tools</a></p>
<p><a href="modeshape/modeshape-news-3.3.0.M2.html">ModeShape Tools</a></p>
<p><a href="maven/maven-news-3.3.0.M2.html">Maven Tools</a></p>
+ <p><a href="jbpm/jbpm-news-3.3.0.M2.html">jBPM Tools</a></p>
+ <p><a href="forge/forge-news-3.3.0.M2.html">Forge Tools</a></p>
</td>
</tr>
Added: trunk/documentation/whatsnew/jbpm/images/conditional-transition-warning.png
===================================================================
(Binary files differ)
Property changes on: trunk/documentation/whatsnew/jbpm/images/conditional-transition-warning.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/documentation/whatsnew/jbpm/images/suppress-condition-warning.png
===================================================================
(Binary files differ)
Property changes on: trunk/documentation/whatsnew/jbpm/images/suppress-condition-warning.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/documentation/whatsnew/jbpm/jbpm-news-3.3.0.M2.html
===================================================================
--- trunk/documentation/whatsnew/jbpm/jbpm-news-3.3.0.M2.html (rev 0)
+++ trunk/documentation/whatsnew/jbpm/jbpm-news-3.3.0.M2.html 2011-06-20 18:51:50 UTC (rev 32234)
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!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">
+<head>
+<meta http-equiv="Content-Language" content="en-us" />
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+<link rel="stylesheet" href="../whatsnew.css"/>
+<title>jBPM Tools 3.3.0.M2 What's New</title>
+<script type="text/javascript">
+
+ var _gaq = _gaq || [];
+ _gaq.push(['_setAccount', 'UA-17645367-5']);
+ _gaq.push(['_trackPageview']);
+
+ (function() {
+ var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+ ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+ var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+ })();
+
+</script></head>
+<body>
+<h1>jBPM Tools 3.3.0.M2 What's New</h1>
+
+ <p align="right"><a href="../index.html">< Main Index</a> <a href="../forge/forge-news-3.3.0.M2.html">Forge Tools ></a>
+
+
+<table border="0" cellpadding="10" cellspacing="0" width="80%">
+
+ <tr>
+ <td colspan="2">
+ <hr/>
+ <h3>jbpm 3.x</h3>
+ <hr/>
+ </td>
+ </tr>
+ <tr>
+ <td valign="top" align="right"><a name="itemname3" id="itemname3"></a><b>Conditional Transitions</b></td>
+ <td valign="top">
+ <p>Conditional transitions are discouraged if they are leaving other nodes than condition nodes. The property
+ page for the conditions on transitions will display a warning if a condition is added to such a transition.
+ This is illustrated in the below screenshot.</p>
+ <p><img src="images/conditional-transition-warning.png"/></p>
+ <p>The warnings can be suppressed by checking the checkbox on the new 'Compatibility' preference page.
+ <p><img src="images/suppress-condition-warning.png"/></p>
+ </td>
+ </tr>
+ <tr>
+ <td colspan="2">
+ <hr/>
+ </td>
+ </tr>
+</table>
+
+</body>
+
+</html>
+
+
Modified: trunk/documentation/whatsnew/maven/maven-news-3.3.0.M2.html
===================================================================
--- trunk/documentation/whatsnew/maven/maven-news-3.3.0.M2.html 2011-06-20 18:50:06 UTC (rev 32233)
+++ trunk/documentation/whatsnew/maven/maven-news-3.3.0.M2.html 2011-06-20 18:51:50 UTC (rev 32234)
@@ -23,8 +23,8 @@
<body>
<h1>Maven Tools</h1>
-<p align="right"><a href="../index.html">< Main Index</a> <!--<a
- href="../examples/examples-news-3.3.0.M1.html">Project Examples ></a>--></p>
+<p align="right"><a href="../index.html">< Main Index</a> <a
+ href="../jbpm/jbpm-news-3.3.0.M2.html">jBPM Tools ></a></p>
<table border="0" cellpadding="10" cellspacing="0" width="80%">
<tr>
<td colspan="2">
14 years, 9 months
JBoss Tools SVN: r32233 - trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/preferences.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-06-20 14:50:06 -0400 (Mon, 20 Jun 2011)
New Revision: 32233
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/preferences/JSFValidationConfigurationBlock.java
Log:
JBIDE-9185
https://issues.jboss.org/browse/JBIDE-9185
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/preferences/JSFValidationConfigurationBlock.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/preferences/JSFValidationConfigurationBlock.java 2011-06-20 18:46:38 UTC (rev 32232)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/preferences/JSFValidationConfigurationBlock.java 2011-06-20 18:50:06 UTC (rev 32233)
@@ -18,6 +18,7 @@
import org.eclipse.ui.preferences.IWorkbenchPreferenceContainer;
import org.jboss.tools.common.preferences.SeverityPreferences;
import org.jboss.tools.common.ui.preferences.SeverityConfigurationBlock;
+import org.jboss.tools.common.ui.preferences.SeverityConfigurationBlock.SectionDescription;
import org.jboss.tools.jsf.JSFModelPlugin;
import org.jboss.tools.jsf.web.validation.JSFSeverityPreferences;
@@ -43,10 +44,8 @@
private static Key[] getKeys() {
ArrayList<Key> keys = new ArrayList<Key>();
- for (int i = 0; i < ALL_SECTIONS.length; i++) {
- for (int j = 0; j < ALL_SECTIONS[i].options.length; j++) {
- keys.add(ALL_SECTIONS[i].options[j].key);
- }
+ for (SectionDescription s: ALL_SECTIONS) {
+ s.collectKeys(keys);
}
keys.add(MAX_NUMBER_OF_PROBLEMS_KEY);
keys.add(WRONG_BUILDER_ORDER_KEY);
14 years, 9 months
JBoss Tools SVN: r32232 - in trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi: internal/core/validation and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-06-20 14:46:38 -0400 (Mon, 20 Jun 2011)
New Revision: 32232
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/extension/feature/IValidatorFeature.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDIValidationErrorManager.java
Log:
JBIDE-9185
https://issues.jboss.org/browse/JBIDE-9185
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/extension/feature/IValidatorFeature.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/extension/feature/IValidatorFeature.java 2011-06-20 18:15:41 UTC (rev 32231)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/extension/feature/IValidatorFeature.java 2011-06-20 18:46:38 UTC (rev 32232)
@@ -12,6 +12,7 @@
import org.eclipse.core.resources.IFile;
import org.jboss.tools.cdi.internal.core.validation.CDICoreValidator;
+import org.jboss.tools.common.preferences.SeverityPreferences;
/**
*
@@ -28,4 +29,6 @@
*/
public void validateResource(IFile file, CDICoreValidator validator);
+ public SeverityPreferences getSeverityPreferences();
+
}
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java 2011-06-20 18:15:41 UTC (rev 32231)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java 2011-06-20 18:46:38 UTC (rev 32232)
@@ -435,7 +435,9 @@
}
Set<IValidatorFeature> extensions = cdiProject.getNature().getExtensionManager().getValidatorFeature();
for (IValidatorFeature v: extensions) {
+ setSeverityPreferences(v.getSeverityPreferences());
v.validateResource(file, this);
+ setSeverityPreferences(null);
}
}
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDIValidationErrorManager.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDIValidationErrorManager.java 2011-06-20 18:15:41 UTC (rev 32231)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDIValidationErrorManager.java 2011-06-20 18:46:38 UTC (rev 32232)
@@ -12,6 +12,7 @@
import org.eclipse.core.resources.IProject;
import org.jboss.tools.cdi.core.preferences.CDIPreferences;
+import org.jboss.tools.common.preferences.SeverityPreferences;
import org.jboss.tools.jst.web.kb.internal.validation.KBValidator;
abstract public class CDIValidationErrorManager extends KBValidator {
@@ -35,9 +36,15 @@
*/
@Override
protected String getPreference(IProject project, String preferenceKey) {
- return CDIPreferences.getInstance().getProjectPreference(project, preferenceKey);
+ return severityPreferences.getProjectPreference(project, preferenceKey);
}
+ SeverityPreferences severityPreferences = CDIPreferences.getInstance();
+
+ protected void setSeverityPreferences(SeverityPreferences severityPreferences) {
+ this.severityPreferences = (severityPreferences == null) ? CDIPreferences.getInstance() : severityPreferences;
+ }
+
/*
* (non-Javadoc)
* @see org.jboss.tools.jst.web.kb.internal.validation.ValidationErrorManager#getMaxNumberOfMarkersPerFile(org.eclipse.core.resources.IProject)
14 years, 9 months