[seam-commits] [pmuir/ticket-monster] 9fecf4: Merge branch 'heiko'

[noreply at github.com]

Branch: refs/heads/master
Home:   http://github.com/pmuir/ticket-monster

Commit: 9fecf481f328e27a5b424a4e23e247e220c00802
    http://github.com/pmuir/ticket-monster/commit/9fecf481f328e27a5b424a4e23e247e220c00802
Author: Pete Muir <pmuir at bleepbleep.org.uk>
Date:   2010-10-07 (Thu, 07 Oct 2010)

Changed paths:
  M .gitignore
  M core/pom.xml
  R core/src/main/java/META-INF/MANIFEST.MF
  A core/src/main/java/org/jboss/seam/example/ticketmonster/action/BaseEventSearch.java
  M core/src/main/java/org/jboss/seam/example/ticketmonster/action/CategorySearch.java
  M core/src/main/java/org/jboss/seam/example/ticketmonster/action/EventSearch.java
  M core/src/main/java/org/jboss/seam/example/ticketmonster/model/IdentityObject.java
  M core/src/main/java/org/jboss/seam/example/ticketmonster/model/IdentityObjectCredential.java
  M core/src/main/java/org/jboss/seam/example/ticketmonster/model/IdentityObjectCredentialType.java
  M core/src/main/java/org/jboss/seam/example/ticketmonster/model/IdentityObjectRelationship.java
  M core/src/main/java/org/jboss/seam/example/ticketmonster/model/IdentityObjectRelationshipType.java
  M core/src/main/java/org/jboss/seam/example/ticketmonster/model/IdentityObjectType.java
  M core/src/main/java/org/jboss/seam/example/ticketmonster/model/IdentityPermission.java
  M core/src/main/java/org/jboss/seam/example/ticketmonster/model/IdentityRoleName.java
  A core/src/main/java/org/jboss/seam/example/ticketmonster/server/CategoryManagement.java
  R core/src/main/java/org/jboss/seam/example/ticketmonster/server/CategorySearchDelegate.java
  A core/src/main/java/org/jboss/seam/example/ticketmonster/server/Crud.java
  A core/src/main/java/org/jboss/seam/example/ticketmonster/server/EventManagement.java
  M gwt-ui/pom.xml
  A gwt-ui/src/main/java/org/gwt/mosaic/ui/client/layout/CustomGridLayout.java
  M gwt-ui/src/main/java/org/jboss/seam/example/ticketmonster/App.gwt.xml
  M gwt-ui/src/main/java/org/jboss/seam/example/ticketmonster/client/categories/CategoryAdmin.java
  A gwt-ui/src/main/java/org/jboss/seam/example/ticketmonster/client/categories/CategoryDetail.java
  A gwt-ui/src/main/java/org/jboss/seam/example/ticketmonster/client/categories/CategoryList.java
  A gwt-ui/src/main/java/org/jboss/seam/example/ticketmonster/client/common/ModelObserver.java
  A gwt-ui/src/main/java/org/jboss/seam/example/ticketmonster/client/common/PropertyGrid.java
  A gwt-ui/src/main/java/org/jboss/seam/example/ticketmonster/client/common/RichTextToolbar.java
  A gwt-ui/src/main/java/org/jboss/seam/example/ticketmonster/client/common/SelectionListener.java
  A gwt-ui/src/main/java/org/jboss/seam/example/ticketmonster/client/events/DescriptionDeck.java
  A gwt-ui/src/main/java/org/jboss/seam/example/ticketmonster/client/events/EventAdmin.java
  A gwt-ui/src/main/java/org/jboss/seam/example/ticketmonster/client/events/EventEditor.java
  A gwt-ui/src/main/java/org/jboss/seam/example/ticketmonster/client/events/EventForm.java
  A gwt-ui/src/main/java/org/jboss/seam/example/ticketmonster/client/events/EventList.java
  A gwt-ui/src/main/java/org/jboss/seam/example/ticketmonster/client/events/PropertyDeck.java
  A gwt-ui/src/main/java/org/jboss/seam/example/ticketmonster/client/events/RTEditor.java
  A gwt-ui/src/main/java/org/jboss/seam/example/ticketmonster/public/ticket.css
  R gwt-ui/war/META-INF/MANIFEST.MF
  R gwt-ui/war/org/jboss/seam/example/ticketmonster/App.gwt.xml
  R gwt-ui/war/org/jboss/seam/example/ticketmonster/client/App.java
  R gwt-ui/war/org/jboss/seam/example/ticketmonster/client/categories/CategoryAdmin.java
  M jsf-ui/pom.xml
  M jsf-ui/src/eap-51/webapp/WEB-INF/web.xml
  A jsf-ui/src/main/resources/login.config
  A jsf-ui/src/main/resources/roles.properties
  A jsf-ui/src/main/resources/users.properties
  R jsf-ui/src/main/webapp/META-INF/MANIFEST.MF
  M pom.xml

Log Message:
-----------
Merge branch 'heiko'