September 2010 - seam-commits - Jboss List Archives

[pmuir/ticket-monster] 5f2b30: Complete the merge of Shane and Heiko's changes

by noreply＠github.com

Branch: refs/heads/master Home: http://github.com/pmuir/ticket-monster Commit: 5f2b30d6dcb1cf79aba32dc7632ca7ffec791bd9 http://github.com/pmuir/ticket-monster/commit/5f2b30d6dcb1cf79aba32dc7632... Author: Pete Muir <pmuir(a)bleepbleep.org.uk> Date: 2010-09-13 (Mon, 13 Sep 2010) Changed paths: A core/src/main/java/META-INF/MANIFEST.MF A core/src/main/java/org/jboss/seam/example/ticketmonster/dto/Availability.java A gwt-ui/war/META-INF/MANIFEST.MF A jsf-ui/src/main/webapp/META-INF/MANIFEST.MF A jsf-ui/src/main/webapp/WEB-INF/templates/simple.xhtml A jsf-ui/src/main/webapp/WEB-INF/web.xml A jsf-ui/src/main/webapp/script/easteregg.js A jsf-ui/src/main/webapp/style/btn_next.png A jsf-ui/src/main/webapp/style/btn_previous.png A jsf-ui/src/main/webapp/style/rawr.png A jsf-ui/src/main/webapp/style/sectionheader_bg.png R src/main/java/org/jboss/seam/example/ticketmonster/dto/Availability.java R src/main/webapp/WEB-INF/templates/simple.xhtml R src/main/webapp/script/easteregg.js R src/main/webapp/style/btn_next.png R src/main/webapp/style/btn_previous.png R src/main/webapp/style/rawr.png R src/main/webapp/style/sectionheader_bg.png Log Message: ----------- Complete the merge of Shane and Heiko's changes manually

14 years, 3 months

1
0
0 / 0

Seam SVN: r13740 - branches/enterprise/JBPAPP_4_3_FP01/seam-gen.

by seam-commits＠lists.jboss.org

Author: manaRH Date: 2010-09-13 10:50:17 -0400 (Mon, 13 Sep 2010) New Revision: 13740 Modified: branches/enterprise/JBPAPP_4_3_FP01/seam-gen/build.xml Log: fixed path to validate.xml for seam-gen project Modified: branches/enterprise/JBPAPP_4_3_FP01/seam-gen/build.xml =================================================================== --- branches/enterprise/JBPAPP_4_3_FP01/seam-gen/build.xml 2010-09-13 12:34:42 UTC (rev 13739) +++ branches/enterprise/JBPAPP_4_3_FP01/seam-gen/build.xml 2010-09-13 14:50:17 UTC (rev 13740) @@ -643,7 +643,7 @@ <filterset refid="project"/> </copy> <copy todir="${project.home}" overwrite="true"> - <fileset file="../validate.xml"/> + <fileset file="${build.dir}/validate.xml"/> </copy> <copy todir="${project.home}/resources"> <fileset dir="${base.dir}/resources/">

14 years, 3 months

1
0
0 / 0

[pmuir/ticket-monster] edbd4f: Exclude JDT dependency: It conflicts with the GWT ...

by noreply＠github.com

