Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Merge branch 'release/2.0.3.Final'

  • Loading branch information...
commit 3db04ef9803252d076e6f888df34cab36a2ffc46 2 parents f01d6ff + 2c98d46
Marius Bogoevici mbogoevici authored
2  build/pom.xml
@@ -2,7 +2,7 @@
2 2 <parent>
3 3 <groupId>org.jboss.snowdrop</groupId>
4 4 <artifactId>snowdrop-parent</artifactId>
5   - <version>2.0.3.Final-SNAPSHOT</version>
  5 + <version>2.0.4.Final-SNAPSHOT</version>
6 6 </parent>
7 7 <modelVersion>4.0.0</modelVersion>
8 8 <artifactId>snowdrop</artifactId>
2  deployer-assembly/pom.xml
@@ -3,7 +3,7 @@
3 3 <parent>
4 4 <artifactId>snowdrop-parent</artifactId>
5 5 <groupId>org.jboss.snowdrop</groupId>
6   - <version>2.0.3.Final-SNAPSHOT</version>
  6 + <version>2.0.4.Final-SNAPSHOT</version>
7 7 </parent>
8 8 <modelVersion>4.0.0</modelVersion>
9 9 <artifactId>jboss-spring-deployer</artifactId>
2  deployers/deployers-aggregator/pom.xml
@@ -25,7 +25,7 @@
25 25 <parent>
26 26 <artifactId>snowdrop-deployers-parent</artifactId>
27 27 <groupId>org.jboss.snowdrop</groupId>
28   - <version>2.0.3.Final-SNAPSHOT</version>
  28 + <version>2.0.4.Final-SNAPSHOT</version>
29 29 </parent>
30 30 <modelVersion>4.0.0</modelVersion>
31 31
2  deployers/deployers-core/pom.xml
@@ -2,7 +2,7 @@
2 2 <parent>
3 3 <groupId>org.jboss.snowdrop</groupId>
4 4 <artifactId>snowdrop-deployers-parent</artifactId>
5   - <version>2.0.3.Final-SNAPSHOT</version>
  5 + <version>2.0.4.Final-SNAPSHOT</version>
6 6 </parent>
7 7 <modelVersion>4.0.0</modelVersion>
8 8 <artifactId>snowdrop-deployers-core</artifactId>
2  deployers/deployers-vfs2/pom.xml
@@ -24,7 +24,7 @@
24 24 <parent>
25 25 <groupId>org.jboss.snowdrop</groupId>
26 26 <artifactId>snowdrop-deployers-parent</artifactId>
27   - <version>2.0.3.Final-SNAPSHOT</version>
  27 + <version>2.0.4.Final-SNAPSHOT</version>
28 28 </parent>
29 29 <modelVersion>4.0.0</modelVersion>
30 30 <artifactId>snowdrop-deployers-vfs2</artifactId>
2  deployers/deployers-vfs3/pom.xml
@@ -24,7 +24,7 @@
24 24 <parent>
25 25 <groupId>org.jboss.snowdrop</groupId>
26 26 <artifactId>snowdrop-deployers-parent</artifactId>
27   - <version>2.0.3.Final-SNAPSHOT</version>
  27 + <version>2.0.4.Final-SNAPSHOT</version>
28 28 </parent>
29 29 <modelVersion>4.0.0</modelVersion>
30 30 <artifactId>snowdrop-deployers-vfs3</artifactId>
2  deployers/pom.xml
@@ -2,7 +2,7 @@
2 2 <parent>
3 3 <groupId>org.jboss.snowdrop</groupId>
4 4 <artifactId>snowdrop-parent</artifactId>
5   - <version>2.0.3.Final-SNAPSHOT</version>
  5 + <version>2.0.4.Final-SNAPSHOT</version>
