JBoss Tools SVN: r38064 - trunk/freemarker/features/org.jboss.ide.eclipse.freemarker.test.feature.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2012-01-23 20:58:30 -0500 (Mon, 23 Jan 2012)
New Revision: 38064
Modified:
trunk/freemarker/features/org.jboss.ide.eclipse.freemarker.test.feature/feature.properties
Log:
https://issues.jboss.org/browse/JBIDE-8997 (CLONE - 2010 in the copyright headers should be replaced by 2012)
fix for freemarker test feature copyright text format
Modified: trunk/freemarker/features/org.jboss.ide.eclipse.freemarker.test.feature/feature.properties
===================================================================
--- trunk/freemarker/features/org.jboss.ide.eclipse.freemarker.test.feature/feature.properties 2012-01-24 01:56:00 UTC (rev 38063)
+++ trunk/freemarker/features/org.jboss.ide.eclipse.freemarker.test.feature/feature.properties 2012-01-24 01:58:30 UTC (rev 38064)
@@ -32,7 +32,7 @@
Distributed under license by Red Hat, Inc. All rights reserved.\n\
This program is made available under the terms of the\n\
Eclipse Public License v1.0 which accompanies this distribution,\n\
-and is available at http\://www.eclipse.org/legal/epl-v10.html\n\
+and is available at http\://www.eclipse.org/legal/epl-v10.html\n\n\
Contributors\:\n\
Red Hat, Inc. - initial API and implementation
12 years, 11 months
JBoss Tools SVN: r38063 - in trunk/forge/features: org.jboss.tools.forge.test.feature and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2012-01-23 20:56:00 -0500 (Mon, 23 Jan 2012)
New Revision: 38063
Modified:
trunk/forge/features/org.jboss.tools.forge.feature/feature.xml
trunk/forge/features/org.jboss.tools.forge.test.feature/feature.xml
Log:
https://issues.jboss.org/browse/JBIDE-8997 (CLONE - 2010 in the copyright headers should be replaced by 2012)
fix for forge source feature copyright text format
Modified: trunk/forge/features/org.jboss.tools.forge.feature/feature.xml
===================================================================
--- trunk/forge/features/org.jboss.tools.forge.feature/feature.xml 2012-01-24 01:47:57 UTC (rev 38062)
+++ trunk/forge/features/org.jboss.tools.forge.feature/feature.xml 2012-01-24 01:56:00 UTC (rev 38063)
@@ -11,10 +11,7 @@
<copyright url="http://www.example.com/copyright">
JBoss, Home of Professional Open Source
-Copyright (c) 2006-2012 Red Hat, Inc., and individual contributors
-as indicated
-by the @authors tag. See the copyright.txt in the distribution
-for a full listing of individual contributors.
+Copyright (c) 2006-2012 Red Hat, Inc., and individual contributors as indicated by the @authors tag. See the copyright.txt in the distribution for a full listing of individual contributors.
</copyright>
<license url="%licenseURL">
Modified: trunk/forge/features/org.jboss.tools.forge.test.feature/feature.xml
===================================================================
--- trunk/forge/features/org.jboss.tools.forge.test.feature/feature.xml 2012-01-24 01:47:57 UTC (rev 38062)
+++ trunk/forge/features/org.jboss.tools.forge.test.feature/feature.xml 2012-01-24 01:56:00 UTC (rev 38063)
@@ -7,10 +7,7 @@
<copyright>
JBoss, Home of Professional Open Source
-Copyright (c) 2006-2012 Red Hat, Inc., and individual contributors
-as indicated
-by the @authors tag. See the copyright.txt in the distribution
-for a full listing of individual contributors.
+Copyright (c) 2006-2012 Red Hat, Inc., and individual contributors as indicated by the @authors tag. See the copyright.txt in the distribution for a full listing of individual contributors.
</copyright>
<license url="%licenseURL">
12 years, 11 months
JBoss Tools SVN: r38062 - in trunk/cdi/features: org.jboss.tools.cdi.seam.feature and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2012-01-23 20:47:57 -0500 (Mon, 23 Jan 2012)
New Revision: 38062
Modified:
trunk/cdi/features/org.jboss.tools.cdi.feature/feature.properties
trunk/cdi/features/org.jboss.tools.cdi.seam.feature/feature.properties
trunk/cdi/features/org.jboss.tools.cdi.seam.test.feature/feature.properties
trunk/cdi/features/org.jboss.tools.cdi.test.feature/feature.properties
Log:
https://issues.jboss.org/browse/JBIDE-8997 (CLONE - 2010 in the copyright headers should be replaced by 2012)
fix for cdi source feature copyright text
format --This line, and those below, will be ignored--
M cdi/features/org.jboss.tools.cdi.seam.test.feature/feature.properties
M cdi/features/org.jboss.tools.cdi.seam.feature/feature.properties
M cdi/features/org.jboss.tools.cdi.test.feature/feature.properties
M cdi/features/org.jboss.tools.cdi.feature/feature.properties
Modified: trunk/cdi/features/org.jboss.tools.cdi.feature/feature.properties
===================================================================
--- trunk/cdi/features/org.jboss.tools.cdi.feature/feature.properties 2012-01-24 01:44:40 UTC (rev 38061)
+++ trunk/cdi/features/org.jboss.tools.cdi.feature/feature.properties 2012-01-24 01:47:57 UTC (rev 38062)
@@ -21,7 +21,7 @@
licenses. For precise licensing details, consult the corresponding \
source code, or contact Red Hat Legal Affairs, 1801 Varsity Drive, \
Raleigh NC 27606 USA.
-copyright=JBoss, Home of Professional Open Source \
+copyright=JBoss, Home of Professional Open Source\n\
Copyright (c) 2006-2012 Red Hat, Inc., and individual contributors \
as indicated by the @authors tag. See the copyright.txt in the distribution \
for a full listing of individual contributors.
Modified: trunk/cdi/features/org.jboss.tools.cdi.seam.feature/feature.properties
===================================================================
--- trunk/cdi/features/org.jboss.tools.cdi.seam.feature/feature.properties 2012-01-24 01:44:40 UTC (rev 38061)
+++ trunk/cdi/features/org.jboss.tools.cdi.seam.feature/feature.properties 2012-01-24 01:47:57 UTC (rev 38062)
@@ -21,7 +21,7 @@
licenses. For precise licensing details, consult the corresponding \
source code, or contact Red Hat Legal Affairs, 1801 Varsity Drive, \
Raleigh NC 27606 USA.
-copyright=JBoss, Home of Professional Open Source \
+copyright=JBoss, Home of Professional Open Source\n\
Copyright (c) 2006-2012 Red Hat, Inc., and individual contributors \
as indicated by the @authors tag. See the copyright.txt in the distribution \
for a full listing of individual contributors.
Modified: trunk/cdi/features/org.jboss.tools.cdi.seam.test.feature/feature.properties
===================================================================
--- trunk/cdi/features/org.jboss.tools.cdi.seam.test.feature/feature.properties 2012-01-24 01:44:40 UTC (rev 38061)
+++ trunk/cdi/features/org.jboss.tools.cdi.seam.test.feature/feature.properties 2012-01-24 01:47:57 UTC (rev 38062)
@@ -21,7 +21,7 @@
licenses. For precise licensing details, consult the corresponding
source code, or contact Red Hat Legal Affairs, 1801 Varsity Drive,
Raleigh NC 27606 USA.
-copyright=JBoss, Home of Professional Open Source \
+copyright=JBoss, Home of Professional Open Source\n\
Copyright (c) 2006-2012 Red Hat, Inc., and individual contributors \
as indicated by the @authors tag. See the copyright.txt in the distribution \
for a full listing of individual contributors.
Modified: trunk/cdi/features/org.jboss.tools.cdi.test.feature/feature.properties
===================================================================
--- trunk/cdi/features/org.jboss.tools.cdi.test.feature/feature.properties 2012-01-24 01:44:40 UTC (rev 38061)
+++ trunk/cdi/features/org.jboss.tools.cdi.test.feature/feature.properties 2012-01-24 01:47:57 UTC (rev 38062)
@@ -21,7 +21,7 @@
licenses. For precise licensing details, consult the corresponding
source code, or contact Red Hat Legal Affairs, 1801 Varsity Drive,
Raleigh NC 27606 USA.
-copyright=JBoss, Home of Professional Open Source \
+copyright=JBoss, Home of Professional Open Source\n\
Copyright (c) 2006-2012 Red Hat, Inc., and individual contributors \
as indicated by the @authors tag. See the copyright.txt in the distribution \
for a full listing of individual contributors.
12 years, 11 months
JBoss Tools SVN: r38061 - trunk/birt/features/org.jboss.tools.birt.test.source.feature.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2012-01-23 20:44:40 -0500 (Mon, 23 Jan 2012)
New Revision: 38061
Modified:
trunk/birt/features/org.jboss.tools.birt.test.source.feature/feature.xml
Log:
https://issues.jboss.org/browse/JBIDE-8997 (CLONE - 2010 in the copyright headers should be replaced by 2012)
fix for birt test source feature copyright
Modified: trunk/birt/features/org.jboss.tools.birt.test.source.feature/feature.xml
===================================================================
--- trunk/birt/features/org.jboss.tools.birt.test.source.feature/feature.xml 2012-01-24 01:41:57 UTC (rev 38060)
+++ trunk/birt/features/org.jboss.tools.birt.test.source.feature/feature.xml 2012-01-24 01:44:40 UTC (rev 38061)
@@ -6,10 +6,7 @@
</description>
<copyright>
- JBoss, Home of Professional Open Source
-Copyright (c) 2011 Red Hat, Inc., and individual contributors as indicated
-by the @authors tag. See the copyright.txt in the distribution
-for a full listing of individual contributors.
+ %copyright
</copyright>
<license url="%licenseURL">
12 years, 11 months
JBoss Tools SVN: r38060 - in trunk/archives/features: org.jboss.ide.eclipse.archives.test.source.feature and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2012-01-23 20:41:57 -0500 (Mon, 23 Jan 2012)
New Revision: 38060
Modified:
trunk/archives/features/org.jboss.ide.eclipse.archives.source.feature/feature.xml
trunk/archives/features/org.jboss.ide.eclipse.archives.test.source.feature/feature.xml
Log:
https://issues.jboss.org/browse/JBIDE-8997 (CLONE - 2010 in the copyright headers should be replaced by 2012)
fix for archives source features copyright text
Modified: trunk/archives/features/org.jboss.ide.eclipse.archives.source.feature/feature.xml
===================================================================
--- trunk/archives/features/org.jboss.ide.eclipse.archives.source.feature/feature.xml 2012-01-24 01:34:14 UTC (rev 38059)
+++ trunk/archives/features/org.jboss.ide.eclipse.archives.source.feature/feature.xml 2012-01-24 01:41:57 UTC (rev 38060)
@@ -6,10 +6,7 @@
</description>
<copyright>
- JBoss, Home of Professional Open Source
-Copyright (c) 2011 Red Hat, Inc., and individual contributors as indicated
-by the @authors tag. See the copyright.txt in the distribution
-for a full listing of individual contributors.
+ %copyright
</copyright>
<license url="%licenseURL">
Modified: trunk/archives/features/org.jboss.ide.eclipse.archives.test.source.feature/feature.xml
===================================================================
--- trunk/archives/features/org.jboss.ide.eclipse.archives.test.source.feature/feature.xml 2012-01-24 01:34:14 UTC (rev 38059)
+++ trunk/archives/features/org.jboss.ide.eclipse.archives.test.source.feature/feature.xml 2012-01-24 01:41:57 UTC (rev 38060)
@@ -6,10 +6,7 @@
</description>
<copyright>
- JBoss, Home of Professional Open Source
-Copyright (c) 2011 Red Hat, Inc., and individual contributors as indicated
-by the @authors tag. See the copyright.txt in the distribution
-for a full listing of individual contributors.
+ %copyright
</copyright>
<license url="%licenseURL">
12 years, 11 months
JBoss Tools SVN: r38059 - in trunk/jst/tests/org.jboss.tools.jst.web.test: projects/testWebProject/src and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2012-01-23 20:34:14 -0500 (Mon, 23 Jan 2012)
New Revision: 38059
Added:
trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testWebProject/WebContent/WEB-INF/webJAXFX.xml
trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testWebProject/src/test/
trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testWebProject/src/test/MyApplication.java
Modified:
trunk/jst/tests/org.jboss.tools.jst.web.test/src/org/jboss/tools/jst/web/test/WebXMLValidationTest.java
Log:
JBIDE-10645
https://issues.joss.org/browse/JBIDE-10645
Tests for support of JAX-RS in validation of servlet-mapping/servlet-name.
Added: trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testWebProject/WebContent/WEB-INF/webJAXFX.xml
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testWebProject/WebContent/WEB-INF/webJAXFX.xml (rev 0)
+++ trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testWebProject/WebContent/WEB-INF/webJAXFX.xml 2012-01-24 01:34:14 UTC (rev 38059)
@@ -0,0 +1,27 @@
+<web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd">
+ <!-- One of the way of activating REST Servises is adding these lines, the server is responsible for adding the corresponding servlet automatically. If the src folder, org.jboss.as.quickstarts.poh5helloworld.HelloWorld class has the Annotations to receive REST invocation-->
+ <servlet-mapping>
+ <servlet-name>javax.ws.rs.core.Application</servlet-name>
+ <url-pattern>/hello/*</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>test.MyApplication</servlet-name>
+ <url-pattern>/hello/*</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>notaservlet</servlet-name>
+ <url-pattern>/hello/*</url-pattern>
+ </servlet-mapping>
+
+ <servlet>
+ <servlet-name>myServlet</servlet-name>
+ </servlet>
+ <servlet-mapping>
+ <servlet-name>myServlet</servlet-name>
+ <url-pattern>/hello/*</url-pattern>
+ </servlet-mapping>
+</web-app>
Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testWebProject/WebContent/WEB-INF/webJAXFX.xml
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testWebProject/src/test/MyApplication.java
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testWebProject/src/test/MyApplication.java (rev 0)
+++ trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testWebProject/src/test/MyApplication.java 2012-01-24 01:34:14 UTC (rev 38059)
@@ -0,0 +1,5 @@
+package test;
+
+public class MyApplication {
+
+}
Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testWebProject/src/test/MyApplication.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/jst/tests/org.jboss.tools.jst.web.test/src/org/jboss/tools/jst/web/test/WebXMLValidationTest.java
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.web.test/src/org/jboss/tools/jst/web/test/WebXMLValidationTest.java 2012-01-24 01:31:18 UTC (rev 38058)
+++ trunk/jst/tests/org.jboss.tools.jst.web.test/src/org/jboss/tools/jst/web/test/WebXMLValidationTest.java 2012-01-24 01:34:14 UTC (rev 38059)
@@ -24,6 +24,7 @@
import org.jboss.tools.common.validation.ValidatorManager;
import org.jboss.tools.jst.web.validation.WebXMLCoreValidator;
import org.jboss.tools.jst.web.validation.WebXMLValidatorMessages;
+import org.jboss.tools.jst.web.webapp.model.WebAppConstants;
import org.jboss.tools.test.util.JobUtils;
import org.jboss.tools.test.util.ProjectImportTestSetup;
import org.jboss.tools.test.util.ResourcesUtils;
@@ -110,15 +111,41 @@
}
static boolean hasMarkerOnLine(IMarker[] ms, int line) {
+ return getMarkerOnLine(ms, line) != null;
+ }
+
+ static IMarker getMarkerOnLine(IMarker[] ms, int line) {
for (IMarker m: ms) {
int l = m.getAttribute(IMarker.LINE_NUMBER, -1);
if(line == l) {
- return true;
+ return m;
}
}
- return false;
+ return null;
}
+ public void testServletMapping() throws CoreException {
+ IFile webxml = project.getFile("WebContent/WEB-INF/webJAXFX.xml");
+ IMarker[] markers = webxml.findMarkers(WebXMLCoreValidator.PROBLEM_TYPE, false, IResource.DEPTH_ZERO);
+
+ //1. If servlet-mapping/servlet-name=javax.ws.rs.core.Application, it is ok.
+ assertFalse(hasMarkerOnLine(markers, 6));
+
+ //2. If servlet-mapping/servlet-name is a class it should extend javax.ws.rs.core.Application.
+ assertTrue(hasMarkerOnLine(markers, 11));
+ IMarker m = getMarkerOnLine(markers, 11);
+ String expected = NLS.bind(WebXMLValidatorMessages.CLASS_NOT_EXTENDS, new Object[]{WebAppConstants.SERVLET_NAME, "test.MyApplication", "javax.ws.rs.core.Application"});
+ assertEquals(expected, m.getAttribute(IMarker.MESSAGE, ""));
+
+ //3. If servlet-mapping/servlet-name is not a class, it should reference servlet/servlet-name
+ assertTrue(hasMarkerOnLine(markers, 16));
+ m = getMarkerOnLine(markers, 16);
+ expected = NLS.bind(WebXMLValidatorMessages.SERVLET_NOT_EXISTS, new Object[]{WebAppConstants.SERVLET_NAME, "notaservlet"});
+ assertEquals(expected, m.getAttribute(IMarker.MESSAGE, ""));
+
+ assertFalse(hasMarkerOnLine(markers, 24));
+ }
+
public static void replaceFile(IProject project, String sourcePath, String targetPath) throws CoreException {
boolean saveAutoBuild = ResourcesUtils.setBuildAutomatically(false);
try {
12 years, 11 months
JBoss Tools SVN: r38058 - in trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web: validation and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2012-01-23 20:31:18 -0500 (Mon, 23 Jan 2012)
New Revision: 38058
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/model/helpers/WebAppHelper.java
trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/validation/CheckServletMappingName.java
trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/webapp/model/WebAppServletImpl.java
trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/webapp/model/WebAppServletMappingImpl.java
Log:
JBIDE-10645
https://issues.joss.org/browse/JBIDE-10645
Constant is used instead of string.
Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/model/helpers/WebAppHelper.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/model/helpers/WebAppHelper.java 2012-01-24 01:23:45 UTC (rev 38057)
+++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/model/helpers/WebAppHelper.java 2012-01-24 01:31:18 UTC (rev 38058)
@@ -91,7 +91,7 @@
XModelObject[] s = getServlets(webxml);
for (int i = 0; i < s.length; i++) {
if(className != null && className.equals(s[i].getAttributeValue("servlet-class"))) return s[i]; //$NON-NLS-1$
- if(servletName != null && servletName.equals(s[i].getAttributeValue("servlet-name"))) return s[i]; //$NON-NLS-1$
+ if(servletName != null && servletName.equals(s[i].getAttributeValue(WebAppConstants.SERVLET_NAME))) return s[i];
}
return null;
}
@@ -112,7 +112,7 @@
XModelObject folder = webxml.getChildByPath(SERVLET_FOLDER);
if(folder == null) folder = webxml;
s = webxml.getModel().createModelObject(getServletEntity(folder.getModelEntity()), null);
- s.setAttributeValue("servlet-name", servletName); //$NON-NLS-1$
+ s.setAttributeValue(WebAppConstants.SERVLET_NAME, servletName);
s.setAttributeValue("servlet-class", className); //$NON-NLS-1$
DefaultCreateHandler.addCreatedObject(folder, s, -1);
}
@@ -138,7 +138,7 @@
if(webxml == null) return null;
XModelObject[] s = getServletMappings(webxml);
for (int i = 0; i < s.length; i++) {
- if(servletName != null && servletName.equals(s[i].getAttributeValue("servlet-name"))) return s[i]; //$NON-NLS-1$
+ if(servletName != null && servletName.equals(s[i].getAttributeValue(WebAppConstants.SERVLET_NAME))) return s[i];
}
return null;
}
@@ -157,7 +157,7 @@
XModelObject folder = webxml.getChildByPath(SERVLET_FOLDER);
if(folder == null) folder = webxml;
s = webxml.getModel().createModelObject(SERVLET_MAPPING_ENTITY, null);
- s.setAttributeValue("servlet-name", servletName); //$NON-NLS-1$
+ s.setAttributeValue(WebAppConstants.SERVLET_NAME, servletName);
s.setAttributeValue("url-pattern", "*.jsf"); //$NON-NLS-1$ //$NON-NLS-2$
DefaultCreateHandler.addCreatedObject(folder, s, -1);
}
Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/validation/CheckServletMappingName.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/validation/CheckServletMappingName.java 2012-01-24 01:23:45 UTC (rev 38057)
+++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/validation/CheckServletMappingName.java 2012-01-24 01:31:18 UTC (rev 38058)
@@ -17,13 +17,14 @@
import org.jboss.tools.common.validation.ValidationErrorManager;
import org.jboss.tools.jst.web.WebModelPlugin;
import org.jboss.tools.jst.web.model.helpers.WebAppHelper;
+import org.jboss.tools.jst.web.webapp.model.WebAppConstants;
/**
* @author Viacheslav Kabanovich
*/
public class CheckServletMappingName extends Check {
public static String JAX_RS_APPLICATION = "javax.ws.rs.core.Application"; //$NON-NLS-1$
- static String ATTR = "servlet-name"; //$NON-NLS-1$
+ static String ATTR = WebAppConstants.SERVLET_NAME;
boolean acceptEmpty = false;
public CheckServletMappingName(ValidationErrorManager manager, String preference, boolean acceptEmpty) {
Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/webapp/model/WebAppServletImpl.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/webapp/model/WebAppServletImpl.java 2012-01-24 01:23:45 UTC (rev 38057)
+++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/webapp/model/WebAppServletImpl.java 2012-01-24 01:31:18 UTC (rev 38058)
@@ -21,13 +21,13 @@
}
public String name() {
- return getAttributeValue("servlet-name"); //$NON-NLS-1$
+ return getAttributeValue(WebAppConstants.SERVLET_NAME);
}
public String getPresentationString() {
String c = getAttributeValue(WebAppConstants.SERVLET_CLASS);
if(c.length() == 0) c = getAttributeValue(WebAppConstants.JSP_FILE);
- return "" + getAttributeValue("servlet-name") + ":" + c; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ return "" + getAttributeValue(WebAppConstants.SERVLET_NAME) + ":" + c; //$NON-NLS-1$ //$NON-NLS-2$
}
protected void onAttributeValueEdit(String name, String oldValue, String newValue) throws XModelException {
Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/webapp/model/WebAppServletMappingImpl.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/webapp/model/WebAppServletMappingImpl.java 2012-01-24 01:23:45 UTC (rev 38057)
+++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/webapp/model/WebAppServletMappingImpl.java 2012-01-24 01:31:18 UTC (rev 38058)
@@ -16,7 +16,7 @@
private static final long serialVersionUID = 1L;
public String name() {
- return getAttributeValue("servlet-name") + ":" + getAttributeValue("url-pattern"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ return getAttributeValue(WebAppConstants.SERVLET_NAME) + ":" + getAttributeValue("url-pattern"); //$NON-NLS-1$ //$NON-NLS-2$
}
}
12 years, 11 months
JBoss Tools SVN: r38057 - in trunk/seam/tests/org.jboss.tools.seam.core.test: src/org/jboss/tools/seam/core/test and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2012-01-23 20:23:45 -0500 (Mon, 23 Jan 2012)
New Revision: 38057
Modified:
trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/WebContent/varAttributes.xhtml
trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamValidatorsTest.java
Log:
https://issues.jboss.org/browse/JBIDE-10699 EL is not validated if "var" attribute is used
Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/WebContent/varAttributes.xhtml
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/WebContent/varAttributes.xhtml 2012-01-24 01:23:41 UTC (rev 38056)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/WebContent/varAttributes.xhtml 2012-01-24 01:23:45 UTC (rev 38057)
@@ -44,10 +44,18 @@
</h:dataTable>
</h:dataTable>
- <h:dataTable value="#{tipos}" var="_a" border="#{_a.name}"/>
- <h:dataTable value="#{testComponentForVars}" var="_a" border="#{_a.test}"/>
- <h:dataTable value="#{tipos}" var="_a" border="#{_a.nonExistingBroken}"/>
- <h:dataTable value="#{tipos.nonExistingBroken}"/>
+ <h:dataTable value="#{tipos}" var="_a" border="#{_a.name}"/>
+ <h:dataTable value="#{testComponentForVars}" var="_a" border="#{_a.test}"/>
+ <h:dataTable value="#{tipos}" var="_a" border="#{_a.nonExistingBroken}"/>
+ <h:dataTable value="#{tipos.nonExistingBroken}"/>
+ <h:dataTable value="#{setItems}" var="value">
+ <h:outputText value="#{value.nonExistingBroken}"/>
+ </h:dataTable>
+
+ <h:dataTable value="#{nonExistingBroken}" var="valueBroken">
+ <h:outputText value="#{valueBroken.name}"/>
+ </h:dataTable>
+
</ui:define>
</ui:composition>
\ No newline at end of file
Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamValidatorsTest.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamValidatorsTest.java 2012-01-24 01:23:41 UTC (rev 38056)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamValidatorsTest.java 2012-01-24 01:23:45 UTC (rev 38057)
@@ -139,7 +139,7 @@
TestUtil.validate(file);
String messagePattern = MessageFormat.format(ELValidationMessages.UNKNOWN_EL_VARIABLE_PROPERTY_NAME, new Object[]{"nonExistingBroken"});
- AbstractResourceMarkerTest.assertMarkerIsCreated(file, messagePattern, false, 49, 50);
+ AbstractResourceMarkerTest.assertMarkerIsCreated(file, messagePattern, false, 49, 50, 53, 56, 57);
List<IMarker> markers = getMarkersByGroupName(file, SeamValidationErrorManager.MARKED_SEAM_PROJECT_MESSAGE_GROUP);
StringBuffer sb = new StringBuffer("Here is a list of found markers in ").append(file.getFullPath().toOSString()).append(markers.size()==0?" : [": " : [\r\n"); //$NON-NLS-1$ //$NON-NLS-2$");
12 years, 11 months
JBoss Tools SVN: r38056 - in trunk/common/features: org.jboss.tools.common.all.test.feature and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2012-01-23 20:23:41 -0500 (Mon, 23 Jan 2012)
New Revision: 38056
Modified:
trunk/common/features/org.jboss.tools.common.all.feature/feature.properties
trunk/common/features/org.jboss.tools.common.all.test.feature/feature.properties
trunk/common/features/org.jboss.tools.common.all.test.source.feature/feature.xml
Log:
https://issues.jboss.org/browse/JBIDE-8997 CLONE - 2010 in the copyright headers should be replaced by 2012
fixed copyright property reference
Modified: trunk/common/features/org.jboss.tools.common.all.feature/feature.properties
===================================================================
--- trunk/common/features/org.jboss.tools.common.all.feature/feature.properties 2012-01-24 01:17:25 UTC (rev 38055)
+++ trunk/common/features/org.jboss.tools.common.all.feature/feature.properties 2012-01-24 01:23:41 UTC (rev 38056)
@@ -1,4 +1,4 @@
-featureName=JBoss Tools Commons
+featureName=JBoss Tools Common All Feature
featureProvider=JBoss by Red Hat
# "updateSiteName" property - label for the update site
@@ -21,7 +21,7 @@
licenses. For precise licensing details, consult the corresponding \
source code, or contact Red Hat Legal Affairs, 1801 Varsity Drive, \
Raleigh NC 27606 USA.
-copyright=JBoss, Home of Professional Open Source \
+copyright=JBoss, Home of Professional Open Source\n\
Copyright (c) 2006-2012 Red Hat, Inc., and individual contributors as indicated \
by the @authors tag. See the copyright.txt in the distribution \
for a full listing of individual contributors.
Modified: trunk/common/features/org.jboss.tools.common.all.test.feature/feature.properties
===================================================================
--- trunk/common/features/org.jboss.tools.common.all.test.feature/feature.properties 2012-01-24 01:17:25 UTC (rev 38055)
+++ trunk/common/features/org.jboss.tools.common.all.test.feature/feature.properties 2012-01-24 01:23:41 UTC (rev 38056)
@@ -1,4 +1,4 @@
-featureName=JBoss Tools - Tests - Commons
+featureName=JBoss Tools - Tests - Common All
featureProvider=JBoss by Red Hat
# "updateSiteName" property - label for the update site
@@ -21,7 +21,7 @@
licenses. For precise licensing details, consult the corresponding \
source code, or contact Red Hat Legal Affairs, 1801 Varsity Drive, \
Raleigh NC 27606 USA.
-copyright=JBoss, Home of Professional Open Source \
+copyright=JBoss, Home of Professional Open Source\n\
Copyright (c) 2006-2012 Red Hat, Inc., and individual contributors as indicated \
by the @authors tag. See the copyright.txt in the distribution \
for a full listing of individual contributors.
Modified: trunk/common/features/org.jboss.tools.common.all.test.source.feature/feature.xml
===================================================================
--- trunk/common/features/org.jboss.tools.common.all.test.source.feature/feature.xml 2012-01-24 01:17:25 UTC (rev 38055)
+++ trunk/common/features/org.jboss.tools.common.all.test.source.feature/feature.xml 2012-01-24 01:23:41 UTC (rev 38056)
@@ -2,7 +2,7 @@
<feature id="org.jboss.tools.common.all.test.source.feature" label="%featureName" version="3.3.0.qualifier" provider-name="%featureProvider">
<description>%description</description>
- <copyright>copyright=</copyright>
+ <copyright>%copyright</copyright>
<license url="%licenseURL">%license</license>
<plugin id="org.jboss.tools.tests.source" download-size="0" install-size="0" version="0.0.0" />
12 years, 11 months
JBoss Tools SVN: r38055 - trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/ca.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2012-01-23 20:17:25 -0500 (Mon, 23 Jan 2012)
New Revision: 38055
Modified:
trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/ca/AbstractELCompletionEngine.java
Log:
https://issues.jboss.org/browse/JBIDE-10699 EL is not validated if "var" attribute is used
Modified: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/ca/AbstractELCompletionEngine.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/ca/AbstractELCompletionEngine.java 2012-01-24 00:57:53 UTC (rev 38054)
+++ trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/ca/AbstractELCompletionEngine.java 2012-01-24 01:17:25 UTC (rev 38055)
@@ -56,7 +56,6 @@
import org.jboss.tools.common.el.core.resolver.TypeInfoCollector.MemberInfo;
import org.jboss.tools.common.el.core.resolver.TypeInfoCollector.MemberPresentation;
import org.jboss.tools.common.el.core.resolver.Var;
-import org.jboss.tools.common.el.internal.core.model.ELPropertyInvocationImpl;
import org.jboss.tools.common.el.internal.core.parser.token.JavaNameTokenDescription;
import org.jboss.tools.common.el.internal.core.parser.token.WhiteSpaceTokenDescription;
import org.jboss.tools.common.text.TextProposal;
@@ -334,6 +333,11 @@
resolution.setSegments(resultSegments);
var.resolveValue("#{" + var.getElToken().getText() + suffix + "}"); //$NON-NLS-1$ //$NON-NLS-2$
+ // Save all used variables from "value" EL to the list of used variables for EL which uses this "var" attribute.
+ for (ELSegment segment : varELResolution.getSegments()) {
+ firstSegment.getVariables().addAll(segment.getVariables());
+ }
+
ELResolutionImpl oldElResolution = resolveELOperand(file, operand, returnEqualedVariablesOnly, false, offset);
if(oldElResolution!=null) {
resolution.getProposals().addAll(oldElResolution.getProposals());
12 years, 11 months