Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'release/2.0.3.Final'

  • Loading branch information...
commit 3db04ef9803252d076e6f888df34cab36a2ffc46 2 parents f01d6ff + 2c98d46
Marius Bogoevici mbogoevici authored
2  build/pom.xml
View
@@ -2,7 +2,7 @@
<parent>
<groupId>org.jboss.snowdrop</groupId>
<artifactId>snowdrop-parent</artifactId>
- <version>2.0.3.Final-SNAPSHOT</version>
+ <version>2.0.4.Final-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>snowdrop</artifactId>
2  deployer-assembly/pom.xml
View
@@ -3,7 +3,7 @@
<parent>
<artifactId>snowdrop-parent</artifactId>
<groupId>org.jboss.snowdrop</groupId>
- <version>2.0.3.Final-SNAPSHOT</version>
+ <version>2.0.4.Final-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jboss-spring-deployer</artifactId>
2  deployers/deployers-aggregator/pom.xml
View
@@ -25,7 +25,7 @@
<parent>
<artifactId>snowdrop-deployers-parent</artifactId>
<groupId>org.jboss.snowdrop</groupId>
- <version>2.0.3.Final-SNAPSHOT</version>
+ <version>2.0.4.Final-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
2  deployers/deployers-core/pom.xml
View
@@ -2,7 +2,7 @@
<parent>
<groupId>org.jboss.snowdrop</groupId>
<artifactId>snowdrop-deployers-parent</artifactId>
- <version>2.0.3.Final-SNAPSHOT</version>
+ <version>2.0.4.Final-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>snowdrop-deployers-core</artifactId>
2  deployers/deployers-vfs2/pom.xml
View
@@ -24,7 +24,7 @@
<parent>
<groupId>org.jboss.snowdrop</groupId>
<artifactId>snowdrop-deployers-parent</artifactId>
- <version>2.0.3.Final-SNAPSHOT</version>
+ <version>2.0.4.Final-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>snowdrop-deployers-vfs2</artifactId>
2  deployers/deployers-vfs3/pom.xml
View
@@ -24,7 +24,7 @@
<parent>
<groupId>org.jboss.snowdrop</groupId>
<artifactId>snowdrop-deployers-parent</artifactId>
- <version>2.0.3.Final-SNAPSHOT</version>
+ <version>2.0.4.Final-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>snowdrop-deployers-vfs3</artifactId>
2  deployers/pom.xml
View
@@ -2,7 +2,7 @@
<parent>
<groupId>org.jboss.snowdrop</groupId>
<artifactId>snowdrop-parent</artifactId>
- <version>2.0.3.Final-SNAPSHOT</version>
+ <version>2.0.4.Final-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>snowdrop-deployers-parent</artifactId>
2  facade/pom.xml
View
@@ -2,7 +2,7 @@
<parent>
<groupId>org.jboss.snowdrop</groupId>
<artifactId>snowdrop-parent</artifactId>
- <version>2.0.3.Final-SNAPSHOT</version>
+ <version>2.0.4.Final-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>snowdrop-facade</artifactId>
2  namespace/pom.xml
View
@@ -3,7 +3,7 @@
<parent>
<artifactId>snowdrop-parent</artifactId>
<groupId>org.jboss.snowdrop</groupId>
- <version>2.0.3.Final-SNAPSHOT</version>
+ <version>2.0.4.Final-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
4 pom.xml
View
@@ -7,7 +7,7 @@
</parent>
<groupId>org.jboss.snowdrop</groupId>
<artifactId>snowdrop-parent</artifactId>
- <version>2.0.3.Final-SNAPSHOT</version>
+ <version>2.0.4.Final-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Snowdrop Parent POM</name>
<url>http://jboss.org/snowdrop</url>
@@ -51,7 +51,7 @@
<version.javaee>3.0.0.GA</version.javaee>
<version.xerces>2.9.1</version.xerces>
<version.aopalliance>1.0</version.aopalliance>
- <version.org.jboss.as7>7.1.0.CR1b</version.org.jboss.as7>
+ <version.org.jboss.as7>7.1.0.Final</version.org.jboss.as7>
<version.spring>2.5.6.SEC02</version.spring>
<version.org.jboss.jandex>1.0.0.Beta7</version.org.jboss.jandex>
<version.aspectj>1.6.6</version.aspectj>
2  subsystem-as7/aggregator/pom.xml
View
@@ -25,7 +25,7 @@
<parent>
<artifactId>snowdrop-subsystem-as7-parent</artifactId>
<groupId>org.jboss.snowdrop</groupId>
- <version>2.0.3.Final-SNAPSHOT</version>
+ <version>2.0.4.Final-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
2  subsystem-as7/modules/pom.xml
View
@@ -25,7 +25,7 @@
<parent>
<artifactId>snowdrop-subsystem-as7-parent</artifactId>
<groupId>org.jboss.snowdrop</groupId>
- <version>2.0.3.Final-SNAPSHOT</version>
+ <version>2.0.4.Final-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
2  subsystem-as7/modules/spring-2.5/pom.xml
View
@@ -25,7 +25,7 @@
<parent>
<artifactId>modules</artifactId>
<groupId>org.jboss.snowdrop</groupId>
- <version>2.0.3.Final-SNAPSHOT</version>
+ <version>2.0.4.Final-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
2  subsystem-as7/modules/spring-3.1/pom.xml
View
@@ -25,7 +25,7 @@
<parent>
<artifactId>modules</artifactId>
<groupId>org.jboss.snowdrop</groupId>
- <version>2.0.3.Final-SNAPSHOT</version>
+ <version>2.0.4.Final-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
2  subsystem-as7/modules/spring-3/pom.xml
View
@@ -25,7 +25,7 @@
<parent>
<artifactId>modules</artifactId>
<groupId>org.jboss.snowdrop</groupId>
- <version>2.0.3.Final-SNAPSHOT</version>
+ <version>2.0.4.Final-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
2  subsystem-as7/pom.xml
View
@@ -3,7 +3,7 @@
<parent>
<artifactId>snowdrop-parent</artifactId>
<groupId>org.jboss.snowdrop</groupId>
- <version>2.0.3.Final-SNAPSHOT</version>
+ <version>2.0.4.Final-SNAPSHOT</version>
</parent>
<artifactId>snowdrop-subsystem-as7-parent</artifactId>
<name>Snowdrop AS7 Subsystem - Parent</name>
2  subsystem-as7/subsystem-as7/pom.xml
View
@@ -3,7 +3,7 @@
<parent>
<artifactId>snowdrop-subsystem-as7-parent</artifactId>
<groupId>org.jboss.snowdrop</groupId>
- <version>2.0.3.Final-SNAPSHOT</version>
+ <version>2.0.4.Final-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<artifactId>snowdrop-subsystem-as7</artifactId>
38 subsystem-as7/subsystem-as7/src/main/java/org/jboss/spring/deployers/as7/SpringDependencyProcessor.java
View
@@ -22,6 +22,9 @@
package org.jboss.spring.deployers.as7;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
+
import org.jboss.as.server.deployment.Attachments;
import org.jboss.as.server.deployment.DeploymentPhaseContext;
import org.jboss.as.server.deployment.DeploymentUnit;
@@ -31,7 +34,9 @@
import org.jboss.as.server.deployment.module.ModuleSpecification;
import org.jboss.modules.Module;
import org.jboss.modules.ModuleIdentifier;
+import org.jboss.modules.ModuleLoader;
import org.jboss.modules.filter.PathFilters;
+import org.springframework.util.ReflectionUtils;
/**
* @author Marius Bogoevici
@@ -59,7 +64,38 @@ public void deploy(DeploymentPhaseContext phaseContext) throws DeploymentUnitPro
}
private ModuleDependency addDependency(ModuleIdentifier moduleIdentifier, ModuleSpecification moduleSpecification) {
- ModuleDependency moduleDependency = new ModuleDependency(Module.getBootModuleLoader(), moduleIdentifier, false, false, true);
+ ModuleDependency moduleDependency = null;
+ try {
+ // try pre-JBoss Modules 1.1.1
+ Constructor<ModuleDependency> constructor = ModuleDependency.class.getConstructor(ModuleLoader.class, ModuleIdentifier.class, boolean.class, boolean.class, boolean.class);
+ moduleDependency = constructor.newInstance(Module.getBootModuleLoader(), moduleIdentifier, false, false, true);
+ } catch (NoSuchMethodException e) {
+ // ignore
+ } catch (InvocationTargetException e) {
+ throw new RuntimeException(e);
+ } catch (InstantiationException e) {
+ throw new RuntimeException(e);
+ } catch (IllegalAccessException e) {
+ throw new RuntimeException(e);
+ }
+ if (moduleDependency == null) {
+ try {
+ // try JBoss Modules 1.1.1
+ Constructor<ModuleDependency> constructor = ModuleDependency.class.getConstructor(ModuleLoader.class, ModuleIdentifier.class, boolean.class, boolean.class, boolean.class, boolean.class);
+ moduleDependency = constructor.newInstance(Module.getBootModuleLoader(), moduleIdentifier, false, false, true, true);
+ } catch (NoSuchMethodException e) {
+ // ignore
+ } catch (InvocationTargetException e) {
+ throw new RuntimeException(e);
+ } catch (InstantiationException e) {
+ throw new RuntimeException(e);
+ } catch (IllegalAccessException e) {
+ throw new RuntimeException(e);
+ }
+ }
+ if (moduleDependency == null) {
+ throw new IllegalStateException("JBoss Modules incompatibility: cannot find a suitable constructor for ModuleDependency");
+ }
moduleDependency.addExportFilter(PathFilters.acceptAll(), true);
moduleDependency.addImportFilter(PathFilters.acceptAll(), true);
moduleSpecification.addUserDependency(moduleDependency);
2  subsystem-as7/subsystem-as7/src/main/java/org/jboss/spring/deployers/as7/SpringSubsystemAdd.java
View
@@ -52,7 +52,7 @@ protected void performBoottime(OperationContext operationContext, ModelNode mode
log.info("Activating Spring Deployer subsystem");
operationContext.addStep(new AbstractDeploymentChainStep() {
protected void execute(DeploymentProcessorTarget bootContext) {
- bootContext.addDeploymentProcessor(Phase.PARSE, Phase.STRUCTURE_JBOSS_DEPLOYMENT_STRUCTURE_DESCRIPTOR + 1, new SpringStructureProcessor());
+ bootContext.addDeploymentProcessor(Phase.STRUCTURE, Phase.STRUCTURE_JBOSS_DEPLOYMENT_STRUCTURE_DESCRIPTOR + 1, new SpringStructureProcessor());
bootContext.addDeploymentProcessor(Phase.PARSE, Phase.PARSE_DEPENDENCIES_MANIFEST, new SpringDependencyProcessor());
bootContext.addDeploymentProcessor(Phase.INSTALL, Integer.MAX_VALUE, new SpringBootstrapProcessor());
}
2  vfs/pom.xml
View
@@ -2,7 +2,7 @@
<parent>
<groupId>org.jboss.snowdrop</groupId>
<artifactId>snowdrop-parent</artifactId>
- <version>2.0.3.Final-SNAPSHOT</version>
+ <version>2.0.4.Final-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>snowdrop-vfs</artifactId>
2  weaving/pom.xml
View
@@ -2,7 +2,7 @@
<parent>
<groupId>org.jboss.snowdrop</groupId>
<artifactId>snowdrop-parent</artifactId>
- <version>2.0.3.Final-SNAPSHOT</version>
+ <version>2.0.4.Final-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>snowdrop-weaving</artifactId>
Please sign in to comment.
Something went wrong with that request. Please try again.