6 6 </parent>
7 7 <modelVersion>4.0.0</modelVersion>
8 8 <artifactId>snowdrop-deployers-parent</artifactId>
2  facade/pom.xml
@@ -2,7 +2,7 @@
2 2 <parent>
3 3 <groupId>org.jboss.snowdrop</groupId>
4 4 <artifactId>snowdrop-parent</artifactId>
5   - <version>2.0.3.Final-SNAPSHOT</version>
  5 + <version>2.0.4.Final-SNAPSHOT</version>
6 6 </parent>
7 7 <modelVersion>4.0.0</modelVersion>
8 8 <artifactId>snowdrop-facade</artifactId>
2  namespace/pom.xml
@@ -3,7 +3,7 @@
3 3 <parent>
4 4 <artifactId>snowdrop-parent</artifactId>
5 5 <groupId>org.jboss.snowdrop</groupId>
6   - <version>2.0.3.Final-SNAPSHOT</version>
  6 + <version>2.0.4.Final-SNAPSHOT</version>
7 7 </parent>
8 8 <modelVersion>4.0.0</modelVersion>
9 9
4 pom.xml
@@ -7,7 +7,7 @@
7 7 </parent>
8 8 <groupId>org.jboss.snowdrop</groupId>
9 9 <artifactId>snowdrop-parent</artifactId>
10   - <version>2.0.3.Final-SNAPSHOT</version>
  10 + <version>2.0.4.Final-SNAPSHOT</version>
11 11 <packaging>pom</packaging>
12 12 <name>Snowdrop Parent POM</name>
13 13 <url>http://jboss.org/snowdrop</url>
@@ -51,7 +51,7 @@
51 51 <version.javaee>3.0.0.GA</version.javaee>
52 52 <version.xerces>2.9.1</version.xerces>
53 53 <version.aopalliance>1.0</version.aopalliance>
54   - <version.org.jboss.as7>7.1.0.CR1b</version.org.jboss.as7>
  54 + <version.org.jboss.as7>7.1.0.Final</version.org.jboss.as7>
55 55 <version.spring>2.5.6.SEC02</version.spring>
56 56 <version.org.jboss.jandex>1.0.0.Beta7</version.org.jboss.jandex>
57 57 <version.aspectj>1.6.6</version.aspectj>
2  subsystem-as7/aggregator/pom.xml
@@ -25,7 +25,7 @@
25 25 <parent>
26 26 <artifactId>snowdrop-subsystem-as7-parent</artifactId>
27 27 <groupId>org.jboss.snowdrop</groupId>
28   - <version>2.0.3.Final-SNAPSHOT</version>
  28 + <version>2.0.4.Final-SNAPSHOT</version>
29 29 </parent>
30 30 <modelVersion>4.0.0</modelVersion>
31 31
2  subsystem-as7/modules/pom.xml
@@ -25,7 +25,7 @@
25 25 <parent>
26 26 <artifactId>snowdrop-subsystem-as7-parent</artifactId>
27 27 <groupId>org.jboss.snowdrop</groupId>
28   - <version>2.0.3.Final-SNAPSHOT</version>
  28 + <version>2.0.4.Final-SNAPSHOT</version>
29 29 </parent>
30 30 <modelVersion>4.0.0</modelVersion>
31 31
2  subsystem-as7/modules/spring-2.5/pom.xml
@@ -25,7 +25,7 @@
25 25 <parent>
26 26 <artifactId>modules</artifactId>
27 27 <groupId>org.jboss.snowdrop</groupId>
28   - <version>2.0.3.Final-SNAPSHOT</version>
  28 + <version>2.0.4.Final-SNAPSHOT</version>
29 29 </parent>
30 30 <modelVersion>4.0.0</modelVersion>
31 31
2  subsystem-as7/modules/spring-3.1/pom.xml
@@ -25,7 +25,7 @@
25 25 <parent>
26 26 <artifactId>modules</artifactId>
27 27 <groupId>org.jboss.snowdrop</groupId>
28   - <version>2.0.3.Final-SNAPSHOT</version>
  28 + <version>2.0.4.Final-SNAPSHOT</version>
