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

    • -25
    • +0
    ./asyncdemo/src/jboss5/WEB-INF/web.xml
    • -25
    • +0
    ./bus-stress-test/src/jboss5/WEB-INF/web.xml
    • -25
    • +0
    ./bus-stress-test/src/jboss6/WEB-INF/web.xml
    • -25
    • +0
    ./clientservice/src/jboss5/WEB-INF/web.xml
  1. … 13 more files in changeset.
Removing demos from errai-bus dir (now part of errai-demos)

    • -25
    • +0
    ./asyncdemo/src/jboss7/WEB-INF/web.xml
    • -25
    • +0
    ./asyncdemo/src/jetty/WEB-INF/web.xml
    • -6
    • +0
    ./asyncdemo/src/main/resources/log4j.properties
    • -10
    • +0
    ./asyncdemo/src/main/webapp/App.html
    • -25
    • +0
    ./asyncdemo/src/tomcat/WEB-INF/web.xml
  1. … 131 more files in changeset.
Updated to new version 2.3.3-SNAPSHOT

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

  1. … 41 more files in changeset.
Merge branch '3.0.M1'

Conflicts:

errai-bus/demos/pom.xml

Enhanced bus stress test to also test passive observation of server broadcasted messages

Now disabling sync button while sync is in progress

  1. … 1 more file in changeset.
Updated to new version 2.3.2-SNAPSHOT

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

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

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

  1. … 51 more files in changeset.
Updated to new version 2.3.1-SNAPSHOT

  1. … 41 more files in changeset.
Updated to new version 2.3.0.Final

  1. … 50 more files in changeset.
Don't deploy demos for now (until we finished the demo refactoring)

  1. … 6 more files in changeset.
fixes

Merge branch '3.0'

Conflicts:

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

  1. … 3 more files in changeset.
add support for lazy loading of marshallers, default array marshallers are now disabled by default unless the types are @Portable members.

  1. … 10 more files in changeset.
Ensured build works without repo config and settings.xml

  1. … 32 more files in changeset.
Ensured build works without repo config and settings.xml

  1. … 32 more files in changeset.
Merge branch 'master' into 3.0

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/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-cdi/demos/errai-cdi-mobile-demo/pom.xml

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

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-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-grocery-list/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-navigation/pom.xml

errai-reflections/pom.xml

errai-reflections/reflections-maven/pom.xml

errai-reflections/reflections/pom.xml

errai-reflections/reflections/src/test/java/org/jboss/errai/reflections/MyTestModelStore.java

errai-tools/pom.xml

errai-ui/pom.xml

errai-uibinder/pom.xml

pom.xml

quickstart/pom.xml

reference/pom.xml

  1. … 18 more files in changeset.
Updated to version 2.3.0-SNAPSHOT

  1. … 41 more files in changeset.
Updated to new version 2.3.0.CR1

  1. … 57 more files in changeset.
Fixed ERRAI-511: ensure demos are deployed, defined all plugin version in pluginmanagement section of parent pom

  1. … 13 more files in changeset.
errai-bus demos are independent of errai-parent

errai-bus demos are independent of errai-parent

errai-bus demos are independent of errai-parent

Merge master into 3.0

Conflicts:

errai-bus/demos/pom.xml

errai-bus/pom.xml

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

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

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/weld-integration/pom.xml

errai-common/pom.xml

errai-ioc/pom.xml

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

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

pom.xml

  1. … 26 more files in changeset.
Added the maven-enforcer-plugin to the root pom and fixed the ensuing breakage

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

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

    • -19
    • +20
    ./bus-stress-test/src/jboss7/WEB-INF/web.xml
    • -1
    • +1
    ./bus-stress-test/src/main/webapp/WEB-INF/web.xml
  1. … 7 more files in changeset.