Clone Tools
  • last updated a few seconds 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. … 16 more files in changeset.
refactor JBoss 7 support into seperate modules. This involves making the Vfs stuff for Reflections pluggable and discoverable as an ErraiApp.properties flag. Also, support for AS6 is now dropped.

Added new ChaosMonkeyServlet for testing. Session recovery also now fixed.

  1. … 133 more files in changeset.
update web.xml and ErraiService.properties to add needed config and remove unneeded config

  1. … 53 more files in changeset.
ERRAI-259: modernized bus demos, build configuration moved to bus demo parent pom

  1. … 177 more files in changeset.