29 29 </parent>
30 30 <modelVersion>4.0.0</modelVersion>
31 31
2  subsystem-as7/modules/spring-3/pom.xml
@@ -25,7 +25,7 @@
25 25 <parent>
26 26 <artifactId>modules</artifactId>
27 27 <groupId>org.jboss.snowdrop</groupId>
28   - <version>2.0.3.Final-SNAPSHOT</version>
  28 + <version>2.0.4.Final-SNAPSHOT</version>
29 29 </parent>
30 30 <modelVersion>4.0.0</modelVersion>
31 31
2  subsystem-as7/pom.xml
@@ -3,7 +3,7 @@
3 3 <parent>
4 4 <artifactId>snowdrop-parent</artifactId>
5 5 <groupId>org.jboss.snowdrop</groupId>
6   - <version>2.0.3.Final-SNAPSHOT</version>
  6 + <version>2.0.4.Final-SNAPSHOT</version>
7 7 </parent>
8 8 <artifactId>snowdrop-subsystem-as7-parent</artifactId>
9 9 <name>Snowdrop AS7 Subsystem - Parent</name>
2  subsystem-as7/subsystem-as7/pom.xml
@@ -3,7 +3,7 @@
3 3 <parent>
4 4 <artifactId>snowdrop-subsystem-as7-parent</artifactId>
5 5 <groupId>org.jboss.snowdrop</groupId>
6   - <version>2.0.3.Final-SNAPSHOT</version>
  6 + <version>2.0.4.Final-SNAPSHOT</version>
7 7 <relativePath>..</relativePath>
8 8 </parent>
9 9 <artifactId>snowdrop-subsystem-as7</artifactId>
38 subsystem-as7/subsystem-as7/src/main/java/org/jboss/spring/deployers/as7/SpringDependencyProcessor.java
@@ -22,6 +22,9 @@
22 22
23 23 package org.jboss.spring.deployers.as7;
24 24
  25 +import java.lang.reflect.Constructor;
  26 +import java.lang.reflect.InvocationTargetException;
  27 +
25 28 import org.jboss.as.server.deployment.Attachments;
26 29 import org.jboss.as.server.deployment.DeploymentPhaseContext;
27 30 import org.jboss.as.server.deployment.DeploymentUnit;
@@ -31,7 +34,9 @@
31 34 import org.jboss.as.server.deployment.module.ModuleSpecification;
32 35 import org.jboss.modules.Module;
33 36 import org.jboss.modules.ModuleIdentifier;
  37 +import org.jboss.modules.ModuleLoader;
34 38 import org.jboss.modules.filter.PathFilters;
  39 +import org.springframework.util.ReflectionUtils;
