Refactor org.wildfly:wildfly-clustering-infinispan -> org.wildfly:wil…

…dfly-clustering-infinispan-extension, org.wildfly:wildfly-clustering-jgroups -> org.wildfly:wildfly-clustering-jgroups-extension
wildfly · Jan 5, 2015 · d13bb1f · d13bb1f
1 parent 2b18c84
commit d13bb1f
Show file tree

Hide file tree

Showing 236 changed files with 747 additions and 253 deletions.
diff --git a/clustering/ejb/infinispan/pom.xml b/clustering/ejb/infinispan/pom.xml
@@ -56,7 +56,7 @@
         </dependency>
         <dependency>
             <groupId>org.wildfly</groupId>
-            <artifactId>wildfly-clustering-infinispan</artifactId>
+            <artifactId>wildfly-clustering-infinispan-extension</artifactId>
         </dependency>
         <dependency>
             <groupId>org.jboss.logging</groupId>

diff --git a/clustering/infinispan/extension/pom.xml b/clustering/infinispan/extension/pom.xml
@@ -0,0 +1,169 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ JBoss, Home of Professional Open Source.
+  ~ Copyright 2010, Red Hat, Inc., and individual contributors
+  ~ as indicated by the @author tags. See the copyright.txt file in the
+  ~ distribution for a full listing of individual contributors.
+  ~
+  ~ This is free software; you can redistribute it and/or modify it
+  ~ under the terms of the GNU Lesser General Public License as
+  ~ published by the Free Software Foundation; either version 2.1 of
+  ~ the License, or (at your option) any later version.
+  ~
+  ~ This software is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  ~ Lesser General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU Lesser General Public
+  ~ License along with this software; if not, write to the Free
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+  -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.wildfly</groupId>
+        <artifactId>wildfly-clustering-infinispan</artifactId>
+        <version>9.0.0.Alpha2-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>wildfly-clustering-infinispan-extension</artifactId>
+    <packaging>jar</packaging>
+
+    <name>WildFly: Infinispan subsystem</name>
+    <build>
+       <plugins>
+           <!-- this is only needed on windows because of bug in byteman-->
+           <plugin>
+               <groupId>org.apache.maven.plugins</groupId>
+               <artifactId>maven-dependency-plugin</artifactId>
+               <executions>
+                   <execution>
+                       <goals>
+                           <goal>properties</goal>
+                       </goals>
+                   </execution>
+               </executions>
+           </plugin>
+           <plugin>
+               <groupId>org.apache.maven.plugins</groupId>
+               <artifactId>maven-surefire-plugin</artifactId>
+               <configuration>
+                   <useManifestOnlyJar>false</useManifestOnlyJar>
+                   <!-- the log manager needs to be setup before the agent this is only needed on windows!-->
+                   <argLine>-Xbootclasspath/a:"${org.jboss.logmanager:jboss-logmanager:jar}"
+                       -javaagent:"${org.jboss.byteman:byteman:jar}"=port:9091,boot:"${org.jboss.byteman:byteman:jar}"
+                   </argLine>
+               </configuration>
+           </plugin>
+       </plugins>
+   </build>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.wildfly</groupId>
+            <artifactId>wildfly-clustering-ee-infinispan</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.wildfly</groupId>
+            <artifactId>wildfly-clustering-jgroups-extension</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.wildfly</groupId>
+            <artifactId>wildfly-clustering-infinispan-spi</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.wildfly</groupId>
+            <artifactId>wildfly-clustering-spi</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.wildfly</groupId>
+            <artifactId>wildfly-ee</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.wildfly.core</groupId>
+            <artifactId>wildfly-jmx</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.wildfly.core</groupId>
+            <artifactId>wildfly-threads</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.wildfly</groupId>
+            <artifactId>wildfly-transactions</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.infinispan</groupId>
+            <artifactId>infinispan-cachestore-jdbc</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.infinispan</groupId>
+            <artifactId>infinispan-cachestore-remote</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>net.jcip</groupId>
+            <artifactId>jcip-annotations</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.infinispan</groupId>
+            <artifactId>infinispan-query</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.hibernate</groupId>
+            <artifactId>hibernate-search-infinispan</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.wildfly</groupId>
+            <artifactId>wildfly-clustering-common</artifactId>
+            <version>${project.version}</version><!--$NO-MVN-MAN-VER$-->
+            <scope>test</scope>
+            <classifier>tests</classifier>
+        </dependency>
+        <dependency>
+            <groupId>org.wildfly</groupId>
+            <artifactId>wildfly-clustering-jgroups-extension</artifactId>
+            <version>${project.version}</version><!--$NO-MVN-MAN-VER$-->
+            <scope>test</scope>
+            <classifier>tests</classifier>
+        </dependency>
+        <dependency>
+            <groupId>org.wildfly.core</groupId>
+            <artifactId>wildfly-subsystem-test</artifactId>
+            <type>pom</type>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.marshalling</groupId>
+            <artifactId>jboss-marshalling-river</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.logging</groupId>
+            <artifactId>jboss-logging</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.logging</groupId>
+            <artifactId>jboss-logging-annotations</artifactId>
+            <!-- This is a compile-time dependency of this project, but is not needed at compile or runtime by other
+                  projects that depend on this project.-->
+            <scope>provided</scope>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.logging</groupId>
+            <artifactId>jboss-logging-processor</artifactId>
+            <!-- This is a compile-time dependency of this project, but is not needed at compile or runtime by other
+                  projects that depend on this project.-->
+            <scope>provided</scope>
+            <optional>true</optional>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/...clustering/infinispan/BatcherFactory.java → ...clustering/infinispan/BatcherFactory.java b/...clustering/infinispan/BatcherFactory.java → ...clustering/infinispan/BatcherFactory.java
diff --git a/...clustering/infinispan/CacheContainer.java → ...clustering/infinispan/CacheContainer.java b/...clustering/infinispan/CacheContainer.java → ...clustering/infinispan/CacheContainer.java
diff --git a/...ustering/infinispan/ChannelTransport.java → ...ustering/infinispan/ChannelTransport.java b/...ustering/infinispan/ChannelTransport.java → ...ustering/infinispan/ChannelTransport.java
diff --git a/...ing/infinispan/DefaultCacheContainer.java → ...ing/infinispan/DefaultCacheContainer.java b/...ing/infinispan/DefaultCacheContainer.java → ...ing/infinispan/DefaultCacheContainer.java
diff --git a/.../infinispan/InfinispanBatcherFactory.java → .../infinispan/InfinispanBatcherFactory.java b/.../infinispan/InfinispanBatcherFactory.java → .../infinispan/InfinispanBatcherFactory.java
diff --git a/...ustering/infinispan/InfinispanLogger.java → ...ustering/infinispan/InfinispanLogger.java b/...ustering/infinispan/InfinispanLogger.java → ...ustering/infinispan/InfinispanLogger.java
diff --git a/...ering/infinispan/MBeanServerProvider.java → ...ering/infinispan/MBeanServerProvider.java b/...ering/infinispan/MBeanServerProvider.java → ...ering/infinispan/MBeanServerProvider.java
diff --git a/...ng/infinispan/ManagedExecutorFactory.java → ...ng/infinispan/ManagedExecutorFactory.java b/...ng/infinispan/ManagedExecutorFactory.java → ...ng/infinispan/ManagedExecutorFactory.java
diff --git a/...span/ManagedScheduledExecutorFactory.java → ...span/ManagedScheduledExecutorFactory.java b/...span/ManagedScheduledExecutorFactory.java → ...span/ManagedScheduledExecutorFactory.java
diff --git a/...nfinispan/TransactionManagerProvider.java → ...nfinispan/TransactionManagerProvider.java b/...nfinispan/TransactionManagerProvider.java → ...nfinispan/TransactionManagerProvider.java
diff --git a/...ctionSynchronizationRegistryProvider.java → ...ctionSynchronizationRegistryProvider.java b/...ctionSynchronizationRegistryProvider.java → ...ctionSynchronizationRegistryProvider.java
diff --git a/...n/affinity/KeyAffinityServiceFactory.java → ...n/affinity/KeyAffinityServiceFactory.java b/...n/affinity/KeyAffinityServiceFactory.java → ...n/affinity/KeyAffinityServiceFactory.java
diff --git a/...ity/KeyAffinityServiceFactoryService.java → ...ity/KeyAffinityServiceFactoryService.java b/...ity/KeyAffinityServiceFactoryService.java → ...ity/KeyAffinityServiceFactoryService.java
diff --git a/...oyment/ClusteringDependencyProcessor.java → ...oyment/ClusteringDependencyProcessor.java b/...oyment/ClusteringDependencyProcessor.java → ...oyment/ClusteringDependencyProcessor.java
diff --git a/.../distribution/ConsistentHashLocality.java → .../distribution/ConsistentHashLocality.java b/.../distribution/ConsistentHashLocality.java → .../distribution/ConsistentHashLocality.java
diff --git a/...ing/infinispan/distribution/Locality.java → ...ing/infinispan/distribution/Locality.java b/...ing/infinispan/distribution/Locality.java → ...ing/infinispan/distribution/Locality.java
diff --git a/...finispan/distribution/SimpleLocality.java → ...finispan/distribution/SimpleLocality.java b/...finispan/distribution/SimpleLocality.java → ...finispan/distribution/SimpleLocality.java
diff --git a/...nispan/io/AbstractSimpleExternalizer.java → ...nispan/io/AbstractSimpleExternalizer.java b/...nispan/io/AbstractSimpleExternalizer.java → ...nispan/io/AbstractSimpleExternalizer.java
diff --git a/...nispan/io/ExternalizableExternalizer.java → ...nispan/io/ExternalizableExternalizer.java b/...nispan/io/ExternalizableExternalizer.java → ...nispan/io/ExternalizableExternalizer.java
diff --git a/.../HashableMarshalledValueExternalizer.java → .../HashableMarshalledValueExternalizer.java b/.../HashableMarshalledValueExternalizer.java → .../HashableMarshalledValueExternalizer.java
diff --git a/...nfinispan/io/ServiceNameExternalizer.java → ...nfinispan/io/ServiceNameExternalizer.java b/...nfinispan/io/ServiceNameExternalizer.java → ...nfinispan/io/ServiceNameExternalizer.java
diff --git a/...ing/infinispan/io/SimpleExternalizer.java → ...ing/infinispan/io/SimpleExternalizer.java b/...ing/infinispan/io/SimpleExternalizer.java → ...ing/infinispan/io/SimpleExternalizer.java
diff --git a/...io/SimpleMarshalledValueExternalizer.java → ...io/SimpleMarshalledValueExternalizer.java b/...io/SimpleMarshalledValueExternalizer.java → ...io/SimpleMarshalledValueExternalizer.java
diff --git a/...ering/infinispan/io/UUIDExternalizer.java → ...ering/infinispan/io/UUIDExternalizer.java b/...ering/infinispan/io/UUIDExternalizer.java → ...ering/infinispan/io/UUIDExternalizer.java
diff --git a/...em/AbstractCacheConfigurationService.java → ...em/AbstractCacheConfigurationService.java b/...em/AbstractCacheConfigurationService.java → ...em/AbstractCacheConfigurationService.java
diff --git a/...infinispan/subsystem/AddAliasHandler.java → ...infinispan/subsystem/AddAliasHandler.java b/...infinispan/subsystem/AddAliasHandler.java → ...infinispan/subsystem/AddAliasHandler.java
diff --git a/...ering/infinispan/subsystem/Attribute.java → ...ering/infinispan/subsystem/Attribute.java b/...ering/infinispan/subsystem/Attribute.java → ...ering/infinispan/subsystem/Attribute.java
diff --git a/...ubsystem/BackupForResourceDefinition.java → ...ubsystem/BackupForResourceDefinition.java b/...ubsystem/BackupForResourceDefinition.java → ...ubsystem/BackupForResourceDefinition.java
diff --git a/...nispan/subsystem/BackupSiteOperation.java → ...nispan/subsystem/BackupSiteOperation.java b/...nispan/subsystem/BackupSiteOperation.java → ...nispan/subsystem/BackupSiteOperation.java
diff --git a/...subsystem/BackupSiteOperationContext.java → ...subsystem/BackupSiteOperationContext.java b/...subsystem/BackupSiteOperationContext.java → ...subsystem/BackupSiteOperationContext.java
diff --git a/...subsystem/BackupSiteOperationHandler.java → ...subsystem/BackupSiteOperationHandler.java b/...subsystem/BackupSiteOperationHandler.java → ...subsystem/BackupSiteOperationHandler.java
diff --git a/...bsystem/BackupSiteResourceDefinition.java → ...bsystem/BackupSiteResourceDefinition.java b/...bsystem/BackupSiteResourceDefinition.java → ...bsystem/BackupSiteResourceDefinition.java
diff --git a/...ystem/BinaryKeyedJDBCStoreAddHandler.java → ...ystem/BinaryKeyedJDBCStoreAddHandler.java b/...ystem/BinaryKeyedJDBCStoreAddHandler.java → ...ystem/BinaryKeyedJDBCStoreAddHandler.java
diff --git a/...naryKeyedJDBCStoreResourceDefinition.java → ...naryKeyedJDBCStoreResourceDefinition.java b/...naryKeyedJDBCStoreResourceDefinition.java → ...naryKeyedJDBCStoreResourceDefinition.java
diff --git a/...infinispan/subsystem/CacheAddHandler.java → ...infinispan/subsystem/CacheAddHandler.java b/...infinispan/subsystem/CacheAddHandler.java → ...infinispan/subsystem/CacheAddHandler.java
diff --git a/.../subsystem/CacheConfigurationService.java → .../subsystem/CacheConfigurationService.java b/.../subsystem/CacheConfigurationService.java → .../subsystem/CacheConfigurationService.java
diff --git a/...n/subsystem/CacheContainerAddHandler.java → ...n/subsystem/CacheContainerAddHandler.java b/...n/subsystem/CacheContainerAddHandler.java → ...n/subsystem/CacheContainerAddHandler.java
diff --git a/...ispan/subsystem/CacheContainerMetric.java → ...ispan/subsystem/CacheContainerMetric.java b/...ispan/subsystem/CacheContainerMetric.java → ...ispan/subsystem/CacheContainerMetric.java
diff --git a/...bsystem/CacheContainerMetricsHandler.java → ...bsystem/CacheContainerMetricsHandler.java b/...bsystem/CacheContainerMetricsHandler.java → ...bsystem/CacheContainerMetricsHandler.java
diff --git a/...ubsystem/CacheContainerRemoveHandler.java → ...ubsystem/CacheContainerRemoveHandler.java b/...ubsystem/CacheContainerRemoveHandler.java → ...ubsystem/CacheContainerRemoveHandler.java
diff --git a/...tem/CacheContainerResourceDefinition.java → ...tem/CacheContainerResourceDefinition.java b/...tem/CacheContainerResourceDefinition.java → ...tem/CacheContainerResourceDefinition.java
diff --git a/...ing/infinispan/subsystem/CacheMetric.java → ...ing/infinispan/subsystem/CacheMetric.java b/...ing/infinispan/subsystem/CacheMetric.java → ...ing/infinispan/subsystem/CacheMetric.java
diff --git a/...nispan/subsystem/CacheMetricsHandler.java → ...nispan/subsystem/CacheMetricsHandler.java b/...nispan/subsystem/CacheMetricsHandler.java → ...nispan/subsystem/CacheMetricsHandler.java
diff --git a/...inispan/subsystem/CacheRemoveHandler.java → ...inispan/subsystem/CacheRemoveHandler.java b/...inispan/subsystem/CacheRemoveHandler.java → ...inispan/subsystem/CacheRemoveHandler.java
diff --git a/...an/subsystem/CacheResourceDefinition.java → ...an/subsystem/CacheResourceDefinition.java b/...an/subsystem/CacheResourceDefinition.java → ...an/subsystem/CacheResourceDefinition.java
diff --git a/...ng/infinispan/subsystem/CacheService.java → ...ng/infinispan/subsystem/CacheService.java b/...ng/infinispan/subsystem/CacheService.java → ...ng/infinispan/subsystem/CacheService.java
diff --git a/...ering/infinispan/subsystem/CacheType.java → ...ering/infinispan/subsystem/CacheType.java b/...ering/infinispan/subsystem/CacheType.java → ...ering/infinispan/subsystem/CacheType.java
diff --git a/...n/subsystem/ClusteredCacheAddHandler.java → ...n/subsystem/ClusteredCacheAddHandler.java b/...n/subsystem/ClusteredCacheAddHandler.java → ...n/subsystem/ClusteredCacheAddHandler.java
diff --git a/...ispan/subsystem/ClusteredCacheMetric.java → ...ispan/subsystem/ClusteredCacheMetric.java b/...ispan/subsystem/ClusteredCacheMetric.java → ...ispan/subsystem/ClusteredCacheMetric.java
diff --git a/...bsystem/ClusteredCacheMetricsHandler.java → ...bsystem/ClusteredCacheMetricsHandler.java b/...bsystem/ClusteredCacheMetricsHandler.java → ...bsystem/ClusteredCacheMetricsHandler.java
diff --git a/...tem/ClusteredCacheResourceDefinition.java → ...tem/ClusteredCacheResourceDefinition.java b/...tem/ClusteredCacheResourceDefinition.java → ...tem/ClusteredCacheResourceDefinition.java
diff --git a/...pan/subsystem/ConsistentHashStrategy.java → ...pan/subsystem/ConsistentHashStrategy.java b/...pan/subsystem/ConsistentHashStrategy.java → ...pan/subsystem/ConsistentHashStrategy.java
diff --git a/...span/subsystem/CustomStoreAddHandler.java → ...span/subsystem/CustomStoreAddHandler.java b/...span/subsystem/CustomStoreAddHandler.java → ...span/subsystem/CustomStoreAddHandler.java
diff --git a/...system/CustomStoreResourceDefinition.java → ...system/CustomStoreResourceDefinition.java b/...system/CustomStoreResourceDefinition.java → ...system/CustomStoreResourceDefinition.java
diff --git a/...subsystem/DistributedCacheAddHandler.java → ...subsystem/DistributedCacheAddHandler.java b/...subsystem/DistributedCacheAddHandler.java → ...subsystem/DistributedCacheAddHandler.java
diff --git a/...m/DistributedCacheResourceDefinition.java → ...m/DistributedCacheResourceDefinition.java b/...m/DistributedCacheResourceDefinition.java → ...m/DistributedCacheResourceDefinition.java
diff --git a/...stering/infinispan/subsystem/Element.java → ...stering/infinispan/subsystem/Element.java b/...stering/infinispan/subsystem/Element.java → ...stering/infinispan/subsystem/Element.java
diff --git a/...em/EmbeddedCacheManagerConfiguration.java → ...em/EmbeddedCacheManagerConfiguration.java b/...em/EmbeddedCacheManagerConfiguration.java → ...em/EmbeddedCacheManagerConfiguration.java
diff --git a/...ddedCacheManagerConfigurationService.java → ...ddedCacheManagerConfigurationService.java b/...ddedCacheManagerConfigurationService.java → ...ddedCacheManagerConfigurationService.java
diff --git a/...ubsystem/EmbeddedCacheManagerService.java → ...ubsystem/EmbeddedCacheManagerService.java b/...ubsystem/EmbeddedCacheManagerService.java → ...ubsystem/EmbeddedCacheManagerService.java
diff --git a/.../infinispan/subsystem/EvictionMetric.java → .../infinispan/subsystem/EvictionMetric.java b/.../infinispan/subsystem/EvictionMetric.java → .../infinispan/subsystem/EvictionMetric.java
diff --git a/...pan/subsystem/EvictionMetricsHandler.java → ...pan/subsystem/EvictionMetricsHandler.java b/...pan/subsystem/EvictionMetricsHandler.java → ...pan/subsystem/EvictionMetricsHandler.java
diff --git a/...subsystem/EvictionResourceDefinition.java → ...subsystem/EvictionResourceDefinition.java b/...subsystem/EvictionResourceDefinition.java → ...subsystem/EvictionResourceDefinition.java
diff --git a/...bsystem/ExpirationResourceDefinition.java → ...bsystem/ExpirationResourceDefinition.java b/...bsystem/ExpirationResourceDefinition.java → ...bsystem/ExpirationResourceDefinition.java
diff --git a/...nispan/subsystem/FileStoreAddHandler.java → ...nispan/subsystem/FileStoreAddHandler.java b/...nispan/subsystem/FileStoreAddHandler.java → ...nispan/subsystem/FileStoreAddHandler.java
diff --git a/...ubsystem/FileStoreResourceDefinition.java → ...ubsystem/FileStoreResourceDefinition.java b/...ubsystem/FileStoreResourceDefinition.java → ...ubsystem/FileStoreResourceDefinition.java
diff --git a/...nispan/subsystem/InfinispanExtension.java → ...nispan/subsystem/InfinispanExtension.java b/...nispan/subsystem/InfinispanExtension.java → ...nispan/subsystem/InfinispanExtension.java
diff --git a/...infinispan/subsystem/InfinispanModel.java → ...infinispan/subsystem/InfinispanModel.java b/...infinispan/subsystem/InfinispanModel.java → ...infinispan/subsystem/InfinispanModel.java
diff --git a/...nfinispanResourceDescriptionResolver.java → ...nfinispanResourceDescriptionResolver.java b/...nfinispanResourceDescriptionResolver.java → ...nfinispanResourceDescriptionResolver.java
diff --git a/...nfinispan/subsystem/InfinispanSchema.java → ...nfinispan/subsystem/InfinispanSchema.java b/...nfinispan/subsystem/InfinispanSchema.java → ...nfinispan/subsystem/InfinispanSchema.java
diff --git a/...system/InfinispanSubsystemAddHandler.java → ...system/InfinispanSubsystemAddHandler.java b/...system/InfinispanSubsystemAddHandler.java → ...system/InfinispanSubsystemAddHandler.java
diff --git a/...nfinispanSubsystemResourceDefinition.java → ...nfinispanSubsystemResourceDefinition.java b/...nfinispanSubsystemResourceDefinition.java → ...nfinispanSubsystemResourceDefinition.java
diff --git a/...bsystem/InfinispanSubsystemXMLReader.java → ...bsystem/InfinispanSubsystemXMLReader.java b/...bsystem/InfinispanSubsystemXMLReader.java → ...bsystem/InfinispanSubsystemXMLReader.java
diff --git a/...bsystem/InfinispanSubsystemXMLWriter.java → ...bsystem/InfinispanSubsystemXMLWriter.java b/...bsystem/InfinispanSubsystemXMLWriter.java → ...bsystem/InfinispanSubsystemXMLWriter.java
diff --git a/...ubsystem/InvalidationCacheAddHandler.java → ...ubsystem/InvalidationCacheAddHandler.java b/...ubsystem/InvalidationCacheAddHandler.java → ...ubsystem/InvalidationCacheAddHandler.java
diff --git a/.../InvalidationCacheResourceDefinition.java → .../InvalidationCacheResourceDefinition.java b/.../InvalidationCacheResourceDefinition.java → .../InvalidationCacheResourceDefinition.java
diff --git a/...nispan/subsystem/JDBCStoreAddHandler.java → ...nispan/subsystem/JDBCStoreAddHandler.java b/...nispan/subsystem/JDBCStoreAddHandler.java → ...nispan/subsystem/JDBCStoreAddHandler.java
diff --git a/...ubsystem/JDBCStoreResourceDefinition.java → ...ubsystem/JDBCStoreResourceDefinition.java b/...ubsystem/JDBCStoreResourceDefinition.java → ...ubsystem/JDBCStoreResourceDefinition.java
diff --git a/...ispan/subsystem/LocalCacheAddHandler.java → ...ispan/subsystem/LocalCacheAddHandler.java b/...ispan/subsystem/LocalCacheAddHandler.java → ...ispan/subsystem/LocalCacheAddHandler.java
diff --git a/...bsystem/LocalCacheResourceDefinition.java → ...bsystem/LocalCacheResourceDefinition.java b/...bsystem/LocalCacheResourceDefinition.java → ...bsystem/LocalCacheResourceDefinition.java
diff --git a/...g/infinispan/subsystem/LockingMetric.java → ...g/infinispan/subsystem/LockingMetric.java b/...g/infinispan/subsystem/LockingMetric.java → ...g/infinispan/subsystem/LockingMetric.java
diff --git a/...span/subsystem/LockingMetricsHandler.java → ...span/subsystem/LockingMetricsHandler.java b/...span/subsystem/LockingMetricsHandler.java → ...span/subsystem/LockingMetricsHandler.java
diff --git a/.../subsystem/LockingResourceDefinition.java → .../subsystem/LockingResourceDefinition.java b/.../subsystem/LockingResourceDefinition.java → .../subsystem/LockingResourceDefinition.java
diff --git a/...ring/infinispan/subsystem/MetricKeys.java → ...ring/infinispan/subsystem/MetricKeys.java b/...ring/infinispan/subsystem/MetricKeys.java → ...ring/infinispan/subsystem/MetricKeys.java
diff --git a/...system/MixedKeyedJDBCStoreAddHandler.java → ...system/MixedKeyedJDBCStoreAddHandler.java b/...system/MixedKeyedJDBCStoreAddHandler.java → ...system/MixedKeyedJDBCStoreAddHandler.java
diff --git a/...ixedKeyedJDBCStoreResourceDefinition.java → ...ixedKeyedJDBCStoreResourceDefinition.java b/...ixedKeyedJDBCStoreResourceDefinition.java → ...ixedKeyedJDBCStoreResourceDefinition.java
diff --git a/...clustering/infinispan/subsystem/Mode.java → ...clustering/infinispan/subsystem/Mode.java b/...clustering/infinispan/subsystem/Mode.java → ...clustering/infinispan/subsystem/Mode.java
diff --git a/...ering/infinispan/subsystem/ModelKeys.java → ...ering/infinispan/subsystem/ModelKeys.java b/...ering/infinispan/subsystem/ModelKeys.java → ...ering/infinispan/subsystem/ModelKeys.java
diff --git a/...span/subsystem/RemoteStoreAddHandler.java → ...span/subsystem/RemoteStoreAddHandler.java b/...span/subsystem/RemoteStoreAddHandler.java → ...span/subsystem/RemoteStoreAddHandler.java
diff --git a/...system/RemoteStoreResourceDefinition.java → ...system/RemoteStoreResourceDefinition.java b/...system/RemoteStoreResourceDefinition.java → ...system/RemoteStoreResourceDefinition.java
diff --git a/...inispan/subsystem/RemoveAliasHandler.java → ...inispan/subsystem/RemoveAliasHandler.java b/...inispan/subsystem/RemoveAliasHandler.java → ...inispan/subsystem/RemoveAliasHandler.java
diff --git a/.../subsystem/ReplicatedCacheAddHandler.java → .../subsystem/ReplicatedCacheAddHandler.java b/.../subsystem/ReplicatedCacheAddHandler.java → .../subsystem/ReplicatedCacheAddHandler.java
diff --git a/...em/ReplicatedCacheResourceDefinition.java → ...em/ReplicatedCacheResourceDefinition.java b/...em/ReplicatedCacheResourceDefinition.java → ...em/ReplicatedCacheResourceDefinition.java
diff --git a/...stem/SegmentsAndVirtualNodeConverter.java → ...stem/SegmentsAndVirtualNodeConverter.java b/...stem/SegmentsAndVirtualNodeConverter.java → ...stem/SegmentsAndVirtualNodeConverter.java
diff --git a/...subsystem/SharedStateCacheAddHandler.java → ...subsystem/SharedStateCacheAddHandler.java b/...subsystem/SharedStateCacheAddHandler.java → ...subsystem/SharedStateCacheAddHandler.java
diff --git a/...m/SharedStateCacheResourceDefinition.java → ...m/SharedStateCacheResourceDefinition.java b/...m/SharedStateCacheResourceDefinition.java → ...m/SharedStateCacheResourceDefinition.java
diff --git a/...ering/infinispan/subsystem/StartMode.java → ...ering/infinispan/subsystem/StartMode.java b/...ering/infinispan/subsystem/StartMode.java → ...ering/infinispan/subsystem/StartMode.java
diff --git a/...stem/StateTransferResourceDefinition.java → ...stem/StateTransferResourceDefinition.java b/...stem/StateTransferResourceDefinition.java → ...stem/StateTransferResourceDefinition.java
diff --git a/...infinispan/subsystem/StoreAddHandler.java → ...infinispan/subsystem/StoreAddHandler.java b/...infinispan/subsystem/StoreAddHandler.java → ...infinispan/subsystem/StoreAddHandler.java
diff --git a/...ing/infinispan/subsystem/StoreMetric.java → ...ing/infinispan/subsystem/StoreMetric.java b/...ing/infinispan/subsystem/StoreMetric.java → ...ing/infinispan/subsystem/StoreMetric.java
diff --git a/...nispan/subsystem/StoreMetricsHandler.java → ...nispan/subsystem/StoreMetricsHandler.java b/...nispan/subsystem/StoreMetricsHandler.java → ...nispan/subsystem/StoreMetricsHandler.java
diff --git a/...stem/StorePropertyResourceDefinition.java → ...stem/StorePropertyResourceDefinition.java b/...stem/StorePropertyResourceDefinition.java → ...stem/StorePropertyResourceDefinition.java
diff --git a/...an/subsystem/StoreResourceDefinition.java → ...an/subsystem/StoreResourceDefinition.java b/...an/subsystem/StoreResourceDefinition.java → ...an/subsystem/StoreResourceDefinition.java
diff --git a/...ering/infinispan/subsystem/StoreType.java → ...ering/infinispan/subsystem/StoreType.java b/...ering/infinispan/subsystem/StoreType.java → ...ering/infinispan/subsystem/StoreType.java
diff --git a/...m/StoreWriteBehindResourceDefinition.java → ...m/StoreWriteBehindResourceDefinition.java b/...m/StoreWriteBehindResourceDefinition.java → ...m/StoreWriteBehindResourceDefinition.java
diff --git a/...ystem/StringKeyedJDBCStoreAddHandler.java → ...ystem/StringKeyedJDBCStoreAddHandler.java b/...ystem/StringKeyedJDBCStoreAddHandler.java → ...ystem/StringKeyedJDBCStoreAddHandler.java
diff --git a/...ringKeyedJDBCStoreResourceDefinition.java → ...ringKeyedJDBCStoreResourceDefinition.java b/...ringKeyedJDBCStoreResourceDefinition.java → ...ringKeyedJDBCStoreResourceDefinition.java
diff --git a/...finispan/subsystem/TransactionMetric.java → ...finispan/subsystem/TransactionMetric.java b/...finispan/subsystem/TransactionMetric.java → ...finispan/subsystem/TransactionMetric.java
diff --git a/.../subsystem/TransactionMetricsHandler.java → .../subsystem/TransactionMetricsHandler.java b/.../subsystem/TransactionMetricsHandler.java → .../subsystem/TransactionMetricsHandler.java
diff --git a/...infinispan/subsystem/TransactionMode.java → ...infinispan/subsystem/TransactionMode.java b/...infinispan/subsystem/TransactionMode.java → ...infinispan/subsystem/TransactionMode.java
diff --git a/...system/TransactionResourceDefinition.java → ...system/TransactionResourceDefinition.java b/...system/TransactionResourceDefinition.java → ...system/TransactionResourceDefinition.java
diff --git a/...ubsystem/TransportResourceDefinition.java → ...ubsystem/TransportResourceDefinition.java b/...ubsystem/TransportResourceDefinition.java → ...ubsystem/TransportResourceDefinition.java
diff --git a/...ustering.infinispan.io.SimpleExternalizer → ...ustering.infinispan.io.SimpleExternalizer b/...ustering.infinispan.io.SimpleExternalizer → ...ustering.infinispan.io.SimpleExternalizer
diff --git a/...ervices/org.jboss.as.controller.Extension → ...ervices/org.jboss.as.controller.Extension b/...ervices/org.jboss.as.controller.Extension → ...ervices/org.jboss.as.controller.Extension
diff --git a/...rc/main/resources/infinispan-defaults.xml → ...rc/main/resources/infinispan-defaults.xml b/...rc/main/resources/infinispan-defaults.xml → ...rc/main/resources/infinispan-defaults.xml
diff --git a/...an/subsystem/LocalDescriptions.properties → ...an/subsystem/LocalDescriptions.properties b/...an/subsystem/LocalDescriptions.properties → ...an/subsystem/LocalDescriptions.properties
diff --git a/...ources/schema/jboss-as-infinispan_1_0.xsd → ...ources/schema/jboss-as-infinispan_1_0.xsd b/...ources/schema/jboss-as-infinispan_1_0.xsd → ...ources/schema/jboss-as-infinispan_1_0.xsd
diff --git a/...ources/schema/jboss-as-infinispan_1_1.xsd → ...ources/schema/jboss-as-infinispan_1_1.xsd b/...ources/schema/jboss-as-infinispan_1_1.xsd → ...ources/schema/jboss-as-infinispan_1_1.xsd
diff --git a/...ources/schema/jboss-as-infinispan_1_2.xsd → ...ources/schema/jboss-as-infinispan_1_2.xsd b/...ources/schema/jboss-as-infinispan_1_2.xsd → ...ources/schema/jboss-as-infinispan_1_2.xsd
diff --git a/...ources/schema/jboss-as-infinispan_1_3.xsd → ...ources/schema/jboss-as-infinispan_1_3.xsd b/...ources/schema/jboss-as-infinispan_1_3.xsd → ...ources/schema/jboss-as-infinispan_1_3.xsd
diff --git a/...ources/schema/jboss-as-infinispan_1_4.xsd → ...ources/schema/jboss-as-infinispan_1_4.xsd b/...ources/schema/jboss-as-infinispan_1_4.xsd → ...ources/schema/jboss-as-infinispan_1_4.xsd
diff --git a/...ources/schema/jboss-as-infinispan_2_0.xsd → ...ources/schema/jboss-as-infinispan_2_0.xsd b/...ources/schema/jboss-as-infinispan_2_0.xsd → ...ources/schema/jboss-as-infinispan_2_0.xsd
diff --git a/...ources/schema/jboss-as-infinispan_3_0.xsd → ...ources/schema/jboss-as-infinispan_3_0.xsd b/...ources/schema/jboss-as-infinispan_3_0.xsd → ...ources/schema/jboss-as-infinispan_3_0.xsd
diff --git a/...ources/subsystem-templates/infinispan.xml → ...ources/subsystem-templates/infinispan.xml b/...ources/subsystem-templates/infinispan.xml → ...ources/subsystem-templates/infinispan.xml
diff --git a/...infinispan/DefaultCacheContainerTest.java → ...infinispan/DefaultCacheContainerTest.java b/...infinispan/DefaultCacheContainerTest.java → ...infinispan/DefaultCacheContainerTest.java
diff --git a/...pan/InfinispanBatcherFactoryTestCase.java → ...pan/InfinispanBatcherFactoryTestCase.java b/...pan/InfinispanBatcherFactoryTestCase.java → ...pan/InfinispanBatcherFactoryTestCase.java
diff --git a/...em/InfinispanRejectedExpressions_1_3.java → ...em/InfinispanRejectedExpressions_1_3.java b/...em/InfinispanRejectedExpressions_1_3.java → ...em/InfinispanRejectedExpressions_1_3.java
diff --git a/...subsystem/OperationSequencesTestCase.java → ...subsystem/OperationSequencesTestCase.java b/...subsystem/OperationSequencesTestCase.java → ...subsystem/OperationSequencesTestCase.java
diff --git a/...span/subsystem/OperationTestCaseBase.java → ...span/subsystem/OperationTestCaseBase.java b/...span/subsystem/OperationTestCaseBase.java → ...span/subsystem/OperationTestCaseBase.java
diff --git a/...inispan/subsystem/OperationsTestCase.java → ...inispan/subsystem/OperationsTestCase.java b/...inispan/subsystem/OperationsTestCase.java → ...inispan/subsystem/OperationsTestCase.java
diff --git a/...n/subsystem/SubsystemParsingTestCase.java → ...n/subsystem/SubsystemParsingTestCase.java b/...n/subsystem/SubsystemParsingTestCase.java → ...n/subsystem/SubsystemParsingTestCase.java
diff --git a/...ispan/subsystem/TransformersTestCase.java → ...ispan/subsystem/TransformersTestCase.java b/...ispan/subsystem/TransformersTestCase.java → ...ispan/subsystem/TransformersTestCase.java
diff --git a/...bsystem/infinispan-transformer-backup.xml → ...bsystem/infinispan-transformer-backup.xml b/...bsystem/infinispan-transformer-backup.xml → ...bsystem/infinispan-transformer-backup.xml
diff --git a/...em/infinispan-transformer-expressions.xml → ...em/infinispan-transformer-expressions.xml b/...em/infinispan-transformer-expressions.xml → ...em/infinispan-transformer-expressions.xml
diff --git a/...span/subsystem/infinispan-transformer.xml → ...span/subsystem/infinispan-transformer.xml b/...span/subsystem/infinispan-transformer.xml → ...span/subsystem/infinispan-transformer.xml
diff --git a/...an/subsystem/subsystem-infinispan-1_0.xml → ...an/subsystem/subsystem-infinispan-1_0.xml b/...an/subsystem/subsystem-infinispan-1_0.xml → ...an/subsystem/subsystem-infinispan-1_0.xml
diff --git a/...an/subsystem/subsystem-infinispan-1_1.xml → ...an/subsystem/subsystem-infinispan-1_1.xml b/...an/subsystem/subsystem-infinispan-1_1.xml → ...an/subsystem/subsystem-infinispan-1_1.xml
diff --git a/...an/subsystem/subsystem-infinispan-1_2.xml → ...an/subsystem/subsystem-infinispan-1_2.xml b/...an/subsystem/subsystem-infinispan-1_2.xml → ...an/subsystem/subsystem-infinispan-1_2.xml
diff --git a/...an/subsystem/subsystem-infinispan-1_3.xml → ...an/subsystem/subsystem-infinispan-1_3.xml b/...an/subsystem/subsystem-infinispan-1_3.xml → ...an/subsystem/subsystem-infinispan-1_3.xml
diff --git a/...an/subsystem/subsystem-infinispan-1_4.xml → ...an/subsystem/subsystem-infinispan-1_4.xml b/...an/subsystem/subsystem-infinispan-1_4.xml → ...an/subsystem/subsystem-infinispan-1_4.xml
diff --git a/...an/subsystem/subsystem-infinispan-2_0.xml → ...an/subsystem/subsystem-infinispan-2_0.xml b/...an/subsystem/subsystem-infinispan-2_0.xml → ...an/subsystem/subsystem-infinispan-2_0.xml
diff --git a/...an/subsystem/subsystem-infinispan-3_0.xml → ...an/subsystem/subsystem-infinispan-3_0.xml b/...an/subsystem/subsystem-infinispan-3_0.xml → ...an/subsystem/subsystem-infinispan-3_0.xml
diff --git a/clustering/infinispan/pom.xml b/clustering/infinispan/pom.xml
@@ -33,133 +33,12 @@
     </parent>
 
     <artifactId>wildfly-clustering-infinispan</artifactId>
