Errai

Clone Tools
  • last updated a few minutes ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge branch 'master' into gwt2.5-integration

Conflicts:

errai-codegen/src/main/java/org/jboss/errai/codegen/meta/impl/build/BuildMetaClass.java

fix to allow forward references from initializers of class fields in the code generator. also, put producer callbacks back inside their parent callbacks

fixes to BuildMetaClass

Merge branch '2.1' into gwt2.5-integration

Conflicts:

errai-codegen/src/main/java/org/jboss/errai/codegen/meta/impl/build/BuildMetaClass.java

reimplemented fix on 2.1

this is a fake merge -- reimplemented fix on 2.1

this is a fake merge -- reimplemented fix on 2.1

merge

have before tasks occur in instance initializer block

IOC before tasks must occur in the static initializer of the Bootstrapper

Merge branch '2.1' into gwt2.5-integration

Conflicts:

errai-codegen/src/main/java/org/jboss/errai/codegen/meta/impl/build/BuildMetaClass.java

merge

IOC before tasks must occur in the static initializer of the Bootstrapper

Merge branch 'master' into 2.1

Conflicts:

errai-marshalling/src/main/java/org/jboss/errai/marshalling/rebind/api/impl/defaultjava/DefaultJavaMappingStrategy.java

Merge branch 'master' into 2.1

- add support for static initializers in generated classes - fix UiBinder incompatibility with new bootstrapper approach in IOC

Fixed ERRAI-329: marshaller generation problem when using public fields

Merge branch '2.1' into gwt2.5-integration

Conflicts:

errai-codegen/src/main/java/org/jboss/errai/codegen/Context.java

errai-codegen/src/main/java/org/jboss/errai/codegen/MethodInvocation.java

errai-marshalling/src/main/java/org/jboss/errai/marshalling/rebind/DefinitionsFactoryImpl.java

errai-marshalling/src/main/java/org/jboss/errai/marshalling/server/MappingContextSingleton.java

apply fix to 2.1 to avoid IOC bootstrapper method becoming too large -- this is not a direct merge as APIs have diverged.

Merge branch 'master' into 2.1

Conflicts:

errai-cdi/errai-cdi-client/src/main/java/org/jboss/errai/enterprise/rebind/JSR299IOCExtensionConfigurator.java

errai-ioc/src/main/java/org/jboss/errai/ioc/rebind/ioc/bootstrapper/IOCBootstrapGenerator.java

errai-ioc/src/main/java/org/jboss/errai/ioc/rebind/ioc/bootstrapper/IOCProcessingContext.java

errai-ioc/src/main/java/org/jboss/errai/ioc/rebind/ioc/bootstrapper/IOCProcessorFactory.java

errai-ioc/src/main/java/org/jboss/errai/ioc/rebind/ioc/injector/TypeInjector.java

Change IOC Bootstrapper generation to prevent method size overloading.

Merge branch '2.1' of https://github.com/errai/errai into 2.1

Merge branch 'master' into 2.1

Conflicts:

errai-marshalling/src/main/java/org/jboss/errai/marshalling/rebind/DefinitionsFactory.java

errai-marshalling/src/main/java/org/jboss/errai/marshalling/rebind/api/impl/defaultjava/DefaultJavaMappingStrategy.java

Code cleanup. Codegen Context now records unresolved symbols and allows permissive mode to be set in the Context.

  1. … 4 more files in changeset.
Improved fix for ERRAI-348 to support marshalling of arrays of interfaces or abstract types

code cleanup

  1. … 56 more files in changeset.
Merge branch '2.1' into gwt2.5-integration

Conflicts:

errai-ioc/src/main/java/org/jboss/errai/ioc/rebind/ioc/builtin/ServiceIOCExtension.java

errai-ioc/src/main/java/org/jboss/errai/ioc/rebind/ioc/graph/GraphSort.java

Merge branch 'master' into 2.1

Conflicts:

errai-ioc/src/main/java/org/jboss/errai/ioc/rebind/ioc/bootstrapper/IOCProcessorFactory.java

re-fix to graph partitioning algorithm

Merge branch 'master' into 2.1