JBoss Tools SVN: r37963 - trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2012-01-18 20:33:40 -0500 (Wed, 18 Jan 2012)
New Revision: 37963
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/XHTMLDetector.java
Log:
https://issues.jboss.org/browse/JBIDE-10472 CLONE - XHTML Validator hangs eclipse
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/XHTMLDetector.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/XHTMLDetector.java 2012-01-19 00:53:49 UTC (rev 37962)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/XHTMLDetector.java 2012-01-19 01:33:40 UTC (rev 37963)
@@ -26,33 +26,22 @@
*
*/
class XHTMLDetector extends TextScanner {
-
- private static final String XML_DECLARATION_START = "<?";
- private static final String XML_DECLARATION_END = "?>";
- private static final String XML_DECLARATION = "xml";
-
+
private static final String DOCTYPE_DECLARATION = "DOCTYPE";
- private static final String DOCTYPE_DECLARATION_END = ">";
- private static final String VALID_DOCTYPE_ROOT = "html";
private static final String[] VALID_DOCTYPE_DTD_DECLARATION_REQUIRED_TOKENS = { "W3C", "DTD", "XHTML"};
private static final String[] VALID_DOCTYPE_DTD_DECLARATION_ONE_OF_TOKENS = { "Strict", "Transitional", "Frameset"};
- private static final String[] VALID_DOCTYPE_DTD_DECLARATION_REQUIRED_SYSTEM_IDS = {
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd",
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd",
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd"
- };
private static final String VALID_ELEMENT_XMLNS_ATTRIBUTE = "xmlns";
private static final String VALID_ELEMENT_XMLNS_ATTRIBUTE_VALUE = "http://www.w3.org/1999/xhtml";
-
+
private static final String TEXT_TOKEN = "___TEXT_TOKEN";
private static final String COMMENT_TOKEN = "___COMMENT_TOKEN";
private static final String XML_DECL_TOKEN = "___XML_DECL_TOKEN";
private static final String DECL_TOKEN = "___DECL_TOKEN";
private static final String ELEMENT_TOKEN = "___ELEMENT_TOKEN";
-
+
private static final String PUBLIC = "PUBLIC";
private static final String SYSTEM = "SYSTEM";
-
+
public XHTMLDetector(Reader reader) {
super(reader);
}
@@ -65,8 +54,7 @@
String docTypeRootName = null;
String docTypeIdKind = null;
String docTypePublicId = null;
- String docTypeSystemId = null;
-
+
for (IToken t = nextToken(); t != null && !t.isEOF() ; t = nextToken()) {
if (!(t instanceof TextToken))
continue;
@@ -77,8 +65,7 @@
docTypeRootName = rootName;
docTypeIdKind = idKind;
docTypePublicId = publicId;
- docTypeSystemId = systemId;
-
+
// if (!VALID_DOCTYPE_ROOT.equals(docTypeRootName))
// return false;
if (!PUBLIC.equals(docTypeIdKind))
@@ -102,12 +89,12 @@
return false;
String name = elementName.substring(elementName.indexOf(':') + 1); // Cut the prefix off
-
- if (!docTypeRootName.equals(name))
+
+ if (!name.equals(docTypeRootName))
return false;
if (!elementAttributes.containsKey(VALID_ELEMENT_XMLNS_ATTRIBUTE))
return false;
-
+
String value = elementAttributes.get(VALID_ELEMENT_XMLNS_ATTRIBUTE);
if (value == null) return false;
if (!VALID_ELEMENT_XMLNS_ATTRIBUTE_VALUE.equals(Utils.trimQuotes(value).toLowerCase()))
@@ -129,7 +116,7 @@
}
return false;
}
-
+
private boolean hasAllTokens(String publicId, String[] reqiured) {
if (publicId == null) return false;
for (String r : reqiured) {
@@ -143,6 +130,7 @@
}
return true;
}
+
private boolean hasOneOfTokens(String publicId, String[] oneOf) {
if (publicId == null) return false;
boolean found = false;
@@ -170,16 +158,16 @@
private static final int STATE_END = 5;
private int state;
-
+
private String declName;
private String rootName;
private String idKind;
private String publicId;
private String systemId;
-
+
private String elementName;
private Map<String, String> elementAttributes = new HashMap<String, String>();
-
+
/* (non-Javadoc)
* @see org.jboss.tools.jsf.text.ext.util.TextScanner#nextToken()
*/
@@ -245,7 +233,7 @@
state = STATE_END;
return getToken(TEXT_TOKEN);
}
-
+
private IToken nextCommentToken() {
int count = skip(3); // Skip '<!--' chars
if (count < 3) {
@@ -276,7 +264,7 @@
state = STATE_END;
return getToken(COMMENT_TOKEN);
}
-
+
private IToken nextXmlDeclToken() {
int count = skip(2); // Skip '<?' chars
if (count < 2) {
@@ -290,7 +278,7 @@
ch = read();
continue;
}
-
+
if (ch == '?') {
ch = read();
if (ch == ICharacterScanner.EOF) {
@@ -307,15 +295,14 @@
state = STATE_END;
return getToken(XML_DECL_TOKEN);
}
-
-
+
private IToken nextDeclToken() {
int count = skip(2); // Skip '<' chars
if (count < 2) {
state = STATE_END;
return getToken(DECL_TOKEN);
}
-
+
// Read declaration name (we're very expecting to see 'DOCTYPE' here)
declName = readName();
if (declName == null || declName.length() == 0) {
@@ -323,7 +310,7 @@
return getToken(DECL_TOKEN);
}
count += declName.length();
-
+
// At least one WS-char is expected here
int wsCount = skipWhitespaceToken();
if (wsCount == 0) {
@@ -331,7 +318,7 @@
return getToken(DECL_TOKEN);
}
count += wsCount;
-
+
// Read root element name here (http://www.w3.org/TR/xhtml1/#strict says that 'html' is strictly expected here)
rootName = readName();
if (declName == null || declName.length() == 0) {
@@ -339,7 +326,7 @@
return getToken(DECL_TOKEN);
}
count += declName.length();
-
+
// At least one WS-char is expected here
wsCount = skipWhitespaceToken();
if (wsCount == 0) {
@@ -347,7 +334,7 @@
return getToken(DECL_TOKEN);
}
count += wsCount;
-
+
// Read 'PUBLIC' or 'SYSTEM' word here
idKind = readName();
if (declName == null || declName.length() == 0) {
@@ -355,7 +342,7 @@
return getToken(DECL_TOKEN);
}
count += declName.length();
-
+
// At least one WS-char is expected here
wsCount = skipWhitespaceToken();
if (wsCount == 0) {
@@ -373,7 +360,7 @@
if (PUBLIC.equals(idKind)) {
publicId = readLiteralValue();
count += publicId.length();
-
+
// At least one WS-char is expected here
wsCount = skipWhitespaceToken();
if (wsCount == 0) {
@@ -382,11 +369,11 @@
}
count += wsCount;
}
-
+
// Read SYSTEM ID value
systemId = readLiteralValue();
count += systemId.length();
-
+
// Expecting end of declaration, so don't check count of WS-chars
count += skipWhitespaceToken();
count += wsCount;
@@ -416,17 +403,17 @@
} else {
count++;
}
-
+
// Read tag name (the tag that is interesting for us is 'html', but it could be any tag)
elementName = readName();
elementAttributes.clear();
-
+
if (elementName == null || elementName.length() == 0) {
state = STATE_END;
return getToken(ELEMENT_TOKEN);
}
count += elementName.length();
-
+
ch = read(); // Check that the next char exists
while (ch != ICharacterScanner.EOF) {
@@ -435,7 +422,7 @@
return getToken(ELEMENT_TOKEN);
}
unread();
-
+
int wsCount = skipWhitespaceToken();
count += wsCount;
// Check for end of tag:
@@ -465,7 +452,7 @@
}
count += attrName.length();
count += skipWhitespaceToken();
-
+
// read eq sign
ch = read();
if (ch != '=') {
@@ -478,33 +465,32 @@
// read attr value
String attrValue = readLiteralValue();
count += attrValue.length();
-
+
elementAttributes.put(attrName, attrValue);
}
- //
ch = read();
}
-
+
state = STATE_END;
return getToken(ELEMENT_TOKEN);
}
-
+
int skip(int count) {
int skipped = 0;
for (;skipped < count && read() != -1;skipped++) ;
return skipped;
}
-
+
public int skipLiteralToken(int quote) {
int count = 0;
for (int ch = read(); ch != -1 && ch != quote; ch = read()) count++;
return count;
}
-
+
String readLiteralValue() {
StringBuffer sb = new StringBuffer();
-
+
int quote = read();
if (quote != '"' && quote != '\'') {
unread();
@@ -517,7 +503,7 @@
sb.append((char)ch);
return sb.toString();
}
-
+
String readName() {
StringBuffer sb = new StringBuffer();
@@ -530,7 +516,7 @@
return null;
}
sb.append((char)ch);
-
+
ch = read();
while (ch != ICharacterScanner.EOF) {
if (!NMTOKEN_DETECTOR.isWordPart((char)ch)) {
@@ -542,4 +528,4 @@
}
return sb.toString();
}
-}
+}
\ No newline at end of file
12 years, 9 months
JBoss Tools SVN: r37962 - trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/operation.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2012-01-18 19:53:49 -0500 (Wed, 18 Jan 2012)
New Revision: 37962
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/operation/TemplatePreprocessor.java
Log:
JBIDE-10639
https://issues.joss.org/browse/JBIDE-10639
Start velocity with context class loader set to current class loader.
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/operation/TemplatePreprocessor.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/operation/TemplatePreprocessor.java 2012-01-19 00:53:11 UTC (rev 37961)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/operation/TemplatePreprocessor.java 2012-01-19 00:53:49 UTC (rev 37962)
@@ -65,7 +65,12 @@
File sourceFile = new File(sourceDir, path);
File targetFile = new File(targetDir, path);
if(!sourceFile.exists()) return;
+
+ ClassLoader c = Thread.currentThread().getContextClassLoader();
+ Thread.currentThread().setContextClassLoader(getClass().getClassLoader());
+ try {
+
Properties properties = new Properties();
properties.put("file.resource.loader.path", sourceDir.getCanonicalPath()); //$NON-NLS-1$
String logFileName = Platform.getLocation().append(".metadata").append(".plugins").append(WebUiPlugin.PLUGIN_ID).append("velocity.log").toFile().getAbsolutePath(); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
@@ -93,5 +98,9 @@
writer.flush();
writer.close();
+
+ } finally {
+ Thread.currentThread().setContextClassLoader(c);
+ }
}
}
\ No newline at end of file
12 years, 9 months
JBoss Tools SVN: r37961 - trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/helpers.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2012-01-18 19:53:11 -0500 (Wed, 18 Jan 2012)
New Revision: 37961
Modified:
trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/helpers/StrutsGenerator.java
Log:
JBIDE-10639
https://issues.joss.org/browse/JBIDE-10639
Start velocity with context class loader set to current class loader.
Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/helpers/StrutsGenerator.java
===================================================================
--- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/helpers/StrutsGenerator.java 2012-01-18 22:06:49 UTC (rev 37960)
+++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/helpers/StrutsGenerator.java 2012-01-19 00:53:11 UTC (rev 37961)
@@ -181,6 +181,10 @@
private void executeTemplate(Map<String,Object> parameters, String templatePath, String targetPath) {
ServiceDialog d = PreferenceModelUtilities.getPreferenceModel().getService();
+
+ ClassLoader c = Thread.currentThread().getContextClassLoader();
+ Thread.currentThread().setContextClassLoader(getClass().getClassLoader());
+
try {
VelocityContext context = new VelocityContext(parameters);
final Template template;
@@ -222,6 +226,8 @@
StrutsModelPlugin.getPluginLog().logError(e);
d.showDialog(StrutsUIMessages.ERROR, e.getMessage(), new String[]{StrutsUIMessages.OK}, null, ServiceDialog.ERROR);
/// ErrorDialog.openError(ModelPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow().getShell(),e);
+ } finally {
+ Thread.currentThread().setContextClassLoader(c);
}
};
12 years, 9 months
JBoss Tools SVN: r37960 - in trunk/common/plugins: org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/marker and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2012-01-18 17:06:49 -0500 (Wed, 18 Jan 2012)
New Revision: 37960
Modified:
trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/marker/AddSuppressWarningsMarkerResolution.java
trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/refactoring/MarkerResolutionUtils.java
Log:
Add the code which is supposed to be inserted by the Quick Fix into its description https://issues.jboss.org/browse/JBIDE-10636
Modified: trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/refactoring/MarkerResolutionUtils.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/refactoring/MarkerResolutionUtils.java 2012-01-18 21:07:22 UTC (rev 37959)
+++ trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/refactoring/MarkerResolutionUtils.java 2012-01-18 22:06:49 UTC (rev 37960)
@@ -14,6 +14,7 @@
import java.util.regex.Matcher;
import java.util.regex.Pattern;
+import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.jdt.core.Flags;
import org.eclipse.jdt.core.IAnnotatable;
@@ -35,6 +36,7 @@
import org.eclipse.jdt.core.dom.CompilationUnit;
import org.eclipse.jdt.internal.core.JavaElement;
import org.eclipse.jpt.common.core.internal.utility.jdt.ASTTools;
+import org.eclipse.ltk.core.refactoring.TextChange;
import org.eclipse.text.edits.DeleteEdit;
import org.eclipse.text.edits.InsertEdit;
import org.eclipse.text.edits.MultiTextEdit;
@@ -44,6 +46,7 @@
public class MarkerResolutionUtils {
public static final String DOT = "."; //$NON-NLS-1$
+ public static final String DOTS = "..."; //$NON-NLS-1$
public static final String COMMA = ","; //$NON-NLS-1$
public static final String SEMICOLON = ";"; //$NON-NLS-1$
public static final String SPACE = " "; //$NON-NLS-1$
@@ -54,11 +57,17 @@
public static final String EXTENDS = "extends"; //$NON-NLS-1$
public static final String OPEN_BRACE = "{"; //$NON-NLS-1$
public static final String CLOSE_BRACE = "}"; //$NON-NLS-1$
+ public static final String OPEN_BOLD = "<b>"; //$NON-NLS-1$
+ public static final String CLOSE_BOLD = "</b>"; //$NON-NLS-1$
+ public static final String NEW_LINE = "\n"; //$NON-NLS-1$
+ public static final String LINE_BREAK = "<br>"; //$NON-NLS-1$
public static final char C_SPACE = ' '; //$NON-NLS-1$
public static final char C_TAB = '\t';
public static final char C_CARRIAGE_RETURN = '\r';
public static final char C_NEW_LINE = '\n';
+
+ private static final int NUMBER_OF_STRINGS = 3;
static final HashSet<String> primitives = new HashSet<String>();
static{
@@ -568,5 +577,61 @@
}
return null;
}
-
+
+ public static String getPreview(TextChange previewChange) throws CoreException{
+ String preview = previewChange.getPreviewContent(new NullProgressMonitor());
+ TextEdit edit = previewChange.getEdit();
+ String text = null;
+ if(edit instanceof InsertEdit){
+ text = ((InsertEdit) edit).getText();
+ }else if(edit instanceof ReplaceEdit){
+ text = ((ReplaceEdit) edit).getText();
+ }
+ if(edit != null && text != null){
+ int offset = edit.getOffset();
+ int length = text.length();
+
+ // select
+ String before = preview.substring(0, offset);
+ String after = preview.substring(offset+length);
+ preview = before+OPEN_BOLD+text+CLOSE_BOLD+after;
+
+ // cut
+ int position = offset;
+ int count = NUMBER_OF_STRINGS;
+ String startText = NEW_LINE;
+ while(position >= 0){
+ char c = preview.charAt(position);
+ if(c == C_NEW_LINE){
+ count--;
+ if(count == 0){
+ position++;
+ startText = DOTS+startText;
+ break;
+ }
+ }
+ position--;
+ }
+ int start = position;
+ String endText = NEW_LINE;
+ position = offset+length;
+ count = NUMBER_OF_STRINGS;
+ while(position < preview.length()-1){
+ char c = preview.charAt(position);
+ if(c == C_NEW_LINE){
+ count--;
+ if(count == 0){
+ endText += DOTS;
+ break;
+ }
+ }
+ position++;
+ }
+ preview = startText+preview.substring(start, position)+endText;
+
+ // format
+ preview = preview.replaceAll(NEW_LINE, LINE_BREAK);
+ }
+ return preview;
+ }
}
Modified: trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/marker/AddSuppressWarningsMarkerResolution.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/marker/AddSuppressWarningsMarkerResolution.java 2012-01-18 21:07:22 UTC (rev 37959)
+++ trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/marker/AddSuppressWarningsMarkerResolution.java 2012-01-18 22:06:49 UTC (rev 37960)
@@ -39,6 +39,7 @@
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.resource.ImageRegistry;
import org.eclipse.jpt.common.core.internal.utility.jdt.ASTTools;
+import org.eclipse.ltk.core.refactoring.TextChange;
import org.eclipse.osgi.util.NLS;
import org.eclipse.swt.graphics.Image;
import org.eclipse.swt.widgets.Shell;
@@ -49,6 +50,7 @@
import org.eclipse.ui.PlatformUI;
import org.jboss.tools.common.EclipseUtil;
import org.jboss.tools.common.preferences.SeverityPreferences;
+import org.jboss.tools.common.refactoring.MarkerResolutionUtils;
import org.jboss.tools.common.ui.CommonUIMessages;
import org.jboss.tools.common.ui.CommonUIPlugin;
import org.jboss.tools.common.validation.WarningNameManager;
@@ -70,6 +72,7 @@
private IAnnotatable element;
private String preferenceKey;
private String label;
+ private String description;
public AddSuppressWarningsMarkerResolution(IFile file, IJavaElement element, String preferenceKey){
this.file = file;
@@ -85,8 +88,21 @@
if(element instanceof IMethod){
label += "()";
}
+
+ description = getPreview();
}
+ private String getPreview(){
+ TextChange previewChange = getPreviewChange();
+
+ try {
+ return MarkerResolutionUtils.getPreview(previewChange);
+ } catch (CoreException e) {
+ CommonUIPlugin.getDefault().logError(e);
+ }
+ return label;
+ }
+
private IAnnotatable getAnnatatableElement(IJavaElement element){
IJavaElement elem = element;
while(elem != null){
@@ -102,6 +118,42 @@
public String getLabel() {
return label;
}
+
+ private TextChange getPreviewChange(){
+ if(element != null && preferenceKey != null){
+ disablePreference();
+ try {
+ ICompilationUnit original = EclipseUtil.getCompilationUnit(file);
+ if(original == null) {
+ return null;
+ }
+
+ return getChange(original);
+ } catch (JavaModelException e) {
+ CommonUIPlugin.getDefault().logError(e);
+ }
+ }
+ return null;
+ }
+
+ private CompilationUnitChange getChange(ICompilationUnit compilationUnit) throws JavaModelException{
+ CompilationUnit cuNode = ASTTools.buildASTRoot(compilationUnit);
+
+ IJavaElement workingCopyElement = findWorkingCopy(compilationUnit, (IJavaElement)element);
+ ASTNode elementNode = null;
+ if(workingCopyElement instanceof JavaElement){
+ elementNode = ((JavaElement) workingCopyElement).findNode(cuNode);
+ }
+
+ IAnnotation annotation = findAnnotation(workingCopyElement);
+ CompilationUnitChange change = null;
+ if(annotation != null){
+ change = updateAnnotation(SUPPRESS_WARNINGS_ANNOTATION, preferenceKey, compilationUnit, annotation);
+ }else{
+ change = addAnnotation(SUPPRESS_WARNINGS_ANNOTATION+"(\""+preferenceKey+"\")", compilationUnit, workingCopyElement, elementNode);
+ }
+ return change;
+ }
@Override
public void run(IMarker marker) {
@@ -114,22 +166,8 @@
}
ICompilationUnit compilationUnit = original.getWorkingCopy(new NullProgressMonitor());
- CompilationUnit cuNode = ASTTools.buildASTRoot(compilationUnit);
+ CompilationUnitChange change = getChange(compilationUnit);
- IJavaElement workingCopyElement = findWorkingCopy(compilationUnit, (IJavaElement)element);
- ASTNode elementNode = null;
- if(workingCopyElement instanceof JavaElement){
- elementNode = ((JavaElement) workingCopyElement).findNode(cuNode);
- }
-
- IAnnotation annotation = findAnnotation(workingCopyElement);
- CompilationUnitChange change = null;
- if(annotation != null){
- change = updateAnnotation(SUPPRESS_WARNINGS_ANNOTATION, preferenceKey, compilationUnit, annotation);
- }else{
- change = addAnnotation(SUPPRESS_WARNINGS_ANNOTATION+"(\""+preferenceKey+"\")", compilationUnit, workingCopyElement, elementNode);
- }
-
if(change != null){
change.perform(new NullProgressMonitor());
original.reconcile(ICompilationUnit.NO_AST, false, null, new NullProgressMonitor());
@@ -233,7 +271,7 @@
}
@Override
public String getDescription() {
- return label;
+ return description;
}
@Override
12 years, 9 months
JBoss Tools SVN: r37959 - in trunk: jst/features/org.jboss.tools.jst.feature and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2012-01-18 16:07:22 -0500 (Wed, 18 Jan 2012)
New Revision: 37959
Modified:
trunk/jsf/features/org.jboss.tools.jsf.feature/feature.properties
trunk/jst/features/org.jboss.tools.jst.feature/feature.properties
trunk/jst/features/org.jboss.tools.jst.web.tiles.feature/feature.properties
Log:
JBIDE-8997 CLONE - 2010 in the copyright headers should be replaced by 2011
updated year for jst/jsf component features
Modified: trunk/jsf/features/org.jboss.tools.jsf.feature/feature.properties
===================================================================
--- trunk/jsf/features/org.jboss.tools.jsf.feature/feature.properties 2012-01-18 21:04:52 UTC (rev 37958)
+++ trunk/jsf/features/org.jboss.tools.jsf.feature/feature.properties 2012-01-18 21:07:22 UTC (rev 37959)
@@ -28,7 +28,7 @@
# "description" property - description of the feature
description=JBoss Tools JSF provides wizards, validation, navigation, visual editing and content assist to JSF projects and component libraries.
-copyright=Copyright (c) 2007 Exadel, Inc and Red Hat, Inc.\n\
+copyright=Copyright (c) 2007 - 2012 Exadel, Inc and Red Hat, Inc.\n\
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\
Modified: trunk/jst/features/org.jboss.tools.jst.feature/feature.properties
===================================================================
--- trunk/jst/features/org.jboss.tools.jst.feature/feature.properties 2012-01-18 21:04:52 UTC (rev 37958)
+++ trunk/jst/features/org.jboss.tools.jst.feature/feature.properties 2012-01-18 21:07:22 UTC (rev 37959)
@@ -28,7 +28,7 @@
# "description" property - description of the feature
description=JBoss Tools Java Standard Tools provides common tools for use in JBoss Tools other plugins, such as Knowledge Base builder and validators for use in JSF/Web projects.
-copyright=Copyright (c) 2007 Exadel, Inc and Red Hat, Inc.\n\
+copyright=Copyright (c) 2007 - 2012 Exadel, Inc and Red Hat, Inc.\n\
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\
Modified: trunk/jst/features/org.jboss.tools.jst.web.tiles.feature/feature.properties
===================================================================
--- trunk/jst/features/org.jboss.tools.jst.web.tiles.feature/feature.properties 2012-01-18 21:04:52 UTC (rev 37958)
+++ trunk/jst/features/org.jboss.tools.jst.web.tiles.feature/feature.properties 2012-01-18 21:07:22 UTC (rev 37959)
@@ -28,7 +28,7 @@
# "description" property - description of the feature
description=JBoss Tools Tiles Support
-copyright=Copyright (c) 2007 Exadel, Inc and Red Hat, Inc.\n\
+copyright=Copyright (c) 2007 - 2012 Exadel, Inc and Red Hat, Inc.\n\
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\
12 years, 9 months
JBoss Tools SVN: r37958 - trunk/common/features/org.jboss.tools.common.verification.feature.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2012-01-18 16:04:52 -0500 (Wed, 18 Jan 2012)
New Revision: 37958
Modified:
trunk/common/features/org.jboss.tools.common.verification.feature/feature.properties
Log:
JBIDE-8997 CLONE - 2010 in the copyright headers should be replaced by 2011
updated year for common component features
Modified: trunk/common/features/org.jboss.tools.common.verification.feature/feature.properties
===================================================================
--- trunk/common/features/org.jboss.tools.common.verification.feature/feature.properties 2012-01-18 21:02:02 UTC (rev 37957)
+++ trunk/common/features/org.jboss.tools.common.verification.feature/feature.properties 2012-01-18 21:04:52 UTC (rev 37958)
@@ -28,7 +28,7 @@
# "description" property - description of the feature
description=JBoss Tools Verification
-copyright=Copyright (c) 2007 Exadel, Inc and Red Hat, Inc.\n\
+copyright=Copyright (c) 2007 - 2012 Exadel, Inc and Red Hat, Inc.\n\
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\
12 years, 9 months
JBoss Tools SVN: r37957 - in trunk/common/features: org.jboss.tools.common.feature and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2012-01-18 16:02:02 -0500 (Wed, 18 Jan 2012)
New Revision: 37957
Modified:
trunk/common/features/org.jboss.tools.common.core.feature/feature.properties
trunk/common/features/org.jboss.tools.common.feature/feature.properties
trunk/common/features/org.jboss.tools.common.text.ext.feature/feature.properties
trunk/common/features/org.jboss.tools.common.ui.feature/feature.properties
Log:
JBIDE-8997 CLONE - 2010 in the copyright headers should be replaced by 2011
updated year for common component features
Modified: trunk/common/features/org.jboss.tools.common.core.feature/feature.properties
===================================================================
--- trunk/common/features/org.jboss.tools.common.core.feature/feature.properties 2012-01-18 20:48:12 UTC (rev 37956)
+++ trunk/common/features/org.jboss.tools.common.core.feature/feature.properties 2012-01-18 21:02:02 UTC (rev 37957)
@@ -28,7 +28,7 @@
# "description" property - description of the feature
description=JBoss Tools Common Core plugins
-copyright=Copyright (c) 2007 Exadel, Inc and Red Hat, Inc.\n\
+copyright=Copyright (c) 2007 - 2012 Exadel, Inc and Red Hat, Inc.\n\
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\
Modified: trunk/common/features/org.jboss.tools.common.feature/feature.properties
===================================================================
--- trunk/common/features/org.jboss.tools.common.feature/feature.properties 2012-01-18 20:48:12 UTC (rev 37956)
+++ trunk/common/features/org.jboss.tools.common.feature/feature.properties 2012-01-18 21:02:02 UTC (rev 37957)
@@ -28,7 +28,7 @@
# "description" property - description of the feature
description=JBoss Tools Common
-copyright=Copyright (c) 2007 Exadel, Inc and Red Hat, Inc.\n\
+copyright=Copyright (c) 2007 - 2012 Exadel, Inc and Red Hat, Inc.\n\
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\
Modified: trunk/common/features/org.jboss.tools.common.text.ext.feature/feature.properties
===================================================================
--- trunk/common/features/org.jboss.tools.common.text.ext.feature/feature.properties 2012-01-18 20:48:12 UTC (rev 37956)
+++ trunk/common/features/org.jboss.tools.common.text.ext.feature/feature.properties 2012-01-18 21:02:02 UTC (rev 37957)
@@ -28,7 +28,7 @@
# "description" property - description of the feature
description=JBoss Tools Common Text editing extensions
-copyright=Copyright (c) 2007 Exadel, Inc and Red Hat, Inc.\n\
+copyright=Copyright (c) 2007 - 2012 Exadel, Inc and Red Hat, Inc.\n\
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\
Modified: trunk/common/features/org.jboss.tools.common.ui.feature/feature.properties
===================================================================
--- trunk/common/features/org.jboss.tools.common.ui.feature/feature.properties 2012-01-18 20:48:12 UTC (rev 37956)
+++ trunk/common/features/org.jboss.tools.common.ui.feature/feature.properties 2012-01-18 21:02:02 UTC (rev 37957)
@@ -28,7 +28,7 @@
# "description" property - description of the feature
description=JBoss Tools Common UI
-copyright=Copyright (c) 2007 Exadel, Inc and Red Hat, Inc.\n\
+copyright=Copyright (c) 2007 - 2012 Exadel, Inc and Red Hat, Inc.\n\
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\
12 years, 9 months
JBoss Tools SVN: r37956 - in trunk/requirements: teiid-7.5.0.Final and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2012-01-18 15:48:12 -0500 (Wed, 18 Jan 2012)
New Revision: 37956
Added:
trunk/requirements/teiid-7.4.0.Final/buildRequirement.xml
trunk/requirements/teiid-7.5.0.Final/buildRequirement.xml
trunk/requirements/teiid-7.6.0.Final/buildRequirement.xml
trunk/requirements/teiid-8.0.0.Alpha1/buildRequirement.xml
Log:
added missing files for teiid requirements
Added: trunk/requirements/teiid-7.4.0.Final/buildRequirement.xml
===================================================================
--- trunk/requirements/teiid-7.4.0.Final/buildRequirement.xml (rev 0)
+++ trunk/requirements/teiid-7.4.0.Final/buildRequirement.xml 2012-01-18 20:48:12 UTC (rev 37956)
@@ -0,0 +1,8 @@
+<project default="build.requirement">
+ <import file="../generic/build.xml" />
+
+ <target name="unpack-zip" >
+ <unzip src="${driver.dest}/${build.archive}" dest="${unzip.dest}/teiid-7.4.0.Final" />
+ </target>
+
+</project>
Property changes on: trunk/requirements/teiid-7.4.0.Final/buildRequirement.xml
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/requirements/teiid-7.5.0.Final/buildRequirement.xml
===================================================================
--- trunk/requirements/teiid-7.5.0.Final/buildRequirement.xml (rev 0)
+++ trunk/requirements/teiid-7.5.0.Final/buildRequirement.xml 2012-01-18 20:48:12 UTC (rev 37956)
@@ -0,0 +1,8 @@
+<project default="build.requirement">
+ <import file="../generic/build.xml" />
+
+ <target name="unpack-zip" >
+ <unzip src="${driver.dest}/${build.archive}" dest="${unzip.dest}/teiid-7.5.0.Final" />
+ </target>
+
+</project>
Property changes on: trunk/requirements/teiid-7.5.0.Final/buildRequirement.xml
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/requirements/teiid-7.6.0.Final/buildRequirement.xml
===================================================================
--- trunk/requirements/teiid-7.6.0.Final/buildRequirement.xml (rev 0)
+++ trunk/requirements/teiid-7.6.0.Final/buildRequirement.xml 2012-01-18 20:48:12 UTC (rev 37956)
@@ -0,0 +1,8 @@
+<project default="build.requirement">
+ <import file="../generic/build.xml" />
+
+ <target name="unpack-zip" >
+ <unzip src="${driver.dest}/${build.archive}" dest="${unzip.dest}/teiid-7.6.0.Final" />
+ </target>
+
+</project>
Property changes on: trunk/requirements/teiid-7.6.0.Final/buildRequirement.xml
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/requirements/teiid-8.0.0.Alpha1/buildRequirement.xml
===================================================================
--- trunk/requirements/teiid-8.0.0.Alpha1/buildRequirement.xml (rev 0)
+++ trunk/requirements/teiid-8.0.0.Alpha1/buildRequirement.xml 2012-01-18 20:48:12 UTC (rev 37956)
@@ -0,0 +1,8 @@
+<project default="build.requirement">
+ <import file="../generic/build.xml" />
+
+ <target name="unpack-zip" >
+ <unzip src="${driver.dest}/${build.archive}" dest="${unzip.dest}/teiid-8.0.0.Aplpha1" />
+ </target>
+
+</project>
Property changes on: trunk/requirements/teiid-8.0.0.Alpha1/buildRequirement.xml
___________________________________________________________________
Added: svn:mime-type
+ text/plain
12 years, 9 months
JBoss Tools SVN: r37955 - trunk/build/target-platform.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2012-01-18 15:45:33 -0500 (Wed, 18 Jan 2012)
New Revision: 37955
Removed:
trunk/build/target-platform/OLD/
Log:
empty folder build/target-platform/OLD deleted
12 years, 9 months
JBoss Tools SVN: r37954 - trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/validation.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2012-01-18 15:16:05 -0500 (Wed, 18 Jan 2012)
New Revision: 37954
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/validation/ELValidatorTest.java
Log:
https://issues.jboss.org/browse/JBIDE-10661 Incorrect validation of ELs with syntax errors
Modified: trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/validation/ELValidatorTest.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/validation/ELValidatorTest.java 2012-01-18 20:08:18 UTC (rev 37953)
+++ trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/validation/ELValidatorTest.java 2012-01-18 20:16:05 UTC (rev 37954)
@@ -258,7 +258,7 @@
TestUtil.validate(file);
- String messagePattern = MessageFormat.format(ELValidationMessages.UNKNOWN_EL_VARIABLE_NAME, new Object[]{ElCoreMessages.ExpressionRule_ExpectingJavaName});
+ String messagePattern = MessageFormat.format(ELValidationMessages.EL_SYNTAX_ERROR, new Object[]{ElCoreMessages.ExpressionRule_ExpectingJavaName});
AbstractResourceMarkerTest.assertMarkerIsCreated(file, messagePattern, false, 7, 8);
messagePattern = MessageFormat.format(ELValidationMessages.UNKNOWN_EL_VARIABLE_NAME, new Object[]{"abc."});
12 years, 9 months