JBoss Tools SVN: r35832 - trunk/forge/plugins/org.jboss.tools.forge.runtime.ext/src/org/jboss/tools/forge/runtime/ext.
by jbosstools-commits＠lists.jboss.org
Author: koen.aers(a)jboss.com
Date: 2011-10-20 03:13:34 -0400 (Thu, 20 Oct 2011)
New Revision: 35832
Modified:
trunk/forge/plugins/org.jboss.tools.forge.runtime.ext/src/org/jboss/tools/forge/runtime/ext/MetaCommandAction.java
Log:
cleanup
Modified: trunk/forge/plugins/org.jboss.tools.forge.runtime.ext/src/org/jboss/tools/forge/runtime/ext/MetaCommandAction.java
===================================================================
--- trunk/forge/plugins/org.jboss.tools.forge.runtime.ext/src/org/jboss/tools/forge/runtime/ext/MetaCommandAction.java 2011-10-20 02:22:26 UTC (rev 35831)
+++ trunk/forge/plugins/org.jboss.tools.forge.runtime.ext/src/org/jboss/tools/forge/runtime/ext/MetaCommandAction.java 2011-10-20 07:13:34 UTC (rev 35832)
@@ -44,17 +44,9 @@
private void handleHiddenCommand(String text) {
try {
-// FileWriter fileWriter = new FileWriter("/Users/koen/Temp/handleHiddenCommand.txt", true);
-// BufferedWriter bufferedWriter = new BufferedWriter(fileWriter);
-// bufferedWriter.write("handleHiddenCommand(" + text + ")\n");
if ("plugin-candidates-query".equals(text)) {
-// bufferedWriter.write("query is plugin-candidates-query\n");
shell.print(ESCAPE + "plugin-candidates-answer: " + getPluginCandidates() + ESCAPE);
-// bufferedWriter.write("response sent back to tools\n");
}
-// bufferedWriter.write("about to exit handleHiddenCommand\n");
-// bufferedWriter.flush();
-// fileWriter.close();
} catch (Exception e) {
// ignored
}
@@ -62,35 +54,21 @@
private String getPluginCandidates() {
try {
-// FileWriter fileWriter = new FileWriter("/Users/koen/Temp/getPluginCandidates.txt", true);
-// BufferedWriter bufferedWriter = new BufferedWriter(fileWriter);
-// bufferedWriter.write("getPluginCandidates()\n");
StringBuffer resultBuffer = new StringBuffer();
Map<String, List<PluginMetadata>> plugins = registry.getPlugins();
-// bufferedWriter.write("got the plugins\n");
for (Entry<String, List<PluginMetadata>> entry : plugins.entrySet()) {
-// bufferedWriter.write("processing entry : " + entry.getKey() + "\n");
for (PluginMetadata pluginMeta : entry.getValue()) {
-// bufferedWriter.write("processing pluginMeta : " + pluginMeta.getName());
if (pluginMeta.constrantsSatisfied(shell)) {
-// bufferedWriter.write("pluginMeta : " + pluginMeta.getName() + " satisfies constraints\n");
List<CommandMetadata> commands = pluginMeta.getAllCommands();
-// bufferedWriter.write("got the commands\n");
if (!commands.isEmpty()) {
-// bufferedWriter.write("commands is not empty\n");
resultBuffer.append("p:").append(pluginMeta.getName()).append(' ');
-// bufferedWriter.write("result becomes : " + resultBuffer.toString() + "\n");
for (CommandMetadata commandMeta : commands) {
-// bufferedWriter.write("processing command : " + commandMeta.getName() + "\n");
resultBuffer.append("c:").append(commandMeta.getName()).append(' ');
-// bufferedWriter.write("result becomes : " + resultBuffer.toString() + "\n");
}
}
}
}
}
-// bufferedWriter.write("about to return result : " + resultBuffer.toString() + "\n");
-// bufferedWriter.flush();
return resultBuffer.toString();
} catch (Exception e) {
return null;
13 years, 2 months
JBoss Tools SVN: r35831 - in trunk/as/docs/reference/en-US: images/perspective and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: irooskov(a)redhat.com
Date: 2011-10-19 22:22:26 -0400 (Wed, 19 Oct 2011)
New Revision: 35831
Modified:
trunk/as/docs/reference/en-US/Book_Info.xml
trunk/as/docs/reference/en-US/JBoss_Server_Manager_Reference_Guide.ent
trunk/as/docs/reference/en-US/images/perspective/perspective_4.png
trunk/as/docs/reference/en-US/images/perspective/perspective_5.png
Log:
updated for JBIDE-9093
Modified: trunk/as/docs/reference/en-US/Book_Info.xml
===================================================================
--- trunk/as/docs/reference/en-US/Book_Info.xml 2011-10-19 23:22:18 UTC (rev 35830)
+++ trunk/as/docs/reference/en-US/Book_Info.xml 2011-10-20 02:22:26 UTC (rev 35831)
@@ -5,9 +5,9 @@
<title>JBoss Server Manager Reference Guide</title>
<subtitle>Provides information relating to the JBoss Server Manager.</subtitle>
<productname>JBoss Developer Studio</productname>
- <productnumber>4.1</productnumber>
- <edition>4.1.0</edition>
- <pubsnumber>2</pubsnumber>
+ <productnumber>5.0</productnumber>
+ <edition>5.0.0</edition>
+ <pubsnumber>1</pubsnumber>
<abstract>
<para>The JBoss Server Manager Reference Guide explains how to use the JBoss Server Manager to configure, start, stop the server, to know deployment and archiving processes.</para>
</abstract>
Modified: trunk/as/docs/reference/en-US/JBoss_Server_Manager_Reference_Guide.ent
===================================================================
--- trunk/as/docs/reference/en-US/JBoss_Server_Manager_Reference_Guide.ent 2011-10-19 23:22:18 UTC (rev 35830)
+++ trunk/as/docs/reference/en-US/JBoss_Server_Manager_Reference_Guide.ent 2011-10-20 02:22:26 UTC (rev 35831)
@@ -4,4 +4,4 @@
<!ENTITY HOLDER "Red Hat">
<!ENTITY BZPRODUCT "JBoss Developer Studio">
<!ENTITY BZCOMPONENT "Server Manager Reference Guide">
-<!ENTITY BZURL "<ulink url='https://bugzilla.redhat.com/enter_bug.cgi?product=JBoss%20Develope...'>http://bugzilla.redhat.com/</ulink>">
+<!ENTITY BZURL "<ulink url='https://bugzilla.redhat.com/enter_bug.cgi?product=JBoss%20Develope...'>http://bugzilla.redhat.com/</ulink>">
Modified: trunk/as/docs/reference/en-US/images/perspective/perspective_4.png
===================================================================
(Binary files differ)
Modified: trunk/as/docs/reference/en-US/images/perspective/perspective_5.png
===================================================================
(Binary files differ)
13 years, 2 months
JBoss Tools SVN: r35830 - in trunk/as: features/org.jboss.ide.eclipse.as.test.source.feature and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-10-19 19:22:18 -0400 (Wed, 19 Oct 2011)
New Revision: 35830
Modified:
trunk/as/features/org.jboss.ide.eclipse.as.test.feature/feature.xml
trunk/as/features/org.jboss.ide.eclipse.as.test.source.feature/feature.xml
trunk/as/tests/pom.xml
Log:
https://issues.jboss.org/browse/JBIDE-9871 as it turns out there is no usch thing as org.jboss.ide.eclipse.as.openshift.test, so let's just remove that, mmkay\?
Modified: trunk/as/features/org.jboss.ide.eclipse.as.test.feature/feature.xml
===================================================================
--- trunk/as/features/org.jboss.ide.eclipse.as.test.feature/feature.xml 2011-10-19 23:18:57 UTC (rev 35829)
+++ trunk/as/features/org.jboss.ide.eclipse.as.test.feature/feature.xml 2011-10-19 23:22:18 UTC (rev 35830)
@@ -21,6 +21,5 @@
<plugin id="org.jboss.ide.eclipse.as.test" download-size="0" install-size="0" version="0.0.0" />
<plugin id="org.jboss.ide.eclipse.as.ui.test" download-size="0" install-size="0" version="0.0.0" unpack="false" />
- <plugin id="org.jboss.ide.eclipse.as.openshift.test" download-size="0" install-size="0" version="0.0.0" unpack="false" />
<plugin id="org.jboss.tools.openshift.express.client.test" download-size="0" install-size="0" version="0.0.0" unpack="false" />
</feature>
Modified: trunk/as/features/org.jboss.ide.eclipse.as.test.source.feature/feature.xml
===================================================================
--- trunk/as/features/org.jboss.ide.eclipse.as.test.source.feature/feature.xml 2011-10-19 23:18:57 UTC (rev 35829)
+++ trunk/as/features/org.jboss.ide.eclipse.as.test.source.feature/feature.xml 2011-10-19 23:22:18 UTC (rev 35830)
@@ -22,6 +22,5 @@
<plugin id="org.jboss.ide.eclipse.as.test.source" download-size="0" install-size="0" version="0.0.0" unpack="false" />
<plugin id="org.jboss.ide.eclipse.as.ui.test.source" download-size="0" install-size="0" version="0.0.0" unpack="false" />
- <plugin id="org.jboss.ide.eclipse.as.openshift.test.source" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
<plugin id="org.jboss.tools.openshift.express.client.test.source" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
</feature>
Modified: trunk/as/tests/pom.xml
===================================================================
--- trunk/as/tests/pom.xml 2011-10-19 23:18:57 UTC (rev 35829)
+++ trunk/as/tests/pom.xml 2011-10-19 23:22:18 UTC (rev 35830)
@@ -17,7 +17,6 @@
<module>org.jboss.ide.eclipse.as.test</module>
<module>org.jboss.ide.eclipse.as.ui.test</module>
- <module>org.jboss.ide.eclipse.as.openshift.test</module>
<module>org.jboss.tools.openshift.express.client.test</module>
</modules>
</project>
13 years, 2 months
JBoss Tools SVN: r35829 - in trunk/as: features/org.jboss.ide.eclipse.as.test.source.feature and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-10-19 19:18:57 -0400 (Wed, 19 Oct 2011)
New Revision: 35829
Modified:
trunk/as/features/org.jboss.ide.eclipse.as.test.feature/feature.xml
trunk/as/features/org.jboss.ide.eclipse.as.test.source.feature/feature.xml
trunk/as/tests/pom.xml
Log:
https://issues.jboss.org/browse/JBIDE-9871 because reminding people != actually getting them to do the work, apparently
Modified: trunk/as/features/org.jboss.ide.eclipse.as.test.feature/feature.xml
===================================================================
--- trunk/as/features/org.jboss.ide.eclipse.as.test.feature/feature.xml 2011-10-19 23:11:58 UTC (rev 35828)
+++ trunk/as/features/org.jboss.ide.eclipse.as.test.feature/feature.xml 2011-10-19 23:18:57 UTC (rev 35829)
@@ -13,9 +13,14 @@
%license
</license>
- <plugin id="org.jboss.ide.eclipse.as.test" download-size="0" install-size="0" version="0.0.0" />
<plugin id="org.jboss.tools.jmx.core.test" download-size="0" install-size="0" version="0.0.0" />
- <plugin id="org.jboss.ide.eclipse.as.ui.test" download-size="0" install-size="0" version="0.0.0" unpack="false" />
+
<plugin id="org.jboss.ide.eclipse.as.archives.integration.test" download-size="0" install-size="0" version="0.0.0" unpack="false" />
+ <plugin id="org.jboss.ide.eclipse.as.egit.test" download-size="0" install-size="0" version="0.0.0" unpack="false" />
<plugin id="org.jboss.ide.eclipse.as.management.as7.tests" download-size="0" install-size="0" version="0.0.0" unpack="false" />
+ <plugin id="org.jboss.ide.eclipse.as.test" download-size="0" install-size="0" version="0.0.0" />
+ <plugin id="org.jboss.ide.eclipse.as.ui.test" download-size="0" install-size="0" version="0.0.0" unpack="false" />
+
+ <plugin id="org.jboss.ide.eclipse.as.openshift.test" download-size="0" install-size="0" version="0.0.0" unpack="false" />
+ <plugin id="org.jboss.tools.openshift.express.client.test" download-size="0" install-size="0" version="0.0.0" unpack="false" />
</feature>
Modified: trunk/as/features/org.jboss.ide.eclipse.as.test.source.feature/feature.xml
===================================================================
--- trunk/as/features/org.jboss.ide.eclipse.as.test.source.feature/feature.xml 2011-10-19 23:11:58 UTC (rev 35828)
+++ trunk/as/features/org.jboss.ide.eclipse.as.test.source.feature/feature.xml 2011-10-19 23:18:57 UTC (rev 35829)
@@ -17,16 +17,11 @@
</license>
<plugin id="org.jboss.ide.eclipse.as.archives.integration.test.source" download-size="0" install-size="0" version="0.0.0" unpack="false" />
+ <plugin id="org.jboss.ide.eclipse.as.egit.test.source" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
+ <plugin id="org.jboss.ide.eclipse.as.management.as7.tests.source" download-size="0" install-size="0" version="0.0.0" unpack="false" />
<plugin id="org.jboss.ide.eclipse.as.test.source" download-size="0" install-size="0" version="0.0.0" unpack="false" />
<plugin id="org.jboss.ide.eclipse.as.ui.test.source" download-size="0" install-size="0" version="0.0.0" unpack="false" />
- <plugin id="org.jboss.ide.eclipse.as.management.as7.tests.source" download-size="0" install-size="0" version="0.0.0" unpack="false" />
- <!-- JBIDE-9871 :: TODO: add to ../pom.xml
- <plugin id="org.jboss.ide.eclipse.as.egit.test.source" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
- -->
-
- <!-- JBIDE-9871 :: TODO: add to ../pom.xml
- <plugin id="org.jboss.tools.openshift.express.client.test.source" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
- <plugin id="org.jboss.ide.eclipse.as.openshift.test.source" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
- -->
+ <plugin id="org.jboss.ide.eclipse.as.openshift.test.source" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
+ <plugin id="org.jboss.tools.openshift.express.client.test.source" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
</feature>
Modified: trunk/as/tests/pom.xml
===================================================================
--- trunk/as/tests/pom.xml 2011-10-19 23:11:58 UTC (rev 35828)
+++ trunk/as/tests/pom.xml 2011-10-19 23:18:57 UTC (rev 35829)
@@ -12,18 +12,13 @@
<packaging>pom</packaging>
<modules>
<module>org.jboss.ide.eclipse.as.archives.integration.test</module>
+ <module>org.jboss.ide.eclipse.as.egit.test</module>
+ <module>org.jboss.ide.eclipse.as.management.as7.tests</module>
<module>org.jboss.ide.eclipse.as.test</module>
<module>org.jboss.ide.eclipse.as.ui.test</module>
- <module>org.jboss.ide.eclipse.as.management.as7.tests</module>
- <!-- JBIDE-9871 :: TODO: enable
- <module>org.jboss.ide.eclipse.as.egit.test</module>
- -->
-
- <!-- JBIDE-9871 :: TODO: enable (or move to new component?)
<module>org.jboss.ide.eclipse.as.openshift.test</module>
<module>org.jboss.tools.openshift.express.client.test</module>
- -->
</modules>
</project>
13 years, 2 months
JBoss Tools SVN: r35828 - trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-10-19 19:11:58 -0400 (Wed, 19 Oct 2011)
New Revision: 35828
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIProject.java
Log:
JBIDE-9951
https://issues.jboss.org/browse/JBIDE-9951
Null pointer fixed.
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-10-19 23:08:06 UTC (rev 35827)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIProject.java 2011-10-19 23:11:58 UTC (rev 35828)
@@ -876,19 +876,19 @@
}
}
}
- }
- for (IProject p: ResourcesPlugin.getWorkspace().getRoot().getProjects()) {
- if(p.isAccessible()) {
- CDICorePlugin.getCDI(p, true);
+ for (IProject p: ResourcesPlugin.getWorkspace().getRoot().getProjects()) {
+ if(p.isAccessible()) {
+ CDICorePlugin.getCDI(p, true);
+ }
}
- }
- CDICoreNature[] ns = getNature().getAllDependentProjects();
- for (CDICoreNature n: ns) {
- if(n.getDelegate() instanceof CDIProject) {
- CDIProject p = (CDIProject)n.getDelegate();
- for (IBean b: p.getDeclaredBeans()) {
- if(b instanceof IClassBean) {
- collectObserverMethods((IClassBean)b, eventType, injectionPoint, result);
+ CDICoreNature[] ns = getNature().getAllDependentProjects();
+ for (CDICoreNature n: ns) {
+ if(n.getDelegate() instanceof CDIProject) {
+ CDIProject p = (CDIProject)n.getDelegate();
+ for (IBean b: p.getDeclaredBeans()) {
+ if(b instanceof IClassBean) {
+ collectObserverMethods((IClassBean)b, eventType, injectionPoint, result);
+ }
}
}
}
@@ -907,7 +907,7 @@
result.add(m);
}
}
- }
+ }
}
/**
13 years, 2 months
JBoss Tools SVN: r35827 - in branches/jbosstools-3.3.0.M4/build: target-platform and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-10-19 19:08:06 -0400 (Wed, 19 Oct 2011)
New Revision: 35827
Modified:
branches/jbosstools-3.3.0.M4/build/parent/pom.xml
branches/jbosstools-3.3.0.M4/build/target-platform/multiple.target
branches/jbosstools-3.3.0.M4/build/target-platform/multiple.target.p2mirror.xml
Log:
branch for M4
Modified: branches/jbosstools-3.3.0.M4/build/parent/pom.xml
===================================================================
--- branches/jbosstools-3.3.0.M4/build/parent/pom.xml 2011-10-19 23:05:17 UTC (rev 35826)
+++ branches/jbosstools-3.3.0.M4/build/parent/pom.xml 2011-10-19 23:08:06 UTC (rev 35827)
@@ -41,11 +41,11 @@
<!-- 2a. URL of latest JBT nightly staging composite site (all the components
in once place) -->
<!-- for trunk use _composite_/trunk; for 3.3_stable_branch, use _composite_/3.3.indigo -->
- <jbosstools-nightly-staging-composite>http://download.jboss.org/jbosstools/builds/staging/_composite_/trunk/</jbosstools-nightly-staging-composite>
+ <jbosstools-nightly-staging-composite>http://download.jboss.org/jbosstools/builds/staging/_composite_/3.3.indigo/</jbosstools-nightly-staging-composite>
<!-- 2b. or use -Plocal.composite -Dlocal.composite=file:///path/to/mirror/of/composite/staging/site/ -->
<!-- for trunk use _composite_/trunk; for 3.3_stable_branch, use _composite_/3.3.indigo -->
- <local.composite>file:///home/hudson/static_build_env/jbds/builds/staging/_composite_/trunk/</local.composite>
+ <local.composite>file:///home/hudson/static_build_env/jbds/builds/staging/_composite_/3.3.indigo/</local.composite>
<!-- 3a. URL of latest JBT requirements composite mirror -->
<jboss-requirements-composite-mirror>http://download.jboss.org/jbosstools/updates/indigo/SR1/</jboss-requirements-composite-mirror>
Modified: branches/jbosstools-3.3.0.M4/build/target-platform/multiple.target
===================================================================
--- branches/jbosstools-3.3.0.M4/build/target-platform/multiple.target 2011-10-19 23:05:17 UTC (rev 35826)
+++ branches/jbosstools-3.3.0.M4/build/target-platform/multiple.target 2011-10-19 23:08:06 UTC (rev 35827)
@@ -9,7 +9,7 @@
<locations>
<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
<!-- for trunk use _composite_/trunk; for 3.3_stable_branch, use _composite_/3.3.indigo -->
- <repository location="http://download.jboss.org/jbosstools/builds/staging/_composite_/trunk/"/>
+ <repository location="http://download.jboss.org/jbosstools/builds/staging/_composite_/3.3.indigo/"/>
</location>
<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
Modified: branches/jbosstools-3.3.0.M4/build/target-platform/multiple.target.p2mirror.xml
===================================================================
--- branches/jbosstools-3.3.0.M4/build/target-platform/multiple.target.p2mirror.xml 2011-10-19 23:05:17 UTC (rev 35826)
+++ branches/jbosstools-3.3.0.M4/build/target-platform/multiple.target.p2mirror.xml 2011-10-19 23:08:06 UTC (rev 35827)
@@ -28,7 +28,7 @@
<p2.mirror destination="file://${repoDir}" verbose="${verbose}">
<slicingOptions includeFeatures="true" followStrict="${followStrict}"/>
<source>
-<repository location="http://download.jboss.org/jbosstools/builds/staging/_composite_/trunk/"/>
+<repository location="http://download.jboss.org/jbosstools/builds/staging/_composite_/3.3.indigo/"/>
<repository location="http://download.jboss.org/jbosstools/updates/indigo/SR1/"/>
</source>
<iu id="org.eclipse.m2e.sdk.feature.feature.group" version=""/>
13 years, 2 months
JBoss Tools SVN: r35826 - in trunk/cdi/tests/org.jboss.tools.cdi.core.test: projects/CDITest2/src/cdi/test/observers and 3 other directories.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-10-19 19:05:17 -0400 (Wed, 19 Oct 2011)
New Revision: 35826
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest1/src/cdi/test/observers/CDIBeanTest.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest2/src/cdi/test/observers/TestBean.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/event/fires/DogWhisperer.java
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/tck/ObserverMethodResolutionTest.java
Log:
JBIDE-9951
https://issues.jboss.org/browse/JBIDE-9951
Null pointer fixed.
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest1/src/cdi/test/observers/CDIBeanTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest1/src/cdi/test/observers/CDIBeanTest.java 2011-10-19 22:57:23 UTC (rev 35825)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest1/src/cdi/test/observers/CDIBeanTest.java 2011-10-19 23:05:17 UTC (rev 35826)
@@ -1,9 +1,12 @@
package cdi.test.observers;
import javax.enterprise.event.Observes;
+import javax.inject.Inject;
public class CDIBeanTest {
public void method(@Observes BaseDecoratedInterface event) {
}
+
+ @Inject BaseDecoratedInterface point;
}
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest2/src/cdi/test/observers/TestBean.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest2/src/cdi/test/observers/TestBean.java 2011-10-19 22:57:23 UTC (rev 35825)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest2/src/cdi/test/observers/TestBean.java 2011-10-19 23:05:17 UTC (rev 35826)
@@ -1,9 +1,15 @@
package cdi.test.observers;
import javax.enterprise.event.Event;
+import javax.enterprise.event.Observes;
import javax.inject.Inject;
public class TestBean implements BaseDecoratedInterface {
@Inject
Event<TestBean> event;
+
+ public void observer(@Observes BaseDecoratedInterface event) {
+
+ }
+
}
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/event/fires/DogWhisperer.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/event/fires/DogWhisperer.java 2011-10-19 22:57:23 UTC (rev 35825)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/event/fires/DogWhisperer.java 2011-10-19 23:05:17 UTC (rev 35826)
@@ -22,6 +22,9 @@
class DogWhisperer
{
+ @Inject @Tame @Role("Master")
+ TamingCommand tamingCommand;
+
@Inject @Any @Tame @Role("Master")
Event<TamingCommand> tamingEvent;
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-10-19 22:57:23 UTC (rev 35825)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/DependentProjectTest.java 2011-10-19 23:05:17 UTC (rev 35826)
@@ -389,6 +389,16 @@
assertTrue(p.getDeclaringProject() == CDICorePlugin.getCDIProject(project2, true));
}
+ /**
+ * This test checks that method resolveObserverMethods does not fail with exception (see JBIDE-9951)
+ */
+ public void testNonrelevantInjectionPointAtResolvingObserverMethods() {
+ ICDIProject cdi1 = CDICorePlugin.getCDIProject(project1, true);
+ IInjectionPointField tamingEvent = getInjectionPointField(cdi1, "/src/cdi/test/observers/CDIBeanTest.java", "point");
+ Set<IObserverMethod> observers = tamingEvent.getCDIProject().resolveObserverMethods(tamingEvent);
+ assertTrue(observers.isEmpty());
+ }
+
public void testCleanDependentProject() throws CoreException, IOException {
ICDIProject cdi2 = CDICorePlugin.getCDIProject(project2, true);
boolean saveAutoBuild = ResourcesUtils.setBuildAutomatically(false);
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/ObserverMethodResolutionTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/ObserverMethodResolutionTest.java 2011-10-19 22:57:23 UTC (rev 35825)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/ObserverMethodResolutionTest.java 2011-10-19 23:05:17 UTC (rev 35826)
@@ -29,6 +29,12 @@
*/
public class ObserverMethodResolutionTest extends TCKTest {
+ public void testNonrelevantInjectionPoint() {
+ IInjectionPointField tamingEvent = getInjectionPointField("JavaSource/org/jboss/jsr299/tck/tests/event/fires/DogWhisperer.java", "tamingCommand");
+ Set<IObserverMethod> observers = tamingEvent.getCDIProject().resolveObserverMethods(tamingEvent);
+ assertTrue(observers.isEmpty());
+ }
+
public void testObserverMethodResolution() {
IInjectionPointField tamingEvent = getInjectionPointField("JavaSource/org/jboss/jsr299/tck/tests/event/fires/DogWhisperer.java", "tamingEvent");
assertNotNull(tamingEvent);
13 years, 2 months
JBoss Tools SVN: r35825 - trunk.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-10-19 18:57:23 -0400 (Wed, 19 Oct 2011)
New Revision: 35825
Modified:
trunk/.gitignore
Log:
.gitignore file
Modified: trunk/.gitignore
===================================================================
--- trunk/.gitignore 2011-10-19 22:55:23 UTC (rev 35824)
+++ trunk/.gitignore 2011-10-19 22:57:23 UTC (rev 35825)
@@ -3,3 +3,4 @@
target
buildlog*.txt
build*log*.txt
+.project
13 years, 2 months
JBoss Tools SVN: r35824 - trunk/build/parent.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-10-19 18:55:23 -0400 (Wed, 19 Oct 2011)
New Revision: 35824
Modified:
trunk/build/parent/pom.xml
Log:
fix composite URLs
Modified: trunk/build/parent/pom.xml
===================================================================
--- trunk/build/parent/pom.xml 2011-10-19 22:55:16 UTC (rev 35823)
+++ trunk/build/parent/pom.xml 2011-10-19 22:55:23 UTC (rev 35824)
@@ -41,11 +41,11 @@
<!-- 2a. URL of latest JBT nightly staging composite site (all the components
in once place) -->
<!-- for trunk use _composite_/trunk; for 3.3_stable_branch, use _composite_/3.3.indigo -->
- <jbosstools-nightly-staging-composite>http://download.jboss.org/jbosstools/builds/staging/_composite_/3.3.indigo/</jbosstools-nightly-staging-composite>
+ <jbosstools-nightly-staging-composite>http://download.jboss.org/jbosstools/builds/staging/_composite_/trunk/</jbosstools-nightly-staging-composite>
<!-- 2b. or use -Plocal.composite -Dlocal.composite=file:///path/to/mirror/of/composite/staging/site/ -->
<!-- for trunk use _composite_/trunk; for 3.3_stable_branch, use _composite_/3.3.indigo -->
- <local.composite>file:///home/hudson/static_build_env/jbds/builds/staging/_composite_/3.3.indigo/</local.composite>
+ <local.composite>file:///home/hudson/static_build_env/jbds/builds/staging/_composite_/trunk/</local.composite>
<!-- 3a. URL of latest JBT requirements composite mirror -->
<jboss-requirements-composite-mirror>http://download.jboss.org/jbosstools/updates/indigo/SR1/</jboss-requirements-composite-mirror>
13 years, 2 months
JBoss Tools SVN: r35823 - trunk/build/parent.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-10-19 18:55:16 -0400 (Wed, 19 Oct 2011)
New Revision: 35823
Modified:
trunk/build/parent/pom.xml
Log:
bump to Beta1 in trunk
Modified: trunk/build/parent/pom.xml
===================================================================
--- trunk/build/parent/pom.xml 2011-10-19 21:27:00 UTC (rev 35822)
+++ trunk/build/parent/pom.xml 2011-10-19 22:55:16 UTC (rev 35823)
@@ -18,7 +18,7 @@
<scmBranch>trunk</scmBranch>
<JBT_VERSION>3.3.0</JBT_VERSION>
<JBDS_VERSION>5.0.0</JBDS_VERSION>
- <BUILD_ALIAS>M4</BUILD_ALIAS>
+ <BUILD_ALIAS>Beta1</BUILD_ALIAS>
<memoryOptions1>-Xms512m -Xmx1024m -XX:PermSize=256m</memoryOptions1>
<memoryOptions2>-XX:MaxPermSize=256m</memoryOptions2>
<systemProperties></systemProperties>
@@ -41,11 +41,11 @@
<!-- 2a. URL of latest JBT nightly staging composite site (all the components
in once place) -->
<!-- for trunk use _composite_/trunk; for 3.3_stable_branch, use _composite_/3.3.indigo -->
- <jbosstools-nightly-staging-composite>http://download.jboss.org/jbosstools/builds/staging/_composite_/trunk/</jbosstools-nightly-staging-composite>
+ <jbosstools-nightly-staging-composite>http://download.jboss.org/jbosstools/builds/staging/_composite_/3.3.indigo/</jbosstools-nightly-staging-composite>
<!-- 2b. or use -Plocal.composite -Dlocal.composite=file:///path/to/mirror/of/composite/staging/site/ -->
<!-- for trunk use _composite_/trunk; for 3.3_stable_branch, use _composite_/3.3.indigo -->
- <local.composite>file:///home/hudson/static_build_env/jbds/builds/staging/_composite_/trunk/</local.composite>
+ <local.composite>file:///home/hudson/static_build_env/jbds/builds/staging/_composite_/3.3.indigo/</local.composite>
<!-- 3a. URL of latest JBT requirements composite mirror -->
<jboss-requirements-composite-mirror>http://download.jboss.org/jbosstools/updates/indigo/SR1/</jboss-requirements-composite-mirror>
13 years, 2 months