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. … 16 more files in changeset.
Removing demos from errai-bus dir (now part of errai-demos)

    • -18
    • +0
    ./main/resources/ErraiApp.properties
    • -23
    • +0
    ./main/resources/ErraiService.properties
  1. … 133 more files in changeset.
- Massive refactoring to bus API - @Disposes methods now work properly with the async bean manager.

  1. … 245 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. … 132 more files in changeset.
Fix for ERRAI-284: Make ErraiService.properties optional

    • -5
    • +0
    ./main/resources/ErraiService.properties
  1. … 6 more files in changeset.
ensured auto-discover-services is on for all profiles in the bus demos

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

  1. … 49 more files in changeset.
adding jboss6 profile to bus and jaxrs demos

    • -0
    • +22
    ./jboss6/WEB-INF/web.xml
  1. … 11 more files in changeset.
ERRAI-259: modernized bus demos, build configuration moved to bus demo parent pom

    • -0
    • +22
    ./jboss5/WEB-INF/web.xml
    • -0
    • +1
    ./jboss7/META-INF/MANIFEST.MF
    • -0
    • +22
    ./jboss7/WEB-INF/web.xml
    • -0
    • +23
    ./jetty/WEB-INF/web.xml
    • -0
    • +0
    ./main/resources/ErraiService.properties
    • -28
    • +0
    ./main/java/ErraiService.properties
    • -0
    • +10
    ./main/webapp/App.html
    • -0
    • +23
    ./main/webapp/WEB-INF/web.xml
  1. … 163 more files in changeset.
Added explanatory comments to all ErraiApp.properties. Resolves ERRAI-182.

  1. … 30 more files in changeset.
Cleanup after merge-in of CDI and JAX-RS modules

* moved bus demos under errai-bus/demos to reflect the setup in CDI and JAX-RS

* fixed warnings in POMs

* pointed various POMs up at errai-parent, and added them back as submodules

* added CDI and JAX-RS to the main distribution

* removed docs from CDI (will merge in wiki and re-export in a future commit)

  1. … 309 more files in changeset.