JBoss Tools SVN: r43777 - in trunk/jsf/tests/org.jboss.tools.jsf.test: projects/jsf2pr/.settings and 3 other directories.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2012-09-17 20:09:00 -0400 (Mon, 17 Sep 2012)
New Revision: 43777
Added:
trunk/jsf/tests/org.jboss.tools.jsf.test/projects/jsf2pr/WebContent/wtpvalidation.xhtml
trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/validation/WTPValidationTest.java
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.test/META-INF/MANIFEST.MF
trunk/jsf/tests/org.jboss.tools.jsf.test/projects/jsf2pr/.settings/org.eclipse.wst.validation.prefs
trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/JsfAllTests.java
Log:
https://issues.jboss.org/browse/JBIDE-12544 JSF Validation error in Java EE Web Project
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 2012-09-17 23:00:20 UTC (rev 43776)
+++ trunk/jsf/tests/org.jboss.tools.jsf.test/META-INF/MANIFEST.MF 2012-09-18 00:09:00 UTC (rev 43777)
@@ -46,7 +46,8 @@
org.jboss.tools.jst.web.kb.test,
org.jboss.tools.common.validation,
org.jboss.tools.common.base.test,
- org.jboss.tools.jsf.base.test;bundle-version="3.3.0"
+ org.jboss.tools.jsf.base.test,
+ org.eclipse.jst.jsf.facelet.ui
Bundle-Activator: org.jboss.tools.jsf.plugin.JsfTestPlugin
Bundle-ActivationPolicy: lazy
Bundle-Localization: plugin
Modified: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/jsf2pr/.settings/org.eclipse.wst.validation.prefs
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.test/projects/jsf2pr/.settings/org.eclipse.wst.validation.prefs 2012-09-17 23:00:20 UTC (rev 43776)
+++ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/jsf2pr/.settings/org.eclipse.wst.validation.prefs 2012-09-18 00:09:00 UTC (rev 43777)
@@ -3,7 +3,7 @@
USER_MANUAL_PREFERENCE=enabledManualValidatorListorg.eclipse.wst.wsi.ui.internal.WSIMessageValidator;org.jboss.tools.common.validation.ValidatorManager;
USER_PREFERENCE=overrideGlobalPreferencestruedisableAllValidationfalseversion1.2.400.v201204260100
eclipse.preferences.version=1
-override=true
+override=false
suspend=false
vals/org.eclipse.jst.jsf.facelet.ui.FaceletHTMLValidator/global=FF01
vf.version=3
Added: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/jsf2pr/WebContent/wtpvalidation.xhtml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.test/projects/jsf2pr/WebContent/wtpvalidation.xhtml (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/jsf2pr/WebContent/wtpvalidation.xhtml 2012-09-18 00:09:00 UTC (rev 43777)
@@ -0,0 +1,7 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:h="http://java.sun.com/jsf/html">
+
+ <h:commandButton id="register" action="#{authenticator.authenticate}" value="Register"/>
+</html>
\ No newline at end of file
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 2012-09-17 23:00:20 UTC (rev 43776)
+++ trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/JsfAllTests.java 2012-09-18 00:09:00 UTC (rev 43777)
@@ -30,6 +30,7 @@
import org.jboss.tools.jsf.test.validation.JSF2ComponentsInClassFolderTest;
import org.jboss.tools.jsf.test.validation.JSF2ComponentsValidatorTest;
import org.jboss.tools.jsf.test.validation.VarAttributesTest;
+import org.jboss.tools.jsf.test.validation.WTPValidationTest;
import org.jboss.tools.jsf.test.validation.WebContentTest;
import org.jboss.tools.jsf.test.validation.XHTMLDetectorAndValidatorTest;
import org.jboss.tools.jsf.test.validation.XHTMLValidatorTest;
@@ -109,6 +110,7 @@
suite.addTest(new ValidationProjectTestSetup(new TestSuite(ELValidatorTest.class),"org.jboss.tools.jsf.test","projects/JSFKickStartOldFormat","JSFKickStartOldFormat"));
suite.addTest(new ValidationProjectTestSetup(new TestSuite(BuilderValidationTest.class),"org.jboss.tools.jsf.test","projects/jsf2pr","jsf2pr"));
suite.addTest(new ValidationProjectTestSetup(new TestSuite(VarAttributesTest.class),"org.jboss.tools.jsf.test","projects/jsf2pr","jsf2pr"));
+ suite.addTest(new ValidationProjectTestSetup(new TestSuite(WTPValidationTest.class),"org.jboss.tools.jsf.test","projects/jsf2pr","jsf2pr"));
suite.addTestSuite(ValidationExceptionTest.class); // This test should be added last!
Added: trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/validation/WTPValidationTest.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/validation/WTPValidationTest.java (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/validation/WTPValidationTest.java 2012-09-18 00:09:00 UTC (rev 43777)
@@ -0,0 +1,37 @@
+/*******************************************************************************
+ * Copyright (c) 2012 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.validation;
+
+import junit.framework.TestCase;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.jboss.tools.tests.AbstractResourceMarkerTest;
+
+/**
+ * @author Alexey Kazakov
+ */
+public class WTPValidationTest extends TestCase {
+
+ IProject project;
+ IFile xhtml;
+
+ @Override
+ protected void setUp() throws Exception {
+ project = ResourcesPlugin.getWorkspace().getRoot().getProject("jsf2pr");
+ xhtml = project.getFile("WebContent/wtpvalidation.xhtml");
+ }
+
+ public void testMethodSignature() throws Exception {
+ AbstractResourceMarkerTest.assertMarkerIsNotCreated(xhtml, AbstractResourceMarkerTest.MARKER_TYPE, ".*", 6);
+ }
+}
\ No newline at end of file
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/validation/WTPValidationTest.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
13 years, 6 months
JBoss Tools SVN: r43776 - trunk/jst/plugins/org.jboss.tools.jst.web.kb.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2012-09-17 19:00:20 -0400 (Mon, 17 Sep 2012)
New Revision: 43776
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web.kb/plugin.xml
Log:
https://issues.jboss.org/browse/JBIDE-12591 Disable WTP Facelet validator for JBT JSF projects
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/plugin.xml
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/plugin.xml 2012-09-17 23:00:06 UTC (rev 43775)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/plugin.xml 2012-09-17 23:00:20 UTC (rev 43776)
@@ -188,6 +188,21 @@
</extension>
<extension
+ id="FaceletValidatorExclude"
+ point="org.eclipse.wst.validation.exclude">
+ <validator
+ id="org.eclipse.jst.jsf.facelet.ui.FaceletHTMLValidator">
+ <exclude>
+ <rules>
+ <projectNature
+ id="org.jboss.tools.jst.web.kb.kbnature">
+ </projectNature>
+ </rules>
+ </exclude>
+ </validator>
+ </extension>
+
+ <extension
id="ELWarnings"
point="org.jboss.tools.common.validation.warnings">
<map
13 years, 6 months
JBoss Tools SVN: r43775 - trunk/jsf/plugins/org.jboss.tools.jsf/META-INF.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2012-09-17 19:00:06 -0400 (Mon, 17 Sep 2012)
New Revision: 43775
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf/META-INF/MANIFEST.MF
Log:
https://issues.jboss.org/browse/JBIDE-12591 Disable WTP Facelet validator for JBT JSF projects
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/META-INF/MANIFEST.MF
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/META-INF/MANIFEST.MF 2012-09-17 22:59:29 UTC (rev 43774)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/META-INF/MANIFEST.MF 2012-09-17 23:00:06 UTC (rev 43775)
@@ -68,9 +68,7 @@
org.jboss.tools.common.text.ext,
org.eclipse.jst.jsp.ui;bundle-version="1.1.600";visibility:=reexport,
org.jboss.tools.jst.jsp,
- org.jboss.tools.common.validation,
- org.eclipse.jst.jsf.facelet.core;bundle-version="1.0.200",
- org.eclipse.jst.jsf.facelet.ui;bundle-version="1.0.1"
+ org.jboss.tools.common.validation
Bundle-Version: 3.4.0.qualifier
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
13 years, 6 months
JBoss Tools SVN: r43774 - trunk/jsf/plugins/org.jboss.tools.jsf/META-INF.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2012-09-17 18:59:29 -0400 (Mon, 17 Sep 2012)
New Revision: 43774
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf/META-INF/MANIFEST.MF
Log:
https://issues.jboss.org/browse/JBIDE-12591 Disable WTP Facelet validator for JBT JSF projects
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/META-INF/MANIFEST.MF
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/META-INF/MANIFEST.MF 2012-09-17 22:03:40 UTC (rev 43773)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/META-INF/MANIFEST.MF 2012-09-17 22:59:29 UTC (rev 43774)
@@ -68,7 +68,9 @@
org.jboss.tools.common.text.ext,
org.eclipse.jst.jsp.ui;bundle-version="1.1.600";visibility:=reexport,
org.jboss.tools.jst.jsp,
- org.jboss.tools.common.validation
+ org.jboss.tools.common.validation,
+ org.eclipse.jst.jsf.facelet.core;bundle-version="1.0.200",
+ org.eclipse.jst.jsf.facelet.ui;bundle-version="1.0.1"
Bundle-Version: 3.4.0.qualifier
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
13 years, 6 months
JBoss Tools SVN: r43773 - trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/loaders.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2012-09-17 18:03:40 -0400 (Mon, 17 Sep 2012)
New Revision: 43773
Modified:
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/loaders/XMLRecognizerContext.java
Log:
JBIDE-12479
https://issues.jboss.org/browse/JBIDE-12479
Dispose reference to char[] of entire text of file in a cached substring.
Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/loaders/XMLRecognizerContext.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/loaders/XMLRecognizerContext.java 2012-09-17 21:08:29 UTC (rev 43772)
+++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/loaders/XMLRecognizerContext.java 2012-09-17 22:03:40 UTC (rev 43773)
@@ -121,7 +121,11 @@
doctypeInfo.publicId = dt.getPublicId();
doctypeInfo.systemId = dt.getSystemId();
doctypeInfo.name = dt.getName();
- doctypes.put(docTypeString, doctypeInfo);
+ //'docTypeString' is a substring of the complete text of the file,
+ //which can be very long; and this substring keeps reference to
+ //char[] of the entire text. Adding an empty string ensures
+ //that the result will not keep the reference.
+ doctypes.put("" + docTypeString, doctypeInfo);
// doctypeInfo.publicId + " " + doctypeInfo.systemId + " " +
// doctypeInfo.name);
return doctypeInfo;
@@ -136,7 +140,8 @@
} catch (IOException e) {
}
}
- doctypes.put(docTypeString, NULL_INFO);
+ //See comment to 'docTypeString' above.
+ doctypes.put("" + docTypeString, NULL_INFO);
return NULL_INFO;
}
13 years, 6 months
JBoss Tools SVN: r43772 - trunk/runtime-soa/tests/org.jboss.tools.runtime.soa.test/src/org/jboss/tools/runtime/test.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-09-17 17:08:29 -0400 (Mon, 17 Sep 2012)
New Revision: 43772
Modified:
trunk/runtime-soa/tests/org.jboss.tools.runtime.soa.test/src/org/jboss/tools/runtime/test/RuntimeDetectionTest.java
Log:
https://issues.jboss.org/browse/JBIDE-12583 more refactoring to resolve moved class(es)
Modified: trunk/runtime-soa/tests/org.jboss.tools.runtime.soa.test/src/org/jboss/tools/runtime/test/RuntimeDetectionTest.java
===================================================================
--- trunk/runtime-soa/tests/org.jboss.tools.runtime.soa.test/src/org/jboss/tools/runtime/test/RuntimeDetectionTest.java 2012-09-17 21:05:44 UTC (rev 43771)
+++ trunk/runtime-soa/tests/org.jboss.tools.runtime.soa.test/src/org/jboss/tools/runtime/test/RuntimeDetectionTest.java 2012-09-17 21:08:29 UTC (rev 43772)
@@ -38,7 +38,7 @@
import org.eclipse.wst.server.core.IRuntimeType;
import org.eclipse.wst.server.core.ServerCore;
import org.jboss.ide.eclipse.as.core.util.IJBossToolingConstants;
-import org.jboss.tools.runtime.as.detector.IJBossRuntimePluginConstants;
+import org.jboss.ide.eclipse.as.core.runtime.IJBossRuntimePluginConstants;
import org.jboss.tools.runtime.core.JBossRuntimeLocator;
import org.jboss.tools.runtime.core.RuntimeCoreActivator;
import org.jboss.tools.runtime.core.internal.InvalidRuntimeDetector;
13 years, 6 months
JBoss Tools SVN: r43771 - trunk/seam/tests/org.jboss.tools.runtime.seam.detector.test/src/org/jboss/tools/runtime/seam/detector/test.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-09-17 17:05:44 -0400 (Mon, 17 Sep 2012)
New Revision: 43771
Modified:
trunk/seam/tests/org.jboss.tools.runtime.seam.detector.test/src/org/jboss/tools/runtime/seam/detector/test/SeamRuntimeDetectionTest.java
Log:
https://issues.jboss.org/browse/JBIDE-12583 more refactoring to resolve moved class(es)
Modified: trunk/seam/tests/org.jboss.tools.runtime.seam.detector.test/src/org/jboss/tools/runtime/seam/detector/test/SeamRuntimeDetectionTest.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.runtime.seam.detector.test/src/org/jboss/tools/runtime/seam/detector/test/SeamRuntimeDetectionTest.java 2012-09-17 20:31:03 UTC (rev 43770)
+++ trunk/seam/tests/org.jboss.tools.runtime.seam.detector.test/src/org/jboss/tools/runtime/seam/detector/test/SeamRuntimeDetectionTest.java 2012-09-17 21:05:44 UTC (rev 43771)
@@ -29,7 +29,7 @@
import org.eclipse.wst.server.core.IServer;
import org.eclipse.wst.server.core.ServerCore;
import org.jboss.ide.eclipse.as.core.util.IJBossToolingConstants;
-import org.jboss.tools.runtime.as.detector.IJBossRuntimePluginConstants;
+import org.jboss.ide.eclipse.as.core.runtime.IJBossRuntimePluginConstants;
import org.jboss.tools.runtime.core.JBossRuntimeLocator;
import org.jboss.tools.runtime.core.RuntimeCoreActivator;
import org.jboss.tools.runtime.core.model.IRuntimeDetector;
13 years, 6 months
JBoss Tools SVN: r43770 - trunk/build.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-09-17 16:31:03 -0400 (Mon, 17 Sep 2012)
New Revision: 43770
Modified:
trunk/build/pom-soa-tooling.xml
Log:
bump parent version and make runtime-soa depend on examples
Modified: trunk/build/pom-soa-tooling.xml
===================================================================
--- trunk/build/pom-soa-tooling.xml 2012-09-17 20:30:57 UTC (rev 43769)
+++ trunk/build/pom-soa-tooling.xml 2012-09-17 20:31:03 UTC (rev 43770)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.jboss.tools</groupId>
<artifactId>parent</artifactId>
- <version>3.3.0.CR1-SNAPSHOT</version>
+ <version>4.0.0.Alpha2-SNAPSHOT</version>
<relativePath>../build/parent/pom.xml</relativePath>
</parent>
<groupId>org.jboss.tools</groupId>
@@ -163,6 +163,7 @@
<module>../esb</module>
<module>../flow</module>
<module>../jbpm</module>
+ <module>../examples</module>
<!-- also needs drools but that's only available as binary upstream so be sure to build it first and resolve from composite staging site -->
<module>../runtime-soa</module>
</modules>
13 years, 6 months
JBoss Tools SVN: r43769 - trunk/seam/tests/org.jboss.tools.runtime.seam.detector.test/META-INF.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-09-17 16:30:57 -0400 (Mon, 17 Sep 2012)
New Revision: 43769
Modified:
trunk/seam/tests/org.jboss.tools.runtime.seam.detector.test/META-INF/MANIFEST.MF
Log:
replace refs to org.jboss.tools.runtime.as.detector with org.jboss.ide.eclipse.as.core
Modified: trunk/seam/tests/org.jboss.tools.runtime.seam.detector.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/seam/tests/org.jboss.tools.runtime.seam.detector.test/META-INF/MANIFEST.MF 2012-09-17 20:29:33 UTC (rev 43768)
+++ trunk/seam/tests/org.jboss.tools.runtime.seam.detector.test/META-INF/MANIFEST.MF 2012-09-17 20:30:57 UTC (rev 43769)
@@ -32,7 +32,7 @@
org.jboss.tools.seam.xml,
org.jboss.tools.seam.xml.ui,
org.jboss.tools.seam.text.ext,
- org.jboss.tools.runtime.as.detector;bundle-version="2.4.0",
+ org.jboss.ide.eclipse.as.core;bundle-version="2.4.0",
org.jboss.tools.runtime.seam.detector;bundle-version="3.4.0"
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
13 years, 6 months