JBoss Tools SVN: r31171 - branches/jbosstools-3.2.x/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2011-05-09 23:44:55 -0400 (Mon, 09 May 2011)
New Revision: 31171
Modified:
branches/jbosstools-3.2.x/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/ServerModeSectionComposite.java
Log:
JBIDE-8884 - NPE when deploy-only server somehow decides to deploy to server-type deployment instead of custom
Modified: branches/jbosstools-3.2.x/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/ServerModeSectionComposite.java
===================================================================
--- branches/jbosstools-3.2.x/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/ServerModeSectionComposite.java 2011-05-10 03:43:11 UTC (rev 31170)
+++ branches/jbosstools-3.2.x/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/ServerModeSectionComposite.java 2011-05-10 03:44:55 UTC (rev 31171)
@@ -18,7 +18,6 @@
import org.eclipse.swt.layout.FillLayout;
import org.eclipse.swt.layout.FormData;
import org.eclipse.swt.layout.FormLayout;
-import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.widgets.Combo;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.ui.forms.widgets.FormToolkit;
@@ -31,6 +30,7 @@
import org.jboss.ide.eclipse.as.core.server.IDeployableServer;
import org.jboss.ide.eclipse.as.core.server.IJBossServerPublishMethodType;
import org.jboss.ide.eclipse.as.core.server.internal.DeployableServerBehavior;
+import org.jboss.ide.eclipse.as.core.util.IJBossToolingConstants;
import org.jboss.ide.eclipse.as.core.util.ServerConverter;
import org.jboss.ide.eclipse.as.ui.UIUtil;
import org.jboss.ide.eclipse.as.ui.editor.IDeploymentTypeUI.IServerModeUICallback;
@@ -142,20 +142,25 @@
callback.getServer(), IDeployableServer.SERVER_MODE,
ui.getPublishType().getId(), "Change server mode"));
String deployType = null;
- if( ui.getPublishType().getId().equals(LocalPublishMethod.LOCAL_PUBLISH_METHOD)) {
- deployType = IDeployableServer.DEPLOY_METADATA;
- } else {
- deployType = IDeployableServer.DEPLOY_SERVER;
+ if( shouldChangeDefaultDeployType(callback.getServer())) {
+ if( ui.getPublishType().getId().equals(LocalPublishMethod.LOCAL_PUBLISH_METHOD)) {
+ deployType = IDeployableServer.DEPLOY_METADATA;
+ } else {
+ deployType = IDeployableServer.DEPLOY_SERVER;
+ }
+ callback.execute(new ChangeServerPropertyCommand(
+ callback.getServer(), IDeployableServer.DEPLOY_DIRECTORY_TYPE,
+ deployType, "Change server's deploy location"));
}
- callback.execute(new ChangeServerPropertyCommand(
- callback.getServer(), IDeployableServer.DEPLOY_DIRECTORY_TYPE,
- deployType, "Change server's deploy location"));
}
} else {
// null selection
}
}
+ private boolean shouldChangeDefaultDeployType(IServerWorkingCopy server) {
+ return !server.getServerType().getId().equals(IJBossToolingConstants.DEPLOY_ONLY_SERVER);
+ }
public static class ChangeServerPropertyCommand extends ServerCommand {
private IServerWorkingCopy server;
13 years, 5 months
JBoss Tools SVN: r31170 - branches/jbosstools-3.2.x/build/parent.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-05-09 23:43:11 -0400 (Mon, 09 May 2011)
New Revision: 31170
Modified:
branches/jbosstools-3.2.x/build/parent/pom.xml
Log:
bump from M1 to CR1
Modified: branches/jbosstools-3.2.x/build/parent/pom.xml
===================================================================
--- branches/jbosstools-3.2.x/build/parent/pom.xml 2011-05-10 03:43:00 UTC (rev 31169)
+++ branches/jbosstools-3.2.x/build/parent/pom.xml 2011-05-10 03:43:11 UTC (rev 31170)
@@ -15,7 +15,7 @@
<!--tychoVersion>0.10.0-SNAPSHOT</tychoVersion -->
<tychoVersion>0.10.0</tychoVersion>
<scmBranch>branches/jbosstools-3.2.x</scmBranch>
- <BUILD_ALIAS>M1</BUILD_ALIAS>
+ <BUILD_ALIAS>CR1</BUILD_ALIAS>
<memoryOptions1>-Xms512m -Xmx1024m -XX:PermSize=256m</memoryOptions1>
<memoryOptions2>-XX:MaxPermSize=256m</memoryOptions2>
<systemProperties></systemProperties>
13 years, 5 months
JBoss Tools SVN: r31169 - branches/jbosstools-3.2.x/build/parent.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-05-09 23:43:00 -0400 (Mon, 09 May 2011)
New Revision: 31169
Modified:
branches/jbosstools-3.2.x/build/parent/pom.xml
Log:
add -Plocal.requirements -Dlocal.requirements=file://path/to/mirror/ for faster offline and Hudson builds
Modified: branches/jbosstools-3.2.x/build/parent/pom.xml
===================================================================
--- branches/jbosstools-3.2.x/build/parent/pom.xml 2011-05-10 02:38:53 UTC (rev 31168)
+++ branches/jbosstools-3.2.x/build/parent/pom.xml 2011-05-10 03:43:00 UTC (rev 31169)
@@ -42,10 +42,13 @@
<!-- 2a. URL of latest JBT nightly staging composite site (all the components in once place) -->
<jbosstools-nightly-staging-composite>http://download.jboss.org/jbosstools/builds/staging/_composite_/3.2_stabl...</jbosstools-nightly-staging-composite>
- <!-- 2b., or, use -Plocal.comp -Dlocal.comp=file://path/to/mirror/of/composite/staging/site/ -->
+ <!-- 2b., or, use -Plocal.composite -Dlocal.composite=file://path/to/mirror/of/composite/staging/site/ -->
<local.composite>file://home/hudson/static_build_env/jbds/builds/staging/_composite_/3.2_stable_branch/</local.composite>
- <!-- 3. published aggregate update site goes here, for consumption by QE and downstream JBDS builds -->
+ <!-- 3. optionally, use -Plocal.requirements -Dlocal.requirements=file://path/to/mirror/of/composite/requirements/site -->
+ <local.requirements>file://qa/services/http/binaries/RHDS/updates/helios/</local.requirements>
+
+ <!-- 4. published aggregate update site goes here, for consumption by QE and downstream JBDS builds -->
<jbosstools.update.site>http://download.jboss.org/jbosstools/updates/nightly/3.2_stable_branch/</jbosstools.update.site>
</properties>
@@ -835,6 +838,27 @@
</repositories>
</profile>
+ <!-- same contents as jboss-requirements-composite-mirror, but locally available (to improve network lag) -->
+ <profile>
+ <id>local.requirements</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <repositories>
+ <repository>
+ <id>local.requirements</id>
+ <url>${local.requirements}</url>
+ <layout>p2</layout>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </repository>
+ </repositories>
+ </profile>
+
<!-- same contents as jbosstools-nightly-staging-composite, but locally available (to improve network lag) -->
<profile>
<id>local.composite</id>
13 years, 5 months
JBoss Tools SVN: r31167 - trunk/download.jboss.org/jbosstools/updates/requirements/birt.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-05-09 22:35:00 -0400 (Mon, 09 May 2011)
New Revision: 31167
Added:
trunk/download.jboss.org/jbosstools/updates/requirements/birt/build-3.7M6...
Log:
rebuild metadata for birt 3.7M6 site pulled from zip (after removing .gz files)
Added: trunk/download.jboss.org/jbosstools/updates/requirements/birt/build-3.7M6...
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/requirements/birt/build-3.7M6... (rev 0)
+++ trunk/download.jboss.org/jbosstools/updates/requirements/birt/build-3.7M6... 2011-05-10 02:35:00 UTC (rev 31167)
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project default="mirror">
+ <!-- run locally in Eclipse (to resolve p2 tasks) using these commandline options:
+
+ -os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl}
+ -consoleLog -nosplash -data /tmp
+ -application org.eclipse.ant.core.antRunner
+ -f "/home/nboldt/tru/download.jboss.org/jbosstools/updates/requirements/birt/build-indigo.xml"
+
+ or, run headless on qa01 server, where Eclipse is installed into ~/eclipse:
+
+ export JAVA_HOME=/opt/jdk1.6.0; \
+ ${JAVA_HOME}/bin/java -cp ~/eclipse/plugins/org.eclipse.equinox.launcher_*.jar \
+ org.eclipse.equinox.launcher.Main -vm ${JAVA_HOME} -consoleLog -nosplash -data /tmp \
+ -application org.eclipse.ant.core.antRunner \
+ -f ~/RHDS/updates/requirements/birt/build-indigo.xml -Ddestination=/tmp/birt-repo
+
+ or, headless on local:
+
+ java -cp /home/nboldt/eclipse/eclipse361/plugins/org.eclipse.equinox.launcher_*.jar \
+ org.eclipse.equinox.launcher.Main -consoleLog -nosplash -data /tmp \
+ -application org.eclipse.ant.core.antRunner -f build-indigo.xml
+
+ -->
+ <target name="mirror">
+ <property name="destination" value="/home/nboldt/tru/download.jboss.org/jbosstools/updates/requirements/birt/" />
+ <property name="compress" value="true" />
+
+ <p2.publish.featuresAndBundles metadataRepository="file:${destination}/3.7M6/" artifactRepository="file:${destination}/3.7M6/" publishartifacts="true" source="${destination}/3.7M6/" compress="${compress}" />
+ </target>
+</project>
13 years, 5 months
JBoss Tools SVN: r31166 - in trunk/download.jboss.org/jbosstools/updates: indigo/M7 and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-05-09 22:26:23 -0400 (Mon, 09 May 2011)
New Revision: 31166
Added:
trunk/download.jboss.org/jbosstools/updates/requirements/birt/build-4.0.xml
Modified:
trunk/download.jboss.org/jbosstools/updates/indigo/M6/compositeArtifacts.xml
trunk/download.jboss.org/jbosstools/updates/indigo/M6/compositeContent.xml
trunk/download.jboss.org/jbosstools/updates/indigo/M7/compositeArtifacts.xml
trunk/download.jboss.org/jbosstools/updates/indigo/M7/compositeContent.xml
Log:
point birt req at 3.7, not 4.0
Modified: trunk/download.jboss.org/jbosstools/updates/indigo/M6/compositeArtifacts.xml
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/indigo/M6/compositeArtifacts.xml 2011-05-10 02:18:20 UTC (rev 31165)
+++ trunk/download.jboss.org/jbosstools/updates/indigo/M6/compositeArtifacts.xml 2011-05-10 02:26:23 UTC (rev 31166)
@@ -12,11 +12,11 @@
endfun
nnoremap <Leader>ts :call ReplaceTimestamp()<CR>
-->
-<property name='p2.timestamp' value='1304967283000'/>
+<property name='p2.timestamp' value='1304994089000'/>
</properties>
<children size='20'>
<child location='../../requirements/indigo/201103180900-M6/'/>
-<child location='../../requirements/birt/4.0M6/'/>
+<child location='../../requirements/birt/3.7M6/'/>
<child location='../../requirements/eclipse/3.7M6/'/>
<child location='../../requirements/emf/2.7M6/'/>
<child location='../../requirements/webtools/3.3M6/'/>
Modified: trunk/download.jboss.org/jbosstools/updates/indigo/M6/compositeContent.xml
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/indigo/M6/compositeContent.xml 2011-05-10 02:18:20 UTC (rev 31165)
+++ trunk/download.jboss.org/jbosstools/updates/indigo/M6/compositeContent.xml 2011-05-10 02:26:23 UTC (rev 31166)
@@ -12,11 +12,11 @@
endfun
nnoremap <Leader>ts :call ReplaceTimestamp()<CR>
-->
-<property name='p2.timestamp' value='1304967283000'/>
+<property name='p2.timestamp' value='1304994089000'/>
</properties>
<children size='20'>
<child location='../../requirements/indigo/201103180900-M6/'/>
-<child location='../../requirements/birt/4.0M6/'/>
+<child location='../../requirements/birt/3.7M6/'/>
<child location='../../requirements/eclipse/3.7M6/'/>
<child location='../../requirements/emf/2.7M6/'/>
<child location='../../requirements/webtools/3.3M6/'/>
Modified: trunk/download.jboss.org/jbosstools/updates/indigo/M7/compositeArtifacts.xml
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/indigo/M7/compositeArtifacts.xml 2011-05-10 02:18:20 UTC (rev 31165)
+++ trunk/download.jboss.org/jbosstools/updates/indigo/M7/compositeArtifacts.xml 2011-05-10 02:26:23 UTC (rev 31166)
@@ -12,11 +12,11 @@
endfun
nnoremap <Leader>ts :call ReplaceTimestamp()<CR>
-->
-<property name='p2.timestamp' value='1304967283000'/>
+<property name='p2.timestamp' value='1304994089000'/>
</properties>
<children size='20'>
<child location='../../requirements/indigo/201105060900-M7/'/>
-<child location='../../requirements/birt/4.0M7/'/>
+<child location='../../requirements/birt/3.7M7/'/>
<child location='../../requirements/eclipse/3.7M7/'/>
<child location='../../requirements/emf/2.7M7/'/>
<child location='../../requirements/webtools/3.3M7/'/>
Modified: trunk/download.jboss.org/jbosstools/updates/indigo/M7/compositeContent.xml
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/indigo/M7/compositeContent.xml 2011-05-10 02:18:20 UTC (rev 31165)
+++ trunk/download.jboss.org/jbosstools/updates/indigo/M7/compositeContent.xml 2011-05-10 02:26:23 UTC (rev 31166)
@@ -12,11 +12,11 @@
endfun
nnoremap <Leader>ts :call ReplaceTimestamp()<CR>
-->
-<property name='p2.timestamp' value='1304967283000'/>
+<property name='p2.timestamp' value='1304994089000'/>
</properties>
<children size='20'>
<child location='../../requirements/indigo/201105060900-M7/'/>
-<child location='../../requirements/birt/4.0M7/'/>
+<child location='../../requirements/birt/3.7M7/'/>
<child location='../../requirements/eclipse/3.7M7/'/>
<child location='../../requirements/emf/2.7M7/'/>
<child location='../../requirements/webtools/3.3M7/'/>
Added: trunk/download.jboss.org/jbosstools/updates/requirements/birt/build-4.0.xml
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/requirements/birt/build-4.0.xml (rev 0)
+++ trunk/download.jboss.org/jbosstools/updates/requirements/birt/build-4.0.xml 2011-05-10 02:26:23 UTC (rev 31166)
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project default="mirror">
+ <!-- run locally in Eclipse (to resolve p2 tasks) using these commandline options:
+
+ -os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl}
+ -consoleLog -nosplash -data /tmp
+ -application org.eclipse.ant.core.antRunner
+ -f "/home/nboldt/tru/download.jboss.org/jbosstools/updates/requirements/birt/build-indigo.xml"
+
+ or, run headless on qa01 server, where Eclipse is installed into ~/eclipse:
+
+ export JAVA_HOME=/opt/jdk1.6.0; \
+ ${JAVA_HOME}/bin/java -cp ~/eclipse/plugins/org.eclipse.equinox.launcher_*.jar \
+ org.eclipse.equinox.launcher.Main -vm ${JAVA_HOME} -consoleLog -nosplash -data /tmp \
+ -application org.eclipse.ant.core.antRunner \
+ -f ~/RHDS/updates/requirements/birt/build-indigo.xml -Ddestination=/tmp/birt-repo
+
+ or, headless on local:
+
+ java -cp /home/nboldt/eclipse/eclipse361/plugins/org.eclipse.equinox.launcher_*.jar \
+ org.eclipse.equinox.launcher.Main -consoleLog -nosplash -data /tmp \
+ -application org.eclipse.ant.core.antRunner -f build-indigo.xml
+
+ -->
+ <target name="mirror">
+ <property name="URL" value="http://download.eclipse.org/birt/update-site/4.0-interim/" />
+ <property name="destination" value="/home/nboldt/tru/download.jboss.org/jbosstools/updates/requirements/birt/" />
+ <property name="compress" value="true" />
+
+ <p2.mirror>
+ <repository location="file:${destination}/4.0M7/" name="Extra BIRT plugins for Eclipse 3.7 (Not in Indigo)" />
+ <source>
+ <repository location="${URL}" />
+ </source>
+
+ <slicingOptions includeFeatures="true" followStrict="true" />
+
+ <iu id="org.eclipse.birt.osgi.runtime.sdk.feature.group" />
+ <iu id="org.eclipse.birt.feature.group" />
+ <iu id="org.eclipse.birt.integration.wtp.feature.group" />
+ <iu id="org.eclipse.birt.chart.feature.group" />
+ <iu id="org.eclipse.birt.chart.integration.wtp.feature.group" />
+
+ </p2.mirror>
+
+ <p2.publish.featuresAndBundles metadataRepository="file:${destination}/4.0M7/" artifactRepository="file:${destination}/4.0M7/" publishartifacts="true" source="${destination}/4.0M7/" compress="${compress}" />
+ </target>
+</project>
13 years, 5 months
JBoss Tools SVN: r31164 - in trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test: projects/CDIConfigTest/src/org/jboss/beans and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-05-09 21:19:41 -0400 (Mon, 09 May 2011)
New Revision: 31164
Added:
trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/org/jboss/beans/test04/
trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/org/jboss/beans/test04/MyBean1.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/org/jboss/beans/test04/MyBean2.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/org/jboss/beans/test04/MyQualifier.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/org/jboss/beans/test04/MyType1.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/org/jboss/beans/test04/MyType2.java
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/META-INF/seam-beans.xml
trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/src/org/jboss/tools/cdi/seam/config/core/test/SeamBeansTest.java
Log:
JBIDE-3120
https://issues.jboss.org/browse/JBIDE-3120
Tests for seam config beans: modifying bean with producer with or without modifying that producer.
Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/META-INF/seam-beans.xml
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/META-INF/seam-beans.xml 2011-05-10 00:53:39 UTC (rev 31163)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/META-INF/seam-beans.xml 2011-05-10 01:19:41 UTC (rev 31164)
@@ -5,6 +5,7 @@
xmlns:test01="urn:java:org.jboss.beans.test01"
xmlns:test02="urn:java:org.jboss.beans.test02"
xmlns:test03="urn:java:org.jboss.beans.test03"
+ xmlns:test04="urn:java:org.jboss.beans.test04"
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://jboss.org/schema/cdi/beans_1_0.xsd">
<!-- Test 01-1 -->
@@ -67,4 +68,17 @@
<s:Named>test03-3-c</s:Named>
</test03:MyBean3>
+<!-- Test 04-1 -->
+<test04:MyBean1>
+ <s:modifies/>
+</test04:MyBean1>
+
+<!-- Test 04-2 -->
+<test04:MyBean2>
+ <s:modifies/>
+ <test04:myType2>
+ <s:Named>test04-2-a</s:Named>
+ </test04:myType2>
+</test04:MyBean2>
+
</beans>
\ No newline at end of file
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/org/jboss/beans/test04/MyBean1.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/org/jboss/beans/test04/MyBean1.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/org/jboss/beans/test04/MyBean1.java 2011-05-10 01:19:41 UTC (rev 31164)
@@ -0,0 +1,26 @@
+package org.jboss.beans.test04;
+
+import javax.enterprise.inject.Produces;
+import javax.inject.Inject;
+
+/**
+ * Test 04-1.
+ * Sources contain class MyBean1 that declares producer field of type MyType1,
+ * class MyType1 has no bean constructor.
+ * Seam config xml contains declaration:
+ * <test04:MyBean1>
+ * <s:modifies/>
+ * </test04:MyBean1>
+ *
+ * ASSERT: Model contains 1 bean with type MyType1.
+ * ASSERT: That bean is field producer.
+ *
+ * @author Viacheslav Kabanovich
+ *
+ */
+public class MyBean1 {
+
+ @Produces
+ public MyType1 myType1 = new MyType1("");
+
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/org/jboss/beans/test04/MyBean1.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/org/jboss/beans/test04/MyBean2.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/org/jboss/beans/test04/MyBean2.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/org/jboss/beans/test04/MyBean2.java 2011-05-10 01:19:41 UTC (rev 31164)
@@ -0,0 +1,31 @@
+package org.jboss.beans.test04;
+
+import javax.enterprise.inject.Produces;
+
+/**
+ * Test 04-2.
+ * Sources contain class MyBean2 that declares producer field of type MyType2,
+ * class MyType2 has no bean constructor.
+ * Seam config xml contains declaration:
+ * <test04:MyBean2>
+ * <s:modifies/>
+ * <test04:myType2>
+ * <s:Named>test04-2-a</s:Named>
+ * </test04:myType2>
+ * </test04:MyBean2>
+ *
+ * ASSERT: Model contains 1 bean with type MyType2.
+ * ASSERT: That bean is field producer.
+ * ASSERT: That bean has qualifier MyQualifier with kind="kind-04-2".
+ * ASSERT: That bean has name "test04-2-a".
+ *
+ * @author Viacheslav Kabanovich
+ *
+ */
+public class MyBean2 {
+
+ @Produces
+ @MyQualifier(kind="kind-04-2")
+ public MyType2 myType2 = new MyType2("");
+
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/org/jboss/beans/test04/MyBean2.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/org/jboss/beans/test04/MyQualifier.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/org/jboss/beans/test04/MyQualifier.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/org/jboss/beans/test04/MyQualifier.java 2011-05-10 01:19:41 UTC (rev 31164)
@@ -0,0 +1,21 @@
+package org.jboss.beans.test04;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import javax.inject.Qualifier;
+
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.PARAMETER;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+@Qualifier
+@Target({ TYPE, METHOD, PARAMETER, FIELD })
+@Retention(RUNTIME)
+@Documented
+public @interface MyQualifier {
+ String kind();
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/org/jboss/beans/test04/MyQualifier.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/org/jboss/beans/test04/MyType1.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/org/jboss/beans/test04/MyType1.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/org/jboss/beans/test04/MyType1.java 2011-05-10 01:19:41 UTC (rev 31164)
@@ -0,0 +1,14 @@
+package org.jboss.beans.test04;
+
+/**
+ * Test 04-1.
+ * see org.jboss.beans.test04.MyBean1
+ *
+ * @author Viacheslav Kabanovich
+ *
+ */
+public class MyType1 {
+ public MyType1(String s) {
+ }
+
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/org/jboss/beans/test04/MyType1.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/org/jboss/beans/test04/MyType2.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/org/jboss/beans/test04/MyType2.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/org/jboss/beans/test04/MyType2.java 2011-05-10 01:19:41 UTC (rev 31164)
@@ -0,0 +1,13 @@
+package org.jboss.beans.test04;
+
+/**
+ * Test 04-2.
+ * see org.jboss.beans.test04.MyBean2
+ *
+ * @author Viacheslav Kabanovich
+ *
+ */
+public class MyType2 {
+ public MyType2(String s) {
+ }
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/org/jboss/beans/test04/MyType2.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/src/org/jboss/tools/cdi/seam/config/core/test/SeamBeansTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/src/org/jboss/tools/cdi/seam/config/core/test/SeamBeansTest.java 2011-05-10 00:53:39 UTC (rev 31163)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/src/org/jboss/tools/cdi/seam/config/core/test/SeamBeansTest.java 2011-05-10 01:19:41 UTC (rev 31164)
@@ -11,11 +11,16 @@
package org.jboss.tools.cdi.seam.config.core.test;
import java.io.IOException;
+import java.util.HashMap;
import java.util.HashSet;
+import java.util.Map;
import java.util.Set;
import org.eclipse.core.runtime.CoreException;
import org.jboss.tools.cdi.core.IBean;
+import org.jboss.tools.cdi.core.IProducerField;
+import org.jboss.tools.cdi.core.IQualifier;
+import org.jboss.tools.cdi.core.IQualifierDeclaration;
/**
*
@@ -221,6 +226,60 @@
assertTrue(names.contains("test03-3-c"));
}
+ /**
+ * Test 04-1.
+ * Sources contain class MyBean1 that declares producer field of type MyType1,
+ * class MyType1 has no bean constructor.
+ * Seam config xml contains declaration:
+ * <test04:MyBean1>
+ * <s:modifies/>
+ * </test04:MyBean1>
+ *
+ * ASSERT: Model contains 1 bean with type MyType1.
+ * ASSERT: That bean is field producer.
+ */
+ public void testModifyingBeanWithFieldProducer() {
+ Set<IBean> beans = cdiProject.getBeans(false, "org.jboss.beans.test04.MyType1");
+ assertEquals(1, beans.size());
+ IBean b = beans.iterator().next();
+ assertTrue(b instanceof IProducerField);
+ }
+
+ /**
+ * Test 04-2.
+ * Sources contain class MyBean2 that declares producer field of type MyType2,
+ * class MyType2 has no bean constructor.
+ * Seam config xml contains declaration:
+ * <test04:MyBean2>
+ * <s:modifies/>
+ * <test04:myType2>
+ * <s:Named>test04-2-a</s:Named>
+ * </test04:myType2>
+ * </test04:MyBean2>
+ *
+ * ASSERT: Model contains 1 bean with type MyType2.
+ * ASSERT: That bean is field producer.
+ * ASSERT: That bean has qualifier MyQualifier with kind="kind-04-2".
+ * ASSERT: That bean has name "test04-2-a".
+ */
+ public void testModifyingBeanWithModifiedFieldProducer() {
+ Set<IBean> beans = cdiProject.getBeans(false, "org.jboss.beans.test04.MyType2",
+ new String[]{"org.jboss.beans.test04.MyQualifier"});
+ assertEquals(1, beans.size());
+ IBean b = beans.iterator().next();
+ Set<IQualifierDeclaration> qs = b.getQualifierDeclarations();
+ Map<String, IQualifierDeclaration> map = new HashMap<String, IQualifierDeclaration>();
+ for (IQualifierDeclaration q: qs) {
+ map.put(q.getType().getFullyQualifiedName(), q);
+ }
+ IQualifierDeclaration myQualifier = map.get("org.jboss.beans.test04.MyQualifier");
+ assertNotNull(myQualifier);
+ assertEquals("kind-04-2", myQualifier.getMemberValue("kind"));
+ assertEquals("test04-2-a", b.getName());
+
+ assertTrue(b instanceof IProducerField);
+ }
+
protected Set<IBean> getBeansByClassName(String className) {
return cdiProject.getBeans(false, className, new String[0]);
}
13 years, 5 months
JBoss Tools SVN: r31163 - trunk/documentation/whatsnew.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2011-05-09 20:53:39 -0400 (Mon, 09 May 2011)
New Revision: 31163
Modified:
trunk/documentation/whatsnew/index.html
Log:
https://issues.jboss.org/browse/JBIDE-8879
Modified: trunk/documentation/whatsnew/index.html
===================================================================
--- trunk/documentation/whatsnew/index.html 2011-05-10 00:50:59 UTC (rev 31162)
+++ trunk/documentation/whatsnew/index.html 2011-05-10 00:53:39 UTC (rev 31163)
@@ -24,9 +24,26 @@
<html>
<table border="0" cellpadding="10" cellspacing="0" width="80%">
+
<tr>
<td colspan="2">
<hr>
+ <h3>JBoss Tools 3.3 individual new and noteworthy</h3>
+ <hr>
+ </td>
+ </tr>
+
+ <tr>
+ <td valign="top" align="left">
+ <p align="right"><b>3.3.0.M1</b>
+ <td valign="top">
+ <p><a href="seam/seam-news-3.3.0.M1.html">Seam Tools</a></p>
+ </td>
+ </tr>
+
+ <tr>
+ <td colspan="2">
+ <hr>
<h3>JBoss Tools 3.2 individual new and noteworthy</h3>
<hr>
</td>
13 years, 5 months
JBoss Tools SVN: r31162 - in trunk/documentation/whatsnew/seam: images and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2011-05-09 20:50:59 -0400 (Mon, 09 May 2011)
New Revision: 31162
Added:
trunk/documentation/whatsnew/seam/images/3.3.0.M1/
trunk/documentation/whatsnew/seam/images/3.3.0.M1/view.png
Modified:
trunk/documentation/whatsnew/seam/seam-news-3.3.0.M1.html
Log:
https://issues.jboss.org/browse/JBIDE-8879
Added: trunk/documentation/whatsnew/seam/images/3.3.0.M1/view.png
===================================================================
(Binary files differ)
Property changes on: trunk/documentation/whatsnew/seam/images/3.3.0.M1/view.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: trunk/documentation/whatsnew/seam/seam-news-3.3.0.M1.html
===================================================================
--- trunk/documentation/whatsnew/seam/seam-news-3.3.0.M1.html 2011-05-09 21:50:06 UTC (rev 31161)
+++ trunk/documentation/whatsnew/seam/seam-news-3.3.0.M1.html 2011-05-10 00:50:59 UTC (rev 31162)
@@ -30,25 +30,21 @@
<tr>
<td colspan="2">
<hr />
- <h3>Code Assists</h3>
+ <h3>Seam Components View</h3>
<hr />
</td>
</tr>
<tr>
<td valign="top" align="left">
- <p><b>Seam-pdf and mail components</b></p>
+ <p><b>Context Menu</b></p>
</td>
<td valign="top">
- <p>Content assist now suggests attributes of Seam PDF (http://jboss.com/products/seam/pdf) and Seam mail (http://jboss.com/products/seam/mail) components.</p>
- <img src="images/seam-pdf.png"/><br/><br/>
- <img src="images/seam-mail.png"/>
- <p><small><a
- href="https://jira.jboss.org/browse/JBIDE-5231">Related Jira 1</a>,
- <a
- href="https://jira.jboss.org/browse/JBIDE-5198">Related Jira 2</a></small></p>
+ <p>Now it's possible to create a new Seam project, action, conversation, form, entity or generate entities from context menu in Seam Components View.</p>
+ <img src="images/3.3.0.M1/view.png"/>
+ <p><small><a href="https://jira.jboss.org/browse/JBIDE-8336">Related Jira</a></small></p>
</td>
</tr>
-
+
<tr>
<td colspan="2">
<hr />
13 years, 5 months