Branch: refs/heads/master Home: http://github.com/pmuir/ticket-monster Commit: edbd4f929942ae69f025fb44e32d77beb5e707d8 http://github.com/pmuir/ticket-monster/commit/edbd4f929942ae69f025fb44e32... Author: heiko-braun <hbraun(a)redhat.com> Date: 2010-09-13 (Mon, 13 Sep 2010) Changed paths: M gwt-ui/pom.xml Log Message: ----------- Exclude JDT dependency: It conflicts with the GWT Compiler Commit: 6d5ced2455a66cda620c9c90cde00b0afeac3205 http://github.com/pmuir/ticket-monster/commit/6d5ced2455a66cda620c9c90cde... Author: Pete Muir <pmuir(a)bleepbleep.org.uk> Date: 2010-09-13 (Mon, 13 Sep 2010) Changed paths: M .gitignore M README.md A core/pom.xml A core/src/main/java/org/jboss/seam/example/ticketmonster/action/CategorySearch.java A core/src/main/java/org/jboss/seam/example/ticketmonster/action/DocumentResourceSearch.java A core/src/main/java/org/jboss/seam/example/ticketmonster/action/EventAction.java A core/src/main/java/org/jboss/seam/example/ticketmonster/action/EventDetail.java A core/src/main/java/org/jboss/seam/example/ticketmonster/action/EventSearch.java A core/src/main/java/org/jboss/seam/example/ticketmonster/action/LayoutAction.java A core/src/main/java/org/jboss/seam/example/ticketmonster/action/VenueAction.java A core/src/main/java/org/jboss/seam/example/ticketmonster/action/VenueLayoutSearch.java A core/src/main/java/org/jboss/seam/example/ticketmonster/action/VenueSearch.java A core/src/main/java/org/jboss/seam/example/ticketmonster/jsf/CategoryConverter.java A core/src/main/java/org/jboss/seam/example/ticketmonster/jsf/SelectItems.java A core/src/main/java/org/jboss/seam/example/ticketmonster/model/Allocation.java A core/src/main/java/org/jboss/seam/example/ticketmonster/model/Document.java A core/src/main/java/org/jboss/seam/example/ticketmonster/model/DocumentResource.java A core/src/main/java/org/jboss/seam/example/ticketmonster/model/Event.java A core/src/main/java/org/jboss/seam/example/ticketmonster/model/EventCategory.java A core/src/main/java/org/jboss/seam/example/ticketmonster/model/IdentityObject.java A core/src/main/java/org/jboss/seam/example/ticketmonster/model/IdentityObjectCredential.java A core/src/main/java/org/jboss/seam/example/ticketmonster/model/IdentityObjectCredentialType.java A core/src/main/java/org/jboss/seam/example/ticketmonster/model/IdentityObjectRelationship.java A core/src/main/java/org/jboss/seam/example/ticketmonster/model/IdentityObjectRelationshipType.java A core/src/main/java/org/jboss/seam/example/ticketmonster/model/IdentityObjectType.java A core/src/main/java/org/jboss/seam/example/ticketmonster/model/IdentityPermission.java A core/src/main/java/org/jboss/seam/example/ticketmonster/model/IdentityRoleName.java A core/src/main/java/org/jboss/seam/example/ticketmonster/model/PriceCategory.java A core/src/main/java/org/jboss/seam/example/ticketmonster/model/Revision.java A core/src/main/java/org/jboss/seam/example/ticketmonster/model/Section.java A core/src/main/java/org/jboss/seam/example/ticketmonster/model/SectionRow.java A core/src/main/java/org/jboss/seam/example/ticketmonster/model/Show.java A core/src/main/java/org/jboss/seam/example/ticketmonster/model/TicketCategory.java A core/src/main/java/org/jboss/seam/example/ticketmonster/model/User.java A core/src/main/java/org/jboss/seam/example/ticketmonster/model/Venue.java A core/src/main/java/org/jboss/seam/example/ticketmonster/model/VenueLayout.java A core/src/main/java/org/jboss/seam/example/ticketmonster/producer/EE6Resources.java A core/src/main/java/org/jboss/seam/example/ticketmonster/producer/JBossEAP51Resources.java A core/src/main/java/org/jboss/seam/example/ticketmonster/server/CategorySearchDelegate.java A core/src/main/java/org/jboss/seam/example/ticketmonster/util/DocumentResourceServlet.java A core/src/main/resources/ErraiApp.properties A core/src/main/resources/META-INF/beans.xml A core/src/main/resources/META-INF/persistence.xml A core/src/main/resources/META-INF/seam-beans.xml A core/src/main/resources/import.sql A docs/usecases/UseCase Diagram0.asta A docs/usecases/WebUserUseCases.png A gwt-ui/pom.xml A gwt-ui/src/jboss6/jboss-web.xml A gwt-ui/src/jboss6/web.xml A gwt-ui/src/jetty/web.xml A gwt-ui/src/main/java/ErraiApp.properties A gwt-ui/src/main/java/ErraiService.properties A gwt-ui/src/main/java/errai-proxy.json A gwt-ui/src/main/java/jndi.properties A gwt-ui/src/main/java/login.config A gwt-ui/src/main/java/org/jboss/seam/example/ticketmonster/App.gwt.xml A gwt-ui/src/main/java/org/jboss/seam/example/ticketmonster/client/App.java A gwt-ui/src/main/java/org/jboss/seam/example/ticketmonster/client/categories/CategoryAdmin.java A gwt-ui/src/main/java/roles.properties A gwt-ui/src/main/java/users.properties A gwt-ui/war/App.css A gwt-ui/war/App.html A gwt-ui/war/ErraiApp.properties A gwt-ui/war/ErraiService.properties A gwt-ui/war/WEB-INF/beans.xml A gwt-ui/war/WEB-INF/jboss-web.xml A gwt-ui/war/WEB-INF/jetty-env.xml A gwt-ui/war/WEB-INF/web.xml A gwt-ui/war/errai-proxy.json A gwt-ui/war/index.html A gwt-ui/war/jboss-web.xml A gwt-ui/war/jndi.properties A gwt-ui/war/login.config A gwt-ui/war/org/jboss/seam/example/ticketmonster/App.gwt.xml A gwt-ui/war/org/jboss/seam/example/ticketmonster/client/App.java A gwt-ui/war/org/jboss/seam/example/ticketmonster/client/categories/CategoryAdmin.java A gwt-ui/war/roles.properties A gwt-ui/war/users.properties A gwt-ui/war/web.xml A jsf-ui/pom.xml A jsf-ui/prototype/background.png A jsf-ui/prototype/curtains.png A jsf-ui/prototype/default.css A jsf-ui/prototype/index.html A jsf-ui/prototype/menu_bg.png A jsf-ui/prototype/schema.dia A jsf-ui/prototype/schema.png A jsf-ui/prototype/ticket.png A jsf-ui/src/eap-51/java/org/jboss/seam/example/ticketmonster/eap51/servlet/provider/WeldServletBeanManagerProvider.java A jsf-ui/src/eap-51/resources/META-INF/services/org.jboss.weld.extensions.beanManager.BeanManagerProvider A jsf-ui/src/eap-51/webapp/WEB-INF/beans.xml A jsf-ui/src/eap-51/webapp/WEB-INF/jboss-web.xml A jsf-ui/src/eap-51/webapp/WEB-INF/web.xml A jsf-ui/src/jboss-6/webapp/WEB-INF/beans.xml A jsf-ui/src/jboss-6/webapp/WEB-INF/web.xml A jsf-ui/src/main/assembly/assembly.xml A jsf-ui/src/main/resources/ErraiService.properties A jsf-ui/src/main/webapp/WEB-INF/faces-config.xml A jsf-ui/src/main/webapp/WEB-INF/login.config A jsf-ui/src/main/webapp/WEB-INF/roles.properties A jsf-ui/src/main/webapp/WEB-INF/security-rules.drl A jsf-ui/src/main/webapp/WEB-INF/taglib.xml A jsf-ui/src/main/webapp/WEB-INF/templates/admin.xhtml A jsf-ui/src/main/webapp/WEB-INF/templates/default.xhtml A jsf-ui/src/main/webapp/WEB-INF/users.properties A jsf-ui/src/main/webapp/admin/categories.xhtml A jsf-ui/src/main/webapp/admin/ckeditor/adapters/jquery.js A jsf-ui/src/main/webapp/admin/ckeditor/ckeditor.js A jsf-ui/src/main/webapp/admin/ckeditor/ckeditor.pack A jsf-ui/src/main/webapp/admin/ckeditor/ckeditor_basic.js A jsf-ui/src/main/webapp/admin/ckeditor/ckeditor_basic_source.js A jsf-ui/src/main/webapp/admin/ckeditor/ckeditor_source.js A jsf-ui/src/main/webapp/admin/ckeditor/config.js A jsf-ui/src/main/webapp/admin/ckeditor/contents.css A jsf-ui/src/main/webapp/admin/ckeditor/images/spacer.gif A jsf-ui/src/main/webapp/admin/ckeditor/lang/_languages.js A jsf-ui/src/main/webapp/admin/ckeditor/lang/_translationstatus.txt A jsf-ui/src/main/webapp/admin/ckeditor/lang/af.js A jsf-ui/src/main/webapp/admin/ckeditor/lang/ar.js A jsf-ui/src/main/webapp/admin/ckeditor/lang/bg.js A jsf-ui/src/main/webapp/admin/ckeditor/lang/bn.js A jsf-ui/src/main/webapp/admin/ckeditor/lang/bs.js A jsf-ui/src/main/webapp/admin/ckeditor/lang/ca.js A jsf-ui/src/main/webapp/admin/ckeditor/lang/cs.js A jsf-ui/src/main/webapp/admin/ckeditor/lang/cy.js A jsf-ui/src/main/webapp/admin/ckeditor/lang/da.js A jsf-ui/src/main/webapp/admin/ckeditor/lang/de.js A jsf-ui/src/main/webapp/admin/ckeditor/lang/el.js A jsf-ui/src/main/webapp/admin/ckeditor/lang/en-au.js A jsf-ui/src/main/webapp/admin/ckeditor/lang/en-ca.js A jsf-ui/src/main/webapp/admin/ckeditor/lang/en-gb.js A jsf-ui/src/main/webapp/admin/ckeditor/lang/en.js A jsf-ui/src/main/webapp/admin/ckeditor/lang/eo.js A jsf-ui/src/main/webapp/admin/ckeditor/lang/es.js A jsf-ui/src/main/webapp/admin/ckeditor/lang/et.js A jsf-ui/src/main/webapp/admin/ckeditor/lang/eu.js A jsf-ui/src/main/webapp/admin/ckeditor/lang/fa.js A jsf-ui/src/main/webapp/admin/ckeditor/lang/fi.js A jsf-ui/src/main/webapp/admin/ckeditor/lang/fo.js A jsf-ui/src/main/webapp/admin/ckeditor/lang/fr-ca.js A jsf-ui/src/main/webapp/admin/ckeditor/lang/fr.js A jsf-ui/src/main/webapp/admin/ckeditor/lang/gl.js A jsf-ui/src/main/webapp/admin/ckeditor/lang/gu.js A jsf-ui/src/main/webapp/admin/ckeditor/lang/he.js A jsf-ui/src/main/webapp/admin/ckeditor/lang/hi.js A jsf-ui/src/main/webapp/admin/ckeditor/lang/hr.js A jsf-ui/src/main/webapp/admin/ckeditor/lang/hu.js A jsf-ui/src/main/webapp/admin/ckeditor/lang/is.js A jsf-ui/src/main/webapp/admin/ckeditor/lang/it.js A jsf-ui/src/main/webapp/admin/ckeditor/lang/ja.js A jsf-ui/src/main/webapp/admin/ckeditor/lang/km.js A jsf-ui/src/main/webapp/admin/ckeditor/lang/ko.js A jsf-ui/src/main/webapp/admin/ckeditor/lang/lt.js A jsf-ui/src/main/webapp/admin/ckeditor/lang/lv.js A jsf-ui/src/main/webapp/admin/ckeditor/lang/mn.js A jsf-ui/src/main/webapp/admin/ckeditor/lang/ms.js A jsf-ui/src/main/webapp/admin/ckeditor/lang/nb.js A jsf-ui/src/main/webapp/admin/ckeditor/lang/nl.js A jsf-ui/src/main/webapp/admin/ckeditor/lang/no.js A jsf-ui/src/main/webapp/admin/ckeditor/lang/pl.js A jsf-ui/src/main/webapp/admin/ckeditor/lang/pt-br.js A jsf-ui/src/main/webapp/admin/ckeditor/lang/pt.js A jsf-ui/src/main/webapp/admin/ckeditor/lang/ro.js A jsf-ui/src/main/webapp/admin/ckeditor/lang/ru.js A jsf-ui/src/main/webapp/admin/ckeditor/lang/sk.js A jsf-ui/src/main/webapp/admin/ckeditor/lang/sl.js A jsf-ui/src/main/webapp/admin/ckeditor/lang/sr-latn.js A jsf-ui/src/main/webapp/admin/ckeditor/lang/sr.js A jsf-ui/src/main/webapp/admin/ckeditor/lang/sv.js A jsf-ui/src/main/webapp/admin/ckeditor/lang/th.js A jsf-ui/src/main/webapp/admin/ckeditor/lang/tr.js A jsf-ui/src/main/webapp/admin/ckeditor/lang/uk.js A jsf-ui/src/main/webapp/admin/ckeditor/lang/vi.js A jsf-ui/src/main/webapp/admin/ckeditor/lang/zh-cn.js A jsf-ui/src/main/webapp/admin/ckeditor/lang/zh.js A jsf-ui/src/main/webapp/admin/ckeditor/plugins/a11yhelp/dialogs/a11yhelp.js A jsf-ui/src/main/webapp/admin/ckeditor/plugins/a11yhelp/lang/en.js A jsf-ui/src/main/webapp/admin/ckeditor/plugins/a11yhelp/lang/he.js A jsf-ui/src/main/webapp/admin/ckeditor/plugins/about/dialogs/about.js A jsf-ui/src/main/webapp/admin/ckeditor/plugins/about/dialogs/logo_ckeditor.png A jsf-ui/src/main/webapp/admin/ckeditor/plugins/autogrow/plugin.js A jsf-ui/src/main/webapp/admin/ckeditor/plugins/clipboard/dialogs/paste.js A jsf-ui/src/main/webapp/admin/ckeditor/plugins/colordialog/dialogs/colordialog.js A jsf-ui/src/main/webapp/admin/ckeditor/plugins/dialog/dialogDefinition.js A jsf-ui/src/main/webapp/admin/ckeditor/plugins/div/dialogs/div.js A jsf-ui/src/main/webapp/admin/ckeditor/plugins/find/dialogs/find.js A jsf-ui/src/main/webapp/admin/ckeditor/plugins/flash/dialogs/flash.js A jsf-ui/src/main/webapp/admin/ckeditor/plugins/flash/images/placeholder.png A jsf-ui/src/main/webapp/admin/ckeditor/plugins/forms/dialogs/button.js A jsf-ui/src/main/webapp/admin/ckeditor/plugins/forms/dialogs/checkbox.js A jsf-ui/src/main/webapp/admin/ckeditor/plugins/forms/dialogs/form.js A jsf-ui/src/main/webapp/admin/ckeditor/plugins/forms/dialogs/hiddenfield.js A jsf-ui/src/main/webapp/admin/ckeditor/plugins/forms/dialogs/radio.js A jsf-ui/src/main/webapp/admin/ckeditor/plugins/forms/dialogs/select.js A jsf-ui/src/main/webapp/admin/ckeditor/plugins/forms/dialogs/textarea.js A jsf-ui/src/main/webapp/admin/ckeditor/plugins/forms/dialogs/textfield.js A jsf-ui/src/main/webapp/admin/ckeditor/plugins/forms/images/hiddenfield.gif A jsf-ui/src/main/webapp/admin/ckeditor/plugins/iframedialog/plugin.js A jsf-ui/src/main/webapp/admin/ckeditor/plugins/image/dialogs/image.js A jsf-ui/src/main/webapp/admin/ckeditor/plugins/link/dialogs/anchor.js A jsf-ui/src/main/webapp/admin/ckeditor/plugins/link/dialogs/link.js A jsf-ui/src/main/webapp/admin/ckeditor/plugins/link/images/anchor.gif A jsf-ui/src/main/webapp/admin/ckeditor/plugins/liststyle/dialogs/liststyle.js A jsf-ui/src/main/webapp/admin/ckeditor/plugins/pagebreak/images/pagebreak.gif A jsf-ui/src/main/webapp/admin/ckeditor/plugins/pastefromword/filter/default.js A jsf-ui/src/main/webapp/admin/ckeditor/plugins/pastetext/dialogs/pastetext.js A jsf-ui/src/main/webapp/admin/ckeditor/plugins/scayt/dialogs/options.js A jsf-ui/src/main/webapp/admin/ckeditor/plugins/scayt/dialogs/toolbar.css A jsf-ui/src/main/webapp/admin/ckeditor/plugins/showblocks/images/block_address.png A jsf-ui/src/main/webapp/admin/ckeditor/plugins/showblocks/images/block_blockquote.png A jsf-ui/src/main/webapp/admin/ckeditor/plugins/showblocks/images/block_div.png A jsf-ui/src/main/webapp/admin/ckeditor/plugins/showblocks/images/block_h1.png A jsf-ui/src/main/webapp/admin/ckeditor/plugins/showblocks/images/block_h2.png A jsf-ui/src/main/webapp/admin/ckeditor/plugins/showblocks/images/block_h3.png A jsf-ui/src/main/webapp/admin/ckeditor/plugins/showblocks/images/block_h4.png A jsf-ui/src/main/webapp/admin/ckeditor/plugins/showblocks/images/block_h5.png A jsf-ui/src/main/webapp/admin/ckeditor/plugins/showblocks/images/block_h6.png A jsf-ui/src/main/webapp/admin/ckeditor/plugins/showblocks/images/block_p.png A jsf-ui/src/main/webapp/admin/ckeditor/plugins/showblocks/images/block_pre.png A jsf-ui/src/main/webapp/admin/ckeditor/plugins/smiley/dialogs/smiley.js A jsf-ui/src/main/webapp/admin/ckeditor/plugins/smiley/images/angel_smile.gif A jsf-ui/src/main/webapp/admin/ckeditor/plugins/smiley/images/angry_smile.gif A jsf-ui/src/main/webapp/admin/ckeditor/plugins/smiley/images/broken_heart.gif A jsf-ui/src/main/webapp/admin/ckeditor/plugins/smiley/images/confused_smile.gif A jsf-ui/src/main/webapp/admin/ckeditor/plugins/smiley/images/cry_smile.gif A jsf-ui/src/main/webapp/admin/ckeditor/plugins/smiley/images/devil_smile.gif A jsf-ui/src/main/webapp/admin/ckeditor/plugins/smiley/images/embaressed_smile.gif A jsf-ui/src/main/webapp/admin/ckeditor/plugins/smiley/images/envelope.gif A jsf-ui/src/main/webapp/admin/ckeditor/plugins/smiley/images/heart.gif A jsf-ui/src/main/webapp/admin/ckeditor/plugins/smiley/images/kiss.gif A jsf-ui/src/main/webapp/admin/ckeditor/plugins/smiley/images/lightbulb.gif A jsf-ui/src/main/webapp/admin/ckeditor/plugins/smiley/images/omg_smile.gif A jsf-ui/src/main/webapp/admin/ckeditor/plugins/smiley/images/regular_smile.gif A jsf-ui/src/main/webapp/admin/ckeditor/plugins/smiley/images/sad_smile.gif A jsf-ui/src/main/webapp/admin/ckeditor/plugins/smiley/images/shades_smile.gif A jsf-ui/src/main/webapp/admin/ckeditor/plugins/smiley/images/teeth_smile.gif A jsf-ui/src/main/webapp/admin/ckeditor/plugins/smiley/images/thumbs_down.gif A jsf-ui/src/main/webapp/admin/ckeditor/plugins/smiley/images/thumbs_up.gif A jsf-ui/src/main/webapp/admin/ckeditor/plugins/smiley/images/tounge_smile.gif A jsf-ui/src/main/webapp/admin/ckeditor/plugins/smiley/images/whatchutalkingabout_smile.gif A jsf-ui/src/main/webapp/admin/ckeditor/plugins/smiley/images/wink_smile.gif A jsf-ui/src/main/webapp/admin/ckeditor/plugins/specialchar/dialogs/specialchar.js A jsf-ui/src/main/webapp/admin/ckeditor/plugins/styles/styles/default.js A jsf-ui/src/main/webapp/admin/ckeditor/plugins/table/dialogs/table.js A jsf-ui/src/main/webapp/admin/ckeditor/plugins/tableresize/plugin.js A jsf-ui/src/main/webapp/admin/ckeditor/plugins/tabletools/dialogs/tableCell.js A jsf-ui/src/main/webapp/admin/ckeditor/plugins/templates/dialogs/templates.js A jsf-ui/src/main/webapp/admin/ckeditor/plugins/templates/templates/default.js A jsf-ui/src/main/webapp/admin/ckeditor/plugins/templates/templates/images/template1.gif A jsf-ui/src/main/webapp/admin/ckeditor/plugins/templates/templates/images/template2.gif A jsf-ui/src/main/webapp/admin/ckeditor/plugins/templates/templates/images/template3.gif A jsf-ui/src/main/webapp/admin/ckeditor/plugins/uicolor/dialogs/uicolor.js A jsf-ui/src/main/webapp/admin/ckeditor/plugins/uicolor/lang/en.js A jsf-ui/src/main/webapp/admin/ckeditor/plugins/uicolor/plugin.js A jsf-ui/src/main/webapp/admin/ckeditor/plugins/uicolor/uicolor.gif A jsf-ui/src/main/webapp/admin/ckeditor/plugins/uicolor/yui/assets/hue_bg.png A jsf-ui/src/main/webapp/admin/ckeditor/plugins/uicolor/yui/assets/hue_thumb.png A jsf-ui/src/main/webapp/admin/ckeditor/plugins/uicolor/yui/assets/picker_mask.png A jsf-ui/src/main/webapp/admin/ckeditor/plugins/uicolor/yui/assets/picker_thumb.png A jsf-ui/src/main/webapp/admin/ckeditor/plugins/uicolor/yui/assets/yui.css A jsf-ui/src/main/webapp/admin/ckeditor/plugins/uicolor/yui/yui.js A jsf-ui/src/main/webapp/admin/ckeditor/plugins/wsc/dialogs/ciframe.html A jsf-ui/src/main/webapp/admin/ckeditor/plugins/wsc/dialogs/tmpFrameset.html A jsf-ui/src/main/webapp/admin/ckeditor/plugins/wsc/dialogs/wsc.css A jsf-ui/src/main/webapp/admin/ckeditor/plugins/wsc/dialogs/wsc.js A jsf-ui/src/main/webapp/admin/ckeditor/skins/kama/dialog.css A jsf-ui/src/main/webapp/admin/ckeditor/skins/kama/editor.css A jsf-ui/src/main/webapp/admin/ckeditor/skins/kama/icons.png A jsf-ui/src/main/webapp/admin/ckeditor/skins/kama/images/dialog_sides.gif A jsf-ui/src/main/webapp/admin/ckeditor/skins/kama/images/dialog_sides.png A jsf-ui/src/main/webapp/admin/ckeditor/skins/kama/images/dialog_sides_rtl.png A jsf-ui/src/main/webapp/admin/ckeditor/skins/kama/images/mini.gif A jsf-ui/src/main/webapp/admin/ckeditor/skins/kama/images/noimage.png A jsf-ui/src/main/webapp/admin/ckeditor/skins/kama/images/sprites.png A jsf-ui/src/main/webapp/admin/ckeditor/skins/kama/images/sprites_ie6.png A jsf-ui/src/main/webapp/admin/ckeditor/skins/kama/images/toolbar_start.gif A jsf-ui/src/main/webapp/admin/ckeditor/skins/kama/skin.js A jsf-ui/src/main/webapp/admin/ckeditor/skins/kama/templates.css A jsf-ui/src/main/webapp/admin/ckeditor/skins/office2003/dialog.css A jsf-ui/src/main/webapp/admin/ckeditor/skins/office2003/editor.css A jsf-ui/src/main/webapp/admin/ckeditor/skins/office2003/icons.png A jsf-ui/src/main/webapp/admin/ckeditor/skins/office2003/images/dialog_sides.gif A jsf-ui/src/main/webapp/admin/ckeditor/skins/office2003/images/dialog_sides.png A jsf-ui/src/main/webapp/admin/ckeditor/skins/office2003/images/dialog_sides_rtl.png A jsf-ui/src/main/webapp/admin/ckeditor/skins/office2003/images/mini.gif A jsf-ui/src/main/webapp/admin/ckeditor/skins/office2003/images/noimage.png A jsf-ui/src/main/webapp/admin/ckeditor/skins/office2003/images/sprites.png A jsf-ui/src/main/webapp/admin/ckeditor/skins/office2003/images/sprites_ie6.png A jsf-ui/src/main/webapp/admin/ckeditor/skins/office2003/skin.js A jsf-ui/src/main/webapp/admin/ckeditor/skins/office2003/templates.css A jsf-ui/src/main/webapp/admin/ckeditor/skins/v2/dialog.css A jsf-ui/src/main/webapp/admin/ckeditor/skins/v2/editor.css A jsf-ui/src/main/webapp/admin/ckeditor/skins/v2/icons.png A jsf-ui/src/main/webapp/admin/ckeditor/skins/v2/images/dialog_sides.gif A jsf-ui/src/main/webapp/admin/ckeditor/skins/v2/images/dialog_sides.png A jsf-ui/src/main/webapp/admin/ckeditor/skins/v2/images/dialog_sides_rtl.png A jsf-ui/src/main/webapp/admin/ckeditor/skins/v2/images/mini.gif A jsf-ui/src/main/webapp/admin/ckeditor/skins/v2/images/noimage.png A jsf-ui/src/main/webapp/admin/ckeditor/skins/v2/images/sprites.png A jsf-ui/src/main/webapp/admin/ckeditor/skins/v2/images/sprites_ie6.png A jsf-ui/src/main/webapp/admin/ckeditor/skins/v2/images/toolbar_start.gif A jsf-ui/src/main/webapp/admin/ckeditor/skins/v2/skin.js A jsf-ui/src/main/webapp/admin/ckeditor/skins/v2/templates.css A jsf-ui/src/main/webapp/admin/ckeditor/themes/default/theme.js A jsf-ui/src/main/webapp/admin/eventdetail.xhtml A jsf-ui/src/main/webapp/admin/home.xhtml A jsf-ui/src/main/webapp/admin/index.jsp A jsf-ui/src/main/webapp/admin/layoutdetail.xhtml A jsf-ui/src/main/webapp/admin/sectiondetail.xhtml A jsf-ui/src/main/webapp/admin/venuedetail.xhtml A jsf-ui/src/main/webapp/admin/venuelayouts.xhtml A jsf-ui/src/main/webapp/admin/venues.xhtml A jsf-ui/src/main/webapp/home.xhtml A jsf-ui/src/main/webapp/index.jsp A jsf-ui/src/main/webapp/style/admin.css A jsf-ui/src/main/webapp/style/background.png A jsf-ui/src/main/webapp/style/buytickets.png A jsf-ui/src/main/webapp/style/curtains.png A jsf-ui/src/main/webapp/style/default.css A jsf-ui/src/main/webapp/style/menu_bg.png A jsf-ui/src/main/webapp/style/menu_highlight.png A jsf-ui/src/main/webapp/style/table_header.png A jsf-ui/src/main/webapp/style/ticket.png A jsf-ui/src/main/webapp/viewevent.xhtml A jsf-ui/ticketmonster-ds.xml M pom.xml R prototype/background.png R prototype/curtains.png R prototype/default.css R prototype/index.html R prototype/menu_bg.png R prototype/schema.dia R prototype/schema.png R prototype/ticket.png R src/eap-51/java/org/jboss/seam/example/ticketmonster/eap51/servlet/provider/WeldServletBeanManagerProvider.java R src/eap-51/resources/META-INF/services/org.jboss.weld.extensions.beanManager.BeanManagerProvider R src/eap-51/webapp/WEB-INF/beans.xml R src/eap-51/webapp/WEB-INF/jboss-web.xml R src/eap-51/webapp/WEB-INF/web.xml R src/jboss-6/webapp/WEB-INF/beans.xml R src/jboss-6/webapp/WEB-INF/web.xml R src/main/assembly/assembly.xml R src/main/java/org/jboss/seam/example/ticketmonster/action/CategorySearch.java R src/main/java/org/jboss/seam/example/ticketmonster/action/DocumentResourceSearch.java R src/main/java/org/jboss/seam/example/ticketmonster/action/EventAction.java R src/main/java/org/jboss/seam/example/ticketmonster/action/EventDetail.java R src/main/java/org/jboss/seam/example/ticketmonster/action/EventSearch.java R src/main/java/org/jboss/seam/example/ticketmonster/action/LayoutAction.java R src/main/java/org/jboss/seam/example/ticketmonster/action/VenueAction.java R src/main/java/org/jboss/seam/example/ticketmonster/action/VenueLayoutSearch.java R src/main/java/org/jboss/seam/example/ticketmonster/action/VenueSearch.java R src/main/java/org/jboss/seam/example/ticketmonster/jsf/CategoryConverter.java R src/main/java/org/jboss/seam/example/ticketmonster/jsf/SelectItems.java R src/main/java/org/jboss/seam/example/ticketmonster/model/Allocation.java R src/main/java/org/jboss/seam/example/ticketmonster/model/Document.java R src/main/java/org/jboss/seam/example/ticketmonster/model/DocumentResource.java R src/main/java/org/jboss/seam/example/ticketmonster/model/Event.java R src/main/java/org/jboss/seam/example/ticketmonster/model/EventCategory.java R src/main/java/org/jboss/seam/example/ticketmonster/model/IdentityObject.java R src/main/java/org/jboss/seam/example/ticketmonster/model/IdentityObjectCredential.java R src/main/java/org/jboss/seam/example/ticketmonster/model/IdentityObjectCredentialType.java R src/main/java/org/jboss/seam/example/ticketmonster/model/IdentityObjectRelationship.java R src/main/java/org/jboss/seam/example/ticketmonster/model/IdentityObjectRelationshipType.java R src/main/java/org/jboss/seam/example/ticketmonster/model/IdentityObjectType.java R src/main/java/org/jboss/seam/example/ticketmonster/model/IdentityPermission.java R src/main/java/org/jboss/seam/example/ticketmonster/model/IdentityRoleName.java R src/main/java/org/jboss/seam/example/ticketmonster/model/PriceCategory.java R src/main/java/org/jboss/seam/example/ticketmonster/model/Revision.java R src/main/java/org/jboss/seam/example/ticketmonster/model/Section.java R src/main/java/org/jboss/seam/example/ticketmonster/model/SectionRow.java R src/main/java/org/jboss/seam/example/ticketmonster/model/Show.java R src/main/java/org/jboss/seam/example/ticketmonster/model/TicketCategory.java R src/main/java/org/jboss/seam/example/ticketmonster/model/User.java R src/main/java/org/jboss/seam/example/ticketmonster/model/Venue.java R src/main/java/org/jboss/seam/example/ticketmonster/model/VenueLayout.java R src/main/java/org/jboss/seam/example/ticketmonster/producer/EE6Resources.java R src/main/java/org/jboss/seam/example/ticketmonster/producer/JBossEAP51Resources.java R src/main/java/org/jboss/seam/example/ticketmonster/util/DocumentResourceServlet.java R src/main/resources/META-INF/persistence.xml R src/main/resources/META-INF/seam-beans.xml R src/main/resources/import.sql R src/main/webapp/WEB-INF/faces-config.xml R src/main/webapp/WEB-INF/security-rules.drl R src/main/webapp/WEB-INF/taglib.xml R src/main/webapp/WEB-INF/templates/admin.xhtml R src/main/webapp/WEB-INF/templates/default.xhtml R src/main/webapp/admin/categories.xhtml R src/main/webapp/admin/ckeditor/adapters/jquery.js R src/main/webapp/admin/ckeditor/ckeditor.js R src/main/webapp/admin/ckeditor/ckeditor.pack R src/main/webapp/admin/ckeditor/ckeditor_basic.js R src/main/webapp/admin/ckeditor/ckeditor_basic_source.js R src/main/webapp/admin/ckeditor/ckeditor_source.js R src/main/webapp/admin/ckeditor/config.js R src/main/webapp/admin/ckeditor/contents.css R src/main/webapp/admin/ckeditor/images/spacer.gif R src/main/webapp/admin/ckeditor/lang/_languages.js R src/main/webapp/admin/ckeditor/lang/_translationstatus.txt R src/main/webapp/admin/ckeditor/lang/af.js R src/main/webapp/admin/ckeditor/lang/ar.js R src/main/webapp/admin/ckeditor/lang/bg.js R src/main/webapp/admin/ckeditor/lang/bn.js R src/main/webapp/admin/ckeditor/lang/bs.js R src/main/webapp/admin/ckeditor/lang/ca.js R src/main/webapp/admin/ckeditor/lang/cs.js R src/main/webapp/admin/ckeditor/lang/cy.js R src/main/webapp/admin/ckeditor/lang/da.js R src/main/webapp/admin/ckeditor/lang/de.js R src/main/webapp/admin/ckeditor/lang/el.js R src/main/webapp/admin/ckeditor/lang/en-au.js R src/main/webapp/admin/ckeditor/lang/en-ca.js R src/main/webapp/admin/ckeditor/lang/en-gb.js R src/main/webapp/admin/ckeditor/lang/en.js R src/main/webapp/admin/ckeditor/lang/eo.js R src/main/webapp/admin/ckeditor/lang/es.js R src/main/webapp/admin/ckeditor/lang/et.js R src/main/webapp/admin/ckeditor/lang/eu.js R src/main/webapp/admin/ckeditor/lang/fa.js R src/main/webapp/admin/ckeditor/lang/fi.js R src/main/webapp/admin/ckeditor/lang/fo.js R src/main/webapp/admin/ckeditor/lang/fr-ca.js R src/main/webapp/admin/ckeditor/lang/fr.js R src/main/webapp/admin/ckeditor/lang/gl.js R src/main/webapp/admin/ckeditor/lang/gu.js R src/main/webapp/admin/ckeditor/lang/he.js R src/main/webapp/admin/ckeditor/lang/hi.js R src/main/webapp/admin/ckeditor/lang/hr.js R src/main/webapp/admin/ckeditor/lang/hu.js R src/main/webapp/admin/ckeditor/lang/is.js R src/main/webapp/admin/ckeditor/lang/it.js R src/main/webapp/admin/ckeditor/lang/ja.js R src/main/webapp/admin/ckeditor/lang/km.js R src/main/webapp/admin/ckeditor/lang/ko.js R src/main/webapp/admin/ckeditor/lang/lt.js R src/main/webapp/admin/ckeditor/lang/lv.js R src/main/webapp/admin/ckeditor/lang/mn.js R src/main/webapp/admin/ckeditor/lang/ms.js R src/main/webapp/admin/ckeditor/lang/nb.js R src/main/webapp/admin/ckeditor/lang/nl.js R src/main/webapp/admin/ckeditor/lang/no.js R src/main/webapp/admin/ckeditor/lang/pl.js R src/main/webapp/admin/ckeditor/lang/pt-br.js R src/main/webapp/admin/ckeditor/lang/pt.js R src/main/webapp/admin/ckeditor/lang/ro.js R src/main/webapp/admin/ckeditor/lang/ru.js R src/main/webapp/admin/ckeditor/lang/sk.js R src/main/webapp/admin/ckeditor/lang/sl.js R src/main/webapp/admin/ckeditor/lang/sr-latn.js R src/main/webapp/admin/ckeditor/lang/sr.js R src/main/webapp/admin/ckeditor/lang/sv.js R src/main/webapp/admin/ckeditor/lang/th.js R src/main/webapp/admin/ckeditor/lang/tr.js R src/main/webapp/admin/ckeditor/lang/uk.js R src/main/webapp/admin/ckeditor/lang/vi.js R src/main/webapp/admin/ckeditor/lang/zh-cn.js R src/main/webapp/admin/ckeditor/lang/zh.js R src/main/webapp/admin/ckeditor/plugins/a11yhelp/dialogs/a11yhelp.js R src/main/webapp/admin/ckeditor/plugins/a11yhelp/lang/en.js R src/main/webapp/admin/ckeditor/plugins/a11yhelp/lang/he.js R src/main/webapp/admin/ckeditor/plugins/about/dialogs/about.js R src/main/webapp/admin/ckeditor/plugins/about/dialogs/logo_ckeditor.png R src/main/webapp/admin/ckeditor/plugins/autogrow/plugin.js R src/main/webapp/admin/ckeditor/plugins/clipboard/dialogs/paste.js R src/main/webapp/admin/ckeditor/plugins/colordialog/dialogs/colordialog.js R src/main/webapp/admin/ckeditor/plugins/dialog/dialogDefinition.js R src/main/webapp/admin/ckeditor/plugins/div/dialogs/div.js R src/main/webapp/admin/ckeditor/plugins/find/dialogs/find.js R src/main/webapp/admin/ckeditor/plugins/flash/dialogs/flash.js R src/main/webapp/admin/ckeditor/plugins/flash/images/placeholder.png R src/main/webapp/admin/ckeditor/plugins/forms/dialogs/button.js R src/main/webapp/admin/ckeditor/plugins/forms/dialogs/checkbox.js R src/main/webapp/admin/ckeditor/plugins/forms/dialogs/form.js R src/main/webapp/admin/ckeditor/plugins/forms/dialogs/hiddenfield.js R src/main/webapp/admin/ckeditor/plugins/forms/dialogs/radio.js R src/main/webapp/admin/ckeditor/plugins/forms/dialogs/select.js R src/main/webapp/admin/ckeditor/plugins/forms/dialogs/textarea.js R src/main/webapp/admin/ckeditor/plugins/forms/dialogs/textfield.js R src/main/webapp/admin/ckeditor/plugins/forms/images/hiddenfield.gif R src/main/webapp/admin/ckeditor/plugins/iframedialog/plugin.js R src/main/webapp/admin/ckeditor/plugins/image/dialogs/image.js R src/main/webapp/admin/ckeditor/plugins/link/dialogs/anchor.js R src/main/webapp/admin/ckeditor/plugins/link/dialogs/link.js R src/main/webapp/admin/ckeditor/plugins/link/images/anchor.gif R src/main/webapp/admin/ckeditor/plugins/liststyle/dialogs/liststyle.js R src/main/webapp/admin/ckeditor/plugins/pagebreak/images/pagebreak.gif R src/main/webapp/admin/ckeditor/plugins/pastefromword/filter/default.js R src/main/webapp/admin/ckeditor/plugins/pastetext/dialogs/pastetext.js R src/main/webapp/admin/ckeditor/plugins/scayt/dialogs/options.js R src/main/webapp/admin/ckeditor/plugins/scayt/dialogs/toolbar.css R src/main/webapp/admin/ckeditor/plugins/showblocks/images/block_address.png R src/main/webapp/admin/ckeditor/plugins/showblocks/images/block_blockquote.png R src/main/webapp/admin/ckeditor/plugins/showblocks/images/block_div.png R src/main/webapp/admin/ckeditor/plugins/showblocks/images/block_h1.png R src/main/webapp/admin/ckeditor/plugins/showblocks/images/block_h2.png R src/main/webapp/admin/ckeditor/plugins/showblocks/images/block_h3.png R src/main/webapp/admin/ckeditor/plugins/showblocks/images/block_h4.png R src/main/webapp/admin/ckeditor/plugins/showblocks/images/block_h5.png R src/main/webapp/admin/ckeditor/plugins/showblocks/images/block_h6.png R src/main/webapp/admin/ckeditor/plugins/showblocks/images/block_p.png R src/main/webapp/admin/ckeditor/plugins/showblocks/images/block_pre.png R src/main/webapp/admin/ckeditor/plugins/smiley/dialogs/smiley.js R src/main/webapp/admin/ckeditor/plugins/smiley/images/angel_smile.gif R src/main/webapp/admin/ckeditor/plugins/smiley/images/angry_smile.gif R src/main/webapp/admin/ckeditor/plugins/smiley/images/broken_heart.gif R src/main/webapp/admin/ckeditor/plugins/smiley/images/confused_smile.gif R src/main/webapp/admin/ckeditor/plugins/smiley/images/cry_smile.gif R src/main/webapp/admin/ckeditor/plugins/smiley/images/devil_smile.gif R src/main/webapp/admin/ckeditor/plugins/smiley/images/embaressed_smile.gif R src/main/webapp/admin/ckeditor/plugins/smiley/images/envelope.gif R src/main/webapp/admin/ckeditor/plugins/smiley/images/heart.gif R src/main/webapp/admin/ckeditor/plugins/smiley/images/kiss.gif R src/main/webapp/admin/ckeditor/plugins/smiley/images/lightbulb.gif R src/main/webapp/admin/ckeditor/plugins/smiley/images/omg_smile.gif R src/main/webapp/admin/ckeditor/plugins/smiley/images/regular_smile.gif R src/main/webapp/admin/ckeditor/plugins/smiley/images/sad_smile.gif R src/main/webapp/admin/ckeditor/plugins/smiley/images/shades_smile.gif R src/main/webapp/admin/ckeditor/plugins/smiley/images/teeth_smile.gif R src/main/webapp/admin/ckeditor/plugins/smiley/images/thumbs_down.gif R src/main/webapp/admin/ckeditor/plugins/smiley/images/thumbs_up.gif R src/main/webapp/admin/ckeditor/plugins/smiley/images/tounge_smile.gif R src/main/webapp/admin/ckeditor/plugins/smiley/images/whatchutalkingabout_smile.gif R src/main/webapp/admin/ckeditor/plugins/smiley/images/wink_smile.gif R src/main/webapp/admin/ckeditor/plugins/specialchar/dialogs/specialchar.js R src/main/webapp/admin/ckeditor/plugins/styles/styles/default.js R src/main/webapp/admin/ckeditor/plugins/table/dialogs/table.js R src/main/webapp/admin/ckeditor/plugins/tableresize/plugin.js R src/main/webapp/admin/ckeditor/plugins/tabletools/dialogs/tableCell.js R src/main/webapp/admin/ckeditor/plugins/templates/dialogs/templates.js R src/main/webapp/admin/ckeditor/plugins/templates/templates/default.js R src/main/webapp/admin/ckeditor/plugins/templates/templates/images/template1.gif R src/main/webapp/admin/ckeditor/plugins/templates/templates/images/template2.gif R src/main/webapp/admin/ckeditor/plugins/templates/templates/images/template3.gif R src/main/webapp/admin/ckeditor/plugins/uicolor/dialogs/uicolor.js R src/main/webapp/admin/ckeditor/plugins/uicolor/lang/en.js R src/main/webapp/admin/ckeditor/plugins/uicolor/plugin.js R src/main/webapp/admin/ckeditor/plugins/uicolor/uicolor.gif R src/main/webapp/admin/ckeditor/plugins/uicolor/yui/assets/hue_bg.png R src/main/webapp/admin/ckeditor/plugins/uicolor/yui/assets/hue_thumb.png R src/main/webapp/admin/ckeditor/plugins/uicolor/yui/assets/picker_mask.png R src/main/webapp/admin/ckeditor/plugins/uicolor/yui/assets/picker_thumb.png R src/main/webapp/admin/ckeditor/plugins/uicolor/yui/assets/yui.css R src/main/webapp/admin/ckeditor/plugins/uicolor/yui/yui.js R src/main/webapp/admin/ckeditor/plugins/wsc/dialogs/ciframe.html R src/main/webapp/admin/ckeditor/plugins/wsc/dialogs/tmpFrameset.html R src/main/webapp/admin/ckeditor/plugins/wsc/dialogs/wsc.css R src/main/webapp/admin/ckeditor/plugins/wsc/dialogs/wsc.js R src/main/webapp/admin/ckeditor/skins/kama/dialog.css R src/main/webapp/admin/ckeditor/skins/kama/editor.css R src/main/webapp/admin/ckeditor/skins/kama/icons.png R src/main/webapp/admin/ckeditor/skins/kama/images/dialog_sides.gif R src/main/webapp/admin/ckeditor/skins/kama/images/dialog_sides.png R src/main/webapp/admin/ckeditor/skins/kama/images/dialog_sides_rtl.png R src/main/webapp/admin/ckeditor/skins/kama/images/mini.gif R src/main/webapp/admin/ckeditor/skins/kama/images/noimage.png R src/main/webapp/admin/ckeditor/skins/kama/images/sprites.png R src/main/webapp/admin/ckeditor/skins/kama/images/sprites_ie6.png R src/main/webapp/admin/ckeditor/skins/kama/images/toolbar_start.gif R src/main/webapp/admin/ckeditor/skins/kama/skin.js R src/main/webapp/admin/ckeditor/skins/kama/templates.css R src/main/webapp/admin/ckeditor/skins/office2003/dialog.css R src/main/webapp/admin/ckeditor/skins/office2003/editor.css R src/main/webapp/admin/ckeditor/skins/office2003/icons.png R src/main/webapp/admin/ckeditor/skins/office2003/images/dialog_sides.gif R src/main/webapp/admin/ckeditor/skins/office2003/images/dialog_sides.png R src/main/webapp/admin/ckeditor/skins/office2003/images/dialog_sides_rtl.png R src/main/webapp/admin/ckeditor/skins/office2003/images/mini.gif R src/main/webapp/admin/ckeditor/skins/office2003/images/noimage.png R src/main/webapp/admin/ckeditor/skins/office2003/images/sprites.png R src/main/webapp/admin/ckeditor/skins/office2003/images/sprites_ie6.png R src/main/webapp/admin/ckeditor/skins/office2003/skin.js R src/main/webapp/admin/ckeditor/skins/office2003/templates.css R src/main/webapp/admin/ckeditor/skins/v2/dialog.css R src/main/webapp/admin/ckeditor/skins/v2/editor.css R src/main/webapp/admin/ckeditor/skins/v2/icons.png R src/main/webapp/admin/ckeditor/skins/v2/images/dialog_sides.gif R src/main/webapp/admin/ckeditor/skins/v2/images/dialog_sides.png R src/main/webapp/admin/ckeditor/skins/v2/images/dialog_sides_rtl.png R src/main/webapp/admin/ckeditor/skins/v2/images/mini.gif R src/main/webapp/admin/ckeditor/skins/v2/images/noimage.png R src/main/webapp/admin/ckeditor/skins/v2/images/sprites.png R src/main/webapp/admin/ckeditor/skins/v2/images/sprites_ie6.png R src/main/webapp/admin/ckeditor/skins/v2/images/toolbar_start.gif R src/main/webapp/admin/ckeditor/skins/v2/skin.js R src/main/webapp/admin/ckeditor/skins/v2/templates.css R src/main/webapp/admin/ckeditor/themes/default/theme.js R src/main/webapp/admin/eventdetail.xhtml R src/main/webapp/admin/home.xhtml R src/main/webapp/admin/index.jsp R src/main/webapp/admin/layoutdetail.xhtml R src/main/webapp/admin/sectiondetail.xhtml R src/main/webapp/admin/venuedetail.xhtml R src/main/webapp/admin/venuelayouts.xhtml R src/main/webapp/admin/venues.xhtml R src/main/webapp/home.xhtml R src/main/webapp/index.jsp R src/main/webapp/style/admin.css R src/main/webapp/style/background.png R src/main/webapp/style/buytickets.png R src/main/webapp/style/curtains.png R src/main/webapp/style/default.css R src/main/webapp/style/menu_bg.png R src/main/webapp/style/menu_highlight.png R src/main/webapp/style/table_header.png R src/main/webapp/style/ticket.png R src/main/webapp/viewevent.xhtml R ticketmonster-ds.xml R usecases/UseCase Diagram0.asta R usecases/WebUserUseCases.png Log Message: ----------- Merge remote branch 'heiko/master'