-    <packaging>jar</packaging>
+    <packaging>pom</packaging>
 
-    <name>WildFly: Infinispan Subsystem</name>
-    <build>
-       <plugins>
-           <!-- this is only needed on windows because of bug in byteman-->
-           <plugin>
-               <groupId>org.apache.maven.plugins</groupId>
-               <artifactId>maven-dependency-plugin</artifactId>
-               <executions>
-                   <execution>
-                       <goals>
-                           <goal>properties</goal>
-                       </goals>
-                   </execution>
-               </executions>
-           </plugin>
-           <plugin>
-               <groupId>org.apache.maven.plugins</groupId>
-               <artifactId>maven-surefire-plugin</artifactId>
-               <configuration>
-                   <useManifestOnlyJar>false</useManifestOnlyJar>
-                   <!-- the log manager needs to be setup before the agent this is only needed on windows!-->
-                   <argLine>-Xbootclasspath/a:"${org.jboss.logmanager:jboss-logmanager:jar}"
-                       -javaagent:"${org.jboss.byteman:byteman:jar}"=port:9091,boot:"${org.jboss.byteman:byteman:jar}"
-                   </argLine>
-               </configuration>
-           </plugin>
-       </plugins>
-   </build>
+    <name>WildFly: Infinispan modules</name>
 
