JBoss Tools SVN: r31141 - in trunk/seam/plugins: org.jboss.tools.seam.core/META-INF and 6 other directories.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2011-05-06 20:55:10 -0400 (Fri, 06 May 2011)
New Revision: 31141
Modified:
trunk/seam/plugins/org.jboss.tools.seam.base.test/META-INF/MANIFEST.MF
trunk/seam/plugins/org.jboss.tools.seam.core/META-INF/MANIFEST.MF
trunk/seam/plugins/org.jboss.tools.seam.pages.xml/META-INF/MANIFEST.MF
trunk/seam/plugins/org.jboss.tools.seam.text.ext/META-INF/MANIFEST.MF
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/META-INF/MANIFEST.MF
trunk/seam/plugins/org.jboss.tools.seam.ui/META-INF/MANIFEST.MF
trunk/seam/plugins/org.jboss.tools.seam.xml.ui/META-INF/MANIFEST.MF
trunk/seam/plugins/org.jboss.tools.seam.xml/META-INF/MANIFEST.MF
Log:
https://issues.jboss.org/browse/JBIDE-8877
Modified: trunk/seam/plugins/org.jboss.tools.seam.base.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.base.test/META-INF/MANIFEST.MF 2011-05-07 00:54:01 UTC (rev 31140)
+++ trunk/seam/plugins/org.jboss.tools.seam.base.test/META-INF/MANIFEST.MF 2011-05-07 00:55:10 UTC (rev 31141)
@@ -4,29 +4,29 @@
Bundle-SymbolicName: org.jboss.tools.seam.base.test
Bundle-Version: 1.0.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Require-Bundle: org.eclipse.core.resources,
- org.eclipse.core.runtime,
- org.eclipse.jst.common.project.facet.core,
- org.eclipse.wst.common.project.facet.core,
- org.eclipse.wst.common.modulecore,
- org.eclipse.wst.common.frameworks,
+Require-Bundle: org.eclipse.core.resources;bundle-version="3.7.100",
+ org.eclipse.core.runtime;bundle-version="3.7.0",
+ org.eclipse.jst.common.project.facet.core;bundle-version="1.4.200",
+ org.eclipse.wst.common.project.facet.core;bundle-version="1.4.200",
+ org.eclipse.wst.common.modulecore;bundle-version="1.2.100",
+ org.eclipse.wst.common.frameworks;bundle-version="1.2.0",
org.jboss.tools.seam.core,
org.jboss.tools.tests,
- org.junit,
+ org.junit;bundle-version="3.8.2",
org.jboss.tools.seam.ui,
- org.eclipse.ui,
+ org.eclipse.ui;bundle-version="3.7.0",
org.jboss.tools.common,
- org.eclipse.debug.core,
- org.eclipse.ui.ide,
+ org.eclipse.debug.core;bundle-version="3.7.0",
+ org.eclipse.ui.ide;bundle-version="3.7.0",
org.jboss.tools.common.ui,
org.jboss.tools.common.model,
- org.eclipse.jst.j2ee,
- org.eclipse.jst.j2ee.core,
- org.eclipse.jst.j2ee.ejb,
- org.eclipse.jst.j2ee.web,
- org.eclipse.jst.jee,
- org.eclipse.jst.jee.ejb,
- org.eclipse.jst.jee.ui,
- org.eclipse.jst.jee.web
+ org.eclipse.jst.j2ee;bundle-version="1.1.500",
+ org.eclipse.jst.j2ee.core;bundle-version="1.2.100",
+ org.eclipse.jst.j2ee.ejb;bundle-version="1.1.401",
+ org.eclipse.jst.j2ee.web;bundle-version="1.1.500",
+ org.eclipse.jst.jee;bundle-version="1.0.401",
+ org.eclipse.jst.jee.ejb;bundle-version="1.0.301",
+ org.eclipse.jst.jee.ui;bundle-version="1.0.400",
+ org.eclipse.jst.jee.web;bundle-version="1.0.301"
Export-Package: org.jboss.tools.seam.core.test.project.facet,
org.jboss.tools.seam.ui.test.wizard
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/META-INF/MANIFEST.MF
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/META-INF/MANIFEST.MF 2011-05-07 00:54:01 UTC (rev 31140)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/META-INF/MANIFEST.MF 2011-05-07 00:55:10 UTC (rev 31141)
@@ -6,38 +6,38 @@
Bundle-Vendor: %Bundle-Vendor.0
Bundle-SymbolicName: org.jboss.tools.seam.core; singleton:=true
Bundle-Localization: plugin
-Require-Bundle: org.eclipse.ui,
- org.eclipse.ui.ide,
- org.eclipse.jdt.ui,
- org.eclipse.jdt.launching,
+Require-Bundle: org.eclipse.ui;bundle-version="3.7.0",
+ org.eclipse.ui.ide;bundle-version="3.7.0",
+ org.eclipse.jdt.ui;bundle-version="3.7.0",
+ org.eclipse.jdt.launching;bundle-version="3.6.0",
org.jboss.tools.common.el.core,
org.jboss.tools.seam.xml,
org.jboss.tools.seam.pages.xml,
- org.eclipse.wst.common.frameworks.ui,
- org.eclipse.wst.common.project.facet.core,
- org.eclipse.jst.jsf.core,
- org.apache.ant,
- org.eclipse.wst.validation;visibility:=reexport,
- org.eclipse.jst.j2ee.web,
- org.eclipse.jst.j2ee,
- org.eclipse.jface.text,
- org.eclipse.wst.sse.core,
- org.eclipse.datatools.connectivity.ui.dse,
- org.eclipse.jst.common.project.facet.core,
+ org.eclipse.wst.common.frameworks.ui;bundle-version="1.2.0",
+ org.eclipse.wst.common.project.facet.core;bundle-version="1.4.200",
+ org.eclipse.jst.jsf.core;bundle-version="1.3.3",
+ org.apache.ant;bundle-version="1.7.1",
+ org.eclipse.wst.validation;visibility:=reexport;bundle-version="1.2.300",
+ org.eclipse.jst.j2ee.web;bundle-version="1.1.500",
+ org.eclipse.jst.j2ee;bundle-version="1.1.500",
+ org.eclipse.jface.text;bundle-version="3.7.0",
+ org.eclipse.wst.sse.core;bundle-version="1.1.600",
+ org.eclipse.datatools.connectivity.ui.dse;bundle-version="1.1.4",
+ org.eclipse.jst.common.project.facet.core;bundle-version="1.4.200",
org.jboss.ide.eclipse.as.core,
- org.eclipse.ltk.core.refactoring,
- org.eclipse.wst.server.core,
- org.eclipse.wst.sse.ui,
- org.eclipse.emf.ecore,
- org.eclipse.jst.jsf.ui,
- org.eclipse.jst.jsf.common,
- org.eclipse.jst.jsf.facesconfig,
- org.eclipse.jst.j2ee.core,
- org.eclipse.jst.common.frameworks,
+ org.eclipse.ltk.core.refactoring;bundle-version="3.5.200",
+ org.eclipse.wst.server.core;bundle-version="1.1.302",
+ org.eclipse.wst.sse.ui;bundle-version="1.3.0",
+ org.eclipse.emf.ecore;bundle-version="2.7.0",
+ org.eclipse.jst.jsf.ui;bundle-version="1.3.1",
+ org.eclipse.jst.jsf.common;bundle-version="1.2.2",
+ org.eclipse.jst.jsf.facesconfig;bundle-version="1.2.1",
+ org.eclipse.jst.j2ee.core;bundle-version="1.2.100",
+ org.eclipse.jst.common.frameworks;bundle-version="1.1.500",
org.jboss.tools.jst.web.kb;visibility:=reexport,
org.jboss.tools.jsf,
- org.eclipse.jem.util,
- org.eclipse.debug.core;bundle-version="3.4.0"
+ org.eclipse.jem.util;bundle-version="2.1.2",
+ org.eclipse.debug.core;bundle-version="3.7.0"
Bundle-Version: 3.3.0.qualifier
Export-Package:
org.jboss.tools.seam.core,
Modified: trunk/seam/plugins/org.jboss.tools.seam.pages.xml/META-INF/MANIFEST.MF
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.pages.xml/META-INF/MANIFEST.MF 2011-05-07 00:54:01 UTC (rev 31140)
+++ trunk/seam/plugins/org.jboss.tools.seam.pages.xml/META-INF/MANIFEST.MF 2011-05-07 00:55:10 UTC (rev 31141)
@@ -7,11 +7,11 @@
Bundle-SymbolicName: org.jboss.tools.seam.pages.xml;singleton:=true
Bundle-Localization: plugin
Require-Bundle: org.jboss.tools.jst.web;visibility:=reexport,
- org.eclipse.ui,
- org.eclipse.wst.common.modulecore,
- org.eclipse.ltk.core.refactoring,
- org.eclipse.jst.jsp.ui,
- org.eclipse.jface.text
+ org.eclipse.ui;bundle-version="3.7.0",
+ org.eclipse.wst.common.modulecore;bundle-version="1.2.100",
+ org.eclipse.ltk.core.refactoring;bundle-version="3.5.200",
+ org.eclipse.jst.jsp.ui;bundle-version="1.1.600",
+ org.eclipse.jface.text;bundle-version="3.7.0"
Bundle-Version: 3.1.0.qualifier
Export-Package: org.jboss.tools.seam.pages.xml,
org.jboss.tools.seam.pages.xml.model,
Modified: trunk/seam/plugins/org.jboss.tools.seam.text.ext/META-INF/MANIFEST.MF
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.text.ext/META-INF/MANIFEST.MF 2011-05-07 00:54:01 UTC (rev 31140)
+++ trunk/seam/plugins/org.jboss.tools.seam.text.ext/META-INF/MANIFEST.MF 2011-05-07 00:55:10 UTC (rev 31141)
@@ -6,18 +6,18 @@
Bundle-Vendor: %providerName
Bundle-SymbolicName: org.jboss.tools.seam.text.ext;singleton:=true
Bundle-Localization: plugin
-Require-Bundle: org.eclipse.ui.ide,
- org.eclipse.core.runtime,
- org.eclipse.ui,
- org.eclipse.text,
- org.eclipse.jface.text,
- org.eclipse.ui.workbench,
- org.eclipse.jdt.core,
- org.eclipse.wst.sse.core,
- org.eclipse.wst.xml.core,
- org.eclipse.jst.jsp.core,
- org.eclipse.jst.j2ee.web,
- org.eclipse.core.resources,
+Require-Bundle: org.eclipse.ui.ide;bundle-version="3.7.0",
+ org.eclipse.core.runtime;bundle-version="3.7.0",
+ org.eclipse.ui;bundle-version="3.7.0",
+ org.eclipse.text;bundle-version="3.5.100",
+ org.eclipse.jface.text;bundle-version="3.7.0",
+ org.eclipse.ui.workbench;bundle-version="3.7.0",
+ org.eclipse.jdt.core;bundle-version="3.7.0",
+ org.eclipse.wst.sse.core;bundle-version="1.1.600",
+ org.eclipse.wst.xml.core;bundle-version="1.1.600",
+ org.eclipse.jst.jsp.core;bundle-version="1.2.400",
+ org.eclipse.jst.j2ee.web;bundle-version="1.1.500",
+ org.eclipse.core.resources;bundle-version="3.7.100",
org.jboss.tools.common,
org.jboss.tools.common.model,
org.jboss.tools.common.el.core,
@@ -26,7 +26,7 @@
org.jboss.tools.jst.web,
org.jboss.tools.jsf,
org.jboss.tools.seam.core,
- org.eclipse.jdt.ui,
+ org.eclipse.jdt.ui;bundle-version="3.7.0",
org.jboss.tools.jsf.text.ext
Export-Package: org.jboss.tools.seam.text.ext,
org.jboss.tools.seam.text.ext.hyperlink
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/META-INF/MANIFEST.MF
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/META-INF/MANIFEST.MF 2011-05-07 00:54:01 UTC (rev 31140)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/META-INF/MANIFEST.MF 2011-05-07 00:55:10 UTC (rev 31141)
@@ -5,40 +5,40 @@
Bundle-Version: 3.3.0.qualifier
Bundle-Activator: org.jboss.tools.seam.ui.SeamGuiPlugin
Bundle-Localization: plugin
-Require-Bundle: org.eclipse.ui.ide,
- org.eclipse.ui.navigator,
- org.eclipse.ui.navigator.resources,
- org.eclipse.jst.servlet.ui,
- org.eclipse.wst.web.ui,
- org.eclipse.wst.common.project.facet.ui,
- org.eclipse.wst.common.frameworks.ui,
+Require-Bundle: org.eclipse.ui.ide;bundle-version="3.7.0",
+ org.eclipse.ui.navigator;bundle-version="3.5.0",
+ org.eclipse.ui.navigator.resources;bundle-version="3.4.300",
+ org.eclipse.jst.servlet.ui;bundle-version="1.1.500",
+ org.eclipse.wst.web.ui;bundle-version="1.1.400",
+ org.eclipse.wst.common.project.facet.ui;bundle-version="1.4.200",
+ org.eclipse.wst.common.frameworks.ui;bundle-version="1.2.0",
org.jboss.tools.seam.core,
org.jboss.tools.common.el.core,
org.hibernate.eclipse.console,
- org.eclipse.jdt.ui,
- org.eclipse.jface.text,
- org.eclipse.ui.workbench.texteditor,
+ org.eclipse.jdt.ui;bundle-version="3.7.0",
+ org.eclipse.jface.text;bundle-version="3.7.0",
+ org.eclipse.ui.workbench.texteditor;bundle-version="3.7.0",
org.hibernate.eclipse.console,
- org.eclipse.jst.j2ee,
- org.eclipse.jst.j2ee,
- org.eclipse.jst.j2ee.ui,
- org.eclipse.wst.xml.ui,
- org.apache.ant,
- org.eclipse.datatools.connectivity.ui.dse,
- org.eclipse.datatools.connectivity.db.generic.ui,
+ org.eclipse.jst.j2ee;bundle-version="1.1.500",
+ org.eclipse.jst.j2ee;bundle-version="1.1.500",
+ org.eclipse.jst.j2ee.ui;bundle-version="1.1.500",
+ org.eclipse.wst.xml.ui;bundle-version="1.1.200",
+ org.apache.ant;bundle-version="1.7.1",
+ org.eclipse.datatools.connectivity.ui.dse;bundle-version="1.1.4",
+ org.eclipse.datatools.connectivity.db.generic.ui;bundle-version="1.0.1",
org.jboss.tools.common.model.ui,
org.hibernate.eclipse,
- org.eclipse.wst.server.core,
- org.eclipse.wst.server.ui,
- org.eclipse.debug.ui,
- org.eclipse.search,
+ org.eclipse.wst.server.core;bundle-version="1.1.302",
+ org.eclipse.wst.server.ui;bundle-version="1.1.305",
+ org.eclipse.debug.ui;bundle-version="3.7.0",
+ org.eclipse.search;bundle-version="3.6.100",
org.jboss.tools.jst.jsp,
- org.eclipse.ltk.core.refactoring,
- org.eclipse.ltk.ui.refactoring,
+ org.eclipse.ltk.core.refactoring;bundle-version="3.5.200",
+ org.eclipse.ltk.ui.refactoring;bundle-version="3.5.100",
org.jboss.ide.eclipse.as.core,
org.jboss.tools.jsf,
org.jboss.tools.jst.web.ui,
- org.eclipse.jst.j2ee.web,
+ org.eclipse.jst.j2ee.web;bundle-version="1.1.500",
org.jboss.tools.common.ui,
org.jboss.tools.common.el.ui
Bundle-ActivationPolicy: lazy
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui.pages/META-INF/MANIFEST.MF
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui.pages/META-INF/MANIFEST.MF 2011-05-07 00:54:01 UTC (rev 31140)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui.pages/META-INF/MANIFEST.MF 2011-05-07 00:55:10 UTC (rev 31141)
@@ -20,20 +20,20 @@
org.jboss.tools.seam.ui.pages.editor.wizard
Bundle-SymbolicName: org.jboss.tools.seam.ui.pages;singleton=true
Bundle-Localization: plugin
-Require-Bundle: org.eclipse.ui,
- org.eclipse.gef,
- org.eclipse.ui.ide,
- org.eclipse.ui.workbench.texteditor,
- org.eclipse.ui.views,
+Require-Bundle: org.eclipse.ui;bundle-version="3.7.0",
+ org.eclipse.gef;bundle-version="3.7.0",
+ org.eclipse.ui.ide;bundle-version="3.7.0",
+ org.eclipse.ui.workbench.texteditor;bundle-version="3.7.0",
+ org.eclipse.ui.views;bundle-version="3.6.0",
org.jboss.tools.common.model.ui,
org.jboss.tools.common.gef,
org.jboss.tools.jst.web.ui,
org.jboss.tools.seam.pages.xml,
- org.eclipse.emf.ecore,
- org.eclipse.pde.ui,
+ org.eclipse.emf.ecore;bundle-version="2.7.0",
+ org.eclipse.pde.ui;bundle-version="3.6.100",
org.jboss.tools.common.gef,
- org.eclipse.jface.text,
- org.eclipse.core.expressions,
- org.eclipse.wst.xml.ui
+ org.eclipse.jface.text;bundle-version="3.7.0",
+ org.eclipse.core.expressions;bundle-version="3.4.200",
+ org.eclipse.wst.xml.ui;bundle-version="1.1.200"
Bundle-Version: 3.3.0.qualifier
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Modified: trunk/seam/plugins/org.jboss.tools.seam.xml/META-INF/MANIFEST.MF
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.xml/META-INF/MANIFEST.MF 2011-05-07 00:54:01 UTC (rev 31140)
+++ trunk/seam/plugins/org.jboss.tools.seam.xml/META-INF/MANIFEST.MF 2011-05-07 00:55:10 UTC (rev 31141)
@@ -12,21 +12,21 @@
org.jboss.tools.seam.xml.components.model.constraint,
org.jboss.tools.seam.xml.ds.model
Require-Bundle: org.jboss.tools.jst.web;visibility:=reexport,
- org.eclipse.ui.ide,
- org.eclipse.ui.views,
- org.eclipse.jface.text,
- org.eclipse.ui.workbench.texteditor,
- org.eclipse.ui.editors,
- org.eclipse.jdt.core,
- org.eclipse.jdt.ui,
- org.eclipse.ui,
- org.eclipse.jface,
- org.eclipse.wst.sse.core,
- org.eclipse.ltk.core.refactoring,
- org.eclipse.ltk.ui.refactoring,
- org.eclipse.wst.xml.core,
- org.eclipse.core.resources,
- org.eclipse.core.runtime,
- org.eclipse.wst.web
+ org.eclipse.ui.ide;bundle-version="3.7.0",
+ org.eclipse.ui.views;bundle-version="3.6.0",
+ org.eclipse.jface.text;bundle-version="3.7.0",
+ org.eclipse.ui.workbench.texteditor;bundle-version="3.7.0",
+ org.eclipse.ui.editors;bundle-version="3.7.0",
+ org.eclipse.jdt.core;bundle-version="3.7.0",
+ org.eclipse.jdt.ui;bundle-version="3.7.0",
+ org.eclipse.ui;bundle-version="3.7.0",
+ org.eclipse.jface;bundle-version="3.7.0",
+ org.eclipse.wst.sse.core;bundle-version="1.1.600",
+ org.eclipse.ltk.core.refactoring;bundle-version="3.5.200",
+ org.eclipse.ltk.ui.refactoring;bundle-version="3.5.100",
+ org.eclipse.wst.xml.core;bundle-version="1.1.600",
+ org.eclipse.core.resources;bundle-version="3.7.100",
+ org.eclipse.core.runtime;bundle-version="3.7.0",
+ org.eclipse.wst.web;bundle-version="1.1.500"
Bundle-Version: 3.2.0.qualifier
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Modified: trunk/seam/plugins/org.jboss.tools.seam.xml.ui/META-INF/MANIFEST.MF
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.xml.ui/META-INF/MANIFEST.MF 2011-05-07 00:54:01 UTC (rev 31140)
+++ trunk/seam/plugins/org.jboss.tools.seam.xml.ui/META-INF/MANIFEST.MF 2011-05-07 00:55:10 UTC (rev 31141)
@@ -10,24 +10,24 @@
org.jboss.tools.seam.xml.ui.wizard.newfile
Bundle-SymbolicName: org.jboss.tools.seam.xml.ui;singleton:=true
Bundle-Localization: plugin
-Require-Bundle: org.eclipse.jface.text,
- org.eclipse.jdt.ui,
- org.eclipse.wst.sse.ui,
- org.eclipse.wst.xml.core,
- org.eclipse.wst.xml.ui,
- org.eclipse.wst.common.frameworks.ui,
- org.eclipse.wst.common.ui,
- org.eclipse.compare,
- org.eclipse.core.resources,
- org.eclipse.core.runtime,
- org.eclipse.jface,
- org.eclipse.ui,
- org.eclipse.draw2d,
- org.eclipse.gef,
- org.eclipse.ui.ide,
- org.eclipse.ui.workbench.texteditor,
- org.eclipse.core.expressions,
- org.eclipse.ui.views,
+Require-Bundle: org.eclipse.jface.text;bundle-version="3.7.0",
+ org.eclipse.jdt.ui;bundle-version="3.7.0",
+ org.eclipse.wst.sse.ui;bundle-version="1.3.0",
+ org.eclipse.wst.xml.core;bundle-version="1.1.600",
+ org.eclipse.wst.xml.ui;bundle-version="1.1.200",
+ org.eclipse.wst.common.frameworks.ui;bundle-version="1.2.0",
+ org.eclipse.wst.common.ui;bundle-version="1.1.500",
+ org.eclipse.compare;bundle-version="3.5.200",
+ org.eclipse.core.resources;bundle-version="3.7.100",
+ org.eclipse.core.runtime;bundle-version="3.7.0",
+ org.eclipse.jface;bundle-version="3.7.0",
+ org.eclipse.ui;bundle-version="3.7.0",
+ org.eclipse.draw2d;bundle-version="3.7.0",
+ org.eclipse.gef;bundle-version="3.7.0",
+ org.eclipse.ui.ide;bundle-version="3.7.0",
+ org.eclipse.ui.workbench.texteditor;bundle-version="3.7.0",
+ org.eclipse.core.expressions;bundle-version="3.4.200",
+ org.eclipse.ui.views;bundle-version="3.6.0",
org.jboss.tools.common.model,
org.jboss.tools.common.model.ui,
org.jboss.tools.common.text.xml,
13 years, 5 months
- 1
- 0
JBoss Tools SVN: r31140 - in trunk/jsf/plugins: org.jboss.tools.jsf.text.ext/META-INF and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2011-05-06 20:54:01 -0400 (Fri, 06 May 2011)
New Revision: 31140
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/META-INF/MANIFEST.MF
trunk/jsf/plugins/org.jboss.tools.jsf.ui/META-INF/MANIFEST.MF
trunk/jsf/plugins/org.jboss.tools.jsf/META-INF/MANIFEST.MF
Log:
https://issues.jboss.org/browse/JBIDE-8880
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/META-INF/MANIFEST.MF
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/META-INF/MANIFEST.MF 2011-05-07 00:53:28 UTC (rev 31139)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/META-INF/MANIFEST.MF 2011-05-07 00:54:01 UTC (rev 31140)
@@ -45,24 +45,24 @@
org.jboss.tools.jst.web.kb;visibility:=reexport,
org.jboss.tools.common,
org.jboss.tools.common.el.core,
- org.eclipse.jface.text,
- org.eclipse.jdt.ui,
- org.eclipse.ui,
- org.eclipse.wst.sse.core,
- org.eclipse.ltk.core.refactoring,
- org.eclipse.wst.common.project.facet.core,
- org.eclipse.wst.common.frameworks,
- org.eclipse.wst.common.modulecore,
- org.eclipse.wst.validation,
- org.eclipse.jdt.core.manipulation,
- org.eclipse.jst.j2ee,
- org.eclipse.ui.ide,
- org.eclipse.wst.html.core;bundle-version="1.1.300",
- org.eclipse.wst.sse.ui;bundle-version="1.1.102",
- org.eclipse.ltk.ui.refactoring,
- org.eclipse.core.expressions;bundle-version="3.4.100",
+ org.eclipse.jface.text;bundle-version="3.7.0",
+ org.eclipse.jdt.ui;bundle-version="3.7.0",
+ org.eclipse.ui;bundle-version="3.7.0",
+ org.eclipse.wst.sse.core;bundle-version="1.1.600",
+ org.eclipse.ltk.core.refactoring;bundle-version="3.5.200",
+ org.eclipse.wst.common.project.facet.core;bundle-version="1.4.200",
+ org.eclipse.wst.common.frameworks;bundle-version="1.2.0",
+ org.eclipse.wst.common.modulecore;bundle-version="1.2.100",
+ org.eclipse.wst.validation;bundle-version="1.2.300",
+ org.eclipse.jdt.core.manipulation;bundle-version="1.3.0",
+ org.eclipse.jst.j2ee;bundle-version="1.1.500",
+ org.eclipse.ui.ide;bundle-version="3.7.0",
+ org.eclipse.wst.html.core;bundle-version="1.1.500",
+ org.eclipse.wst.sse.ui;bundle-version="1.3.0",
+ org.eclipse.ltk.ui.refactoring;bundle-version="3.5.100",
+ org.eclipse.core.expressions;bundle-version="3.4.200",
org.jboss.tools.common.text.ext;bundle-version="3.1.0",
- org.eclipse.jst.jsp.ui;visibility:=reexport,
+ org.eclipse.jst.jsp.ui;visibility:=reexport;bundle-version="1.1.600",
org.jboss.tools.jst.jsp;bundle-version="3.2.0"
Bundle-Version: 3.3.0.qualifier
Bundle-ActivationPolicy: lazy
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/META-INF/MANIFEST.MF
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/META-INF/MANIFEST.MF 2011-05-07 00:53:28 UTC (rev 31139)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/META-INF/MANIFEST.MF 2011-05-07 00:54:01 UTC (rev 31140)
@@ -6,14 +6,14 @@
Bundle-Vendor: %providerName
Bundle-SymbolicName: org.jboss.tools.jsf.text.ext; singleton:=true
Bundle-Localization: plugin
-Require-Bundle: org.eclipse.ui.ide,
- org.eclipse.ui,
- org.eclipse.jface.text,
+Require-Bundle: org.eclipse.ui.ide;bundle-version="3.7.0",
+ org.eclipse.ui;bundle-version="3.7.0",
+ org.eclipse.jface.text;bundle-version="3.7.0",
org.jboss.tools.common.text.ext,
org.jboss.tools.jst.text.ext,
org.jboss.tools.jsf,
org.jboss.tools.common.el.core,
- org.eclipse.jdt.ui;bundle-version="3.5.0",
+ org.eclipse.jdt.ui;bundle-version="3.7.0",
org.jboss.tools.jst.jsp;bundle-version="3.3.0",
org.jboss.tools.common.model.ui;bundle-version="3.3.0"
Export-Package: org.jboss.tools.jsf.text.ext,
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.ui/META-INF/MANIFEST.MF
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.ui/META-INF/MANIFEST.MF 2011-05-07 00:53:28 UTC (rev 31139)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.ui/META-INF/MANIFEST.MF 2011-05-07 00:54:01 UTC (rev 31140)
@@ -35,29 +35,29 @@
Require-Bundle: org.jboss.tools.common.model.ui,
org.jboss.tools.jst.web.ui,
org.jboss.tools.jst.jsp,
- org.eclipse.jface.text,
- org.eclipse.jdt.ui,
+ org.eclipse.jface.text;bundle-version="3.7.0",
+ org.eclipse.jdt.ui;bundle-version="3.7.0",
org.jboss.tools.jsf,
- org.eclipse.compare,
- org.eclipse.core.resources,
- org.eclipse.ui,
- org.eclipse.ui.views,
- org.eclipse.ui.ide,
- org.eclipse.gef,
- org.eclipse.ui.workbench.texteditor,
- org.eclipse.core.expressions,
- org.eclipse.ui.forms,
+ org.eclipse.compare;bundle-version="3.5.200",
+ org.eclipse.core.resources;bundle-version="3.7.100",
+ org.eclipse.ui;bundle-version="3.7.0",
+ org.eclipse.ui.views;bundle-version="3.6.0",
+ org.eclipse.ui.ide;bundle-version="3.7.0",
+ org.eclipse.gef;bundle-version="3.7.0",
+ org.eclipse.ui.workbench.texteditor;bundle-version="3.7.0",
+ org.eclipse.core.expressions;bundle-version="3.4.200",
+ org.eclipse.ui.forms;bundle-version="3.5.100",
org.jboss.tools.common.gef,
org.jboss.tools.common.ui,
- org.eclipse.ltk.ui.refactoring;bundle-version="3.4.100",
- org.eclipse.ltk.core.refactoring;bundle-version="3.5.0",
- org.eclipse.search;bundle-version="3.5.0",
+ org.eclipse.ltk.ui.refactoring;bundle-version="3.5.100",
+ org.eclipse.ltk.core.refactoring;bundle-version="3.5.200",
+ org.eclipse.search;bundle-version="3.6.100",
org.jboss.tools.common.el.core,
- org.eclipse.wst.html.ui;bundle-version="1.0.401",
- org.eclipse.pde.ui;bundle-version="[3.6.0,4.0.0)",
- org.eclipse.jst.jsf.core,
- org.eclipse.wst.common.project.facet.core,
- org.eclipse.wst.xml.ui;bundle-version="1.1.103"
+ org.eclipse.wst.html.ui;bundle-version="1.0.600",
+ org.eclipse.pde.ui;bundle-version="3.6.100",
+ org.eclipse.jst.jsf.core;bundle-version="1.3.3",
+ org.eclipse.wst.common.project.facet.core;bundle-version="1.4.200",
+ org.eclipse.wst.xml.ui;bundle-version="1.1.200"
Bundle-Version: 3.3.0.qualifier
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: J2SE-1.5
13 years, 5 months
- 1
- 0
JBoss Tools SVN: r31139 - trunk/jst/plugins/org.jboss.tools.jst.css/META-INF.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2011-05-06 20:53:28 -0400 (Fri, 06 May 2011)
New Revision: 31139
Modified:
trunk/jst/plugins/org.jboss.tools.jst.css/META-INF/MANIFEST.MF
Log:
https://issues.jboss.org/browse/JBIDE-8876
Modified: trunk/jst/plugins/org.jboss.tools.jst.css/META-INF/MANIFEST.MF
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.css/META-INF/MANIFEST.MF 2011-05-07 00:52:45 UTC (rev 31138)
+++ trunk/jst/plugins/org.jboss.tools.jst.css/META-INF/MANIFEST.MF 2011-05-07 00:53:28 UTC (rev 31139)
@@ -6,24 +6,24 @@
Bundle-Activator: org.jboss.tools.jst.css.CSSPlugin
Bundle-Vendor: %Bundle-Vendor
Bundle-Localization: plugin
-Require-Bundle: org.eclipse.core.runtime,
+Require-Bundle: org.eclipse.core.runtime;bundle-version="3.7.0",
org.jboss.tools.jst.jsp,
- org.eclipse.ui.views.properties.tabbed,
- org.eclipse.core.databinding,
- org.eclipse.wst.css.core,
- org.eclipse.jdt.ui,
- org.eclipse.debug.ui,
- org.eclipse.wst.sse.core,
- org.eclipse.jface.text,
- org.eclipse.wst.xml.core,
- org.eclipse.wst.sse.ui,
+ org.eclipse.ui.views.properties.tabbed;bundle-version="3.5.200",
+ org.eclipse.core.databinding;bundle-version="1.4.0",
+ org.eclipse.wst.css.core;bundle-version="1.1.500",
+ org.eclipse.jdt.ui;bundle-version="3.7.0",
+ org.eclipse.debug.ui;bundle-version="3.7.0",
+ org.eclipse.wst.sse.core;bundle-version="1.1.600",
+ org.eclipse.jface.text;bundle-version="3.7.0",
+ org.eclipse.wst.xml.core;bundle-version="1.1.600",
+ org.eclipse.wst.sse.ui;bundle-version="1.3.0",
org.jboss.tools.common;bundle-version="3.2.0",
org.jboss.tools.common.text.ext;bundle-version="3.2.0",
- org.eclipse.wst.css.ui,
+ org.eclipse.wst.css.ui;bundle-version="1.0.600",
org.jboss.tools.common.model.ui;bundle-version="3.2.0",
org.jboss.tools.jst.web.kb;bundle-version="3.2.0",
org.jboss.tools.common.el.core;bundle-version="3.2.0",
- org.eclipse.jface.databinding;bundle-version="1.4.0",
+ org.eclipse.jface.databinding;bundle-version="1.5.0",
org.eclipse.core.databinding.property;bundle-version="1.3.0",
org.jboss.tools.jst.web;bundle-version="3.2.0"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
13 years, 5 months
- 1
- 0
JBoss Tools SVN: r31138 - in trunk/jst/plugins: org.jboss.tools.jst.jsp/META-INF and 8 other directories.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2011-05-06 20:52:45 -0400 (Fri, 06 May 2011)
New Revision: 31138
Modified:
trunk/jst/plugins/org.jboss.tools.jst.firstrun/META-INF/MANIFEST.MF
trunk/jst/plugins/org.jboss.tools.jst.jsp.base.test/META-INF/MANIFEST.MF
trunk/jst/plugins/org.jboss.tools.jst.jsp/META-INF/MANIFEST.MF
trunk/jst/plugins/org.jboss.tools.jst.text.ext/META-INF/MANIFEST.MF
trunk/jst/plugins/org.jboss.tools.jst.web.kb/META-INF/MANIFEST.MF
trunk/jst/plugins/org.jboss.tools.jst.web.tiles.ui/META-INF/MANIFEST.MF
trunk/jst/plugins/org.jboss.tools.jst.web.tiles/META-INF/MANIFEST.MF
trunk/jst/plugins/org.jboss.tools.jst.web.ui/META-INF/MANIFEST.MF
trunk/jst/plugins/org.jboss.tools.jst.web.verification/META-INF/MANIFEST.MF
trunk/jst/plugins/org.jboss.tools.jst.web/META-INF/MANIFEST.MF
Log:
https://issues.jboss.org/browse/JBIDE-8876
Modified: trunk/jst/plugins/org.jboss.tools.jst.firstrun/META-INF/MANIFEST.MF
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.firstrun/META-INF/MANIFEST.MF 2011-05-07 00:48:00 UTC (rev 31137)
+++ trunk/jst/plugins/org.jboss.tools.jst.firstrun/META-INF/MANIFEST.MF 2011-05-07 00:52:45 UTC (rev 31138)
@@ -4,14 +4,14 @@
Bundle-SymbolicName: org.jboss.tools.jst.firstrun;singleton:=true
Bundle-Version: 3.2.0.qualifier
Bundle-Vendor: %Bundle-Vendor.0
-Require-Bundle: org.eclipse.ui.workbench,
- org.eclipse.wst.server.core,
- org.eclipse.core.runtime,
- org.eclipse.core.resources,
- org.eclipse.jdt.launching,
- org.eclipse.jface,
- org.eclipse.datatools.connectivity;visibility:=reexport,
- org.eclipse.datatools.connectivity.db.generic,
+Require-Bundle: org.eclipse.ui.workbench;bundle-version="3.7.0",
+ org.eclipse.wst.server.core;bundle-version="1.1.302",
+ org.eclipse.core.runtime;bundle-version="3.7.0",
+ org.eclipse.core.resources;bundle-version="3.7.100",
+ org.eclipse.jdt.launching;bundle-version="3.6.0",
+ org.eclipse.jface;bundle-version="3.7.0",
+ org.eclipse.datatools.connectivity;visibility:=reexport;bundle-version="1.2.2",
+ org.eclipse.datatools.connectivity.db.generic;bundle-version="1.0.1",
org.jboss.tools.common;bundle-version="2.0.0"
Bundle-Activator: org.jboss.tools.jst.firstrun.JstFirstRunPlugin
Bundle-ActivationPolicy: lazy
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/META-INF/MANIFEST.MF
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/META-INF/MANIFEST.MF 2011-05-07 00:48:00 UTC (rev 31137)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/META-INF/MANIFEST.MF 2011-05-07 00:52:45 UTC (rev 31138)
@@ -31,31 +31,31 @@
org.jboss.tools.common.model.ui,
org.jboss.tools.jst.web,
org.jboss.tools.jst.web.kb,
- org.eclipse.gef,
- org.eclipse.jface.text,
- org.eclipse.ui.workbench.texteditor,
- org.eclipse.ui.ide,
- org.eclipse.jdt.ui,
- org.eclipse.wst.common.ui,
- org.eclipse.wst.html.core,
- org.eclipse.wst.html.ui,
- org.eclipse.wst.xml.ui,
- org.eclipse.wst.css.core,
- org.eclipse.wst.css.ui,
- org.eclipse.jst.jsp.ui,
- org.eclipse.help.ui,
- org.eclipse.jem,
- org.eclipse.ui.views,
- org.eclipse.core.databinding,
- org.eclipse.jface.databinding,
- org.eclipse.core.databinding.property,
- org.eclipse.emf.ecore,
- org.eclipse.compare,
- org.eclipse.wst.dtd.core,
- org.eclipse.wst.validation,
- org.eclipse.ui,
- org.eclipse.jst.standard.schemas,
- org.eclipse.wst.standard.schemas
+ org.eclipse.gef;bundle-version="3.7.0",
+ org.eclipse.jface.text;bundle-version="3.7.0",
+ org.eclipse.ui.workbench.texteditor;bundle-version="3.7.0",
+ org.eclipse.ui.ide;bundle-version="3.7.0",
+ org.eclipse.jdt.ui;bundle-version="3.7.0",
+ org.eclipse.wst.common.ui;bundle-version="1.1.500",
+ org.eclipse.wst.html.core;bundle-version="1.1.500",
+ org.eclipse.wst.html.ui;bundle-version="1.0.600",
+ org.eclipse.wst.xml.ui;bundle-version="1.1.200",
+ org.eclipse.wst.css.core;bundle-version="1.1.500",
+ org.eclipse.wst.css.ui;bundle-version="1.0.600",
+ org.eclipse.jst.jsp.ui;bundle-version="1.1.600",
+ org.eclipse.help.ui;bundle-version="3.5.100",
+ org.eclipse.jem;bundle-version="2.0.400",
+ org.eclipse.ui.views;bundle-version="3.6.0",
+ org.eclipse.core.databinding;bundle-version="1.4.0",
+ org.eclipse.jface.databinding;bundle-version="1.5.0",
+ org.eclipse.core.databinding.property;bundle-version="1.3.0",
+ org.eclipse.emf.ecore;bundle-version="2.7.0",
+ org.eclipse.compare;bundle-version="3.5.200",
+ org.eclipse.wst.dtd.core;bundle-version="1.1.500",
+ org.eclipse.wst.validation;bundle-version="1.2.300",
+ org.eclipse.ui;bundle-version="3.7.0",
+ org.eclipse.jst.standard.schemas;bundle-version="1.2.0",
+ org.eclipse.wst.standard.schemas;bundle-version="1.0.300"
Bundle-Version: 3.3.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ClassPath: .
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp.base.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp.base.test/META-INF/MANIFEST.MF 2011-05-07 00:48:00 UTC (rev 31137)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp.base.test/META-INF/MANIFEST.MF 2011-05-07 00:52:45 UTC (rev 31138)
@@ -3,19 +3,19 @@
Bundle-Name: Base Classes for JSP Editor Related Tests
Bundle-SymbolicName: org.jboss.tools.jst.jsp.base.test
Bundle-Version: 1.1.0.qualifier
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.jface;bundle-version="3.6.0",
- org.eclipse.core.resources;bundle-version="3.6.0",
- org.eclipse.ui;bundle-version="3.6.0",
- org.eclipse.wst.sse.core;bundle-version="1.1.500",
- org.eclipse.wst.sse.ui;bundle-version="1.2.0",
+Require-Bundle: org.eclipse.core.runtime;bundle-version="3.7.0",
+ org.eclipse.jface;bundle-version="3.7.0",
+ org.eclipse.core.resources;bundle-version="3.7.100",
+ org.eclipse.ui;bundle-version="3.7.0",
+ org.eclipse.wst.sse.core;bundle-version="1.1.600",
+ org.eclipse.wst.sse.ui;bundle-version="1.3.0",
org.jboss.tools.common.text.ext;bundle-version="3.2.0",
org.jboss.tools.jst.jsp;bundle-version="3.2.0",
org.jboss.tools.tests;bundle-version="3.1.0",
- org.eclipse.jface.text;bundle-version="3.6.0",
- org.junit,
+ org.eclipse.jface.text;bundle-version="3.7.0",
+ org.junit;bundle-version="3.8.2",
org.jboss.tools.jst.web;bundle-version="3.2.0",
- org.eclipse.ui.ide;bundle-version="3.6.0",
+ org.eclipse.ui.ide;bundle-version="3.7.0",
org.jboss.tools.common.text.xml;bundle-version="3.2.0"
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Modified: trunk/jst/plugins/org.jboss.tools.jst.text.ext/META-INF/MANIFEST.MF
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.text.ext/META-INF/MANIFEST.MF 2011-05-07 00:48:00 UTC (rev 31137)
+++ trunk/jst/plugins/org.jboss.tools.jst.text.ext/META-INF/MANIFEST.MF 2011-05-07 00:52:45 UTC (rev 31138)
@@ -15,19 +15,19 @@
Require-Bundle: org.jboss.tools.common.model,
org.jboss.tools.common.text.ext,
org.jboss.tools.jst.web,
- org.eclipse.ui.ide,
- org.eclipse.ui,
- org.eclipse.jface.text,
- org.eclipse.ui.workbench.texteditor,
- org.eclipse.jdt.ui,
- org.eclipse.wst.sse.core;visibility:=reexport,
- org.eclipse.wst.sse.ui;visibility:=reexport,
- org.eclipse.jst.jsp.core;visibility:=reexport,
- org.eclipse.wst.common.modulecore;visibility:=reexport,
- org.eclipse.pde.ui,
+ org.eclipse.ui.ide;bundle-version="3.7.0",
+ org.eclipse.ui;bundle-version="3.7.0",
+ org.eclipse.jface.text;bundle-version="3.7.0",
+ org.eclipse.ui.workbench.texteditor;bundle-version="3.7.0",
+ org.eclipse.jdt.ui;bundle-version="3.7.0",
+ org.eclipse.wst.sse.core;visibility:=reexport;bundle-version="1.1.600",
+ org.eclipse.wst.sse.ui;visibility:=reexport;bundle-version="1.3.0",
+ org.eclipse.jst.jsp.core;visibility:=reexport;bundle-version="1.2.400",
+ org.eclipse.wst.common.modulecore;visibility:=reexport;bundle-version="1.2.100",
+ org.eclipse.pde.ui;bundle-version="3.6.100",
org.jboss.tools.common.el.core,
- org.eclipse.emf.ecore,
- org.eclipse.wst.css.core,
- org.eclipse.wst.html.core,
+ org.eclipse.emf.ecore;bundle-version="2.7.0",
+ org.eclipse.wst.css.core;bundle-version="1.1.500",
+ org.eclipse.wst.html.core;bundle-version="1.1.500",
org.jboss.tools.jst.web.kb
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Modified: trunk/jst/plugins/org.jboss.tools.jst.web/META-INF/MANIFEST.MF
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web/META-INF/MANIFEST.MF 2011-05-07 00:48:00 UTC (rev 31137)
+++ trunk/jst/plugins/org.jboss.tools.jst.web/META-INF/MANIFEST.MF 2011-05-07 00:52:45 UTC (rev 31138)
@@ -10,18 +10,18 @@
Bundle-Localization: plugin
Require-Bundle: org.jboss.tools.common.model;visibility:=reexport,
org.jboss.tools.common.projecttemplates;visibility:=reexport,
- org.eclipse.ui,
- org.eclipse.jdt.launching,
- org.eclipse.debug.ui,
- org.eclipse.jdt.debug,
- org.eclipse.wst.server.core,
- org.eclipse.jem.util,
- org.eclipse.wst.sse.core,
- org.eclipse.jst.j2ee,
- org.eclipse.ltk.core.refactoring,
- org.eclipse.jst.jsp.core,
- org.eclipse.jst.j2ee.core;bundle-version="1.1.300",
- org.eclipse.wst.common.project.facet.core;bundle-version="1.4.0"
+ org.eclipse.ui;bundle-version="3.7.0",
+ org.eclipse.jdt.launching;bundle-version="3.6.0",
+ org.eclipse.debug.ui;bundle-version="3.7.0",
+ org.eclipse.jdt.debug;bundle-version="3.7.0",
+ org.eclipse.wst.server.core;bundle-version="1.1.302",
+ org.eclipse.jem.util;bundle-version="2.1.2",
+ org.eclipse.wst.sse.core;bundle-version="1.1.600",
+ org.eclipse.jst.j2ee;bundle-version="1.1.500",
+ org.eclipse.ltk.core.refactoring;bundle-version="3.5.200",
+ org.eclipse.jst.jsp.core;bundle-version="1.2.400",
+ org.eclipse.jst.j2ee.core;bundle-version="1.2.100",
+ org.eclipse.wst.common.project.facet.core;bundle-version="1.4.200"
Bundle-Version: 3.3.0.qualifier
Export-Package:
org.jboss.tools.jst.web,
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/META-INF/MANIFEST.MF
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/META-INF/MANIFEST.MF 2011-05-07 00:48:00 UTC (rev 31137)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/META-INF/MANIFEST.MF 2011-05-07 00:52:45 UTC (rev 31138)
@@ -5,28 +5,28 @@
Bundle-Localization: plugin
Bundle-Version: 3.3.0.qualifier
Bundle-Activator: org.jboss.tools.jst.web.kb.WebKbPlugin
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
+Require-Bundle: org.eclipse.ui;bundle-version="3.7.0",
+ org.eclipse.core.runtime;bundle-version="3.7.0",
org.jboss.tools.jst.web,
org.jboss.tools.common.el.core,
- org.eclipse.jface.text,
- org.eclipse.wst.sse.core,
- org.eclipse.wst.sse.ui,
- org.eclipse.jst.jsp.core,
- org.eclipse.ui.ide,
- org.eclipse.wst.common.modulecore,
+ org.eclipse.jface.text;bundle-version="3.7.0",
+ org.eclipse.wst.sse.core;bundle-version="1.1.600",
+ org.eclipse.wst.sse.ui;bundle-version="1.3.0",
+ org.eclipse.jst.jsp.core;bundle-version="1.2.400",
+ org.eclipse.ui.ide;bundle-version="3.7.0",
+ org.eclipse.wst.common.modulecore;bundle-version="1.2.100",
org.jboss.tools.common.text.ext,
- org.eclipse.emf.ecore,
- org.eclipse.wst.xml.ui,
- org.eclipse.jdt.ui,
- org.eclipse.wst.validation,
- org.eclipse.ui.editors;visibility:=reexport,
- org.eclipse.ui.ide,
- org.eclipse.wst.css.core,
- org.eclipse.wst.html.core,
+ org.eclipse.emf.ecore;bundle-version="2.7.0",
+ org.eclipse.wst.xml.ui;bundle-version="1.1.200",
+ org.eclipse.jdt.ui;bundle-version="3.7.0",
+ org.eclipse.wst.validation;bundle-version="1.2.300",
+ org.eclipse.ui.editors;visibility:=reexport;bundle-version="3.7.0",
+ org.eclipse.ui.ide;bundle-version="3.7.0",
+ org.eclipse.wst.css.core;bundle-version="1.1.500",
+ org.eclipse.wst.html.core;bundle-version="1.1.500",
org.jboss.tools.common.el.ui,
- org.eclipse.wst.common.project.facet.core,
- org.eclipse.jst.j2ee
+ org.eclipse.wst.common.project.facet.core;bundle-version="1.4.200",
+ org.eclipse.jst.j2ee;bundle-version="1.1.500"
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-Vendor: %providerName
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.tiles/META-INF/MANIFEST.MF
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.tiles/META-INF/MANIFEST.MF 2011-05-07 00:48:00 UTC (rev 31137)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.tiles/META-INF/MANIFEST.MF 2011-05-07 00:52:45 UTC (rev 31138)
@@ -11,18 +11,18 @@
org.jboss.tools.jst.web.tiles.model.handlers,
org.jboss.tools.jst.web.tiles.model.helpers
Require-Bundle: org.jboss.tools.common,
- org.eclipse.jdt.core,
- org.eclipse.ui,
- org.eclipse.debug.core,
- org.eclipse.jdt.launching,
- org.eclipse.jdt.ui,
- org.eclipse.debug.ui,
+ org.eclipse.jdt.core;bundle-version="3.7.0",
+ org.eclipse.ui;bundle-version="3.7.0",
+ org.eclipse.debug.core;bundle-version="3.7.0",
+ org.eclipse.jdt.launching;bundle-version="3.6.0",
+ org.eclipse.jdt.ui;bundle-version="3.7.0",
+ org.eclipse.debug.ui;bundle-version="3.7.0",
org.jboss.tools.common.model,
org.jboss.tools.jst.web,
- org.eclipse.jdt.debug,
- org.eclipse.ltk.core.refactoring,
- org.eclipse.ltk.ui.refactoring,
- org.eclipse.core.resources,
- org.eclipse.core.runtime
+ org.eclipse.jdt.debug;bundle-version="3.7.0",
+ org.eclipse.ltk.core.refactoring;bundle-version="3.5.200",
+ org.eclipse.ltk.ui.refactoring;bundle-version="3.5.100",
+ org.eclipse.core.resources;bundle-version="3.7.100",
+ org.eclipse.core.runtime;bundle-version="3.7.0"
Bundle-Version: 3.1.0.qualifier
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.tiles.ui/META-INF/MANIFEST.MF
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.tiles.ui/META-INF/MANIFEST.MF 2011-05-07 00:48:00 UTC (rev 31137)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.tiles.ui/META-INF/MANIFEST.MF 2011-05-07 00:52:45 UTC (rev 31138)
@@ -25,27 +25,27 @@
org.jboss.tools.jst.web.tiles.ui.wizard.newfile
Require-Bundle: org.jboss.tools.common,
org.jboss.tools.common.gef,
- org.eclipse.ui.ide,
- org.eclipse.jface.text,
- org.eclipse.ui.workbench.texteditor,
- org.eclipse.ui.editors,
- org.eclipse.ui.views,
+ org.eclipse.ui.ide;bundle-version="3.7.0",
+ org.eclipse.jface.text;bundle-version="3.7.0",
+ org.eclipse.ui.workbench.texteditor;bundle-version="3.7.0",
+ org.eclipse.ui.editors;bundle-version="3.7.0",
+ org.eclipse.ui.views;bundle-version="3.6.0",
org.jboss.tools.common.model,
org.jboss.tools.common.model.ui,
org.jboss.tools.jst.web,
org.jboss.tools.jst.web.ui,
org.jboss.tools.jst.web.tiles,
- org.eclipse.jface,
- org.eclipse.ui,
- org.eclipse.jdt.core,
- org.eclipse.jdt.ui,
+ org.eclipse.jface;bundle-version="3.7.0",
+ org.eclipse.ui;bundle-version="3.7.0",
+ org.eclipse.jdt.core;bundle-version="3.7.0",
+ org.eclipse.jdt.ui;bundle-version="3.7.0",
org.jboss.tools.common.text.xml,
- org.eclipse.debug.core,
- org.eclipse.wst.xml.ui,
- org.eclipse.wst.sse.ui,
- org.eclipse.core.resources,
- org.eclipse.core.runtime,
- org.eclipse.gef,
- org.eclipse.core.expressions
+ org.eclipse.debug.core;bundle-version="3.7.0",
+ org.eclipse.wst.xml.ui;bundle-version="1.1.200",
+ org.eclipse.wst.sse.ui;bundle-version="1.3.0",
+ org.eclipse.core.resources;bundle-version="3.7.100",
+ org.eclipse.core.runtime;bundle-version="3.7.0",
+ org.eclipse.gef;bundle-version="3.7.0",
+ org.eclipse.core.expressions;bundle-version="3.4.200"
Bundle-Version: 3.3.0.qualifier
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.ui/META-INF/MANIFEST.MF
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.ui/META-INF/MANIFEST.MF 2011-05-07 00:48:00 UTC (rev 31137)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.ui/META-INF/MANIFEST.MF 2011-05-07 00:52:45 UTC (rev 31138)
@@ -23,30 +23,30 @@
org.jboss.tools.jst.web.ui.wizards.newfile,
org.jboss.tools.jst.web.ui.wizards.process,
org.jboss.tools.jst.web.ui.wizards.project
-Require-Bundle: org.eclipse.ui.ide,
+Require-Bundle: org.eclipse.ui.ide;bundle-version="3.7.0",
org.jboss.tools.common.model.ui,
org.jboss.tools.jst.web,
- org.eclipse.ui.navigator,
- org.eclipse.jdt.ui,
- org.eclipse.wst.common.frameworks;visibility:=reexport,
- org.eclipse.wst.server.core,
- org.eclipse.wst.server.ui,
- org.eclipse.jst.j2ee.web,
- org.eclipse.jst.j2ee,
- org.eclipse.jem.util,
- org.eclipse.wst.common.frameworks,
- org.eclipse.wst.common.project.facet.ui,
- org.eclipse.debug.ui,
+ org.eclipse.ui.navigator;bundle-version="3.5.0",
+ org.eclipse.jdt.ui;bundle-version="3.7.0",
+ org.eclipse.wst.common.frameworks;visibility:=reexport;bundle-version="1.2.0",
+ org.eclipse.wst.server.core;bundle-version="1.1.302",
+ org.eclipse.wst.server.ui;bundle-version="1.1.305",
+ org.eclipse.jst.j2ee.web;bundle-version="1.1.500",
+ org.eclipse.jst.j2ee;bundle-version="1.1.500",
+ org.eclipse.jem.util;bundle-version="2.1.2",
+ org.eclipse.wst.common.frameworks;bundle-version="1.2.0",
+ org.eclipse.wst.common.project.facet.ui;bundle-version="1.4.200",
+ org.eclipse.debug.ui;bundle-version="3.7.0",
org.jboss.tools.jst.jsp;bundle-version="2.0.0",
- org.eclipse.jface.text;bundle-version="3.5.0",
- org.eclipse.wst.common.emfworkbench.integration,
+ org.eclipse.jface.text;bundle-version="3.7.0",
+ org.eclipse.wst.common.emfworkbench.integration;bundle-version="1.2.100",
org.apache.velocity;bundle-version="1.5.0",
- org.eclipse.ui.workbench.texteditor,
- org.eclipse.wst.html.ui,
+ org.eclipse.ui.workbench.texteditor;bundle-version="3.7.0",
+ org.eclipse.wst.html.ui;bundle-version="1.0.600",
org.jboss.tools.common.el.core;bundle-version="3.2.0",
org.jboss.tools.common.ui,
org.jboss.tools.jst.web.kb,
- org.eclipse.ui.forms,
+ org.eclipse.ui.forms;bundle-version="3.5.100",
org.jboss.tools.common.el.ui
Bundle-Version: 3.3.0.qualifier
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.verification/META-INF/MANIFEST.MF
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.verification/META-INF/MANIFEST.MF 2011-05-07 00:48:00 UTC (rev 31137)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.verification/META-INF/MANIFEST.MF 2011-05-07 00:52:45 UTC (rev 31138)
@@ -7,9 +7,9 @@
Export-Package: org.jboss.tools.jst.web.verification.vrules
Bundle-Localization: plugin
Bundle-SymbolicName: org.jboss.tools.jst.web.verification;singleton:=true
-Require-Bundle: org.eclipse.core.runtime.compatibility,
- org.eclipse.core.resources,
- org.eclipse.jdt.core,
+Require-Bundle: org.eclipse.core.runtime.compatibility;bundle-version="3.2.100",
+ org.eclipse.core.resources;bundle-version="3.7.100",
+ org.eclipse.jdt.core;bundle-version="3.7.0",
org.jboss.tools.common.model,
org.jboss.tools.common.verification,
org.jboss.tools.jst.web
13 years, 5 months
- 1
- 0
JBoss Tools SVN: r31137 - in trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi: internal/core/impl and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-05-06 20:48:00 -0400 (Fri, 06 May 2011)
New Revision: 31137
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDIUtil.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIProject.java
Log:
JBIDE-8872
https://issues.jboss.org/browse/JBIDE-8872
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDIUtil.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDIUtil.java 2011-05-07 00:46:33 UTC (rev 31136)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDIUtil.java 2011-05-07 00:48:00 UTC (rev 31137)
@@ -205,7 +205,7 @@
Set<IInjectionPoint> injectionPoints = bean.getInjectionPoints();
for (IInjectionPoint iPoint : injectionPoints) {
if (element instanceof IField && iPoint instanceof IInjectionPointField) {
- if (((IInjectionPointField) iPoint).getField() != null && ((IInjectionPointField) iPoint).getField().equals(element))
+ if (((IInjectionPointField) iPoint).getField() != null && ((IInjectionPointField) iPoint).getField().getElementName().equals(element.getElementName()))
return iPoint;
} else if (element instanceof IMethod && iPoint instanceof IInjectionPointMethod && position == 0) {
if (((IInjectionPointMethod) iPoint).getMethod() != null && ((IInjectionPointMethod) iPoint).getMethod().equals(element))
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIProject.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIProject.java 2011-05-07 00:46:33 UTC (rev 31136)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIProject.java 2011-05-07 00:48:00 UTC (rev 31137)
@@ -376,7 +376,8 @@
if(isNew) {
//TODO improve
IType bType = b.getBeanClass();
- if(bType != null && bType.equals(type.getType())) {
+ if(bType != null && type.getType() != null
+ && bType.getFullyQualifiedName().equals(type.getType().getFullyQualifiedName())) {
result.add(b);
}
continue;
@@ -426,7 +427,7 @@
if(jType == null) return false;
for (IParametedType t: types) {
IType jType1 = t.getType();
- if(!jType.equals(jType1)) continue;
+ if(jType1 == null || !jType.getFullyQualifiedName().equals(jType1.getFullyQualifiedName())) continue;
if(!((ParametedType)t).getArrayPrefix().equals(((ParametedType)type).getArrayPrefix())) continue;
if(((ParametedType)t).isAssignableTo((ParametedType)type, false)) {
return true;
13 years, 5 months
- 1
- 0
JBoss Tools SVN: r31136 - in trunk/cdi/tests/org.jboss.tools.cdi.core.test: projects/CDITest1/lib and 5 other directories.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-05-06 20:46:33 -0400 (Fri, 06 May 2011)
New Revision: 31136
Added:
trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest1/lib/example.jar
trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest1/src/cdi/test/MyExampleFactory.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest2/lib/example.jar
trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest2/src/test/MyExampleInjection.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/DependentProjectsTestSetup.java
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest1/.classpath
trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest2/.classpath
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/CDICoreAllTests.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/DependentProjectTest.java
Log:
JBIDE-8872
https://issues.jboss.org/browse/JBIDE-8872
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest1/.classpath
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest1/.classpath 2011-05-06 23:10:27 UTC (rev 31135)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest1/.classpath 2011-05-07 00:46:33 UTC (rev 31136)
@@ -9,5 +9,6 @@
<classpathentry kind="lib" path="lib/weld-se.jar"/>
<classpathentry kind="lib" path="lib/weld-servlet.jar"/>
<classpathentry kind="lib" path="lib/some-weld.jar"/>
+ <classpathentry kind="lib" path="lib/example.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest1/lib/example.jar
===================================================================
(Binary files differ)
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest1/lib/example.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest1/src/cdi/test/MyExampleFactory.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest1/src/cdi/test/MyExampleFactory.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest1/src/cdi/test/MyExampleFactory.java 2011-05-07 00:46:33 UTC (rev 31136)
@@ -0,0 +1,13 @@
+package cdi.test;
+
+import javax.enterprise.inject.Produces;
+
+import org.jboss.cdi.test.example.Example;
+
+public class MyExampleFactory {
+
+ @Produces
+ public Example createExample() {
+ return new Example();
+ }
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest1/src/cdi/test/MyExampleFactory.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest2/.classpath
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest2/.classpath 2011-05-06 23:10:27 UTC (rev 31135)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest2/.classpath 2011-05-07 00:46:33 UTC (rev 31136)
@@ -4,6 +4,7 @@
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry exported="true" kind="lib" path="lib/cdi-api.jar"/>
<classpathentry exported="true" kind="lib" path="lib/javax.inject.jar"/>
+ <classpathentry kind="lib" path="lib/example.jar"/>
<classpathentry combineaccessrules="false" exported="true" kind="src" path="/CDITest1"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest2/lib/example.jar
===================================================================
(Binary files differ)
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest2/lib/example.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest2/src/test/MyExampleInjection.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest2/src/test/MyExampleInjection.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest2/src/test/MyExampleInjection.java 2011-05-07 00:46:33 UTC (rev 31136)
@@ -0,0 +1,11 @@
+package test;
+
+import javax.inject.Inject;
+
+import org.jboss.cdi.test.example.Example;
+
+public class MyExampleInjection {
+
+ @Inject
+ Example example1;
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest2/src/test/MyExampleInjection.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/CDICoreAllTests.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/CDICoreAllTests.java 2011-05-06 23:10:27 UTC (rev 31135)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/CDICoreAllTests.java 2011-05-07 00:46:33 UTC (rev 31136)
@@ -99,7 +99,10 @@
suiteAll.addTestSuite(ExtensionFactoryTest.class);
suiteAll.addTestSuite(WeldJarTest.class);
suiteAll.addTestSuite(BeansXMLTest.class);
- suiteAll.addTestSuite(DependentProjectTest.class);
+ TestSuite dependentSuite = new TestSuite("Dependent Projects Tests");
+ dependentSuite.addTestSuite(DependentProjectTest.class);
+ DependentProjectsTestSetup dependent = new DependentProjectsTestSetup(dependentSuite);
+ suiteAll.addTest(dependent);
suiteAll.addTestSuite(EnableCDISupportForWarTest.class);
suiteAll.addTestSuite(EnableCDISupportForJarTest.class);
suiteAll.addTestSuite(DependentProjectValidationTest.class);
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/DependentProjectTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/DependentProjectTest.java 2011-05-06 23:10:27 UTC (rev 31135)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/DependentProjectTest.java 2011-05-07 00:46:33 UTC (rev 31136)
@@ -10,9 +10,11 @@
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IResource;
import org.eclipse.core.resources.IncrementalProjectBuilder;
+import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.core.runtime.Path;
+import org.eclipse.jdt.core.IType;
import org.jboss.tools.cdi.core.CDIConstants;
import org.jboss.tools.cdi.core.CDICoreNature;
import org.jboss.tools.cdi.core.CDICorePlugin;
@@ -20,12 +22,15 @@
import org.jboss.tools.cdi.core.IBean;
import org.jboss.tools.cdi.core.ICDIProject;
import org.jboss.tools.cdi.core.IClassBean;
+import org.jboss.tools.cdi.core.IInjectionPoint;
+import org.jboss.tools.cdi.core.IInjectionPointField;
import org.jboss.tools.cdi.core.IProducer;
+import org.jboss.tools.cdi.core.IProducerMethod;
import org.jboss.tools.cdi.core.IQualifier;
import org.jboss.tools.cdi.core.IScope;
+import org.jboss.tools.cdi.internal.core.impl.ProducerMethod;
import org.jboss.tools.jst.web.kb.IKbProject;
import org.jboss.tools.jst.web.kb.KbProjectFactory;
-import org.jboss.tools.jst.web.kb.WebKbPlugin;
import org.jboss.tools.jst.web.kb.internal.KbProject;
import org.jboss.tools.test.util.JobUtils;
import org.jboss.tools.test.util.ResourcesUtils;
@@ -41,20 +46,46 @@
IProject project2 = null;
IProject project3 = null;
- public DependentProjectTest() {}
+ public DependentProjectTest() {
+ project1 = getTestProject(project1, "/projects/CDITest1", "CDITest1");
+ project2 = getTestProject(project2, "/projects/CDITest2", "CDITest2");
+ project3 = getTestProject(project3, "/projects/CDITest3", "CDITest3");
+ }
+
+ public static IProject getTestProject(IProject project, String projectPath, String projectName) {
+ if(project==null) {
+ try {
+ project = findTestProject(projectName);
+ if(project==null || !project.exists()) {
+ project = ResourcesUtils.importProject(PLUGIN_ID, projectPath);
+ project.refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor());
+ JobUtils.waitForIdle();
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ fail("Can't import CDI test project: " + e.getMessage());
+ }
+ }
+ return project;
+ }
- public void setUp() throws Exception {
- project1 = ResourcesUtils.importProject(PLUGIN_ID, "/projects/CDITest1");
- project1.refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor());
- JobUtils.waitForIdle();
+ public static IProject findTestProject(String projectName) {
+ return ResourcesPlugin.getWorkspace().getRoot().getProject(projectName);
+ }
- project2 = ResourcesUtils.importProject(PLUGIN_ID, "/projects/CDITest2");
- project2.refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor());
- JobUtils.waitForIdle();
-
- project3 = ResourcesUtils.importProject(PLUGIN_ID, "/projects/CDITest3");
- project3.refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor());
- JobUtils.waitForIdle();
+ public void testProjectDependencyLoading() throws CoreException, IOException {
+ IKbProject kb2 = KbProjectFactory.getKbProject(project2, true);
+ ((KbProject)kb2).store();
+ CDICoreNature cdi2 = CDICorePlugin.getCDI(project2, true);
+ Set<CDICoreNature> dependsOn = cdi2.getCDIProjects();
+ Set<CDICoreNature> usedBy = cdi2.getDependentProjects();
+ assertEquals(1, dependsOn.size());
+ assertEquals(1, usedBy.size());
+ cdi2.reloadProjectDependencies();
+ dependsOn = cdi2.getCDIProjects();
+ usedBy = cdi2.getDependentProjects();
+ assertEquals(1, dependsOn.size());
+ assertEquals(1, usedBy.size());
}
public void testDependentProject() throws CoreException, IOException {
@@ -80,22 +111,6 @@
}
}
- public void testCleanDependentProject() throws CoreException, IOException {
- ICDIProject cdi2 = CDICorePlugin.getCDIProject(project2, true);
- boolean saveAutoBuild = ResourcesUtils.setBuildAutomatically(false);
- JobUtils.waitForIdle();
-
- cdi2.getNature().getProject().build(IncrementalProjectBuilder.CLEAN_BUILD, new NullProgressMonitor());
- JobUtils.waitForIdle();
- assertBeanIsPresent(cdi2, "cdi.test.MyBean", true);
-
- ResourcesUtils.setBuildAutomatically(true);
- JobUtils.waitForIdle();
- assertBeanIsPresent(cdi2, "cdi.test.MyBean", true);
-
- ResourcesUtils.setBuildAutomatically(saveAutoBuild);
- }
-
public void testScopeFromParentProject() throws CoreException, IOException {
IProducer producer = getProducer("/CDITest2/src/test/Test1.java");
@@ -146,28 +161,40 @@
assertNotNull(q);
}
- public void testProjectDependencyLoading() throws CoreException, IOException {
- IKbProject kb2 = KbProjectFactory.getKbProject(project2, true);
- ((KbProject)kb2).store();
- CDICoreNature cdi2 = CDICorePlugin.getCDI(project2, true);
- Set<CDICoreNature> dependsOn = cdi2.getCDIProjects();
- Set<CDICoreNature> usedBy = cdi2.getDependentProjects();
- assertEquals(1, dependsOn.size());
- assertEquals(1, usedBy.size());
- cdi2.reloadProjectDependencies();
- dependsOn = cdi2.getCDIProjects();
- usedBy = cdi2.getDependentProjects();
- assertEquals(1, dependsOn.size());
- assertEquals(1, usedBy.size());
+ public void testInjectionOfTypeRepeatedInJarCopies() throws CoreException {
+ ICDIProject cdi2 = CDICorePlugin.getCDIProject(project2, true);
+ Set<IBean> bs = cdi2.getBeans(new Path("/CDITest2/src/test/MyExampleInjection.java"));
+ assertEquals(1, bs.size());
+ IBean b = bs.iterator().next();
+ Set<IInjectionPoint> ps = b.getInjectionPoints();
+ assertEquals(1, ps.size());
+ IInjectionPoint p = ps.iterator().next();
+ Set<IBean> injected = cdi2.getBeans(false, p);
+ assertEquals(1, injected.size());
+ IBean i = injected.iterator().next();
+ assertTrue(i instanceof IProducerMethod);
+ IProducerMethod f = (IProducerMethod)i;
+ IType producerType = ((ProducerMethod)f).getType().getType();
+ IType injectionType = ((IInjectionPointField)p).getMemberType().getType();
+ assertEquals("org.jboss.cdi.test.example.Example", producerType.getFullyQualifiedName());
+ assertEquals("org.jboss.cdi.test.example.Example", injectionType.getFullyQualifiedName());
+ assertFalse(producerType.equals(injectionType));
}
- public void tearDown() throws Exception {
+ public void testCleanDependentProject() throws CoreException, IOException {
+ ICDIProject cdi2 = CDICorePlugin.getCDIProject(project2, true);
boolean saveAutoBuild = ResourcesUtils.setBuildAutomatically(false);
JobUtils.waitForIdle();
- project1.delete(true, true, null);
- project2.delete(true, true, null);
- project3.delete(true, true, null);
+
+ cdi2.getNature().getProject().build(IncrementalProjectBuilder.CLEAN_BUILD, new NullProgressMonitor());
JobUtils.waitForIdle();
+ assertBeanIsPresent(cdi2, "cdi.test.MyBean", true);
+
+ ResourcesUtils.setBuildAutomatically(true);
+ JobUtils.waitForIdle();
+ assertBeanIsPresent(cdi2, "cdi.test.MyBean", true);
+
ResourcesUtils.setBuildAutomatically(saveAutoBuild);
}
-}
\ No newline at end of file
+
+}
Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/DependentProjectsTestSetup.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/DependentProjectsTestSetup.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/DependentProjectsTestSetup.java 2011-05-07 00:46:33 UTC (rev 31136)
@@ -0,0 +1,53 @@
+/*******************************************************************************
+ * 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.core.test;
+
+import junit.extensions.TestSetup;
+import junit.framework.Test;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.jboss.tools.test.util.JobUtils;
+import org.jboss.tools.test.util.ResourcesUtils;
+
+/**
+ * @author Viacheslav Kabanovich
+ */
+public class DependentProjectsTestSetup extends TestSetup {
+ protected static String PLUGIN_ID = "org.jboss.tools.cdi.core.test";
+ IProject project1 = null;
+ IProject project2 = null;
+ IProject project3 = null;
+
+ public DependentProjectsTestSetup(Test test) {
+ super(test);
+ }
+
+ @Override
+ protected void setUp() throws Exception {
+ project1 = DependentProjectTest.getTestProject(project1, "/projects/CDITest1", "CDITest1");
+ project2 = DependentProjectTest.getTestProject(project2, "/projects/CDITest2", "CDITest2");
+ project3 = DependentProjectTest.getTestProject(project3, "/projects/CDITest3", "CDITest3");
+ }
+
+ @Override
+ public void tearDown() throws Exception {
+ boolean saveAutoBuild = ResourcesUtils.setBuildAutomatically(false);
+ JobUtils.waitForIdle();
+ project1.delete(true, true, null);
+ project2.delete(true, true, null);
+ project3.delete(true, true, null);
+ JobUtils.waitForIdle();
+ ResourcesUtils.setBuildAutomatically(saveAutoBuild);
+ }
+
+}
\ 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/DependentProjectsTestSetup.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
13 years, 5 months
- 1
- 0
JBoss Tools SVN: r31135 - in trunk/cdi/plugins: org.jboss.tools.cdi.seam.config.core/META-INF and 8 other directories.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2011-05-06 19:10:27 -0400 (Fri, 06 May 2011)
New Revision: 31135
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.core/META-INF/MANIFEST.MF
trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/META-INF/MANIFEST.MF
trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.ui/META-INF/MANIFEST.MF
trunk/cdi/plugins/org.jboss.tools.cdi.seam.faces.core/META-INF/MANIFEST.MF
trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/META-INF/MANIFEST.MF
trunk/cdi/plugins/org.jboss.tools.cdi.seam.text.ext/META-INF/MANIFEST.MF
trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/META-INF/MANIFEST.MF
trunk/cdi/plugins/org.jboss.tools.cdi.ui/META-INF/MANIFEST.MF
trunk/cdi/plugins/org.jboss.tools.cdi.xml.ui/META-INF/MANIFEST.MF
trunk/cdi/plugins/org.jboss.tools.cdi.xml/META-INF/MANIFEST.MF
Log:
https://issues.jboss.org/browse/JBIDE-8878
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/META-INF/MANIFEST.MF
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/META-INF/MANIFEST.MF 2011-05-06 23:09:07 UTC (rev 31134)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/META-INF/MANIFEST.MF 2011-05-06 23:10:27 UTC (rev 31135)
@@ -5,25 +5,25 @@
Bundle-Version: 1.2.0.qualifier
Bundle-Activator: org.jboss.tools.cdi.core.CDICorePlugin
Bundle-Localization: plugin
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
+Require-Bundle: org.eclipse.ui;bundle-version="3.7.0",
+ org.eclipse.core.runtime;bundle-version="3.7.0",
org.jboss.tools.common,
- org.eclipse.jdt.core,
- org.eclipse.core.resources,
+ org.eclipse.jdt.core;bundle-version="3.7.0",
+ org.eclipse.core.resources;bundle-version="3.7.100",
org.jboss.tools.common.model,
- org.eclipse.wst.common.project.facet.core,
- org.eclipse.wst.common.modulecore,
- org.eclipse.wst.common.frameworks,
- org.eclipse.wst.validation,
- org.eclipse.jst.j2ee,
+ org.eclipse.wst.common.project.facet.core;bundle-version="1.4.200",
+ org.eclipse.wst.common.modulecore;bundle-version="1.2.100",
+ org.eclipse.wst.common.frameworks;bundle-version="1.2.0",
+ org.eclipse.wst.validation;bundle-version="1.2.300",
+ org.eclipse.jst.j2ee;bundle-version="1.1.500",
org.jboss.tools.jst.web.kb,
org.jboss.tools.common.el.core,
- org.eclipse.ltk.core.refactoring,
- org.eclipse.jface.text,
- org.eclipse.equinox.preferences,
- org.eclipse.wst.sse.core,
- org.eclipse.jdt.ui,
- org.apache.ant
+ org.eclipse.ltk.core.refactoring;bundle-version="3.5.200",
+ org.eclipse.jface.text;bundle-version="3.7.0",
+ org.eclipse.equinox.preferences;bundle-version="3.4.0",
+ org.eclipse.wst.sse.core;bundle-version="1.1.600",
+ org.eclipse.jdt.ui;bundle-version="3.7.0",
+ org.apache.ant;bundle-version="1.7.1"
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-Vendor: JBoss by Red Hat
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/META-INF/MANIFEST.MF
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/META-INF/MANIFEST.MF 2011-05-06 23:09:07 UTC (rev 31134)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/META-INF/MANIFEST.MF 2011-05-06 23:10:27 UTC (rev 31135)
@@ -5,26 +5,26 @@
Bundle-Version: 1.0.0.qualifier
Bundle-Activator: org.jboss.tools.cdi.seam.config.core.CDISeamConfigCorePlugin
Bundle-Localization: plugin
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
+Require-Bundle: org.eclipse.ui;bundle-version="3.7.0",
+ org.eclipse.core.runtime;bundle-version="3.7.0",
org.jboss.tools.common,
org.jboss.tools.cdi.core,
- org.eclipse.jdt.core,
- org.eclipse.core.resources,
+ org.eclipse.jdt.core;bundle-version="3.7.0",
+ org.eclipse.core.resources;bundle-version="3.7.100",
org.jboss.tools.common.model,
- org.eclipse.wst.common.project.facet.core,
- org.eclipse.wst.common.modulecore,
- org.eclipse.wst.common.frameworks,
- org.eclipse.wst.validation,
- org.eclipse.jst.j2ee,
+ org.eclipse.wst.common.project.facet.core;bundle-version="1.4.200",
+ org.eclipse.wst.common.modulecore;bundle-version="1.2.100",
+ org.eclipse.wst.common.frameworks;bundle-version="1.2.0",
+ org.eclipse.wst.validation;bundle-version="1.2.300",
+ org.eclipse.jst.j2ee;bundle-version="1.1.500",
org.jboss.tools.jst.web.kb,
org.jboss.tools.common.el.core,
- org.eclipse.ltk.core.refactoring,
- org.eclipse.jface.text,
- org.eclipse.equinox.preferences,
- org.eclipse.wst.sse.core,
- org.eclipse.jdt.ui,
- org.apache.ant
+ org.eclipse.ltk.core.refactoring;bundle-version="3.5.200",
+ org.eclipse.jface.text;bundle-version="3.7.0",
+ org.eclipse.equinox.preferences;bundle-version="3.4.0",
+ org.eclipse.wst.sse.core;bundle-version="1.1.600",
+ org.eclipse.jdt.ui;bundle-version="3.7.0",
+ org.apache.ant;bundle-version="1.7.1"
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-Vendor: JBoss by Red Hat
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-05-06 23:09:07 UTC (rev 31134)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.ui/META-INF/MANIFEST.MF 2011-05-06 23:10:27 UTC (rev 31135)
@@ -8,15 +8,15 @@
Bundle-Localization: plugin
Export-Package: org.jboss.tools.cdi.seam.config.ui,
org.jboss.tools.cdi.seam.config.ui.contentassist
-Require-Bundle: org.eclipse.ui;bundle-version="3.5.0",
- org.jboss.tools.common.text.ext;bundle-version="2.0.0",
- org.eclipse.jface.text;bundle-version="3.5.0",
- org.eclipse.jdt.ui;bundle-version="3.5.0",
- org.eclipse.wst.xml.ui,
- org.jboss.tools.cdi.ui;bundle-version="1.2.0",
+Require-Bundle: org.eclipse.ui;bundle-version="3.7.0",
+ org.jboss.tools.common.text.ext,
+ org.eclipse.jface.text;bundle-version="3.7.0",
+ org.eclipse.jdt.ui;bundle-version="3.7.0",
+ org.eclipse.wst.xml.ui;bundle-version="1.1.200",
+ org.jboss.tools.cdi.ui,
org.jboss.tools.cdi.core,
org.jboss.tools.cdi.seam.config.core,
org.jboss.tools.jst.web.kb,
- org.jboss.tools.jst.web;bundle-version="3.2.0"
+ org.jboss.tools.jst.web
Bundle-Version: 1.0.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.faces.core/META-INF/MANIFEST.MF
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.faces.core/META-INF/MANIFEST.MF 2011-05-06 23:09:07 UTC (rev 31134)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.faces.core/META-INF/MANIFEST.MF 2011-05-06 23:10:27 UTC (rev 31135)
@@ -5,8 +5,8 @@
Bundle-Version: 1.0.0.qualifier
Bundle-Activator: org.jboss.tools.cdi.seam.faces.core.SeamFacesCorePlugin
Bundle-Localization: plugin
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
+Require-Bundle: org.eclipse.ui;bundle-version="3.7.0",
+ org.eclipse.core.runtime;bundle-version="3.7.0",
org.jboss.tools.common,
org.jboss.tools.jst.web.kb
Bundle-ActivationPolicy: lazy
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/META-INF/MANIFEST.MF
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/META-INF/MANIFEST.MF 2011-05-06 23:09:07 UTC (rev 31134)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/META-INF/MANIFEST.MF 2011-05-06 23:10:27 UTC (rev 31135)
@@ -5,26 +5,26 @@
Bundle-Version: 1.0.0.qualifier
Bundle-Activator: org.jboss.tools.cdi.seam.solder.core.CDISeamSolderCorePlugin
Bundle-Localization: plugin
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
+Require-Bundle: org.eclipse.ui;bundle-version="3.7.0",
+ org.eclipse.core.runtime;bundle-version="3.7.0",
org.jboss.tools.common,
org.jboss.tools.cdi.core,
- org.eclipse.jdt.core,
- org.eclipse.core.resources,
+ org.eclipse.jdt.core;bundle-version="3.7.0",
+ org.eclipse.core.resources;bundle-version="3.7.100",
org.jboss.tools.common.model,
- org.eclipse.wst.common.project.facet.core,
- org.eclipse.wst.common.modulecore,
- org.eclipse.wst.common.frameworks,
- org.eclipse.wst.validation,
- org.eclipse.jst.j2ee,
+ org.eclipse.wst.common.project.facet.core;bundle-version="1.4.200",
+ org.eclipse.wst.common.modulecore;bundle-version="1.2.100",
+ org.eclipse.wst.common.frameworks;bundle-version="1.2.0",
+ org.eclipse.wst.validation;bundle-version="1.2.300",
+ org.eclipse.jst.j2ee;bundle-version="1.1.500",
org.jboss.tools.jst.web.kb,
org.jboss.tools.common.el.core,
- org.eclipse.ltk.core.refactoring,
- org.eclipse.jface.text,
- org.eclipse.equinox.preferences,
- org.eclipse.wst.sse.core,
- org.eclipse.jdt.ui,
- org.apache.ant
+ org.eclipse.ltk.core.refactoring;bundle-version="3.5.200",
+ org.eclipse.jface.text;bundle-version="3.7.0",
+ org.eclipse.equinox.preferences;bundle-version="3.4.0",
+ org.eclipse.wst.sse.core;bundle-version="1.1.600",
+ org.eclipse.jdt.ui;bundle-version="3.7.0",
+ org.apache.ant;bundle-version="1.7.1"
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-Vendor: JBoss by Red Hat
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.text.ext/META-INF/MANIFEST.MF
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.text.ext/META-INF/MANIFEST.MF 2011-05-06 23:09:07 UTC (rev 31134)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.text.ext/META-INF/MANIFEST.MF 2011-05-06 23:10:27 UTC (rev 31135)
@@ -8,10 +8,10 @@
Bundle-Localization: plugin
Export-Package: org.jboss.tools.cdi.seam.text.ext,
org.jboss.tools.cdi.seam.text.ext.hyperlink
-Require-Bundle: org.eclipse.ui;bundle-version="3.5.0",
+Require-Bundle: org.eclipse.ui;bundle-version="3.7.0",
org.jboss.tools.common.text.ext;bundle-version="2.0.0",
- org.eclipse.jface.text;bundle-version="3.5.0",
- org.eclipse.jdt.ui;bundle-version="3.5.0",
+ org.eclipse.jface.text;bundle-version="3.7.0",
+ org.eclipse.jdt.ui;bundle-version="3.7.0",
org.jboss.tools.cdi.ui;bundle-version="1.2.0",
org.jboss.tools.cdi.core,
org.jboss.tools.cdi.seam.config.core,
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/META-INF/MANIFEST.MF
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/META-INF/MANIFEST.MF 2011-05-06 23:09:07 UTC (rev 31134)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/META-INF/MANIFEST.MF 2011-05-06 23:10:27 UTC (rev 31135)
@@ -8,14 +8,14 @@
Bundle-Localization: plugin
Export-Package: org.jboss.tools.cdi.text.ext,
org.jboss.tools.cdi.text.ext.hyperlink
-Require-Bundle: org.eclipse.ui;bundle-version="3.5.0",
- org.eclipse.core.runtime;bundle-version="3.5.0",
+Require-Bundle: org.eclipse.ui;bundle-version="3.7.0",
+ org.eclipse.core.runtime;bundle-version="3.7.0",
org.jboss.tools.common.text.ext;bundle-version="2.0.0",
- org.eclipse.core.resources;bundle-version="3.5.0",
- org.eclipse.jface.text;bundle-version="3.5.0",
- org.eclipse.jdt.ui;bundle-version="3.5.0",
- org.eclipse.jdt.core;bundle-version="3.5.0",
- org.eclipse.ui.ide;bundle-version="3.5.0",
+ org.eclipse.core.resources;bundle-version="3.7.100",
+ org.eclipse.jface.text;bundle-version="3.7.0",
+ org.eclipse.jdt.ui;bundle-version="3.7.0",
+ org.eclipse.jdt.core;bundle-version="3.7.0",
+ org.eclipse.ui.ide;bundle-version="3.7.0",
org.jboss.tools.cdi.core;bundle-version="1.0.0",
org.jboss.tools.common;bundle-version="2.0.0",
org.jboss.tools.common.el.core;bundle-version="2.0.0",
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/META-INF/MANIFEST.MF
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/META-INF/MANIFEST.MF 2011-05-06 23:09:07 UTC (rev 31134)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/META-INF/MANIFEST.MF 2011-05-06 23:10:27 UTC (rev 31135)
@@ -5,34 +5,34 @@
Bundle-Version: 1.2.0.qualifier
Bundle-Activator: org.jboss.tools.cdi.ui.CDIUIPlugin
Bundle-Localization: plugin
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
+Require-Bundle: org.eclipse.ui;bundle-version="3.7.0",
+ org.eclipse.core.runtime;bundle-version="3.7.0",
org.jboss.tools.cdi.core,
org.jboss.tools.common,
- org.eclipse.core.resources,
+ org.eclipse.core.resources;bundle-version="3.7.100",
org.jboss.tools.common.ui,
org.jboss.tools.common.el.ui,
org.jboss.tools.common.el.core,
- org.eclipse.wst.xml.ui,
- org.eclipse.jdt.ui,
- org.eclipse.jface.text,
- org.eclipse.wst.sse.ui,
+ org.eclipse.wst.xml.ui;bundle-version="1.1.200",
+ org.eclipse.jdt.ui;bundle-version="3.7.0",
+ org.eclipse.jface.text;bundle-version="3.7.0",
+ org.eclipse.wst.sse.ui;bundle-version="1.3.0",
org.jboss.tools.jst.web.kb,
- org.eclipse.jdt.core,
- org.eclipse.search,
- org.eclipse.wst.sse.core,
- org.eclipse.ltk.ui.refactoring,
- org.eclipse.ui.ide,
+ org.eclipse.jdt.core;bundle-version="3.7.0",
+ org.eclipse.search;bundle-version="3.6.100",
+ org.eclipse.wst.sse.core;bundle-version="1.1.600",
+ org.eclipse.ltk.ui.refactoring;bundle-version="3.5.100",
+ org.eclipse.ui.ide;bundle-version="3.7.0",
org.jboss.tools.common.model,
org.jboss.tools.common.model.ui,
org.jboss.tools.jst.web.ui,
- org.eclipse.core.expressions,
- org.eclipse.ltk.core.refactoring,
+ org.eclipse.core.expressions;bundle-version="3.4.200",
+ org.eclipse.ltk.core.refactoring;bundle-version="3.5.200",
org.jboss.tools.jst.jsp,
- org.eclipse.wst.common.project.facet.ui,
- org.eclipse.debug.ui,
- org.eclipse.ui.navigator,
- org.eclipse.ui.navigator.resources
+ org.eclipse.wst.common.project.facet.ui;bundle-version="1.4.200",
+ org.eclipse.debug.ui;bundle-version="3.7.0",
+ org.eclipse.ui.navigator;bundle-version="3.5.0",
+ org.eclipse.ui.navigator.resources;bundle-version="3.4.300"
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-Vendor: %Bundle-Vendor.0
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.xml/META-INF/MANIFEST.MF
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.xml/META-INF/MANIFEST.MF 2011-05-06 23:09:07 UTC (rev 31134)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.xml/META-INF/MANIFEST.MF 2011-05-06 23:10:27 UTC (rev 31135)
@@ -10,21 +10,21 @@
org.jboss.tools.cdi.xml.beans.model,
org.jboss.tools.cdi.xml.beans.model.handlers
Require-Bundle: org.jboss.tools.jst.web;visibility:=reexport,
- org.eclipse.ui.ide,
- org.eclipse.ui.views,
- org.eclipse.jface.text,
- org.eclipse.ui.workbench.texteditor,
- org.eclipse.ui.editors,
- org.eclipse.jdt.core,
- org.eclipse.jdt.ui,
- org.eclipse.ui,
- org.eclipse.jface,
- org.eclipse.wst.sse.core,
- org.eclipse.ltk.core.refactoring,
- org.eclipse.ltk.ui.refactoring,
- org.eclipse.wst.xml.core,
- org.eclipse.core.resources,
- org.eclipse.core.runtime,
- org.eclipse.wst.web
+ org.eclipse.ui.ide;bundle-version="3.7.0",
+ org.eclipse.ui.views;bundle-version="3.6.0",
+ org.eclipse.jface.text;bundle-version="3.7.0",
+ org.eclipse.ui.workbench.texteditor;bundle-version="3.7.0",
+ org.eclipse.ui.editors;bundle-version="3.7.0",
+ org.eclipse.jdt.core;bundle-version="3.7.0",
+ org.eclipse.jdt.ui;bundle-version="3.7.0",
+ org.eclipse.ui;bundle-version="3.7.0",
+ org.eclipse.jface;bundle-version="3.7.0",
+ org.eclipse.wst.sse.core;bundle-version="1.1.600",
+ org.eclipse.ltk.core.refactoring;bundle-version="3.5.200",
+ org.eclipse.ltk.ui.refactoring;bundle-version="3.5.100",
+ org.eclipse.wst.xml.core;bundle-version="1.1.600",
+ org.eclipse.core.resources;bundle-version="3.7.100",
+ org.eclipse.core.runtime;bundle-version="3.7.0",
+ org.eclipse.wst.web;bundle-version="1.1.500"
Bundle-Version: 1.1.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.xml.ui/META-INF/MANIFEST.MF
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.xml.ui/META-INF/MANIFEST.MF 2011-05-06 23:09:07 UTC (rev 31134)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.xml.ui/META-INF/MANIFEST.MF 2011-05-06 23:10:27 UTC (rev 31135)
@@ -7,24 +7,24 @@
org.jboss.tools.cdi.xml.ui.editor.form
Bundle-SymbolicName: org.jboss.tools.cdi.xml.ui; singleton:=true
Bundle-Localization: plugin
-Require-Bundle: org.eclipse.jface.text,
- org.eclipse.jdt.ui,
- org.eclipse.wst.sse.ui,
- org.eclipse.wst.xml.core,
- org.eclipse.wst.xml.ui,
- org.eclipse.wst.common.frameworks.ui,
- org.eclipse.wst.common.ui,
- org.eclipse.compare,
- org.eclipse.core.resources,
- org.eclipse.core.runtime,
- org.eclipse.jface,
- org.eclipse.ui,
- org.eclipse.draw2d,
- org.eclipse.gef,
- org.eclipse.ui.ide,
- org.eclipse.ui.workbench.texteditor,
- org.eclipse.core.expressions,
- org.eclipse.ui.views,
+Require-Bundle: org.eclipse.jface.text;bundle-version="3.7.0",
+ org.eclipse.jdt.ui;bundle-version="3.7.0",
+ org.eclipse.wst.sse.ui;bundle-version="1.3.0",
+ org.eclipse.wst.xml.core;bundle-version="1.1.600",
+ org.eclipse.wst.xml.ui;bundle-version="1.1.200",
+ org.eclipse.wst.common.frameworks.ui;bundle-version="1.2.0",
+ org.eclipse.wst.common.ui;bundle-version="1.1.500",
+ org.eclipse.compare;bundle-version="3.5.200",
+ org.eclipse.core.resources;bundle-version="3.7.100",
+ org.eclipse.core.runtime;bundle-version="3.7.0",
+ org.eclipse.jface;bundle-version="3.7.0",
+ org.eclipse.ui;bundle-version="3.7.0",
+ org.eclipse.draw2d;bundle-version="3.7.0",
+ org.eclipse.gef;bundle-version="3.7.0",
+ org.eclipse.ui.ide;bundle-version="3.7.0",
+ org.eclipse.ui.workbench.texteditor;bundle-version="3.7.0",
+ org.eclipse.core.expressions;bundle-version="3.4.200",
+ org.eclipse.ui.views;bundle-version="3.6.0",
org.jboss.tools.common.model,
org.jboss.tools.common.model.ui,
org.jboss.tools.common.text.xml,
13 years, 5 months
- 1
- 0
JBoss Tools SVN: r31134 - in trunk/common/plugins: org.jboss.tools.common.el.core/META-INF and 13 other directories.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2011-05-06 19:09:07 -0400 (Fri, 06 May 2011)
New Revision: 31134
Modified:
trunk/common/plugins/org.jboss.tools.common.el.core/META-INF/MANIFEST.MF
trunk/common/plugins/org.jboss.tools.common.el.ui/META-INF/MANIFEST.MF
trunk/common/plugins/org.jboss.tools.common.gef/META-INF/MANIFEST.MF
trunk/common/plugins/org.jboss.tools.common.model.ui.capabilities/META-INF/MANIFEST.MF
trunk/common/plugins/org.jboss.tools.common.model.ui/META-INF/MANIFEST.MF
trunk/common/plugins/org.jboss.tools.common.model/META-INF/MANIFEST.MF
trunk/common/plugins/org.jboss.tools.common.projecttemplates/META-INF/MANIFEST.MF
trunk/common/plugins/org.jboss.tools.common.resref.core/META-INF/MANIFEST.MF
trunk/common/plugins/org.jboss.tools.common.resref.ui/META-INF/MANIFEST.MF
trunk/common/plugins/org.jboss.tools.common.text.ext/META-INF/MANIFEST.MF
trunk/common/plugins/org.jboss.tools.common.text.xml/META-INF/MANIFEST.MF
trunk/common/plugins/org.jboss.tools.common.ui/META-INF/MANIFEST.MF
trunk/common/plugins/org.jboss.tools.common.verification.ui/META-INF/MANIFEST.MF
trunk/common/plugins/org.jboss.tools.common.verification/META-INF/MANIFEST.MF
trunk/common/plugins/org.jboss.tools.common/META-INF/MANIFEST.MF
Log:
https://issues.jboss.org/browse/JBIDE-8875
Modified: trunk/common/plugins/org.jboss.tools.common/META-INF/MANIFEST.MF
===================================================================
--- trunk/common/plugins/org.jboss.tools.common/META-INF/MANIFEST.MF 2011-05-06 21:52:31 UTC (rev 31133)
+++ trunk/common/plugins/org.jboss.tools.common/META-INF/MANIFEST.MF 2011-05-06 23:09:07 UTC (rev 31134)
@@ -15,19 +15,19 @@
org.jboss.tools.common.jobs,
org.jboss.tools.common.xml,
org.jboss.tools.common.zip
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.wst.xml.core;visibility:=reexport,
- org.eclipse.jface,
- org.eclipse.core.resources,
- org.eclipse.ui,
- org.eclipse.ui.ide,
- org.eclipse.wst.common.uriresolver;visibility:=reexport,
- org.eclipse.core.net,
- org.eclipse.jdt.core,
- org.eclipse.jdt.ui,
- org.eclipse.ui.workbench.texteditor,
- org.eclipse.jface.text,
- org.apache.commons.httpclient
+Require-Bundle: org.eclipse.core.runtime;bundle-version="3.7.0",
+ org.eclipse.wst.xml.core;visibility:=reexport;bundle-version="1.1.600",
+ org.eclipse.jface;bundle-version="3.7.0",
+ org.eclipse.core.resources;bundle-version="3.7.100",
+ org.eclipse.ui;bundle-version="3.7.0",
+ org.eclipse.ui.ide;bundle-version="3.7.0",
+ org.eclipse.wst.common.uriresolver;visibility:=reexport;bundle-version="1.1.401",
+ org.eclipse.core.net;bundle-version="1.2.100",
+ org.eclipse.jdt.core;bundle-version="3.7.0",
+ org.eclipse.jdt.ui;bundle-version="3.7.0",
+ org.eclipse.ui.workbench.texteditor;bundle-version="3.7.0",
+ org.eclipse.jface.text;bundle-version="3.7.0",
+ org.apache.commons.httpclient;bundle-version="3.1.0"
Bundle-Version: 3.3.0.qualifier
Bundle-ActivationPolicy: lazy
Bundle-ManifestVersion: 2
Modified: trunk/common/plugins/org.jboss.tools.common.el.core/META-INF/MANIFEST.MF
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.el.core/META-INF/MANIFEST.MF 2011-05-06 21:52:31 UTC (rev 31133)
+++ trunk/common/plugins/org.jboss.tools.common.el.core/META-INF/MANIFEST.MF 2011-05-06 23:09:07 UTC (rev 31134)
@@ -15,12 +15,12 @@
org.jboss.tools.common.el.internal.core.parser,
org.jboss.tools.common.el.internal.core.parser.token
Bundle-Activator: org.jboss.tools.common.el.core.ELCorePlugin
-Require-Bundle: org.eclipse.jface.text,
- org.eclipse.wst.sse.core,
- org.eclipse.wst.sse.ui,
+Require-Bundle: org.eclipse.jface.text;bundle-version="3.7.0",
+ org.eclipse.wst.sse.core;bundle-version="1.1.600",
+ org.eclipse.wst.sse.ui;bundle-version="1.3.0",
org.jboss.tools.common.model,
org.jboss.tools.common.resref.core;visibility:=reexport,
- org.eclipse.ui,
- org.eclipse.jdt.ui;bundle-version="[3.5.0,4.0.0)"
+ org.eclipse.ui;bundle-version="3.7.0",
+ org.eclipse.jdt.ui;bundle-version="3.7.0"
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-ClassPath: .
Modified: trunk/common/plugins/org.jboss.tools.common.el.ui/META-INF/MANIFEST.MF
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.el.ui/META-INF/MANIFEST.MF 2011-05-06 21:52:31 UTC (rev 31133)
+++ trunk/common/plugins/org.jboss.tools.common.el.ui/META-INF/MANIFEST.MF 2011-05-06 23:09:07 UTC (rev 31134)
@@ -8,13 +8,13 @@
Export-Package: org.jboss.tools.common.el.ui,
org.jboss.tools.common.el.ui.ca
Bundle-Activator: org.jboss.tools.common.el.ui.ElUiPlugin
-Require-Bundle: org.eclipse.ui,
+Require-Bundle: org.eclipse.ui;bundle-version="3.7.0",
org.jboss.tools.common.el.core,
org.jboss.tools.common.model.ui,
- org.eclipse.jdt.ui;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.ui.ide;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.jface.text;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.wst.xml.ui,
+ org.eclipse.jdt.ui;bundle-version="3.7.0",
+ org.eclipse.ui.ide;bundle-version="3.7.0",
+ org.eclipse.jface.text;bundle-version="3.7.0",
+ org.eclipse.wst.xml.ui;bundle-version="1.1.200",
org.jboss.tools.common.ui
Bundle-Vendor: %Bundle-Vendor.0
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Modified: trunk/common/plugins/org.jboss.tools.common.gef/META-INF/MANIFEST.MF
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.gef/META-INF/MANIFEST.MF 2011-05-06 21:52:31 UTC (rev 31133)
+++ trunk/common/plugins/org.jboss.tools.common.gef/META-INF/MANIFEST.MF 2011-05-06 23:09:07 UTC (rev 31134)
@@ -16,16 +16,16 @@
org.jboss.tools.common.gef.outline.xpl,
org.jboss.tools.common.gef.xpl
Require-Bundle: org.jboss.tools.common,
- org.eclipse.jface.text,
- org.eclipse.ui.workbench.texteditor,
- org.eclipse.ui.editors,
- org.eclipse.ui.ide,
- org.eclipse.swt,
- org.eclipse.ui,
- org.eclipse.ui.views,
- org.eclipse.draw2d,
- org.eclipse.gef,
- org.eclipse.core.runtime,
- org.eclipse.core.resources
+ org.eclipse.jface.text;bundle-version="3.7.0",
+ org.eclipse.ui.workbench.texteditor;bundle-version="3.7.0",
+ org.eclipse.ui.editors;bundle-version="3.7.0",
+ org.eclipse.ui.ide;bundle-version="3.7.0",
+ org.eclipse.swt;bundle-version="3.7.0",
+ org.eclipse.ui;bundle-version="3.7.0",
+ org.eclipse.ui.views;bundle-version="3.6.0",
+ org.eclipse.draw2d;bundle-version="3.7.0",
+ org.eclipse.gef;bundle-version="3.7.0",
+ org.eclipse.core.runtime;bundle-version="3.7.0",
+ org.eclipse.core.resources;bundle-version="3.7.100"
Bundle-Version: 3.1.0.qualifier
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Modified: trunk/common/plugins/org.jboss.tools.common.model/META-INF/MANIFEST.MF
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/META-INF/MANIFEST.MF 2011-05-06 21:52:31 UTC (rev 31133)
+++ trunk/common/plugins/org.jboss.tools.common.model/META-INF/MANIFEST.MF 2011-05-06 23:09:07 UTC (rev 31134)
@@ -61,28 +61,28 @@
images,
org.jboss.tools.common.model.refactoring
Require-Bundle: org.jboss.tools.common;visibility:=reexport,
- org.eclipse.ui.ide,
- org.eclipse.ui.views,
- org.eclipse.jface.text,
- org.eclipse.ui.workbench.texteditor,
- org.eclipse.ui.editors,
- org.eclipse.jdt.core;visibility:=reexport,
- org.eclipse.swt;visibility:=reexport,
- org.eclipse.ui,
- org.eclipse.jdt.ui,
- org.eclipse.debug.core,
- org.eclipse.debug.ui,
- org.eclipse.help,
- org.eclipse.ant.ui,
- org.eclipse.ant.core,
- org.eclipse.ltk.core.refactoring,
- org.eclipse.ltk.ui.refactoring,
- org.eclipse.wst.common.uriresolver,
- org.eclipse.wst.common.modulecore,
- org.eclipse.jem.util,
- org.eclipse.wst.common.emfworkbench.integration,
- org.eclipse.core.resources;visibility:=reexport,
- org.eclipse.core.runtime;visibility:=reexport
+ org.eclipse.ui.ide;bundle-version="3.7.0",
+ org.eclipse.ui.views;bundle-version="3.6.0",
+ org.eclipse.jface.text;bundle-version="3.7.0",
+ org.eclipse.ui.workbench.texteditor;bundle-version="3.7.0",
+ org.eclipse.ui.editors;bundle-version="3.7.0",
+ org.eclipse.jdt.core;visibility:=reexport;bundle-version="3.7.0",
+ org.eclipse.swt;visibility:=reexport;bundle-version="3.7.0",
+ org.eclipse.ui;bundle-version="3.7.0",
+ org.eclipse.jdt.ui;bundle-version="3.7.0",
+ org.eclipse.debug.core;bundle-version="3.7.0",
+ org.eclipse.debug.ui;bundle-version="3.7.0",
+ org.eclipse.help;bundle-version="3.5.0",
+ org.eclipse.ant.ui;bundle-version="3.5.100",
+ org.eclipse.ant.core;bundle-version="3.2.200",
+ org.eclipse.ltk.core.refactoring;bundle-version="3.5.200",
+ org.eclipse.ltk.ui.refactoring;bundle-version="3.5.100",
+ org.eclipse.wst.common.uriresolver;bundle-version="1.1.401",
+ org.eclipse.wst.common.modulecore;bundle-version="1.2.100",
+ org.eclipse.jem.util;bundle-version="2.1.2",
+ org.eclipse.wst.common.emfworkbench.integration;bundle-version="1.2.100",
+ org.eclipse.core.resources;visibility:=reexport;bundle-version="3.7.100",
+ org.eclipse.core.runtime;visibility:=reexport;bundle-version="3.7.0"
Bundle-Version: 3.3.0.qualifier
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-ClassPath: org.jboss.tools.common.model.jar
Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/META-INF/MANIFEST.MF
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model.ui/META-INF/MANIFEST.MF 2011-05-06 21:52:31 UTC (rev 31133)
+++ trunk/common/plugins/org.jboss.tools.common.model.ui/META-INF/MANIFEST.MF 2011-05-06 23:09:07 UTC (rev 31134)
@@ -77,22 +77,22 @@
Require-Bundle: org.jboss.tools.common.model;visibility:=reexport,
org.jboss.tools.common.text.ext;visibility:=reexport,
org.jboss.tools.common.text.xml;visibility:=reexport,
- org.eclipse.ui,
- org.eclipse.ui.ide;visibility:=reexport,
- org.eclipse.ui.views,
- org.eclipse.jface.text,
- org.eclipse.ui.workbench.texteditor,
- org.eclipse.ui.forms,
- org.eclipse.jdt.ui,
- org.eclipse.compare,
- org.eclipse.wst.xml.ui,
- org.eclipse.jdt.launching,
- org.eclipse.wst.html.core,
- org.eclipse.pde.ui,
- org.eclipse.core.expressions;bundle-version="[3.4.100,4.0.0)",
+ org.eclipse.ui;bundle-version="3.7.0",
+ org.eclipse.ui.ide;visibility:=reexport;bundle-version="3.7.0",
+ org.eclipse.ui.views;bundle-version="3.6.0",
+ org.eclipse.jface.text;bundle-version="3.7.0",
+ org.eclipse.ui.workbench.texteditor;bundle-version="3.7.0",
+ org.eclipse.ui.forms;bundle-version="3.5.100",
+ org.eclipse.jdt.ui;bundle-version="3.7.0",
+ org.eclipse.compare;bundle-version="3.5.200",
+ org.eclipse.wst.xml.ui;bundle-version="1.1.200",
+ org.eclipse.jdt.launching;bundle-version="3.6.0",
+ org.eclipse.wst.html.core;bundle-version="1.1.500",
+ org.eclipse.pde.ui;bundle-version="3.6.100",
+ org.eclipse.core.expressions;bundle-version="3.4.200",
org.jboss.tools.common.ui,
- org.eclipse.jst.standard.schemas,
- org.eclipse.wst.standard.schemas
+ org.eclipse.jst.standard.schemas;bundle-version="1.2.0",
+ org.eclipse.wst.standard.schemas;bundle-version="1.0.300"
Bundle-Version: 3.3.0.qualifier
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-ClassPath: org.jboss.tools.common.model.ui.jar
Modified: 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 2011-05-06 21:52:31 UTC (rev 31133)
+++ trunk/common/plugins/org.jboss.tools.common.model.ui.capabilities/META-INF/MANIFEST.MF 2011-05-06 23:09:07 UTC (rev 31134)
@@ -5,5 +5,5 @@
Bundle-Version: 3.2.0.qualifier
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-Localization: plugin
-Require-Bundle: org.eclipse.ui
+Require-Bundle: org.eclipse.ui;bundle-version="3.7.0"
Bundle-Vendor: %providerName
Modified: trunk/common/plugins/org.jboss.tools.common.projecttemplates/META-INF/MANIFEST.MF
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.projecttemplates/META-INF/MANIFEST.MF 2011-05-06 21:52:31 UTC (rev 31133)
+++ trunk/common/plugins/org.jboss.tools.common.projecttemplates/META-INF/MANIFEST.MF 2011-05-06 23:09:07 UTC (rev 31134)
@@ -6,8 +6,8 @@
Export-Package: org.jboss.tools.common.projecttemplates
Bundle-Localization: plugin
Bundle-SymbolicName: org.jboss.tools.common.projecttemplates;singleton:=true
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.ui,
+Require-Bundle: org.eclipse.core.runtime;bundle-version="3.7.0",
+ org.eclipse.ui;bundle-version="3.7.0",
org.jboss.tools.common
Bundle-Version: 3.3.0.qualifier
Bundle-ActivationPolicy: lazy
Modified: trunk/common/plugins/org.jboss.tools.common.resref.core/META-INF/MANIFEST.MF
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.resref.core/META-INF/MANIFEST.MF 2011-05-06 21:52:31 UTC (rev 31133)
+++ trunk/common/plugins/org.jboss.tools.common.resref.core/META-INF/MANIFEST.MF 2011-05-06 23:09:07 UTC (rev 31134)
@@ -4,8 +4,8 @@
Bundle-SymbolicName: org.jboss.tools.common.resref.core
Bundle-Version: 3.2.0.qualifier
Bundle-Activator: org.jboss.tools.common.resref.core.ResourceReferencePlugin
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
+Require-Bundle: org.eclipse.ui;bundle-version="3.7.0",
+ org.eclipse.core.runtime;bundle-version="3.7.0",
org.jboss.tools.common.model
Bundle-ActivationPolicy: lazy
Export-Package: org.jboss.tools.common.resref.core
Modified: trunk/common/plugins/org.jboss.tools.common.resref.ui/META-INF/MANIFEST.MF
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.resref.ui/META-INF/MANIFEST.MF 2011-05-06 21:52:31 UTC (rev 31133)
+++ trunk/common/plugins/org.jboss.tools.common.resref.ui/META-INF/MANIFEST.MF 2011-05-06 23:09:07 UTC (rev 31134)
@@ -4,8 +4,8 @@
Bundle-SymbolicName: org.jboss.tools.common.resref.ui
Bundle-Version: 3.2.0.qualifier
Bundle-Activator: org.jboss.tools.common.resref.ui.Activator
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
+Require-Bundle: org.eclipse.ui;bundle-version="3.7.0",
+ org.eclipse.core.runtime;bundle-version="3.7.0",
org.jboss.tools.common.model.ui,
org.jboss.tools.common.resref.core
Bundle-ActivationPolicy: lazy
Modified: trunk/common/plugins/org.jboss.tools.common.text.ext/META-INF/MANIFEST.MF
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.text.ext/META-INF/MANIFEST.MF 2011-05-06 21:52:31 UTC (rev 31133)
+++ trunk/common/plugins/org.jboss.tools.common.text.ext/META-INF/MANIFEST.MF 2011-05-06 23:09:07 UTC (rev 31134)
@@ -15,20 +15,20 @@
Bundle-SymbolicName: org.jboss.tools.common.text.ext;singleton:=true
Bundle-Localization: plugin
Require-Bundle: org.jboss.tools.common.model,
- org.eclipse.ui.ide,
- org.eclipse.ui,
- org.eclipse.jface.text,
- org.eclipse.ui.workbench.texteditor,
- org.eclipse.jdt.ui,
- org.eclipse.wst.sse.core;visibility:=reexport,
- org.eclipse.wst.sse.ui;visibility:=reexport,
- org.eclipse.jst.jsp.core;visibility:=reexport,
- org.eclipse.wst.common.modulecore;visibility:=reexport,
- org.eclipse.pde.ui,
+ org.eclipse.ui.ide;bundle-version="3.7.0",
+ org.eclipse.ui;bundle-version="3.7.0",
+ org.eclipse.jface.text;bundle-version="3.7.0",
+ org.eclipse.ui.workbench.texteditor;bundle-version="3.7.0",
+ org.eclipse.jdt.ui;bundle-version="3.7.0",
+ org.eclipse.wst.sse.core;visibility:=reexport;bundle-version="1.1.600",
+ org.eclipse.wst.sse.ui;visibility:=reexport;bundle-version="1.3.0",
+ org.eclipse.jst.jsp.core;visibility:=reexport;bundle-version="1.2.400",
+ org.eclipse.wst.common.modulecore;visibility:=reexport;bundle-version="1.2.100",
+ org.eclipse.pde.ui;bundle-version="3.6.100",
org.jboss.tools.common.el.core,
- org.eclipse.emf.ecore;bundle-version="[2.5.0,3.0.0)",
- org.eclipse.wst.css.core,
- org.eclipse.wst.html.core,
+ org.eclipse.emf.ecore;bundle-version="2.7.0",
+ org.eclipse.wst.css.core;bundle-version="1.1.500",
+ org.eclipse.wst.html.core;bundle-version="1.1.500",
org.jboss.tools.common.ui
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-ClassPath: .
Modified: trunk/common/plugins/org.jboss.tools.common.text.xml/META-INF/MANIFEST.MF
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.text.xml/META-INF/MANIFEST.MF 2011-05-06 21:52:31 UTC (rev 31133)
+++ trunk/common/plugins/org.jboss.tools.common.text.xml/META-INF/MANIFEST.MF 2011-05-06 23:09:07 UTC (rev 31134)
@@ -15,19 +15,19 @@
org.jboss.tools.jst.jsp.preferences.xpl,
org.jboss.tools.jst.jsp.text.xpl
Require-Bundle: org.jboss.tools.common,
- org.eclipse.core.runtime,
- org.eclipse.ui,
- org.eclipse.jface.text,
- org.eclipse.ui.workbench.texteditor,
- org.eclipse.jdt.ui,
- org.eclipse.jdt.core,
- org.eclipse.wst.xml.ui,
- org.eclipse.wst.sse.ui,
- org.eclipse.wst.sse.core,
- org.eclipse.core.resources,
- org.eclipse.wst.xsd.ui,
- org.eclipse.wst.dtd.ui,
- org.eclipse.ui.ide;bundle-version="3.6.0"
+ org.eclipse.core.runtime;bundle-version="3.7.0",
+ org.eclipse.ui;bundle-version="3.7.0",
+ org.eclipse.jface.text;bundle-version="3.7.0",
+ org.eclipse.ui.workbench.texteditor;bundle-version="3.7.0",
+ org.eclipse.jdt.ui;bundle-version="3.7.0",
+ org.eclipse.jdt.core;bundle-version="3.7.0",
+ org.eclipse.wst.xml.ui;bundle-version="1.1.200",
+ org.eclipse.wst.sse.ui;bundle-version="1.3.0",
+ org.eclipse.wst.sse.core;bundle-version="1.1.600",
+ org.eclipse.core.resources;bundle-version="3.7.100",
+ org.eclipse.wst.xsd.ui;bundle-version="1.2.404",
+ org.eclipse.wst.dtd.ui;bundle-version="1.0.600",
+ org.eclipse.ui.ide;bundle-version="3.7.0"
Bundle-Version: 3.3.0.qualifier
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-ClassPath: .
Modified: trunk/common/plugins/org.jboss.tools.common.ui/META-INF/MANIFEST.MF
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.ui/META-INF/MANIFEST.MF 2011-05-06 21:52:31 UTC (rev 31133)
+++ trunk/common/plugins/org.jboss.tools.common.ui/META-INF/MANIFEST.MF 2011-05-06 23:09:07 UTC (rev 31134)
@@ -3,18 +3,18 @@
Bundle-Name: %Bundle-Name.0
Bundle-SymbolicName: org.jboss.tools.common.ui;singleton:=true
Bundle-Version: 3.2.0.qualifier
-Require-Bundle: org.eclipse.osgi,
+Require-Bundle: org.eclipse.osgi;bundle-version="3.7.0",
org.jboss.tools.common,
- org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.jdt.core,
- org.eclipse.jdt.ui,
- org.eclipse.core.resources,
- org.eclipse.ui.ide,
- org.eclipse.jst.j2ee.ui,
- org.eclipse.ui.forms,
- org.eclipse.ui.workbench.texteditor,
- org.eclipse.jface.text
+ org.eclipse.ui;bundle-version="3.7.0",
+ org.eclipse.core.runtime;bundle-version="3.7.0",
+ org.eclipse.jdt.core;bundle-version="3.7.0",
+ org.eclipse.jdt.ui;bundle-version="3.7.0",
+ org.eclipse.core.resources;bundle-version="3.7.100",
+ org.eclipse.ui.ide;bundle-version="3.7.0",
+ org.eclipse.jst.j2ee.ui;bundle-version="1.1.500",
+ org.eclipse.ui.forms;bundle-version="3.5.100",
+ org.eclipse.ui.workbench.texteditor;bundle-version="3.7.0",
+ org.eclipse.jface.text;bundle-version="3.7.0"
Export-Package: org.jboss.tools.common.ui,
org.jboss.tools.common.ui.preferences,
org.jboss.tools.common.ui.widget.editor,
Modified: trunk/common/plugins/org.jboss.tools.common.verification/META-INF/MANIFEST.MF
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.verification/META-INF/MANIFEST.MF 2011-05-06 21:52:31 UTC (rev 31133)
+++ trunk/common/plugins/org.jboss.tools.common.verification/META-INF/MANIFEST.MF 2011-05-06 23:09:07 UTC (rev 31134)
@@ -11,16 +11,16 @@
org.jboss.tools.common.verification.vrules.layer,
org.jboss.tools.common.verification.vrules.core.resources
Require-Bundle: org.jboss.tools.common,
- org.eclipse.ui.ide,
- org.eclipse.ui.views,
- org.eclipse.jface.text,
- org.eclipse.ui.workbench.texteditor,
- org.eclipse.ui.editors,
- org.eclipse.jdt.core,
- org.eclipse.ui,
+ org.eclipse.ui.ide;bundle-version="3.7.0",
+ org.eclipse.ui.views;bundle-version="3.6.0",
+ org.eclipse.jface.text;bundle-version="3.7.0",
+ org.eclipse.ui.workbench.texteditor;bundle-version="3.7.0",
+ org.eclipse.ui.editors;bundle-version="3.7.0",
+ org.eclipse.jdt.core;bundle-version="3.7.0",
+ org.eclipse.ui;bundle-version="3.7.0",
org.jboss.tools.common.model,
- org.eclipse.core.resources,
- org.eclipse.core.runtime,
- org.eclipse.wst.validation
+ org.eclipse.core.resources;bundle-version="3.7.100",
+ org.eclipse.core.runtime;bundle-version="3.7.0",
+ org.eclipse.wst.validation;bundle-version="1.2.300"
Bundle-Version: 3.2.0.qualifier
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Modified: trunk/common/plugins/org.jboss.tools.common.verification.ui/META-INF/MANIFEST.MF
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.verification.ui/META-INF/MANIFEST.MF 2011-05-06 21:52:31 UTC (rev 31133)
+++ trunk/common/plugins/org.jboss.tools.common.verification.ui/META-INF/MANIFEST.MF 2011-05-06 23:09:07 UTC (rev 31134)
@@ -14,21 +14,21 @@
org.jboss.tools.common.verification.ui.vrules.wizard.runtime,
org.jboss.tools.common.verification.ui.vrules.wizard.runtime2,
org.jboss.tools.common.verification.ui
-Require-Bundle: org.eclipse.ui.ide,
- org.eclipse.core.resources,
- org.eclipse.core.runtime,
- org.eclipse.swt,
- org.eclipse.ui,
- org.eclipse.jface,
- org.eclipse.jface.text,
- org.eclipse.ui.workbench,
- org.eclipse.jdt.ui,
+Require-Bundle: org.eclipse.ui.ide;bundle-version="3.7.0",
+ org.eclipse.core.resources;bundle-version="3.7.100",
+ org.eclipse.core.runtime;bundle-version="3.7.0",
+ org.eclipse.swt;bundle-version="3.7.0",
+ org.eclipse.ui;bundle-version="3.7.0",
+ org.eclipse.jface;bundle-version="3.7.0",
+ org.eclipse.jface.text;bundle-version="3.7.0",
+ org.eclipse.ui.workbench;bundle-version="3.7.0",
+ org.eclipse.jdt.ui;bundle-version="3.7.0",
org.jboss.tools.common.verification,
org.jboss.tools.common.model.ui,
- org.eclipse.core.expressions,
- org.eclipse.core.commands,
- org.eclipse.jface,
- org.eclipse.wst.common.project.facet.core,
- org.eclipse.wst.validation
+ org.eclipse.core.expressions;bundle-version="3.4.200",
+ org.eclipse.core.commands;bundle-version="3.6.0",
+ org.eclipse.jface;bundle-version="3.7.0",
+ org.eclipse.wst.common.project.facet.core;bundle-version="1.4.200",
+ org.eclipse.wst.validation;bundle-version="1.2.300"
Bundle-Version: 3.1.0.qualifier
Bundle-RequiredExecutionEnvironment: J2SE-1.5
13 years, 5 months
- 1
- 0
JBoss Tools SVN: r31133 - trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/src/org/jboss/tools/maven/ui/bot/test.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2011-05-06 17:52:31 -0400 (Fri, 06 May 2011)
New Revision: 31133
Modified:
trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/src/org/jboss/tools/maven/ui/bot/test/CreateMavenizedSeamProjectTest.java
Log:
JBIDE-8797 Test failure in Maven trunk component
Modified: trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/src/org/jboss/tools/maven/ui/bot/test/CreateMavenizedSeamProjectTest.java
===================================================================
--- trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/src/org/jboss/tools/maven/ui/bot/test/CreateMavenizedSeamProjectTest.java 2011-05-06 21:45:04 UTC (rev 31132)
+++ trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/src/org/jboss/tools/maven/ui/bot/test/CreateMavenizedSeamProjectTest.java 2011-05-06 21:52:31 UTC (rev 31133)
@@ -45,7 +45,9 @@
import org.eclipse.datatools.connectivity.drivers.PropertySetImpl;
import org.eclipse.datatools.connectivity.drivers.models.TemplateDescriptor;
import org.eclipse.m2e.core.core.IMavenConstants;
+import org.eclipse.swt.SWT;
import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Event;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.swtbot.eclipse.finder.SWTWorkbenchBot;
import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotEditor;
@@ -58,6 +60,7 @@
import org.eclipse.swtbot.swt.finder.results.VoidResult;
import org.eclipse.swtbot.swt.finder.utils.SWTBotPreferences;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotMenu;
+import org.eclipse.swtbot.swt.finder.widgets.SWTBotRadio;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotShell;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem;
@@ -481,7 +484,26 @@
bot.button("Next >").click();
bot.comboBox(0).setSelection(SEAM_RUNTIME_NAME);
- bot.radio(deployType).click();
+ String otherType = DEPLOY_TYPE_EAR;
+ if (DEPLOY_TYPE_EAR.equals(deployType)) {
+ otherType = DEPLOY_TYPE_WAR;
+ }
+ final SWTBotRadio radio = bot.radio(deployType);
+ final SWTBotRadio otherRadio = bot.radio(otherType);
+ radio.click();
+ Display.getDefault().syncExec(new Runnable() {
+
+ public void run() {
+ radio.widget.setSelection(true);
+ otherRadio.widget.setSelection(false);
+ Event event = new Event();
+ event.time = (int) System.currentTimeMillis();
+ event.widget = radio.widget;
+ event.display = Display.getCurrent();
+ radio.widget.notifyListeners(SWT.Selection, event);
+ }
+ });
+
bot.comboBox(1).setSelection("HSQL");
bot.comboBox(2).setSelection(CONNECTION_PROFILE_NAME);
bot.button("Finish").click();
13 years, 5 months
- 1
- 0
JBoss Tools SVN: r31132 - trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.ui/src/org/jboss/tools/cdi/seam/config/ui/contentassist.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-05-06 17:45:04 -0400 (Fri, 06 May 2011)
New Revision: 31132
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.ui/src/org/jboss/tools/cdi/seam/config/ui/contentassist/SeamConfigXmlCompletionProposalComputer.java
trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.ui/src/org/jboss/tools/cdi/seam/config/ui/contentassist/TagData.java
Log:
JBIDE-8842
https://issues.jboss.org/browse/JBIDE-8842
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.ui/src/org/jboss/tools/cdi/seam/config/ui/contentassist/SeamConfigXmlCompletionProposalComputer.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.ui/src/org/jboss/tools/cdi/seam/config/ui/contentassist/SeamConfigXmlCompletionProposalComputer.java 2011-05-06 18:26:47 UTC (rev 31131)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.ui/src/org/jboss/tools/cdi/seam/config/ui/contentassist/SeamConfigXmlCompletionProposalComputer.java 2011-05-06 21:45:04 UTC (rev 31132)
@@ -1,7 +1,9 @@
package org.jboss.tools.cdi.seam.config.ui.contentassist;
+import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet;
+import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -22,6 +24,7 @@
import org.eclipse.jdt.core.IPackageFragmentRoot;
import org.eclipse.jdt.core.IType;
import org.eclipse.jdt.core.JavaModelException;
+import org.eclipse.jdt.internal.ui.text.javadoc.JavadocContentAccess2;
import org.eclipse.jface.text.IDocument;
import org.eclipse.wst.sse.core.StructuredModelManager;
import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
@@ -31,6 +34,7 @@
import org.eclipse.wst.sse.ui.internal.contentassist.ContentAssistUtils;
import org.eclipse.wst.sse.ui.internal.contentassist.CustomCompletionProposal;
import org.eclipse.wst.xml.core.internal.contentmodel.CMNode;
+import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement;
import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
import org.eclipse.wst.xml.ui.internal.contentassist.AbstractXMLModelQueryCompletionProposalComputer;
import org.eclipse.wst.xml.ui.internal.contentassist.ContentAssistRequest;
@@ -45,6 +49,7 @@
import org.jboss.tools.cdi.seam.config.core.util.Util;
import org.jboss.tools.cdi.seam.config.core.xml.SAXElement;
import org.jboss.tools.cdi.seam.config.ui.CDISeamConfigUIPlugin;
+import org.jboss.tools.common.model.util.EclipseJavaUtil;
import org.jboss.tools.common.model.util.EclipseResourceUtil;
import org.jboss.tools.common.xml.XMLUtilities;
import org.w3c.dom.Element;
@@ -60,6 +65,7 @@
CompletionProposalInvocationContext context;
Node currentNode;
+ Element parentElement;
SAXElement sax;
IFile resource;
@@ -73,11 +79,22 @@
String eePrefix;
Map<String, String> prefixByPackage = new HashMap<String, String>();
- public List computeCompletionProposals(
+ public List<?> computeCompletionProposals(
CompletionProposalInvocationContext context,
IProgressMonitor monitor) {
this.context = context;
currentNode = findNode();
+ if(currentNode instanceof IDOMElement && context.getInvocationOffset() == ((IDOMElement)currentNode).getStartOffset()) {
+ currentNode = currentNode.getPreviousSibling() != null ? currentNode.getPreviousSibling() : currentNode.getParentNode();
+ }
+
+ Node p = currentNode;
+ while(p != null && !(p instanceof Element)) p = p.getParentNode();
+ if(!(p instanceof Element)) {
+ // can do nothing without context of parent element.
+ return new ArrayList<Object>();
+ }
+ parentElement = (Element)p;
sax = buildSAXElement(currentNode);
fillNameSpaces(currentNode);
@@ -87,6 +104,9 @@
cdi = CDICorePlugin.getCDI(resource.getProject(), true);
if(cdi != null) extension = CDISeamConfigExtension.getExtension(cdi);
}
+ if(!isActive()) {
+ return new ArrayList<Object>();
+ }
//compute the completion proposals
return super.computeCompletionProposals(context, monitor);
}
@@ -140,20 +160,26 @@
protected void addTagInsertionProposals(
ContentAssistRequest contentAssistRequest, int childPosition,
CompletionProposalInvocationContext context) {
- if(!isActive()) {
- return;
+ Set<TagData> tagData = collectTagData();
+
+ for (TagData tag: tagData) {
+ if(tag.isUnique()) {
+ if(XMLUtilities.getUniqueChild((Element)parentElement, tag.getName()) != null) continue;
+ }
+ String tagText = tag.getText();
+ int positionAdjustment = (tagText.indexOf("><") > 0) ? tagText.indexOf("><") + 1 : tagText.length();
+ String displayText = tag.getName();
+ if(tag.getMember() instanceof IType) {
+ displayText += " - " + ((IType)tag.getMember()).getPackageFragment().getElementName();
+ }
+ createProposal(contentAssistRequest, tagText, displayText, positionAdjustment, tag.getMember(), tag.getRelevance());
}
+ }
- Node currentNode = contentAssistRequest.getNode();
- Node parentElement = currentNode;
- while(parentElement != null && !(parentElement instanceof Element)) parentElement = parentElement.getParentNode();
- if(parentElement == null) {
- //Can suggest nothing without parent context.
- return;
- }
+ private Set<TagData> collectTagData() {
String parentElementName = sax.getLocalName();
String parentElementPrefix = sax.getPrefix();
-
+
Set<TagData> tagData = new HashSet<TagData>();
if("beans".equals(parentElementName)) {
@@ -164,9 +190,9 @@
IType contextType = null;
if(Util.isEntry(sax)) {
//Inside entry - only <key> and <value>
- if(eePrefix != null) {
- addTagData(tagData, eePrefix, KEYWORD_KEY, true, RELEVANCE_TAG_KEYWORD);
- addTagData(tagData, eePrefix, KEYWORD_VALUE, true, RELEVANCE_TAG_KEYWORD);
+ if(eePrefix != null) {
+ addTagData(tagData, eePrefix, KEYWORD_KEY, true, true, RELEVANCE_TAG_KEYWORD);
+ addTagData(tagData, eePrefix, KEYWORD_VALUE, true, true, RELEVANCE_TAG_KEYWORD);
}
} else if(Util.isValue(sax) || Util.isKey(sax)) {
//Inside value or key we can define new bean.
@@ -176,9 +202,11 @@
} else if((contextType = Util.resolveType(sax, cdi)) != null) {
//We are inside bean. Suggest members and annotations.
addTypeNames(tagData, true); //only annotations allowed here.
- addTagData(tagData, getTagNamesForMembers(parentElementPrefix, contextType), RELEVANCE_TAG_MEMBER);
+ addTagData(tagData, getTagNamesForMembers(parentElementPrefix, contextType, false), RELEVANCE_TAG_MEMBER);
- if(eePrefix != null) {
+ if(eePrefix != null
+ && XMLUtilities.getUniqueChild((Element)parentElement, eePrefix + ":" + KEYWORD_MODIFIES) == null
+ && XMLUtilities.getUniqueChild((Element)parentElement, eePrefix + ":" + KEYWORD_REPLACES) == null) {
addTagData(tagData, eePrefix, KEYWORD_MODIFIES, false, true, RELEVANCE_TAG_KEYWORD);
addTagData(tagData, eePrefix, KEYWORD_REPLACES, false, true, RELEVANCE_TAG_KEYWORD);
}
@@ -203,26 +231,12 @@
}
}
}
-
- int begin = contentAssistRequest.getReplacementBeginPosition();;
- int length = contentAssistRequest.getReplacementLength();
- for (TagData tag: tagData) {
- if(tag.isUnique) {
- if(XMLUtilities.getUniqueChild((Element)parentElement, tag.getName()) != null) continue;
- }
- String tagText = tag.getText();
- String proposedInfo = null;
- CustomCompletionProposal textProposal = new CustomCompletionProposal(
- tagText, begin, length, tagText.length(),
- XMLEditorPluginImageHelper.getInstance().getImage(XMLEditorPluginImages.IMG_OBJ_TAG_GENERIC),
- tag.getName(), null, proposedInfo, tag.getRelevance());
- contentAssistRequest.addProposal(textProposal);
- }
+ return tagData;
}
private void addTypeNames(Set<TagData> tagData, boolean annotationsOnly) {
try {
- Set<String> tagNames = getAllTagNames(annotationsOnly);
+ Map<String, IMember> tagNames = getAllTagNames(annotationsOnly);
addTagData(tagData, tagNames, annotationsOnly ? RELEVANCE_TAG_ANNOTATION : RELEVANCE_TAG_TYPE);
} catch (JavaModelException e) {
CDISeamConfigUIPlugin.log(e);
@@ -237,21 +251,108 @@
tagData.add(new TagData(prefix, name, hasClosingTag, isUnique, relevance));
}
- private void addTagData(Set<TagData> tagData, Set<String> tagNames, int relevance) {
- for (String tagName: tagNames) {
- tagData.add(new TagData(tagName, relevance));
+ private void addTagData(Set<TagData> tagData, Map<String, IMember> tagNames, int relevance) {
+ for (String tagName: tagNames.keySet()) {
+ TagData d = new TagData(tagName, relevance);
+ IMember m = tagNames.get(tagName);
+ if(m instanceof IType) {
+ String qn = ((IType)m).getFullyQualifiedName();
+ //TODO improve list of annotations that never need children.
+ if(QUALIFIER_ANNOTATION_TYPE_NAME.equals(qn)
+ || ANY_QUALIFIER_TYPE_NAME.equals(qn)
+ || DEFAULT_QUALIFIER_TYPE_NAME.equals(qn)
+ || SPECIALIZES_ANNOTATION_TYPE_NAME.equals(qn)
+ || DECORATOR_STEREOTYPE_TYPE_NAME.equals(qn)
+ || INJECT_ANNOTATION_TYPE_NAME.equals(qn)
+ || PRODUCES_ANNOTATION_TYPE_NAME.equals(qn)) {
+ d.setHasClosingTag(false);
+ }
+ }
+ d.setMember(m);
+ tagData.add(d);
}
}
protected void addTagNameProposals(ContentAssistRequest contentAssistRequest,
int childPosition, CompletionProposalInvocationContext context) {
- if(!isActive()) {
- return;
+ IDOMNode node = (IDOMNode) contentAssistRequest.getNode();
+ boolean isEnded = (node.getNodeType() != Node.TEXT_NODE) &&
+ node.getFirstStructuredDocumentRegion().isEnded();
+ if(currentNode == parentElement) {
+ parentElement = (Element)parentElement.getParentNode();
+ sax = sax.getParent();
}
- //TODO
- // super.addTagNameProposals(contentAssistRequest, childPosition, context);
+
+ String match = contentAssistRequest.getMatchString();
+
+ Set<TagData> tagData = collectTagData();
+ if(match != null && match.length() > 0) {
+ Iterator<TagData> i = tagData.iterator();
+ while(i.hasNext()) {
+ TagData d = i.next();
+ if(!d.getName().startsWith(match) && d.getName().indexOf(":" + match) < 0) {
+ i.remove();
+ }
+ }
+ }
+
+ for (TagData tag: tagData) {
+ if(tag.isUnique()) {
+ if(XMLUtilities.getUniqueChild((Element)parentElement, tag.getName()) != null) continue;
+ }
+ String tagText = isEnded ? tag.getName() : tag.getText();
+ if(tagText.startsWith("<")) tagText = tagText.substring(1);
+ int positionAdjustment = (tagText.indexOf("><") > 0) ? tagText.indexOf("><") + 1 : tagText.length();
+ String displayText = tag.getName();
+ if(tag.getMember() instanceof IType) {
+ displayText += " - " + ((IType)tag.getMember()).getPackageFragment().getElementName();
+ }
+ createProposal(contentAssistRequest, tagText, displayText, positionAdjustment, tag.getMember(), tag.getRelevance());
+ }
}
+ private void createProposal(ContentAssistRequest contentAssistRequest, String tagText, String displayText, int positionAdjustment, IMember member, int relevance) {
+ int begin = contentAssistRequest.getReplacementBeginPosition();;
+ int length = contentAssistRequest.getReplacementLength();
+ String proposedInfo = null;
+ if(member != null) {
+ try {
+ proposedInfo = JavadocContentAccess2.getHTMLContent(member, true);
+ } catch (JavaModelException e) {
+ CDISeamConfigUIPlugin.log(e);
+ }
+ }
+ String imagePath = XMLEditorPluginImages.IMG_OBJ_TAG_GENERIC;
+ if(tagText.endsWith("\"")) { //improve that dirty hack
+ imagePath = XMLEditorPluginImages.IMG_OBJ_ATTRIBUTE;
+ }
+ CustomCompletionProposal textProposal = new CustomCompletionProposal(
+ tagText, begin, length, positionAdjustment,
+ XMLEditorPluginImageHelper.getInstance().getImage(imagePath),
+ displayText, null, proposedInfo, relevance);
+ contentAssistRequest.addProposal(textProposal);
+ }
+
+ protected void addAttributeNameProposals(
+ ContentAssistRequest contentAssistRequest,
+ CompletionProposalInvocationContext context) {
+ IType contextType = Util.resolveType(sax, cdi);
+ if(contextType != null) {
+ String match = contentAssistRequest.getMatchString();
+ Set<TagData> tagData = new HashSet<TagData>();
+ addTagData(tagData, getTagNamesForMembers(sax.getPrefix(), contextType, true), RELEVANCE_TAG_MEMBER);
+ for (TagData tag: tagData) {
+ String attrName = tag.getName().substring(tag.getName().indexOf(':') + 1);
+ if(parentElement.hasAttribute(attrName)) continue;
+ if(match != null && !attrName.startsWith(match)) continue;
+ String tagText = attrName + "=\"\"";
+ int positionAdjustment = tagText.length() - 1;
+ createProposal(contentAssistRequest, tagText, attrName, positionAdjustment, tag.getMember(), tag.getRelevance());
+ }
+ }
+
+ }
+
@Override
protected XMLContentModelGenerator getContentGenerator() {
return new XMLContentModelGenerator();
@@ -295,29 +396,35 @@
}
}
- Set<String> getAllTagNames(boolean annotationsOnly) throws JavaModelException {
- Set<String> result = new HashSet<String>();
+ Map<String, IMember> getAllTagNames(boolean annotationsOnly) throws JavaModelException {
+ Map<String, IMember> result = new HashMap<String, IMember>();
for (String packageName: prefixByPackage.keySet()) {
String prefix = prefixByPackage.get(packageName);
- Set<String> typeNames = findTypeNamesByPackage(javaProject, packageName, annotationsOnly);
- for (String typeName: typeNames) result.add(prefix + ":" + typeName);
+ Map<String, IMember> typeNames = findTypeNamesByPackage(javaProject, packageName, annotationsOnly);
+ for (String typeName: typeNames.keySet()) {
+ result.put(prefix + ":" + typeName, typeNames.get(typeName));
+ }
}
return result;
}
- Set<String> getTypeNamesByPrefix(String prefix, boolean annotationsOnly) throws JavaModelException {
- Set<String> result = new HashSet<String>();
+ Map<String, IMember> getTypeNamesByPrefix(String prefix, boolean annotationsOnly) throws JavaModelException {
+ Map<String, IMember> result = new HashMap<String, IMember>();
String uri = uriByPrefix.get(prefix);
for (String packageName: Util.getPackages(uri)) {
- result.addAll(findTypeNamesByPackage(javaProject, packageName, annotationsOnly));
+ result.putAll(findTypeNamesByPackage(javaProject, packageName, annotationsOnly));
}
return result;
}
- public static Set<String> findTypeNamesByPackage(IJavaProject javaProject, String packageName, boolean annotationsOnly) throws JavaModelException {
- Set<String> result = new HashSet<String>();
+ public static Map<String, IMember> findTypeNamesByPackage(IJavaProject javaProject, String packageName, boolean annotationsOnly) throws JavaModelException {
+ Map<String, IMember> result = new HashMap<String, IMember>();
if(PACKAGE_EE.equals(packageName)) {
- result.addAll(Util.EE_TYPES.keySet());
+ for (String name: Util.EE_TYPES.keySet()) {
+ String cls = Util.EE_TYPES.get(name);
+ IType t = EclipseJavaUtil.findType(javaProject, cls);
+ if(accept(t, annotationsOnly)) result.put(name, t);
+ }
} else if(javaProject != null) {
IPackageFragmentRoot[] rs = javaProject.getAllPackageFragmentRoots();
for (IPackageFragmentRoot r: rs) {
@@ -326,11 +433,11 @@
ICompilationUnit[] units = pkg.getCompilationUnits();
for (ICompilationUnit u: units) {
IType[] ts = u.getTypes();
- for (IType t: ts) if(accept(t, annotationsOnly)) result.add(t.getElementName());
+ for (IType t: ts) if(accept(t, annotationsOnly)) result.put(t.getElementName(), t);
}
IClassFile[] cs = pkg.getClassFiles();
for (IClassFile cls: cs) {
- if(accept(cls.getType(), annotationsOnly)) result.add(cls.getType().getElementName());
+ if(accept(cls.getType(), annotationsOnly)) result.put(cls.getType().getElementName(), cls.getType());
}
}
}
@@ -343,16 +450,18 @@
return (type != null) && (!annotationOnly || type.isAnnotation());
}
- private Set<String> getTagNamesForMembers(String prefix, IType type) {
- Set<String> result = new HashSet<String>();
+ private Map<String, IMember> getTagNamesForMembers(String prefix, IType type, boolean fieldsOnly) {
+ Map<String, IMember> result = new HashMap<String, IMember>();
try {
IField[] fs = type.getFields();
for (IField f: fs) {
- result.add(prefix + ":" + f.getElementName());
+ result.put(prefix + ":" + f.getElementName(), f);
}
- IMethod[] ms = type.getMethods();
- for (IMethod m: ms) {
- result.add(prefix + ":" + m.getElementName());
+ if(!fieldsOnly || type.isAnnotation()) {
+ IMethod[] ms = type.getMethods();
+ for (IMethod m: ms) {
+ result.put(prefix + ":" + m.getElementName(), m);
+ }
}
} catch (JavaModelException e) {
CDISeamConfigUIPlugin.log(e);
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.ui/src/org/jboss/tools/cdi/seam/config/ui/contentassist/TagData.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.ui/src/org/jboss/tools/cdi/seam/config/ui/contentassist/TagData.java 2011-05-06 18:26:47 UTC (rev 31131)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.ui/src/org/jboss/tools/cdi/seam/config/ui/contentassist/TagData.java 2011-05-06 21:45:04 UTC (rev 31132)
@@ -1,10 +1,14 @@
package org.jboss.tools.cdi.seam.config.ui.contentassist;
+import org.eclipse.jdt.core.IMember;
+
public class TagData {
String name;
boolean hasClosingTag = true;
boolean isUnique = false;
int relevance;
+
+ IMember member;
public TagData(String name, int relevance) {
this.name = name;
@@ -42,4 +46,12 @@
return isUnique;
}
+ public void setMember(IMember member) {
+ this.member = member;
+ }
+
+ public IMember getMember() {
+ return member;
+ }
+
}
13 years, 5 months
- 1
- 0