Seam SVN: r12104 - in modules/xml/trunk/src: main/java/org/jboss/seam/xml/parser/namespace and 1 other directories.
by seam-commits＠lists.jboss.org
Author: swd847
Date: 2010-03-05 15:48:08 -0500 (Fri, 05 Mar 2010)
New Revision: 12104
Removed:
modules/xml/trunk/src/main/java/org/jboss/seam/xml/model/VetoXmlItem.java
Modified:
modules/xml/trunk/src/main/java/org/jboss/seam/xml/model/ModelBuilder.java
modules/xml/trunk/src/main/java/org/jboss/seam/xml/parser/namespace/RootNamespaceElementResolver.java
modules/xml/trunk/src/test/resources/META-INF/seam-beans.xml
Log:
removed <veto> tag
Modified: modules/xml/trunk/src/main/java/org/jboss/seam/xml/model/ModelBuilder.java
===================================================================
--- modules/xml/trunk/src/main/java/org/jboss/seam/xml/model/ModelBuilder.java 2010-03-05 20:45:41 UTC (rev 12103)
+++ modules/xml/trunk/src/main/java/org/jboss/seam/xml/model/ModelBuilder.java 2010-03-05 20:48:08 UTC (rev 12104)
@@ -222,17 +222,7 @@
}
}
}
- for (VetoXmlItem it : item.getChildrenOfType(VetoXmlItem.class))
- {
- if (ret != null)
- {
- throw new XmlConfigurationException("Element cannot be both an VETO and a " + ret.toString(), item.getDocument(), item.getLineno());
- }
- else
- {
- ret = ResultType.VETO;
- }
- }
+
if (ret == null)
{
ret = ResultType.BEAN;
Deleted: modules/xml/trunk/src/main/java/org/jboss/seam/xml/model/VetoXmlItem.java
===================================================================
--- modules/xml/trunk/src/main/java/org/jboss/seam/xml/model/VetoXmlItem.java 2010-03-05 20:45:41 UTC (rev 12103)
+++ modules/xml/trunk/src/main/java/org/jboss/seam/xml/model/VetoXmlItem.java 2010-03-05 20:48:08 UTC (rev 12104)
@@ -1,24 +0,0 @@
-/*
- * Distributed under the LGPL License
- *
- */
-package org.jboss.seam.xml.model;
-
-import java.util.Collections;
-import java.util.Set;
-
-public class VetoXmlItem extends AbstractXmlItem
-{
-
- public VetoXmlItem(XmlItem parent, String document, int lineno)
- {
- super(XmlItemType.VETO, parent, null, null, null, document, lineno);
-
- }
-
- public Set<XmlItemType> getAllowedItem()
- {
- return Collections.singleton(XmlItemType.CLASS);
- }
-
-}
Modified: modules/xml/trunk/src/main/java/org/jboss/seam/xml/parser/namespace/RootNamespaceElementResolver.java
===================================================================
--- modules/xml/trunk/src/main/java/org/jboss/seam/xml/parser/namespace/RootNamespaceElementResolver.java 2010-03-05 20:45:41 UTC (rev 12103)
+++ modules/xml/trunk/src/main/java/org/jboss/seam/xml/parser/namespace/RootNamespaceElementResolver.java 2010-03-05 20:48:08 UTC (rev 12104)
@@ -13,7 +13,6 @@
import org.jboss.seam.xml.model.ParameterXmlItem;
import org.jboss.seam.xml.model.ParametersXmlItem;
import org.jboss.seam.xml.model.ValueXmlItem;
-import org.jboss.seam.xml.model.VetoXmlItem;
import org.jboss.seam.xml.model.XmlItem;
import org.jboss.seam.xml.model.XmlItemType;
import org.jboss.seam.xml.parser.SaxNode;
@@ -57,10 +56,6 @@
{
return new ArrayXmlItem(parent, node.getAttributes(), node.getDocument(), node.getLineNo());
}
- else if (item.equals("veto"))
- {
- return new VetoXmlItem(parent, node.getDocument(), node.getLineNo());
- }
else if (item.equals("override"))
{
return new OverrideXmlItem(parent, node.getDocument(), node.getLineNo());
Modified: modules/xml/trunk/src/test/resources/META-INF/seam-beans.xml
===================================================================
--- modules/xml/trunk/src/test/resources/META-INF/seam-beans.xml 2010-03-05 20:45:41 UTC (rev 12103)
+++ modules/xml/trunk/src/test/resources/META-INF/seam-beans.xml 2010-03-05 20:48:08 UTC (rev 12104)
@@ -15,9 +15,5 @@
<AroundInvoke/>
</test:myMethod>
</test:InterceptorBean>
-
- <veto>
- <test:InterceptorBean/>
- </veto>
</Beans>
\ No newline at end of file
14 years, 1 month
- 1
- 0
Seam SVN: r12103 - in modules/xml/trunk: src/test/java/org/jboss/seam/xml/test/simple and 7 other directories.
by seam-commits＠lists.jboss.org
Author: swd847
Date: 2010-03-05 15:45:41 -0500 (Fri, 05 Mar 2010)
New Revision: 12103
Removed:
modules/xml/trunk/src/test/java/org/jboss/seam/xml/test/simple/VetoTest.java
modules/xml/trunk/src/test/java/org/jboss/seam/xml/test/simple/VetoedBean.java
modules/xml/trunk/src/test/resources/org/jboss/seam/xml/test/simple/veto-beans.xml
Modified:
modules/xml/trunk/pom.xml
modules/xml/trunk/src/test/resources/META-INF/seam-beans.xml
modules/xml/trunk/src/test/resources/org/jboss/seam/xml/test/fieldset/array-set-field-value-beans.xml
modules/xml/trunk/src/test/resources/org/jboss/seam/xml/test/fieldset/colection-set-field-value-beans.xml
modules/xml/trunk/src/test/resources/org/jboss/seam/xml/test/fieldset/map-set-field-value-beans.xml
modules/xml/trunk/src/test/resources/org/jboss/seam/xml/test/fieldset/set-field-value-beans.xml
modules/xml/trunk/src/test/resources/org/jboss/seam/xml/test/injection/producer-field-value-beans.xml
modules/xml/trunk/src/test/resources/org/jboss/seam/xml/test/injection/qualifier-attributes-test-beans.xml
modules/xml/trunk/src/test/resources/org/jboss/seam/xml/test/interceptor/interceptor-beans.xml
modules/xml/trunk/src/test/resources/org/jboss/seam/xml/test/method/method-beans.xml
modules/xml/trunk/src/test/resources/org/jboss/seam/xml/test/producer/multiple-producers.xml
modules/xml/trunk/src/test/resources/org/jboss/seam/xml/test/simple/simple-beans.xml
Log:
removed all reference to <veto> from the tests
Modified: modules/xml/trunk/pom.xml
===================================================================
--- modules/xml/trunk/pom.xml 2010-03-05 09:32:12 UTC (rev 12102)
+++ modules/xml/trunk/pom.xml 2010-03-05 20:45:41 UTC (rev 12103)
@@ -92,6 +92,14 @@
<downloadSources>true</downloadSources>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <forkMode>once</forkMode>
+ <argLine>-Xmx512Mb</argLine>
+ </configuration>
+ </plugin>
</plugins>
</build>
</project>
Deleted: modules/xml/trunk/src/test/java/org/jboss/seam/xml/test/simple/VetoTest.java
===================================================================
--- modules/xml/trunk/src/test/java/org/jboss/seam/xml/test/simple/VetoTest.java 2010-03-05 09:32:12 UTC (rev 12102)
+++ modules/xml/trunk/src/test/java/org/jboss/seam/xml/test/simple/VetoTest.java 2010-03-05 20:45:41 UTC (rev 12103)
@@ -1,34 +0,0 @@
-/*
- * Distributed under the LGPL License
- *
- */
-package org.jboss.seam.xml.test.simple;
-
-import org.jboss.seam.xml.test.AbstractXMLTest;
-import org.testng.annotations.Test;
-
-public class VetoTest extends AbstractXMLTest
-{
-
- @Override
- protected String getXmlFileName()
- {
- return "veto-beans.xml";
- }
-
- @Test
- public void testInterceptors()
- {
-
- try
- {
- VetoedBean y = getReference(VetoedBean.class);
- assert y != null : "Vetoed bean was installed";
- }
- catch (Exception e)
- {
- // we expect this to throw an exception instead of returning null
- }
-
- }
-}
Deleted: modules/xml/trunk/src/test/java/org/jboss/seam/xml/test/simple/VetoedBean.java
===================================================================
--- modules/xml/trunk/src/test/java/org/jboss/seam/xml/test/simple/VetoedBean.java 2010-03-05 09:32:12 UTC (rev 12102)
+++ modules/xml/trunk/src/test/java/org/jboss/seam/xml/test/simple/VetoedBean.java 2010-03-05 20:45:41 UTC (rev 12103)
@@ -1,10 +0,0 @@
-/*
- * Distributed under the LGPL License
- *
- */
-package org.jboss.seam.xml.test.simple;
-
-public class VetoedBean
-{
-
-}
Modified: modules/xml/trunk/src/test/resources/META-INF/seam-beans.xml
===================================================================
--- modules/xml/trunk/src/test/resources/META-INF/seam-beans.xml 2010-03-05 09:32:12 UTC (rev 12102)
+++ modules/xml/trunk/src/test/resources/META-INF/seam-beans.xml 2010-03-05 20:45:41 UTC (rev 12103)
@@ -7,6 +7,7 @@
</test:InterceptorBinding>
<test:InterceptorBean>
+ <override/>
<Interceptor/>
<test:InterceptorBinding/>
<test:myMethod>
@@ -14,5 +15,9 @@
<AroundInvoke/>
</test:myMethod>
</test:InterceptorBean>
+
+ <veto>
+ <test:InterceptorBean/>
+ </veto>
</Beans>
\ No newline at end of file
Modified: modules/xml/trunk/src/test/resources/org/jboss/seam/xml/test/fieldset/array-set-field-value-beans.xml
===================================================================
--- modules/xml/trunk/src/test/resources/org/jboss/seam/xml/test/fieldset/array-set-field-value-beans.xml 2010-03-05 09:32:12 UTC (rev 12102)
+++ modules/xml/trunk/src/test/resources/org/jboss/seam/xml/test/fieldset/array-set-field-value-beans.xml 2010-03-05 20:45:41 UTC (rev 12103)
@@ -1,10 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<Beans xmlns="urn:seam:core"
xmlns:test="urn:java:org.jboss.seam.xml.test.fieldset">
- <veto>
- <test:ArrayFieldValue/>
- </veto>
<test:ArrayFieldValue>
+ <override/>
<test:iarray>
<value>1</value>
<value>2</value>
Modified: modules/xml/trunk/src/test/resources/org/jboss/seam/xml/test/fieldset/colection-set-field-value-beans.xml
===================================================================
--- modules/xml/trunk/src/test/resources/org/jboss/seam/xml/test/fieldset/colection-set-field-value-beans.xml 2010-03-05 09:32:12 UTC (rev 12102)
+++ modules/xml/trunk/src/test/resources/org/jboss/seam/xml/test/fieldset/colection-set-field-value-beans.xml 2010-03-05 20:45:41 UTC (rev 12103)
@@ -2,11 +2,8 @@
<Beans xmlns="urn:seam:core"
xmlns:test="urn:java:org.jboss.seam.xml.test.fieldset">
- <veto>
- <test:CollectionFieldValue/>
- </veto>
-
<test:CollectionFieldValue>
+ <override/>
<test:iset>
<value>1</value>
<value>2</value>
Modified: modules/xml/trunk/src/test/resources/org/jboss/seam/xml/test/fieldset/map-set-field-value-beans.xml
===================================================================
--- modules/xml/trunk/src/test/resources/org/jboss/seam/xml/test/fieldset/map-set-field-value-beans.xml 2010-03-05 09:32:12 UTC (rev 12102)
+++ modules/xml/trunk/src/test/resources/org/jboss/seam/xml/test/fieldset/map-set-field-value-beans.xml 2010-03-05 20:45:41 UTC (rev 12103)
@@ -1,10 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<Beans xmlns="urn:seam:core"
xmlns:test="urn:java:org.jboss.seam.xml.test.fieldset">
- <veto>
- <test:MapFieldValue />
- </veto>
<test:MapFieldValue>
+ <override/>
<test:map1>
<entry><key>1</key><value>hello</value></entry>
<entry><key>2</key><value>world</value></entry>
Modified: modules/xml/trunk/src/test/resources/org/jboss/seam/xml/test/fieldset/set-field-value-beans.xml
===================================================================
--- modules/xml/trunk/src/test/resources/org/jboss/seam/xml/test/fieldset/set-field-value-beans.xml 2010-03-05 09:32:12 UTC (rev 12102)
+++ modules/xml/trunk/src/test/resources/org/jboss/seam/xml/test/fieldset/set-field-value-beans.xml 2010-03-05 20:45:41 UTC (rev 12103)
@@ -1,13 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<Beans xmlns="urn:seam:core"
xmlns:test="urn:java:org.jboss.seam.xml.test.fieldset">
-
- <veto>
- <test:FieldValueBean />
- <test:FieldValueProducer/>
- </veto>
-
+
<test:FieldValueBean>
+ <override/>
<test:ivalue>10</test:ivalue>
<test:stringValue>hello world</test:stringValue>
<test:enumValue>A</test:enumValue>
Modified: modules/xml/trunk/src/test/resources/org/jboss/seam/xml/test/injection/producer-field-value-beans.xml
===================================================================
--- modules/xml/trunk/src/test/resources/org/jboss/seam/xml/test/injection/producer-field-value-beans.xml 2010-03-05 09:32:12 UTC (rev 12102)
+++ modules/xml/trunk/src/test/resources/org/jboss/seam/xml/test/injection/producer-field-value-beans.xml 2010-03-05 20:45:41 UTC (rev 12103)
@@ -2,16 +2,13 @@
<Beans xmlns="urn:seam:core"
xmlns:test="urn:java:org.jboss.seam.xml.test.injection">
- <veto>
- <test:ProducerBean/>
- <test:RecieverBean/>
- </veto>
-
+
<test:ProducerQualifier>
<Qualifier/>
</test:ProducerQualifier>
<test:ProducerBean>
+ <override/>
<test:value>
<Produces/>
<test:ProducerQualifier/>
@@ -20,6 +17,7 @@
</test:ProducerBean>
<test:RecieverBean>
+ <override/>
<test:value>
<test:ProducerQualifier/>
<Inject/>
Modified: modules/xml/trunk/src/test/resources/org/jboss/seam/xml/test/injection/qualifier-attributes-test-beans.xml
===================================================================
--- modules/xml/trunk/src/test/resources/org/jboss/seam/xml/test/injection/qualifier-attributes-test-beans.xml 2010-03-05 09:32:12 UTC (rev 12102)
+++ modules/xml/trunk/src/test/resources/org/jboss/seam/xml/test/injection/qualifier-attributes-test-beans.xml 2010-03-05 20:45:41 UTC (rev 12103)
@@ -2,10 +2,6 @@
<Beans xmlns="urn:seam:core"
xmlns:test="urn:java:org.jboss.seam.xml.test.injection">
- <veto>
- <test:QualifierTestBean/>
- </veto>
-
<test:OtherQualifier>
<Qualifier/>
</test:OtherQualifier>
@@ -19,6 +15,7 @@
</test:QualifiedBean2>
<test:QualifierTestBean>
+ <override/>
<test:bean1>
<test:OtherQualifier value1="AA" value2="1" value="A" />
<Inject/>
Modified: modules/xml/trunk/src/test/resources/org/jboss/seam/xml/test/interceptor/interceptor-beans.xml
===================================================================
--- modules/xml/trunk/src/test/resources/org/jboss/seam/xml/test/interceptor/interceptor-beans.xml 2010-03-05 09:32:12 UTC (rev 12102)
+++ modules/xml/trunk/src/test/resources/org/jboss/seam/xml/test/interceptor/interceptor-beans.xml 2010-03-05 20:45:41 UTC (rev 12103)
@@ -2,11 +2,8 @@
<Beans xmlns="urn:seam:core"
xmlns:test="urn:java:org.jboss.seam.xml.test.interceptor">
- <veto>
- <test:InterceptedBean/>
- </veto>
-
<test:InterceptedBean>
+ <override/>
<test:method>
<test:InterceptorBinding/>
</test:method>
Modified: modules/xml/trunk/src/test/resources/org/jboss/seam/xml/test/method/method-beans.xml
===================================================================
--- modules/xml/trunk/src/test/resources/org/jboss/seam/xml/test/method/method-beans.xml 2010-03-05 09:32:12 UTC (rev 12102)
+++ modules/xml/trunk/src/test/resources/org/jboss/seam/xml/test/method/method-beans.xml 2010-03-05 20:45:41 UTC (rev 12103)
@@ -1,10 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<Beans xmlns="urn:seam:core" xmlns:test="urn:java:org.jboss.seam.xml.test.method">
- <veto>
- <test:MethodTarget />
- </veto>
+
<test:Qualifier1>
<Qualifier />
</test:Qualifier1>
@@ -42,6 +40,7 @@
</test:MethodBean>
<test:MethodTarget>
+ <override/>
<test:value1>
<Inject />
</test:value1>
Modified: modules/xml/trunk/src/test/resources/org/jboss/seam/xml/test/producer/multiple-producers.xml
===================================================================
--- modules/xml/trunk/src/test/resources/org/jboss/seam/xml/test/producer/multiple-producers.xml 2010-03-05 09:32:12 UTC (rev 12102)
+++ modules/xml/trunk/src/test/resources/org/jboss/seam/xml/test/producer/multiple-producers.xml 2010-03-05 20:45:41 UTC (rev 12103)
@@ -1,12 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<Beans xmlns="urn:seam:core"
xmlns:test="urn:java:org.jboss.seam.xml.test.producer">
- <veto>
- <test:Producer/>
- <test:Reciever/>
- </veto>
+
<test:Producer>
+ <override/>
<test:value>
<Produces/>
<test:ProducerQualifier value="1" />
@@ -32,6 +30,7 @@
<test:Reciever>
+ <override/>
<test:val1>
<Inject/>
<test:ProducerQualifier value="1" />
Modified: modules/xml/trunk/src/test/resources/org/jboss/seam/xml/test/simple/simple-beans.xml
===================================================================
--- modules/xml/trunk/src/test/resources/org/jboss/seam/xml/test/simple/simple-beans.xml 2010-03-05 09:32:12 UTC (rev 12102)
+++ modules/xml/trunk/src/test/resources/org/jboss/seam/xml/test/simple/simple-beans.xml 2010-03-05 20:45:41 UTC (rev 12103)
@@ -1,9 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<Beans xmlns="urn:seam:core"
xmlns:test="urn:java:org.jboss.seam.xml.test.simple">
- <veto>
- <test:Bean2/>
- </veto>
+
<test:Bean1>
@@ -19,6 +17,7 @@
</test:Bean1>
<test:Bean2>
+ <override/>
<test:produceBean3>
<Produces/>
</test:produceBean3>
Deleted: modules/xml/trunk/src/test/resources/org/jboss/seam/xml/test/simple/veto-beans.xml
===================================================================
--- modules/xml/trunk/src/test/resources/org/jboss/seam/xml/test/simple/veto-beans.xml 2010-03-05 09:32:12 UTC (rev 12102)
+++ modules/xml/trunk/src/test/resources/org/jboss/seam/xml/test/simple/veto-beans.xml 2010-03-05 20:45:41 UTC (rev 12103)
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Beans xmlns="urn:seam:core"
- xmlns:test="urn:java:org.jboss.seam.xml.test.simple">
-
- <veto>
- <test:VetoedBean/>
- </veto>
-
-</Beans>
\ No newline at end of file
14 years, 1 month
- 1
- 0
Seam SVN: r12102 - tags/JBoss_Seam_2_2_1_CR1/src/test/ftest/examples/dvdstore/src/org/jboss/seam/example/dvd/test/selenium.
by seam-commits＠lists.jboss.org
Author: jharting
Date: 2010-03-05 04:32:12 -0500 (Fri, 05 Mar 2010)
New Revision: 12102
Modified:
tags/JBoss_Seam_2_2_1_CR1/src/test/ftest/examples/dvdstore/src/org/jboss/seam/example/dvd/test/selenium/SearchTest.java
Log:
JBSEAM-4561
Modified: tags/JBoss_Seam_2_2_1_CR1/src/test/ftest/examples/dvdstore/src/org/jboss/seam/example/dvd/test/selenium/SearchTest.java
===================================================================
--- tags/JBoss_Seam_2_2_1_CR1/src/test/ftest/examples/dvdstore/src/org/jboss/seam/example/dvd/test/selenium/SearchTest.java 2010-03-05 09:16:57 UTC (rev 12101)
+++ tags/JBoss_Seam_2_2_1_CR1/src/test/ftest/examples/dvdstore/src/org/jboss/seam/example/dvd/test/selenium/SearchTest.java 2010-03-05 09:32:12 UTC (rev 12102)
@@ -65,12 +65,7 @@
String searchString1 = "Forrest Gump";
String searchString2 = "The Shawshank Redemption";
- browser.openWindow(CONTEXT_PATH + getProperty("HOME_PAGE"), "1");
- browser.selectWindow("1");
- Thread.sleep(10000); // ugly but turned out to be the most browser-compatible solution
assertTrue("User should be logged in by now.", isLoggedIn(browser));
- browser.selectWindow(null); // select main window
- assertTrue("User should be logged in by now.", isLoggedIn(browser));
browser.click(getProperty("SHOP"));
browser.waitForPageToLoad(TIMEOUT);
browser.type(getProperty("SEARCH_FIELD"), searchString1);
@@ -80,7 +75,10 @@
searchString1, browser
.getText(getProperty("SEARCH_RESULT_FIRST_ROW_LINK")));
// search for dvd in second window
+ browser.openWindow(CONTEXT_PATH + getProperty("HOME_PAGE"), "1");
browser.selectWindow("1");
+ Thread.sleep(10000); // ugly but turned out to be the most browser-compatible solution
+ assertTrue("User should be logged in by now.", isLoggedIn(browser));
browser.click(getProperty("SHOP"));
browser.waitForPageToLoad(TIMEOUT);
browser.type(getProperty("SEARCH_FIELD"), searchString2);
14 years, 1 month
- 1
- 0
Seam SVN: r12101 - branches/community/Seam_2_2/src/test/ftest/examples/dvdstore/src/org/jboss/seam/example/dvd/test/selenium.
by seam-commits＠lists.jboss.org
Author: jharting
Date: 2010-03-05 04:16:57 -0500 (Fri, 05 Mar 2010)
New Revision: 12101
Modified:
branches/community/Seam_2_2/src/test/ftest/examples/dvdstore/src/org/jboss/seam/example/dvd/test/selenium/SearchTest.java
Log:
JBSEAM-4561
Modified: branches/community/Seam_2_2/src/test/ftest/examples/dvdstore/src/org/jboss/seam/example/dvd/test/selenium/SearchTest.java
===================================================================
--- branches/community/Seam_2_2/src/test/ftest/examples/dvdstore/src/org/jboss/seam/example/dvd/test/selenium/SearchTest.java 2010-03-05 04:48:01 UTC (rev 12100)
+++ branches/community/Seam_2_2/src/test/ftest/examples/dvdstore/src/org/jboss/seam/example/dvd/test/selenium/SearchTest.java 2010-03-05 09:16:57 UTC (rev 12101)
@@ -65,12 +65,7 @@
String searchString1 = "Forrest Gump";
String searchString2 = "The Shawshank Redemption";
- browser.openWindow(CONTEXT_PATH + getProperty("HOME_PAGE"), "1");
- browser.selectWindow("1");
- Thread.sleep(10000); // ugly but turned out to be the most browser-compatible solution
assertTrue("User should be logged in by now.", isLoggedIn(browser));
- browser.selectWindow(null); // select main window
- assertTrue("User should be logged in by now.", isLoggedIn(browser));
browser.click(getProperty("SHOP"));
browser.waitForPageToLoad(TIMEOUT);
browser.type(getProperty("SEARCH_FIELD"), searchString1);
@@ -80,7 +75,10 @@
searchString1, browser
.getText(getProperty("SEARCH_RESULT_FIRST_ROW_LINK")));
// search for dvd in second window
+ browser.openWindow(CONTEXT_PATH + getProperty("HOME_PAGE"), "1");
browser.selectWindow("1");
+ Thread.sleep(10000); // ugly but turned out to be the most browser-compatible solution
+ assertTrue("User should be logged in by now.", isLoggedIn(browser));
browser.click(getProperty("SHOP"));
browser.waitForPageToLoad(TIMEOUT);
browser.type(getProperty("SEARCH_FIELD"), searchString2);
14 years, 1 month
- 1
- 0
Seam SVN: r12100 - in modules/xml/trunk: src/main/java/org/jboss/seam/xml/core and 6 other directories.
by seam-commits＠lists.jboss.org
Author: swd847
Date: 2010-03-04 23:48:01 -0500 (Thu, 04 Mar 2010)
New Revision: 12100
Added:
modules/xml/trunk/src/main/java/org/jboss/seam/xml/model/ParametersXmlItem.java
Modified:
modules/xml/trunk/docs/en-US/xml-general.xml
modules/xml/trunk/src/main/java/org/jboss/seam/xml/core/XmlId.java
modules/xml/trunk/src/main/java/org/jboss/seam/xml/fieldset/DirectFieldSetter.java
modules/xml/trunk/src/main/java/org/jboss/seam/xml/fieldset/FieldValueObject.java
modules/xml/trunk/src/main/java/org/jboss/seam/xml/fieldset/FieldValueSetter.java
modules/xml/trunk/src/main/java/org/jboss/seam/xml/fieldset/MethodFieldSetter.java
modules/xml/trunk/src/main/java/org/jboss/seam/xml/model/ClassXmlItem.java
modules/xml/trunk/src/main/java/org/jboss/seam/xml/model/MethodXmlItem.java
modules/xml/trunk/src/main/java/org/jboss/seam/xml/model/ModelBuilder.java
modules/xml/trunk/src/main/java/org/jboss/seam/xml/model/XmlItemType.java
modules/xml/trunk/src/main/java/org/jboss/seam/xml/parser/ParserMain.java
modules/xml/trunk/src/main/java/org/jboss/seam/xml/parser/SaxNode.java
modules/xml/trunk/src/main/java/org/jboss/seam/xml/parser/namespace/PackageNamespaceElementResolver.java
modules/xml/trunk/src/main/java/org/jboss/seam/xml/parser/namespace/RootNamespaceElementResolver.java
modules/xml/trunk/src/main/java/org/jboss/seam/xml/util/XmlObjectConverter.java
modules/xml/trunk/src/test/resources/org/jboss/seam/xml/test/method/method-beans.xml
modules/xml/trunk/src/test/resources/org/jboss/seam/xml/test/method/primitive-method-beans.xml
Log:
added <parameters> element
Modified: modules/xml/trunk/docs/en-US/xml-general.xml
===================================================================
--- modules/xml/trunk/docs/en-US/xml-general.xml 2010-03-05 04:30:50 UTC (rev 12099)
+++ modules/xml/trunk/docs/en-US/xml-general.xml 2010-03-05 04:48:01 UTC (rev 12100)
@@ -240,17 +240,21 @@
<test:method>
<Produces/>
<test:Qualifier1/>
- <test:MethodValueBean>
- <test:Qualifier2/>
- </test:MethodValueBean>
+ <parameters>
+ <test:MethodValueBean>
+ <test:Qualifier2/>
+ </test:MethodValueBean>
+ </parameters>
</test:method>
<test:method>
<Produces/>
<test:Qualifier1/>
- <array dimensions="2">
- <test:Qualifier2/>
- <test:MethodValueBean/>
- </array>
+ <parameters>
+ <array dimensions="2">
+ <test:Qualifier2/>
+ <test:MethodValueBean/>
+ </array>
+ </parameters>
</test:method>
</test:MethodBean>
</Beans>
@@ -267,6 +271,11 @@
{
return bean.value + 1;
}
+
+ public void method(MethodValueBean[][] beans)
+ {
+ //do stuff
+ }
}
Modified: modules/xml/trunk/src/main/java/org/jboss/seam/xml/core/XmlId.java
===================================================================
--- modules/xml/trunk/src/main/java/org/jboss/seam/xml/core/XmlId.java 2010-03-05 04:30:50 UTC (rev 12099)
+++ modules/xml/trunk/src/main/java/org/jboss/seam/xml/core/XmlId.java 2010-03-05 04:48:01 UTC (rev 12100)
@@ -8,8 +8,11 @@
import java.lang.annotation.RetentionPolicy;
/**
- * Annotation that allows tracing of annotated types through the startup proces
+ * Annotation that allows tracing of annotated types through the startup process
*
+ * TODO: This approach currently breaks replication as the id's are non
+ * deterministic
+ *
* @author stuart
*
*/
Modified: modules/xml/trunk/src/main/java/org/jboss/seam/xml/fieldset/DirectFieldSetter.java
===================================================================
--- modules/xml/trunk/src/main/java/org/jboss/seam/xml/fieldset/DirectFieldSetter.java 2010-03-05 04:30:50 UTC (rev 12099)
+++ modules/xml/trunk/src/main/java/org/jboss/seam/xml/fieldset/DirectFieldSetter.java 2010-03-05 04:48:01 UTC (rev 12100)
@@ -4,6 +4,12 @@
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Type;
+/**
+ * class that can set a field value directly
+ *
+ * @author Stuart Douglas <stuart(a)baileyroberts.com.au>
+ *
+ */
public class DirectFieldSetter implements FieldValueSetter
{
Modified: modules/xml/trunk/src/main/java/org/jboss/seam/xml/fieldset/FieldValueObject.java
===================================================================
--- modules/xml/trunk/src/main/java/org/jboss/seam/xml/fieldset/FieldValueObject.java 2010-03-05 04:30:50 UTC (rev 12099)
+++ modules/xml/trunk/src/main/java/org/jboss/seam/xml/fieldset/FieldValueObject.java 2010-03-05 04:48:01 UTC (rev 12100)
@@ -4,6 +4,12 @@
*/
package org.jboss.seam.xml.fieldset;
+/**
+ * FieldValueObjects set field values for a given instance
+ *
+ * @author Stuart Douglas <stuart(a)baileyroberts.com.au>
+ *
+ */
public interface FieldValueObject
{
Modified: modules/xml/trunk/src/main/java/org/jboss/seam/xml/fieldset/FieldValueSetter.java
===================================================================
--- modules/xml/trunk/src/main/java/org/jboss/seam/xml/fieldset/FieldValueSetter.java 2010-03-05 04:30:50 UTC (rev 12099)
+++ modules/xml/trunk/src/main/java/org/jboss/seam/xml/fieldset/FieldValueSetter.java 2010-03-05 04:48:01 UTC (rev 12100)
@@ -3,6 +3,13 @@
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Type;
+/**
+ * Class that knows how to set a field value, either directly or by calling a
+ * getter
+ *
+ * @author Stuart Douglas <stuart(a)baileyroberts.com.au>
+ *
+ */
public interface FieldValueSetter
{
Modified: modules/xml/trunk/src/main/java/org/jboss/seam/xml/fieldset/MethodFieldSetter.java
===================================================================
--- modules/xml/trunk/src/main/java/org/jboss/seam/xml/fieldset/MethodFieldSetter.java 2010-03-05 04:30:50 UTC (rev 12099)
+++ modules/xml/trunk/src/main/java/org/jboss/seam/xml/fieldset/MethodFieldSetter.java 2010-03-05 04:48:01 UTC (rev 12100)
@@ -4,6 +4,12 @@
import java.lang.reflect.Method;
import java.lang.reflect.Type;
+/**
+ * class that sets a field value by calling a setter method
+ *
+ * @author Stuart Douglas <stuart(a)baileyroberts.com.au>
+ *
+ */
public class MethodFieldSetter implements FieldValueSetter
{
Method method;
Modified: modules/xml/trunk/src/main/java/org/jboss/seam/xml/model/ClassXmlItem.java
===================================================================
--- modules/xml/trunk/src/main/java/org/jboss/seam/xml/model/ClassXmlItem.java 2010-03-05 04:30:50 UTC (rev 12099)
+++ modules/xml/trunk/src/main/java/org/jboss/seam/xml/model/ClassXmlItem.java 2010-03-05 04:48:01 UTC (rev 12100)
@@ -18,7 +18,7 @@
allowed.add(XmlItemType.ANNOTATION);
allowed.add(XmlItemType.FIELD);
allowed.add(XmlItemType.METHOD);
- allowed.add(XmlItemType.PARAMETER);
+ allowed.add(XmlItemType.PARAMETERS);
}
Modified: modules/xml/trunk/src/main/java/org/jboss/seam/xml/model/MethodXmlItem.java
===================================================================
--- modules/xml/trunk/src/main/java/org/jboss/seam/xml/model/MethodXmlItem.java 2010-03-05 04:30:50 UTC (rev 12099)
+++ modules/xml/trunk/src/main/java/org/jboss/seam/xml/model/MethodXmlItem.java 2010-03-05 04:48:01 UTC (rev 12100)
@@ -23,6 +23,10 @@
public MethodXmlItem(XmlItem parent, String methodName, String document, int lineno)
{
super(XmlItemType.METHOD, parent, parent.getJavaClass(), null, null, document, lineno);
+
+ allowed.add(XmlItemType.ANNOTATION);
+ allowed.add(XmlItemType.PARAMETERS);
+
// methods are lazily resolved once we know the parameter types
this.methodName = methodName;
Method found = null;
@@ -43,8 +47,6 @@
}
}
method = found;
- allowed.add(XmlItemType.ANNOTATION);
- allowed.add(XmlItemType.PARAMETER);
}
/**
@@ -64,9 +66,14 @@
}
List<Class<?>> rtList = new ArrayList<Class<?>>();
- for (XmlItem c : children)
+ List<ParametersXmlItem> parameters = getChildrenOfType(ParametersXmlItem.class);
+ if (parameters.size() > 1)
{
- if (c.getType() == XmlItemType.PARAMETER)
+ throw new XmlConfigurationException("A method may only have a single <parameters> element", document, lineno);
+ }
+ else if (!parameters.isEmpty())
+ {
+ for (ParameterXmlItem c : parameters.get(0).getChildrenOfType(ParameterXmlItem.class))
{
Class<?> cl = c.getJavaClass();
rtList.add(cl);
Modified: modules/xml/trunk/src/main/java/org/jboss/seam/xml/model/ModelBuilder.java
===================================================================
--- modules/xml/trunk/src/main/java/org/jboss/seam/xml/model/ModelBuilder.java 2010-03-05 04:30:50 UTC (rev 12099)
+++ modules/xml/trunk/src/main/java/org/jboss/seam/xml/model/ModelBuilder.java 2010-03-05 04:48:01 UTC (rev 12100)
@@ -284,13 +284,21 @@
Annotation a = createAnnotation(fi);
type.addToMethod(item.getMethod(), a);
}
- for (ParameterXmlItem fi : item.getChildrenOfType(ParameterXmlItem.class))
+ List<ParametersXmlItem> parameters = item.getChildrenOfType(ParametersXmlItem.class);
+ if (parameters.size() > 1)
{
- int param = paramCount++;
- for (AnnotationXmlItem pan : fi.getChildrenOfType(AnnotationXmlItem.class))
+ throw new XmlConfigurationException("A method may only have a single <parameters> element", item.getDocument(), item.getLineno());
+ }
+ else if (!parameters.isEmpty())
+ {
+ for (ParameterXmlItem fi : parameters.get(0).getChildrenOfType(ParameterXmlItem.class))
{
- Annotation a = createAnnotation(pan);
- type.addToMethodParameter(item.getMethod(), param, a);
+ int param = paramCount++;
+ for (AnnotationXmlItem pan : fi.getChildrenOfType(AnnotationXmlItem.class))
+ {
+ Annotation a = createAnnotation(pan);
+ type.addToMethodParameter(item.getMethod(), param, a);
+ }
}
}
Added: modules/xml/trunk/src/main/java/org/jboss/seam/xml/model/ParametersXmlItem.java
===================================================================
--- modules/xml/trunk/src/main/java/org/jboss/seam/xml/model/ParametersXmlItem.java (rev 0)
+++ modules/xml/trunk/src/main/java/org/jboss/seam/xml/model/ParametersXmlItem.java 2010-03-05 04:48:01 UTC (rev 12100)
@@ -0,0 +1,24 @@
+/*
+ * Distributed under the LGPL License
+ *
+ */
+package org.jboss.seam.xml.model;
+
+import java.util.Collections;
+import java.util.Set;
+
+public class ParametersXmlItem extends AbstractXmlItem
+{
+
+ public ParametersXmlItem(XmlItem parent, String document, int lineno)
+ {
+ super(XmlItemType.PARAMETERS, parent, null, null, null, document, lineno);
+
+ }
+
+ public Set<XmlItemType> getAllowedItem()
+ {
+ return Collections.singleton(XmlItemType.PARAMETER);
+ }
+
+}
Modified: modules/xml/trunk/src/main/java/org/jboss/seam/xml/model/XmlItemType.java
===================================================================
--- modules/xml/trunk/src/main/java/org/jboss/seam/xml/model/XmlItemType.java 2010-03-05 04:30:50 UTC (rev 12099)
+++ modules/xml/trunk/src/main/java/org/jboss/seam/xml/model/XmlItemType.java 2010-03-05 04:48:01 UTC (rev 12100)
@@ -6,5 +6,5 @@
public enum XmlItemType
{
- CLASS, METHOD, FIELD, ANNOTATION, VALUE, VETO, ENTRY, KEY, DEPENDENCY, PARAMETER, ARRAY, OVERRIDE, EXTENDS;
+ CLASS, METHOD, FIELD, ANNOTATION, VALUE, VETO, ENTRY, KEY, DEPENDENCY, PARAMETERS, PARAMETER, ARRAY, OVERRIDE, EXTENDS;
}
Modified: modules/xml/trunk/src/main/java/org/jboss/seam/xml/parser/ParserMain.java
===================================================================
--- modules/xml/trunk/src/main/java/org/jboss/seam/xml/parser/ParserMain.java 2010-03-05 04:30:50 UTC (rev 12099)
+++ modules/xml/trunk/src/main/java/org/jboss/seam/xml/parser/ParserMain.java 2010-03-05 04:48:01 UTC (rev 12100)
@@ -20,7 +20,8 @@
import org.xml.sax.helpers.XMLReaderFactory;
/**
- * Parser for xml configration, this class should only be used once
+ * Parser for xml configration, this class should only be used once and then
+ * discarded
*
* @author Stuart Douglas <stuart(a)baileyroberts.com.au>
*
@@ -46,15 +47,11 @@
document = fileUrl;
try
{
-
XMLReader xr = XMLReaderFactory.createXMLReader();
-
xr.setContentHandler(this);
xr.setErrorHandler(this);
xr.parse(inputSource);
-
return parentNode;
-
}
catch (SAXException e)
{
Modified: modules/xml/trunk/src/main/java/org/jboss/seam/xml/parser/SaxNode.java
===================================================================
--- modules/xml/trunk/src/main/java/org/jboss/seam/xml/parser/SaxNode.java 2010-03-05 04:30:50 UTC (rev 12099)
+++ modules/xml/trunk/src/main/java/org/jboss/seam/xml/parser/SaxNode.java 2010-03-05 04:48:01 UTC (rev 12100)
@@ -9,6 +9,12 @@
import java.util.List;
import java.util.Map;
+/**
+ * represents an XML element
+ *
+ * @author Stuart Douglas <stuart(a)baileyroberts.com.au>
+ *
+ */
public class SaxNode
{
Modified: modules/xml/trunk/src/main/java/org/jboss/seam/xml/parser/namespace/PackageNamespaceElementResolver.java
===================================================================
--- modules/xml/trunk/src/main/java/org/jboss/seam/xml/parser/namespace/PackageNamespaceElementResolver.java 2010-03-05 04:30:50 UTC (rev 12099)
+++ modules/xml/trunk/src/main/java/org/jboss/seam/xml/parser/namespace/PackageNamespaceElementResolver.java 2010-03-05 04:48:01 UTC (rev 12100)
@@ -53,8 +53,8 @@
}
else
{
- //if it is a method or constructor parameter
- if(parent != null && (parent.getType() == XmlItemType.METHOD || parent.getType() == XmlItemType.CLASS))
+ // if it is a method or constructor parameter
+ if (parent != null && parent.getType() == XmlItemType.PARAMETERS)
{
return new ParameterXmlItem(parent, c, node.getDocument(), node.getLineNo());
}
Modified: modules/xml/trunk/src/main/java/org/jboss/seam/xml/parser/namespace/RootNamespaceElementResolver.java
===================================================================
--- modules/xml/trunk/src/main/java/org/jboss/seam/xml/parser/namespace/RootNamespaceElementResolver.java 2010-03-05 04:30:50 UTC (rev 12099)
+++ modules/xml/trunk/src/main/java/org/jboss/seam/xml/parser/namespace/RootNamespaceElementResolver.java 2010-03-05 04:48:01 UTC (rev 12100)
@@ -11,6 +11,7 @@
import org.jboss.seam.xml.model.KeyXmlItem;
import org.jboss.seam.xml.model.OverrideXmlItem;
import org.jboss.seam.xml.model.ParameterXmlItem;
+import org.jboss.seam.xml.model.ParametersXmlItem;
import org.jboss.seam.xml.model.ValueXmlItem;
import org.jboss.seam.xml.model.VetoXmlItem;
import org.jboss.seam.xml.model.XmlItem;
@@ -21,7 +22,7 @@
{
CompositeNamespaceElementResolver delegate;
- static final String[] namspaces = { "java.lang", "java.util", "javax.annotation", "javax.inject", "javax.enterprise.inject", "javax.enterprise.context", "javax.enterprise.event", "javax.decorator", "javax.interceptor", "javax.persistence", "javax.xml.ws", "javax.jms", "javax.sql" };
+ static final String[] namspaces = { "java.lang", "java.util", "javax.annotation", "javax.inject", "javax.enterprise.inject", "javax.enterprise.context", "javax.enterprise.event", "javax.decorator", "javax.interceptor" };
public RootNamespaceElementResolver()
{
@@ -68,6 +69,10 @@
{
return new ExtendsXmlItem(parent, node.getDocument(), node.getLineNo());
}
+ else if (item.equals("parameters"))
+ {
+ return new ParametersXmlItem(parent, node.getDocument(), node.getLineNo());
+ }
// now deal with primitive types
@@ -106,7 +111,7 @@
}
if (primType != null)
{
- if (parent != null && (parent.getType() == XmlItemType.METHOD || parent.getType() == XmlItemType.CLASS))
+ if (parent != null && parent.getType() == XmlItemType.PARAMETERS)
{
return new ParameterXmlItem(parent, primType, node.getDocument(), node.getLineNo());
}
Modified: modules/xml/trunk/src/main/java/org/jboss/seam/xml/util/XmlObjectConverter.java
===================================================================
--- modules/xml/trunk/src/main/java/org/jboss/seam/xml/util/XmlObjectConverter.java 2010-03-05 04:30:50 UTC (rev 12099)
+++ modules/xml/trunk/src/main/java/org/jboss/seam/xml/util/XmlObjectConverter.java 2010-03-05 04:48:01 UTC (rev 12100)
@@ -31,8 +31,6 @@
}
else if (target == Class.class)
{
- Class dval = null;
-
try
{
return XmlObjectConverter.class.getClassLoader().loadClass(value);
@@ -56,13 +54,11 @@
{
java.util.Date dval = DateFormat.getDateTimeInstance().parse(value);
return new java.sql.Date(dval.getYear(), dval.getMonth(), dval.getDay());
-
}
catch (ParseException e)
{
throw new RuntimeException("Cannot parse javax.sql.Date field value: " + value, e);
}
-
}
else if (java.sql.Time.class == target)
{
@@ -75,7 +71,6 @@
{
throw new RuntimeException("Cannot parse javax.sql.Date field value: " + value, e);
}
-
}
else if (java.sql.Timestamp.class == target)
{
@@ -83,7 +78,6 @@
{
java.util.Date dval = DateFormat.getDateTimeInstance().parse(value);
return new java.sql.Timestamp(dval.getYear(), dval.getMonth(), dval.getDay(), dval.getHours(), dval.getMinutes(), dval.getSeconds(), 0);
-
}
catch (ParseException e)
{
@@ -104,20 +98,17 @@
{
throw new RuntimeException("Cannot parse Calendar field value: " + value, e);
}
-
}
else if (java.util.Date.class == target)
{
try
{
return DateFormat.getDateTimeInstance().parse(value);
-
}
catch (ParseException e)
{
throw new RuntimeException("Cannot parse Calendar field value: " + value, e);
}
-
}
else if (target == BigDecimal.class)
{
@@ -139,12 +130,10 @@
else if (target == int.class || target == Integer.class)
{
return Integer.parseInt(value);
-
}
else if (target == short.class || target == Short.class)
{
return new Short(value);
-
}
else if (target == long.class || target == Long.class)
{
@@ -153,7 +142,6 @@
else if (target == byte.class || target == byte.class)
{
return new Byte(value);
-
}
else if (target == double.class || target == Double.class)
{
Modified: modules/xml/trunk/src/test/resources/org/jboss/seam/xml/test/method/method-beans.xml
===================================================================
--- modules/xml/trunk/src/test/resources/org/jboss/seam/xml/test/method/method-beans.xml 2010-03-05 04:30:50 UTC (rev 12099)
+++ modules/xml/trunk/src/test/resources/org/jboss/seam/xml/test/method/method-beans.xml 2010-03-05 04:48:01 UTC (rev 12100)
@@ -1,50 +1,61 @@
<?xml version="1.0" encoding="UTF-8"?>
-<Beans xmlns="urn:seam:core"
- xmlns:test="urn:java:org.jboss.seam.xml.test.method">
-
- <veto>
- <test:MethodTarget/>
- </veto>
-
- <test:Qualifier1>
- <Qualifier/>
- </test:Qualifier1>
-
- <test:Qualifier2>
- <Qualifier/>
- </test:Qualifier2>
-
+<Beans xmlns="urn:seam:core" xmlns:test="urn:java:org.jboss.seam.xml.test.method">
+
+ <veto>
+ <test:MethodTarget />
+ </veto>
+
+ <test:Qualifier1>
+ <Qualifier />
+ </test:Qualifier1>
+
+ <test:Qualifier2>
+ <Qualifier />
+ </test:Qualifier2>
+
<test:MethodBean>
<test:method>
- <Produces/>
+ <Produces />
</test:method>
-
+
<test:method>
- <Produces/>
- <test:Qualifier1/>
- <test:MethodValueBean>
- <test:Qualifier2/>
- </test:MethodValueBean>
+ <Produces />
+ <test:Qualifier1 />
+ <parameters>
+ <test:MethodValueBean>
+ <test:Qualifier2 />
+ </test:MethodValueBean>
+ </parameters>
</test:method>
-
+
<test:method>
- <Produces/>
- <test:Qualifier1/>
- <array dimensions="2">
- <test:Qualifier2/>
- <test:MethodValueBean/>
- </array>
+ <Produces />
+ <test:Qualifier1 />
+ <parameters>
+ <array dimensions="2">
+ <test:Qualifier2 />
+ <test:MethodValueBean />
+ </array>
+ </parameters>
</test:method>
-
+
</test:MethodBean>
-
+
<test:MethodTarget>
- <test:value1><Inject/></test:value1>
- <test:value2><Inject/><test:Qualifier1/></test:value2>
- <test:longValue><Inject/><test:Qualifier1/></test:longValue>
+ <test:value1>
+ <Inject />
+ </test:value1>
+ <test:value2>
+ <Inject />
+ <test:Qualifier1 />
+ </test:value2>
+ <test:longValue>
+ <Inject />
+ <test:Qualifier1 />
+ </test:longValue>
</test:MethodTarget>
-
+
<test:MethodValueBean>
- <test:Qualifier2/>
+ <test:Qualifier2 />
</test:MethodValueBean>
</Beans>
\ No newline at end of file
Modified: modules/xml/trunk/src/test/resources/org/jboss/seam/xml/test/method/primitive-method-beans.xml
===================================================================
--- modules/xml/trunk/src/test/resources/org/jboss/seam/xml/test/method/primitive-method-beans.xml 2010-03-05 04:30:50 UTC (rev 12099)
+++ modules/xml/trunk/src/test/resources/org/jboss/seam/xml/test/method/primitive-method-beans.xml 2010-03-05 04:48:01 UTC (rev 12100)
@@ -15,14 +15,18 @@
<test:add>
<Produces/>
<test:Qualifier1/>
- <int/>
+ <parameters>
+ <int/>
+ </parameters>
</test:add>
<test:add>
<Produces/>
- <test:Qualifier2/>
- <array>
- <int/>
- </array>
+ <test:Qualifier2/>
+ <parameters>
+ <array>
+ <int/>
+ </array>
+ </parameters>
</test:add>
</test:PrimitiveBean>
14 years, 1 month
- 1
- 0
Seam SVN: r12099 - in modules/remoting/trunk: core and 1 other directory.
by seam-commits＠lists.jboss.org
Author: shane.bryzak(a)jboss.com
Date: 2010-03-04 23:30:50 -0500 (Thu, 04 Mar 2010)
New Revision: 12099
Added:
modules/remoting/trunk/distribution.txt
Modified:
modules/remoting/trunk/assembly.xml
modules/remoting/trunk/core/pom.xml
modules/remoting/trunk/readme.txt
Log:
my hackish attempt at using maven to build a distribution.. at least it works!
Modified: modules/remoting/trunk/assembly.xml
===================================================================
--- modules/remoting/trunk/assembly.xml 2010-03-05 03:44:36 UTC (rev 12098)
+++ modules/remoting/trunk/assembly.xml 2010-03-05 04:30:50 UTC (rev 12099)
@@ -6,16 +6,47 @@
<format>zip</format>
</formats>
<includeBaseDirectory>false</includeBaseDirectory>
+
+ <fileSets>
+ <fileSet>
+ <directory>core/target/apidocs</directory>
+ <outputDirectory>seam-remoting/doc/apidocs</outputDirectory>
+ <includes>
+ <include>**</include>
+ </includes>
+ </fileSet>
+
+ <fileSet>
+ <directory>examples</directory>
+ <outputDirectory>seam-remoting/examples</outputDirectory>
+ <useDefaultExcludes>true</useDefaultExcludes>
+ <includes>
+ <include>helloworld/pom.xml</include>
+ <include>helloworld/src/**</include>
+ <include>model/pom.xml</include>
+ <include>model/src/**</include>
+ </includes>
+ </fileSet>
+
+ <fileSet>
+ <directory>.</directory>
+ <outputDirectory>seam-remoting</outputDirectory>
+ <includes>
+ <include>readme.txt</include>
+ <include>lgpl.txt</include>
+ </includes>
+ </fileSet>
+ </fileSets>
<moduleSets>
<moduleSet>
<includes>
- <include>org.jboss.seam.remoting:seam-remoting-core</include>
+ <include>org.jboss.seam.remoting:seam-remoting-core:jar</include>
</includes>
<binaries>
<outputDirectory>seam-remoting/lib</outputDirectory>
<unpack>false</unpack>
- </binaries>
+ </binaries>
</moduleSet>
<moduleSet>
@@ -28,14 +59,5 @@
</binaries>
</moduleSet>
- <moduleSet>
- <includes>
- <include>org.jboss.seam.remoting:seam-remoting-helloworld-example</include>
- </includes>
- <sources>
- <outputDirectory>seam-remoting/examples/helloworld</outputDirectory>
- <includeModuleDirectory>false</includeModuleDirectory>
- </sources>
- </moduleSet>
</moduleSets>
</assembly>
Modified: modules/remoting/trunk/core/pom.xml
===================================================================
--- modules/remoting/trunk/core/pom.xml 2010-03-05 03:44:36 UTC (rev 12098)
+++ modules/remoting/trunk/core/pom.xml 2010-03-05 04:30:50 UTC (rev 12099)
@@ -14,24 +14,7 @@
<packaging>jar</packaging>
<name>Seam Remoting</name>
- <!-- Snapshots repo to get parent -->
- <repositories>
- <repository>
- <id>oss.sonatype.org/jboss-snapshots</id>
- <name>JBoss (Nexus) Snapshots Repository</name>
- <url>http://oss.sonatype.org/content/repositories/jboss-snapshots</url>
- <releases>
- <enabled>false</enabled>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- <updatePolicy>never</updatePolicy>
- </snapshots>
- </repository>
- </repositories>
-
<dependencies>
-
<dependency>
<groupId>javax.el</groupId>
<artifactId>el-api</artifactId>
@@ -94,10 +77,23 @@
</dependency>
</dependencies>
- <scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/seam/modules/remoting/trunk</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/seam/modules/remoting/trunk</developerConnection>
- <url>http://fisheye.jboss.org/browse/Seam/modules/remoting/trunk</url>
- </scm>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.6.1</version>
+ <executions>
+ <execution>
+ <id>javadoc-jar</id>
+ <phase>package</phase>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</project>
Added: modules/remoting/trunk/distribution.txt
===================================================================
--- modules/remoting/trunk/distribution.txt (rev 0)
+++ modules/remoting/trunk/distribution.txt 2010-03-05 04:30:50 UTC (rev 12099)
@@ -0,0 +1,4 @@
+To create the Seam Remoting distribution, run the following Maven command:
+
+mvn clean package assembly:assembly
+
Modified: modules/remoting/trunk/readme.txt
===================================================================
--- modules/remoting/trunk/readme.txt 2010-03-05 03:44:36 UTC (rev 12098)
+++ modules/remoting/trunk/readme.txt 2010-03-05 04:30:50 UTC (rev 12099)
@@ -15,7 +15,7 @@
Seam Remoting Examples
-artifacts/
+lib/
Seam Remoting jar files
@@ -44,3 +44,6 @@
* Added new feature - Model API
* Simplified JavaScript stubs for server-side beans
* Added option to compress remote.js - add ?compress=true to URL
+* Experimental JMS support (that was present in Seam 2.x) has been removed - this feature will be
+ provided at a later date by a unified AJAX event bus.
+* Support for batch requests has been removed
14 years, 1 month
- 1
- 0
Seam SVN: r12098 - in modules/xml/trunk: src/main/java/org/jboss/seam/xml/bootstrap and 7 other directories.
by seam-commits＠lists.jboss.org
Author: swd847
Date: 2010-03-04 22:44:36 -0500 (Thu, 04 Mar 2010)
New Revision: 12098
Added:
modules/xml/trunk/src/main/java/org/jboss/seam/xml/model/ExtendsXmlItem.java
modules/xml/trunk/src/main/java/org/jboss/seam/xml/model/OverrideXmlItem.java
modules/xml/trunk/src/test/java/org/jboss/seam/xml/test/simple/ExtendedBean.java
modules/xml/trunk/src/test/java/org/jboss/seam/xml/test/simple/ExtendedQualifier1.java
modules/xml/trunk/src/test/java/org/jboss/seam/xml/test/simple/ExtendedQualifier2.java
modules/xml/trunk/src/test/java/org/jboss/seam/xml/test/simple/OverriddenBean.java
Removed:
modules/xml/trunk/src/main/java/org/jboss/seam/xml/model/DependsXmlItem.java
modules/xml/trunk/src/test/java/org/jboss/seam/xml/test/dependency/
modules/xml/trunk/src/test/resources/org/jboss/seam/xml/test/dependency/dependency-beans.xml
Modified:
modules/xml/trunk/pom.xml
modules/xml/trunk/src/main/java/org/jboss/seam/xml/bootstrap/XmlExtension.java
modules/xml/trunk/src/main/java/org/jboss/seam/xml/core/BeanResult.java
modules/xml/trunk/src/main/java/org/jboss/seam/xml/core/XmlResult.java
modules/xml/trunk/src/main/java/org/jboss/seam/xml/model/ModelBuilder.java
modules/xml/trunk/src/main/java/org/jboss/seam/xml/model/XmlItemType.java
modules/xml/trunk/src/main/java/org/jboss/seam/xml/parser/namespace/RootNamespaceElementResolver.java
modules/xml/trunk/src/test/java/org/jboss/seam/xml/test/AbstractXMLTest.java
modules/xml/trunk/src/test/java/org/jboss/seam/xml/test/simple/SimpleBeanTest.java
modules/xml/trunk/src/test/resources/org/jboss/seam/xml/test/simple/simple-beans.xml
Log:
added <extends> and <override> tags
Modified: modules/xml/trunk/pom.xml
===================================================================
--- modules/xml/trunk/pom.xml 2010-03-04 17:57:27 UTC (rev 12097)
+++ modules/xml/trunk/pom.xml 2010-03-05 03:44:36 UTC (rev 12098)
@@ -46,8 +46,8 @@
</dependency>
<dependency>
<groupId>org.jboss.weld</groupId>
- <artifactId>weld-extensions</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <artifactId>weld-extensions-core</artifactId>
+ <version>1.0.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.jboss.weld</groupId>
Modified: modules/xml/trunk/src/main/java/org/jboss/seam/xml/bootstrap/XmlExtension.java
===================================================================
--- modules/xml/trunk/src/main/java/org/jboss/seam/xml/bootstrap/XmlExtension.java 2010-03-04 17:57:27 UTC (rev 12097)
+++ modules/xml/trunk/src/main/java/org/jboss/seam/xml/bootstrap/XmlExtension.java 2010-03-05 03:44:36 UTC (rev 12098)
@@ -33,6 +33,7 @@
import org.jboss.seam.xml.parser.SaxNode;
import org.jboss.seam.xml.util.FileDataReader;
import org.jboss.weld.extensions.util.AnnotationInstanceProvider;
+import org.jboss.weld.extensions.util.annotated.NewAnnotatedTypeBuilder;
public class XmlExtension implements Extension
{
@@ -47,6 +48,8 @@
Map<Class<?>, AnnotatedType<?>> types = new HashMap<Class<?>, AnnotatedType<?>>();
+ Map<Class<?>, BeanResult<?>> beanExtensions = new HashMap<Class<?>, BeanResult<?>>();
+
int count = 0;
/**
@@ -74,7 +77,6 @@
ParserMain parser = new ParserMain();
ModelBuilder builder = new ModelBuilder();
SaxNode parentNode = parser.parse(d.getInputSource(), d.getFileUrl(), errors);
- ;
results.add(builder.build(parentNode));
}
}
@@ -118,26 +120,14 @@
}
for (BeanResult<?> bb : r.getBeans())
{
- boolean install = true;
- for (Object className : bb.getDependencies())
- {
- try
- {
- bb.getType().getClassLoader().loadClass(className.toString());
- }
- catch (ClassNotFoundException e)
- {
- install = false;
- break;
- }
- }
- if (install)
- {
- AnnotatedType<?> tp = bb.getBuilder().create();
- event.addAnnotatedType(tp);
- types.put(tp.getJavaClass(), tp);
- }
+ AnnotatedType<?> tp = bb.getBuilder().create();
+ event.addAnnotatedType(tp);
+ types.put(tp.getJavaClass(), tp);
}
+ for (BeanResult<?> bb : r.getExtendBeans())
+ {
+ beanExtensions.put(bb.getType(), bb);
+ }
veto.addAll(r.getVeto());
}
@@ -150,6 +140,13 @@
{
event.veto();
}
+ Class javaClass = event.getAnnotatedType().getJavaClass();
+ if (beanExtensions.containsKey(javaClass))
+ {
+ NewAnnotatedTypeBuilder typeBuilder = beanExtensions.get(javaClass).getBuilder();
+ typeBuilder.mergeAnnotations(event.getAnnotatedType(), false);
+ event.setAnnotatedType(typeBuilder.create());
+ }
}
public <T> void processInjectionTarget(@Observes ProcessInjectionTarget<T> event)
Modified: modules/xml/trunk/src/main/java/org/jboss/seam/xml/core/BeanResult.java
===================================================================
--- modules/xml/trunk/src/main/java/org/jboss/seam/xml/core/BeanResult.java 2010-03-04 17:57:27 UTC (rev 12097)
+++ modules/xml/trunk/src/main/java/org/jboss/seam/xml/core/BeanResult.java 2010-03-05 03:44:36 UTC (rev 12098)
@@ -4,17 +4,13 @@
*/
package org.jboss.seam.xml.core;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
import org.jboss.weld.extensions.util.annotated.NewAnnotatedTypeBuilder;
public class BeanResult<X>
{
NewAnnotatedTypeBuilder<X> builder;
- List<String> dependencies = new ArrayList<String>();
Class<X> type;
+ boolean override, extend;
public BeanResult(Class<X> type)
{
@@ -27,18 +23,28 @@
return builder;
}
- public void addDependency(String className)
+ public Class<X> getType()
{
- dependencies.add(className);
+ return type;
}
- public List<String> getDependencies()
+ public boolean isOverride()
{
- return Collections.unmodifiableList(dependencies);
+ return override;
}
- public Class<X> getType()
+ public void setOverride(boolean override)
{
- return type;
+ this.override = override;
}
+
+ public boolean isExtend()
+ {
+ return extend;
+ }
+
+ public void setExtend(boolean extend)
+ {
+ this.extend = extend;
+ }
}
Modified: modules/xml/trunk/src/main/java/org/jboss/seam/xml/core/XmlResult.java
===================================================================
--- modules/xml/trunk/src/main/java/org/jboss/seam/xml/core/XmlResult.java 2010-03-04 17:57:27 UTC (rev 12097)
+++ modules/xml/trunk/src/main/java/org/jboss/seam/xml/core/XmlResult.java 2010-03-05 03:44:36 UTC (rev 12098)
@@ -33,6 +33,8 @@
List<BeanResult<?>> beans = new ArrayList<BeanResult<?>>();
+ List<BeanResult<?>> extendBeans = new ArrayList<BeanResult<?>>();
+
Map<BeanResult<?>, List<FieldValueObject>> fieldValues = new HashMap<BeanResult<?>, List<FieldValueObject>>();
public Map<Class<? extends Annotation>, Annotation[]> getStereotypes()
@@ -80,4 +82,9 @@
return veto;
}
+ public List<BeanResult<?>> getExtendBeans()
+ {
+ return extendBeans;
+ }
+
}
Deleted: modules/xml/trunk/src/main/java/org/jboss/seam/xml/model/DependsXmlItem.java
===================================================================
--- modules/xml/trunk/src/main/java/org/jboss/seam/xml/model/DependsXmlItem.java 2010-03-04 17:57:27 UTC (rev 12097)
+++ modules/xml/trunk/src/main/java/org/jboss/seam/xml/model/DependsXmlItem.java 2010-03-05 03:44:36 UTC (rev 12098)
@@ -1,23 +0,0 @@
-/*
- * Distributed under the LGPL License
- *
- */
-package org.jboss.seam.xml.model;
-
-import java.util.Collections;
-import java.util.Set;
-
-public class DependsXmlItem extends AbstractXmlItem
-{
-
- public DependsXmlItem(XmlItem parent, String innerTest, String document, int lineno)
- {
- super(XmlItemType.DEPENDENCY, parent, null, innerTest, null, document, lineno);
- }
-
- public Set<XmlItemType> getAllowedItem()
- {
- return Collections.emptySet();
- }
-
-}
Added: modules/xml/trunk/src/main/java/org/jboss/seam/xml/model/ExtendsXmlItem.java
===================================================================
--- modules/xml/trunk/src/main/java/org/jboss/seam/xml/model/ExtendsXmlItem.java (rev 0)
+++ modules/xml/trunk/src/main/java/org/jboss/seam/xml/model/ExtendsXmlItem.java 2010-03-05 03:44:36 UTC (rev 12098)
@@ -0,0 +1,24 @@
+/*
+ * Distributed under the LGPL License
+ *
+ */
+package org.jboss.seam.xml.model;
+
+import java.util.Collections;
+import java.util.Set;
+
+public class ExtendsXmlItem extends AbstractXmlItem
+{
+
+ public ExtendsXmlItem(XmlItem parent, String document, int lineno)
+ {
+ super(XmlItemType.EXTENDS, parent, null, null, null, document, lineno);
+
+ }
+
+ public Set<XmlItemType> getAllowedItem()
+ {
+ return Collections.emptySet();
+ }
+
+}
Modified: modules/xml/trunk/src/main/java/org/jboss/seam/xml/model/ModelBuilder.java
===================================================================
--- modules/xml/trunk/src/main/java/org/jboss/seam/xml/model/ModelBuilder.java 2010-03-04 17:57:27 UTC (rev 12097)
+++ modules/xml/trunk/src/main/java/org/jboss/seam/xml/model/ModelBuilder.java 2010-03-05 03:44:36 UTC (rev 12098)
@@ -95,7 +95,18 @@
if (type == ResultType.BEAN)
{
BeanResult<?> tp = buildAnnotatedType(rb);
- ret.getBeans().add(tp);
+ if (tp.isExtend())
+ {
+ ret.getExtendBeans().add(tp);
+ }
+ else
+ {
+ ret.getBeans().add(tp);
+ }
+ if (tp.isOverride())
+ {
+ ret.addVeto(tp.getType());
+ }
List<FieldValueObject> fields = new ArrayList<FieldValueObject>();
for (FieldXmlItem xi : rb.getChildrenOfType(FieldXmlItem.class))
{
@@ -237,6 +248,15 @@
// list of constructor arguments
List<XmlItem> constList = new ArrayList<XmlItem>();
+ boolean override = !rb.getChildrenOfType(OverrideXmlItem.class).isEmpty();
+ boolean extend = !rb.getChildrenOfType(ExtendsXmlItem.class).isEmpty();
+ if (override && extend)
+ {
+ throw new XmlConfigurationException("A bean may not both <override> and <extend> an existing bean", rb.getDocument(), rb.getLineno());
+ }
+ result.setOverride(override);
+ result.setExtend(extend);
+
for (AnnotationXmlItem item : rb.getChildrenOfType(AnnotationXmlItem.class))
{
Annotation a = createAnnotation(item);
@@ -275,10 +295,6 @@
}
}
- for (DependsXmlItem item : rb.getChildrenOfType(DependsXmlItem.class))
- {
- result.addDependency(item.getInnerText());
- }
if (!constList.isEmpty())
{
Added: modules/xml/trunk/src/main/java/org/jboss/seam/xml/model/OverrideXmlItem.java
===================================================================
--- modules/xml/trunk/src/main/java/org/jboss/seam/xml/model/OverrideXmlItem.java (rev 0)
+++ modules/xml/trunk/src/main/java/org/jboss/seam/xml/model/OverrideXmlItem.java 2010-03-05 03:44:36 UTC (rev 12098)
@@ -0,0 +1,24 @@
+/*
+ * Distributed under the LGPL License
+ *
+ */
+package org.jboss.seam.xml.model;
+
+import java.util.Collections;
+import java.util.Set;
+
+public class OverrideXmlItem extends AbstractXmlItem
+{
+
+ public OverrideXmlItem(XmlItem parent, String document, int lineno)
+ {
+ super(XmlItemType.OVERRIDE, parent, null, null, null, document, lineno);
+
+ }
+
+ public Set<XmlItemType> getAllowedItem()
+ {
+ return Collections.emptySet();
+ }
+
+}
Modified: modules/xml/trunk/src/main/java/org/jboss/seam/xml/model/XmlItemType.java
===================================================================
--- modules/xml/trunk/src/main/java/org/jboss/seam/xml/model/XmlItemType.java 2010-03-04 17:57:27 UTC (rev 12097)
+++ modules/xml/trunk/src/main/java/org/jboss/seam/xml/model/XmlItemType.java 2010-03-05 03:44:36 UTC (rev 12098)
@@ -6,5 +6,5 @@
public enum XmlItemType
{
- CLASS, METHOD, FIELD, ANNOTATION, VALUE, VETO, ENTRY, KEY, DEPENDENCY, PARAMETER, ARRAY, OVERRIDE;
+ CLASS, METHOD, FIELD, ANNOTATION, VALUE, VETO, ENTRY, KEY, DEPENDENCY, PARAMETER, ARRAY, OVERRIDE, EXTENDS;
}
Modified: modules/xml/trunk/src/main/java/org/jboss/seam/xml/parser/namespace/RootNamespaceElementResolver.java
===================================================================
--- modules/xml/trunk/src/main/java/org/jboss/seam/xml/parser/namespace/RootNamespaceElementResolver.java 2010-03-04 17:57:27 UTC (rev 12097)
+++ modules/xml/trunk/src/main/java/org/jboss/seam/xml/parser/namespace/RootNamespaceElementResolver.java 2010-03-05 03:44:36 UTC (rev 12098)
@@ -6,9 +6,10 @@
import org.jboss.seam.xml.model.ArrayXmlItem;
import org.jboss.seam.xml.model.ClassXmlItem;
-import org.jboss.seam.xml.model.DependsXmlItem;
import org.jboss.seam.xml.model.EntryXmlItem;
+import org.jboss.seam.xml.model.ExtendsXmlItem;
import org.jboss.seam.xml.model.KeyXmlItem;
+import org.jboss.seam.xml.model.OverrideXmlItem;
import org.jboss.seam.xml.model.ParameterXmlItem;
import org.jboss.seam.xml.model.ValueXmlItem;
import org.jboss.seam.xml.model.VetoXmlItem;
@@ -59,10 +60,14 @@
{
return new VetoXmlItem(parent, node.getDocument(), node.getLineNo());
}
- else if (item.equals("depends"))
+ else if (item.equals("override"))
{
- return new DependsXmlItem(parent, node.getInnerText(), node.getDocument(), node.getLineNo());
+ return new OverrideXmlItem(parent, node.getDocument(), node.getLineNo());
}
+ else if (item.equals("extends"))
+ {
+ return new ExtendsXmlItem(parent, node.getDocument(), node.getLineNo());
+ }
// now deal with primitive types
Modified: modules/xml/trunk/src/test/java/org/jboss/seam/xml/test/AbstractXMLTest.java
===================================================================
--- modules/xml/trunk/src/test/java/org/jboss/seam/xml/test/AbstractXMLTest.java 2010-03-04 17:57:27 UTC (rev 12097)
+++ modules/xml/trunk/src/test/java/org/jboss/seam/xml/test/AbstractXMLTest.java 2010-03-05 03:44:36 UTC (rev 12098)
@@ -17,11 +17,8 @@
public abstract class AbstractXMLTest
{
-
- public static String[] ARGS_EMPTY = new String[] {};
-
protected BeanManager manager;
-
+
Weld weld;
protected abstract String getXmlFileName();
@@ -39,7 +36,7 @@
@AfterClass
public void teardown()
{
- weld.shutdown();
+ weld.shutdown();
}
public <T> T getReference(Class<T> clazz, Annotation... bindings)
@@ -52,7 +49,7 @@
else if (beans.size() != 1)
{
StringBuilder bs = new StringBuilder("[");
- for(Annotation a : bindings)
+ for (Annotation a : bindings)
{
bs.append(a.toString() + ",");
}
@@ -63,5 +60,4 @@
return (T) bean.create(manager.createCreationalContext(bean));
}
-
}
Added: modules/xml/trunk/src/test/java/org/jboss/seam/xml/test/simple/ExtendedBean.java
===================================================================
--- modules/xml/trunk/src/test/java/org/jboss/seam/xml/test/simple/ExtendedBean.java (rev 0)
+++ modules/xml/trunk/src/test/java/org/jboss/seam/xml/test/simple/ExtendedBean.java 2010-03-05 03:44:36 UTC (rev 12098)
@@ -0,0 +1,7 @@
+package org.jboss.seam.xml.test.simple;
+
+@ExtendedQualifier1
+public class ExtendedBean
+{
+
+}
Added: modules/xml/trunk/src/test/java/org/jboss/seam/xml/test/simple/ExtendedQualifier1.java
===================================================================
--- modules/xml/trunk/src/test/java/org/jboss/seam/xml/test/simple/ExtendedQualifier1.java (rev 0)
+++ modules/xml/trunk/src/test/java/org/jboss/seam/xml/test/simple/ExtendedQualifier1.java 2010-03-05 03:44:36 UTC (rev 12098)
@@ -0,0 +1,13 @@
+package org.jboss.seam.xml.test.simple;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+import javax.inject.Qualifier;
+
+(a)Retention(RetentionPolicy.RUNTIME)
+@Qualifier
+public @interface ExtendedQualifier1
+{
+
+}
Added: modules/xml/trunk/src/test/java/org/jboss/seam/xml/test/simple/ExtendedQualifier2.java
===================================================================
--- modules/xml/trunk/src/test/java/org/jboss/seam/xml/test/simple/ExtendedQualifier2.java (rev 0)
+++ modules/xml/trunk/src/test/java/org/jboss/seam/xml/test/simple/ExtendedQualifier2.java 2010-03-05 03:44:36 UTC (rev 12098)
@@ -0,0 +1,13 @@
+package org.jboss.seam.xml.test.simple;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+import javax.inject.Qualifier;
+
+(a)Retention(RetentionPolicy.RUNTIME)
+@Qualifier
+public @interface ExtendedQualifier2
+{
+
+}
Added: modules/xml/trunk/src/test/java/org/jboss/seam/xml/test/simple/OverriddenBean.java
===================================================================
--- modules/xml/trunk/src/test/java/org/jboss/seam/xml/test/simple/OverriddenBean.java (rev 0)
+++ modules/xml/trunk/src/test/java/org/jboss/seam/xml/test/simple/OverriddenBean.java 2010-03-05 03:44:36 UTC (rev 12098)
@@ -0,0 +1,6 @@
+package org.jboss.seam.xml.test.simple;
+
+public class OverriddenBean
+{
+
+}
Modified: modules/xml/trunk/src/test/java/org/jboss/seam/xml/test/simple/SimpleBeanTest.java
===================================================================
--- modules/xml/trunk/src/test/java/org/jboss/seam/xml/test/simple/SimpleBeanTest.java 2010-03-04 17:57:27 UTC (rev 12097)
+++ modules/xml/trunk/src/test/java/org/jboss/seam/xml/test/simple/SimpleBeanTest.java 2010-03-05 03:44:36 UTC (rev 12098)
@@ -4,6 +4,11 @@
*/
package org.jboss.seam.xml.test.simple;
+import java.util.Set;
+
+import javax.enterprise.inject.spi.Bean;
+import javax.enterprise.util.AnnotationLiteral;
+
import org.jboss.seam.xml.test.AbstractXMLTest;
import org.jboss.weld.environment.se.util.WeldManagerUtils;
import org.testng.annotations.Test;
@@ -32,4 +37,27 @@
assert x.value == 1 : "Post construct method not called";
}
+ @Test
+ public void testOverride()
+ {
+ Set<Bean<?>> beans = manager.getBeans(OverriddenBean.class);
+ assert beans.size() == 1;
+ assert beans.iterator().next().getName().equals("someBean");
+
+ }
+
+ @Test
+ public void testExtends()
+ {
+ AnnotationLiteral<ExtendedQualifier1> e1 = new AnnotationLiteral<ExtendedQualifier1>()
+ {
+ };
+ AnnotationLiteral<ExtendedQualifier2> e2 = new AnnotationLiteral<ExtendedQualifier2>()
+ {
+ };
+
+ ExtendedBean ext = getReference(ExtendedBean.class, e1, e2);
+ assert ext != null;
+
+ }
}
Deleted: modules/xml/trunk/src/test/resources/org/jboss/seam/xml/test/dependency/dependency-beans.xml
===================================================================
--- modules/xml/trunk/src/test/resources/org/jboss/seam/xml/test/dependency/dependency-beans.xml 2010-03-04 17:57:27 UTC (rev 12097)
+++ modules/xml/trunk/src/test/resources/org/jboss/seam/xml/test/dependency/dependency-beans.xml 2010-03-05 03:44:36 UTC (rev 12098)
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Beans xmlns="urn:seam:core"
- xmlns:test="urn:java:org.jboss.seam.xml.test.dependency">
- <veto>
- <test:AdvancedTimer/>
- </veto>
-
- <test:AdvancedTimer>
- <Specializes/>
- <depends>com.advanced.timer.server.that.is.not.on.the.ClassPath</depends>
- </test:AdvancedTimer>
-
-</Beans>
\ No newline at end of file
Modified: modules/xml/trunk/src/test/resources/org/jboss/seam/xml/test/simple/simple-beans.xml
===================================================================
--- modules/xml/trunk/src/test/resources/org/jboss/seam/xml/test/simple/simple-beans.xml 2010-03-04 17:57:27 UTC (rev 12097)
+++ modules/xml/trunk/src/test/resources/org/jboss/seam/xml/test/simple/simple-beans.xml 2010-03-05 03:44:36 UTC (rev 12098)
@@ -24,5 +24,14 @@
</test:produceBean3>
</test:Bean2>
+ <test:OverriddenBean>
+ <override/>
+ <Named>someBean</Named>
+ </test:OverriddenBean>
+
+ <test:ExtendedBean>
+ <extends/>
+ <test:ExtendedQualifier2/>
+ </test:ExtendedBean>
</Beans>
\ No newline at end of file
14 years, 1 month
- 1
- 0
Seam SVN: r12097 - tags/JBoss_Seam_2_2_1_CR1/src/main/org/jboss/seam/persistence.
by seam-commits＠lists.jboss.org
Author: youngm
Date: 2010-03-04 12:57:27 -0500 (Thu, 04 Mar 2010)
New Revision: 12097
Modified:
tags/JBoss_Seam_2_2_1_CR1/src/main/org/jboss/seam/persistence/EntityManagerInvocationHandler.java
tags/JBoss_Seam_2_2_1_CR1/src/main/org/jboss/seam/persistence/HibernateSessionInvocationHandler.java
Log:
JBSEAM-4580
Modified: tags/JBoss_Seam_2_2_1_CR1/src/main/org/jboss/seam/persistence/EntityManagerInvocationHandler.java
===================================================================
--- tags/JBoss_Seam_2_2_1_CR1/src/main/org/jboss/seam/persistence/EntityManagerInvocationHandler.java 2010-03-04 15:50:50 UTC (rev 12096)
+++ tags/JBoss_Seam_2_2_1_CR1/src/main/org/jboss/seam/persistence/EntityManagerInvocationHandler.java 2010-03-04 17:57:27 UTC (rev 12097)
@@ -1,5 +1,6 @@
package org.jboss.seam.persistence;
+import java.io.Serializable;
import java.lang.reflect.InvocationHandler;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
@@ -16,7 +17,7 @@
* @author Gavin King
* @author Mike Youngstrom
*/
-public class EntityManagerInvocationHandler implements InvocationHandler
+public class EntityManagerInvocationHandler implements InvocationHandler, Serializable
{
private EntityManager delegate;
Modified: tags/JBoss_Seam_2_2_1_CR1/src/main/org/jboss/seam/persistence/HibernateSessionInvocationHandler.java
===================================================================
--- tags/JBoss_Seam_2_2_1_CR1/src/main/org/jboss/seam/persistence/HibernateSessionInvocationHandler.java 2010-03-04 15:50:50 UTC (rev 12096)
+++ tags/JBoss_Seam_2_2_1_CR1/src/main/org/jboss/seam/persistence/HibernateSessionInvocationHandler.java 2010-03-04 17:57:27 UTC (rev 12097)
@@ -1,5 +1,6 @@
package org.jboss.seam.persistence;
+import java.io.Serializable;
import java.lang.reflect.InvocationHandler;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
@@ -17,7 +18,7 @@
* @author Mike Youngstrom
*
*/
-public class HibernateSessionInvocationHandler implements InvocationHandler
+public class HibernateSessionInvocationHandler implements InvocationHandler, Serializable
{
private Session delegate;
14 years, 1 month
- 1
- 0
Seam SVN: r12096 - branches/community/Seam_2_2/src/main/org/jboss/seam/persistence.
by seam-commits＠lists.jboss.org
Author: youngm
Date: 2010-03-04 10:50:50 -0500 (Thu, 04 Mar 2010)
New Revision: 12096
Modified:
branches/community/Seam_2_2/src/main/org/jboss/seam/persistence/EntityManagerInvocationHandler.java
branches/community/Seam_2_2/src/main/org/jboss/seam/persistence/HibernateSessionInvocationHandler.java
Log:
JBSEAM-4580
Modified: branches/community/Seam_2_2/src/main/org/jboss/seam/persistence/EntityManagerInvocationHandler.java
===================================================================
--- branches/community/Seam_2_2/src/main/org/jboss/seam/persistence/EntityManagerInvocationHandler.java 2010-03-04 14:08:32 UTC (rev 12095)
+++ branches/community/Seam_2_2/src/main/org/jboss/seam/persistence/EntityManagerInvocationHandler.java 2010-03-04 15:50:50 UTC (rev 12096)
@@ -1,5 +1,6 @@
package org.jboss.seam.persistence;
+import java.io.Serializable;
import java.lang.reflect.InvocationHandler;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
@@ -16,7 +17,7 @@
* @author Gavin King
* @author Mike Youngstrom
*/
-public class EntityManagerInvocationHandler implements InvocationHandler
+public class EntityManagerInvocationHandler implements InvocationHandler, Serializable
{
private EntityManager delegate;
Modified: branches/community/Seam_2_2/src/main/org/jboss/seam/persistence/HibernateSessionInvocationHandler.java
===================================================================
--- branches/community/Seam_2_2/src/main/org/jboss/seam/persistence/HibernateSessionInvocationHandler.java 2010-03-04 14:08:32 UTC (rev 12095)
+++ branches/community/Seam_2_2/src/main/org/jboss/seam/persistence/HibernateSessionInvocationHandler.java 2010-03-04 15:50:50 UTC (rev 12096)
@@ -1,5 +1,6 @@
package org.jboss.seam.persistence;
+import java.io.Serializable;
import java.lang.reflect.InvocationHandler;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
@@ -17,7 +18,7 @@
* @author Mike Youngstrom
*
*/
-public class HibernateSessionInvocationHandler implements InvocationHandler
+public class HibernateSessionInvocationHandler implements InvocationHandler, Serializable
{
private Session delegate;
14 years, 1 month
- 1
- 0
Seam SVN: r12095 - branches/community/Seam_2_2.
by seam-commits＠lists.jboss.org
Author: kpiwko(a)redhat.com
Date: 2010-03-04 09:08:32 -0500 (Thu, 04 Mar 2010)
New Revision: 12095
Modified:
branches/community/Seam_2_2/release-process.txt
Log:
JBSEAM-4583, Update Portlet Bridge and GateIn integration instructions
Modified: branches/community/Seam_2_2/release-process.txt
===================================================================
--- branches/community/Seam_2_2/release-process.txt 2010-03-04 06:01:31 UTC (rev 12094)
+++ branches/community/Seam_2_2/release-process.txt 2010-03-04 14:08:32 UTC (rev 12095)
@@ -456,17 +456,35 @@
* JBDS - test a subset of the examples with testNG plugin.
- See "/readme.txt" and "/examples/readme.txt" for details.
-Portal Bridge Verification
+Portlet Bridge Verification
--------------------------
-* Use the latest released version of the PortalBridge (PBR) and JBoss Portal.
- - http://labs.jboss.com/portletbridge
- - http://www.jboss.org/jbossportal/
-* <NOTE: because the bridge is beta first test the example using the PBR
- distribution. Then follow the steps below to upgrade the seam
- version in the example. Then retest the example./>
+* Use the latest released version of the JBoss Portlet Bridge (PBR) and GateIn.
+ - for PBR source distribution is preferred
+ - http://www.jboss.com/portletbridge
+ - http://www.jboss.org/gatein
+
+* <NOTE: since no GA is released yet, this is expected to work with versions of
+ PBR 2.0.0.CR1 and GateIn 3.0.CR1 or higher. It is useful to check both
+ with original Seam version specified in PBR and current Seam release />
+
* Deploy PBR seam booking example following the PBR document instructions.
- - Review any known issues with the PBR in the PBR Jira project.
+ - Review any known issues with the PBR in the PBR JIRA project.
+ - verify cargo is set to version which supports JBoss 5.x distributed with
+ GateIn and versions are set to "jboss5x"
+ - the same holds for maven-ear-plugin
+ - <NOTE: see PBR-145 in case of problems />
+ - simplified instructions for deploying seam booking:
+ - use 2 terminals
+ - 1: $ mvn clean install
+ $ mvn cargo:start -Plocal-portal -Dlocal \
+ -DJBOSS_ZIP_HOME=${path.to.GateIn.zip} \
+ -DJBOSS_HOME_DIR=${path.to.JBossAS.in.zip}
+ - 2: $ mvn cargo:deploy -Plocal-portal -Dlocal
+ -DJBOSS_ZIP_HOME=${path.to.GateIn.zip} \
+ -DJBOSS_HOME_DIR=${path.to.JBossAS.in.zip}
* Verify the example and functionality.
+ - Update applications in application registry
+ - Add new page with Seam booking portlets
- User authentication through portal
- use default users, and new users that are created
- Basic hotel booking
@@ -477,18 +495,13 @@
- Conversation handling
- launch several hotels booking conv. from the search page
- individually confirm and switch between conversations.
- - <NOTE: Can not lauch into multiple conversations ATM>
- - <NOTE: logging in/out through the portlet, registering new users, and
- changing passwords do not work, and jiras have been entered
- for them to be removed as it is integrated with portal auth/>
-* Upgrade the seam version in the seam portlet booking example
- - download the src distribution of the PBR
+ - <NOTE: Can not launch into multiple conversations ATM>
+* Upgrade the Seam version in the Seam portlet booking example and follow
+ steps above
- edit the $PBR_SRC/examples/seam/booking/pom.xml file
- adjust the seam version properties at the top of the file
- - build the example by running "mvn install" in the $PBR_SRC/examples dir
- - <NOTE: You need to remove the "javassist.jar" from both the EAR
- and WAR lib directories. This is related to PBR-2 - but for some
- reason the javassist.jar is still placed in both./>
+ - build the example by running "mvn clean install"
+ in the $PBR_SRC/examples/seam/booking dir
* Deploy a second version of the booking example as a separate portlet
- <TODO: DEFER - this is not supported in the bridge yet/>
- <TODO: there may be a new chatroom seam portlet for this testing/>
14 years, 1 month
- 1
- 0