February 2008 - seam-commits - Jboss List Archives

Seam SVN: r7368 - in trunk: examples/booking/resources/WEB-INF and 55 other directories.

by seam-commits＠lists.jboss.org

Author: norman.richards(a)jboss.com Date: 2008-02-05 14:37:56 -0500 (Tue, 05 Feb 2008) New Revision: 7368 Added: trunk/src/ioc/org/jboss/seam/ioc/spring/spring-2.1.xsd trunk/src/ioc/org/jboss/seam/ioc/spring/spring-seam-2.1.xsd trunk/src/main/org/jboss/seam/async-2.1.xsd trunk/src/main/org/jboss/seam/bpm-2.1.xsd trunk/src/main/org/jboss/seam/components-2.1.dtd trunk/src/main/org/jboss/seam/components-2.1.xsd trunk/src/main/org/jboss/seam/core-2.1.xsd trunk/src/main/org/jboss/seam/drools-2.1.xsd trunk/src/main/org/jboss/seam/framework-2.1.xsd trunk/src/main/org/jboss/seam/identity-management-2.1.xsd trunk/src/main/org/jboss/seam/international-2.1.xsd trunk/src/main/org/jboss/seam/jms-2.1.xsd trunk/src/main/org/jboss/seam/mail-2.1.xsd trunk/src/main/org/jboss/seam/navigation-2.1.xsd trunk/src/main/org/jboss/seam/pageflow-2.1.xsd trunk/src/main/org/jboss/seam/pages-2.1.dtd trunk/src/main/org/jboss/seam/pages-2.1.xsd trunk/src/main/org/jboss/seam/pdf-2.1.xsd trunk/src/main/org/jboss/seam/persistence-2.1.xsd trunk/src/main/org/jboss/seam/remoting-2.1.xsd trunk/src/main/org/jboss/seam/security-2.1.xsd trunk/src/main/org/jboss/seam/theme-2.1.xsd trunk/src/main/org/jboss/seam/transaction-2.1.xsd trunk/src/main/org/jboss/seam/web-2.1.xsd trunk/src/pdf/org/jboss/seam/pdf/pdf-2.1.xsd Removed: trunk/src/ioc/org/jboss/seam/ioc/spring/spring-2.0.xsd trunk/src/ioc/org/jboss/seam/ioc/spring/spring-seam-2.0.xsd trunk/src/main/org/jboss/seam/async-2.0.xsd trunk/src/main/org/jboss/seam/bpm-2.0.xsd trunk/src/main/org/jboss/seam/components-2.0.dtd trunk/src/main/org/jboss/seam/components-2.0.xsd trunk/src/main/org/jboss/seam/core-2.0.xsd trunk/src/main/org/jboss/seam/drools-2.0.xsd trunk/src/main/org/jboss/seam/framework-2.0.xsd trunk/src/main/org/jboss/seam/identity-management-2.0.xsd trunk/src/main/org/jboss/seam/international-2.0.xsd trunk/src/main/org/jboss/seam/jms-2.0.xsd trunk/src/main/org/jboss/seam/mail-2.0.xsd trunk/src/main/org/jboss/seam/navigation-2.0.xsd trunk/src/main/org/jboss/seam/pageflow-2.0.xsd trunk/src/main/org/jboss/seam/pages-2.0.dtd trunk/src/main/org/jboss/seam/pages-2.0.xsd trunk/src/main/org/jboss/seam/pdf-2.0.xsd trunk/src/main/org/jboss/seam/persistence-2.0.xsd trunk/src/main/org/jboss/seam/remoting-2.0.xsd trunk/src/main/org/jboss/seam/security-2.0.xsd trunk/src/main/org/jboss/seam/theme-2.0.xsd trunk/src/main/org/jboss/seam/transaction-2.0.xsd trunk/src/main/org/jboss/seam/web-2.0.xsd trunk/src/pdf/org/jboss/seam/pdf/pdf-2.0.xsd Modified: trunk/examples/blog/resources/WEB-INF/components.xml trunk/examples/blog/resources/WEB-INF/pages.xml trunk/examples/booking/resources/WEB-INF/components.xml trunk/examples/booking/resources/WEB-INF/pages.xml trunk/examples/contactlist/resources/WEB-INF/components.xml trunk/examples/contactlist/resources/WEB-INF/pages.xml trunk/examples/drools/resources/WEB-INF/components.xml trunk/examples/drools/resources/pageflow.jpdl.xml trunk/examples/dvdstore/resources/WEB-INF/components.xml trunk/examples/dvdstore/resources/WEB-INF/pages.xml trunk/examples/dvdstore/resources/checkout.jpdl.xml trunk/examples/dvdstore/resources/newuser.jpdl.xml trunk/examples/groovybooking/resources/WEB-INF/components.xml trunk/examples/groovybooking/resources/WEB-INF/pages.xml trunk/examples/hibernate/resources-glassfish/WEB-INF/components.xml trunk/examples/hibernate/resources-glassfish/WEB-INF/pages.xml trunk/examples/hibernate/resources-jboss/WEB-INF/components.xml trunk/examples/hibernate/resources-jboss/WEB-INF/pages.xml trunk/examples/hibernate/resources-tomcat/WEB-INF/components.xml trunk/examples/hibernate/resources-tomcat/WEB-INF/pages.xml trunk/examples/hibernate/resources-weblogic92/WEB-INF/components.xml trunk/examples/hibernate/resources-weblogic92/WEB-INF/pages.xml trunk/examples/hibernate/resources-websphere61/WEB-INF/components.xml trunk/examples/hibernate/resources-websphere61/WEB-INF/pages.xml trunk/examples/icefaces/resources/WEB-INF/components.xml trunk/examples/icefaces/resources/WEB-INF/pages.xml trunk/examples/itext/resources/WEB-INF/components.xml trunk/examples/itext/resources/WEB-INF/pages.xml trunk/examples/jee5/booking/resources/WEB-INF/components.xml trunk/examples/jee5/booking/resources/WEB-INF/pages.xml trunk/examples/jee5/remoting/resources/WEB-INF/components.xml trunk/examples/jpa/resources-glassfish/WEB-INF/components.xml trunk/examples/jpa/resources-glassfish/WEB-INF/pages.xml trunk/examples/jpa/resources-jboss/WEB-INF/components.xml trunk/examples/jpa/resources-jboss/WEB-INF/pages.xml trunk/examples/jpa/resources-tomcat/WEB-INF/components.xml trunk/examples/jpa/resources-tomcat/WEB-INF/pages.xml trunk/examples/jpa/resources-weblogic10/WEB-INF/components.xml trunk/examples/jpa/resources-weblogic10/WEB-INF/pages.xml trunk/examples/jpa/resources-weblogic92/WEB-INF/components.xml trunk/examples/jpa/resources-weblogic92/WEB-INF/pages.xml trunk/examples/jpa/resources-websphere61/WEB-INF/components.xml trunk/examples/jpa/resources-websphere61/WEB-INF/pages.xml trunk/examples/mail/resources/WEB-INF/components.xml trunk/examples/mail/resources/WEB-INF/pages.xml trunk/examples/messages/resources/WEB-INF/components.xml trunk/examples/nestedbooking/resources/WEB-INF/components.xml trunk/examples/nestedbooking/resources/WEB-INF/pages.xml trunk/examples/numberguess/resources/WEB-INF/components.xml trunk/examples/numberguess/resources/WEB-INF/pages.xml trunk/examples/numberguess/resources/cheat.jpdl.xml trunk/examples/numberguess/resources/pageflow.jpdl.xml trunk/examples/portal/resources/WEB-INF/components.xml trunk/examples/quartz/resources/WEB-INF/components.xml trunk/examples/quartz/resources/WEB-INF/pages.xml trunk/examples/registration/resources/WEB-INF/components.xml trunk/examples/remoting/chatroom/resources/WEB-INF/components.xml trunk/examples/remoting/gwt/resources/WEB-INF/components.xml trunk/examples/remoting/helloworld/resources/WEB-INF/components.xml trunk/examples/remoting/poker/resources/WEB-INF/components.xml trunk/examples/remoting/progressbar/resources/WEB-INF/components.xml trunk/examples/seambay/resources/META-INF/standard-jaxws-endpoint-config.xml trunk/examples/seambay/resources/WEB-INF/components.xml trunk/examples/seambay/resources/WEB-INF/pages.xml trunk/examples/seamdiscs/resources/WEB-INF/components.xml trunk/examples/seamdiscs/resources/WEB-INF/pages.xml trunk/examples/seamdiscs/view/artist.page.xml trunk/examples/seamdiscs/view/artists.page.xml trunk/examples/seamdiscs/view/disc.page.xml trunk/examples/seamdiscs/view/discs.page.xml trunk/examples/seamdiscs/view/home.page.xml trunk/examples/seamdiscs/view/login.page.xml trunk/examples/seampay/resources/WEB-INF/components.xml trunk/examples/seampay/resources/WEB-INF/pages.xml trunk/examples/seamspace/resources/WEB-INF/components.xml trunk/examples/seamspace/resources/WEB-INF/pages.xml trunk/examples/spring/resources/WEB-INF/applicationContext.xml trunk/examples/spring/resources/WEB-INF/components.xml trunk/examples/spring/resources/WEB-INF/pages.xml trunk/examples/takeaway/resources/WEB-INF/components.xml trunk/examples/takeaway/resources/WEB-INF/pages.xml trunk/examples/todo/resources/WEB-INF/components.xml trunk/examples/ui/resources/WEB-INF/components.xml trunk/examples/ui/resources/WEB-INF/pages.xml trunk/examples/wicket/resources/WEB-INF/components.xml trunk/examples/wicket/resources/WEB-INF/pages.xml trunk/examples/wiki/src/etc/META-INF/components-dev.xml trunk/examples/wiki/src/etc/META-INF/components-prod.xml trunk/examples/wiki/src/etc/WEB-INF/components.xml trunk/examples/wiki/src/etc/WEB-INF/pages.xml trunk/src/ioc/META-INF/spring.schemas trunk/src/main/META-INF/components.xml trunk/src/test/integration/resources/WEB-INF/components.xml trunk/src/test/integration/resources/WEB-INF/pages.xml trunk/src/test/unit/META-INF/pagesForPageActionsTest.xml trunk/src/test/unit/org/jboss/seam/test/unit/component/MyEntityHome.component.xml Log: update schemas Modified: trunk/examples/blog/resources/WEB-INF/components.xml =================================================================== --- trunk/examples/blog/resources/WEB-INF/components.xml 2008-02-05 18:00:10 UTC (rev 7367) +++ trunk/examples/blog/resources/WEB-INF/components.xml 2008-02-05 19:37:56 UTC (rev 7368) @@ -6,11 +6,11 @@ xmlns:theme="http://jboss.com/products/seam/theme" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation= - "http://jboss.com/products/seam/core http://jboss.com/products/seam/core-2.0.xsd - http://jboss.com/products/seam/persistence http://jboss.com/products/seam/persistence-2.0.xsd - http://jboss.com/products/seam/security http://jboss.com/products/seam/security-2.0.xsd - http://jboss.com/products/seam/theme http://jboss.com/products/seam/theme-2.0.xsd - http://jboss.com/products/seam/components http://jboss.com/products/seam/components-2.0.xsd"> + "http://jboss.com/products/seam/core http://jboss.com/products/seam/core-2.1.xsd + http://jboss.com/products/seam/persistence http://jboss.com/products/seam/persistence-2.1.xsd + http://jboss.com/products/seam/security http://jboss.com/products/seam/security-2.1.xsd + http://jboss.com/products/seam/theme http://jboss.com/products/seam/theme-2.1.xsd + http://jboss.com/products/seam/components http://jboss.com/products/seam/components-2.1.xsd"> <core:init debug="true"/> Modified: trunk/examples/blog/resources/WEB-INF/pages.xml =================================================================== --- trunk/examples/blog/resources/WEB-INF/pages.xml 2008-02-05 18:00:10 UTC (rev 7367) +++ trunk/examples/blog/resources/WEB-INF/pages.xml 2008-02-05 19:37:56 UTC (rev 7368) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <pages xmlns="http://jboss.com/products/seam/pages" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://jboss.com/products/seam/pages http://jboss.com/products/seam/pages-2.0.xsd" + xsi:schemaLocation="http://jboss.com/products/seam/pages http://jboss.com/products/seam/pages-2.1.xsd" login-view-id="/login.xhtml"> Modified: trunk/examples/booking/resources/WEB-INF/components.xml =================================================================== --- trunk/examples/booking/resources/WEB-INF/components.xml 2008-02-05 18:00:10 UTC (rev 7367) +++ trunk/examples/booking/resources/WEB-INF/components.xml 2008-02-05 19:37:56 UTC (rev 7368) @@ -5,10 +5,10 @@ xmlns:transaction="http://jboss.com/products/seam/transaction" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation= - "http://jboss.com/products/seam/core http://jboss.com/products/seam/core-2.0.xsd - http://jboss.com/products/seam/transaction http://jboss.com/products/seam/transaction-2.0.xsd - http://jboss.com/products/seam/security http://jboss.com/products/seam/security-2.0.xsd - http://jboss.com/products/seam/components http://jboss.com/products/seam/components-2.0.xsd"> + "http://jboss.com/products/seam/core http://jboss.com/products/seam/core-2.1.xsd + http://jboss.com/products/seam/transaction http://jboss.com/products/seam/transaction-2.1.xsd + http://jboss.com/products/seam/security http://jboss.com/products/seam/security-2.1.xsd + http://jboss.com/products/seam/components http://jboss.com/products/seam/components-2.1.xsd"> <core:init jndi-pattern="@jndiPattern@" debug="true"/> Modified: trunk/examples/booking/resources/WEB-INF/pages.xml =================================================================== --- trunk/examples/booking/resources/WEB-INF/pages.xml 2008-02-05 18:00:10 UTC (rev 7367) +++ trunk/examples/booking/resources/WEB-INF/pages.xml 2008-02-05 19:37:56 UTC (rev 7368) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <pages xmlns="http://jboss.com/products/seam/pages" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://jboss.com/products/seam/pages http://jboss.com/products/seam/pages-2.0.xsd" + xsi:schemaLocation="http://jboss.com/products/seam/pages http://jboss.com/products/seam/pages-2.1.xsd" no-conversation-view-id="/main.xhtml" login-view-id="/home.xhtml"> Modified: trunk/examples/contactlist/resources/WEB-INF/components.xml =================================================================== --- trunk/examples/contactlist/resources/WEB-INF/components.xml 2008-02-05 18:00:10 UTC (rev 7367) +++ trunk/examples/contactlist/resources/WEB-INF/components.xml 2008-02-05 19:37:56 UTC (rev 7368) @@ -5,10 +5,10 @@ xmlns:persistence="http://jboss.com/products/seam/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation= - "http://jboss.com/products/seam/core http://jboss.com/products/seam/core-2.0.xsd - http://jboss.com/products/seam/framework http://jboss.com/products/seam/framework-2.0.xsd - http://jboss.com/products/seam/persistence http://jboss.com/products/seam/persistence-2.0.xsd - http://jboss.com/products/seam/components http://jboss.com/products/seam/components-2.0.xsd"> + "http://jboss.com/products/seam/core http://jboss.com/products/seam/core-2.1.xsd + http://jboss.com/products/seam/framework http://jboss.com/products/seam/framework-2.1.xsd + http://jboss.com/products/seam/persistence http://jboss.com/products/seam/persistence-2.1.xsd + http://jboss.com/products/seam/components http://jboss.com/products/seam/components-2.1.xsd"> <persistence:managed-persistence-context name="entityManager" persistence-unit-jndi-name="java:/contactlistEntityManagerFactory"/> Modified: trunk/examples/contactlist/resources/WEB-INF/pages.xml =================================================================== --- trunk/examples/contactlist/resources/WEB-INF/pages.xml 2008-02-05 18:00:10 UTC (rev 7367) +++ trunk/examples/contactlist/resources/WEB-INF/pages.xml 2008-02-05 19:37:56 UTC (rev 7368) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <pages xmlns="http://jboss.com/products/seam/pages" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://jboss.com/products/seam/pages http://jboss.com/products/seam/pages-2.0.xsd"> + xsi:schemaLocation="http://jboss.com/products/seam/pages http://jboss.com/products/seam/pages-2.1.xsd"> <page view-id="/viewContact.xhtml"> Modified: trunk/examples/drools/resources/WEB-INF/components.xml =================================================================== --- trunk/examples/drools/resources/WEB-INF/components.xml 2008-02-05 18:00:10 UTC (rev 7367) +++ trunk/examples/drools/resources/WEB-INF/components.xml 2008-02-05 19:37:56 UTC (rev 7368) @@ -4,10 +4,10 @@ xmlns:bpm="http://jboss.com/products/seam/bpm" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation= - "http://jboss.com/products/seam/drools http://jboss.com/products/seam/drools-2.0.xsd - http://jboss.com/products/seam/core http://jboss.com/products/seam/core-2.0.xsd - http://jboss.com/products/seam/components http://jboss.com/products/seam/components-2.0.xsd - http://jboss.com/products/seam/bpm http://jboss.com/products/seam/bpm-2.0.xsd"> + "http://jboss.com/products/seam/drools http://jboss.com/products/seam/drools-2.1.xsd + http://jboss.com/products/seam/core http://jboss.com/products/seam/core-2.1.xsd + http://jboss.com/products/seam/components http://jboss.com/products/seam/components-2.1.xsd + http://jboss.com/products/seam/bpm http://jboss.com/products/seam/bpm-2.1.xsd"> <drools:rule-base name="ruleBase" rule-files="numberguess.drl"/> <drools:managed-working-memory name="workingMemory" rule-base="#{ruleBase}"/> Modified: trunk/examples/drools/resources/pageflow.jpdl.xml =================================================================== --- trunk/examples/drools/resources/pageflow.jpdl.xml 2008-02-05 18:00:10 UTC (rev 7367) +++ trunk/examples/drools/resources/pageflow.jpdl.xml 2008-02-05 19:37:56 UTC (rev 7368) @@ -8,7 +8,7 @@ xmlns="http://jboss.com/products/seam/pageflow" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation= - "http://jboss.com/products/seam/pageflow http://jboss.com/products/seam/pageflow-2.0.xsd" + "http://jboss.com/products/seam/pageflow http://jboss.com/products/seam/pageflow-2.1.xsd" name="numberGuess"> <start-page name="displayGuess" view-id="/numberGuess.jsp"> Modified: trunk/examples/dvdstore/resources/WEB-INF/components.xml =================================================================== --- trunk/examples/dvdstore/resources/WEB-INF/components.xml 2008-02-05 18:00:10 UTC (rev 7367) +++ trunk/examples/dvdstore/resources/WEB-INF/components.xml 2008-02-05 19:37:56 UTC (rev 7368) @@ -7,12 +7,12 @@ xmlns:framework="http://jboss.com/products/seam/framework" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation= - "http://jboss.com/products/seam/core http://jboss.com/products/seam/core-2.0.xsd - http://jboss.com/products/seam/bpm http://jboss.com/products/seam/bpm-2.0.xsd - http://jboss.com/products/seam/persistence http://jboss.com/products/seam/persistence-2.0.xsd - http://jboss.com/products/seam/security http://jboss.com/products/seam/security-2.0.xsd - http://jboss.com/products/seam/framework http://jboss.com/products/seam/framework-2.0.xsd - http://jboss.com/products/seam/components http://jboss.com/products/seam/components-2.0.xsd"> + "http://jboss.com/products/seam/core http://jboss.com/products/seam/core-2.1.xsd + http://jboss.com/products/seam/bpm http://jboss.com/products/seam/bpm-2.1.xsd + http://jboss.com/products/seam/persistence http://jboss.com/products/seam/persistence-2.1.xsd + http://jboss.com/products/seam/security http://jboss.com/products/seam/security-2.1.xsd + http://jboss.com/products/seam/framework http://jboss.com/products/seam/framework-2.1.xsd + http://jboss.com/products/seam/components http://jboss.com/products/seam/components-2.1.xsd"> <core:init debug="true" jndi-pattern="@jndiPattern@"/> Modified: trunk/examples/dvdstore/resources/WEB-INF/pages.xml =================================================================== --- trunk/examples/dvdstore/resources/WEB-INF/pages.xml 2008-02-05 18:00:10 UTC (rev 7367) +++ trunk/examples/dvdstore/resources/WEB-INF/pages.xml 2008-02-05 19:37:56 UTC (rev 7368) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <pages xmlns="http://jboss.com/products/seam/pages" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://jboss.com/products/seam/pages http://jboss.com/products/seam/pages-2.0.xsd"> + xsi:schemaLocation="http://jboss.com/products/seam/pages http://jboss.com/products/seam/pages-2.1.xsd"> <page view-id="/dvd.xhtml" action="#{search.selectFromRequest}"> Modified: trunk/examples/dvdstore/resources/checkout.jpdl.xml =================================================================== --- trunk/examples/dvdstore/resources/checkout.jpdl.xml 2008-02-05 18:00:10 UTC (rev 7367) +++ trunk/examples/dvdstore/resources/checkout.jpdl.xml 2008-02-05 19:37:56 UTC (rev 7368) @@ -4,7 +4,7 @@ xmlns="http://jboss.com/products/seam/pageflow" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation= - "http://jboss.com/products/seam/pageflow http://jboss.com/products/seam/pageflow-2.0.xsd" + "http://jboss.com/products/seam/pageflow http://jboss.com/products/seam/pageflow-2.1.xsd" name="checkout"> <start-state name="start"> <transition to="confirm"/> Modified: trunk/examples/dvdstore/resources/newuser.jpdl.xml =================================================================== --- trunk/examples/dvdstore/resources/newuser.jpdl.xml 2008-02-05 18:00:10 UTC (rev 7367) +++ trunk/examples/dvdstore/resources/newuser.jpdl.xml 2008-02-05 19:37:56 UTC (rev 7368) @@ -4,7 +4,7 @@ xmlns="http://jboss.com/products/seam/pageflow" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation= - "http://jboss.com/products/seam/pageflow http://jboss.com/products/seam/pageflow-2.0.xsd" + "http://jboss.com/products/seam/pageflow http://jboss.com/products/seam/pageflow-2.1.xsd" name="newuser"> <start-state name="start"> <transition to="account"/> Modified: trunk/examples/groovybooking/resources/WEB-INF/components.xml =================================================================== --- trunk/examples/groovybooking/resources/WEB-INF/components.xml 2008-02-05 18:00:10 UTC (rev 7367) +++ trunk/examples/groovybooking/resources/WEB-INF/components.xml 2008-02-05 19:37:56 UTC (rev 7368) @@ -7,12 +7,12 @@ xmlns:mail="http://jboss.com/products/seam/mail" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation= - "http://jboss.com/products/seam/core http://jboss.com/products/seam/core-2.0.xsd - http://jboss.com/products/seam/persistence http://jboss.com/products/seam/persistence-2.0.xsd - http://jboss.com/products/seam/drools http://jboss.com/products/seam/drools-2.0.xsd - http://jboss.com/products/seam/security http://jboss.com/products/seam/security-2.0.xsd - http://jboss.com/products/seam/mail http://jboss.com/products/seam/mail-2.0.xsd - http://jboss.com/products/seam/components http://jboss.com/products/seam/components-2.0.xsd"> + "http://jboss.com/products/seam/core http://jboss.com/products/seam/core-2.1.xsd + http://jboss.com/products/seam/persistence http://jboss.com/products/seam/persistence-2.1.xsd + http://jboss.com/products/seam/drools http://jboss.com/products/seam/drools-2.1.xsd + http://jboss.com/products/seam/security http://jboss.com/products/seam/security-2.1.xsd + http://jboss.com/products/seam/mail http://jboss.com/products/seam/mail-2.1.xsd + http://jboss.com/products/seam/components http://jboss.com/products/seam/components-2.1.xsd"> <core:init debug="@debug@" jndi-pattern="@jndiPattern@"/> Modified: trunk/examples/groovybooking/resources/WEB-INF/pages.xml =================================================================== --- trunk/examples/groovybooking/resources/WEB-INF/pages.xml 2008-02-05 18:00:10 UTC (rev 7367) +++ trunk/examples/groovybooking/resources/WEB-INF/pages.xml 2008-02-05 19:37:56 UTC (rev 7368) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <pages xmlns="http://jboss.com/products/seam/pages" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://jboss.com/products/seam/pages http://jboss.com/products/seam/pages-2.0.xsd" + xsi:schemaLocation="http://jboss.com/products/seam/pages http://jboss.com/products/seam/pages-2.1.xsd" no-conversation-view-id="/main.xhtml" login-view-id="/home.xhtml"> Modified: trunk/examples/hibernate/resources-glassfish/WEB-INF/components.xml =================================================================== --- trunk/examples/hibernate/resources-glassfish/WEB-INF/components.xml 2008-02-05 18:00:10 UTC (rev 7367) +++ trunk/examples/hibernate/resources-glassfish/WEB-INF/components.xml 2008-02-05 19:37:56 UTC (rev 7368) @@ -5,10 +5,10 @@ xmlns:security="http://jboss.com/products/seam/security" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation= - "http://jboss.com/products/seam/core http://jboss.com/products/seam/core-2.0.xsd - http://jboss.com/products/seam/persistence http://jboss.com/products/seam/persistence-2.0.xsd - http://jboss.com/products/seam/security http://jboss.com/products/seam/security-2.0.xsd - http://jboss.com/products/seam/components http://jboss.com/products/seam/components-2.0.xsd"> + "http://jboss.com/products/seam/core http://jboss.com/products/seam/core-2.1.xsd + http://jboss.com/products/seam/persistence http://jboss.com/products/seam/persistence-2.1.xsd + http://jboss.com/products/seam/security http://jboss.com/products/seam/security-2.1.xsd + http://jboss.com/products/seam/components http://jboss.com/products/seam/components-2.1.xsd"> <core:init debug="true"/> Modified: trunk/examples/hibernate/resources-glassfish/WEB-INF/pages.xml =================================================================== --- trunk/examples/hibernate/resources-glassfish/WEB-INF/pages.xml 2008-02-05 18:00:10 UTC (rev 7367) +++ trunk/examples/hibernate/resources-glassfish/WEB-INF/pages.xml 2008-02-05 19:37:56 UTC (rev 7368) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <pages xmlns="http://jboss.com/products/seam/pages" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://jboss.com/products/seam/pages http://jboss.com/products/seam/pages-2.0.xsd" + xsi:schemaLocation="http://jboss.com/products/seam/pages http://jboss.com/products/seam/pages-2.1.xsd" no-conversation-view-id="/main.xhtml" login-view-id="/home.xhtml"> Modified: trunk/examples/hibernate/resources-jboss/WEB-INF/components.xml =================================================================== --- trunk/examples/hibernate/resources-jboss/WEB-INF/components.xml 2008-02-05 18:00:10 UTC (rev 7367) +++ trunk/examples/hibernate/resources-jboss/WEB-INF/components.xml 2008-02-05 19:37:56 UTC (rev 7368) @@ -6,11 +6,11 @@ xmlns:transaction="http://jboss.com/products/seam/transaction" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation= - "http://jboss.com/products/seam/core http://jboss.com/products/seam/core-2.0.xsd - http://jboss.com/products/seam/persistence http://jboss.com/products/seam/persistence-2.0.xsd - http://jboss.com/products/seam/security http://jboss.com/products/seam/security-2.0.xsd - http://jboss.com/products/seam/transaction http://jboss.com/products/seam/transaction-2.0.xsd - http://jboss.com/products/seam/components http://jboss.com/products/seam/components-2.0.xsd"> + "http://jboss.com/products/seam/core http://jboss.com/products/seam/core-2.1.xsd + http://jboss.com/products/seam/persistence http://jboss.com/products/seam/persistence-2.1.xsd + http://jboss.com/products/seam/security http://jboss.com/products/seam/security-2.1.xsd + http://jboss.com/products/seam/transaction http://jboss.com/products/seam/transaction-2.1.xsd + http://jboss.com/products/seam/components http://jboss.com/products/seam/components-2.1.xsd"> <core:manager conversation-timeout="120000" concurrent-request-timeout="500" Modified: trunk/examples/hibernate/resources-jboss/WEB-INF/pages.xml =================================================================== --- trunk/examples/hibernate/resources-jboss/WEB-INF/pages.xml 2008-02-05 18:00:10 UTC (rev 7367) +++ trunk/examples/hibernate/resources-jboss/WEB-INF/pages.xml 2008-02-05 19:37:56 UTC (rev 7368) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <pages xmlns="http://jboss.com/products/seam/pages" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://jboss.com/products/seam/pages http://jboss.com/products/seam/pages-2.0.xsd" + xsi:schemaLocation="http://jboss.com/products/seam/pages http://jboss.com/products/seam/pages-2.1.xsd" no-conversation-view-id="/main.xhtml" login-view-id="/home.xhtml"> Modified: trunk/examples/hibernate/resources-tomcat/WEB-INF/components.xml =================================================================== --- trunk/examples/hibernate/resources-tomcat/WEB-INF/components.xml 2008-02-05 18:00:10 UTC (rev 7367) +++ trunk/examples/hibernate/resources-tomcat/WEB-INF/components.xml 2008-02-05 19:37:56 UTC (rev 7368) @@ -6,11 +6,11 @@ xmlns:transaction="http://jboss.com/products/seam/transaction" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation= - "http://jboss.com/products/seam/core http://jboss.com/products/seam/core-2.0.xsd - http://jboss.com/products/seam/persistence http://jboss.com/products/seam/persistence-2.0.xsd - http://jboss.com/products/seam/security http://jboss.com/products/seam/security-2.0.xsd - http://jboss.com/products/seam/transaction http://jboss.com/products/seam/transaction-2.0.xsd - http://jboss.com/products/seam/components http://jboss.com/products/seam/components-2.0.xsd"> + "http://jboss.com/products/seam/core http://jboss.com/products/seam/core-2.1.xsd + http://jboss.com/products/seam/persistence http://jboss.com/products/seam/persistence-2.1.xsd + http://jboss.com/products/seam/security http://jboss.com/products/seam/security-2.1.xsd + http://jboss.com/products/seam/transaction http://jboss.com/products/seam/transaction-2.1.xsd + http://jboss.com/products/seam/components http://jboss.com/products/seam/components-2.1.xsd"> <core:manager conversation-timeout="120000" concurrent-request-timeout="500" Modified: trunk/examples/hibernate/resources-tomcat/WEB-INF/pages.xml =================================================================== --- trunk/examples/hibernate/resources-tomcat/WEB-INF/pages.xml 2008-02-05 18:00:10 UTC (rev 7367) +++ trunk/examples/hibernate/resources-tomcat/WEB-INF/pages.xml 2008-02-05 19:37:56 UTC (rev 7368) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <pages xmlns="http://jboss.com/products/seam/pages" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://jboss.com/products/seam/pages http://jboss.com/products/seam/pages-2.0.xsd" + xsi:schemaLocation="http://jboss.com/products/seam/pages http://jboss.com/products/seam/pages-2.1.xsd" no-conversation-view-id="/main.xhtml" login-view-id="/home.xhtml"> Modified: trunk/examples/hibernate/resources-weblogic92/WEB-INF/components.xml =================================================================== --- trunk/examples/hibernate/resources-weblogic92/WEB-INF/components.xml 2008-02-05 18:00:10 UTC (rev 7367) +++ trunk/examples/hibernate/resources-weblogic92/WEB-INF/components.xml 2008-02-05 19:37:56 UTC (rev 7368) @@ -5,10 +5,10 @@ xmlns:security="http://jboss.com/products/seam/security" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation= - "http://jboss.com/products/seam/core http://jboss.com/products/seam/core-2.0.xsd - http://jboss.com/products/seam/persistence http://jboss.com/products/seam/persistence-2.0.xsd - http://jboss.com/products/seam/security http://jboss.com/products/seam/security-2.0.xsd - http://jboss.com/products/seam/components http://jboss.com/products/seam/components-2.0.xsd"> + "http://jboss.com/products/seam/core http://jboss.com/products/seam/core-2.1.xsd + http://jboss.com/products/seam/persistence http://jboss.com/products/seam/persistence-2.1.xsd + http://jboss.com/products/seam/security http://jboss.com/products/seam/security-2.1.xsd + http://jboss.com/products/seam/components http://jboss.com/products/seam/components-2.1.xsd"> <core:init debug="true"/> Modified: trunk/examples/hibernate/resources-weblogic92/WEB-INF/pages.xml =================================================================== --- trunk/examples/hibernate/resources-weblogic92/WEB-INF/pages.xml 2008-02-05 18:00:10 UTC (rev 7367) +++ trunk/examples/hibernate/resources-weblogic92/WEB-INF/pages.xml 2008-02-05 19:37:56 UTC (rev 7368) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <pages xmlns="http://jboss.com/products/seam/pages" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://jboss.com/products/seam/pages http://jboss.com/products/seam/pages-2.0.xsd" + xsi:schemaLocation="http://jboss.com/products/seam/pages http://jboss.com/products/seam/pages-2.1.xsd" no-conversation-view-id="/main.xhtml" login-view-id="/home.xhtml"> Modified: trunk/examples/hibernate/resources-websphere61/WEB-INF/components.xml =================================================================== --- trunk/examples/hibernate/resources-websphere61/WEB-INF/components.xml 2008-02-05 18:00:10 UTC (rev 7367) +++ trunk/examples/hibernate/resources-websphere61/WEB-INF/components.xml 2008-02-05 19:37:56 UTC (rev 7368) @@ -6,11 +6,11 @@ xmlns:web="http://jboss.com/products/seam/web" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation= - "http://jboss.com/products/seam/core http://jboss.com/products/seam/core-2.0.xsd - http://jboss.com/products/seam/persistence http://jboss.com/products/seam/persistence-2.0.xsd - http://jboss.com/products/seam/web http://jboss.com/products/seam/web-2.0.xsd - http://jboss.com/products/seam/security http://jboss.com/products/seam/security-2.0.xsd - http://jboss.com/products/seam/components http://jboss.com/products/seam/components-2.0.xsd"> + "http://jboss.com/products/seam/core http://jboss.com/products/seam/core-2.1.xsd + http://jboss.com/products/seam/persistence http://jboss.com/products/seam/persistence-2.1.xsd + http://jboss.com/products/seam/web http://jboss.com/products/seam/web-2.1.xsd + http://jboss.com/products/seam/security http://jboss.com/products/seam/security-2.1.xsd + http://jboss.com/products/seam/components http://jboss.com/products/seam/components-2.1.xsd"> <core:init debug="true"/> Modified: trunk/examples/hibernate/resources-websphere61/WEB-INF/pages.xml =================================================================== --- trunk/examples/hibernate/resources-websphere61/WEB-INF/pages.xml 2008-02-05 18:00:10 UTC (rev 7367) +++ trunk/examples/hibernate/resources-websphere61/WEB-INF/pages.xml 2008-02-05 19:37:56 UTC (rev 7368) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <pages xmlns="http://jboss.com/products/seam/pages" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://jboss.com/products/seam/pages http://jboss.com/products/seam/pages-2.0.xsd" + xsi:schemaLocation="http://jboss.com/products/seam/pages http://jboss.com/products/seam/pages-2.1.xsd" no-conversation-view-id="/main.xhtml" login-view-id="/home.xhtml"> Modified: trunk/examples/icefaces/resources/WEB-INF/components.xml =================================================================== --- trunk/examples/icefaces/resources/WEB-INF/components.xml 2008-02-05 18:00:10 UTC (rev 7367) +++ trunk/examples/icefaces/resources/WEB-INF/components.xml 2008-02-05 19:37:56 UTC (rev 7368) @@ -5,10 +5,10 @@ xmlns:transaction="http://jboss.com/products/seam/transaction" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation= - "http://jboss.com/products/seam/core http://jboss.com/products/seam/core-2.0.xsd - http://jboss.com/products/seam/transaction http://jboss.com/products/seam/transaction-2.0.xsd - http://jboss.com/products/seam/security http://jboss.com/products/seam/security-2.0.xsd - http://jboss.com/products/seam/components http://jboss.com/products/seam/components-2.0.xsd"> + "http://jboss.com/products/seam/core http://jboss.com/products/seam/core-2.1.xsd + http://jboss.com/products/seam/transaction http://jboss.com/products/seam/transaction-2.1.xsd + http://jboss.com/products/seam/security http://jboss.com/products/seam/security-2.1.xsd + http://jboss.com/products/seam/components http://jboss.com/products/seam/components-2.1.xsd"> <core:init jndi-pattern="@jndiPattern@" debug="true"/> Modified: trunk/examples/icefaces/resources/WEB-INF/pages.xml =================================================================== --- trunk/examples/icefaces/resources/WEB-INF/pages.xml 2008-02-05 18:00:10 UTC (rev 7367) +++ trunk/examples/icefaces/resources/WEB-INF/pages.xml 2008-02-05 19:37:56 UTC (rev 7368) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <pages xmlns="http://jboss.com/products/seam/pages" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://jboss.com/products/seam/pages http://jboss.com/products/seam/pages-2.0.xsd" + xsi:schemaLocation="http://jboss.com/products/seam/pages http://jboss.com/products/seam/pages-2.1.xsd" no-conversation-view-id="/main.xhtml" login-view-id="/home.xhtml"> Modified: trunk/examples/itext/resources/WEB-INF/components.xml =================================================================== --- trunk/examples/itext/resources/WEB-INF/components.xml 2008-02-05 18:00:10 UTC (rev 7367) +++ trunk/examples/itext/resources/WEB-INF/components.xml 2008-02-05 19:37:56 UTC (rev 7368) @@ -3,10 +3,10 @@ xmlns:core="http://jboss.com/products/seam/core" xmlns:framework="http://jboss.com/products/seam/framework" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://jboss.com/products/seam/core http://jboss.com/products/seam/core-2.0.xsd - http://jboss.com/products/seam/framework http://jboss.com/products/seam/framework-2.0.xsd - http://jboss.com/products/seam/pdf http://jboss.com/products/seam/pdf-2.0.xsd - http://jboss.com/products/seam/components http://jboss.com/products/seam/components-2.0.xsd"> + xsi:schemaLocation="http://jboss.com/products/seam/core http://jboss.com/products/seam/core-2.1.xsd + http://jboss.com/products/seam/framework http://jboss.com/products/seam/framework-2.1.xsd + http://jboss.com/products/seam/pdf http://jboss.com/products/seam/pdf-2.1.xsd + http://jboss.com/products/seam/components http://jboss.com/products/seam/components-2.1.xsd"> <pdf:document-store use-extensions="true" error-page="/pdfMissing.seam" /> Modified: trunk/examples/itext/resources/WEB-INF/pages.xml =================================================================== --- trunk/examples/itext/resources/WEB-INF/pages.xml 2008-02-05 18:00:10 UTC (rev 7367) +++ trunk/examples/itext/resources/WEB-INF/pages.xml 2008-02-05 19:37:56 UTC (rev 7368) @@ -1,4 +1,4 @@ <?xml version="1.0" encoding="UTF-8"?> <pages xmlns="http://jboss.com/products/seam/pages" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://jboss.com/products/seam/pages http://jboss.com/products/seam/pages-2.0.xsd"> + xsi:schemaLocation="http://jboss.com/products/seam/pages http://jboss.com/products/seam/pages-2.1.xsd"> </pages> Modified: trunk/examples/jee5/booking/resources/WEB-INF/components.xml =================================================================== --- trunk/examples/jee5/booking/resources/WEB-INF/components.xml 2008-02-05 18:00:10 UTC (rev 7367) +++ trunk/examples/jee5/booking/resources/WEB-INF/components.xml 2008-02-05 19:37:56 UTC (rev 7368) @@ -5,10 +5,10 @@ xmlns:transaction="http://jboss.com/products/seam/transaction" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation= - "http://jboss.com/products/seam/core http://jboss.com/products/seam/core-2.0.xsd - http://jboss.com/products/seam/security http://jboss.com/products/seam/security-2.0.xsd - http://jboss.com/products/seam/transaction http://jboss.com/products/seam/transaction-2.0.xsd - http://jboss.com/products/seam/components http://jboss.com/products/seam/components-2.0.xsd"> + "http://jboss.com/products/seam/core http://jboss.com/products/seam/core-2.1.xsd + http://jboss.com/products/seam/security http://jboss.com/products/seam/security-2.1.xsd + http://jboss.com/products/seam/transaction http://jboss.com/products/seam/transaction-2.1.xsd + http://jboss.com/products/seam/components http://jboss.com/products/seam/components-2.1.xsd"> <core:init jndi-pattern="java:comp/env/jboss-seam-jee5/#{ejbName}/local" debug="true"/> Modified: trunk/examples/jee5/booking/resources/WEB-INF/pages.xml =================================================================== --- trunk/examples/jee5/booking/resources/WEB-INF/pages.xml 2008-02-05 18:00:10 UTC (rev 7367) +++ trunk/examples/jee5/booking/resources/WEB-INF/pages.xml 2008-02-05 19:37:56 UTC (rev 7368) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <pages xmlns="http://jboss.com/products/seam/pages" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://jboss.com/products/seam/pages http://jboss.com/products/seam/pages-2.0.xsd" + xsi:schemaLocation="http://jboss.com/products/seam/pages http://jboss.com/products/seam/pages-2.1.xsd" no-conversation-view-id="/main.xhtml" login-view-id="/home.xhtml"> Modified: trunk/examples/jee5/remoting/resources/WEB-INF/components.xml =================================================================== --- trunk/examples/jee5/remoting/resources/WEB-INF/components.xml 2008-02-05 18:00:10 UTC (rev 7367) +++ trunk/examples/jee5/remoting/resources/WEB-INF/components.xml 2008-02-05 19:37:56 UTC (rev 7368) @@ -5,10 +5,10 @@ xmlns:transaction="http://jboss.com/products/seam/transaction" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation= - "http://jboss.com/products/seam/core http://jboss.com/products/seam/core-2.0.xsd - http://jboss.com/products/seam/security http://jboss.com/products/seam/security-2.0.xsd - http://jboss.com/products/seam/transaction http://jboss.com/products/seam/transaction-2.0.xsd - http://jboss.com/products/seam/components http://jboss.com/products/seam/components-2.0.xsd"> + "http://jboss.com/products/seam/core http://jboss.com/products/seam/core-2.1.xsd + http://jboss.com/products/seam/security http://jboss.com/products/seam/security-2.1.xsd + http://jboss.com/products/seam/transaction http://jboss.com/products/seam/transaction-2.1.xsd + http://jboss.com/products/seam/components http://jboss.com/products/seam/components-2.1.xsd"> <core:init jndi-pattern="java:comp/env/jboss-seam-remoting/#{ejbName}/local" debug="true"/> Modified: trunk/examples/jpa/resources-glassfish/WEB-INF/components.xml =================================================================== --- trunk/examples/jpa/resources-glassfish/WEB-INF/components.xml 2008-02-05 18:00:10 UTC (rev 7367) +++ trunk/examples/jpa/resources-glassfish/WEB-INF/components.xml 2008-02-05 19:37:56 UTC (rev 7368) @@ -6,11 +6,11 @@ xmlns:security="http://jboss.com/products/seam/security" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation= - "http://jboss.com/products/seam/core http://jboss.com/products/seam/core-2.0.xsd - http://jboss.com/products/seam/persistence http://jboss.com/products/seam/persistence-2.0.xsd - http://jboss.com/products/seam/transaction http://jboss.com/products/seam/transaction-2.0.xsd - http://jboss.com/products/seam/security http://jboss.com/products/seam/security-2.0.xsd - http://jboss.com/products/seam/components http://jboss.com/products/seam/components-2.0.xsd"> + "http://jboss.com/products/seam/core http://jboss.com/products/seam/core-2.1.xsd + http://jboss.com/products/seam/persistence http://jboss.com/products/seam/persistence-2.1.xsd + http://jboss.com/products/seam/transaction http://jboss.com/products/seam/transaction-2.1.xsd + http://jboss.com/products/seam/security http://jboss.com/products/seam/security-2.1.xsd + http://jboss.com/products/seam/components http://jboss.com/products/seam/components-2.1.xsd"> <core:manager conversation-timeout="120000" concurrent-request-timeout="500" Modified: trunk/examples/jpa/resources-glassfish/WEB-INF/pages.xml =================================================================== --- trunk/examples/jpa/resources-glassfish/WEB-INF/pages.xml 2008-02-05 18:00:10 UTC (rev 7367) +++ trunk/examples/jpa/resources-glassfish/WEB-INF/pages.xml 2008-02-05 19:37:56 UTC (rev 7368) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <pages xmlns="http://jboss.com/products/seam/pages" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://jboss.com/products/seam/pages http://jboss.com/products/seam/pages-2.0.xsd" + xsi:schemaLocation="http://jboss.com/products/seam/pages http://jboss.com/products/seam/pages-2.1.xsd" no-conversation-view-id="/main.xhtml" login-view-id="/home.xhtml"> Modified: trunk/examples/jpa/resources-jboss/WEB-INF/components.xml =================================================================== --- trunk/examples/jpa/resources-jboss/WEB-INF/components.xml 2008-02-05 18:00:10 UTC (rev 7367) +++ trunk/examples/jpa/resources-jboss/WEB-INF/components.xml 2008-02-05 19:37:56 UTC (rev 7368) @@ -6,11 +6,11 @@ xmlns:security="http://jboss.com/products/seam/security" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation= - "http://jboss.com/products/seam/core http://jboss.com/products/seam/core-2.0.xsd - http://jboss.com/products/seam/persistence http://jboss.com/products/seam/persistence-2.0.xsd - http://jboss.com/products/seam/transaction http://jboss.com/products/seam/transaction-2.0.xsd - http://jboss.com/products/seam/security http://jboss.com/products/seam/security-2.0.xsd - http://jboss.com/products/seam/components http://jboss.com/products/seam/components-2.0.xsd"> + "http://jboss.com/products/seam/core http://jboss.com/products/seam/core-2.1.xsd + http://jboss.com/products/seam/persistence http://jboss.com/products/seam/persistence-2.1.xsd + http://jboss.com/products/seam/transaction http://jboss.com/products/seam/transaction-2.1.xsd + http://jboss.com/products/seam/security http://jboss.com/products/seam/security-2.1.xsd + http://jboss.com/products/seam/components http://jboss.com/products/seam/components-2.1.xsd"> <core:manager conversation-timeout="120000" concurrent-request-timeout="500" Modified: trunk/examples/jpa/resources-jboss/WEB-INF/pages.xml =================================================================== --- trunk/examples/jpa/resources-jboss/WEB-INF/pages.xml 2008-02-05 18:00:10 UTC (rev 7367) +++ trunk/examples/jpa/resources-jboss/WEB-INF/pages.xml 2008-02-05 19:37:56 UTC (rev 7368) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <pages xmlns="http://jboss.com/products/seam/pages" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://jboss.com/products/seam/pages http://jboss.com/products/seam/pages-2.0.xsd" + xsi:schemaLocation="http://jboss.com/products/seam/pages http://jboss.com/products/seam/pages-2.1.xsd" no-conversation-view-id="/main.xhtml" login-view-id="/home.xhtml"> Modified: trunk/examples/jpa/resources-tomcat/WEB-INF/components.xml =================================================================== --- trunk/examples/jpa/resources-tomcat/WEB-INF/components.xml 2008-02-05 18:00:10 UTC (rev 7367) +++ trunk/examples/jpa/resources-tomcat/WEB-INF/components.xml 2008-02-05 19:37:56 UTC (rev 7368) @@ -6,11 +6,11 @@ xmlns:security="http://jboss.com/products/seam/security" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation= - "http://jboss.com/products/seam/core http://jboss.com/products/seam/core-2.0.xsd - http://jboss.com/products/seam/persistence http://jboss.com/products/seam/persistence-2.0.xsd - http://jboss.com/products/seam/transaction http://jboss.com/products/seam/transaction-2.0.xsd - http://jboss.com/products/seam/security http://jboss.com/products/seam/security-2.0.xsd - http://jboss.com/products/seam/components http://jboss.com/products/seam/components-2.0.xsd"> + "http://jboss.com/products/seam/core http://jboss.com/products/seam/core-2.1.xsd + http://jboss.com/products/seam/persistence http://jboss.com/products/seam/persistence-2.1.xsd + http://jboss.com/products/seam/transaction http://jboss.com/products/seam/transaction-2.1.xsd + http://jboss.com/products/seam/security http://jboss.com/products/seam/security-2.1.xsd + http://jboss.com/products/seam/components http://jboss.com/products/seam/components-2.1.xsd"> <core:manager conversation-timeout="120000" concurrent-request-timeout="500" Modified: trunk/examples/jpa/resources-tomcat/WEB-INF/pages.xml =================================================================== --- trunk/examples/jpa/resources-tomcat/WEB-INF/pages.xml 2008-02-05 18:00:10 UTC (rev 7367) +++ trunk/examples/jpa/resources-tomcat/WEB-INF/pages.xml 2008-02-05 19:37:56 UTC (rev 7368) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <pages xmlns="http://jboss.com/products/seam/pages" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://jboss.com/products/seam/pages http://jboss.com/products/seam/pages-2.0.xsd" + xsi:schemaLocation="http://jboss.com/products/seam/pages http://jboss.com/products/seam/pages-2.1.xsd" no-conversation-view-id="/main.xhtml" login-view-id="/home.xhtml"> Modified: trunk/examples/jpa/resources-weblogic10/WEB-INF/components.xml =================================================================== --- trunk/examples/jpa/resources-weblogic10/WEB-INF/components.xml 2008-02-05 18:00:10 UTC (rev 7367) +++ trunk/examples/jpa/resources-weblogic10/WEB-INF/components.xml 2008-02-05 19:37:56 UTC (rev 7368) @@ -6,11 +6,11 @@ xmlns:security="http://jboss.com/products/seam/security" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation= - "http://jboss.com/products/seam/core http://jboss.com/products/seam/core-2.0.xsd - http://jboss.com/products/seam/persistence http://jboss.com/products/seam/persistence-2.0.xsd - http://jboss.com/products/seam/transaction http://jboss.com/products/seam/transaction-2.0.xsd - http://jboss.com/products/seam/security http://jboss.com/products/seam/security-2.0.xsd - http://jboss.com/products/seam/components http://jboss.com/products/seam/components-2.0.xsd"> + "http://jboss.com/products/seam/core http://jboss.com/products/seam/core-2.1.xsd + http://jboss.com/products/seam/persistence http://jboss.com/products/seam/persistence-2.1.xsd + http://jboss.com/products/seam/transaction http://jboss.com/products/seam/transaction-2.1.xsd + http://jboss.com/products/seam/security http://jboss.com/products/seam/security-2.1.xsd + http://jboss.com/products/seam/components http://jboss.com/products/seam/components-2.1.xsd"> <core:manager conversation-timeout="120000" concurrent-request-timeout="500" Modified: trunk/examples/jpa/resources-weblogic10/WEB-INF/pages.xml =================================================================== --- trunk/examples/jpa/resources-weblogic10/WEB-INF/pages.xml 2008-02-05 18:00:10 UTC (rev 7367) +++ trunk/examples/jpa/resources-weblogic10/WEB-INF/pages.xml 2008-02-05 19:37:56 UTC (rev 7368) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <pages xmlns="http://jboss.com/products/seam/pages" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://jboss.com/products/seam/pages http://jboss.com/products/seam/pages-2.0.xsd" + xsi:schemaLocation="http://jboss.com/products/seam/pages http://jboss.com/products/seam/pages-2.1.xsd" no-conversation-view-id="/main.xhtml" login-view-id="/home.xhtml"> Modified: trunk/examples/jpa/resources-weblogic92/WEB-INF/components.xml =================================================================== --- trunk/examples/jpa/resources-weblogic92/WEB-INF/components.xml 2008-02-05 18:00:10 UTC (rev 7367) +++ trunk/examples/jpa/resources-weblogic92/WEB-INF/components.xml 2008-02-05 19:37:56 UTC (rev 7368) @@ -6,10 +6,10 @@ xmlns:security="http://jboss.com/products/seam/security" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation= - "http://jboss.com/products/seam/core http://jboss.com/products/seam/core-2.0.xsd - http://jboss.com/products/seam/persistence http://jboss.com/products/seam/persistence-2.0.xsd - http://jboss.com/products/seam/security http://jboss.com/products/seam/security-2.0.xsd - http://jboss.com/products/seam/components http://jboss.com/products/seam/components-2.0.xsd"> + "http://jboss.com/products/seam/core http://jboss.com/products/seam/core-2.1.xsd + http://jboss.com/products/seam/persistence http://jboss.com/products/seam/persistence-2.1.xsd + http://jboss.com/products/seam/security http://jboss.com/products/seam/security-2.1.xsd + http://jboss.com/products/seam/components http://jboss.com/products/seam/components-2.1.xsd"> <core:manager conversation-timeout="120000" concurrent-request-timeout="500" Modified: trunk/examples/jpa/resources-weblogic92/WEB-INF/pages.xml =================================================================== --- trunk/examples/jpa/resources-weblogic92/WEB-INF/pages.xml 2008-02-05 18:00:10 UTC (rev 7367) +++ trunk/examples/jpa/resources-weblogic92/WEB-INF/pages.xml 2008-02-05 19:37:56 UTC (rev 7368) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <pages xmlns="http://jboss.com/products/seam/pages" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://jboss.com/products/seam/pages http://jboss.com/products/seam/pages-2.0.xsd" + xsi:schemaLocation="http://jboss.com/products/seam/pages http://jboss.com/products/seam/pages-2.1.xsd" no-conversation-view-id="/main.xhtml" login-view-id="/home.xhtml"> Modified: trunk/examples/jpa/resources-websphere61/WEB-INF/components.xml =================================================================== --- trunk/examples/jpa/resources-websphere61/WEB-INF/components.xml 2008-02-05 18:00:10 UTC (rev 7367) +++ trunk/examples/jpa/resources-websphere61/WEB-INF/components.xml 2008-02-05 19:37:56 UTC (rev 7368) @@ -6,12 +6,12 @@ xmlns:security="http://jboss.com/products/seam/security" xmlns:web="http://jboss.com/products/seam/web" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://jboss.com/products/seam/core http://jboss.com/products/seam/core-2.0.xsd - http://jboss.com/products/seam/persistence http://jboss.com/products/seam/persistence-2.0.xsd - http://jboss.com/products/seam/security http://jboss.com/products/seam/security-2.0.xsd - http://jboss.com/products/seam/transaction http://jboss.com/products/seam/transaction-2.0.xsd - http://jboss.com/products/seam/web http://jboss.com/products/seam/web-2.0.xsd - http://jboss.com/products/seam/components http://jboss.com/products/seam/components-2.0.xsd"> + xsi:schemaLocation="http://jboss.com/products/seam/core http://jboss.com/products/seam/core-2.1.xsd + http://jboss.com/products/seam/persistence http://jboss.com/products/seam/persistence-2.1.xsd + http://jboss.com/products/seam/security http://jboss.com/products/seam/security-2.1.xsd + http://jboss.com/products/seam/transaction http://jboss.com/products/seam/transaction-2.1.xsd + http://jboss.com/products/seam/web http://jboss.com/products/seam/web-2.1.xsd + http://jboss.com/products/seam/components http://jboss.com/products/seam/components-2.1.xsd"> <core:manager conversation-timeout="120000" concurrent-request-timeout="500" Modified: trunk/examples/jpa/resources-websphere61/WEB-INF/pages.xml =================================================================== --- trunk/examples/jpa/resources-websphere61/WEB-INF/pages.xml 2008-02-05 18:00:10 UTC (rev 7367) +++ trunk/examples/jpa/resources-websphere61/WEB-INF/pages.xml 2008-02-05 19:37:56 UTC (rev 7368) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <pages xmlns="http://jboss.com/products/seam/pages" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://jboss.com/products/seam/pages http://jboss.com/products/seam/pages-2.0.xsd" + xsi:schemaLocation="http://jboss.com/products/seam/pages http://jboss.com/products/seam/pages-2.1.xsd" no-conversation-view-id="/main.xhtml" login-view-id="/home.xhtml"> Modified: trunk/examples/mail/resources/WEB-INF/components.xml =================================================================== --- trunk/examples/mail/resources/WEB-INF/components.xml 2008-02-05 18:00:10 UTC (rev 7367) +++ trunk/examples/mail/resources/WEB-INF/components.xml 2008-02-05 19:37:56 UTC (rev 7368) @@ -4,10 +4,10 @@ xmlns:mail="http://jboss.com/products/seam/mail" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation= - "http://jboss.com/products/seam/core http://jboss.com/products/seam/core-2.0.xsd - http://jboss.com/products/seam/async http://jboss.com/products/seam/async-2.0.xsd - http://jboss.com/products/seam/mail http://jboss.com/products/seam/mail-2.0.xsd - http://jboss.com/products/seam/components http://jboss.com/products/seam/components-2.0.xsd"> + "http://jboss.com/products/seam/core http://jboss.com/products/seam/core-2.1.xsd + http://jboss.com/products/seam/async http://jboss.com/products/seam/async-2.1.xsd + http://jboss.com/products/seam/mail http://jboss.com/products/seam/mail-2.1.xsd + http://jboss.com/products/seam/components http://jboss.com/products/seam/components-2.1.xsd"> <core:init debug="true" jndi-pattern="@jndiPattern@" /> Modified: trunk/examples/mail/resources/WEB-INF/pages.xml =================================================================== --- trunk/examples/mail/resources/WEB-INF/pages.xml 2008-02-05 18:00:10 UTC (rev 7367) +++ trunk/examples/mail/resources/WEB-INF/pages.xml 2008-02-05 19:37:56 UTC (rev 7368) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <pages xmlns="http://jboss.com/products/seam/pages" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://jboss.com/products/seam/pages http://jboss.com/products/seam/pages-2.0.xsd"> + xsi:schemaLocation="http://jboss.com/products/seam/pages http://jboss.com/products/seam/pages-2.1.xsd"> <page view-id="/index.xhtml"> <begin-conversation join="true" /> Modified: trunk/examples/messages/resources/WEB-INF/components.xml =================================================================== --- trunk/examples/messages/resources/WEB-INF/components.xml 2008-02-05 18:00:10 UTC (rev 7367) +++ trunk/examples/messages/resources/WEB-INF/components.xml 2008-02-05 19:37:56 UTC (rev 7368) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <components xmlns="http://jboss.com/products/seam/components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://jboss.com/products/seam/components http://jboss.com/products/seam/components-2.0.xsd"> + xsi:schemaLocation="http://jboss.com/products/seam/components http://jboss.com/products/seam/components-2.1.xsd"> <component name="org.jboss.seam.core.init"> <property name="jndiPattern">@jndiPattern@</property> Modified: trunk/examples/nestedbooking/resources/WEB-INF/components.xml =================================================================== --- trunk/examples/nestedbooking/resources/WEB-INF/components.xml 2008-02-05 18:00:10 UTC (rev 7367) +++ trunk/examples/nestedbooking/resources/WEB-INF/components.xml 2008-02-05 19:37:56 UTC (rev 7368) @@ -5,10 +5,10 @@ xmlns:transaction="http://jboss.com/products/seam/transaction" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation= - "http://jboss.com/products/seam/core http://jboss.com/products/seam/core-2.0.xsd - http://jboss.com/products/seam/transaction http://jboss.com/products/seam/transaction-2.0.xsd - http://jboss.com/products/seam/security http://jboss.com/products/seam/security-2.0.xsd - http://jboss.com/products/seam/components http://jboss.com/products/seam/components-2.0.xsd"> + "http://jboss.com/products/seam/core http://jboss.com/products/seam/core-2.1.xsd + http://jboss.com/products/seam/transaction http://jboss.com/products/seam/transaction-2.1.xsd + http://jboss.com/products/seam/security http://jboss.com/products/seam/security-2.1.xsd + http://jboss.com/products/seam/components http://jboss.com/products/seam/components-2.1.xsd"> <core:init jndi-pattern="@jndiPattern@" debug="true"/> Modified: trunk/examples/nestedbooking/resources/WEB-INF/pages.xml =================================================================== --- trunk/examples/nestedbooking/resources/WEB-INF/pages.xml 2008-02-05 18:00:10 UTC (rev 7367) +++ trunk/examples/nestedbooking/resources/WEB-INF/pages.xml 2008-02-05 19:37:56 UTC (rev 7368) @@ -1,6 +1,6 @@ <!DOCTYPE pages PUBLIC - "-//JBoss/Seam Pages Configuration DTD 1.2//EN" - "http://jboss.com/products/seam/pages-2.0.dtd"> + "-//JBoss/Seam Pages Configuration DTD 2.1//EN" + "http://jboss.com/products/seam/pages-2.1.dtd"> <pages no-conversation-view-id="/main.xhtml" login-view-id="/home.xhtml"> Modified: trunk/examples/numberguess/resources/WEB-INF/components.xml =================================================================== --- trunk/examples/numberguess/resources/WEB-INF/components.xml 2008-02-05 18:00:10 UTC (rev 7367) +++ trunk/examples/numberguess/resources/WEB-INF/components.xml 2008-02-05 19:37:56 UTC (rev 7368) @@ -3,8 +3,8 @@ xmlns:bpm="http://jboss.com/products/seam/bpm" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation= - "http://jboss.com/products/seam/bpm http://jboss.com/products/seam/bpm-2.0.xsd - http://jboss.com/products/seam/components http://jboss.com/products/seam/components-2.0.xsd"> + "http://jboss.com/products/seam/bpm http://jboss.com/products/seam/bpm-2.1.xsd + http://jboss.com/products/seam/components http://jboss.com/products/seam/components-2.1.xsd"> <component name="numberGuess"> <property name="maxGuesses">10</property> Modified: trunk/examples/numberguess/resources/WEB-INF/pages.xml =================================================================== --- trunk/examples/numberguess/resources/WEB-INF/pages.xml 2008-02-05 18:00:10 UTC (rev 7367) +++ trunk/examples/numberguess/resources/WEB-INF/pages.xml 2008-02-05 19:37:56 UTC (rev 7368) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <pages xmlns="http://jboss.com/products/seam/pages" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://jboss.com/products/seam/pages http://jboss.com/products/seam/pages-2.0.xsd"> + xsi:schemaLocation="http://jboss.com/products/seam/pages http://jboss.com/products/seam/pages-2.1.xsd"> <page view-id="/numberGuess.jspx"> <begin-conversation join="true" pageflow="numberGuess"/> Modified: trunk/examples/numberguess/resources/cheat.jpdl.xml =================================================================== --- trunk/examples/numberguess/resources/cheat.jpdl.xml 2008-02-05 18:00:10 UTC (rev 7367) +++ trunk/examples/numberguess/resources/cheat.jpdl.xml 2008-02-05 19:37:56 UTC (rev 7368) @@ -12,7 +12,7 @@ <pageflow-definition xmlns="http://jboss.com/products/seam/pageflow" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation= - "http://jboss.com/products/seam/pageflow http://jboss.com/products/seam/pageflow-2.0.xsd" + "http://jboss.com/products/seam/pageflow http://jboss.com/products/seam/pageflow-2.1.xsd" name="cheat"> <start-state name="start"> Modified: trunk/examples/numberguess/resources/pageflow.jpdl.xml =================================================================== --- trunk/examples/numberguess/resources/pageflow.jpdl.xml 2008-02-05 18:00:10 UTC (rev 7367) +++ trunk/examples/numberguess/resources/pageflow.jpdl.xml 2008-02-05 19:37:56 UTC (rev 7368) @@ -13,7 +13,7 @@ xmlns="http://jboss.com/products/seam/pageflow" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation= - "http://jboss.com/products/seam/pageflow http://jboss.com/products/seam/pageflow-2.0.xsd" + "http://jboss.com/products/seam/pageflow http://jboss.com/products/seam/pageflow-2.1.xsd" name="numberGuess"> <start-page name="displayGuess" view-id="/numberGuess.jspx"> Modified: trunk/examples/portal/resources/WEB-INF/components.xml =================================================================== --- trunk/examples/portal/resources/WEB-INF/components.xml 2008-02-05 18:00:10 UTC (rev 7367) +++ trunk/examples/portal/resources/WEB-INF/components.xml 2008-02-05 19:37:56 UTC (rev 7368) @@ -4,9 +4,9 @@ xmlns:security="http://jboss.com/products/seam/security" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation= - "http://jboss.com/products/seam/core http://jboss.com/products/seam/core-2.0.xsd - http://jboss.com/products/seam/security http://jboss.com/products/seam/security-2.0.xsd - http://jboss.com/products/seam/components http://jboss.com/products/seam/components-2.0.xsd"> + "http://jboss.com/products/seam/core http://jboss.com/products/seam/core-2.1.xsd + http://jboss.com/products/seam/security http://jboss.com/products/seam/security-2.1.xsd + http://jboss.com/products/seam/components http://jboss.com/products/seam/components-2.1.xsd">  <component name="bookingDatabase" Modified: trunk/examples/quartz/resources/WEB-INF/components.xml =================================================================== --- trunk/examples/quartz/resources/WEB-INF/components.xml 2008-02-05 18:00:10 UTC (rev 7367) +++ trunk/examples/quartz/resources/WEB-INF/components.xml 2008-02-05 19:37:56 UTC (rev 7368) @@ -5,10 +5,10 @@ xmlns:persistence="http://jboss.com/products/seam/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation= - "http://jboss.com/products/seam/core http://jboss.com/products/seam/core-2.0.xsd - http://jboss.com/products/seam/async http://jboss.com/products/seam/async-2.0.xsd - http://jboss.com/products/seam/framework http://jboss.com/products/seam/framework-2.0.xsd - http://jboss.com/products/seam/persistence http://jboss.com/products/seam/persistence-2.0.xsd"> + "http://jboss.com/products/seam/core http://jboss.com/products/seam/core-2.1.xsd + http://jboss.com/products/seam/async http://jboss.com/products/seam/async-2.1.xsd + http://jboss.com/products/seam/framework http://jboss.com/products/seam/framework-2.1.xsd + http://jboss.com/products/seam/persistence http://jboss.com/products/seam/persistence-2.1.xsd"> <pay:payment-home name="paymentHome" new-instance="#{newPayment}" Modified: trunk/examples/quartz/resources/WEB-INF/pages.xml =================================================================== --- trunk/examples/quartz/resources/WEB-INF/pages.xml 2008-02-05 18:00:10 UTC (rev 7367) +++ trunk/examples/quartz/resources/WEB-INF/pages.xml 2008-02-05 19:37:56 UTC (rev 7368) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <pages xmlns="http://jboss.com/products/seam/pages" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://jboss.com/products/seam/pages http://jboss.com/products/seam/pages-2.0.xsd"> + xsi:schemaLocation="http://jboss.com/products/seam/pages http://jboss.com/products/seam/pages-2.1.xsd"> <page view-id="/search.xhtml"> <param name="accountId" value="#{accountHome.id}" converterId="javax.faces.Long" /> Modified: trunk/examples/registration/resources/WEB-INF/components.xml =================================================================== --- trunk/examples/registration/resources/WEB-INF/components.xml 2008-02-05 18:00:10 UTC (rev 7367) +++ trunk/examples/registration/resources/WEB-INF/components.xml 2008-02-05 19:37:56 UTC (rev 7368) @@ -3,8 +3,8 @@ xmlns:core="http://jboss.com/products/seam/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation= - "http://jboss.com/products/seam/core http://jboss.com/products/seam/core-2.0.xsd - http://jboss.com/products/seam/components http://jboss.com/products/seam/components-2.0.xsd"> + "http://jboss.com/products/seam/core http://jboss.com/products/seam/core-2.1.xsd + http://jboss.com/products/seam/components http://jboss.com/products/seam/components-2.1.xsd"> <core:init jndi-pattern="@jndiPattern@"/> Modified: trunk/examples/remoting/chatroom/resources/WEB-INF/components.xml =================================================================== --- trunk/examples/remoting/chatroom/resources/WEB-INF/components.xml 2008-02-05 18:00:10 UTC (rev 7367) +++ trunk/examples/remoting/chatroom/resources/WEB-INF/components.xml 2008-02-05 19:37:56 UTC (rev 7368) @@ -1,6 +1,6 @@ <!DOCTYPE components PUBLIC - "-//JBoss/Seam Component Configuration DTD 2.0//EN" - "http://jboss.com/products/seam/components-2.0.dtd"> + "-//JBoss/Seam Component Configuration DTD 2.1//EN" + "http://jboss.com/products/seam/components-2.1.dtd"> <components> Modified: trunk/examples/remoting/gwt/resources/WEB-INF/components.xml =================================================================== --- trunk/examples/remoting/gwt/resources/WEB-INF/components.xml 2008-02-05 18:00:10 UTC (rev 7367) +++ trunk/examples/remoting/gwt/resources/WEB-INF/components.xml 2008-02-05 19:37:56 UTC (rev 7368) @@ -4,10 +4,10 @@ xmlns:remoting="http://jboss.com/products/seam/remoting" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation= - "http://jboss.com/products/seam/core http://jboss.com/products/seam/core-2.0.xsd - http://jboss.com/products/seam/components http://jboss.com/products/seam/components-2.0.xsd - http://jboss.com/products/seam/remoting http://jboss.com/products/seam/remoting-2.0.xsd"> + "http://jboss.com/products/seam/core http://jboss.com/products/seam/core-2.1.xsd + http://jboss.com/products/seam/components http://jboss.com/products/seam/components-2.1.xsd + http://jboss.com/products/seam/remoting http://jboss.com/products/seam/remoting-2.1.xsd"> <core:init jndi-pattern="@jndiPattern@" debug="true"/> -</components> \ No newline at end of file +</components> Modified: trunk/examples/remoting/helloworld/resources/WEB-INF/components.xml =================================================================== --- trunk/examples/remoting/helloworld/resources/WEB-INF/components.xml 2008-02-05 18:00:10 UTC (rev 7367) +++ trunk/examples/remoting/helloworld/resources/WEB-INF/components.xml 2008-02-05 19:37:56 UTC (rev 7368) @@ -1,6 +1,6 @@ <!DOCTYPE components PUBLIC - "-//JBoss/Seam Component Configuration DTD 2.0//EN" - "http://jboss.com/products/seam/components-2.0.dtd"> + "-//JBoss/Seam Component Configuration DTD 2.1//EN" + "http://jboss.com/products/seam/components-2.1.dtd"> <components> Modified: trunk/examples/remoting/poker/resources/WEB-INF/components.xml =================================================================== --- trunk/examples/remoting/poker/resources/WEB-INF/components.xml 2008-02-05 18:00:10 UTC (rev 7367) +++ trunk/examples/remoting/poker/resources/WEB-INF/components.xml 2008-02-05 19:37:56 UTC (rev 7368) @@ -1,6 +1,6 @@ <!DOCTYPE components PUBLIC - "-//JBoss/Seam Component Configuration DTD 2.0//EN" - "http://jboss.com/products/seam/components-2.0.dtd"> + "-//JBoss/Seam Component Configuration DTD 2.1//EN" + "http://jboss.com/products/seam/components-2.1.dtd"> <components> Modified: trunk/examples/remoting/progressbar/resources/WEB-INF/components.xml =================================================================== --- trunk/examples/remoting/progressbar/resources/WEB-INF/components.xml 2008-02-05 18:00:10 UTC (rev 7367) +++ trunk/examples/remoting/progressbar/resources/WEB-INF/components.xml 2008-02-05 19:37:56 UTC (rev 7368) @@ -1,6 +1,6 @@ <!DOCTYPE components PUBLIC - "-//JBoss/Seam Component Configuration DTD 2.0//EN" - "http://jboss.com/products/seam/components-2.0.dtd"> + "-//JBoss/Seam Component Configuration DTD 2.1//EN" + "http://jboss.com/products/seam/components-2.1.dtd"> <components> Modified: trunk/examples/seambay/resources/META-INF/standard-jaxws-endpoint-config.xml =================================================================== --- trunk/examples/seambay/resources/META-INF/standard-jaxws-endpoint-config.xml 2008-02-05 18:00:10 UTC (rev 7367) +++ trunk/examples/seambay/resources/META-INF/standard-jaxws-endpoint-config.xml 2008-02-05 19:37:56 UTC (rev 7368) @@ -1,7 +1,7 @@ <jaxws-config xmlns="urn:jboss:jaxws-config:2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:javaee="http://java.sun.com/xml/ns/javaee" - xsi:schemaLocation="urn:jboss:jaxws-config:2.0 jaxws-config_2_0.xsd"> + xsi:schemaLocation="urn:jboss:jaxws-config:2.0 jaxws-config_2.1.xsd"> <endpoint-config> <config-name>Seam WebService Endpoint</config-name> <pre-handler-chains> @@ -14,4 +14,4 @@ </javaee:handler-chain> </pre-handler-chains> </endpoint-config> -</jaxws-config> \ No newline at end of file +</jaxws-config> Modified: trunk/examples/seambay/resources/WEB-INF/components.xml =================================================================== --- trunk/examples/seambay/resources/WEB-INF/components.xml 2008-02-05 18:00:10 UTC (rev 7367) +++ trunk/examples/seambay/resources/WEB-INF/components.xml 2008-02-05 19:37:56 UTC (rev 7368) @@ -8,13 +8,13 @@ xmlns:web="http://jboss.com/products/seam/web" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation= - "http://jboss.com/products/seam/core http://jboss.com/products/seam/core-2.0.xsd - http://jboss.com/products/seam/persistence http://jboss.com/products/seam/persistence-2.0.xsd - http://jboss.com/products/seam/components http://jboss.com/products/seam/components-2.0.xsd - http://jboss.com/products/seam/security http://jboss.com/products/seam/security-2.0.xsd - http://jboss.com/products/seam/async http://jboss.com/products/seam/async-2.0.xsd - http://jboss.com/products/seam/web http://jboss.com/products/seam/web-2.0.xsd - http://jboss.com/products/seam/drools http://jboss.com/products/seam/drools-2.0.xsd"> + "http://jboss.com/products/seam/core http://jboss.com/products/seam/core-2.1.xsd + http://jboss.com/products/seam/persistence http://jboss.com/products/seam/persistence-2.1.xsd + http://jboss.com/products/seam/components http://jboss.com/products/seam/components-2.1.xsd + http://jboss.com/products/seam/security http://jboss.com/products/seam/security-2.1.xsd + http://jboss.com/products/seam/async http://jboss.com/products/seam/async-2.1.xsd + http://jboss.com/products/seam/web http://jboss.com/products/seam/web-2.1.xsd + http://jboss.com/products/seam/drools http://jboss.com/products/seam/drools-2.1.xsd"> <core:init jndi-pattern="@jndiPattern@" debug="true"/> Modified: trunk/examples/seambay/resources/WEB-INF/pages.xml =================================================================== --- trunk/examples/seambay/resources/WEB-INF/pages.xml 2008-02-05 18:00:10 UTC (rev 7367) +++ trunk/examples/seambay/resources/WEB-INF/pages.xml 2008-02-05 19:37:56 UTC (rev 7368) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <pages xmlns="http://jboss.com/products/seam/pages" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://jboss.com/products/seam/pages http://jboss.com/products/seam/pages-2.0.xsd" + xsi:schemaLocation="http://jboss.com/products/seam/pages http://jboss.com/products/seam/pages-2.1.xsd" no-conversation-view-id="/home.xhtml" login-view-id="/login.xhtml"> Modified: trunk/examples/seamdiscs/resources/WEB-INF/components.xml =================================================================== --- trunk/examples/seamdiscs/resources/WEB-INF/components.xml 2008-02-05 18:00:10 UTC (rev 7367) +++ trunk/examples/seamdiscs/resources/WEB-INF/components.xml 2008-02-05 19:37:56 UTC (rev 7368) @@ -6,12 +6,12 @@ xmlns:web="http://jboss.com/products/seam/web" xmlns:framework="http://jboss.com/products/seam/framework" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://jboss.com/products/seam/core http://jboss.com/products/seam/core-2.0.xsd - http://jboss.com/products/seam/security http://jboss.com/products/seam/security-2.0.xsd - http://jboss.com/products/seam/persistence http://jboss.com/products/seam/persistence-2.0.xsd - http://jboss.com/products/seam/components http://jboss.com/products/seam/components-2.0.xsd - http://jboss.com/products/seam/web http://jboss.com/products/seam/web-2.0.xsd - http://jboss.com/products/seam/framework http://jboss.com/products/seam/framework-2.0.xsd"> + xsi:schemaLocation="http://jboss.com/products/seam/core http://jboss.com/products/seam/core-2.1.xsd + http://jboss.com/products/seam/security http://jboss.com/products/seam/security-2.1.xsd + http://jboss.com/products/seam/persistence http://jboss.com/products/seam/persistence-2.1.xsd + http://jboss.com/products/seam/components http://jboss.com/products/seam/components-2.1.xsd + http://jboss.com/products/seam/web http://jboss.com/products/seam/web-2.1.xsd + http://jboss.com/products/seam/framework http://jboss.com/products/seam/framework-2.1.xsd"> <core:init debug="false" jndi-pattern="@jndiPattern@" /> Modified: trunk/examples/seamdiscs/resources/WEB-INF/pages.xml =================================================================== --- trunk/examples/seamdiscs/resources/WEB-INF/pages.xml 2008-02-05 18:00:10 UTC (rev 7367) +++ trunk/examples/seamdiscs/resources/WEB-INF/pages.xml 2008-02-05 19:37:56 UTC (rev 7368) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <pages xmlns="http://jboss.com/products/seam/pages" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://jboss.com/products/seam/pages http://jboss.com/products/seam/pages-2.0.xsd" + xsi:schemaLocation="http://jboss.com/products/seam/pages http://jboss.com/products/seam/pages-2.1.xsd" no-conversation-view-id="/home.xhtml" login-view-id="/login.xhtml"> Modified: trunk/examples/seamdiscs/view/artist.page.xml =================================================================== --- trunk/examples/seamdiscs/view/artist.page.xml 2008-02-05 18:00:10 UTC (rev 7367) +++ trunk/examples/seamdiscs/view/artist.page.xml 2008-02-05 19:37:56 UTC (rev 7368) @@ -1,6 +1,6 @@ <!DOCTYPE page PUBLIC - "-//JBoss/Seam Pages Configuration DTD 2.0//EN" - "http://jboss.com/products/seam/pages-2.0.dtd"> + "-//JBoss/Seam Pages Configuration DTD 2.1//EN" + "http://jboss.com/products/seam/pages-2.1.dtd"> <page> <param name="artistId" value="#{artistHome.id}" converterId="javax.faces.Integer"/> Modified: trunk/examples/seamdiscs/view/artists.page.xml =================================================================== --- trunk/examples/seamdiscs/view/artists.page.xml 2008-02-05 18:00:10 UTC (rev 7367) +++ trunk/examples/seamdiscs/view/artists.page.xml 2008-02-05 19:37:56 UTC (rev 7368) @@ -1,6 +1,6 @@ <!DOCTYPE page PUBLIC - "-//JBoss/Seam Pages Configuration DTD 2.0//EN" - "http://jboss.com/products/seam/pages-2.0.dtd"> + "-//JBoss/Seam Pages Configuration DTD 2.1//EN" + "http://jboss.com/products/seam/pages-2.1.dtd"> <page> <param name="artistId" value="#{artistHome.id}" converterId="javax.faces.Integer"/> Modified: trunk/examples/seamdiscs/view/disc.page.xml =================================================================== --- trunk/examples/seamdiscs/view/disc.page.xml 2008-02-05 18:00:10 UTC (rev 7367) +++ trunk/examples/seamdiscs/view/disc.page.xml 2008-02-05 19:37:56 UTC (rev 7368) @@ -1,6 +1,6 @@ <!DOCTYPE page PUBLIC - "-//JBoss/Seam Pages Configuration DTD 2.0//EN" - "http://jboss.com/products/seam/pages-2.0.dtd"> + "-//JBoss/Seam Pages Configuration DTD 2.1//EN" + "http://jboss.com/products/seam/pages-2.1.dtd"> <page> <param name="discId" value="#{discHome.id}" converterId="javax.faces.Integer"/> Modified: trunk/examples/seamdiscs/view/discs.page.xml =================================================================== --- trunk/examples/seamdiscs/view/discs.page.xml 2008-02-05 18:00:10 UTC (rev 7367) +++ trunk/examples/seamdiscs/view/discs.page.xml 2008-02-05 19:37:56 UTC (rev 7368) @@ -1,6 +1,6 @@ <!DOCTYPE page PUBLIC - "-//JBoss/Seam Pages Configuration DTD 2.0//EN" - "http://jboss.com/products/seam/pages-2.0.dtd"> + "-//JBoss/Seam Pages Configuration DTD 2.1//EN" + "http://jboss.com/products/seam/pages-2.1.dtd"> <page> <param name="discId" value="#{discHome.id}" converterId="javax.faces.Integer"/> Modified: trunk/examples/seamdiscs/view/home.page.xml =================================================================== --- trunk/examples/seamdiscs/view/home.page.xml 2008-02-05 18:00:10 UTC (rev 7367) +++ trunk/examples/seamdiscs/view/home.page.xml 2008-02-05 19:37:56 UTC (rev 7368) @@ -1,6 +1,6 @@ <!DOCTYPE page PUBLIC - "-//JBoss/Seam Pages Configuration DTD 2.0//EN" - "http://jboss.com/products/seam/pages-2.0.dtd"> + "-//JBoss/Seam Pages Configuration DTD 2.1//EN" + "http://jboss.com/products/seam/pages-2.1.dtd"> <page> <param name="artistId" value="#{artistHome.id}" converterId="javax.faces.Integer"/> Modified: trunk/examples/seamdiscs/view/login.page.xml =================================================================== --- trunk/examples/seamdiscs/view/login.page.xml 2008-02-05 18:00:10 UTC (rev 7367) +++ trunk/examples/seamdiscs/view/login.page.xml 2008-02-05 19:37:56 UTC (rev 7368) @@ -1,6 +1,6 @@ <!DOCTYPE page PUBLIC - "-//JBoss/Seam Pages Configuration DTD 2.0//EN" - "http://jboss.com/products/seam/pages-2.0.dtd"> + "-//JBoss/Seam Pages Configuration DTD 2.1//EN" + "http://jboss.com/products/seam/pages-2.1.dtd"> <page> <navigation from-action="#{identity.login}"> Modified: trunk/examples/seampay/resources/WEB-INF/components.xml =================================================================== --- trunk/examples/seampay/resources/WEB-INF/components.xml 2008-02-05 18:00:10 UTC (rev 7367) +++ trunk/examples/seampay/resources/WEB-INF/components.xml 2008-02-05 19:37:56 UTC (rev 7368) @@ -5,10 +5,10 @@ xmlns:async="http://jboss.com/products/seam/async" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation= - "http://jboss.com/products/seam/core http://jboss.com/products/seam/core-2.0.xsd - http://jboss.com/products/seam/persistence http://jboss.com/products/seam/persistence-2.0.xsd - http://jboss.com/products/seam/async http://jboss.com/products/seam/async-2.0.xsd - http://jboss.com/products/seam/framework http://jboss.com/products/seam/framework-2.0.xsd" > + "http://jboss.com/products/seam/core http://jboss.com/products/seam/core-2.1.xsd + http://jboss.com/products/seam/persistence http://jboss.com/products/seam/persistence-2.1.xsd + http://jboss.com/products/seam/async http://jboss.com/products/seam/async-2.1.xsd + http://jboss.com/products/seam/framework http://jboss.com/products/seam/framework-2.1.xsd" > <pay:payment-home new-instance="#{newPayment}" Modified: trunk/examples/seampay/resources/WEB-INF/pages.xml =================================================================== --- trunk/examples/seampay/resources/WEB-INF/pages.xml 2008-02-05 18:00:10 UTC (rev 7367) +++ trunk/examples/seampay/resources/WEB-INF/pages.xml 2008-02-05 19:37:56 UTC (rev 7368) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <pages xmlns="http://jboss.com/products/seam/pages" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://jboss.com/products/seam/pages http://jboss.com/products/seam/pages-2.0.xsd"> + xsi:schemaLocation="http://jboss.com/products/seam/pages http://jboss.com/products/seam/pages-2.1.xsd"> <page view-id="/search.xhtml"> <param name="accountId" value="#{accountHome.id}" converterId="javax.faces.Long" /> Modified: trunk/examples/seamspace/resources/WEB-INF/components.xml =================================================================== --- trunk/examples/seamspace/resources/WEB-INF/components.xml 2008-02-05 18:00:10 UTC (rev 7367) +++ trunk/examples/seamspace/resources/WEB-INF/components.xml 2008-02-05 19:37:56 UTC (rev 7368) @@ -9,14 +9,14 @@ xmlns:web="http://jboss.com/products/seam/web" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation= - "http://jboss.com/products/seam/core http://jboss.com/products/seam/core-2.0.xsd - http://jboss.com/products/seam/persistence http://jboss.com/products/seam/persistence-2.0.xsd - http://jboss.com/products/seam/components http://jboss.com/products/seam/components-2.0.xsd - http://jboss.com/products/seam/security http://jboss.com/products/seam/security-2.0.xsd - http://jboss.com/products/seam/security/management http://jboss.com/products/seam/identity-management-2.0.xsd - http://jboss.com/products/seam/web http://jboss.com/products/seam/web-2.0.xsd - http://jboss.com/products/seam/drools http://jboss.com/products/seam/drools-2.0.xsd - http://jboss.com/products/seam/captcha http://jboss.com/products/seam/captcha-2.0.xsd"> + "http://jboss.com/products/seam/core http://jboss.com/products/seam/core-2.1.xsd + http://jboss.com/products/seam/persistence http://jboss.com/products/seam/persistence-2.1.xsd + http://jboss.com/products/seam/components http://jboss.com/products/seam/components-2.1.xsd + http://jboss.com/products/seam/security http://jboss.com/products/seam/security-2.1.xsd + http://jboss.com/products/seam/security/management http://jboss.com/products/seam/identity-management-2.1.xsd + http://jboss.com/products/seam/web http://jboss.com/products/seam/web-2.1.xsd + http://jboss.com/products/seam/drools http://jboss.com/products/seam/drools-2.1.xsd + http://jboss.com/products/seam/captcha http://jboss.com/products/seam/captcha-2.1.xsd"> <core:init jndi-pattern="@jndiPattern@" debug="false"/> Modified: trunk/examples/seamspace/resources/WEB-INF/pages.xml =================================================================== --- trunk/examples/seamspace/resources/WEB-INF/pages.xml 2008-02-05 18:00:10 UTC (rev 7367) +++ trunk/examples/seamspace/resources/WEB-INF/pages.xml 2008-02-05 19:37:56 UTC (rev 7368) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <pages xmlns="http://jboss.com/products/seam/pages" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://jboss.com/products/seam/pages http://jboss.com/products/seam/pages-2.0.xsd" + xsi:schemaLocation="http://jboss.com/products/seam/pages http://jboss.com/products/seam/pages-2.1.xsd" login-view-id="/home.xhtml"> <page view-id="/home.xhtml"> Modified: trunk/examples/spring/resources/WEB-INF/applicationContext.xml =================================================================== --- trunk/examples/spring/resources/WEB-INF/applicationContext.xml 2008-02-05 18:00:10 UTC (rev 7367) +++ trunk/examples/spring/resources/WEB-INF/applicationContext.xml 2008-02-05 19:37:56 UTC (rev 7368) @@ -7,7 +7,7 @@ http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.0.xsd http://www.springframework.org/schema/jee http://www.springframework.org/schema/jee/spring-jee-2.0.xsd http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-2.0.xsd - http://jboss.com/products/seam/spring-seam http://jboss.com/products/seam/spring-seam-2.0.xsd + http://jboss.com/products/seam/spring-seam http://jboss.com/products/seam/spring-seam-2.1.xsd http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-2.0.xsd" default-lazy-init="true"> Modified: trunk/examples/spring/resources/WEB-INF/components.xml =================================================================== --- trunk/examples/spring/resources/WEB-INF/components.xml 2008-02-05 18:00:10 UTC (rev 7367) +++ trunk/examples/spring/resources/WEB-INF/components.xml 2008-02-05 19:37:56 UTC (rev 7368) @@ -4,10 +4,10 @@ xmlns:persistence="http://jboss.com/products/seam/persistence" xmlns:spring="http://jboss.com/products/seam/spring" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://jboss.com/products/seam/core http://jboss.com/products/seam/core-2.0.xsd - http://jboss.com/products/seam/persistence http://jboss.com/products/seam/persistence-2.0.xsd - http://jboss.com/products/seam/components http://jboss.com/products/seam/components-2.0.xsd - http://jboss.com/products/seam/spring http://jboss.com/products/seam/spring-2.0.xsd"> + xsi:schemaLocation="http://jboss.com/products/seam/core http://jboss.com/products/seam/core-2.1.xsd + http://jboss.com/products/seam/persistence http://jboss.com/products/seam/persistence-2.1.xsd + http://jboss.com/products/seam/components http://jboss.com/products/seam/components-2.1.xsd + http://jboss.com/products/seam/spring http://jboss.com/products/seam/spring-2.1.xsd"> <core:manager conversation-timeout="120000" Modified: trunk/examples/spring/resources/WEB-INF/pages.xml =================================================================== --- trunk/examples/spring/resources/WEB-INF/pages.xml 2008-02-05 18:00:10 UTC (rev 7367) +++ trunk/examples/spring/resources/WEB-INF/pages.xml 2008-02-05 19:37:56 UTC (rev 7368) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <pages xmlns="http://jboss.com/products/seam/pages" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://jboss.com/products/seam/pages http://jboss.com/products/seam/pages-2.0.xsd" + xsi:schemaLocation="http://jboss.com/products/seam/pages http://jboss.com/products/seam/pages-2.1.xsd" no-conversation-view-id="/main.xhtml"> Modified: trunk/examples/takeaway/resources/WEB-INF/components.xml =================================================================== --- trunk/examples/takeaway/resources/WEB-INF/components.xml 2008-02-05 18:00:10 UTC (rev 7367) +++ trunk/examples/takeaway/resources/WEB-INF/components.xml 2008-02-05 19:37:56 UTC (rev 7368) @@ -3,9 +3,9 @@ xmlns:mail="http://jboss.com/products/seam/mail" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation= - "http://jboss.com/products/seam/core http://jboss.com/products/seam/core-2.0.xsd - http://jboss.com/products/seam/mail http://jboss.com/products/seam/mail-2.0.xsd - http://jboss.com/products/seam/components http://jboss.com/products/seam/components-2.0.xsd"> + "http://jboss.com/products/seam/core http://jboss.com/products/seam/core-2.1.xsd + http://jboss.com/products/seam/mail http://jboss.com/products/seam/mail-2.1.xsd + http://jboss.com/products/seam/components http://jboss.com/products/seam/components-2.1.xsd"> <core:init debug="true" jndi-pattern="jboss-seam-takeaway/#{ejbName}/local" /> Modified: trunk/examples/takeaway/resources/WEB-INF/pages.xml =================================================================== --- trunk/examples/takeaway/resources/WEB-INF/pages.xml 2008-02-05 18:00:10 UTC (rev 7367) +++ trunk/examples/takeaway/resources/WEB-INF/pages.xml 2008-02-05 19:37:56 UTC (rev 7368) @@ -1,4 +1,4 @@ <?xml version="1.0" encoding="UTF-8"?> <pages xmlns="http://jboss.com/products/seam/pages" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://jboss.com/products/seam/pages http://jboss.com/products/seam/pages-2.0.xsd"/> + xsi:schemaLocation="http://jboss.com/products/seam/pages http://jboss.com/products/seam/pages-2.1.xsd"/> Modified: trunk/examples/todo/resources/WEB-INF/components.xml =================================================================== --- trunk/examples/todo/resources/WEB-INF/components.xml 2008-02-05 18:00:10 UTC (rev 7367) +++ trunk/examples/todo/resources/WEB-INF/components.xml 2008-02-05 19:37:56 UTC (rev 7368) @@ -3,8 +3,8 @@ xmlns:bpm="http://jboss.com/products/seam/bpm" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation= - "http://jboss.com/products/seam/bpm http://jboss.com/products/seam/bpm-2.0.xsd - http://jboss.com/products/seam/components http://jboss.com/products/seam/components-2.0.xsd"> + "http://jboss.com/products/seam/bpm http://jboss.com/products/seam/bpm-2.1.xsd + http://jboss.com/products/seam/components http://jboss.com/products/seam/components-2.1.xsd"> <bpm:jbpm> <bpm:process-definitions> Modified: trunk/examples/ui/resources/WEB-INF/components.xml =================================================================== --- trunk/examples/ui/resources/WEB-INF/components.xml 2008-02-05 18:00:10 UTC (rev 7367) +++ trunk/examples/ui/resources/WEB-INF/components.xml 2008-02-05 19:37:56 UTC (rev 7368) @@ -4,10 +4,10 @@ xmlns:framework="http://jboss.com/products/seam/framework" xmlns:persistence="http://jboss.com/products/seam/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://jboss.com/products/seam/core http://jboss.com/products/seam/core-2.0.xsd - http://jboss.com/products/seam/components http://jboss.com/products/seam/components-2.0.xsd - http://jboss.com/products/seam/persistence http://jboss.com/products/seam/persistence-2.0.xsd - http://jboss.com/products/seam/framework http://jboss.com/products/seam/framework-2.0.xsd"> + xsi:schemaLocation="http://jboss.com/products/seam/core http://jboss.com/products/seam/core-2.1.xsd + http://jboss.com/products/seam/components http://jboss.com/products/seam/components-2.1.xsd + http://jboss.com/products/seam/persistence http://jboss.com/products/seam/persistence-2.1.xsd + http://jboss.com/products/seam/framework http://jboss.com/products/seam/framework-2.1.xsd"> <core:init jndi-pattern="jboss-seam-ui-example/#{ejbName}/local" debug="true"/> Modified: trunk/examples/ui/resources/WEB-INF/pages.xml =================================================================== --- trunk/examples/ui/resources/WEB-INF/pages.xml 2008-02-05 18:00:10 UTC (rev 7367) +++ trunk/examples/ui/resources/WEB-INF/pages.xml 2008-02-05 19:37:56 UTC (rev 7368) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <pages xmlns="http://jboss.com/products/seam/pages" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://jboss.com/products/seam/pages http://jboss.com/products/seam/pages-2.0.xsd"> + xsi:schemaLocation="http://jboss.com/products/seam/pages http://jboss.com/products/seam/pages-2.1.xsd"> <page view-id="/index.xhtml"> <param name="personId" converterId="javax.faces.Integer" value="#{personHome.id}" /> Modified: trunk/examples/wicket/resources/WEB-INF/components.xml =================================================================== --- trunk/examples/wicket/resources/WEB-INF/components.xml 2008-02-05 18:00:10 UTC (rev 7367) +++ trunk/examples/wicket/resources/WEB-INF/components.xml 2008-02-05 19:37:56 UTC (rev 7368) @@ -6,11 +6,11 @@ xmlns:web="http://jboss.com/products/seam/web" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation= - "http://jboss.com/products/seam/core http://jboss.com/products/seam/core-2.0.xsd - http://jboss.com/products/seam/transaction http://jboss.com/products/seam/transaction-2.0.xsd - http://jboss.com/products/seam/web http://jboss.com/products/seam/web-2.0.xsd - http://jboss.com/products/seam/security http://jboss.com/products/seam/security-2.0.xsd - http://jboss.com/products/seam/components http://jboss.com/products/seam/components-2.0.xsd"> + "http://jboss.com/products/seam/core http://jboss.com/products/seam/core-2.1.xsd + http://jboss.com/products/seam/transaction http://jboss.com/products/seam/transaction-2.1.xsd + http://jboss.com/products/seam/web http://jboss.com/products/seam/web-2.1.xsd + http://jboss.com/products/seam/security http://jboss.com/products/seam/security-2.1.xsd + http://jboss.com/products/seam/components http://jboss.com/products/seam/components-2.1.xsd"> <core:init jndi-pattern="@jndiPattern@" debug="true"/> Modified: trunk/examples/wicket/resources/WEB-INF/pages.xml =================================================================== --- trunk/examples/wicket/resources/WEB-INF/pages.xml 2008-02-05 18:00:10 UTC (rev 7367) +++ trunk/examples/wicket/resources/WEB-INF/pages.xml 2008-02-05 19:37:56 UTC (rev 7368) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <pages xmlns="http://jboss.com/products/seam/pages" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://jboss.com/products/seam/pages http://jboss.com/products/seam/pages-2.0.xsd" + xsi:schemaLocation="http://jboss.com/products/seam/pages http://jboss.com/products/seam/pages-2.1.xsd" no-conversation-view-id="/main.xhtml" login-view-id="/home.xhtml"> Modified: trunk/examples/wiki/src/etc/META-INF/components-dev.xml =================================================================== --- trunk/examples/wiki/src/etc/META-INF/components-dev.xml 2008-02-05 18:00:10 UTC (rev 7367) +++ trunk/examples/wiki/src/etc/META-INF/components-dev.xml 2008-02-05 19:37:56 UTC (rev 7368) @@ -9,14 +9,14 @@ xmlns:transaction="http://jboss.com/products/seam/transaction" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation= - "http://jboss.com/products/seam/core http://jboss.com/products/seam/core-2.0.xsd - http://jboss.com/products/seam/persistence http://jboss.com/products/seam/persistence-2.0.xsd - http://jboss.com/products/seam/security http://jboss.com/products/seam/security-2.0.xsd - http://jboss.com/products/seam/web http://jboss.com/products/seam/web-2.0.xsd - http://jboss.com/products/seam/drools http://jboss.com/products/seam/drools-2.0.xsd - http://jboss.com/products/seam/mail http://jboss.com/products/seam/mail-2.0.xsd - http://jboss.com/products/seam/transaction http://jboss.com/products/seam/transaction-2.0.xsd - http://jboss.com/products/seam/components http://jboss.com/products/seam/components-2.0.xsd"> + "http://jboss.com/products/seam/core http://jboss.com/products/seam/core-2.1.xsd + http://jboss.com/products/seam/persistence http://jboss.com/products/seam/persistence-2.1.xsd + http://jboss.com/products/seam/security http://jboss.com/products/seam/security-2.1.xsd + http://jboss.com/products/seam/web http://jboss.com/products/seam/web-2.1.xsd + http://jboss.com/products/seam/drools http://jboss.com/products/seam/drools-2.1.xsd + http://jboss.com/products/seam/mail http://jboss.com/products/seam/mail-2.1.xsd + http://jboss.com/products/seam/transaction http://jboss.com/products/seam/transaction-2.1.xsd + http://jboss.com/products/seam/components http://jboss.com/products/seam/components-2.1.xsd">  <component name="dbunitImporter" class="org.jboss.seam.wiki.util.DBUnitImporter" scope="APPLICATION" auto-create="true"> @@ -41,4 +41,4 @@ <property name="debug">true</property> </component> -</components> \ No newline at end of file +</components> Modified: trunk/examples/wiki/src/etc/META-INF/components-prod.xml =================================================================== --- trunk/examples/wiki/src/etc/META-INF/components-prod.xml 2008-02-05 18:00:10 UTC (rev 7367) +++ trunk/examples/wiki/src/etc/META-INF/components-prod.xml 2008-02-05 19:37:56 UTC (rev 7368) @@ -9,18 +9,18 @@ xmlns:transaction="http://jboss.com/products/seam/transaction" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation= - "http://jboss.com/products/seam/core http://jboss.com/products/seam/core-2.0.xsd - http://jboss.com/products/seam/persistence http://jboss.com/products/seam/persistence-2.0.xsd - http://jboss.com/products/seam/security http://jboss.com/products/seam/security-2.0.xsd - http://jboss.com/products/seam/web http://jboss.com/products/seam/web-2.0.xsd - http://jboss.com/products/seam/drools http://jboss.com/products/seam/drools-2.0.xsd - http://jboss.com/products/seam/mail http://jboss.com/products/seam/mail-2.0.xsd - http://jboss.com/products/seam/transaction http://jboss.com/products/seam/transaction-2.0.xsd - http://jboss.com/products/seam/components http://jboss.com/products/seam/components-2.0.xsd"> + "http://jboss.com/products/seam/core http://jboss.com/products/seam/core-2.1.xsd + http://jboss.com/products/seam/persistence http://jboss.com/products/seam/persistence-2.1.xsd + http://jboss.com/products/seam/security http://jboss.com/products/seam/security-2.1.xsd + http://jboss.com/products/seam/web http://jboss.com/products/seam/web-2.1.xsd + http://jboss.com/products/seam/drools http://jboss.com/products/seam/drools-2.1.xsd + http://jboss.com/products/seam/mail http://jboss.com/products/seam/mail-2.1.xsd + http://jboss.com/products/seam/transaction http://jboss.com/products/seam/transaction-2.1.xsd + http://jboss.com/products/seam/components http://jboss.com/products/seam/components-2.1.xsd"> <component name="wikiInit" class="org.jboss.seam.wiki.WikiInit" precedence="30"> <property name="adminContact">christian.bauer(a)gmail.com</property> <property name="debug">false</property> </component> -</components> \ No newline at end of file +</components> Modified: trunk/examples/wiki/src/etc/WEB-INF/components.xml =================================================================== --- trunk/examples/wiki/src/etc/WEB-INF/components.xml 2008-02-05 18:00:10 UTC (rev 7367) +++ trunk/examples/wiki/src/etc/WEB-INF/components.xml 2008-02-05 19:37:56 UTC (rev 7368) @@ -9,14 +9,14 @@ xmlns:transaction="http://jboss.com/products/seam/transaction" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation= - "http://jboss.com/products/seam/core http://jboss.com/products/seam/core-2.0.xsd - http://jboss.com/products/seam/persistence http://jboss.com/products/seam/persistence-2.0.xsd - http://jboss.com/products/seam/security http://jboss.com/products/seam/security-2.0.xsd - http://jboss.com/products/seam/web http://jboss.com/products/seam/web-2.0.xsd - http://jboss.com/products/seam/drools http://jboss.com/products/seam/drools-2.0.xsd - http://jboss.com/products/seam/mail http://jboss.com/products/seam/mail-2.0.xsd - http://jboss.com/products/seam/transaction http://jboss.com/products/seam/transaction-2.0.xsd - http://jboss.com/products/seam/components http://jboss.com/products/seam/components-2.0.xsd"> + "http://jboss.com/products/seam/core http://jboss.com/products/seam/core-2.1.xsd + http://jboss.com/products/seam/persistence http://jboss.com/products/seam/persistence-2.1.xsd + http://jboss.com/products/seam/security http://jboss.com/products/seam/security-2.1.xsd + http://jboss.com/products/seam/web http://jboss.com/products/seam/web-2.1.xsd + http://jboss.com/products/seam/drools http://jboss.com/products/seam/drools-2.1.xsd + http://jboss.com/products/seam/mail http://jboss.com/products/seam/mail-2.1.xsd + http://jboss.com/products/seam/transaction http://jboss.com/products/seam/transaction-2.1.xsd + http://jboss.com/products/seam/components http://jboss.com/products/seam/components-2.1.xsd">  Modified: trunk/examples/wiki/src/etc/WEB-INF/pages.xml =================================================================== --- trunk/examples/wiki/src/etc/WEB-INF/pages.xml 2008-02-05 18:00:10 UTC (rev 7367) +++ trunk/examples/wiki/src/etc/WEB-INF/pages.xml 2008-02-05 19:37:56 UTC (rev 7368) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <pages xmlns="http://jboss.com/products/seam/pages" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://jboss.com/products/seam/pages http://jboss.com/products/seam/pages-2.0.xsd"> + xsi:schemaLocation="http://jboss.com/products/seam/pages http://jboss.com/products/seam/pages-2.1.xsd"> <page view-id="/wiki.xhtml"> <param name="nodeId" value="#{wikiRequestResolver.nodeId}"/> Modified: trunk/src/ioc/META-INF/spring.schemas =================================================================== --- trunk/src/ioc/META-INF/spring.schemas 2008-02-05 18:00:10 UTC (rev 7367) +++ trunk/src/ioc/META-INF/spring.schemas 2008-02-05 19:37:56 UTC (rev 7368) @@ -1 +1 @@ -http\://jboss.com/products/seam/spring-seam-2.0.xsd=org/jboss/seam/ioc/spring/spring-seam-2.0.xsd +http\://jboss.com/products/seam/spring-seam-2.1.xsd=org/jboss/seam/ioc/spring/spring-seam-2.1.xsd Deleted: trunk/src/ioc/org/jboss/seam/ioc/spring/spring-2.0.xsd =================================================================== --- trunk/src/ioc/org/jboss/seam/ioc/spring/spring-2.0.xsd 2008-02-05 18:00:10 UTC (rev 7367) +++ trunk/src/ioc/org/jboss/seam/ioc/spring/spring-2.0.xsd 2008-02-05 19:37:56 UTC (rev 7368) @@ -1,78 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" - targetNamespace="http://jboss.com/products/seam/spring" xmlns:spring="http://jboss.com/products/seam/spring" - xmlns:components="http://jboss.com/products/seam/components" attributeFormDefault="unqualified"> - <xs:import namespace="http://jboss.com/products/seam/components" - schemaLocation="http://jboss.com/products/seam/components-2.0.xsd" /> - - <xs:element name="context-loader"> - <xs:complexType mixed="true"> - <xs:choice minOccurs="0" maxOccurs="unbounded"> - <xs:element minOccurs="0" maxOccurs="1" ref="spring:config-locations" /> - </xs:choice> - <xs:attributeGroup ref="components:attlist.component" /> - <xs:attribute name="config-locations" type="xs:string" use="optional" - default="/WEB-INF/applicationContext.xml"> - <xs:annotation> - <xs:documentation> - <![CDATA[ - A single application context config location. - ]]> - </xs:documentation> - </xs:annotation> - </xs:attribute> - </xs:complexType> - </xs:element> - <xs:element name="config-locations" type="components:multiValuedProperty"> - <xs:annotation> - <xs:documentation> - <![CDATA[ - Allows you to specify many config-locations in nested value elements. - ]]> - </xs:documentation> - </xs:annotation> - </xs:element> - - <xs:element name="task-executor-dispatcher"> - <xs:complexType mixed="true"> - <xs:attributeGroup ref="components:attlist.component" /> - <xs:attributeGroup ref="spring:attlist.taskExecutorDispatcher" /> - </xs:complexType> - </xs:element> - <xs:attributeGroup name="attlist.taskExecutorDispatcher"> - <xs:attribute name="task-executor" use="required" /> - <xs:attribute name="schedule-dispatcher" /> - </xs:attributeGroup> - - <xs:element name="spring-transaction"> - <xs:complexType mixed="true"> - <xs:attributeGroup ref="components:attlist.component" /> - <xs:attribute name="platform-transaction-manager"> - <xs:annotation> - <xs:documentation> - <![CDATA[ - An expression evalutating to the spring platform transaction manager - ]]> - </xs:documentation> - </xs:annotation> - </xs:attribute> - <xs:attribute name="conversation-context-required" type="xs:boolean" use="optional" default="true"> - <xs:annotation> - <xs:documentation> - Specify if this transaction manager requires a conversation context to be available or not. - Set to true if you're using a JpaTransactionManager with a conversation scoped persistence - context. - </xs:documentation> - </xs:annotation> - </xs:attribute> - <xs:attribute name="join-transaction" type="xs:boolean" use="optional"> - <xs:annotation> - <xs:documentation> - Should this transaction manager participate in request to join a transaction. For JTA - transactions set to true. - </xs:documentation> - </xs:annotation> - </xs:attribute> - </xs:complexType> - </xs:element> -</xs:schema> Added: trunk/src/ioc/org/jboss/seam/ioc/spring/spring-2.1.xsd =================================================================== --- trunk/src/ioc/org/jboss/seam/ioc/spring/spring-2.1.xsd (rev 0) +++ trunk/src/ioc/org/jboss/seam/ioc/spring/spring-2.1.xsd 2008-02-05 19:37:56 UTC (rev 7368) @@ -0,0 +1,78 @@ +<?xml version="1.0" encoding="UTF-8"?> +<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" + targetNamespace="http://jboss.com/products/seam/spring" xmlns:spring="http://jboss.com/products/seam/spring" + xmlns:components="http://jboss.com/products/seam/components" attributeFormDefault="unqualified"> + <xs:import namespace="http://jboss.com/products/seam/components" + schemaLocation="http://jboss.com/products/seam/components-2.1.xsd" /> + + <xs:element name="context-loader"> + <xs:complexType mixed="true"> + <xs:choice minOccurs="0" maxOccurs="unbounded"> + <xs:element minOccurs="0" maxOccurs="1" ref="spring:config-locations" /> + </xs:choice> + <xs:attributeGroup ref="components:attlist.component" /> + <xs:attribute name="config-locations" type="xs:string" use="optional" + default="/WEB-INF/applicationContext.xml"> + <xs:annotation> + <xs:documentation> + <![CDATA[ + A single application context config location. + ]]> + </xs:documentation> + </xs:annotation> + </xs:attribute> + </xs:complexType> + </xs:element> + <xs:element name="config-locations" type="components:multiValuedProperty"> + <xs:annotation> + <xs:documentation> + <![CDATA[ + Allows you to specify many config-locations in nested value elements. + ]]> + </xs:documentation> + </xs:annotation> + </xs:element> + + <xs:element name="task-executor-dispatcher"> + <xs:complexType mixed="true"> + <xs:attributeGroup ref="components:attlist.component" /> + <xs:attributeGroup ref="spring:attlist.taskExecutorDispatcher" /> + </xs:complexType> + </xs:element> + <xs:attributeGroup name="attlist.taskExecutorDispatcher"> + <xs:attribute name="task-executor" use="required" /> + <xs:attribute name="schedule-dispatcher" /> + </xs:attributeGroup> + + <xs:element name="spring-transaction"> + <xs:complexType mixed="true"> + <xs:attributeGroup ref="components:attlist.component" /> + <xs:attribute name="platform-transaction-manager"> + <xs:annotation> + <xs:documentation> + <![CDATA[ + An expression evalutating to the spring platform transaction manager + ]]> + </xs:documentation> + </xs:annotation> + </xs:attribute> + <xs:attribute name="conversation-context-required" type="xs:boolean" use="optional" default="true"> + <xs:annotation> + <xs:documentation> + Specify if this transaction manager requires a conversation context to be available or not. + Set to true if you're using a JpaTransactionManager with a conversation scoped persistence + context. + </xs:documentation> + </xs:annotation> + </xs:attribute> + <xs:attribute name="join-transaction" type="xs:boolean" use="optional"> + <xs:annotation> + <xs:documentation> + Should this transaction manager participate in request to join a transaction. For JTA + transactions set to true. + </xs:documentation> + </xs:annotation> + </xs:attribute> + </xs:complexType> + </xs:element> +</xs:schema> Deleted: trunk/src/ioc/org/jboss/seam/ioc/spring/spring-seam-2.0.xsd =================================================================== --- trunk/src/ioc/org/jboss/seam/ioc/spring/spring-seam-2.0.xsd 2008-02-05 18:00:10 UTC (rev 7367) +++ trunk/src/ioc/org/jboss/seam/ioc/spring/spring-seam-2.0.xsd 2008-02-05 19:37:56 UTC (rev 7368) @@ -1,210 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> - -<xsd:schema xmlns="http://jboss.com/products/seam/spring-seam" xmlns:xsd="http://www.w3.org/2001/XMLSchema" - xmlns:tool="http://www.springframework.org/schema/tool" targetNamespace="http://jboss.com/products/seam/spring-seam" - elementFormDefault="qualified" attributeFormDefault="unqualified"> - - <xsd:import namespace="http://www.springframework.org/schema/tool" - schemaLocation="http://www.springframework.org/schema/tool/spring-tool-2.0.xsd" /> - - <xsd:element name="configure-scopes"> - <xsd:annotation> - <xsd:documentation>Makes all the seam scopes available in spring.</xsd:documentation> - <xsd:appinfo> - <tool:annotation> - <tool:exports /> - </tool:annotation> - </xsd:appinfo> - </xsd:annotation> - <xsd:complexType> - <xsd:attribute name="prefix" type="xsd:string" use="optional"> - <xsd:annotation> - <xsd:documentation> - <![CDATA[ - The prefix to use for the seam scopes. Default: "seam." - ]]> - </xsd:documentation> - </xsd:annotation> - </xsd:attribute> - <xsd:attribute name="default-auto-create" type="xsd:boolean" use="optional" default="false"> - <xsd:annotation> - <xsd:documentation> - <![CDATA[ - Should instances of this component be auto-created. Defaults to false since custom Seam - scopes are typically used to create stateful components that go on to be created multiple times. - ]]> - </xsd:documentation> - </xsd:annotation> - </xsd:attribute> - </xsd:complexType> - </xsd:element> - <xsd:element name="instance"> - <xsd:annotation> - <xsd:documentation> - Make an instance of a seam component available to spring beans for spring injection. - </xsd:documentation> - <xsd:appinfo> - <tool:annotation> - <tool:exports /> - </tool:annotation> - </xsd:appinfo> - </xsd:annotation> - <xsd:complexType> - <xsd:attribute name="id" type="xsd:ID"> - <xsd:annotation> - <xsd:documentation> - <![CDATA[ - The id to use when making this seam component instance available in spring. The default will be the seam component name. - ]]> - </xsd:documentation> - </xsd:annotation> - </xsd:attribute> - <xsd:attribute name="name" type="xsd:string" use="required"> - <xsd:annotation> - <xsd:documentation> - <![CDATA[ - The seam component name to get an instance of. - ]]> - </xsd:documentation> - </xsd:annotation> - </xsd:attribute> - <xsd:attribute name="scope" use="optional"> - <xsd:annotation> - <xsd:documentation> - <![CDATA[ - The optional scope to look for this seam component instance in. - ]]> - </xsd:documentation> - </xsd:annotation> - <xsd:simpleType> - <xsd:restriction base="xsd:string"> - <xsd:enumeration value="STATELESS" /> - <xsd:enumeration value="METHOD" /> - <xsd:enumeration value="EVENT" /> - <xsd:enumeration value="PAGE" /> - <xsd:enumeration value="CONVERSATION" /> - <xsd:enumeration value="SESSION" /> - <xsd:enumeration value="APPLICATION" /> - <xsd:enumeration value="BUSINESS_PROCESS" /> - </xsd:restriction> - </xsd:simpleType> - </xsd:attribute> - <xsd:attribute name="type" type="xsd:string" use="optional"> - <xsd:annotation> - <xsd:documentation> - <![CDATA[ - The class type to use when creating a proxy of this instance. Useful when using - EL for the name because the type of the EL expression may not be available when the - proxy is created. - ]]> - </xsd:documentation> - </xsd:annotation> - </xsd:attribute> - <xsd:attribute name="create" type="xsd:boolean" use="optional"> - <xsd:annotation> - <xsd:documentation> - <![CDATA[ - Whether seam should create a new instance if one does not already exist. - ]]> - </xsd:documentation> - </xsd:annotation> - </xsd:attribute> - <xsd:attribute name="proxy" type="xsd:boolean" use="optional" default="false"> - <xsd:annotation> - <xsd:documentation> - <![CDATA[ - Whether to wrap this definition in a proxy for safe injection into a spring singleton. - ]]> - </xsd:documentation> - </xsd:annotation> - </xsd:attribute> - </xsd:complexType> - </xsd:element> - <xsd:element name="component"> - <xsd:annotation> - <xsd:documentation> - <![CDATA[ - Makes the surrounding spring bean a seam component with the scope managed by spring. Also helps to resolve cases where - the spring bean name must be different from the seam component name or where the seam beanClass cannot be correctly - detected. - ]]> - </xsd:documentation> - <xsd:appinfo> - <tool:annotation> - <tool:exports /> - </tool:annotation> - </xsd:appinfo> - </xsd:annotation> - <xsd:complexType> - <xsd:attribute name="name" type="xsd:string" use="optional"> - <xsd:annotation> - <xsd:documentation> - <![CDATA[ - The seam component name to give this spring bean. Optional unless the seam component name must be different from the - spring bean name. - ]]> - </xsd:documentation> - </xsd:annotation> - </xsd:attribute> - <xsd:attribute name="spring-name" type="xsd:string" use="optional"> - <xsd:annotation> - <xsd:documentation> - <![CDATA[ - What spring bean name should seam use to obtain an instance of this bean. Only necessary when seam-spring cannot - property detect the name of the spring bean which some spring NamespaceHandlers can do (eg. <aop:scoped-proxy/>, etc.). - ]]> - </xsd:documentation> - </xsd:annotation> - </xsd:attribute> - <xsd:attribute name="class" type="xsd:string" use="optional"> - <xsd:annotation> - <xsd:documentation> - <![CDATA[ - The component class seam will use to get annotations from and to wrap it's interceptors around. Optional unless the - correct class is not being detected by seam-spring. - ]]> - </xsd:documentation> - </xsd:annotation> - </xsd:attribute> - <xsd:attribute name="intercept" type="xsd:boolean" use="optional"> - <xsd:annotation> - <xsd:documentation> - <![CDATA[ - Determines whether Seam interceptors should be wrapped around a bean, overriding - Seam's default which is currently "true". - ]]> - </xsd:documentation> - </xsd:annotation> - </xsd:attribute> - <xsd:attribute name="auto-create" type="xsd:boolean" use="optional" default="true"> - <xsd:annotation> - <xsd:documentation> - <![CDATA[ - Should instances of this component be auto-created. Defaults to true since the STATELESS - scope is going to be used most of the time when using this namespace handler. - ]]> - </xsd:documentation> - </xsd:annotation> - </xsd:attribute> - <xsd:attribute name="scope" use="optional" default="STATELESS"> - <xsd:annotation> - <xsd:documentation> - <![CDATA[ -The optional scope this component should have. STATELESS will allow spring to manage the scope. ]]> - </xsd:documentation> - </xsd:annotation> - <xsd:simpleType> - <xsd:restriction base="xsd:string"> - <xsd:enumeration value="STATELESS" /> - <xsd:enumeration value="EVENT" /> - <xsd:enumeration value="PAGE" /> - <xsd:enumeration value="CONVERSATION" /> - <xsd:enumeration value="SESSION" /> - <xsd:enumeration value="APPLICATION" /> - <xsd:enumeration value="BUSINESS_PROCESS" /> - </xsd:restriction> - </xsd:simpleType> - </xsd:attribute> - </xsd:complexType> - </xsd:element> -</xsd:schema> Added: trunk/src/ioc/org/jboss/seam/ioc/spring/spring-seam-2.1.xsd =================================================================== --- trunk/src/ioc/org/jboss/seam/ioc/spring/spring-seam-2.1.xsd (rev 0) +++ trunk/src/ioc/org/jboss/seam/ioc/spring/spring-seam-2.1.xsd 2008-02-05 19:37:56 UTC (rev 7368) @@ -0,0 +1,210 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> + +<xsd:schema xmlns="http://jboss.com/products/seam/spring-seam" xmlns:xsd="http://www.w3.org/2001/XMLSchema" + xmlns:tool="http://www.springframework.org/schema/tool" targetNamespace="http://jboss.com/products/seam/spring-seam" + elementFormDefault="qualified" attributeFormDefault="unqualified"> + + <xsd:import namespace="http://www.springframework.org/schema/tool" + schemaLocation="http://www.springframework.org/schema/tool/spring-tool-2.0.xsd" /> + + <xsd:element name="configure-scopes"> + <xsd:annotation> + <xsd:documentation>Makes all the seam scopes available in spring.</xsd:documentation> + <xsd:appinfo> + <tool:annotation> + <tool:exports /> + </tool:annotation> + </xsd:appinfo> + </xsd:annotation> + <xsd:complexType> + <xsd:attribute name="prefix" type="xsd:string" use="optional"> + <xsd:annotation> + <xsd:documentation> + <![CDATA[ + The prefix to use for the seam scopes. Default: "seam." + ]]> + </xsd:documentation> + </xsd:annotation> + </xsd:attribute> + <xsd:attribute name="default-auto-create" type="xsd:boolean" use="optional" default="false"> + <xsd:annotation> + <xsd:documentation> + <![CDATA[ + Should instances of this component be auto-created. Defaults to false since custom Seam + scopes are typically used to create stateful components that go on to be created multiple times. + ]]> + </xsd:documentation> + </xsd:annotation> + </xsd:attribute> + </xsd:complexType> + </xsd:element> + <xsd:element name="instance"> + <xsd:annotation> + <xsd:documentation> + Make an instance of a seam component available to spring beans for spring injection. + </xsd:documentation> + <xsd:appinfo> + <tool:annotation> + <tool:exports /> + </tool:annotation> + </xsd:appinfo> + </xsd:annotation> + <xsd:complexType> + <xsd:attribute name="id" type="xsd:ID"> + <xsd:annotation> + <xsd:documentation> + <![CDATA[ + The id to use when making this seam component instance available in spring. The default will be the seam component name. + ]]> + </xsd:documentation> + </xsd:annotation> + </xsd:attribute> + <xsd:attribute name="name" type="xsd:string" use="required"> + <xsd:annotation> + <xsd:documentation> + <![CDATA[ + The seam component name to get an instance of. + ]]> + </xsd:documentation> + </xsd:annotation> + </xsd:attribute> + <xsd:attribute name="scope" use="optional"> + <xsd:annotation> + <xsd:documentation> + <![CDATA[ + The optional scope to look for this seam component instance in. + ]]> + </xsd:documentation> + </xsd:annotation> + <xsd:simpleType> + <xsd:restriction base="xsd:string"> + <xsd:enumeration value="STATELESS" /> + <xsd:enumeration value="METHOD" /> + <xsd:enumeration value="EVENT" /> + <xsd:enumeration value="PAGE" /> + <xsd:enumeration value="CONVERSATION" /> + <xsd:enumeration value="SESSION" /> + <xsd:enumeration value="APPLICATION" /> + <xsd:enumeration value="BUSINESS_PROCESS" /> + </xsd:restriction> + </xsd:simpleType> + </xsd:attribute> + <xsd:attribute name="type" type="xsd:string" use="optional"> + <xsd:annotation> + <xsd:documentation> + <![CDATA[ + The class type to use when creating a proxy of this instance. Useful when using + EL for the name because the type of the EL expression may not be available when the + proxy is created. + ]]> + </xsd:documentation> + </xsd:annotation> + </xsd:attribute> + <xsd:attribute name="create" type="xsd:boolean" use="optional"> + <xsd:annotation> + <xsd:documentation> + <![CDATA[ + Whether seam should create a new instance if one does not already exist. + ]]> + </xsd:documentation> + </xsd:annotation> + </xsd:attribute> + <xsd:attribute name="proxy" type="xsd:boolean" use="optional" default="false"> + <xsd:annotation> + <xsd:documentation> + <![CDATA[ + Whether to wrap this definition in a proxy for safe injection into a spring singleton. + ]]> + </xsd:documentation> + </xsd:annotation> + </xsd:attribute> + </xsd:complexType> + </xsd:element> + <xsd:element name="component"> + <xsd:annotation> + <xsd:documentation> + <![CDATA[ + Makes the surrounding spring bean a seam component with the scope managed by spring. Also helps to resolve cases where + the spring bean name must be different from the seam component name or where the seam beanClass cannot be correctly + detected. + ]]> + </xsd:documentation> + <xsd:appinfo> + <tool:annotation> + <tool:exports /> + </tool:annotation> + </xsd:appinfo> + </xsd:annotation> + <xsd:complexType> + <xsd:attribute name="name" type="xsd:string" use="optional"> + <xsd:annotation> + <xsd:documentation> + <![CDATA[ + The seam component name to give this spring bean. Optional unless the seam component name must be different from the + spring bean name. + ]]> + </xsd:documentation> + </xsd:annotation> + </xsd:attribute> + <xsd:attribute name="spring-name" type="xsd:string" use="optional"> + <xsd:annotation> + <xsd:documentation> + <![CDATA[ + What spring bean name should seam use to obtain an instance of this bean. Only necessary when seam-spring cannot + property detect the name of the spring bean which some spring NamespaceHandlers can do (eg. <aop:scoped-proxy/>, etc.). + ]]> + </xsd:documentation> + </xsd:annotation> + </xsd:attribute> + <xsd:attribute name="class" type="xsd:string" use="optional"> + <xsd:annotation> + <xsd:documentation> + <![CDATA[ + The component class seam will use to get annotations from and to wrap it's interceptors around. Optional unless the + correct class is not being detected by seam-spring. + ]]> + </xsd:documentation> + </xsd:annotation> + </xsd:attribute> + <xsd:attribute name="intercept" type="xsd:boolean" use="optional"> + <xsd:annotation> + <xsd:documentation> + <![CDATA[ + Determines whether Seam interceptors should be wrapped around a bean, overriding + Seam's default which is currently "true". + ]]> + </xsd:documentation> + </xsd:annotation> + </xsd:attribute> + <xsd:attribute name="auto-create" type="xsd:boolean" use="optional" default="true"> + <xsd:annotation> + <xsd:documentation> + <![CDATA[ + Should instances of this component be auto-created. Defaults to true since the STATELESS + scope is going to be used most of the time when using this namespace handler. + ]]> + </xsd:documentation> + </xsd:annotation> + </xsd:attribute> + <xsd:attribute name="scope" use="optional" default="STATELESS"> + <xsd:annotation> + <xsd:documentation> + <![CDATA[ +The optional scope this component should have. STATELESS will allow spring to manage the scope. ]]> + </xsd:documentation> + </xsd:annotation> + <xsd:simpleType> + <xsd:restriction base="xsd:string"> + <xsd:enumeration value="STATELESS" /> + <xsd:enumeration value="EVENT" /> + <xsd:enumeration value="PAGE" /> + <xsd:enumeration value="CONVERSATION" /> + <xsd:enumeration value="SESSION" /> + <xsd:enumeration value="APPLICATION" /> + <xsd:enumeration value="BUSINESS_PROCESS" /> + </xsd:restriction> + </xsd:simpleType> + </xsd:attribute> + </xsd:complexType> + </xsd:element> +</xsd:schema> Modified: trunk/src/main/META-INF/components.xml =================================================================== --- trunk/src/main/META-INF/components.xml 2008-02-05 18:00:10 UTC (rev 7367) +++ trunk/src/main/META-INF/components.xml 2008-02-05 19:37:56 UTC (rev 7368) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <components xmlns="http://jboss.com/products/seam/components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://jboss.com/products/seam/components http://jboss.com/products/seam/components-2.0.xsd"> + xsi:schemaLocation="http://jboss.com/products/seam/components http://jboss.com/products/seam/components-2.1.xsd"> <import>org.jboss.seam.core</import> <import>org.jboss.seam.transaction</import> Deleted: trunk/src/main/org/jboss/seam/async-2.0.xsd =================================================================== --- trunk/src/main/org/jboss/seam/async-2.0.xsd 2008-02-05 18:00:10 UTC (rev 7367) +++ trunk/src/main/org/jboss/seam/async-2.0.xsd 2008-02-05 19:37:56 UTC (rev 7368) @@ -1,34 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" - targetNamespace="http://jboss.com/products/seam/async" xmlns:async="http://jboss.com/products/seam/async" - xmlns:components="http://jboss.com/products/seam/components" attributeFormDefault="unqualified"> - <xs:import namespace="http://jboss.com/products/seam/components" schemaLocation="components-2.0.xsd"/> - - <xs:element name="timer-service-dispatcher"> - <xs:complexType mixed="true"> - <xs:attributeGroup ref="components:attlist.component"/> - <xs:attributeGroup ref="components:attlist.ejbcomponent"/> - <xs:attributeGroup ref="async:attlist.timerServiceDispatcher"/> - </xs:complexType> - </xs:element> - <xs:attributeGroup name="attlist.timerServiceDispatcher"> </xs:attributeGroup> - - <xs:element name="quartz-dispatcher"> - <xs:complexType mixed="true"> - <xs:attributeGroup ref="components:attlist.component"/> - <xs:attributeGroup ref="async:attlist.quartzDispatcher"/> - </xs:complexType> - </xs:element> - <xs:attributeGroup name="attlist.quartzDispatcher"> </xs:attributeGroup> - - <xs:element name="thread-pool-dispatcher"> - <xs:complexType mixed="true"> - <xs:attributeGroup ref="components:attlist.component"/> - <xs:attributeGroup ref="async:attlist.threadPoolDispatcher"/> - </xs:complexType> - </xs:element> - <xs:attributeGroup name="attlist.threadPoolDispatcher"> - <xs:attribute name="thread-pool-size" type="xs:integer"/> - </xs:attributeGroup> - -</xs:schema> Added: trunk/src/main/org/jboss/seam/async-2.1.xsd =================================================================== --- trunk/src/main/org/jboss/seam/async-2.1.xsd (rev 0) +++ trunk/src/main/org/jboss/seam/async-2.1.xsd 2008-02-05 19:37:56 UTC (rev 7368) @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="UTF-8"?> +<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" + targetNamespace="http://jboss.com/products/seam/async" xmlns:async="http://jboss.com/products/seam/async" + xmlns:components="http://jboss.com/products/seam/components" attributeFormDefault="unqualified"> + <xs:import namespace="http://jboss.com/products/seam/components" schemaLocation="components-2.1.xsd"/> + + <xs:element name="timer-service-dispatcher"> + <xs:complexType mixed="true"> + <xs:attributeGroup ref="components:attlist.component"/> + <xs:attributeGroup ref="components:attlist.ejbcomponent"/> + <xs:attributeGroup ref="async:attlist.timerServiceDispatcher"/> + </xs:complexType> + </xs:element> + <xs:attributeGroup name="attlist.timerServiceDispatcher"> </xs:attributeGroup> + + <xs:element name="quartz-dispatcher"> + <xs:complexType mixed="true"> + <xs:attributeGroup ref="components:attlist.component"/> + <xs:attributeGroup ref="async:attlist.quartzDispatcher"/> + </xs:complexType> + </xs:element> + <xs:attributeGroup name="attlist.quartzDispatcher"> </xs:attributeGroup> + + <xs:element name="thread-pool-dispatcher"> + <xs:complexType mixed="true"> + <xs:attributeGroup ref="components:attlist.component"/> + <xs:attributeGroup ref="async:attlist.threadPoolDispatcher"/> + </xs:complexType> + </xs:element> + <xs:attributeGroup name="attlist.threadPoolDispatcher"> + <xs:attribute name="thread-pool-size" type="xs:integer"/> + </xs:attributeGroup> + +</xs:schema> Deleted: trunk/src/main/org/jboss/seam/bpm-2.0.xsd =================================================================== --- trunk/src/main/org/jboss/seam/bpm-2.0.xsd 2008-02-05 18:00:10 UTC (rev 7367) +++ trunk/src/main/org/jboss/seam/bpm-2.0.xsd 2008-02-05 19:37:56 UTC (rev 7368) @@ -1,37 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" - targetNamespace="http://jboss.com/products/seam/bpm" xmlns:bpm="http://jboss.com/products/seam/bpm" - xmlns:components="http://jboss.com/products/seam/components" attributeFormDefault="unqualified"> - <xs:import namespace="http://jboss.com/products/seam/components" schemaLocation="components-2.0.xsd"/> - - <xs:element name="actor"> - <xs:complexType mixed="true"> - <xs:choice minOccurs="0" maxOccurs="unbounded"> - <xs:element minOccurs="0" maxOccurs="1" ref="bpm:id"/> - <xs:element minOccurs="0" maxOccurs="1" ref="bpm:group-actor-ids"/> - </xs:choice> - <xs:attributeGroup ref="components:attlist.component"/> - <xs:attributeGroup ref="bpm:attlist.actor"/> - </xs:complexType> - </xs:element> - <xs:element name="id" type="xs:string"/> - <xs:element name="group-actor-ids" type="components:multiValuedProperty"/> - <xs:attributeGroup name="attlist.actor"> - <xs:attribute name="group-actor-ids"> </xs:attribute> - </xs:attributeGroup> - - <xs:element name="jbpm"> - <xs:complexType mixed="true"> - <xs:choice minOccurs="0" maxOccurs="unbounded"> - <xs:element ref="bpm:process-definitions"/> - <xs:element ref="bpm:pageflow-definitions"/> - </xs:choice> - <xs:attributeGroup ref="components:attlist.component"/> - <xs:attributeGroup ref="bpm:attlist.jbpm"/> - </xs:complexType> - </xs:element> - <xs:element name="process-definitions" type="components:multiValuedProperty"/> - <xs:element name="pageflow-definitions" type="components:multiValuedProperty"/> - <xs:attributeGroup name="attlist.jbpm"> </xs:attributeGroup> - -</xs:schema> Added: trunk/src/main/org/jboss/seam/bpm-2.1.xsd =================================================================== --- trunk/src/main/org/jboss/seam/bpm-2.1.xsd (rev 0) +++ trunk/src/main/org/jboss/seam/bpm-2.1.xsd 2008-02-05 19:37:56 UTC (rev 7368) @@ -0,0 +1,37 @@ +<?xml version="1.0" encoding="UTF-8"?> +<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" + targetNamespace="http://jboss.com/products/seam/bpm" xmlns:bpm="http://jboss.com/products/seam/bpm" + xmlns:components="http://jboss.com/products/seam/components" attributeFormDefault="unqualified"> + <xs:import namespace="http://jboss.com/products/seam/components" schemaLocation="components-2.1.xsd"/> + + <xs:element name="actor"> + <xs:complexType mixed="true"> + <xs:choice minOccurs="0" maxOccurs="unbounded"> + <xs:element minOccurs="0" maxOccurs="1" ref="bpm:id"/> + <xs:element minOccurs="0" maxOccurs="1" ref="bpm:group-actor-ids"/> + </xs:choice> + <xs:attributeGroup ref="components:attlist.component"/> + <xs:attributeGroup ref="bpm:attlist.actor"/> + </xs:complexType> + </xs:element> + <xs:element name="id" type="xs:string"/> + <xs:element name="group-actor-ids" type="components:multiValuedProperty"/> + <xs:attributeGroup name="attlist.actor"> + <xs:attribute name="group-actor-ids"> </xs:attribute> + </xs:attributeGroup> + + <xs:element name="jbpm"> + <xs:complexType mixed="true"> + <xs:choice minOccurs="0" maxOccurs="unbounded"> + <xs:element ref="bpm:process-definitions"/> + <xs:element ref="bpm:pageflow-definitions"/> + </xs:choice> + <xs:attributeGroup ref="components:attlist.component"/> + <xs:attributeGroup ref="bpm:attlist.jbpm"/> + </xs:complexType> + </xs:element> + <xs:element name="process-definitions" type="components:multiValuedProperty"/> + <xs:element name="pageflow-definitions" type="components:multiValuedProperty"/> + <xs:attributeGroup name="attlist.jbpm"> </xs:attributeGroup> + +</xs:schema> Deleted: trunk/src/main/org/jboss/seam/components-2.0.dtd =================================================================== --- trunk/src/main/org/jboss/seam/components-2.0.dtd 2008-02-05 18:00:10 UTC (rev 7367) +++ trunk/src/main/org/jboss/seam/components-2.0.dtd 2008-02-05 19:37:56 UTC (rev 7368) @@ -1,42 +0,0 @@ - - -<!ELEMENT components (component|factory|event)*> - -<!ELEMENT component (property*)> -<!ATTLIST component name CDATA #IMPLIED> -<!ATTLIST component class CDATA #IMPLIED> -<!ATTLIST component scope (stateless|event|page|conversation|session|business_process|application|STATELESS|EVENT|PAGE|CONVERSATION|SESSION|BUSINESS_PROCESS|APPLICATION) #IMPLIED> -<!ATTLIST component jndi-name CDATA #IMPLIED> -<!ATTLIST component installed CDATA #IMPLIED> -<!ATTLIST component precedence CDATA #IMPLIED> -<!ATTLIST component auto-create (true|false) "false"> - -<!ELEMENT factory EMPTY> -<!ATTLIST factory name CDATA #REQUIRED> -<!ATTLIST factory method CDATA #IMPLIED> -<!ATTLIST factory value CDATA #IMPLIED> -<!ATTLIST factory scope (stateless|event|page|conversation|session|business_process|application|STATELESS|EVENT|PAGE|CONVERSATION|SESSION|BUSINESS_PROCESS|APPLICATION) #IMPLIED> -<!ATTLIST factory auto-create (true|false) #IMPLIED> -<!ATTLIST factory startup (true|false) #IMPLIED> - -<!ELEMENT property (#PCDATA|key|value)*> -<!ATTLIST property name CDATA #REQUIRED> - -<!ELEMENT key (#PCDATA)> -<!ELEMENT value (#PCDATA)> - -<!ELEMENT import (#PCDATA)> - - - -<!ELEMENT event (action*)> -<!ATTLIST event type CDATA #REQUIRED> - -<!ELEMENT action EMPTY> -<!ATTLIST action execute CDATA #REQUIRED> Deleted: trunk/src/main/org/jboss/seam/components-2.0.xsd =================================================================== --- trunk/src/main/org/jboss/seam/components-2.0.xsd 2008-02-05 18:00:10 UTC (rev 7367) +++ trunk/src/main/org/jboss/seam/components-2.0.xsd 2008-02-05 19:37:56 UTC (rev 7368) @@ -1,140 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" - targetNamespace="http://jboss.com/products/seam/components" - xmlns:components="http://jboss.com/products/seam/components"> - <xs:element name="components"> - <xs:complexType> - <xs:choice minOccurs="0" maxOccurs="unbounded"> - <xs:element ref="components:component"/> - <xs:element ref="components:factory"/> - <xs:element ref="components:event"/> - <xs:element ref="components:import"/> - <xs:any namespace="##other" processContents="strict"/> - </xs:choice> - </xs:complexType> - </xs:element> - <xs:element name="component"> - <xs:complexType> - <xs:sequence> - <xs:element minOccurs="0" maxOccurs="unbounded" ref="components:property"/> - </xs:sequence> - <xs:attributeGroup ref="components:attlist.component"/> - <xs:attributeGroup ref="components:attlist.ejbcomponent"/> - </xs:complexType> - </xs:element> - - <xs:element name="import" type="xs:string"/> - - <xs:attributeGroup name="attlist.ejbcomponent"> - <xs:attribute name="jndi-name"/> - </xs:attributeGroup> - - <xs:attributeGroup name="attlist.component"> - <xs:attribute name="name"/> - <xs:attribute name="class"/> - <xs:attribute name="scope"> - <xs:simpleType> - <xs:restriction base="xs:token"> - <xs:enumeration value="stateless"/> - <xs:enumeration value="event"/> - <xs:enumeration value="page"/> - <xs:enumeration value="conversation"/> - <xs:enumeration value="session"/> - <xs:enumeration value="business_process"/> - <xs:enumeration value="application"/> - <xs:enumeration value="STATELESS"/> - <xs:enumeration value="EVENT"/> - <xs:enumeration value="PAGE"/> - <xs:enumeration value="CONVERSATION"/> - <xs:enumeration value="SESSION"/> - <xs:enumeration value="BUSINESS_PROCESS"/> - <xs:enumeration value="APPLICATION"/> - </xs:restriction> - </xs:simpleType> - </xs:attribute> - <xs:attribute name="precedence" type="xs:int"/> - <xs:attribute name="installed" default="true" type="xs:boolean"/> - <xs:attribute name="auto-create" default="false" type="xs:boolean"/> - <xs:attribute name="startup" default="false" type="xs:boolean"/> - </xs:attributeGroup> - <xs:element name="factory"> - <xs:complexType> - <xs:attributeGroup ref="components:attlist.factory"/> - </xs:complexType> - </xs:element> - <xs:attributeGroup name="attlist.factory"> - <xs:attribute name="name" use="required"/> - <xs:attribute name="method"/> - <xs:attribute name="value"/> - <xs:attribute name="scope"> - <xs:simpleType> - <xs:restriction base="xs:token"> - <xs:enumeration value="stateless"/> - <xs:enumeration value="event"/> - <xs:enumeration value="page"/> - <xs:enumeration value="conversation"/> - <xs:enumeration value="session"/> - <xs:enumeration value="business_process"/> - <xs:enumeration value="application"/> - <xs:enumeration value="STATELESS"/> - <xs:enumeration value="EVENT"/> - <xs:enumeration value="PAGE"/> - <xs:enumeration value="CONVERSATION"/> - <xs:enumeration value="SESSION"/> - <xs:enumeration value="BUSINESS_PROCESS"/> - <xs:enumeration value="APPLICATION"/> - </xs:restriction> - </xs:simpleType> - </xs:attribute> - <xs:attribute name="auto-create" type="xs:boolean"/> - </xs:attributeGroup> - <xs:element name="property"> - <xs:complexType mixed="true"> - <xs:choice minOccurs="0" maxOccurs="unbounded"> - <xs:element ref="components:key"/> - <xs:element ref="components:value"/> - </xs:choice> - <xs:attributeGroup ref="components:attlist.property"/> - </xs:complexType> - </xs:element> - <xs:attributeGroup name="attlist.property"> - <xs:attribute name="name" use="required"/> - </xs:attributeGroup> - <xs:element name="key" type="xs:string"/> - <xs:element name="value" type="xs:string"/> - - <xs:complexType name="multiValuedProperty"> - <xs:sequence minOccurs="0" maxOccurs="unbounded"> - <xs:element ref="components:value"/> - </xs:sequence> - </xs:complexType> - - <xs:complexType name="mapProperty"> - <xs:sequence minOccurs="0" maxOccurs="unbounded"> - <xs:element ref="components:key"/> - <xs:element ref="components:value"/> - </xs:sequence> - </xs:complexType> - - <xs:element name="event"> - <xs:complexType> - <xs:choice minOccurs="0" maxOccurs="unbounded"> - <xs:element ref="components:action"/> - </xs:choice> - <xs:attributeGroup ref="components:attlist.event"/> - </xs:complexType> - </xs:element> - <xs:attributeGroup name="attlist.event"> - <xs:attribute name="type" use="required"/> - </xs:attributeGroup> - - <xs:element name="action"> - <xs:complexType> - <xs:attributeGroup ref="components:attlist.action"/> - </xs:complexType> - </xs:element> - <xs:attributeGroup name="attlist.action"> - <xs:attribute name="execute" use="required"/> - </xs:attributeGroup> - -</xs:schema> Added: trunk/src/main/org/jboss/seam/components-2.1.dtd =================================================================== --- trunk/src/main/org/jboss/seam/components-2.1.dtd (rev 0) +++ trunk/src/main/org/jboss/seam/components-2.1.dtd 2008-02-05 19:37:56 UTC (rev 7368) @@ -0,0 +1,42 @@ + + +<!ELEMENT components (component|factory|event)*> + +<!ELEMENT component (property*)> +<!ATTLIST component name CDATA #IMPLIED> +<!ATTLIST component class CDATA #IMPLIED> +<!ATTLIST component scope (stateless|event|page|conversation|session|business_process|application|STATELESS|EVENT|PAGE|CONVERSATION|SESSION|BUSINESS_PROCESS|APPLICATION) #IMPLIED> +<!ATTLIST component jndi-name CDATA #IMPLIED> +<!ATTLIST component installed CDATA #IMPLIED> +<!ATTLIST component precedence CDATA #IMPLIED> +<!ATTLIST component auto-create (true|false) "false"> + +<!ELEMENT factory EMPTY> +<!ATTLIST factory name CDATA #REQUIRED> +<!ATTLIST factory method CDATA #IMPLIED> +<!ATTLIST factory value CDATA #IMPLIED> +<!ATTLIST factory scope (stateless|event|page|conversation|session|business_process|application|STATELESS|EVENT|PAGE|CONVERSATION|SESSION|BUSINESS_PROCESS|APPLICATION) #IMPLIED> +<!ATTLIST factory auto-create (true|false) #IMPLIED> +<!ATTLIST factory startup (true|false) #IMPLIED> + +<!ELEMENT property (#PCDATA|key|value)*> +<!ATTLIST property name CDATA #REQUIRED> + +<!ELEMENT key (#PCDATA)> +<!ELEMENT value (#PCDATA)> + +<!ELEMENT import (#PCDATA)> + + + +<!ELEMENT event (action*)> +<!ATTLIST event type CDATA #REQUIRED> + +<!ELEMENT action EMPTY> +<!ATTLIST action execute CDATA #REQUIRED> Added: trunk/src/main/org/jboss/seam/components-2.1.xsd =================================================================== --- trunk/src/main/org/jboss/seam/components-2.1.xsd (rev 0) +++ trunk/src/main/org/jboss/seam/components-2.1.xsd 2008-02-05 19:37:56 UTC (rev 7368) @@ -0,0 +1,140 @@ +<?xml version="1.0" encoding="UTF-8"?> +<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" + targetNamespace="http://jboss.com/products/seam/components" + xmlns:components="http://jboss.com/products/seam/components"> + <xs:element name="components"> + <xs:complexType> + <xs:choice minOccurs="0" maxOccurs="unbounded"> + <xs:element ref="components:component"/> + <xs:element ref="components:factory"/> + <xs:element ref="components:event"/> + <xs:element ref="components:import"/> + <xs:any namespace="##other" processContents="strict"/> + </xs:choice> + </xs:complexType> + </xs:element> + <xs:element name="component"> + <xs:complexType> + <xs:sequence> + <xs:element minOccurs="0" maxOccurs="unbounded" ref="components:property"/> + </xs:sequence> + <xs:attributeGroup ref="components:attlist.component"/> + <xs:attributeGroup ref="components:attlist.ejbcomponent"/> + </xs:complexType> + </xs:element> + + <xs:element name="import" type="xs:string"/> + + <xs:attributeGroup name="attlist.ejbcomponent"> + <xs:attribute name="jndi-name"/> + </xs:attributeGroup> + + <xs:attributeGroup name="attlist.component"> + <xs:attribute name="name"/> + <xs:attribute name="class"/> + <xs:attribute name="scope"> + <xs:simpleType> + <xs:restriction base="xs:token"> + <xs:enumeration value="stateless"/> + <xs:enumeration value="event"/> + <xs:enumeration value="page"/> + <xs:enumeration value="conversation"/> + <xs:enumeration value="session"/> + <xs:enumeration value="business_process"/> + <xs:enumeration value="application"/> + <xs:enumeration value="STATELESS"/> + <xs:enumeration value="EVENT"/> + <xs:enumeration value="PAGE"/> + <xs:enumeration value="CONVERSATION"/> + <xs:enumeration value="SESSION"/> + <xs:enumeration value="BUSINESS_PROCESS"/> + <xs:enumeration value="APPLICATION"/> + </xs:restriction> + </xs:simpleType> + </xs:attribute> + <xs:attribute name="precedence" type="xs:int"/> + <xs:attribute name="installed" default="true" type="xs:boolean"/> + <xs:attribute name="auto-create" default="false" type="xs:boolean"/> + <xs:attribute name="startup" default="false" type="xs:boolean"/> + </xs:attributeGroup> + <xs:element name="factory"> + <xs:complexType> + <xs:attributeGroup ref="components:attlist.factory"/> + </xs:complexType> + </xs:element> + <xs:attributeGroup name="attlist.factory"> + <xs:attribute name="name" use="required"/> + <xs:attribute name="method"/> + <xs:attribute name="value"/> + <xs:attribute name="scope"> + <xs:simpleType> + <xs:restriction base="xs:token"> + <xs:enumeration value="stateless"/> + <xs:enumeration value="event"/> + <xs:enumeration value="page"/> + <xs:enumeration value="conversation"/> + <xs:enumeration value="session"/> + <xs:enumeration value="business_process"/> + <xs:enumeration value="application"/> + <xs:enumeration value="STATELESS"/> + <xs:enumeration value="EVENT"/> + <xs:enumeration value="PAGE"/> + <xs:enumeration value="CONVERSATION"/> + <xs:enumeration value="SESSION"/> + <xs:enumeration value="BUSINESS_PROCESS"/> + <xs:enumeration value="APPLICATION"/> + </xs:restriction> + </xs:simpleType> + </xs:attribute> + <xs:attribute name="auto-create" type="xs:boolean"/> + </xs:attributeGroup> + <xs:element name="property"> + <xs:complexType mixed="true"> + <xs:choice minOccurs="0" maxOccurs="unbounded"> + <xs:element ref="components:key"/> + <xs:element ref="components:value"/> + </xs:choice> + <xs:attributeGroup ref="components:attlist.property"/> + </xs:complexType> + </xs:element> + <xs:attributeGroup name="attlist.property"> + <xs:attribute name="name" use="required"/> + </xs:attributeGroup> + <xs:element name="key" type="xs:string"/> + <xs:element name="value" type="xs:string"/> + + <xs:complexType name="multiValuedProperty"> + <xs:sequence minOccurs="0" maxOccurs="unbounded"> + <xs:element ref="components:value"/> + </xs:sequence> + </xs:complexType> + + <xs:complexType name="mapProperty"> + <xs:sequence minOccurs="0" maxOccurs="unbounded"> + <xs:element ref="components:key"/> + <xs:element ref="components:value"/> + </xs:sequence> + </xs:complexType> + + <xs:element name="event"> + <xs:complexType> + <xs:choice minOccurs="0" maxOccurs="unbounded"> + <xs:element ref="components:action"/> + </xs:choice> + <xs:attributeGroup ref="components:attlist.event"/> + </xs:complexType> + </xs:element> + <xs:attributeGroup name="attlist.event"> + <xs:attribute name="type" use="required"/> + </xs:attributeGroup> + + <xs:element name="action"> + <xs:complexType> + <xs:attributeGroup ref="components:attlist.action"/> + </xs:complexType> + </xs:element> + <xs:attributeGroup name="attlist.action"> + <xs:attribute name="execute" use="required"/> + </xs:attributeGroup> + +</xs:schema> Deleted: trunk/src/main/org/jboss/seam/core-2.0.xsd =================================================================== --- trunk/src/main/org/jboss/seam/core-2.0.xsd 2008-02-05 18:00:10 UTC (rev 7367) +++ trunk/src/main/org/jboss/seam/core-2.0.xsd 2008-02-05 19:37:56 UTC (rev 7368) @@ -1,71 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" - targetNamespace="http://jboss.com/products/seam/core" xmlns:core="http://jboss.com/products/seam/core" - xmlns:components="http://jboss.com/products/seam/components" attributeFormDefault="unqualified"> - <xs:import namespace="http://jboss.com/products/seam/components" schemaLocation="components-2.0.xsd"/> - - <xs:element name="init"> - <xs:complexType mixed="true"> - <xs:attributeGroup ref="components:attlist.component"/> - <xs:attributeGroup ref="core:attlist.init"/> - </xs:complexType> - </xs:element> - <xs:attributeGroup name="attlist.init"> - <xs:attribute name="debug"> - <xs:simpleType> - <xs:restriction base="xs:token"> - <xs:enumeration value="true"/> - <xs:enumeration value="false"/> - </xs:restriction> - </xs:simpleType> - </xs:attribute> - <xs:attribute name="jndi-pattern"/> - <xs:attribute name="transaction-management-enabled"> - <xs:simpleType> - <xs:restriction base="xs:token"> - <xs:enumeration value="true"/> - <xs:enumeration value="false"/> - </xs:restriction> - </xs:simpleType> - </xs:attribute> - <xs:attribute name="user-transaction-name"/> - </xs:attributeGroup> - - <xs:element name="manager"> - <xs:complexType mixed="true"> - <xs:attributeGroup ref="components:attlist.component"/> - <xs:attributeGroup ref="core:attlist.manager"/> - </xs:complexType> - </xs:element> - <xs:attributeGroup name="attlist.manager"> - <xs:attribute name="concurrent-request-timeout" type="xs:integer"/> - <xs:attribute name="conversation-timeout" type="xs:integer"/> - <xs:attribute name="conversation-id-parameter"/> - <xs:attribute name="parent-conversation-id-parameter"/> - </xs:attributeGroup> - - <xs:element name="resource-loader"> - <xs:complexType mixed="true"> - <xs:choice minOccurs="0" maxOccurs="unbounded"> - <xs:element ref="core:bundle-names"/> - </xs:choice> - <xs:attributeGroup ref="components:attlist.component"/> - <xs:attributeGroup ref="core:attlist.resourceLoader"/> - </xs:complexType> - </xs:element> - <xs:element name="bundle-names" type="components:multiValuedProperty"/> - <xs:attributeGroup name="attlist.resourceLoader"> - <xs:attribute name="bundle-names"> </xs:attribute> - </xs:attributeGroup> - - <xs:element name="pojo-cache"> - <xs:complexType mixed="true"> - <xs:attributeGroup ref="components:attlist.component"/> - <xs:attributeGroup ref="core:attlist.pojoCache"/> - </xs:complexType> - </xs:element> - <xs:attributeGroup name="attlist.pojoCache"> - <xs:attribute name="cfg-resource-name"/> - </xs:attributeGroup> - -</xs:schema> Added: trunk/src/main/org/jboss/seam/core-2.1.xsd =================================================================== --- trunk/src/main/org/jboss/seam/core-2.1.xsd (rev 0) +++ trunk/src/main/org/jboss/seam/core-2.1.xsd 2008-02-05 19:37:56 UTC (rev 7368) @@ -0,0 +1,71 @@ +<?xml version="1.0" encoding="UTF-8"?> +<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" + targetNamespace="http://jboss.com/products/seam/core" xmlns:core="http://jboss.com/products/seam/core" + xmlns:components="http://jboss.com/products/seam/components" attributeFormDefault="unqualified"> + <xs:import namespace="http://jboss.com/products/seam/components" schemaLocation="components-2.1.xsd"/> + + <xs:element name="init"> + <xs:complexType mixed="true"> + <xs:attributeGroup ref="components:attlist.component"/> + <xs:attributeGroup ref="core:attlist.init"/> + </xs:complexType> + </xs:element> + <xs:attributeGroup name="attlist.init"> + <xs:attribute name="debug"> + <xs:simpleType> + <xs:restriction base="xs:token"> + <xs:enumeration value="true"/> + <xs:enumeration value="false"/> + </xs:restriction> + </xs:simpleType> + </xs:attribute> + <xs:attribute name="jndi-pattern"/> + <xs:attribute name="transaction-management-enabled"> + <xs:simpleType> + <xs:restriction base="xs:token"> + <xs:enumeration value="true"/> + <xs:enumeration value="false"/> + </xs:restriction> + </xs:simpleType> + </xs:attribute> + <xs:attribute name="user-transaction-name"/> + </xs:attributeGroup> + + <xs:element name="manager"> + <xs:complexType mixed="true"> + <xs:attributeGroup ref="components:attlist.component"/> + <xs:attributeGroup ref="core:attlist.manager"/> + </xs:complexType> + </xs:element> + <xs:attributeGroup name="attlist.manager"> + <xs:attribute name="concurrent-request-timeout" type="xs:integer"/> + <xs:attribute name="conversation-timeout" type="xs:integer"/> + <xs:attribute name="conversation-id-parameter"/> + <xs:attribute name="parent-conversation-id-parameter"/> + </xs:attributeGroup> + + <xs:element name="resource-loader"> + <xs:complexType mixed="true"> + <xs:choice minOccurs="0" maxOccurs="unbounded"> + <xs:element ref="core:bundle-names"/> + </xs:choice> + <xs:attributeGroup ref="components:attlist.component"/> + <xs:attributeGroup ref="core:attlist.resourceLoader"/> + </xs:complexType> + </xs:element> + <xs:element name="bundle-names" type="components:multiValuedProperty"/> + <xs:attributeGroup name="attlist.resourceLoader"> + <xs:attribute name="bundle-names"> </xs:attribute> + </xs:attributeGroup> + + <xs:element name="pojo-cache"> + <xs:complexType mixed="true"> + <xs:attributeGroup ref="components:attlist.component"/> + <xs:attributeGroup ref="core:attlist.pojoCache"/> + </xs:complexType> + </xs:element> + <xs:attributeGroup name="attlist.pojoCache"> + <xs:attribute name="cfg-resource-name"/> + </xs:attributeGroup> + +</xs:schema> Deleted: trunk/src/main/org/jboss/seam/drools-2.0.xsd =================================================================== --- trunk/src/main/org/jboss/seam/drools-2.0.xsd 2008-02-05 18:00:10 UTC (rev 7367) +++ trunk/src/main/org/jboss/seam/drools-2.0.xsd 2008-02-05 19:37:56 UTC (rev 7368) @@ -1,48 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" - targetNamespace="http://jboss.com/products/seam/drools" xmlns:drools="http://jboss.com/products/seam/drools" - xmlns:components="http://jboss.com/products/seam/components" attributeFormDefault="unqualified"> - <xs:import namespace="http://jboss.com/products/seam/components" schemaLocation="components-2.0.xsd"/> - - <xs:element name="rule-base"> - <xs:complexType mixed="true"> - <xs:choice minOccurs="0" maxOccurs="unbounded"> - <xs:element minOccurs="0" maxOccurs="1" ref="drools:rule-files"/> - </xs:choice> - <xs:attributeGroup ref="components:attlist.component"/> - <xs:attributeGroup ref="drools:attlist.RuleBase"/> - </xs:complexType> - </xs:element> - <xs:element name="rule-files" type="components:multiValuedProperty"/> - <xs:attributeGroup name="attlist.RuleBase"> - <xs:attribute name="dsl-file" type="xs:string"/> - <xs:attribute name="rule-files" type="xs:string"/> - </xs:attributeGroup> - - <xs:element name="rule-agent"> - <xs:complexType mixed="true"> - <xs:attributeGroup ref="components:attlist.component" /> - <xs:attributeGroup ref="drools:attlist.RuleAgent" /> - </xs:complexType> - </xs:element> - <xs:attributeGroup name="attlist.RuleAgent"> - <xs:attribute name="configuration-file" type="xs:string" /> - <xs:attribute name="config-name" type="xs:string" /> - <xs:attribute name="new-instance" type="xs:string" /> - <xs:attribute name="files" type="xs:string" /> - <xs:attribute name="url" type="xs:string" /> - <xs:attribute name="local-cache-dir" type="xs:string" /> - <xs:attribute name="poll" type="xs:string" /> - </xs:attributeGroup> - - <xs:element name="managed-working-memory"> - <xs:complexType mixed="true"> - <xs:attributeGroup ref="components:attlist.component"/> - <xs:attributeGroup ref="drools:attlist.ManagedWorkingMemory"/> - </xs:complexType> - </xs:element> - <xs:attributeGroup name="attlist.ManagedWorkingMemory"> - <xs:attribute name="rule-base" type="xs:string"/> - </xs:attributeGroup> - -</xs:schema> Added: trunk/src/main/org/jboss/seam/drools-2.1.xsd =================================================================== --- trunk/src/main/org/jboss/seam/drools-2.1.xsd (rev 0) +++ trunk/src/main/org/jboss/seam/drools-2.1.xsd 2008-02-05 19:37:56 UTC (rev 7368) @@ -0,0 +1,48 @@ +<?xml version="1.0" encoding="UTF-8"?> +<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" + targetNamespace="http://jboss.com/products/seam/drools" xmlns:drools="http://jboss.com/products/seam/drools" + xmlns:components="http://jboss.com/products/seam/components" attributeFormDefault="unqualified"> + <xs:import namespace="http://jboss.com/products/seam/components" schemaLocation="components-2.1.xsd"/> + + <xs:element name="rule-base"> + <xs:complexType mixed="true"> + <xs:choice minOccurs="0" maxOccurs="unbounded"> + <xs:element minOccurs="0" maxOccurs="1" ref="drools:rule-files"/> + </xs:choice> + <xs:attributeGroup ref="components:attlist.component"/> + <xs:attributeGroup ref="drools:attlist.RuleBase"/> + </xs:complexType> + </xs:element> + <xs:element name="rule-files" type="components:multiValuedProperty"/> + <xs:attributeGroup name="attlist.RuleBase"> + <xs:attribute name="dsl-file" type="xs:string"/> + <xs:attribute name="rule-files" type="xs:string"/> + </xs:attributeGroup> + + <xs:element name="rule-agent"> + <xs:complexType mixed="true"> + <xs:attributeGroup ref="components:attlist.component" /> + <xs:attributeGroup ref="drools:attlist.RuleAgent" /> + </xs:complexType> + </xs:element> + <xs:attributeGroup name="attlist.RuleAgent"> + <xs:attribute name="configuration-file" type="xs:string" /> + <xs:attribute name="config-name" type="xs:string" /> + <xs:attribute name="new-instance" type="xs:string" /> + <xs:attribute name="files" type="xs:string" /> + <xs:attribute name="url" type="xs:string" /> + <xs:attribute name="local-cache-dir" type="xs:string" /> + <xs:attribute name="poll" type="xs:string" /> + </xs:attributeGroup> + + <xs:element name="managed-working-memory"> + <xs:complexType mixed="true"> + <xs:attributeGroup ref="components:attlist.component"/> + <xs:attributeGroup ref="drools:attlist.ManagedWorkingMemory"/> + </xs:complexType> + </xs:element> + <xs:attributeGroup name="attlist.ManagedWorkingMemory"> + <xs:attribute name="rule-base" type="xs:string"/> + </xs:attributeGroup> + +</xs:schema> Deleted: trunk/src/main/org/jboss/seam/framework-2.0.xsd =================================================================== --- trunk/src/main/org/jboss/seam/framework-2.0.xsd 2008-02-05 18:00:10 UTC (rev 7367) +++ trunk/src/main/org/jboss/seam/framework-2.0.xsd 2008-02-05 19:37:56 UTC (rev 7368) @@ -1,112 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" - targetNamespace="http://jboss.com/products/seam/framework" - xmlns:framework="http://jboss.com/products/seam/framework" - xmlns:components="http://jboss.com/products/seam/components" attributeFormDefault="unqualified"> - <xs:import namespace="http://jboss.com/products/seam/components" schemaLocation="components-2.0.xsd"/> - - - <xs:attributeGroup name="attlist.Home"> - <xs:attribute name="entity-class" type="xs:string"/> - <xs:attribute name="new-instance" type="xs:string"/> - <xs:attribute name="created-message" type="xs:string"/> - <xs:attribute name="updated-message" type="xs:string"/> - <xs:attribute name="deleted-message" type="xs:string"/> - </xs:attributeGroup> - - <xs:attributeGroup name="attlist.Query"> - <xs:attribute name="ejbql" type="xs:string"/> - <xs:attribute name="max-results" type="xs:integer"/> - <xs:attribute name="order" type="xs:string"/> - </xs:attributeGroup> - <xs:element name="restrictions" type="components:multiValuedProperty"/> - <xs:element name="hints" type="components:mapProperty"/> - - <xs:element name="ejbql" type="xs:string"/> - <xs:element name="order" type="xs:string"/> - - <xs:element name="entity-query"> - <xs:complexType mixed="true"> - <xs:choice minOccurs="0" maxOccurs="unbounded"> - <xs:element minOccurs="0" maxOccurs="1" ref="framework:ejbql"/> - <xs:element minOccurs="0" maxOccurs="1" ref="framework:order"/> - <xs:element minOccurs="0" maxOccurs="1" ref="framework:restrictions"/> - <xs:element minOccurs="0" maxOccurs="1" ref="framework:hints"/> - </xs:choice> - <xs:attributeGroup ref="components:attlist.component"/> - <xs:attributeGroup ref="framework:attlist.Query"/> - <xs:attributeGroup ref="framework:attlist.entityQuery"/> - </xs:complexType> - </xs:element> - <xs:attributeGroup name="attlist.entityQuery"> - <xs:attribute name="entity-manager" type="xs:string"/> - </xs:attributeGroup> - - <xs:element name="hibernate-entity-query"> - <xs:complexType mixed="true"> - <xs:choice minOccurs="0" maxOccurs="unbounded"> - <xs:element minOccurs="0" maxOccurs="1" ref="framework:ejbql"/> - <xs:element minOccurs="0" maxOccurs="1" ref="framework:order"/> - <xs:element minOccurs="0" maxOccurs="1" ref="framework:restrictions"/> - </xs:choice> - <xs:attributeGroup ref="components:attlist.component"/> - <xs:attributeGroup ref="framework:attlist.Query"/> - <xs:attributeGroup ref="framework:attlist.HibernateEntityQuery"/> - </xs:complexType> - </xs:element> - <xs:attributeGroup name="attlist.HibernateEntityQuery"> - <xs:attribute name="cacheable"> - <xs:simpleType> - <xs:restriction base="xs:token"> - <xs:enumeration value="true"/> - <xs:enumeration value="false"/> - </xs:restriction> - </xs:simpleType> - </xs:attribute> - <xs:attribute name="cache-region" type="xs:string"/> - <xs:attribute name="fetch-size" type="xs:integer"/> - <xs:attribute name="session" type="xs:string"/> - </xs:attributeGroup> - - <xs:element name="created-message" type="xs:string"/> - <xs:element name="updated-message" type="xs:string"/> - <xs:element name="deleted-message" type="xs:string"/> - <xs:element name="new-instance" type="xs:string"/> - - <xs:element name="entity-home"> - <xs:complexType mixed="true"> - <xs:choice minOccurs="0" maxOccurs="unbounded"> - <xs:element name="id" type="xs:string"/> - <xs:element minOccurs="0" maxOccurs="1" ref="framework:created-message"/> - <xs:element minOccurs="0" maxOccurs="1" ref="framework:updated-message"/> - <xs:element minOccurs="0" maxOccurs="1" ref="framework:deleted-message"/> - <xs:element minOccurs="0" maxOccurs="1" ref="framework:new-instance"/> - </xs:choice> - <xs:attributeGroup ref="components:attlist.component"/> - <xs:attributeGroup ref="framework:attlist.Home"/> - <xs:attributeGroup ref="framework:attlist.EntityHome"/> - </xs:complexType> - </xs:element> - <xs:attributeGroup name="attlist.EntityHome"> - <xs:attribute name="entity-manager" type="xs:string"/> - </xs:attributeGroup> - - <xs:element name="hibernate-entity-home"> - <xs:complexType mixed="true"> - <xs:choice minOccurs="0" maxOccurs="unbounded"> - <xs:element name="id" type="xs:string"/> - <xs:element minOccurs="0" maxOccurs="1" ref="framework:created-message"/> - <xs:element minOccurs="0" maxOccurs="1" ref="framework:updated-message"/> - <xs:element minOccurs="0" maxOccurs="1" ref="framework:deleted-message"/> - <xs:element minOccurs="0" maxOccurs="1" ref="framework:new-instance"/> - </xs:choice> - <xs:attributeGroup ref="components:attlist.component"/> - <xs:attributeGroup ref="framework:attlist.Home"/> - <xs:attributeGroup ref="framework:attlist.HibernateEntityHome"/> - </xs:complexType> - </xs:element> - <xs:attributeGroup name="attlist.HibernateEntityHome"> - <xs:attribute name="session" type="xs:string"/> - </xs:attributeGroup> - -</xs:schema> Added: trunk/src/main/org/jboss/seam/framework-2.1.xsd =================================================================== --- trunk/src/main/org/jboss/seam/framework-2.1.xsd (rev 0) +++ trunk/src/main/org/jboss/seam/framework-2.1.xsd 2008-02-05 19:37:56 UTC (rev 7368) @@ -0,0 +1,112 @@ +<?xml version="1.0" encoding="UTF-8"?> +<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" + targetNamespace="http://jboss.com/products/seam/framework" + xmlns:framework="http://jboss.com/products/seam/framework" + xmlns:components="http://jboss.com/products/seam/components" attributeFormDefault="unqualified"> + <xs:import namespace="http://jboss.com/products/seam/components" schemaLocation="components-2.1.xsd"/> + + + <xs:attributeGroup name="attlist.Home"> + <xs:attribute name="entity-class" type="xs:string"/> + <xs:attribute name="new-instance" type="xs:string"/> + <xs:attribute name="created-message" type="xs:string"/> + <xs:attribute name="updated-message" type="xs:string"/> + <xs:attribute name="deleted-message" type="xs:string"/> + </xs:attributeGroup> + + <xs:attributeGroup name="attlist.Query"> + <xs:attribute name="ejbql" type="xs:string"/> + <xs:attribute name="max-results" type="xs:integer"/> + <xs:attribute name="order" type="xs:string"/> + </xs:attributeGroup> + <xs:element name="restrictions" type="components:multiValuedProperty"/> + <xs:element name="hints" type="components:mapProperty"/> + + <xs:element name="ejbql" type="xs:string"/> + <xs:element name="order" type="xs:string"/> + + <xs:element name="entity-query"> + <xs:complexType mixed="true"> + <xs:choice minOccurs="0" maxOccurs="unbounded"> + <xs:element minOccurs="0" maxOccurs="1" ref="framework:ejbql"/> + <xs:element minOccurs="0" maxOccurs="1" ref="framework:order"/> + <xs:element minOccurs="0" maxOccurs="1" ref="framework:restrictions"/> + <xs:element minOccurs="0" maxOccurs="1" ref="framework:hints"/> + </xs:choice> + <xs:attributeGroup ref="components:attlist.component"/> + <xs:attributeGroup ref="framework:attlist.Query"/> + <xs:attributeGroup ref="framework:attlist.entityQuery"/> + </xs:complexType> + </xs:element> + <xs:attributeGroup name="attlist.entityQuery"> + <xs:attribute name="entity-manager" type="xs:string"/> + </xs:attributeGroup> + + <xs:element name="hibernate-entity-query"> + <xs:complexType mixed="true"> + <xs:choice minOccurs="0" maxOccurs="unbounded"> + <xs:element minOccurs="0" maxOccurs="1" ref="framework:ejbql"/> + <xs:element minOccurs="0" maxOccurs="1" ref="framework:order"/> + <xs:element minOccurs="0" maxOccurs="1" ref="framework:restrictions"/> + </xs:choice> + <xs:attributeGroup ref="components:attlist.component"/> + <xs:attributeGroup ref="framework:attlist.Query"/> + <xs:attributeGroup ref="framework:attlist.HibernateEntityQuery"/> + </xs:complexType> + </xs:element> + <xs:attributeGroup name="attlist.HibernateEntityQuery"> + <xs:attribute name="cacheable"> + <xs:simpleType> + <xs:restriction base="xs:token"> + <xs:enumeration value="true"/> + <xs:enumeration value="false"/> + </xs:restriction> + </xs:simpleType> + </xs:attribute> + <xs:attribute name="cache-region" type="xs:string"/> + <xs:attribute name="fetch-size" type="xs:integer"/> + <xs:attribute name="session" type="xs:string"/> + </xs:attributeGroup> + + <xs:element name="created-message" type="xs:string"/> + <xs:element name="updated-message" type="xs:string"/> + <xs:element name="deleted-message" type="xs:string"/> + <xs:element name="new-instance" type="xs:string"/> + + <xs:element name="entity-home"> + <xs:complexType mixed="true"> + <xs:choice minOccurs="0" maxOccurs="unbounded"> + <xs:element name="id" type="xs:string"/> + <xs:element minOccurs="0" maxOccurs="1" ref="framework:created-message"/> + <xs:element minOccurs="0" maxOccurs="1" ref="framework:updated-message"/> + <xs:element minOccurs="0" maxOccurs="1" ref="framework:deleted-message"/> + <xs:element minOccurs="0" maxOccurs="1" ref="framework:new-instance"/> + </xs:choice> + <xs:attributeGroup ref="components:attlist.component"/> + <xs:attributeGroup ref="framework:attlist.Home"/> + <xs:attributeGroup ref="framework:attlist.EntityHome"/> + </xs:complexType> + </xs:element> + <xs:attributeGroup name="attlist.EntityHome"> + <xs:attribute name="entity-manager" type="xs:string"/> + </xs:attributeGroup> + + <xs:element name="hibernate-entity-home"> + <xs:complexType mixed="true"> + <xs:choice minOccurs="0" maxOccurs="unbounded"> + <xs:element name="id" type="xs:string"/> + <xs:element minOccurs="0" maxOccurs="1" ref="framework:created-message"/> + <xs:element minOccurs="0" maxOccurs="1" ref="framework:updated-message"/> + <xs:element minOccurs="0" maxOccurs="1" ref="framework:deleted-message"/> + <xs:element minOccurs="0" maxOccurs="1" ref="framework:new-instance"/> + </xs:choice> + <xs:attributeGroup ref="components:attlist.component"/> + <xs:attributeGroup ref="framework:attlist.Home"/> + <xs:attributeGroup ref="framework:attlist.HibernateEntityHome"/> + </xs:complexType> + </xs:element> + <xs:attributeGroup name="attlist.HibernateEntityHome"> + <xs:attribute name="session" type="xs:string"/> + </xs:attributeGroup> + +</xs:schema> Deleted: trunk/src/main/org/jboss/seam/identity-management-2.0.xsd =================================================================== --- trunk/src/main/org/jboss/seam/identity-management-2.0.xsd 2008-02-05 18:00:10 UTC (rev 7367) +++ trunk/src/main/org/jboss/seam/identity-management-2.0.xsd 2008-02-05 19:37:56 UTC (rev 7368) @@ -1,18 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" - targetNamespace="http://jboss.com/products/seam/security/management" xmlns:identity-management="http://jboss.com/products/seam/security/management" - xmlns:components="http://jboss.com/products/seam/components" attributeFormDefault="unqualified"> - <xs:import namespace="http://jboss.com/products/seam/components" schemaLocation="components-2.0.xsd"/> - - <xs:element name="jpa-identity-store"> - <xs:complexType mixed="true"> - <xs:attributeGroup ref="components:attlist.component"/> - <xs:attributeGroup ref="security:attlist.jpa-identity-store"/> - </xs:complexType> - </xs:element> - - <xs:attributeGroup name="attlist.jpa-identity-store"> - <xs:attribute name="account-class" /> - </xs:attributeGroup> - -</xs:schema> Added: trunk/src/main/org/jboss/seam/identity-management-2.1.xsd =================================================================== --- trunk/src/main/org/jboss/seam/identity-management-2.1.xsd (rev 0) +++ trunk/src/main/org/jboss/seam/identity-management-2.1.xsd 2008-02-05 19:37:56 UTC (rev 7368) @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="UTF-8"?> +<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" + targetNamespace="http://jboss.com/products/seam/security/management" xmlns:identity-management="http://jboss.com/products/seam/security/management" + xmlns:components="http://jboss.com/products/seam/components" attributeFormDefault="unqualified"> + <xs:import namespace="http://jboss.com/products/seam/components" schemaLocation="components-2.1.xsd"/> + + <xs:element name="jpa-identity-store"> + <xs:complexType mixed="true"> + <xs:attributeGroup ref="components:attlist.component"/> + <xs:attributeGroup ref="security:attlist.jpa-identity-store"/> + </xs:complexType> + </xs:element> + + <xs:attributeGroup name="attlist.jpa-identity-store"> + <xs:attribute name="account-class" /> + </xs:attributeGroup> + +</xs:schema> Deleted: trunk/src/main/org/jboss/seam/international-2.0.xsd =================================================================== --- trunk/src/main/org/jboss/seam/international-2.0.xsd 2008-02-05 18:00:10 UTC (rev 7367) +++ trunk/src/main/org/jboss/seam/international-2.0.xsd 2008-02-05 19:37:56 UTC (rev 7368) @@ -1,45 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" - targetNamespace="http://jboss.com/products/seam/international" xmlns:international="http://jboss.com/products/seam/international" - xmlns:components="http://jboss.com/products/seam/components" attributeFormDefault="unqualified"> - <xs:import namespace="http://jboss.com/products/seam/components" schemaLocation="components-2.0.xsd"/> - - <xs:element name="locale-selector"> - <xs:complexType mixed="true"> - <xs:attributeGroup ref="components:attlist.component"/> - <xs:attributeGroup ref="international:attlist.localeSelector"/> - </xs:complexType> - </xs:element> - <xs:attributeGroup name="attlist.localeSelector"> - <xs:attribute name="locale-string"/> - <xs:attribute name="cookie-max-age"/> - <xs:attribute name="cookie-enabled"> - <xs:simpleType> - <xs:restriction base="xs:token"> - <xs:enumeration value="true"/> - <xs:enumeration value="false"/> - </xs:restriction> - </xs:simpleType> - </xs:attribute> - </xs:attributeGroup> - - <xs:element name="time-zone-selector"> - <xs:complexType mixed="true"> - <xs:attributeGroup ref="components:attlist.component"/> - <xs:attributeGroup ref="international:attlist.timeZoneSelector"/> - </xs:complexType> - </xs:element> - <xs:attributeGroup name="attlist.timeZoneSelector"> - <xs:attribute name="time-zone-id"/> - <xs:attribute name="cookie-max-age"/> - <xs:attribute name="cookie-enabled"> - <xs:simpleType> - <xs:restriction base="xs:token"> - <xs:enumeration value="true"/> - <xs:enumeration value="false"/> - </xs:restriction> - </xs:simpleType> - </xs:attribute> - </xs:attributeGroup> - -</xs:schema> Added: trunk/src/main/org/jboss/seam/international-2.1.xsd =================================================================== --- trunk/src/main/org/jboss/seam/international-2.1.xsd (rev 0) +++ trunk/src/main/org/jboss/seam/international-2.1.xsd 2008-02-05 19:37:56 UTC (rev 7368) @@ -0,0 +1,45 @@ +<?xml version="1.0" encoding="UTF-8"?> +<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" + targetNamespace="http://jboss.com/products/seam/international" xmlns:international="http://jboss.com/products/seam/international" + xmlns:components="http://jboss.com/products/seam/components" attributeFormDefault="unqualified"> + <xs:import namespace="http://jboss.com/products/seam/components" schemaLocation="components-2.1.xsd"/> + + <xs:element name="locale-selector"> + <xs:complexType mixed="true"> + <xs:attributeGroup ref="components:attlist.component"/> + <xs:attributeGroup ref="international:attlist.localeSelector"/> + </xs:complexType> + </xs:element> + <xs:attributeGroup name="attlist.localeSelector"> + <xs:attribute name="locale-string"/> + <xs:attribute name="cookie-max-age"/> + <xs:attribute name="cookie-enabled"> + <xs:simpleType> + <xs:restriction base="xs:token"> + <xs:enumeration value="true"/> + <xs:enumeration value="false"/> + </xs:restriction> + </xs:simpleType> + </xs:attribute> + </xs:attributeGroup> + + <xs:element name="time-zone-selector"> + <xs:complexType mixed="true"> + <xs:attributeGroup ref="components:attlist.component"/> + <xs:attributeGroup ref="international:attlist.timeZoneSelector"/> + </xs:complexType> + </xs:element> + <xs:attributeGroup name="attlist.timeZoneSelector"> + <xs:attribute name="time-zone-id"/> + <xs:attribute name="cookie-max-age"/> + <xs:attribute name="cookie-enabled"> + <xs:simpleType> + <xs:restriction base="xs:token"> + <xs:enumeration value="true"/> + <xs:enumeration value="false"/> + </xs:restriction> + </xs:simpleType> + </xs:attribute> + </xs:attributeGroup> + +</xs:schema> Deleted: trunk/src/main/org/jboss/seam/jms-2.0.xsd =================================================================== --- trunk/src/main/org/jboss/seam/jms-2.0.xsd 2008-02-05 18:00:10 UTC (rev 7367) +++ trunk/src/main/org/jboss/seam/jms-2.0.xsd 2008-02-05 19:37:56 UTC (rev 7368) @@ -1,46 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" - targetNamespace="http://jboss.com/products/seam/jms" xmlns:jms="http://jboss.com/products/seam/jms" - xmlns:components="http://jboss.com/products/seam/components" attributeFormDefault="unqualified"> - <xs:import namespace="http://jboss.com/products/seam/components" schemaLocation="components-2.0.xsd"/> - - <xs:element name="topic-connection"> - <xs:complexType mixed="true"> - <xs:attributeGroup ref="components:attlist.component"/> - <xs:attributeGroup ref="jms:attlist.TopicConnection"/> - </xs:complexType> - </xs:element> - <xs:attributeGroup name="attlist.TopicConnection"> - <xs:attribute name="topic-connection-factory-jndi-name" type="xs:string"/> - </xs:attributeGroup> - - <xs:element name="queue-connection"> - <xs:complexType mixed="true"> - <xs:attributeGroup ref="components:attlist.component"/> - <xs:attributeGroup ref="jms:attlist.QueueConnection"/> - </xs:complexType> - </xs:element> - <xs:attributeGroup name="attlist.QueueConnection"> - <xs:attribute name="queue-connection-factory-jndi-name" type="xs:string"/> - </xs:attributeGroup> - - <xs:element name="managed-topic-publisher"> - <xs:complexType mixed="true"> - <xs:attributeGroup ref="components:attlist.component"/> - <xs:attributeGroup ref="jms:attlist.ManagedTopicPublisher"/> - </xs:complexType> - </xs:element> - <xs:attributeGroup name="attlist.ManagedTopicPublisher"> - <xs:attribute name="topic-jndi-name" type="xs:string"/> - </xs:attributeGroup> - - <xs:element name="managed-queue-sender"> - <xs:complexType mixed="true"> - <xs:attributeGroup ref="components:attlist.component"/> - <xs:attributeGroup ref="jms:attlist.ManagedQueueSender"/> - </xs:complexType> - </xs:element> - <xs:attributeGroup name="attlist.ManagedQueueSender"> - <xs:attribute name="queue-jndi-name" type="xs:string"/> - </xs:attributeGroup> -</xs:schema> Added: trunk/src/main/org/jboss/seam/jms-2.1.xsd =================================================================== --- trunk/src/main/org/jboss/seam/jms-2.1.xsd (rev 0) +++ trunk/src/main/org/jboss/seam/jms-2.1.xsd 2008-02-05 19:37:56 UTC (rev 7368) @@ -0,0 +1,46 @@ +<?xml version="1.0" encoding="UTF-8"?> +<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" + targetNamespace="http://jboss.com/products/seam/jms" xmlns:jms="http://jboss.com/products/seam/jms" + xmlns:components="http://jboss.com/products/seam/components" attributeFormDefault="unqualified"> + <xs:import namespace="http://jboss.com/products/seam/components" schemaLocation="components-2.1.xsd"/> + + <xs:element name="topic-connection"> + <xs:complexType mixed="true"> + <xs:attributeGroup ref="components:attlist.component"/> + <xs:attributeGroup ref="jms:attlist.TopicConnection"/> + </xs:complexType> + </xs:element> + <xs:attributeGroup name="attlist.TopicConnection"> + <xs:attribute name="topic-connection-factory-jndi-name" type="xs:string"/> + </xs:attributeGroup> + + <xs:element name="queue-connection"> + <xs:complexType mixed="true"> + <xs:attributeGroup ref="components:attlist.component"/> + <xs:attributeGroup ref="jms:attlist.QueueConnection"/> + </xs:complexType> + </xs:element> + <xs:attributeGroup name="attlist.QueueConnection"> + <xs:attribute name="queue-connection-factory-jndi-name" type="xs:string"/> + </xs:attributeGroup> + + <xs:element name="managed-topic-publisher"> + <xs:complexType mixed="true"> + <xs:attributeGroup ref="components:attlist.component"/> + <xs:attributeGroup ref="jms:attlist.ManagedTopicPublisher"/> + </xs:complexType> + </xs:element> + <xs:attributeGroup name="attlist.ManagedTopicPublisher"> + <xs:attribute name="topic-jndi-name" type="xs:string"/> + </xs:attributeGroup> + + <xs:element name="managed-queue-sender"> + <xs:complexType mixed="true"> + <xs:attributeGroup ref="components:attlist.component"/> + <xs:attributeGroup ref="jms:attlist.ManagedQueueSender"/> + </xs:complexType> + </xs:element> + <xs:attributeGroup name="attlist.ManagedQueueSender"> + <xs:attribute name="queue-jndi-name" type="xs:string"/> + </xs:attributeGroup> +</xs:schema> Deleted: trunk/src/main/org/jboss/seam/mail-2.0.xsd =================================================================== --- trunk/src/main/org/jboss/seam/mail-2.0.xsd 2008-02-05 18:00:10 UTC (rev 7367) +++ trunk/src/main/org/jboss/seam/mail-2.0.xsd 2008-02-05 19:37:56 UTC (rev 7368) @@ -1,50 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" - targetNamespace="http://jboss.com/products/seam/mail" - xmlns:mail="http://jboss.com/products/seam/mail" - xmlns:components="http://jboss.com/products/seam/components" attributeFormDefault="unqualified"> - <xs:import namespace="http://jboss.com/products/seam/components" schemaLocation="components-2.0.xsd"/> - - <xs:attributeGroup name="attlist.mailSession"> - <xs:attribute name="username" type="xs:string"/> - <xs:attribute name="password" type="xs:string"/> - <xs:attribute name="host" type="xs:string" default="localhost"/> - <xs:attribute name="port" type="xs:string" /> - <xs:attribute name="debug" type="xs:string" default="false" /> - <xs:attribute name="ssl" type="xs:boolean" default="false" /> - <xs:attribute name="tls" type="xs:boolean" default="true" /> - <xs:attribute name="session-jndi-name" type="xs:string" /> - </xs:attributeGroup> - <xs:element name="mail-session"> - <xs:complexType> - <xs:attributeGroup ref="components:attlist.component" /> - <xs:attributeGroup ref="mail:attlist.mailSession" /> - </xs:complexType> - </xs:element> - - <xs:element name="users" type="components:multiValuedProperty"/> - <xs:element name="meldware"> - <xs:complexType> - <xs:choice minOccurs="0" maxOccurs="unbounded"> - <xs:element ref="mail:users" /> - </xs:choice> - <xs:attributeGroup ref="components:attlist.component" /> - </xs:complexType> - </xs:element> - - <xs:element name="aliases" type="components:multiValuedProperty"/> - <xs:attributeGroup name="attlist.meldwareUser"> - <xs:attribute name="username" type="xs:string" /> - <xs:attribute name="password" type="xs:string" /> - <xs:attribute name="administrator" type="xs:boolean" default="false"/> - </xs:attributeGroup> - <xs:element name="meldware-user"> - <xs:complexType> - <xs:choice minOccurs="0" maxOccurs="unbounded"> - <xs:element ref="mail:aliases" /> - </xs:choice> - <xs:attributeGroup ref="components:attlist.component" /> - <xs:attributeGroup ref="mail:attlist.meldwareUser" /> - </xs:complexType> - </xs:element> -</xs:schema> Added: trunk/src/main/org/jboss/seam/mail-2.1.xsd =================================================================== --- trunk/src/main/org/jboss/seam/mail-2.1.xsd (rev 0) +++ trunk/src/main/org/jboss/seam/mail-2.1.xsd 2008-02-05 19:37:56 UTC (rev 7368) @@ -0,0 +1,50 @@ +<?xml version="1.0" encoding="UTF-8"?> +<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" + targetNamespace="http://jboss.com/products/seam/mail" + xmlns:mail="http://jboss.com/products/seam/mail" + xmlns:components="http://jboss.com/products/seam/components" attributeFormDefault="unqualified"> + <xs:import namespace="http://jboss.com/products/seam/components" schemaLocation="components-2.1.xsd"/> + + <xs:attributeGroup name="attlist.mailSession"> + <xs:attribute name="username" type="xs:string"/> + <xs:attribute name="password" type="xs:string"/> + <xs:attribute name="host" type="xs:string" default="localhost"/> + <xs:attribute name="port" type="xs:string" /> + <xs:attribute name="debug" type="xs:string" default="false" /> + <xs:attribute name="ssl" type="xs:boolean" default="false" /> + <xs:attribute name="tls" type="xs:boolean" default="true" /> + <xs:attribute name="session-jndi-name" type="xs:string" /> + </xs:attributeGroup> + <xs:element name="mail-session"> + <xs:complexType> + <xs:attributeGroup ref="components:attlist.component" /> + <xs:attributeGroup ref="mail:attlist.mailSession" /> + </xs:complexType> + </xs:element> + + <xs:element name="users" type="components:multiValuedProperty"/> + <xs:element name="meldware"> + <xs:complexType> + <xs:choice minOccurs="0" maxOccurs="unbounded"> + <xs:element ref="mail:users" /> + </xs:choice> + <xs:attributeGroup ref="components:attlist.component" /> + </xs:complexType> + </xs:element> + + <xs:element name="aliases" type="components:multiValuedProperty"/> + <xs:attributeGroup name="attlist.meldwareUser"> + <xs:attribute name="username" type="xs:string" /> + <xs:attribute name="password" type="xs:string" /> + <xs:attribute name="administrator" type="xs:boolean" default="false"/> + </xs:attributeGroup> + <xs:element name="meldware-user"> + <xs:complexType> + <xs:choice minOccurs="0" maxOccurs="unbounded"> + <xs:element ref="mail:aliases" /> + </xs:choice> + <xs:attributeGroup ref="components:attlist.component" /> + <xs:attributeGroup ref="mail:attlist.meldwareUser" /> + </xs:complexType> + </xs:element> +</xs:schema> Deleted: trunk/src/main/org/jboss/seam/navigation-2.0.xsd =================================================================== --- trunk/src/main/org/jboss/seam/navigation-2.0.xsd 2008-02-05 18:00:10 UTC (rev 7367) +++ trunk/src/main/org/jboss/seam/navigation-2.0.xsd 2008-02-05 19:37:56 UTC (rev 7368) @@ -1,26 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" - targetNamespace="http://jboss.com/products/seam/navigation" xmlns:navigation="http://jboss.com/products/seam/navigation" - xmlns:components="http://jboss.com/products/seam/components" attributeFormDefault="unqualified"> - <xs:import namespace="http://jboss.com/products/seam/components" schemaLocation="components-2.0.xsd"/> - - <xs:element name="pages"> - <xs:complexType mixed="true"> - <xs:choice minOccurs="0" maxOccurs="1"> - <xs:element ref="navigation:resources"/> - </xs:choice> - <xs:attributeGroup ref="components:attlist.component"/> - <xs:attributeGroup ref="navigation:attlist.pages"/> - </xs:complexType> - </xs:element> - - <xs:element name="resources" type="components:multiValuedProperty"/> - - <xs:attributeGroup name="attlist.pages"> - <xs:attribute name="no-conversation-view-id"/> - <xs:attribute name="login-view-id"/> - <xs:attribute name="http-port" type="xs:integer"/> - <xs:attribute name="https-port" type="xs:integer"/> - </xs:attributeGroup> - -</xs:schema> Added: trunk/src/main/org/jboss/seam/navigation-2.1.xsd =================================================================== --- trunk/src/main/org/jboss/seam/navigation-2.1.xsd (rev 0) +++ trunk/src/main/org/jboss/seam/navigation-2.1.xsd 2008-02-05 19:37:56 UTC (rev 7368) @@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="UTF-8"?> +<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" + targetNamespace="http://jboss.com/products/seam/navigation" xmlns:navigation="http://jboss.com/products/seam/navigation" + xmlns:components="http://jboss.com/products/seam/components" attributeFormDefault="unqualified"> + <xs:import namespace="http://jboss.com/products/seam/components" schemaLocation="components-2.1.xsd"/> + + <xs:element name="pages"> + <xs:complexType mixed="true"> + <xs:choice minOccurs="0" maxOccurs="1"> + <xs:element ref="navigation:resources"/> + </xs:choice> + <xs:attributeGroup ref="components:attlist.component"/> + <xs:attributeGroup ref="navigation:attlist.pages"/> + </xs:complexType> + </xs:element> + + <xs:element name="resources" type="components:multiValuedProperty"/> + + <xs:attributeGroup name="attlist.pages"> + <xs:attribute name="no-conversation-view-id"/> + <xs:attribute name="login-view-id"/> + <xs:attribute name="http-port" type="xs:integer"/> + <xs:attribute name="https-port" type="xs:integer"/> + </xs:attributeGroup> + +</xs:schema> Deleted: trunk/src/main/org/jboss/seam/pageflow-2.0.xsd =================================================================== --- trunk/src/main/org/jboss/seam/pageflow-2.0.xsd 2008-02-05 18:00:10 UTC (rev 7367) +++ trunk/src/main/org/jboss/seam/pageflow-2.0.xsd 2008-02-05 19:37:56 UTC (rev 7368) @@ -1,325 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<xs:schema xmlns="http://jboss.com/products/seam/pageflow" - targetNamespace="http://jboss.com/products/seam/pageflow" - xmlns:xs="http://www.w3.org/2001/XMLSchema" - elementFormDefault="qualified"> - -  -  - <xs:element name="pageflow-definition"> - <xs:complexType> - <xs:choice minOccurs="0" maxOccurs="unbounded"> - <xs:group ref="start-node-elements" /> - <xs:group ref="node-elements" /> - <xs:group ref="end-node-elements" /> - <xs:group ref="action-elements" /> - <xs:element ref="event" /> - <xs:element ref="exception-handler" /> - </xs:choice> - <xs:attribute name="name" type="xs:string" use="required" /> - <xs:attribute name="start-page" type="xs:string" /> - </xs:complexType> - </xs:element> - -  -  - <xs:element name="start-state"> - <xs:complexType> - <xs:choice minOccurs="0" maxOccurs="unbounded"> - <xs:element ref="transition" /> - <xs:element ref="event" /> - <xs:element ref="exception-handler" /> - </xs:choice> - <xs:attribute name="name" type="xs:string" /> - </xs:complexType> - </xs:element> - - <xs:element name="end-state"> - <xs:complexType> - <xs:choice minOccurs="0" maxOccurs="unbounded"> - <xs:element ref="event" /> - <xs:element ref="exception-handler" /> - </xs:choice> - <xs:attribute name="name" type="xs:string" use="required" /> - </xs:complexType> - </xs:element> - - <xs:element name="process-state"> - <xs:complexType> - <xs:choice minOccurs="0" maxOccurs="unbounded"> - <xs:element ref="sub-process" /> - <xs:element ref="transition" /> - <xs:element ref="event" /> - <xs:element ref="exception-handler" /> - </xs:choice> - <xs:attribute name="name" type="xs:string" /> - <xs:attribute name="binding" type="bindingType" /> - </xs:complexType> - </xs:element> - - <xs:element name="sub-process"> - <xs:complexType> - <xs:attribute name="name" type="xs:string" use="required" /> - <xs:attribute name="version" type="xs:integer" /> - - </xs:complexType> - </xs:element> - - <xs:element name="start-page"> - <xs:complexType> - <xs:choice minOccurs="0" maxOccurs="unbounded"> - <xs:group ref="page-elements" /> - </xs:choice> - <xs:attributeGroup ref="page-attributes" /> - </xs:complexType> - </xs:element> - - <xs:element name="decision"> - <xs:complexType> - <xs:choice minOccurs="0" maxOccurs="unbounded"> - <xs:element name="handler" type="delegation" /> - <xs:element ref="event" /> - <xs:element ref="exception-handler" /> - <xs:element name="transition"> - <xs:complexType> - <xs:choice minOccurs="0" - maxOccurs="unbounded"> - <xs:element name="condition"> - <xs:complexType mixed="true"> - <xs:sequence minOccurs="0" - maxOccurs="unbounded"> - <xs:any processContents="lax" - minOccurs="0" maxOccurs="unbounded" /> - </xs:sequence> - <xs:attribute name="expression" - type="xs:string" /> - </xs:complexType> - </xs:element> - <xs:group ref="action-elements" /> - <xs:element ref="exception-handler" /> - </xs:choice> - <xs:attribute name="to" type="xs:string" - use="required" /> - <xs:attribute name="name" type="xs:string" /> - </xs:complexType> - </xs:element> - </xs:choice> - <xs:attribute name="name" type="xs:string" use="required" /> - <xs:attribute name="expression" type="xs:string" /> - </xs:complexType> - </xs:element> - - <xs:element name="page"> - <xs:complexType> - <xs:sequence> - <xs:choice minOccurs="0" maxOccurs="1"> - <xs:element ref="end-conversation" /> - </xs:choice> - <xs:choice minOccurs="0" maxOccurs="1"> - <xs:element ref="end-task" /> - </xs:choice> - <xs:group ref="page-elements" /> - </xs:sequence> - <xs:attributeGroup ref="page-attributes" /> - </xs:complexType> - </xs:element> - - <xs:element name="redirect" /> - <xs:element name="description" type="xs:string" /> - - <xs:element name="end-conversation"> - <xs:complexType> - <xs:attribute name="before-redirect" type="booleanType" /> - <xs:attribute name="create-process" type="xs:string" /> - </xs:complexType> - </xs:element> - - <xs:element name="end-task"> - <xs:complexType> - <xs:attribute name="transition" type="xs:string" /> - </xs:complexType> - </xs:element> - -  -  - <xs:element name="transition"> - <xs:complexType> - <xs:choice minOccurs="0" maxOccurs="unbounded"> - <xs:group ref="action-elements" /> - <xs:element ref="exception-handler" /> - </xs:choice> - <xs:attribute name="to" type="xs:string" use="required" /> - <xs:attribute name="name" type="xs:string" /> - </xs:complexType> - </xs:element> - -  -  - <xs:element name="action"> - <xs:complexType mixed="true"> - <xs:sequence> - <xs:any processContents="lax" minOccurs="0" - maxOccurs="unbounded" /> - </xs:sequence> - <xs:attribute name="class" type="xs:string" /> - <xs:attribute name="config-type" default="field" type="xs:string" /> - <xs:attribute name="name" type="xs:string" /> - <xs:attribute name="ref-name" type="xs:string" /> - <xs:attribute name="accept-propagated-events" - type="booleanType" default="true" /> - <xs:attribute name="expression" type="xs:string" /> - </xs:complexType> - </xs:element> - - <xs:element name="script"> - <xs:complexType mixed="true"> - <xs:sequence> - <xs:any processContents="lax" minOccurs="0" - maxOccurs="unbounded" /> - </xs:sequence> - <xs:attribute name="name" type="xs:string" /> - <xs:attribute name="accept-propagated-events" - type="booleanType" default="true" /> - </xs:complexType> - </xs:element> - -  -  - <xs:element name="event"> - <xs:complexType> - <xs:choice minOccurs="0" maxOccurs="unbounded"> - <xs:group ref="action-elements" /> - </xs:choice> - <xs:attribute name="type" use="required"> - <xs:simpleType> - <xs:union> - <xs:simpleType> - <xs:restriction base="xs:string" /> - </xs:simpleType> - <xs:simpleType> - <xs:restriction base="xs:string"> - <xs:enumeration value="node-enter" /> - <xs:enumeration value="node-leave" /> - <xs:enumeration value="process-start" /> - <xs:enumeration value="process-end" /> - <xs:enumeration value="task-create" /> - <xs:enumeration value="task-assign" /> - <xs:enumeration value="task-start" /> - <xs:enumeration value="task-end" /> - <xs:enumeration value="before-signal" /> - <xs:enumeration value="after-signal" /> - </xs:restriction> - </xs:simpleType> - </xs:union> - </xs:simpleType> - </xs:attribute> - </xs:complexType> - </xs:element> - -  -  - <xs:element name="exception-handler"> - <xs:complexType> - <xs:choice minOccurs="1" maxOccurs="unbounded"> - <xs:element ref="action" /> - <xs:element ref="script" /> - </xs:choice> - <xs:attribute name="exception-class" type="xs:string" /> - </xs:complexType> - </xs:element> - -  -  - <xs:complexType name="delegation" mixed="true"> - <xs:sequence> - <xs:any processContents="lax" minOccurs="0" - maxOccurs="unbounded" /> - </xs:sequence> - <xs:attribute name="class" type="xs:string" /> - <xs:attribute name="config-type" default="field" type="xs:string" /> - </xs:complexType> - - <xs:simpleType name="configType"> - <xs:restriction base="xs:string"> - <xs:enumeration value="field" /> - <xs:enumeration value="bean" /> - <xs:enumeration value="constructor" /> - <xs:enumeration value="configuration-property" /> - </xs:restriction> - </xs:simpleType> - - <xs:simpleType name="booleanType"> - <xs:restriction base="xs:string"> - <xs:enumeration value="yes" /> - <xs:enumeration value="no" /> - <xs:enumeration value="true" /> - <xs:enumeration value="false" /> - <xs:enumeration value="on" /> - <xs:enumeration value="off" /> - </xs:restriction> - </xs:simpleType> - - <xs:simpleType name="enabledType"> - <xs:restriction base="xs:string"> - <xs:enumeration value="enabled" /> - <xs:enumeration value="disabled" /> - </xs:restriction> - </xs:simpleType> - - <xs:group name="start-node-elements"> - <xs:choice> - <xs:element ref="start-state" /> - <xs:element ref="start-page" /> - </xs:choice> - </xs:group> - - <xs:group name="node-elements"> - <xs:choice> - <xs:element ref="page" /> - <xs:element ref="decision" /> - <xs:element ref="process-state" /> - </xs:choice> - </xs:group> - - <xs:group name="end-node-elements"> - <xs:choice> - <xs:element ref="end-state" /> - </xs:choice> - </xs:group> - - <xs:group name="action-elements"> - <xs:choice> - <xs:element ref="action" /> - </xs:choice> - </xs:group> - - <xs:group name="page-elements"> - <xs:sequence> - <xs:element ref="description" maxOccurs="1" minOccurs="0"/> - <xs:element ref="redirect" maxOccurs="1" minOccurs="0"/> - <xs:element ref="event" minOccurs="0" maxOccurs="unbounded"/> - <xs:element ref="exception-handler" minOccurs="0" maxOccurs="unbounded"/> - <xs:element ref="transition" maxOccurs="unbounded" minOccurs="0"/> - <xs:group ref="action-elements" minOccurs="0" maxOccurs="1" /> - </xs:sequence> - </xs:group> - - <xs:attributeGroup name="page-attributes"> - <xs:attribute name="redirect" type="xs:boolean" /> - <xs:attribute name="switch" type="enabledType" /> - <xs:attribute name="no-conversation-view-id" type="xs:string" /> - <xs:attribute name="timeout" type="xs:int" /> - <xs:attribute name="back" type="enabledType" /> - <xs:attribute name="view-id" type="xs:string" use="required" /> - <xs:attribute name="name" type="xs:string" use="required" /> - </xs:attributeGroup> - - <xs:simpleType name="bindingType"> - <xs:restriction base="xs:string"> - <xs:enumeration value="late" /> - <xs:enumeration value="early" /> - </xs:restriction> - </xs:simpleType> - -</xs:schema> Added: trunk/src/main/org/jboss/seam/pageflow-2.1.xsd =================================================================== --- trunk/src/main/org/jboss/seam/pageflow-2.1.xsd (rev 0) +++ trunk/src/main/org/jboss/seam/pageflow-2.1.xsd 2008-02-05 19:37:56 UTC (rev 7368) @@ -0,0 +1,325 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<xs:schema xmlns="http://jboss.com/products/seam/pageflow" + targetNamespace="http://jboss.com/products/seam/pageflow" + xmlns:xs="http://www.w3.org/2001/XMLSchema" + elementFormDefault="qualified"> + +  +  + <xs:element name="pageflow-definition"> + <xs:complexType> + <xs:choice minOccurs="0" maxOccurs="unbounded"> + <xs:group ref="start-node-elements" /> + <xs:group ref="node-elements" /> + <xs:group ref="end-node-elements" /> + <xs:group ref="action-elements" /> + <xs:element ref="event" /> + <xs:element ref="exception-handler" /> + </xs:choice> + <xs:attribute name="name" type="xs:string" use="required" /> + <xs:attribute name="start-page" type="xs:string" /> + </xs:complexType> + </xs:element> + +  +  + <xs:element name="start-state"> + <xs:complexType> + <xs:choice minOccurs="0" maxOccurs="unbounded"> + <xs:element ref="transition" /> + <xs:element ref="event" /> + <xs:element ref="exception-handler" /> + </xs:choice> + <xs:attribute name="name" type="xs:string" /> + </xs:complexType> + </xs:element> + + <xs:element name="end-state"> + <xs:complexType> + <xs:choice minOccurs="0" maxOccurs="unbounded"> + <xs:element ref="event" /> + <xs:element ref="exception-handler" /> + </xs:choice> + <xs:attribute name="name" type="xs:string" use="required" /> + </xs:complexType> + </xs:element> + + <xs:element name="process-state"> + <xs:complexType> + <xs:choice minOccurs="0" maxOccurs="unbounded"> + <xs:element ref="sub-process" /> + <xs:element ref="transition" /> + <xs:element ref="event" /> + <xs:element ref="exception-handler" /> + </xs:choice> + <xs:attribute name="name" type="xs:string" /> + <xs:attribute name="binding" type="bindingType" /> + </xs:complexType> + </xs:element> + + <xs:element name="sub-process"> + <xs:complexType> + <xs:attribute name="name" type="xs:string" use="required" /> + <xs:attribute name="version" type="xs:integer" /> + + </xs:complexType> + </xs:element> + + <xs:element name="start-page"> + <xs:complexType> + <xs:choice minOccurs="0" maxOccurs="unbounded"> + <xs:group ref="page-elements" /> + </xs:choice> + <xs:attributeGroup ref="page-attributes" /> + </xs:complexType> + </xs:element> + + <xs:element name="decision"> + <xs:complexType> + <xs:choice minOccurs="0" maxOccurs="unbounded"> + <xs:element name="handler" type="delegation" /> + <xs:element ref="event" /> + <xs:element ref="exception-handler" /> + <xs:element name="transition"> + <xs:complexType> + <xs:choice minOccurs="0" + maxOccurs="unbounded"> + <xs:element name="condition"> + <xs:complexType mixed="true"> + <xs:sequence minOccurs="0" + maxOccurs="unbounded"> + <xs:any processContents="lax" + minOccurs="0" maxOccurs="unbounded" /> + </xs:sequence> + <xs:attribute name="expression" + type="xs:string" /> + </xs:complexType> + </xs:element> + <xs:group ref="action-elements" /> + <xs:element ref="exception-handler" /> + </xs:choice> + <xs:attribute name="to" type="xs:string" + use="required" /> + <xs:attribute name="name" type="xs:string" /> + </xs:complexType> + </xs:element> + </xs:choice> + <xs:attribute name="name" type="xs:string" use="required" /> + <xs:attribute name="expression" type="xs:string" /> + </xs:complexType> + </xs:element> + + <xs:element name="page"> + <xs:complexType> + <xs:sequence> + <xs:choice minOccurs="0" maxOccurs="1"> + <xs:element ref="end-conversation" /> + </xs:choice> + <xs:choice minOccurs="0" maxOccurs="1"> + <xs:element ref="end-task" /> + </xs:choice> + <xs:group ref="page-elements" /> + </xs:sequence> + <xs:attributeGroup ref="page-attributes" /> + </xs:complexType> + </xs:element> + + <xs:element name="redirect" /> + <xs:element name="description" type="xs:string" /> + + <xs:element name="end-conversation"> + <xs:complexType> + <xs:attribute name="before-redirect" type="booleanType" /> + <xs:attribute name="create-process" type="xs:string" /> + </xs:complexType> + </xs:element> + + <xs:element name="end-task"> + <xs:complexType> + <xs:attribute name="transition" type="xs:string" /> + </xs:complexType> + </xs:element> + +  +  + <xs:element name="transition"> + <xs:complexType> + <xs:choice minOccurs="0" maxOccurs="unbounded"> + <xs:group ref="action-elements" /> + <xs:element ref="exception-handler" /> + </xs:choice> + <xs:attribute name="to" type="xs:string" use="required" /> + <xs:attribute name="name" type="xs:string" /> + </xs:complexType> + </xs:element> + +  +  + <xs:element name="action"> + <xs:complexType mixed="true"> + <xs:sequence> + <xs:any processContents="lax" minOccurs="0" + maxOccurs="unbounded" /> + </xs:sequence> + <xs:attribute name="class" type="xs:string" /> + <xs:attribute name="config-type" default="field" type="xs:string" /> + <xs:attribute name="name" type="xs:string" /> + <xs:attribute name="ref-name" type="xs:string" /> + <xs:attribute name="accept-propagated-events" + type="booleanType" default="true" /> + <xs:attribute name="expression" type="xs:string" /> + </xs:complexType> + </xs:element> + + <xs:element name="script"> + <xs:complexType mixed="true"> + <xs:sequence> + <xs:any processContents="lax" minOccurs="0" + maxOccurs="unbounded" /> + </xs:sequence> + <xs:attribute name="name" type="xs:string" /> + <xs:attribute name="accept-propagated-events" + type="booleanType" default="true" /> + </xs:complexType> + </xs:element> + +  +  + <xs:element name="event"> + <xs:complexType> + <xs:choice minOccurs="0" maxOccurs="unbounded"> + <xs:group ref="action-elements" /> + </xs:choice> + <xs:attribute name="type" use="required"> + <xs:simpleType> + <xs:union> + <xs:simpleType> + <xs:restriction base="xs:string" /> + </xs:simpleType> + <xs:simpleType> + <xs:restriction base="xs:string"> + <xs:enumeration value="node-enter" /> + <xs:enumeration value="node-leave" /> + <xs:enumeration value="process-start" /> + <xs:enumeration value="process-end" /> + <xs:enumeration value="task-create" /> + <xs:enumeration value="task-assign" /> + <xs:enumeration value="task-start" /> + <xs:enumeration value="task-end" /> + <xs:enumeration value="before-signal" /> + <xs:enumeration value="after-signal" /> + </xs:restriction> + </xs:simpleType> + </xs:union> + </xs:simpleType> + </xs:attribute> + </xs:complexType> + </xs:element> + +  +  + <xs:element name="exception-handler"> + <xs:complexType> + <xs:choice minOccurs="1" maxOccurs="unbounded"> + <xs:element ref="action" /> + <xs:element ref="script" /> + </xs:choice> + <xs:attribute name="exception-class" type="xs:string" /> + </xs:complexType> + </xs:element> + +  +  + <xs:complexType name="delegation" mixed="true"> + <xs:sequence> + <xs:any processContents="lax" minOccurs="0" + maxOccurs="unbounded" /> + </xs:sequence> + <xs:attribute name="class" type="xs:string" /> + <xs:attribute name="config-type" default="field" type="xs:string" /> + </xs:complexType> + + <xs:simpleType name="configType"> + <xs:restriction base="xs:string"> + <xs:enumeration value="field" /> + <xs:enumeration value="bean" /> + <xs:enumeration value="constructor" /> + <xs:enumeration value="configuration-property" /> + </xs:restriction> + </xs:simpleType> + + <xs:simpleType name="booleanType"> + <xs:restriction base="xs:string"> + <xs:enumeration value="yes" /> + <xs:enumeration value="no" /> + <xs:enumeration value="true" /> + <xs:enumeration value="false" /> + <xs:enumeration value="on" /> + <xs:enumeration value="off" /> + </xs:restriction> + </xs:simpleType> + + <xs:simpleType name="enabledType"> + <xs:restriction base="xs:string"> + <xs:enumeration value="enabled" /> + <xs:enumeration value="disabled" /> + </xs:restriction> + </xs:simpleType> + + <xs:group name="start-node-elements"> + <xs:choice> + <xs:element ref="start-state" /> + <xs:element ref="start-page" /> + </xs:choice> + </xs:group> + + <xs:group name="node-elements"> + <xs:choice> + <xs:element ref="page" /> + <xs:element ref="decision" /> + <xs:element ref="process-state" /> + </xs:choice> + </xs:group> + + <xs:group name="end-node-elements"> + <xs:choice> + <xs:element ref="end-state" /> + </xs:choice> + </xs:group> + + <xs:group name="action-elements"> + <xs:choice> + <xs:element ref="action" /> + </xs:choice> + </xs:group> + + <xs:group name="page-elements"> + <xs:sequence> + <xs:element ref="description" maxOccurs="1" minOccurs="0"/> + <xs:element ref="redirect" maxOccurs="1" minOccurs="0"/> + <xs:element ref="event" minOccurs="0" maxOccurs="unbounded"/> + <xs:element ref="exception-handler" minOccurs="0" maxOccurs="unbounded"/> + <xs:element ref="transition" maxOccurs="unbounded" minOccurs="0"/> + <xs:group ref="action-elements" minOccurs="0" maxOccurs="1" /> + </xs:sequence> + </xs:group> + + <xs:attributeGroup name="page-attributes"> + <xs:attribute name="redirect" type="xs:boolean" /> + <xs:attribute name="switch" type="enabledType" /> + <xs:attribute name="no-conversation-view-id" type="xs:string" /> + <xs:attribute name="timeout" type="xs:int" /> + <xs:attribute name="back" type="enabledType" /> + <xs:attribute name="view-id" type="xs:string" use="required" /> + <xs:attribute name="name" type="xs:string" use="required" /> + </xs:attributeGroup> + + <xs:simpleType name="bindingType"> + <xs:restriction base="xs:string"> + <xs:enumeration value="late" /> + <xs:enumeration value="early" /> + </xs:restriction> + </xs:simpleType> + +</xs:schema> Deleted: trunk/src/main/org/jboss/seam/pages-2.0.dtd =================================================================== --- trunk/src/main/org/jboss/seam/pages-2.0.dtd 2008-02-05 18:00:10 UTC (rev 7367) +++ trunk/src/main/org/jboss/seam/pages-2.0.dtd 2008-02-05 19:37:56 UTC (rev 7368) @@ -1,113 +0,0 @@ - - -<!ELEMENT pages ((conversation|page)*,exception*)> -<!ATTLIST pages no-conversation-view-id CDATA #IMPLIED> -<!ATTLIST pages login-view-id CDATA #IMPLIED> - -<!ELEMENT exception (end-conversation?,(http-error|redirect))> -<!ATTLIST exception class CDATA #IMPLIED> - -<!ELEMENT conversation EMPTY> -<!ATTLIST conversation name CDATA #REQUIRED> -<!ATTLIST conversation parameter-name CDATA #REQUIRED> -<!ATTLIST conversation parameter-value CDATA #IMPLIED> - -<!ELEMENT page (#PCDATA|restrict|description|param|begin-conversation|end-conversation|start-task|begin-task|end-task|create-process|resume-process|in|raise-event|action|navigation)*> -<!ATTLIST page action CDATA #IMPLIED> -<!ATTLIST page view-id CDATA #IMPLIED> -<!ATTLIST page switch (enabled|disabled) "enabled"> -<!ATTLIST page no-conversation-view-id CDATA #IMPLIED> -<!ATTLIST page conversation-required (true|false) "false"> -<!ATTLIST page login-required (true|false) "false"> -<!ATTLIST page scheme CDATA #IMPLIED> -<!ATTLIST page timeout CDATA #IMPLIED> -<!ATTLIST page bundle CDATA #IMPLIED> -<!ATTLIST page conversation CDATA #IMPLIED> - -<!ELEMENT param EMPTY> -<!ATTLIST param name CDATA #IMPLIED> -<!ATTLIST param value CDATA #IMPLIED> -<!ATTLIST param converter CDATA #IMPLIED> -<!ATTLIST param converterId CDATA #IMPLIED> -<!ATTLIST param validator CDATA #IMPLIED> -<!ATTLIST param validatorId CDATA #IMPLIED> -<!ATTLIST param required (true|false) "false"> - -<!ELEMENT action EMPTY> -<!ATTLIST action if CDATA #IMPLIED> -<!ATTLIST action execute CDATA #REQUIRED> - -<!ELEMENT restrict (#PCDATA)> - -<!ELEMENT navigation (((begin-conversation|end-conversation|start-task|begin-task|end-task|create-process|resume-process)?,(out*),raise-event?,(render|redirect)?)|(rule*))> -<!ATTLIST navigation from-action CDATA #IMPLIED> -<!ATTLIST navigation evaluate CDATA #IMPLIED> - -<!ELEMENT rule ((begin-conversation|end-conversation|start-task|begin-task|end-task|create-process|resume-process)?,(out*),raise-event?,(render|redirect)?)> -<!ATTLIST rule if-outcome CDATA #IMPLIED> -<!ATTLIST rule if CDATA #IMPLIED> - -<!ELEMENT raise-event EMPTY> -<!ATTLIST raise-event type CDATA #REQUIRED> - -<!ELEMENT begin-conversation EMPTY> -<!ATTLIST begin-conversation join (true|false) "false"> -<!ATTLIST begin-conversation nested (true|false) "false"> -<!ATTLIST begin-conversation pageflow CDATA #IMPLIED> -<!ATTLIST begin-conversation flush-mode (manual|auto|commit|MANUAL|AUTO|COMMIT) #IMPLIED> -<!ATTLIST begin-conversation if CDATA #IMPLIED> - -<!ELEMENT end-conversation EMPTY> -<!ATTLIST end-conversation before-redirect (true|false) "false"> -<!ATTLIST end-conversation if CDATA #IMPLIED> - -<!ELEMENT begin-task EMPTY> -<!ATTLIST begin-task task-id CDATA #IMPLIED> -<!ATTLIST begin-task pageflow CDATA #IMPLIED> -<!ATTLIST begin-task flush-mode (manual|auto|commit|MANUAL|AUTO|COMMIT) #IMPLIED> - -<!ELEMENT start-task EMPTY> -<!ATTLIST start-task task-id CDATA #IMPLIED> -<!ATTLIST start-task pageflow CDATA #IMPLIED> -<!ATTLIST start-task flush-mode (manual|auto|commit|MANUAL|AUTO|COMMIT) #IMPLIED> - -<!ELEMENT end-task EMPTY> -<!ATTLIST end-task transition CDATA #IMPLIED> -<!ATTLIST end-task before-redirect (true|false) "false"> - -<!ELEMENT create-process EMPTY> -<!ATTLIST create-process definition CDATA #IMPLIED> - -<!ELEMENT resume-process EMPTY> -<!ATTLIST resume-process process-id CDATA #IMPLIED> - -<!ELEMENT in EMPTY> -<!ATTLIST in name CDATA #REQUIRED> -<!ATTLIST in scope (stateless|event|page|conversation|session|business_process|application|STATELESS|EVENT|PAGE|CONVERSATION|SESSION|BUSINESS_PROCESS|APPLICATION) #IMPLIED> -<!ATTLIST in value CDATA #REQUIRED> - -<!ELEMENT out EMPTY> -<!ATTLIST out name CDATA #REQUIRED> -<!ATTLIST out scope (stateless|event|page|conversation|session|business_process|application|STATELESS|EVENT|PAGE|CONVERSATION|SESSION|BUSINESS_PROCESS|APPLICATION) "CONVERSATION"> -<!ATTLIST out value CDATA #REQUIRED> - -<!ELEMENT render (message?)> -<!ATTLIST render view-id CDATA #IMPLIED> - -<!ELEMENT redirect (message?,param*)> -<!ATTLIST redirect view-id CDATA #IMPLIED> - -<!ELEMENT http-error (message?)> -<!ATTLIST http-error error-code CDATA #IMPLIED> - -<!ELEMENT message (#PCDATA)> -<!ATTLIST message for CDATA #IMPLIED> -<!ATTLIST message severity (info|warn|error|fatal|INFO|WARN|ERROR|FATAL) "INFO"> - -<!ELEMENT description (#PCDATA)> Deleted: trunk/src/main/org/jboss/seam/pages-2.0.xsd =================================================================== --- trunk/src/main/org/jboss/seam/pages-2.0.xsd 2008-02-05 18:00:10 UTC (rev 7367) +++ trunk/src/main/org/jboss/seam/pages-2.0.xsd 2008-02-05 19:37:56 UTC (rev 7368) @@ -1,432 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" - elementFormDefault="qualified" - targetNamespace="http://jboss.com/products/seam/pages" - xmlns:pages="http://jboss.com/products/seam/pages"> - <xs:element name="pages"> - <xs:complexType> - <xs:sequence> - <xs:choice minOccurs="0" maxOccurs="unbounded"> - <xs:element ref="pages:conversation"/> - <xs:element ref="pages:page"/> - </xs:choice> - <xs:element minOccurs="0" maxOccurs="unbounded" ref="pages:exception"/> - </xs:sequence> - <xs:attributeGroup ref="pages:attlist.pages"/> - </xs:complexType> - </xs:element> - <xs:attributeGroup name="attlist.pages"> - <xs:attribute name="no-conversation-view-id"/> - <xs:attribute name="login-view-id"/> - </xs:attributeGroup> - <xs:element name="exception"> - <xs:complexType> - <xs:sequence> - <xs:element minOccurs="0" ref="pages:end-conversation"/> - <xs:choice> - <xs:element ref="pages:http-error"/> - <xs:element ref="pages:redirect"/> - </xs:choice> - </xs:sequence> - <xs:attributeGroup ref="pages:attlist.exception"/> - </xs:complexType> - </xs:element> - <xs:attributeGroup name="attlist.exception"> - <xs:attribute name="class"/> - <xs:attribute name="log"/> - <xs:attribute name="logLevel"/> - </xs:attributeGroup> - <xs:element name="conversation"> - <xs:complexType> - <xs:attributeGroup ref="pages:attlist.conversation"/> - </xs:complexType> - </xs:element> - <xs:attributeGroup name="attlist.conversation"> - <xs:attribute name="name" use="required"/> - <xs:attribute name="parameter-name" use="required"/> - <xs:attribute name="parameter-value"/> - </xs:attributeGroup> - <xs:element name="page"> - <xs:complexType mixed="true"> - <xs:choice minOccurs="0" maxOccurs="unbounded"> - <xs:element ref="pages:restrict"/> - <xs:element ref="pages:description"/> - <xs:element ref="pages:param"/> - <xs:element ref="pages:begin-conversation"/> - <xs:element ref="pages:end-conversation"/> - <xs:element ref="pages:start-task"/> - <xs:element ref="pages:begin-task"/> - <xs:element ref="pages:end-task"/> - <xs:element ref="pages:create-process"/> - <xs:element ref="pages:resume-process"/> - <xs:element ref="pages:in"/> - <xs:element ref="pages:raise-event"/> - <xs:element ref="pages:action"/> - <xs:element ref="pages:navigation"/> - </xs:choice> - <xs:attributeGroup ref="pages:attlist.page"/> - </xs:complexType> - </xs:element> - <xs:attributeGroup name="attlist.page"> - <xs:attribute name="action"/> - <xs:attribute name="view-id"/> - <xs:attribute name="switch" default="enabled"> - <xs:simpleType> - <xs:restriction base="xs:token"> - <xs:enumeration value="enabled"/> - <xs:enumeration value="disabled"/> - </xs:restriction> - </xs:simpleType> - </xs:attribute> - <xs:attribute name="no-conversation-view-id"/> - <xs:attribute name="conversation-required" default="false"> - <xs:simpleType> - <xs:restriction base="xs:token"> - <xs:enumeration value="true"/> - <xs:enumeration value="false"/> - </xs:restriction> - </xs:simpleType> - </xs:attribute> - <xs:attribute name="login-required" default="false"> - <xs:simpleType> - <xs:restriction base="xs:token"> - <xs:enumeration value="true"/> - <xs:enumeration value="false"/> - </xs:restriction> - </xs:simpleType> - </xs:attribute> - <xs:attribute name="scheme"/> - <xs:attribute name="timeout"/> - <xs:attribute name="bundle"/> - <xs:attribute name="conversation"/> - </xs:attributeGroup> - <xs:element name="param"> - <xs:complexType> - <xs:attributeGroup ref="pages:attlist.param"/> - </xs:complexType> - </xs:element> - <xs:attributeGroup name="attlist.param"> - <xs:attribute name="name"/> - <xs:attribute name="value"/> - <xs:attribute name="converter"/> - <xs:attribute name="converterId"/> - <xs:attribute name="validator"/> - <xs:attribute name="validatorId"/> - <xs:attribute name="required" type="xs:boolean"/> - </xs:attributeGroup> - <xs:element name="action"> - <xs:complexType> - <xs:attributeGroup ref="pages:attlist.action"/> - </xs:complexType> - </xs:element> - <xs:attributeGroup name="attlist.action"> - <xs:attribute name="if"/> - <xs:attribute name="execute" use="required"/> - </xs:attributeGroup> - <xs:element name="restrict" type="xs:string"/> - <xs:element name="navigation"> - <xs:complexType> - <xs:choice maxOccurs="2"> - <xs:sequence> - <xs:choice minOccurs="0"> - <xs:element ref="pages:begin-conversation"/> - <xs:element ref="pages:end-conversation"/> - <xs:element ref="pages:start-task"/> - <xs:element ref="pages:begin-task"/> - <xs:element ref="pages:end-task"/> - <xs:element ref="pages:create-process"/> - <xs:element ref="pages:resume-process"/> - </xs:choice> - <xs:element minOccurs="0" maxOccurs="unbounded" ref="pages:out"/> - <xs:element minOccurs="0" ref="pages:raise-event" maxOccurs="1"/> - <xs:choice minOccurs="0"> - <xs:element ref="pages:render"/> - <xs:element ref="pages:redirect"/> - </xs:choice> - </xs:sequence> - <xs:element minOccurs="0" maxOccurs="unbounded" ref="pages:rule"/> - </xs:choice> - <xs:attributeGroup ref="pages:attlist.navigation"/> - </xs:complexType> - </xs:element> - <xs:attributeGroup name="attlist.navigation"> - <xs:attribute name="from-action"/> - <xs:attribute name="evaluate"/> - </xs:attributeGroup> - <xs:element name="rule"> - <xs:complexType> - <xs:sequence> - <xs:choice minOccurs="0"> - <xs:element ref="pages:begin-conversation"/> - <xs:element ref="pages:end-conversation"/> - <xs:element ref="pages:start-task"/> - <xs:element ref="pages:begin-task"/> - <xs:element ref="pages:end-task"/> - <xs:element ref="pages:create-process"/> - <xs:element ref="pages:resume-process"/> - </xs:choice> - <xs:element minOccurs="0" maxOccurs="unbounded" ref="pages:out"/> - <xs:element minOccurs="0" ref="pages:raise-event"/> - <xs:choice minOccurs="0"> - <xs:element ref="pages:render"/> - <xs:element ref="pages:redirect"/> - </xs:choice> - </xs:sequence> - <xs:attributeGroup ref="pages:attlist.rule"/> - </xs:complexType> - </xs:element> - <xs:attributeGroup name="attlist.rule"> - <xs:attribute name="if-outcome"/> - <xs:attribute name="if"/> - </xs:attributeGroup> - <xs:element name="raise-event"> - <xs:complexType> - <xs:attributeGroup ref="pages:attlist.raise-event"/> - </xs:complexType> - </xs:element> - <xs:attributeGroup name="attlist.raise-event"> - <xs:attribute name="type" use="required"/> - </xs:attributeGroup> - <xs:element name="begin-conversation"> - <xs:complexType> - <xs:attributeGroup ref="pages:attlist.begin-conversation"/> - </xs:complexType> - </xs:element> - <xs:attributeGroup name="attlist.begin-conversation"> - <xs:attribute name="join" default="false"> - <xs:simpleType> - <xs:restriction base="xs:token"> - <xs:enumeration value="true"/> - <xs:enumeration value="false"/> - </xs:restriction> - </xs:simpleType> - </xs:attribute> - <xs:attribute name="nested" default="false"> - <xs:simpleType> - <xs:restriction base="xs:token"> - <xs:enumeration value="true"/> - <xs:enumeration value="false"/> - </xs:restriction> - </xs:simpleType> - </xs:attribute> - <xs:attribute name="pageflow"/> - <xs:attribute name="flush-mode"> - <xs:simpleType> - <xs:restriction base="xs:token"> - <xs:enumeration value="manual"/> - <xs:enumeration value="auto"/> - <xs:enumeration value="commit"/> - <xs:enumeration value="MANUAL"/> - <xs:enumeration value="AUTO"/> - <xs:enumeration value="COMMIT"/> - </xs:restriction> - </xs:simpleType> - </xs:attribute> - <xs:attribute name="if"/> - </xs:attributeGroup> - <xs:element name="end-conversation"> - <xs:complexType> - <xs:attributeGroup ref="pages:attlist.end-conversation"/> - </xs:complexType> - </xs:element> - <xs:attributeGroup name="attlist.end-conversation"> - <xs:attribute name="before-redirect" default="false"> - <xs:simpleType> - <xs:restriction base="xs:token"> - <xs:enumeration value="true"/> - <xs:enumeration value="false"/> - </xs:restriction> - </xs:simpleType> - </xs:attribute> - <xs:attribute name="if"/> - </xs:attributeGroup> - <xs:element name="begin-task"> - <xs:complexType> - <xs:attributeGroup ref="pages:attlist.begin-task"/> - </xs:complexType> - </xs:element> - <xs:attributeGroup name="attlist.begin-task"> - <xs:attribute name="task-id"/> - <xs:attribute name="pageflow"/> - <xs:attribute name="flush-mode"> - <xs:simpleType> - <xs:restriction base="xs:token"> - <xs:enumeration value="manual"/> - <xs:enumeration value="auto"/> - <xs:enumeration value="commit"/> - <xs:enumeration value="MANUAL"/> - <xs:enumeration value="AUTO"/> - <xs:enumeration value="COMMIT"/> - </xs:restriction> - </xs:simpleType> - </xs:attribute> - </xs:attributeGroup> - <xs:element name="start-task"> - <xs:complexType> - <xs:attributeGroup ref="pages:attlist.start-task"/> - </xs:complexType> - </xs:element> - <xs:attributeGroup name="attlist.start-task"> - <xs:attribute name="task-id"/> - <xs:attribute name="pageflow"/> - <xs:attribute name="flush-mode"> - <xs:simpleType> - <xs:restriction base="xs:token"> - <xs:enumeration value="manual"/> - <xs:enumeration value="auto"/> - <xs:enumeration value="commit"/> - <xs:enumeration value="MANUAL"/> - <xs:enumeration value="AUTO"/> - <xs:enumeration value="COMMIT"/> - </xs:restriction> - </xs:simpleType> - </xs:attribute> - </xs:attributeGroup> - <xs:element name="end-task"> - <xs:complexType> - <xs:attributeGroup ref="pages:attlist.end-task"/> - </xs:complexType> - </xs:element> - <xs:attributeGroup name="attlist.end-task"> - <xs:attribute name="transition"/> - <xs:attribute name="before-redirect" default="false"> - <xs:simpleType> - <xs:restriction base="xs:token"> - <xs:enumeration value="true"/> - <xs:enumeration value="false"/> - </xs:restriction> - </xs:simpleType> - </xs:attribute> - </xs:attributeGroup> - <xs:element name="create-process"> - <xs:complexType> - <xs:attributeGroup ref="pages:attlist.create-process"/> - </xs:complexType> - </xs:element> - <xs:attributeGroup name="attlist.create-process"> - <xs:attribute name="definition"/> - </xs:attributeGroup> - <xs:element name="resume-process"> - <xs:complexType> - <xs:attributeGroup ref="pages:attlist.resume-process"/> - </xs:complexType> - </xs:element> - <xs:attributeGroup name="attlist.resume-process"> - <xs:attribute name="process-id"/> - </xs:attributeGroup> - <xs:element name="in"> - <xs:complexType> - <xs:attributeGroup ref="pages:attlist.in"/> - </xs:complexType> - </xs:element> - <xs:attributeGroup name="attlist.in"> - <xs:attribute name="name" use="required"/> - <xs:attribute name="scope"> - <xs:simpleType> - <xs:restriction base="xs:token"> - <xs:enumeration value="stateless"/> - <xs:enumeration value="event"/> - <xs:enumeration value="page"/> - <xs:enumeration value="conversation"/> - <xs:enumeration value="session"/> - <xs:enumeration value="business_process"/> - <xs:enumeration value="application"/> - <xs:enumeration value="STATELESS"/> - <xs:enumeration value="EVENT"/> - <xs:enumeration value="PAGE"/> - <xs:enumeration value="CONVERSATION"/> - <xs:enumeration value="SESSION"/> - <xs:enumeration value="BUSINESS_PROCESS"/> - <xs:enumeration value="APPLICATION"/> - </xs:restriction> - </xs:simpleType> - </xs:attribute> - <xs:attribute name="value" use="required"/> - </xs:attributeGroup> - <xs:element name="out"> - <xs:complexType> - <xs:attributeGroup ref="pages:attlist.out"/> - </xs:complexType> - </xs:element> - <xs:attributeGroup name="attlist.out"> - <xs:attribute name="name" use="required"/> - <xs:attribute name="scope" default="CONVERSATION"> - <xs:simpleType> - <xs:restriction base="xs:token"> - <xs:enumeration value="stateless"/> - <xs:enumeration value="event"/> - <xs:enumeration value="page"/> - <xs:enumeration value="conversation"/> - <xs:enumeration value="session"/> - <xs:enumeration value="business_process"/> - <xs:enumeration value="application"/> - <xs:enumeration value="STATELESS"/> - <xs:enumeration value="EVENT"/> - <xs:enumeration value="PAGE"/> - <xs:enumeration value="CONVERSATION"/> - <xs:enumeration value="SESSION"/> - <xs:enumeration value="BUSINESS_PROCESS"/> - <xs:enumeration value="APPLICATION"/> - </xs:restriction> - </xs:simpleType> - </xs:attribute> - <xs:attribute name="value" use="required"/> - </xs:attributeGroup> - <xs:element name="render"> - <xs:complexType> - <xs:sequence> - <xs:element minOccurs="0" ref="pages:message"/> - </xs:sequence> - <xs:attributeGroup ref="pages:attlist.render"/> - </xs:complexType> - </xs:element> - <xs:attributeGroup name="attlist.render"> - <xs:attribute name="view-id"/> - </xs:attributeGroup> - <xs:element name="redirect"> - <xs:complexType> - <xs:sequence> - <xs:element minOccurs="0" ref="pages:message"/> - <xs:element minOccurs="0" maxOccurs="unbounded" ref="pages:param"/> - </xs:sequence> - <xs:attributeGroup ref="pages:attlist.redirect"/> - </xs:complexType> - </xs:element> - <xs:attributeGroup name="attlist.redirect"> - <xs:attribute name="view-id"/> - </xs:attributeGroup> - <xs:element name="http-error"> - <xs:complexType> - <xs:sequence> - <xs:element minOccurs="0" ref="pages:message"/> - </xs:sequence> - <xs:attributeGroup ref="pages:attlist.http-error"/> - </xs:complexType> - </xs:element> - <xs:attributeGroup name="attlist.http-error"> - <xs:attribute name="error-code"/> - </xs:attributeGroup> - <xs:element name="message"> - <xs:complexType mixed="true"> - <xs:attributeGroup ref="pages:attlist.message"/> - </xs:complexType> - </xs:element> - <xs:attributeGroup name="attlist.message"> - <xs:attribute name="for"/> - <xs:attribute name="severity" default="INFO"> - <xs:simpleType> - <xs:restriction base="xs:token"> - <xs:enumeration value="info"/> - <xs:enumeration value="warn"/> - <xs:enumeration value="error"/> - <xs:enumeration value="fatal"/> - <xs:enumeration value="INFO"/> - <xs:enumeration value="WARN"/> - <xs:enumeration value="ERROR"/> - <xs:enumeration value="FATAL"/> - </xs:restriction> - </xs:simpleType> - </xs:attribute> - </xs:attributeGroup> - <xs:element name="description" type="xs:string"/> -</xs:schema> Added: trunk/src/main/org/jboss/seam/pages-2.1.dtd =================================================================== --- trunk/src/main/org/jboss/seam/pages-2.1.dtd (rev 0) +++ trunk/src/main/org/jboss/seam/pages-2.1.dtd 2008-02-05 19:37:56 UTC (rev 7368) @@ -0,0 +1,113 @@ + + +<!ELEMENT pages ((conversation|page)*,exception*)> +<!ATTLIST pages no-conversation-view-id CDATA #IMPLIED> +<!ATTLIST pages login-view-id CDATA #IMPLIED> + +<!ELEMENT exception (end-conversation?,(http-error|redirect))> +<!ATTLIST exception class CDATA #IMPLIED> + +<!ELEMENT conversation EMPTY> +<!ATTLIST conversation name CDATA #REQUIRED> +<!ATTLIST conversation parameter-name CDATA #REQUIRED> +<!ATTLIST conversation parameter-value CDATA #IMPLIED> + +<!ELEMENT page (#PCDATA|restrict|description|param|begin-conversation|end-conversation|start-task|begin-task|end-task|create-process|resume-process|in|raise-event|action|navigation)*> +<!ATTLIST page action CDATA #IMPLIED> +<!ATTLIST page view-id CDATA #IMPLIED> +<!ATTLIST page switch (enabled|disabled) "enabled"> +<!ATTLIST page no-conversation-view-id CDATA #IMPLIED> +<!ATTLIST page conversation-required (true|false) "false"> +<!ATTLIST page login-required (true|false) "false"> +<!ATTLIST page scheme CDATA #IMPLIED> +<!ATTLIST page timeout CDATA #IMPLIED> +<!ATTLIST page bundle CDATA #IMPLIED> +<!ATTLIST page conversation CDATA #IMPLIED> + +<!ELEMENT param EMPTY> +<!ATTLIST param name CDATA #IMPLIED> +<!ATTLIST param value CDATA #IMPLIED> +<!ATTLIST param converter CDATA #IMPLIED> +<!ATTLIST param converterId CDATA #IMPLIED> +<!ATTLIST param validator CDATA #IMPLIED> +<!ATTLIST param validatorId CDATA #IMPLIED> +<!ATTLIST param required (true|false) "false"> + +<!ELEMENT action EMPTY> +<!ATTLIST action if CDATA #IMPLIED> +<!ATTLIST action execute CDATA #REQUIRED> + +<!ELEMENT restrict (#PCDATA)> + +<!ELEMENT navigation (((begin-conversation|end-conversation|start-task|begin-task|end-task|create-process|resume-process)?,(out*),raise-event?,(render|redirect)?)|(rule*))> +<!ATTLIST navigation from-action CDATA #IMPLIED> +<!ATTLIST navigation evaluate CDATA #IMPLIED> + +<!ELEMENT rule ((begin-conversation|end-conversation|start-task|begin-task|end-task|create-process|resume-process)?,(out*),raise-event?,(render|redirect)?)> +<!ATTLIST rule if-outcome CDATA #IMPLIED> +<!ATTLIST rule if CDATA #IMPLIED> + +<!ELEMENT raise-event EMPTY> +<!ATTLIST raise-event type CDATA #REQUIRED> + +<!ELEMENT begin-conversation EMPTY> +<!ATTLIST begin-conversation join (true|false) "false"> +<!ATTLIST begin-conversation nested (true|false) "false"> +<!ATTLIST begin-conversation pageflow CDATA #IMPLIED> +<!ATTLIST begin-conversation flush-mode (manual|auto|commit|MANUAL|AUTO|COMMIT) #IMPLIED> +<!ATTLIST begin-conversation if CDATA #IMPLIED> + +<!ELEMENT end-conversation EMPTY> +<!ATTLIST end-conversation before-redirect (true|false) "false"> +<!ATTLIST end-conversation if CDATA #IMPLIED> + +<!ELEMENT begin-task EMPTY> +<!ATTLIST begin-task task-id CDATA #IMPLIED> +<!ATTLIST begin-task pageflow CDATA #IMPLIED> +<!ATTLIST begin-task flush-mode (manual|auto|commit|MANUAL|AUTO|COMMIT) #IMPLIED> + +<!ELEMENT start-task EMPTY> +<!ATTLIST start-task task-id CDATA #IMPLIED> +<!ATTLIST start-task pageflow CDATA #IMPLIED> +<!ATTLIST start-task flush-mode (manual|auto|commit|MANUAL|AUTO|COMMIT) #IMPLIED> + +<!ELEMENT end-task EMPTY> +<!ATTLIST end-task transition CDATA #IMPLIED> +<!ATTLIST end-task before-redirect (true|false) "false"> + +<!ELEMENT create-process EMPTY> +<!ATTLIST create-process definition CDATA #IMPLIED> + +<!ELEMENT resume-process EMPTY> +<!ATTLIST resume-process process-id CDATA #IMPLIED> + +<!ELEMENT in EMPTY> +<!ATTLIST in name CDATA #REQUIRED> +<!ATTLIST in scope (stateless|event|page|conversation|session|business_process|application|STATELESS|EVENT|PAGE|CONVERSATION|SESSION|BUSINESS_PROCESS|APPLICATION) #IMPLIED> +<!ATTLIST in value CDATA #REQUIRED> + +<!ELEMENT out EMPTY> +<!ATTLIST out name CDATA #REQUIRED> +<!ATTLIST out scope (stateless|event|page|conversation|session|business_process|application|STATELESS|EVENT|PAGE|CONVERSATION|SESSION|BUSINESS_PROCESS|APPLICATION) "CONVERSATION"> +<!ATTLIST out value CDATA #REQUIRED> + +<!ELEMENT render (message?)> +<!ATTLIST render view-id CDATA #IMPLIED> + +<!ELEMENT redirect (message?,param*)> +<!ATTLIST redirect view-id CDATA #IMPLIED> + +<!ELEMENT http-error (message?)> +<!ATTLIST http-error error-code CDATA #IMPLIED> + +<!ELEMENT message (#PCDATA)> +<!ATTLIST message for CDATA #IMPLIED> +<!ATTLIST message severity (info|warn|error|fatal|INFO|WARN|ERROR|FATAL) "INFO"> + +<!ELEMENT description (#PCDATA)> Added: trunk/src/main/org/jboss/seam/pages-2.1.xsd =================================================================== --- trunk/src/main/org/jboss/seam/pages-2.1.xsd (rev 0) +++ trunk/src/main/org/jboss/seam/pages-2.1.xsd 2008-02-05 19:37:56 UTC (rev 7368) @@ -0,0 +1,432 @@ +<?xml version="1.0" encoding="UTF-8"?> +<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" + elementFormDefault="qualified" + targetNamespace="http://jboss.com/products/seam/pages" + xmlns:pages="http://jboss.com/products/seam/pages"> + <xs:element name="pages"> + <xs:complexType> + <xs:sequence> + <xs:choice minOccurs="0" maxOccurs="unbounded"> + <xs:element ref="pages:conversation"/> + <xs:element ref="pages:page"/> + </xs:choice> + <xs:element minOccurs="0" maxOccurs="unbounded" ref="pages:exception"/> + </xs:sequence> + <xs:attributeGroup ref="pages:attlist.pages"/> + </xs:complexType> + </xs:element> + <xs:attributeGroup name="attlist.pages"> + <xs:attribute name="no-conversation-view-id"/> + <xs:attribute name="login-view-id"/> + </xs:attributeGroup> + <xs:element name="exception"> + <xs:complexType> + <xs:sequence> + <xs:element minOccurs="0" ref="pages:end-conversation"/> + <xs:choice> + <xs:element ref="pages:http-error"/> + <xs:element ref="pages:redirect"/> + </xs:choice> + </xs:sequence> + <xs:attributeGroup ref="pages:attlist.exception"/> + </xs:complexType> + </xs:element> + <xs:attributeGroup name="attlist.exception"> + <xs:attribute name="class"/> + <xs:attribute name="log"/> + <xs:attribute name="logLevel"/> + </xs:attributeGroup> + <xs:element name="conversation"> + <xs:complexType> + <xs:attributeGroup ref="pages:attlist.conversation"/> + </xs:complexType> + </xs:element> + <xs:attributeGroup name="attlist.conversation"> + <xs:attribute name="name" use="required"/> + <xs:attribute name="parameter-name" use="required"/> + <xs:attribute name="parameter-value"/> + </xs:attributeGroup> + <xs:element name="page"> + <xs:complexType mixed="true"> + <xs:choice minOccurs="0" maxOccurs="unbounded"> + <xs:element ref="pages:restrict"/> + <xs:element ref="pages:description"/> + <xs:element ref="pages:param"/> + <xs:element ref="pages:begin-conversation"/> + <xs:element ref="pages:end-conversation"/> + <xs:element ref="pages:start-task"/> + <xs:element ref="pages:begin-task"/> + <xs:element ref="pages:end-task"/> + <xs:element ref="pages:create-process"/> + <xs:element ref="pages:resume-process"/> + <xs:element ref="pages:in"/> + <xs:element ref="pages:raise-event"/> + <xs:element ref="pages:action"/> + <xs:element ref="pages:navigation"/> + </xs:choice> + <xs:attributeGroup ref="pages:attlist.page"/> + </xs:complexType> + </xs:element> + <xs:attributeGroup name="attlist.page"> + <xs:attribute name="action"/> + <xs:attribute name="view-id"/> + <xs:attribute name="switch" default="enabled"> + <xs:simpleType> + <xs:restriction base="xs:token"> + <xs:enumeration value="enabled"/> + <xs:enumeration value="disabled"/> + </xs:restriction> + </xs:simpleType> + </xs:attribute> + <xs:attribute name="no-conversation-view-id"/> + <xs:attribute name="conversation-required" default="false"> + <xs:simpleType> + <xs:restriction base="xs:token"> + <xs:enumeration value="true"/> + <xs:enumeration value="false"/> + </xs:restriction> + </xs:simpleType> + </xs:attribute> + <xs:attribute name="login-required" default="false"> + <xs:simpleType> + <xs:restriction base="xs:token"> + <xs:enumeration value="true"/> + <xs:enumeration value="false"/> + </xs:restriction> + </xs:simpleType> + </xs:attribute> + <xs:attribute name="scheme"/> + <xs:attribute name="timeout"/> + <xs:attribute name="bundle"/> + <xs:attribute name="conversation"/> + </xs:attributeGroup> + <xs:element name="param"> + <xs:complexType> + <xs:attributeGroup ref="pages:attlist.param"/> + </xs:complexType> + </xs:element> + <xs:attributeGroup name="attlist.param"> + <xs:attribute name="name"/> + <xs:attribute name="value"/> + <xs:attribute name="converter"/> + <xs:attribute name="converterId"/> + <xs:attribute name="validator"/> + <xs:attribute name="validatorId"/> + <xs:attribute name="required" type="xs:boolean"/> + </xs:attributeGroup> + <xs:element name="action"> + <xs:complexType> + <xs:attributeGroup ref="pages:attlist.action"/> + </xs:complexType> + </xs:element> + <xs:attributeGroup name="attlist.action"> + <xs:attribute name="if"/> + <xs:attribute name="execute" use="required"/> + </xs:attributeGroup> + <xs:element name="restrict" type="xs:string"/> + <xs:element name="navigation"> + <xs:complexType> + <xs:choice maxOccurs="2"> + <xs:sequence> + <xs:choice minOccurs="0"> + <xs:element ref="pages:begin-conversation"/> + <xs:element ref="pages:end-conversation"/> + <xs:element ref="pages:start-task"/> + <xs:element ref="pages:begin-task"/> + <xs:element ref="pages:end-task"/> + <xs:element ref="pages:create-process"/> + <xs:element ref="pages:resume-process"/> + </xs:choice> + <xs:element minOccurs="0" maxOccurs="unbounded" ref="pages:out"/> + <xs:element minOccurs="0" ref="pages:raise-event" maxOccurs="1"/> + <xs:choice minOccurs="0"> + <xs:element ref="pages:render"/> + <xs:element ref="pages:redirect"/> + </xs:choice> + </xs:sequence> + <xs:element minOccurs="0" maxOccurs="unbounded" ref="pages:rule"/> + </xs:choice> + <xs:attributeGroup ref="pages:attlist.navigation"/> + </xs:complexType> + </xs:element> + <xs:attributeGroup name="attlist.navigation"> + <xs:attribute name="from-action"/> + <xs:attribute name="evaluate"/> + </xs:attributeGroup> + <xs:element name="rule"> + <xs:complexType> + <xs:sequence> + <xs:choice minOccurs="0"> + <xs:element ref="pages:begin-conversation"/> + <xs:element ref="pages:end-conversation"/> + <xs:element ref="pages:start-task"/> + <xs:element ref="pages:begin-task"/> + <xs:element ref="pages:end-task"/> + <xs:element ref="pages:create-process"/> + <xs:element ref="pages:resume-process"/> + </xs:choice> + <xs:element minOccurs="0" maxOccurs="unbounded" ref="pages:out"/> + <xs:element minOccurs="0" ref="pages:raise-event"/> + <xs:choice minOccurs="0"> + <xs:element ref="pages:render"/> + <xs:element ref="pages:redirect"/> + </xs:choice> + </xs:sequence> + <xs:attributeGroup ref="pages:attlist.rule"/> + </xs:complexType> + </xs:element> + <xs:attributeGroup name="attlist.rule"> + <xs:attribute name="if-outcome"/> + <xs:attribute name="if"/> + </xs:attributeGroup> + <xs:element name="raise-event"> + <xs:complexType> + <xs:attributeGroup ref="pages:attlist.raise-event"/> + </xs:complexType> + </xs:element> + <xs:attributeGroup name="attlist.raise-event"> + <xs:attribute name="type" use="required"/> + </xs:attributeGroup> + <xs:element name="begin-conversation"> + <xs:complexType> + <xs:attributeGroup ref="pages:attlist.begin-conversation"/> + </xs:complexType> + </xs:element> + <xs:attributeGroup name="attlist.begin-conversation"> + <xs:attribute name="join" default="false"> + <xs:simpleType> + <xs:restriction base="xs:token"> + <xs:enumeration value="true"/> + <xs:enumeration value="false"/> + </xs:restriction> + </xs:simpleType> + </xs:attribute> + <xs:attribute name="nested" default="false"> + <xs:simpleType> + <xs:restriction base="xs:token"> + <xs:enumeration value="true"/> + <xs:enumeration value="false"/> + </xs:restriction> + </xs:simpleType> + </xs:attribute> + <xs:attribute name="pageflow"/> + <xs:attribute name="flush-mode"> + <xs:simpleType> + <xs:restriction base="xs:token"> + <xs:enumeration value="manual"/> + <xs:enumeration value="auto"/> + <xs:enumeration value="commit"/> + <xs:enumeration value="MANUAL"/> + <xs:enumeration value="AUTO"/> + <xs:enumeration value="COMMIT"/> + </xs:restriction> + </xs:simpleType> + </xs:attribute> + <xs:attribute name="if"/> + </xs:attributeGroup> + <xs:element name="end-conversation"> + <xs:complexType> + <xs:attributeGroup ref="pages:attlist.end-conversation"/> + </xs:complexType> + </xs:element> + <xs:attributeGroup name="attlist.end-conversation"> + <xs:attribute name="before-redirect" default="false"> + <xs:simpleType> + <xs:restriction base="xs:token"> + <xs:enumeration value="true"/> + <xs:enumeration value="false"/> + </xs:restriction> + </xs:simpleType> + </xs:attribute> + <xs:attribute name="if"/> + </xs:attributeGroup> + <xs:element name="begin-task"> + <xs:complexType> + <xs:attributeGroup ref="pages:attlist.begin-task"/> + </xs:complexType> + </xs:element> + <xs:attributeGroup name="attlist.begin-task"> + <xs:attribute name="task-id"/> + <xs:attribute name="pageflow"/> + <xs:attribute name="flush-mode"> + <xs:simpleType> + <xs:restriction base="xs:token"> + <xs:enumeration value="manual"/> + <xs:enumeration value="auto"/> + <xs:enumeration value="commit"/> + <xs:enumeration value="MANUAL"/> + <xs:enumeration value="AUTO"/> + <xs:enumeration value="COMMIT"/> + </xs:restriction> + </xs:simpleType> + </xs:attribute> + </xs:attributeGroup> + <xs:element name="start-task"> + <xs:complexType> + <xs:attributeGroup ref="pages:attlist.start-task"/> + </xs:complexType> + </xs:element> + <xs:attributeGroup name="attlist.start-task"> + <xs:attribute name="task-id"/> + <xs:attribute name="pageflow"/> + <xs:attribute name="flush-mode"> + <xs:simpleType> + <xs:restriction base="xs:token"> + <xs:enumeration value="manual"/> + <xs:enumeration value="auto"/> + <xs:enumeration value="commit"/> + <xs:enumeration value="MANUAL"/> + <xs:enumeration value="AUTO"/> + <xs:enumeration value="COMMIT"/> + </xs:restriction> + </xs:simpleType> + </xs:attribute> + </xs:attributeGroup> + <xs:element name="end-task"> + <xs:complexType> + <xs:attributeGroup ref="pages:attlist.end-task"/> + </xs:complexType> + </xs:element> + <xs:attributeGroup name="attlist.end-task"> + <xs:attribute name="transition"/> + <xs:attribute name="before-redirect" default="false"> + <xs:simpleType> + <xs:restriction base="xs:token"> + <xs:enumeration value="true"/> + <xs:enumeration value="false"/> + </xs:restriction> + </xs:simpleType> + </xs:attribute> + </xs:attributeGroup> + <xs:element name="create-process"> + <xs:complexType> + <xs:attributeGroup ref="pages:attlist.create-process"/> + </xs:complexType> + </xs:element> + <xs:attributeGroup name="attlist.create-process"> + <xs:attribute name="definition"/> + </xs:attributeGroup> + <xs:element name="resume-process"> + <xs:complexType> + <xs:attributeGroup ref="pages:attlist.resume-process"/> + </xs:complexType> + </xs:element> + <xs:attributeGroup name="attlist.resume-process"> + <xs:attribute name="process-id"/> + </xs:attributeGroup> + <xs:element name="in"> + <xs:complexType> + <xs:attributeGroup ref="pages:attlist.in"/> + </xs:complexType> + </xs:element> + <xs:attributeGroup name="attlist.in"> + <xs:attribute name="name" use="required"/> + <xs:attribute name="scope"> + <xs:simpleType> + <xs:restriction base="xs:token"> + <xs:enumeration value="stateless"/> + <xs:enumeration value="event"/> + <xs:enumeration value="page"/> + <xs:enumeration value="conversation"/> + <xs:enumeration value="session"/> + <xs:enumeration value="business_process"/> + <xs:enumeration value="application"/> + <xs:enumeration value="STATELESS"/> + <xs:enumeration value="EVENT"/> + <xs:enumeration value="PAGE"/> + <xs:enumeration value="CONVERSATION"/> + <xs:enumeration value="SESSION"/> + <xs:enumeration value="BUSINESS_PROCESS"/> + <xs:enumeration value="APPLICATION"/> + </xs:restriction> + </xs:simpleType> + </xs:attribute> + <xs:attribute name="value" use="required"/> + </xs:attributeGroup> + <xs:element name="out"> + <xs:complexType> + <xs:attributeGroup ref="pages:attlist.out"/> + </xs:complexType> + </xs:element> + <xs:attributeGroup name="attlist.out"> + <xs:attribute name="name" use="required"/> + <xs:attribute name="scope" default="CONVERSATION"> + <xs:simpleType> + <xs:restriction base="xs:token"> + <xs:enumeration value="stateless"/> + <xs:enumeration value="event"/> + <xs:enumeration value="page"/> + <xs:enumeration value="conversation"/> + <xs:enumeration value="session"/> + <xs:enumeration value="business_process"/> + <xs:enumeration value="application"/> + <xs:enumeration value="STATELESS"/> + <xs:enumeration value="EVENT"/> + <xs:enumeration value="PAGE"/> + <xs:enumeration value="CONVERSATION"/> + <xs:enumeration value="SESSION"/> + <xs:enumeration value="BUSINESS_PROCESS"/> + <xs:enumeration value="APPLICATION"/> + </xs:restriction> + </xs:simpleType> + </xs:attribute> + <xs:attribute name="value" use="required"/> + </xs:attributeGroup> + <xs:element name="render"> + <xs:complexType> + <xs:sequence> + <xs:element minOccurs="0" ref="pages:message"/> + </xs:sequence> + <xs:attributeGroup ref="pages:attlist.render"/> + </xs:complexType> + </xs:element> + <xs:attributeGroup name="attlist.render"> + <xs:attribute name="view-id"/> + </xs:attributeGroup> + <xs:element name="redirect"> + <xs:complexType> + <xs:sequence> + <xs:element minOccurs="0" ref="pages:message"/> + <xs:element minOccurs="0" maxOccurs="unbounded" ref="pages:param"/> + </xs:sequence> + <xs:attributeGroup ref="pages:attlist.redirect"/> + </xs:complexType> + </xs:element> + <xs:attributeGroup name="attlist.redirect"> + <xs:attribute name="view-id"/> + </xs:attributeGroup> + <xs:element name="http-error"> + <xs:complexType> + <xs:sequence> + <xs:element minOccurs="0" ref="pages:message"/> + </xs:sequence> + <xs:attributeGroup ref="pages:attlist.http-error"/> + </xs:complexType> + </xs:element> + <xs:attributeGroup name="attlist.http-error"> + <xs:attribute name="error-code"/> + </xs:attributeGroup> + <xs:element name="message"> + <xs:complexType mixed="true"> + <xs:attributeGroup ref="pages:attlist.message"/> + </xs:complexType> + </xs:element> + <xs:attributeGroup name="attlist.message"> + <xs:attribute name="for"/> + <xs:attribute name="severity" default="INFO"> + <xs:simpleType> + <xs:restriction base="xs:token"> + <xs:enumeration value="info"/> + <xs:enumeration value="warn"/> + <xs:enumeration value="error"/> + <xs:enumeration value="fatal"/> + <xs:enumeration value="INFO"/> + <xs:enumeration value="WARN"/> + <xs:enumeration value="ERROR"/> + <xs:enumeration value="FATAL"/> + </xs:restriction> + </xs:simpleType> + </xs:attribute> + </xs:attributeGroup> + <xs:element name="description" type="xs:string"/> +</xs:schema> Deleted: trunk/src/main/org/jboss/seam/pdf-2.0.xsd =================================================================== --- trunk/src/main/org/jboss/seam/pdf-2.0.xsd 2008-02-05 18:00:10 UTC (rev 7367) +++ trunk/src/main/org/jboss/seam/pdf-2.0.xsd 2008-02-05 19:37:56 UTC (rev 7368) @@ -1,33 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" - elementFormDefault="qualified" - targetNamespace="http://jboss.com/products/seam/pdf" - xmlns:pdf="http://jboss.com/products/seam/pdf" - xmlns:components="http://jboss.com/products/seam/components" - attributeFormDefault="unqualified"> - <xs:import namespace="http://jboss.com/products/seam/components" schemaLocation="components-2.0.xsd"/> - - <xs:element name="document-store"> - <xs:complexType mixed="true"> - <xs:attributeGroup ref="components:attlist.component"/> - <xs:attributeGroup ref="pdf:attlist.docstore"/> - </xs:complexType> - </xs:element> - <xs:attributeGroup name="attlist.docstore"> - <xs:attribute name="error-page" type="xs:string"/> - <xs:attribute name="use-extensions" type="xs:string"/> - </xs:attributeGroup> - - <xs:element name="key-store-config"> - <xs:complexType mixed="true"> - <xs:attributeGroup ref="components:attlist.component"/> - <xs:attributeGroup ref="pdf:attlist.UseExtensions"/> - </xs:complexType> - </xs:element> - <xs:attributeGroup name="attlist.UseExtensions"> - <xs:attribute name="key-store" type="xs:string"/> - <xs:attribute name="key-store-password" type="xs:string"/> - <xs:attribute name="key-password" type="xs:string"/> - <xs:attribute name="key-alias" type="xs:string"/> - </xs:attributeGroup> -</xs:schema> Added: trunk/src/main/org/jboss/seam/pdf-2.1.xsd =================================================================== --- trunk/src/main/org/jboss/seam/pdf-2.1.xsd (rev 0) +++ trunk/src/main/org/jboss/seam/pdf-2.1.xsd 2008-02-05 19:37:56 UTC (rev 7368) @@ -0,0 +1,33 @@ +<?xml version="1.0" encoding="UTF-8"?> +<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" + elementFormDefault="qualified" + targetNamespace="http://jboss.com/products/seam/pdf" + xmlns:pdf="http://jboss.com/products/seam/pdf" + xmlns:components="http://jboss.com/products/seam/components" + attributeFormDefault="unqualified"> + <xs:import namespace="http://jboss.com/products/seam/components" schemaLocation="components-2.1.xsd"/> + + <xs:element name="document-store"> + <xs:complexType mixed="true"> + <xs:attributeGroup ref="components:attlist.component"/> + <xs:attributeGroup ref="pdf:attlist.docstore"/> + </xs:complexType> + </xs:element> + <xs:attributeGroup name="attlist.docstore"> + <xs:attribute name="error-page" type="xs:string"/> + <xs:attribute name="use-extensions" type="xs:string"/> + </xs:attributeGroup> + + <xs:element name="key-store-config"> + <xs:complexType mixed="true"> + <xs:attributeGroup ref="components:attlist.component"/> + <xs:attributeGroup ref="pdf:attlist.UseExtensions"/> + </xs:complexType> + </xs:element> + <xs:attributeGroup name="attlist.UseExtensions"> + <xs:attribute name="key-store" type="xs:string"/> + <xs:attribute name="key-store-password" type="xs:string"/> + <xs:attribute name="key-password" type="xs:string"/> + <xs:attribute name="key-alias" type="xs:string"/> + </xs:attributeGroup> +</xs:schema> Deleted: trunk/src/main/org/jboss/seam/persistence-2.0.xsd =================================================================== --- trunk/src/main/org/jboss/seam/persistence-2.0.xsd 2008-02-05 18:00:10 UTC (rev 7367) +++ trunk/src/main/org/jboss/seam/persistence-2.0.xsd 2008-02-05 19:37:56 UTC (rev 7368) @@ -1,88 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" - targetNamespace="http://jboss.com/products/seam/persistence" xmlns:persistence="http://jboss.com/products/seam/persistence" - xmlns:components="http://jboss.com/products/seam/components" attributeFormDefault="unqualified"> - <xs:import namespace="http://jboss.com/products/seam/components" schemaLocation="components-2.0.xsd"/> - - <xs:element name="managed-persistence-context"> - <xs:complexType mixed="true"> - <xs:sequence> - <xs:choice minOccurs="0" maxOccurs="unbounded"> - <xs:element ref="persistence:filters"/> - <xs:element ref="persistence:persistence-unit-jndi-name" /> - </xs:choice> - </xs:sequence> - <xs:attributeGroup ref="persistence:attlist.ManagedPersistenceContext"/> - <xs:attributeGroup ref="components:attlist.component"/> - </xs:complexType> - </xs:element> - <xs:attributeGroup name="attlist.ManagedPersistenceContext"> - <xs:attribute name="entity-manager-factory"/> - <xs:attribute name="persistence-unit-jndi-name"/> - </xs:attributeGroup> - - <xs:element name="managed-hibernate-session"> - <xs:complexType mixed="true"> - <xs:sequence minOccurs="0" maxOccurs="1"> - <xs:element ref="persistence:filters"/> - </xs:sequence> - <xs:attributeGroup ref="persistence:attlist.ManagedHibernateSession"/> - <xs:attributeGroup ref="components:attlist.component"/> - </xs:complexType> - </xs:element> - - <xs:element name="filters" type="components:multiValuedProperty"/> - - <xs:element name="persistence-unit-jndi-name" type="xs:string" /> - - <xs:attributeGroup name="attlist.ManagedHibernateSession"> - <xs:attribute name="session-factory"/> - <xs:attribute name="session-factory-jndi-name"/> - </xs:attributeGroup> - - <xs:element name="hibernate-session-factory"> - <xs:complexType mixed="true"> - <xs:choice minOccurs="0" maxOccurs="unbounded"> - <xs:element name="mapping-classes" type="components:multiValuedProperty"/> - <xs:element name="mapping-files" type="components:multiValuedProperty"/> - <xs:element name="mapping-jars" type="components:multiValuedProperty"/> - <xs:element name="mapping-packages" type="components:multiValuedProperty"/> - <xs:element name="mapping-resources" type="components:multiValuedProperty"/> - <xs:element name="cfg-properties" type="components:mapProperty"/> - </xs:choice> - <xs:attributeGroup ref="persistence:attlist.HibernateSessionFactory"/> - <xs:attributeGroup ref="components:attlist.component"/> - </xs:complexType> - </xs:element> - <xs:attributeGroup name="attlist.HibernateSessionFactory"> - <xs:attribute name="cfg-resource-name"/> - </xs:attributeGroup> - - <xs:element name="entity-manager-factory"> - <xs:complexType mixed="true"> - <xs:sequence minOccurs="0" maxOccurs="1"> - <xs:element name="persistence-unit-properties" type="components:mapProperty"/> - </xs:sequence> - <xs:attributeGroup ref="persistence:attlist.EntityManagerFactory"/> - <xs:attributeGroup ref="components:attlist.component"/> - </xs:complexType> - </xs:element> - <xs:attributeGroup name="attlist.EntityManagerFactory"> - <xs:attribute name="persistence-unit-name"/> - </xs:attributeGroup> - - <xs:element name="filter"> - <xs:complexType mixed="true"> - <xs:sequence> - <xs:element minOccurs="0" name="name" type="xs:string"/> - <xs:element minOccurs="0" name="parameters" type="components:mapProperty"/> - </xs:sequence> - <xs:attributeGroup ref="persistence:attlist.filter"/> - <xs:attributeGroup ref="components:attlist.component"/> - </xs:complexType> - </xs:element> - <xs:attributeGroup name="attlist.filter"> - <xs:attribute name="enabled"/> - </xs:attributeGroup> - -</xs:schema> Added: trunk/src/main/org/jboss/seam/persistence-2.1.xsd =================================================================== --- trunk/src/main/org/jboss/seam/persistence-2.1.xsd (rev 0) +++ trunk/src/main/org/jboss/seam/persistence-2.1.xsd 2008-02-05 19:37:56 UTC (rev 7368) @@ -0,0 +1,88 @@ +<?xml version="1.0" encoding="UTF-8"?> +<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" + targetNamespace="http://jboss.com/products/seam/persistence" xmlns:persistence="http://jboss.com/products/seam/persistence" + xmlns:components="http://jboss.com/products/seam/components" attributeFormDefault="unqualified"> + <xs:import namespace="http://jboss.com/products/seam/components" schemaLocation="components-2.1.xsd"/> + + <xs:element name="managed-persistence-context"> + <xs:complexType mixed="true"> + <xs:sequence> + <xs:choice minOccurs="0" maxOccurs="unbounded"> + <xs:element ref="persistence:filters"/> + <xs:element ref="persistence:persistence-unit-jndi-name" /> + </xs:choice> + </xs:sequence> + <xs:attributeGroup ref="persistence:attlist.ManagedPersistenceContext"/> + <xs:attributeGroup ref="components:attlist.component"/> + </xs:complexType> + </xs:element> + <xs:attributeGroup name="attlist.ManagedPersistenceContext"> + <xs:attribute name="entity-manager-factory"/> + <xs:attribute name="persistence-unit-jndi-name"/> + </xs:attributeGroup> + + <xs:element name="managed-hibernate-session"> + <xs:complexType mixed="true"> + <xs:sequence minOccurs="0" maxOccurs="1"> + <xs:element ref="persistence:filters"/> + </xs:sequence> + <xs:attributeGroup ref="persistence:attlist.ManagedHibernateSession"/> + <xs:attributeGroup ref="components:attlist.component"/> + </xs:complexType> + </xs:element> + + <xs:element name="filters" type="components:multiValuedProperty"/> + + <xs:element name="persistence-unit-jndi-name" type="xs:string" /> + + <xs:attributeGroup name="attlist.ManagedHibernateSession"> + <xs:attribute name="session-factory"/> + <xs:attribute name="session-factory-jndi-name"/> + </xs:attributeGroup> + + <xs:element name="hibernate-session-factory"> + <xs:complexType mixed="true"> + <xs:choice minOccurs="0" maxOccurs="unbounded"> + <xs:element name="mapping-classes" type="components:multiValuedProperty"/> + <xs:element name="mapping-files" type="components:multiValuedProperty"/> + <xs:element name="mapping-jars" type="components:multiValuedProperty"/> + <xs:element name="mapping-packages" type="components:multiValuedProperty"/> + <xs:element name="mapping-resources" type="components:multiValuedProperty"/> + <xs:element name="cfg-properties" type="components:mapProperty"/> + </xs:choice> + <xs:attributeGroup ref="persistence:attlist.HibernateSessionFactory"/> + <xs:attributeGroup ref="components:attlist.component"/> + </xs:complexType> + </xs:element> + <xs:attributeGroup name="attlist.HibernateSessionFactory"> + <xs:attribute name="cfg-resource-name"/> + </xs:attributeGroup> + + <xs:element name="entity-manager-factory"> + <xs:complexType mixed="true"> + <xs:sequence minOccurs="0" maxOccurs="1"> + <xs:element name="persistence-unit-properties" type="components:mapProperty"/> + </xs:sequence> + <xs:attributeGroup ref="persistence:attlist.EntityManagerFactory"/> + <xs:attributeGroup ref="components:attlist.component"/> + </xs:complexType> + </xs:element> + <xs:attributeGroup name="attlist.EntityManagerFactory"> + <xs:attribute name="persistence-unit-name"/> + </xs:attributeGroup> + + <xs:element name="filter"> + <xs:complexType mixed="true"> + <xs:sequence> + <xs:element minOccurs="0" name="name" type="xs:string"/> + <xs:element minOccurs="0" name="parameters" type="components:mapProperty"/> + </xs:sequence> + <xs:attributeGroup ref="persistence:attlist.filter"/> + <xs:attributeGroup ref="components:attlist.component"/> + </xs:complexType> + </xs:element> + <xs:attributeGroup name="attlist.filter"> + <xs:attribute name="enabled"/> + </xs:attributeGroup> + +</xs:schema> Deleted: trunk/src/main/org/jboss/seam/remoting-2.0.xsd =================================================================== --- trunk/src/main/org/jboss/seam/remoting-2.0.xsd 2008-02-05 18:00:10 UTC (rev 7367) +++ trunk/src/main/org/jboss/seam/remoting-2.0.xsd 2008-02-05 19:37:56 UTC (rev 7368) @@ -1,26 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" - targetNamespace="http://jboss.com/products/seam/remoting" xmlns:remoting="http://jboss.com/products/seam/remoting" - xmlns:components="http://jboss.com/products/seam/components" attributeFormDefault="unqualified"> - <xs:import namespace="http://jboss.com/products/seam/components" schemaLocation="components-2.0.xsd"/> - - <xs:element name="remoting-config"> - <xs:complexType mixed="true"> - <xs:attributeGroup ref="components:attlist.component"/> - <xs:attributeGroup ref="remoting:attlist.remotingConfig"/> - </xs:complexType> - </xs:element> - <xs:attributeGroup name="attlist.remotingConfig"> - <xs:attribute name="poll-interval" /> - <xs:attribute name="poll-timeout" /> - <xs:attribute name="debug"> - <xs:simpleType> - <xs:restriction base="xs:token"> - <xs:enumeration value="true"/> - <xs:enumeration value="false"/> - </xs:restriction> - </xs:simpleType> - </xs:attribute> - </xs:attributeGroup> - -</xs:schema> Added: trunk/src/main/org/jboss/seam/remoting-2.1.xsd =================================================================== --- trunk/src/main/org/jboss/seam/remoting-2.1.xsd (rev 0) +++ trunk/src/main/org/jboss/seam/remoting-2.1.xsd 2008-02-05 19:37:56 UTC (rev 7368) @@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="UTF-8"?> +<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" + targetNamespace="http://jboss.com/products/seam/remoting" xmlns:remoting="http://jboss.com/products/seam/remoting" + xmlns:components="http://jboss.com/products/seam/components" attributeFormDefault="unqualified"> + <xs:import namespace="http://jboss.com/products/seam/components" schemaLocation="components-2.1.xsd"/> + + <xs:element name="remoting-config"> + <xs:complexType mixed="true"> + <xs:attributeGroup ref="components:attlist.component"/> + <xs:attributeGroup ref="remoting:attlist.remotingConfig"/> + </xs:complexType> + </xs:element> + <xs:attributeGroup name="attlist.remotingConfig"> + <xs:attribute name="poll-interval" /> + <xs:attribute name="poll-timeout" /> + <xs:attribute name="debug"> + <xs:simpleType> + <xs:restriction base="xs:token"> + <xs:enumeration value="true"/> + <xs:enumeration value="false"/> + </xs:restriction> + </xs:simpleType> + </xs:attribute> + </xs:attributeGroup> + +</xs:schema> Deleted: trunk/src/main/org/jboss/seam/security-2.0.xsd =================================================================== --- trunk/src/main/org/jboss/seam/security-2.0.xsd 2008-02-05 18:00:10 UTC (rev 7367) +++ trunk/src/main/org/jboss/seam/security-2.0.xsd 2008-02-05 19:37:56 UTC (rev 7368) @@ -1,33 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" - targetNamespace="http://jboss.com/products/seam/security" xmlns:security="http://jboss.com/products/seam/security" - xmlns:components="http://jboss.com/products/seam/components" attributeFormDefault="unqualified"> - <xs:import namespace="http://jboss.com/products/seam/components" schemaLocation="components-2.0.xsd"/> - - <xs:element name="identity"> - <xs:complexType mixed="true"> - <xs:attributeGroup ref="components:attlist.component"/> - <xs:attributeGroup ref="security:attlist.identity"/> - </xs:complexType> - </xs:element> - - <xs:element name="faces-security-events"> - <xs:complexType mixed="true"> - <xs:attributeGroup ref="components:attlist.component"/> - <xs:attributeGroup ref="security:attlist.faces-security-events"/> - </xs:complexType> - </xs:element> - - <xs:attributeGroup name="attlist.identity"> - <xs:attribute name="authenticate-method" /> - <xs:attribute name="remember-me" type="xs:boolean"/> - <xs:attribute name="authenticate-every-request" type="xs:boolean"/> - <xs:attribute name="jaas-config-name" type="xs:string"/> - <xs:attribute name="security-rules" type="xs:string"/> - </xs:attributeGroup> - - <xs:attributeGroup name="attlist.faces-security-events"> - <xs:attribute name="cookie-max-age"/> - </xs:attributeGroup> - -</xs:schema> Added: trunk/src/main/org/jboss/seam/security-2.1.xsd =================================================================== --- trunk/src/main/org/jboss/seam/security-2.1.xsd (rev 0) +++ trunk/src/main/org/jboss/seam/security-2.1.xsd 2008-02-05 19:37:56 UTC (rev 7368) @@ -0,0 +1,33 @@ +<?xml version="1.0" encoding="UTF-8"?> +<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" + targetNamespace="http://jboss.com/products/seam/security" xmlns:security="http://jboss.com/products/seam/security" + xmlns:components="http://jboss.com/products/seam/components" attributeFormDefault="unqualified"> + <xs:import namespace="http://jboss.com/products/seam/components" schemaLocation="components-2.1.xsd"/> + + <xs:element name="identity"> + <xs:complexType mixed="true"> + <xs:attributeGroup ref="components:attlist.component"/> + <xs:attributeGroup ref="security:attlist.identity"/> + </xs:complexType> + </xs:element> + + <xs:element name="faces-security-events"> + <xs:complexType mixed="true"> + <xs:attributeGroup ref="components:attlist.component"/> + <xs:attributeGroup ref="security:attlist.faces-security-events"/> + </xs:complexType> + </xs:element> + + <xs:attributeGroup name="attlist.identity"> + <xs:attribute name="authenticate-method" /> + <xs:attribute name="remember-me" type="xs:boolean"/> + <xs:attribute name="authenticate-every-request" type="xs:boolean"/> + <xs:attribute name="jaas-config-name" type="xs:string"/> + <xs:attribute name="security-rules" type="xs:string"/> + </xs:attributeGroup> + + <xs:attributeGroup name="attlist.faces-security-events"> + <xs:attribute name="cookie-max-age"/> + </xs:attributeGroup> + +</xs:schema> Deleted: trunk/src/main/org/jboss/seam/theme-2.0.xsd =================================================================== --- trunk/src/main/org/jboss/seam/theme-2.0.xsd 2008-02-05 18:00:10 UTC (rev 7367) +++ trunk/src/main/org/jboss/seam/theme-2.0.xsd 2008-02-05 19:37:56 UTC (rev 7368) @@ -1,31 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" - targetNamespace="http://jboss.com/products/seam/theme" xmlns:theme="http://jboss.com/products/seam/theme" - xmlns:components="http://jboss.com/products/seam/components" attributeFormDefault="unqualified"> - <xs:import namespace="http://jboss.com/products/seam/components" schemaLocation="components-2.0.xsd"/> - - <xs:element name="theme-selector"> - <xs:complexType mixed="true"> - <xs:choice minOccurs="0" maxOccurs="1"> - <xs:element ref="theme:available-themes"/> - </xs:choice> - <xs:attributeGroup ref="components:attlist.component"/> - <xs:attributeGroup ref="theme:attlist.themeSelector"/> - </xs:complexType> - </xs:element> - <xs:element name="available-themes" type="components:multiValuedProperty"/> - <xs:attributeGroup name="attlist.themeSelector"> - <xs:attribute name="theme" type="xs:string"/> - <xs:attribute name="available-themes" type="xs:string"/> - <xs:attribute name="cookie-max-age"/> - <xs:attribute name="cookie-enabled"> - <xs:simpleType> - <xs:restriction base="xs:token"> - <xs:enumeration value="true"/> - <xs:enumeration value="false"/> - </xs:restriction> - </xs:simpleType> - </xs:attribute> - </xs:attributeGroup> - -</xs:schema> Added: trunk/src/main/org/jboss/seam/theme-2.1.xsd =================================================================== --- trunk/src/main/org/jboss/seam/theme-2.1.xsd (rev 0) +++ trunk/src/main/org/jboss/seam/theme-2.1.xsd 2008-02-05 19:37:56 UTC (rev 7368) @@ -0,0 +1,31 @@ +<?xml version="1.0" encoding="UTF-8"?> +<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" + targetNamespace="http://jboss.com/products/seam/theme" xmlns:theme="http://jboss.com/products/seam/theme" + xmlns:components="http://jboss.com/products/seam/components" attributeFormDefault="unqualified"> + <xs:import namespace="http://jboss.com/products/seam/components" schemaLocation="components-2.1.xsd"/> + + <xs:element name="theme-selector"> + <xs:complexType mixed="true"> + <xs:choice minOccurs="0" maxOccurs="1"> + <xs:element ref="theme:available-themes"/> + </xs:choice> + <xs:attributeGroup ref="components:attlist.component"/> + <xs:attributeGroup ref="theme:attlist.themeSelector"/> + </xs:complexType> + </xs:element> + <xs:element name="available-themes" type="components:multiValuedProperty"/> + <xs:attributeGroup name="attlist.themeSelector"> + <xs:attribute name="theme" type="xs:string"/> + <xs:attribute name="available-themes" type="xs:string"/> + <xs:attribute name="cookie-max-age"/> + <xs:attribute name="cookie-enabled"> + <xs:simpleType> + <xs:restriction base="xs:token"> + <xs:enumeration value="true"/> + <xs:enumeration value="false"/> + </xs:restriction> + </xs:simpleType> + </xs:attribute> + </xs:attributeGroup> + +</xs:schema> Deleted: trunk/src/main/org/jboss/seam/transaction-2.0.xsd =================================================================== --- trunk/src/main/org/jboss/seam/transaction-2.0.xsd 2008-02-05 18:00:10 UTC (rev 7367) +++ trunk/src/main/org/jboss/seam/transaction-2.0.xsd 2008-02-05 19:37:56 UTC (rev 7368) @@ -1,42 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" - targetNamespace="http://jboss.com/products/seam/transaction" xmlns:transaction="http://jboss.com/products/seam/transaction" - xmlns:components="http://jboss.com/products/seam/components" attributeFormDefault="unqualified"> - <xs:import namespace="http://jboss.com/products/seam/components" schemaLocation="components-2.0.xsd"/> - - <xs:element name="ejb-transaction"> - <xs:complexType mixed="true"> - <xs:attributeGroup ref="components:attlist.component"/> - <xs:attributeGroup ref="components:attlist.ejbcomponent"/> - <xs:attributeGroup ref="transaction:attlist.transaction"/> - </xs:complexType> - </xs:element> - <xs:attributeGroup name="attlist.transaction"> </xs:attributeGroup> - - <xs:element name="hibernate-transaction"> - <xs:complexType mixed="true"> - <xs:attributeGroup ref="components:attlist.component"/> - <xs:attributeGroup ref="transaction:attlist.HibernateTransaction"/> - </xs:complexType> - </xs:element> - <xs:attributeGroup name="attlist.HibernateTransaction"> - <xs:attribute name="session" type="xs:string" use="required"/> - </xs:attributeGroup> - - <xs:element name="entity-transaction"> - <xs:complexType mixed="true"> - <xs:attributeGroup ref="components:attlist.component"/> - <xs:attributeGroup ref="transaction:attlist.EntityTransaction"/> - </xs:complexType> - </xs:element> - <xs:attributeGroup name="attlist.EntityTransaction"> - <xs:attribute name="entity-manager" type="xs:string" use="required"/> - </xs:attributeGroup> - - <xs:element name="no-transaction"> - <xs:complexType mixed="true"> - <xs:attributeGroup ref="components:attlist.component"/> - </xs:complexType> - </xs:element> - -</xs:schema> Added: trunk/src/main/org/jboss/seam/transaction-2.1.xsd =================================================================== --- trunk/src/main/org/jboss/seam/transaction-2.1.xsd (rev 0) +++ trunk/src/main/org/jboss/seam/transaction-2.1.xsd 2008-02-05 19:37:56 UTC (rev 7368) @@ -0,0 +1,42 @@ +<?xml version="1.0" encoding="UTF-8"?> +<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" + targetNamespace="http://jboss.com/products/seam/transaction" xmlns:transaction="http://jboss.com/products/seam/transaction" + xmlns:components="http://jboss.com/products/seam/components" attributeFormDefault="unqualified"> + <xs:import namespace="http://jboss.com/products/seam/components" schemaLocation="components-2.1.xsd"/> + + <xs:element name="ejb-transaction"> + <xs:complexType mixed="true"> + <xs:attributeGroup ref="components:attlist.component"/> + <xs:attributeGroup ref="components:attlist.ejbcomponent"/> + <xs:attributeGroup ref="transaction:attlist.transaction"/> + </xs:complexType> + </xs:element> + <xs:attributeGroup name="attlist.transaction"> </xs:attributeGroup> + + <xs:element name="hibernate-transaction"> + <xs:complexType mixed="true"> + <xs:attributeGroup ref="components:attlist.component"/> + <xs:attributeGroup ref="transaction:attlist.HibernateTransaction"/> + </xs:complexType> + </xs:element> + <xs:attributeGroup name="attlist.HibernateTransaction"> + <xs:attribute name="session" type="xs:string" use="required"/> + </xs:attributeGroup> + + <xs:element name="entity-transaction"> + <xs:complexType mixed="true"> + <xs:attributeGroup ref="components:attlist.component"/> + <xs:attributeGroup ref="transaction:attlist.EntityTransaction"/> + </xs:complexType> + </xs:element> + <xs:attributeGroup name="attlist.EntityTransaction"> + <xs:attribute name="entity-manager" type="xs:string" use="required"/> + </xs:attributeGroup> + + <xs:element name="no-transaction"> + <xs:complexType mixed="true"> + <xs:attributeGroup ref="components:attlist.component"/> + </xs:complexType> + </xs:element> + +</xs:schema> Deleted: trunk/src/main/org/jboss/seam/web-2.0.xsd =================================================================== --- trunk/src/main/org/jboss/seam/web-2.0.xsd 2008-02-05 18:00:10 UTC (rev 7367) +++ trunk/src/main/org/jboss/seam/web-2.0.xsd 2008-02-05 19:37:56 UTC (rev 7368) @@ -1,133 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" - targetNamespace="http://jboss.com/products/seam/web" xmlns:web="http://jboss.com/products/seam/web" - xmlns:components="http://jboss.com/products/seam/components" attributeFormDefault="unqualified"> - <xs:import namespace="http://jboss.com/products/seam/components" schemaLocation="components-2.0.xsd"/> - - <xs:element name="multipart-filter"> - <xs:complexType mixed="true"> - <xs:attributeGroup ref="components:attlist.component"/> - <xs:attributeGroup ref="web:attlist.filter"/> - <xs:attributeGroup ref="web:attlist.multipartFilter"/> - </xs:complexType> - </xs:element> - - <xs:element name="redirect-filter"> - <xs:complexType mixed="true"> - <xs:attributeGroup ref="components:attlist.component"/> - <xs:attributeGroup ref="web:attlist.filter"/> - </xs:complexType> - </xs:element> - - <xs:element name="exception-filter"> - <xs:complexType mixed="true"> - <xs:attributeGroup ref="components:attlist.component"/> - <xs:attributeGroup ref="web:attlist.filter"/> - </xs:complexType> - </xs:element> - - <xs:element name="context-filter"> - <xs:complexType mixed="true"> - <xs:attributeGroup ref="components:attlist.component"/> - <xs:attributeGroup ref="web:attlist.filter"/> - </xs:complexType> - </xs:element> - - <xs:element name="wicket-filter"> - <xs:complexType mixed="true"> - <xs:attributeGroup ref="components:attlist.component"/> - <xs:attributeGroup ref="web:attlist.filter"/> - <xs:attributeGroup ref="web:attlist.wicketFilter"/> - </xs:complexType> - </xs:element> - - <xs:element name="character-encoding-filter"> - <xs:complexType mixed="true"> - <xs:attributeGroup ref="components:attlist.component"/> - <xs:attributeGroup ref="web:attlist.filter"/> - <xs:attribute name="encoding" type="xs:string"/> - <xs:attribute name="override-client" type="xs:boolean"/> - </xs:complexType> - </xs:element> - - <xs:element name="authentication-filter"> - <xs:complexType mixed="true"> - <xs:attributeGroup ref="components:attlist.component"/> - <xs:attributeGroup ref="web:attlist.filter"/> - <xs:attribute name="realm" type="xs:string"/> - <xs:attribute name="key" type="xs:string"/> - <xs:attribute name="nonce-validity-seconds" type="xs:int"/> - <xs:attribute name="auth-type" type="xs:string"/> - </xs:complexType> - </xs:element> - - <xs:element name="logging-filter"> - <xs:complexType mixed="true"> - <xs:attributeGroup ref="components:attlist.component"/> - <xs:attributeGroup ref="web:attlist.filter"/> - </xs:complexType> - </xs:element> - - <xs:element name="ajax4jsf-filter"> - <xs:complexType mixed="true"> - <xs:attributeGroup ref="components:attlist.component"/> - <xs:attributeGroup ref="web:attlist.filter"/> - <xs:attributeGroup ref="web:attlist.ajax4jsfFilter"/> - </xs:complexType> - </xs:element> - - <xs:attributeGroup name="attlist.filter"> - <xs:attribute name="url-pattern" type="xs:string"/> - <xs:attribute name="regex-url-pattern" type="xs:string"/> - <xs:attribute name="disabled" type="xs:boolean" default="false" /> - </xs:attributeGroup> - - <xs:attributeGroup name="attlist.wicketFilter"> - <xs:attribute name="application-class" type="xs:string"/> - <xs:attribute name="application-factory-class" type="xs:string"/> - <xs:attribute name="detect-portlet-context" type="xs:boolean" default="false" /> - </xs:attributeGroup> - - <xs:attributeGroup name="attlist.multipartFilter"> - <xs:attribute name="create-temp-files"> - <xs:simpleType> - <xs:restriction base="xs:token"> - <xs:enumeration value="true"/> - <xs:enumeration value="false"/> - </xs:restriction> - </xs:simpleType> - </xs:attribute> - <xs:attribute name="max-request-size" type="xs:integer"/> - </xs:attributeGroup> - - <xs:attributeGroup name="attlist.ajax4jsfFilter"> - <xs:attribute name="enable-cache"> - <xs:simpleType> - <xs:restriction base="xs:token"> - <xs:enumeration value="true"/> - <xs:enumeration value="false"/> - </xs:restriction> - </xs:simpleType> - </xs:attribute> - <xs:attribute name="force-parser"> - <xs:simpleType> - <xs:restriction base="xs:token"> - <xs:enumeration value="true"/> - <xs:enumeration value="false"/> - </xs:restriction> - </xs:simpleType> - </xs:attribute> - <xs:attribute name="log4j-init-file" type="xs:string"/> - </xs:attributeGroup> - - <xs:element name="servlet-session"> - <xs:complexType mixed="true"> - <xs:attributeGroup ref="components:attlist.component"/> - <xs:attributeGroup ref="web:attlist.servlet-session"/> - </xs:complexType> - </xs:element> - <xs:attributeGroup name="attlist.servlet-session"> - <xs:attribute name="invalidate-on-scheme-change" type="xs:boolean"/> - </xs:attributeGroup> - -</xs:schema> Added: trunk/src/main/org/jboss/seam/web-2.1.xsd =================================================================== --- trunk/src/main/org/jboss/seam/web-2.1.xsd (rev 0) +++ trunk/src/main/org/jboss/seam/web-2.1.xsd 2008-02-05 19:37:56 UTC (rev 7368) @@ -0,0 +1,133 @@ +<?xml version="1.0" encoding="UTF-8"?> +<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" + targetNamespace="http://jboss.com/products/seam/web" xmlns:web="http://jboss.com/products/seam/web" + xmlns:components="http://jboss.com/products/seam/components" attributeFormDefault="unqualified"> + <xs:import namespace="http://jboss.com/products/seam/components" schemaLocation="components-2.1.xsd"/> + + <xs:element name="multipart-filter"> + <xs:complexType mixed="true"> + <xs:attributeGroup ref="components:attlist.component"/> + <xs:attributeGroup ref="web:attlist.filter"/> + <xs:attributeGroup ref="web:attlist.multipartFilter"/> + </xs:complexType> + </xs:element> + + <xs:element name="redirect-filter"> + <xs:complexType mixed="true"> + <xs:attributeGroup ref="components:attlist.component"/> + <xs:attributeGroup ref="web:attlist.filter"/> + </xs:complexType> + </xs:element> + + <xs:element name="exception-filter"> + <xs:complexType mixed="true"> + <xs:attributeGroup ref="components:attlist.component"/> + <xs:attributeGroup ref="web:attlist.filter"/> + </xs:complexType> + </xs:element> + + <xs:element name="context-filter"> + <xs:complexType mixed="true"> + <xs:attributeGroup ref="components:attlist.component"/> + <xs:attributeGroup ref="web:attlist.filter"/> + </xs:complexType> + </xs:element> + + <xs:element name="wicket-filter"> + <xs:complexType mixed="true"> + <xs:attributeGroup ref="components:attlist.component"/> + <xs:attributeGroup ref="web:attlist.filter"/> + <xs:attributeGroup ref="web:attlist.wicketFilter"/> + </xs:complexType> + </xs:element> + + <xs:element name="character-encoding-filter"> + <xs:complexType mixed="true"> + <xs:attributeGroup ref="components:attlist.component"/> + <xs:attributeGroup ref="web:attlist.filter"/> + <xs:attribute name="encoding" type="xs:string"/> + <xs:attribute name="override-client" type="xs:boolean"/> + </xs:complexType> + </xs:element> + + <xs:element name="authentication-filter"> + <xs:complexType mixed="true"> + <xs:attributeGroup ref="components:attlist.component"/> + <xs:attributeGroup ref="web:attlist.filter"/> + <xs:attribute name="realm" type="xs:string"/> + <xs:attribute name="key" type="xs:string"/> + <xs:attribute name="nonce-validity-seconds" type="xs:int"/> + <xs:attribute name="auth-type" type="xs:string"/> + </xs:complexType> + </xs:element> + + <xs:element name="logging-filter"> + <xs:complexType mixed="true"> + <xs:attributeGroup ref="components:attlist.component"/> + <xs:attributeGroup ref="web:attlist.filter"/> + </xs:complexType> + </xs:element> + + <xs:element name="ajax4jsf-filter"> + <xs:complexType mixed="true"> + <xs:attributeGroup ref="components:attlist.component"/> + <xs:attributeGroup ref="web:attlist.filter"/> + <xs:attributeGroup ref="web:attlist.ajax4jsfFilter"/> + </xs:complexType> + </xs:element> + + <xs:attributeGroup name="attlist.filter"> + <xs:attribute name="url-pattern" type="xs:string"/> + <xs:attribute name="regex-url-pattern" type="xs:string"/> + <xs:attribute name="disabled" type="xs:boolean" default="false" /> + </xs:attributeGroup> + + <xs:attributeGroup name="attlist.wicketFilter"> + <xs:attribute name="application-class" type="xs:string"/> + <xs:attribute name="application-factory-class" type="xs:string"/> + <xs:attribute name="detect-portlet-context" type="xs:boolean" default="false" /> + </xs:attributeGroup> + + <xs:attributeGroup name="attlist.multipartFilter"> + <xs:attribute name="create-temp-files"> + <xs:simpleType> + <xs:restriction base="xs:token"> + <xs:enumeration value="true"/> + <xs:enumeration value="false"/> + </xs:restriction> + </xs:simpleType> + </xs:attribute> + <xs:attribute name="max-request-size" type="xs:integer"/> + </xs:attributeGroup> + + <xs:attributeGroup name="attlist.ajax4jsfFilter"> + <xs:attribute name="enable-cache"> + <xs:simpleType> + <xs:restriction base="xs:token"> + <xs:enumeration value="true"/> + <xs:enumeration value="false"/> + </xs:restriction> + </xs:simpleType> + </xs:attribute> + <xs:attribute name="force-parser"> + <xs:simpleType> + <xs:restriction base="xs:token"> + <xs:enumeration value="true"/> + <xs:enumeration value="false"/> + </xs:restriction> + </xs:simpleType> + </xs:attribute> + <xs:attribute name="log4j-init-file" type="xs:string"/> + </xs:attributeGroup> + + <xs:element name="servlet-session"> + <xs:complexType mixed="true"> + <xs:attributeGroup ref="components:attlist.component"/> + <xs:attributeGroup ref="web:attlist.servlet-session"/> + </xs:complexType> + </xs:element> + <xs:attributeGroup name="attlist.servlet-session"> + <xs:attribute name="invalidate-on-scheme-change" type="xs:boolean"/> + </xs:attributeGroup> + +</xs:schema> Deleted: trunk/src/pdf/org/jboss/seam/pdf/pdf-2.0.xsd =================================================================== --- trunk/src/pdf/org/jboss/seam/pdf/pdf-2.0.xsd 2008-02-05 18:00:10 UTC (rev 7367) +++ trunk/src/pdf/org/jboss/seam/pdf/pdf-2.0.xsd 2008-02-05 19:37:56 UTC (rev 7368) @@ -1,33 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" - elementFormDefault="qualified" - targetNamespace="http://jboss.com/products/seam/pdf" - xmlns:pdf="http://jboss.com/products/seam/pdf" - xmlns:components="http://jboss.com/products/seam/components" - attributeFormDefault="unqualified"> - <xs:import namespace="http://jboss.com/products/seam/components" schemaLocation="components-2.0.xsd"/> - - <xs:element name="document-store"> - <xs:complexType mixed="true"> - <xs:attributeGroup ref="components:attlist.component"/> - <xs:attributeGroup ref="pdf:attlist.docstore"/> - </xs:complexType> - </xs:element> - <xs:attributeGroup name="attlist.docstore"> - <xs:attribute name="error-page" type="xs:string"/> - <xs:attribute name="use-extensions" type="xs:string"/> - </xs:attributeGroup> - - <xs:element name="key-store-config"> - <xs:complexType mixed="true"> - <xs:attributeGroup ref="components:attlist.component"/> - <xs:attributeGroup ref="pdf:attlist.UseExtensions"/> - </xs:complexType> - </xs:element> - <xs:attributeGroup name="attlist.UseExtensions"> - <xs:attribute name="key-store" type="xs:string"/> - <xs:attribute name="key-store-password" type="xs:string"/> - <xs:attribute name="key-password" type="xs:string"/> - <xs:attribute name="key-alias" type="xs:string"/> - </xs:attributeGroup> -</xs:schema> Added: trunk/src/pdf/org/jboss/seam/pdf/pdf-2.1.xsd =================================================================== --- trunk/src/pdf/org/jboss/seam/pdf/pdf-2.1.xsd (rev 0) +++ trunk/src/pdf/org/jboss/seam/pdf/pdf-2.1.xsd 2008-02-05 19:37:56 UTC (rev 7368) @@ -0,0 +1,33 @@ +<?xml version="1.0" encoding="UTF-8"?> +<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" + elementFormDefault="qualified" + targetNamespace="http://jboss.com/products/seam/pdf" + xmlns:pdf="http://jboss.com/products/seam/pdf" + xmlns:components="http://jboss.com/products/seam/components" + attributeFormDefault="unqualified"> + <xs:import namespace="http://jboss.com/products/seam/components" schemaLocation="components-2.1.xsd"/> + + <xs:element name="document-store"> + <xs:complexType mixed="true"> + <xs:attributeGroup ref="components:attlist.component"/> + <xs:attributeGroup ref="pdf:attlist.docstore"/> + </xs:complexType> + </xs:element> + <xs:attributeGroup name="attlist.docstore"> + <xs:attribute name="error-page" type="xs:string"/> + <xs:attribute name="use-extensions" type="xs:string"/> + </xs:attributeGroup> + + <xs:element name="key-store-config"> + <xs:complexType mixed="true"> + <xs:attributeGroup ref="components:attlist.component"/> + <xs:attributeGroup ref="pdf:attlist.UseExtensions"/> + </xs:complexType> + </xs:element> + <xs:attributeGroup name="attlist.UseExtensions"> + <xs:attribute name="key-store" type="xs:string"/> + <xs:attribute name="key-store-password" type="xs:string"/> + <xs:attribute name="key-password" type="xs:string"/> + <xs:attribute name="key-alias" type="xs:string"/> + </xs:attributeGroup> +</xs:schema> Modified: trunk/src/test/integration/resources/WEB-INF/components.xml =================================================================== --- trunk/src/test/integration/resources/WEB-INF/components.xml 2008-02-05 18:00:10 UTC (rev 7367) +++ trunk/src/test/integration/resources/WEB-INF/components.xml 2008-02-05 19:37:56 UTC (rev 7368) @@ -9,14 +9,14 @@ xmlns:jms="http://jboss.com/products/seam/jms" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation= - "http://jboss.com/products/seam/core http://jboss.com/products/seam/core-2.0.xsd - http://jboss.com/products/seam/bpm http://jboss.com/products/seam/bpm-2.0.xsd - http://jboss.com/products/seam/security http://jboss.com/products/seam/security-2.0.xsd - http://jboss.com/products/seam/persistence http://jboss.com/products/seam/persistence-2.0.xsd - http://jboss.com/products/seam/components http://jboss.com/products/seam/components-2.0.xsd - http://jboss.com/products/seam/web http://jboss.com/products/seam/web-2.0.xsd - http://jboss.com/products/seam/jms http://jboss.com/products/seam/jms-2.0.xsd - http://jboss.com/products/seam/framework http://jboss.com/products/seam/framework-2.0.xsd"> + "http://jboss.com/products/seam/core http://jboss.com/products/seam/core-2.1.xsd + http://jboss.com/products/seam/bpm http://jboss.com/products/seam/bpm-2.1.xsd + http://jboss.com/products/seam/security http://jboss.com/products/seam/security-2.1.xsd + http://jboss.com/products/seam/persistence http://jboss.com/products/seam/persistence-2.1.xsd + http://jboss.com/products/seam/components http://jboss.com/products/seam/components-2.1.xsd + http://jboss.com/products/seam/web http://jboss.com/products/seam/web-2.1.xsd + http://jboss.com/products/seam/jms http://jboss.com/products/seam/jms-2.1.xsd + http://jboss.com/products/seam/framework http://jboss.com/products/seam/framework-2.1.xsd"> <core:init debug="false" jndi-pattern="@jndiPattern@" /> Modified: trunk/src/test/integration/resources/WEB-INF/pages.xml =================================================================== --- trunk/src/test/integration/resources/WEB-INF/pages.xml 2008-02-05 18:00:10 UTC (rev 7367) +++ trunk/src/test/integration/resources/WEB-INF/pages.xml 2008-02-05 19:37:56 UTC (rev 7368) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <pages xmlns="http://jboss.com/products/seam/pages" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://jboss.com/products/seam/pages http://jboss.com/products/seam/pages-2.0.xsd" + xsi:schemaLocation="http://jboss.com/products/seam/pages http://jboss.com/products/seam/pages-2.1.xsd" no-conversation-view-id="/home.xhtml" login-view-id="/login.xhtml"> Modified: trunk/src/test/unit/META-INF/pagesForPageActionsTest.xml =================================================================== --- trunk/src/test/unit/META-INF/pagesForPageActionsTest.xml 2008-02-05 18:00:10 UTC (rev 7367) +++ trunk/src/test/unit/META-INF/pagesForPageActionsTest.xml 2008-02-05 19:37:56 UTC (rev 7368) @@ -2,7 +2,7 @@ <pages xmlns="http://jboss.com/products/seam/pages" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jboss.com/products/seam/pages - http://jboss.com/products/seam/pages-2.0.xsd"> + http://jboss.com/products/seam/pages-2.1.xsd"> <page view-id="/action-test01a.xhtml"> <action execute="#{testActions.nonNullActionA}" /> Modified: trunk/src/test/unit/org/jboss/seam/test/unit/component/MyEntityHome.component.xml =================================================================== --- trunk/src/test/unit/org/jboss/seam/test/unit/component/MyEntityHome.component.xml 2008-02-05 18:00:10 UTC (rev 7367) +++ trunk/src/test/unit/org/jboss/seam/test/unit/component/MyEntityHome.component.xml 2008-02-05 19:37:56 UTC (rev 7368) @@ -3,8 +3,8 @@ xmlns:framework="http://jboss.com/products/seam/framework" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation=" - http://jboss.com/products/seam/components http://jboss.com/products/seam/components-2.0.xsd - http://jboss.com/products/seam/framework http://jboss.com/products/seam/framework-2.0.xsd"> + http://jboss.com/products/seam/components http://jboss.com/products/seam/components-2.1.xsd + http://jboss.com/products/seam/framework http://jboss.com/products/seam/framework-2.1.xsd"> <!-- NOTE: The presence of this file exercises the test to verify that the class attribute is read on namespaced elements. The reason this attribute is significant in this case is because the namespace references a class that does not have @Name. @@ -15,4 +15,4 @@ <framework:deleted-message>You deleted it! Yeah!</framework:deleted-message> </framework:entity-home> -</components> \ No newline at end of file +</components>

16 years, 3 months

1
0
0 / 0

Seam SVN: r7367 - trunk/examples/wicket/src/web/org/jboss/seam.

by seam-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2008-02-05 13:00:10 -0500 (Tue, 05 Feb 2008) New Revision: 7367 Removed: trunk/examples/wicket/src/web/org/jboss/seam/wicket/ Log: Cleanup

16 years, 3 months

1
0
0 / 0

Seam SVN: r7366 - in trunk: examples/wicket/resources and 8 other directories.

by seam-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2008-02-05 12:37:10 -0500 (Tue, 05 Feb 2008) New Revision: 7366 Added: trunk/examples/wicket/resources/jboss-seam-wicket-booking-ds.xml trunk/examples/wicket/src/web/org/jboss/seam/example/wicket/SimpleDataProvider.java trunk/src/main/org/jboss/seam/web/FilterConfigWrapper.java trunk/src/main/org/jboss/seam/web/WicketFilter.java trunk/src/wicket/org/jboss/seam/wicket/SeamWebApplication.java trunk/src/wicket/org/jboss/seam/wicket/ioc/ trunk/src/wicket/org/jboss/seam/wicket/ioc/BijectedAttribute.java trunk/src/wicket/org/jboss/seam/wicket/ioc/BijectedField.java trunk/src/wicket/org/jboss/seam/wicket/ioc/BijectedMethod.java trunk/src/wicket/org/jboss/seam/wicket/ioc/BijectedProperty.java trunk/src/wicket/org/jboss/seam/wicket/ioc/InjectionInterceptor.java trunk/src/wicket/org/jboss/seam/wicket/ioc/Injector.java trunk/src/wicket/org/jboss/seam/wicket/ioc/Loggable.java trunk/src/wicket/org/jboss/seam/wicket/ioc/MetaModel.java trunk/src/wicket/org/jboss/seam/wicket/ioc/MetaModelUtils.java trunk/src/wicket/org/jboss/seam/wicket/ioc/Outjector.java trunk/src/wicket/org/jboss/seam/wicket/ioc/SeamInjectionListener.java trunk/src/wicket/org/jboss/seam/wicket/ioc/WicketComponent.java trunk/src/wicket/org/jboss/seam/wicket/web/ trunk/src/wicket/org/jboss/seam/wicket/web/WicketExceptionFilter.java trunk/src/wicket/org/jboss/seam/wicket/web/WicketFilterInstantiator.java trunk/src/wicket/org/jboss/seam/wicket/web/WicketRedirectFilter.java Removed: trunk/examples/wicket/resources/jboss-seam-booking-ds.xml trunk/src/wicket/org/jboss/seam/wicket/BijectedAttribute.java trunk/src/wicket/org/jboss/seam/wicket/BijectedField.java trunk/src/wicket/org/jboss/seam/wicket/BijectedMethod.java trunk/src/wicket/org/jboss/seam/wicket/BijectedProperty.java trunk/src/wicket/org/jboss/seam/wicket/InjectionInterceptor.java trunk/src/wicket/org/jboss/seam/wicket/InjectionSupport.java trunk/src/wicket/org/jboss/seam/wicket/LoggerSupport.java trunk/src/wicket/org/jboss/seam/wicket/MetaModel.java trunk/src/wicket/org/jboss/seam/wicket/MetaModelUtils.java trunk/src/wicket/org/jboss/seam/wicket/OutjectionSupport.java trunk/src/wicket/org/jboss/seam/wicket/SeamSupport.java trunk/src/wicket/org/jboss/seam/wicket/SimpleDataProvider.java trunk/src/wicket/org/jboss/seam/wicket/WicketComponent.java trunk/src/wicket/org/jboss/seam/wicket/WicketExceptionFilter.java trunk/src/wicket/org/jboss/seam/wicket/WicketRedirectFilter.java trunk/src/wicket/org/jboss/seam/wicket/WicketSeamFilter.java Modified: trunk/examples/wicket/build.xml trunk/examples/wicket/resources/META-INF/application.xml trunk/examples/wicket/resources/META-INF/jboss-app.xml trunk/examples/wicket/resources/META-INF/persistence.xml trunk/examples/wicket/resources/WEB-INF/components.xml trunk/examples/wicket/resources/WEB-INF/web.xml trunk/examples/wicket/src/web/org/jboss/seam/example/wicket/Main.java trunk/examples/wicket/src/web/org/jboss/seam/example/wicket/Register.java trunk/examples/wicket/src/web/org/jboss/seam/example/wicket/WicketBookingApplication.java trunk/src/main/org/jboss/seam/web-2.0.xsd trunk/src/main/org/jboss/seam/web/Ajax4jsfFilter.java trunk/src/wicket/org/jboss/seam/wicket/ModelValidator.java trunk/src/wicket/org/jboss/seam/wicket/SeamAuthorizationStrategy.java trunk/src/wicket/org/jboss/seam/wicket/SeamLink.java Log: Move lots of stuff, better filter integration Modified: trunk/examples/wicket/build.xml =================================================================== --- trunk/examples/wicket/build.xml 2008-02-05 12:07:18 UTC (rev 7365) +++ trunk/examples/wicket/build.xml 2008-02-05 17:37:10 UTC (rev 7366) @@ -4,7 +4,7 @@  <property name="Name" value="Port of Seam Booking Example to use Wicket"/> - <property name="example.name" value="jboss-seam-wicket"/> + <property name="example.name" value="jboss-seam-wicket-booking"/> <property name="src.java.dir" value="src/action" /> <property name="src.web.dir" value="src/web" /> @@ -15,7 +15,7 @@ <property name="wicket-extensions.lib" value="yes" />  - <property name="example.ds" value="jboss-seam-wicket-ds.xml"/> + <property name="example.ds" value="jboss-seam-wicket-booking-ds.xml"/> <import file="../build.xml"/> Modified: trunk/examples/wicket/resources/META-INF/application.xml =================================================================== --- trunk/examples/wicket/resources/META-INF/application.xml 2008-02-05 12:07:18 UTC (rev 7365) +++ trunk/examples/wicket/resources/META-INF/application.xml 2008-02-05 17:37:10 UTC (rev 7366) @@ -8,13 +8,13 @@ <module> <web> - <web-uri>jboss-seam-wicket.war</web-uri> + <web-uri>jboss-seam-wicket-booking.war</web-uri> <context-root>/seam-wicket</context-root> </web> </module> <module> - <ejb>jboss-seam-wicket.jar</ejb> + <ejb>jboss-seam-wicket-booking.jar</ejb> </module> <module> Modified: trunk/examples/wicket/resources/META-INF/jboss-app.xml =================================================================== --- trunk/examples/wicket/resources/META-INF/jboss-app.xml 2008-02-05 12:07:18 UTC (rev 7365) +++ trunk/examples/wicket/resources/META-INF/jboss-app.xml 2008-02-05 17:37:10 UTC (rev 7366) @@ -5,6 +5,6 @@ <jboss-app> <loader-repository> - seam.jboss.org:loader=seam-wicket + seam.jboss.org:loader=seam-wicket-booking </loader-repository> </jboss-app> \ No newline at end of file Modified: trunk/examples/wicket/resources/META-INF/persistence.xml =================================================================== --- trunk/examples/wicket/resources/META-INF/persistence.xml 2008-02-05 12:07:18 UTC (rev 7365) +++ trunk/examples/wicket/resources/META-INF/persistence.xml 2008-02-05 17:37:10 UTC (rev 7366) @@ -3,9 +3,9 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd" version="1.0"> - <persistence-unit name="bookingDatabase"> + <persistence-unit name="wicketDatabase"> <provider>org.hibernate.ejb.HibernatePersistence</provider> - <jta-data-source>java:/bookingDatasource</jta-data-source> + <jta-data-source>java:/wicketDatasource</jta-data-source> <properties> <property name="hibernate.hbm2ddl.auto" value="create-drop"/> <property name="hibernate.show_sql" value="true"/> Modified: trunk/examples/wicket/resources/WEB-INF/components.xml =================================================================== --- trunk/examples/wicket/resources/WEB-INF/components.xml 2008-02-05 12:07:18 UTC (rev 7365) +++ trunk/examples/wicket/resources/WEB-INF/components.xml 2008-02-05 17:37:10 UTC (rev 7366) @@ -21,5 +21,8 @@ <transaction:ejb-transaction/> <security:identity authenticate-method="#{authenticator.authenticate}"/> + +  + <web:wicket-filter application-class="org.jboss.seam.example.wicket.WicketBookingApplication" /> </components> Modified: trunk/examples/wicket/resources/WEB-INF/web.xml =================================================================== --- trunk/examples/wicket/resources/WEB-INF/web.xml 2008-02-05 12:07:18 UTC (rev 7365) +++ trunk/examples/wicket/resources/WEB-INF/web.xml 2008-02-05 17:37:10 UTC (rev 7366) @@ -32,24 +32,6 @@ <url-pattern>/*</url-pattern> </filter-mapping> - <filter> - <filter-name>wicket-booking</filter-name> - <filter-class> - org.apache.wicket.protocol.http.WicketFilter - </filter-class> - <init-param> - <param-name>applicationClassName</param-name> - <param-value> - org.jboss.seam.example.wicket.WicketBookingApplication - </param-value> - </init-param> - </filter> - - <filter-mapping> - <filter-name>wicket-booking</filter-name> - <url-pattern>/*</url-pattern> - </filter-mapping> -  <session-config> Deleted: trunk/examples/wicket/resources/jboss-seam-booking-ds.xml =================================================================== --- trunk/examples/wicket/resources/jboss-seam-booking-ds.xml 2008-02-05 12:07:18 UTC (rev 7365) +++ trunk/examples/wicket/resources/jboss-seam-booking-ds.xml 2008-02-05 17:37:10 UTC (rev 7366) @@ -1,16 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!DOCTYPE datasources - PUBLIC "-//JBoss//DTD JBOSS JCA Config 1.5//EN" - "http://www.jboss.org/j2ee/dtd/jboss-ds_1_5.dtd"> - -<datasources> - <local-tx-datasource> - <jndi-name>bookingDatasource</jndi-name> - <connection-url>jdbc:hsqldb:.</connection-url> - <driver-class>org.hsqldb.jdbcDriver</driver-class> - <user-name>sa</user-name> - <password></password> - </local-tx-datasource> -</datasources> - Copied: trunk/examples/wicket/resources/jboss-seam-wicket-booking-ds.xml (from rev 7364, trunk/examples/wicket/resources/jboss-seam-booking-ds.xml) =================================================================== --- trunk/examples/wicket/resources/jboss-seam-wicket-booking-ds.xml (rev 0) +++ trunk/examples/wicket/resources/jboss-seam-wicket-booking-ds.xml 2008-02-05 17:37:10 UTC (rev 7366) @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!DOCTYPE datasources + PUBLIC "-//JBoss//DTD JBOSS JCA Config 1.5//EN" + "http://www.jboss.org/j2ee/dtd/jboss-ds_1_5.dtd"> + +<datasources> + <local-tx-datasource> + <jndi-name>wicketDatasource</jndi-name> + <connection-url>jdbc:hsqldb:.</connection-url> + <driver-class>org.hsqldb.jdbcDriver</driver-class> + <user-name>sa</user-name> + <password></password> + </local-tx-datasource> +</datasources> + Property changes on: trunk/examples/wicket/resources/jboss-seam-wicket-booking-ds.xml ___________________________________________________________________ Name: svn:executable + * Modified: trunk/examples/wicket/src/web/org/jboss/seam/example/wicket/Main.java =================================================================== --- trunk/examples/wicket/src/web/org/jboss/seam/example/wicket/Main.java 2008-02-05 12:07:18 UTC (rev 7365) +++ trunk/examples/wicket/src/web/org/jboss/seam/example/wicket/Main.java 2008-02-05 17:37:10 UTC (rev 7366) @@ -43,7 +43,6 @@ import org.jboss.seam.example.wicket.action.BookingList; import org.jboss.seam.example.wicket.action.Hotel; import org.jboss.seam.example.wicket.action.HotelSearching; -import org.jboss.seam.wicket.SimpleDataProvider; @Restrict public class Main extends WebPage Modified: trunk/examples/wicket/src/web/org/jboss/seam/example/wicket/Register.java =================================================================== --- trunk/examples/wicket/src/web/org/jboss/seam/example/wicket/Register.java 2008-02-05 12:07:18 UTC (rev 7365) +++ trunk/examples/wicket/src/web/org/jboss/seam/example/wicket/Register.java 2008-02-05 17:37:10 UTC (rev 7366) @@ -55,22 +55,6 @@ setResponsePage(Home.class); } - @Override - protected void onError() - { - super.onError(); - System.out.println("onError"); - System.out.println(username.getFeedbackMessage()); - } - } - @Override - protected void onBeforeRender() - { - super.onBeforeRender(); - System.out.println("onBeforeRender"); - System.out.println(username.getFeedbackMessage()); - } - } Copied: trunk/examples/wicket/src/web/org/jboss/seam/example/wicket/SimpleDataProvider.java (from rev 7364, trunk/src/wicket/org/jboss/seam/wicket/SimpleDataProvider.java) =================================================================== --- trunk/examples/wicket/src/web/org/jboss/seam/example/wicket/SimpleDataProvider.java (rev 0) +++ trunk/examples/wicket/src/web/org/jboss/seam/example/wicket/SimpleDataProvider.java 2008-02-05 17:37:10 UTC (rev 7366) @@ -0,0 +1,22 @@ +package org.jboss.seam.example.wicket; + +import java.io.Serializable; + +import org.apache.wicket.markup.repeater.data.IDataProvider; +import org.apache.wicket.model.IModel; +import org.apache.wicket.model.Model; + +public abstract class SimpleDataProvider implements IDataProvider +{ + + public IModel model(Object object) + { + return new Model((Serializable) object); + } + + public void detach() + { + // No - op + } + +} Modified: trunk/examples/wicket/src/web/org/jboss/seam/example/wicket/WicketBookingApplication.java =================================================================== --- trunk/examples/wicket/src/web/org/jboss/seam/example/wicket/WicketBookingApplication.java 2008-02-05 12:07:18 UTC (rev 7365) +++ trunk/examples/wicket/src/web/org/jboss/seam/example/wicket/WicketBookingApplication.java 2008-02-05 17:37:10 UTC (rev 7366) @@ -1,140 +1,24 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ package org.jboss.seam.example.wicket; -import java.util.Map; -import org.apache.wicket.Component; -import org.apache.wicket.Page; -import org.apache.wicket.Request; -import org.apache.wicket.RequestCycle; -import org.apache.wicket.RequestListenerInterface; -import org.apache.wicket.Response; -import org.apache.wicket.Session; -import org.apache.wicket.markup.html.form.IFormSubmitListener; -import org.apache.wicket.protocol.http.WebApplication; -import org.apache.wicket.protocol.http.WebRequestCycleProcessor; -import org.apache.wicket.protocol.http.WebSession; -import org.apache.wicket.protocol.http.request.WebRequestCodingStrategy; -import org.apache.wicket.request.IRequestCodingStrategy; -import org.apache.wicket.request.IRequestCycleProcessor; -import org.apache.wicket.request.RequestParameters; -import org.apache.wicket.request.target.component.IBookmarkablePageRequestTarget; -import org.apache.wicket.request.target.component.listener.IListenerInterfaceRequestTarget; -import org.jboss.seam.core.Conversation; -import org.jboss.seam.core.Manager; -import org.jboss.seam.wicket.SeamAuthorizationStrategy; -import org.jboss.seam.wicket.SeamSupport; +import org.jboss.seam.wicket.SeamWebApplication; + /** - * Test application for Wicket/ Seam/ Jetty. + * Port of Booking Application to Wicket */ -public class WicketBookingApplication extends WebApplication { +public class WicketBookingApplication extends SeamWebApplication { - /** - * Constructor. - */ - public WicketBookingApplication() { - } - - /** - * @see wicket.Application#getHomePage() - */ - @SuppressWarnings("unchecked") - public Class getHomePage() { + @Override + public Class getHomePage() + { return Home.class; } - /** - * Custom session with invalidation override. We can't just let Wicket - * invalidate the session as Seam might have to do some cleaning up to do. - */ - @Override - public Session newSession(Request request, Response response) { - return new WebSession(WicketBookingApplication.this, request) { - - @Override - public void invalidate() { - org.jboss.seam.web.Session.getInstance().invalidate(); - } - - @Override - public void invalidateNow() { - // sorry, can't support this with Seam - org.jboss.seam.web.Session.getInstance().invalidate(); - } - }; - } + @Override + protected Class getLoginPage() + { + return Home.class; + } - @Override - protected IRequestCycleProcessor newRequestCycleProcessor() - { - return new WebRequestCycleProcessor() - { - @Override - protected IRequestCodingStrategy newRequestCodingStrategy() - { - return new WebRequestCodingStrategy() - { - @Override - protected CharSequence encode(RequestCycle requestCycle, final IListenerInterfaceRequestTarget requestTarget) - { - if (IFormSubmitListener.INTERFACE.getName().equals(requestTarget.getRequestListenerInterface().getName())) - { - // TODO Do this nicely - StringBuilder stringBuilder = new StringBuilder(super.encode(requestCycle, requestTarget)); - if (Manager.instance().isReallyLongRunningConversation()) - { - stringBuilder.append("&" + Manager.instance().getConversationIdParameter() + "=" + Conversation.instance().getId()); - } - return stringBuilder.subSequence(0, stringBuilder.length()); - } - else - { - return super.encode(requestCycle, requestTarget); - } - } - - @Override - protected CharSequence encode(RequestCycle requestCycle, IBookmarkablePageRequestTarget requestTarget) - { - if (requestCycle.getRequest().getParameter("cid") != null) - { - // TODO Do this nicely - StringBuilder stringBuilder = new StringBuilder(super.encode(requestCycle, requestTarget)); - if (Manager.instance().isReallyLongRunningConversation()) - { - stringBuilder.append("&" + Manager.instance().getConversationIdParameter() + "=" + Conversation.instance().getId()); - } - return stringBuilder.subSequence(0, stringBuilder.length()); - - } - return super.encode(requestCycle, requestTarget); - } - - }; - } - }; - } - - @Override - protected void init() { - super.init(); - SeamSupport.activate(this); - getSecuritySettings().setAuthorizationStrategy(new SeamAuthorizationStrategy(Home.class)); - } -} \ No newline at end of file +} Modified: trunk/src/main/org/jboss/seam/web/Ajax4jsfFilter.java =================================================================== --- trunk/src/main/org/jboss/seam/web/Ajax4jsfFilter.java 2008-02-05 12:07:18 UTC (rev 7365) +++ trunk/src/main/org/jboss/seam/web/Ajax4jsfFilter.java 2008-02-05 17:37:10 UTC (rev 7366) @@ -4,14 +4,11 @@ import static org.jboss.seam.annotations.Install.BUILT_IN; import java.io.IOException; -import java.util.Collections; -import java.util.Enumeration; import java.util.HashMap; import java.util.Map; import javax.servlet.FilterChain; import javax.servlet.FilterConfig; -import javax.servlet.ServletContext; import javax.servlet.ServletException; import javax.servlet.ServletRequest; import javax.servlet.ServletResponse; @@ -23,7 +20,6 @@ import org.jboss.seam.annotations.Scope; import org.jboss.seam.annotations.intercept.BypassInterceptors; import org.jboss.seam.annotations.web.Filter; -import org.jboss.seam.util.EnumerationEnumeration; /** * A Seam filter component wrapper for the Ajax4JSF. @@ -126,50 +122,5 @@ { this.log4jInitFile = log4jInitFile; } - - private class FilterConfigWrapper implements FilterConfig - { - - private FilterConfig delegate; - private Map<String, String> parameters; - - public FilterConfigWrapper(FilterConfig filterConfig, Map<String, String> parameters) - { - delegate = filterConfig; - this.parameters = parameters; - } - - public String getFilterName() - { - return delegate.getFilterName(); - } - - public String getInitParameter(String name) - { - if ( parameters.containsKey(name) ) - { - return parameters.get(name); - } - else - { - return delegate.getInitParameter(name); - } - } - - public Enumeration getInitParameterNames() - { - Enumeration[] enumerations = { - delegate.getInitParameterNames(), - Collections.enumeration( parameters.keySet() ) - }; - return new EnumerationEnumeration(enumerations); - } - - public ServletContext getServletContext() - { - return delegate.getServletContext(); - } - - } } Added: trunk/src/main/org/jboss/seam/web/FilterConfigWrapper.java =================================================================== --- trunk/src/main/org/jboss/seam/web/FilterConfigWrapper.java (rev 0) +++ trunk/src/main/org/jboss/seam/web/FilterConfigWrapper.java 2008-02-05 17:37:10 UTC (rev 7366) @@ -0,0 +1,58 @@ +/** + * + */ +package org.jboss.seam.web; + +import java.util.Collections; +import java.util.Enumeration; +import java.util.Map; + +import javax.servlet.FilterConfig; +import javax.servlet.ServletContext; + +import org.jboss.seam.util.EnumerationEnumeration; + +public class FilterConfigWrapper implements FilterConfig +{ + + private FilterConfig delegate; + private Map<String, String> parameters; + + public FilterConfigWrapper(FilterConfig filterConfig, Map<String, String> parameters) + { + delegate = filterConfig; + this.parameters = parameters; + } + + public String getFilterName() + { + return delegate.getFilterName(); + } + + public String getInitParameter(String name) + { + if ( parameters.containsKey(name) ) + { + return parameters.get(name); + } + else + { + return delegate.getInitParameter(name); + } + } + + public Enumeration getInitParameterNames() + { + Enumeration[] enumerations = { + delegate.getInitParameterNames(), + Collections.enumeration( parameters.keySet() ) + }; + return new EnumerationEnumeration(enumerations); + } + + public ServletContext getServletContext() + { + return delegate.getServletContext(); + } + +} \ No newline at end of file Property changes on: trunk/src/main/org/jboss/seam/web/FilterConfigWrapper.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/src/main/org/jboss/seam/web/WicketFilter.java =================================================================== --- trunk/src/main/org/jboss/seam/web/WicketFilter.java (rev 0) +++ trunk/src/main/org/jboss/seam/web/WicketFilter.java 2008-02-05 17:37:10 UTC (rev 7366) @@ -0,0 +1,132 @@ +package org.jboss.seam.web; + +import static org.jboss.seam.ScopeType.APPLICATION; +import static org.jboss.seam.annotations.Install.BUILT_IN; + +import java.io.IOException; +import java.util.HashMap; +import java.util.Map; + +import javax.servlet.Filter; +import javax.servlet.FilterChain; +import javax.servlet.FilterConfig; +import javax.servlet.ServletException; +import javax.servlet.ServletRequest; +import javax.servlet.ServletResponse; +import javax.servlet.http.HttpServletRequest; + +import org.jboss.seam.Component; +import org.jboss.seam.ScopeType; +import org.jboss.seam.annotations.Install; +import org.jboss.seam.annotations.Name; +import org.jboss.seam.annotations.Scope; +import org.jboss.seam.annotations.intercept.BypassInterceptors; +import org.jboss.seam.servlet.ContextualHttpServletRequest; + +@Scope(APPLICATION) +@Name("org.jboss.seam.web.wicketFilter") +@Install(precedence = BUILT_IN, dependencies="org.jboss.seam.wicket.web.wicketFilterInstantiator") +@BypassInterceptors +(a)org.jboss.seam.annotations.web.Filter +public class WicketFilter extends AbstractFilter +{ + + private Filter delegate = null; + + private String applicationClass; + + private String applicationFactoryClass; + + private boolean detectPortletContext; + + + + public void doFilter(final ServletRequest servletRequest, final ServletResponse servletResponse, final FilterChain chain) throws IOException, ServletException + { + if (delegate==null) + { + chain.doFilter(servletRequest, servletResponse); + } + else + { + new ContextualHttpServletRequest((HttpServletRequest) servletRequest) + { + @Override + public void process() throws Exception + { + delegate.doFilter(servletRequest, servletResponse, chain); + } + + }.run(); + } + } + + @Override + public void init(FilterConfig filterConfig) throws ServletException + { + super.init(filterConfig); + + delegate = (javax.servlet.Filter) Component.getInstance("org.jboss.seam.wicket.web.wicketFilterInstantiator", ScopeType.STATELESS); + + if (delegate!=null) + { + Map<String, String> parameters = new HashMap<String, String>(); + if ( getApplicationClass() != null ) + { + parameters.put( "applicationClassName", getApplicationClass() ); + } + else + { + throw new IllegalStateException("Must set application-class in <web:wicket-filter /> in components.xml"); + } + if ( getUrlPattern() != null ) + { + parameters.put("filterMappingUrlPattern", getUrlPattern()); + } + else + { + parameters.put("filterMappingUrlPattern", "/*"); + } + if (getApplicationFactoryClass() != null) + { + parameters.put("applicationFactoryClassName", getApplicationFactoryClass()); + } + if (isDetectPortletContext()) + { + parameters.put("detectPortletContext", "true"); + } + delegate.init( new FilterConfigWrapper(filterConfig, parameters) ); + } + } + + public String getApplicationClass() + { + return applicationClass; + } + + public void setApplicationClass(String applicationClassName) + { + this.applicationClass = applicationClassName; + } + + public String getApplicationFactoryClass() + { + return applicationFactoryClass; + } + + public void setApplicationFactoryClass(String applicationFactoryClass) + { + this.applicationFactoryClass = applicationFactoryClass; + } + + public boolean isDetectPortletContext() + { + return detectPortletContext; + } + + public void setDetectPortletContext(boolean detectPortletContext) + { + this.detectPortletContext = detectPortletContext; + } + +} Property changes on: trunk/src/main/org/jboss/seam/web/WicketFilter.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/src/main/org/jboss/seam/web-2.0.xsd =================================================================== --- trunk/src/main/org/jboss/seam/web-2.0.xsd 2008-02-05 12:07:18 UTC (rev 7365) +++ trunk/src/main/org/jboss/seam/web-2.0.xsd 2008-02-05 17:37:10 UTC (rev 7366) @@ -31,6 +31,14 @@ <xs:attributeGroup ref="components:attlist.component"/> <xs:attributeGroup ref="web:attlist.filter"/> </xs:complexType> + </xs:element> + + <xs:element name="wicket-filter"> + <xs:complexType mixed="true"> + <xs:attributeGroup ref="components:attlist.component"/> + <xs:attributeGroup ref="web:attlist.filter"/> + <xs:attributeGroup ref="web:attlist.wicketFilter"/> + </xs:complexType> </xs:element> <xs:element name="character-encoding-filter"> @@ -71,9 +79,15 @@ <xs:attributeGroup name="attlist.filter"> <xs:attribute name="url-pattern" type="xs:string"/> <xs:attribute name="regex-url-pattern" type="xs:string"/> - <xs:attribute name="disabled" type="xs:string" default="false" /> + <xs:attribute name="disabled" type="xs:boolean" default="false" /> </xs:attributeGroup> + <xs:attributeGroup name="attlist.wicketFilter"> + <xs:attribute name="application-class" type="xs:string"/> + <xs:attribute name="application-factory-class" type="xs:string"/> + <xs:attribute name="detect-portlet-context" type="xs:boolean" default="false" /> + </xs:attributeGroup> + <xs:attributeGroup name="attlist.multipartFilter"> <xs:attribute name="create-temp-files"> <xs:simpleType> Deleted: trunk/src/wicket/org/jboss/seam/wicket/BijectedAttribute.java =================================================================== --- trunk/src/wicket/org/jboss/seam/wicket/BijectedAttribute.java 2008-02-05 12:07:18 UTC (rev 7365) +++ trunk/src/wicket/org/jboss/seam/wicket/BijectedAttribute.java 2008-02-05 17:37:10 UTC (rev 7366) @@ -1,14 +0,0 @@ -package org.jboss.seam.wicket; - -import java.io.Serializable; -import java.lang.annotation.Annotation; - -public interface BijectedAttribute<T extends Annotation> -{ - public String getName(); - public T getAnnotation(); - public Class getType(); - public void set(Object bean, Object value); - public Object get(Object bean); - public MetaModel getMetaModel(); -} Deleted: trunk/src/wicket/org/jboss/seam/wicket/BijectedField.java =================================================================== --- trunk/src/wicket/org/jboss/seam/wicket/BijectedField.java 2008-02-05 12:07:18 UTC (rev 7365) +++ trunk/src/wicket/org/jboss/seam/wicket/BijectedField.java 2008-02-05 17:37:10 UTC (rev 7366) @@ -1,54 +0,0 @@ -package org.jboss.seam.wicket; - -import java.lang.annotation.Annotation; -import java.lang.reflect.Field; - -public class BijectedField<T extends Annotation> implements BijectedAttribute<T> - { - private String name; - private Field field; - private T annotation; - private MetaModel metaModel; - - public BijectedField(String name, Field field, T annotation, MetaModel metaModel) - { - this.name = name; - this.field = field; - this.annotation = annotation; - this.metaModel = metaModel; - } - public String getName() - { - return name; - } - public Field getField() - { - return field; - } - public T getAnnotation() - { - return annotation; - } - public Class getType() - { - return field.getType(); - } - public void set(Object bean, Object value) - { - metaModel.setFieldValue(bean, field, name, value); - } - public Object get(Object bean) - { - return metaModel.getFieldValue(bean, field, name); - } - @Override - public String toString() - { - return "BijectedField(" + name + ')'; - } - - public MetaModel getMetaModel() - { - return metaModel; - } - } \ No newline at end of file Deleted: trunk/src/wicket/org/jboss/seam/wicket/BijectedMethod.java =================================================================== --- trunk/src/wicket/org/jboss/seam/wicket/BijectedMethod.java 2008-02-05 12:07:18 UTC (rev 7365) +++ trunk/src/wicket/org/jboss/seam/wicket/BijectedMethod.java 2008-02-05 17:37:10 UTC (rev 7366) @@ -1,53 +0,0 @@ -package org.jboss.seam.wicket; - -import java.lang.annotation.Annotation; -import java.lang.reflect.Method; - -public class BijectedMethod<T extends Annotation> implements BijectedAttribute<T> - { - private String name; - private Method method; - private T annotation; - private MetaModel metaModel; - - public BijectedMethod(String name, Method method, T annotation, MetaModel metaModel) - { - this.name = name; - this.method = method; - this.annotation = annotation; - } - public String getName() - { - return name; - } - public Method getMethod() - { - return method; - } - public T getAnnotation() - { - return annotation; - } - public void set(Object bean, Object value) - { - metaModel.setPropertyValue(bean, method, name, value); - } - public Object get(Object bean) - { - return metaModel.getPropertyValue(bean, method, name); - } - public Class getType() - { - return method.getParameterTypes()[0]; - } - @Override - public String toString() - { - return "BijectedMethod(" + name + ')'; - } - - public MetaModel getMetaModel() - { - return metaModel; - } - } \ No newline at end of file Deleted: trunk/src/wicket/org/jboss/seam/wicket/BijectedProperty.java =================================================================== --- trunk/src/wicket/org/jboss/seam/wicket/BijectedProperty.java 2008-02-05 12:07:18 UTC (rev 7365) +++ trunk/src/wicket/org/jboss/seam/wicket/BijectedProperty.java 2008-02-05 17:37:10 UTC (rev 7366) @@ -1,66 +0,0 @@ -package org.jboss.seam.wicket; - -import java.lang.annotation.Annotation; -import java.lang.reflect.Method; - -import org.jboss.seam.util.Reflections; - -public class BijectedProperty<T extends Annotation> implements BijectedAttribute<T> - { - - private BijectedMethod<T> getter; - private BijectedMethod<T> setter; - private MetaModel metaModel; - - public BijectedProperty(String name, Method getter, Method setter, T annotation, MetaModel metaModel) - { - this.getter = new BijectedMethod(name, getter, annotation, metaModel); - this.setter = new BijectedMethod(name, setter, annotation, metaModel); - } - - public BijectedProperty(String name, Method getter, T annotation, MetaModel metaModel) - { - this.getter = new BijectedMethod(name, getter, annotation, metaModel); - try - { - Method setterMethod = Reflections.getSetterMethod(getter.getDeclaringClass(), name); - this.setter = new BijectedMethod(name, setterMethod, annotation, metaModel); - } - catch (IllegalArgumentException e) {} - } - - public Object get(Object bean) - { - return getter.get(bean); - } - - public T getAnnotation() - { - return getter.getAnnotation(); - } - - public String getName() - { - return getter.getName(); - } - - public Class getType() - { - return getter.getType(); - } - - public void set(Object bean, Object value) - { - if (setter == null) - { - throw new IllegalArgumentException("Component must have a setter for " + metaModel.getName()); - } - setter.set(bean, value); - } - - public MetaModel getMetaModel() - { - return metaModel; - } - - } \ No newline at end of file Deleted: trunk/src/wicket/org/jboss/seam/wicket/InjectionInterceptor.java =================================================================== --- trunk/src/wicket/org/jboss/seam/wicket/InjectionInterceptor.java 2008-02-05 12:07:18 UTC (rev 7365) +++ trunk/src/wicket/org/jboss/seam/wicket/InjectionInterceptor.java 2008-02-05 17:37:10 UTC (rev 7366) @@ -1,112 +0,0 @@ -package org.jboss.seam.wicket; - -import static org.jboss.seam.ScopeType.STATELESS; -import static org.jboss.seam.ScopeType.UNSPECIFIED; - -import java.io.Serializable; -import java.lang.reflect.Method; - -import org.jboss.seam.Component; -import org.jboss.seam.Namespace; -import org.jboss.seam.annotations.In; -import org.jboss.seam.core.Expressions; -import org.jboss.seam.core.Init; -import org.jboss.seam.log.LogProvider; -import org.jboss.seam.log.Logging; -import org.jboss.seam.util.Reflections; - -import javassist.util.proxy.MethodHandler; - -public class InjectionInterceptor implements MethodHandler, Serializable -{ - - private String name; - private In annotation; - private String metaModelName; - private transient MetaModel metaModel; - - public InjectionInterceptor(BijectedAttribute<In> in) - { - this.name = in.getName(); - this.annotation = in.getAnnotation(); - this.metaModelName = in.getMetaModel().getMetaModelName(); - } - - private static LogProvider log = Logging.getLogProvider(InjectionInterceptor.class); - - public Object invoke(final Object proxy, final Method method, final Method proceed, final Object[] params) throws Throwable - { - return Reflections.invoke(method, getValueToInject(proxy), params); - } - - private Object getValueToInject(Object bean) - { - if ( name.startsWith("#") ) - { - if ( log.isDebugEnabled() ) - { - log.trace("trying to inject with EL expression: " + name); - } - return Expressions.instance().createValueExpression(name).getValue(); - } - else if ( annotation.scope()==UNSPECIFIED ) - { - if ( log.isDebugEnabled() ) - { - log.trace("trying to inject with hierarchical context search: " + name); - } - return getInstanceInAllNamespaces(name, annotation.create()); - } - else - { - if ( annotation.create() ) - { - throw new IllegalArgumentException( - "cannot combine create=true with explicit scope on @In: " + - getMetaModel().getAttributeMessage(name) - ); - } - if ( annotation.scope()==STATELESS ) - { - throw new IllegalArgumentException( - "cannot specify explicit scope=STATELESS on @In: " + - getMetaModel().getAttributeMessage(name) - ); - } - - - log.trace("trying to inject from specified context: " + name); - - if ( annotation.scope().isContextActive() ) - { - return annotation.scope().getContext().get(name); - } - } - return null; - } - - private Object getInstanceInAllNamespaces(String name, boolean create) - { - Object result; - result = Component.getInstance(name, create); - if (result==null) - { - for ( Namespace namespace: Init.instance().getGlobalImports() ) - { - result = namespace.getComponentInstance(name, create); - if (result!=null) break; - } - } - return result; - } - - private MetaModel getMetaModel() - { - if (metaModel == null) - { - metaModel = MetaModel.forName(metaModelName); - } - return metaModel; - } - -} Deleted: trunk/src/wicket/org/jboss/seam/wicket/InjectionSupport.java =================================================================== --- trunk/src/wicket/org/jboss/seam/wicket/InjectionSupport.java 2008-02-05 12:07:18 UTC (rev 7365) +++ trunk/src/wicket/org/jboss/seam/wicket/InjectionSupport.java 2008-02-05 17:37:10 UTC (rev 7366) @@ -1,91 +0,0 @@ -package org.jboss.seam.wicket; - -import static org.jboss.seam.wicket.MetaModelUtils.createProxyFactory; -import static org.jboss.seam.wicket.MetaModelUtils.toName; - -import java.lang.reflect.Field; -import java.lang.reflect.Method; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import javassist.util.proxy.ProxyObject; - -import org.jboss.seam.Component; -import org.jboss.seam.Namespace; -import org.jboss.seam.annotations.In; -import org.jboss.seam.core.Init; -import org.jboss.seam.log.LogProvider; -import org.jboss.seam.log.Logging; - - -public class InjectionSupport -{ - - // TODO Ouch - private static final Map<Class, Class<ProxyObject>> proxyFactories = new HashMap<Class, Class<ProxyObject>>(); - - private LogProvider log = Logging.getLogProvider(InjectionSupport.class); - - private List<BijectedAttribute<In>> inAttributes = new ArrayList<BijectedAttribute<In>>(); - - private MetaModel metaModel; - - public InjectionSupport(MetaModel metaModel) - { - this.metaModel = metaModel; - } - - public void add(Method method) - { - if ( method.isAnnotationPresent(In.class) ) - { - In in = method.getAnnotation(In.class); - String name = toName( in.value(), method ); - inAttributes.add( new BijectedMethod(name, method, in, metaModel) ); - } - } - - public void add(Field field) - { - if ( field.isAnnotationPresent(In.class) ) - { - In in = field.getAnnotation(In.class); - String name = toName( in.value(), field ); - inAttributes.add( new BijectedField(name, field, in, metaModel) ); - } - } - - public void inject(Object instance) throws Exception - { - for ( BijectedAttribute<In> in : inAttributes ) - { - // Currently need a proxy here as Wicket has no native support for interceptors - // TODO Replace this with a Seam ClientSide interceptor. Needs JBSEAM-699 - in.set( instance, wrap( instance, in ) ); - } - } - - private static Object wrap(Object bean, BijectedAttribute<In> in) throws Exception - { - ProxyObject proxy = getProxyFactory(in.getType()).newInstance(); - proxy.setHandler(new InjectionInterceptor(in)); - return proxy; - } - - private static Class<ProxyObject> getProxyFactory(Class type) - { - if (proxyFactories.containsKey(type)) - { - return proxyFactories.get(type); - } - else - { - Class<ProxyObject> factory = createProxyFactory( type ); - proxyFactories.put(type, factory); - return factory; - } - } - -} Deleted: trunk/src/wicket/org/jboss/seam/wicket/LoggerSupport.java =================================================================== --- trunk/src/wicket/org/jboss/seam/wicket/LoggerSupport.java 2008-02-05 12:07:18 UTC (rev 7365) +++ trunk/src/wicket/org/jboss/seam/wicket/LoggerSupport.java 2008-02-05 17:37:10 UTC (rev 7366) @@ -1,58 +0,0 @@ -package org.jboss.seam.wicket; - -import java.lang.reflect.Field; -import java.lang.reflect.Modifier; -import java.util.ArrayList; -import java.util.List; - -import org.jboss.seam.util.Reflections; - -// TODO Reimplement as Seam ClientSide Interceptor -public class LoggerSupport -{ - - private List<Field> logFields = new ArrayList<Field>(); - private List<org.jboss.seam.log.Log> logInstances = new ArrayList<org.jboss.seam.log.Log>(); - - private MetaModel metaModel; - - public LoggerSupport(MetaModel metaModel) - { - this.metaModel = metaModel; - } - - public void add(Field field) - { - if ( field.isAnnotationPresent(org.jboss.seam.annotations.Logger.class) ) - { - String category = field.getAnnotation(org.jboss.seam.annotations.Logger.class).value(); - org.jboss.seam.log.Log logInstance; - if ( "".equals( category ) ) - { - logInstance = org.jboss.seam.log.Logging.getLog(metaModel.getBeanClass()); - } - else - { - logInstance = org.jboss.seam.log.Logging.getLog(category); - } - if ( Modifier.isStatic( field.getModifiers() ) ) - { - Reflections.setAndWrap(field, null, logInstance); - } - else - { - logFields.add(field); - logInstances.add(logInstance); - } - } - } - - public void inject(Object instance) throws Exception - { - for (int i=0; i<logFields.size(); i++) - { - metaModel.setFieldValue( instance, logFields.get(i), "log", logInstances.get(i) ); - } - } - -} Deleted: trunk/src/wicket/org/jboss/seam/wicket/MetaModel.java =================================================================== --- trunk/src/wicket/org/jboss/seam/wicket/MetaModel.java 2008-02-05 12:07:18 UTC (rev 7365) +++ trunk/src/wicket/org/jboss/seam/wicket/MetaModel.java 2008-02-05 17:37:10 UTC (rev 7366) @@ -1,144 +0,0 @@ -package org.jboss.seam.wicket; - -import java.lang.reflect.Field; -import java.lang.reflect.Method; - -import org.jboss.seam.Model; -import org.jboss.seam.contexts.Contexts; -import org.jboss.seam.util.Reflections; - -public abstract class MetaModel extends Model -{ - - private InjectionSupport injectionSupport; - private OutjectionSupport outjectionSupport; - private LoggerSupport loggerSupport; - - public MetaModel(Class<?> beanClass) - { - super(beanClass); - injectionSupport = new InjectionSupport(this); - outjectionSupport = new OutjectionSupport(this); - loggerSupport = new LoggerSupport(this); - scan(); - } - - public void initialize() - { - scan(); - } - - public void inject(Object instance) throws Exception - { - injectionSupport.inject(instance); - loggerSupport.inject(instance); - } - - public void outject(Object instance) - { - outjectionSupport.outject(instance); - } - - private void scan() - { - Class clazz = getBeanClass(); - for ( ; clazz!=Object.class; clazz = clazz.getSuperclass() ) - { - for ( Method method: clazz.getDeclaredMethods() ) - { - scanMethod(method); - } - - for ( Field field: clazz.getDeclaredFields() ) - { - scanField(field); - } - } - } - - private void scanField(Field field) - { - if ( !field.isAccessible() ) - { - field.setAccessible(true); - } - injectionSupport.add(field); - loggerSupport.add(field); - } - - private void scanMethod(Method method) - { - injectionSupport.add(method); - } - - protected void setFieldValue(Object bean, Field field, String name, Object value) - { - try - { - Reflections.set(field, bean, value); - } - catch (Exception e) - { - throw new IllegalArgumentException("could not set field value: " + getAttributeMessage(name), e); - } - } - - protected Object getFieldValue(Object bean, Field field, String name) - { - try { - return Reflections.get(field, bean); - } - catch (Exception e) - { - throw new IllegalArgumentException("could not get field value: " + getAttributeMessage(name), e); - } - } - - protected String getAttributeMessage(String attributeName) - { - return getName() + '.' + attributeName; - } - - protected String getName() - { - return getBeanClass().getName(); - } - - protected abstract String getMetaModelName(); - - protected void setPropertyValue(Object bean, Method method, String name, Object value) - { - try - { - Reflections.invoke(method, bean, value ); - } - catch (Exception e) - { - throw new IllegalArgumentException("could not set property value: " + getAttributeMessage(name), e); - } - } - - public Object getPropertyValue(Object bean, Method method, String name) - { - try { - return Reflections.invoke(method, bean); - } - catch (Exception e) - { - throw new IllegalArgumentException("could not get property value: " + getAttributeMessage(name), e); - } - } - - public static MetaModel forName(String name) - { - if (Contexts.isApplicationContextActive()) - { - return (MetaModel) Contexts.getApplicationContext().get(name); - } - else - { - throw new IllegalStateException("Application context is not active"); - } - } - -} Deleted: trunk/src/wicket/org/jboss/seam/wicket/MetaModelUtils.java =================================================================== --- trunk/src/wicket/org/jboss/seam/wicket/MetaModelUtils.java 2008-02-05 12:07:18 UTC (rev 7365) +++ trunk/src/wicket/org/jboss/seam/wicket/MetaModelUtils.java 2008-02-05 17:37:10 UTC (rev 7366) @@ -1,48 +0,0 @@ -package org.jboss.seam.wicket; - -import java.io.Serializable; -import java.lang.reflect.Field; -import java.lang.reflect.Method; - -import javassist.util.proxy.ProxyObject; - -import org.jboss.seam.util.ProxyFactory; - -public class MetaModelUtils -{ - - public static String toName(String name, Method method) - { - //TODO: does not handle "isFoo" - if (name==null || name.length() == 0) - { - name = method.getName().substring(3, 4).toLowerCase() - + method.getName().substring(4); - } - return name; - } - - public static String toName(String name, Field field) - { - if (name==null || name.length() == 0) - { - name = field.getName(); - } - return name; - } - - public static Class<ProxyObject> createProxyFactory(final Class beanClass) - { - ProxyFactory factory = new ProxyFactory(); - if (beanClass.isInterface()) - { - factory.setInterfaces(new Class[] {beanClass, Serializable.class}); - } - else - { - factory.setSuperclass( beanClass ); - } - return factory.createClass(); - } - -} Modified: trunk/src/wicket/org/jboss/seam/wicket/ModelValidator.java =================================================================== --- trunk/src/wicket/org/jboss/seam/wicket/ModelValidator.java 2008-02-05 12:07:18 UTC (rev 7365) +++ trunk/src/wicket/org/jboss/seam/wicket/ModelValidator.java 2008-02-05 17:37:10 UTC (rev 7366) @@ -12,7 +12,7 @@ /** * - * An implementation of Hibernate Model Validation for Wicket + * Allows Hibernate Model Validation to be used in Wicket * * @author Pete Muir * @@ -23,18 +23,28 @@ private Class clazz; private String property; + /** + * Create a ModelValidator which will validate the specified property + */ public ModelValidator(Class clazz, String property) { this.clazz = clazz; this.property = property; } + /** + * Create a model validator that will validate the property specified by the + * PropertyModel + */ public ModelValidator(PropertyModel propertyModel) { this.clazz = propertyModel.getTarget().getClass(); this.property = propertyModel.getPropertyExpression(); } + /** + * Do the validation, normally called by Wicket + */ public void validate(IValidatable validatable) { System.out.println("model validator " + property + " / " + clazz); Deleted: trunk/src/wicket/org/jboss/seam/wicket/OutjectionSupport.java =================================================================== --- trunk/src/wicket/org/jboss/seam/wicket/OutjectionSupport.java 2008-02-05 12:07:18 UTC (rev 7365) +++ trunk/src/wicket/org/jboss/seam/wicket/OutjectionSupport.java 2008-02-05 17:37:10 UTC (rev 7366) @@ -1,94 +0,0 @@ -package org.jboss.seam.wicket; - -import static org.jboss.seam.ScopeType.STATELESS; -import static org.jboss.seam.ScopeType.UNSPECIFIED; -import static org.jboss.seam.wicket.MetaModelUtils.toName; - -import java.lang.reflect.Field; -import java.lang.reflect.Method; -import java.util.ArrayList; -import java.util.List; - -import org.jboss.seam.RequiredException; -import org.jboss.seam.annotations.Out; - - -public class OutjectionSupport -{ - - private List<BijectedAttribute<Out>> outAttributes = new ArrayList<BijectedAttribute<Out>>(); - - private MetaModel metaModel; - - public OutjectionSupport(MetaModel metaModel) - { - this.metaModel = metaModel; - } - - public void add(Method method) - { - Out out = method.getAnnotation(Out.class); - String name = toName( out.value(), method ); - outAttributes.add( new BijectedMethod(name, method, out, metaModel) ); - } - - public void add(Field field) - { - if ( field.isAnnotationPresent(Out.class) ) - { - Out out = field.getAnnotation(Out.class); - String name = toName( out.value(), field ); - outAttributes.add(new BijectedField(name, field, out, metaModel) ); - } - } - - public void outject(Object instance) - { - for ( BijectedAttribute<Out> att: outAttributes ) - { - outjectAttribute( att.getAnnotation(), att.getName(), instance, att.get(instance) ); - } - } - - private void outjectAttribute(Out out, String name, Object bean, Object value) - { - - if (value==null && out.required()) - { - throw new RequiredException( - "@Out attribute requires non-null value: " + - metaModel.getAttributeMessage(name) - ); - } - else - { - if ( out.scope()==UNSPECIFIED ) - { - throw new IllegalArgumentException( - "Must specify a scope to outject to: " + - metaModel.getAttributeMessage(name) - ); - } - else if ( out.scope()==STATELESS ) - { - throw new IllegalArgumentException( - "cannot specify explicit scope=STATELESS on @Out: " + - metaModel.getAttributeMessage(name) - ); - } - - if ( out.scope().isContextActive() ) - { - if (value==null) - { - out.scope().getContext().remove(name); - } - else - { - out.scope().getContext().set(name, value); - } - } - } - } - -} Modified: trunk/src/wicket/org/jboss/seam/wicket/SeamAuthorizationStrategy.java =================================================================== --- trunk/src/wicket/org/jboss/seam/wicket/SeamAuthorizationStrategy.java 2008-02-05 12:07:18 UTC (rev 7365) +++ trunk/src/wicket/org/jboss/seam/wicket/SeamAuthorizationStrategy.java 2008-02-05 17:37:10 UTC (rev 7366) @@ -12,17 +12,23 @@ import org.jboss.seam.security.NotLoggedInException; import org.jboss.seam.util.Strings; +/** + * An authorization strategy for Wicket backed by Seam Security + * + * @author pmuir + * + */ public class SeamAuthorizationStrategy implements IAuthorizationStrategy { private LogProvider log = Logging.getLogProvider(SeamAuthorizationStrategy.class); private Class loginPage; - - public SeamAuthorizationStrategy() - { - this(null); - } + /** + * Create the strategy, specifying the page to use for login + * + * @param loginPage + */ public SeamAuthorizationStrategy(final Class loginPage) { this.loginPage = loginPage; @@ -34,6 +40,11 @@ return isInstantiationAuthorized(component.getClass()); } + /** + * Check whether access is allowed to the given wicket component. + * + * Uses the @Restrict annotation to control access + */ public boolean isInstantiationAuthorized(Class componentClass) { Restrict restrict = (Restrict) componentClass.getAnnotation(Restrict.class); Modified: trunk/src/wicket/org/jboss/seam/wicket/SeamLink.java =================================================================== --- trunk/src/wicket/org/jboss/seam/wicket/SeamLink.java 2008-02-05 12:07:18 UTC (rev 7365) +++ trunk/src/wicket/org/jboss/seam/wicket/SeamLink.java 2008-02-05 17:37:10 UTC (rev 7366) @@ -7,6 +7,14 @@ import org.jboss.seam.core.Conversation; import org.jboss.seam.core.Manager; +/** + * A SeamLink is like a Wicket Link, but will propagate the conversation + * + * This will probably be replaced in the future + * + * @author pmuir + * + */ public abstract class SeamLink extends Link { Deleted: trunk/src/wicket/org/jboss/seam/wicket/SeamSupport.java =================================================================== --- trunk/src/wicket/org/jboss/seam/wicket/SeamSupport.java 2008-02-05 12:07:18 UTC (rev 7365) +++ trunk/src/wicket/org/jboss/seam/wicket/SeamSupport.java 2008-02-05 17:37:10 UTC (rev 7366) @@ -1,65 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.seam.wicket; - -import org.apache.wicket.Application; -import org.apache.wicket.Component; -import org.apache.wicket.application.IComponentInstantiationListener; - -/** - * Main support class for letting Wicket work with Seam annotations. Active - * support by calling {@link #activate(Application) the activate method} - * preferably from your {@link Application#init() application's init method}. - * - * @author eelcohillenius - * @author Pete Muir - */ -// TODO handle outjection etc. Might need onAfterRender and may -// onBeforeRender for that, in which case this class can implement the -// appropriate interfaces and register itself as a listener for them. -// TODO handle method level sometime. For starters, see if there is any example/ -// test case/ whatever in Seam first that shows off that kind of usage -public class SeamSupport implements IComponentInstantiationListener { - - /** - * Activate support for Seam annotations on components for the provided - * application. - * - * @param application - * The application to active support for - */ - public static void activate(Application application) { - SeamSupport listener = new SeamSupport(); - application.addComponentInstantiationListener(listener); - } - - /** - * @see org.apache.wicket.application.IComponentInstantiationListener#onInstantiation(org.apache.wicket.Component) - */ - public void onInstantiation(Component component) - { - WicketComponent wicketComponent = WicketComponent.forClass(component.getClass()); - try - { - wicketComponent.inject(component); - } - catch (Exception e) - { - throw new RuntimeException(e); - } - } -} Added: trunk/src/wicket/org/jboss/seam/wicket/SeamWebApplication.java =================================================================== --- trunk/src/wicket/org/jboss/seam/wicket/SeamWebApplication.java (rev 0) +++ trunk/src/wicket/org/jboss/seam/wicket/SeamWebApplication.java 2008-02-05 17:37:10 UTC (rev 7366) @@ -0,0 +1,141 @@ +package org.jboss.seam.wicket; + +import org.apache.wicket.Request; +import org.apache.wicket.RequestCycle; +import org.apache.wicket.Response; +import org.apache.wicket.Session; +import org.apache.wicket.markup.html.form.IFormSubmitListener; +import org.apache.wicket.protocol.http.WebApplication; +import org.apache.wicket.protocol.http.WebRequestCycleProcessor; +import org.apache.wicket.protocol.http.WebSession; +import org.apache.wicket.protocol.http.request.WebRequestCodingStrategy; +import org.apache.wicket.request.IRequestCodingStrategy; +import org.apache.wicket.request.IRequestCycleProcessor; +import org.apache.wicket.request.target.component.IBookmarkablePageRequestTarget; +import org.apache.wicket.request.target.component.listener.IListenerInterfaceRequestTarget; +import org.jboss.seam.core.Conversation; +import org.jboss.seam.core.Manager; +import org.jboss.seam.wicket.ioc.SeamInjectionListener; + +/** + * The base class for Seam Web Applications + * + * TODO Remove the need to extend this + * + * @author Pete Muir + * + */ +public abstract class SeamWebApplication extends WebApplication +{ + + /** + * Custom session with invalidation override. We can't just let Wicket + * invalidate the session as Seam might have to do some cleaning up to do. + */ + @Override + public Session newSession(Request request, Response response) + { + return new WebSession(request) + { + + @Override + public void invalidate() + { + org.jboss.seam.web.Session.getInstance().invalidate(); + } + + @Override + public void invalidateNow() + { + // sorry, can't support this with Seam + org.jboss.seam.web.Session.getInstance().invalidate(); + } + }; + } + + @Override + /** + * Seam's hooks into Wicket. Required for proper functioning + */ + protected IRequestCycleProcessor newRequestCycleProcessor() + { + return new WebRequestCycleProcessor() + { + @Override + protected IRequestCodingStrategy newRequestCodingStrategy() + { + return new WebRequestCodingStrategy() + { + @Override + protected CharSequence encode(RequestCycle requestCycle, final IListenerInterfaceRequestTarget requestTarget) + { + if (IFormSubmitListener.INTERFACE.getName().equals(requestTarget.getRequestListenerInterface().getName())) + { + // TODO Do this nicely + StringBuilder stringBuilder = new StringBuilder(super.encode(requestCycle, requestTarget)); + if (Manager.instance().isReallyLongRunningConversation()) + { + stringBuilder.append("&" + Manager.instance().getConversationIdParameter() + "=" + Conversation.instance().getId()); + } + return stringBuilder.subSequence(0, stringBuilder.length()); + } + else + { + return super.encode(requestCycle, requestTarget); + } + } + + @Override + protected CharSequence encode(RequestCycle requestCycle, IBookmarkablePageRequestTarget requestTarget) + { + if (requestCycle.getRequest().getParameter("cid") != null) + { + // TODO Do this nicely + StringBuilder stringBuilder = new StringBuilder(super.encode(requestCycle, requestTarget)); + if (Manager.instance().isReallyLongRunningConversation()) + { + stringBuilder.append("&" + Manager.instance().getConversationIdParameter() + "=" + Conversation.instance().getId()); + } + return stringBuilder.subSequence(0, stringBuilder.length()); + + } + return super.encode(requestCycle, requestTarget); + } + + }; + } + }; + } + + @Override + protected void init() + { + super.init(); + inititializeSeamSecurity(); + initializeSeamInjection(); + } + + /** + * Add Seam Security to the wicket app. + * + * This allows you to @Restrict your Wicket components. Override this method + * to apply a different scheme + * + */ + protected void inititializeSeamSecurity() + { + getSecuritySettings().setAuthorizationStrategy(new SeamAuthorizationStrategy(getLoginPage())); + } + + + /** + * Add Seam injection support to your app. Required for proper functioning + */ + protected void initializeSeamInjection() + { + addComponentInstantiationListener(new SeamInjectionListener()); + } + + protected abstract Class getLoginPage(); + +} Property changes on: trunk/src/wicket/org/jboss/seam/wicket/SeamWebApplication.java ___________________________________________________________________ Name: svn:mime-type + text/plain Deleted: trunk/src/wicket/org/jboss/seam/wicket/SimpleDataProvider.java =================================================================== --- trunk/src/wicket/org/jboss/seam/wicket/SimpleDataProvider.java 2008-02-05 12:07:18 UTC (rev 7365) +++ trunk/src/wicket/org/jboss/seam/wicket/SimpleDataProvider.java 2008-02-05 17:37:10 UTC (rev 7366) @@ -1,22 +0,0 @@ -package org.jboss.seam.wicket; - -import java.io.Serializable; - -import org.apache.wicket.markup.repeater.data.IDataProvider; -import org.apache.wicket.model.IModel; -import org.apache.wicket.model.Model; - -public abstract class SimpleDataProvider implements IDataProvider -{ - - public IModel model(Object object) - { - return new Model((Serializable) object); - } - - public void detach() - { - // No - op - } - -} Deleted: trunk/src/wicket/org/jboss/seam/wicket/WicketComponent.java =================================================================== --- trunk/src/wicket/org/jboss/seam/wicket/WicketComponent.java 2008-02-05 12:07:18 UTC (rev 7365) +++ trunk/src/wicket/org/jboss/seam/wicket/WicketComponent.java 2008-02-05 17:37:10 UTC (rev 7366) @@ -1,47 +0,0 @@ -package org.jboss.seam.wicket; - -import org.jboss.seam.contexts.Contexts; - -public class WicketComponent extends MetaModel -{ - - public WicketComponent(Class<?> beanClass) - { - super(beanClass); - } - - @Override - protected String getMetaModelName() - { - return getComponentName(getBeanClass()); - } - - protected static String getComponentName(Class clazz) - { - return clazz.getName() + ".wicketComponent"; - } - - public static WicketComponent forClass(Class clazz) - { - if (Contexts.isApplicationContextActive()) - { - String metaModelName = getComponentName(clazz); - instantiate(metaModelName, clazz); - return (WicketComponent) forName(metaModelName); - } - else - { - throw new IllegalStateException("Application context is not active"); - } - } - - private static void instantiate(String componentName, Class clazz) - { - if (!Contexts.getApplicationContext().isSet(componentName)) - { - WicketComponent component = new WicketComponent(clazz); - Contexts.getApplicationContext().set(componentName, component); - } - } - -} Deleted: trunk/src/wicket/org/jboss/seam/wicket/WicketExceptionFilter.java =================================================================== --- trunk/src/wicket/org/jboss/seam/wicket/WicketExceptionFilter.java 2008-02-05 12:07:18 UTC (rev 7365) +++ trunk/src/wicket/org/jboss/seam/wicket/WicketExceptionFilter.java 2008-02-05 17:37:10 UTC (rev 7366) @@ -1,44 +0,0 @@ -package org.jboss.seam.wicket; - -import static org.jboss.seam.annotations.Install.FRAMEWORK; -import static org.jboss.seam.ScopeType.APPLICATION; - -import java.io.IOException; - -import javax.servlet.FilterChain; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; - -import org.jboss.seam.annotations.Install; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; -import org.jboss.seam.annotations.intercept.BypassInterceptors; -import org.jboss.seam.annotations.web.Filter; -import org.jboss.seam.web.AbstractFilter; - -/** - * Kill the redirect filter - * @author - */ -@Scope(APPLICATION) -@Name("org.jboss.seam.web.exceptionFilter") -@Install(precedence = FRAMEWORK, classDependencies="org.apache.wicket.Application") -@BypassInterceptors -@Filter() -public class WicketExceptionFilter extends AbstractFilter -{ - - - @Override - public boolean isDisabled() - { - return true; - } - - public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException - { - - - } -} Deleted: trunk/src/wicket/org/jboss/seam/wicket/WicketRedirectFilter.java =================================================================== --- trunk/src/wicket/org/jboss/seam/wicket/WicketRedirectFilter.java 2008-02-05 12:07:18 UTC (rev 7365) +++ trunk/src/wicket/org/jboss/seam/wicket/WicketRedirectFilter.java 2008-02-05 17:37:10 UTC (rev 7366) @@ -1,43 +0,0 @@ -package org.jboss.seam.wicket; - -import static org.jboss.seam.ScopeType.APPLICATION; -import static org.jboss.seam.annotations.Install.FRAMEWORK; - -import java.io.IOException; - -import javax.servlet.FilterChain; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; - -import org.jboss.seam.annotations.Install; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; -import org.jboss.seam.annotations.intercept.BypassInterceptors; -import org.jboss.seam.web.AbstractFilter; - -/** - * Kill the redirect filter - * - * @author - */ -@Scope(APPLICATION) -@Name("org.jboss.seam.web.redirectFilter") -@Install(precedence = FRAMEWORK, classDependencies="org.apache.wicket.Application") -@BypassInterceptors -public class WicketRedirectFilter extends AbstractFilter -{ - - - @Override - public boolean isDisabled() - { - return true; - } - - public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException - { - - - } -} Deleted: trunk/src/wicket/org/jboss/seam/wicket/WicketSeamFilter.java =================================================================== --- trunk/src/wicket/org/jboss/seam/wicket/WicketSeamFilter.java 2008-02-05 12:07:18 UTC (rev 7365) +++ trunk/src/wicket/org/jboss/seam/wicket/WicketSeamFilter.java 2008-02-05 17:37:10 UTC (rev 7366) @@ -1,163 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.seam.wicket; - -import static org.jboss.seam.ScopeType.APPLICATION; -import static org.jboss.seam.annotations.Install.BUILT_IN; - -import java.io.IOException; -import java.util.Set; - -import javax.servlet.FilterChain; -import javax.servlet.FilterConfig; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.HttpServletRequest; - -import org.apache.wicket.Application; -import org.apache.wicket.protocol.http.WebApplication; -import org.apache.wicket.protocol.http.WicketFilter; -import org.jboss.seam.annotations.Install; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; -import org.jboss.seam.annotations.intercept.BypassInterceptors; -import org.jboss.seam.annotations.web.Filter; -import org.jboss.seam.contexts.Context; -import org.jboss.seam.contexts.ServletLifecycle; -import org.jboss.seam.core.ConversationPropagation; -import org.jboss.seam.core.Manager; -import org.jboss.seam.log.LogProvider; -import org.jboss.seam.log.Logging; -import org.jboss.seam.servlet.ContextualHttpServletRequest; -import org.jboss.seam.servlet.ServletRequestSessionMap; -import org.jboss.seam.web.AbstractFilter; -import org.jboss.seam.web.ServletContexts; - -/** - * Seam component that delegates requests to the {@link WicketFilter} and sets - * up and pulls down Seam {@link Context}s for the request. - * <p> - * Users do not have to install this filter, but instead just install - * {@link WicketFilter} like they would normally do. This Seam component - * automatically attaches to it. - * </p> - * <p> - * The filter automatically picks up the {@link WebApplication} when there is - * only one active for the web application this filter is configured for. If - * there are multiple Wicket applications active in the web application, you'll - * have to explicitly configure which one to use by providing filter init - * parameter 'applicationName', which corresponds to the filter name of the - * Wicket filter for the application you want to use this filter with. - * </p> - * - * @author eelcohillenius - */ -@Scope(APPLICATION) -@Name("org.apache.wicket.seam.WicketSeamFilter") -@Install(classDependencies = { "org.apache.wicket.protocol.http.WebApplication" }, precedence = BUILT_IN) -@BypassInterceptors -@Filter() -public class WicketSeamFilter extends AbstractFilter { - - private static final class WicketSeamFilterConfigurationException extends - IllegalStateException { - public WicketSeamFilterConfigurationException(String msg) { - super(msg); - } - } - - private static final String APPLICATION_NONE = "<none>"; - - private static LogProvider log = Logging.getLogProvider(WicketSeamFilter.class); - - private String applicationName = null; - - private WicketFilter delegate = null; - - /** - * Construct. - */ - public WicketSeamFilter() { - } - - @SuppressWarnings("unchecked") - public void doFilter(final ServletRequest servletRequest, - final ServletResponse servletResponse, final FilterChain filterChain) - throws IOException, ServletException { - - // Check for the Wicket filter (which might be initialized after this - // filter, hence the lazy loading). Synchronization is not important. - if (delegate == null && !APPLICATION_NONE.equals(applicationName)) { - - if (applicationName == null) { - Set<String> applicationKeys = Application.getApplicationKeys(); - if (applicationKeys.size() > 1) { - throw new WicketSeamFilterConfigurationException( - "If you run this filter in the context of multiple Wicket " - + "application instances (/ filters) you have to provide filer " - + "init parameter 'applicationName' which should correspond to " - + "the filter name you want to use this filter with."); - } else if (applicationKeys.size() == 0) { - // no Wicket apps configured... set to special name - applicationName = APPLICATION_NONE; - } else { - applicationName = applicationKeys.iterator().next(); - } - } - Application application = (!APPLICATION_NONE - .equals(applicationName)) ? Application - .get(applicationName) : null; - if (application != null && !(application instanceof WebApplication)) { - log - .warn("This filter can only be used with Wicket WebApplications. Currently, " - + "it is configured to work with an application of type " - + application.getClass().getName()); - applicationName = APPLICATION_NONE; - filterChain.doFilter(servletRequest, servletResponse); - return; - } - - WebApplication webApplication = (WebApplication) application; - if (webApplication == null) { - log - .warn("ignoring request: no Wicket web application instance found"); - applicationName = APPLICATION_NONE; - filterChain.doFilter(servletRequest, servletResponse); - return; - } - - delegate = webApplication.getWicketFilter(); - } - - new ContextualHttpServletRequest((HttpServletRequest) servletRequest) - { - @Override - public void process() throws Exception - { - delegate.doFilter(servletRequest, servletResponse, filterChain); - } - - }.run(); - } - - @Override - public void init(FilterConfig filterConfig) throws ServletException { - super.init(filterConfig); - this.applicationName = filterConfig.getInitParameter("applicationName"); - } -} Copied: trunk/src/wicket/org/jboss/seam/wicket/ioc/BijectedAttribute.java (from rev 7364, trunk/src/wicket/org/jboss/seam/wicket/BijectedAttribute.java) =================================================================== --- trunk/src/wicket/org/jboss/seam/wicket/ioc/BijectedAttribute.java (rev 0) +++ trunk/src/wicket/org/jboss/seam/wicket/ioc/BijectedAttribute.java 2008-02-05 17:37:10 UTC (rev 7366) @@ -0,0 +1,20 @@ +package org.jboss.seam.wicket.ioc; + +import java.lang.annotation.Annotation; + +/** + * A bijected attribute (field or get/set pair) + * @author Pete Muir + * + * + * TODO Move into Seam core + */ +public interface BijectedAttribute<T extends Annotation> +{ + public String getName(); + public T getAnnotation(); + public Class getType(); + public void set(Object bean, Object value); + public Object get(Object bean); + public MetaModel getMetaModel(); +} Copied: trunk/src/wicket/org/jboss/seam/wicket/ioc/BijectedField.java (from rev 7364, trunk/src/wicket/org/jboss/seam/wicket/BijectedField.java) =================================================================== --- trunk/src/wicket/org/jboss/seam/wicket/ioc/BijectedField.java (rev 0) +++ trunk/src/wicket/org/jboss/seam/wicket/ioc/BijectedField.java 2008-02-05 17:37:10 UTC (rev 7366) @@ -0,0 +1,59 @@ +package org.jboss.seam.wicket.ioc; + +import java.lang.annotation.Annotation; +import java.lang.reflect.Field; + +/** + * Implementation of BijectedAttribute for a field + * @author Pete Muir + * + */ +public class BijectedField<T extends Annotation> implements BijectedAttribute<T> + { + private String name; + private Field field; + private T annotation; + private MetaModel metaModel; + + public BijectedField(String name, Field field, T annotation, MetaModel metaModel) + { + this.name = name; + this.field = field; + this.annotation = annotation; + this.metaModel = metaModel; + } + public String getName() + { + return name; + } + public Field getField() + { + return field; + } + public T getAnnotation() + { + return annotation; + } + public Class getType() + { + return field.getType(); + } + public void set(Object bean, Object value) + { + metaModel.setFieldValue(bean, field, name, value); + } + public Object get(Object bean) + { + return metaModel.getFieldValue(bean, field, name); + } + @Override + public String toString() + { + return "BijectedField(" + name + ')'; + } + + public MetaModel getMetaModel() + { + return metaModel; + } + } \ No newline at end of file Copied: trunk/src/wicket/org/jboss/seam/wicket/ioc/BijectedMethod.java (from rev 7364, trunk/src/wicket/org/jboss/seam/wicket/BijectedMethod.java) =================================================================== --- trunk/src/wicket/org/jboss/seam/wicket/ioc/BijectedMethod.java (rev 0) +++ trunk/src/wicket/org/jboss/seam/wicket/ioc/BijectedMethod.java 2008-02-05 17:37:10 UTC (rev 7366) @@ -0,0 +1,58 @@ +package org.jboss.seam.wicket.ioc; + +import java.lang.annotation.Annotation; +import java.lang.reflect.Method; + +/** + * Implementation of BijectedAttribute for a method + * @author Pete Muir + * + */ +public class BijectedMethod<T extends Annotation> implements BijectedAttribute<T> + { + private String name; + private Method method; + private T annotation; + private MetaModel metaModel; + + public BijectedMethod(String name, Method method, T annotation, MetaModel metaModel) + { + this.name = name; + this.method = method; + this.annotation = annotation; + } + public String getName() + { + return name; + } + public Method getMethod() + { + return method; + } + public T getAnnotation() + { + return annotation; + } + public void set(Object bean, Object value) + { + metaModel.setPropertyValue(bean, method, name, value); + } + public Object get(Object bean) + { + return metaModel.getPropertyValue(bean, method, name); + } + public Class getType() + { + return method.getParameterTypes()[0]; + } + @Override + public String toString() + { + return "BijectedMethod(" + name + ')'; + } + + public MetaModel getMetaModel() + { + return metaModel; + } + } \ No newline at end of file Copied: trunk/src/wicket/org/jboss/seam/wicket/ioc/BijectedProperty.java (from rev 7364, trunk/src/wicket/org/jboss/seam/wicket/BijectedProperty.java) =================================================================== --- trunk/src/wicket/org/jboss/seam/wicket/ioc/BijectedProperty.java (rev 0) +++ trunk/src/wicket/org/jboss/seam/wicket/ioc/BijectedProperty.java 2008-02-05 17:37:10 UTC (rev 7366) @@ -0,0 +1,71 @@ +package org.jboss.seam.wicket.ioc; + +import java.lang.annotation.Annotation; +import java.lang.reflect.Method; + +import org.jboss.seam.util.Reflections; + +/** + * Implementation of BijectedAttribute for a pair of methods + * @author Pete Muir + * + */ +public class BijectedProperty<T extends Annotation> implements BijectedAttribute<T> + { + + private BijectedMethod<T> getter; + private BijectedMethod<T> setter; + private MetaModel metaModel; + + public BijectedProperty(String name, Method getter, Method setter, T annotation, MetaModel metaModel) + { + this.getter = new BijectedMethod(name, getter, annotation, metaModel); + this.setter = new BijectedMethod(name, setter, annotation, metaModel); + } + + public BijectedProperty(String name, Method getter, T annotation, MetaModel metaModel) + { + this.getter = new BijectedMethod(name, getter, annotation, metaModel); + try + { + Method setterMethod = Reflections.getSetterMethod(getter.getDeclaringClass(), name); + this.setter = new BijectedMethod(name, setterMethod, annotation, metaModel); + } + catch (IllegalArgumentException e) {} + } + + public Object get(Object bean) + { + return getter.get(bean); + } + + public T getAnnotation() + { + return getter.getAnnotation(); + } + + public String getName() + { + return getter.getName(); + } + + public Class getType() + { + return getter.getType(); + } + + public void set(Object bean, Object value) + { + if (setter == null) + { + throw new IllegalArgumentException("Component must have a setter for " + metaModel.getName()); + } + setter.set(bean, value); + } + + public MetaModel getMetaModel() + { + return metaModel; + } + + } \ No newline at end of file Copied: trunk/src/wicket/org/jboss/seam/wicket/ioc/InjectionInterceptor.java (from rev 7364, trunk/src/wicket/org/jboss/seam/wicket/InjectionInterceptor.java) =================================================================== --- trunk/src/wicket/org/jboss/seam/wicket/ioc/InjectionInterceptor.java (rev 0) +++ trunk/src/wicket/org/jboss/seam/wicket/ioc/InjectionInterceptor.java 2008-02-05 17:37:10 UTC (rev 7366) @@ -0,0 +1,113 @@ +package org.jboss.seam.wicket.ioc; + +import static org.jboss.seam.ScopeType.STATELESS; +import static org.jboss.seam.ScopeType.UNSPECIFIED; + +import java.io.Serializable; +import java.lang.reflect.Method; + +import org.jboss.seam.Component; +import org.jboss.seam.Namespace; +import org.jboss.seam.annotations.In; +import org.jboss.seam.core.Expressions; +import org.jboss.seam.core.Init; +import org.jboss.seam.log.LogProvider; +import org.jboss.seam.log.Logging; +import org.jboss.seam.util.Reflections; + +import javassist.util.proxy.MethodHandler; + +// TODO Replace with a client side Seam interceptor +public class InjectionInterceptor implements MethodHandler, Serializable +{ + + private String name; + private In annotation; + private String metaModelName; + private transient MetaModel metaModel; + + public InjectionInterceptor(BijectedAttribute<In> in) + { + this.name = in.getName(); + this.annotation = in.getAnnotation(); + this.metaModelName = in.getMetaModel().getMetaModelName(); + } + + private static LogProvider log = Logging.getLogProvider(InjectionInterceptor.class); + + public Object invoke(final Object proxy, final Method method, final Method proceed, final Object[] params) throws Throwable + { + return Reflections.invoke(method, getValueToInject(proxy), params); + } + + private Object getValueToInject(Object bean) + { + if ( name.startsWith("#") ) + { + if ( log.isDebugEnabled() ) + { + log.trace("trying to inject with EL expression: " + name); + } + return Expressions.instance().createValueExpression(name).getValue(); + } + else if ( annotation.scope()==UNSPECIFIED ) + { + if ( log.isDebugEnabled() ) + { + log.trace("trying to inject with hierarchical context search: " + name); + } + return getInstanceInAllNamespaces(name, annotation.create()); + } + else + { + if ( annotation.create() ) + { + throw new IllegalArgumentException( + "cannot combine create=true with explicit scope on @In: " + + getMetaModel().getAttributeMessage(name) + ); + } + if ( annotation.scope()==STATELESS ) + { + throw new IllegalArgumentException( + "cannot specify explicit scope=STATELESS on @In: " + + getMetaModel().getAttributeMessage(name) + ); + } + + + log.trace("trying to inject from specified context: " + name); + + if ( annotation.scope().isContextActive() ) + { + return annotation.scope().getContext().get(name); + } + } + return null; + } + + private Object getInstanceInAllNamespaces(String name, boolean create) + { + Object result; + result = Component.getInstance(name, create); + if (result==null) + { + for ( Namespace namespace: Init.instance().getGlobalImports() ) + { + result = namespace.getComponentInstance(name, create); + if (result!=null) break; + } + } + return result; + } + + private MetaModel getMetaModel() + { + if (metaModel == null) + { + metaModel = MetaModel.forName(metaModelName); + } + return metaModel; + } + +} Copied: trunk/src/wicket/org/jboss/seam/wicket/ioc/Injector.java (from rev 7364, trunk/src/wicket/org/jboss/seam/wicket/InjectionSupport.java) =================================================================== --- trunk/src/wicket/org/jboss/seam/wicket/ioc/Injector.java (rev 0) +++ trunk/src/wicket/org/jboss/seam/wicket/ioc/Injector.java 2008-02-05 17:37:10 UTC (rev 7366) @@ -0,0 +1,87 @@ +package org.jboss.seam.wicket.ioc; + +import static org.jboss.seam.wicket.ioc.MetaModelUtils.createProxyFactory; +import static org.jboss.seam.wicket.ioc.MetaModelUtils.toName; + +import java.lang.reflect.Field; +import java.lang.reflect.Method; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import javassist.util.proxy.ProxyObject; + +import org.jboss.seam.annotations.In; + +/** + * Controls injection for a MetaModel + * + */ +public class Injector +{ + + // TODO Ouch + private static final Map<Class, Class<ProxyObject>> proxyFactories = new HashMap<Class, Class<ProxyObject>>(); + + private List<BijectedAttribute<In>> inAttributes = new ArrayList<BijectedAttribute<In>>(); + + private MetaModel metaModel; + + public Injector(MetaModel metaModel) + { + this.metaModel = metaModel; + } + + public void add(Method method) + { + if ( method.isAnnotationPresent(In.class) ) + { + In in = method.getAnnotation(In.class); + String name = toName( in.value(), method ); + inAttributes.add( new BijectedMethod(name, method, in, metaModel) ); + } + } + + public void add(Field field) + { + if ( field.isAnnotationPresent(In.class) ) + { + In in = field.getAnnotation(In.class); + String name = toName( in.value(), field ); + inAttributes.add( new BijectedField(name, field, in, metaModel) ); + } + } + + public void inject(Object instance) throws Exception + { + for ( BijectedAttribute<In> in : inAttributes ) + { + // Currently need a proxy here as Wicket has no native support for interceptors + // TODO Replace this with a Seam ClientSide interceptor. Needs JBSEAM-699 + in.set( instance, wrap( instance, in ) ); + } + } + + private static Object wrap(Object bean, BijectedAttribute<In> in) throws Exception + { + ProxyObject proxy = getProxyFactory(in.getType()).newInstance(); + proxy.setHandler(new InjectionInterceptor(in)); + return proxy; + } + + private static Class<ProxyObject> getProxyFactory(Class type) + { + if (proxyFactories.containsKey(type)) + { + return proxyFactories.get(type); + } + else + { + Class<ProxyObject> factory = createProxyFactory( type ); + proxyFactories.put(type, factory); + return factory; + } + } + +} Copied: trunk/src/wicket/org/jboss/seam/wicket/ioc/Loggable.java (from rev 7364, trunk/src/wicket/org/jboss/seam/wicket/LoggerSupport.java) =================================================================== --- trunk/src/wicket/org/jboss/seam/wicket/ioc/Loggable.java (rev 0) +++ trunk/src/wicket/org/jboss/seam/wicket/ioc/Loggable.java 2008-02-05 17:37:10 UTC (rev 7366) @@ -0,0 +1,61 @@ +package org.jboss.seam.wicket.ioc; + +import java.lang.reflect.Field; +import java.lang.reflect.Modifier; +import java.util.ArrayList; +import java.util.List; + +import org.jboss.seam.util.Reflections; + +/** + * Controls logging for a MetaModel + * + */ +public class Loggable +{ + + private List<Field> logFields = new ArrayList<Field>(); + private List<org.jboss.seam.log.Log> logInstances = new ArrayList<org.jboss.seam.log.Log>(); + + private MetaModel metaModel; + + public Loggable(MetaModel metaModel) + { + this.metaModel = metaModel; + } + + public void add(Field field) + { + if ( field.isAnnotationPresent(org.jboss.seam.annotations.Logger.class) ) + { + String category = field.getAnnotation(org.jboss.seam.annotations.Logger.class).value(); + org.jboss.seam.log.Log logInstance; + if ( "".equals( category ) ) + { + logInstance = org.jboss.seam.log.Logging.getLog(metaModel.getBeanClass()); + } + else + { + logInstance = org.jboss.seam.log.Logging.getLog(category); + } + if ( Modifier.isStatic( field.getModifiers() ) ) + { + Reflections.setAndWrap(field, null, logInstance); + } + else + { + logFields.add(field); + logInstances.add(logInstance); + } + } + } + + public void inject(Object instance) throws Exception + { + for (int i=0; i<logFields.size(); i++) + { + metaModel.setFieldValue( instance, logFields.get(i), "log", logInstances.get(i) ); + } + } + +} Copied: trunk/src/wicket/org/jboss/seam/wicket/ioc/MetaModel.java (from rev 7364, trunk/src/wicket/org/jboss/seam/wicket/MetaModel.java) =================================================================== --- trunk/src/wicket/org/jboss/seam/wicket/ioc/MetaModel.java (rev 0) +++ trunk/src/wicket/org/jboss/seam/wicket/ioc/MetaModel.java 2008-02-05 17:37:10 UTC (rev 7366) @@ -0,0 +1,149 @@ +package org.jboss.seam.wicket.ioc; + +import java.lang.reflect.Field; +import java.lang.reflect.Method; + +import org.jboss.seam.Model; +import org.jboss.seam.contexts.Contexts; +import org.jboss.seam.util.Reflections; + +/** + * MetaModel for a component + * @author pmuir + * + */ +public abstract class MetaModel extends Model +{ + + private Injector injectionSupport; + private Outjector outjectionSupport; + private Loggable loggerSupport; + + public MetaModel(Class<?> beanClass) + { + super(beanClass); + injectionSupport = new Injector(this); + outjectionSupport = new Outjector(this); + loggerSupport = new Loggable(this); + scan(); + } + + public void initialize() + { + scan(); + } + + public void inject(Object instance) throws Exception + { + injectionSupport.inject(instance); + loggerSupport.inject(instance); + } + + public void outject(Object instance) + { + outjectionSupport.outject(instance); + } + + private void scan() + { + Class clazz = getBeanClass(); + for ( ; clazz!=Object.class; clazz = clazz.getSuperclass() ) + { + for ( Method method: clazz.getDeclaredMethods() ) + { + scanMethod(method); + } + + for ( Field field: clazz.getDeclaredFields() ) + { + scanField(field); + } + } + } + + private void scanField(Field field) + { + if ( !field.isAccessible() ) + { + field.setAccessible(true); + } + injectionSupport.add(field); + loggerSupport.add(field); + } + + private void scanMethod(Method method) + { + injectionSupport.add(method); + } + + protected void setFieldValue(Object bean, Field field, String name, Object value) + { + try + { + Reflections.set(field, bean, value); + } + catch (Exception e) + { + throw new IllegalArgumentException("could not set field value: " + getAttributeMessage(name), e); + } + } + + protected Object getFieldValue(Object bean, Field field, String name) + { + try { + return Reflections.get(field, bean); + } + catch (Exception e) + { + throw new IllegalArgumentException("could not get field value: " + getAttributeMessage(name), e); + } + } + + protected String getAttributeMessage(String attributeName) + { + return getName() + '.' + attributeName; + } + + protected String getName() + { + return getBeanClass().getName(); + } + + protected abstract String getMetaModelName(); + + protected void setPropertyValue(Object bean, Method method, String name, Object value) + { + try + { + Reflections.invoke(method, bean, value ); + } + catch (Exception e) + { + throw new IllegalArgumentException("could not set property value: " + getAttributeMessage(name), e); + } + } + + public Object getPropertyValue(Object bean, Method method, String name) + { + try { + return Reflections.invoke(method, bean); + } + catch (Exception e) + { + throw new IllegalArgumentException("could not get property value: " + getAttributeMessage(name), e); + } + } + + public static MetaModel forName(String name) + { + if (Contexts.isApplicationContextActive()) + { + return (MetaModel) Contexts.getApplicationContext().get(name); + } + else + { + throw new IllegalStateException("Application context is not active"); + } + } + +} Copied: trunk/src/wicket/org/jboss/seam/wicket/ioc/MetaModelUtils.java (from rev 7364, trunk/src/wicket/org/jboss/seam/wicket/MetaModelUtils.java) =================================================================== --- trunk/src/wicket/org/jboss/seam/wicket/ioc/MetaModelUtils.java (rev 0) +++ trunk/src/wicket/org/jboss/seam/wicket/ioc/MetaModelUtils.java 2008-02-05 17:37:10 UTC (rev 7366) @@ -0,0 +1,53 @@ +package org.jboss.seam.wicket.ioc; + +import java.io.Serializable; +import java.lang.reflect.Field; +import java.lang.reflect.Method; + +import javassist.util.proxy.ProxyObject; + +import org.jboss.seam.util.ProxyFactory; + +/** + * Utilitilies relating to a MetaModel + * @author pmuir + * + */ +public class MetaModelUtils +{ + + public static String toName(String name, Method method) + { + //TODO: does not handle "isFoo" + if (name==null || name.length() == 0) + { + name = method.getName().substring(3, 4).toLowerCase() + + method.getName().substring(4); + } + return name; + } + + public static String toName(String name, Field field) + { + if (name==null || name.length() == 0) + { + name = field.getName(); + } + return name; + } + + public static Class<ProxyObject> createProxyFactory(final Class beanClass) + { + ProxyFactory factory = new ProxyFactory(); + if (beanClass.isInterface()) + { + factory.setInterfaces(new Class[] {beanClass, Serializable.class}); + } + else + { + factory.setSuperclass( beanClass ); + } + return factory.createClass(); + } + +} Copied: trunk/src/wicket/org/jboss/seam/wicket/ioc/Outjector.java (from rev 7364, trunk/src/wicket/org/jboss/seam/wicket/OutjectionSupport.java) =================================================================== --- trunk/src/wicket/org/jboss/seam/wicket/ioc/Outjector.java (rev 0) +++ trunk/src/wicket/org/jboss/seam/wicket/ioc/Outjector.java 2008-02-05 17:37:10 UTC (rev 7366) @@ -0,0 +1,94 @@ +package org.jboss.seam.wicket.ioc; + +import static org.jboss.seam.ScopeType.STATELESS; +import static org.jboss.seam.ScopeType.UNSPECIFIED; +import static org.jboss.seam.wicket.ioc.MetaModelUtils.toName; + +import java.lang.reflect.Field; +import java.lang.reflect.Method; +import java.util.ArrayList; +import java.util.List; + +import org.jboss.seam.RequiredException; +import org.jboss.seam.annotations.Out; + + +public class Outjector +{ + + private List<BijectedAttribute<Out>> outAttributes = new ArrayList<BijectedAttribute<Out>>(); + + private MetaModel metaModel; + + public Outjector(MetaModel metaModel) + { + this.metaModel = metaModel; + } + + public void add(Method method) + { + Out out = method.getAnnotation(Out.class); + String name = toName( out.value(), method ); + outAttributes.add( new BijectedMethod(name, method, out, metaModel) ); + } + + public void add(Field field) + { + if ( field.isAnnotationPresent(Out.class) ) + { + Out out = field.getAnnotation(Out.class); + String name = toName( out.value(), field ); + outAttributes.add(new BijectedField(name, field, out, metaModel) ); + } + } + + public void outject(Object instance) + { + for ( BijectedAttribute<Out> att: outAttributes ) + { + outjectAttribute( att.getAnnotation(), att.getName(), instance, att.get(instance) ); + } + } + + private void outjectAttribute(Out out, String name, Object bean, Object value) + { + + if (value==null && out.required()) + { + throw new RequiredException( + "@Out attribute requires non-null value: " + + metaModel.getAttributeMessage(name) + ); + } + else + { + if ( out.scope()==UNSPECIFIED ) + { + throw new IllegalArgumentException( + "Must specify a scope to outject to: " + + metaModel.getAttributeMessage(name) + ); + } + else if ( out.scope()==STATELESS ) + { + throw new IllegalArgumentException( + "cannot specify explicit scope=STATELESS on @Out: " + + metaModel.getAttributeMessage(name) + ); + } + + if ( out.scope().isContextActive() ) + { + if (value==null) + { + out.scope().getContext().remove(name); + } + else + { + out.scope().getContext().set(name, value); + } + } + } + } + +} Copied: trunk/src/wicket/org/jboss/seam/wicket/ioc/SeamInjectionListener.java (from rev 7364, trunk/src/wicket/org/jboss/seam/wicket/SeamSupport.java) =================================================================== --- trunk/src/wicket/org/jboss/seam/wicket/ioc/SeamInjectionListener.java (rev 0) +++ trunk/src/wicket/org/jboss/seam/wicket/ioc/SeamInjectionListener.java 2008-02-05 17:37:10 UTC (rev 7366) @@ -0,0 +1,26 @@ +package org.jboss.seam.wicket.ioc; + +import org.apache.wicket.Component; +import org.apache.wicket.application.IComponentInstantiationListener; + +/** + * Repsonsible for injecting dynamic proxies into Wicket classes + * + * @author Pete Muir + */ +public class SeamInjectionListener implements IComponentInstantiationListener +{ + + public void onInstantiation(Component component) + { + WicketComponent wicketComponent = WicketComponent.forClass(component.getClass()); + try + { + wicketComponent.inject(component); + } + catch (Exception e) + { + throw new RuntimeException(e); + } + } +} Copied: trunk/src/wicket/org/jboss/seam/wicket/ioc/WicketComponent.java (from rev 7364, trunk/src/wicket/org/jboss/seam/wicket/WicketComponent.java) =================================================================== --- trunk/src/wicket/org/jboss/seam/wicket/ioc/WicketComponent.java (rev 0) +++ trunk/src/wicket/org/jboss/seam/wicket/ioc/WicketComponent.java 2008-02-05 17:37:10 UTC (rev 7366) @@ -0,0 +1,52 @@ +package org.jboss.seam.wicket.ioc; + +import org.jboss.seam.contexts.Contexts; + +/** + * MetaModel for Wicket components + * @author pmuir + * + */ +public class WicketComponent extends MetaModel +{ + + public WicketComponent(Class<?> beanClass) + { + super(beanClass); + } + + @Override + protected String getMetaModelName() + { + return getComponentName(getBeanClass()); + } + + protected static String getComponentName(Class clazz) + { + return clazz.getName() + ".wicketComponent"; + } + + public static WicketComponent forClass(Class clazz) + { + if (Contexts.isApplicationContextActive()) + { + String metaModelName = getComponentName(clazz); + instantiate(metaModelName, clazz); + return (WicketComponent) forName(metaModelName); + } + else + { + throw new IllegalStateException("Application context is not active"); + } + } + + private static void instantiate(String componentName, Class clazz) + { + if (!Contexts.getApplicationContext().isSet(componentName)) + { + WicketComponent component = new WicketComponent(clazz); + Contexts.getApplicationContext().set(componentName, component); + } + } + +} Copied: trunk/src/wicket/org/jboss/seam/wicket/web/WicketExceptionFilter.java (from rev 7364, trunk/src/wicket/org/jboss/seam/wicket/WicketExceptionFilter.java) =================================================================== --- trunk/src/wicket/org/jboss/seam/wicket/web/WicketExceptionFilter.java (rev 0) +++ trunk/src/wicket/org/jboss/seam/wicket/web/WicketExceptionFilter.java 2008-02-05 17:37:10 UTC (rev 7366) @@ -0,0 +1,45 @@ +package org.jboss.seam.wicket.web; + +import static org.jboss.seam.annotations.Install.FRAMEWORK; +import static org.jboss.seam.ScopeType.APPLICATION; + +import java.io.IOException; + +import javax.servlet.FilterChain; +import javax.servlet.ServletException; +import javax.servlet.ServletRequest; +import javax.servlet.ServletResponse; + +import org.jboss.seam.annotations.Install; +import org.jboss.seam.annotations.Name; +import org.jboss.seam.annotations.Scope; +import org.jboss.seam.annotations.intercept.BypassInterceptors; +import org.jboss.seam.annotations.web.Filter; +import org.jboss.seam.web.AbstractFilter; + +/** + * Disable the exception filter when using Wicket (as JSF is an EE library, we + * can't rely on classDependencies to disable it) + * @author + */ +@Scope(APPLICATION) +@Name("org.jboss.seam.web.exceptionFilter") +@Install(precedence = FRAMEWORK, classDependencies="org.apache.wicket.Application") +@BypassInterceptors +@Filter() +public class WicketExceptionFilter extends AbstractFilter +{ + + + @Override + public boolean isDisabled() + { + return true; + } + + public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException + { + + + } +} Property changes on: trunk/src/wicket/org/jboss/seam/wicket/web/WicketExceptionFilter.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/src/wicket/org/jboss/seam/wicket/web/WicketFilterInstantiator.java =================================================================== --- trunk/src/wicket/org/jboss/seam/wicket/web/WicketFilterInstantiator.java (rev 0) +++ trunk/src/wicket/org/jboss/seam/wicket/web/WicketFilterInstantiator.java 2008-02-05 17:37:10 UTC (rev 7366) @@ -0,0 +1,31 @@ +/** + * + */ +package org.jboss.seam.wicket.web; + +import static org.jboss.seam.annotations.Install.BUILT_IN; + +import javax.servlet.Filter; + +import org.apache.wicket.protocol.http.WicketFilter; +import org.jboss.seam.ScopeType; +import org.jboss.seam.annotations.Install; +import org.jboss.seam.annotations.Name; +import org.jboss.seam.annotations.Scope; +import org.jboss.seam.annotations.Unwrap; +import org.jboss.seam.annotations.intercept.BypassInterceptors; + +@Name("org.jboss.seam.wicket.web.wicketFilterInstantiator") +@Install(precedence = BUILT_IN, classDependencies={"org.apache.wicket.Application"}) +@BypassInterceptors +(a)Scope(ScopeType.STATELESS) +public class WicketFilterInstantiator +{ + + @Unwrap + public Filter unrwap() + { + return new WicketFilter(); + } + +} Property changes on: trunk/src/wicket/org/jboss/seam/wicket/web/WicketFilterInstantiator.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: trunk/src/wicket/org/jboss/seam/wicket/web/WicketRedirectFilter.java (from rev 7364, trunk/src/wicket/org/jboss/seam/wicket/WicketRedirectFilter.java) =================================================================== --- trunk/src/wicket/org/jboss/seam/wicket/web/WicketRedirectFilter.java (rev 0) +++ trunk/src/wicket/org/jboss/seam/wicket/web/WicketRedirectFilter.java 2008-02-05 17:37:10 UTC (rev 7366) @@ -0,0 +1,44 @@ +package org.jboss.seam.wicket.web; + +import static org.jboss.seam.ScopeType.APPLICATION; +import static org.jboss.seam.annotations.Install.FRAMEWORK; + +import java.io.IOException; + +import javax.servlet.FilterChain; +import javax.servlet.ServletException; +import javax.servlet.ServletRequest; +import javax.servlet.ServletResponse; + +import org.jboss.seam.annotations.Install; +import org.jboss.seam.annotations.Name; +import org.jboss.seam.annotations.Scope; +import org.jboss.seam.annotations.intercept.BypassInterceptors; +import org.jboss.seam.web.AbstractFilter; + +/** + * Disable the redirect filter when using Wicket (as JSF is an EE library, we + * can't rely on classDependencies to disable it) + * + * @author + */ +@Scope(APPLICATION) +@Name("org.jboss.seam.web.redirectFilter") +@Install(precedence = FRAMEWORK, classDependencies="org.apache.wicket.Application") +@BypassInterceptors +public class WicketRedirectFilter extends AbstractFilter +{ + + + @Override + public boolean isDisabled() + { + return true; + } + + public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException + { + + + } +}

16 years, 3 months

1
0
0 / 0

Seam SVN: r7365 - trunk/build.

by seam-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2008-02-05 07:07:18 -0500 (Tue, 05 Feb 2008) New Revision: 7365 Modified: trunk/build/build.xml Log: Add jbas5 to deployed modules for release Modified: trunk/build/build.xml =================================================================== --- trunk/build/build.xml 2008-02-05 10:41:01 UTC (rev 7364) +++ trunk/build/build.xml 2008-02-05 12:07:18 UTC (rev 7365) @@ -40,6 +40,7 @@ <deployWithSources pom="${pdf.pom}" jar="${lib.dir}/jboss-seam-pdf.jar" repositoryId="offline.repository.jboss.org" srcjar="${lib.dir}/src/jboss-seam-pdf-sources.jar"/> <deployWithSources pom="${remoting.pom}" jar="${lib.dir}/jboss-seam-remoting.jar" repositoryId="offline.repository.jboss.org" srcjar="${lib.dir}/src/jboss-seam-remoting-sources.jar"/> <deployWithSources pom="${ui.pom}" jar="${lib.dir}/jboss-seam-ui.jar" repositoryId="offline.repository.jboss.org" srcjar="${lib.dir}/src/jboss-seam-ui-sources.jar"/> + <deployWithSources pom="${jbas5.pom}" jar="${lib.dir}/jboss-seam-jbas5.jar" repositoryId="offline.repository.jboss.org" srcjar="${lib.dir}/src/jboss-seam-jbas5-sources.jar"/> <deployExample name="booking" repositoryId="offline.repository.jboss.org"/> <deployExampleNoDs name="numberguess" repositoryId="offline.repository.jboss.org"/> <deployExample name="dvd" path="${seam.dir}/examples/dvdstore" repositoryId="offline.repository.jboss.org"/>

16 years, 3 months

1
0
0 / 0

Seam SVN: r7364 - branches/Seam_2_0/build.

by seam-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2008-02-05 05:41:01 -0500 (Tue, 05 Feb 2008) New Revision: 7364 Modified: branches/Seam_2_0/build/default.build.properties Log: Fix version number Modified: branches/Seam_2_0/build/default.build.properties =================================================================== --- branches/Seam_2_0/build/default.build.properties 2008-02-05 07:35:56 UTC (rev 7363) +++ branches/Seam_2_0/build/default.build.properties 2008-02-05 10:41:01 UTC (rev 7364) @@ -7,7 +7,7 @@ # ------------ major.version 2 minor.version .0 -patchlevel .1 +patchlevel .2 qualifier -SNAPSHOT # # Other program locations

16 years, 3 months

1
0
0 / 0

Seam SVN: r7363 - in trunk/examples/wiki: src/etc/META-INF and 5 other directories.

by seam-commits＠lists.jboss.org

Author: christian.bauer(a)jboss.com Date: 2008-02-05 02:35:56 -0500 (Tue, 05 Feb 2008) New Revision: 7363 Modified: trunk/examples/wiki/src/etc/META-INF/persistence-dev-war.xml trunk/examples/wiki/src/etc/META-INF/persistence-prod-war.xml trunk/examples/wiki/src/etc/ehcache.xml trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/dao/WikiNodeDAO.java trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/dao/WikiNodeFactory.java trunk/examples/wiki/view/plugins/jiraIssueList/plugin.xhtml trunk/examples/wiki/view/themes/default/css/jiraIssueList.css trunk/examples/wiki/view/themes/inrelationto/css/jiraIssueList.css trunk/examples/wiki/view/themes/sfwkorg/css/jiraIssueList.css Log: Improvied jiraIssueList UI and enabled caching again Modified: trunk/examples/wiki/src/etc/META-INF/persistence-dev-war.xml =================================================================== --- trunk/examples/wiki/src/etc/META-INF/persistence-dev-war.xml 2008-02-05 00:39:32 UTC (rev 7362) +++ trunk/examples/wiki/src/etc/META-INF/persistence-dev-war.xml 2008-02-05 07:35:56 UTC (rev 7363) @@ -41,13 +41,9 @@  <property name="hibernate.cache.provider_class" value="org.jboss.seam.wiki.util.MonitoringEHCacheProvider"/> -  - <property name="hibernate.cache.use_query_cache" value="false"/> - <property name="hibernate.cache.use_second_level_cache" value="false"/> + <property name="hibernate.cache.use_query_cache" value="true"/> + <property name="hibernate.cache.use_second_level_cache" value="true"/> - <property name="hibernate.ejb.classcache.org.jboss.seam.wiki.core.model.WikiNode" - value="read-write, WikiNode"/> - <property name="hibernate.ejb.classcache.org.jboss.seam.wiki.core.preferences.WikiPreferenceValue" value="read-write, WikiPreference"/> Modified: trunk/examples/wiki/src/etc/META-INF/persistence-prod-war.xml =================================================================== --- trunk/examples/wiki/src/etc/META-INF/persistence-prod-war.xml 2008-02-05 00:39:32 UTC (rev 7362) +++ trunk/examples/wiki/src/etc/META-INF/persistence-prod-war.xml 2008-02-05 07:35:56 UTC (rev 7363) @@ -36,13 +36,9 @@  <property name="hibernate.cache.provider_class" value="org.jboss.seam.wiki.util.MonitoringEHCacheProvider"/> -  - <property name="hibernate.cache.use_query_cache" value="false"/> - <property name="hibernate.cache.use_second_level_cache" value="false"/> + <property name="hibernate.cache.use_query_cache" value="true"/> + <property name="hibernate.cache.use_second_level_cache" value="true"/> - <property name="hibernate.ejb.classcache.org.jboss.seam.wiki.core.model.WikiNode" - value="read-write, WikiNode"/> - <property name="hibernate.ejb.classcache.org.jboss.seam.wiki.core.preferences.WikiPreferenceValue" value="read-write, WikiPreference"/> Modified: trunk/examples/wiki/src/etc/ehcache.xml =================================================================== --- trunk/examples/wiki/src/etc/ehcache.xml 2008-02-05 00:39:32 UTC (rev 7362) +++ trunk/examples/wiki/src/etc/ehcache.xml 2008-02-05 07:35:56 UTC (rev 7363) @@ -103,15 +103,6 @@ diskPersistent="false" overflowToDisk="false"/> - <cache name="WikiNode" - maxElementsInMemory="1000" - eternal="false" - overflowToDisk="false" - timeToIdleSeconds="1000" - timeToLiveSeconds="6000" - diskPersistent="false" - memoryStoreEvictionPolicy="LRU"/> - <cache name="WikiPreference" maxElementsInMemory="20000" eternal="false" Modified: trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/dao/WikiNodeDAO.java =================================================================== --- trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/dao/WikiNodeDAO.java 2008-02-05 00:39:32 UTC (rev 7362) +++ trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/dao/WikiNodeDAO.java 2008-02-05 07:35:56 UTC (rev 7363) @@ -54,7 +54,7 @@ .createQuery("select n from WikiNode n where n.id = :id") .setParameter("id", nodeId) .setHint("org.hibernate.comment", "Find wikinode by id") - .setHint("org.hibernate.cacheable", true) + .setHint("org.hibernate.cacheable", false) .getSingleResult(); } catch (EntityNotFoundException ex) { } catch (NoResultException ex) { @@ -68,7 +68,7 @@ .createQuery("select n from WikiNode n where n.id in (:idList)") .setParameter("idList", ids) .setHint("org.hibernate.comment", "Find wikinodes by id list") - .setHint("org.hibernate.cacheable", true) + .setHint("org.hibernate.cacheable", false) .getResultList(); } @@ -83,7 +83,7 @@ .setParameter("areaNumber", areaNumber) .setParameter("wikiname", wikiname) .setHint("org.hibernate.comment", "Find node in area") - .setHint("org.hibernate.cacheable", true) + .setHint("org.hibernate.cacheable", false) .getSingleResult(); } catch (EntityNotFoundException ex) { } catch (NoResultException ex) { @@ -115,7 +115,7 @@ .createQuery(queryString.toString()) .setHint("org.hibernate.comment", "Find wikinode children order by "+orderBy.name()) .setParameter("parent", node) - .setHint("org.hibernate.cacheable", true) + .setHint("org.hibernate.cacheable", false) .setFirstResult(firstResult) .setMaxResults(maxResults) .getResultList(); @@ -126,7 +126,7 @@ .createQuery("select d from WikiDirectory d left join fetch d.feed where d.parent = :parent") .setHint("org.hibernate.comment", "Find wikinode children directories") .setParameter("parent", dir) - .setHint("org.hibernate.cacheable", true) + .setHint("org.hibernate.cacheable", false) .getResultList(); } @@ -136,7 +136,7 @@ .createQuery("select c from WikiComment c where c.id = :id") .setParameter("id", commentId) .setHint("org.hibernate.comment", "Find comment by id") - .setHint("org.hibernate.cacheable", true) + .setHint("org.hibernate.cacheable", false) .getSingleResult(); } catch (EntityNotFoundException ex) { } catch (NoResultException ex) { @@ -174,7 +174,7 @@ org.hibernate.Query nsQuery = getSession(true).createQuery(queryString.toString()); nsQuery.setParameter("doc", document); nsQuery.setComment("Find wikicomments (tree)"); - nsQuery.setCacheable(true); + nsQuery.setCacheable(false); nsQuery.setResultTransformer( new ResultTransformer() { public Object transformTuple(Object[] objects, String[] aliases) { @@ -214,7 +214,7 @@ nsQuery.setParameter("nsLeft", root.getNodeInfo().getNsLeft()); nsQuery.setParameter("nsRight", root.getNodeInfo().getNsRight()); nsQuery.setComment("Find wikicomments subtree"); - nsQuery.setCacheable(true); + nsQuery.setCacheable(false); nsQuery.setResultTransformer( new ResultTransformer() { public Object transformTuple(Object[] objects, String[] aliases) { @@ -237,7 +237,7 @@ .createQuery("select f from WikiFile f where f.id = :id") .setParameter("id", fileId) .setHint("org.hibernate.comment", "Find wikifile by id") - .setHint("org.hibernate.cacheable", true) + .setHint("org.hibernate.cacheable", false) .getSingleResult(); } catch (EntityNotFoundException ex) { } catch (NoResultException ex) { @@ -256,7 +256,7 @@ .setParameter("areaNumber", areaNumber) .setParameter("wikiname", wikiname) .setHint("org.hibernate.comment", "Find wikifile in area") - .setHint("org.hibernate.cacheable", true) + .setHint("org.hibernate.cacheable", false) .getSingleResult(); } catch (EntityNotFoundException ex) { } catch (NoResultException ex) { @@ -270,7 +270,7 @@ .createQuery("select d from WikiDocument d where d.id = :id") .setParameter("id", documentId) .setHint("org.hibernate.comment", "Find document by id") - .setHint("org.hibernate.cacheable", true) + .setHint("org.hibernate.cacheable", false) .getSingleResult(); } catch (EntityNotFoundException ex) { } catch (NoResultException ex) { @@ -286,7 +286,7 @@ .createQuery("select d.defaultFile from WikiDirectory d where d = :dir") .setParameter("dir", directory) .setHint("org.hibernate.comment", "Find default file") - .setHint("org.hibernate.cacheable", true) + .setHint("org.hibernate.cacheable", false) .getSingleResult(); } catch (EntityNotFoundException ex) { } catch (NoResultException ex) { @@ -301,7 +301,7 @@ .createQuery("select doc from WikiDocument doc, WikiDirectory d where d = :dir and doc.id = d.defaultFile.id") .setParameter("dir", directory) .setHint("org.hibernate.comment", "Find default doc") - .setHint("org.hibernate.cacheable", true) + .setHint("org.hibernate.cacheable", false) .getSingleResult(); } catch (EntityNotFoundException ex) { } catch (NoResultException ex) { @@ -317,7 +317,7 @@ return restrictedEntityManager.createQuery(query.toString()) .setParameter("dir", directory) .setHint("org.hibernate.comment", "Find documents of directory") - .setHint("org.hibernate.cacheable", true) + .setHint("org.hibernate.cacheable", false) .getResultList(); } @@ -332,7 +332,7 @@ .setParameter("areaNumber", areaNumber) .setParameter("wikiname", wikiname) .setHint("org.hibernate.comment", "Find document in area") - .setHint("org.hibernate.cacheable", true) + .setHint("org.hibernate.cacheable", false) .getSingleResult(); } catch (EntityNotFoundException ex) { } catch (NoResultException ex) { @@ -350,7 +350,7 @@ return (List<WikiDocument>)restrictedEntityManager .createQuery(query.toString()) .setHint("org.hibernate.comment", "Find documents order by " + orderBy.name()) - .setHint("org.hibernate.cacheable", true) + .setHint("org.hibernate.cacheable", false) .setMaxResults(maxResults) .getResultList(); } @@ -362,7 +362,7 @@ " where sibling.parent = current.parent and current = :current and not sibling = :current" + " and sibling."+ byProperty.name() + " " + (previousOrNext ? "<=" : ">=") + "current."+ byProperty.name() + " order by sibling." +byProperty + " " + (previousOrNext ? "desc" : "asc") ) - .setHint("org.hibernate.cacheable", true) + .setHint("org.hibernate.cacheable", false) .setMaxResults(1) .setParameter("current", currentDocument) .getSingleResult(); @@ -378,7 +378,7 @@ .createQuery("select u from WikiUpload u where u.id = :id") .setParameter("id", uploadId) .setHint("org.hibernate.comment", "Find upload by id") - .setHint("org.hibernate.cacheable", true) + .setHint("org.hibernate.cacheable", false) .getSingleResult(); } catch (EntityNotFoundException ex) { } catch (NoResultException ex) { @@ -394,7 +394,7 @@ return restrictedEntityManager.createQuery(query.toString()) .setParameter("dir", directory) .setHint("org.hibernate.comment", "Find uploads of directory") - .setHint("org.hibernate.cacheable", true) + .setHint("org.hibernate.cacheable", false) .getResultList(); } @@ -404,7 +404,7 @@ .createQuery("select d from WikiDirectory d left join fetch d.feed where d.id = :id") .setParameter("id", directoryId) .setHint("org.hibernate.comment", "Find directory by id") - .setHint("org.hibernate.cacheable", true) + .setHint("org.hibernate.cacheable", false) .getSingleResult(); } catch (EntityNotFoundException ex) { } catch (NoResultException ex) { @@ -440,7 +440,7 @@ .setParameter("areaNumber", areaNumber) .setParameter("wikiname", wikiname) .setHint("org.hibernate.comment", "Find directory in area") - .setHint("org.hibernate.cacheable", true) + .setHint("org.hibernate.cacheable", false) .getSingleResult(); } catch (EntityNotFoundException ex) { } catch (NoResultException ex) { @@ -462,7 +462,7 @@ .createQuery("select d from WikiDirectory d left join fetch d.feed, WikiDirectory r where r.parent is null and d.parent = r and d.wikiname = :wikiname") .setParameter("wikiname", wikiname) .setHint("org.hibernate.comment", "Find area by wikiname") - .setHint("org.hibernate.cacheable", true) + .setHint("org.hibernate.cacheable", false) .getSingleResult(); } catch (EntityNotFoundException ex) { } catch (NoResultException ex) { @@ -476,7 +476,7 @@ .createQuery("select d from WikiDirectory d left join fetch d.feed, WikiDirectory r where r.parent is null and d.parent = r and d.areaNumber = :areaNumber") .setParameter("areaNumber", areaNumber) .setHint("org.hibernate.comment", "Find area by area number") - .setHint("org.hibernate.cacheable", true) + .setHint("org.hibernate.cacheable", false) .getSingleResult(); } catch (EntityNotFoundException ex) { } catch (NoResultException ex) { Modified: trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/dao/WikiNodeFactory.java =================================================================== --- trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/dao/WikiNodeFactory.java 2008-02-05 00:39:32 UTC (rev 7362) +++ trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/dao/WikiNodeFactory.java 2008-02-05 07:35:56 UTC (rev 7363) @@ -63,7 +63,7 @@ return (WikiDirectory) em .createQuery("select d from WikiDirectory d left join fetch d.feed where d.parent is null") .setHint("org.hibernate.comment", "Loading wikiRoot") - .setHint("org.hibernate.cacheable", true) + .setHint("org.hibernate.cacheable", false) .getSingleResult(); } catch (RuntimeException ex) { throw new RuntimeException("You need to INSERT at least one parentless directory into the database", ex); @@ -79,7 +79,7 @@ .createQuery("select d from WikiDocument d where d.id = :id") .setParameter("id", Preferences.getInstance(WikiPreferences.class).getDefaultDocumentId()) .setHint("org.hibernate.comment", "Loading wikiStart") - .setHint("org.hibernate.cacheable", true) + .setHint("org.hibernate.cacheable", false) .getSingleResult(); } catch (EntityNotFoundException ex) { } catch (NoResultException ex) { @@ -101,7 +101,7 @@ .createQuery("select d from WikiDirectory d left join fetch d.feed where d.id = :id") .setParameter("id", wikiroot.getId()) .setHint("org.hibernate.comment", "Loading wikiRootRestricted") - .setHint("org.hibernate.cacheable", true) + .setHint("org.hibernate.cacheable", false) .getSingleResult(); } catch (RuntimeException ex) { throw new RuntimeException("You need to INSERT at least one parentless directory into the database", ex); @@ -118,7 +118,7 @@ .createQuery("select d from WikiDirectory d left join fetch d.feed where d.wikiname = :name and d.parent.parent is null") .setParameter("name", WikiUtil.convertToWikiName(memberAreaName) ) .setHint("org.hibernate.comment", "Loading memberArea") - .setHint("org.hibernate.cacheable", true) + .setHint("org.hibernate.cacheable", false) .getSingleResult(); } catch (RuntimeException ex) { FacesMessages.instance().addFromResourceBundleOrDefault( @@ -141,7 +141,7 @@ .createQuery("select d from WikiDirectory d left join fetch d.feed where d.wikiname = :name and d.parent.parent is null") .setParameter("name", WikiUtil.convertToWikiName(trashAreaName) ) .setHint("org.hibernate.comment", "Loading trashArea") - .setHint("org.hibernate.cacheable", true) + .setHint("org.hibernate.cacheable", false) .getSingleResult(); } catch (RuntimeException ex) { FacesMessages.instance().addFromResourceBundleOrDefault( @@ -164,7 +164,7 @@ .createQuery("select d from WikiDirectory d left join fetch d.feed where d.wikiname = :name and d.parent.parent is null") .setParameter("name", WikiUtil.convertToWikiName(helpAreaName) ) .setHint("org.hibernate.comment", "Loading trashArea") - .setHint("org.hibernate.cacheable", true) + .setHint("org.hibernate.cacheable", false) .getSingleResult(); } catch (RuntimeException ex) { FacesMessages.instance().addFromResourceBundleOrDefault( Modified: trunk/examples/wiki/view/plugins/jiraIssueList/plugin.xhtml =================================================================== --- trunk/examples/wiki/view/plugins/jiraIssueList/plugin.xhtml 2008-02-05 00:39:32 UTC (rev 7362) +++ trunk/examples/wiki/view/plugins/jiraIssueList/plugin.xhtml 2008-02-05 07:35:56 UTC (rev 7363) @@ -19,8 +19,7 @@ rendered="#{not empty jiraIssueList.issues and jiraIssueList.issues.size() > 0}" styleClass="datatable jiraIssueListTable" columnClasses="onePercentColumn alignCenter priorityColumn, - defaultColumn alignLeft summaryColumn wrapWhitespace, - tenPercentColumn alignLeft componentsColumn" + defaultColumn alignLeft summaryColumn wrapWhitespace" rowClasses="rowOdd, rowEven" cellpadding="0" cellspacing="0" border="0"> @@ -29,22 +28,23 @@ </h:column> <h:column> + + <s:div styleClass="jiraIssueComponents smallFont"> + <ui:repeat var="comp" value="#{i.componentNames}"> + <h:outputText value="#{comp}"/> + <h:outputText rendered="#{i.componentNames.indexOf(comp) < i.componentNames.size()-1}" + value=",  "/> + </ui:repeat> + <h:outputText value=" " rendered="#{empty i.componentNames}"/> + </s:div> + <h:outputLink value="#{preferences.get('JiraIssueList', currentMacro).url}/browse/#{i.key}"> <h:outputText value="(#{i.key})  #{wiki:truncateString(i.summary, preferences.get('JiraIssueList', currentMacro).truncateSummary, '...')}"/> </h:outputLink> - </h:column> - <h:column> - <ui:repeat var="comp" value="#{i.componentNames}"> - <h:outputText value="#{comp}"/> - <h:outputText rendered="#{i.componentNames.indexOf(comp) < i.componentNames.size()-1}" - value=",  "/> - </ui:repeat> - <h:outputText value=" " rendered="#{empty i.componentNames}"/> </h:column> - </h:dataTable> </div> Modified: trunk/examples/wiki/view/themes/default/css/jiraIssueList.css =================================================================== --- trunk/examples/wiki/view/themes/default/css/jiraIssueList.css 2008-02-05 00:39:32 UTC (rev 7362) +++ trunk/examples/wiki/view/themes/default/css/jiraIssueList.css 2008-02-05 07:35:56 UTC (rev 7363) @@ -6,7 +6,9 @@ .jiraIssueListTable .summaryColumn {} -.jiraIssueListTable .componentsColumn {} +.jiraIssueListTable .jiraIssueComponents { + text-align: right; +} .jiraIssueListEmpty { padding: 5px; Modified: trunk/examples/wiki/view/themes/inrelationto/css/jiraIssueList.css =================================================================== --- trunk/examples/wiki/view/themes/inrelationto/css/jiraIssueList.css 2008-02-05 00:39:32 UTC (rev 7362) +++ trunk/examples/wiki/view/themes/inrelationto/css/jiraIssueList.css 2008-02-05 07:35:56 UTC (rev 7363) @@ -6,7 +6,9 @@ .jiraIssueListTable .summaryColumn {} -.jiraIssueListTable .componentsColumn {} +.jiraIssueListTable .jiraIssueComponents { + text-align: right; +} .jiraIssueListEmpty { padding: 5px; Modified: trunk/examples/wiki/view/themes/sfwkorg/css/jiraIssueList.css =================================================================== --- trunk/examples/wiki/view/themes/sfwkorg/css/jiraIssueList.css 2008-02-05 00:39:32 UTC (rev 7362) +++ trunk/examples/wiki/view/themes/sfwkorg/css/jiraIssueList.css 2008-02-05 07:35:56 UTC (rev 7363) @@ -6,7 +6,9 @@ .jiraIssueListTable .summaryColumn {} -.jiraIssueListTable .componentsColumn {} +.jiraIssueListTable .jiraIssueComponents { + text-align: right; +} .jiraIssueListEmpty { border-left: 1px solid #d3d2d1;

16 years, 3 months

1
0
0 / 0

Seam SVN: r7362 - trunk/doc/reference/en/modules.

by seam-commits＠lists.jboss.org

Author: shane.bryzak(a)jboss.com Date: 2008-02-04 19:39:32 -0500 (Mon, 04 Feb 2008) New Revision: 7362 Modified: trunk/doc/reference/en/modules/security.xml Log: updated docs with new event Modified: trunk/doc/reference/en/modules/security.xml =================================================================== --- trunk/doc/reference/en/modules/security.xml 2008-02-05 00:32:46 UTC (rev 7361) +++ trunk/doc/reference/en/modules/security.xml 2008-02-05 00:39:32 UTC (rev 7362) @@ -581,6 +581,18 @@ </para> </entry> </row> + <row> + <entry> + <para> + <literal>org.jboss.seam.AlreadyLoggedIn</literal> + </para> + </entry> + <entry> + <para> + This message is produced when a user that is already authenticated attempts to log in again. + </para> + </entry> + </row> </tbody> </tgroup> </table> @@ -1396,6 +1408,18 @@ <row> <entry> <para> + <literal>org.jboss.seam.security.alreadyLoggedIn</literal> + </para> + </entry> + <entry> + <para> + Raised when a user that is already authenticated attempts to log in again. + </para> + </entry> + </row> + <row> + <entry> + <para> <literal>org.jboss.seam.security.notLoggedIn</literal> </para> </entry>

16 years, 3 months

1
0
0 / 0

Seam SVN: r7361 - trunk/src/main/org/jboss/seam/security.

by seam-commits＠lists.jboss.org

Author: shane.bryzak(a)jboss.com Date: 2008-02-04 19:32:46 -0500 (Mon, 04 Feb 2008) New Revision: 7361 Modified: trunk/src/main/org/jboss/seam/security/FacesSecurityEvents.java trunk/src/main/org/jboss/seam/security/Identity.java trunk/src/main/org/jboss/seam/security/RuleBasedIdentity.java Log: Identity.logout() only unauthenticates if user is logged in. New event raised when already-authenticated user attempts to login again. Modified: trunk/src/main/org/jboss/seam/security/FacesSecurityEvents.java =================================================================== --- trunk/src/main/org/jboss/seam/security/FacesSecurityEvents.java 2008-02-04 22:46:33 UTC (rev 7360) +++ trunk/src/main/org/jboss/seam/security/FacesSecurityEvents.java 2008-02-05 00:32:46 UTC (rev 7361) @@ -139,4 +139,14 @@ { return "org.jboss.seam.loginSuccessful"; } + + @Observer(Identity.EVENT_ALREADY_LOGGED_IN) + public void addAlreadyLoggedInMessage() + { + FacesMessages.instance().addFromResourceBundleOrDefault ( + FacesMessage.SEVERITY_WARN, + "org.jboss.seam.AlreadyLoggedIn", + "You are already logged in, please log out first if you wish to log in again" + ); + } } Modified: trunk/src/main/org/jboss/seam/security/Identity.java =================================================================== --- trunk/src/main/org/jboss/seam/security/Identity.java 2008-02-04 22:46:33 UTC (rev 7360) +++ trunk/src/main/org/jboss/seam/security/Identity.java 2008-02-05 00:32:46 UTC (rev 7361) @@ -64,6 +64,7 @@ public static final String EVENT_LOGGED_OUT = "org.jboss.seam.security.loggedOut"; public static final String EVENT_CREDENTIALS_UPDATED = "org.jboss.seam.security.credentialsUpdated"; public static final String EVENT_REMEMBER_ME = "org.jboss.seam.security.rememberMe"; + public static final String EVENT_ALREADY_LOGGED_IN = "org.jboss.seam.security.alreadyLoggedIn"; protected static boolean securityEnabled = true; @@ -192,11 +193,28 @@ } } + /** + * Attempts to authenticate the user. This method is distinct to the + * authenticate() method in that it raises events in response to whether + * authentication is successful or not. The following events may be raised + * by calling login(): + * + * org.jboss.seam.security.loginSuccessful - raised when authentication is successful + * org.jboss.seam.security.loginFailed - raised when authentication fails + * org.jboss.seam.security.alreadyLoggedIn - raised if the user is already authenticated + * + * @return String returns "loggedIn" if user is authenticated, or null if not. + */ public String login() { try - { - authenticate(); + { + if (!authenticate()) + { + if (Events.exists()) Events.instance().raiseEvent(EVENT_ALREADY_LOGGED_IN); + return "loggedIn"; + } + if ( log.isDebugEnabled() ) { log.debug("Login successful for: " + getUsername()); @@ -230,7 +248,12 @@ catch (LoginException ex) { } } - public void authenticate() + /** + * + * @return boolean true if authentication is attempted, false if it is not. + * @throws LoginException + */ + public boolean authenticate() throws LoginException { // If we're already authenticated, then don't authenticate again @@ -239,6 +262,11 @@ principal = null; subject = new Subject(); authenticate( getLoginContext() ); + return true; + } + else + { + return false; } } @@ -250,7 +278,7 @@ authenticating = true; preAuthenticate(); loginContext.login(); - postAuthenticate(); + postAuthenticate(); } finally { @@ -327,9 +355,12 @@ public void logout() { - unAuthenticate(); - Session.instance().invalidate(); - if (Events.exists()) Events.instance().raiseEvent(EVENT_LOGGED_OUT); + if (isLoggedIn(false)) + { + unAuthenticate(); + Session.instance().invalidate(); + if (Events.exists()) Events.instance().raiseEvent(EVENT_LOGGED_OUT); + } } /** Modified: trunk/src/main/org/jboss/seam/security/RuleBasedIdentity.java =================================================================== --- trunk/src/main/org/jboss/seam/security/RuleBasedIdentity.java 2008-02-04 22:46:33 UTC (rev 7360) +++ trunk/src/main/org/jboss/seam/security/RuleBasedIdentity.java 2008-02-05 00:32:46 UTC (rev 7361) @@ -222,18 +222,5 @@ public void setSecurityRules(RuleBase securityRules) { this.securityRules = securityRules; - } - - @Override - public void logout() - { - // Explicitly destroy the security context - if (getSecurityContext() != null) - { - getSecurityContext().dispose(); - setSecurityContext(null); - } - - super.logout(); - } + } }

16 years, 3 months

1
0
0 / 0

Seam SVN: r7360 - in trunk/examples: wiki and 1 other directory.

by seam-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2008-02-04 17:46:33 -0500 (Mon, 04 Feb 2008) New Revision: 7360 Modified: trunk/examples/build.xml trunk/examples/wiki/build.xml Log: Fix build Modified: trunk/examples/build.xml =================================================================== --- trunk/examples/build.xml 2008-02-04 17:45:22 UTC (rev 7359) +++ trunk/examples/build.xml 2008-02-04 22:46:33 UTC (rev 7360) @@ -452,6 +452,7 @@ <fileset dir="${lib.dir}">  <exclude name="jboss-seam-ui.jar" /> + <exclude name="jboss-seam-wicket.jar" /> <exclude name="interop/**/*" /> </fileset> <path path="${eejb.conf.dir}" /> Modified: trunk/examples/wiki/build.xml =================================================================== --- trunk/examples/wiki/build.xml 2008-02-04 17:45:22 UTC (rev 7359) +++ trunk/examples/wiki/build.xml 2008-02-04 22:46:33 UTC (rev 7360) @@ -72,6 +72,7 @@  <exclude name="hibernate*.jar"/> <exclude name="jboss-seam-jbas5.jar" /> + <exclude name="jboss-seam-wicket.jar" /> </fileset> <fileset dir="${local.lib.dir}">

16 years, 3 months

1
0
0 / 0

Seam SVN: r7359 - trunk/build.

by seam-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2008-02-04 12:45:22 -0500 (Mon, 04 Feb 2008) New Revision: 7359 Modified: trunk/build/classpath.tmpl Log: oops Modified: trunk/build/classpath.tmpl =================================================================== (Binary files differ)

16 years, 3 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

seam-commits February 2008