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

  1. … 131 more files in changeset.
Enhanced bus stress test to also test passive observation of server broadcasted messages

  1. … 2 more files in changeset.
- Massive refactoring to bus API - @Disposes methods now work properly with the async bean manager.

  1. … 241 more files in changeset.
fix SSE in the StandardAsyncServlet

  1. … 7 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.
MASSIVE bus refactoring. Bus now has a modular transport layer. All unit tests now passing. Some things still not done, however.

  1. … 40 more files in changeset.
async bean manager integration tests now work properly for out-of-order resource loads. Unit tests now simulate variable latency to ensure this works.

  1. … 37 more files in changeset.
Added checkbox for manipulating and observing bus.initialized state

Added bus control buttons to the status widget, then made the bus respond correctly to stop() and init()

  1. … 1 more file in changeset.
Added bus lifecycle monitor widget to stress test demo

massive refactoring: created new errai-config and errai-codegen-gwt package to resolve dependency cycles introduced by new ClassScanner system.

  1. … 81 more files in changeset.
Major code cleanup: make vars that can be final, fina. Fix spelling mistakes in APIs.

  1. … 71 more files in changeset.
Fix to ERRAI-323: prefer to page out queues which fall behind instead o aggressively disconnect them.

  1. … 5 more files in changeset.
Fix to ERRAI-323: prefer to page out queues which fall behind instead o aggressively disconnect them.

  1. … 5 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
    • +21
    ./jetty/WEB-INF/web.xml
    • -0
    • +46
    ./main/webapp/App.css
    • -0
    • +12
    ./main/webapp/App.html
    • -0
    • +21
    ./main/webapp/WEB-INF/web.xml
    • -0
    • +21
    ./tomcat/WEB-INF/web.xml
  1. … 165 more files in changeset.
Added explanatory comments to all ErraiApp.properties. Resolves ERRAI-182.

    • -28
    • +14
    ./main/resources/ErraiApp.properties
    • -11
    • +13
    ./test/resources/ErraiApp.properties
  1. … 29 more files in changeset.
giving the bus-stress-test more time to complete

fix failing test in bus stress test

  1. … 1 more file in changeset.
change operation ordering -- skipping SessionID resulting in badly placed comma

  1. … 1 more file in changeset.
remove all instances of 'org.jboss.errai.container.DevModeCDIBootstrap' and replace with 'org.jboss.errai.container.CDIServletStateListener'

  1. … 2 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)

    • -0
    • +0
    ./main/resources/ErraiService.properties
  1. … 302 more files in changeset.