09 Sep, 2013
14 commits
-
Conflicts: impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/bootstrap/ManagementBootstrap.java impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/Management.java impl/extension/jmx/src/main/java/br/gov/frameworkdemoiselle/internal/DynamicMBeanProxy.java impl/extension/jmx/src/main/java/br/gov/frameworkdemoiselle/internal/JMXManagementExtension.java impl/extension/jmx/src/main/java/br/gov/frameworkdemoiselle/internal/NotificationEventListener.java impl/extension/jsf/src/test/java/test/Tests.java
-
Conflicts: impl/extension/jmx/src/main/java/br/gov/frameworkdemoiselle/internal/DynamicMBeanProxy.java
06 Sep, 2013
16 commits
-
Conflicts: impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/bootstrap/ManagementBootstrap.java impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/management/Management.java
-
(client/server)
-
Conflicts: impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/context/ContextManager.java impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/context/CustomContext.java impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/context/ManagedContext.java impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/context/ThreadLocalContext.java
05 Sep, 2013
10 commits