JBoss Tools SVN: r31161 - in trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test: projects/CDIConfigTest/src/org/jboss and 5 other directories.
by jbosstools-commits@lists.jboss.org
Author: scabanovich
Date: 2011-05-09 17:50:06 -0400 (Mon, 09 May 2011)
New Revision: 31161
Added:
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/org/jboss/beans/
trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/org/jboss/beans/test01/
trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/org/jboss/beans/test01/MyBean1.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/org/jboss/beans/test01/MyBean2.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/org/jboss/beans/test01/MyBean3.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/org/jboss/beans/test01/MyBean4.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/org/jboss/beans/test02/
trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/org/jboss/beans/test02/MyBean1.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/org/jboss/beans/test02/MyBean2.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/org/jboss/beans/test02/MyBean3.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/org/jboss/beans/test02/MyQualifier1.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/org/jboss/beans/test02/MyQualifier2.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/org/jboss/beans/test03/
trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/org/jboss/beans/test03/MyBean1.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/org/jboss/beans/test03/MyBean2.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/org/jboss/beans/test03/MyBean3.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/src/org/jboss/tools/cdi/seam/config/core/test/SeamBeansTest.java
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/src/org/jboss/tools/cdi/seam/config/core/test/CDISeamConfigCoreAllTests.java
Log:
JBIDE-3120
https://issues.jboss.org/browse/JBIDE-3120
Tests for seam config beans: replacing, modifying, creating trivial beans, beans with qualifiers, named beans.
Added: 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 (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/META-INF/seam-beans.xml 2011-05-09 21:50:06 UTC (rev 31161)
@@ -0,0 +1,70 @@
+<?xml version="1.0"?>
+<beans xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:s="urn:java:ee"
+ xmlns:test01="urn:java:org.jboss.beans.test01"
+ xmlns:test02="urn:java:org.jboss.beans.test02"
+ xmlns:test03="urn:java:org.jboss.beans.test03"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://jboss.org/schema/cdi/beans_1_0.xsd">
+
+<!-- Test 01-1 -->
+<test01:MyBean1>
+ <s:modifies/>
+</test01:MyBean1>
+
+<!-- Test 01-2 -->
+<test01:MyBean2>
+ <s:replaces/>
+</test01:MyBean2>
+
+<!-- Test 01-3 -->
+<test01:MyBean3>
+</test01:MyBean3>
+
+<!-- Test 01-4 -->
+<test01:MyBean4>
+</test01:MyBean4>
+<test01:MyBean4>
+</test01:MyBean4>
+
+<!-- Test 02-1 -->
+<test02:MyBean1>
+ <s:modifies/>
+ <test02:MyQualifier2/>
+</test02:MyBean1>
+
+<!-- Test 02-2 -->
+<test02:MyBean2>
+ <s:replaces/>
+ <test02:MyQualifier2/>
+</test02:MyBean2>
+
+<!-- Test 02-3 -->
+<test02:MyBean3>
+ <test02:MyQualifier1/>
+</test02:MyBean3>
+<test02:MyBean3>
+ <test02:MyQualifier2/>
+</test02:MyBean3>
+
+<!-- Test 03-1 -->
+<test03:MyBean1>
+ <s:modifies/>
+ <s:Named>test03-1-b</s:Named>
+</test03:MyBean1>
+
+<!-- Test 03-2 -->
+<test03:MyBean2>
+ <s:replaces/>
+ <s:Named>test03-2-b</s:Named>
+</test03:MyBean2>
+
+<!-- Test 03-3 -->
+<test03:MyBean3>
+ <s:Named>test03-3-b</s:Named>
+</test03:MyBean3>
+<test03:MyBean3>
+ <s:Named>test03-3-c</s:Named>
+</test03:MyBean3>
+
+</beans>
\ No newline at end of file
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/META-INF/seam-beans.xml
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/org/jboss/beans/test01/MyBean1.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/org/jboss/beans/test01/MyBean1.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/org/jboss/beans/test01/MyBean1.java 2011-05-09 21:50:06 UTC (rev 31161)
@@ -0,0 +1,18 @@
+package org.jboss.beans.test01;
+
+/**
+ * Test 01-1.
+ * Sources contain simple bean class MyBean1.
+ * Seam config xml contains declaration:
+ * <test01:MyBean1>
+ * <s:modifies/>
+ * </test01:MyBean1>
+ *
+ * ASSERT: Model contains 1 bean with type MyBean1.
+ *
+ * @author Viacheslav Kabanovich
+ *
+ */
+public class MyBean1 {
+
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/org/jboss/beans/test01/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/test01/MyBean2.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/org/jboss/beans/test01/MyBean2.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/org/jboss/beans/test01/MyBean2.java 2011-05-09 21:50:06 UTC (rev 31161)
@@ -0,0 +1,18 @@
+package org.jboss.beans.test01;
+
+/**
+ * Test 01-2.
+ * Sources contain simple bean class MyBean2.
+ * Seam config xml contains declaration:
+ * <test01:MyBean2>
+ * <s:replaces/>
+ * </test01:MyBean2>
+ *
+ * ASSERT: Model contains 1 bean with type MyBean2.
+ *
+ * @author Viacheslav Kabanovich
+ *
+ */
+public class MyBean2 {
+
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/org/jboss/beans/test01/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/test01/MyBean3.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/org/jboss/beans/test01/MyBean3.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/org/jboss/beans/test01/MyBean3.java 2011-05-09 21:50:06 UTC (rev 31161)
@@ -0,0 +1,17 @@
+package org.jboss.beans.test01;
+
+/**
+ * Test 01-3.
+ * Sources contain simple bean class MyBean3.
+ * Seam config xml contains declaration:
+ * <test01:MyBean3>
+ * </test01:MyBean3>
+ *
+ * ASSERT: Model contains 2 beans with type MyBean3.
+ *
+ * @author Viacheslav Kabanovich
+ *
+ */
+public class MyBean3 {
+
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/org/jboss/beans/test01/MyBean3.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/test01/MyBean4.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/org/jboss/beans/test01/MyBean4.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/org/jboss/beans/test01/MyBean4.java 2011-05-09 21:50:06 UTC (rev 31161)
@@ -0,0 +1,19 @@
+package org.jboss.beans.test01;
+
+/**
+ * Test 01-4.
+ * Sources contain simple bean class MyBean4.
+ * Seam config xml contains 2 declarations:
+ * <test01:MyBean4>
+ * </test01:MyBean4>
+ * <test01:MyBean4>
+ * </test01:MyBean4>
+ *
+ * ASSERT: Model contains 3 beans with type MyBean4.
+ *
+ * @author Viacheslav Kabanovich
+ *
+ */
+public class MyBean4 {
+
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/org/jboss/beans/test01/MyBean4.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/test02/MyBean1.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/org/jboss/beans/test02/MyBean1.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/org/jboss/beans/test02/MyBean1.java 2011-05-09 21:50:06 UTC (rev 31161)
@@ -0,0 +1,21 @@
+package org.jboss.beans.test02;
+
+/**
+ * Test 02-1.
+ * Sources contain simple bean class MyBean1 with qualifier MyQualifier1.
+ * Seam config xml contains declaration:
+ * <test02:MyBean1>
+ * <s:modifies/>
+ * <test02:MyQualifier2/>
+ * </test02:MyBean1>
+ *
+ * ASSERT: Model contains 1 bean with type MyBean1 and qualifier MyQualifier1.
+ * ASSERT: That bean also has qualifier MyQualifier2.
+ *
+ * @author Viacheslav Kabanovich
+ *
+ */
+@MyQualifier1
+public class MyBean1 {
+
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/org/jboss/beans/test02/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/test02/MyBean2.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/org/jboss/beans/test02/MyBean2.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/org/jboss/beans/test02/MyBean2.java 2011-05-09 21:50:06 UTC (rev 31161)
@@ -0,0 +1,21 @@
+package org.jboss.beans.test02;
+
+/**
+ * Test 02-2.
+ * Sources contain simple bean class MyBean2 with qualifier MyQualifier1.
+ * Seam config xml contains declaration:
+ * <test02:MyBean2>
+ * <s:replaces/>
+ * <test02:MyQualifier2/>
+ * </test02:MyBean2>
+ *
+ * ASSERT: Model contains no bean with type MyBean2 and qualifier MyQualifier1.
+ * ASSERT: Model contains 1 bean with type MyBean2 and qualifier MyQualifier2.
+ *
+ * @author Viacheslav Kabanovich
+ *
+ */
+@MyQualifier1
+public class MyBean2 {
+
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/org/jboss/beans/test02/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/test02/MyBean3.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/org/jboss/beans/test02/MyBean3.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/org/jboss/beans/test02/MyBean3.java 2011-05-09 21:50:06 UTC (rev 31161)
@@ -0,0 +1,23 @@
+package org.jboss.beans.test02;
+
+/**
+ * Test 02-3.
+ * Sources contain simple bean class MyBean3.
+ * Seam config xml contains declarations:
+ * <test02:MyBean3>
+ * <test02:MyQualifier1/>
+ * </test02:MyBean3>
+ * <test02:MyBean3>
+ * <test02:MyQualifier2/>
+ * </test02:MyBean3>
+ *
+ * ASSERT: Model contains 3 bean with type MyBean2.
+ * ASSERT: Model contains 1 bean with type MyBean2 and qualifier MyQualifier1.
+ * ASSERT: Model contains 1 bean with type MyBean2 and qualifier MyQualifier2.
+ *
+ * @author Viacheslav Kabanovich
+ *
+ */
+public class MyBean3 {
+
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/org/jboss/beans/test02/MyBean3.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/test02/MyQualifier1.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/org/jboss/beans/test02/MyQualifier1.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/org/jboss/beans/test02/MyQualifier1.java 2011-05-09 21:50:06 UTC (rev 31161)
@@ -0,0 +1,21 @@
+package org.jboss.beans.test02;
+
+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 MyQualifier1 {
+
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/org/jboss/beans/test02/MyQualifier1.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/test02/MyQualifier2.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/org/jboss/beans/test02/MyQualifier2.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/org/jboss/beans/test02/MyQualifier2.java 2011-05-09 21:50:06 UTC (rev 31161)
@@ -0,0 +1,21 @@
+package org.jboss.beans.test02;
+
+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 MyQualifier2 {
+
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/org/jboss/beans/test02/MyQualifier2.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/test03/MyBean1.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/org/jboss/beans/test03/MyBean1.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/org/jboss/beans/test03/MyBean1.java 2011-05-09 21:50:06 UTC (rev 31161)
@@ -0,0 +1,23 @@
+package org.jboss.beans.test03;
+
+import javax.inject.Named;
+
+/**
+ * Test 03-1.
+ * Sources contain simple bean class MyBean1 with qualifier Named("test03-1-a").
+ * Seam config xml contains declaration:
+ * <test03:MyBean1>
+ * <s:modifies/>
+ * <s:Named>test03-1-b</s:Named>
+ * </test03:MyBean1>
+ *
+ * ASSERT: Model contains no named bean with name "test03-1-a".
+ * ASSERT: Model contains 1 named bean with name "test03-1-b".
+ *
+ * @author Viacheslav Kabanovich
+ *
+ */
+@Named("test03-1-a")
+public class MyBean1 {
+
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/org/jboss/beans/test03/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/test03/MyBean2.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/org/jboss/beans/test03/MyBean2.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/org/jboss/beans/test03/MyBean2.java 2011-05-09 21:50:06 UTC (rev 31161)
@@ -0,0 +1,23 @@
+package org.jboss.beans.test03;
+
+import javax.inject.Named;
+
+/**
+ * Test 03-2.
+ * Sources contain simple bean class MyBean2 with qualifier Named("test03-2-a").
+ * Seam config xml contains declaration:
+ * <test03:MyBean2>
+ * <s:replaces/>
+ * <s:Named>test03-2-b</s:Named>
+ * </test03:MyBean2>
+ *
+ * ASSERT: Model contains no named bean with name "test03-2-a".
+ * ASSERT: Model contains 1 named bean with name "test03-2-b".
+ *
+ * @author Viacheslav Kabanovich
+ *
+ */
+@Named("test03-2-a")
+public class MyBean2 {
+
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/org/jboss/beans/test03/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/test03/MyBean3.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/org/jboss/beans/test03/MyBean3.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/org/jboss/beans/test03/MyBean3.java 2011-05-09 21:50:06 UTC (rev 31161)
@@ -0,0 +1,24 @@
+package org.jboss.beans.test03;
+
+import javax.inject.Named;
+
+/**
+ * Test 03-3.
+ * Sources contain simple bean class MyBean3 with qualifier Named("test03-3-a").
+ * Seam config xml contains declarations:
+ * <test03:MyBean3>
+ * <s:Named>test03-3-b</s:Named>
+ * </test03:MyBean3>
+ * <test03:MyBean3>
+ * <s:Named>test03-3-c</s:Named>
+ * </test03:MyBean3>
+ *
+ * ASSERT: Model contains named beans "test03-3-a", "test03-3-b", "test03-3-c".
+ *
+ * @author Viacheslav Kabanovich
+ *
+ */
+@Named("test03-3-a")
+public class MyBean3 {
+
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/org/jboss/beans/test03/MyBean3.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/CDISeamConfigCoreAllTests.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/src/org/jboss/tools/cdi/seam/config/core/test/CDISeamConfigCoreAllTests.java 2011-05-09 21:26:01 UTC (rev 31160)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/src/org/jboss/tools/cdi/seam/config/core/test/CDISeamConfigCoreAllTests.java 2011-05-09 21:50:06 UTC (rev 31161)
@@ -27,6 +27,7 @@
suiteAll.addTestSuite(ExtensionTest.class);
suiteAll.addTestSuite(SeamDefinitionsTest.class);
+ suiteAll.addTestSuite(SeamBeansTest.class);
SeamConfigTestSetup suite = new SeamConfigTestSetup(suiteAll);
Added: 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 (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/src/org/jboss/tools/cdi/seam/config/core/test/SeamBeansTest.java 2011-05-09 21:50:06 UTC (rev 31161)
@@ -0,0 +1,228 @@
+/*******************************************************************************
+ * Copyright (c) 2011 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.cdi.seam.config.core.test;
+
+import java.io.IOException;
+import java.util.HashSet;
+import java.util.Set;
+
+import org.eclipse.core.runtime.CoreException;
+import org.jboss.tools.cdi.core.IBean;
+
+/**
+ *
+ * @author Viacheslav Kabanovich
+ *
+ */
+public class SeamBeansTest extends SeamConfigTest {
+
+ public SeamBeansTest() {}
+
+ /**
+ * Test 01-1.
+ * Sources contain simple bean class MyBean1.
+ * Seam config xml contains declaration:
+ * <test01:MyBean1>
+ * <s:modifies/>
+ * </test01:MyBean1>
+ *
+ * ASSERT: Model contains 1 bean with type MyBean1.
+ */
+ public void testModifyingATrivialBean() throws CoreException, IOException {
+ Set<IBean> beans = getBeansByClassName("org.jboss.beans.test01.MyBean1");
+ assertEquals(1, beans.size());
+ }
+
+ /**
+ * Test 01-2.
+ * Sources contain simple bean class MyBean2.
+ * Seam config xml contains declaration:
+ * <test01:MyBean2>
+ * <s:replaces/>
+ * </test01:MyBean2>
+ *
+ * ASSERT: Model contains 1 bean with type MyBean2.
+ */
+ public void testReplacingATrivialBean() throws CoreException, IOException {
+ Set<IBean> beans = getBeansByClassName("org.jboss.beans.test01.MyBean2");
+ assertEquals(1, beans.size());
+ }
+
+ /**
+ * Test 01-3.
+ * Sources contain simple bean class MyBean3.
+ * Seam config xml contains declaration:
+ * <test01:MyBean3>
+ * </test01:MyBean3>
+ *
+ * ASSERT: Model contains 2 beans with type MyBean3.
+ */
+ public void testCreatingNewTrivialBean() throws CoreException, IOException {
+ Set<IBean> beans = getBeansByClassName("org.jboss.beans.test01.MyBean3");
+ assertEquals(2, beans.size());
+ }
+
+ /**
+ * Test 01-4.
+ * Sources contain simple bean class MyBean4.
+ * Seam config xml contains 2 declarations:
+ * <test01:MyBean4>
+ * </test01:MyBean4>
+ * <test01:MyBean4>
+ * </test01:MyBean4>
+ *
+ * ASSERT: Model contains 3 beans with type MyBean4.
+ */
+ public void testCreatingTwoNewTrivialBeans() throws CoreException, IOException {
+ Set<IBean> beans = getBeansByClassName("org.jboss.beans.test01.MyBean4");
+ assertEquals(3, beans.size());
+ }
+
+ /**
+ * Test 02-1.
+ * Sources contain simple bean class MyBean1
+ * with qualifier MyQualifier1.
+ * Seam config xml contains declaration:
+ * <test02:MyBean1>
+ * <s:modifies/>
+ * <test02:MyQualifier2/>
+ * </test02:MyBean1>
+ *
+ * ASSERT: Model contains 1 bean with type MyBean1 and qualifier MyQualifier1.
+ * ASSERT: That bean also has qualifier MyQualifier2.
+ *
+ * @author Viacheslav Kabanovich
+ *
+ */
+ public void testModifyingAQualifiedBean() throws CoreException, IOException {
+ Set<IBean> beans1 = cdiProject.getBeans(false, "org.jboss.beans.test02.MyBean1",
+ new String[]{"org.jboss.beans.test02.MyQualifier1"});
+ assertEquals(1, beans1.size());
+ Set<IBean> beans2 = cdiProject.getBeans(false, "org.jboss.beans.test02.MyBean1",
+ new String[]{"org.jboss.beans.test02.MyQualifier1",
+ "org.jboss.beans.test02.MyQualifier2"});
+ assertEquals(1, beans2.size());
+ assertTrue("Two sets should contain the same bean.", beans1.iterator().next() == beans2.iterator().next());
+ }
+
+ /**
+ * Test 02-2.
+ * Sources contain simple bean class MyBean2
+ * with qualifier MyQualifier1.
+ * Seam config xml contains declaration:
+ * <test02:MyBean2>
+ * <s:replaces/>
+ * <test02:MyQualifier2/>
+ * </test02:MyBean2>
+ *
+ * ASSERT: Model contains no bean with type MyBean2 and qualifier MyQualifier1.
+ * ASSERT: Model contains 1 bean with type MyBean2 and qualifier MyQualifier2.
+ */
+ public void testReplacingAQualifiedBean() throws CoreException, IOException {
+ Set<IBean> beans1 = cdiProject.getBeans(false, "org.jboss.beans.test02.MyBean2",
+ new String[]{"org.jboss.beans.test02.MyQualifier1"});
+ assertTrue(beans1.isEmpty());
+ Set<IBean> beans2 = cdiProject.getBeans(false, "org.jboss.beans.test02.MyBean2",
+ new String[]{"org.jboss.beans.test02.MyQualifier2"});
+ assertEquals(1, beans2.size());
+ }
+
+ /**
+ * Test 02-3.
+ * Sources contain simple bean class MyBean3.
+ * Seam config xml contains declarations:
+ * <test02:MyBean3>
+ * <test02:MyQualifier1/>
+ * </test02:MyBean3>
+ * <test02:MyBean3>
+ * <test02:MyQualifier2/>
+ * </test02:MyBean3>
+ *
+ * ASSERT: Model contains 3 bean with type MyBean2.
+ * ASSERT: Model contains 1 bean with type MyBean2 and qualifier MyQualifier1.
+ * ASSERT: Model contains 1 bean with type MyBean2 and qualifier MyQualifier2.
+ *
+ * @author Viacheslav Kabanovich
+ *
+ */
+ public void testCreatingTwoNewQualifiedBeans() throws CoreException, IOException {
+ Set<IBean> beans = getBeansByClassName("org.jboss.beans.test01.MyBean4");
+ assertEquals(3, beans.size());
+ }
+
+ /**
+ * Test 03-1.
+ * Sources contain simple bean class MyBean1 with qualifier Named("test03-1-a").
+ * Seam config xml contains declaration:
+ * <test03:MyBean1>
+ * <s:modifies/>
+ * <s:Named>test03-1-b</s:Named>
+ * </test03:MyBean1>
+ *
+ * ASSERT: Model contains no named bean with name "test03-1-a".
+ * ASSERT: Model contains 1 named bean with name "test03-1-b".
+ */
+ public void testModifyingANamedBean() throws CoreException, IOException {
+ Set<IBean> beans1 = cdiProject.getBeans(false, "org.jboss.beans.test03.MyBean1");
+ assertEquals(1, beans1.size());
+ IBean b = beans1.iterator().next();
+ assertEquals("test03-1-b", b.getName());
+ }
+
+ /**
+ * Test 03-2.
+ * Sources contain simple bean class MyBean2 with qualifier Named("test03-2-a").
+ * Seam config xml contains declaration:
+ * <test03:MyBean2>
+ * <s:replaces/>
+ * <s:Named>test03-2-b</s:Named>
+ * </test03:MyBean2>
+ *
+ * ASSERT: Model contains no named bean with name "test03-2-a".
+ * ASSERT: Model contains 1 named bean with name "test03-2-b".
+ */
+ public void testReplacingANamedBean() throws CoreException, IOException {
+ Set<IBean> beans1 = cdiProject.getBeans(false, "org.jboss.beans.test03.MyBean2");
+ assertEquals(1, beans1.size());
+ IBean b = beans1.iterator().next();
+ assertEquals("test03-2-b", b.getName());
+ }
+
+ /**
+ * Test 03-3.
+ * Sources contain simple bean class MyBean3 with qualifier Named("test03-3-a").
+ * Seam config xml contains declarations:
+ * <test03:MyBean3>
+ * <s:Named>test03-3-b</s:Named>
+ * </test03:MyBean3>
+ * <test03:MyBean3>
+ * <s:Named>test03-3-c</s:Named>
+ * </test03:MyBean3>
+ *
+ * ASSERT: Model contains named beans "test03-3-a", "test03-3-b", "test03-3-c".
+ */
+ public void testCreatingNamedBeans() throws CoreException, IOException {
+ Set<IBean> beans = cdiProject.getBeans(false, "org.jboss.beans.test03.MyBean3");
+ assertEquals(3, beans.size());
+ Set<String> names = new HashSet<String>();
+ for (IBean b: beans) {
+ names.add(b.getName());
+ }
+ assertTrue(names.contains("test03-3-a"));
+ assertTrue(names.contains("test03-3-b"));
+ assertTrue(names.contains("test03-3-c"));
+ }
+
+ protected Set<IBean> getBeansByClassName(String className) {
+ return cdiProject.getBeans(false, className, new String[0]);
+ }
+
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/src/org/jboss/tools/cdi/seam/config/core/test/SeamBeansTest.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
13 years, 5 months
JBoss Tools SVN: r31160 - tags.
by jbosstools-commits@lists.jboss.org
Author: nickboldt
Date: 2011-05-09 17:26:01 -0400 (Mon, 09 May 2011)
New Revision: 31160
Added:
tags/jbosstools-3.2.1.M1/
Log:
tag for 3.2.1.M1
13 years, 5 months
JBoss Tools SVN: r31159 - trunk/build/aggregate/site.
by jbosstools-commits@lists.jboss.org
Author: nickboldt
Date: 2011-05-09 16:52:47 -0400 (Mon, 09 May 2011)
New Revision: 31159
Modified:
trunk/build/aggregate/site/aggregateSite.jbosstools.properties
Log:
use M6 site, not the M7 or M6+M7 site to fetch deps
Modified: trunk/build/aggregate/site/aggregateSite.jbosstools.properties
===================================================================
--- trunk/build/aggregate/site/aggregateSite.jbosstools.properties 2011-05-09 20:51:21 UTC (rev 31158)
+++ trunk/build/aggregate/site/aggregateSite.jbosstools.properties 2011-05-09 20:52:47 UTC (rev 31159)
@@ -4,4 +4,4 @@
#update.site.version=3.2.0.M2.2010-07-16_13-26-18-H21
# associate sites to add to the resulting repo
-associate.sites=http://download.jboss.org/jbosstools/updates/indigo/
+associate.sites=http://download.jboss.org/jbosstools/updates/indigo/M6/
13 years, 5 months
JBoss Tools SVN: r31158 - in trunk/download.jboss.org/jbosstools/updates/indigo: M6 and 1 other directories.
by jbosstools-commits@lists.jboss.org
Author: nickboldt
Date: 2011-05-09 16:51:21 -0400 (Mon, 09 May 2011)
New Revision: 31158
Added:
trunk/download.jboss.org/jbosstools/updates/indigo/M6/
trunk/download.jboss.org/jbosstools/updates/indigo/M6/README.txt
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/
trunk/download.jboss.org/jbosstools/updates/indigo/M7/README.txt
trunk/download.jboss.org/jbosstools/updates/indigo/M7/compositeArtifacts.xml
trunk/download.jboss.org/jbosstools/updates/indigo/M7/compositeContent.xml
Modified:
trunk/download.jboss.org/jbosstools/updates/indigo/compositeArtifacts.xml
trunk/download.jboss.org/jbosstools/updates/indigo/compositeContent.xml
trunk/download.jboss.org/jbosstools/updates/indigo/index.html
Log:
split M6 and M7 into sep sites because, oh, that's right, THEY'RE NOT COMPATIBLE. #FML
Added: trunk/download.jboss.org/jbosstools/updates/indigo/M6/README.txt
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/indigo/M6/README.txt (rev 0)
+++ trunk/download.jboss.org/jbosstools/updates/indigo/M6/README.txt 2011-05-09 20:51:21 UTC (rev 31158)
@@ -0,0 +1,4 @@
+Instead of mirroring Indigo here, composite a site.
+See composite*.xml for contained site refs.
+
+See /updates/requirements/{*}/build.xml for how to mirror other sites.
Added: trunk/download.jboss.org/jbosstools/updates/indigo/M6/compositeArtifacts.xml
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/indigo/M6/compositeArtifacts.xml (rev 0)
+++ trunk/download.jboss.org/jbosstools/updates/indigo/M6/compositeArtifacts.xml 2011-05-09 20:51:21 UTC (rev 31158)
@@ -0,0 +1,42 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<?compositeArtifactRepository version='1.0.0'?>
+<repository name='JBoss Tools Requirements - Composite Indigo Mirror' type='org.eclipse.equinox.internal.p2.artifact.repository.CompositeArtifactRepository' version='1.0.0'>
+<properties size='2'>
+<property name='p2.compressed' value='true'/>
+<!--
+" add this to your ~/.vimrc file, then use \ts to update timestamp to current
+fun! ReplaceTimestamp()
+ let tstamp = strftime("%s000")
+ exe ":%s#<property name='p2.timestamp' value='[0-9]\\+'/>#<property name='p2.timestamp' value='" . tstamp . "'/>#g"
+ echo "New time: " . tstamp
+endfun
+nnoremap <Leader>ts :call ReplaceTimestamp()<CR>
+-->
+<property name='p2.timestamp' value='1304967283000'/>
+</properties>
+<children size='20'>
+<child location='../../requirements/indigo/201103180900-M6/'/>
+<child location='../../requirements/birt/4.0M6/'/>
+<child location='../../requirements/eclipse/3.7M6/'/>
+<child location='../../requirements/emf/2.7M6/'/>
+<child location='../../requirements/webtools/3.3M6/'/>
+<child location='../../requirements/m2eclipse/0.13.0.201103291237/'/>
+
+<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/'/>
+
+<child location='../../requirements/mylyn/3.6/'/>
+<child location='../../requirements/orbit/S20110124210048/'/>
+<child location='../../requirements/pmd/3.2.6/'/>
+<child location='../../requirements/springide/2.6.0.201103160035/'/>
+
+<child location='../../requirements/subclipse/1.6/'/>
+<child location='../../requirements/subversive/0.7.9_2.2.2/'/>
+<child location='../../requirements/swtbot/2.0.4/'/>
+<child location='../../requirements/testng/6.0.1.20110418_1444/'/>
+<child location='../../requirements/xulrunner-1.9.1.2/'/>
+</children>
+</repository>
Added: trunk/download.jboss.org/jbosstools/updates/indigo/M6/compositeContent.xml
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/indigo/M6/compositeContent.xml (rev 0)
+++ trunk/download.jboss.org/jbosstools/updates/indigo/M6/compositeContent.xml 2011-05-09 20:51:21 UTC (rev 31158)
@@ -0,0 +1,42 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<?compositeMetadataRepository version='1.0.0'?>
+<repository name='JBoss Tools Requirements - Composite Indigo Mirror' type='org.eclipse.equinox.internal.p2.metadata.repository.CompositeMetadataRepository' version='1.0.0'>
+<properties size='2'>
+<property name='p2.compressed' value='true'/>
+<!--
+" add this to your ~/.vimrc file, then use \ts to update timestamp to current
+fun! ReplaceTimestamp()
+ let tstamp = strftime("%s000")
+ exe ":%s#<property name='p2.timestamp' value='[0-9]\\+'/>#<property name='p2.timestamp' value='" . tstamp . "'/>#g"
+ echo "New time: " . tstamp
+endfun
+nnoremap <Leader>ts :call ReplaceTimestamp()<CR>
+-->
+<property name='p2.timestamp' value='1304967283000'/>
+</properties>
+<children size='20'>
+<child location='../../requirements/indigo/201103180900-M6/'/>
+<child location='../../requirements/birt/4.0M6/'/>
+<child location='../../requirements/eclipse/3.7M6/'/>
+<child location='../../requirements/emf/2.7M6/'/>
+<child location='../../requirements/webtools/3.3M6/'/>
+<child location='../../requirements/m2eclipse/0.13.0.201103291237/'/>
+
+<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/'/>
+
+<child location='../../requirements/mylyn/3.6/'/>
+<child location='../../requirements/orbit/S20110124210048/'/>
+<child location='../../requirements/pmd/3.2.6/'/>
+<child location='../../requirements/springide/2.6.0.201103160035/'/>
+
+<child location='../../requirements/subclipse/1.6/'/>
+<child location='../../requirements/subversive/0.7.9_2.2.2/'/>
+<child location='../../requirements/swtbot/2.0.4/'/>
+<child location='../../requirements/testng/6.0.1.20110418_1444/'/>
+<child location='../../requirements/xulrunner-1.9.1.2/'/>
+</children>
+</repository>
Added: trunk/download.jboss.org/jbosstools/updates/indigo/M7/README.txt
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/indigo/M7/README.txt (rev 0)
+++ trunk/download.jboss.org/jbosstools/updates/indigo/M7/README.txt 2011-05-09 20:51:21 UTC (rev 31158)
@@ -0,0 +1,4 @@
+Instead of mirroring Indigo here, composite a site.
+See composite*.xml for contained site refs.
+
+See /updates/requirements/{*}/build.xml for how to mirror other sites.
Added: trunk/download.jboss.org/jbosstools/updates/indigo/M7/compositeArtifacts.xml
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/indigo/M7/compositeArtifacts.xml (rev 0)
+++ trunk/download.jboss.org/jbosstools/updates/indigo/M7/compositeArtifacts.xml 2011-05-09 20:51:21 UTC (rev 31158)
@@ -0,0 +1,42 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<?compositeArtifactRepository version='1.0.0'?>
+<repository name='JBoss Tools Requirements - Composite Indigo Mirror' type='org.eclipse.equinox.internal.p2.artifact.repository.CompositeArtifactRepository' version='1.0.0'>
+<properties size='2'>
+<property name='p2.compressed' value='true'/>
+<!--
+" add this to your ~/.vimrc file, then use \ts to update timestamp to current
+fun! ReplaceTimestamp()
+ let tstamp = strftime("%s000")
+ exe ":%s#<property name='p2.timestamp' value='[0-9]\\+'/>#<property name='p2.timestamp' value='" . tstamp . "'/>#g"
+ echo "New time: " . tstamp
+endfun
+nnoremap <Leader>ts :call ReplaceTimestamp()<CR>
+-->
+<property name='p2.timestamp' value='1304967283000'/>
+</properties>
+<children size='20'>
+<child location='../../requirements/indigo/201105060900-M7/'/>
+<child location='../../requirements/birt/4.0M7/'/>
+<child location='../../requirements/eclipse/3.7M7/'/>
+<child location='../../requirements/emf/2.7M7/'/>
+<child location='../../requirements/webtools/3.3M7/'/>
+<child location='../../requirements/m2eclipse/0.13.0.201105091504/'/>
+
+<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/'/>
+
+<child location='../../requirements/mylyn/3.6/'/>
+<child location='../../requirements/orbit/S20110124210048/'/>
+<child location='../../requirements/pmd/3.2.6/'/>
+<child location='../../requirements/springide/2.6.0.201103160035/'/>
+
+<child location='../../requirements/subclipse/1.6/'/>
+<child location='../../requirements/subversive/0.7.9_2.2.2/'/>
+<child location='../../requirements/swtbot/2.0.4/'/>
+<child location='../../requirements/testng/6.0.1.20110418_1444/'/>
+<child location='../../requirements/xulrunner-1.9.1.2/'/>
+</children>
+</repository>
Added: trunk/download.jboss.org/jbosstools/updates/indigo/M7/compositeContent.xml
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/indigo/M7/compositeContent.xml (rev 0)
+++ trunk/download.jboss.org/jbosstools/updates/indigo/M7/compositeContent.xml 2011-05-09 20:51:21 UTC (rev 31158)
@@ -0,0 +1,42 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<?compositeMetadataRepository version='1.0.0'?>
+<repository name='JBoss Tools Requirements - Composite Indigo Mirror' type='org.eclipse.equinox.internal.p2.metadata.repository.CompositeMetadataRepository' version='1.0.0'>
+<properties size='2'>
+<property name='p2.compressed' value='true'/>
+<!--
+" add this to your ~/.vimrc file, then use \ts to update timestamp to current
+fun! ReplaceTimestamp()
+ let tstamp = strftime("%s000")
+ exe ":%s#<property name='p2.timestamp' value='[0-9]\\+'/>#<property name='p2.timestamp' value='" . tstamp . "'/>#g"
+ echo "New time: " . tstamp
+endfun
+nnoremap <Leader>ts :call ReplaceTimestamp()<CR>
+-->
+<property name='p2.timestamp' value='1304967283000'/>
+</properties>
+<children size='20'>
+<child location='../../requirements/indigo/201105060900-M7/'/>
+<child location='../../requirements/birt/4.0M7/'/>
+<child location='../../requirements/eclipse/3.7M7/'/>
+<child location='../../requirements/emf/2.7M7/'/>
+<child location='../../requirements/webtools/3.3M7/'/>
+<child location='../../requirements/m2eclipse/0.13.0.201105091504/'/>
+
+<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/'/>
+
+<child location='../../requirements/mylyn/3.6/'/>
+<child location='../../requirements/orbit/S20110124210048/'/>
+<child location='../../requirements/pmd/3.2.6/'/>
+<child location='../../requirements/springide/2.6.0.201103160035/'/>
+
+<child location='../../requirements/subclipse/1.6/'/>
+<child location='../../requirements/subversive/0.7.9_2.2.2/'/>
+<child location='../../requirements/swtbot/2.0.4/'/>
+<child location='../../requirements/testng/6.0.1.20110418_1444/'/>
+<child location='../../requirements/xulrunner-1.9.1.2/'/>
+</children>
+</repository>
Modified: trunk/download.jboss.org/jbosstools/updates/indigo/compositeArtifacts.xml
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/indigo/compositeArtifacts.xml 2011-05-09 20:32:07 UTC (rev 31157)
+++ trunk/download.jboss.org/jbosstools/updates/indigo/compositeArtifacts.xml 2011-05-09 20:51:21 UTC (rev 31158)
@@ -14,36 +14,8 @@
-->
<property name='p2.timestamp' value='1304967283000'/>
</properties>
-<children size='26'>
-<child location='../requirements/indigo/201105060900-M7/'/>
-<child location='../requirements/birt/4.0M7/'/>
-<child location='../requirements/eclipse/3.7M7/'/>
-<child location='../requirements/emf/2.7M7/'/>
-<child location='../requirements/webtools/3.3M7/'/>
-<child location='../requirements/m2eclipse/0.13.0.201105091504/'/>
-
-<child location='../requirements/indigo/201103180900-M6/'/>
-<child location='../requirements/birt/4.0M6/'/>
-<child location='../requirements/eclipse/3.7M6/'/>
-<child location='../requirements/emf/2.7M6/'/>
-<child location='../requirements/webtools/3.3M6/'/>
-<child location='../requirements/m2eclipse/0.13.0.201103291237/'/>
-
-<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/'/>
-
-<child location='../requirements/mylyn/3.6/'/>
-<child location='../requirements/orbit/S20110124210048/'/>
-<child location='../requirements/pmd/3.2.6/'/>
-<child location='../requirements/springide/2.6.0.201103160035/'/>
-
-<child location='../requirements/subclipse/1.6/'/>
-<child location='../requirements/subversive/0.7.9_2.2.2/'/>
-<child location='../requirements/swtbot/2.0.4/'/>
-<child location='../requirements/testng/6.0.1.20110418_1444/'/>
-<child location='../requirements/xulrunner-1.9.1.2/'/>
+<children size='2'>
+<child location='M6/'/>
+<child location='M7/'/>
</children>
</repository>
Modified: trunk/download.jboss.org/jbosstools/updates/indigo/compositeContent.xml
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/indigo/compositeContent.xml 2011-05-09 20:32:07 UTC (rev 31157)
+++ trunk/download.jboss.org/jbosstools/updates/indigo/compositeContent.xml 2011-05-09 20:51:21 UTC (rev 31158)
@@ -14,36 +14,8 @@
-->
<property name='p2.timestamp' value='1304967283000'/>
</properties>
-<children size='26'>
-<child location='../requirements/indigo/201105060900-M7/'/>
-<child location='../requirements/birt/4.0M7/'/>
-<child location='../requirements/eclipse/3.7M7/'/>
-<child location='../requirements/emf/2.7M7/'/>
-<child location='../requirements/webtools/3.3M7/'/>
-<child location='../requirements/m2eclipse/0.13.0.201105091504/'/>
-
-<child location='../requirements/indigo/201103180900-M6/'/>
-<child location='../requirements/birt/4.0M6/'/>
-<child location='../requirements/eclipse/3.7M6/'/>
-<child location='../requirements/emf/2.7M6/'/>
-<child location='../requirements/webtools/3.3M6/'/>
-<child location='../requirements/m2eclipse/0.13.0.201103291237/'/>
-
-<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/'/>
-
-<child location='../requirements/mylyn/3.6/'/>
-<child location='../requirements/orbit/S20110124210048/'/>
-<child location='../requirements/pmd/3.2.6/'/>
-<child location='../requirements/springide/2.6.0.201103160035/'/>
-
-<child location='../requirements/subclipse/1.6/'/>
-<child location='../requirements/subversive/0.7.9_2.2.2/'/>
-<child location='../requirements/swtbot/2.0.4/'/>
-<child location='../requirements/testng/6.0.1.20110418_1444/'/>
-<child location='../requirements/xulrunner-1.9.1.2/'/>
+<children size='2'>
+<child location='M6/'/>
+<child location='M7/'/>
</children>
</repository>
Modified: trunk/download.jboss.org/jbosstools/updates/indigo/index.html
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/indigo/index.html 2011-05-09 20:32:07 UTC (rev 31157)
+++ trunk/download.jboss.org/jbosstools/updates/indigo/index.html 2011-05-09 20:51:21 UTC (rev 31158)
@@ -48,8 +48,8 @@
<br/>
<ul>
<li><a class=link href=README.txt>README.txt</a></li>
-<li><a class=link href=compositeArtifacts.xml>compositeArtifacts.xml</a></li>
-<li><a class=link href=compositeContent.xml>compositeContent.xml</a></li>
+<li><a class=link href=M7>Indigo M7</a></li>
+<li><a class=link href=M6>Indigo M6</a></li>
</ul>
<br/>
</td>
13 years, 5 months
JBoss Tools SVN: r31157 - trunk/forge/plugins/org.jboss.tools.seam.forge/src/org/jboss/tools/seam/forge/importer.
by jbosstools-commits@lists.jboss.org
Author: koen.aers(a)jboss.com
Date: 2011-05-09 16:32:07 -0400 (Mon, 09 May 2011)
New Revision: 31157
Modified:
trunk/forge/plugins/org.jboss.tools.seam.forge/src/org/jboss/tools/seam/forge/importer/ProjectImporter.java
Log:
revert to older dependency of m2e
Modified: trunk/forge/plugins/org.jboss.tools.seam.forge/src/org/jboss/tools/seam/forge/importer/ProjectImporter.java
===================================================================
--- trunk/forge/plugins/org.jboss.tools.seam.forge/src/org/jboss/tools/seam/forge/importer/ProjectImporter.java 2011-05-09 20:23:02 UTC (rev 31156)
+++ trunk/forge/plugins/org.jboss.tools.seam.forge/src/org/jboss/tools/seam/forge/importer/ProjectImporter.java 2011-05-09 20:32:07 UTC (rev 31157)
@@ -30,7 +30,7 @@
Job job = new WorkspaceJob("Importing Forge project") {
public IStatus runInWorkspace(IProgressMonitor monitor) {
try {
- MavenPlugin.getProjectConfigurationManager().importProjects(
+ MavenPlugin.getDefault().getProjectConfigurationManager().importProjects(
getProjectToImport(),
new ProjectImportConfiguration(),
monitor);
@@ -40,7 +40,7 @@
return Status.OK_STATUS;
}
};
- job.setRule(MavenPlugin.getProjectConfigurationManager().getRule());
+ job.setRule(MavenPlugin.getDefault().getProjectConfigurationManager().getRule());
job.schedule();
}
@@ -49,7 +49,7 @@
try {
File projectDir = new File(baseDirPath, projectName);
File pomFile = new File(projectDir, "pom.xml");
- Model model = MavenPlugin.getMavenModelManager().readMavenModel(pomFile);
+ Model model = MavenPlugin.getDefault().getMavenModelManager().readMavenModel(pomFile);
String pomName = projectName + "/" + "pom.xml";
result = new MavenProjectInfo(pomName, pomFile, model, null);
} catch (CoreException e) {
13 years, 5 months
JBoss Tools SVN: r31156 - in trunk/download.jboss.org/jbosstools/updates: requirements/m2eclipse and 1 other directory.
by jbosstools-commits@lists.jboss.org
Author: nickboldt
Date: 2011-05-09 16:23:02 -0400 (Mon, 09 May 2011)
New Revision: 31156
Modified:
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/m2eclipse/build.xml
trunk/download.jboss.org/jbosstools/updates/requirements/m2eclipse/index....
Log:
bump m2e 0.13 to newer version (M6 -> M7)
Modified: trunk/download.jboss.org/jbosstools/updates/indigo/compositeArtifacts.xml
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/indigo/compositeArtifacts.xml 2011-05-09 20:22:44 UTC (rev 31155)
+++ trunk/download.jboss.org/jbosstools/updates/indigo/compositeArtifacts.xml 2011-05-09 20:23:02 UTC (rev 31156)
@@ -14,18 +14,20 @@
-->
<property name='p2.timestamp' value='1304967283000'/>
</properties>
-<children size='24'>
+<children size='26'>
<child location='../requirements/indigo/201105060900-M7/'/>
<child location='../requirements/birt/4.0M7/'/>
<child location='../requirements/eclipse/3.7M7/'/>
<child location='../requirements/emf/2.7M7/'/>
<child location='../requirements/webtools/3.3M7/'/>
+<child location='../requirements/m2eclipse/0.13.0.201105091504/'/>
<child location='../requirements/indigo/201103180900-M6/'/>
<child location='../requirements/birt/4.0M6/'/>
<child location='../requirements/eclipse/3.7M6/'/>
<child location='../requirements/emf/2.7M6/'/>
<child location='../requirements/webtools/3.3M6/'/>
+<child location='../requirements/m2eclipse/0.13.0.201103291237/'/>
<child location='../requirements/ecf/3.5/'/>
<child location='../requirements/egit/0.11/'/>
@@ -34,7 +36,6 @@
<child location='../requirements/jslint/1.5/'/>
<child location='../requirements/mylyn/3.6/'/>
-<child location='../requirements/m2eclipse/0.13.0.201103291237/'/>
<child location='../requirements/orbit/S20110124210048/'/>
<child location='../requirements/pmd/3.2.6/'/>
<child location='../requirements/springide/2.6.0.201103160035/'/>
Modified: trunk/download.jboss.org/jbosstools/updates/indigo/compositeContent.xml
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/indigo/compositeContent.xml 2011-05-09 20:22:44 UTC (rev 31155)
+++ trunk/download.jboss.org/jbosstools/updates/indigo/compositeContent.xml 2011-05-09 20:23:02 UTC (rev 31156)
@@ -14,18 +14,20 @@
-->
<property name='p2.timestamp' value='1304967283000'/>
</properties>
-<children size='24'>
+<children size='26'>
<child location='../requirements/indigo/201105060900-M7/'/>
<child location='../requirements/birt/4.0M7/'/>
<child location='../requirements/eclipse/3.7M7/'/>
<child location='../requirements/emf/2.7M7/'/>
<child location='../requirements/webtools/3.3M7/'/>
+<child location='../requirements/m2eclipse/0.13.0.201105091504/'/>
<child location='../requirements/indigo/201103180900-M6/'/>
<child location='../requirements/birt/4.0M6/'/>
<child location='../requirements/eclipse/3.7M6/'/>
<child location='../requirements/emf/2.7M6/'/>
<child location='../requirements/webtools/3.3M6/'/>
+<child location='../requirements/m2eclipse/0.13.0.201103291237/'/>
<child location='../requirements/ecf/3.5/'/>
<child location='../requirements/egit/0.11/'/>
@@ -34,7 +36,6 @@
<child location='../requirements/jslint/1.5/'/>
<child location='../requirements/mylyn/3.6/'/>
-<child location='../requirements/m2eclipse/0.13.0.201103291237/'/>
<child location='../requirements/orbit/S20110124210048/'/>
<child location='../requirements/pmd/3.2.6/'/>
<child location='../requirements/springide/2.6.0.201103160035/'/>
Modified: trunk/download.jboss.org/jbosstools/updates/requirements/m2eclipse/build.xml
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/requirements/m2eclipse/build.xml 2011-05-09 20:22:44 UTC (rev 31155)
+++ trunk/download.jboss.org/jbosstools/updates/requirements/m2eclipse/build.xml 2011-05-09 20:23:02 UTC (rev 31156)
@@ -16,11 +16,16 @@
-f ~/RHDS/updates/requirements/m2eclipse/build.xml -Ddestination=/tmp/m2eclipse-repo
-->
<target name="mirror">
+
+ <property name="URL1" value="https://repository.sonatype.org/content/sites/forge-sites/m2e/0.13.0/N/0...."/>
+ <property name="URL2" value="https://repository.sonatype.org/content/sites/forge-sites/m2e-extras/0.13..."/>
+ <property name="URL3" value="https://repository.sonatype.org/content/sites/forge-sites/m2eclipse-wtp/0..."/>
+
+ <!--
<property name="URL1" value="https://repository.sonatype.org/content/sites/forge-sites/m2e/0.13.0/N/0...."/>
<property name="URL2" value="https://repository.sonatype.org/content/sites/forge-sites/m2e-extras/0.13..."/>
<property name="URL3" value="https://repository.sonatype.org/content/sites/forge-sites/m2eclipse-wtp/0..."/>
- <!--
<property name="URL1" value="http://m2eclipse.sonatype.org/sites/m2e/" />
<property name="URL2" value="http://m2eclipse.sonatype.org/sites/m2e-extras/" />
<property name="URL3" value="http://download.eclipse.org/technology/m2e/updates/M/" />
@@ -30,7 +35,7 @@
<property name="compress" value="true" />
<p2.mirror>
- <repository location="file:${destination}/0.13.0.201103291237/" name="m2eclipse 0.13.0.201103291237 plugins for Eclipse 3.6 - 3.7" />
+ <repository location="file:${destination}/0.13.0.201105091504/" name="m2eclipse 0.13.0.201105091504 plugins for Eclipse 3.6 - 3.7" />
<source>
<repository location="${URL1}" />
<repository location="${URL2}" />
@@ -40,6 +45,7 @@
<slicingOptions includeFeatures="true" followStrict="true" />
</p2.mirror>
- <p2.publish.featuresAndBundles metadataRepository="file:${destination}/0.13.0.201103291237/" artifactRepository="file:${destination}/0.13.0.201103291237/" publishartifacts="true" source="${destination}/0.13.0.201103291237/" compress="${compress}" />
+ <p2.publish.featuresAndBundles metadataRepository="file:${destination}/0.13.0.201105091504/" artifactRepository="file:${destination}/0.13.0.201105091504/"
+ publishartifacts="true" source="${destination}/0.13.0.201105091504/" compress="${compress}" />
</target>
</project>
Modified: trunk/download.jboss.org/jbosstools/updates/requirements/m2eclipse/index....
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/requirements/m2eclipse/index.... 2011-05-09 20:22:44 UTC (rev 31155)
+++ trunk/download.jboss.org/jbosstools/updates/requirements/m2eclipse/index.... 2011-05-09 20:23:02 UTC (rev 31156)
@@ -46,8 +46,9 @@
-->
<br/>
<ul>
+<li><a class=link href=0.13.0.201105091504>0.13.0.201105091504</a> (Indigo M7) </li>
+<li><a class=link href=0.13.0.201103291237>0.13.0.201103291237</a> (Indigo M6) </li>
<li><a class=link href=0.12>0.12</a> </li>
-<li><a class=link href=0.13.0.201103291237>0.13.0.201103291237</a> </li>
</ul>
<br/>
</td>
13 years, 5 months
JBoss Tools SVN: r31154 - trunk/struts/tests/org.jboss.tools.struts.vpe.struts.test.
by jbosstools-commits@lists.jboss.org
Author: nickboldt
Date: 2011-05-09 15:48:09 -0400 (Mon, 09 May 2011)
New Revision: 31154
Modified:
trunk/struts/tests/org.jboss.tools.struts.vpe.struts.test/pom.xml
Log:
bump test timeout from 45 mins to 60 mins
Modified: trunk/struts/tests/org.jboss.tools.struts.vpe.struts.test/pom.xml
===================================================================
--- trunk/struts/tests/org.jboss.tools.struts.vpe.struts.test/pom.xml 2011-05-09 19:45:09 UTC (rev 31153)
+++ trunk/struts/tests/org.jboss.tools.struts.vpe.struts.test/pom.xml 2011-05-09 19:48:09 UTC (rev 31154)
@@ -20,9 +20,9 @@
<groupId>org.sonatype.tycho</groupId>
<artifactId>maven-osgi-test-plugin</artifactId>
<configuration>
- <!-- timeout in seconds (45 mins) -->
- <surefire.timeout>2700</surefire.timeout>
- <forkedProcessTimeoutInSeconds>2700</forkedProcessTimeoutInSeconds>
+ <!-- timeout in seconds (60 mins) -->
+ <surefire.timeout>3600</surefire.timeout>
+ <forkedProcessTimeoutInSeconds>3600</forkedProcessTimeoutInSeconds>
<product>org.jboss.tools.tests</product>
<explodedBundles>
<bundle>org.jboss.tools.vpe</bundle>
@@ -35,4 +35,4 @@
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
13 years, 5 months
JBoss Tools SVN: r31152 - trunk/hibernatetools/tests/org.hibernate.eclipse.console.test.
by jbosstools-commits@lists.jboss.org
Author: nickboldt
Date: 2011-05-09 15:42:57 -0400 (Mon, 09 May 2011)
New Revision: 31152
Modified:
trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/pom.xml
Log:
double the timeout for tests in hibernatetools/tests/org.hibernate.eclipse.console.test
Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/pom.xml
===================================================================
--- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/pom.xml 2011-05-09 19:36:00 UTC (rev 31151)
+++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/pom.xml 2011-05-09 19:42:57 UTC (rev 31152)
@@ -26,8 +26,11 @@
<bundle>org.hibernate.eclipse.console.test</bundle>
<bundle>org.hibernate.eclipse</bundle>
</explodedBundles>
+ <!-- timeout in seconds; default 1800 -->
+ <surefire.timeout>3600</surefire.timeout>
+ <forkedProcessTimeoutInSeconds>3600</forkedProcessTimeoutInSeconds>
</configuration>
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
13 years, 5 months