-    <dependencies>
-        <dependency>
-            <groupId>org.wildfly</groupId>
-            <artifactId>wildfly-clustering-ee-infinispan</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.wildfly</groupId>
-            <artifactId>wildfly-clustering-jgroups</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.wildfly</groupId>
-            <artifactId>wildfly-clustering-spi</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.wildfly</groupId>
-            <artifactId>wildfly-ee</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.wildfly.core</groupId>
-            <artifactId>wildfly-jmx</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.wildfly.core</groupId>
-            <artifactId>wildfly-threads</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.wildfly</groupId>
-            <artifactId>wildfly-transactions</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.infinispan</groupId>
-            <artifactId>infinispan-cachestore-jdbc</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.infinispan</groupId>
-            <artifactId>infinispan-cachestore-remote</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>net.jcip</groupId>
-            <artifactId>jcip-annotations</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.infinispan</groupId>
-            <artifactId>infinispan-query</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.hibernate</groupId>
-            <artifactId>hibernate-search-infinispan</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.wildfly</groupId>
-            <artifactId>wildfly-clustering-common</artifactId>
-            <version>${project.version}</version><!--$NO-MVN-MAN-VER$-->
-            <scope>test</scope>
-            <classifier>tests</classifier>
-        </dependency>
-        <dependency>
-            <groupId>org.wildfly</groupId>
-            <artifactId>wildfly-clustering-jgroups</artifactId>
-            <version>${project.version}</version><!--$NO-MVN-MAN-VER$-->
-            <scope>test</scope>
-            <classifier>tests</classifier>
-        </dependency>
-        <dependency>
-            <groupId>org.wildfly.core</groupId>
-            <artifactId>wildfly-subsystem-test</artifactId>
-            <type>pom</type>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.jboss.marshalling</groupId>
-            <artifactId>jboss-marshalling-river</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.jboss.logging</groupId>
-            <artifactId>jboss-logging</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.jboss.logging</groupId>
-            <artifactId>jboss-logging-annotations</artifactId>
-            <!-- This is a compile-time dependency of this project, but is not needed at compile or runtime by other
-                  projects that depend on this project.-->
-            <scope>provided</scope>
-            <optional>true</optional>
-        </dependency>
-        <dependency>
-            <groupId>org.jboss.logging</groupId>
-            <artifactId>jboss-logging-processor</artifactId>
-            <!-- This is a compile-time dependency of this project, but is not needed at compile or runtime by other
-                  projects that depend on this project.-->
-            <scope>provided</scope>
-            <optional>true</optional>
-        </dependency>
-    </dependencies>
+    <modules>
+        <module>extension</module>
+        <module>spi</module>
+    </modules>
 </project>
