JBoss Tools SVN: r30869 - in trunk/as: tests/org.jboss.ide.eclipse.as.management.as7.tests/src/org/jboss/ide/eclipse/as/management/as7/tests and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-04-27 07:49:58 -0400 (Wed, 27 Apr 2011)
New Revision: 30869
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/deployment/AS7Manager.java
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/deployment/AS7ManagerUtil.java
trunk/as/tests/org.jboss.ide.eclipse.as.management.as7.tests/src/org/jboss/ide/eclipse/as/management/as7/tests/AS7ManagerIntegrationTest.java
trunk/as/tests/org.jboss.ide.eclipse.as.management.as7.tests/src/org/jboss/ide/eclipse/as/management/as7/tests/AS7ManagerTestUtils.java
Log:
[JBIDE-8793] added #shutdown to AS7Manager
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/deployment/AS7Manager.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/deployment/AS7Manager.java 2011-04-27 11:25:41 UTC (rev 30868)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/deployment/AS7Manager.java 2011-04-27 11:49:58 UTC (rev 30869)
@@ -17,6 +17,7 @@
import static org.jboss.ide.eclipse.as.management.as7.deployment.ModelDescriptionConstants.OP;
import static org.jboss.ide.eclipse.as.management.as7.deployment.ModelDescriptionConstants.READ_RESOURCE_OPERATION;
import static org.jboss.ide.eclipse.as.management.as7.deployment.ModelDescriptionConstants.RESULT;
+import static org.jboss.ide.eclipse.as.management.as7.deployment.ModelDescriptionConstants.SHUTDOWN;
import java.io.File;
import java.io.IOException;
@@ -131,9 +132,19 @@
} else {
return JBoss7DeploymentState.STOPPED;
}
+ }
+ /**
+ * Shuts the server down.
+ *
+ * @throws JBoss7ManangerException
+ */
+ public void shutdown() throws JBoss7ManangerException {
+ ModelNode request = new ModelNode();
+ request.get(OP).set(SHUTDOWN);
+ quietlyExecute(request);
}
-
+
public void dispose() {
StreamUtils.safeClose(client);
}
@@ -155,6 +166,16 @@
}
}
+ public void quietlyExecute(ModelNode node) throws JBoss7ManangerException {
+ try {
+ client.execute(node);
+ } catch(IOException e) {
+ // ignore
+ } catch (Exception e) {
+ throw new JBoss7ManangerException(e);
+ }
+ }
+
private IJBoss7DeploymentResult execute(DeploymentPlanBuilder builder) throws JBoss7ManangerException {
try {
DeploymentAction action = builder.getLastAction();
@@ -164,4 +185,4 @@
throw new JBoss7ManangerException(e);
}
}
-}
+}
\ No newline at end of file
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/deployment/AS7ManagerUtil.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/deployment/AS7ManagerUtil.java 2011-04-27 11:25:41 UTC (rev 30868)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/deployment/AS7ManagerUtil.java 2011-04-27 11:49:58 UTC (rev 30869)
@@ -11,6 +11,7 @@
package org.jboss.ide.eclipse.as.management.as7.deployment;
import static org.jboss.ide.eclipse.as.management.as7.deployment.ModelDescriptionConstants.CHILD_TYPE;
+import static org.jboss.ide.eclipse.as.management.as7.deployment.ModelDescriptionConstants.DEPLOYMENT;
import static org.jboss.ide.eclipse.as.management.as7.deployment.ModelDescriptionConstants.FAILURE_DESCRIPTION;
import static org.jboss.ide.eclipse.as.management.as7.deployment.ModelDescriptionConstants.OUTCOME;
import static org.jboss.ide.eclipse.as.management.as7.deployment.ModelDescriptionConstants.READ_CHILDREN_NAMES_OPERATION;
@@ -107,7 +108,7 @@
final ModelNode request;
try {
builder.operationName(READ_CHILDREN_NAMES_OPERATION);
- builder.addProperty(CHILD_TYPE, ModelDescriptionConstants.DEPLOYMENT);
+ builder.addProperty(CHILD_TYPE, DEPLOYMENT);
request = builder.buildRequest();
} catch (OperationFormatException e) {
throw new IllegalStateException(AS7Messages.FailedToBuildOperation, e);
@@ -158,4 +159,4 @@
throw new JBoss7ManangerException(e);
}
}
-}
+}
\ No newline at end of file
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.management.as7.tests/src/org/jboss/ide/eclipse/as/management/as7/tests/AS7ManagerIntegrationTest.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.management.as7.tests/src/org/jboss/ide/eclipse/as/management/as7/tests/AS7ManagerIntegrationTest.java 2011-04-27 11:25:41 UTC (rev 30868)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.management.as7.tests/src/org/jboss/ide/eclipse/as/management/as7/tests/AS7ManagerIntegrationTest.java 2011-04-27 11:49:58 UTC (rev 30869)
@@ -7,11 +7,12 @@
*
* Contributors:
* Red Hat, Inc. - initial API and implementation
- ******************************************************************************/
+ ******************************************************************************/
package org.jboss.ide.eclipse.as.management.as7.tests;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.equalTo;
+import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
@@ -38,7 +39,10 @@
private AS7Manager manager;
@Before
- public void setUp() throws UnknownHostException {
+ public void setUp() throws IOException {
+ assertTrue("There is no server at " + AS7ManagerTestUtils.HOST +
+ " that listens on port " + AS7ManagerTestUtils.MGMT_PORT,
+ AS7ManagerTestUtils.isListening(AS7ManagerTestUtils.HOST, AS7ManagerTestUtils.MGMT_PORT));
this.manager = new AS7Manager(AS7ManagerTestUtils.HOST, AS7ManagerTestUtils.MGMT_PORT);
}
@@ -131,7 +135,8 @@
}
@Test
- public void getDisabledStateIfDeploymentIsOnlyAdded() throws URISyntaxException, IOException, JBoss7ManangerException {
+ public void getDisabledStateIfDeploymentIsOnlyAdded() throws URISyntaxException, IOException,
+ JBoss7ManangerException {
String deploymentName = "testDeployment";
File warFile = AS7ManagerTestUtils.getWarFile(AS7ManagerTestUtils.MINIMALISTIC_WAR);
try {
@@ -153,4 +158,11 @@
AS7ManagerTestUtils.quietlyUndeploy(deploymentName, manager);
}
}
-}
+
+ @Test
+ public void canShutdown() throws JBoss7ManangerException, UnknownHostException, IOException {
+ assertTrue(AS7ManagerTestUtils.isListening(AS7ManagerTestUtils.HOST, AS7ManagerTestUtils.MGMT_PORT));
+ manager.shutdown();
+ assertFalse(AS7ManagerTestUtils.isListening(AS7ManagerTestUtils.HOST, AS7ManagerTestUtils.MGMT_PORT));
+ }
+}
\ No newline at end of file
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.management.as7.tests/src/org/jboss/ide/eclipse/as/management/as7/tests/AS7ManagerTestUtils.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.management.as7.tests/src/org/jboss/ide/eclipse/as/management/as7/tests/AS7ManagerTestUtils.java 2011-04-27 11:25:41 UTC (rev 30868)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.management.as7.tests/src/org/jboss/ide/eclipse/as/management/as7/tests/AS7ManagerTestUtils.java 2011-04-27 11:49:58 UTC (rev 30869)
@@ -7,7 +7,7 @@
*
* Contributors:
* Red Hat, Inc. - initial API and implementation
- ******************************************************************************/
+ ******************************************************************************/
package org.jboss.ide.eclipse.as.management.as7.tests;
import java.io.BufferedInputStream;
@@ -16,14 +16,17 @@
import java.io.IOException;
import java.io.InputStream;
import java.io.StringWriter;
+import java.net.ConnectException;
import java.net.HttpURLConnection;
+import java.net.Socket;
import java.net.URISyntaxException;
import java.net.URL;
+import java.net.UnknownHostException;
import org.eclipse.core.runtime.FileLocator;
import org.eclipse.core.runtime.Platform;
+import org.jboss.ide.eclipse.as.core.server.internal.v7.IJBoss7DeploymentResult;
import org.jboss.ide.eclipse.as.core.server.internal.v7.JBoss7ManangerException;
-import org.jboss.ide.eclipse.as.core.server.internal.v7.IJBoss7DeploymentResult;
import org.jboss.ide.eclipse.as.management.as7.deployment.AS7Manager;
import org.osgi.framework.Bundle;
@@ -62,7 +65,8 @@
public static void quietlyUndeploy(String name, AS7Manager manager) {
try {
- // DetypedDeployer.undeploy(name, AS7ManagerTestUtils.HOST, AS7ManagerTestUtils.MGMT_PORT);
+ // DetypedDeployer.undeploy(name, AS7ManagerTestUtils.HOST,
+ // AS7ManagerTestUtils.MGMT_PORT);
waitUntilFinished(manager.undeploy(name));
} catch (Exception e) {
// ignore
@@ -71,7 +75,8 @@
public static void quietlyRemove(String name, AS7Manager manager) {
try {
- //DetypedDeployer.remove(name, AS7ManagerTestUtils.HOST, AS7ManagerTestUtils.MGMT_PORT);
+ // DetypedDeployer.remove(name, AS7ManagerTestUtils.HOST,
+ // AS7ManagerTestUtils.MGMT_PORT);
waitUntilFinished(manager.remove(name));
} catch (Exception e) {
// ignore
@@ -82,7 +87,6 @@
result.getStatus(); // wait for operation to finish
}
-
public static String getResponse(String name, String host, int port) throws IOException {
URL url = new URL("http://" + host + ":" + port + "/" + name);
HttpURLConnection connection = connect(url);
@@ -127,4 +131,18 @@
}
return writer.toString();
}
-}
+
+ public static boolean isListening(String host, int port) throws UnknownHostException, IOException {
+ Socket socket = null;
+ try {
+ socket = new Socket(host, port);
+ return socket.isConnected();
+ } catch (ConnectException e) {
+ return false;
+ } finally {
+ if (socket != null) {
+ socket.close();
+ }
+ }
+ }
+}
\ No newline at end of file
14 years, 11 months
JBoss Tools SVN: r30868 - trunk/jst/plugins/org.jboss.tools.jst.jsp.
by jbosstools-commits＠lists.jboss.org
Author: dmaliarevich
Date: 2011-04-27 07:25:41 -0400 (Wed, 27 Apr 2011)
New Revision: 30868
Modified:
trunk/jst/plugins/org.jboss.tools.jst.jsp/plugin.properties
trunk/jst/plugins/org.jboss.tools.jst.jsp/plugin.xml
Log:
https://issues.jboss.org/browse/JBIDE-8619 , MenuContributionItem was replaced by Handler and Command.
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/plugin.properties
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/plugin.properties 2011-04-27 02:11:40 UTC (rev 30867)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/plugin.properties 2011-04-27 11:25:41 UTC (rev 30868)
@@ -17,7 +17,7 @@
proposalCategory.xmlEL= JBoss JSF EL Proposals
proposalCategory.xmlTag= JBoss JSF Tag Proposals
Toggle.Selection.Bar=Toggle Selection Bar
-Externalize.Selected.Property=Externalize Strings...
+Externalize.Selected.Property=Externalize selected string..
vpe.toolbar.name=VPE Toolbar
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/plugin.xml
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/plugin.xml 2011-04-27 02:11:40 UTC (rev 30867)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/plugin.xml 2011-04-27 11:25:41 UTC (rev 30868)
@@ -365,17 +365,13 @@
</menuContribution>
<menuContribution
locationURI="popup:org.jboss.tools.jst.jsp.jspeditor.JSPTextEditor.source.EditorContext?after=org.jboss.tools.jst.jsp.i18n.ExternalizeAllStringsContributionItem">
- <dynamic
- class="org.jboss.tools.jst.jsp.i18n.ExternalizeStringsContributionItem"
- id="org.jboss.tools.jst.jsp.i18n.ExternalizeStringsContributionItem">
- </dynamic>
+ <command
+ commandId="org.jboss.tools.jst.jsp.commands.i18" />
</menuContribution>
<menuContribution
locationURI="popup:org.jboss.tools.jst.jsp.jspeditor.HTMLTextEditor.source.EditorContext?after=org.jboss.tools.jst.jsp.i18n.ExternalizeAllStringsContributionItem">
- <dynamic
- class="org.jboss.tools.jst.jsp.i18n.ExternalizeStringsContributionItem"
- id="org.jboss.tools.jst.jsp.i18n.ExternalizeStringsContributionItem">
- </dynamic>
+ <command
+ commandId="org.jboss.tools.jst.jsp.commands.i18" />
</menuContribution>
<menuContribution
locationURI="menu:sourceMenuId?after=OccurencesFile">
14 years, 11 months
JBoss Tools SVN: r30867 - trunk/smooks/docs/reference/en-US.
by jbosstools-commits＠lists.jboss.org
Author: irooskov(a)redhat.com
Date: 2011-04-26 22:11:40 -0400 (Tue, 26 Apr 2011)
New Revision: 30867
Modified:
trunk/smooks/docs/reference/en-US/Book_Info.xml
Log:
updated to correct version of product for docs.redhat.com when book is released
Modified: trunk/smooks/docs/reference/en-US/Book_Info.xml
===================================================================
--- trunk/smooks/docs/reference/en-US/Book_Info.xml 2011-04-27 01:11:44 UTC (rev 30866)
+++ trunk/smooks/docs/reference/en-US/Book_Info.xml 2011-04-27 02:11:40 UTC (rev 30867)
@@ -5,7 +5,7 @@
<title>Smooks Developer Tools Reference Guide</title>
<subtitle>Provides information relating to the Smooks Tools module.</subtitle>
<productname>JBoss Developer Studio</productname>
- <productnumber>4.1</productnumber>
+ <productnumber>4.0</productnumber>
<edition>4.1.0</edition>
<pubsnumber>2</pubsnumber>
<abstract>
14 years, 11 months
JBoss Tools SVN: r30866 - trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/src/org/jboss/tools/cdi/seam/config/core/test.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-04-26 21:11:44 -0400 (Tue, 26 Apr 2011)
New Revision: 30866
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/src/org/jboss/tools/cdi/seam/config/core/test/SeamDefinitionsTest.java
Log:
JBIDE-3120
https://issues.jboss.org/browse/JBIDE-3120
Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/src/org/jboss/tools/cdi/seam/config/core/test/SeamDefinitionsTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/src/org/jboss/tools/cdi/seam/config/core/test/SeamDefinitionsTest.java 2011-04-27 01:11:30 UTC (rev 30865)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/src/org/jboss/tools/cdi/seam/config/core/test/SeamDefinitionsTest.java 2011-04-27 01:11:44 UTC (rev 30866)
@@ -3,6 +3,7 @@
import java.io.IOException;
import java.util.HashMap;
import java.util.Iterator;
+import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -137,5 +138,53 @@
assertNotNull(f.getAnnotation(someQualifier));
assertEquals("Red Hat Inc", f.getValue());
}
-
+
+ /**
+<test6041:ArrayFieldValue>
+ <test6041:intArrayField>
+ <s:value>1</s:value>
+ <s:value>2</s:value>
+ </test6041:intArrayField>
+ <test6041:classArrayField>
+ <s:value>java.lang.Integer</s:value>
+ <s:value>java.lang.Long</s:value>
+ </test6041:classArrayField>
+ <test6041:stringArrayField>
+ <s:value>hello</s:value>
+ <s:value>world</s:value>
+ </test6041:stringArrayField>
+</test6041:ArrayFieldValue>
+ *
+ */
+ public void testInitialFieldListValues() {
+ ICDIProject cdi = CDICorePlugin.getCDIProject(project, true);
+ ConfigDefinitionContext context = (ConfigDefinitionContext)getConfigExtension(cdi).getContext();
+ SeamBeansDefinition d = getBeansDefinition(context, "src/META-INF/beans.xml");
+
+ Set<SeamBeanDefinition> ds = findBeanDefinitionByTagName(d, "test6041:ArrayFieldValue");
+ assertEquals(1, ds.size());
+ SeamBeanDefinition b = ds.iterator().next();
+ SeamFieldDefinition f = b.getField("intArrayField");
+ assertNotNull(f);
+ List<String> vs = f.getListValue();
+ assertEquals(2, vs.size());
+ assertEquals("1", vs.get(0));
+ assertEquals("2", vs.get(1));
+
+ f = b.getField("classArrayField");
+ assertNotNull(f);
+ vs = f.getListValue();
+ assertEquals(2, vs.size());
+ assertEquals("java.lang.Integer", vs.get(0));
+ assertEquals("java.lang.Long", vs.get(1));
+
+ f = b.getField("stringArrayField");
+ assertNotNull(f);
+ vs = f.getListValue();
+ assertEquals(2, vs.size());
+ assertEquals("hello", vs.get(0));
+ assertEquals("world", vs.get(1));
+
+ }
+
}
14 years, 11 months
JBoss Tools SVN: r30865 - trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/scanner.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-04-26 21:11:30 -0400 (Tue, 26 Apr 2011)
New Revision: 30865
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/scanner/SAXParser.java
Log:
JBIDE-3120
https://issues.jboss.org/browse/JBIDE-3120
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/scanner/SAXParser.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/scanner/SAXParser.java 2011-04-27 00:57:13 UTC (rev 30864)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/scanner/SAXParser.java 2011-04-27 01:11:30 UTC (rev 30865)
@@ -160,6 +160,7 @@
text.setValue(currentText.toString());
current.setTextNode(text);
text.setLocation(currentTextLocation);
+ currentText.setLength(0);
}
if(current.getParent() != null) {
14 years, 11 months
JBoss Tools SVN: r30863 - in trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test: projects/CDIConfigTest/src/org/jboss and 3 other directories.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-04-26 20:57:12 -0400 (Tue, 26 Apr 2011)
New Revision: 30863
Added:
trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/org/jboss/test603/
trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/org/jboss/test603/OtherQualifier.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/org/jboss/test603/QualifiedBean1.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/org/jboss/test603/QualifiedBean2.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/org/jboss/test6041/
trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/org/jboss/test6041/ArrayFieldValue.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/org/jboss/test6041/MyBean.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/org/jboss/test6041/RobotFactory.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/org/jboss/test6041/SomeQualifier.java
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/META-INF/beans.xml
trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/src/org/jboss/tools/cdi/seam/config/core/test/SeamDefinitionsTest.java
Log:
JBIDE-3120
https://issues.jboss.org/browse/JBIDE-3120
Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/META-INF/beans.xml
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/META-INF/beans.xml 2011-04-27 00:56:17 UTC (rev 30862)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/META-INF/beans.xml 2011-04-27 00:57:12 UTC (rev 30863)
@@ -4,6 +4,8 @@
xmlns:s="urn:java:ee"
xmlns:config="urn:java:org.jboss.test.config"
xmlns:test602="urn:java:org.jboss.test602.report"
+ xmlns:test603="urn:java:org.jboss.test603"
+ xmlns:test6041="urn:java:org.jboss.test6041"
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://jboss.org/schema/cdi/beans_1_0.xsd">
<config:MyAnnotation>
<s:Qualifier1/>
@@ -19,4 +21,45 @@
<test602:NewQualifier/>
</test602:ReportDatasource>
-</beans>
\ No newline at end of file
+<test603:QualifiedBean1>
+ <test603:OtherQualifier value1="AA" value2="1">false</test603:OtherQualifier>
+</test603:QualifiedBean1>
+
+<test603:QualifiedBean2>
+ <test603:OtherQualifier value1="BB" value2="2" value="true" />
+</test603:QualifiedBean2>
+
+<test6041:RobotFactory>
+ <test6041:robot>
+ <s:Produces/>
+ </test6041:robot>
+</test6041:RobotFactory>
+
+<test6041:MyBean>
+ <test6041:SomeQualifier/>
+ <test6041:company>Red Hat Inc</test6041:company>
+</test6041:MyBean>
+
+<test6041:MyBean>
+ <test6041:company>
+ <s:value>Red Hat Inc</s:value>
+ <test6041:SomeQualifier/>
+ </test6041:company>
+</test6041:MyBean>
+
+<test6041:ArrayFieldValue>
+ <test6041:intArrayField>
+ <s:value>1</s:value>
+ <s:value>2</s:value>
+ </test6041:intArrayField>
+ <test6041:classArrayField>
+ <s:value>java.lang.Integer</s:value>
+ <s:value>java.lang.Long</s:value>
+ </test6041:classArrayField>
+ <test6041:stringArrayField>
+ <s:value>hello</s:value>
+ <s:value>world</s:value>
+ </test6041:stringArrayField>
+</test6041:ArrayFieldValue>
+
+</beans>
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/org/jboss/test603/OtherQualifier.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/org/jboss/test603/OtherQualifier.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/org/jboss/test603/OtherQualifier.java 2011-04-27 00:57:12 UTC (rev 30863)
@@ -0,0 +1,23 @@
+package org.jboss.test603;
+
+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 OtherQualifier {
+ public String value1();
+ public int value2();
+ public boolean value();
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/org/jboss/test603/OtherQualifier.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/org/jboss/test603/QualifiedBean1.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/org/jboss/test603/QualifiedBean1.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/org/jboss/test603/QualifiedBean1.java 2011-04-27 00:57:12 UTC (rev 30863)
@@ -0,0 +1,5 @@
+package org.jboss.test603;
+
+public class QualifiedBean1 {
+
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/org/jboss/test603/QualifiedBean1.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/org/jboss/test603/QualifiedBean2.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/org/jboss/test603/QualifiedBean2.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/org/jboss/test603/QualifiedBean2.java 2011-04-27 00:57:12 UTC (rev 30863)
@@ -0,0 +1,5 @@
+package org.jboss.test603;
+
+public class QualifiedBean2 {
+
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/org/jboss/test603/QualifiedBean2.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/org/jboss/test6041/ArrayFieldValue.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/org/jboss/test6041/ArrayFieldValue.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/org/jboss/test6041/ArrayFieldValue.java 2011-04-27 00:57:12 UTC (rev 30863)
@@ -0,0 +1,8 @@
+package org.jboss.test6041;
+
+public class ArrayFieldValue {
+ int[] intArrayField;
+ Class[] classArrayField;
+ String[] stringArrayField;
+
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/org/jboss/test6041/ArrayFieldValue.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/org/jboss/test6041/MyBean.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/org/jboss/test6041/MyBean.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/org/jboss/test6041/MyBean.java 2011-04-27 00:57:12 UTC (rev 30863)
@@ -0,0 +1,5 @@
+package org.jboss.test6041;
+
+public class MyBean {
+ String company;
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/org/jboss/test6041/MyBean.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/org/jboss/test6041/RobotFactory.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/org/jboss/test6041/RobotFactory.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/org/jboss/test6041/RobotFactory.java 2011-04-27 00:57:12 UTC (rev 30863)
@@ -0,0 +1,5 @@
+package org.jboss.test6041;
+
+public class RobotFactory {
+ String robot = "robot";
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/org/jboss/test6041/RobotFactory.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/org/jboss/test6041/SomeQualifier.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/org/jboss/test6041/SomeQualifier.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/org/jboss/test6041/SomeQualifier.java 2011-04-27 00:57:12 UTC (rev 30863)
@@ -0,0 +1,21 @@
+package org.jboss.test6041;
+
+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 SomeQualifier {
+
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/org/jboss/test6041/SomeQualifier.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/SeamDefinitionsTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/src/org/jboss/tools/cdi/seam/config/core/test/SeamDefinitionsTest.java 2011-04-27 00:56:17 UTC (rev 30862)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/src/org/jboss/tools/cdi/seam/config/core/test/SeamDefinitionsTest.java 2011-04-27 00:57:12 UTC (rev 30863)
@@ -1,10 +1,14 @@
package org.jboss.tools.cdi.seam.config.core.test;
import java.io.IOException;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
import java.util.Set;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.runtime.CoreException;
+import org.eclipse.jdt.core.IMemberValuePair;
import org.jboss.tools.cdi.core.CDICorePlugin;
import org.jboss.tools.cdi.core.ICDIProject;
import org.jboss.tools.cdi.core.IJavaAnnotation;
@@ -13,6 +17,7 @@
import org.jboss.tools.cdi.seam.config.core.ConfigDefinitionContext;
import org.jboss.tools.cdi.seam.config.core.definition.SeamBeanDefinition;
import org.jboss.tools.cdi.seam.config.core.definition.SeamBeansDefinition;
+import org.jboss.tools.cdi.seam.config.core.definition.SeamFieldDefinition;
import org.jboss.tools.common.text.ITextSourceReference;
/**
@@ -23,7 +28,7 @@
public class SeamDefinitionsTest extends SeamConfigTest {
public SeamDefinitionsTest() {}
- public void testBeansWithReplacesAndModifies() throws CoreException, IOException {
+ public void testReplacingAndModifyingBeans() throws CoreException, IOException {
ICDIProject cdi = CDICorePlugin.getCDIProject(project, true);
ConfigDefinitionContext context = (ConfigDefinitionContext)getConfigExtension(cdi).getContext();
SeamBeansDefinition d = getBeansDefinition(context, "src/META-INF/beans.xml");
@@ -41,8 +46,96 @@
SeamBeanDefinition reportDatasource = ds.iterator().next();
ITextSourceReference replaces = reportDatasource.getReplacesLocation();
assertNotNull(replaces);
+ }
+
+ public void testApplyingAnnotations() throws CoreException {
+ ICDIProject cdi = CDICorePlugin.getCDIProject(project, true);
+ ConfigDefinitionContext context = (ConfigDefinitionContext)getConfigExtension(cdi).getContext();
+ SeamBeansDefinition d = getBeansDefinition(context, "src/META-INF/beans.xml");
+ Set<SeamBeanDefinition> ds = findBeanDefinitionByTagName(d, "test603:QualifiedBean1");
+ assertEquals(1, ds.size());
+ SeamBeanDefinition b = ds.iterator().next();
+ IJavaAnnotation a = b.getAnnotation("org.jboss.test603.OtherQualifier");
+ Map<String, Object> ps = toMap(a.getMemberValuePairs());
+ assertEquals(3, ps.size());
+ assertEquals("AA", "" + ps.get("value1"));
+ assertEquals("1", "" + ps.get("value2"));
+ assertEquals("false", "" + ps.get("value"));
+
+ ds = findBeanDefinitionByTagName(d, "test603:QualifiedBean2");
+ assertEquals(1, ds.size());
+ b = ds.iterator().next();
+ a = b.getAnnotation("org.jboss.test603.OtherQualifier");
+ ps = toMap(a.getMemberValuePairs());
+ assertEquals(3, ps.size());
+ assertEquals("BB", "" + ps.get("value1"));
+ assertEquals("2", "" + ps.get("value2"));
+ assertEquals("true", "" + ps.get("value"));
+ }
+ Map<String, Object> toMap(IMemberValuePair[] ps) {
+ Map<String, Object> result = new HashMap<String, Object>();
+ for (IMemberValuePair p: ps) result.put(p.getMemberName(), p.getValue());
+ return result;
}
+ public void testInitialFieldValues() {
+ ICDIProject cdi = CDICorePlugin.getCDIProject(project, true);
+ ConfigDefinitionContext context = (ConfigDefinitionContext)getConfigExtension(cdi).getContext();
+ SeamBeansDefinition d = getBeansDefinition(context, "src/META-INF/beans.xml");
+
+ /*
+<test6041:RobotFactory>
+ <test6041:robot>
+ <s:Produces/>
+ </test6041:robot>
+</test6041:RobotFactory>
+ */
+ Set<SeamBeanDefinition> ds = findBeanDefinitionByTagName(d, "test6041:RobotFactory");
+ assertEquals(1, ds.size());
+ SeamBeanDefinition b = ds.iterator().next();
+ SeamFieldDefinition f = b.getField("robot");
+ assertNotNull(f);
+ IJavaAnnotation a = f.getAnnotation("javax.enterprise.inject.Produces");
+ assertNotNull(a);
+
+/*
+<test6041:MyBean>
+ <test6041:SomeQualifier/>
+ <test6041:company>Red Hat Inc</test6041:company>
+</test6041:MyBean>
+
+<test6041:MyBean>
+ <test6041:company>
+ <s:value>Red Hat Inc</s:value>
+ <test6041:SomeQualifier/>
+ </test6041:company>
+</test6041:MyBean>
+ */
+ ds = findBeanDefinitionByTagName(d, "test6041:MyBean");
+ assertEquals(2, ds.size());
+ Iterator<SeamBeanDefinition> it = ds.iterator();
+ SeamBeanDefinition b1 = it.next();
+ SeamBeanDefinition b2 = it.next();
+ String someQualifier = "org.jboss.test6041.SomeQualifier";
+ boolean qb1 = b1.getAnnotation(someQualifier) != null;
+ boolean qb2 = b2.getAnnotation(someQualifier) != null;
+ assertFalse(qb1 == qb2);
+ if(qb2) {
+ //assign b1 to bean with qualifier; b2 to bean having field with qualifier.
+ SeamBeanDefinition bc = b1;
+ b1 = b2;
+ b2 = bc;
+ }
+ f = b1.getField("company");
+ assertNotNull(f);
+ assertNull(f.getAnnotation(someQualifier));
+ assertEquals("Red Hat Inc", f.getValue());
+ f = b2.getField("company");
+ assertNotNull(f);
+ assertNotNull(f.getAnnotation(someQualifier));
+ assertEquals("Red Hat Inc", f.getValue());
+ }
+
}
14 years, 11 months
JBoss Tools SVN: r30864 - in trunk/download.jboss.org/jbosstools/updates: indigo and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-04-26 20:57:13 -0400 (Tue, 26 Apr 2011)
New Revision: 30864
Modified:
trunk/download.jboss.org/jbosstools/updates/helios/compositeArtifacts.xml
trunk/download.jboss.org/jbosstools/updates/helios/compositeContent.xml
trunk/download.jboss.org/jbosstools/updates/indigo/compositeArtifacts.xml
trunk/download.jboss.org/jbosstools/updates/indigo/compositeContent.xml
trunk/download.jboss.org/jbosstools/updates/requirements/index.html
Log:
add findbugs back into indigo & helios sites
Modified: trunk/download.jboss.org/jbosstools/updates/helios/compositeArtifacts.xml
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/helios/compositeArtifacts.xml 2011-04-27 00:57:12 UTC (rev 30863)
+++ trunk/download.jboss.org/jbosstools/updates/helios/compositeArtifacts.xml 2011-04-27 00:57:13 UTC (rev 30864)
@@ -12,9 +12,9 @@
endfun
nnoremap <Leader>ts :call ReplaceTimestamp()<CR>
-->
-<property name='p2.timestamp' value='1303264329000'/>
+<property name='p2.timestamp' value='1303858049000'/>
</properties>
-<children size='19'>
+<children size='20'>
<child location='../requirements/helios/SR2/'/>
<child location='../requirements/birt/2.6.2/'/>
<child location='../requirements/ecf/3.4/'/>
@@ -22,6 +22,7 @@
<child location='../requirements/egit/0.11/'/>
<child location='../requirements/emf/2.6/'/>
+<child location='../requirements/findbugs/1.3.9/'/>
<child location='../requirements/gwt/201012211742/'/>
<child location='../requirements/mylyn/3.6/'/>
<child location='../requirements/m2eclipse/0.12/'/>
Modified: trunk/download.jboss.org/jbosstools/updates/helios/compositeContent.xml
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/helios/compositeContent.xml 2011-04-27 00:57:12 UTC (rev 30863)
+++ trunk/download.jboss.org/jbosstools/updates/helios/compositeContent.xml 2011-04-27 00:57:13 UTC (rev 30864)
@@ -12,9 +12,9 @@
endfun
nnoremap <Leader>ts :call ReplaceTimestamp()<CR>
-->
-<property name='p2.timestamp' value='1303264329000'/>
+<property name='p2.timestamp' value='1303858063000'/>
</properties>
-<children size='19'>
+<children size='20'>
<child location='../requirements/helios/SR2/'/>
<child location='../requirements/birt/2.6.2/'/>
<child location='../requirements/ecf/3.4/'/>
@@ -22,6 +22,7 @@
<child location='../requirements/egit/0.11/'/>
<child location='../requirements/emf/2.6/'/>
+<child location='../requirements/findbugs/1.3.9/'/>
<child location='../requirements/gwt/201012211742/'/>
<child location='../requirements/mylyn/3.6/'/>
<child location='../requirements/m2eclipse/0.12/'/>
Modified: trunk/download.jboss.org/jbosstools/updates/indigo/compositeArtifacts.xml
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/indigo/compositeArtifacts.xml 2011-04-27 00:57:12 UTC (rev 30863)
+++ trunk/download.jboss.org/jbosstools/updates/indigo/compositeArtifacts.xml 2011-04-27 00:57:13 UTC (rev 30864)
@@ -12,9 +12,9 @@
endfun
nnoremap <Leader>ts :call ReplaceTimestamp()<CR>
-->
-<property name='p2.timestamp' value='1303264329000'/>
+<property name='p2.timestamp' value='1303858018000'/>
</properties>
-<children size='19'>
+<children size='20'>
<child location='../requirements/indigo/201103180900-M6/'/>
<child location='../requirements/birt/4.0M6/'/>
<child location='../requirements/eclipse/3.7M6/'/>
@@ -23,6 +23,7 @@
<child location='../requirements/ecf/3.5/'/>
<child location='../requirements/egit/0.11/'/>
+<child location='../requirements/findbugs/1.3.9/'/>
<child location='../requirements/gwt/201102111811/'/>
<child location='../requirements/jslint/1.5/'/>
Modified: trunk/download.jboss.org/jbosstools/updates/indigo/compositeContent.xml
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/indigo/compositeContent.xml 2011-04-27 00:57:12 UTC (rev 30863)
+++ trunk/download.jboss.org/jbosstools/updates/indigo/compositeContent.xml 2011-04-27 00:57:13 UTC (rev 30864)
@@ -12,7 +12,7 @@
endfun
nnoremap <Leader>ts :call ReplaceTimestamp()<CR>
-->
-<property name='p2.timestamp' value='1303264329000'/>
+<property name='p2.timestamp' value='1303858023000'/>
</properties>
<children size='19'>
<child location='../requirements/indigo/201103180900-M6/'/>
@@ -23,6 +23,7 @@
<child location='../requirements/ecf/3.5/'/>
<child location='../requirements/egit/0.11/'/>
+<child location='../requirements/findbugs/1.3.9/'/>
<child location='../requirements/gwt/201102111811/'/>
<child location='../requirements/jslint/1.5/'/>
Modified: trunk/download.jboss.org/jbosstools/updates/requirements/index.html
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/requirements/index.html 2011-04-27 00:57:12 UTC (rev 30863)
+++ trunk/download.jboss.org/jbosstools/updates/requirements/index.html 2011-04-27 00:57:13 UTC (rev 30864)
@@ -64,7 +64,7 @@
<li><a class=link href=ecf>ecf</a></li>
<li><a class=link href=eclipse>eclipse</a></li>
<li><a class=link href=emf>emf</a></li>
-<!-- <li><a class=link href=findbugs>findbugs</a></li> -->
+<li><a class=link href=findbugs>findbugs</a></li>
<!-- <li><a class=link href=gwt/201102111811>gwt/201102111811</a></li> -->
<li><a class=link href=jslint>jslint</a></li>
<li><a class=link href=mylyn>mylyn</a> (including connectors for: Eclipse/PDE/Java, JIRA, Bugzilla, CVS, SVN, Git)</li>
@@ -92,7 +92,7 @@
<li><a class=link href=eclipse>eclipse/3.6</a></li>
<li><a class=link href=egit>egit</a></li>
<li><a class=link href=emf>emf/2.6</a></li>
-<!-- <li><a class=link href=findbugs>findbugs</a></li> -->
+<li><a class=link href=findbugs>findbugs</a></li>
<li><a class=link href=gwt/201012211742>gwt/201012211742</a></li>
<li><a class=link href=mylyn>mylyn</a> (including connectors for: Eclipse/PDE/Java, JIRA, Bugzilla, CVS, SVN, Git)</li>
<li><a class=link href=m2eclipse/0.12>m2eclipse/0.12</a></li>
14 years, 11 months
JBoss Tools SVN: r30862 - in trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core: scanner and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-04-26 20:56:17 -0400 (Tue, 26 Apr 2011)
New Revision: 30862
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/definition/SeamBeanDefinition.java
trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/definition/SeamFieldDefinition.java
trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/scanner/SeamDefinitionBuilder.java
trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/util/Util.java
Log:
JBIDE-3120
https://issues.jboss.org/browse/JBIDE-3120
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/definition/SeamBeanDefinition.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/definition/SeamBeanDefinition.java 2011-04-26 23:58:08 UTC (rev 30861)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/definition/SeamBeanDefinition.java 2011-04-27 00:56:17 UTC (rev 30862)
@@ -14,6 +14,7 @@
import java.util.List;
import org.eclipse.jdt.core.IType;
+import org.jboss.tools.cdi.seam.config.core.scanner.SAXElement;
/**
*
@@ -39,4 +40,12 @@
methods.add(method);
}
+ public SeamFieldDefinition getField(String name) {
+ for (SeamFieldDefinition d: fields) {
+ SAXElement e = d.getElement();
+ if(name.equals(e.getLocalName())) return d;
+ }
+ return null;
+ }
+
}
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/definition/SeamFieldDefinition.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/definition/SeamFieldDefinition.java 2011-04-26 23:58:08 UTC (rev 30861)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/definition/SeamFieldDefinition.java 2011-04-27 00:56:17 UTC (rev 30862)
@@ -10,7 +10,13 @@
******************************************************************************/
package org.jboss.tools.cdi.seam.config.core.definition;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
import org.eclipse.jdt.core.IField;
+import org.jboss.tools.cdi.seam.config.core.scanner.SAXText;
/**
*
@@ -18,12 +24,45 @@
*
*/
public class SeamFieldDefinition extends SeamMemberDefinition {
- IField field;
+ protected IField field;
+ protected List<SAXText> listValue = null;
+ protected Map<SAXText, SAXText> mapValue = null;
+
public SeamFieldDefinition() {}
public void setField(IField field) {
this.field = field;
}
+ public String getValue() {
+ return listValue == null || listValue.size() == 0 ? null : listValue.get(0).getValue();
+ }
+
+ public void addValue(SAXText value) {
+ if(listValue == null) listValue = new ArrayList<SAXText>();
+ listValue.add(value);
+ }
+
+ public List<String> getListValue() {
+ List<String> result = new ArrayList<String>();
+ if(listValue != null) for (SAXText t: listValue) {
+ result.add(t.getValue());
+ }
+ return result;
+ }
+
+ public void addValue(SAXText key, SAXText value) {
+ if(mapValue == null) mapValue = new HashMap<SAXText, SAXText>();
+ mapValue.put(key, value);
+ }
+
+ public Map<String, String> getMapValue() {
+ Map<String, String> result = new HashMap<String, String>();
+ if(mapValue != null) for (SAXText t: mapValue.keySet()) {
+ result.put(t.getValue(), mapValue.get(t).getValue());
+ }
+ return result;
+ }
+
}
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/scanner/SeamDefinitionBuilder.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/scanner/SeamDefinitionBuilder.java 2011-04-26 23:58:08 UTC (rev 30861)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/scanner/SeamDefinitionBuilder.java 2011-04-27 00:56:17 UTC (rev 30862)
@@ -139,16 +139,22 @@
SeamFieldDefinition def = new SeamFieldDefinition();
def.setElement(element);
def.setField(field);
+ if(Util.hasText(element)) {
+ def.addValue(element.getTextNode());
+ }
List<SAXElement> es = element.getChildElements();
for (SAXElement c: es) {
if(!Util.isConfigRelevant(c)) continue;
- if(Util.containsEEPackage(c)) {
- if(Util.isValue(c)) {
+ if(Util.isValue(c)) {
+ if(Util.hasText(c)) {
+ def.addValue(c.getTextNode());
+ } else {
scanFieldValue(c);
- } else if(Util.isEntry(c)) {
- scanEntry(c);
}
continue;
+ } else if(Util.isEntry(c)) {
+ scanEntry(def, c);
+ continue;
}
IType t = Util.resolveType(c, project);
if(t != null) {
@@ -180,14 +186,30 @@
}
}
- private void scanEntry(SAXElement element) {
+ private void scanEntry(SeamFieldDefinition def, SAXElement element) {
List<SAXElement> es = element.getChildElements();
+ SAXText key = null;
+ SAXText value = null;
for (SAXElement c: es) {
if(!Util.isConfigRelevant(c)) continue;
- if(Util.isKey(c) || Util.isValue(c)) {
- scanFieldValue(c);
+ if(Util.isKey(c)) {
+ if(Util.hasText(c)) {
+ key = c.getTextNode();
+ } else {
+ scanFieldValue(c);
+ }
}
+ if(Util.isValue(c)) {
+ if(Util.hasText(c)) {
+ value = c.getTextNode();
+ } else {
+ scanFieldValue(c);
+ }
+ }
}
+ if(key != null && value != null) {
+ def.addValue(key, value);
+ }
}
private SeamMethodDefinition scanMethod(SAXElement element, IMethod method) {
@@ -197,17 +219,17 @@
List<SAXElement> es = element.getChildElements();
for (SAXElement c: es) {
if(!Util.isConfigRelevant(c)) continue;
- if(Util.containsEEPackage(c)) {
- if(Util.isParameters(c)) {
- List<SAXElement> ps = element.getChildElements();
- for (SAXElement p: ps) {
- SeamParameterDefinition pd = scanParameter(p);
- if(pd != null) def.addParameter(pd);
- }
- } else if(Util.isArray(c)) {
- SeamParameterDefinition pd = scanParameter(c);
+ if(Util.isParameters(c)) {
+ List<SAXElement> ps = element.getChildElements();
+ for (SAXElement p: ps) {
+ SeamParameterDefinition pd = scanParameter(p);
if(pd != null) def.addParameter(pd);
- }
+ }
+ continue;
+ } else if(Util.isArray(c)) {
+ SeamParameterDefinition pd = scanParameter(c);
+ if(pd != null) def.addParameter(pd);
+ continue;
}
IType t = Util.resolveType(c, project);
if(t != null) {
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/util/Util.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/util/Util.java 2011-04-26 23:58:08 UTC (rev 30861)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/util/Util.java 2011-04-27 00:56:17 UTC (rev 30862)
@@ -11,6 +11,7 @@
import org.jboss.tools.cdi.core.CDICoreNature;
import org.jboss.tools.cdi.seam.config.core.CDISeamConfigConstants;
import org.jboss.tools.cdi.seam.config.core.scanner.SAXElement;
+import org.jboss.tools.cdi.seam.config.core.scanner.SAXText;
public class Util implements CDISeamConfigConstants {
public static Map<String, String> EE_TYPES = new HashMap<String, String>();
@@ -145,4 +146,9 @@
return (keyword1.equals(n) || keyword2.equals(n)) && containsEEPackage(element);
}
+ public static boolean hasText(SAXElement element) {
+ SAXText t = element.getTextNode();
+ return t != null && t.getValue() != null && t.getValue().trim().length() > 0;
+ }
+
}
14 years, 11 months
JBoss Tools SVN: r30861 - in trunk/cdi/tests/org.jboss.tools.cdi.seam.text.ext.test: META-INF and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2011-04-26 19:58:08 -0400 (Tue, 26 Apr 2011)
New Revision: 30861
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.seam.text.ext.test/META-INF/MANIFEST.MF
trunk/cdi/tests/org.jboss.tools.cdi.seam.text.ext.test/pom.xml
Log:
https://issues.jboss.org/browse/JBIDE-8787
Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam.text.ext.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.text.ext.test/META-INF/MANIFEST.MF 2011-04-26 23:39:43 UTC (rev 30860)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.text.ext.test/META-INF/MANIFEST.MF 2011-04-26 23:58:08 UTC (rev 30861)
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name.0
Bundle-SymbolicName: org.jboss.tools.cdi.seam.text.ext.test
-Bundle-Version: 1.2.0.qualifier
+Bundle-Version: 1.0.0.qualifier
Require-Bundle: org.junit,
org.eclipse.core.resources,
org.eclipse.jface.text,
Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam.text.ext.test/pom.xml
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.text.ext.test/pom.xml 2011-04-26 23:39:43 UTC (rev 30860)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.text.ext.test/pom.xml 2011-04-26 23:58:08 UTC (rev 30861)
@@ -8,7 +8,7 @@
</parent>
<groupId>org.jboss.tools.cdi.tests</groupId>
<artifactId>org.jboss.tools.cdi.seam.text.ext.test</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
<properties>
14 years, 11 months
JBoss Tools SVN: r30860 - trunk/vpe/plugins/org.jboss.tools.vpe.base.test/src/org/jboss/tools/vpe/base/test.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2011-04-26 19:39:43 -0400 (Tue, 26 Apr 2011)
New Revision: 30860
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe.base.test/src/org/jboss/tools/vpe/base/test/VpeTest.java
Log:
Fix for intermittent errors in VPE related to catching exceptions that not related to VPE
Modified: trunk/vpe/plugins/org.jboss.tools.vpe.base.test/src/org/jboss/tools/vpe/base/test/VpeTest.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.base.test/src/org/jboss/tools/vpe/base/test/VpeTest.java 2011-04-26 23:33:33 UTC (rev 30859)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.base.test/src/org/jboss/tools/vpe/base/test/VpeTest.java 2011-04-26 23:39:43 UTC (rev 30860)
@@ -37,6 +37,7 @@
import org.jboss.tools.jst.jsp.JspEditorPlugin;
import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor;
import org.jboss.tools.jst.jsp.preferences.IVpePreferencesPage;
+import org.jboss.tools.vpe.VpePlugin;
import org.jboss.tools.vpe.editor.VpeController;
import org.jboss.tools.vpe.editor.mapping.VpeDomMapping;
import org.jboss.tools.vpe.editor.mapping.VpeElementMapping;
@@ -121,17 +122,9 @@
*/
@Override
protected void tearDown() throws Exception {
-
closeEditors();
-
Platform.removeLogListener(this);
-
- if (getException() != null) {
- throw new Exception(getException());
- }
-
super.tearDown();
-
}
/*
@@ -150,18 +143,20 @@
* the plugin
*/
public void logging(IStatus status, String plugin) {
- switch (status.getSeverity()) {
- case IStatus.ERROR:
- setException(status.getException());
- break;
- case IStatus.WARNING:
- if (isCheckWarning())
+ // Not perfect solution but at least now exceptions in other plug-ins aren't going to break VPE tests
+ if (VpePlugin.PLUGIN_ID.equals(status.getPlugin())) {
+ switch (status.getSeverity()) {
+ case IStatus.ERROR:
setException(status.getException());
- break;
- default:
- break;
+ break;
+ case IStatus.WARNING:
+ if (isCheckWarning())
+ setException(status.getException());
+ break;
+ default:
+ break;
+ }
}
-
}
/**
14 years, 11 months