Clone Tools
  • last updated 25 mins ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge remote-tracking branch 'origin/master' into ide

# Conflicts:

# core/config/src/main/java/org/apache/isis/config/viewer/wicket/WebAppContextPath.java

# core/security/shiro/src/main/java/org/apache/isis/security/shiro/webmodule/WebModuleShiro.java

# core/viewers/restfulobjects/jaxrs-resteasy-4/src/main/java/org/apache/isis/viewer/restfulobjects/jaxrsresteasy4/webmodule/WebModuleJaxrsResteasy4.java

# core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/webmodule/IsisRestfulObjectsSessionFilter.java

# core/webapp/src/main/java/org/apache/isis/webapp/modules/templresources/TemplateResourceServlet.java

# valuetypes/sse/src/main/java/org/apache/isis/extensions/sse/webmodule/ServerSentEventsServlet.java

  1. … 8 more files in changeset.
ISIS-2259: fixes package names for isis-core-config

  1. … 265 more files in changeset.
ISIS-2259: fixes package for isis-core-commons

  1. … 1030 more files in changeset.
Merge remote-tracking branch 'origin/master' into ide

  1. … 2 more files in changeset.
ISIS-2259: reorg sse module

  1. … 40 more files in changeset.