Permalink
Browse files

Update to 7.1.x.incremental.1.

  • Loading branch information...
1 parent da864be commit c6c902a3395d270f9e48b09d28aeb7e14fdd3fe3 @tobias tobias committed Jun 18, 2012
@@ -35,3 +35,4 @@
end
FileUtils.rm_rf( Dir["#{output_dir}/jboss/standalone/log/*"] )
+FileUtils.mkdir_p( "#{output_dir}/jboss/standalone/deployments/" )
@@ -59,9 +59,9 @@ protected void execute(DeploymentProcessorTarget processorTarget) {
protected void addDeploymentProcessors(final DeploymentProcessorTarget processorTarget) {
- processorTarget.addDeploymentProcessor( Phase.DEPENDENCIES, 1, new CacheDependenciesProcessor() );
+ processorTarget.addDeploymentProcessor( CacheExtension.SUBSYSTEM_NAME, Phase.DEPENDENCIES, 1, new CacheDependenciesProcessor() );
- processorTarget.addDeploymentProcessor( Phase.POST_MODULE, 200, new PossiblyLeakingClusterAwareCacheManagerDependencyInator() );
+ processorTarget.addDeploymentProcessor( CacheExtension.SUBSYSTEM_NAME, Phase.POST_MODULE, 200, new PossiblyLeakingClusterAwareCacheManagerDependencyInator() );
}
static ModelNode createOperation(ModelNode address) {
View
@@ -94,6 +94,13 @@
<artifactId>jboss-logging</artifactId>
<scope>provided</scope>
</dependency>
+
+ <!-- needed so we can get its version for the build info -->
+ <dependency>
+ <groupId>org.hornetq</groupId>
+ <artifactId>hornetq-core</artifactId>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
<build>
@@ -87,22 +87,22 @@ protected void execute(DeploymentProcessorTarget processorTarget) {
}
protected void addDeploymentProcessors(final DeploymentProcessorTarget processorTarget) {
- processorTarget.addDeploymentProcessor( Phase.STRUCTURE, 0, new DescriptorRootMountProcessor( Immutant.DESCRIPTOR_SUFFIX ) );
- processorTarget.addDeploymentProcessor( Phase.STRUCTURE, 0, new ArchiveStructureProcessor( Immutant.ARCHIVE_SUFFIX ) );
- processorTarget.addDeploymentProcessor( Phase.STRUCTURE, Phase.STRUCTURE_MOUNT + 10, new ArchiveRecognizer() );
- processorTarget.addDeploymentProcessor( Phase.STRUCTURE, Phase.STRUCTURE_MOUNT + 20, new DeploymentDescriptorParsingProcessor() );
- processorTarget.addDeploymentProcessor( Phase.STRUCTURE, Phase.STRUCTURE_MOUNT + 30, new ApplicationExploder() );
- processorTarget.addDeploymentProcessor( Phase.STRUCTURE, Phase.STRUCTURE_MOUNT + 50, new FullAppConfigLoadingProcessor() );
- processorTarget.addDeploymentProcessor( Phase.STRUCTURE, Phase.STRUCTURE_MOUNT + 100, new AppDependenciesProcessor() );
+ processorTarget.addDeploymentProcessor( CoreExtension.SUBSYSTEM_NAME, Phase.STRUCTURE, 0, new DescriptorRootMountProcessor( Immutant.DESCRIPTOR_SUFFIX ) );
+ processorTarget.addDeploymentProcessor( CoreExtension.SUBSYSTEM_NAME, Phase.STRUCTURE, 0, new ArchiveStructureProcessor( Immutant.ARCHIVE_SUFFIX ) );
+ processorTarget.addDeploymentProcessor( CoreExtension.SUBSYSTEM_NAME, Phase.STRUCTURE, Phase.STRUCTURE_MOUNT + 10, new ArchiveRecognizer() );
+ processorTarget.addDeploymentProcessor( CoreExtension.SUBSYSTEM_NAME, Phase.STRUCTURE, Phase.STRUCTURE_MOUNT + 20, new DeploymentDescriptorParsingProcessor() );
+ processorTarget.addDeploymentProcessor( CoreExtension.SUBSYSTEM_NAME, Phase.STRUCTURE, Phase.STRUCTURE_MOUNT + 30, new ApplicationExploder() );
+ processorTarget.addDeploymentProcessor( CoreExtension.SUBSYSTEM_NAME, Phase.STRUCTURE, Phase.STRUCTURE_MOUNT + 50, new FullAppConfigLoadingProcessor() );
+ processorTarget.addDeploymentProcessor( CoreExtension.SUBSYSTEM_NAME, Phase.STRUCTURE, Phase.STRUCTURE_MOUNT + 100, new AppDependenciesProcessor() );
- processorTarget.addDeploymentProcessor( Phase.DEPENDENCIES, 1, new CoreDependenciesProcessor() );
+ processorTarget.addDeploymentProcessor( CoreExtension.SUBSYSTEM_NAME, Phase.DEPENDENCIES, 1, new CoreDependenciesProcessor() );
- processorTarget.addDeploymentProcessor( Phase.POST_MODULE, 120, new ClojureRuntimeInstaller() );
- processorTarget.addDeploymentProcessor( Phase.POST_MODULE, 130, new CloserInstaller() );
- processorTarget.addDeploymentProcessor( Phase.POST_MODULE, 140, new AppNameRegisteringProcessor() );
- processorTarget.addDeploymentProcessor( Phase.POST_MODULE, 141, new AppRootRegisteringProcessor() );
+ processorTarget.addDeploymentProcessor( CoreExtension.SUBSYSTEM_NAME, Phase.POST_MODULE, 120, new ClojureRuntimeInstaller() );
+ processorTarget.addDeploymentProcessor( CoreExtension.SUBSYSTEM_NAME, Phase.POST_MODULE, 130, new CloserInstaller() );
+ processorTarget.addDeploymentProcessor( CoreExtension.SUBSYSTEM_NAME, Phase.POST_MODULE, 140, new AppNameRegisteringProcessor() );
+ processorTarget.addDeploymentProcessor( CoreExtension.SUBSYSTEM_NAME, Phase.POST_MODULE, 141, new AppRootRegisteringProcessor() );
- processorTarget.addDeploymentProcessor( Phase.INSTALL, 10000, new ApplicationInitializer() );
+ processorTarget.addDeploymentProcessor( CoreExtension.SUBSYSTEM_NAME, Phase.INSTALL, 10000, new ApplicationInitializer() );
}
@SuppressWarnings("serial")
@@ -59,9 +59,9 @@ protected void execute(DeploymentProcessorTarget processorTarget) {
protected void addDeploymentProcessors(final DeploymentProcessorTarget processorTarget) {
- processorTarget.addDeploymentProcessor( Phase.DEPENDENCIES, 1, new DaemonsDependenciesProcessor() );
+ processorTarget.addDeploymentProcessor( DaemonsExtension.SUBSYSTEM_NAME, Phase.DEPENDENCIES, 1, new DaemonsDependenciesProcessor() );
- processorTarget.addDeploymentProcessor( Phase.POST_MODULE, 200, new DaemonizerInstaller() );
+ processorTarget.addDeploymentProcessor( DaemonsExtension.SUBSYSTEM_NAME, Phase.POST_MODULE, 200, new DaemonizerInstaller() );
}
@@ -59,9 +59,9 @@ protected void execute(DeploymentProcessorTarget processorTarget) {
protected void addDeploymentProcessors(final DeploymentProcessorTarget processorTarget) {
- processorTarget.addDeploymentProcessor( Phase.DEPENDENCIES, 1, new JobsDependenciesProcessor() );
+ processorTarget.addDeploymentProcessor( JobsExtension.SUBSYSTEM_NAME, Phase.DEPENDENCIES, 1, new JobsDependenciesProcessor() );
- processorTarget.addDeploymentProcessor( Phase.POST_MODULE, 200, new JobSchedulizerInstaller() );
+ processorTarget.addDeploymentProcessor( JobsExtension.SUBSYSTEM_NAME, Phase.POST_MODULE, 200, new JobSchedulizerInstaller() );
}
static ModelNode createOperation(ModelNode address) {
@@ -65,8 +65,8 @@ protected void execute(DeploymentProcessorTarget processorTarget) {
protected void addDeploymentProcessors(final DeploymentProcessorTarget processorTarget) {
- processorTarget.addDeploymentProcessor( Phase.DEPENDENCIES, 3, new MessagingDependenciesProcessor() );
- processorTarget.addDeploymentProcessor( Phase.POST_MODULE, 11, new ApplicationNamingContextBindingProcessor() );
+ processorTarget.addDeploymentProcessor( MessagingExtension.SUBSYSTEM_NAME, Phase.DEPENDENCIES, 3, new MessagingDependenciesProcessor() );
+ processorTarget.addDeploymentProcessor( MessagingExtension.SUBSYSTEM_NAME, Phase.POST_MODULE, 11, new ApplicationNamingContextBindingProcessor() );
}
@@ -65,25 +65,15 @@ protected void execute(DeploymentProcessorTarget processorTarget) {
}
protected void addDeploymentProcessors(final DeploymentProcessorTarget processorTarget) {
- processorTarget.addDeploymentProcessor( Phase.PARSE, 0, new RingApplicationRecognizer() );
- //processorTarget.addDeploymentProcessor( Phase.PARSE, 10, new RailsApplicationRecognizer() );
- //processorTarget.addDeploymentProcessor( Phase.PARSE, 30, new WebYamlParsingProcessor() );
- //processorTarget.addDeploymentProcessor( Phase.PARSE, 40, new RailsVersionProcessor() );
- //processorTarget.addDeploymentProcessor( Phase.PARSE, 50, new RailsRackProcessor() );
- processorTarget.addDeploymentProcessor( Phase.PARSE, 60, new WebApplicationDefaultsProcessor( false, true ) );
- processorTarget.addDeploymentProcessor( Phase.PARSE, 70, new RingWebApplicationInstaller() );
- //processorTarget.addDeploymentProcessor( Phase.PARSE, 1000, new RailsRuntimeProcessor() );
- //processorTarget.addDeploymentProcessor( Phase.PARSE, 1100, new RackRuntimeProcessor() );
+ 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, 70, new RingWebApplicationInstaller() );
- processorTarget.addDeploymentProcessor( Phase.DEPENDENCIES, 1, new WebDependenciesProcessor() );
+ processorTarget.addDeploymentProcessor( WebExtension.SUBSYSTEM_NAME, Phase.DEPENDENCIES, 1, new WebDependenciesProcessor() );
- //processorTarget.addDeploymentProcessor( Phase.CONFIGURE_MODULE, 100, new WebRuntimePoolProcessor() );
- //processorTarget.addDeploymentProcessor( Phase.CONFIGURE_MODULE, 500, new RailsAutoloadPathProcessor() );
-
- //processorTarget.addDeploymentProcessor( Phase.POST_MODULE, 120, new RackApplicationComponentResolverInstaller() );
- processorTarget.addDeploymentProcessor( Phase.INSTALL, 1, new RingFilterClojureRuntimeInstaller() );
- processorTarget.addDeploymentProcessor( Phase.INSTALL, 2100, new VirtualHostInstaller() );
- processorTarget.addDeploymentProcessor( Phase.INSTALL, Phase.INSTALL_WAR_DEPLOYMENT + 1, new WebContextRegisteringProcessor() );
+ processorTarget.addDeploymentProcessor( WebExtension.SUBSYSTEM_NAME, Phase.INSTALL, 1, new RingFilterClojureRuntimeInstaller() );
+ processorTarget.addDeploymentProcessor( WebExtension.SUBSYSTEM_NAME, Phase.INSTALL, 2100, new VirtualHostInstaller() );
+ processorTarget.addDeploymentProcessor( WebExtension.SUBSYSTEM_NAME, Phase.INSTALL, Phase.INSTALL_WAR_DEPLOYMENT + 1, new WebContextRegisteringProcessor() );
}
@@ -59,9 +59,9 @@ protected void execute(DeploymentProcessorTarget processorTarget) {
protected void addDeploymentProcessors(final DeploymentProcessorTarget processorTarget) {
- processorTarget.addDeploymentProcessor( Phase.DEPENDENCIES, 1, new XaDependenciesProcessor() );
+ processorTarget.addDeploymentProcessor( XaExtension.SUBSYSTEM_NAME, Phase.DEPENDENCIES, 1, new XaDependenciesProcessor() );
- processorTarget.addDeploymentProcessor( Phase.POST_MODULE, 200, new XAifierInstaller() );
+ processorTarget.addDeploymentProcessor( XaExtension.SUBSYSTEM_NAME, Phase.POST_MODULE, 200, new XAifierInstaller() );
}
View
12 pom.xml
@@ -283,6 +283,13 @@
<version>${version.digest}</version>
</dependency>
+ <!-- we explicitly bring this in here to workaround a transitive
+ dep issue with pomegranate. -->
+ <dependency>
+ <groupId>org.apache.maven.wagon</groupId>
+ <artifactId>wagon-provider-api</artifactId>
+ <version>${version.wagon}</version>
+ </dependency>
</dependencies>
</dependencyManagement>
@@ -292,7 +299,7 @@
<version.jmock>2.5.1</version.jmock>
<version.mockito>1.8.4</version.mockito>
<version.hamcrest>1.1</version.hamcrest>
- <version.jbossas>7.1.1.Final</version.jbossas>
+ <version.jbossas>7.1.x.incremental.1</version.jbossas>
<version.clojure>1.4.0</version.clojure>
<version.clojure-contrib>1.2.0</version.clojure-contrib>
<version.clojure.tools.logging>0.2.3</version.clojure.tools.logging>
@@ -301,6 +308,7 @@
<version.ring-servlet>1.1.0</version.ring-servlet>
<version.swank-clojure>1.4.2</version.swank-clojure>
<version.nrepl>0.2.0-beta5</version.nrepl>
+ <version.wagon>2.2</version.wagon>
<version.commons-io>2.0.1</version.commons-io>
<version.clj-glob>1.0.0</version.clj-glob>
@@ -440,7 +448,7 @@
<extension>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-webdav-jackrabbit</artifactId>
- <version>1.0-beta-7</version>
+ <version>2.2</version>
</extension>
</extensions>

0 comments on commit c6c902a

Please sign in to comment.