14 years, 3 months

1
0
0 / 0

[pmuir/ticket-monster] 3a6bba: minor cleanup, add selected venue and date details

by noreply＠github.com

Branch: refs/heads/master Home: http://github.com/pmuir/ticket-monster Commit: 3a6bbaaa8bb9b12179894464393832bdde18a055 http://github.com/pmuir/ticket-monster/commit/3a6bbaaa8bb9b12179894464393... Author: Shane Bryzak <shane.bryzak(a)jboss.com> Date: 2010-09-11 (Sat, 11 Sep 2010) Changed paths: M src/main/webapp/viewevent.xhtml Log Message: ----------- minor cleanup, add selected venue and date details Commit: 032de0823d9b099e599935da78bdd08a57f3caa8 http://github.com/pmuir/ticket-monster/commit/032de0823d9b099e599935da78b... Author: Shane Bryzak <shane.bryzak(a)jboss.com> Date: 2010-09-11 (Sat, 11 Sep 2010) Changed paths: M src/main/java/org/jboss/seam/example/ticketmonster/action/EventDetail.java A src/main/java/org/jboss/seam/example/ticketmonster/dto/Availability.java M src/main/webapp/viewevent.xhtml Log Message: ----------- added availability dto Commit: 0ddaff59eaba2945f6317c3beeeeff83b084c68c http://github.com/pmuir/ticket-monster/commit/0ddaff59eaba2945f6317c3beee... Author: Shane Bryzak <shane.bryzak(a)jboss.com> Date: 2010-09-12 (Sun, 12 Sep 2010) Changed paths: M src/main/webapp/style/default.css M src/main/webapp/viewevent.xhtml Log Message: ----------- added availability key to ticket selection

