JBoss Tools SVN: r22491 - trunk/jsf/features/org.jboss.tools.richfaces.feature.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2010-06-02 13:45:19 -0400 (Wed, 02 Jun 2010)
New Revision: 22491
Modified:
trunk/jsf/features/org.jboss.tools.richfaces.feature/feature.xml
Log:
https://jira.jboss.org/browse/JBDS-1202 problems running tests
jsf component tests error fix:
- capabilities extension point moved out to separate plug-in and included in reachfaces feature
Modified: trunk/jsf/features/org.jboss.tools.richfaces.feature/feature.xml
===================================================================
--- trunk/jsf/features/org.jboss.tools.richfaces.feature/feature.xml 2010-06-02 17:41:17 UTC (rev 22490)
+++ trunk/jsf/features/org.jboss.tools.richfaces.feature/feature.xml 2010-06-02 17:45:19 UTC (rev 22491)
@@ -18,10 +18,6 @@
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>
- <!-- <url>
- <update label="%updateSiteName" url="http://download.jboss.org/jbosstools/updates/stable/galileo/"/>
- </url> -->
-
<requires>
<import feature="org.jboss.tools.xulrunner.feature" version="1.8.1.3-20070904"/>
</requires>
@@ -40,7 +36,7 @@
version="0.0.0"
unpack="false"/>
- <plugin
+ <plugin
id="org.jboss.tools.common.ui"
download-size="0"
install-size="0"
@@ -327,4 +323,11 @@
install-size="0"
version="0.0.0"/>
+ <plugin
+ id="org.jboss.tools.common.model.ui.capabilities"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
</feature>
14 years, 7 months
JBoss Tools SVN: r22490 - in trunk/common/plugins: org.jboss.tools.common.model.ui.capabilities and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2010-06-02 13:41:17 -0400 (Wed, 02 Jun 2010)
New Revision: 22490
Added:
trunk/common/plugins/org.jboss.tools.common.model.ui.capabilities/.classpath
trunk/common/plugins/org.jboss.tools.common.model.ui.capabilities/.project
trunk/common/plugins/org.jboss.tools.common.model.ui.capabilities/.settings/
trunk/common/plugins/org.jboss.tools.common.model.ui.capabilities/.settings/org.eclipse.jdt.core.prefs
trunk/common/plugins/org.jboss.tools.common.model.ui.capabilities/META-INF/
trunk/common/plugins/org.jboss.tools.common.model.ui.capabilities/META-INF/MANIFEST.MF
trunk/common/plugins/org.jboss.tools.common.model.ui.capabilities/build.properties
trunk/common/plugins/org.jboss.tools.common.model.ui.capabilities/plugin.xml
trunk/common/plugins/org.jboss.tools.common.model.ui.capabilities/src/
Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/plugin.xml
Log:
https://jira.jboss.org/browse/JBDS-1202 problems running tests
jsf component tests error fix:
- capabilities extension point moved out to separate plug-in to fix test errors
Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/plugin.xml
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model.ui/plugin.xml 2010-06-02 17:38:45 UTC (rev 22489)
+++ trunk/common/plugins/org.jboss.tools.common.model.ui/plugin.xml 2010-06-02 17:41:17 UTC (rev 22490)
@@ -457,43 +457,6 @@
class="org.jboss.tools.common.model.ui.editors.dnd.PlainTextDropCommand"/>
</extension>
- <extension
- point="org.eclipse.ui.activities">
- <category
- description="%CategoryDescription_experimental"
- id="org.jboss.tools.common.model.ui.experimental"
- name="%CategoryName_experimental"/>
- <categoryActivityBinding
- activityId="org.jboss.tools.common.model.ui.templates"
- categoryId="org.jboss.tools.common.model.ui.experimental"/>
- <activity
- id="org.jboss.tools.common.model.ui.templates"
- name="%ActivityName_templates"/>
- <activityPatternBinding
- activityId="org.jboss.tools.common.model.ui.templates"
- pattern="org\.jboss\.tools\.common\.model\.ui/.*templates"/>
- <activityPatternBinding
- activityId="org.jboss.tools.common.model.ui.templates"
- pattern="org\.jboss\.tools\.jsf\.ui/.*jsfimplementations"/>
- <activityPatternBinding
- activityId="org.jboss.tools.common.model.ui.templates"
- pattern="org\.jboss\.tools\.jsf\.ui/.*capabilities"/>
- <activityPatternBinding
- activityId="org.jboss.tools.common.model.ui.templates"
- pattern="ExadelTemplatesPropertiesPage"/>
- <activityPatternBinding
- activityId="org.jboss.tools.common.model.ui.templates"
- pattern="org\.jboss\.tools\.struts\.ui/.*environments"/>
- <activityPatternBinding
- activityId="org.jboss.tools.common.model.ui.templates"
- pattern="org\.jboss\.tools\.jst\.web\.ui/.*libsets"/>
- <activityPatternBinding
- activityId="org.jboss.tools.common.model.ui.templates"
- pattern="org\.jboss\.tools\.common\.model\.ui/ExadelTemplatesPropertiesPage"/>
- <activityPatternBinding
- activityId="org.jboss.tools.common.model.ui.templates"
- pattern="org\.jboss\.tools\.jst\.web\.ui/.*SaveProjectAsTemplateActionDelegate"/>
- </extension>
<extension
point="org.jboss.tools.common.model.ui.attributeContentProposalProviders">
Added: trunk/common/plugins/org.jboss.tools.common.model.ui.capabilities/.classpath
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model.ui.capabilities/.classpath (rev 0)
+++ trunk/common/plugins/org.jboss.tools.common.model.ui.capabilities/.classpath 2010-06-02 17:41:17 UTC (rev 22490)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
Property changes on: trunk/common/plugins/org.jboss.tools.common.model.ui.capabilities/.classpath
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/common/plugins/org.jboss.tools.common.model.ui.capabilities/.project
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model.ui.capabilities/.project (rev 0)
+++ trunk/common/plugins/org.jboss.tools.common.model.ui.capabilities/.project 2010-06-02 17:41:17 UTC (rev 22490)
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.jboss.tools.common.model.ui.capabilities</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.ManifestBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.SchemaBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.pde.PluginNature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
Property changes on: trunk/common/plugins/org.jboss.tools.common.model.ui.capabilities/.project
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/common/plugins/org.jboss.tools.common.model.ui.capabilities/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model.ui.capabilities/.settings/org.eclipse.jdt.core.prefs (rev 0)
+++ trunk/common/plugins/org.jboss.tools.common.model.ui.capabilities/.settings/org.eclipse.jdt.core.prefs 2010-06-02 17:41:17 UTC (rev 22490)
@@ -0,0 +1,8 @@
+#Wed Jun 02 10:26:06 PDT 2010
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.5
Property changes on: trunk/common/plugins/org.jboss.tools.common.model.ui.capabilities/.settings/org.eclipse.jdt.core.prefs
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/common/plugins/org.jboss.tools.common.model.ui.capabilities/META-INF/MANIFEST.MF
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model.ui.capabilities/META-INF/MANIFEST.MF (rev 0)
+++ trunk/common/plugins/org.jboss.tools.common.model.ui.capabilities/META-INF/MANIFEST.MF 2010-06-02 17:41:17 UTC (rev 22490)
@@ -0,0 +1,7 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Capabilities
+Bundle-SymbolicName: org.jboss.tools.common.model.ui.capabilities;singleton:=true
+Bundle-Version: 3.1.0.qualifier
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Require-Bundle: org.eclipse.ui;bundle-version="3.5.2"
Property changes on: trunk/common/plugins/org.jboss.tools.common.model.ui.capabilities/META-INF/MANIFEST.MF
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/common/plugins/org.jboss.tools.common.model.ui.capabilities/build.properties
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model.ui.capabilities/build.properties (rev 0)
+++ trunk/common/plugins/org.jboss.tools.common.model.ui.capabilities/build.properties 2010-06-02 17:41:17 UTC (rev 22490)
@@ -0,0 +1,5 @@
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+ .,\
+ plugin.xml
Property changes on: trunk/common/plugins/org.jboss.tools.common.model.ui.capabilities/build.properties
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/common/plugins/org.jboss.tools.common.model.ui.capabilities/plugin.xml
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model.ui.capabilities/plugin.xml (rev 0)
+++ trunk/common/plugins/org.jboss.tools.common.model.ui.capabilities/plugin.xml 2010-06-02 17:41:17 UTC (rev 22490)
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.4"?>
+<plugin>
+ <extension
+ point="org.eclipse.ui.activities">
+ <category
+ description="%CategoryDescription_experimental"
+ id="org.jboss.tools.common.model.ui.experimental"
+ name="%CategoryName_experimental">
+ </category>
+ <categoryActivityBinding
+ activityId="org.jboss.tools.common.model.ui.templates"
+ categoryId="org.jboss.tools.common.model.ui.experimental">
+ </categoryActivityBinding>
+ <activity
+ id="org.jboss.tools.common.model.ui.templates"
+ name="%ActivityName_templates">
+ </activity>
+ <activityPatternBinding
+ activityId="org.jboss.tools.common.model.ui.templates"
+ pattern="org\.jboss\.tools\.common\.model\.ui/.*templates">
+ </activityPatternBinding>
+ <activityPatternBinding
+ activityId="org.jboss.tools.common.model.ui.templates"
+ pattern="org\.jboss\.tools\.jsf\.ui/.*jsfimplementations">
+ </activityPatternBinding>
+ <activityPatternBinding
+ activityId="org.jboss.tools.common.model.ui.templates"
+ pattern="org\.jboss\.tools\.jsf\.ui/.*capabilities">
+ </activityPatternBinding>
+ <activityPatternBinding
+ activityId="org.jboss.tools.common.model.ui.templates"
+ pattern="ExadelTemplatesPropertiesPage">
+ </activityPatternBinding>
+ <activityPatternBinding
+ activityId="org.jboss.tools.common.model.ui.templates"
+ pattern="org\.jboss\.tools\.struts\.ui/.*environments">
+ </activityPatternBinding>
+ <activityPatternBinding
+ activityId="org.jboss.tools.common.model.ui.templates"
+ pattern="org\.jboss\.tools\.jst\.web\.ui/.*libsets">
+ </activityPatternBinding>
+ <activityPatternBinding
+ activityId="org.jboss.tools.common.model.ui.templates"
+ pattern="org\.jboss\.tools\.common\.model\.ui/ExadelTemplatesPropertiesPage">
+ </activityPatternBinding>
+ <activityPatternBinding
+ activityId="org.jboss.tools.common.model.ui.templates"
+ pattern="org\.jboss\.tools\.jst\.web\.ui/.*SaveProjectAsTemplateActionDelegate">
+ </activityPatternBinding>
+ </extension>
+</plugin>
Property changes on: trunk/common/plugins/org.jboss.tools.common.model.ui.capabilities/plugin.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
14 years, 7 months
JBoss Tools SVN: r22488 - trunk.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2010-06-02 13:37:35 -0400 (Wed, 02 Jun 2010)
New Revision: 22488
Modified:
trunk/parent-pom.xml
Log:
port changes from helios branch to trunk
Modified: trunk/parent-pom.xml
===================================================================
--- trunk/parent-pom.xml 2010-06-02 17:35:23 UTC (rev 22487)
+++ trunk/parent-pom.xml 2010-06-02 17:37:35 UTC (rev 22488)
@@ -9,7 +9,6 @@
<properties>
<tychoVersion>0.9.0-SNAPSHOT</tychoVersion>
- <!-- <tychoVersion>0.8.0</tychoVersion> -->
<scmBranch>trunk</scmBranch>
<BUILD_ALIAS>M1</BUILD_ALIAS>
</properties>
@@ -167,6 +166,157 @@
<url>https://jira.jboss.org/jira/secure/</url>
</issueManagement>
+ <repositories>
+ <repository>
+ <id>galileo</id>
+ <url>http://download.eclipse.org/releases/galileo/</url>
+ <layout>p2</layout>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </repository>
+ <repository>
+ <id>eclipse35</id>
+ <url>http://download.eclipse.org/eclipse/updates/3.5/</url>
+ <layout>p2</layout>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </repository>
+ <repository>
+ <id>birt25r</id>
+ <url>http://download.eclipse.org/birt/update-site/2.5</url>
+ <layout>p2</layout>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </repository>
+ <repository>
+ <id>swtbot-galileo</id>
+ <url>http://download.eclipse.org/technology/swtbot/galileo/dev-build/update-site
+ </url>
+ <layout>p2</layout>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </repository>
+ <repository>
+ <id>webtools</id>
+ <url>http://download.eclipse.org/webtools/updates/</url>
+ <layout>p2</layout>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </repository>
+
+ <!--
+ <repository>
+ <id>helios</id>
+ <url>http://download.eclipse.org/releases/helios/</url>
+ <layout>p2</layout>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </repository>
+ <repository>
+ <id>webtools32</id>
+ <url>http://download.eclipse.org/webtools/repository/helios</url>
+ <layout>p2</layout>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </repository>
+ <repository>
+ <id>eclipse36</id>
+ <url>http://download.eclipse.org/eclipse/updates/3.6/</url>
+ <layout>p2</layout>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </repository>
+ <repository>
+ <id>birt26r</id>
+ <url>http://download.eclipse.org/birt/update-site/2.6/</url>
+ <layout>p2</layout>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </repository>
+ <repository>
+ <id>birt26i</id>
+ <url>http://download.eclipse.org/birt/update-site/2.6-interim/</url>
+ <layout>p2</layout>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </repository>
+ <repository>
+ <id>swtbot-helios</id>
+ <url>http://download.eclipse.org/technology/swtbot/helios/dev-build/update-site/
+ </url>
+ <layout>p2</layout>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </repository>
+ -->
+ <repository>
+ <id>m2eclipse</id>
+ <url>http://m2eclipse.sonatype.org/sites/m2e/</url>
+ <layout>p2</layout>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </repository>
+ <repository>
+ <id>m2eclipse-extras</id>
+ <url>http://m2eclipse.sonatype.org/sites/m2e-extras/</url>
+ <layout>p2</layout>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </repository>
+ </repositories>
+
<profiles>
<!-- TODO: verify that this profile overrides the default profile if BUILD_NUMBER
is set (by a Hudson job) -->
@@ -193,72 +343,6 @@
</build>
</profile>
<profile>
- <id>helios</id>
- <activation>
- <property>
- <name>helios</name>
- </property>
- </activation>
- <repositories>
- <repository>
- <id>helios</id>
- <url>http://download.eclipse.org/releases/helios/</url>
- <layout>p2</layout>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <releases>
- <enabled>true</enabled>
- </releases>
- </repository>
- <repository>
- <id>webtools32</id>
- <url>http://download.eclipse.org/webtools/repository/helios</url>
- <layout>p2</layout>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <releases>
- <enabled>true</enabled>
- </releases>
- </repository>
- <repository>
- <id>eclipse36</id>
- <url>http://download.eclipse.org/eclipse/updates/3.6/</url>
- <layout>p2</layout>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <releases>
- <enabled>true</enabled>
- </releases>
- </repository>
- <repository>
- <id>birt26</id>
- <url>http://download.eclipse.org/birt/update-site/2.6/</url>
- <layout>p2</layout>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <releases>
- <enabled>true</enabled>
- </releases>
- </repository>
- <repository>
- <id>swtbot-helios</id>
- <url>http://download.eclipse.org/technology/swtbot/helios/dev-build/update-site
- </url>
- <layout>p2</layout>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <releases>
- <enabled>true</enabled>
- </releases>
- </repository>
- </repositories>
- </profile>
- <profile>
<id>svn-repos</id>
<activation>
<property>
@@ -312,94 +396,10 @@
<enabled>true</enabled>
</releases>
</repository>
-
</repositories>
</profile>
</profiles>
- <repositories>
- <!-- TODO: add JBT nightly update site so we can build against binaries -->
- <repository>
- <id>galileo</id>
- <url>http://download.eclipse.org/releases/galileo/</url>
- <layout>p2</layout>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <releases>
- <enabled>true</enabled>
- </releases>
- </repository>
- <repository>
- <id>eclipse35</id>
- <url>http://download.eclipse.org/eclipse/updates/3.5/</url>
- <layout>p2</layout>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <releases>
- <enabled>true</enabled>
- </releases>
- </repository>
- <repository>
- <id>birt25r</id>
- <url>http://download.eclipse.org/birt/update-site/2.5</url>
- <layout>p2</layout>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <releases>
- <enabled>true</enabled>
- </releases>
- </repository>
- <repository>
- <id>swtbot-galileo</id>
- <url>http://download.eclipse.org/technology/swtbot/galileo/dev-build/update-site
- </url>
- <layout>p2</layout>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <releases>
- <enabled>true</enabled>
- </releases>
- </repository>
-
- <repository>
- <id>webtools</id>
- <url>http://download.eclipse.org/webtools/updates/</url>
- <layout>p2</layout>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <releases>
- <enabled>true</enabled>
- </releases>
- </repository>
- <repository>
- <id>m2eclipse</id>
- <url>http://m2eclipse.sonatype.org/sites/m2e/</url>
- <layout>p2</layout>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <releases>
- <enabled>true</enabled>
- </releases>
- </repository>
- <repository>
- <id>m2eclipse-extras</id>
- <url>http://m2eclipse.sonatype.org/sites/m2e-extras/</url>
- <layout>p2</layout>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <releases>
- <enabled>true</enabled>
- </releases>
- </repository>
- </repositories>
-
<pluginRepositories>
<pluginRepository>
<id>sonatype-maven-central</id>
@@ -446,24 +446,4 @@
</pluginRepository>
</pluginRepositories>
- <!-- https://issues.sonatype.org/browse/TYCHO-413: does not work - doesn't
- respect username & ssh key -->
- <distributionManagement>
- <!-- http://download.jboss.org/jbosstools/ -->
- <!-- <repository> <id>jbosstools.internal.repo</id> <url> scp://filemgmt.jboss.org/downloads_htdocs/tools/repository/
- </url> </repository> -->
- <!-- https://sourceforge.net/projects/jboss/files/JBossTools/JBossTools3.2.x -->
- <!-- <repository> <id>jbosstools.external.repo</id> <name>JBoss Developer
- Studio Repository</name> <url>scp://nickboldt,jboss@frs.sourceforge.net/home/frs/project/j/jb/jboss/JBossTools/JBossTools3.2.x/</url>
- </repository> -->
-
- <!-- http://reports.qa.atl.jboss.com/binaries/RHDS/ -->
- <!-- <repository> <id>jbds.internal.repo</id> <name>JBoss Developer Studio
- Repository</name> <url>scp://hudson@localhost/qa/services/http/binaries/RHDS/repository/</url>
- </repository> -->
- <!-- http://devstudio.jboss.com -->
- <!-- <repository> <id>jbds.external.repo</id> <name>JBoss Developer Studio
- Repository</name> <url>scp://nboldt@wallace.redhat.com/mnt/devstudio/repository/</url>
- </repository> -->
- </distributionManagement>
</project>
14 years, 7 months
JBoss Tools SVN: r22487 - trunk/site.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2010-06-02 13:35:23 -0400 (Wed, 02 Jun 2010)
New Revision: 22487
Modified:
trunk/site/site.xml
Log:
switch update site to M1, not beta-1
Modified: trunk/site/site.xml
===================================================================
--- trunk/site/site.xml 2010-06-02 17:35:06 UTC (rev 22486)
+++ trunk/site/site.xml 2010-06-02 17:35:23 UTC (rev 22487)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<site pack200="true">
<description>
- This is the Nightly Build Update Site for JBoss Tools 3.2.0-beta-1.
+ This is the Nightly Build Update Site for JBoss Tools 3.2.0.M1.
</description>
<!-- only in JBDS -->
@@ -213,7 +213,7 @@
</description>
</category-def>
- <category-def name="AllTools" label="All JBoss Tools 3.2.0-beta-1">
+ <category-def name="AllTools" label="All JBoss Tools 3.2.0.M1">
<description>
Contains ALL the plugins that are available from
JBoss Tools except those
14 years, 7 months
JBoss Tools SVN: r22486 - branches/3.2.helios/site.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2010-06-02 13:35:06 -0400 (Wed, 02 Jun 2010)
New Revision: 22486
Modified:
branches/3.2.helios/site/site.xml
Log:
switch update site to M1, not beta-1
Modified: branches/3.2.helios/site/site.xml
===================================================================
--- branches/3.2.helios/site/site.xml 2010-06-02 17:33:05 UTC (rev 22485)
+++ branches/3.2.helios/site/site.xml 2010-06-02 17:35:06 UTC (rev 22486)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<site pack200="true">
<description>
- This is the Nightly Build Update Site for JBoss Tools 3.2.0-beta-1.
+ This is the Nightly Build Update Site for JBoss Tools 3.2.0.M1.
</description>
<!-- only in JBDS -->
@@ -213,7 +213,7 @@
</description>
</category-def>
- <category-def name="AllTools" label="All JBoss Tools 3.2.0-beta-1">
+ <category-def name="AllTools" label="All JBoss Tools 3.2.0.M1">
<description>
Contains ALL the plugins that are available from
JBoss Tools except those
14 years, 7 months
JBoss Tools SVN: r22485 - branches/3.2.helios.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2010-06-02 13:33:05 -0400 (Wed, 02 Jun 2010)
New Revision: 22485
Modified:
branches/3.2.helios/parent-pom.xml
Log:
set helios deps as defaults (no profile needed)
Modified: branches/3.2.helios/parent-pom.xml
===================================================================
--- branches/3.2.helios/parent-pom.xml 2010-06-02 16:27:58 UTC (rev 22484)
+++ branches/3.2.helios/parent-pom.xml 2010-06-02 17:33:05 UTC (rev 22485)
@@ -9,8 +9,8 @@
<properties>
<tychoVersion>0.9.0-SNAPSHOT</tychoVersion>
- <!-- <tychoVersion>0.8.0</tychoVersion> -->
<scmBranch>trunk</scmBranch>
+ <BUILD_ALIAS>M1</BUILD_ALIAS>
</properties>
<build>
@@ -20,7 +20,7 @@
<artifactId>maven-osgi-packaging-plugin</artifactId>
<version>${tychoVersion}</version>
<configuration>
- <format>'v'yyyyMMdd-HHmm</format>
+ <format>'v'yyyyMMdd-HHmm'-${BUILD_ALIAS}'</format>
<archiveSite>true</archiveSite>
</configuration>
</plugin>
@@ -100,6 +100,17 @@
<artifactId>org.eclipse.sdk.ide</artifactId>
<version>0.0.0</version>
</dependency>
+ <!-- http://www.jmock.org/maven.html -->
+ <dependency>
+ <groupId>org.jmock</groupId>
+ <artifactId>jmock-legacy</artifactId>
+ <version>2.5.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jmock</groupId>
+ <artifactId>jmock-junit4</artifactId>
+ <version>2.5.1</version>
+ </dependency>
</dependencies>
<includes>
<include>**/AllTests.class</include>
@@ -155,126 +166,10 @@
<url>https://jira.jboss.org/jira/secure/</url>
</issueManagement>
- <profiles>
- <profile>
- <id>helios</id>
- <activation>
- <property>
- <name>helios</name>
- </property>
- </activation>
- <repositories>
- <repository>
- <id>helios</id>
- <url>http://download.eclipse.org/releases/helios/</url>
- <layout>p2</layout>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <releases>
- <enabled>true</enabled>
- </releases>
- </repository>
- <repository>
- <id>eclipse36</id>
- <url>http://download.eclipse.org/eclipse/updates/3.6/</url>
- <layout>p2</layout>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <releases>
- <enabled>true</enabled>
- </releases>
- </repository>
- <repository>
- <id>birt26</id>
- <url>http://download.eclipse.org/birt/update-site/2.6/</url>
- <layout>p2</layout>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <releases>
- <enabled>true</enabled>
- </releases>
- </repository>
- <repository>
- <id>swtbot-helios</id>
- <url>http://download.eclipse.org/technology/swtbot/helios/dev-build/update-site
- </url>
- <layout>p2</layout>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <releases>
- <enabled>true</enabled>
- </releases>
- </repository>
- </repositories>
- </profile>
- <profile>
- <id>svn-repos</id>
- <activation>
- <property>
- <name>svn</name>
- </property>
- </activation>
- <repositories>
- <repository>
- <id>svnkit13</id>
- <url>http://eclipse.svnkit.com/1.3.x/</url>
- <layout>p2</layout>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <releases>
- <enabled>true</enabled>
- </releases>
- </repository>
- <repository>
- <id>subclipse16</id>
- <url>http://subclipse.tigris.org/update_1.6.x/</url>
- <layout>p2</layout>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <releases>
- <enabled>true</enabled>
- </releases>
- </repository>
- <repository>
- <id>subversive07</id>
- <url>http://download.eclipse.org/technology/subversive/0.7/update-site/
- </url>
- <layout>p2</layout>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <releases>
- <enabled>true</enabled>
- </releases>
- </repository>
- <repository>
- <id>subversive20</id>
- <url>http://community.polarion.com/projects/subversive/download/eclipse/2.0/up...
- </url>
- <layout>p2</layout>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <releases>
- <enabled>true</enabled>
- </releases>
- </repository>
-
- </repositories>
- </profile>
- </profiles>
-
<repositories>
- <!-- TODO: add JBT nightly update site so we can build against binaries -->
<repository>
- <id>galileo</id>
- <url>http://download.eclipse.org/releases/galileo/</url>
+ <id>helios</id>
+ <url>http://download.eclipse.org/releases/helios/</url>
<layout>p2</layout>
<snapshots>
<enabled>true</enabled>
@@ -284,8 +179,8 @@
</releases>
</repository>
<repository>
- <id>eclipse35</id>
- <url>http://download.eclipse.org/eclipse/updates/3.5/</url>
+ <id>webtools32</id>
+ <url>http://download.eclipse.org/webtools/repository/helios</url>
<layout>p2</layout>
<snapshots>
<enabled>true</enabled>
@@ -295,8 +190,8 @@
</releases>
</repository>
<repository>
- <id>birt25r</id>
- <url>http://download.eclipse.org/birt/update-site/2.5</url>
+ <id>eclipse36</id>
+ <url>http://download.eclipse.org/eclipse/updates/3.6/</url>
<layout>p2</layout>
<snapshots>
<enabled>true</enabled>
@@ -306,9 +201,8 @@
</releases>
</repository>
<repository>
- <id>swtbot-galileo</id>
- <url>http://download.eclipse.org/technology/swtbot/galileo/dev-build/update-site
- </url>
+ <id>birt26r</id>
+ <url>http://download.eclipse.org/birt/update-site/2.6/</url>
<layout>p2</layout>
<snapshots>
<enabled>true</enabled>
@@ -317,10 +211,9 @@
<enabled>true</enabled>
</releases>
</repository>
-
<repository>
- <id>webtools</id>
- <url>http://download.eclipse.org/webtools/updates/</url>
+ <id>birt26i</id>
+ <url>http://download.eclipse.org/birt/update-site/2.6-interim/</url>
<layout>p2</layout>
<snapshots>
<enabled>true</enabled>
@@ -330,6 +223,18 @@
</releases>
</repository>
<repository>
+ <id>swtbot-helios</id>
+ <url>http://download.eclipse.org/technology/swtbot/helios/dev-build/update-site/
+ </url>
+ <layout>p2</layout>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </repository>
+ <repository>
<id>m2eclipse</id>
<url>http://m2eclipse.sonatype.org/sites/m2e/</url>
<layout>p2</layout>
@@ -353,24 +258,96 @@
</repository>
</repositories>
+ <profiles>
+ <!-- TODO: verify that this profile overrides the default profile if BUILD_NUMBER
+ is set (by a Hudson job) -->
+ <profile>
+ <id>hudson</id>
+ <activation>
+ <property>
+ <name>BUILD_NUMBER</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.sonatype.tycho</groupId>
+ <artifactId>maven-osgi-packaging-plugin</artifactId>
+ <version>${tychoVersion}</version>
+ <configuration>
+ <format>'v'yyyyMMdd-HHmm'-H${BUILD_NUMBER}-${BUILD_ALIAS}'
+ </format>
+ <archiveSite>true</archiveSite>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
+ <id>svn-repos</id>
+ <activation>
+ <property>
+ <name>svn</name>
+ </property>
+ </activation>
+ <repositories>
+ <repository>
+ <id>svnkit13</id>
+ <url>http://eclipse.svnkit.com/1.3.x/</url>
+ <layout>p2</layout>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </repository>
+ <repository>
+ <id>subclipse16</id>
+ <url>http://subclipse.tigris.org/update_1.6.x/</url>
+ <layout>p2</layout>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </repository>
+ <repository>
+ <id>subversive07</id>
+ <url>http://download.eclipse.org/technology/subversive/0.7/update-site/
+ </url>
+ <layout>p2</layout>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </repository>
+ <repository>
+ <id>subversive20</id>
+ <url>http://community.polarion.com/projects/subversive/download/eclipse/2.0/up...
+ </url>
+ <layout>p2</layout>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </repository>
+ </repositories>
+ </profile>
+ </profiles>
+
<pluginRepositories>
<pluginRepository>
- <id>maven-central</id>
- <url>http://repo1.maven.org/maven2/
- </url>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <releases>
- <enabled>true</enabled>
- </releases>
- </pluginRepository>
- <pluginRepository>
<id>sonatype-maven-central</id>
<url>http://repository.sonatype.org/content/repositories/central/
</url>
<snapshots>
- <enabled>true</enabled>
+ <enabled>false</enabled>
</snapshots>
<releases>
<enabled>true</enabled>
@@ -384,7 +361,7 @@
<enabled>true</enabled>
</snapshots>
<releases>
- <enabled>true</enabled>
+ <enabled>false</enabled>
</releases>
</pluginRepository>
<pluginRepository>
@@ -395,7 +372,7 @@
<enabled>true</enabled>
</snapshots>
<releases>
- <enabled>true</enabled>
+ <enabled>false</enabled>
</releases>
</pluginRepository>
<pluginRepository>
@@ -405,29 +382,9 @@
<enabled>true</enabled>
</snapshots>
<releases>
- <enabled>true</enabled>
+ <enabled>false</enabled>
</releases>
</pluginRepository>
</pluginRepositories>
- <!-- https://issues.sonatype.org/browse/TYCHO-413: does not work - doesn't
- respect username & ssh key -->
- <distributionManagement>
- <!-- http://download.jboss.org/jbosstools/ -->
- <!-- <repository> <id>jbosstools.internal.repo</id> <url> scp://filemgmt.jboss.org/downloads_htdocs/tools/repository/
- </url> </repository> -->
- <!-- https://sourceforge.net/projects/jboss/files/JBossTools/JBossTools3.2.x -->
- <!-- <repository> <id>jbosstools.external.repo</id> <name>JBoss Developer
- Studio Repository</name> <url>scp://nickboldt,jboss@frs.sourceforge.net/home/frs/project/j/jb/jboss/JBossTools/JBossTools3.2.x/</url>
- </repository> -->
-
- <!-- http://reports.qa.atl.jboss.com/binaries/RHDS/ -->
- <!-- <repository> <id>jbds.internal.repo</id> <name>JBoss Developer Studio
- Repository</name> <url>scp://hudson@localhost/qa/services/http/binaries/RHDS/repository/</url>
- </repository> -->
- <!-- http://devstudio.jboss.com -->
- <!-- <repository> <id>jbds.external.repo</id> <name>JBoss Developer Studio
- Repository</name> <url>scp://nboldt@wallace.redhat.com/mnt/devstudio/repository/</url>
- </repository> -->
- </distributionManagement>
</project>
14 years, 7 months
JBoss Tools SVN: r22484 - in trunk: seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2010-06-02 12:27:58 -0400 (Wed, 02 Jun 2010)
New Revision: 22484
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/messages.properties
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/messages.properties
Log:
Added validator names to subtask name during validation.
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/messages.properties
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/messages.properties 2010-06-02 16:02:31 UTC (rev 22483)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/messages.properties 2010-06-02 16:27:58 UTC (rev 22484)
@@ -16,7 +16,7 @@
EL_SYNTAX_ERROR=EL syntax error: {0}.
#Messages for Progress Monitor
-VALIDATING_EL_FILE=project "{0}"; EL in "{1}"
+VALIDATING_EL_FILE=project "{0}"; EL in "{1}" (JSF EL Validator)
EL_VALIDATOR_ERROR_VALIDATING=Error validating EL
EL_VALIDATOR_SETTER=Setter
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/messages.properties
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/messages.properties 2010-06-02 16:02:31 UTC (rev 22483)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/messages.properties 2010-06-02 16:27:58 UTC (rev 22484)
@@ -61,9 +61,9 @@
INVALID_JAR_MODULE_IN_APPLICATION_XML=Having "{0}" listed as a java module in application.xml can cause publishing errors. It is recommended to remove this module entry from application.xml.
#Messages for Progress Monitor
-SEARCHING_RESOURCES=project "{0}"; searching resources for validation.
-VALIDATING_COMPONENT=project "{0}"; component "{1}"
-VALIDATING_FACTORY=project "{0}"; factory "{1}"
-VALIDATING_RESOURCE=project "{0}"; resource "{1}"
-VALIDATING_CLASS=project "{0}"; class "{1}"
-VALIDATING_PROJECT=project "{0}"
\ No newline at end of file
+SEARCHING_RESOURCES=project "{0}"; searching resources for validation (Seam Validator).
+VALIDATING_COMPONENT=project "{0}"; component "{1}" (Seam Validator)
+VALIDATING_FACTORY=project "{0}"; factory "{1}" (Seam Validator)
+VALIDATING_RESOURCE=project "{0}"; resource "{1}" (Seam Validator)
+VALIDATING_CLASS=project "{0}"; class "{1}" (Seam Validator)
+VALIDATING_PROJECT=project "{0}" (Seam Validator)
\ No newline at end of file
14 years, 7 months
JBoss Tools SVN: r22483 - trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/util.
by jbosstools-commits＠lists.jboss.org
Author: yradtsevich
Date: 2010-06-02 12:02:31 -0400 (Wed, 02 Jun 2010)
New Revision: 22483
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/util/XPCOM.java
trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/util/XulRunnerVpeUtils.java
Log:
https://jira.jboss.org/browse/JBIDE-6229
Implement DnD support for selected text in VPE
- A method to get bounds of the selected text has been created: XulRunnerVpeUtils.getTextSelectionBounds .
Modified: trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/util/XPCOM.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/util/XPCOM.java 2010-06-02 14:58:31 UTC (rev 22482)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/util/XPCOM.java 2010-06-02 16:02:31 UTC (rev 22483)
@@ -36,6 +36,7 @@
public static final String NS_PREFSERVICE_CONTRACTID = "@mozilla.org/preferences-service;1"; //$NON-NLS-1$
public static final String NS_SUPPORTSSTRING_CONTRACTID = "@mozilla.org/supports-string;1"; //$NON-NLS-1$
public static final String NS_SUPPORTSARRAY_CONTRACTID = "@mozilla.org/supports-array;1"; //$NON-NLS-1$
+ public static final String NS_ACCESSIBILITYSERVICE_CONTRACTID = "@mozilla.org/accessibilityService;1"; //$NON-NLS-1$
public static final String IN_FLASHER_CONTRACTID = "@mozilla.org/inspector/flasher;1"; //$NON-NLS-1$
/**
Modified: trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/util/XulRunnerVpeUtils.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/util/XulRunnerVpeUtils.java 2010-06-02 14:58:31 UTC (rev 22482)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/util/XulRunnerVpeUtils.java 2010-06-02 16:02:31 UTC (rev 22483)
@@ -15,6 +15,11 @@
import org.eclipse.swt.graphics.Rectangle;
import org.jboss.tools.vpe.xulrunner.BrowserPlugin;
+import org.mozilla.interfaces.nsIAccessNode;
+import org.mozilla.interfaces.nsIAccessible;
+import org.mozilla.interfaces.nsIAccessibleCoordinateType;
+import org.mozilla.interfaces.nsIAccessibleRetrieval;
+import org.mozilla.interfaces.nsIAccessibleText;
import org.mozilla.interfaces.nsIBoxObject;
import org.mozilla.interfaces.nsIDOMDocument;
import org.mozilla.interfaces.nsIDOMElement;
@@ -22,6 +27,8 @@
import org.mozilla.interfaces.nsIDOMNSElement;
import org.mozilla.interfaces.nsIDOMNSHTMLElement;
import org.mozilla.interfaces.nsIDOMNode;
+import org.mozilla.interfaces.nsIDOMText;
+import org.mozilla.xpcom.Mozilla;
import org.mozilla.xpcom.XPCOMException;
/**
@@ -106,4 +113,69 @@
return new Rectangle(0, 0, 0, 0);
}
}
+
+ /**
+ * Returns the bounds of the selected text in given
+ * {@code selectionContainer}.
+ */
+ public static Rectangle getTextSelectionBounds(nsIDOMText slectionContainer) {
+ nsIAccessibleText accessibleTextAncestor = getAccessibleTextAncestor(slectionContainer);
+ if (accessibleTextAncestor == null) {
+ // cannot get selection bounds
+ return null;
+ }
+ if (accessibleTextAncestor.getSelectionCount() == 0) {
+ // no text selected
+ return null;
+ }
+
+ int[] startOffset = new int[1];
+ int[] endOffset = new int[1];
+ accessibleTextAncestor.getSelectionBounds(0, startOffset, endOffset);
+
+ int[] x = new int[1];
+ int[] y = new int[1];
+ int[] width = new int[1];
+ int[] height = new int[1];
+ accessibleTextAncestor.getRangeExtents(startOffset[0], endOffset[0],
+ x, y, width, height, nsIAccessibleCoordinateType.COORDTYPE_PARENT_RELATIVE);
+
+ Rectangle ancestorBounds = getElementBounds(
+ queryInterface(accessibleTextAncestor, nsIAccessNode.class)
+ .getDOMNode());
+
+ return new Rectangle(ancestorBounds.x + x[0], ancestorBounds.y + y[0],
+ width[0], height[0]);
+ }
+
+ /**
+ * Returns the nearest ancestor of given {@code node} which supports
+ * {@link nsIAccessibleText}.
+ */
+ private static nsIAccessibleText getAccessibleTextAncestor(nsIDOMNode node) {
+ nsIAccessibleText accessibleTextAncestor = null;
+ nsIDOMNode ancestor = node;
+ while (accessibleTextAncestor == null && ancestor != null) {
+ ancestor = ancestor.getParentNode();
+ try {
+ nsIAccessible accessibleAncestor = getAccessible(ancestor);
+ accessibleTextAncestor = queryInterface(accessibleAncestor, nsIAccessibleText.class);
+ } catch (XPCOMException e) {
+ // it's OK, accessibleTextAncestor still = null
+ }
+ }
+
+ return accessibleTextAncestor;
+ }
+
+ /**
+ * Returns {@link nsIAccessible} interface for given {@code node}.
+ */
+ private static nsIAccessible getAccessible(nsIDOMNode node) {
+ return ((nsIAccessibleRetrieval)
+ Mozilla.getInstance().getServiceManager().getServiceByContractID(
+ XPCOM.NS_ACCESSIBILITYSERVICE_CONTRACTID,
+ nsIAccessibleRetrieval.NS_IACCESSIBLERETRIEVAL_IID))
+ .getAccessibleFor(node);
+ }
}
14 years, 7 months
JBoss Tools SVN: r22482 - in trunk/cdi: tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2010-06-02 10:58:31 -0400 (Wed, 02 Jun 2010)
New Revision: 22482
Added:
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/ResolutionByTypeTest.java
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDIValidationMessages.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/messages.properties
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/CDICoreTestSuite.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/TCKTest.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/ValidationTest.java
Log:
https://jira.jboss.org/browse/JBIDE-5808
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDIValidationMessages.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDIValidationMessages.java 2010-06-02 14:36:05 UTC (rev 22481)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDIValidationMessages.java 2010-06-02 14:58:31 UTC (rev 22482)
@@ -35,8 +35,10 @@
public static String PRODUCER_FIELD_TYPE_DOES_NOT_MATCH_JAVA_EE_OBJECT;
public static String INJECTION_TYPE_IS_VARIABLE;
public static String STEREOTYPE_IS_ANNOTATED_TYPED;
- public static String MISSING_NONBINDING_IN_QUALIFIER_TYPE_MEMBER;
- public static String MISSING_NONBINDING_IN_INTERCEPTOR_BINDING_TYPE_MEMBER;
+ public static String MISSING_NONBINDING_FOR_ANNOTATION_VALUE_IN_QUALIFIER_TYPE_MEMBER;
+ public static String MISSING_NONBINDING_FOR_ARRAY_VALUE_IN_QUALIFIER_TYPE_MEMBER;
+ public static String MISSING_NONBINDING_FOR_ANNOTATION_VALUE_IN_INTERCEPTOR_BINDING_TYPE_MEMBER;
+ public static String MISSING_NONBINDING_FOR_ARRAY_VALUE_IN_INTERCEPTOR_BINDING_TYPE_MEMBER;
public static String MULTIPLE_SCOPE_TYPE_ANNOTATIONS;
public static String MISSING_SCOPE_WHEN_THERE_IS_NO_DEFAULT_SCOPE;
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/messages.properties
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/messages.properties 2010-06-02 14:36:05 UTC (rev 22481)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/messages.properties 2010-06-02 14:58:31 UTC (rev 22482)
@@ -14,8 +14,10 @@
PRODUCER_FIELD_TYPE_DOES_NOT_MATCH_JAVA_EE_OBJECT=Matching object in the Java EE component environment is not of the same type as the producer field declaration
INJECTION_TYPE_IS_VARIABLE=Injection point type is a type variable
STEREOTYPE_IS_ANNOTATED_TYPED=Stereotype is annotated @Typed
-MISSING_NONBINDING_IN_QUALIFIER_TYPE_MEMBER=Array-valued or annotation-valued member of a qualifier type is not annotated @Nonbinding
-MISSING_NONBINDING_IN_INTERCEPTOR_BINDING_TYPE_MEMBER=Array-valued or annotation-valued member of an interceptor binding type is not annotated @Nonbinding
+MISSING_NONBINDING_FOR_ANNOTATION_VALUE_IN_QUALIFIER_TYPE_MEMBER=Annotation-valued member of a qualifier type is not annotated @Nonbinding
+MISSING_NONBINDING_FOR_ARRAY_VALUE_IN_QUALIFIER_TYPE_MEMBER=Array-valued member of a qualifier type is not annotated @Nonbinding
+MISSING_NONBINDING_FOR_ANNOTATION_VALUE_IN_INTERCEPTOR_BINDING_TYPE_MEMBER=Annotation-valued member of an interceptor binding type is not annotated @Nonbinding
+MISSING_NONBINDING_FOR_ARRAY_VALUE_IN_INTERCEPTOR_BINDING_TYPE_MEMBER=Array-valued member of an interceptor binding type is not annotated @Nonbinding
MULTIPLE_SCOPE_TYPE_ANNOTATIONS=Bean class or producer method or field specifies multiple scope type annotations
MISSING_SCOPE_WHEN_THERE_IS_NO_DEFAULT_SCOPE=Bean does not explicitly declare a scope when there is no default scope
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/CDICoreTestSuite.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/CDICoreTestSuite.java 2010-06-02 14:36:05 UTC (rev 22481)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/CDICoreTestSuite.java 2010-06-02 14:58:31 UTC (rev 22482)
@@ -14,6 +14,7 @@
import junit.framework.TestSuite;
import org.jboss.tools.cdi.core.test.tck.BeanDefinitionTest;
+import org.jboss.tools.cdi.core.test.tck.BeanSpecializationTest;
import org.jboss.tools.cdi.core.test.tck.DefaultNamedTest;
import org.jboss.tools.cdi.core.test.tck.EnterpriseQualifierDefinitionTest;
import org.jboss.tools.cdi.core.test.tck.EnterpriseScopeDefinitionTest;
@@ -22,8 +23,8 @@
import org.jboss.tools.cdi.core.test.tck.NameDefinitionTest;
import org.jboss.tools.cdi.core.test.tck.ProducerMethodDefinitionTest;
import org.jboss.tools.cdi.core.test.tck.QualifierDefinitionTest;
+import org.jboss.tools.cdi.core.test.tck.ResolutionByTypeTest;
import org.jboss.tools.cdi.core.test.tck.ScopeDefinitionTest;
-import org.jboss.tools.cdi.core.test.tck.BeanSpecializationTest;
import org.jboss.tools.cdi.core.test.tck.StereotypeDefinitionTest;
import org.jboss.tools.cdi.core.test.tck.StereotypeInheritenceTest;
import org.jboss.tools.cdi.core.test.tck.ValidationTest;
@@ -48,6 +49,7 @@
suite.addTestSuite(ProducerMethodDefinitionTest.class);
suite.addTestSuite(InjectionPointTest.class);
suite.addTestSuite(BeanSpecializationTest.class);
+ suite.addTestSuite(ResolutionByTypeTest.class);
suite.addTestSuite(ValidationTest.class);
return suite;
}
Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/ResolutionByTypeTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/ResolutionByTypeTest.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/ResolutionByTypeTest.java 2010-06-02 14:58:31 UTC (rev 22482)
@@ -0,0 +1,38 @@
+/*******************************************************************************
+ * Copyright (c) 2010 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.cdi.core.test.tck;
+
+import java.util.Set;
+
+import org.eclipse.core.runtime.CoreException;
+import org.jboss.tools.cdi.core.IBean;
+import org.jboss.tools.cdi.core.IParametedType;
+import org.jboss.tools.cdi.core.IQualifierDeclaration;
+
+/**
+ * @author Alexey Kazakov
+ */
+public class ResolutionByTypeTest extends TCKTest {
+
+ /**
+ * Section 5.2 - Typesafe resolution
+ * ld) Test with matching beans with matching qualifier with same annotation member value for each member which is not annotated @javax.enterprise.util.NonBinding.
+ *
+ * @throws CoreException
+ */
+ public void testResolveByTypeWithNonBindingMembers() throws CoreException {
+ IQualifierDeclaration expensiveQualifier = getQualifierDeclarationFromBeanClass("JavaSource/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/RoundWhitefish.java", "org.jboss.jsr299.tck.tests.lookup.typesafe.resolution.Expensive");
+ IQualifierDeclaration whitefishQualifier = getQualifierDeclarationFromBeanClass("JavaSource/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/RoundWhitefish.java", "org.jboss.jsr299.tck.tests.lookup.typesafe.resolution.Whitefish");
+ IParametedType type = getType("org.jboss.jsr299.tck.tests.lookup.typesafe.resolution.Animal");
+ Set<IBean> beans = cdiProject.getBeans(true, type, new IQualifierDeclaration[]{expensiveQualifier, whitefishQualifier});
+ assertContainsBeanClasses(beans, new String[]{"org.jboss.jsr299.tck.tests.lookup.typesafe.resolution.RoundWhitefish", "org.jboss.jsr299.tck.tests.lookup.typesafe.resolution.Halibut"});
+ }
+}
\ No newline at end of file
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/ResolutionByTypeTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/TCKTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/TCKTest.java 2010-06-02 14:36:05 UTC (rev 22481)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/TCKTest.java 2010-06-02 14:58:31 UTC (rev 22482)
@@ -228,6 +228,37 @@
fail(bean.getResource().getFullPath() + " bean " + allTypes.toString() + " should have " + typeName + " type.");
}
+ public static void assertContainsBeanClasses(Set<IBean> beans, String... beanClassNames) throws CoreException {
+ assertContainsBeanClasses(true, beans, beanClassNames);
+ }
+
+ public static void assertContainsBeanClasses(boolean checkTheNumberOfBeans, Set<IBean> beans, String... beanClassNames) throws CoreException {
+ if(checkTheNumberOfBeans) {
+ assertEquals("Wrong number of beans.", beanClassNames.length, beans.size());
+ }
+ StringBuffer sb = new StringBuffer("[");
+ for (String beanClassName : beanClassNames) {
+ sb.append(beanClassName).append("; ");
+ }
+ sb.append("]");
+ for (String beanClassName : beanClassNames) {
+ assertTrue("Didn't found " + beanClassName + " among " + sb.toString(), containsBeanClass(beans, beanClassName));
+ }
+ }
+
+ public static void assertContainsBeanClass(Set<IBean> beans, String beanClassName) throws CoreException {
+ assertTrue("Didn't find " + beanClassName, containsBeanClass(beans, beanClassName));
+ }
+
+ private static boolean containsBeanClass(Set<IBean> beans, String beanClassName) throws CoreException {
+ for (IBean bean : beans) {
+ if(beanClassName.equals(bean.getBeanClass().getFullyQualifiedName())) {
+ return true;
+ }
+ }
+ return false;
+ }
+
public static void assertContainsQualifier(IBean bean, IQualifierDeclaration declaration) throws CoreException {
String typeName = declaration.getQualifier().getSourceType().getFullyQualifiedName();
Set<IQualifier> qualifiers = bean.getQualifiers();
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/ValidationTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/ValidationTest.java 2010-06-02 14:36:05 UTC (rev 22481)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/ValidationTest.java 2010-06-02 14:58:31 UTC (rev 22482)
@@ -897,6 +897,28 @@
}
/**
+ * 5.2.5. Qualifier annotations with members
+ * - annotation-valued member of a qualifier type is not annotated @Nonbinding (Non-Portable behavior)
+ *
+ * @throws Exception
+ */
+ public void testAnnotationMemberWithoutNonBinding() throws Exception {
+ IFile file = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/lookup/binding/members/annotation/Expensive_Broken.java");
+ AbstractResourceMarkerTest.assertMarkerIsCreated(file, AbstractResourceMarkerTest.MARKER_TYPE, CDIValidationMessages.MISSING_NONBINDING_FOR_ANNOTATION_VALUE_IN_QUALIFIER_TYPE_MEMBER, 35);
+ }
+
+ /**
+ * 5.2.5. Qualifier annotations with members
+ * - array-valued member of a qualifier type is not annotated @Nonbinding (Non-Portable behavior)
+ *
+ * @throws Exception
+ */
+ public void testArrayMemberWithoutNonBinding() throws Exception {
+ IFile file = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/lookup/binding/members/array/Expensive_Broken.java");
+ AbstractResourceMarkerTest.assertMarkerIsCreated(file, AbstractResourceMarkerTest.MARKER_TYPE, CDIValidationMessages.MISSING_NONBINDING_FOR_ARRAY_VALUE_IN_QUALIFIER_TYPE_MEMBER, 34);
+ }
+
+ /**
* 10.4.2. Declaring an observer method
* - method has more than one parameter annotated @Observes
*
14 years, 7 months