35 40
36 41 /**
37 42 * @author Marius Bogoevici
@@ -59,7 +64,38 @@ public void deploy(DeploymentPhaseContext phaseContext) throws DeploymentUnitPro
59 64 }
60 65
61 66 private ModuleDependency addDependency(ModuleIdentifier moduleIdentifier, ModuleSpecification moduleSpecification) {
62   - ModuleDependency moduleDependency = new ModuleDependency(Module.getBootModuleLoader(), moduleIdentifier, false, false, true);
  67 + ModuleDependency moduleDependency = null;
  68 + try {
  69 + // try pre-JBoss Modules 1.1.1
  70 + Constructor<ModuleDependency> constructor = ModuleDependency.class.getConstructor(ModuleLoader.class, ModuleIdentifier.class, boolean.class, boolean.class, boolean.class);
  71 + moduleDependency = constructor.newInstance(Module.getBootModuleLoader(), moduleIdentifier, false, false, true);
  72 + } catch (NoSuchMethodException e) {
  73 + // ignore
  74 + } catch (InvocationTargetException e) {
  75 + throw new RuntimeException(e);
  76 + } catch (InstantiationException e) {
  77 + throw new RuntimeException(e);
  78 + } catch (IllegalAccessException e) {
  79 + throw new RuntimeException(e);
  80 + }
  81 + if (moduleDependency == null) {
  82 + try {
  83 + // try JBoss Modules 1.1.1
  84 + Constructor<ModuleDependency> constructor = ModuleDependency.class.getConstructor(ModuleLoader.class, ModuleIdentifier.class, boolean.class, boolean.class, boolean.class, boolean.class);
  85 + moduleDependency = constructor.newInstance(Module.getBootModuleLoader(), moduleIdentifier, false, false, true, true);
  86 + } catch (NoSuchMethodException e) {
  87 + // ignore
  88 + } catch (InvocationTargetException e) {
  89 + throw new RuntimeException(e);
  90 + } catch (InstantiationException e) {
  91 + throw new RuntimeException(e);
  92 + } catch (IllegalAccessException e) {
  93 + throw new RuntimeException(e);
  94 + }
  95 + }
  96 + if (moduleDependency == null) {
  97 + throw new IllegalStateException("JBoss Modules incompatibility: cannot find a suitable constructor for ModuleDependency");
  98 + }
63 99 moduleDependency.addExportFilter(PathFilters.acceptAll(), true);
64 100 moduleDependency.addImportFilter(PathFilters.acceptAll(), true);
65 101 moduleSpecification.addUserDependency(moduleDependency);
2  subsystem-as7/subsystem-as7/src/main/java/org/jboss/spring/deployers/as7/SpringSubsystemAdd.java
@@ -52,7 +52,7 @@ protected void performBoottime(OperationContext operationContext, ModelNode mode
52 52 log.info("Activating Spring Deployer subsystem");
53 53 operationContext.addStep(new AbstractDeploymentChainStep() {
54 54 protected void execute(DeploymentProcessorTarget bootContext) {
55   - bootContext.addDeploymentProcessor(Phase.PARSE, Phase.STRUCTURE_JBOSS_DEPLOYMENT_STRUCTURE_DESCRIPTOR + 1, new SpringStructureProcessor());
  55 + bootContext.addDeploymentProcessor(Phase.STRUCTURE, Phase.STRUCTURE_JBOSS_DEPLOYMENT_STRUCTURE_DESCRIPTOR + 1, new SpringStructureProcessor());
56 56 bootContext.addDeploymentProcessor(Phase.PARSE, Phase.PARSE_DEPENDENCIES_MANIFEST, new SpringDependencyProcessor());
57 57 bootContext.addDeploymentProcessor(Phase.INSTALL, Integer.MAX_VALUE, new SpringBootstrapProcessor());
58 58 }
2  vfs/pom.xml
@@ -2,7 +2,7 @@
2 2 <parent>
3 3 <groupId>org.jboss.snowdrop</groupId>
4 4 <artifactId>snowdrop-parent</artifactId>
5   - <version>2.0.3.Final-SNAPSHOT</version>
  5 + <version>2.0.4.Final-SNAPSHOT</version>
6 6 </parent>
7 7 <modelVersion>4.0.0</modelVersion>
8 8 <artifactId>snowdrop-vfs</artifactId>
2  weaving/pom.xml
@@ -2,7 +2,7 @@
2 2 <parent>
3 3 <groupId>org.jboss.snowdrop</groupId>
4 4 <artifactId>snowdrop-parent</artifactId>
5   - <version>2.0.3.Final-SNAPSHOT</version>
  5 + <version>2.0.4.Final-SNAPSHOT</version>
6 6 </parent>
7 7 <modelVersion>4.0.0</modelVersion>
8 8 <artifactId>snowdrop-weaving</artifactId>

0 comments on commit 3db04ef

Please sign in to comment.
Something went wrong with that request. Please try again.