14 years, 3 months

1
0
0 / 0

Seam SVN: r13739 - branches/enterprise/JBPAPP_5_0/src/test/ftest/src/main/org/jboss/seam/example/common/test/selenium.

by seam-commits＠lists.jboss.org

Author: jharting Date: 2010-09-13 08:34:42 -0400 (Mon, 13 Sep 2010) New Revision: 13739 Modified: branches/enterprise/JBPAPP_5_0/src/test/ftest/src/main/org/jboss/seam/example/common/test/selenium/SeamSelenium.java Log: Minor changes in functional tests. Modified: branches/enterprise/JBPAPP_5_0/src/test/ftest/src/main/org/jboss/seam/example/common/test/selenium/SeamSelenium.java =================================================================== --- branches/enterprise/JBPAPP_5_0/src/test/ftest/src/main/org/jboss/seam/example/common/test/selenium/SeamSelenium.java 2010-09-13 10:43:33 UTC (rev 13738) +++ branches/enterprise/JBPAPP_5_0/src/test/ftest/src/main/org/jboss/seam/example/common/test/selenium/SeamSelenium.java 2010-09-13 12:34:42 UTC (rev 13739) @@ -302,30 +302,28 @@ @Override public void open(String url) { - if (suppressSeleniumTimeoutException) - { try { super.open(url); } catch (SeleniumException e) { - if (isTimeoutException(e)) + if (suppressSeleniumTimeoutException && isTimeoutException(e)) { // NOOP // THIS IS A WORKAROUND FOR IE BEHAVIOR // SEE JBPAPP-4036 } + else if (is404(e)) + { + // since 1.0.3 Selenium throws SeleniumException when a server returns 404 + // we suppress this behavior in order to retain backward compatibility + } else { throw e; } } - } - else - { - super.open(url); - } } private boolean isTimeoutException(SeleniumException e) @@ -333,6 +331,11 @@ return e.getMessage().contains("Timed out"); } + private boolean is404(SeleniumException e) + { + return e.getMessage().contains("Response_Code = 404 Error_Message = Not Found"); + } + public boolean isSuppressSeleniumTimeoutException() { return suppressSeleniumTimeoutException; @@ -342,18 +345,4 @@ { this.suppressSeleniumTimeoutException = suppressSeleniumTimeoutException; } - - @Override - public void open(String url) - { - try - { - super.open(url); - } - catch (SeleniumException e) - { - // since 1.0.3 Selenium throws SeleniumException when a server returns 404 - // we suppress this behavior in order to retain backward compatibility - } - } }

14 years, 3 months

1
0
0 / 0

Seam SVN: r13738 - modules/drools/trunk/impl/src/main/java/org/jboss/seam/drools.

by seam-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2010-09-13 06:43:33 -0400 (Mon, 13 Sep 2010) New Revision: 13738 Modified: modules/drools/trunk/impl/src/main/java/org/jboss/seam/drools/SessionReportProducer.java Log: fix deployment issue Modified: modules/drools/trunk/impl/src/main/java/org/jboss/seam/drools/SessionReportProducer.java =================================================================== --- modules/drools/trunk/impl/src/main/java/org/jboss/seam/drools/SessionReportProducer.java 2010-09-13 04:32:37 UTC (rev 13737) +++ modules/drools/trunk/impl/src/main/java/org/jboss/seam/drools/SessionReportProducer.java 2010-09-13 10:43:33 UTC (rev 13738) @@ -21,6 +21,8 @@ */ package org.jboss.seam.drools; +import java.io.Serializable; + import javax.enterprise.context.SessionScoped; import javax.enterprise.inject.Default; import javax.enterprise.inject.Produces; @@ -41,7 +43,7 @@ * @author Tihomir Surdilovic */ @SessionScoped -public class SessionReportProducer +public class SessionReportProducer implements Serializable { private static final Logger log = LoggerFactory.getLogger(SessionReportProducer.class);

14 years, 3 months

1
0
0 / 0

Seam SVN: r13737 - in modules/drools/trunk: impl/src/main/java/org/jboss/seam/drools and 4 other directories.

by seam-commits＠lists.jboss.org

Author: tsurdilovic Date: 2010-09-13 00:32:37 -0400 (Mon, 13 Sep 2010) New Revision: 13737 Added: modules/drools/trunk/impl/src/main/java/org/jboss/seam/drools/SessionReportWrapper.java modules/drools/trunk/impl/src/test/java/org/jboss/seam/drools/test/sessionreport/ modules/drools/trunk/impl/src/test/java/org/jboss/seam/drools/test/sessionreport/Cheese.java modules/drools/trunk/impl/src/test/java/org/jboss/seam/drools/test/sessionreport/SessionReportTest.java modules/drools/trunk/impl/src/test/resources/org/jboss/seam/drools/test/sessionreport/ modules/drools/trunk/impl/src/test/resources/org/jboss/seam/drools/test/sessionreport/SessionReportTest-beans.xml modules/drools/trunk/impl/src/test/resources/org/jboss/seam/drools/test/sessionreport/sessionreporttest.drl Modified: modules/drools/trunk/api/src/main/java/org/jboss/seam/drools/qualifiers/SessionReport.java modules/drools/trunk/impl/src/main/java/org/jboss/seam/drools/SessionReportProducer.java Log: SEAMDROOLS-6 - Add support for session inspector to generate reports Modified: modules/drools/trunk/api/src/main/java/org/jboss/seam/drools/qualifiers/SessionReport.java =================================================================== --- modules/drools/trunk/api/src/main/java/org/jboss/seam/drools/qualifiers/SessionReport.java 2010-09-12 16:15:25 UTC (rev 13736) +++ modules/drools/trunk/api/src/main/java/org/jboss/seam/drools/qualifiers/SessionReport.java 2010-09-13 04:32:37 UTC (rev 13737) @@ -47,5 +47,8 @@ public @interface SessionReport { @Nonbinding - String value() default ""; + String name() default ""; + + @Nonbinding + String template() default ""; } Modified: modules/drools/trunk/impl/src/main/java/org/jboss/seam/drools/SessionReportProducer.java =================================================================== --- modules/drools/trunk/impl/src/main/java/org/jboss/seam/drools/SessionReportProducer.java 2010-09-12 16:15:25 UTC (rev 13736) +++ modules/drools/trunk/impl/src/main/java/org/jboss/seam/drools/SessionReportProducer.java 2010-09-13 04:32:37 UTC (rev 13737) @@ -22,10 +22,20 @@ package org.jboss.seam.drools; import javax.enterprise.context.SessionScoped; +import javax.enterprise.inject.Default; +import javax.enterprise.inject.Produces; +import javax.enterprise.inject.spi.InjectionPoint; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.drools.core.util.debug.SessionInspector; +import org.drools.core.util.debug.SessionReporter; +import org.drools.core.util.debug.StatefulKnowledgeSessionInfo; +import org.drools.runtime.StatefulKnowledgeSession; +import org.jboss.seam.drools.qualifiers.Scanned; +import org.jboss.seam.drools.qualifiers.SessionReport; + /** * * @author Tihomir Surdilovic @@ -35,4 +45,35 @@ { private static final Logger log = LoggerFactory.getLogger(SessionReportProducer.class); + @Produces + @Default + @SessionReport + public SessionReportWrapper produceSessionReport(StatefulKnowledgeSession ksession, InjectionPoint ip) { + return generate(ksession, ip.getAnnotated().getAnnotation(SessionReport.class).name(), ip.getAnnotated().getAnnotation(SessionReport.class).template()); + } + + @Produces + @Scanned + @SessionReport + public SessionReportWrapper produceScannedSessionReport(@Scanned StatefulKnowledgeSession ksession, InjectionPoint ip) { + return generate(ksession, ip.getAnnotated().getAnnotation(SessionReport.class).name(), ip.getAnnotated().getAnnotation(SessionReport.class).template()); + } + + private SessionReportWrapper generate(StatefulKnowledgeSession ksession, String name, String template) { + if(name == null) + { + name = "simple"; + } + SessionInspector inspector = new SessionInspector( ksession ); + StatefulKnowledgeSessionInfo info = inspector.getSessionInfo(); + if(template != null) + { + SessionReporter.addNamedTemplate( name, getClass().getResourceAsStream( template ) ); + } + + SessionReportWrapper sessionReportWrapper = new SessionReportWrapper(); + sessionReportWrapper.setReport(SessionReporter.generateReport( name, info, null )); + return sessionReportWrapper; + } + } Added: modules/drools/trunk/impl/src/main/java/org/jboss/seam/drools/SessionReportWrapper.java =================================================================== --- modules/drools/trunk/impl/src/main/java/org/jboss/seam/drools/SessionReportWrapper.java (rev 0) +++ modules/drools/trunk/impl/src/main/java/org/jboss/seam/drools/SessionReportWrapper.java 2010-09-13 04:32:37 UTC (rev 13737) @@ -0,0 +1,16 @@ +package org.jboss.seam.drools; + +public class SessionReportWrapper +{ + private String report; + + public String getReport() + { + return report; + } + + public void setReport(String report) + { + this.report = report; + } +} Property changes on: modules/drools/trunk/impl/src/main/java/org/jboss/seam/drools/SessionReportWrapper.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: modules/drools/trunk/impl/src/test/java/org/jboss/seam/drools/test/sessionreport/Cheese.java =================================================================== --- modules/drools/trunk/impl/src/test/java/org/jboss/seam/drools/test/sessionreport/Cheese.java (rev 0) +++ modules/drools/trunk/impl/src/test/java/org/jboss/seam/drools/test/sessionreport/Cheese.java 2010-09-13 04:32:37 UTC (rev 13737) @@ -0,0 +1,43 @@ +package org.jboss.seam.drools.test.sessionreport; + +public class Cheese +{ + private String type; + private int price; + + public Cheese(String type, int price) { + this.type = type; + this.price = price; + } + + public String getType() + { + return type; + } + public void setType(String type) + { + this.type = type; + } + public int getPrice() + { + return price; + } + public void setPrice(int price) + { + this.price = price; + } + + public boolean equals(Object obj) { + if ( this == obj ) return true; + if ( obj == null ) return false; + if ( getClass() != obj.getClass() ) return false; + final Cheese other = (Cheese) obj; + if ( price != other.price ) return false; + if ( type == null ) { + if ( other.type != null ) return false; + } else if ( !type.equals( other.type ) ) return false; + return true; + } + + +} Property changes on: modules/drools/trunk/impl/src/test/java/org/jboss/seam/drools/test/sessionreport/Cheese.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: modules/drools/trunk/impl/src/test/java/org/jboss/seam/drools/test/sessionreport/SessionReportTest.java =================================================================== --- modules/drools/trunk/impl/src/test/java/org/jboss/seam/drools/test/sessionreport/SessionReportTest.java (rev 0) +++ modules/drools/trunk/impl/src/test/java/org/jboss/seam/drools/test/sessionreport/SessionReportTest.java 2010-09-13 04:32:37 UTC (rev 13737) @@ -0,0 +1,109 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2010, Red Hat, Inc., and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.seam.drools.test.sessionreport; + +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.assertSame; +import static org.junit.Assert.assertNotSame; + +import javax.enterprise.inject.Default; +import javax.inject.Inject; + +import org.drools.runtime.StatefulKnowledgeSession; +import org.jboss.arquillian.api.Deployment; +import org.jboss.arquillian.junit.Arquillian; +import org.jboss.seam.drools.KnowledgeBaseProducer; +import org.jboss.seam.drools.SessionReportWrapper; +import org.jboss.seam.drools.qualifiers.SessionReport; +import org.jboss.seam.drools.qualifiers.config.DefaultConfig; +import org.jboss.seam.drools.test.DroolsModuleFilter; +import org.jboss.seam.drools.test.query.QueryTest; +import org.jboss.shrinkwrap.api.ArchivePaths; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.weld.extensions.resourceLoader.ResourceProvider; +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; + +(a)RunWith(Arquillian.class) +public class SessionReportTest +{ + @Deployment + public static JavaArchive createTestArchive() + { + String pkgPath = QueryTest.class.getPackage().getName().replaceAll("\\.", "/"); + JavaArchive archive = ShrinkWrap.create("test.jar", JavaArchive.class) + .addPackages(true, new DroolsModuleFilter("sessionreport"), KnowledgeBaseProducer.class.getPackage()) + .addPackages(true, ResourceProvider.class.getPackage()) + .addClass(Cheese.class) + .addResource(pkgPath + "/sessionreporttest.drl", ArchivePaths.create("sessionreporttest.drl")) + //.addResource(pkgPath + "/kbuilderconfig.properties", ArchivePaths.create("kbuilderconfig.properties")) + //.addResource(pkgPath + "/kbaseconfig.properties", ArchivePaths.create("kbaseconfig.properties")) + .addManifestResource(pkgPath + "/SessionReportTest-beans.xml", ArchivePaths.create("beans.xml")); + //System.out.println(archive.toString(Formatters.VERBOSE)); + return archive; + } + + @Inject @Default @DefaultConfig StatefulKnowledgeSession ksession; + + @Before + public void setupKSession() { + assertNotNull(ksession); + Cheese c1 = new Cheese("stillton", 10); + Cheese c2 = new Cheese("stillton", 2); + Cheese c3 = new Cheese("stillton", 4); + Cheese c4 = new Cheese("stillton", 44); + Cheese c5 = new Cheese("stillton", 23); + Cheese c6 = new Cheese("stillton", 1); + Cheese c7 = new Cheese("stillton", 7); + Cheese c8 = new Cheese("stillton", 4); + Cheese c9 = new Cheese("mozarella", 77); + Cheese c10 = new Cheese("mozarella", 53); + Cheese c11 = new Cheese("mozarella", 31); + Cheese c12 = new Cheese("mozarella", 7); + Cheese c13 = new Cheese("mozarella", 3); + + ksession.insert(c1); + ksession.insert(c2); + ksession.insert(c3); + ksession.insert(c4); + ksession.insert(c5); + ksession.insert(c6); + ksession.insert(c7); + ksession.insert(c8); + ksession.insert(c9); + ksession.insert(c10); + ksession.insert(c11); + ksession.insert(c12); + ksession.insert(c13); + + ksession.fireAllRules(); + } + + @Test + public void testGeneratedReport(@Default @DefaultConfig @SessionReport SessionReportWrapper wrapper) { + assertNotNull(wrapper); + assertNotNull(wrapper.getReport()); + } +} Property changes on: modules/drools/trunk/impl/src/test/java/org/jboss/seam/drools/test/sessionreport/SessionReportTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: modules/drools/trunk/impl/src/test/resources/org/jboss/seam/drools/test/sessionreport/SessionReportTest-beans.xml =================================================================== --- modules/drools/trunk/impl/src/test/resources/org/jboss/seam/drools/test/sessionreport/SessionReportTest-beans.xml (rev 0) +++ modules/drools/trunk/impl/src/test/resources/org/jboss/seam/drools/test/sessionreport/SessionReportTest-beans.xml 2010-09-13 04:32:37 UTC (rev 13737) @@ -0,0 +1,35 @@ + +<beans xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:s="urn:java:ee" + xmlns:d="urn:java:org.jboss.seam.drools:org.jboss.seam.drools.config" + xmlns:test="urn:java:org.jboss.seam.drools.test.ksession"> + + <d:DefaultRuleResources> + <s:modifies/> + <s:Exact>org.jboss.seam.drools.config.DefaultRuleResources</s:Exact> + <d:resources> + <s:value>classpath;sessionreporttest.drl;DRL</s:value> + </d:resources> + </d:DefaultRuleResources> + +</beans> Property changes on: modules/drools/trunk/impl/src/test/resources/org/jboss/seam/drools/test/sessionreport/SessionReportTest-beans.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Added: modules/drools/trunk/impl/src/test/resources/org/jboss/seam/drools/test/sessionreport/sessionreporttest.drl =================================================================== --- modules/drools/trunk/impl/src/test/resources/org/jboss/seam/drools/test/sessionreport/sessionreporttest.drl (rev 0) +++ modules/drools/trunk/impl/src/test/resources/org/jboss/seam/drools/test/sessionreport/sessionreporttest.drl 2010-09-13 04:32:37 UTC (rev 13737) @@ -0,0 +1,10 @@ +package org.jboss.seam.drools.test.sessionreport + +import org.jboss.seam.drools.test.sessionreport.Cheese; + +rule stilltonCheeses + when + $c : Cheese( type == "stillton" ) + then + System.out.println($c.getPrice()); +end

14 years, 3 months

1
0
0 / 0

Seam SVN: r13736 - in modules/drools/trunk: api and 9 other directories.

by seam-commits＠lists.jboss.org

Author: tsurdilovic Date: 2010-09-12 12:15:25 -0400 (Sun, 12 Sep 2010) New Revision: 13736 Added: modules/drools/trunk/api/src/main/java/org/jboss/seam/drools/qualifiers/Channel.java modules/drools/trunk/api/src/main/java/org/jboss/seam/drools/qualifiers/SessionReport.java modules/drools/trunk/impl/src/main/java/org/jboss/seam/drools/SessionReportProducer.java modules/drools/trunk/impl/src/test/java/org/jboss/seam/drools/test/channel/ modules/drools/trunk/impl/src/test/java/org/jboss/seam/drools/test/channel/ChannelBean.java modules/drools/trunk/impl/src/test/java/org/jboss/seam/drools/test/channel/ChannelTest.java modules/drools/trunk/impl/src/test/java/org/jboss/seam/drools/test/channel/Person.java modules/drools/trunk/impl/src/test/resources/org/jboss/seam/drools/test/channel/ modules/drools/trunk/impl/src/test/resources/org/jboss/seam/drools/test/channel/ChannelTest-beans.xml modules/drools/trunk/impl/src/test/resources/org/jboss/seam/drools/test/channel/channeltest.drl Modified: modules/drools/trunk/api/pom.xml modules/drools/trunk/api/src/main/java/org/jboss/seam/drools/qualifiers/Query.java modules/drools/trunk/impl/pom.xml modules/drools/trunk/impl/src/main/java/org/jboss/seam/drools/KnowledgeSessionProducer.java modules/drools/trunk/impl/src/main/java/org/jboss/seam/drools/StatefulKnowledgeSessionWrapper.java modules/drools/trunk/impl/src/main/java/org/jboss/seam/drools/bootstrap/DroolsExtension.java modules/drools/trunk/impl/src/test/java/org/jboss/seam/drools/test/customoperator/CustomOperatorTest.java modules/drools/trunk/pom.xml Log: SEAMDROOLS-7 - Add support for Channel registration and integration Modified: modules/drools/trunk/api/pom.xml =================================================================== --- modules/drools/trunk/api/pom.xml 2010-09-11 05:48:19 UTC (rev 13735) +++ modules/drools/trunk/api/pom.xml 2010-09-12 16:15:25 UTC (rev 13736) @@ -36,30 +36,37 @@ <dependency> <groupId>org.drools</groupId> <artifactId>drools-core</artifactId> + <version>${drools.version}</version> </dependency> <dependency> <groupId>org.drools</groupId> <artifactId>drools-compiler</artifactId> + <version>${drools.version}</version> </dependency> <dependency> <groupId>org.drools</groupId> <artifactId>drools-api</artifactId> + <version>${drools.version}</version> </dependency> <dependency> <groupId>org.drools</groupId> <artifactId>drools-templates</artifactId> + <version>${drools.version}</version> </dependency> <dependency> <groupId>org.drools</groupId> <artifactId>drools-decisiontables</artifactId> + <version>${drools.version}</version> </dependency> <dependency> <groupId>org.drools</groupId> <artifactId>drools-workitems</artifactId> + <version>${drools.version}</version> </dependency> <dependency> <groupId>org.drools</groupId> - <artifactId>drools-transformer-xstream</artifactId> + <artifactId>drools-pipeline</artifactId> + <version>${drools.version}</version> </dependency> <dependency> <groupId>org.jboss.weld</groupId> Added: modules/drools/trunk/api/src/main/java/org/jboss/seam/drools/qualifiers/Channel.java =================================================================== --- modules/drools/trunk/api/src/main/java/org/jboss/seam/drools/qualifiers/Channel.java (rev 0) +++ modules/drools/trunk/api/src/main/java/org/jboss/seam/drools/qualifiers/Channel.java 2010-09-12 16:15:25 UTC (rev 13736) @@ -0,0 +1,50 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright ${year}, Red Hat, Inc., and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.seam.drools.qualifiers; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.PARAMETER; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Documented; +import java.lang.annotation.Inherited; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import javax.enterprise.util.Nonbinding; +import javax.inject.Qualifier; + +/** + * + * @author Tihomir Surdilovic + */ +@Qualifier +@Target( { TYPE, METHOD, FIELD, PARAMETER }) +@Documented +@Retention(RUNTIME) +@Inherited +public @interface Channel +{ + @Nonbinding String value() default ""; +} Property changes on: modules/drools/trunk/api/src/main/java/org/jboss/seam/drools/qualifiers/Channel.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: modules/drools/trunk/api/src/main/java/org/jboss/seam/drools/qualifiers/Query.java =================================================================== --- modules/drools/trunk/api/src/main/java/org/jboss/seam/drools/qualifiers/Query.java 2010-09-11 05:48:19 UTC (rev 13735) +++ modules/drools/trunk/api/src/main/java/org/jboss/seam/drools/qualifiers/Query.java 2010-09-12 16:15:25 UTC (rev 13736) @@ -18,7 +18,7 @@ * License along with this software; if not, write to the Free * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ + */ package org.jboss.seam.drools.qualifiers; import static java.lang.annotation.ElementType.FIELD; @@ -40,10 +40,12 @@ * @author Tihomir Surdilovic */ @Qualifier -@Target( { TYPE, METHOD, FIELD, PARAMETER }) +@Target({ TYPE, METHOD, FIELD, PARAMETER }) @Documented @Retention(RUNTIME) @Inherited -public @interface Query { - @Nonbinding String value() default ""; +public @interface Query +{ + @Nonbinding + String value() default ""; } Added: modules/drools/trunk/api/src/main/java/org/jboss/seam/drools/qualifiers/SessionReport.java =================================================================== --- modules/drools/trunk/api/src/main/java/org/jboss/seam/drools/qualifiers/SessionReport.java (rev 0) +++ modules/drools/trunk/api/src/main/java/org/jboss/seam/drools/qualifiers/SessionReport.java 2010-09-12 16:15:25 UTC (rev 13736) @@ -0,0 +1,51 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright ${year}, Red Hat, Inc., and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.seam.drools.qualifiers; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.PARAMETER; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Documented; +import java.lang.annotation.Inherited; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import javax.enterprise.util.Nonbinding; +import javax.inject.Qualifier; + +/** + * + * @author Tihomir Surdilovic + */ +@Qualifier +@Target({ TYPE, METHOD, FIELD, PARAMETER }) +@Documented +@Retention(RUNTIME) +@Inherited +public @interface SessionReport +{ + @Nonbinding + String value() default ""; +} Property changes on: modules/drools/trunk/api/src/main/java/org/jboss/seam/drools/qualifiers/SessionReport.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: modules/drools/trunk/impl/pom.xml =================================================================== --- modules/drools/trunk/impl/pom.xml 2010-09-11 05:48:19 UTC (rev 13735) +++ modules/drools/trunk/impl/pom.xml 2010-09-12 16:15:25 UTC (rev 13736) @@ -40,26 +40,32 @@ <dependency> <groupId>org.drools</groupId> <artifactId>drools-core</artifactId> + <version>${drools.version}</version> </dependency> <dependency> <groupId>org.drools</groupId> <artifactId>drools-compiler</artifactId> + <version>${drools.version}</version> </dependency> <dependency> <groupId>org.drools</groupId> <artifactId>drools-api</artifactId> + <version>${drools.version}</version> </dependency> <dependency> <groupId>org.drools</groupId> <artifactId>drools-templates</artifactId> + <version>${drools.version}</version> </dependency> <dependency> <groupId>org.drools</groupId> <artifactId>drools-decisiontables</artifactId> + <version>${drools.version}</version> </dependency> <dependency> <groupId>org.drools</groupId> <artifactId>drools-workitems</artifactId> + <version>${drools.version}</version> </dependency> <dependency> <groupId>org.jboss.weld</groupId> Modified: modules/drools/trunk/impl/src/main/java/org/jboss/seam/drools/KnowledgeSessionProducer.java =================================================================== --- modules/drools/trunk/impl/src/main/java/org/jboss/seam/drools/KnowledgeSessionProducer.java 2010-09-11 05:48:19 UTC (rev 13735) +++ modules/drools/trunk/impl/src/main/java/org/jboss/seam/drools/KnowledgeSessionProducer.java 2010-09-12 16:15:25 UTC (rev 13736) @@ -28,7 +28,6 @@ import javax.enterprise.context.RequestScoped; import javax.enterprise.context.SessionScoped; import javax.enterprise.inject.Disposes; -import javax.enterprise.inject.New; import javax.enterprise.inject.Produces; import javax.enterprise.inject.spi.BeanManager; import javax.inject.Inject; @@ -67,7 +66,7 @@ @Inject SeamDelegate delegate; - + @Produces @RequestScoped public StatefulKnowledgeSession produceStatefulSession(KnowledgeBase kbase,DroolsConfig config) throws Exception @@ -79,6 +78,7 @@ addEventListeners(ksession); addWorkItemHandlers(ksession); addFactProviders(ksession); + addChannels(ksession); return ksession; } @@ -95,6 +95,7 @@ addEventListeners(ksession); addWorkItemHandlers(ksession); addFactProviders(ksession); + addChannels(ksession); return ksession; } @@ -179,6 +180,15 @@ } } + private void addChannels(StatefulKnowledgeSession ksession) { + Iterator<String> iter = droolsExtension.getChannels().keySet().iterator(); + while(iter.hasNext()) + { + String channelName = iter.next(); + ksession.registerChannel(channelName, droolsExtension.getChannels().get(channelName)); + } + } + private void addFactProviders(StatefulKnowledgeSession ksession) { Iterator<FactProvider> iter = droolsExtension.getFactProviderSet().iterator(); while(iter.hasNext()) Added: modules/drools/trunk/impl/src/main/java/org/jboss/seam/drools/SessionReportProducer.java =================================================================== --- modules/drools/trunk/impl/src/main/java/org/jboss/seam/drools/SessionReportProducer.java (rev 0) +++ modules/drools/trunk/impl/src/main/java/org/jboss/seam/drools/SessionReportProducer.java 2010-09-12 16:15:25 UTC (rev 13736) @@ -0,0 +1,38 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright ${year}, Red Hat, Inc., and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.seam.drools; + +import javax.enterprise.context.SessionScoped; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +/** + * + * @author Tihomir Surdilovic + */ +@SessionScoped +public class SessionReportProducer +{ + private static final Logger log = LoggerFactory.getLogger(SessionReportProducer.class); + +} Property changes on: modules/drools/trunk/impl/src/main/java/org/jboss/seam/drools/SessionReportProducer.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: modules/drools/trunk/impl/src/main/java/org/jboss/seam/drools/StatefulKnowledgeSessionWrapper.java =================================================================== --- modules/drools/trunk/impl/src/main/java/org/jboss/seam/drools/StatefulKnowledgeSessionWrapper.java 2010-09-11 05:48:19 UTC (rev 13735) +++ modules/drools/trunk/impl/src/main/java/org/jboss/seam/drools/StatefulKnowledgeSessionWrapper.java 2010-09-12 16:15:25 UTC (rev 13736) @@ -39,6 +39,8 @@ import org.drools.marshalling.MarshallerFactory; import org.drools.marshalling.ObjectMarshallingStrategy; import org.drools.marshalling.ObjectMarshallingStrategyAcceptor; +import org.drools.runtime.Calendars; +import org.drools.runtime.Channel; import org.drools.runtime.Environment; import org.drools.runtime.ExecutionResults; import org.drools.runtime.ExitPoint; @@ -50,7 +52,9 @@ import org.drools.runtime.rule.Agenda; import org.drools.runtime.rule.AgendaFilter; import org.drools.runtime.rule.FactHandle; +import org.drools.runtime.rule.LiveQuery; import org.drools.runtime.rule.QueryResults; +import org.drools.runtime.rule.ViewChangedEventListener; import org.drools.runtime.rule.WorkingMemoryEntryPoint; import org.drools.time.SessionClock; @@ -281,7 +285,7 @@ @SuppressWarnings("unchecked") public ExecutionResults execute(Command command) { - return ksession.execute(command); + return (ExecutionResults) ksession.execute(command); } public void addEventListener(AgendaEventListener listener) @@ -333,7 +337,50 @@ { return ksession.getWorkingMemoryEntryPoint(name); } + + + public Calendars getCalendars() + { + return ksession.getCalendars(); + } + + public Map<String, Channel> getChannels() + { + return ksession.getChannels(); + } + + public void registerChannel(String arg0, Channel arg1) + { + ksession.registerChannel(arg0, arg1); + + } + + public void unregisterChannel(String arg0) + { + ksession.unregisterChannel(arg0); + } + + public void signalEvent(String arg0, Object arg1, long arg2) + { + ksession.signalEvent(arg0, arg1, arg2); + } + + public LiveQuery openLiveQuery(String arg0, Object[] arg1, ViewChangedEventListener arg2) + { + return ksession.openLiveQuery(arg0, arg1, arg2); + } + + public String getEntryPointId() + { + return ksession.getEntryPointId(); + } + + public long getFactCount() + { + return ksession.getFactCount(); + } + public Collection<? extends WorkingMemoryEntryPoint> getWorkingMemoryEntryPoints() { return ksession.getWorkingMemoryEntryPoints(); Modified: modules/drools/trunk/impl/src/main/java/org/jboss/seam/drools/bootstrap/DroolsExtension.java =================================================================== --- modules/drools/trunk/impl/src/main/java/org/jboss/seam/drools/bootstrap/DroolsExtension.java 2010-09-11 05:48:19 UTC (rev 13735) +++ modules/drools/trunk/impl/src/main/java/org/jboss/seam/drools/bootstrap/DroolsExtension.java 2010-09-12 16:15:25 UTC (rev 13736) @@ -36,6 +36,7 @@ import javax.enterprise.inject.spi.Extension; import javax.enterprise.util.AnnotationLiteral; +import org.drools.runtime.Channel; import org.drools.base.evaluators.EvaluatorDefinition; import org.drools.event.knowledgebase.KnowledgeBaseEventListener; import org.drools.runtime.process.WorkItemHandler; @@ -58,6 +59,7 @@ private Map<String, TemplateDataProvider> templateDataProviders = new HashMap<String, TemplateDataProvider>(); private Set<FactProvider> factProviderSet = new HashSet<FactProvider>(); private Map<String, EvaluatorDefinition> evaluatorDefinitions = new HashMap<String, EvaluatorDefinition>(); + private Map<String, Channel> channels = new HashMap<String, Channel>(); @SuppressWarnings("serial") void afterBeanDiscovery(@Observes AfterBeanDiscovery abd, BeanManager bm) { @@ -130,7 +132,28 @@ } log.info("End creating [" + ( allEvaluatorDefinitions== null ? 0 : allEvaluatorDefinitions.size())+ "] evaluator definitions"); + // Channels + log.info("Start creating channel definitions"); + Set<Bean<?>> allChannels = bm.getBeans(org.drools.runtime.Channel.class, new AnnotationLiteral<Any>(){}); + if(allChannels != null) { + Iterator<Bean<?>> iter = allChannels.iterator(); + while (iter.hasNext()) + { + Bean<?> channel = iter.next(); + org.jboss.seam.drools.qualifiers.Channel evaluatorAnnotation = channel.getBeanClass().getAnnotation(org.jboss.seam.drools.qualifiers.Channel.class); + String channelName = evaluatorAnnotation.value(); + if(channelName.length() > 0) { + CreationalContext<?> context = bm.createCreationalContext(channel); + org.drools.runtime.Channel channelInstance = (org.drools.runtime.Channel) bm.getReference(channel, org.drools.runtime.Channel.class, context); + channels.put(channelName, channelInstance); + } else { + throw new IllegalStateException("Channel name cannot be empty in class: " + channel.getBeanClass().getName()); + } + } + } + log.info("End creating [" + ( allChannels== null ? 0 : allChannels.size())+ "] channel definitions"); + //Template Data Providers log.info("Start creating template providers"); Set<Bean<?>> allTemplateProviders = bm.getBeans(TemplateDataProvider.class, new AnnotationLiteral<Any>(){}); @@ -194,5 +217,15 @@ public Map<String, EvaluatorDefinition> getEvaluatorDefinitions() { return evaluatorDefinitions; + } + + public static Logger getLog() + { + return log; + } + + public Map<String, Channel> getChannels() + { + return channels; } } Added: modules/drools/trunk/impl/src/test/java/org/jboss/seam/drools/test/channel/ChannelBean.java =================================================================== --- modules/drools/trunk/impl/src/test/java/org/jboss/seam/drools/test/channel/ChannelBean.java (rev 0) +++ modules/drools/trunk/impl/src/test/java/org/jboss/seam/drools/test/channel/ChannelBean.java 2010-09-12 16:15:25 UTC (rev 13736) @@ -0,0 +1,37 @@ +package org.jboss.seam.drools.test.channel; + +import java.util.ArrayList; +import java.util.List; + +import org.jboss.seam.drools.qualifiers.Channel; + +@Channel("testChannel") +public class ChannelBean implements org.drools.runtime.Channel +{ + private int numOfSentObjects = 0; + private List<Person> eligiblesList = new ArrayList<Person>(); + private List<Person> notEligiblesList = new ArrayList<Person>(); + + public void send(Object personObject) + { + Person p = (Person) personObject; + if(p.isEligible()) { + eligiblesList.add(p); + } else { + notEligiblesList.add(p); + } + numOfSentObjects++; + } + + public int getNumOfSentObjects() { + return numOfSentObjects; + } + + public List<Person> getEligiblesList() { + return eligiblesList; + } + + public List<Person> getNotEligiblesList() { + return notEligiblesList; + } +} Property changes on: modules/drools/trunk/impl/src/test/java/org/jboss/seam/drools/test/channel/ChannelBean.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: modules/drools/trunk/impl/src/test/java/org/jboss/seam/drools/test/channel/ChannelTest.java =================================================================== --- modules/drools/trunk/impl/src/test/java/org/jboss/seam/drools/test/channel/ChannelTest.java (rev 0) +++ modules/drools/trunk/impl/src/test/java/org/jboss/seam/drools/test/channel/ChannelTest.java 2010-09-12 16:15:25 UTC (rev 13736) @@ -0,0 +1,117 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2010, Red Hat, Inc., and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.seam.drools.test.channel; + +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; + +import javax.enterprise.inject.Default; +import javax.inject.Inject; + +import org.drools.runtime.StatefulKnowledgeSession; +import org.jboss.arquillian.api.Deployment; +import org.jboss.arquillian.junit.Arquillian; +import org.jboss.seam.drools.KnowledgeBaseProducer; +import org.jboss.seam.drools.qualifiers.config.DefaultConfig; +import org.jboss.seam.drools.test.DroolsModuleFilter; +import org.jboss.shrinkwrap.api.ArchivePaths; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.weld.extensions.resourceLoader.ResourceProvider; +import org.junit.Test; +import org.junit.runner.RunWith; + +(a)RunWith(Arquillian.class) +public class ChannelTest +{ + @Deployment + public static JavaArchive createTestArchive() + { + String pkgPath = ChannelTest.class.getPackage().getName().replaceAll("\\.", "/"); + JavaArchive archive = ShrinkWrap.create("test.jar", JavaArchive.class) + .addPackages(true, new DroolsModuleFilter("channel"), KnowledgeBaseProducer.class.getPackage()) + .addPackages(true, ResourceProvider.class.getPackage()) + .addClass(ChannelBean.class) + .addClass(Person.class) + .addResource(pkgPath + "/channeltest.drl", ArchivePaths.create("channeltest.drl")) + // .addResource(pkgPath + "/kbuilderconfig.properties", + // ArchivePaths.create("kbuilderconfig.properties")) + // .addResource(pkgPath + "/kbaseconfig.properties", + // ArchivePaths.create("kbaseconfig.properties")) + .addManifestResource(pkgPath + "/ChannelTest-beans.xml", ArchivePaths.create("beans.xml")); + // System.out.println(archive.toString(Formatters.VERBOSE)); + return archive; + } + + @Inject + @Default + @DefaultConfig + StatefulKnowledgeSession ksession; + + @Inject ChannelBean channelBean; + + @Test + public void testChannel() + { + assertNotNull(ksession); + assertNotNull(channelBean); + + Person p1 = new Person(); + p1.setAge(12); + + Person p2 = new Person(); + p2.setAge(20); + + Person p3 = new Person(); + p3.setAge(4); + + Person p4 = new Person(); + p4.setAge(19); + + Person p5 = new Person(); + p5.setAge(33); + + Person p6 = new Person(); + p6.setAge(55); + + Person p7 = new Person(); + p7.setAge(15); + + Person p8 = new Person(); + p8.setAge(69); + + ksession.insert(p1); + ksession.insert(p2); + ksession.insert(p3); + ksession.insert(p4); + ksession.insert(p5); + ksession.insert(p6); + ksession.insert(p7); + ksession.insert(p8); + + ksession.fireAllRules(); + + assertTrue(channelBean.getEligiblesList().size() == 5); + assertTrue(channelBean.getNotEligiblesList().size() == 3); + + } +} Property changes on: modules/drools/trunk/impl/src/test/java/org/jboss/seam/drools/test/channel/ChannelTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: modules/drools/trunk/impl/src/test/java/org/jboss/seam/drools/test/channel/Person.java =================================================================== --- modules/drools/trunk/impl/src/test/java/org/jboss/seam/drools/test/channel/Person.java (rev 0) +++ modules/drools/trunk/impl/src/test/java/org/jboss/seam/drools/test/channel/Person.java 2010-09-12 16:15:25 UTC (rev 13736) @@ -0,0 +1,27 @@ +package org.jboss.seam.drools.test.channel; + +public class Person +{ + private int age; + private boolean eligible = false; + + public int getAge() { + return age; + } + + public void setAge(int age) { + this.age = age; + } + + public boolean isEligible() + { + return eligible; + } + + public void setEligible(boolean eligible) + { + this.eligible = eligible; + } + + +} Property changes on: modules/drools/trunk/impl/src/test/java/org/jboss/seam/drools/test/channel/Person.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: modules/drools/trunk/impl/src/test/java/org/jboss/seam/drools/test/customoperator/CustomOperatorTest.java =================================================================== --- modules/drools/trunk/impl/src/test/java/org/jboss/seam/drools/test/customoperator/CustomOperatorTest.java 2010-09-11 05:48:19 UTC (rev 13735) +++ modules/drools/trunk/impl/src/test/java/org/jboss/seam/drools/test/customoperator/CustomOperatorTest.java 2010-09-12 16:15:25 UTC (rev 13736) @@ -47,12 +47,18 @@ public static JavaArchive createTestArchive() { String pkgPath = CustomOperatorTest.class.getPackage().getName().replaceAll("\\.", "/"); - JavaArchive archive = ShrinkWrap.create("test.jar", JavaArchive.class).addPackages(true, new DroolsModuleFilter("customoperator"), KnowledgeBaseProducer.class.getPackage()).addPackages(true, ResourceProvider.class.getPackage()).addClass(MessageBean.class).addClass(StrEvaluator.class).addClass(StrEvaluatorDefinition.class).addResource(pkgPath + "/customoperatortest.drl", ArchivePaths.create("customoperatortest.drl")) + JavaArchive archive = ShrinkWrap.create("test.jar", JavaArchive.class) + .addPackages(true, new DroolsModuleFilter("customoperator"), KnowledgeBaseProducer.class.getPackage()) + .addPackages(true, ResourceProvider.class.getPackage()) + .addClass(MessageBean.class) + .addClass(StrEvaluator.class) + .addClass(StrEvaluatorDefinition.class) + .addResource(pkgPath + "/customoperatortest.drl", ArchivePaths.create("customoperatortest.drl")) // .addResource(pkgPath + "/kbuilderconfig.properties", // ArchivePaths.create("kbuilderconfig.properties")) // .addResource(pkgPath + "/kbaseconfig.properties", // ArchivePaths.create("kbaseconfig.properties")) - .addManifestResource(pkgPath + "/CustomOperatorTest-beans.xml", ArchivePaths.create("beans.xml")); + .addManifestResource(pkgPath + "/CustomOperatorTest-beans.xml", ArchivePaths.create("beans.xml")); // System.out.println(archive.toString(Formatters.VERBOSE)); return archive; } Added: modules/drools/trunk/impl/src/test/resources/org/jboss/seam/drools/test/channel/ChannelTest-beans.xml =================================================================== --- modules/drools/trunk/impl/src/test/resources/org/jboss/seam/drools/test/channel/ChannelTest-beans.xml (rev 0) +++ modules/drools/trunk/impl/src/test/resources/org/jboss/seam/drools/test/channel/ChannelTest-beans.xml 2010-09-12 16:15:25 UTC (rev 13736) @@ -0,0 +1,35 @@ + +<beans xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:s="urn:java:ee" + xmlns:d="urn:java:org.jboss.seam.drools:org.jboss.seam.drools.config" + xmlns:test="urn:java:org.jboss.seam.drools.test.ksession"> + + <d:DefaultRuleResources> + <s:modifies/> + <s:Exact>org.jboss.seam.drools.config.DefaultRuleResources</s:Exact> + <d:resources> + <s:value>classpath;channeltest.drl;DRL</s:value> + </d:resources> + </d:DefaultRuleResources> + +</beans> Property changes on: modules/drools/trunk/impl/src/test/resources/org/jboss/seam/drools/test/channel/ChannelTest-beans.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Added: modules/drools/trunk/impl/src/test/resources/org/jboss/seam/drools/test/channel/channeltest.drl =================================================================== --- modules/drools/trunk/impl/src/test/resources/org/jboss/seam/drools/test/channel/channeltest.drl (rev 0) +++ modules/drools/trunk/impl/src/test/resources/org/jboss/seam/drools/test/channel/channeltest.drl 2010-09-12 16:15:25 UTC (rev 13736) @@ -0,0 +1,19 @@ +package org.jboss.seam.drools.test.channel + +import org.jboss.seam.drools.test.channel.Person; + +rule eligiblePerson + when + $p : Person( age <= 18 ) + then + $p.setEligible(true); + channels["testChannel"].send( $p ); +end + +rule notElibiglePerson + when + $p : Person( age > 18 ) + then + $p.setEligible(false); + channels["testChannel"].send( $p ); +end \ No newline at end of file Modified: modules/drools/trunk/pom.xml =================================================================== --- modules/drools/trunk/pom.xml 2010-09-11 05:48:19 UTC (rev 13735) +++ modules/drools/trunk/pom.xml 2010-09-12 16:15:25 UTC (rev 13736) @@ -7,7 +7,7 @@ <artifactId>seam-parent</artifactId> <version>3</version> </parent> - + <artifactId>seam-drools-parent</artifactId> <groupId>org.jboss.seam.drools</groupId> <version>3.0.0-SNAPSHOT</version> @@ -47,6 +47,7 @@ </developers> <properties> + <drools.version>5.1.1</drools.version> <seam.version>3.0.0.b01</seam.version> <weld-extensions.version>1.0.0-SNAPSHOT</weld-extensions.version> </properties>

14 years, 3 months

1
0
0 / 0

Seam SVN: r13735 - in modules/drools/trunk: api/src/main/java/org/jboss/seam/drools/qualifiers and 9 other directories.

by seam-commits＠lists.jboss.org

Author: tsurdilovic Date: 2010-09-11 01:48:19 -0400 (Sat, 11 Sep 2010) New Revision: 13735 Added: modules/drools/trunk/api/src/main/java/org/jboss/seam/drools/qualifiers/EvaluatorDef.java modules/drools/trunk/impl/src/test/java/org/jboss/seam/drools/test/customoperator/ modules/drools/trunk/impl/src/test/java/org/jboss/seam/drools/test/customoperator/CustomOperatorTest.java modules/drools/trunk/impl/src/test/java/org/jboss/seam/drools/test/customoperator/MessageBean.java modules/drools/trunk/impl/src/test/java/org/jboss/seam/drools/test/customoperator/StrEvaluator.java modules/drools/trunk/impl/src/test/java/org/jboss/seam/drools/test/customoperator/StrEvaluatorDefinition.java modules/drools/trunk/impl/src/test/resources/org/jboss/seam/drools/test/customoperator/ modules/drools/trunk/impl/src/test/resources/org/jboss/seam/drools/test/customoperator/CustomOperatorTest-beans.xml modules/drools/trunk/impl/src/test/resources/org/jboss/seam/drools/test/customoperator/customoperatortest.drl Modified: modules/drools/trunk/impl/pom.xml modules/drools/trunk/impl/src/main/java/org/jboss/seam/drools/KnowledgeBaseProducer.java modules/drools/trunk/impl/src/main/java/org/jboss/seam/drools/bootstrap/DroolsExtension.java modules/drools/trunk/impl/src/main/java/org/jboss/seam/drools/config/DroolsConfig.java modules/drools/trunk/impl/src/main/resources/META-INF/beans.xml modules/drools/trunk/pom.xml Log: SEAMDROOLS-4 - Add ability to automatically register custom operators Added: modules/drools/trunk/api/src/main/java/org/jboss/seam/drools/qualifiers/EvaluatorDef.java =================================================================== --- modules/drools/trunk/api/src/main/java/org/jboss/seam/drools/qualifiers/EvaluatorDef.java (rev 0) +++ modules/drools/trunk/api/src/main/java/org/jboss/seam/drools/qualifiers/EvaluatorDef.java 2010-09-11 05:48:19 UTC (rev 13735) @@ -0,0 +1,25 @@ +package org.jboss.seam.drools.qualifiers; + +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Documented; +import java.lang.annotation.Inherited; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import javax.enterprise.util.Nonbinding; +import javax.inject.Qualifier; + +/** + * + * @author Tihomir Surdilovic + */ +@Qualifier +@Target( TYPE ) +@Documented +@Retention(RUNTIME) +@Inherited +public @interface EvaluatorDef { + @Nonbinding String value(); +} \ No newline at end of file Property changes on: modules/drools/trunk/api/src/main/java/org/jboss/seam/drools/qualifiers/EvaluatorDef.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: modules/drools/trunk/impl/pom.xml =================================================================== --- modules/drools/trunk/impl/pom.xml 2010-09-10 14:19:11 UTC (rev 13734) +++ modules/drools/trunk/impl/pom.xml 2010-09-11 05:48:19 UTC (rev 13735) @@ -78,6 +78,12 @@ <scope>test</scope> <version>3.0.0-SNAPSHOT</version> </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <version>2.5</version> + <scope>test</scope> + </dependency>  <dependency> <groupId>junit</groupId> Modified: modules/drools/trunk/impl/src/main/java/org/jboss/seam/drools/KnowledgeBaseProducer.java =================================================================== --- modules/drools/trunk/impl/src/main/java/org/jboss/seam/drools/KnowledgeBaseProducer.java 2010-09-10 14:19:11 UTC (rev 13734) +++ modules/drools/trunk/impl/src/main/java/org/jboss/seam/drools/KnowledgeBaseProducer.java 2010-09-11 05:48:19 UTC (rev 13735) @@ -18,7 +18,7 @@ * License along with this software; if not, write to the Free * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ + */ package org.jboss.seam.drools; import java.io.InputStream; @@ -26,6 +26,7 @@ import java.io.Serializable; import java.io.StringReader; import java.util.Iterator; +import java.util.Map.Entry; import javax.enterprise.context.ApplicationScoped; import javax.enterprise.inject.Default; @@ -35,11 +36,14 @@ import org.drools.KnowledgeBase; import org.drools.KnowledgeBaseFactory; +import org.drools.base.evaluators.EvaluatorDefinition; import org.drools.builder.KnowledgeBuilder; +import org.drools.builder.KnowledgeBuilderConfiguration; import org.drools.builder.KnowledgeBuilderError; import org.drools.builder.KnowledgeBuilderErrors; import org.drools.builder.KnowledgeBuilderFactory; import org.drools.builder.ResourceType; +import org.drools.builder.conf.EvaluatorOption; import org.drools.event.knowledgebase.KnowledgeBaseEventListener; import org.drools.io.ResourceFactory; import org.drools.template.ObjectDataCompiler; @@ -63,10 +67,10 @@ @Inject BeanManager manager; - + @Inject ResourceProvider resourceProvider; - + @Inject DroolsExtension droolsExtension; @@ -75,13 +79,15 @@ @ApplicationScoped public KnowledgeBase produceKnowledgeBase(DroolsConfig config) throws Exception { - KnowledgeBuilder kbuilder = KnowledgeBuilderFactory.newKnowledgeBuilder(config.getKnowledgeBuilderConfiguration()); + KnowledgeBuilder kbuilder = KnowledgeBuilderFactory.newKnowledgeBuilder(addCustomEvaluators(config.getKnowledgeBuilderConfiguration())); - if(config.getRuleResources().getResources() == null || config.getRuleResources().getResources().length == 0) { + if (config.getRuleResources().getResources() == null || config.getRuleResources().getResources().length == 0) + { throw new IllegalStateException("No rule resources are specified."); } - - for(String resourceEntry : config.getRuleResources().getResources()) { + + for (String resourceEntry : config.getRuleResources().getResources()) + { addResource(kbuilder, resourceEntry); } @@ -103,6 +109,17 @@ return kbase; } + private KnowledgeBuilderConfiguration addCustomEvaluators(KnowledgeBuilderConfiguration config) + { + Iterator<Entry<String, EvaluatorDefinition>> allCustomEvaluators = droolsExtension.getEvaluatorDefinitions().entrySet().iterator(); + while (allCustomEvaluators.hasNext()) + { + Entry<String, EvaluatorDefinition> nextEvalInfo = allCustomEvaluators.next(); + config.setOption(EvaluatorOption.get(nextEvalInfo.getKey(), nextEvalInfo.getValue())); + } + return config; + } + private void addEventListeners(KnowledgeBase kbase) { Iterator<KnowledgeBaseEventListener> allKBaseEventListeners = droolsExtension.getKbaseEventListenerSet().iterator(); @@ -117,7 +134,7 @@ private void addResource(KnowledgeBuilder kbuilder, String entry) throws Exception { String[] entryParts = RuleResources.DIVIDER.split(entry.trim()); - + if (entryParts.length >= 3) { ResourceType resourceType = ResourceType.getResourceType(entryParts[RuleResources.RESOURCE_TYPE]); Modified: modules/drools/trunk/impl/src/main/java/org/jboss/seam/drools/bootstrap/DroolsExtension.java =================================================================== --- modules/drools/trunk/impl/src/main/java/org/jboss/seam/drools/bootstrap/DroolsExtension.java 2010-09-10 14:19:11 UTC (rev 13734) +++ modules/drools/trunk/impl/src/main/java/org/jboss/seam/drools/bootstrap/DroolsExtension.java 2010-09-11 05:48:19 UTC (rev 13735) @@ -36,10 +36,12 @@ import javax.enterprise.inject.spi.Extension; import javax.enterprise.util.AnnotationLiteral; +import org.drools.base.evaluators.EvaluatorDefinition; import org.drools.event.knowledgebase.KnowledgeBaseEventListener; import org.drools.runtime.process.WorkItemHandler; import org.jboss.seam.drools.FactProvider; import org.jboss.seam.drools.TemplateDataProvider; +import org.jboss.seam.drools.qualifiers.EvaluatorDef; import org.jboss.seam.drools.qualifiers.KBaseEventListener; import org.jboss.seam.drools.qualifiers.KSessionEventListener; import org.jboss.seam.drools.qualifiers.TemplateData; @@ -55,6 +57,7 @@ private Map<String, WorkItemHandler> workItemHandlers = new HashMap<String, WorkItemHandler>(); private Map<String, TemplateDataProvider> templateDataProviders = new HashMap<String, TemplateDataProvider>(); private Set<FactProvider> factProviderSet = new HashSet<FactProvider>(); + private Map<String, EvaluatorDefinition> evaluatorDefinitions = new HashMap<String, EvaluatorDefinition>(); @SuppressWarnings("serial") void afterBeanDiscovery(@Observes AfterBeanDiscovery abd, BeanManager bm) { @@ -106,6 +109,28 @@ } log.info("End creating [" + (allWorkItemHandlers == null ? 0 : allWorkItemHandlers.size())+ "] workitem handlers"); + //EvaluatorDefinitions + log.info("Start creating evaluator definitions"); + Set<Bean<?>> allEvaluatorDefinitions = bm.getBeans(EvaluatorDefinition.class, new AnnotationLiteral<Any>(){}); + if(allEvaluatorDefinitions != null) { + Iterator<Bean<?>> iter = allEvaluatorDefinitions.iterator(); + while (iter.hasNext()) + { + Bean<?> evaluator = iter.next(); + EvaluatorDef evaluatorAnnotation = evaluator.getBeanClass().getAnnotation(EvaluatorDef.class); + String evaluatorName = evaluatorAnnotation.value(); + if(evaluatorName.length() > 0) { + CreationalContext<?> context = bm.createCreationalContext(evaluator); + EvaluatorDefinition evaluatorInstance = (EvaluatorDefinition) bm.getReference(evaluator, EvaluatorDefinition.class, context); + evaluatorDefinitions.put(evaluatorName, evaluatorInstance); + } else { + throw new IllegalStateException("Evaluator name cannot be empty in class: " + evaluator.getBeanClass().getName()); + } + } + } + log.info("End creating [" + ( allEvaluatorDefinitions== null ? 0 : allEvaluatorDefinitions.size())+ "] evaluator definitions"); + + //Template Data Providers log.info("Start creating template providers"); Set<Bean<?>> allTemplateProviders = bm.getBeans(TemplateDataProvider.class, new AnnotationLiteral<Any>(){}); @@ -166,5 +191,8 @@ { return templateDataProviders; } - + + public Map<String, EvaluatorDefinition> getEvaluatorDefinitions() { + return evaluatorDefinitions; + } } Modified: modules/drools/trunk/impl/src/main/java/org/jboss/seam/drools/config/DroolsConfig.java =================================================================== --- modules/drools/trunk/impl/src/main/java/org/jboss/seam/drools/config/DroolsConfig.java 2010-09-10 14:19:11 UTC (rev 13734) +++ modules/drools/trunk/impl/src/main/java/org/jboss/seam/drools/config/DroolsConfig.java 2010-09-11 05:48:19 UTC (rev 13735) @@ -41,6 +41,7 @@ import org.drools.io.ResourceFactory; import org.drools.runtime.KnowledgeSessionConfiguration; import org.jboss.seam.drools.utils.ConfigUtils; +import org.jboss.weld.extensions.bean.generic.GenericConfiguration; import org.jboss.weld.extensions.resourceLoader.ResourceProvider; import org.slf4j.Logger; @@ -51,6 +52,7 @@ * * @author Tihomir Surdilovic */ +@GenericConfiguration public class DroolsConfig { private static final Logger log = LoggerFactory.getLogger(DroolsConfig.class); Modified: modules/drools/trunk/impl/src/main/resources/META-INF/beans.xml =================================================================== --- modules/drools/trunk/impl/src/main/resources/META-INF/beans.xml 2010-09-10 14:19:11 UTC (rev 13734) +++ modules/drools/trunk/impl/src/main/resources/META-INF/beans.xml 2010-09-11 05:48:19 UTC (rev 13735) @@ -20,7 +20,7 @@ xmlns:d="urn:java:org.jboss.seam.drools:org.jboss.seam.drools.config:org.jboss.seam.drools.qualifiers.config" xmlns:drools="urn:java:org.drools:org.drools.runtime"> - <s:genericBean class="org.jboss.seam.drools.config.DroolsConfig"> +  <d:DroolsConfig> <s:modifies /> Added: modules/drools/trunk/impl/src/test/java/org/jboss/seam/drools/test/customoperator/CustomOperatorTest.java =================================================================== --- modules/drools/trunk/impl/src/test/java/org/jboss/seam/drools/test/customoperator/CustomOperatorTest.java (rev 0) +++ modules/drools/trunk/impl/src/test/java/org/jboss/seam/drools/test/customoperator/CustomOperatorTest.java 2010-09-11 05:48:19 UTC (rev 13735) @@ -0,0 +1,76 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2010, Red Hat, Inc., and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.seam.drools.test.customoperator; + +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; + +import javax.enterprise.inject.Default; +import javax.inject.Inject; + +import org.drools.runtime.StatefulKnowledgeSession; +import org.jboss.arquillian.api.Deployment; +import org.jboss.arquillian.junit.Arquillian; +import org.jboss.seam.drools.KnowledgeBaseProducer; +import org.jboss.seam.drools.qualifiers.config.DefaultConfig; +import org.jboss.seam.drools.test.DroolsModuleFilter; +import org.jboss.shrinkwrap.api.ArchivePaths; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.weld.extensions.resourceLoader.ResourceProvider; +import org.junit.Test; +import org.junit.runner.RunWith; + +(a)RunWith(Arquillian.class) +public class CustomOperatorTest +{ + @Deployment + public static JavaArchive createTestArchive() + { + String pkgPath = CustomOperatorTest.class.getPackage().getName().replaceAll("\\.", "/"); + JavaArchive archive = ShrinkWrap.create("test.jar", JavaArchive.class).addPackages(true, new DroolsModuleFilter("customoperator"), KnowledgeBaseProducer.class.getPackage()).addPackages(true, ResourceProvider.class.getPackage()).addClass(MessageBean.class).addClass(StrEvaluator.class).addClass(StrEvaluatorDefinition.class).addResource(pkgPath + "/customoperatortest.drl", ArchivePaths.create("customoperatortest.drl")) + // .addResource(pkgPath + "/kbuilderconfig.properties", + // ArchivePaths.create("kbuilderconfig.properties")) + // .addResource(pkgPath + "/kbaseconfig.properties", + // ArchivePaths.create("kbaseconfig.properties")) + .addManifestResource(pkgPath + "/CustomOperatorTest-beans.xml", ArchivePaths.create("beans.xml")); + // System.out.println(archive.toString(Formatters.VERBOSE)); + return archive; + } + + @Inject + @Default + @DefaultConfig + StatefulKnowledgeSession ksession; + + @Test + public void testCustomOperator() + { + assertNotNull(ksession); + MessageBean mb = new MessageBean(); + mb.setRoutingValue("R1:messageBody:R2"); + org.drools.runtime.rule.FactHandle mbHandle = ksession.insert(mb); + ksession.fireAllRules(); + MessageBean mbAfterEval = (MessageBean) ksession.getObject(mbHandle); + assertTrue(mbAfterEval.getResult().equals("Message starts with R1, ends with R2 and it's length is 17")); + } +} Property changes on: modules/drools/trunk/impl/src/test/java/org/jboss/seam/drools/test/customoperator/CustomOperatorTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: modules/drools/trunk/impl/src/test/java/org/jboss/seam/drools/test/customoperator/MessageBean.java =================================================================== --- modules/drools/trunk/impl/src/test/java/org/jboss/seam/drools/test/customoperator/MessageBean.java (rev 0) +++ modules/drools/trunk/impl/src/test/java/org/jboss/seam/drools/test/customoperator/MessageBean.java 2010-09-11 05:48:19 UTC (rev 13735) @@ -0,0 +1,53 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright ${year}, Red Hat, Inc., and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.seam.drools.test.customoperator; + +/** + * + * @author Tihomir Surdilovic + */ +public class MessageBean +{ + private String routingValue; + private String result; + + public String getRoutingValue() + { + return routingValue; + } + + public void setRoutingValue(String routingValue) + { + this.routingValue = routingValue; + } + + public String getResult() + { + return result; + } + + public void setResult(String result) + { + this.result = result; + } + +} Property changes on: modules/drools/trunk/impl/src/test/java/org/jboss/seam/drools/test/customoperator/MessageBean.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: modules/drools/trunk/impl/src/test/java/org/jboss/seam/drools/test/customoperator/StrEvaluator.java =================================================================== --- modules/drools/trunk/impl/src/test/java/org/jboss/seam/drools/test/customoperator/StrEvaluator.java (rev 0) +++ modules/drools/trunk/impl/src/test/java/org/jboss/seam/drools/test/customoperator/StrEvaluator.java 2010-09-11 05:48:19 UTC (rev 13735) @@ -0,0 +1,139 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright ${year}, Red Hat, Inc., and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.seam.drools.test.customoperator; + +import org.drools.base.BaseEvaluator; +import org.drools.base.ValueType; +import org.drools.base.evaluators.Operator; +import org.drools.common.InternalWorkingMemory; +import org.drools.rule.VariableRestriction.ObjectVariableContextEntry; +import org.drools.rule.VariableRestriction.VariableContextEntry; +import org.drools.spi.FieldValue; +import org.drools.spi.InternalReadAccessor; +import org.jboss.seam.drools.test.customoperator.StrEvaluatorDefinition.Operations; + +/** + * + * @author Tihomir Surdilovic + */ +public class StrEvaluator extends BaseEvaluator { + + public static final Operator STR_COMPARE = Operator.addOperatorToRegistry( + "str", false); + public static final Operator NOT_STR_COMPARE = Operator + .addOperatorToRegistry("str", true); + public static final String[] SUPPORTED_IDS = { STR_COMPARE + .getOperatorString() }; + + private Operations parameter; + + public void setParameterText(String parameterText) { + this.parameter = Operations.valueOf(parameterText); + } + + public Operations getParameter() { + return parameter; + } + + public StrEvaluator(final ValueType type, final boolean isNegated) { + super(type, isNegated ? NOT_STR_COMPARE : STR_COMPARE); + } + + public boolean evaluate(InternalWorkingMemory workingMemory, + InternalReadAccessor extractor, Object object, FieldValue value) { + final Object objectValue = extractor +.getValue(workingMemory, object); + switch (parameter) { + case startsWith: + return this.getOperator().isNegated() ^ (((String)objectValue).startsWith( (String)value.getValue() )); + case endsWith: + return this.getOperator().isNegated() ^ (((String)objectValue).endsWith( (String)value.getValue() )); + case length: + return this.getOperator().isNegated() ^ (((String)objectValue).length() == ((Long) value.getValue()).longValue() ); + default: + throw new IllegalAccessError("Illegal str comparison parameter"); + } + } + + public boolean evaluate(InternalWorkingMemory workingMemory, + InternalReadAccessor leftExtractor, Object left, + InternalReadAccessor rightExtractor, Object right) { + final Object value1 = leftExtractor.getValue(workingMemory, left); + final Object value2 = rightExtractor.getValue(workingMemory, right); + + switch (parameter) { + case startsWith: + return this.getOperator().isNegated() ^ (((String)value1).startsWith( (String) value2 )); + case endsWith: + return this.getOperator().isNegated() ^ (((String)value1).endsWith( (String) value2 )); + case length: + return this.getOperator().isNegated() ^ (((String)value1).length() == ((Long) value2).longValue() ); + default: + throw new IllegalAccessError("Illegal str comparison parameter"); + } + + } + + public boolean evaluateCachedLeft(InternalWorkingMemory workingMemory, + VariableContextEntry context, Object right) { + + switch (parameter) { + case startsWith: + return this.getOperator().isNegated() ^ (((String)right).startsWith( (String)((ObjectVariableContextEntry) + context).left) ); + case endsWith: + return this.getOperator().isNegated() ^ (((String)right).endsWith( (String)((ObjectVariableContextEntry) + context).left)); + case length: + return this.getOperator().isNegated() ^ (((String)right).length() == ((Long)((ObjectVariableContextEntry) + context).left).longValue()); + default: + throw new IllegalAccessError("Illegal str comparison parameter"); + } + + } + + public boolean evaluateCachedRight(InternalWorkingMemory workingMemory, + VariableContextEntry context, Object left) { + switch (parameter) { + case startsWith: + return this.getOperator().isNegated() ^ (((String)left).startsWith((String)((ObjectVariableContextEntry) + context).right)); + case endsWith: + return this.getOperator().isNegated() ^ (((String)left).endsWith((String)((ObjectVariableContextEntry) + context).right)); + case length: + return this.getOperator().isNegated() ^ (((String)left).length() == ((Long)((ObjectVariableContextEntry) + context).right).longValue()); + default: + throw new IllegalAccessError("Illegal str comparison parameter"); + } + + } + + @Override + public String toString() { + return "StrEvaluatorDefinition str"; + + } + +} Property changes on: modules/drools/trunk/impl/src/test/java/org/jboss/seam/drools/test/customoperator/StrEvaluator.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: modules/drools/trunk/impl/src/test/java/org/jboss/seam/drools/test/customoperator/StrEvaluatorDefinition.java =================================================================== --- modules/drools/trunk/impl/src/test/java/org/jboss/seam/drools/test/customoperator/StrEvaluatorDefinition.java (rev 0) +++ modules/drools/trunk/impl/src/test/java/org/jboss/seam/drools/test/customoperator/StrEvaluatorDefinition.java 2010-09-11 05:48:19 UTC (rev 13735) @@ -0,0 +1,100 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright ${year}, Red Hat, Inc., and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.seam.drools.test.customoperator; + +import java.io.IOException; +import java.io.ObjectInput; +import java.io.ObjectOutput; + +import org.drools.base.ValueType; +import org.drools.base.evaluators.EvaluatorDefinition; +import org.drools.base.evaluators.Operator; +import org.drools.spi.Evaluator; +import org.jboss.seam.drools.qualifiers.EvaluatorDef; + +/** + * + * @author Tihomir Surdilovic + */ +@EvaluatorDef("str") +public class StrEvaluatorDefinition implements EvaluatorDefinition +{ + + public enum Operations + { + startsWith, endsWith, length; + } + + private Evaluator[] evaluator; + + public Evaluator getEvaluator(ValueType type, Operator operator) + { + return this.getEvaluator(type, operator.getOperatorString(), operator.isNegated(), null); + } + + public Evaluator getEvaluator(ValueType type, Operator operator, String parameterText) + { + return this.getEvaluator(type, operator.getOperatorString(), operator.isNegated(), parameterText); + } + + public Evaluator getEvaluator(ValueType type, String operatorId, boolean isNegated, String parameterText) + { + return getEvaluator(type, operatorId, isNegated, parameterText, Target.FACT, Target.FACT); + } + + public Evaluator getEvaluator(ValueType type, String operatorId, boolean isNegated, String parameterText, Target leftTarget, Target rightTarget) + { + StrEvaluator evaluator = new StrEvaluator(type, isNegated); + evaluator.setParameterText(parameterText); + return evaluator; + } + + public String[] getEvaluatorIds() + { + return StrEvaluator.SUPPORTED_IDS; + } + + public Target getTarget() + { + return Target.FACT; + } + + public boolean isNegatable() + { + return true; + } + + public boolean supportsType(ValueType type) + { + return true; + } + + public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException + { + evaluator = (Evaluator[]) in.readObject(); + } + + public void writeExternal(ObjectOutput out) throws IOException + { + out.writeObject(evaluator); + } +} Property changes on: modules/drools/trunk/impl/src/test/java/org/jboss/seam/drools/test/customoperator/StrEvaluatorDefinition.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: modules/drools/trunk/impl/src/test/resources/org/jboss/seam/drools/test/customoperator/CustomOperatorTest-beans.xml =================================================================== --- modules/drools/trunk/impl/src/test/resources/org/jboss/seam/drools/test/customoperator/CustomOperatorTest-beans.xml (rev 0) +++ modules/drools/trunk/impl/src/test/resources/org/jboss/seam/drools/test/customoperator/CustomOperatorTest-beans.xml 2010-09-11 05:48:19 UTC (rev 13735) @@ -0,0 +1,35 @@ + +<beans xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:s="urn:java:ee" + xmlns:d="urn:java:org.jboss.seam.drools:org.jboss.seam.drools.config" + xmlns:test="urn:java:org.jboss.seam.drools.test.ksession"> + + <d:DefaultRuleResources> + <s:modifies/> + <s:Exact>org.jboss.seam.drools.config.DefaultRuleResources</s:Exact> + <d:resources> + <s:value>classpath;customoperatortest.drl;DRL</s:value> + </d:resources> + </d:DefaultRuleResources> + +</beans> Property changes on: modules/drools/trunk/impl/src/test/resources/org/jboss/seam/drools/test/customoperator/CustomOperatorTest-beans.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Added: modules/drools/trunk/impl/src/test/resources/org/jboss/seam/drools/test/customoperator/customoperatortest.drl =================================================================== --- modules/drools/trunk/impl/src/test/resources/org/jboss/seam/drools/test/customoperator/customoperatortest.drl (rev 0) +++ modules/drools/trunk/impl/src/test/resources/org/jboss/seam/drools/test/customoperator/customoperatortest.drl 2010-09-11 05:48:19 UTC (rev 13735) @@ -0,0 +1,38 @@ +package org.jboss.seam.drools.test.customoperator + +import org.jboss.seam.drools.test.customoperator.MessageBean; +/** +rule teststartswith +when + $m : MessageBean( routingValue str[startsWith] "R1" ) +then + System.out.println(" Message starts with R1 "); +end + +rule testsendswith +when + $m : MessageBean( routingValue str[endsWith] "R2" ) +then + System.out.println(" Message ends with R2 "); +end + +rule testlength +when + $m : MessageBean( routingValue str[length] 17 ) +then + System.out.println(" Message length is 17 "); +end + +rule testnotstartswith +when + $m : MessageBean( routingValue not str[startsWith] "R2" ) +then + System.out.println(" Message does not start with R2 "); +end +*/ +rule testmultiple +when + $m : MessageBean( routingValue str[startsWith] "R1" && str[endsWith] "R2" && str[length] 17) +then + $m.setResult("Message starts with R1, ends with R2 and it's length is 17"); +end Modified: modules/drools/trunk/pom.xml =================================================================== --- modules/drools/trunk/pom.xml 2010-09-10 14:19:11 UTC (rev 13734) +++ modules/drools/trunk/pom.xml 2010-09-11 05:48:19 UTC (rev 13735) @@ -48,6 +48,7 @@ <properties> <seam.version>3.0.0.b01</seam.version> + <weld-extensions.version>1.0.0-SNAPSHOT</weld-extensions.version> </properties> <dependencyManagement> @@ -73,6 +74,11 @@ <artifactId>seam-drools-impl</artifactId> <version>${project.version}</version> </dependency> + <dependency> + <groupId>org.jboss.weld</groupId> + <artifactId>weld-extensions</artifactId> + <version>${weld-extensions.version}</version> + </dependency> </dependencies> </dependencyManagement>

14 years, 3 months

1
0
0 / 0

Seam SVN: r13734 - branches/community/Seam_2_2/src/test/ftest/src/main/org/jboss/seam/example/common/test/selenium.

by seam-commits＠lists.jboss.org

Author: jharting Date: 2010-09-10 10:19:11 -0400 (Fri, 10 Sep 2010) New Revision: 13734 Modified: branches/community/Seam_2_2/src/test/ftest/src/main/org/jboss/seam/example/common/test/selenium/SeleniumDateSelector.java Log: Minor changes in functional tests. Modified: branches/community/Seam_2_2/src/test/ftest/src/main/org/jboss/seam/example/common/test/selenium/SeleniumDateSelector.java =================================================================== --- branches/community/Seam_2_2/src/test/ftest/src/main/org/jboss/seam/example/common/test/selenium/SeleniumDateSelector.java 2010-09-10 14:17:32 UTC (rev 13733) +++ branches/community/Seam_2_2/src/test/ftest/src/main/org/jboss/seam/example/common/test/selenium/SeleniumDateSelector.java 2010-09-10 14:19:11 UTC (rev 13734) @@ -56,7 +56,7 @@ String calMonth = stk.nextToken().trim(); int steps = monthStepsCount(calMonth, month); - movement(browser, "xpath=//div[@class='rich-calendar-tool-btn' and text()='<']", "xpath=//div[@class='rich-calendar-tool-btn' and text()='>']", steps); + movement(browser, "xpath=//div[@class='rich-calendar-tool-btn' and normalize-space(text())='<']", "xpath=//div[@class='rich-calendar-tool-btn' and normalize-space(text())='>']", steps); } @Override @@ -69,7 +69,7 @@ String calYear = stk.nextToken().trim(); int steps = yearStepsCount(calYear, year); - movement(browser, "xpath=//div[@class='rich-calendar-tool-btn' and text()='<<']", "xpath=//div[@class='rich-calendar-tool-btn' and text()='>>'", steps); + movement(browser, "xpath=//div[@class='rich-calendar-tool-btn' and normalize-space(text())='<<']", "xpath=//div[@class='rich-calendar-tool-btn' and normalize-space(text())='>>']", steps); } },

14 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 September 2010