Permalink
Browse files

Use metadata to specify web defaults.

This prevents the TorqueBox defaults from stomping ours in an overlay
situation.
  • Loading branch information...
1 parent 9da5a64 commit 19556d3cefd79fb89349db5503d694c1784d2ad4 @tobias tobias committed Mar 7, 2013
@@ -66,7 +66,7 @@ protected void execute(DeploymentProcessorTarget processorTarget) {
protected void addDeploymentProcessors(final DeploymentProcessorTarget processorTarget) {
processorTarget.addDeploymentProcessor( WebExtension.SUBSYSTEM_NAME, Phase.PARSE, 0, new RingApplicationRecognizer() );
- processorTarget.addDeploymentProcessor( WebExtension.SUBSYSTEM_NAME, Phase.PARSE, 60, new WebApplicationDefaultsProcessor( false, true ) );
+ processorTarget.addDeploymentProcessor( WebExtension.SUBSYSTEM_NAME, Phase.PARSE, 60, new WebApplicationDefaultsProcessor() );
processorTarget.addDeploymentProcessor( WebExtension.SUBSYSTEM_NAME, Phase.PARSE, 70, new RingWebApplicationInstaller() );
processorTarget.addDeploymentProcessor( WebExtension.SUBSYSTEM_NAME, Phase.DEPENDENCIES, 1, new WebDependenciesProcessor() );
@@ -19,7 +19,6 @@
package org.immutant.web.ring;
-import java.util.ArrayList;
import java.util.List;
import org.immutant.core.ClojureMetaData;
@@ -45,6 +44,11 @@ public RingMetaData(ClojureMetaData appMetaData) {
}
@Override
+ public boolean forceDefaultContext() {
+ return false;
+ }
+
+ @Override
public void attachTo(DeploymentUnit unit) {
super.attachTo( unit );
unit.putAttachment( ATTACHMENT_KEY, this );
View
@@ -344,7 +344,7 @@
</dependencyManagement>
<properties>
- <version.polyglot>1.x.incremental.14</version.polyglot>
+ <version.polyglot>1.x.incremental.15</version.polyglot>
<version.junit>4.7</version.junit>
<version.jmock>2.5.1</version.jmock>
<version.mockito>1.8.4</version.mockito>

0 comments on commit 19556d3

Please sign in to comment.