Clone Tools
  • last updated a few minutes ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge stuff from the time of the 2.3.2.Final release; most notably the JettyLauncher enhancement

Conflicts:

dist/pom.xml

errai-bus/demos/asyncdemo/pom.xml

errai-bus/demos/bus-stress-test/pom.xml

errai-bus/demos/clientservice/pom.xml

errai-bus/demos/helloworld/pom.xml

errai-bus/demos/queryservice/pom.xml

errai-bus/demos/rpcdemo/pom.xml

errai-bus/demos/serialization/pom.xml

errai-bus/demos/stockdemo/pom.xml

errai-bus/pom.xml

errai-bus/src/test/java/org/jboss/errai/bus/server/SessionPassivationService.java

errai-cdi/demos/errai-cdi-mobile-demo/pom.xml

errai-cdi/demos/errai-cdi-mvp-demo/src/main/java/org/jboss/errai/cdi/demo/mvp/shared/Contact.java

errai-cdi/demos/errai-cdi-stock-demo/pom.xml

errai-cdi/demos/errai-cdi-stress-test/pom.xml

errai-cdi/demos/errai-cdi-tagcloud-demo/pom.xml

errai-cdi/errai-cdi-client/pom.xml

errai-cdi/jetty/pom.xml

errai-cdi/pom.xml

errai-cdi/weld-integration/pom.xml

errai-codegen-gwt/pom.xml

errai-codegen/pom.xml

errai-common/pom.xml

errai-config/pom.xml

errai-data-binding/pom.xml

errai-data-binding/src/test/java/org/jboss/errai/databinding/client/test/DataBindingIntegrationTest.java

errai-demos/errai-bus-demo-stock/pom.xml

errai-demos/errai-cdi-demo-mvp/src/main/java/org/jboss/errai/cdi/demo/mvp/client/local/presenter/EditContactPresenter.java

errai-demos/errai-cdi-demo-mvp/src/main/java/org/jboss/errai/cdi/demo/mvp/server/ContactsServiceImpl.java

errai-demos/errai-jpa-demo-basic/pom.xml

errai-demos/errai-jpa-demo-grocery-list/pom.xml

errai-html5/pom.xml

errai-ioc/pom.xml

errai-javaee-all/pom.xml

errai-javax-enterprise/pom.xml

errai-jaxrs/demos/jaxrs-demo/pom.xml

errai-jaxrs/errai-jaxrs-client/pom.xml

errai-jaxrs/errai-jaxrs-provider/pom.xml

errai-jaxrs/pom.xml

errai-jpa/demos/errai-jpa-demo-basic/pom.xml

errai-jpa/demos/errai-jpa-demo-todo-list/pom.xml

errai-jpa/errai-jpa-client/pom.xml

errai-jpa/pom.xml

errai-js/pom.xml

errai-marshalling/pom.xml

errai-marshalling/src/main/java/org/jboss/errai/marshalling/client/marshallers/ErraiProtocolEnvelopeMarshaller.java

errai-navigation/pom.xml

errai-reflections/pom.xml

errai-reflections/reflections-maven/pom.xml

errai-reflections/reflections/pom.xml

errai-tools/pom.xml

errai-ui/pom.xml

errai-uibinder/pom.xml

pom.xml

quickstart/pom.xml

quickstart/src/main/docbook/en/chapter-1-Errai_Maven_Archetype.xml

quickstart/src/main/docbook/en/chapter-2-Errai_CDI_Maven_Archetype.xml

quickstart/src/main/docbook/en/chapter-3-Errai_JAX_RS_Maven_Archetype.xml

quickstart/src/main/docbook/en/chapter-4-Errai_Kitchen_Sink_Maven_Archetype.xml

reference/pom.xml

reference/src/main/docbook/en/chapter-10-Errai_UI.xml

reference/src/main/docbook/en/chapter-4-Errai_CDI.xml

reference/src/main/docbook/en/chapter-9-Data_Binding.xml

  1. … 14 more files in changeset.
Removing demos from errai-jpa dir (now part of errai-demos)

    • -34
    • +0
    ./errai-jpa-demo-basic/src/jboss6/WEB-INF/web.xml
    • -34
    • +0
    ./errai-jpa-demo-basic/src/jboss7/WEB-INF/web.xml
    • -55
    • +0
    ./errai-jpa-demo-basic/src/jetty/WEB-INF/web.xml
  1. … 94 more files in changeset.
Updated to new version 2.3.3-SNAPSHOT

  1. … 47 more files in changeset.
Updated to new version 2.3.2.Final

  1. … 47 more files in changeset.
Moved datasync enchancements of todo list demo to the new demo location under /errai-demos

    • -363
    • +0
    ./errai-jpa-demo-todo-list/pom.xml
  1. … 53 more files in changeset.
Finishing touches for live demo on openshift (but will move to /errai-demos/ before going live)

Back to 3.0-SNAPSHOT

  1. … 50 more files in changeset.
removed the 'ugly' dropdown and made something a bit nicer looking

Changed version numbers for 3.0 milestone 1 release

  1. … 51 more files in changeset.
refactored out a separate LocaleListBox component and added dutch translation to the grocery list demo

  1. … 4 more files in changeset.
fixed keys

Removed validator generator rule from TODO list demo

Removed unneeded ValidationFactory

Added a startup bean that ensures the user table has a password column

Tested and working with PostgreSQL and H2 DB.

Now disabling sync button while sync is in progress

  1. … 1 more file in changeset.
add missing language properties

Updated readme with current instructions for building and running the app.

    • -9
    • +24
    ./errai-jpa-demo-todo-list/README.md
    • -35
    • +38
    ./errai-jpa-demo-todo-list/pom.xml
Renamed TodoListApp to TodoListPage to better reflect its current purpose

Fixed archiving of finished items (was broken since User class was introduced)

Updated to new version 2.3.2-SNAPSHOT

  1. … 47 more files in changeset.
Updated to new version 2.3.1.Final

  1. … 59 more files in changeset.
Added validation to the Todo List demo signup page

Cleaned up error handling for all data sync operations.

Added optional error callback for coldSync() call

  1. … 2 more files in changeset.
ERRAI-554 Move explicit dependencies/plugins to dependencyMangement/pluginManagement

    • -94
    • +1
    ./errai-jpa-demo-grocery-list/pom.xml
  1. … 51 more files in changeset.
ERRAI-554 Move explicit dependencies/plugins to dependencyMangement/pluginManagement

    • -94
    • +1
    ./errai-jpa-demo-grocery-list/pom.xml
  1. … 50 more files in changeset.
Fixed the signup process (the authorization feature broke it)

Refactored "current user" discovery on server side to avoid the need for null session-scoped beans

Implemented log out action that clears client data and removes user from server session

There is still a bug in this: whoAmI() isn't permitted to return null for the SessionScoped user bean.

This will require a little refactoring to make the CDI usage legal.

  1. … 2 more files in changeset.
Signup and login are now working properly!

At this point, there is no authorization checking, so anybody can sync anybody else's stuff.

This will be fixed shortly!