JBoss Tools SVN: r34411 - trunk/smooks/features/org.jboss.tools.smooks.test.feature.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2011-08-30 15:09:53 -0400 (Tue, 30 Aug 2011)
New Revision: 34411
Added:
trunk/smooks/features/org.jboss.tools.smooks.test.feature/feature.properties
trunk/smooks/features/org.jboss.tools.smooks.test.feature/license.html
Modified:
trunk/smooks/features/org.jboss.tools.smooks.test.feature/build.properties
trunk/smooks/features/org.jboss.tools.smooks.test.feature/feature.xml
Log:
https://issues.jboss.org/browse/JBIDE-9597 ./smooks/features/org.jboss.tools.smooks.test.feature/feature.xml :: add license/copyright/description in feature.properties and ref from feature.xml; fix build.properties to include license.html & feature.*
fixed in trunk for 3.3.0.M4
Modified: trunk/smooks/features/org.jboss.tools.smooks.test.feature/build.properties
===================================================================
--- trunk/smooks/features/org.jboss.tools.smooks.test.feature/build.properties 2011-08-30 19:05:03 UTC (rev 34410)
+++ trunk/smooks/features/org.jboss.tools.smooks.test.feature/build.properties 2011-08-30 19:09:53 UTC (rev 34411)
@@ -1 +1,9 @@
-bin.includes = feature.xml
+bin.includes = feature.xml,\
+ license.html,\
+ feature.properties
+src.includes = pom.xml,\
+ license.html,\
+ feature.xml,\
+ build.properties,\
+ feature.properties,\
+ .project
Added: trunk/smooks/features/org.jboss.tools.smooks.test.feature/feature.properties
===================================================================
--- trunk/smooks/features/org.jboss.tools.smooks.test.feature/feature.properties (rev 0)
+++ trunk/smooks/features/org.jboss.tools.smooks.test.feature/feature.properties 2011-08-30 19:09:53 UTC (rev 34411)
@@ -0,0 +1,46 @@
+###############################################################################
+# Copyright (c) 2010-2011 Red Hat, Inc. 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:
+# JBoss by Red Hat - Initial implementation.
+##############################################################################
+# feature.properties
+# contains externalized strings for feature.xml
+# "%foo" in feature.xml corresponds to the key "foo" in this file
+# java.io.Properties file (ISO 8859-1 with "\" escapes)
+# This file should be translated.
+
+# "featureName" property - name of the feature
+featureName=JBoss ESB Tools Tests
+
+# "providerName" property - name of the company that provides the feature
+providerName=JBoss by Red Hat
+
+# "updateSiteName" property - label for the update site
+updateSiteName=JBossTools Update Site
+
+devUpdateSiteName=JBossTools Development Update Site
+
+# "description" property - description of the feature
+description=Provides tests for for JBoss ESB Tools.
+
+copyright=Copyright 2007-2011 Red Hat, Inc.\n\
+Distributed under license by Red Hat, Inc. All rights reserved.\n\
+This program is made available under the terms of the\n\
+Eclipse Public License v1.0 which accompanies this distribution,\n\
+and is available at http\://www.eclipse.org/legal/epl-v10.html\n\
+Contributors\:\n\
+Red Hat, Inc. - initial API and implementation
+
+licenseURL=license.html
+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.
\ No newline at end of file
Property changes on: trunk/smooks/features/org.jboss.tools.smooks.test.feature/feature.properties
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/smooks/features/org.jboss.tools.smooks.test.feature/feature.xml
===================================================================
--- trunk/smooks/features/org.jboss.tools.smooks.test.feature/feature.xml 2011-08-30 19:05:03 UTC (rev 34410)
+++ trunk/smooks/features/org.jboss.tools.smooks.test.feature/feature.xml 2011-08-30 19:09:53 UTC (rev 34411)
@@ -1,16 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<feature id="org.jboss.tools.smooks.test.feature" label="JBoss Tools - Tests - Smooks" version="1.3.0.qualifier" provider-name="JBoss by RedHat">
- <description url="http://www.example.com/description">
- [Enter Feature Description here.]
+ <description url="http://www.jboss.org/tools">
+ %description
</description>
- <copyright url="http://www.example.com/copyright">
- [Enter Copyright Description here.]
+ <copyright>
+ %copyright
</copyright>
- <license url="http://www.example.com/license">
- [Enter License Description here.]
+ <license url="%licenseURL">
+ %license
</license>
<plugin id="org.jboss.tools.smooks.core.test" download-size="0" install-size="0" version="0.0.0" />
Added: trunk/smooks/features/org.jboss.tools.smooks.test.feature/license.html
===================================================================
--- trunk/smooks/features/org.jboss.tools.smooks.test.feature/license.html (rev 0)
+++ trunk/smooks/features/org.jboss.tools.smooks.test.feature/license.html 2011-08-30 19:09:53 UTC (rev 34411)
@@ -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/smooks/features/org.jboss.tools.smooks.test.feature/license.html
___________________________________________________________________
Added: svn:mime-type
+ text/plain
12 years, 8 months
JBoss Tools SVN: r34410 - branches/jbosstools-3.3.0.M3/hibernatetools/features/org.hibernate.eclipse.test.feature.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2011-08-30 15:05:03 -0400 (Tue, 30 Aug 2011)
New Revision: 34410
Added:
branches/jbosstools-3.3.0.M3/hibernatetools/features/org.hibernate.eclipse.test.feature/feature.properties
branches/jbosstools-3.3.0.M3/hibernatetools/features/org.hibernate.eclipse.test.feature/license.html
Modified:
branches/jbosstools-3.3.0.M3/hibernatetools/features/org.hibernate.eclipse.test.feature/build.properties
branches/jbosstools-3.3.0.M3/hibernatetools/features/org.hibernate.eclipse.test.feature/feature.xml
Log:
https://issues.jboss.org/browse/JBIDE-9598 ./hibernatetools/features/org.hibernate.eclipse.test.feature/feature.xml :: add license/copyright/description in feature.properties and ref from feature.xml; fix build.properties to include license.html & feature.*
fixed in branch for 3.3.0.M3
Modified: branches/jbosstools-3.3.0.M3/hibernatetools/features/org.hibernate.eclipse.test.feature/build.properties
===================================================================
--- branches/jbosstools-3.3.0.M3/hibernatetools/features/org.hibernate.eclipse.test.feature/build.properties 2011-08-30 19:03:58 UTC (rev 34409)
+++ branches/jbosstools-3.3.0.M3/hibernatetools/features/org.hibernate.eclipse.test.feature/build.properties 2011-08-30 19:05:03 UTC (rev 34410)
@@ -1 +1,9 @@
-bin.includes = feature.xml
+bin.includes = feature.xml,\
+ license.html,\
+ feature.properties
+src.includes = pom.xml,\
+ license.html,\
+ feature.xml,\
+ build.properties,\
+ feature.properties,\
+ .project
Added: branches/jbosstools-3.3.0.M3/hibernatetools/features/org.hibernate.eclipse.test.feature/feature.properties
===================================================================
--- branches/jbosstools-3.3.0.M3/hibernatetools/features/org.hibernate.eclipse.test.feature/feature.properties (rev 0)
+++ branches/jbosstools-3.3.0.M3/hibernatetools/features/org.hibernate.eclipse.test.feature/feature.properties 2011-08-30 19:05:03 UTC (rev 34410)
@@ -0,0 +1,46 @@
+###############################################################################
+# Copyright (c) 2010-2011 Red Hat, Inc. 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:
+# JBoss by Red Hat - Initial implementation.
+##############################################################################
+# feature.properties
+# contains externalized strings for feature.xml
+# "%foo" in feature.xml corresponds to the key "foo" in this file
+# java.io.Properties file (ISO 8859-1 with "\" escapes)
+# This file should be translated.
+
+# "featureName" property - name of the feature
+featureName=JBoss Hibernate Tools Tests
+
+# "providerName" property - name of the company that provides the feature
+providerName=JBoss by Red Hat
+
+# "updateSiteName" property - label for the update site
+updateSiteName=JBossTools Update Site
+
+devUpdateSiteName=JBossTools Development Update Site
+
+# "description" property - description of the feature
+description=Provides tests for for JBoss Hibernate Tools.
+
+copyright=Copyright 2007-2011 Red Hat, Inc.\n\
+Distributed under license by Red Hat, Inc. All rights reserved.\n\
+This program is made available under the terms of the\n\
+Eclipse Public License v1.0 which accompanies this distribution,\n\
+and is available at http\://www.eclipse.org/legal/epl-v10.html\n\
+Contributors\:\n\
+Red Hat, Inc. - initial API and implementation
+
+licenseURL=license.html
+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.
\ No newline at end of file
Property changes on: branches/jbosstools-3.3.0.M3/hibernatetools/features/org.hibernate.eclipse.test.feature/feature.properties
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: branches/jbosstools-3.3.0.M3/hibernatetools/features/org.hibernate.eclipse.test.feature/feature.xml
===================================================================
--- branches/jbosstools-3.3.0.M3/hibernatetools/features/org.hibernate.eclipse.test.feature/feature.xml 2011-08-30 19:03:58 UTC (rev 34409)
+++ branches/jbosstools-3.3.0.M3/hibernatetools/features/org.hibernate.eclipse.test.feature/feature.xml 2011-08-30 19:05:03 UTC (rev 34410)
@@ -5,22 +5,17 @@
version="3.4.0.qualifier"
provider-name="JBoss by Red Hat">
- <description url="http://www.example.com/description">
- hibernate test
+ <description url="http://www.jboss.org/tools">
+ %description
</description>
- <copyright url="http://www.example.com/copyright">
- [Enter Copyright Description here.]
+ <copyright>
+ %copyright
</copyright>
- <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="%licenseURL">
+ %license
+ </license>
<plugin id="org.hibernate.eclipse.console.test" download-size="0" install-size="0" version="0.0.0" />
<plugin id="org.hibernate.eclipse.jdt.ui.test" download-size="0" install-size="0" version="0.0.0" />
Added: branches/jbosstools-3.3.0.M3/hibernatetools/features/org.hibernate.eclipse.test.feature/license.html
===================================================================
--- branches/jbosstools-3.3.0.M3/hibernatetools/features/org.hibernate.eclipse.test.feature/license.html (rev 0)
+++ branches/jbosstools-3.3.0.M3/hibernatetools/features/org.hibernate.eclipse.test.feature/license.html 2011-08-30 19:05:03 UTC (rev 34410)
@@ -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: branches/jbosstools-3.3.0.M3/hibernatetools/features/org.hibernate.eclipse.test.feature/license.html
___________________________________________________________________
Added: svn:mime-type
+ text/plain
12 years, 8 months
JBoss Tools SVN: r34409 - branches/jbosstools-3.2.x/build/aggregate/webtools-site.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-08-30 15:03:58 -0400 (Tue, 30 Aug 2011)
New Revision: 34409
Modified:
branches/jbosstools-3.2.x/build/aggregate/webtools-site/site.xml
Log:
remove org.jboss.ide.eclipse.as.server.rse.integration as it's not available in 32x branch
Modified: branches/jbosstools-3.2.x/build/aggregate/webtools-site/site.xml
===================================================================
--- branches/jbosstools-3.2.x/build/aggregate/webtools-site/site.xml 2011-08-30 19:03:50 UTC (rev 34408)
+++ branches/jbosstools-3.2.x/build/aggregate/webtools-site/site.xml 2011-08-30 19:03:58 UTC (rev 34409)
@@ -20,9 +20,6 @@
<feature url="features/org.jboss.ide.eclipse.as.feature_0.0.0.jar" id="org.jboss.ide.eclipse.as.feature" version="0.0.0">
<category name="JBoss Tools - Web Tools Nightly Build Update Site"/>
</feature>
- <feature url="features/org.jboss.ide.eclipse.as.server.rse.integration_0.0.0.jar" id="org.jboss.ide.eclipse.as.server.rse.integration" version="0.0.0">
- <category name="JBoss Tools - Web Tools Nightly Build Update Site"/>
- </feature>
<feature url="features/org.jboss.ide.eclipse.as.jmx.integration_0.0.0.jar" id="org.jboss.ide.eclipse.as.jmx.integration" version="0.0.0">
<category name="JBoss Tools - Web Tools Nightly Build Update Site"/>
</feature>
12 years, 8 months
JBoss Tools SVN: r34408 - trunk/hibernatetools/features/org.hibernate.eclipse.test.feature.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2011-08-30 15:03:50 -0400 (Tue, 30 Aug 2011)
New Revision: 34408
Added:
trunk/hibernatetools/features/org.hibernate.eclipse.test.feature/feature.properties
trunk/hibernatetools/features/org.hibernate.eclipse.test.feature/license.html
Log:
https://issues.jboss.org/browse/JBIDE-9598 ./hibernatetools/features/org.hibernate.eclipse.test.feature/feature.xml :: add license/copyright/description in feature.properties and ref from feature.xml; fix build.properties to include license.html & feature.*
fixed in trunk for 3.3.0.M4, new resources added
Added: trunk/hibernatetools/features/org.hibernate.eclipse.test.feature/feature.properties
===================================================================
--- trunk/hibernatetools/features/org.hibernate.eclipse.test.feature/feature.properties (rev 0)
+++ trunk/hibernatetools/features/org.hibernate.eclipse.test.feature/feature.properties 2011-08-30 19:03:50 UTC (rev 34408)
@@ -0,0 +1,46 @@
+###############################################################################
+# Copyright (c) 2010-2011 Red Hat, Inc. 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:
+# JBoss by Red Hat - Initial implementation.
+##############################################################################
+# feature.properties
+# contains externalized strings for feature.xml
+# "%foo" in feature.xml corresponds to the key "foo" in this file
+# java.io.Properties file (ISO 8859-1 with "\" escapes)
+# This file should be translated.
+
+# "featureName" property - name of the feature
+featureName=JBoss Hibernate Tools Tests
+
+# "providerName" property - name of the company that provides the feature
+providerName=JBoss by Red Hat
+
+# "updateSiteName" property - label for the update site
+updateSiteName=JBossTools Update Site
+
+devUpdateSiteName=JBossTools Development Update Site
+
+# "description" property - description of the feature
+description=Provides tests for for JBoss Hibernate Tools.
+
+copyright=Copyright 2007-2011 Red Hat, Inc.\n\
+Distributed under license by Red Hat, Inc. All rights reserved.\n\
+This program is made available under the terms of the\n\
+Eclipse Public License v1.0 which accompanies this distribution,\n\
+and is available at http\://www.eclipse.org/legal/epl-v10.html\n\
+Contributors\:\n\
+Red Hat, Inc. - initial API and implementation
+
+licenseURL=license.html
+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.
\ No newline at end of file
Property changes on: trunk/hibernatetools/features/org.hibernate.eclipse.test.feature/feature.properties
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/hibernatetools/features/org.hibernate.eclipse.test.feature/license.html
===================================================================
--- trunk/hibernatetools/features/org.hibernate.eclipse.test.feature/license.html (rev 0)
+++ trunk/hibernatetools/features/org.hibernate.eclipse.test.feature/license.html 2011-08-30 19:03:50 UTC (rev 34408)
@@ -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/hibernatetools/features/org.hibernate.eclipse.test.feature/license.html
___________________________________________________________________
Added: svn:mime-type
+ text/plain
12 years, 8 months
JBoss Tools SVN: r34407 - trunk/hibernatetools/features/org.hibernate.eclipse.test.feature.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2011-08-30 14:55:05 -0400 (Tue, 30 Aug 2011)
New Revision: 34407
Modified:
trunk/hibernatetools/features/org.hibernate.eclipse.test.feature/build.properties
trunk/hibernatetools/features/org.hibernate.eclipse.test.feature/feature.xml
Log:
https://issues.jboss.org/browse/JBIDE-9598 ./hibernatetools/features/org.hibernate.eclipse.test.feature/feature.xml :: add license/copyright/description in feature.properties and ref from feature.xml; fix build.properties to include license.html & feature.*
fixed in trunk for 3.3.0.M4
Modified: trunk/hibernatetools/features/org.hibernate.eclipse.test.feature/build.properties
===================================================================
--- trunk/hibernatetools/features/org.hibernate.eclipse.test.feature/build.properties 2011-08-30 18:54:25 UTC (rev 34406)
+++ trunk/hibernatetools/features/org.hibernate.eclipse.test.feature/build.properties 2011-08-30 18:55:05 UTC (rev 34407)
@@ -1 +1,9 @@
-bin.includes = feature.xml
+bin.includes = feature.xml,\
+ license.html,\
+ feature.properties
+src.includes = pom.xml,\
+ license.html,\
+ feature.xml,\
+ build.properties,\
+ feature.properties,\
+ .project
Modified: trunk/hibernatetools/features/org.hibernate.eclipse.test.feature/feature.xml
===================================================================
--- trunk/hibernatetools/features/org.hibernate.eclipse.test.feature/feature.xml 2011-08-30 18:54:25 UTC (rev 34406)
+++ trunk/hibernatetools/features/org.hibernate.eclipse.test.feature/feature.xml 2011-08-30 18:55:05 UTC (rev 34407)
@@ -5,22 +5,17 @@
version="3.4.0.qualifier"
provider-name="JBoss by Red Hat">
- <description url="http://www.example.com/description">
- hibernate test
+ <description url="http://www.jboss.org/tools">
+ %description
</description>
- <copyright url="http://www.example.com/copyright">
- [Enter Copyright Description here.]
+ <copyright>
+ %copyright
</copyright>
- <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="%licenseURL">
+ %license
+ </license>
<plugin id="org.hibernate.eclipse.console.test" download-size="0" install-size="0" version="0.0.0" />
<plugin id="org.hibernate.eclipse.jdt.ui.test" download-size="0" install-size="0" version="0.0.0" />
12 years, 8 months
JBoss Tools SVN: r34406 - in trunk/cdi/plugins: org.jboss.tools.cdi.seam.config.ui/META-INF and 5 other directories.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2011-08-30 14:54:25 -0400 (Tue, 30 Aug 2011)
New Revision: 34406
Added:
trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.ui/src/org/jboss/tools/cdi/seam/config/ui/marker/
trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.ui/src/org/jboss/tools/cdi/seam/config/ui/marker/CDIMarkerResolutionGeneratorExtension.java
trunk/cdi/plugins/org.jboss.tools.cdi.ui/schema/quickFixExtension.exsd
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/CDIQuickFixExtensionManager.java
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/ICDIMarkerResolutionGeneratorExtension.java
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.ui/META-INF/MANIFEST.MF
trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.ui/plugin.xml
trunk/cdi/plugins/org.jboss.tools.cdi.ui/plugin.xml
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/CDIProblemMarkerResolutionGenerator.java
Log:
Disabled quick fixes for case of generic beans
Quick fix for "Multiple beans are eligible for injection point" problem markers works wrong in case of working with generic beans. https://issues.jboss.org/browse/JBIDE-9115
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.ui/META-INF/MANIFEST.MF
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.ui/META-INF/MANIFEST.MF 2011-08-30 18:44:04 UTC (rev 34405)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.ui/META-INF/MANIFEST.MF 2011-08-30 18:54:25 UTC (rev 34406)
@@ -20,6 +20,7 @@
org.jboss.tools.cdi.seam.config.core,
org.jboss.tools.cdi.seam.solder.core,
org.jboss.tools.jst.web.kb,
- org.jboss.tools.jst.web
+ org.jboss.tools.jst.web,
+ org.eclipse.ui.ide;bundle-version="3.7.0"
Bundle-Version: 1.2.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.ui/plugin.xml
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.ui/plugin.xml 2011-08-30 18:44:04 UTC (rev 34405)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.ui/plugin.xml 2011-08-30 18:54:25 UTC (rev 34406)
@@ -32,4 +32,11 @@
class="org.jboss.tools.cdi.seam.config.ui.preferences.CDISeamConfigurationBlockDescriptionProvider">
</provider>
</extension>
+<extension
+ point="org.jboss.tools.cdi.ui.quickFixExtension">
+ <resolution_generator_extension
+ generator-extension-class="org.jboss.tools.cdi.seam.config.ui.marker.CDIMarkerResolutionGeneratorExtension"
+ id="org.jboss.tools.cdi.seam.config.ui.resolution_generator_extension">
+ </resolution_generator_extension>
+</extension>
</plugin>
Added: trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.ui/src/org/jboss/tools/cdi/seam/config/ui/marker/CDIMarkerResolutionGeneratorExtension.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.ui/src/org/jboss/tools/cdi/seam/config/ui/marker/CDIMarkerResolutionGeneratorExtension.java (rev 0)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.ui/src/org/jboss/tools/cdi/seam/config/ui/marker/CDIMarkerResolutionGeneratorExtension.java 2011-08-30 18:54:25 UTC (rev 34406)
@@ -0,0 +1,44 @@
+/*******************************************************************************
+ * Copyright (c) 2011 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.seam.config.ui.marker;
+
+import java.util.Collections;
+import java.util.List;
+
+import org.eclipse.ui.IMarkerResolution;
+import org.jboss.tools.cdi.core.IBean;
+import org.jboss.tools.cdi.internal.core.validation.CDIValidationErrorManager;
+import org.jboss.tools.cdi.seam.solder.core.generic.GenericBeanProducerField;
+import org.jboss.tools.cdi.seam.solder.core.generic.GenericBeanProducerMethod;
+import org.jboss.tools.cdi.seam.solder.core.generic.GenericClassBean;
+import org.jboss.tools.cdi.ui.marker.ICDIMarkerResolutionGeneratorExtension;
+
+public class CDIMarkerResolutionGeneratorExtension implements
+ ICDIMarkerResolutionGeneratorExtension {
+
+ private boolean isBeanGeneric(IBean bean){
+ return (bean instanceof GenericClassBean ||
+ bean instanceof GenericBeanProducerField ||
+ bean instanceof GenericBeanProducerMethod);
+ }
+
+ @Override
+ public boolean shouldBeExtended(int id, IBean bean) {
+ return (id == CDIValidationErrorManager.AMBIGUOUS_INJECTION_POINTS_ID || id == CDIValidationErrorManager.UNSATISFIED_INJECTION_POINTS_ID) &&
+ isBeanGeneric(bean);
+ }
+
+ @Override
+ public List<IMarkerResolution> getResolutions(int id, IBean bean) {
+ return Collections.emptyList();
+ }
+
+}
Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.ui/src/org/jboss/tools/cdi/seam/config/ui/marker/CDIMarkerResolutionGeneratorExtension.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/plugin.xml
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/plugin.xml 2011-08-30 18:44:04 UTC (rev 34405)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/plugin.xml 2011-08-30 18:54:25 UTC (rev 34406)
@@ -2,6 +2,7 @@
<?eclipse version="3.2"?>
<plugin>
<extension-point id="configBlockDescriptionProvider" name="Config Block Description Provider" schema="schema/configBlockDescriptionProvider.exsd"/>
+ <extension-point id="quickFixExtension" name="Quick Fix Extension" schema="schema/quickFixExtension.exsd"/>
<extension
point="org.eclipse.ui.propertyPages">
Added: trunk/cdi/plugins/org.jboss.tools.cdi.ui/schema/quickFixExtension.exsd
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/schema/quickFixExtension.exsd (rev 0)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/schema/quickFixExtension.exsd 2011-08-30 18:54:25 UTC (rev 34406)
@@ -0,0 +1,133 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!-- Schema file written by PDE -->
+<schema targetNamespace="org.jboss.tools.cdi.ui" xmlns="http://www.w3.org/2001/XMLSchema">
+<annotation>
+ <appInfo>
+ <meta.schema plugin="org.jboss.tools.cdi.ui" id="quickFixExtension" name="Quick Fix Extension"/>
+ </appInfo>
+ <documentation>
+ [Enter description of this extension point.]
+ </documentation>
+ </annotation>
+
+ <element name="extension">
+ <annotation>
+ <appInfo>
+ <meta.element />
+ </appInfo>
+ </annotation>
+ <complexType>
+ <sequence>
+ <element ref="resolution_generator_extension" minOccurs="1" maxOccurs="unbounded"/>
+ </sequence>
+ <attribute name="point" type="string" use="required">
+ <annotation>
+ <documentation>
+
+ </documentation>
+ </annotation>
+ </attribute>
+ <attribute name="id" type="string">
+ <annotation>
+ <documentation>
+
+ </documentation>
+ </annotation>
+ </attribute>
+ <attribute name="name" type="string">
+ <annotation>
+ <documentation>
+
+ </documentation>
+ <appInfo>
+ <meta.attribute translatable="true"/>
+ </appInfo>
+ </annotation>
+ </attribute>
+ </complexType>
+ </element>
+
+ <element name="resolution_generator_extension">
+ <complexType>
+ <attribute name="id" type="string" use="required">
+ <annotation>
+ <documentation>
+
+ </documentation>
+ <appInfo>
+ <meta.attribute kind="identifier"/>
+ </appInfo>
+ </annotation>
+ </attribute>
+ <attribute name="generator-extension-class" type="string" use="required">
+ <annotation>
+ <documentation>
+
+ </documentation>
+ <appInfo>
+ <meta.attribute kind="java" basedOn=":org.jboss.tools.cdi.ui.marker.ICDIMarkerResolutionGeneratorExtension"/>
+ </appInfo>
+ </annotation>
+ </attribute>
+ </complexType>
+ </element>
+
+ <annotation>
+ <appInfo>
+ <meta.section type="since"/>
+ </appInfo>
+ <documentation>
+ JBoss Tools 3.3
+ </documentation>
+ </annotation>
+
+ <annotation>
+ <appInfo>
+ <meta.section type="examples"/>
+ </appInfo>
+ <documentation>
+ <extension point="org.jboss.tools.cdi.ui.quickFixExtension">
+ <resolution_generator_extension
+ generator-extension-class = "org.jboss.tools.cdi.seam.config.ui.marker.CDIMarkerResolutionGeneratorExtension"
+ id="org.jboss.tools.cdi.seam.config.ui.resolution_generator_extension">
+ </resolution_generator_extension>
+</extension>
+
+ </documentation>
+ </annotation>
+
+ <annotation>
+ <appInfo>
+ <meta.section type="apiinfo"/>
+ </appInfo>
+ <documentation>
+ [Enter API information here.]
+ </documentation>
+ </annotation>
+
+ <annotation>
+ <appInfo>
+ <meta.section type="implementation"/>
+ </appInfo>
+ <documentation>
+ [Enter information about supplied implementation of this extension point.]
+ </documentation>
+ </annotation>
+
+ <annotation>
+ <appInfo>
+ <meta.section type="copyright"/>
+ </appInfo>
+ <documentation>
+ Copyright (c) 2011 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
+ </documentation>
+ </annotation>
+
+</schema>
Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.ui/schema/quickFixExtension.exsd
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/CDIProblemMarkerResolutionGenerator.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/CDIProblemMarkerResolutionGenerator.java 2011-08-30 18:44:04 UTC (rev 34405)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/CDIProblemMarkerResolutionGenerator.java 2011-08-30 18:54:25 UTC (rev 34406)
@@ -44,11 +44,9 @@
import org.jboss.tools.cdi.internal.core.validation.CDIValidationErrorManager;
import org.jboss.tools.cdi.ui.CDIUIPlugin;
import org.jboss.tools.common.EclipseUtil;
-import org.jboss.tools.common.java.IAnnotated;
import org.jboss.tools.common.java.IAnnotationDeclaration;
import org.jboss.tools.common.model.util.EclipseJavaUtil;
import org.jboss.tools.common.model.util.EclipseResourceUtil;
-import org.jboss.tools.common.text.ITextSourceReference;
/**
* @author Daniel Azarov
@@ -93,6 +91,8 @@
if (attribute == null)
return new IMarkerResolution[] {};
final int start = attribute.intValue();
+
+ ICDIMarkerResolutionGeneratorExtension[] extensions = CDIQuickFixExtensionManager.getInstances();
if (JAVA_EXTENSION.equals(file.getFileExtension())) {
if (messageId == CDIValidationErrorManager.ILLEGAL_PRODUCER_FIELD_IN_SESSION_BEAN_ID) {
@@ -135,39 +135,41 @@
new DeleteAllInjectedConstructorsMarkerResolution(method, file)
};
}
- }else if(messageId == CDIValidationErrorManager.AMBIGUOUS_INJECTION_POINTS_ID){
+ }else if(messageId == CDIValidationErrorManager.AMBIGUOUS_INJECTION_POINTS_ID ||
+ messageId == CDIValidationErrorManager.UNSATISFIED_INJECTION_POINTS_ID){
+
+ List<IMarkerResolution> resolutions = new ArrayList<IMarkerResolution>();
+
IInjectionPoint injectionPoint = findInjectionPoint(file, start);
if(injectionPoint != null){
- List<IBean> beans = findBeans(injectionPoint);
- if(beans.size() < MARKER_RESULUTION_NUMBER_LIMIT){
- IMarkerResolution[] resolutions = new IMarkerResolution[beans.size()];
- for(int i = 0; i < beans.size(); i++){
- resolutions[i] = new MakeInjectedPointUnambiguousMarkerResolution(injectionPoint, beans, i);
- }
- return resolutions;
+ List<IBean> beans;
+ if(messageId == CDIValidationErrorManager.AMBIGUOUS_INJECTION_POINTS_ID){
+ beans = findBeans(injectionPoint);
}else{
- IMarkerResolution[] resolutions = new IMarkerResolution[1];
- resolutions[0] = new SelectBeanMarkerResolution(injectionPoint, beans);
- return resolutions;
+ beans = findLegalBeans(injectionPoint);
}
- }
- }else if(messageId == CDIValidationErrorManager.UNSATISFIED_INJECTION_POINTS_ID){
- IInjectionPoint injectionPoint = findInjectionPoint(file, start);
- if(injectionPoint != null){
- List<IBean> beans = findLegalBeans(injectionPoint);
- if(beans.size() < MARKER_RESULUTION_NUMBER_LIMIT){
- IMarkerResolution[] resolutions = new IMarkerResolution[beans.size()];
+ for(int i = beans.size()-1; i >= 0; i--){
+ IBean bean = beans.get(i);
+ for(ICDIMarkerResolutionGeneratorExtension extension : extensions){
+ if(extension.shouldBeExtended(messageId, bean)){
+ List<IMarkerResolution> addings = extension.getResolutions(messageId, bean);
+ resolutions.addAll(addings);
+ beans.remove(bean);
+ break;
+ }
+ }
+ }
+
+ if(beans.size() < MARKER_RESULUTION_NUMBER_LIMIT){
for(int i = 0; i < beans.size(); i++){
- resolutions[i] = new MakeInjectedPointUnambiguousMarkerResolution(injectionPoint, beans, i);
+ resolutions.add(new MakeInjectedPointUnambiguousMarkerResolution(injectionPoint, beans, i));
}
- return resolutions;
}else{
- IMarkerResolution[] resolutions = new IMarkerResolution[1];
- resolutions[0] = new SelectBeanMarkerResolution(injectionPoint, beans);
- return resolutions;
+ resolutions.add(new SelectBeanMarkerResolution(injectionPoint, beans));
}
}
+ return resolutions.toArray(new IMarkerResolution[]{});
}else if(messageId == CDIValidationErrorManager.NOT_PASSIVATION_CAPABLE_BEAN_ID){
IType type = findTypeWithNoSerializable(file, start);
Added: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/CDIQuickFixExtensionManager.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/CDIQuickFixExtensionManager.java (rev 0)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/CDIQuickFixExtensionManager.java 2011-08-30 18:54:25 UTC (rev 34406)
@@ -0,0 +1,54 @@
+/*******************************************************************************
+ * Copyright (c) 2011 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.ui.marker;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.core.runtime.CoreException;
+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.ELCorePlugin;
+
+public class CDIQuickFixExtensionManager {
+ public static String EXTENSION_POINT = "org.jboss.tools.cdi.ui.quickFixExtension"; //$NON-NLS-1$
+
+ String id;
+ ICDIMarkerResolutionGeneratorExtension extension;
+
+ public CDIQuickFixExtensionManager() {}
+
+ public String getId() {
+ return id;
+ }
+
+ static ICDIMarkerResolutionGeneratorExtension[] INSTANCES;
+
+ public static ICDIMarkerResolutionGeneratorExtension[] getInstances() {
+ if(INSTANCES != null) return INSTANCES;
+ List<ICDIMarkerResolutionGeneratorExtension> list = new ArrayList<ICDIMarkerResolutionGeneratorExtension>();
+ IExtensionPoint point = Platform.getExtensionRegistry().getExtensionPoint(EXTENSION_POINT);
+ IConfigurationElement[] es = point.getConfigurationElements();
+ for (IConfigurationElement e: es) {
+ CDIQuickFixExtensionManager n = new CDIQuickFixExtensionManager();
+ n.id = e.getAttribute("id"); //$NON-NLS-1$
+ try{
+ n.extension = (ICDIMarkerResolutionGeneratorExtension)e.createExecutableExtension("generator-extension-class"); //$NON-NLS-1$
+ list.add(n.extension);
+ }catch(CoreException ex){
+ ELCorePlugin.getDefault().logError(ex);
+ }
+
+ }
+ return INSTANCES = list.toArray(new ICDIMarkerResolutionGeneratorExtension[0]);
+ }
+}
Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/CDIQuickFixExtensionManager.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/ICDIMarkerResolutionGeneratorExtension.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/ICDIMarkerResolutionGeneratorExtension.java (rev 0)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/ICDIMarkerResolutionGeneratorExtension.java 2011-08-30 18:54:25 UTC (rev 34406)
@@ -0,0 +1,22 @@
+/*******************************************************************************
+ * Copyright (c) 2011 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.ui.marker;
+
+import java.util.List;
+
+import org.eclipse.ui.IMarkerResolution;
+import org.jboss.tools.cdi.core.IBean;
+
+
+public interface ICDIMarkerResolutionGeneratorExtension{
+ public boolean shouldBeExtended(int id, IBean bean);
+ public List<IMarkerResolution> getResolutions(int id, IBean bean);
+}
Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/ICDIMarkerResolutionGeneratorExtension.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
12 years, 8 months
JBoss Tools SVN: r34405 - branches/jbosstools-3.3.0.M3/freemarker/features/org.jboss.ide.eclipse.freemarker.test.feature.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2011-08-30 14:44:04 -0400 (Tue, 30 Aug 2011)
New Revision: 34405
Modified:
branches/jbosstools-3.3.0.M3/freemarker/features/org.jboss.ide.eclipse.freemarker.test.feature/feature.xml
Log:
https://issues.jboss.org/browse/JBIDE-9600 ./freemarker/features/org.jboss.ide.eclipse.freemarker.test.feature/feature.xml :: add license/copyright/description in feature.properties and ref from feature.xml; fix build.properties to include license.html & feature.*
fixed in trunk
Modified: branches/jbosstools-3.3.0.M3/freemarker/features/org.jboss.ide.eclipse.freemarker.test.feature/feature.xml
===================================================================
--- branches/jbosstools-3.3.0.M3/freemarker/features/org.jboss.ide.eclipse.freemarker.test.feature/feature.xml 2011-08-30 18:29:38 UTC (rev 34404)
+++ branches/jbosstools-3.3.0.M3/freemarker/features/org.jboss.ide.eclipse.freemarker.test.feature/feature.xml 2011-08-30 18:44:04 UTC (rev 34405)
@@ -6,7 +6,7 @@
provider-name="JBoss by RedHat">
<description url="http://www.jboss.org/tools">
- [Enter Feature Description here.]
+ %description
</description>
<copyright>
12 years, 8 months
JBoss Tools SVN: r34404 - branches/jbosstools-3.3.0.M3/freemarker/features/org.jboss.ide.eclipse.freemarker.test.feature.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2011-08-30 14:29:38 -0400 (Tue, 30 Aug 2011)
New Revision: 34404
Added:
branches/jbosstools-3.3.0.M3/freemarker/features/org.jboss.ide.eclipse.freemarker.test.feature/feature.properties
branches/jbosstools-3.3.0.M3/freemarker/features/org.jboss.ide.eclipse.freemarker.test.feature/license.html
Modified:
branches/jbosstools-3.3.0.M3/freemarker/features/org.jboss.ide.eclipse.freemarker.test.feature/build.properties
branches/jbosstools-3.3.0.M3/freemarker/features/org.jboss.ide.eclipse.freemarker.test.feature/feature.xml
Log:
https://issues.jboss.org/browse/JBIDE-9600 ./freemarker/features/org.jboss.ide.eclipse.freemarker.test.feature/feature.xml :: add license/copyright/description in feature.properties and ref from feature.xml; fix build.properties to include license.html & feature.*
fixed in 3.3.0.M3 branch
Modified: branches/jbosstools-3.3.0.M3/freemarker/features/org.jboss.ide.eclipse.freemarker.test.feature/build.properties
===================================================================
--- branches/jbosstools-3.3.0.M3/freemarker/features/org.jboss.ide.eclipse.freemarker.test.feature/build.properties 2011-08-30 18:28:21 UTC (rev 34403)
+++ branches/jbosstools-3.3.0.M3/freemarker/features/org.jboss.ide.eclipse.freemarker.test.feature/build.properties 2011-08-30 18:29:38 UTC (rev 34404)
@@ -1 +1,9 @@
-bin.includes = feature.xml
+bin.includes = feature.xml,\
+ license.html,\
+ feature.properties
+src.includes = pom.xml,\
+ license.html,\
+ feature.xml,\
+ build.properties,\
+ feature.properties,\
+ .project
Added: branches/jbosstools-3.3.0.M3/freemarker/features/org.jboss.ide.eclipse.freemarker.test.feature/feature.properties
===================================================================
--- branches/jbosstools-3.3.0.M3/freemarker/features/org.jboss.ide.eclipse.freemarker.test.feature/feature.properties (rev 0)
+++ branches/jbosstools-3.3.0.M3/freemarker/features/org.jboss.ide.eclipse.freemarker.test.feature/feature.properties 2011-08-30 18:29:38 UTC (rev 34404)
@@ -0,0 +1,46 @@
+###############################################################################
+# Copyright (c) 2010-2011 Red Hat, Inc. 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:
+# JBoss by Red Hat - Initial implementation.
+##############################################################################
+# feature.properties
+# contains externalized strings for feature.xml
+# "%foo" in feature.xml corresponds to the key "foo" in this file
+# java.io.Properties file (ISO 8859-1 with "\" escapes)
+# This file should be translated.
+
+# "featureName" property - name of the feature
+featureName=JBoss Tools Freemarker Tests
+
+# "providerName" property - name of the company that provides the feature
+providerName=JBoss by Red Hat
+
+# "updateSiteName" property - label for the update site
+updateSiteName=JBossTools Update Site
+
+devUpdateSiteName=JBossTools Development Update Site
+
+# "description" property - description of the feature
+description=Provides tests for for JBoss Tools Freemarker Editor.
+
+copyright=Copyright 2007-2011 Red Hat, Inc.\n\
+Distributed under license by Red Hat, Inc. All rights reserved.\n\
+This program is made available under the terms of the\n\
+Eclipse Public License v1.0 which accompanies this distribution,\n\
+and is available at http\://www.eclipse.org/legal/epl-v10.html\n\
+Contributors\:\n\
+Red Hat, Inc. - initial API and implementation
+
+licenseURL=license.html
+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.
\ No newline at end of file
Property changes on: branches/jbosstools-3.3.0.M3/freemarker/features/org.jboss.ide.eclipse.freemarker.test.feature/feature.properties
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: branches/jbosstools-3.3.0.M3/freemarker/features/org.jboss.ide.eclipse.freemarker.test.feature/feature.xml
===================================================================
--- branches/jbosstools-3.3.0.M3/freemarker/features/org.jboss.ide.eclipse.freemarker.test.feature/feature.xml 2011-08-30 18:28:21 UTC (rev 34403)
+++ branches/jbosstools-3.3.0.M3/freemarker/features/org.jboss.ide.eclipse.freemarker.test.feature/feature.xml 2011-08-30 18:29:38 UTC (rev 34404)
@@ -1,18 +1,26 @@
<?xml version="1.0" encoding="UTF-8"?>
-<feature id="org.jboss.ide.eclipse.freemarker.test.feature" label="JBoss Tools - Tests - Freemarker" version="1.2.0.qualifier" provider-name="JBoss by RedHat">
+<feature
+ id="org.jboss.ide.eclipse.freemarker.test.feature"
+ label="JBoss Tools - Tests - Freemarker"
+ version="1.2.0.qualifier"
+ provider-name="JBoss by RedHat">
- <description url="http://www.example.com/description">
+ <description url="http://www.jboss.org/tools">
[Enter Feature Description here.]
</description>
- <copyright url="http://www.example.com/copyright">
- [Enter Copyright Description here.]
+ <copyright>
+ %copyright
</copyright>
- <license url="http://www.example.com/license">
- [Enter License Description here.]
+ <license url="%licenseURL">
+ %license
</license>
- <plugin id="org.jboss.ide.eclipse.freemarker.test" download-size="0" install-size="0" version="0.0.0" />
+ <plugin
+ id="org.jboss.ide.eclipse.freemarker.test"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"/>
</feature>
Added: branches/jbosstools-3.3.0.M3/freemarker/features/org.jboss.ide.eclipse.freemarker.test.feature/license.html
===================================================================
--- branches/jbosstools-3.3.0.M3/freemarker/features/org.jboss.ide.eclipse.freemarker.test.feature/license.html (rev 0)
+++ branches/jbosstools-3.3.0.M3/freemarker/features/org.jboss.ide.eclipse.freemarker.test.feature/license.html 2011-08-30 18:29:38 UTC (rev 34404)
@@ -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: branches/jbosstools-3.3.0.M3/freemarker/features/org.jboss.ide.eclipse.freemarker.test.feature/license.html
___________________________________________________________________
Added: svn:mime-type
+ text/plain
12 years, 8 months
JBoss Tools SVN: r34403 - in trunk: vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/tools and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: vpakan(a)redhat.com
Date: 2011-08-30 14:28:21 -0400 (Tue, 30 Aug 2011)
New Revision: 34403
Modified:
trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/helper/ContextMenuHelper.java
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/tools/SWTBotWebBrowser.java
Log:
Fixes related to changes regarding MacOs
Modified: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/helper/ContextMenuHelper.java
===================================================================
--- trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/helper/ContextMenuHelper.java 2011-08-30 18:28:08 UTC (rev 34402)
+++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/helper/ContextMenuHelper.java 2011-08-30 18:28:21 UTC (rev 34403)
@@ -41,6 +41,7 @@
import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem;
import org.hamcrest.Matcher;
+import org.jboss.tools.ui.bot.ext.SWTJBTExt;
/**
* Helper to find context menu of widget
@@ -149,18 +150,28 @@
*/
private static void hide(final Menu menu , boolean hideRecursively) {
if (menu != null){
- // Hide recursively
- if (hideRecursively) {
- KeyboardHelper.typeKeyCodeUsingAWT(KeyEvent.VK_ESCAPE);
- }
- else{
- menu.notifyListeners(SWT.Hide, new Event());
- }
+ menu.notifyListeners(SWT.Hide, new Event());
try {
Thread.sleep(100);
} catch (InterruptedException e) {
e.printStackTrace();
- }
+ }
+ // Hide recursively
+ if (hideRecursively) {
+ if (SWTJBTExt.isRunningOnMacOs()){
+ KeyboardHelper.typeKeyCodeUsingAWT(KeyEvent.VK_ESCAPE);
+ try {
+ Thread.sleep(100);
+ } catch (InterruptedException e) {
+ e.printStackTrace();
+ }
+ }
+ else{
+ if (menu.getParentMenu() != null) {
+ hide(menu.getParentMenu(),hideRecursively);
+ }
+ }
+ }
}
}
/**
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/tools/SWTBotWebBrowser.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/tools/SWTBotWebBrowser.java 2011-08-30 18:28:08 UTC (rev 34402)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/tools/SWTBotWebBrowser.java 2011-08-30 18:28:21 UTC (rev 34403)
@@ -661,9 +661,8 @@
}
menusHolder = parent;
}
-
try {
- Menu[] menus = ReflectionsHelper.getPrivateFieldValue(menusHolder.getClass(),
+ Menu[] menus = ReflectionsHelper.getPrivateFieldValue(SWTJBTExt.isRunningOnMacOs() ? Display.class : Decorations.class,
"menus",
menusHolder,
Menu[].class);
12 years, 8 months
JBoss Tools SVN: r34402 - trunk/freemarker/features/org.jboss.ide.eclipse.freemarker.test.feature.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2011-08-30 14:28:08 -0400 (Tue, 30 Aug 2011)
New Revision: 34402
Added:
trunk/freemarker/features/org.jboss.ide.eclipse.freemarker.test.feature/feature.properties
trunk/freemarker/features/org.jboss.ide.eclipse.freemarker.test.feature/license.html
Modified:
trunk/freemarker/features/org.jboss.ide.eclipse.freemarker.test.feature/build.properties
trunk/freemarker/features/org.jboss.ide.eclipse.freemarker.test.feature/feature.xml
Log:
https://issues.jboss.org/browse/JBIDE-9600 ./freemarker/features/org.jboss.ide.eclipse.freemarker.test.feature/feature.xml :: add license/copyright/description in feature.properties and ref from feature.xml; fix build.properties to include license.html & feature.*
fixed in trunk
Modified: trunk/freemarker/features/org.jboss.ide.eclipse.freemarker.test.feature/build.properties
===================================================================
--- trunk/freemarker/features/org.jboss.ide.eclipse.freemarker.test.feature/build.properties 2011-08-30 18:18:04 UTC (rev 34401)
+++ trunk/freemarker/features/org.jboss.ide.eclipse.freemarker.test.feature/build.properties 2011-08-30 18:28:08 UTC (rev 34402)
@@ -1 +1,9 @@
-bin.includes = feature.xml
+bin.includes = feature.xml,\
+ license.html,\
+ feature.properties
+src.includes = pom.xml,\
+ license.html,\
+ feature.xml,\
+ build.properties,\
+ feature.properties,\
+ .project
Added: trunk/freemarker/features/org.jboss.ide.eclipse.freemarker.test.feature/feature.properties
===================================================================
--- trunk/freemarker/features/org.jboss.ide.eclipse.freemarker.test.feature/feature.properties (rev 0)
+++ trunk/freemarker/features/org.jboss.ide.eclipse.freemarker.test.feature/feature.properties 2011-08-30 18:28:08 UTC (rev 34402)
@@ -0,0 +1,46 @@
+###############################################################################
+# Copyright (c) 2010-2011 Red Hat, Inc. 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:
+# JBoss by Red Hat - Initial implementation.
+##############################################################################
+# feature.properties
+# contains externalized strings for feature.xml
+# "%foo" in feature.xml corresponds to the key "foo" in this file
+# java.io.Properties file (ISO 8859-1 with "\" escapes)
+# This file should be translated.
+
+# "featureName" property - name of the feature
+featureName=JBoss Tools Freemarker Tests
+
+# "providerName" property - name of the company that provides the feature
+providerName=JBoss by Red Hat
+
+# "updateSiteName" property - label for the update site
+updateSiteName=JBossTools Update Site
+
+devUpdateSiteName=JBossTools Development Update Site
+
+# "description" property - description of the feature
+description=Provides tests for for JBoss Tools Freemarker Editor.
+
+copyright=Copyright 2007-2011 Red Hat, Inc.\n\
+Distributed under license by Red Hat, Inc. All rights reserved.\n\
+This program is made available under the terms of the\n\
+Eclipse Public License v1.0 which accompanies this distribution,\n\
+and is available at http\://www.eclipse.org/legal/epl-v10.html\n\
+Contributors\:\n\
+Red Hat, Inc. - initial API and implementation
+
+licenseURL=license.html
+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.
\ No newline at end of file
Property changes on: trunk/freemarker/features/org.jboss.ide.eclipse.freemarker.test.feature/feature.properties
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/freemarker/features/org.jboss.ide.eclipse.freemarker.test.feature/feature.xml
===================================================================
--- trunk/freemarker/features/org.jboss.ide.eclipse.freemarker.test.feature/feature.xml 2011-08-30 18:18:04 UTC (rev 34401)
+++ trunk/freemarker/features/org.jboss.ide.eclipse.freemarker.test.feature/feature.xml 2011-08-30 18:28:08 UTC (rev 34402)
@@ -1,18 +1,26 @@
<?xml version="1.0" encoding="UTF-8"?>
-<feature id="org.jboss.ide.eclipse.freemarker.test.feature" label="JBoss Tools - Tests - Freemarker" version="1.2.0.qualifier" provider-name="JBoss by RedHat">
+<feature
+ id="org.jboss.ide.eclipse.freemarker.test.feature"
+ label="JBoss Tools - Tests - Freemarker"
+ version="1.2.0.qualifier"
+ provider-name="JBoss by RedHat">
- <description url="http://www.example.com/description">
+ <description url="http://www.jboss.org/tools">
[Enter Feature Description here.]
</description>
- <copyright url="http://www.example.com/copyright">
- [Enter Copyright Description here.]
+ <copyright>
+ %copyright
</copyright>
- <license url="http://www.example.com/license">
- [Enter License Description here.]
+ <license url="%licenseURL">
+ %license
</license>
- <plugin id="org.jboss.ide.eclipse.freemarker.test" download-size="0" install-size="0" version="0.0.0" />
+ <plugin
+ id="org.jboss.ide.eclipse.freemarker.test"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"/>
</feature>
Added: trunk/freemarker/features/org.jboss.ide.eclipse.freemarker.test.feature/license.html
===================================================================
--- trunk/freemarker/features/org.jboss.ide.eclipse.freemarker.test.feature/license.html (rev 0)
+++ trunk/freemarker/features/org.jboss.ide.eclipse.freemarker.test.feature/license.html 2011-08-30 18:28:08 UTC (rev 34402)
@@ -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/freemarker/features/org.jboss.ide.eclipse.freemarker.test.feature/license.html
___________________________________________________________________
Added: svn:executable
+ *
Added: svn:mime-type
+ text/plain
12 years, 8 months