diff --git a/clustering/infinispan/spi/pom.xml b/clustering/infinispan/spi/pom.xml
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ JBoss, Home of Professional Open Source.
+  ~ Copyright 2010, Red Hat, Inc., and individual contributors
+  ~ as indicated by the @author tags. See the copyright.txt file in the
+  ~ distribution for a full listing of individual contributors.
+  ~
+  ~ This is free software; you can redistribute it and/or modify it
+  ~ under the terms of the GNU Lesser General Public License as
+  ~ published by the Free Software Foundation; either version 2.1 of
+  ~ the License, or (at your option) any later version.
+  ~
+  ~ This software is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  ~ Lesser General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU Lesser General Public
+  ~ License along with this software; if not, write to the Free
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+  -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.wildfly</groupId>
+        <artifactId>wildfly-clustering-infinispan</artifactId>
+        <version>9.0.0.Alpha2-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>wildfly-clustering-infinispan-spi</artifactId>
+    <packaging>jar</packaging>
+
+    <name>WildFly: Infinispan SPI</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.wildfly</groupId>
+            <artifactId>wildfly-clustering-marshalling</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.wildfly</groupId>
+            <artifactId>wildfly-clustering-service</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.wildfly.security</groupId>
+            <artifactId>wildfly-security-manager</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.infinispan</groupId>
+            <artifactId>infinispan-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.logging</groupId>
+            <artifactId>jboss-logging</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.msc</groupId>
+            <artifactId>jboss-msc</artifactId>
+        </dependency>
+    </dependencies>
+</project>