JBoss Tools SVN: r36345 - trunk/download.jboss.org/jbosstools/examples.
by jbosstools-commits＠lists.jboss.org
Author: fbricon
Date: 2011-11-15 07:55:51 -0500 (Tue, 15 Nov 2011)
New Revision: 36345
Modified:
trunk/download.jboss.org/jbosstools/examples/project-examples-maven-3.3.xml
Log:
Add new Richfaces archetype
Modified: trunk/download.jboss.org/jbosstools/examples/project-examples-maven-3.3.xml
===================================================================
--- trunk/download.jboss.org/jbosstools/examples/project-examples-maven-3.3.xml 2011-11-15 12:22:32 UTC (rev 36344)
+++ trunk/download.jboss.org/jbosstools/examples/project-examples-maven-3.3.xml 2011-11-15 12:55:51 UTC (rev 36345)
@@ -353,8 +353,8 @@
<category>Java EE 6 Quickstarts</category>
<name>jboss-javaee6-poh5-archetype</name>
<included-projects>jboss-javaee6-poh5</included-projects>
- <shortDescription>Java EE 6 Plain Old HTML5 Webapp (Maven archetype)</shortDescription>
- <description>An archetype that generates a starter Java EE 6 Plain Old HTML5 (POH5) webapp project for JBoss AS 7 / EAP 6</description>
+ <shortDescription>Java EE 6 HTML5 Mobile Webapp (Maven archetype)</shortDescription>
+ <description>An archetype that generates a Java EE 6 HTML5 Mobile Webapp project for JBoss AS 7 / EAP 6</description>
<size>165567</size>
<url/>
<fixes>
@@ -390,10 +390,103 @@
<archetypeVersion>7.0.2-SNAPSHOT</archetypeVersion>
<archetypeRepository>http://anonsvn.jboss.org/repos/jbosstools/workspace/fred/repositories/sna...</archetypeRepository>
<groupId>org.jboss.tools.example</groupId>
- <artifactId>poh5</artifactId>
+ <artifactId>html5-webapp</artifactId>
<version>0.0.1-SNAPSHOT</version>
- <javaPackage>org.jboss.tools.example.poh5</javaPackage>
+ <javaPackage>org.jboss.tools.example.html5</javaPackage>
</mavenArchetype>
- <!--targetProjectFacet facet="jst.ear" version="6.0"/-->
</project>
+ <!-- Temporary Spring MVC project - replace with Marius' new archetype when it's ready -->
+ <project>
+ <category>Java EE 6 Quickstarts</category>
+ <name>spring-mvc-webapp</name>
+ <included-projects>spring-mvc-webapp</included-projects>
+ <shortDescription>Java EE 6 - Spring MVC Application (Maven archetype)</shortDescription>
+ <description>An archetype that generates a starter Spring MVC application with Java EE persistence settings (server bootstrapped JPA, JTA transaction management) for JBoss AS7 / EAP 6</description>
+ <size>165567</size>
+ <url/>
+ <fixes>
+ <fix type="wtpruntime">
+ <property name="allowed-types">org.jboss.ide.eclipse.as.runtime.70, org.jboss.ide.eclipse.as.runtime.eap.60</property>
+ <property name="description">This project example requires JBoss AS 7.0</property>
+ <property name="downloadId">org.jboss.tools.runtime.core.as.702</property>
+ </fix>
+ <fix type="plugin">
+ <property name="id">org.eclipse.m2e.core</property>
+ <property name="versions">[1.0.0,1.2.0)</property>
+ <property name="description">This project example requires m2e >= 1.0.</property>
+ <property name="connectorIds">org.eclipse.m2e.feature</property>
+ </fix>
+ <fix type="plugin">
+ <property name="id">org.maven.ide.eclipse.wtp</property>
+ <property name="versions">[0.13.1,0.15.0)</property>
+ <property name="description">This project example requires m2eclipse-wtp >= 0.13.1.</property>
+ <property name="connectorIds">org.maven.ide.eclipse.wtp</property>
+ </fix>
+ <fix type="plugin">
+ <property name="id">org.jboss.tools.maven.core</property>
+ <property name="versions">[1.3.0,1.4.0)</property>
+ <property name="description">This project example requires JBoss Maven Tools.</property>
+ <property name="connectorIds">org.jboss.tools.maven.feature,org.jboss.tools.maven.cdi.feature</property>
+ </fix>
+ </fixes>
+ <importType>mavenArchetype</importType>
+ <importTypeDescription>The project example requires the m2e, m2eclipse-wtp and JBoss Maven Integration feature.</importTypeDescription>
+ <mavenArchetype>
+ <archetypeGroupId>org.jboss.spring.archetypes</archetypeGroupId>
+ <archetypeArtifactId>spring-mvc-webapp</archetypeArtifactId>
+ <archetypeVersion>1.0.0-SNAPSHOT</archetypeVersion>
+ <archetypeRepository>http://anonsvn.jboss.org/repos/jbosstools/workspace/fred/repositories/sna...</archetypeRepository>
+ <groupId>org.jboss.tools.example</groupId>
+ <artifactId>spring-mvc-webapp</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <javaPackage>org.jboss.tools.example.springmvc</javaPackage>
+ </mavenArchetype>
+ </project>
+ <!-- Richfaces project -->
+ <project>
+ <category>Java EE 6 Quickstarts</category>
+ <name>richfaces-archetype-simpleapp</name>
+ <included-projects>richfaces-archetype-simpleapp</included-projects>
+ <shortDescription>Java EE 6 - RichFaces Simple Application (Maven archetype)</shortDescription>
+ <description>An archetype that generates a simple Richfaces application</description>
+ <size>165567</size>
+ <url/>
+ <fixes>
+ <fix type="wtpruntime">
+ <property name="allowed-types">org.jboss.ide.eclipse.as.runtime.70, org.jboss.ide.eclipse.as.runtime.eap.60</property>
+ <property name="description">This project example requires JBoss AS 7.0</property>
+ <property name="downloadId">org.jboss.tools.runtime.core.as.702</property>
+ </fix>
+ <fix type="plugin">
+ <property name="id">org.eclipse.m2e.core</property>
+ <property name="versions">[1.0.0,1.2.0)</property>
+ <property name="description">This project example requires m2e >= 1.0.</property>
+ <property name="connectorIds">org.eclipse.m2e.feature</property>
+ </fix>
+ <fix type="plugin">
+ <property name="id">org.maven.ide.eclipse.wtp</property>
+ <property name="versions">[0.13.1,0.15.0)</property>
+ <property name="description">This project example requires m2eclipse-wtp >= 0.13.1.</property>
+ <property name="connectorIds">org.maven.ide.eclipse.wtp</property>
+ </fix>
+ <fix type="plugin">
+ <property name="id">org.jboss.tools.maven.core</property>
+ <property name="versions">[1.3.0,1.4.0)</property>
+ <property name="description">This project example requires JBoss Maven Tools.</property>
+ <property name="connectorIds">org.jboss.tools.maven.feature,org.jboss.tools.maven.cdi.feature</property>
+ </fix>
+ </fixes>
+ <importType>mavenArchetype</importType>
+ <importTypeDescription>The project example requires the m2e, m2eclipse-wtp and JBoss Maven Integration feature.</importTypeDescription>
+ <mavenArchetype>
+ <archetypeGroupId>org.richfaces.archetypes</archetypeGroupId>
+ <archetypeArtifactId>richfaces-archetype-simpleapp</archetypeArtifactId>
+ <archetypeVersion>4.1.0-SNAPSHOT</archetypeVersion>
+ <archetypeRepository>http://repository.jboss.org/nexus/content/repositories/snapshots/</archetypeRepository>
+ <groupId>org.jboss.tools.example</groupId>
+ <artifactId>richfaces-webapp</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <javaPackage>org.jboss.tools.example.richfaces</javaPackage>
+ </mavenArchetype>
+ </project>
</projects>
14 years, 5 months
JBoss Tools SVN: r36344 - workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim/src/org/jboss/tools/browsersim.
by jbosstools-commits＠lists.jboss.org
Author: yradtsevich
Date: 2011-11-15 07:22:32 -0500 (Tue, 15 Nov 2011)
New Revision: 36344
Modified:
workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim/src/org/jboss/tools/browsersim/BrowserSim.java
workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim/src/org/jboss/tools/browsersim/DevicesManager.java
Log:
https://issues.jboss.org/browse/JBIDE-9539 : Browsersim app for testing mobile/desktop web apps
- now configuration file is loaded as stream, not as file
Modified: workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim/src/org/jboss/tools/browsersim/BrowserSim.java
===================================================================
--- workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim/src/org/jboss/tools/browsersim/BrowserSim.java 2011-11-15 02:55:00 UTC (rev 36343)
+++ workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim/src/org/jboss/tools/browsersim/BrowserSim.java 2011-11-15 12:22:32 UTC (rev 36344)
@@ -292,7 +292,7 @@
DevicesList devicesList;
try {
- devicesList = DevicesManager.loadDevicesList(getResourceAsFile(
+ devicesList = DevicesManager.loadDevicesList(getResourceAsStream(
"/org/jboss/tools/browsersim/resources/config/devices.cfg"));
} catch (IOException e) {
devicesList = new DevicesList(new ArrayList<Device>(), 0);
Modified: workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim/src/org/jboss/tools/browsersim/DevicesManager.java
===================================================================
--- workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim/src/org/jboss/tools/browsersim/DevicesManager.java 2011-11-15 02:55:00 UTC (rev 36343)
+++ workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim/src/org/jboss/tools/browsersim/DevicesManager.java 2011-11-15 12:22:32 UTC (rev 36344)
@@ -13,9 +13,10 @@
import java.io.BufferedReader;
import java.io.BufferedWriter;
import java.io.File;
-import java.io.FileReader;
import java.io.FileWriter;
import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
import java.util.ArrayList;
import java.util.List;
import java.util.Observable;
@@ -121,8 +122,8 @@
writer.close();
}
- public static DevicesList loadDevicesList(File file) throws IOException {
- BufferedReader reader = new BufferedReader(new FileReader(file));
+ public static DevicesList loadDevicesList(InputStream inputStream) throws IOException {
+ BufferedReader reader = new BufferedReader(new InputStreamReader(inputStream));
String nextLine = reader.readLine();
int selectedDeviceIndex = 0;
14 years, 5 months
JBoss Tools SVN: r36343 - branches/jbosstools-3.2.x/build/target-platform.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-11-14 21:55:00 -0500 (Mon, 14 Nov 2011)
New Revision: 36343
Modified:
branches/jbosstools-3.2.x/build/target-platform/jbds.target.p2mirror.xml
branches/jbosstools-3.2.x/build/target-platform/multiple.target.p2mirror.xml
Log:
32-bit and 64-bit patches are oddly named but hell, if this works I don't really care that one's called 64333360 and the other 333630. File this under typos/wtfss for 100, Alex.
Modified: branches/jbosstools-3.2.x/build/target-platform/jbds.target.p2mirror.xml
===================================================================
--- branches/jbosstools-3.2.x/build/target-platform/jbds.target.p2mirror.xml 2011-11-15 02:48:28 UTC (rev 36342)
+++ branches/jbosstools-3.2.x/build/target-platform/jbds.target.p2mirror.xml 2011-11-15 02:55:00 UTC (rev 36343)
@@ -169,7 +169,7 @@
<iu id="org.eclipse.tm.terminal.telnet.feature.group" version=""/>
<iu id="org.eclipse.tm.terminal.ssh.feature.group" version=""/>
<iu id="org.eclipse.rcp.patch333630.feature.group" version=""/>
-<iu id="org.eclipse.rcp.patch64333630.feature.group" version=""/>
+<iu id="org.eclipse.rcp.patch64333360.feature.group" version=""/>
</p2.mirror>
</target>
</project>
Modified: branches/jbosstools-3.2.x/build/target-platform/multiple.target.p2mirror.xml
===================================================================
--- branches/jbosstools-3.2.x/build/target-platform/multiple.target.p2mirror.xml 2011-11-15 02:48:28 UTC (rev 36342)
+++ branches/jbosstools-3.2.x/build/target-platform/multiple.target.p2mirror.xml 2011-11-15 02:55:00 UTC (rev 36343)
@@ -207,7 +207,7 @@
<iu id="com.google.gdt.eclipse.suite.e36.feature.feature.group" version=""/>
<iu id="com.google.gwt.eclipse.sdkbundle.e36.feature.2.1.1.feature.group" version=""/>
<iu id="org.eclipse.rcp.patch333630.feature.group" version=""/>
-<iu id="org.eclipse.rcp.patch64333630.feature.group" version=""/>
+<iu id="org.eclipse.rcp.patch64333360.feature.group" version=""/>
<iu id="org.drools.eclipse.feature.feature.group" version=""/>
<iu id="org.drools.eclipse.task.feature.feature.group" version=""/>
<iu id="org.guvnor.tools.feature.feature.group" version=""/>
14 years, 5 months
JBoss Tools SVN: r36342 - branches/jbosstools-3.2.x/build/target-platform.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-11-14 21:48:28 -0500 (Mon, 14 Nov 2011)
New Revision: 36342
Modified:
branches/jbosstools-3.2.x/build/target-platform/multiple.target
branches/jbosstools-3.2.x/build/target-platform/unified.target.p2mirror.xml
Log:
tweak files for consistency
Modified: branches/jbosstools-3.2.x/build/target-platform/multiple.target
===================================================================
--- branches/jbosstools-3.2.x/build/target-platform/multiple.target 2011-11-15 02:48:20 UTC (rev 36341)
+++ branches/jbosstools-3.2.x/build/target-platform/multiple.target 2011-11-15 02:48:28 UTC (rev 36342)
@@ -17,7 +17,7 @@
<unit id="org.eclipse.m2e.sdk.feature.feature.group" version="1.0.0.201106061504"/>
<unit id="org.eclipse.m2e.feature.feature.group" version="1.0.0.201106061504"/>
<unit id="org.maven.ide.eclipse.wtp.feature.feature.group" version="0.13.1.20110728-1800"/>
- <unit id="org.sonatype.m2e.mavenarchiver.feature.feature.group" version="0.14.0.201107260131"/>
+ <unit id="org.sonatype.m2e.mavenarchiver.feature.feature.group" version="0.14.0.201107260131"/>
<unit id="ch.qos.logback.classic" version="0.9.27.v20110224-1110"/>
<unit id="ch.qos.logback.core" version="0.9.27.v20110224-1110"/>
<unit id="ch.qos.logback.slf4j" version="0.9.27.v20110224-1110"/>
Modified: branches/jbosstools-3.2.x/build/target-platform/unified.target.p2mirror.xml
===================================================================
--- branches/jbosstools-3.2.x/build/target-platform/unified.target.p2mirror.xml 2011-11-15 02:48:20 UTC (rev 36341)
+++ branches/jbosstools-3.2.x/build/target-platform/unified.target.p2mirror.xml 2011-11-15 02:48:28 UTC (rev 36342)
@@ -205,13 +205,13 @@
<iu id="org.eclipse.wst.xml_core.feature.feature.group" version=""/>
<iu id="com.google.gdt.eclipse.suite.e36.feature.feature.group" version=""/>
<iu id="com.google.gwt.eclipse.sdkbundle.e36.feature.2.1.1.feature.group" version=""/>
+<iu id="org.eclipse.rcp.patch333630.feature.group" version=""/>
+<iu id="org.eclipse.rcp.patch64333630.feature.group" version=""/>
<iu id="org.drools.eclipse.feature.feature.group" version=""/>
<iu id="org.drools.eclipse.task.feature.feature.group" version=""/>
<iu id="org.guvnor.tools.feature.feature.group" version=""/>
<iu id="org.mozilla.xulrunner.feature.feature.group" version=""/>
<iu id="org.mozilla.xpcom.feature.feature.group" version=""/>
-<iu id="org.eclipse.rcp.patch333630.feature.group" version=""/>
-<iu id="org.eclipse.rcp.patch64333630.feature.group" version=""/>
</p2.mirror>
</target>
</project>
14 years, 5 months
JBoss Tools SVN: r36341 - branches/jbosstools-3.2.x/build/target-platform.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-11-14 21:48:20 -0500 (Mon, 14 Nov 2011)
New Revision: 36341
Modified:
branches/jbosstools-3.2.x/build/target-platform/jbds.target
branches/jbosstools-3.2.x/build/target-platform/multiple.target
branches/jbosstools-3.2.x/build/target-platform/multiple.target.p2mirror.xml
branches/jbosstools-3.2.x/build/target-platform/unified.target
Log:
32-bit and 64-bit patches are oddly named but hell, if this works I don't really care that one's called 64333360 and the other 333630. File this under typos/wtfss for 100, Alex.
Modified: branches/jbosstools-3.2.x/build/target-platform/jbds.target
===================================================================
--- branches/jbosstools-3.2.x/build/target-platform/jbds.target 2011-11-15 02:43:49 UTC (rev 36340)
+++ branches/jbosstools-3.2.x/build/target-platform/jbds.target 2011-11-15 02:48:20 UTC (rev 36341)
@@ -180,7 +180,7 @@
<!-- JBDS-1648 SWT patches -->
<unit id="org.eclipse.rcp.patch333630.feature.group" version="1.0.0"/>
- <unit id="org.eclipse.rcp.patch64333630.feature.group" version="1.0.0"/>
+ <unit id="org.eclipse.rcp.patch64333360.feature.group" version="1.0.0"/>
</location>
</locations>
</target>
Modified: branches/jbosstools-3.2.x/build/target-platform/multiple.target
===================================================================
--- branches/jbosstools-3.2.x/build/target-platform/multiple.target 2011-11-15 02:43:49 UTC (rev 36340)
+++ branches/jbosstools-3.2.x/build/target-platform/multiple.target 2011-11-15 02:48:20 UTC (rev 36341)
@@ -225,7 +225,7 @@
<!-- JBDS-1648 SWT patches -->
<unit id="org.eclipse.rcp.patch333630.feature.group" version="1.0.0"/>
- <unit id="org.eclipse.rcp.patch64333630.feature.group" version="1.0.0"/>
+ <unit id="org.eclipse.rcp.patch64333360.feature.group" version="1.0.0"/>
</location>
</locations>
<includeBundles>
Modified: branches/jbosstools-3.2.x/build/target-platform/multiple.target.p2mirror.xml
===================================================================
--- branches/jbosstools-3.2.x/build/target-platform/multiple.target.p2mirror.xml 2011-11-15 02:43:49 UTC (rev 36340)
+++ branches/jbosstools-3.2.x/build/target-platform/multiple.target.p2mirror.xml 2011-11-15 02:48:20 UTC (rev 36341)
@@ -206,13 +206,13 @@
<iu id="org.eclipse.wst.xml_core.feature.feature.group" version=""/>
<iu id="com.google.gdt.eclipse.suite.e36.feature.feature.group" version=""/>
<iu id="com.google.gwt.eclipse.sdkbundle.e36.feature.2.1.1.feature.group" version=""/>
+<iu id="org.eclipse.rcp.patch333630.feature.group" version=""/>
+<iu id="org.eclipse.rcp.patch64333630.feature.group" version=""/>
<iu id="org.drools.eclipse.feature.feature.group" version=""/>
<iu id="org.drools.eclipse.task.feature.feature.group" version=""/>
<iu id="org.guvnor.tools.feature.feature.group" version=""/>
<iu id="org.mozilla.xulrunner.feature.feature.group" version=""/>
<iu id="org.mozilla.xpcom.feature.feature.group" version=""/>
-<iu id="org.eclipse.rcp.patch333630.feature.group" version=""/>
-<iu id="org.eclipse.rcp.patch64333630.feature.group" version=""/>
</p2.mirror>
</target>
</project>
Modified: branches/jbosstools-3.2.x/build/target-platform/unified.target
===================================================================
--- branches/jbosstools-3.2.x/build/target-platform/unified.target 2011-11-15 02:43:49 UTC (rev 36340)
+++ branches/jbosstools-3.2.x/build/target-platform/unified.target 2011-11-15 02:48:20 UTC (rev 36341)
@@ -225,7 +225,7 @@
<!-- JBDS-1648 SWT patches -->
<unit id="org.eclipse.rcp.patch333630.feature.group" version="1.0.0"/>
- <unit id="org.eclipse.rcp.patch64333630.feature.group" version="1.0.0"/>
+ <unit id="org.eclipse.rcp.patch64333360.feature.group" version="1.0.0"/>
</location>
</locations>
<includeBundles>
14 years, 5 months
JBoss Tools SVN: r36339 - branches/jbosstools-3.2.x/build/target-platform.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-11-14 21:33:07 -0500 (Mon, 14 Nov 2011)
New Revision: 36339
Modified:
branches/jbosstools-3.2.x/build/target-platform/jbds.target.p2mirror.xml
branches/jbosstools-3.2.x/build/target-platform/multiple.target.p2mirror.xml
branches/jbosstools-3.2.x/build/target-platform/unified.target.p2mirror.xml
Log:
JBDS-1648 add swt patches to TPs
Modified: branches/jbosstools-3.2.x/build/target-platform/jbds.target.p2mirror.xml
===================================================================
--- branches/jbosstools-3.2.x/build/target-platform/jbds.target.p2mirror.xml 2011-11-15 02:32:55 UTC (rev 36338)
+++ branches/jbosstools-3.2.x/build/target-platform/jbds.target.p2mirror.xml 2011-11-15 02:33:07 UTC (rev 36339)
@@ -168,6 +168,8 @@
<iu id="org.eclipse.tm.terminal.view.feature.group" version=""/>
<iu id="org.eclipse.tm.terminal.telnet.feature.group" version=""/>
<iu id="org.eclipse.tm.terminal.ssh.feature.group" version=""/>
+<iu id="org.eclipse.rcp.patch333630.feature.group" version=""/>
+<iu id="org.eclipse.rcp.patch64333630.feature.group" version=""/>
</p2.mirror>
</target>
</project>
Modified: branches/jbosstools-3.2.x/build/target-platform/multiple.target.p2mirror.xml
===================================================================
--- branches/jbosstools-3.2.x/build/target-platform/multiple.target.p2mirror.xml 2011-11-15 02:32:55 UTC (rev 36338)
+++ branches/jbosstools-3.2.x/build/target-platform/multiple.target.p2mirror.xml 2011-11-15 02:33:07 UTC (rev 36339)
@@ -211,6 +211,8 @@
<iu id="org.guvnor.tools.feature.feature.group" version=""/>
<iu id="org.mozilla.xulrunner.feature.feature.group" version=""/>
<iu id="org.mozilla.xpcom.feature.feature.group" version=""/>
+<iu id="org.eclipse.rcp.patch333630.feature.group" version=""/>
+<iu id="org.eclipse.rcp.patch64333630.feature.group" version=""/>
</p2.mirror>
</target>
</project>
Modified: branches/jbosstools-3.2.x/build/target-platform/unified.target.p2mirror.xml
===================================================================
--- branches/jbosstools-3.2.x/build/target-platform/unified.target.p2mirror.xml 2011-11-15 02:32:55 UTC (rev 36338)
+++ branches/jbosstools-3.2.x/build/target-platform/unified.target.p2mirror.xml 2011-11-15 02:33:07 UTC (rev 36339)
@@ -210,6 +210,8 @@
<iu id="org.guvnor.tools.feature.feature.group" version=""/>
<iu id="org.mozilla.xulrunner.feature.feature.group" version=""/>
<iu id="org.mozilla.xpcom.feature.feature.group" version=""/>
+<iu id="org.eclipse.rcp.patch333630.feature.group" version=""/>
+<iu id="org.eclipse.rcp.patch64333630.feature.group" version=""/>
</p2.mirror>
</target>
</project>
14 years, 5 months
JBoss Tools SVN: r36338 - branches/jbosstools-3.2.x/build/target-platform.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-11-14 21:32:55 -0500 (Mon, 14 Nov 2011)
New Revision: 36338
Modified:
branches/jbosstools-3.2.x/build/target-platform/jbds.target
branches/jbosstools-3.2.x/build/target-platform/multiple.target
branches/jbosstools-3.2.x/build/target-platform/unified.target
Log:
JBDS-1648 add swt patches to TPs
Modified: branches/jbosstools-3.2.x/build/target-platform/jbds.target
===================================================================
--- branches/jbosstools-3.2.x/build/target-platform/jbds.target 2011-11-15 01:48:10 UTC (rev 36337)
+++ branches/jbosstools-3.2.x/build/target-platform/jbds.target 2011-11-15 02:32:55 UTC (rev 36338)
@@ -178,6 +178,9 @@
<unit id="org.eclipse.tm.terminal.telnet.feature.group" version="2.0.200.v201005032000-3-8_7w311A1A271116"/>
<unit id="org.eclipse.tm.terminal.ssh.feature.group" version="2.0.200.v201005271030-3-A77w312116382141"/>
+ <!-- JBDS-1648 SWT patches -->
+ <unit id="org.eclipse.rcp.patch333630.feature.group" version="1.0.0"/>
+ <unit id="org.eclipse.rcp.patch64333630.feature.group" version="1.0.0"/>
</location>
</locations>
</target>
Modified: branches/jbosstools-3.2.x/build/target-platform/multiple.target
===================================================================
--- branches/jbosstools-3.2.x/build/target-platform/multiple.target 2011-11-15 01:48:10 UTC (rev 36337)
+++ branches/jbosstools-3.2.x/build/target-platform/multiple.target 2011-11-15 02:32:55 UTC (rev 36338)
@@ -222,6 +222,10 @@
<unit id="com.google.gdt.eclipse.suite.e36.feature.feature.group" version="1.4.2.v201012211742"/>
<unit id="com.google.gwt.eclipse.sdkbundle.e36.feature.2.1.1.feature.group" version="2.1.1.v201012170127"/>
+
+ <!-- JBDS-1648 SWT patches -->
+ <unit id="org.eclipse.rcp.patch333630.feature.group" version="1.0.0"/>
+ <unit id="org.eclipse.rcp.patch64333630.feature.group" version="1.0.0"/>
</location>
</locations>
<includeBundles>
@@ -232,4 +236,4 @@
<feature id="org.mozilla.xpcom.feature"/>
</includeBundles>
<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
-</target>
\ No newline at end of file
+</target>
Modified: branches/jbosstools-3.2.x/build/target-platform/unified.target
===================================================================
--- branches/jbosstools-3.2.x/build/target-platform/unified.target 2011-11-15 01:48:10 UTC (rev 36337)
+++ branches/jbosstools-3.2.x/build/target-platform/unified.target 2011-11-15 02:32:55 UTC (rev 36338)
@@ -222,6 +222,10 @@
<unit id="com.google.gdt.eclipse.suite.e36.feature.feature.group" version="1.4.2.v201012211742"/>
<unit id="com.google.gwt.eclipse.sdkbundle.e36.feature.2.1.1.feature.group" version="2.1.1.v201012170127"/>
+
+ <!-- JBDS-1648 SWT patches -->
+ <unit id="org.eclipse.rcp.patch333630.feature.group" version="1.0.0"/>
+ <unit id="org.eclipse.rcp.patch64333630.feature.group" version="1.0.0"/>
</location>
</locations>
<includeBundles>
14 years, 5 months
JBoss Tools SVN: r36337 - trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/launch.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2011-11-14 20:48:10 -0500 (Mon, 14 Nov 2011)
New Revision: 36337
Modified:
trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/launch/JBossLaunchConfigTests.java
trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/launch/LaunchConfigTests.java
Log:
JBIDE-10175 - compile error in tests. feh.
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/launch/JBossLaunchConfigTests.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/launch/JBossLaunchConfigTests.java 2011-11-15 00:04:21 UTC (rev 36336)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/launch/JBossLaunchConfigTests.java 2011-11-15 01:48:10 UTC (rev 36337)
@@ -10,24 +10,11 @@
******************************************************************************/
package org.jboss.ide.eclipse.as.test.launch;
-import static org.jboss.ide.eclipse.as.core.server.internal.launch.configuration.JBossLaunchConfigProperties.areEnvironmentVariablesSet;
-import static org.jboss.ide.eclipse.as.core.server.internal.launch.configuration.JBossLaunchConfigProperties.areProgramArgumentsSet;
-import static org.jboss.ide.eclipse.as.core.server.internal.launch.configuration.JBossLaunchConfigProperties.areVMArgumentsSet;
-import static org.jboss.ide.eclipse.as.core.server.internal.launch.configuration.JBossLaunchConfigProperties.isClasspathProviderSet;
-import static org.jboss.ide.eclipse.as.core.server.internal.launch.configuration.JBossLaunchConfigProperties.isClasspathSet;
-import static org.jboss.ide.eclipse.as.core.server.internal.launch.configuration.JBossLaunchConfigProperties.isConfigSet;
-import static org.jboss.ide.eclipse.as.core.server.internal.launch.configuration.JBossLaunchConfigProperties.isUseDefaultClasspathSet;
-import static org.jboss.ide.eclipse.as.core.server.internal.launch.configuration.JBossLaunchConfigProperties.isEndorsedDirSet;
-import static org.jboss.ide.eclipse.as.core.server.internal.launch.configuration.JBossLaunchConfigProperties.isHostSet;
-import static org.jboss.ide.eclipse.as.core.server.internal.launch.configuration.JBossLaunchConfigProperties.isJreContainerSet;
-import static org.jboss.ide.eclipse.as.core.server.internal.launch.configuration.JBossLaunchConfigProperties.isMainTypeSet;
-import static org.jboss.ide.eclipse.as.core.server.internal.launch.configuration.JBossLaunchConfigProperties.isServerHomeSet;
-import static org.jboss.ide.eclipse.as.core.server.internal.launch.configuration.JBossLaunchConfigProperties.isServerIdSet;
-import static org.jboss.ide.eclipse.as.core.server.internal.launch.configuration.JBossLaunchConfigProperties.isWorkingDirectorySet;
-
import org.eclipse.core.runtime.CoreException;
import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
import org.eclipse.wst.server.core.IServer;
+import org.jboss.ide.eclipse.as.core.server.internal.launch.configuration.JBossLaunchConfigProperties;
+import org.jboss.ide.eclipse.as.core.server.internal.v7.JBoss7LaunchConfigProperties;
import org.jboss.ide.eclipse.as.test.util.ServerRuntimeUtils;
/**
@@ -44,21 +31,21 @@
public void testConfiguration() throws CoreException {
ILaunchConfigurationWorkingCopy launchConfig = LaunchConfigConfiguratorFactory.createCustomConfigLocationLaunchConfig(mockServer);
-
- assertTrue(areProgramArgumentsSet(launchConfig));
- assertTrue(areVMArgumentsSet(launchConfig));
- assertTrue(isHostSet(launchConfig));
- assertTrue(isMainTypeSet(launchConfig));
- assertTrue(isWorkingDirectorySet(launchConfig));
- assertTrue(areEnvironmentVariablesSet(launchConfig));
- assertTrue(isClasspathSet(launchConfig));
- assertTrue(isClasspathProviderSet(launchConfig));
- assertTrue(isUseDefaultClasspathSet(launchConfig));
- assertTrue(isJreContainerSet(launchConfig));
- assertTrue(isConfigSet(launchConfig));
- assertTrue(isServerHomeSet(launchConfig));
- assertTrue(isEndorsedDirSet(launchConfig));
- assertTrue(isServerIdSet(launchConfig));
+ JBossLaunchConfigProperties props = new JBossLaunchConfigProperties();
+ assertTrue(props.areProgramArgumentsSet(launchConfig));
+ assertTrue(props.areVMArgumentsSet(launchConfig));
+ assertTrue(props.isHostSet(launchConfig));
+ assertTrue(props.isMainTypeSet(launchConfig));
+ assertTrue(props.isWorkingDirectorySet(launchConfig));
+ assertTrue(props.areEnvironmentVariablesSet(launchConfig));
+ assertTrue(props.isClasspathSet(launchConfig));
+ assertTrue(props.isClasspathProviderSet(launchConfig));
+ assertTrue(props.isUseDefaultClasspathSet(launchConfig));
+ assertTrue(props.isJreContainerSet(launchConfig));
+ assertTrue(props.isConfigSet(launchConfig));
+ assertTrue(props.isServerHomeSet(launchConfig));
+ assertTrue(props.isEndorsedDirSet(launchConfig));
+ assertTrue(props.isServerIdSet(launchConfig));
}
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/launch/LaunchConfigTests.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/launch/LaunchConfigTests.java 2011-11-15 00:04:21 UTC (rev 36336)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/launch/LaunchConfigTests.java 2011-11-15 01:48:10 UTC (rev 36337)
@@ -10,8 +10,6 @@
******************************************************************************/
package org.jboss.ide.eclipse.as.test.launch;
-import static org.jboss.ide.eclipse.as.core.server.internal.launch.configuration.JBossLaunchConfigProperties.isServerHomeSet;
-
import java.util.List;
import junit.framework.TestCase;
@@ -23,6 +21,7 @@
import org.jboss.ide.eclipse.as.core.server.internal.JBossServer;
import org.jboss.ide.eclipse.as.core.server.internal.launch.configuration.AbstractStartLaunchConfigurator;
import org.jboss.ide.eclipse.as.core.server.internal.launch.configuration.ILaunchConfigConfigurator;
+import org.jboss.ide.eclipse.as.core.server.internal.launch.configuration.JBossLaunchConfigProperties;
import org.jboss.ide.eclipse.as.test.util.ServerRuntimeUtils;
/**
@@ -117,17 +116,22 @@
protected String getDefaultVMArguments(IJBossServerRuntime runtime) {
return null;
}
+
+ @Override
+ protected String getJavaLibraryPath(IJBossServerRuntime runtime) {
+ return null;
+ }
};
public void testServerHomeIsNotSetIfNotCustomConfigLocation() throws CoreException {
ILaunchConfigurationWorkingCopy launchConfig = LaunchConfigConfiguratorFactory.createNonCustomConfigLocationLaunchConfig(mockServer);
-
- assertFalse(isServerHomeSet(launchConfig));
+ JBossLaunchConfigProperties props = new JBossLaunchConfigProperties();
+ assertFalse(props.isServerHomeSet(launchConfig));
}
public void testServerHomeIsSetIfCustomConfigLocation() throws CoreException {
ILaunchConfigurationWorkingCopy launchConfig = LaunchConfigConfiguratorFactory.createCustomConfigLocationLaunchConfig(mockServer);
-
- assertTrue(isServerHomeSet(launchConfig));
+ JBossLaunchConfigProperties props = new JBossLaunchConfigProperties();
+ assertTrue(props.isServerHomeSet(launchConfig));
}
}
14 years, 5 months
JBoss Tools SVN: r36336 - in trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui: wizard/xpl and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2011-11-14 19:04:21 -0500 (Mon, 14 Nov 2011)
New Revision: 36336
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/AddQualifiersToBeanProcessor.java
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MarkerResolutionUtils.java
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/xpl/AddQualifiersToBeanComposite.java
Log:
Quickfix and Wizard for fixing ambigious injection warning is confusing https://issues.jboss.org/browse/JBIDE-9940
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/AddQualifiersToBeanProcessor.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/AddQualifiersToBeanProcessor.java 2011-11-14 22:10:18 UTC (rev 36335)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/AddQualifiersToBeanProcessor.java 2011-11-15 00:04:21 UTC (rev 36336)
@@ -17,14 +17,19 @@
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.OperationCanceledException;
+import org.eclipse.jdt.core.ICompilationUnit;
+import org.eclipse.jdt.core.refactoring.CompilationUnitChange;
import org.eclipse.ltk.core.refactoring.CompositeChange;
import org.eclipse.ltk.core.refactoring.RefactoringStatus;
+import org.eclipse.ltk.core.refactoring.TextFileChange;
import org.eclipse.ltk.core.refactoring.participants.CheckConditionsContext;
+import org.eclipse.text.edits.MultiTextEdit;
import org.jboss.tools.cdi.core.CDICoreMessages;
import org.jboss.tools.cdi.core.IBean;
import org.jboss.tools.cdi.core.IInjectionPoint;
import org.jboss.tools.cdi.ui.refactoring.CDIRefactoringProcessor;
import org.jboss.tools.cdi.ui.wizard.xpl.AddQualifiersToBeanComposite.ValuedQualifier;
+import org.jboss.tools.common.EclipseUtil;
public class AddQualifiersToBeanProcessor extends CDIRefactoringProcessor {
protected IBean selectedBean;
@@ -73,11 +78,37 @@
}
createRootChange();
+
+ IFile file = (IFile)selectedBean.getBeanClass().getResource();
+ ICompilationUnit compilationUnit = EclipseUtil.getCompilationUnit(file);
+
+ CompilationUnitChange fileChange = new CompilationUnitChange(file.getName(), compilationUnit);
+
+ MultiTextEdit edit = new MultiTextEdit();
- MarkerResolutionUtils.addQualifiersToBean(qualifiers, selectedBean, rootChange);
+ MarkerResolutionUtils.addQualifiersToBean(qualifiers, selectedBean, compilationUnit, edit);
+
+ IFile file2 = (IFile)injectionPoint.getClassBean().getResource();
+ ICompilationUnit compilationUnit2 = injectionPoint.getClassBean().getBeanClass().getCompilationUnit();
+
+ if(!compilationUnit.equals(compilationUnit2)){
+ if(edit.getChildrenSize() > 0){
+ fileChange.setEdit(edit);
+ rootChange.add(fileChange);
+ }
+ fileChange = new CompilationUnitChange(file2.getName(), compilationUnit2);
+
+ edit = new MultiTextEdit();
+ }else{
+ compilationUnit2 = compilationUnit;
+ }
- MarkerResolutionUtils.addQualifiersToInjectionPoint(qualifiers, injectionPoint, rootChange);
+ MarkerResolutionUtils.addQualifiersToInjectionPoint(qualifiers, injectionPoint, compilationUnit2, edit);
+ if(edit.getChildrenSize() > 0){
+ fileChange.setEdit(edit);
+ rootChange.add(fileChange);
+ }
return status;
}
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MarkerResolutionUtils.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MarkerResolutionUtils.java 2011-11-14 22:10:18 UTC (rev 36335)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MarkerResolutionUtils.java 2011-11-15 00:04:21 UTC (rev 36336)
@@ -18,7 +18,6 @@
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import org.eclipse.core.resources.IFile;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.jdt.core.Flags;
@@ -40,8 +39,6 @@
import org.eclipse.jdt.core.ITypeParameter;
import org.eclipse.jdt.core.JavaModelException;
import org.eclipse.jdt.core.Signature;
-import org.eclipse.ltk.core.refactoring.CompositeChange;
-import org.eclipse.ltk.core.refactoring.TextFileChange;
import org.eclipse.text.edits.DeleteEdit;
import org.eclipse.text.edits.InsertEdit;
import org.eclipse.text.edits.MultiTextEdit;
@@ -58,8 +55,8 @@
import org.jboss.tools.cdi.core.IQualifierDeclaration;
import org.jboss.tools.cdi.ui.CDIUIPlugin;
import org.jboss.tools.cdi.ui.wizard.xpl.AddQualifiersToBeanComposite.ValuedQualifier;
-import org.jboss.tools.common.EclipseUtil;
import org.jboss.tools.common.model.util.EclipseJavaUtil;
+import org.jboss.tools.common.util.BeanUtil;
/**
* @author Daniel Azarov
@@ -178,13 +175,24 @@
compilationUnit.createImport(qualifiedName, null, new NullProgressMonitor());
}
}else{
- TextEdit edit = new InsertEdit(compilationUnit.getImportContainer().getSourceRange().getOffset()+compilationUnit.getImportContainer().getSourceRange().getLength(), compilationUnit.findRecommendedLineSeparator()+IMPORT+SPACE+qualifiedName+SEMICOLON);
- rootEdit.addChild(edit);
+ String text = compilationUnit.findRecommendedLineSeparator()+IMPORT+SPACE+qualifiedName+SEMICOLON;
+ if(!isDuplicate(rootEdit, text)){
+ TextEdit edit = new InsertEdit(compilationUnit.getImportContainer().getSourceRange().getOffset()+compilationUnit.getImportContainer().getSourceRange().getLength(), text);
+ rootEdit.addChild(edit);
+ }
}
}
return false;
}
+ private static boolean isDuplicate(MultiTextEdit rootEdit, String text){
+ for(TextEdit edit : rootEdit.getChildren()){
+ if(edit instanceof InsertEdit && ((InsertEdit) edit).getText().equals(text))
+ return true;
+ }
+ return false;
+ }
+
public static void addAnnotation(String qualifiedName, ICompilationUnit compilationUnit, IJavaElement element) throws JavaModelException{
addAnnotation(qualifiedName, compilationUnit, element, "");
}
@@ -528,15 +536,8 @@
return null;
}
- public static void addQualifiersToInjectionPoint(List<ValuedQualifier> deployed, IInjectionPoint injectionPoint, CompositeChange change){
- IFile file = (IFile)injectionPoint.getClassBean().getResource();
+ public static void addQualifiersToInjectionPoint(List<ValuedQualifier> deployed, IInjectionPoint injectionPoint, ICompilationUnit compilationUnit, MultiTextEdit edit){
try{
- ICompilationUnit compilationUnit = injectionPoint.getClassBean().getBeanClass().getCompilationUnit();
-
- TextFileChange fileChange = new TextFileChange(file.getName(), file);
-
- MultiTextEdit edit = new MultiTextEdit();
-
if(injectionPoint instanceof IInjectionPointParameter){
addQualifiersToParameter(compilationUnit, injectionPoint, deployed, edit);
}else{
@@ -560,20 +561,13 @@
}
}
}
-
- if(edit.getChildrenSize() > 0){
- fileChange.setEdit(edit);
- change.add(fileChange);
- }
}catch(CoreException ex){
CDIUIPlugin.getDefault().logError(ex);
}
}
- public static void addQualifiersToBean(List<ValuedQualifier> deployed, IBean bean, CompositeChange change){
- IFile file = (IFile)bean.getBeanClass().getResource();
-
+ public static void addQualifiersToBean(List<ValuedQualifier> deployed, IBean bean, ICompilationUnit compilationUnit, MultiTextEdit edit){
IJavaElement beanElement = null;
if(bean instanceof IBeanField){
beanElement = ((IBeanField) bean).getField();
@@ -584,12 +578,6 @@
}
try{
- ICompilationUnit compilationUnit = EclipseUtil.getCompilationUnit(file);
-
- TextFileChange fileChange = new TextFileChange(file.getName(), file);
-
- MultiTextEdit edit = new MultiTextEdit();
-
for(IQualifierDeclaration declaration : bean.getQualifierDeclarations()){
IQualifier qualifier = declaration.getQualifier();
String qualifierName = qualifier.getSourceType().getFullyQualifiedName();
@@ -611,11 +599,6 @@
}
}
-
- if(edit.getChildrenSize() > 0){
- fileChange.setEdit(edit);
- change.add(fileChange);
- }
}catch(CoreException ex){
CDIUIPlugin.getDefault().logError(ex);
}
@@ -856,4 +839,23 @@
}
return null;
}
+
+ public static String getELName(IBean bean){
+ String name;
+ if(bean instanceof IBeanField){
+ name = ((IBeanField) bean).getField().getElementName();
+ }else if(bean instanceof IBeanMethod){
+ name = ((IBeanMethod) bean).getMethod().getElementName();
+ if(BeanUtil.isGetter(((IBeanMethod) bean).getMethod())) {
+ return BeanUtil.getPropertyName(name);
+ }
+ }else{
+ name = bean.getBeanClass().getElementName();
+ if(name.length() > 0) {
+ name = name.substring(0, 1).toLowerCase() + name.substring(1);
+ }
+ }
+
+ return name;
+ }
}
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/xpl/AddQualifiersToBeanComposite.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/xpl/AddQualifiersToBeanComposite.java 2011-11-14 22:10:18 UTC (rev 36335)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/xpl/AddQualifiersToBeanComposite.java 2011-11-15 00:04:21 UTC (rev 36336)
@@ -133,6 +133,7 @@
public void init(IBean bean){
this.bean = bean;
+ String beanName = MarkerResolutionUtils.getELName(bean);
originalQualifiers.clear();
deployed.clear();
for(IQualifier q : bean.getQualifiers()){
@@ -148,6 +149,7 @@
defaultQualifier = new ValuedQualifier(bean.getCDIProject().getQualifier(CDIConstants.DEFAULT_QUALIFIER_TYPE_NAME));
namedQualifier = new ValuedQualifier(bean.getCDIProject().getQualifier(CDIConstants.NAMED_QUALIFIER_TYPE_NAME));
+ namedQualifier.setValue(beanName);
for(ValuedQualifier q : originalQualifiers){
if(q.equals(defaultQualifier)){
@@ -174,6 +176,8 @@
}
private ValuedQualifier loadAvailableQualifiers(){
+ String beanName = MarkerResolutionUtils.getELName(bean);
+
ValuedQualifier lastQualifier = null;
String beanTypeName = bean.getBeanClass().getFullyQualifiedName();
String beanPackage = beanTypeName.substring(0,beanTypeName.lastIndexOf(MarkerResolutionUtils.DOT));
@@ -197,6 +201,8 @@
String qualifierPackage = qualifierTypeName.substring(0,qualifierTypeName.lastIndexOf(MarkerResolutionUtils.DOT));
if((isPublic || (samePackage && injectionPointPackage.equals(qualifierPackage))) ){
if(beanJavaProject.findType(qualifierTypeName) != null && injectionPointJavaProject.findType(qualifierTypeName) != null){
+ if(q.getSourceType().getFullyQualifiedName().equals(CDIConstants.NAMED_QUALIFIER_TYPE_NAME))
+ vq.setValue(beanName);
qualifiers.add(vq);
availableTableViewer.add(vq);
lastQualifier = vq;
14 years, 5 months