JBoss Tools SVN: r18513 - trunk/common/releng/maps.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2009-11-09 14:32:58 -0500 (Mon, 09 Nov 2009)
New Revision: 18513
Modified:
trunk/common/releng/maps/project.map
Log:
https://jira.jboss.org/jira/browse/JBIDE-5172 add three new features
Modified: trunk/common/releng/maps/project.map
===================================================================
--- trunk/common/releng/maps/project.map 2009-11-09 19:31:33 UTC (rev 18512)
+++ trunk/common/releng/maps/project.map 2009-11-09 19:32:58 UTC (rev 18513)
@@ -1,4 +1,8 @@
!*** Generated with org.eclipse.dash.common.releng/tools/scripts/buildAllHelper.xml#dir2svnmap task
+feature@org.jboss.tools.common.all.feature=SVN,,http://anonsvn.jboss.org/repos,,jbosstools/trunk/common/features/org.jboss.tools.common.all.feature
+feature@org.jboss.tools.common.all.sdk.feature=SVN,,http://anonsvn.jboss.org/repos,,jbosstools/trunk/common/features/org.jboss.tools.common.all.sdk.feature
+feature@org.jboss.tools.common.all.tests.feature=SVN,,http://anonsvn.jboss.org/repos,,jbosstools/trunk/common/features/org.jboss.tools.common.all.tests.feature
+
feature@org.jboss.tools.common.core.feature=SVN,,http://anonsvn.jboss.org/repos,,jbosstools/trunk/common/features/org.jboss.tools.common.core.feature
feature@org.jboss.tools.common.feature=SVN,,http://anonsvn.jboss.org/repos,,jbosstools/trunk/common/features/org.jboss.tools.common.feature
feature@org.jboss.tools.common.text.ext.feature=SVN,,http://anonsvn.jboss.org/repos,,jbosstools/trunk/common/features/org.jboss.tools.common.text.ext.feature
15 years, 1 month
- 1
- 0
JBoss Tools SVN: r18512 - in trunk/common/features: org.jboss.tools.common.all.feature and 5 other directories.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2009-11-09 14:31:33 -0500 (Mon, 09 Nov 2009)
New Revision: 18512
Added:
trunk/common/features/org.jboss.tools.common.all.feature/
trunk/common/features/org.jboss.tools.common.all.feature/.project
trunk/common/features/org.jboss.tools.common.all.feature/build.properties
trunk/common/features/org.jboss.tools.common.all.feature/feature.properties
trunk/common/features/org.jboss.tools.common.all.feature/feature.xml
trunk/common/features/org.jboss.tools.common.all.feature/license.html
trunk/common/features/org.jboss.tools.common.all.feature/sourceTemplateFeature/
trunk/common/features/org.jboss.tools.common.all.feature/sourceTemplateFeature/build.properties
trunk/common/features/org.jboss.tools.common.all.feature/sourceTemplateFeature/feature.properties
trunk/common/features/org.jboss.tools.common.all.feature/sourceTemplateFeature/license.html
trunk/common/features/org.jboss.tools.common.all.feature/sourceTemplatePlugin/
trunk/common/features/org.jboss.tools.common.all.feature/sourceTemplatePlugin/about.ini
trunk/common/features/org.jboss.tools.common.all.feature/sourceTemplatePlugin/about.mappings
trunk/common/features/org.jboss.tools.common.all.feature/sourceTemplatePlugin/about.properties
trunk/common/features/org.jboss.tools.common.all.feature/sourceTemplatePlugin/build.properties
trunk/common/features/org.jboss.tools.common.all.feature/sourceTemplatePlugin/plugin.properties
trunk/common/features/org.jboss.tools.common.all.sdk.feature/
trunk/common/features/org.jboss.tools.common.all.sdk.feature/.project
trunk/common/features/org.jboss.tools.common.all.sdk.feature/build.properties
trunk/common/features/org.jboss.tools.common.all.sdk.feature/feature.properties
trunk/common/features/org.jboss.tools.common.all.sdk.feature/feature.xml
trunk/common/features/org.jboss.tools.common.all.sdk.feature/license.html
trunk/common/features/org.jboss.tools.common.all.tests.feature/
trunk/common/features/org.jboss.tools.common.all.tests.feature/.cvsignore
trunk/common/features/org.jboss.tools.common.all.tests.feature/.project
trunk/common/features/org.jboss.tools.common.all.tests.feature/build.properties
trunk/common/features/org.jboss.tools.common.all.tests.feature/feature.properties
trunk/common/features/org.jboss.tools.common.all.tests.feature/feature.xml
trunk/common/features/org.jboss.tools.common.all.tests.feature/license.html
trunk/common/features/org.jboss.tools.common.all.tests.feature/sourceTemplatePlugin/
trunk/common/features/org.jboss.tools.common.all.tests.feature/sourceTemplatePlugin/about.ini
trunk/common/features/org.jboss.tools.common.all.tests.feature/sourceTemplatePlugin/about.mappings
trunk/common/features/org.jboss.tools.common.all.tests.feature/sourceTemplatePlugin/about.properties
trunk/common/features/org.jboss.tools.common.all.tests.feature/sourceTemplatePlugin/build.properties
trunk/common/features/org.jboss.tools.common.all.tests.feature/sourceTemplatePlugin/plugin.properties
Log:
https://jira.jboss.org/jira/browse/JBIDE-5172 new common.all, common.all.sdk, and common.all.tests features
Added: trunk/common/features/org.jboss.tools.common.all.feature/.project
===================================================================
--- trunk/common/features/org.jboss.tools.common.all.feature/.project (rev 0)
+++ trunk/common/features/org.jboss.tools.common.all.feature/.project 2009-11-09 19:31:33 UTC (rev 18512)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.jboss.tools.common.all.feature</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.pde.FeatureBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.pde.FeatureNature</nature>
+ </natures>
+</projectDescription>
Property changes on: trunk/common/features/org.jboss.tools.common.all.feature/.project
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/common/features/org.jboss.tools.common.all.feature/build.properties
===================================================================
--- trunk/common/features/org.jboss.tools.common.all.feature/build.properties (rev 0)
+++ trunk/common/features/org.jboss.tools.common.all.feature/build.properties 2009-11-09 19:31:33 UTC (rev 18512)
@@ -0,0 +1,3 @@
+bin.includes = feature.xml,\
+ feature.properties,\
+ license.html
Property changes on: trunk/common/features/org.jboss.tools.common.all.feature/build.properties
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/common/features/org.jboss.tools.common.all.feature/feature.properties
===================================================================
--- trunk/common/features/org.jboss.tools.common.all.feature/feature.properties (rev 0)
+++ trunk/common/features/org.jboss.tools.common.all.feature/feature.properties 2009-11-09 19:31:33 UTC (rev 18512)
@@ -0,0 +1,25 @@
+featureName=JBoss Tools Commons
+featureProvider=JBoss by Red Hat
+
+# "updateSiteName" property - label for the update site
+updateSiteName=JBossTools Update Site
+
+# "description" property - description of the feature
+description=Common functionality on which other plugins and features depend
+
+# "licenseURL" property - URL of the "Feature License"
+# do not translate value - just change to point to a locale-specific HTML page
+licenseURL=license.html
+
+# START NON-TRANSLATABLE
+# "license" property - text of the "Feature Update License"
+# should be plain text version of license agreement pointed to be "licenseURL"
+license=Red Hat, Inc. licenses these features and plugins to you under
+certain open source licenses (or aggregations of such licenses), which
+in a particular case may include the Eclipse Public License, the GNU
+Lesser General Public License, and/or certain other open source
+licenses. For precise licensing details, consult the corresponding
+source code, or contact Red Hat Legal Affairs, 1801 Varsity Drive,
+Raleigh NC 27606 USA.
+# END NON-TRANSLATABLE
+########### end of license property ##########################################
Property changes on: trunk/common/features/org.jboss.tools.common.all.feature/feature.properties
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/common/features/org.jboss.tools.common.all.feature/feature.xml
===================================================================
--- trunk/common/features/org.jboss.tools.common.all.feature/feature.xml (rev 0)
+++ trunk/common/features/org.jboss.tools.common.all.feature/feature.xml 2009-11-09 19:31:33 UTC (rev 18512)
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+ id="org.jboss.tools.common.all.feature"
+ label="%featureName"
+ version="1.0.0.qualifier"
+ provider-name="%featureProvider">
+
+ <description>
+ %description
+ </description>
+
+ <copyright>
+ JBoss, Home of Professional Open Source
+Copyright 2006-2009, JBoss by Red Hat, 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">
+ %license
+ </license>
+
+ <url>
+ <update label="%updateSiteName" url="http://download.jboss.org/jbosstools/updates/stable"/>
+ </url>
+
+ <includes
+ id="org.jboss.tools.common.core.feature"
+ version="0.0.0"/>
+
+ <includes
+ id="org.jboss.tools.common.feature"
+ version="0.0.0"/>
+
+ <includes
+ id="org.jboss.tools.common.text.ext.feature"
+ version="0.0.0"/>
+
+ <includes
+ id="org.jboss.tools.common.ui.feature"
+ version="0.0.0"/>
+
+ <includes
+ id="org.jboss.tools.common.verification.feature"
+ version="0.0.0"/>
+
+ <plugin
+ id="org.jboss.tools.common.el.core"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"/>
+
+ <plugin
+ id="org.jboss.tools.common.el.ui"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"/>
+
+ <plugin
+ id="org.jboss.tools.common.meta.ui"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"/>
+
+ <plugin
+ id="org.jboss.tools.common.resref.core"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"/>
+
+ <plugin
+ id="org.jboss.tools.common.resref.ui"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"/>
+
+
+</feature>
Property changes on: trunk/common/features/org.jboss.tools.common.all.feature/feature.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/common/features/org.jboss.tools.common.all.feature/license.html
===================================================================
--- trunk/common/features/org.jboss.tools.common.all.feature/license.html (rev 0)
+++ trunk/common/features/org.jboss.tools.common.all.feature/license.html 2009-11-09 19:31:33 UTC (rev 18512)
@@ -0,0 +1,14 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html>
+
+<body>
+<p>Red Hat, Inc. licenses these features and plugins to you under
+certain open source licenses (or aggregations of such licenses), which
+in a particular case may include the Eclipse Public License, the GNU
+Lesser General Public License, and/or certain other open source
+licenses. For precise licensing details, consult the corresponding
+source code, or contact Red Hat Legal Affairs, 1801 Varsity Drive,
+Raleigh NC 27606 USA.
+</p>
+</body>
+</html>
\ No newline at end of file
Property changes on: trunk/common/features/org.jboss.tools.common.all.feature/license.html
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/common/features/org.jboss.tools.common.all.feature/sourceTemplateFeature/build.properties
===================================================================
--- trunk/common/features/org.jboss.tools.common.all.feature/sourceTemplateFeature/build.properties (rev 0)
+++ trunk/common/features/org.jboss.tools.common.all.feature/sourceTemplateFeature/build.properties 2009-11-09 19:31:33 UTC (rev 18512)
@@ -0,0 +1,15 @@
+###############################################################################
+# Copyright (c) 2009 JBoss by Red Hat, and others.
+# All rights reserved. This program and the accompanying materials
+# are 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 - initial API and implementation
+###############################################################################
+
+bin.includes = feature.*,\
+ license.html
+
+
Property changes on: trunk/common/features/org.jboss.tools.common.all.feature/sourceTemplateFeature/build.properties
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/common/features/org.jboss.tools.common.all.feature/sourceTemplateFeature/feature.properties
===================================================================
--- trunk/common/features/org.jboss.tools.common.all.feature/sourceTemplateFeature/feature.properties (rev 0)
+++ trunk/common/features/org.jboss.tools.common.all.feature/sourceTemplateFeature/feature.properties 2009-11-09 19:31:33 UTC (rev 18512)
@@ -0,0 +1,26 @@
+featureName=JBoss Tools Commons Source
+featureProvider=JBoss by Red Hat
+
+# "updateSiteName" property - label for the update site
+updateSiteName=JBossTools Update Site
+
+# "description" property - description of the feature
+description=Sources for Common functionality on which other plugins and features depend
+
+# "licenseURL" property - URL of the "Feature License"
+# do not translate value - just change to point to a locale-specific HTML page
+licenseURL=license.html
+
+# START NON-TRANSLATABLE
+# "license" property - text of the "Feature Update License"
+# should be plain text version of license agreement pointed to be "licenseURL"
+license=Red Hat, Inc. licenses these features and plugins to you under
+certain open source licenses (or aggregations of such licenses), which
+in a particular case may include the Eclipse Public License, the GNU
+Lesser General Public License, and/or certain other open source
+licenses. For precise licensing details, consult the corresponding
+source code, or contact Red Hat Legal Affairs, 1801 Varsity Drive,
+Raleigh NC 27606 USA.
+# END NON-TRANSLATABLE
+########### end of license property ##########################################
+
\ No newline at end of file
Property changes on: trunk/common/features/org.jboss.tools.common.all.feature/sourceTemplateFeature/feature.properties
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/common/features/org.jboss.tools.common.all.feature/sourceTemplateFeature/license.html
===================================================================
--- trunk/common/features/org.jboss.tools.common.all.feature/sourceTemplateFeature/license.html (rev 0)
+++ trunk/common/features/org.jboss.tools.common.all.feature/sourceTemplateFeature/license.html 2009-11-09 19:31:33 UTC (rev 18512)
@@ -0,0 +1,14 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html>
+
+<body>
+<p>Red Hat, Inc. licenses these features and plugins to you under
+certain open source licenses (or aggregations of such licenses), which
+in a particular case may include the Eclipse Public License, the GNU
+Lesser General Public License, and/or certain other open source
+licenses. For precise licensing details, consult the corresponding
+source code, or contact Red Hat Legal Affairs, 1801 Varsity Drive,
+Raleigh NC 27606 USA.
+</p>
+</body>
+</html>
\ No newline at end of file
Property changes on: trunk/common/features/org.jboss.tools.common.all.feature/sourceTemplateFeature/license.html
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/common/features/org.jboss.tools.common.all.feature/sourceTemplatePlugin/about.ini
===================================================================
--- trunk/common/features/org.jboss.tools.common.all.feature/sourceTemplatePlugin/about.ini (rev 0)
+++ trunk/common/features/org.jboss.tools.common.all.feature/sourceTemplatePlugin/about.ini 2009-11-09 19:31:33 UTC (rev 18512)
@@ -0,0 +1,29 @@
+# about.ini
+# contains information about a feature
+# java.io.Properties file (ISO 8859-1 with "\" escapes)
+# "%key" are externalized strings defined in about.properties
+# This file does not need to be translated.
+
+# Property "aboutText" contains blurb for "About" dialog (translated)
+aboutText=%blurb
+
+# Property "windowImage" contains path to window icon (16x16)
+# needed for primary features only
+
+# Property "featureImage" contains path to feature image (32x32)
+#featureImage=eclipse32.png
+
+# Property "aboutImage" contains path to product image (500x330 or 115x164)
+# needed for primary features only
+
+# Property "appName" contains name of the application (translated)
+# needed for primary features only
+
+# Property "welcomePage" contains path to welcome page (special XML-based format)
+# optional
+
+# Property "welcomePerspective" contains the id of the perspective in which the
+# welcome page is to be opened.
+# optional
+
+
Property changes on: trunk/common/features/org.jboss.tools.common.all.feature/sourceTemplatePlugin/about.ini
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/common/features/org.jboss.tools.common.all.feature/sourceTemplatePlugin/about.mappings
===================================================================
--- trunk/common/features/org.jboss.tools.common.all.feature/sourceTemplatePlugin/about.mappings (rev 0)
+++ trunk/common/features/org.jboss.tools.common.all.feature/sourceTemplatePlugin/about.mappings 2009-11-09 19:31:33 UTC (rev 18512)
@@ -0,0 +1,6 @@
+# about.mappings
+# contains fill-ins for about.properties
+# java.io.Properties file (ISO 8859-1 with "\" escapes)
+# This file does not need to be translated.
+
+0=@build@
\ No newline at end of file
Added: trunk/common/features/org.jboss.tools.common.all.feature/sourceTemplatePlugin/about.properties
===================================================================
--- trunk/common/features/org.jboss.tools.common.all.feature/sourceTemplatePlugin/about.properties (rev 0)
+++ trunk/common/features/org.jboss.tools.common.all.feature/sourceTemplatePlugin/about.properties 2009-11-09 19:31:33 UTC (rev 18512)
@@ -0,0 +1,7 @@
+blurb=JBoss Tools Commons Source\n\
+\n\
+Version: {featureVersion}\n\
+Build id: {0}\n\
+\n\
+(c) Copyright 2009 JBoss by Red Hat, and others. Initial contribution by Jeff Mesnil, http://jmesnil.net. All rights reserved.\n\
+Visit http://www.jboss.org/tools
Property changes on: trunk/common/features/org.jboss.tools.common.all.feature/sourceTemplatePlugin/about.properties
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/common/features/org.jboss.tools.common.all.feature/sourceTemplatePlugin/build.properties
===================================================================
--- trunk/common/features/org.jboss.tools.common.all.feature/sourceTemplatePlugin/build.properties (rev 0)
+++ trunk/common/features/org.jboss.tools.common.all.feature/sourceTemplatePlugin/build.properties 2009-11-09 19:31:33 UTC (rev 18512)
@@ -0,0 +1,5 @@
+bin.includes = plugin.*,\
+ about.*,\
+ src/,\
+ META-INF/
+sourcePlugin = true
Property changes on: trunk/common/features/org.jboss.tools.common.all.feature/sourceTemplatePlugin/build.properties
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/common/features/org.jboss.tools.common.all.feature/sourceTemplatePlugin/plugin.properties
===================================================================
--- trunk/common/features/org.jboss.tools.common.all.feature/sourceTemplatePlugin/plugin.properties (rev 0)
+++ trunk/common/features/org.jboss.tools.common.all.feature/sourceTemplatePlugin/plugin.properties 2009-11-09 19:31:33 UTC (rev 18512)
@@ -0,0 +1,3 @@
+pluginName = JBoss Tools Commons Source
+providerName = JBoss by Red Hat
+
Property changes on: trunk/common/features/org.jboss.tools.common.all.feature/sourceTemplatePlugin/plugin.properties
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/common/features/org.jboss.tools.common.all.sdk.feature/.project
===================================================================
--- trunk/common/features/org.jboss.tools.common.all.sdk.feature/.project (rev 0)
+++ trunk/common/features/org.jboss.tools.common.all.sdk.feature/.project 2009-11-09 19:31:33 UTC (rev 18512)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.jboss.tools.common.all.sdk.feature</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.pde.FeatureBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.pde.FeatureNature</nature>
+ </natures>
+</projectDescription>
Property changes on: trunk/common/features/org.jboss.tools.common.all.sdk.feature/.project
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/common/features/org.jboss.tools.common.all.sdk.feature/build.properties
===================================================================
--- trunk/common/features/org.jboss.tools.common.all.sdk.feature/build.properties (rev 0)
+++ trunk/common/features/org.jboss.tools.common.all.sdk.feature/build.properties 2009-11-09 19:31:33 UTC (rev 18512)
@@ -0,0 +1,4 @@
+bin.includes = feature.xml,\
+ feature.properties,\
+ license.html
+generate.feature(a)org.jboss.tools.common.all.source.feature=org.jboss.tools.common.all.feature
Property changes on: trunk/common/features/org.jboss.tools.common.all.sdk.feature/build.properties
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/common/features/org.jboss.tools.common.all.sdk.feature/feature.properties
===================================================================
--- trunk/common/features/org.jboss.tools.common.all.sdk.feature/feature.properties (rev 0)
+++ trunk/common/features/org.jboss.tools.common.all.sdk.feature/feature.properties 2009-11-09 19:31:33 UTC (rev 18512)
@@ -0,0 +1,25 @@
+featureName=JBoss Tools Commons SDK
+featureProvider=JBoss by Red Hat
+
+# "updateSiteName" property - label for the update site
+updateSiteName=JBossTools Update Site
+
+# "description" property - description of the feature
+description=Common functionality on which other plugins and features depend. Includes sources
+
+# "licenseURL" property - URL of the "Feature License"
+# do not translate value - just change to point to a locale-specific HTML page
+licenseURL=license.html
+
+# START NON-TRANSLATABLE
+# "license" property - text of the "Feature Update License"
+# should be plain text version of license agreement pointed to be "licenseURL"
+license=Red Hat, Inc. licenses these features and plugins to you under
+certain open source licenses (or aggregations of such licenses), which
+in a particular case may include the Eclipse Public License, the GNU
+Lesser General Public License, and/or certain other open source
+licenses. For precise licensing details, consult the corresponding
+source code, or contact Red Hat Legal Affairs, 1801 Varsity Drive,
+Raleigh NC 27606 USA.
+# END NON-TRANSLATABLE
+########### end of license property ##########################################
Property changes on: trunk/common/features/org.jboss.tools.common.all.sdk.feature/feature.properties
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/common/features/org.jboss.tools.common.all.sdk.feature/feature.xml
===================================================================
--- trunk/common/features/org.jboss.tools.common.all.sdk.feature/feature.xml (rev 0)
+++ trunk/common/features/org.jboss.tools.common.all.sdk.feature/feature.xml 2009-11-09 19:31:33 UTC (rev 18512)
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+ id="org.jboss.tools.common.all.sdk.feature"
+ label="%featureName"
+ version="1.0.0.qualifier"
+ provider-name="%featureProvider">
+
+ <description>
+ %description
+ </description>
+
+ <copyright>
+ JBoss, Home of Professional Open Source
+Copyright 2006-2009, JBoss by Red Hat, 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">
+ %license
+ </license>
+
+ <url>
+ <update label="%updateSiteName" url="http://download.jboss.org/jbosstools/updates/stable/"/>
+ </url>
+
+ <includes
+ id="org.jboss.tools.common.all.feature"
+ version="0.0.0"/>
+
+ <includes
+ id="org.jboss.tools.common.all.source.feature"
+ version="0.0.0"/>
+
+ <includes
+ id="org.jboss.tools.common.all.tests.feature"
+ version="0.0.0"/>
+
+</feature>
Property changes on: trunk/common/features/org.jboss.tools.common.all.sdk.feature/feature.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/common/features/org.jboss.tools.common.all.sdk.feature/license.html
===================================================================
--- trunk/common/features/org.jboss.tools.common.all.sdk.feature/license.html (rev 0)
+++ trunk/common/features/org.jboss.tools.common.all.sdk.feature/license.html 2009-11-09 19:31:33 UTC (rev 18512)
@@ -0,0 +1,14 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html>
+
+<body>
+<p>Red Hat, Inc. licenses these features and plugins to you under
+certain open source licenses (or aggregations of such licenses), which
+in a particular case may include the Eclipse Public License, the GNU
+Lesser General Public License, and/or certain other open source
+licenses. For precise licensing details, consult the corresponding
+source code, or contact Red Hat Legal Affairs, 1801 Varsity Drive,
+Raleigh NC 27606 USA.
+</p>
+</body>
+</html>
\ No newline at end of file
Property changes on: trunk/common/features/org.jboss.tools.common.all.sdk.feature/license.html
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/common/features/org.jboss.tools.common.all.tests.feature/.cvsignore
===================================================================
--- trunk/common/features/org.jboss.tools.common.all.tests.feature/.cvsignore (rev 0)
+++ trunk/common/features/org.jboss.tools.common.all.tests.feature/.cvsignore 2009-11-09 19:31:33 UTC (rev 18512)
@@ -0,0 +1 @@
+build.xml
Property changes on: trunk/common/features/org.jboss.tools.common.all.tests.feature/.cvsignore
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/common/features/org.jboss.tools.common.all.tests.feature/.project
===================================================================
--- trunk/common/features/org.jboss.tools.common.all.tests.feature/.project (rev 0)
+++ trunk/common/features/org.jboss.tools.common.all.tests.feature/.project 2009-11-09 19:31:33 UTC (rev 18512)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.jboss.tools.common.all.tests.feature</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.pde.FeatureBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.pde.FeatureNature</nature>
+ </natures>
+</projectDescription>
Property changes on: trunk/common/features/org.jboss.tools.common.all.tests.feature/.project
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/common/features/org.jboss.tools.common.all.tests.feature/build.properties
===================================================================
--- trunk/common/features/org.jboss.tools.common.all.tests.feature/build.properties (rev 0)
+++ trunk/common/features/org.jboss.tools.common.all.tests.feature/build.properties 2009-11-09 19:31:33 UTC (rev 18512)
@@ -0,0 +1,11 @@
+bin.includes = feature.xml,\
+ feature.properties,\
+ license.html
+generate.plugin(a)org.jboss.tools.common.el.core.test.source=org.jboss.tools.common.el.core.test
+generate.plugin(a)org.jboss.tools.common.model.test.source=org.jboss.tools.common.model.test
+generate.plugin(a)org.jboss.tools.common.model.ui.test.source=org.jboss.tools.common.model.ui.test
+generate.plugin(a)org.jboss.tools.common.test.source=org.jboss.tools.common.test
+generate.plugin(a)org.jboss.tools.common.text.ext.test.source=org.jboss.tools.common.text.ext.test
+generate.plugin(a)org.jboss.tools.common.verification.test.source=org.jboss.tools.common.verification.test
+generate.plugin(a)org.jboss.tools.common.verification.ui.test.source=org.jboss.tools.common.verification.ui.test
+
Property changes on: trunk/common/features/org.jboss.tools.common.all.tests.feature/build.properties
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/common/features/org.jboss.tools.common.all.tests.feature/feature.properties
===================================================================
--- trunk/common/features/org.jboss.tools.common.all.tests.feature/feature.properties (rev 0)
+++ trunk/common/features/org.jboss.tools.common.all.tests.feature/feature.properties 2009-11-09 19:31:33 UTC (rev 18512)
@@ -0,0 +1,26 @@
+featureName=JBoss Tools Commons Tests
+featureProvider=JBoss by Red Hat
+
+# "updateSiteName" property - label for the update site
+updateSiteName=JBossTools Update Site
+
+# "description" property - description of the feature
+description=Tests for Common functionality on which other plugins and features depend
+
+# "licenseURL" property - URL of the "Feature License"
+# do not translate value - just change to point to a locale-specific HTML page
+licenseURL=license.html
+
+# START NON-TRANSLATABLE
+# "license" property - text of the "Feature Update License"
+# should be plain text version of license agreement pointed to be "licenseURL"
+license=Red Hat, Inc. licenses these features and plugins to you under
+certain open source licenses (or aggregations of such licenses), which
+in a particular case may include the Eclipse Public License, the GNU
+Lesser General Public License, and/or certain other open source
+licenses. For precise licensing details, consult the corresponding
+source code, or contact Red Hat Legal Affairs, 1801 Varsity Drive,
+Raleigh NC 27606 USA.
+# END NON-TRANSLATABLE
+########### end of license property ##########################################
+
\ No newline at end of file
Property changes on: trunk/common/features/org.jboss.tools.common.all.tests.feature/feature.properties
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/common/features/org.jboss.tools.common.all.tests.feature/feature.xml
===================================================================
--- trunk/common/features/org.jboss.tools.common.all.tests.feature/feature.xml (rev 0)
+++ trunk/common/features/org.jboss.tools.common.all.tests.feature/feature.xml 2009-11-09 19:31:33 UTC (rev 18512)
@@ -0,0 +1,132 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+ id="org.jboss.tools.common.all.tests.feature"
+ label="%featureName"
+ version="1.0.0.qualifier"
+ provider-name="%featureProvider"
+ image="eclipse_update_120.jpg">
+
+ <description>
+ %description
+ </description>
+
+ <copyright>
+ %copyright
+ </copyright>
+
+ <license url="%licenseURL">
+ %license
+ </license>
+
+ <url>
+ <update label="%updateSiteName" url="http://download.jboss.org/jbosstools/updates/stable/"/>
+ </url>
+
+ <requires>
+ <import plugin="org.junit" version="3.8.1" match="compatible"/>
+ <import plugin="org.eclipse.core.runtime" version="3.3.0" match="compatible"/>
+ <import plugin="org.eclipse.core.resources" version="3.3.0" match="compatible"/>
+ <import plugin="org.eclipse.ant.core" version="3.1.100" match="compatible"/>
+ <import plugin="org.eclipse.core.resources" version="3.2.0" match="compatible"/>
+ <import plugin="org.eclipse.core.runtime" version="3.2.0" match="compatible"/>
+ <import plugin="org.eclipse.debug.core" version="3.2.0" match="compatible"/>
+ </requires>
+
+ <plugin
+ id="org.eclipse.ant.optional.junit"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ fragment="true"/>
+
+ <plugin
+ id="org.eclipse.test"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"/>
+
+ <plugin
+ id="org.jboss.tools.common.el.core.test"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"/>
+
+ <plugin
+ id="org.jboss.tools.common.el.core.test.source"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"/>
+
+ <plugin
+ id="org.jboss.tools.common.model.test"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"/>
+
+ <plugin
+ id="org.jboss.tools.common.model.test.source"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"/>
+
+ <plugin
+ id="org.jboss.tools.common.model.ui.test"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"/>
+
+ <plugin
+ id="org.jboss.tools.common.model.ui.test.source"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"/>
+
+ <plugin
+ id="org.jboss.tools.common.test"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"/>
+
+ <plugin
+ id="org.jboss.tools.common.test.source"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"/>
+
+ <plugin
+ id="org.jboss.tools.common.text.ext.test"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"/>
+
+ <plugin
+ id="org.jboss.tools.common.text.ext.test.source"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"/>
+
+ <plugin
+ id="org.jboss.tools.common.verification.test"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"/>
+
+ <plugin
+ id="org.jboss.tools.common.verification.test.source"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"/>
+
+ <plugin
+ id="org.jboss.tools.common.verification.ui.test"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"/>
+
+ <plugin
+ id="org.jboss.tools.common.verification.ui.test.source"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"/>
+
+</feature>
Property changes on: trunk/common/features/org.jboss.tools.common.all.tests.feature/feature.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/common/features/org.jboss.tools.common.all.tests.feature/license.html
===================================================================
--- trunk/common/features/org.jboss.tools.common.all.tests.feature/license.html (rev 0)
+++ trunk/common/features/org.jboss.tools.common.all.tests.feature/license.html 2009-11-09 19:31:33 UTC (rev 18512)
@@ -0,0 +1,14 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html>
+
+<body>
+<p>Red Hat, Inc. licenses these features and plugins to you under
+certain open source licenses (or aggregations of such licenses), which
+in a particular case may include the Eclipse Public License, the GNU
+Lesser General Public License, and/or certain other open source
+licenses. For precise licensing details, consult the corresponding
+source code, or contact Red Hat Legal Affairs, 1801 Varsity Drive,
+Raleigh NC 27606 USA.
+</p>
+</body>
+</html>
\ No newline at end of file
Property changes on: trunk/common/features/org.jboss.tools.common.all.tests.feature/license.html
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/common/features/org.jboss.tools.common.all.tests.feature/sourceTemplatePlugin/about.ini
===================================================================
--- trunk/common/features/org.jboss.tools.common.all.tests.feature/sourceTemplatePlugin/about.ini (rev 0)
+++ trunk/common/features/org.jboss.tools.common.all.tests.feature/sourceTemplatePlugin/about.ini 2009-11-09 19:31:33 UTC (rev 18512)
@@ -0,0 +1,29 @@
+# about.ini
+# contains information about a feature
+# java.io.Properties file (ISO 8859-1 with "\" escapes)
+# "%key" are externalized strings defined in about.properties
+# This file does not need to be translated.
+
+# Property "aboutText" contains blurb for "About" dialog (translated)
+aboutText=%blurb
+
+# Property "windowImage" contains path to window icon (16x16)
+# needed for primary features only
+
+# Property "featureImage" contains path to feature image (32x32)
+#featureImage=eclipse32.png
+
+# Property "aboutImage" contains path to product image (500x330 or 115x164)
+# needed for primary features only
+
+# Property "appName" contains name of the application (translated)
+# needed for primary features only
+
+# Property "welcomePage" contains path to welcome page (special XML-based format)
+# optional
+
+# Property "welcomePerspective" contains the id of the perspective in which the
+# welcome page is to be opened.
+# optional
+
+
Property changes on: trunk/common/features/org.jboss.tools.common.all.tests.feature/sourceTemplatePlugin/about.ini
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/common/features/org.jboss.tools.common.all.tests.feature/sourceTemplatePlugin/about.mappings
===================================================================
--- trunk/common/features/org.jboss.tools.common.all.tests.feature/sourceTemplatePlugin/about.mappings (rev 0)
+++ trunk/common/features/org.jboss.tools.common.all.tests.feature/sourceTemplatePlugin/about.mappings 2009-11-09 19:31:33 UTC (rev 18512)
@@ -0,0 +1,6 @@
+# about.mappings
+# contains fill-ins for about.properties
+# java.io.Properties file (ISO 8859-1 with "\" escapes)
+# This file does not need to be translated.
+
+0=@build@
\ No newline at end of file
Added: trunk/common/features/org.jboss.tools.common.all.tests.feature/sourceTemplatePlugin/about.properties
===================================================================
--- trunk/common/features/org.jboss.tools.common.all.tests.feature/sourceTemplatePlugin/about.properties (rev 0)
+++ trunk/common/features/org.jboss.tools.common.all.tests.feature/sourceTemplatePlugin/about.properties 2009-11-09 19:31:33 UTC (rev 18512)
@@ -0,0 +1,7 @@
+blurb=JBoss Tools Commons Tests Source\n\
+\n\
+Version: {featureVersion}\n\
+Build id: {0}\n\
+\n\
+(c) Copyright 2009 JBoss by Red Hat, and others. Initial contribution by Jeff Mesnil, http://jmesnil.net All rights reserved.\n\
+Visit http://www.jboss.org/tools
Property changes on: trunk/common/features/org.jboss.tools.common.all.tests.feature/sourceTemplatePlugin/about.properties
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/common/features/org.jboss.tools.common.all.tests.feature/sourceTemplatePlugin/build.properties
===================================================================
--- trunk/common/features/org.jboss.tools.common.all.tests.feature/sourceTemplatePlugin/build.properties (rev 0)
+++ trunk/common/features/org.jboss.tools.common.all.tests.feature/sourceTemplatePlugin/build.properties 2009-11-09 19:31:33 UTC (rev 18512)
@@ -0,0 +1,5 @@
+bin.includes = plugin.*,\
+ about.*,\
+ src/,\
+ META-INF/
+sourcePlugin = true
Property changes on: trunk/common/features/org.jboss.tools.common.all.tests.feature/sourceTemplatePlugin/build.properties
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/common/features/org.jboss.tools.common.all.tests.feature/sourceTemplatePlugin/plugin.properties
===================================================================
--- trunk/common/features/org.jboss.tools.common.all.tests.feature/sourceTemplatePlugin/plugin.properties (rev 0)
+++ trunk/common/features/org.jboss.tools.common.all.tests.feature/sourceTemplatePlugin/plugin.properties 2009-11-09 19:31:33 UTC (rev 18512)
@@ -0,0 +1,3 @@
+pluginName = JBoss Tools Commons Tests Source
+providerName = JBoss by Red Hat
+
Property changes on: trunk/common/features/org.jboss.tools.common.all.tests.feature/sourceTemplatePlugin/plugin.properties
___________________________________________________________________
Name: svn:mime-type
+ text/plain
15 years, 1 month
- 1
- 0
JBoss Tools SVN: r18511 - trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/refactoring.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2009-11-09 14:21:22 -0500 (Mon, 09 Nov 2009)
New Revision: 18511
Modified:
trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/refactoring/RefactorSearcher.java
Log:
message removed from exception logging
Modified: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/refactoring/RefactorSearcher.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/refactoring/RefactorSearcher.java 2009-11-09 19:11:17 UTC (rev 18510)
+++ trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/refactoring/RefactorSearcher.java 2009-11-09 19:21:22 UTC (rev 18511)
@@ -192,7 +192,7 @@
try {
content = FileUtil.readStream(file);
} catch (CoreException e) {
- ELCorePlugin.getDefault().logError("Error occured during reading content of {0} file", e); //$NON-NLS-1$
+ ELCorePlugin.getDefault().logError(e);
}
if(content!=null) {
String ext = file.getFileExtension();
15 years, 1 month
- 1
- 0
JBoss Tools SVN: r18510 - in trunk/common/plugins/org.jboss.tools.common.el.core: src/org/jboss/tools/common/el/core and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2009-11-09 14:11:17 -0500 (Mon, 09 Nov 2009)
New Revision: 18510
Added:
trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/ELCorePlugin.java
Removed:
trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/Activator.java
Modified:
trunk/common/plugins/org.jboss.tools.common.el.core/META-INF/MANIFEST.MF
trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/refactoring/ELProjectSetExtension.java
trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/refactoring/RefactorSearcher.java
trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/ELResolverFactoryManager.java
trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/ElVarSearcher.java
trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/TypeInfoCollector.java
Log:
http://www.jboss.org/index.html?module=bb&op=viewtopic&p=4264652#4264652
Potential memory leak test was fixed
Modified: trunk/common/plugins/org.jboss.tools.common.el.core/META-INF/MANIFEST.MF
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.el.core/META-INF/MANIFEST.MF 2009-11-09 19:11:05 UTC (rev 18509)
+++ trunk/common/plugins/org.jboss.tools.common.el.core/META-INF/MANIFEST.MF 2009-11-09 19:11:17 UTC (rev 18510)
@@ -13,7 +13,7 @@
org.jboss.tools.common.el.core.resolver,
org.jboss.tools.common.el.internal.core.parser,
org.jboss.tools.common.el.internal.core.parser.token
-Bundle-Activator: org.jboss.tools.common.el.core.Activator
+Bundle-Activator: org.jboss.tools.common.el.core.ELCorePlugin
Require-Bundle: org.eclipse.jface.text,
org.eclipse.wst.sse.core,
org.eclipse.wst.sse.ui,
Deleted: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/Activator.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/Activator.java 2009-11-09 19:11:05 UTC (rev 18509)
+++ trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/Activator.java 2009-11-09 19:11:17 UTC (rev 18510)
@@ -1,65 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 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.common.el.core;
-
-import org.jboss.tools.common.log.BaseUIPlugin;
-import org.jboss.tools.common.log.IPluginLog;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle
- */
-public class Activator extends BaseUIPlugin {
-
- // The plug-in ID
- public static final String PLUGIN_ID = "org.jboss.tools.common.el"; //$NON-NLS-1$
-
- // The shared instance
- private static Activator plugin;
-
- /**
- * The constructor
- */
- public Activator() {
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
- */
- public void start(BundleContext context) throws Exception {
- super.start(context);
- plugin = this;
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
- */
- public void stop(BundleContext context) throws Exception {
- plugin = null;
- super.stop(context);
- }
-
- /**
- * Returns the shared instance
- *
- * @return the shared instance
- */
- public static Activator getDefault() {
- return plugin;
- }
-
- public static IPluginLog getPluginLog() {
- return getDefault();
- }
-
-}
Copied: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/ELCorePlugin.java (from rev 18503, trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/Activator.java)
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/ELCorePlugin.java (rev 0)
+++ trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/ELCorePlugin.java 2009-11-09 19:11:17 UTC (rev 18510)
@@ -0,0 +1,65 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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.common.el.core;
+
+import org.jboss.tools.common.log.BaseUIPlugin;
+import org.jboss.tools.common.log.IPluginLog;
+import org.osgi.framework.BundleContext;
+
+/**
+ * The activator class controls the plug-in life cycle
+ */
+public class ELCorePlugin extends BaseUIPlugin {
+
+ // The plug-in ID
+ public static final String PLUGIN_ID = "org.jboss.tools.common.el"; //$NON-NLS-1$
+
+ // The shared instance
+ private static ELCorePlugin plugin;
+
+ /**
+ * The constructor
+ */
+ public ELCorePlugin() {
+ }
+
+ /*
+ * (non-Javadoc)
+ * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
+ */
+ public void start(BundleContext context) throws Exception {
+ super.start(context);
+ plugin = this;
+ }
+
+ /*
+ * (non-Javadoc)
+ * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
+ */
+ public void stop(BundleContext context) throws Exception {
+ plugin = null;
+ super.stop(context);
+ }
+
+ /**
+ * Returns the shared instance
+ *
+ * @return the shared instance
+ */
+ public static ELCorePlugin getDefault() {
+ return plugin;
+ }
+
+ public static IPluginLog getPluginLog() {
+ return getDefault();
+ }
+
+}
Property changes on: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/ELCorePlugin.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/refactoring/ELProjectSetExtension.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/refactoring/ELProjectSetExtension.java 2009-11-09 19:11:05 UTC (rev 18509)
+++ trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/refactoring/ELProjectSetExtension.java 2009-11-09 19:11:17 UTC (rev 18510)
@@ -7,7 +7,7 @@
import org.eclipse.core.runtime.IConfigurationElement;
import org.eclipse.core.runtime.IExtensionPoint;
import org.eclipse.core.runtime.Platform;
-import org.jboss.tools.common.el.core.Activator;
+import org.jboss.tools.common.el.core.ELCorePlugin;
public class ELProjectSetExtension {
public static String EXTENSION_POINT = "org.jboss.tools.common.el.core.elProjectSet"; //$NON-NLS-1$
@@ -38,7 +38,7 @@
try{
n.searcher = (ProjectsSet)e.createExecutableExtension("projectset-class"); //$NON-NLS-1$
}catch(CoreException ex){
- Activator.getDefault().logError(ex);
+ ELCorePlugin.getDefault().logError(ex);
}
list.add(n);
}
Modified: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/refactoring/RefactorSearcher.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/refactoring/RefactorSearcher.java 2009-11-09 19:11:05 UTC (rev 18509)
+++ trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/refactoring/RefactorSearcher.java 2009-11-09 19:11:17 UTC (rev 18510)
@@ -11,6 +11,7 @@
package org.jboss.tools.common.el.core.refactoring;
import java.io.IOException;
+import java.io.InputStream;
import java.util.List;
import java.util.StringTokenizer;
@@ -41,7 +42,7 @@
import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext;
-import org.jboss.tools.common.el.core.Activator;
+import org.jboss.tools.common.el.core.ELCorePlugin;
import org.jboss.tools.common.el.core.model.ELExpression;
import org.jboss.tools.common.el.core.model.ELInstance;
import org.jboss.tools.common.el.core.model.ELInvocationExpression;
@@ -147,7 +148,7 @@
scanForJava((IFile) resource);
}
}catch(CoreException ex){
- Activator.getDefault().logError(ex);
+ ELCorePlugin.getDefault().logError(ex);
}
}
@@ -160,46 +161,48 @@
scan((IFile) resource);
}
}catch(CoreException ex){
- Activator.getDefault().logError(ex);
+ ELCorePlugin.getDefault().logError(ex);
}
}
private void scanForJava(IFile file){
- String ext = file.getFileExtension();
-
- if(!isFileCorrect(file))
- return;
-
- String content = null;
- try {
- content = FileUtil.readStream(file.getContents());
- } catch (CoreException e) {
- Activator.getDefault().logError(e);
- return;
+ if(isFileCorrect(file)) {
+ String content = null;
+ try {
+ content = FileUtil.readStream(file);
+ } catch (CoreException e) {
+ ELCorePlugin.getDefault().logError(e);
+ }
+ if(content!= null) {
+ String ext = file.getFileExtension();
+ if(JAVA_EXT.equalsIgnoreCase(ext)){
+ scanJava(file, content);
+ } else if(XML_EXT.equalsIgnoreCase(ext)) {
+ scanDOM(file, content);
+ } else if(PROPERTIES_EXT.equalsIgnoreCase(ext)) {
+ scanProperties(file, content);
+ }
+ }
}
- if(JAVA_EXT.equalsIgnoreCase(ext)){
- scanJava(file, content);
- }else if(XML_EXT.equalsIgnoreCase(ext))
- scanDOM(file, content);
- else if(PROPERTIES_EXT.equalsIgnoreCase(ext))
- scanProperties(file, content);
}
private void scan(IFile file){
- String ext = file.getFileExtension();
-
- if(!isFileCorrect(file))
- return;
-
- String content = null;
- try {
- content = FileUtil.readStream(file.getContents());
- } catch (CoreException e) {
- Activator.getDefault().logError(e);
- return;
+ if(isFileCorrect(file)) {
+ String content = null;
+ try {
+ content = FileUtil.readStream(file);
+ } catch (CoreException e) {
+ ELCorePlugin.getDefault().logError("Error occured during reading content of {0} file", e); //$NON-NLS-1$
+ }
+ if(content!=null) {
+ String ext = file.getFileExtension();
+ if(XML_EXT.equalsIgnoreCase(ext)
+ || XHTML_EXT.equalsIgnoreCase(ext)
+ || JSP_EXT.equalsIgnoreCase(ext)) {
+ scanDOM(file, content);
+ }
+ }
}
- if(XML_EXT.equalsIgnoreCase(ext) || XHTML_EXT.equalsIgnoreCase(ext) || JSP_EXT.equalsIgnoreCase(ext))
- scanDOM(file, content);
}
private void scanJava(IFile file, String content){
@@ -220,31 +223,30 @@
token = scaner.nextToken();
}
} catch (BadLocationException e) {
- Activator.getDefault().logError(e);
+ ELCorePlugin.getDefault().logError(e);
}
}
private void scanDOM(IFile file, String content){
IModelManager manager = StructuredModelManager.getModelManager();
- if(manager == null) {
- return;
- }
- IStructuredModel model = null;
- try {
- model = manager.getModelForRead(file);
- if (model instanceof IDOMModel) {
- IDOMModel domModel = (IDOMModel) model;
- IDOMDocument document = domModel.getDocument();
- scanChildNodes(file, document);
+ if(manager != null) {
+ IStructuredModel model = null;
+ try {
+ model = manager.getModelForRead(file);
+ if (model instanceof IDOMModel) {
+ IDOMModel domModel = (IDOMModel) model;
+ IDOMDocument document = domModel.getDocument();
+ scanChildNodes(file, document);
+ }
+ } catch (CoreException e) {
+ ELCorePlugin.getDefault().logError(e);
+ } catch (IOException e) {
+ ELCorePlugin.getDefault().logError(e);
+ } finally {
+ if (model != null) {
+ model.releaseFromRead();
+ }
}
- } catch (CoreException e) {
- Activator.getDefault().logError(e);
- } catch (IOException e) {
- Activator.getDefault().logError(e);
- } finally {
- if (model != null) {
- model.releaseFromRead();
- }
}
}
Modified: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/ELResolverFactoryManager.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/ELResolverFactoryManager.java 2009-11-09 19:11:05 UTC (rev 18509)
+++ trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/ELResolverFactoryManager.java 2009-11-09 19:11:17 UTC (rev 18510)
@@ -22,7 +22,7 @@
import org.eclipse.core.runtime.IExtensionRegistry;
import org.eclipse.core.runtime.InvalidRegistryObjectException;
import org.eclipse.core.runtime.Platform;
-import org.jboss.tools.common.el.core.Activator;
+import org.jboss.tools.common.el.core.ELCorePlugin;
/**
* This factory is used to get EL Resources for particular resource
@@ -77,13 +77,13 @@
if(resolver instanceof ELResolver) {
resolverSet.add((ELResolver)resolver);
} else {
- Activator.getPluginLog().logError(resolver.getClass().getName() + " must be instance of org.jboss.tools.common.el.core.resolver.ELResolver"); //$NON-NLS-1$
+ ELCorePlugin.getPluginLog().logError(resolver.getClass().getName() + " must be instance of org.jboss.tools.common.el.core.resolver.ELResolver"); //$NON-NLS-1$
}
}
} catch (InvalidRegistryObjectException e) {
- Activator.getPluginLog().logError(e);
+ ELCorePlugin.getPluginLog().logError(e);
} catch (CoreException e) {
- Activator.getPluginLog().logError(e);
+ ELCorePlugin.getPluginLog().logError(e);
}
}
IConfigurationElement[] factories = elements[j].getChildren("factory"); //$NON-NLS-1$
@@ -96,10 +96,10 @@
resolverSet.add(resolver);
}
} else {
- Activator.getPluginLog().logError(factory.getClass().getName() + " must be instance of org.jboss.tools.common.el.core.resolver.ELResolverFactory"); //$NON-NLS-1$
+ ELCorePlugin.getPluginLog().logError(factory.getClass().getName() + " must be instance of org.jboss.tools.common.el.core.resolver.ELResolverFactory"); //$NON-NLS-1$
}
} catch (CoreException e) {
- Activator.getPluginLog().logError(e);
+ ELCorePlugin.getPluginLog().logError(e);
}
}
}
Modified: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/ElVarSearcher.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/ElVarSearcher.java 2009-11-09 19:11:05 UTC (rev 18509)
+++ trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/ElVarSearcher.java 2009-11-09 19:11:17 UTC (rev 18510)
@@ -25,7 +25,7 @@
import org.eclipse.wst.sse.core.internal.provisional.IndexedRegion;
import org.eclipse.wst.sse.ui.internal.contentassist.ContentAssistUtils;
import org.eclipse.wst.xml.core.internal.provisional.document.IDOMAttr;
-import org.jboss.tools.common.el.core.Activator;
+import org.jboss.tools.common.el.core.ELCorePlugin;
import org.jboss.tools.common.el.core.model.ELExpression;
import org.jboss.tools.common.el.core.parser.ELParserFactory;
import org.w3c.dom.Element;
@@ -122,10 +122,10 @@
try {
model = mm.getModelForRead(file);
} catch (IOException e) {
- Activator.getDefault().logError(e);
+ ELCorePlugin.getDefault().logError(e);
return null;
} catch (CoreException e) {
- Activator.getDefault().logError(e);
+ ELCorePlugin.getDefault().logError(e);
return null;
}
}
@@ -303,9 +303,9 @@
engine.resolveELOperand(file, var.getElToken(), true, parentVars, this);
resolvedToken = parentVar.getResolvedElToken();
} catch (StringIndexOutOfBoundsException e) {
- Activator.getPluginLog().logError(e);
+ ELCorePlugin.getPluginLog().logError(e);
} catch (BadLocationException e) {
- Activator.getPluginLog().logError(e);
+ ELCorePlugin.getPluginLog().logError(e);
}
}
if(resolvedToken!=null) {
Modified: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/TypeInfoCollector.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/TypeInfoCollector.java 2009-11-09 19:11:05 UTC (rev 18509)
+++ trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/TypeInfoCollector.java 2009-11-09 19:11:17 UTC (rev 18510)
@@ -33,7 +33,7 @@
import org.eclipse.jdt.core.ITypeParameter;
import org.eclipse.jdt.core.JavaModelException;
import org.eclipse.jdt.core.Signature;
-import org.jboss.tools.common.el.core.Activator;
+import org.jboss.tools.common.el.core.ELCorePlugin;
import org.jboss.tools.common.model.util.EclipseJavaUtil;
/**
@@ -312,7 +312,7 @@
fMemberType = getSourceType().getJavaProject().findType(getType().getQualifiedName());
}
} catch (JavaModelException e) {
- Activator.getPluginLog().logError(e);
+ ELCorePlugin.getPluginLog().logError(e);
}
}
return fMemberType;
@@ -391,7 +391,7 @@
superType.initializeParameters(this);
}
} catch (JavaModelException e) {
- Activator.getPluginLog().logError(e);
+ ELCorePlugin.getPluginLog().logError(e);
}
}
@@ -504,7 +504,7 @@
IType declType = getSourceType().getJavaProject().findType(getDeclaringTypeQualifiedName());
fJavaElement = (declType == null ? null : declType.getField(getName()));
} catch (JavaModelException e) {
- Activator.getPluginLog().logError(e);
+ ELCorePlugin.getPluginLog().logError(e);
}
}
return fJavaElement;
@@ -678,7 +678,7 @@
}
}
} catch (JavaModelException e) {
- Activator.getPluginLog().logError(e);
+ ELCorePlugin.getPluginLog().logError(e);
}
}
return fJavaElement;
@@ -759,7 +759,7 @@
addInfoForDataModelVariable();
}
} catch (JavaModelException e) {
- Activator.getPluginLog().logError(e);
+ ELCorePlugin.getPluginLog().logError(e);
}
}
@@ -962,7 +962,7 @@
methods.add(info);
}
} catch (JavaModelException e) {
- Activator.getPluginLog().logError(e);
+ ELCorePlugin.getPluginLog().logError(e);
}
}
return methods;
@@ -1081,7 +1081,7 @@
properties.add(info);
}
} catch (JavaModelException e) {
- Activator.getPluginLog().logError(e);
+ ELCorePlugin.getPluginLog().logError(e);
}
}
@@ -1212,7 +1212,7 @@
result = new MethodInfo(method, declaringType, declaringType, dataModel);
}
} catch (JavaModelException e) {
- Activator.getPluginLog().logError(e);
+ ELCorePlugin.getPluginLog().logError(e);
}
if(result != null && cache!=null) {
cache.put(member, result);
15 years, 1 month
- 1
- 0
JBoss Tools SVN: r18509 - in trunk: common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/propertieseditor/bundlemodel and 6 other directories.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2009-11-09 14:11:05 -0500 (Mon, 09 Nov 2009)
New Revision: 18509
Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/propertieseditor/bundlemodel/BundleModel.java
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/EclipseResourceUtil.java
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/ELValidator.java
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/validation/ELReference.java
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/refactoring/SeamRenameProcessor.java
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/refactoring/SeamRefactorContributionFactory.java
trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/refactoring/SeamComponentRefactoringTest.java
trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/refactoring/SeamContextVariableRefactoringTest.java
trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/view/SeamComponentsViewTest.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-5179
Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/EclipseResourceUtil.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/EclipseResourceUtil.java 2009-11-09 19:08:01 UTC (rev 18508)
+++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/EclipseResourceUtil.java 2009-11-09 19:11:05 UTC (rev 18509)
@@ -12,35 +12,60 @@
import java.io.File;
import java.io.IOException;
+import java.io.InputStream;
import java.net.URL;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
-import org.eclipse.core.resources.*;
+import org.eclipse.core.resources.IContainer;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IMarker;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IProjectDescription;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.FileLocator;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.Path;
import org.eclipse.core.runtime.Plugin;
-import org.eclipse.jdt.core.*;
+import org.eclipse.jdt.core.IClasspathContainer;
+import org.eclipse.jdt.core.IClasspathEntry;
+import org.eclipse.jdt.core.ICompilationUnit;
+import org.eclipse.jdt.core.IJavaElement;
+import org.eclipse.jdt.core.IJavaModelMarker;
+import org.eclipse.jdt.core.IJavaProject;
+import org.eclipse.jdt.core.IType;
+import org.eclipse.jdt.core.JavaCore;
+import org.eclipse.jdt.core.JavaModelException;
import org.eclipse.jdt.ui.PreferenceConstants;
import org.eclipse.swt.graphics.Image;
import org.eclipse.wst.common.componentcore.ComponentCore;
import org.eclipse.wst.common.componentcore.ModuleCoreNature;
import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.osgi.framework.Bundle;
-
import org.jboss.tools.common.meta.action.XActionInvoker;
-import org.jboss.tools.common.model.*;
+import org.jboss.tools.common.model.XModel;
+import org.jboss.tools.common.model.XModelConstants;
+import org.jboss.tools.common.model.XModelFactory;
+import org.jboss.tools.common.model.XModelObject;
+import org.jboss.tools.common.model.XModelObjectConstants;
import org.jboss.tools.common.model.filesystems.FilePathHelper;
import org.jboss.tools.common.model.filesystems.FileSystemsHelper;
import org.jboss.tools.common.model.filesystems.XFileObject;
-import org.jboss.tools.common.model.filesystems.impl.*;
-import org.jboss.tools.common.model.icons.impl.*;
+import org.jboss.tools.common.model.filesystems.impl.FileSystemImpl;
+import org.jboss.tools.common.model.filesystems.impl.FileSystemsImpl;
+import org.jboss.tools.common.model.filesystems.impl.JarSystemImpl;
+import org.jboss.tools.common.model.icons.impl.XModelObjectIcon;
import org.jboss.tools.common.model.impl.XModelObjectImpl;
import org.jboss.tools.common.model.plugin.ModelPlugin;
import org.jboss.tools.common.model.project.IModelNature;
import org.jboss.tools.common.model.project.ModelNature;
import org.jboss.tools.common.model.project.ModelNatureExtension;
+import org.jboss.tools.common.util.FileUtil;
+import org.osgi.framework.Bundle;
public class EclipseResourceUtil {
@@ -962,4 +987,22 @@
return path.endsWith(".jar") || path.endsWith(".zip"); //$NON-NLS-1$ //$NON-NLS-2$
}
-}
+ public static String getFileContent(IFile file) {
+ InputStream is = null;
+ try {
+ is = file.getContents();
+ return FileUtil.readStream(is);
+ } catch (CoreException e) {
+ ModelPlugin.getPluginLog().logError(e);
+ return null;
+ } finally {
+ if(is!=null) {
+ try {
+ is.close();
+ } catch (IOException e) {
+ // ignore
+ }
+ }
+ }
+ }
+}
\ No newline at end of file
Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/propertieseditor/bundlemodel/BundleModel.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/propertieseditor/bundlemodel/BundleModel.java 2009-11-09 19:08:01 UTC (rev 18508)
+++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/propertieseditor/bundlemodel/BundleModel.java 2009-11-09 19:11:05 UTC (rev 18509)
@@ -162,8 +162,9 @@
ArrayList<String> keys = new ArrayList<String>();
ArrayList<String> values = new ArrayList<String>();
Properties p = new Properties();
+ InputStream s = null;
try {
- InputStream s = file.getContents();
+ s = file.getContents();
BufferedReader in = new BufferedReader(new InputStreamReader(s, "8859_1")); //$NON-NLS-1$
while (true) {
String line = in.readLine();
@@ -198,6 +199,14 @@
ModelUIPlugin.getPluginLog().logError(e);
} catch (IOException e) {
ModelUIPlugin.getPluginLog().logError(e);
+ } finally {
+ if(s!=null) {
+ try {
+ s.close();
+ } catch (IOException e) {
+ // ignore
+ }
+ }
}
String[][] r = new String[keys.size()][2];
for (int i = 0; i < r.length; i++) {
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/ELValidator.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/ELValidator.java 2009-11-09 19:08:01 UTC (rev 18508)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/ELValidator.java 2009-11-09 19:11:05 UTC (rev 18509)
@@ -73,7 +73,6 @@
import org.jboss.tools.common.el.core.resolver.TypeInfoCollector;
import org.jboss.tools.common.el.core.resolver.Var;
import org.jboss.tools.common.model.util.EclipseResourceUtil;
-import org.jboss.tools.common.util.FileUtil;
import org.jboss.tools.jsf.JSFModelPlugin;
import org.jboss.tools.jsf.preferences.JSFSeverityPreferences;
import org.jboss.tools.jsf.project.JSFNature;
@@ -269,13 +268,7 @@
removeAllMessagesFromResource(file);
displaySubtask(JSFValidationMessages.VALIDATING_EL_FILE, new String[]{file.getProject().getName(), file.getName()});
String ext = file.getFileExtension();
- String content = null;
- try {
- content = FileUtil.readStream(file.getContents());
- } catch (CoreException e) {
- JSFModelPlugin.getPluginLog().logError(e);
- return;
- }
+ String content = EclipseResourceUtil.getFileContent(file);
if(ext.equalsIgnoreCase(JAVA_EXT)) {
validateJava(file, content);
} else {
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/validation/ELReference.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/validation/ELReference.java 2009-11-09 19:08:01 UTC (rev 18508)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/validation/ELReference.java 2009-11-09 19:11:05 UTC (rev 18509)
@@ -28,8 +28,8 @@
import org.jboss.tools.common.el.core.parser.ELParser;
import org.jboss.tools.common.el.core.parser.ELParserUtil;
import org.jboss.tools.common.el.core.parser.SyntaxError;
+import org.jboss.tools.common.model.util.EclipseResourceUtil;
import org.jboss.tools.common.text.ITextSourceReference;
-import org.jboss.tools.common.util.FileUtil;
import org.jboss.tools.jst.web.kb.WebKbPlugin;
import org.w3c.dom.Element;
@@ -117,29 +117,25 @@
public ELExpression[] getEl() {
if(el==null) {
Set<ELExpression> exps = new HashSet<ELExpression>();
- try {
- String content = FileUtil.readStream(getResource().getContents());
- String elText = content.substring(startPosition, startPosition + length);
- int startEl = elText.indexOf("#{"); //$NON-NLS-1$
- if(startEl>-1) {
- ELParser parser = ELParserUtil.getJbossFactory().createParser();
- ELModel model = parser.parse(elText);
- List<SyntaxError> errors = model.getSyntaxErrors();
- if(!errors.isEmpty()) {
+ String content = EclipseResourceUtil.getFileContent(getResource());
+ String elText = content.substring(startPosition, startPosition + length);
+ int startEl = elText.indexOf("#{"); //$NON-NLS-1$
+ if(startEl>-1) {
+ ELParser parser = ELParserUtil.getJbossFactory().createParser();
+ ELModel model = parser.parse(elText);
+ List<SyntaxError> errors = model.getSyntaxErrors();
+ if(!errors.isEmpty()) {
+ WebKbPlugin.getDefault().logWarning("ELObject hold incorrect information. Maybe resource " + getResource() + " has been changed.");
+ return null;
+ }
+ List<ELInstance> is = model.getInstances();
+ for (ELInstance i : is) {
+ if(!i.getErrors().isEmpty()) {
WebKbPlugin.getDefault().logWarning("ELObject hold incorrect information. Maybe resource " + getResource() + " has been changed.");
- return null;
+ continue;
}
- List<ELInstance> is = model.getInstances();
- for (ELInstance i : is) {
- if(!i.getErrors().isEmpty()) {
- WebKbPlugin.getDefault().logWarning("ELObject hold incorrect information. Maybe resource " + getResource() + " has been changed.");
- continue;
- }
- exps.add(i.getExpression());
- }
+ exps.add(i.getExpression());
}
- } catch (CoreException e) {
- WebKbPlugin.getDefault().logError(e);
}
el = exps.toArray(new ELExpression[0]);
}
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/refactoring/SeamRenameProcessor.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/refactoring/SeamRenameProcessor.java 2009-11-09 19:08:01 UTC (rev 18508)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/refactoring/SeamRenameProcessor.java 2009-11-09 19:11:05 UTC (rev 18509)
@@ -30,8 +30,8 @@
import org.eclipse.text.edits.TextEdit;
import org.jboss.tools.common.el.core.model.ELInvocationExpression;
import org.jboss.tools.common.el.core.model.ELPropertyInvocation;
+import org.jboss.tools.common.model.util.EclipseResourceUtil;
import org.jboss.tools.common.text.ITextSourceReference;
-import org.jboss.tools.common.util.FileUtil;
import org.jboss.tools.seam.core.BijectedAttributeType;
import org.jboss.tools.seam.core.IBijectedAttribute;
import org.jboss.tools.seam.core.ISeamComponent;
@@ -217,15 +217,8 @@
if(!isFileCorrect(file))
return;
-
- String content = null;
- try {
- content = FileUtil.readStream(file.getContents());
- } catch (CoreException e) {
- SeamCorePlugin.getPluginLog().logError(e);
- return;
- }
-
+
+ String content = EclipseResourceUtil.getFileContent(file);
String text = content.substring(location.getStartPosition(), location.getStartPosition()+location.getLength());
if(text.startsWith("<")){ //$NON-NLS-1$
int position = text.lastIndexOf("/>"); //$NON-NLS-1$
@@ -245,14 +238,7 @@
if(!isFileCorrect(file))
return;
- String content = null;
- try {
- content = FileUtil.readStream(file.getContents());
- } catch (CoreException e) {
- SeamCorePlugin.getPluginLog().logError(e);
- return;
- }
-
+ String content = EclipseResourceUtil.getFileContent(file);
String text = content.substring(location.getStartPosition(), location.getStartPosition()+location.getLength());
int openBracket = text.indexOf("("); //$NON-NLS-1$
int openQuote = text.indexOf("\""); //$NON-NLS-1$
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/refactoring/SeamRefactorContributionFactory.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/refactoring/SeamRefactorContributionFactory.java 2009-11-09 19:08:01 UTC (rev 18508)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/refactoring/SeamRefactorContributionFactory.java 2009-11-09 19:11:05 UTC (rev 18509)
@@ -169,23 +169,16 @@
}else if(editor instanceof WebCompoundEditor)
sel = ((WebCompoundEditor)editor).getActiveEditor().getSite().getSelectionProvider().getSelection();
}
-
+
if(sel instanceof TextSelection){
TextSelection selection = (TextSelection)sel;
-
+
selectedText = selection.getText();
-
- fileContent = null;
- try {
- fileContent = FileUtil.readStream(editorFile.getContents());
- } catch (CoreException e) {
- SeamCorePlugin.getPluginLog().logError(e);
- return;
- }
-
+
+ fileContent = EclipseResourceUtil.getFileContent(editorFile);
+
boolean status = false;
-
-
+
if(JAVA_EXT.equalsIgnoreCase(ext)){
// check - whether selected component's name or not
// if(checkNameAnnotation(selection)){
@@ -199,10 +192,10 @@
status = checkContextVariableInDOM(editorFile, fileContent, selection);
else if(PROPERTIES_EXT.equalsIgnoreCase(ext))
status = checkContextVariableInProperties(editorFile, fileContent, selection);
-
+
if(status){
mm.add(new RenameSeamContextVariableAction());
-
+
if(!separatorIsAdded)
additions.addContributionItem(new Separator(), null);
additions.addContributionItem(mm, null);
Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/refactoring/SeamComponentRefactoringTest.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/refactoring/SeamComponentRefactoringTest.java 2009-11-09 19:08:01 UTC (rev 18508)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/refactoring/SeamComponentRefactoringTest.java 2009-11-09 19:11:05 UTC (rev 18509)
@@ -9,6 +9,7 @@
import org.eclipse.ltk.core.refactoring.CompositeChange;
import org.eclipse.ltk.core.refactoring.TextFileChange;
import org.eclipse.text.edits.MultiTextEdit;
+import org.jboss.tools.common.model.util.EclipseResourceUtil;
import org.jboss.tools.common.util.FileUtil;
import org.jboss.tools.seam.core.ISeamComponent;
import org.jboss.tools.seam.core.ISeamProject;
@@ -130,8 +131,7 @@
assertNotNull("Can't load component " + newName, seamProject.getComponent(newName));
for(TestChangeStructure changeStructure : changeList){
IFile file = changeStructure.getProject().getFile(changeStructure.getFileName());
- String content = null;
- content = FileUtil.readStream(file.getContents());
+ String content = EclipseResourceUtil.getFileContent(file);
//System.out.println("File - "+file.getName()+" offset - "+changeStructure.getOffset()+" expected - ["+changeStructure.getText()+"] actual - ["+content.substring(changeStructure.getOffset(), changeStructure.getOffset()+changeStructure.getLength())+"]");
for(TestTextChange change : changeStructure.getTextChanges()){
assertEquals("There is unexpected change in resource - "+file.getName(),change.getText(), content.substring(change.getOffset(), change.getOffset()+change.getLength()));
Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/refactoring/SeamContextVariableRefactoringTest.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/refactoring/SeamContextVariableRefactoringTest.java 2009-11-09 19:08:01 UTC (rev 18508)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/refactoring/SeamContextVariableRefactoringTest.java 2009-11-09 19:11:05 UTC (rev 18509)
@@ -9,6 +9,7 @@
import org.eclipse.ltk.core.refactoring.CompositeChange;
import org.eclipse.ltk.core.refactoring.TextFileChange;
import org.eclipse.text.edits.MultiTextEdit;
+import org.jboss.tools.common.model.util.EclipseResourceUtil;
import org.jboss.tools.common.util.FileUtil;
import org.jboss.tools.seam.core.ISeamProject;
import org.jboss.tools.seam.internal.core.refactoring.RenameSeamContextVariableProcessor;
@@ -25,8 +26,7 @@
// Test before renaming
for(TestChangeStructure changeStructure : changeList){
IFile file = changeStructure.getProject().getFile(changeStructure.getFileName());
- String content = null;
- content = FileUtil.readStream(file.getContents());
+ String content = EclipseResourceUtil.getFileContent(file);
for(TestTextChange change : changeStructure.getTextChanges()){
assertNotSame(change.getText(), content.substring(change.getOffset(), change.getOffset()+change.getLength()));
}
Modified: trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/view/SeamComponentsViewTest.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/view/SeamComponentsViewTest.java 2009-11-09 19:08:01 UTC (rev 18508)
+++ trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/view/SeamComponentsViewTest.java 2009-11-09 19:11:05 UTC (rev 18509)
@@ -11,6 +11,8 @@
******************************************************************************/
package org.jboss.tools.seam.ui.test.view;
+import java.io.IOException;
+import java.io.InputStream;
import java.util.Iterator;
import junit.framework.TestCase;
@@ -37,6 +39,7 @@
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.WorkbenchException;
import org.eclipse.ui.navigator.CommonNavigator;
+import org.jboss.tools.common.model.util.EclipseResourceUtil;
import org.jboss.tools.seam.core.ISeamComponent;
import org.jboss.tools.seam.core.ISeamPackage;
import org.jboss.tools.seam.core.SeamCorePlugin;
@@ -238,10 +241,20 @@
IFile file1 = project.getFile("JavaSource/demo/Person.1");
assertTrue("Cannot find Person.1 in test project", file1 != null && file1.exists());
+ InputStream is = null;
try{
- classFile.create(file1.getContents(), false, new NullProgressMonitor());
+ is = file1.getContents();
+ classFile.create(is, false, new NullProgressMonitor());
}catch(Exception ex){
JUnitUtils.fail("Cannot read file JavaSource/demo/Person.1", ex);
+ } finally {
+ if(is!=null) {
+ try {
+ is.close();
+ } catch (IOException e) {
+ // ignore
+ }
+ }
}
refreshProject(project);
15 years, 1 month
- 1
- 0
JBoss Tools SVN: r18508 - trunk/common/features/org.jboss.tools.common.core.feature.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2009-11-09 14:08:01 -0500 (Mon, 09 Nov 2009)
New Revision: 18508
Modified:
trunk/common/features/org.jboss.tools.common.core.feature/feature.xml
Log:
https://jira.jboss.org/jira/browse/JBIDE-5172 remove .kb plugin (does not exist in svn repo)
Modified: trunk/common/features/org.jboss.tools.common.core.feature/feature.xml
===================================================================
--- trunk/common/features/org.jboss.tools.common.core.feature/feature.xml 2009-11-09 18:59:07 UTC (rev 18507)
+++ trunk/common/features/org.jboss.tools.common.core.feature/feature.xml 2009-11-09 19:08:01 UTC (rev 18508)
@@ -13,16 +13,16 @@
%copyright
</copyright>
- <license>Red Hat, Inc. licenses these features and plugins to you under
+ <license>
+ Red Hat, Inc. licenses these features and plugins to you under
certain open source licenses (or aggregations of such licenses), which
in a particular case may include the Eclipse Public License, the GNU
Lesser General Public License, and/or certain other open source
licenses. For precise licensing details, consult the corresponding
source code, or contact Red Hat Legal Affairs, 1801 Varsity Drive,
Raleigh NC 27606 USA.
-</license>
+ </license>
-
<url>
<update label="%updateSiteName" url="http://download.jboss.org/jbosstools/updates/stable"/>
</url>
@@ -34,12 +34,6 @@
version="0.0.0"/>
<plugin
- id="org.jboss.tools.common.kb"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
id="org.jboss.tools.common.model"
download-size="0"
install-size="0"
15 years, 1 month
- 1
- 0
JBoss Tools SVN: r18507 - trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/util.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2009-11-09 13:59:07 -0500 (Mon, 09 Nov 2009)
New Revision: 18507
Modified:
trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/util/FileUtil.java
Log:
new readStream(IFile) method added
Modified: trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/util/FileUtil.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/util/FileUtil.java 2009-11-09 18:54:11 UTC (rev 18506)
+++ trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/util/FileUtil.java 2009-11-09 18:59:07 UTC (rev 18507)
@@ -184,6 +184,24 @@
}
return sb.toString();
}
+
+ public static String readStream(IFile file) throws CoreException {
+ String content = null;
+ InputStream in = null;
+ try {
+ in = file.getContents();
+ content = FileUtil.readStream(in);
+ } finally {
+ if(in!=null) {
+ try {
+ in.close();
+ } catch (IOException e) {
+ CommonPlugin.getPluginLog().logError(e);
+ }
+ }
+ }
+ return content;
+ }
public static boolean writeFile(File f, String value) {
return writeFileWithEncodingCheck(f, value, null);
15 years, 1 month
- 1
- 0
JBoss Tools SVN: r18506 - trunk/jmx/features/org.jboss.tools.jmx.sdk.feature.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2009-11-09 13:54:11 -0500 (Mon, 09 Nov 2009)
New Revision: 18506
Modified:
trunk/jmx/features/org.jboss.tools.jmx.sdk.feature/.project
Log:
fix feature name in .project
Modified: trunk/jmx/features/org.jboss.tools.jmx.sdk.feature/.project
===================================================================
--- trunk/jmx/features/org.jboss.tools.jmx.sdk.feature/.project 2009-11-09 18:47:12 UTC (rev 18505)
+++ trunk/jmx/features/org.jboss.tools.jmx.sdk.feature/.project 2009-11-09 18:54:11 UTC (rev 18506)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.jboss.tools.jmx.sdk-feature</name>
+ <name>org.jboss.tools.jmx.sdk.feature</name>
<comment></comment>
<projects>
</projects>
15 years, 1 month
- 1
- 0
JBoss Tools SVN: r18505 - trunk/hibernatetools/features/org.hibernate.eclipse.sdk.feature.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2009-11-09 13:47:12 -0500 (Mon, 09 Nov 2009)
New Revision: 18505
Modified:
trunk/hibernatetools/features/org.hibernate.eclipse.sdk.feature/.project
Log:
fix feature name in .project
Modified: trunk/hibernatetools/features/org.hibernate.eclipse.sdk.feature/.project
===================================================================
--- trunk/hibernatetools/features/org.hibernate.eclipse.sdk.feature/.project 2009-11-09 18:44:03 UTC (rev 18504)
+++ trunk/hibernatetools/features/org.hibernate.eclipse.sdk.feature/.project 2009-11-09 18:47:12 UTC (rev 18505)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.hibernate.eclipse.feature</name>
+ <name>org.hibernate.eclipse.sdk.feature</name>
<comment></comment>
<projects>
</projects>
15 years, 1 month
- 1
- 0
JBoss Tools SVN: r18504 - trunk/maven/features/org.jboss.tools.maven.feature.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2009-11-09 13:44:03 -0500 (Mon, 09 Nov 2009)
New Revision: 18504
Modified:
trunk/maven/features/org.jboss.tools.maven.feature/.project
Log:
fix feature name in .project
Modified: trunk/maven/features/org.jboss.tools.maven.feature/.project
===================================================================
--- trunk/maven/features/org.jboss.tools.maven.feature/.project 2009-11-09 18:11:18 UTC (rev 18503)
+++ trunk/maven/features/org.jboss.tools.maven.feature/.project 2009-11-09 18:44:03 UTC (rev 18504)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.jboss.tools.maven.sdk.feature</name>
+ <name>org.jboss.tools.maven.feature</name>
<comment></comment>
<projects>
</projects>
15 years, 1 month
- 1
- 0