diff --git a/build/assembly.xml b/build/assembly.xml index 9b3428c399dc..cf43623d9c64 100644 --- a/build/assembly.xml +++ b/build/assembly.xml @@ -1,13 +1,11 @@ - distro + thin-server zip - false - target @@ -15,37 +13,6 @@ ${server.output.dir.prefix}-${version}/** - - **/*.sh - ${server.output.dir.prefix}-${version}/domain/tmp/auth - ${server.output.dir.prefix}-${version}/standalone/tmp/auth - **/*-users.properties - - - - target - - - ${server.output.dir.prefix}-${version}/**/*.sh - - 0755 - - - target - - - ${server.output.dir.prefix}-${version}/**/*-users.properties - - 0600 - - - target - - - ${server.output.dir.prefix}-${version}/domain/tmp/auth - ${server.output.dir.prefix}-${version}/standalone/tmp/auth - - 0700 diff --git a/build/pom.xml b/build/pom.xml index cd8a30ad435f..0c06cb56b95f 100644 --- a/build/pom.xml +++ b/build/pom.xml @@ -38,38 +38,39 @@ WildFly: Build pom - - - ${basedir}/target/generated-configs - ${generated.configs}/standalone/configuration - ${generated.configs}/domain/configuration - ${generated.configs}/docs/examples/configs - ${basedir}/src/main/resources - ${basedir}/src/main/resources - ${project.version} - - + + + org.wildfly + wildfly-feature-pack + zip + + + * + * + + + + - wildfly-${project.version} + ${server.output.dir.prefix}-${project.version} - org.wildfly.core - wildfly-build-plugin + org.wildfly.build + wildfly-server-provisioning-maven-plugin - create-server + server-provisioning build - package + compile - server-build.xml + server-provisioning.xml - org.apache.maven.plugins maven-assembly-plugin @@ -84,10 +85,11 @@ assembly.xml + true ${server.output.dir.prefix}-${project.version} false - target/ - target/assembly/work + ${project.build.directory} + ${project.build.directory}/assembly/work gnu @@ -96,2101 +98,4 @@ - - - - - org.jboss - jandex - - - - org.jboss - jboss-dmr - - - - org.jboss - staxmapper - - - - - org.wildfly.core - wildfly-core-model-test-framework - - - org.wildfly.core - wildfly-model-test - - - - - - org.wildfly.core - wildfly-core-build - zip - - - - org.wildfly - wildfly-web-build - zip - - - - org.wildfly.core - wildfly-domain-http-error-context - - - - org.wildfly.core - wildfly-io - - - - org.wildfly.core - wildfly-jmx - - - - org.wildfly - wildfly-picketlink - - - - org.wildfly - wildfly-security-manager - - - - org.wildfly - wildfly-security-api - - - - org.wildfly.security - wildfly-security-manager - - - - org.wildfly.core - wildfly-server - - - - org.jboss.invocation - jboss-invocation - - - - org.jboss.logging - jboss-logging - - - - org.jboss.logging - jul-to-slf4j-stub - - - - org.jboss.logmanager - jboss-logmanager - - - - org.jboss.logmanager - log4j-jboss-logmanager - - - - org.jboss.marshalling - jboss-marshalling - - - - org.jboss.marshalling - jboss-marshalling-river - - - - org.jboss.modules - jboss-modules - - - - org.jboss.msc - jboss-msc - - - - org.jboss.narayana.rts - restat-util - - - - antlr - antlr - - - - asm - asm - - - - ch.qos.cal10n - cal10n-api - - - - com.fasterxml - classmate - - - - com.fasterxml.jackson.core - jackson-core - - - com.fasterxml.jackson.core - jackson-annotations - - - com.fasterxml.jackson.core - jackson-databind - - - com.fasterxml.jackson.jaxrs - jackson-jaxrs-json-provider - - - com.fasterxml.jackson.jaxrs - jackson-jaxrs-base - - - com.fasterxml.jackson.module - jackson-module-jaxb-annotations - - - - com.github.relaxng - relaxngDatatype - - - - com.google.guava - guava - - - - com.h2database - h2 - - - - com.sun.codemodel - codemodel - - - - com.sun.faces - jsf-impl - - - - com.sun.istack - istack-commons-runtime - - - - com.sun.istack - istack-commons-tools - - - - com.sun.xml.bind - jaxb-impl - - - - com.sun.xml.bind - jaxb-xjc - - - - com.sun.xml.fastinfoset - FastInfoset - - - - com.sun.xml.messaging.saaj - saaj-impl - - - - com.sun.xml.txw2 - txw2 - - - - com.sun.xsom - xsom - - - - commons-beanutils - commons-beanutils - - - - commons-cli - commons-cli - - - - commons-codec - commons-codec - - - - commons-collections - commons-collections - - - - commons-io - commons-io - - - - commons-lang - commons-lang - - - - commons-configuration - commons-configuration - - - - commons-pool - commons-pool - - - - dom4j - dom4j - - - - gnu.getopt - java-getopt - - - - org.jacorb - jacorb - - - - javax.activation - activation - - - - javax.enterprise - cdi-api - - - org.jboss.spec.javax.interceptor - jboss-interceptors-api_1.1_spec - - - - - - javax.inject - javax.inject - - - - javax.jws - jsr181-api - - - - com.sun.mail - javax.mail - - - - javax.validation - validation-api - - - - jaxen - jaxen - - - - jboss.jaxbintros - jboss-jaxb-intros - - - - org.jboss.aesh - aesh - - - - org.fusesource.jansi - jansi - - - - joda-time - joda-time - - - - org.jsoup - jsoup - - - - net.jcip - jcip-annotations - - - - org.apache.avro - avro - - - - org.apache.cxf - cxf-api - - - - org.apache.cxf - cxf-rt-bindings-coloc - - - - org.apache.cxf - cxf-rt-bindings-object - - - - org.apache.cxf - cxf-rt-bindings-soap - - - - org.apache.cxf - cxf-rt-bindings-xml - - - - org.apache.cxf - cxf-rt-core - - - - org.apache.cxf - cxf-rt-databinding-aegis - - - - org.apache.cxf - cxf-rt-databinding-jaxb - - - - org.apache.cxf - cxf-rt-frontend-jaxws - - - - org.apache.cxf - cxf-rt-frontend-simple - - - - org.apache.cxf - cxf-rt-management - - - - org.apache.cxf - cxf-rt-transports-http - - - - org.apache.cxf - cxf-rt-transports-local - - - - org.apache.cxf - cxf-rt-transports-jms - - - - org.apache.cxf - cxf-rt-ws-addr - - - - org.apache.cxf - cxf-rt-ws-mex - - - - org.apache.cxf - cxf-rt-ws-policy - - - - org.apache.cxf - cxf-rt-ws-rm - - - - org.apache.cxf - cxf-rt-ws-security - - - - org.apache.cxf - cxf-tools-common - - - - org.apache.cxf - cxf-tools-java2ws - - - - org.apache.cxf - cxf-tools-validator - - - - org.apache.cxf - cxf-tools-wsdlto-core - - - - org.apache.cxf - cxf-tools-wsdlto-databinding-jaxb - - - - org.apache.cxf - cxf-tools-wsdlto-frontend-jaxws - - - - org.apache.cxf.services.sts - cxf-services-sts-core - - - - org.apache.cxf.services.ws-discovery - cxf-services-ws-discovery-api - - - - org.apache.cxf.xjcplugins - cxf-xjc-boolean - - - - org.apache.cxf.xjcplugins - cxf-xjc-dv - - - - org.wildfly - wildfly-rts - - - - org.jboss.narayana.rts - restat-api - - - - org.jboss.narayana.rts - restat-integration - - - - org.jboss.narayana.rts - restat-bridge - - - - org.jboss.narayana.txframework - txframework - - - - org.jboss.classfilewriter - jboss-classfilewriter - - - - org.jboss - jboss-ejb-client - - - - org.jboss.ejb3 - jboss-ejb3-ext-api - - - - org.wildfly - wildfly-jpa - - - - org.jipijapa - jipijapa-hibernate3 - - - org.hibernate - hibernate-commons-annotations - - - - - - org.jipijapa - jipijapa-hibernate4-3 - - - - org.jipijapa - jipijapa-hibernate4-1 - - - - org.jipijapa - jipijapa-eclipselink - - - - org.jipijapa - jipijapa-openjpa - - - - org.jipijapa - jipijapa-spi - - - - org.jboss - jboss-transaction-spi - - - - org.jboss.genericjms - generic-jms-ra-jar - - - - org.jboss.ironjacamar - ironjacamar-core-api - - - - org.jboss.ironjacamar - ironjacamar-core-impl - - - - org.jboss.ironjacamar - ironjacamar-common-api - - - - org.jboss.ironjacamar - ironjacamar-common-spi - - - - org.jboss.ironjacamar - ironjacamar-common-impl - - - - org.jboss.ironjacamar - ironjacamar-deployers-common - - - - org.jboss.ironjacamar - ironjacamar-jdbc - - - - org.jboss.ironjacamar - ironjacamar-spec-api - - - - org.jboss.ironjacamar - ironjacamar-validator - - - - org.jboss.narayana.jts - narayana-jts-jacorb - - - - org.jboss.narayana.jts - narayana-jts-integration - - - - org.jboss.narayana - jbosstxbridge - - - - org.jboss.narayana.xts - jbossxts - - - - org.jboss.narayana.xts - jbossxts - api - - - - org.jboss.metadata - jboss-metadata-appclient - - - - org.jboss.metadata - jboss-metadata-common - - - - org.jboss.metadata - jboss-metadata-ear - - - - org.jboss.metadata - jboss-metadata-ejb - - - - org.jboss.metadata - jboss-metadata-web - - - - org.jboss.mod_cluster - mod_cluster-container-spi - - - org.jboss.mod_cluster - mod_cluster-core - - - - org.jboss.xnio.netty - netty-xnio-transport - - - io.netty - netty-transport - - - io.netty - netty-buffer - - - - - - io.undertow - undertow-core - - - - - io.netty - netty-all - - - - org.jboss.remoting - jboss-remoting - - - - org.jboss.remotingjmx - remoting-jmx - - - - org.jboss - jboss-remote-naming - - - - org.jboss.resteasy - jaxrs-api - - - - org.jboss.resteasy - jose-jwt - - - - org.jboss.resteasy - resteasy-client - - - - org.jboss.resteasy - resteasy-jaxrs - - - - org.jboss.resteasy - async-http-servlet-3.0 - - - - org.jboss.resteasy - resteasy-spring - - - - org.jboss.resteasy - resteasy-atom-provider - - - - org.jboss.resteasy - resteasy-cdi - - - - org.jboss.resteasy - resteasy-crypto - - - - org.jboss.resteasy - resteasy-jackson-provider - - - - org.jboss.resteasy - resteasy-jackson2-provider - - - - org.jboss.resteasy - resteasy-json-p-provider - - - - org.jboss.resteasy - resteasy-jaxb-provider - - - - org.jboss.resteasy - resteasy-jettison-provider - - - - org.jboss.resteasy - resteasy-jsapi - - - - org.jboss.resteasy - resteasy-multipart-provider - - - - org.jboss.resteasy - resteasy-validator-provider-11 - - - - org.jboss.resteasy - resteasy-yaml-provider - - - - org.jboss.sasl - jboss-sasl - - - - org.jboss.seam.integration - jboss-seam-int-jbossas - - - - org.jboss.security - jboss-negotiation-common - - - - org.jboss.security - jboss-negotiation-extras - - - - org.jboss.security - jboss-negotiation-net - - - - org.jboss.security - jboss-negotiation-ntlm - - - - org.jboss.security - jboss-negotiation-spnego - - - - org.jboss.security - jbossxacml - - - - org.jboss.shrinkwrap - shrinkwrap-api - - - - org.jboss.shrinkwrap - shrinkwrap-impl-base - - - - org.jboss.shrinkwrap - shrinkwrap-spi - - - - org.jboss.slf4j - slf4j-jboss-logmanager - - - - org.jboss.spec.javax.annotation - jboss-annotations-api_1.2_spec - - - - org.jboss.spec.javax.batch - jboss-batch-api_1.0_spec - - - - org.jboss.spec.javax.ejb - jboss-ejb-api_3.2_spec - - - - org.jboss.spec.javax.el - jboss-el-api_3.0_spec - - - - org.jboss.spec.javax.enterprise.concurrent - jboss-concurrency-api_1.0_spec - - - - org.jboss.spec.javax.faces - jboss-jsf-api_2.2_spec - - - - org.jboss.spec.javax.interceptor - jboss-interceptors-api_1.2_spec - - - - org.jboss.spec.javax.jms - jboss-jms-api_2.0_spec - - - - org.jboss.spec.javax.management.j2ee - jboss-j2eemgmt-api_1.1_spec - - - - org.jboss.spec.javax.resource - jboss-connector-api_1.7_spec - - - - org.jboss.spec.javax.rmi - jboss-rmi-api_1.0_spec - - - - org.jboss.spec.javax.security.auth.message - jboss-jaspi-api_1.1_spec - - - - org.jboss.spec.javax.security.jacc - jboss-jacc-api_1.5_spec - - - - org.jboss.spec.javax.servlet - jboss-servlet-api_3.1_spec - - - - org.jboss.spec.javax.servlet.jsp - jboss-jsp-api_2.3_spec - - - - org.jboss.spec.javax.servlet.jstl - jboss-jstl-api_1.2_spec - - - - org.jboss.spec.javax.transaction - jboss-transaction-api_1.2_spec - - - - org.jboss.spec.javax.xml.bind - jboss-jaxb-api_2.2_spec - - - - org.jboss.spec.javax.xml.rpc - jboss-jaxrpc-api_1.1_spec - - - - org.jboss.spec.javax.xml.soap - jboss-saaj-api_1.3_spec - - - - org.jboss.spec.javax.xml.ws - jboss-jaxws-api_2.2_spec - - - - org.jboss.stdio - jboss-stdio - - - - org.jboss.threads - jboss-threads - - - - org.eclipse.jdt.core.compiler - ecj - - - - io.undertow - undertow-servlet - - - - io.undertow - undertow-websockets-jsr - - - - org.jboss.spec.javax.websocket - jboss-websocket-api_1.0_spec - - - - org.wildfly - wildfly-undertow - - - - io.undertow.jastow - jastow - - - - org.jboss.weld - weld-api - - - - org.jboss.weld - weld-core-impl - - - - org.jboss.weld - weld-core-jsf - - - - org.jboss.weld - weld-spi - - - - org.jboss.ws - jbossws-api - - - - org.jboss.ws - jbossws-common - - - - org.jboss.ws - jbossws-common-tools - - - - org.jboss.ws - jbossws-spi - - - - org.jboss.ws.cxf - jbossws-cxf-client - - - - org.jboss.ws.cxf - jbossws-cxf-factories - - - - org.jboss.ws.cxf - jbossws-cxf-resources - wildfly800 - - - - org.jboss.ws.cxf - jbossws-cxf-server - - - - org.jboss.ws.cxf - jbossws-cxf-transports-udp - - - - org.jboss.xnio - xnio-api - - - - org.jboss.xnio - xnio-nio - - - - org.jboss - jbossxb - - - - org.jdom - jdom - - - - org.jgroups - jgroups - - - - org.kohsuke.rngom - rngom - - - - org.picketlink - picketlink-api - - - - org.picketlink - picketlink-impl - - - - org.picketlink - picketlink-federation - - - - org.picketlink - picketlink-common - - - - org.picketlink - picketlink-config - - - - org.picketlink - picketlink-idm-api - - - - org.picketlink - picketlink-idm-impl - - - - org.scannotation - scannotation - - - - org.picketbox - picketbox - - - org.picketbox - picketbox-commons - - - - org.picketbox - picketbox-infinispan - - - - org.slf4j - jcl-over-slf4j - - - - org.slf4j - slf4j-api - - - - org.slf4j - slf4j-ext - - - - org.yaml - snakeyaml - - - - wsdl4j - wsdl4j - - - - xalan - serializer - - - - xalan - xalan - - - - xerces - xercesImpl - - - - xml-resolver - xml-resolver - - - - com.io7m.xom - xom - - - - org.apache.cxf.xjcplugins - cxf-xjc-ts - - - - org.opensaml - opensaml - - - - org.opensaml - openws - - - - org.opensaml - xmltooling - - - - org.apache.httpcomponents - httpclient - - - - org.apache.httpcomponents - httpcore - - - - org.apache.httpcomponents - httpmime - - - - org.apache.james - apache-mime4j - - - - org.apache.lucene - lucene-analyzers - - - org.apache.lucene - lucene-core - - - org.apache.lucene - lucene-facet - - - org.apache.lucene - lucene-memory - - - - org.apache.neethi - neethi - - - - org.apache.qpid - proton-api - - - - org.apache.qpid - proton-jms - - - - org.apache.qpid - proton-j-impl - - - - org.apache.santuario - xmlsec - - - - org.apache.ws.xmlschema - xmlschema-core - - - - org.apache.velocity - velocity - - - - org.apache.ws.security - wss4j - - - - org.bouncycastle - bcprov-jdk15on - - - - org.bouncycastle - bcmail-jdk15on - - - - org.bouncycastle - bcpkix-jdk15on - - - - org.codehaus.jackson - jackson-core-asl - - - - org.codehaus.jackson - jackson-mapper-asl - - - - org.codehaus.jackson - jackson-jaxrs - - - - org.codehaus.jackson - jackson-xc - - - - org.codehaus.jettison - jettison - - - - org.codehaus.woodstox - woodstox-core-asl - - - - org.codehaus.woodstox - stax2-api - - - - - org.glassfish - javax.json - - - - org.glassfish - javax.el-impl - - - - - org.glassfish - javax.enterprise.concurrent - - - - org.hibernate - hibernate-core - - - - org.hibernate.common - hibernate-commons-annotations - - - - org.hibernate - hibernate-entitymanager - - - - org.hibernate - hibernate-infinispan - - - - org.hibernate - hibernate-validator - - - - org.hibernate - hibernate-validator-cdi - - - - org.hibernate - hibernate-envers - - - - org.hibernate - hibernate-search-engine - - - org.hibernate - hibernate-search-infinispan - - - org.hibernate - hibernate-search-orm - - - - org.hibernate.javax.persistence - hibernate-jpa-2.1-api - - - - org.hibernate.hql - hibernate-hql-lucene - - - org.hibernate.hql - hibernate-hql-parser - - - - org.hornetq - hornetq-amqp-protocol - - - - org.hornetq - hornetq-commons - - - - org.hornetq - hornetq-tools - - - - org.hornetq - hornetq-core-client - - - - org.hornetq - hornetq-jms-client - - - - org.hornetq - hornetq-jms-server - - - org.jboss.jbossts.jts - jbossjts-jacorb - - - - - - org.hornetq - hornetq-journal - - - - org.hornetq - hornetq-native - - - - org.hornetq - hornetq-ra - - - - org.hornetq - hornetq-server - - - - org.hornetq - hornetq-stomp-protocol - - - - org.infinispan - infinispan-cachestore-jdbc - - - org.infinispan - infinispan-cachestore-remote - - - org.infinispan - infinispan-client-hotrod - - - org.infinispan - infinispan-commons - - - org.infinispan - infinispan-core - - - org.infinispan - infinispan-lucene-directory - - - org.infinispan - infinispan-lucene-v3 - - - org.infinispan - infinispan-query - - - org.infinispan - infinispan-query-dsl - - - - org.javassist - javassist - - - - org.jberet - jberet-core - - - - org.jboss.common - jboss-common-beans - - - - org.jboss - jboss-common-core - - - - org.jboss - jboss-iiop-client - - - - org.jboss - jboss-vfs - - - - org.wildfly - wildfly-appclient - - - - org.wildfly.core - wildfly-cli - - - - org.wildfly.core - wildfly-cli - client - - - - org.wildfly - wildfly-client-all - - - org.wildfly - wildfly-ejb-client-bom - - - org.wildfly - wildfly-jms-client-bom - - - - - - org.wildfly - wildfly-clustering-api - - - - org.wildfly - wildfly-clustering-spi - - - - org.wildfly - wildfly-clustering-common - - - - org.wildfly - wildfly-clustering-ejb-infinispan - - - org.wildfly - wildfly-clustering-ejb-spi - - - - org.wildfly - wildfly-clustering-infinispan - - - - org.wildfly - wildfly-clustering-jgroups - - - - org.wildfly - wildfly-clustering-server - - - - org.wildfly - wildfly-clustering-singleton - - - - org.wildfly - wildfly-clustering-web-api - - - org.wildfly - wildfly-clustering-web-infinispan - - - org.wildfly - wildfly-clustering-web-spi - - - org.wildfly - wildfly-clustering-web-undertow - - - - org.wildfly - wildfly-cmp - - - - org.jboss.hal - release-stream - resources - - - - org.wildfly - wildfly-batch - - - - org.wildfly - wildfly-bean-validation - - - - org.wildfly - wildfly-jberet - - - - org.wildfly - wildfly-connector - - - - org.wildfly.core - wildfly-controller - - - - org.wildfly.core - wildfly-controller-client - - - - org.wildfly.core - wildfly-core-security-api - - - - org.wildfly.core - wildfly-core-security - - - - org.wildfly.core - wildfly-domain-http-interface - - - - org.wildfly.core - wildfly-domain-management - - - - org.wildfly.core - wildfly-deployment-repository - - - - org.wildfly.core - wildfly-deployment-scanner - - - - org.wildfly - wildfly-ee - - - - org.wildfly - wildfly-ejb3 - - - - org.wildfly - wildfly-embedded - - - - org.wildfly - wildfly-jaxr - - - - org.wildfly - wildfly-jaxrs - - - - org.wildfly - wildfly-jdr - - - - org.wildfly - wildfly-jsf - - - - org.wildfly - wildfly-jsf-injection - - - - org.wildfly - wildfly-jsr77 - - - - org.wildfly.core - wildfly-host-controller - - - - org.wildfly - wildfly-jacorb - - - - org.wildfly.core - wildfly-logging - - - - org.wildfly - wildfly-mail - - - - org.wildfly.core - wildfly-management-client-content - - - - org.wildfly - wildfly-messaging - - - - org.wildfly - wildfly-mod_cluster-extension - - - - org.wildfly - wildfly-mod_cluster-undertow - - - - org.wildfly - wildfly-naming - - - - org.wildfly.core - wildfly-network - - - - org.wildfly.core - wildfly-patching - - - - org.wildfly.core - wildfly-platform-mbean - - - - org.wildfly - wildfly-pojo - - - - org.wildfly.core - wildfly-process-controller - - - - org.wildfly.core - wildfly-protocol - - - - org.wildfly.core - wildfly-remoting - - - - org.wildfly - wildfly-sar - - - - org.wildfly - wildfly-security - - - - org.wildfly.core - wildfly-system-jmx - - - - org.wildfly.core - wildfly-threads - - - - org.wildfly - wildfly-transactions - - - - org.wildfly.core - wildfly-version - - - - org.wildfly - wildfly-web - - - - org.wildfly - wildfly-web-common - - - - org.wildfly - wildfly-weld - - - - org.wildfly - wildfly-webservices-server-integration - - - - org.wildfly - wildfly-xts - - - - org.jboss.ws.cxf - jbossws-cxf-transports-undertow - - - - org.jboss.ws.projects - jaxws-undertow-httpspi - - - - org.picketlink - picketlink-idm-simple-schema - - - - org.picketlink.distribution - picketlink-wildfly8 - - - - - - - release - - - release - - - - wildfly-${project.version} - - - org.codehaus.mojo - license-maven-plugin - false - - - - download-licenses - - package - - - ${project.basedir}/../${wildfly.build.output.dir}/docs/licenses - - - ${project.basedir}/../${wildfly.build.output.dir}/docs/licenses/licenses.xml - - - - - - - - - - - enforce - - - !skip-enforce - - - - - - org.apache.maven.plugins - maven-enforcer-plugin - - - ban-transitive-deps - - enforce - - - - - - - com.sun:tools - sun.jdk:jconsole - - - - - - - - - - - - - javadocDist - - WildFly public API - ${project.version} - - - - - org.apache.maven.plugins - maven-javadoc-plugin - ${version.javadoc.plugin} - - - javadocs-dist - - aggregate-jar - - validate - - true - true - 2400m - - ISO-8859-1 - - ${javadoc.branding} public API - ${javadoc.branding} public API -
${javadoc.branding}
-
${javadoc.branding}
- - true - - - - - - - - - - - - - - - - - - - - - diff --git a/build/server-provisioning.xml b/build/server-provisioning.xml new file mode 100644 index 000000000000..12180b58c27c --- /dev/null +++ b/build/server-provisioning.xml @@ -0,0 +1,26 @@ + + + + + + \ No newline at end of file diff --git a/dist/assembly.xml b/dist/assembly.xml index 90efd154a569..dff00a7c430b 100644 --- a/dist/assembly.xml +++ b/dist/assembly.xml @@ -6,9 +6,7 @@ zip tar.gz - false - target @@ -16,37 +14,6 @@ ${server.output.dir.prefix}-${version}/** - - **/*.sh - ${server.output.dir.prefix}-${version}/domain/tmp/auth - ${server.output.dir.prefix}-${version}/standalone/tmp/auth - **/*-users.properties - - - - target - - - ${server.output.dir.prefix}-${version}/**/*.sh - - 0755 - - - target - - - ${server.output.dir.prefix}-${version}/**/*-users.properties - - 0600 - - - target - - - ${server.output.dir.prefix}-${version}/domain/tmp/auth - ${server.output.dir.prefix}-${version}/standalone/tmp/auth - - 0700 diff --git a/dist/pom.xml b/dist/pom.xml index 31e6296e1c15..e9bf327d9473 100644 --- a/dist/pom.xml +++ b/dist/pom.xml @@ -41,33 +41,39 @@ org.wildfly - wildfly-build + wildfly-feature-pack pom provided org.wildfly - wildfly-build + wildfly-feature-pack zip + + + * + * + + - wildfly-${project.version} + ${server.output.dir.prefix}-${project.version} - org.wildfly.core - wildfly-build-plugin + org.wildfly.build + wildfly-server-provisioning-maven-plugin - create-server + server-provisioning build - package + compile - server-build.xml + server-provisioning.xml @@ -103,8 +109,8 @@ true ${server.output.dir.prefix}-${project.version} false - target/ - target/assembly/work + ${project.build.directory} + ${project.build.directory}/assembly/work gnu @@ -120,8 +126,8 @@ ${server.output.dir.prefix}-${project.version} true - target/ - target/assembly-src/work + ${project.build.directory} + ${project.build.directory}/assembly-src/work gnu diff --git a/dist/server-build.xml b/dist/server-build.xml deleted file mode 100644 index 0be98f8eb9b5..000000000000 --- a/dist/server-build.xml +++ /dev/null @@ -1,53 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/dist/server-provisioning.xml b/dist/server-provisioning.xml new file mode 100644 index 000000000000..3195643d658c --- /dev/null +++ b/dist/server-provisioning.xml @@ -0,0 +1,26 @@ + + + + + + \ No newline at end of file diff --git a/feature-pack/assembly.xml b/feature-pack/assembly.xml new file mode 100644 index 000000000000..553c16ec15fa --- /dev/null +++ b/feature-pack/assembly.xml @@ -0,0 +1,15 @@ + + + feature-pack + + zip + + false + + + target/${server.output.dir.prefix}-${version} + + + + diff --git a/build/server-build.xml b/feature-pack/feature-pack-build.xml similarity index 95% rename from build/server-build.xml rename to feature-pack/feature-pack-build.xml index d86afebbbb20..32a41088083a 100644 --- a/build/server-build.xml +++ b/feature-pack/feature-pack-build.xml @@ -20,17 +20,11 @@ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. --> - - - - - - - - - + + + + - - + - @@ -116,7 +109,7 @@ - + diff --git a/build/javadoc/README.txt b/feature-pack/javadoc/README.txt similarity index 100% rename from build/javadoc/README.txt rename to feature-pack/javadoc/README.txt diff --git a/build/javadoc/artifactsBlacklist.txt b/feature-pack/javadoc/artifactsBlacklist.txt similarity index 100% rename from build/javadoc/artifactsBlacklist.txt rename to feature-pack/javadoc/artifactsBlacklist.txt diff --git a/build/javadoc/convertModuleNameToGA.xsl b/feature-pack/javadoc/convertModuleNameToGA.xsl similarity index 100% rename from build/javadoc/convertModuleNameToGA.xsl rename to feature-pack/javadoc/convertModuleNameToGA.xsl diff --git a/build/javadoc/extractPackageGroupsByModules.sh b/feature-pack/javadoc/extractPackageGroupsByModules.sh similarity index 100% rename from build/javadoc/extractPackageGroupsByModules.sh rename to feature-pack/javadoc/extractPackageGroupsByModules.sh diff --git a/build/javadoc/extractPublicApiArtifactsList.sh b/feature-pack/javadoc/extractPublicApiArtifactsList.sh similarity index 100% rename from build/javadoc/extractPublicApiArtifactsList.sh rename to feature-pack/javadoc/extractPublicApiArtifactsList.sh diff --git a/build/javadoc/pomSetIncludesAndGroups.xsl b/feature-pack/javadoc/pomSetIncludesAndGroups.xsl similarity index 100% rename from build/javadoc/pomSetIncludesAndGroups.xsl rename to feature-pack/javadoc/pomSetIncludesAndGroups.xsl diff --git a/build/javadoc/printModulesInPlainText.xsl b/feature-pack/javadoc/printModulesInPlainText.xsl similarity index 100% rename from build/javadoc/printModulesInPlainText.xsl rename to feature-pack/javadoc/printModulesInPlainText.xsl diff --git a/feature-pack/pom.xml b/feature-pack/pom.xml new file mode 100644 index 000000000000..f76055933ef8 --- /dev/null +++ b/feature-pack/pom.xml @@ -0,0 +1,2319 @@ + + + + + + 4.0.0 + + + org.wildfly + wildfly-parent + 9.0.0.Alpha1-SNAPSHOT + + + wildfly-feature-pack + + WildFly: Full Feature Pack + pom + + + ${project.version} + + + + ${server.output.dir.prefix}-${project.version} + + + org.apache.maven.plugins + maven-resources-plugin + + + + org.wildfly.build + wildfly-feature-pack-build-maven-plugin + + + feature-pack-build + + build + + compile + + feature-pack-build.xml + + + + + + org.apache.maven.plugins + maven-assembly-plugin + + + assemble + package + + single + + + + assembly.xml + + ${project.build.finalName} + false + ${project.build.directory} + ${project.build.directory}/assembly/work + gnu + + + + + + + + + + + + + org.wildfly + wildfly-web-feature-pack + zip + + + * + * + + + + + + + + org.wildfly + wildfly-picketlink + + + * + * + + + + + + org.wildfly + wildfly-security-api + + + * + * + + + + + + org.jboss.narayana.rts + restat-util + + + + antlr + antlr + + + + asm + asm + + + + ch.qos.cal10n + cal10n-api + + + + com.fasterxml + classmate + + + + com.fasterxml.jackson.core + jackson-core + + + com.fasterxml.jackson.core + jackson-annotations + + + com.fasterxml.jackson.core + jackson-databind + + + com.fasterxml.jackson.jaxrs + jackson-jaxrs-json-provider + + + com.fasterxml.jackson.jaxrs + jackson-jaxrs-base + + + com.fasterxml.jackson.module + jackson-module-jaxb-annotations + + + + com.github.relaxng + relaxngDatatype + + + + com.google.guava + guava + + + + com.h2database + h2 + + + + com.sun.codemodel + codemodel + + + + com.sun.faces + jsf-impl + + + + com.sun.istack + istack-commons-runtime + + + * + * + + + + + + com.sun.istack + istack-commons-tools + + + + com.sun.xml.bind + jaxb-impl + + + + com.sun.xml.bind + jaxb-xjc + + + * + * + + + + + + com.sun.xml.fastinfoset + FastInfoset + + + + com.sun.xml.messaging.saaj + saaj-impl + + + * + * + + + + + + com.sun.xml.txw2 + txw2 + + + + com.sun.xsom + xsom + + + + commons-beanutils + commons-beanutils + + + + commons-cli + commons-cli + + + + commons-codec + commons-codec + + + + commons-collections + commons-collections + + + + commons-io + commons-io + + + + commons-lang + commons-lang + + + + commons-configuration + commons-configuration + + + + commons-pool + commons-pool + + + + dom4j + dom4j + + + + gnu.getopt + java-getopt + + + + org.jacorb + jacorb + + + + javax.jws + jsr181-api + + + + com.sun.mail + javax.mail + + + * + * + + + + + + jaxen + jaxen + + + * + * + + + + + + jboss.jaxbintros + jboss-jaxb-intros + + + + joda-time + joda-time + + + + org.jsoup + jsoup + + + + net.jcip + jcip-annotations + + + + org.apache.avro + avro + + + * + * + + + + + + org.apache.cxf + cxf-api + + + * + * + + + + + + org.apache.cxf + cxf-rt-bindings-coloc + + + + org.apache.cxf + cxf-rt-bindings-object + + + + org.apache.cxf + cxf-rt-bindings-soap + + + + org.apache.cxf + cxf-rt-bindings-xml + + + + org.apache.cxf + cxf-rt-core + + + + org.apache.cxf + cxf-rt-databinding-aegis + + + + org.apache.cxf + cxf-rt-databinding-jaxb + + + + org.apache.cxf + cxf-rt-frontend-jaxws + + + * + * + + + + + + org.apache.cxf + cxf-rt-frontend-simple + + + + org.apache.cxf + cxf-rt-management + + + + org.apache.cxf + cxf-rt-transports-http + + + + org.apache.cxf + cxf-rt-transports-local + + + + org.apache.cxf + cxf-rt-transports-jms + + + + org.apache.cxf + cxf-rt-ws-addr + + + + org.apache.cxf + cxf-rt-ws-mex + + + + org.apache.cxf + cxf-rt-ws-policy + + + + org.apache.cxf + cxf-rt-ws-rm + + + + org.apache.cxf + cxf-rt-ws-security + + + + org.apache.cxf + cxf-tools-common + + + + org.apache.cxf + cxf-tools-java2ws + + + + org.apache.cxf + cxf-tools-validator + + + + org.apache.cxf + cxf-tools-wsdlto-core + + + + org.apache.cxf + cxf-tools-wsdlto-databinding-jaxb + + + + org.apache.cxf + cxf-tools-wsdlto-frontend-jaxws + + + * + * + + + + + + org.apache.cxf.services.sts + cxf-services-sts-core + + + + org.apache.cxf.services.ws-discovery + cxf-services-ws-discovery-api + + + + org.apache.cxf.xjcplugins + cxf-xjc-boolean + + + + org.apache.cxf.xjcplugins + cxf-xjc-dv + + + + org.wildfly + wildfly-rts + + + * + * + + + + + + org.jboss.narayana.rts + restat-api + + + + org.jboss.narayana.rts + restat-integration + + + + org.jboss.narayana.rts + restat-bridge + + + + org.jboss.narayana.txframework + txframework + + + * + * + + + + + + org.jboss + jboss-ejb-client + + + * + * + + + + + + org.jboss.ejb3 + jboss-ejb3-ext-api + + + + org.wildfly + wildfly-jpa + + + * + * + + + + + + org.jipijapa + jipijapa-hibernate3 + + + * + * + + + + + + org.jipijapa + jipijapa-hibernate4-3 + + + * + * + + + + + + org.jipijapa + jipijapa-hibernate4-1 + + + * + * + + + + + + org.jipijapa + jipijapa-eclipselink + + + * + * + + + + + + org.jipijapa + jipijapa-openjpa + + + + org.jipijapa + jipijapa-spi + + + * + * + + + + + + org.jboss + jboss-transaction-spi + + + + org.jboss.genericjms + generic-jms-ra-jar + + + * + * + + + + + + org.jboss.ironjacamar + ironjacamar-core-api + + + * + * + + + + + + org.jboss.ironjacamar + ironjacamar-core-impl + + + * + * + + + + + + org.jboss.ironjacamar + ironjacamar-common-api + + + + org.jboss.ironjacamar + ironjacamar-common-spi + + + + org.jboss.ironjacamar + ironjacamar-common-impl + + + * + * + + + + + + org.jboss.ironjacamar + ironjacamar-deployers-common + + + * + * + + + + + + org.jboss.ironjacamar + ironjacamar-jdbc + + + * + * + + + + + + org.jboss.ironjacamar + ironjacamar-spec-api + + + * + * + + + + + + org.jboss.ironjacamar + ironjacamar-validator + + + + org.jboss.narayana.jts + narayana-jts-jacorb + + + * + * + + + + + + org.jboss.narayana.jts + narayana-jts-integration + + + + org.jboss.narayana + jbosstxbridge + + + + org.jboss.narayana.xts + jbossxts + + + + org.jboss.narayana.xts + jbossxts + api + + + + org.jboss.metadata + jboss-metadata-appclient + + + * + * + + + + + + org.jboss.metadata + jboss-metadata-ejb + + + * + * + + + + + + org.jboss.mod_cluster + mod_cluster-container-spi + + + org.jboss.mod_cluster + mod_cluster-core + + + + org.jboss.xnio.netty + netty-xnio-transport + + + * + * + + + + + + + io.netty + netty-all + + + + org.jboss.resteasy + jaxrs-api + + + + org.jboss.resteasy + jose-jwt + + + + org.jboss.resteasy + resteasy-client + + + + org.jboss.resteasy + resteasy-jaxrs + + + * + * + + + + + + org.jboss.resteasy + async-http-servlet-3.0 + + + + org.jboss.resteasy + resteasy-spring + + + * + * + + + + + + org.jboss.resteasy + resteasy-atom-provider + + + + org.jboss.resteasy + resteasy-cdi + + + * + * + + + + + + org.jboss.resteasy + resteasy-crypto + + + + org.jboss.resteasy + resteasy-jackson-provider + + + + org.jboss.resteasy + resteasy-jackson2-provider + + + + org.jboss.resteasy + resteasy-json-p-provider + + + + org.jboss.resteasy + resteasy-jaxb-provider + + + + org.jboss.resteasy + resteasy-jettison-provider + + + + org.jboss.resteasy + resteasy-jsapi + + + + org.jboss.resteasy + resteasy-multipart-provider + + + + org.jboss.resteasy + resteasy-validator-provider-11 + + + + org.jboss.resteasy + resteasy-yaml-provider + + + + org.jboss.seam.integration + jboss-seam-int-jbossas + + + + org.jboss.security + jbossxacml + + + + org.jboss.shrinkwrap + shrinkwrap-api + + + + org.jboss.shrinkwrap + shrinkwrap-impl-base + + + + org.jboss.shrinkwrap + shrinkwrap-spi + + + + org.jboss.spec.javax.batch + jboss-batch-api_1.0_spec + + + * + * + + + + + + org.jboss.spec.javax.ejb + jboss-ejb-api_3.2_spec + + + + org.jboss.spec.javax.faces + jboss-jsf-api_2.2_spec + + + + org.jboss.spec.javax.jms + jboss-jms-api_2.0_spec + + + + org.jboss.spec.javax.management.j2ee + jboss-j2eemgmt-api_1.1_spec + + + + org.jboss.spec.javax.resource + jboss-connector-api_1.7_spec + + + + org.jboss.spec.javax.rmi + jboss-rmi-api_1.0_spec + + + + org.jboss.spec.javax.xml.bind + jboss-jaxb-api_2.2_spec + + + + org.jboss.spec.javax.xml.rpc + jboss-jaxrpc-api_1.1_spec + + + + org.jboss.spec.javax.xml.soap + jboss-saaj-api_1.3_spec + + + + org.jboss.spec.javax.xml.ws + jboss-jaxws-api_2.2_spec + + + + org.jboss.weld + weld-api + + + * + * + + + + + + org.jboss.weld + weld-core-impl + + + * + * + + + + + + org.jboss.weld + weld-core-jsf + + + + org.jboss.weld + weld-spi + + + * + * + + + + + + org.jboss.ws + jbossws-api + + + + org.jboss.ws + jbossws-common + + + + org.jboss.ws + jbossws-common-tools + + + + org.jboss.ws + jbossws-spi + + + + org.jboss.ws.cxf + jbossws-cxf-client + + + * + * + + + + + + org.jboss.ws.cxf + jbossws-cxf-factories + + + + org.jboss.ws.cxf + jbossws-cxf-resources + wildfly800 + + + + org.jboss.ws.cxf + jbossws-cxf-server + + + * + * + + + + + + org.jboss.ws.cxf + jbossws-cxf-transports-udp + + + + org.jboss + jbossxb + + + * + * + + + + + + org.jdom + jdom + + + + org.jgroups + jgroups + + + + org.kohsuke.rngom + rngom + + + + org.picketlink + picketlink-api + + + + org.picketlink + picketlink-impl + + + + org.picketlink + picketlink-federation + + + * + * + + + + + + org.picketlink + picketlink-common + + + + org.picketlink + picketlink-config + + + + org.picketlink + picketlink-idm-api + + + + org.picketlink + picketlink-idm-impl + + + + org.scannotation + scannotation + + + + org.slf4j + jcl-over-slf4j + + + * + * + + + + + + org.slf4j + slf4j-ext + + + * + * + + + + + + org.yaml + snakeyaml + + + + wsdl4j + wsdl4j + + + + com.io7m.xom + xom + + + * + * + + + + + + org.apache.cxf.xjcplugins + cxf-xjc-ts + + + + org.opensaml + opensaml + + + + org.opensaml + openws + + + * + * + + + + + + org.opensaml + xmltooling + + + * + * + + + + + + org.apache.httpcomponents + httpclient + + + + org.apache.httpcomponents + httpcore + + + + org.apache.httpcomponents + httpmime + + + + org.apache.james + apache-mime4j + + + + org.apache.lucene + lucene-analyzers + + + org.apache.lucene + lucene-core + + + org.apache.lucene + lucene-facet + + + org.apache.lucene + lucene-memory + + + + org.apache.neethi + neethi + + + * + * + + + + + + org.apache.qpid + proton-api + + + + org.apache.qpid + proton-jms + + + + org.apache.qpid + proton-j-impl + + + + org.apache.santuario + xmlsec + + + + org.apache.ws.xmlschema + xmlschema-core + + + + org.apache.velocity + velocity + + + + org.apache.ws.security + wss4j + + + + org.bouncycastle + bcprov-jdk15on + + + + org.bouncycastle + bcmail-jdk15on + + + + org.bouncycastle + bcpkix-jdk15on + + + + org.codehaus.jackson + jackson-core-asl + + + + org.codehaus.jackson + jackson-mapper-asl + + + + org.codehaus.jackson + jackson-jaxrs + + + + org.codehaus.jackson + jackson-xc + + + + org.codehaus.jettison + jettison + + + + + org.glassfish + javax.json + + + + org.hibernate + hibernate-core + + + * + * + + + + + + org.hibernate.common + hibernate-commons-annotations + + + * + * + + + + + + org.hibernate + hibernate-entitymanager + + + * + * + + + + + + org.hibernate + hibernate-infinispan + + + * + * + + + + + + org.hibernate + hibernate-validator + + + * + * + + + + + + org.hibernate + hibernate-validator-cdi + + + + org.hibernate + hibernate-envers + + + * + * + + + + + + org.hibernate + hibernate-search-engine + + + * + * + + + + + + org.hibernate + hibernate-search-infinispan + + + * + * + + + + + + org.hibernate + hibernate-search-orm + + + * + * + + + + + + org.hibernate.javax.persistence + hibernate-jpa-2.1-api + + + * + * + + + + + + org.hibernate.hql + hibernate-hql-lucene + + + * + * + + + + + + org.hibernate.hql + hibernate-hql-parser + + + * + * + + + + + + org.hornetq + hornetq-amqp-protocol + + + * + * + + + + + + org.hornetq + hornetq-commons + + + * + * + + + + + + org.hornetq + hornetq-tools + + + org.jboss.logging + jboss-logging + + + + + + org.hornetq + hornetq-core-client + + + + org.hornetq + hornetq-jms-client + + + * + * + + + + + + org.hornetq + hornetq-jms-server + + + org.jboss.jbossts.jts + jbossjts-jacorb + + + + + + org.hornetq + hornetq-journal + + + org.jboss.logging + jboss-logging + + + + + + org.hornetq + hornetq-native + + + + org.hornetq + hornetq-ra + + + org.jboss.logging + jboss-logging + + + + + + org.hornetq + hornetq-server + + + org.jboss.logging + jboss-logging + + + + + + org.hornetq + hornetq-stomp-protocol + + + org.jboss.logging + jboss-logging + + + + + + org.infinispan + infinispan-cachestore-jdbc + + + org.infinispan + infinispan-cachestore-remote + + + org.infinispan + infinispan-client-hotrod + + + * + * + + + + + org.infinispan + infinispan-commons + + + org.infinispan + infinispan-core + + + org.infinispan + infinispan-lucene-directory + + + org.infinispan + infinispan-lucene-v3 + + + org.infinispan + infinispan-query + + + org.infinispan + infinispan-query-dsl + + + + org.javassist + javassist + + + + org.jberet + jberet-core + + + * + * + + + + + + org.jboss + jboss-iiop-client + + + + org.wildfly + wildfly-appclient + + + * + * + + + + + + org.wildfly.core + wildfly-cli + client + + + * + * + + + + + + org.wildfly.core + wildfly-version + + + * + * + + + + + + org.wildfly + wildfly-client-all + + + org.wildfly + wildfly-ejb-client-bom + + + org.wildfly + wildfly-jms-client-bom + + + + + + org.wildfly + wildfly-clustering-api + + + + org.wildfly + wildfly-clustering-spi + + + * + * + + + + + + org.wildfly + wildfly-clustering-common + + + * + * + + + + + + org.wildfly + wildfly-clustering-ejb-infinispan + + + + org.wildfly + wildfly-clustering-ejb-spi + + + * + * + + + + + + org.wildfly + wildfly-clustering-infinispan + + + * + * + + + + + + org.wildfly + wildfly-clustering-jgroups + + + * + * + + + + + + org.wildfly + wildfly-clustering-server + + + + org.wildfly + wildfly-clustering-singleton + + + * + * + + + + + + org.wildfly + wildfly-clustering-web-api + + + + org.wildfly + wildfly-clustering-web-infinispan + + + * + * + + + + + + org.wildfly + wildfly-clustering-web-spi + + + * + * + + + + + + org.wildfly + wildfly-clustering-web-undertow + + + * + * + + + + + + org.wildfly + wildfly-cmp + + + * + * + + + + + + org.jboss.hal + release-stream + resources + + + + org.wildfly + wildfly-batch + + + * + * + + + + + + org.wildfly + wildfly-bean-validation + + + * + * + + + + + + org.wildfly + wildfly-jberet + + + * + * + + + + + + org.wildfly + wildfly-connector + + + * + * + + + + + + org.wildfly + wildfly-ejb3 + + + * + * + + + + + + org.wildfly + wildfly-embedded + + + * + * + + + + + + org.wildfly + wildfly-jaxr + + + * + * + + + + + + org.wildfly + wildfly-jaxrs + + + * + * + + + + + + org.wildfly + wildfly-jdr + + + * + * + + + + + + org.wildfly + wildfly-jsf + + + * + * + + + + + + org.wildfly + wildfly-jsf-injection + + + + org.wildfly + wildfly-jsr77 + + + * + * + + + + + + org.wildfly + wildfly-jacorb + + + * + * + + + + + + org.wildfly + wildfly-mail + + + * + * + + + + + + org.wildfly + wildfly-messaging + + + * + * + + + + + + org.wildfly + wildfly-mod_cluster-extension + + + * + * + + + + + + org.wildfly + wildfly-mod_cluster-undertow + + + * + * + + + + + + org.wildfly + wildfly-pojo + + + * + * + + + + + + org.wildfly + wildfly-sar + + + * + * + + + + + + org.wildfly + wildfly-transactions + + + * + * + + + + + + org.wildfly + wildfly-web + + + * + * + + + + + + org.wildfly + wildfly-weld + + + * + * + + + + + + org.wildfly + wildfly-webservices-server-integration + + + * + * + + + + + + org.wildfly + wildfly-xts + + + * + * + + + + + + org.jboss.ws.cxf + jbossws-cxf-transports-undertow + + + + org.jboss.ws.projects + jaxws-undertow-httpspi + + + * + * + + + + + + org.picketlink + picketlink-idm-simple-schema + + + + org.picketlink.distribution + picketlink-wildfly8 + + + + + + + release + + + release + + + + + + org.codehaus.mojo + license-maven-plugin + false + + + + download-licenses + + package + + + ${project.build.directory}/${project.build.finalName}/content/docs/licenses + + + ${project.build.directory}/${project.build.finalName}/content/docs/licenses/licenses.xml + + + + + + + + + + + enforce + + + !skip-enforce + + + + + + org.apache.maven.plugins + maven-enforcer-plugin + + + ban-transitive-deps + + enforce + + + + + + + com.sun:tools + sun.jdk:jconsole + + + + + + + + + + + + + javadocDist + + WildFly public API - ${project.version} + + + + + org.apache.maven.plugins + maven-javadoc-plugin + ${version.javadoc.plugin} + + + javadocs-dist + + aggregate-jar + + validate + + true + true + 2400m + + ISO-8859-1 + + ${javadoc.branding} public API + ${javadoc.branding} public API +
${javadoc.branding}
+
${javadoc.branding}
+ + true + + + + + + + + + + + + + + + + + + + + + + diff --git a/build/src/license/licenses.xml b/feature-pack/src/license/licenses.xml similarity index 100% rename from build/src/license/licenses.xml rename to feature-pack/src/license/licenses.xml diff --git a/build/src/main/resources/configuration/ReadMe.txt b/feature-pack/src/main/resources/configuration/ReadMe.txt similarity index 100% rename from build/src/main/resources/configuration/ReadMe.txt rename to feature-pack/src/main/resources/configuration/ReadMe.txt diff --git a/build/src/main/resources/configuration/domain/subsystems-core.xml b/feature-pack/src/main/resources/configuration/domain/subsystems-core.xml similarity index 100% rename from build/src/main/resources/configuration/domain/subsystems-core.xml rename to feature-pack/src/main/resources/configuration/domain/subsystems-core.xml diff --git a/build/src/main/resources/configuration/domain/subsystems.xml b/feature-pack/src/main/resources/configuration/domain/subsystems.xml similarity index 100% rename from build/src/main/resources/configuration/domain/subsystems.xml rename to feature-pack/src/main/resources/configuration/domain/subsystems.xml diff --git a/build/src/main/resources/configuration/domain/template-core.xml b/feature-pack/src/main/resources/configuration/domain/template-core.xml similarity index 100% rename from build/src/main/resources/configuration/domain/template-core.xml rename to feature-pack/src/main/resources/configuration/domain/template-core.xml diff --git a/build/src/main/resources/configuration/domain/template.xml b/feature-pack/src/main/resources/configuration/domain/template.xml similarity index 100% rename from build/src/main/resources/configuration/domain/template.xml rename to feature-pack/src/main/resources/configuration/domain/template.xml diff --git a/build/src/main/resources/configuration/examples/subsystems-genericjms.xml b/feature-pack/src/main/resources/configuration/examples/subsystems-genericjms.xml similarity index 100% rename from build/src/main/resources/configuration/examples/subsystems-genericjms.xml rename to feature-pack/src/main/resources/configuration/examples/subsystems-genericjms.xml diff --git a/build/src/main/resources/configuration/examples/subsystems-hornetq-colocated.xml b/feature-pack/src/main/resources/configuration/examples/subsystems-hornetq-colocated.xml similarity index 100% rename from build/src/main/resources/configuration/examples/subsystems-hornetq-colocated.xml rename to feature-pack/src/main/resources/configuration/examples/subsystems-hornetq-colocated.xml diff --git a/build/src/main/resources/configuration/examples/subsystems-jts.xml b/feature-pack/src/main/resources/configuration/examples/subsystems-jts.xml similarity index 100% rename from build/src/main/resources/configuration/examples/subsystems-jts.xml rename to feature-pack/src/main/resources/configuration/examples/subsystems-jts.xml diff --git a/build/src/main/resources/configuration/examples/subsystems-picketlink.xml b/feature-pack/src/main/resources/configuration/examples/subsystems-picketlink.xml similarity index 100% rename from build/src/main/resources/configuration/examples/subsystems-picketlink.xml rename to feature-pack/src/main/resources/configuration/examples/subsystems-picketlink.xml diff --git a/build/src/main/resources/configuration/examples/subsystems-rts.xml b/feature-pack/src/main/resources/configuration/examples/subsystems-rts.xml similarity index 100% rename from build/src/main/resources/configuration/examples/subsystems-rts.xml rename to feature-pack/src/main/resources/configuration/examples/subsystems-rts.xml diff --git a/build/src/main/resources/configuration/examples/subsystems-xts.xml b/feature-pack/src/main/resources/configuration/examples/subsystems-xts.xml similarity index 100% rename from build/src/main/resources/configuration/examples/subsystems-xts.xml rename to feature-pack/src/main/resources/configuration/examples/subsystems-xts.xml diff --git a/build/src/main/resources/configuration/standalone/subsystems-core.xml b/feature-pack/src/main/resources/configuration/standalone/subsystems-core.xml similarity index 100% rename from build/src/main/resources/configuration/standalone/subsystems-core.xml rename to feature-pack/src/main/resources/configuration/standalone/subsystems-core.xml diff --git a/build/src/main/resources/configuration/standalone/subsystems-full-ha.xml b/feature-pack/src/main/resources/configuration/standalone/subsystems-full-ha.xml similarity index 100% rename from build/src/main/resources/configuration/standalone/subsystems-full-ha.xml rename to feature-pack/src/main/resources/configuration/standalone/subsystems-full-ha.xml diff --git a/build/src/main/resources/configuration/standalone/subsystems-full.xml b/feature-pack/src/main/resources/configuration/standalone/subsystems-full.xml similarity index 100% rename from build/src/main/resources/configuration/standalone/subsystems-full.xml rename to feature-pack/src/main/resources/configuration/standalone/subsystems-full.xml diff --git a/build/src/main/resources/configuration/standalone/subsystems-ha.xml b/feature-pack/src/main/resources/configuration/standalone/subsystems-ha.xml similarity index 100% rename from build/src/main/resources/configuration/standalone/subsystems-ha.xml rename to feature-pack/src/main/resources/configuration/standalone/subsystems-ha.xml diff --git a/build/src/main/resources/configuration/standalone/subsystems.xml b/feature-pack/src/main/resources/configuration/standalone/subsystems.xml similarity index 100% rename from build/src/main/resources/configuration/standalone/subsystems.xml rename to feature-pack/src/main/resources/configuration/standalone/subsystems.xml diff --git a/build/src/main/resources/configuration/standalone/template.xml b/feature-pack/src/main/resources/configuration/standalone/template.xml similarity index 100% rename from build/src/main/resources/configuration/standalone/template.xml rename to feature-pack/src/main/resources/configuration/standalone/template.xml diff --git a/build/src/main/resources/appclient/configuration/appclient.xml b/feature-pack/src/main/resources/content/appclient/configuration/appclient.xml similarity index 100% rename from build/src/main/resources/appclient/configuration/appclient.xml rename to feature-pack/src/main/resources/content/appclient/configuration/appclient.xml diff --git a/build/src/main/resources/appclient/configuration/logging.properties b/feature-pack/src/main/resources/content/appclient/configuration/logging.properties similarity index 100% rename from build/src/main/resources/appclient/configuration/logging.properties rename to feature-pack/src/main/resources/content/appclient/configuration/logging.properties diff --git a/build/src/main/resources/bin/appclient.bat b/feature-pack/src/main/resources/content/bin/appclient.bat similarity index 100% rename from build/src/main/resources/bin/appclient.bat rename to feature-pack/src/main/resources/content/bin/appclient.bat diff --git a/build/src/main/resources/bin/appclient.conf b/feature-pack/src/main/resources/content/bin/appclient.conf similarity index 100% rename from build/src/main/resources/bin/appclient.conf rename to feature-pack/src/main/resources/content/bin/appclient.conf diff --git a/build/src/main/resources/bin/appclient.conf.bat b/feature-pack/src/main/resources/content/bin/appclient.conf.bat similarity index 100% rename from build/src/main/resources/bin/appclient.conf.bat rename to feature-pack/src/main/resources/content/bin/appclient.conf.bat diff --git a/build/src/main/resources/bin/appclient.sh b/feature-pack/src/main/resources/content/bin/appclient.sh similarity index 100% rename from build/src/main/resources/bin/appclient.sh rename to feature-pack/src/main/resources/content/bin/appclient.sh diff --git a/build/src/main/resources/bin/client/README-CLI-JCONSOLE.txt b/feature-pack/src/main/resources/content/bin/client/README-CLI-JCONSOLE.txt similarity index 100% rename from build/src/main/resources/bin/client/README-CLI-JCONSOLE.txt rename to feature-pack/src/main/resources/content/bin/client/README-CLI-JCONSOLE.txt diff --git a/build/src/main/resources/bin/client/README-EJB-JMS.txt b/feature-pack/src/main/resources/content/bin/client/README-EJB-JMS.txt similarity index 100% rename from build/src/main/resources/bin/client/README-EJB-JMS.txt rename to feature-pack/src/main/resources/content/bin/client/README-EJB-JMS.txt diff --git a/build/src/main/resources/bin/jconsole.bat b/feature-pack/src/main/resources/content/bin/jconsole.bat similarity index 100% rename from build/src/main/resources/bin/jconsole.bat rename to feature-pack/src/main/resources/content/bin/jconsole.bat diff --git a/build/src/main/resources/bin/jconsole.sh b/feature-pack/src/main/resources/content/bin/jconsole.sh similarity index 100% rename from build/src/main/resources/bin/jconsole.sh rename to feature-pack/src/main/resources/content/bin/jconsole.sh diff --git a/build/src/main/resources/bin/jdr.bat b/feature-pack/src/main/resources/content/bin/jdr.bat similarity index 100% rename from build/src/main/resources/bin/jdr.bat rename to feature-pack/src/main/resources/content/bin/jdr.bat diff --git a/build/src/main/resources/bin/jdr.sh b/feature-pack/src/main/resources/content/bin/jdr.sh similarity index 100% rename from build/src/main/resources/bin/jdr.sh rename to feature-pack/src/main/resources/content/bin/jdr.sh diff --git a/build/src/main/resources/bin/run.bat b/feature-pack/src/main/resources/content/bin/run.bat similarity index 100% rename from build/src/main/resources/bin/run.bat rename to feature-pack/src/main/resources/content/bin/run.bat diff --git a/build/src/main/resources/bin/run.sh b/feature-pack/src/main/resources/content/bin/run.sh similarity index 100% rename from build/src/main/resources/bin/run.sh rename to feature-pack/src/main/resources/content/bin/run.sh diff --git a/build/src/main/resources/bin/wsconsume.bat b/feature-pack/src/main/resources/content/bin/wsconsume.bat similarity index 100% rename from build/src/main/resources/bin/wsconsume.bat rename to feature-pack/src/main/resources/content/bin/wsconsume.bat diff --git a/build/src/main/resources/bin/wsconsume.sh b/feature-pack/src/main/resources/content/bin/wsconsume.sh similarity index 100% rename from build/src/main/resources/bin/wsconsume.sh rename to feature-pack/src/main/resources/content/bin/wsconsume.sh diff --git a/build/src/main/resources/bin/wsprovide.bat b/feature-pack/src/main/resources/content/bin/wsprovide.bat similarity index 100% rename from build/src/main/resources/bin/wsprovide.bat rename to feature-pack/src/main/resources/content/bin/wsprovide.bat diff --git a/build/src/main/resources/bin/wsprovide.sh b/feature-pack/src/main/resources/content/bin/wsprovide.sh similarity index 100% rename from build/src/main/resources/bin/wsprovide.sh rename to feature-pack/src/main/resources/content/bin/wsprovide.sh diff --git a/build/src/main/resources/docs/examples/configs/standalone-minimalistic.xml b/feature-pack/src/main/resources/content/docs/examples/configs/standalone-minimalistic.xml similarity index 100% rename from build/src/main/resources/docs/examples/configs/standalone-minimalistic.xml rename to feature-pack/src/main/resources/content/docs/examples/configs/standalone-minimalistic.xml diff --git a/build/src/main/resources/modules/system/layers/base/asm/asm/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/asm/asm/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/asm/asm/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/asm/asm/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/ch/qos/cal10n/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/ch/qos/cal10n/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/ch/qos/cal10n/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/ch/qos/cal10n/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/com/fasterxml/classmate/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/com/fasterxml/classmate/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/com/fasterxml/classmate/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/com/fasterxml/classmate/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/com/fasterxml/jackson/core/jackson-annotations/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/com/fasterxml/jackson/core/jackson-annotations/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/com/fasterxml/jackson/core/jackson-annotations/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/com/fasterxml/jackson/core/jackson-annotations/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/com/fasterxml/jackson/core/jackson-core/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/com/fasterxml/jackson/core/jackson-core/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/com/fasterxml/jackson/core/jackson-core/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/com/fasterxml/jackson/core/jackson-core/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/com/fasterxml/jackson/core/jackson-databind/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/com/fasterxml/jackson/core/jackson-databind/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/com/fasterxml/jackson/core/jackson-databind/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/com/fasterxml/jackson/core/jackson-databind/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/com/fasterxml/jackson/jaxrs/jackson-jaxrs-json-provider/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/com/fasterxml/jackson/jaxrs/jackson-jaxrs-json-provider/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/com/fasterxml/jackson/jaxrs/jackson-jaxrs-json-provider/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/com/fasterxml/jackson/jaxrs/jackson-jaxrs-json-provider/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/com/github/relaxng/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/com/github/relaxng/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/com/github/relaxng/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/com/github/relaxng/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/com/google/guava/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/com/google/guava/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/com/google/guava/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/com/google/guava/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/com/h2database/h2/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/com/h2database/h2/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/com/h2database/h2/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/com/h2database/h2/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/com/sun/codemodel/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/com/sun/codemodel/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/com/sun/codemodel/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/com/sun/codemodel/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/com/sun/istack/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/com/sun/istack/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/com/sun/istack/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/com/sun/istack/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/com/sun/jsf-impl/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/com/sun/jsf-impl/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/com/sun/jsf-impl/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/com/sun/jsf-impl/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/com/sun/xml/bind/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/com/sun/xml/bind/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/com/sun/xml/bind/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/com/sun/xml/bind/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/com/sun/xml/fastinfoset/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/com/sun/xml/fastinfoset/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/com/sun/xml/fastinfoset/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/com/sun/xml/fastinfoset/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/com/sun/xml/messaging/saaj/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/com/sun/xml/messaging/saaj/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/com/sun/xml/messaging/saaj/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/com/sun/xml/messaging/saaj/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/com/sun/xml/txw2/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/com/sun/xml/txw2/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/com/sun/xml/txw2/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/com/sun/xml/txw2/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/com/sun/xsom/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/com/sun/xsom/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/com/sun/xsom/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/com/sun/xsom/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/gnu/getopt/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/gnu/getopt/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/gnu/getopt/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/gnu/getopt/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/io/netty/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/io/netty/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/io/netty/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/io/netty/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/javaee/api/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/javaee/api/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/javaee/api/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/javaee/api/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/javax/batch/api/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/javax/batch/api/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/javax/batch/api/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/javax/batch/api/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/javax/ejb/api/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/javax/ejb/api/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/javax/ejb/api/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/javax/ejb/api/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/javax/faces/api/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/javax/faces/api/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/javax/faces/api/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/javax/faces/api/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/javax/jms/api/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/javax/jms/api/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/javax/jms/api/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/javax/jms/api/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/javax/json/api/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/javax/json/api/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/javax/json/api/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/javax/json/api/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/javax/jws/api/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/javax/jws/api/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/javax/jws/api/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/javax/jws/api/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/javax/mail/api/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/javax/mail/api/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/javax/mail/api/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/javax/mail/api/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/javax/management/j2ee/api/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/javax/management/j2ee/api/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/javax/management/j2ee/api/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/javax/management/j2ee/api/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/javax/persistence/api/main/jbosgi-xservice.properties b/feature-pack/src/main/resources/modules/system/layers/base/javax/persistence/api/main/jbosgi-xservice.properties similarity index 100% rename from build/src/main/resources/modules/system/layers/base/javax/persistence/api/main/jbosgi-xservice.properties rename to feature-pack/src/main/resources/modules/system/layers/base/javax/persistence/api/main/jbosgi-xservice.properties diff --git a/build/src/main/resources/modules/system/layers/base/javax/persistence/api/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/javax/persistence/api/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/javax/persistence/api/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/javax/persistence/api/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/javax/resource/api/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/javax/resource/api/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/javax/resource/api/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/javax/resource/api/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/javax/rmi/api/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/javax/rmi/api/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/javax/rmi/api/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/javax/rmi/api/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/javax/ws/rs/api/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/javax/ws/rs/api/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/javax/ws/rs/api/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/javax/ws/rs/api/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/javax/wsdl4j/api/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/javax/wsdl4j/api/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/javax/wsdl4j/api/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/javax/wsdl4j/api/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/javax/xml/bind/api/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/javax/xml/bind/api/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/javax/xml/bind/api/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/javax/xml/bind/api/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/javax/xml/rpc/api/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/javax/xml/rpc/api/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/javax/xml/rpc/api/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/javax/xml/rpc/api/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/javax/xml/soap/api/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/javax/xml/soap/api/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/javax/xml/soap/api/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/javax/xml/soap/api/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/javax/xml/ws/api/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/javax/xml/ws/api/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/javax/xml/ws/api/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/javax/xml/ws/api/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/net/jcip/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/net/jcip/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/net/jcip/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/net/jcip/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/nu/xom/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/nu/xom/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/nu/xom/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/nu/xom/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/org/antlr/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/antlr/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/org/antlr/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/org/antlr/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/org/apache/avro/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/apache/avro/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/org/apache/avro/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/org/apache/avro/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/org/apache/commons/beanutils/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/apache/commons/beanutils/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/org/apache/commons/beanutils/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/org/apache/commons/beanutils/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/org/apache/commons/cli/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/apache/commons/cli/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/org/apache/commons/cli/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/org/apache/commons/cli/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/org/apache/commons/codec/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/apache/commons/codec/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/org/apache/commons/codec/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/org/apache/commons/codec/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/org/apache/commons/collections/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/apache/commons/collections/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/org/apache/commons/collections/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/org/apache/commons/collections/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/org/apache/commons/configuration/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/apache/commons/configuration/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/org/apache/commons/configuration/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/org/apache/commons/configuration/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/org/apache/commons/io/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/apache/commons/io/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/org/apache/commons/io/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/org/apache/commons/io/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/org/apache/commons/lang/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/apache/commons/lang/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/org/apache/commons/lang/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/org/apache/commons/lang/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/org/apache/commons/logging/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/apache/commons/logging/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/org/apache/commons/logging/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/org/apache/commons/logging/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/org/apache/commons/pool/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/apache/commons/pool/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/org/apache/commons/pool/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/org/apache/commons/pool/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/org/apache/cxf/impl/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/apache/cxf/impl/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/org/apache/cxf/impl/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/org/apache/cxf/impl/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/org/apache/cxf/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/apache/cxf/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/org/apache/cxf/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/org/apache/cxf/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/org/apache/httpcomponents/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/apache/httpcomponents/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/org/apache/httpcomponents/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/org/apache/httpcomponents/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/org/apache/james/mime4j/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/apache/james/mime4j/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/org/apache/james/mime4j/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/org/apache/james/mime4j/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/org/apache/lucene/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/apache/lucene/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/org/apache/lucene/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/org/apache/lucene/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/org/apache/neethi/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/apache/neethi/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/org/apache/neethi/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/org/apache/neethi/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/org/apache/openjpa/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/apache/openjpa/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/org/apache/openjpa/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/org/apache/openjpa/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/org/apache/qpid/proton/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/apache/qpid/proton/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/org/apache/qpid/proton/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/org/apache/qpid/proton/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/org/apache/santuario/xmlsec/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/apache/santuario/xmlsec/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/org/apache/santuario/xmlsec/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/org/apache/santuario/xmlsec/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/org/apache/velocity/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/apache/velocity/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/org/apache/velocity/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/org/apache/velocity/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/org/apache/ws/security/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/apache/ws/security/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/org/apache/ws/security/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/org/apache/ws/security/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/org/apache/ws/xmlschema/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/apache/ws/xmlschema/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/org/apache/ws/xmlschema/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/org/apache/ws/xmlschema/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/org/bouncycastle/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/bouncycastle/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/org/bouncycastle/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/org/bouncycastle/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/org/codehaus/jackson/jackson-core-asl/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/codehaus/jackson/jackson-core-asl/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/org/codehaus/jackson/jackson-core-asl/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/org/codehaus/jackson/jackson-core-asl/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/org/codehaus/jackson/jackson-jaxrs/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/codehaus/jackson/jackson-jaxrs/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/org/codehaus/jackson/jackson-jaxrs/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/org/codehaus/jackson/jackson-jaxrs/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/org/codehaus/jackson/jackson-mapper-asl/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/codehaus/jackson/jackson-mapper-asl/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/org/codehaus/jackson/jackson-mapper-asl/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/org/codehaus/jackson/jackson-mapper-asl/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/org/codehaus/jackson/jackson-xc/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/codehaus/jackson/jackson-xc/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/org/codehaus/jackson/jackson-xc/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/org/codehaus/jackson/jackson-xc/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/org/codehaus/jettison/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/codehaus/jettison/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/org/codehaus/jettison/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/org/codehaus/jettison/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/org/dom4j/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/dom4j/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/org/dom4j/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/org/dom4j/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/org/eclipse/persistence/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/eclipse/persistence/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/org/eclipse/persistence/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/org/eclipse/persistence/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/org/glassfish/javax/json/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/glassfish/javax/json/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/org/glassfish/javax/json/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/org/glassfish/javax/json/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/org/hibernate/3/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/hibernate/3/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/org/hibernate/3/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/org/hibernate/3/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/org/hibernate/4.1/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/hibernate/4.1/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/org/hibernate/4.1/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/org/hibernate/4.1/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/org/hibernate/commons-annotations/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/hibernate/commons-annotations/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/org/hibernate/commons-annotations/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/org/hibernate/commons-annotations/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/org/hibernate/envers/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/hibernate/envers/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/org/hibernate/envers/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/org/hibernate/envers/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/org/hibernate/hql/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/hibernate/hql/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/org/hibernate/hql/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/org/hibernate/hql/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/org/hibernate/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/hibernate/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/org/hibernate/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/org/hibernate/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/org/hibernate/search/engine/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/hibernate/search/engine/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/org/hibernate/search/engine/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/org/hibernate/search/engine/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/org/hibernate/search/orm/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/hibernate/search/orm/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/org/hibernate/search/orm/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/org/hibernate/search/orm/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/org/hibernate/validator/cdi/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/hibernate/validator/cdi/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/org/hibernate/validator/cdi/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/org/hibernate/validator/cdi/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/org/hibernate/validator/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/hibernate/validator/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/org/hibernate/validator/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/org/hibernate/validator/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/org/hornetq/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/hornetq/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/org/hornetq/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/org/hornetq/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/org/hornetq/protocol/amqp/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/hornetq/protocol/amqp/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/org/hornetq/protocol/amqp/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/org/hornetq/protocol/amqp/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/org/hornetq/protocol/stomp/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/hornetq/protocol/stomp/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/org/hornetq/protocol/stomp/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/org/hornetq/protocol/stomp/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/org/hornetq/ra/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/hornetq/ra/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/org/hornetq/ra/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/org/hornetq/ra/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/org/infinispan/cachestore/jdbc/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/infinispan/cachestore/jdbc/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/org/infinispan/cachestore/jdbc/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/org/infinispan/cachestore/jdbc/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/org/infinispan/cachestore/remote/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/infinispan/cachestore/remote/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/org/infinispan/cachestore/remote/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/org/infinispan/cachestore/remote/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/org/infinispan/client/hotrod/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/infinispan/client/hotrod/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/org/infinispan/client/hotrod/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/org/infinispan/client/hotrod/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/org/infinispan/commons/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/infinispan/commons/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/org/infinispan/commons/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/org/infinispan/commons/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/org/infinispan/lucene/directory/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/infinispan/lucene/directory/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/org/infinispan/lucene/directory/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/org/infinispan/lucene/directory/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/org/infinispan/lucene/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/infinispan/lucene/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/org/infinispan/lucene/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/org/infinispan/lucene/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/org/infinispan/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/infinispan/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/org/infinispan/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/org/infinispan/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/org/infinispan/query/dsl/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/infinispan/query/dsl/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/org/infinispan/query/dsl/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/org/infinispan/query/dsl/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/org/infinispan/query/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/infinispan/query/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/org/infinispan/query/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/org/infinispan/query/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/org/jacorb/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jacorb/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/org/jacorb/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/org/jacorb/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/org/javassist/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/javassist/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/org/javassist/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/org/javassist/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/org/jaxen/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jaxen/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/org/jaxen/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/org/jaxen/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/org/jberet/jberet-core/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jberet/jberet-core/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/org/jberet/jberet-core/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/org/jberet/jberet-core/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/org/jboss/as/aggregate/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/aggregate/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/org/jboss/as/aggregate/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/aggregate/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/org/jboss/as/appclient/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/appclient/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/org/jboss/as/appclient/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/appclient/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/org/jboss/as/clustering/common/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/clustering/common/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/org/jboss/as/clustering/common/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/clustering/common/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/org/jboss/as/clustering/ejb3/infinispan/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/clustering/ejb3/infinispan/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/org/jboss/as/clustering/ejb3/infinispan/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/clustering/ejb3/infinispan/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/org/jboss/as/clustering/infinispan/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/clustering/infinispan/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/org/jboss/as/clustering/infinispan/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/clustering/infinispan/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/org/jboss/as/clustering/jgroups/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/clustering/jgroups/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/org/jboss/as/clustering/jgroups/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/clustering/jgroups/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/org/jboss/as/clustering/web/infinispan/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/clustering/web/infinispan/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/org/jboss/as/clustering/web/infinispan/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/clustering/web/infinispan/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/org/jboss/as/cmp/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/cmp/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/org/jboss/as/cmp/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/cmp/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/org/jboss/as/connector/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/connector/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/org/jboss/as/connector/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/connector/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/org/jboss/as/console/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/console/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/org/jboss/as/console/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/console/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/org/jboss/as/ejb3/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/ejb3/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/org/jboss/as/ejb3/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/ejb3/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/org/jboss/as/ejb3/main/timers/timer-sql.properties b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/ejb3/main/timers/timer-sql.properties similarity index 100% rename from build/src/main/resources/modules/system/layers/base/org/jboss/as/ejb3/main/timers/timer-sql.properties rename to feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/ejb3/main/timers/timer-sql.properties diff --git a/build/src/main/resources/modules/system/layers/base/org/jboss/as/embedded/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/embedded/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/org/jboss/as/embedded/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/embedded/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/org/jboss/as/jacorb/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/jacorb/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/org/jboss/as/jacorb/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/jacorb/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/org/jboss/as/jaxr/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/jaxr/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/org/jboss/as/jaxr/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/jaxr/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/org/jboss/as/jaxrs/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/jaxrs/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/org/jboss/as/jaxrs/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/jaxrs/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/org/jboss/as/jdr/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/jdr/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/org/jboss/as/jdr/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/jdr/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/org/jboss/as/jdr/main/resources/plugins.properties b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/jdr/main/resources/plugins.properties similarity index 100% rename from build/src/main/resources/modules/system/layers/base/org/jboss/as/jdr/main/resources/plugins.properties rename to feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/jdr/main/resources/plugins.properties diff --git a/build/src/main/resources/modules/system/layers/base/org/jboss/as/jpa/hibernate/3/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/jpa/hibernate/3/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/org/jboss/as/jpa/hibernate/3/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/jpa/hibernate/3/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/org/jboss/as/jpa/hibernate/4/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/jpa/hibernate/4/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/org/jboss/as/jpa/hibernate/4/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/jpa/hibernate/4/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/org/jboss/as/jpa/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/jpa/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/org/jboss/as/jpa/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/jpa/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/org/jboss/as/jpa/openjpa/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/jpa/openjpa/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/org/jboss/as/jpa/openjpa/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/jpa/openjpa/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/org/jboss/as/jpa/spi/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/jpa/spi/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/org/jboss/as/jpa/spi/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/jpa/spi/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/org/jboss/as/jsf-injection/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/jsf-injection/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/org/jboss/as/jsf-injection/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/jsf-injection/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/org/jboss/as/jsf/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/jsf/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/org/jboss/as/jsf/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/jsf/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/org/jboss/as/jsr77/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/jsr77/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/org/jboss/as/jsr77/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/jsr77/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/org/jboss/as/mail/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/mail/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/org/jboss/as/mail/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/mail/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/org/jboss/as/messaging/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/messaging/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/org/jboss/as/messaging/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/messaging/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/org/jboss/as/modcluster/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/modcluster/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/org/jboss/as/modcluster/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/modcluster/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/org/jboss/as/pojo/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/pojo/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/org/jboss/as/pojo/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/pojo/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/org/jboss/as/sar/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/sar/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/org/jboss/as/sar/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/sar/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/org/jboss/as/security-api/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/security-api/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/org/jboss/as/security-api/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/security-api/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/org/jboss/as/transactions/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/transactions/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/org/jboss/as/transactions/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/transactions/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/org/jboss/as/vault-tool/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/vault-tool/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/org/jboss/as/vault-tool/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/vault-tool/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/org/jboss/as/web/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/web/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/org/jboss/as/web/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/web/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/org/jboss/as/webservices/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/webservices/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/org/jboss/as/webservices/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/webservices/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/org/jboss/as/webservices/server/integration/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/webservices/server/integration/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/org/jboss/as/webservices/server/integration/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/webservices/server/integration/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/org/jboss/as/weld/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/weld/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/org/jboss/as/weld/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/weld/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/org/jboss/as/xts/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/xts/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/org/jboss/as/xts/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/xts/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/org/jboss/deployers/jboss-service-deployer/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/deployers/jboss-service-deployer/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/org/jboss/deployers/jboss-service-deployer/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/org/jboss/deployers/jboss-service-deployer/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/org/jboss/ejb-client/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/ejb-client/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/org/jboss/ejb-client/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/org/jboss/ejb-client/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/org/jboss/ejb/remote/protocol/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/ejb/remote/protocol/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/org/jboss/ejb/remote/protocol/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/org/jboss/ejb/remote/protocol/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/org/jboss/ejb3/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/ejb3/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/org/jboss/ejb3/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/org/jboss/ejb3/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/org/jboss/genericjms/main/META-INF/ra.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/genericjms/main/META-INF/ra.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/org/jboss/genericjms/main/META-INF/ra.xml rename to feature-pack/src/main/resources/modules/system/layers/base/org/jboss/genericjms/main/META-INF/ra.xml diff --git a/build/src/main/resources/modules/system/layers/base/org/jboss/genericjms/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/genericjms/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/org/jboss/genericjms/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/org/jboss/genericjms/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/org/jboss/iiop-client/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/iiop-client/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/org/jboss/iiop-client/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/org/jboss/iiop-client/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/org/jboss/integration/ext-content/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/integration/ext-content/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/org/jboss/integration/ext-content/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/org/jboss/integration/ext-content/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/org/jboss/ironjacamar/api/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/ironjacamar/api/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/org/jboss/ironjacamar/api/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/org/jboss/ironjacamar/api/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/org/jboss/ironjacamar/impl/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/ironjacamar/impl/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/org/jboss/ironjacamar/impl/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/org/jboss/ironjacamar/impl/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/org/jboss/ironjacamar/jdbcadapters/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/ironjacamar/jdbcadapters/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/org/jboss/ironjacamar/jdbcadapters/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/org/jboss/ironjacamar/jdbcadapters/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/org/jboss/jaxbintros/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/jaxbintros/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/org/jboss/jaxbintros/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/org/jboss/jaxbintros/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/org/jboss/jboss-transaction-spi/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/jboss-transaction-spi/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/org/jboss/jboss-transaction-spi/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/org/jboss/jboss-transaction-spi/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/org/jboss/jts/integration/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/jts/integration/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/org/jboss/jts/integration/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/org/jboss/jts/integration/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/org/jboss/jts/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/jts/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/org/jboss/jts/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/org/jboss/jts/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/org/jboss/metadata/appclient/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/metadata/appclient/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/org/jboss/metadata/appclient/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/org/jboss/metadata/appclient/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/org/jboss/metadata/ejb/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/metadata/ejb/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/org/jboss/metadata/ejb/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/org/jboss/metadata/ejb/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/org/jboss/mod_cluster/container/spi/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/mod_cluster/container/spi/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/org/jboss/mod_cluster/container/spi/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/org/jboss/mod_cluster/container/spi/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/org/jboss/mod_cluster/core/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/mod_cluster/core/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/org/jboss/mod_cluster/core/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/org/jboss/mod_cluster/core/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/org/jboss/narayana/rts/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/narayana/rts/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/org/jboss/narayana/rts/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/org/jboss/narayana/rts/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/org/jboss/narayana/txframework/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/narayana/txframework/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/org/jboss/narayana/txframework/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/org/jboss/narayana/txframework/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/org/jboss/remoting3/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/remoting3/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/org/jboss/remoting3/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/org/jboss/remoting3/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/org/jboss/remoting3/remoting-jmx/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/remoting3/remoting-jmx/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/org/jboss/remoting3/remoting-jmx/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/org/jboss/remoting3/remoting-jmx/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/org/jboss/resteasy/jose-jwt/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/resteasy/jose-jwt/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/org/jboss/resteasy/jose-jwt/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/org/jboss/resteasy/jose-jwt/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/org/jboss/resteasy/resteasy-atom-provider/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/resteasy/resteasy-atom-provider/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/org/jboss/resteasy/resteasy-atom-provider/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/org/jboss/resteasy/resteasy-atom-provider/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/org/jboss/resteasy/resteasy-cdi/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/resteasy/resteasy-cdi/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/org/jboss/resteasy/resteasy-cdi/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/org/jboss/resteasy/resteasy-cdi/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/org/jboss/resteasy/resteasy-crypto/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/resteasy/resteasy-crypto/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/org/jboss/resteasy/resteasy-crypto/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/org/jboss/resteasy/resteasy-crypto/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/org/jboss/resteasy/resteasy-jackson-provider/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/resteasy/resteasy-jackson-provider/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/org/jboss/resteasy/resteasy-jackson-provider/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/org/jboss/resteasy/resteasy-jackson-provider/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/org/jboss/resteasy/resteasy-jackson2-provider/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/resteasy/resteasy-jackson2-provider/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/org/jboss/resteasy/resteasy-jackson2-provider/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/org/jboss/resteasy/resteasy-jackson2-provider/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/org/jboss/resteasy/resteasy-jaxb-provider/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/resteasy/resteasy-jaxb-provider/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/org/jboss/resteasy/resteasy-jaxb-provider/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/org/jboss/resteasy/resteasy-jaxb-provider/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/org/jboss/resteasy/resteasy-jaxrs/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/resteasy/resteasy-jaxrs/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/org/jboss/resteasy/resteasy-jaxrs/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/org/jboss/resteasy/resteasy-jaxrs/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/org/jboss/resteasy/resteasy-jettison-provider/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/resteasy/resteasy-jettison-provider/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/org/jboss/resteasy/resteasy-jettison-provider/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/org/jboss/resteasy/resteasy-jettison-provider/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/org/jboss/resteasy/resteasy-jsapi/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/resteasy/resteasy-jsapi/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/org/jboss/resteasy/resteasy-jsapi/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/org/jboss/resteasy/resteasy-jsapi/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/org/jboss/resteasy/resteasy-json-p-provider/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/resteasy/resteasy-json-p-provider/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/org/jboss/resteasy/resteasy-json-p-provider/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/org/jboss/resteasy/resteasy-json-p-provider/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/org/jboss/resteasy/resteasy-multipart-provider/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/resteasy/resteasy-multipart-provider/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/org/jboss/resteasy/resteasy-multipart-provider/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/org/jboss/resteasy/resteasy-multipart-provider/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/org/jboss/resteasy/resteasy-spring/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/resteasy/resteasy-spring/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/org/jboss/resteasy/resteasy-spring/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/org/jboss/resteasy/resteasy-spring/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/org/jboss/resteasy/resteasy-validator-provider-11/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/resteasy/resteasy-validator-provider-11/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/org/jboss/resteasy/resteasy-validator-provider-11/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/org/jboss/resteasy/resteasy-validator-provider-11/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/org/jboss/resteasy/resteasy-yaml-provider/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/resteasy/resteasy-yaml-provider/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/org/jboss/resteasy/resteasy-yaml-provider/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/org/jboss/resteasy/resteasy-yaml-provider/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/org/jboss/security/xacml/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/security/xacml/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/org/jboss/security/xacml/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/org/jboss/security/xacml/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/org/jboss/shrinkwrap/core/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/shrinkwrap/core/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/org/jboss/shrinkwrap/core/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/org/jboss/shrinkwrap/core/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/org/jboss/weld/api/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/weld/api/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/org/jboss/weld/api/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/org/jboss/weld/api/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/org/jboss/weld/core/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/weld/core/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/org/jboss/weld/core/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/org/jboss/weld/core/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/org/jboss/weld/spi/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/weld/spi/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/org/jboss/weld/spi/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/org/jboss/weld/spi/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/org/jboss/ws/api/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/ws/api/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/org/jboss/ws/api/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/org/jboss/ws/api/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/org/jboss/ws/common/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/ws/common/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/org/jboss/ws/common/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/org/jboss/ws/common/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/org/jboss/ws/cxf/jbossws-cxf-client/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/ws/cxf/jbossws-cxf-client/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/org/jboss/ws/cxf/jbossws-cxf-client/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/org/jboss/ws/cxf/jbossws-cxf-client/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/org/jboss/ws/cxf/jbossws-cxf-factories/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/ws/cxf/jbossws-cxf-factories/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/org/jboss/ws/cxf/jbossws-cxf-factories/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/org/jboss/ws/cxf/jbossws-cxf-factories/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/org/jboss/ws/cxf/jbossws-cxf-server/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/ws/cxf/jbossws-cxf-server/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/org/jboss/ws/cxf/jbossws-cxf-server/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/org/jboss/ws/cxf/jbossws-cxf-server/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/org/jboss/ws/cxf/jbossws-cxf-transports-udp/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/ws/cxf/jbossws-cxf-transports-udp/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/org/jboss/ws/cxf/jbossws-cxf-transports-udp/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/org/jboss/ws/cxf/jbossws-cxf-transports-udp/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/org/jboss/ws/cxf/jbossws-cxf-transports-undertow/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/ws/cxf/jbossws-cxf-transports-undertow/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/org/jboss/ws/cxf/jbossws-cxf-transports-undertow/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/org/jboss/ws/cxf/jbossws-cxf-transports-undertow/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/org/jboss/ws/jaxws-client/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/ws/jaxws-client/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/org/jboss/ws/jaxws-client/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/org/jboss/ws/jaxws-client/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/org/jboss/ws/jaxws-undertow-httpspi/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/ws/jaxws-undertow-httpspi/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/org/jboss/ws/jaxws-undertow-httpspi/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/org/jboss/ws/jaxws-undertow-httpspi/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/org/jboss/ws/saaj-impl/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/ws/saaj-impl/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/org/jboss/ws/saaj-impl/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/org/jboss/ws/saaj-impl/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/org/jboss/ws/spi/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/ws/spi/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/org/jboss/ws/spi/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/org/jboss/ws/spi/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/org/jboss/ws/tools/common/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/ws/tools/common/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/org/jboss/ws/tools/common/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/org/jboss/ws/tools/common/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/org/jboss/ws/tools/wsconsume/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/ws/tools/wsconsume/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/org/jboss/ws/tools/wsconsume/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/org/jboss/ws/tools/wsconsume/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/org/jboss/ws/tools/wsprovide/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/ws/tools/wsprovide/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/org/jboss/ws/tools/wsprovide/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/org/jboss/ws/tools/wsprovide/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/org/jboss/xb/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/xb/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/org/jboss/xb/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/org/jboss/xb/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/org/jboss/xnio/netty/netty-xnio-transport/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/xnio/netty/netty-xnio-transport/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/org/jboss/xnio/netty/netty-xnio-transport/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/org/jboss/xnio/netty/netty-xnio-transport/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/org/jboss/xts/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/xts/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/org/jboss/xts/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/org/jboss/xts/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/org/jdom/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jdom/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/org/jdom/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/org/jdom/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/org/jgroups/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jgroups/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/org/jgroups/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/org/jgroups/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/org/joda/time/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/joda/time/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/org/joda/time/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/org/joda/time/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/org/jsoup/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jsoup/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/org/jsoup/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/org/jsoup/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/org/kohsuke/rngom/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/kohsuke/rngom/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/org/kohsuke/rngom/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/org/kohsuke/rngom/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/org/omg/api/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/omg/api/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/org/omg/api/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/org/omg/api/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/org/opensaml/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/opensaml/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/org/opensaml/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/org/opensaml/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/org/picketlink/common/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/picketlink/common/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/org/picketlink/common/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/org/picketlink/common/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/org/picketlink/config/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/picketlink/config/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/org/picketlink/config/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/org/picketlink/config/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/org/picketlink/core/api/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/picketlink/core/api/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/org/picketlink/core/api/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/org/picketlink/core/api/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/org/picketlink/core/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/picketlink/core/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/org/picketlink/core/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/org/picketlink/core/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/org/picketlink/federation/bindings/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/picketlink/federation/bindings/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/org/picketlink/federation/bindings/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/org/picketlink/federation/bindings/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/org/picketlink/federation/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/picketlink/federation/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/org/picketlink/federation/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/org/picketlink/federation/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/org/picketlink/idm/api/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/picketlink/idm/api/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/org/picketlink/idm/api/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/org/picketlink/idm/api/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/org/picketlink/idm/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/picketlink/idm/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/org/picketlink/idm/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/org/picketlink/idm/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/org/picketlink/idm/schema/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/picketlink/idm/schema/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/org/picketlink/idm/schema/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/org/picketlink/idm/schema/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/org/picketlink/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/picketlink/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/org/picketlink/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/org/picketlink/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/org/scannotation/scannotation/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/scannotation/scannotation/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/org/scannotation/scannotation/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/org/scannotation/scannotation/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/org/slf4j/ext/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/slf4j/ext/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/org/slf4j/ext/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/org/slf4j/ext/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/org/slf4j/jcl-over-slf4j/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/slf4j/jcl-over-slf4j/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/org/slf4j/jcl-over-slf4j/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/org/slf4j/jcl-over-slf4j/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/org/wildfly/clustering/api/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/wildfly/clustering/api/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/org/wildfly/clustering/api/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/org/wildfly/clustering/api/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/org/wildfly/clustering/ejb/infinispan/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/wildfly/clustering/ejb/infinispan/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/org/wildfly/clustering/ejb/infinispan/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/org/wildfly/clustering/ejb/infinispan/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/org/wildfly/clustering/ejb/spi/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/wildfly/clustering/ejb/spi/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/org/wildfly/clustering/ejb/spi/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/org/wildfly/clustering/ejb/spi/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/org/wildfly/clustering/server/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/wildfly/clustering/server/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/org/wildfly/clustering/server/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/org/wildfly/clustering/server/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/org/wildfly/clustering/singleton/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/wildfly/clustering/singleton/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/org/wildfly/clustering/singleton/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/org/wildfly/clustering/singleton/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/org/wildfly/clustering/spi/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/wildfly/clustering/spi/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/org/wildfly/clustering/spi/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/org/wildfly/clustering/spi/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/org/wildfly/clustering/web/api/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/wildfly/clustering/web/api/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/org/wildfly/clustering/web/api/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/org/wildfly/clustering/web/api/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/org/wildfly/clustering/web/infinispan/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/wildfly/clustering/web/infinispan/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/org/wildfly/clustering/web/infinispan/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/org/wildfly/clustering/web/infinispan/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/org/wildfly/clustering/web/spi/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/wildfly/clustering/web/spi/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/org/wildfly/clustering/web/spi/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/org/wildfly/clustering/web/spi/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/org/wildfly/clustering/web/undertow/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/wildfly/clustering/web/undertow/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/org/wildfly/clustering/web/undertow/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/org/wildfly/clustering/web/undertow/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/org/wildfly/extension/batch/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/wildfly/extension/batch/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/org/wildfly/extension/batch/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/org/wildfly/extension/batch/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/org/wildfly/extension/bean-validation/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/wildfly/extension/bean-validation/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/org/wildfly/extension/bean-validation/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/org/wildfly/extension/bean-validation/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/org/wildfly/extension/mod_cluster/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/wildfly/extension/mod_cluster/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/org/wildfly/extension/mod_cluster/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/org/wildfly/extension/mod_cluster/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/org/wildfly/extension/picketlink/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/wildfly/extension/picketlink/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/org/wildfly/extension/picketlink/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/org/wildfly/extension/picketlink/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/org/wildfly/extension/rts/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/wildfly/extension/rts/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/org/wildfly/extension/rts/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/org/wildfly/extension/rts/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/org/wildfly/jberet/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/wildfly/jberet/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/org/wildfly/jberet/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/org/wildfly/jberet/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/org/wildfly/mod_cluster/undertow/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/wildfly/mod_cluster/undertow/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/org/wildfly/mod_cluster/undertow/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/org/wildfly/mod_cluster/undertow/main/module.xml diff --git a/build/src/main/resources/modules/system/layers/base/org/yaml/snakeyaml/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/yaml/snakeyaml/main/module.xml similarity index 100% rename from build/src/main/resources/modules/system/layers/base/org/yaml/snakeyaml/main/module.xml rename to feature-pack/src/main/resources/modules/system/layers/base/org/yaml/snakeyaml/main/module.xml diff --git a/pom.xml b/pom.xml index 5403c4bd933f..e46341c00f1e 100644 --- a/pom.xml +++ b/pom.xml @@ -254,9 +254,10 @@ 1.0.0.v20140518 0.0.0.M5 6.1.1 + 1.0.0.Alpha1 1.0.0.Final 1.0.0.Final - 1.0.0.Alpha4 + 1.0.0.Alpha5-SNAPSHOT 1.0.0.Alpha1 1.13 2.2.5.jboss-2 @@ -300,16 +301,17 @@ appclient batch bean-validation - build + build client/ejb client/jms client/shade clustering connector - dist + dist ee ejb3 embedded + feature-pack jacorb jaxrs jdr @@ -334,11 +336,12 @@ web-build web-common web-dist + web-feature-pack webservices weld xts rts - testsuite/shared + testsuite/shared testsuite @@ -810,6 +813,16 @@ wildfly-build-plugin ${version.org.wildfly.core} + + org.wildfly.build + wildfly-feature-pack-build-maven-plugin + ${version.org.wildfly.build-tools} + + + org.wildfly.build + wildfly-server-provisioning-maven-plugin + ${version.org.wildfly.build-tools} + @@ -824,6 +837,29 @@ + + + + + org.wildfly.core + wildfly-build-plugin + ${version.org.wildfly.core} + + + + org.wildfly.core + wildfly-core-feature-pack + pom + ${version.org.wildfly.core} + + + + org.wildfly.core + wildfly-core-feature-pack + zip + ${version.org.wildfly.core} + + @@ -837,6 +873,13 @@ wildfly-batch ${project.version} + + + org.wildfly + wildfly-build + ${project.version} + pom + org.wildfly @@ -852,36 +895,25 @@ org.wildfly - wildfly-build + wildfly-feature-pack pom ${project.version} org.wildfly - wildfly-build + wildfly-feature-pack zip ${project.version} - - - org.wildfly.core - wildfly-core-build - zip - ${version.org.wildfly.core} - - + org.wildfly.checkstyle wildfly-checkstyle-config ${version.org.wildfly.checkstyle-config} - - org.wildfly.core - wildfly-build-plugin - ${version.org.wildfly.core} - + org.wildfly.core @@ -1398,31 +1430,31 @@ org.wildfly - wildfly-web-build - pom + wildfly-web-common ${project.version} org.wildfly - wildfly-web-build - zip + wildfly-web-dist ${project.version} + pom - + org.wildfly - wildfly-web-common + wildfly-web-feature-pack + pom ${project.version} org.wildfly - wildfly-web-dist + wildfly-web-feature-pack + zip ${project.version} - pom - + org.wildfly wildfly-webservices-server-integration diff --git a/testsuite/pom.xml b/testsuite/pom.xml index 9d64a95f566a..1617a9901743 100644 --- a/testsuite/pom.xml +++ b/testsuite/pom.xml @@ -187,12 +187,7 @@ org.wildfly wildfly-testsuite-shared test - - - org.wildfly - wildfly-build - pom - + org.jboss.spec.javax.annotation diff --git a/testsuite/shared/pom.xml b/testsuite/shared/pom.xml index c7fb2a5425f9..d7a5844960ce 100644 --- a/testsuite/shared/pom.xml +++ b/testsuite/shared/pom.xml @@ -38,9 +38,20 @@ + + + org.wildfly + wildfly-feature-pack + pom + org.wildfly - wildfly-build + wildfly-web-feature-pack + pom + + + org.wildfly.core + wildfly-core-feature-pack pom diff --git a/web-build/assembly.xml b/web-build/assembly.xml index d3343d7ffdd8..1e441aefb389 100644 --- a/web-build/assembly.xml +++ b/web-build/assembly.xml @@ -25,13 +25,11 @@ - distro + thin-server zip - false - target @@ -39,37 +37,6 @@ ${server.output.dir.prefix}-web-${project.version}/** - - **/*.sh - ${server.output.dir.prefix}-web-${project.version}/domain/tmp/auth - ${server.output.dir.prefix}-web-${project.version}/standalone/tmp/auth - **/*-users.properties - - - - target - - - ${server.output.dir.prefix}-web-${project.version}/**/*.sh - - 0755 - - - target - - - ${server.output.dir.prefix}-web-${project.version}/**/*-users.properties - - 0600 - - - target - - - ${server.output.dir.prefix}-web-${project.version}/domain/tmp/auth - ${server.output.dir.prefix}-web-${project.version}/standalone/tmp/auth - - 0700 diff --git a/web-build/pom.xml b/web-build/pom.xml index ee51f728502e..ff6fc8293d39 100644 --- a/web-build/pom.xml +++ b/web-build/pom.xml @@ -38,617 +38,39 @@ WildFly: Build Web pom - - - ${basedir}/target/generated-configs - ${generated.configs}/standalone/configuration - ${generated.configs}/domain/configuration - ${generated.configs}/docs/examples/configs - ${basedir}/src/main/resources - ${basedir}/src/main/resources - - - - - - io.undertow - undertow-core - - - - io.undertow - undertow-servlet - - - - io.undertow - undertow-websockets-jsr - - - - io.undertow.jastow - jastow - - - - javax.activation - activation - - - - javax.validation - validation-api - - - - javax.enterprise - cdi-api - - - - javax.inject - javax.inject - - - - log4j - log4j - - - - org.codehaus.woodstox - woodstox-core-asl - - - - org.codehaus.woodstox - stax2-api - - - - org.eclipse.jdt.core.compiler - ecj - - - - org.glassfish - javax.enterprise.concurrent - - - - org.glassfish - javax.el-impl - - - - - org.jboss - jandex - - - - org.jboss - jboss-dmr - - - - org.jboss - staxmapper - - - - org.jboss - jboss-remote-naming - - - org.jboss - jboss-ejb-client - - - - - - org.jboss.spec.javax.annotation - jboss-annotations-api_1.2_spec - - - - org.jboss.spec.javax.enterprise.concurrent - jboss-concurrency-api_1.0_spec - - - - org.jboss.spec.javax.el - jboss-el-api_3.0_spec - - - - org.jboss.spec.javax.interceptor - jboss-interceptors-api_1.2_spec - - - - org.jboss.spec.javax.security.auth.message - jboss-jaspi-api_1.1_spec - - - - org.jboss.spec.javax.servlet - jboss-servlet-api_3.1_spec - - - - org.jboss.spec.javax.servlet.jsp - jboss-jsp-api_2.3_spec - - - - org.jboss.spec.javax.servlet.jstl - jboss-jstl-api_1.2_spec - - - - org.jboss.spec.javax.security.jacc - jboss-jacc-api_1.5_spec - - - - org.jboss.spec.javax.transaction - jboss-transaction-api_1.2_spec - - - - org.jboss.spec.javax.websocket - jboss-websocket-api_1.0_spec - - - - org.jboss.classfilewriter - jboss-classfilewriter - - - - org.jboss.common - jboss-common-beans - - - - org.jboss - jboss-common-core - - - - org.jboss - jboss-vfs - - - - org.jboss.aesh - aesh - - - - org.jboss.invocation - jboss-invocation - - - - org.jboss.logging - jboss-logging - - - - org.jboss.logging - jul-to-slf4j-stub - - - - org.jboss.logmanager - jboss-logmanager - - - - org.jboss.logmanager - log4j-jboss-logmanager - - - - org.jboss.marshalling - jboss-marshalling - - - - org.jboss.marshalling - jboss-marshalling-river - - - - org.jboss.metadata - jboss-metadata-common - - - - org.jboss.metadata - jboss-metadata-ear - - - - org.jboss.metadata - jboss-metadata-web - - - - org.jboss.modules - jboss-modules - - - - org.jboss.msc - jboss-msc - - - - org.jboss.remoting - jboss-remoting - - - - org.jboss.remotingjmx - remoting-jmx - - - - org.jboss.sasl - jboss-sasl - - - - org.jboss.slf4j - slf4j-jboss-logmanager - - - - org.jboss.security - jboss-negotiation-common - - - - org.jboss.security - jboss-negotiation-extras - - - - org.jboss.security - jboss-negotiation-net - - - - org.jboss.security - jboss-negotiation-ntlm - - - - org.jboss.security - jboss-negotiation-spnego - - - - org.jboss.stdio - jboss-stdio - - - - org.jboss.threads - jboss-threads - - - - org.jboss.xnio - xnio-api - - - - org.jboss.xnio - xnio-nio - - - - org.fusesource.jansi - jansi - - - - org.picketbox - picketbox - - - - org.picketbox - picketbox-commons - - - - - org.picketbox - picketbox-infinispan - - - - org.slf4j - slf4j-api - - - - - org.wildfly.core - wildfly-core-model-test-framework - - - org.wildfly.core - wildfly-model-test - - - - - - org.wildfly.core - wildfly-core-build - zip - - - - org.wildfly.core - wildfly-controller - - - - org.wildfly.core - wildfly-controller-client - - - - org.wildfly.core - wildfly-core-security - - - - org.wildfly.core - wildfly-core-security-api - - - - org.wildfly.core - wildfly-cli - - - - org.wildfly.core - wildfly-host-controller - - - - org.wildfly.core - wildfly-deployment-repository - - - - org.wildfly.core - wildfly-deployment-scanner - - - - org.wildfly.core - wildfly-domain-http-error-context - - - - org.wildfly.core - wildfly-domain-http-interface - - - - org.wildfly.core - wildfly-domain-management - - - - org.wildfly - wildfly-ee - - - org.hibernate - hibernate-validator - - - - - - org.wildfly.core - wildfly-io - - - - org.wildfly.core - wildfly-logging - - - - org.wildfly.core - wildfly-management-client-content - - - - org.wildfly.core - wildfly-network - - - - org.wildfly.core - wildfly-jmx - - org.wildfly - wildfly-naming - - - org.jboss - jboss-remote-naming - - - - - - org.wildfly.core - wildfly-patching - - - - org.wildfly.core - wildfly-platform-mbean - - - - org.wildfly.core - wildfly-process-controller - - - - org.wildfly.core - wildfly-protocol - - - - org.wildfly.core - wildfly-remoting - - - - org.wildfly - wildfly-security + wildfly-web-feature-pack + zip - org.wildfly - wildfly-clustering-infinispan - - - org.wildfly - wildfly-transactions - - - org.jboss.security - jboss-negotiation-extras - - - org.jboss.security - jboss-negotiation-common - - - org.jboss.security - jboss-negotiation-spnego - - - org.picketbox - picketbox-infinispan - - - org.picketbox - picketbox-commons - - - commons-cli - commons-cli + * + * - - - org.wildfly.security - wildfly-security-manager - - - - org.wildfly - wildfly-security-manager - - - org.wildfly.core - wildfly-server - - - - org.wildfly.core - wildfly-system-jmx - - - - org.wildfly.core - wildfly-threads - - - - org.wildfly - wildfly-undertow - - - - org.wildfly - wildfly-web-common - - - - org.wildfly.core - wildfly-version - - - - xalan - serializer - - - - xalan - xalan - - - - xerces - xercesImpl - - - - xml-resolver - xml-resolver - - ${server.output.dir.prefix}-web-${project.version} - org.apache.maven.plugins - maven-resources-plugin - - - - org.wildfly.core - wildfly-build-plugin + org.wildfly.build + wildfly-server-provisioning-maven-plugin - create-server + server-provisioning build - package + compile - server-build.xml + server-provisioning.xml - org.apache.maven.plugins maven-assembly-plugin @@ -666,8 +88,8 @@ true ${server.output.dir.prefix}-web-${project.version} false - target/ - target/assembly/work + ${project.build.directory} + ${project.build.directory}/assembly/work gnu @@ -676,94 +98,4 @@ - - - enforce - - - !skip-enforce - - - - - - org.apache.maven.plugins - maven-enforcer-plugin - - - ban-transitive-deps - - enforce - - - - - - - com.sun:tools - sun.jdk:jconsole - - - - - - - - - - - - - javadocDist - - WildFly public API - ${project.version} - - - - - org.apache.maven.plugins - maven-javadoc-plugin - ${version.javadoc.plugin} - - - javadocs-dist - - aggregate-jar - - validate - - true - true - 2400m - - ISO-8859-1 - - ${javadoc.branding} public API - ${javadoc.branding} public API -
${javadoc.branding}
-
${javadoc.branding}
- - true - - - - - - - - - - - - - - - - - - - - - diff --git a/web-build/server-provisioning.xml b/web-build/server-provisioning.xml new file mode 100644 index 000000000000..c4b4a6eef7aa --- /dev/null +++ b/web-build/server-provisioning.xml @@ -0,0 +1,26 @@ + + + + + + \ No newline at end of file diff --git a/web-dist/assembly.xml b/web-dist/assembly.xml index 6a0a421ec1b8..6be2ae61b598 100644 --- a/web-dist/assembly.xml +++ b/web-dist/assembly.xml @@ -28,9 +28,7 @@ zip tar.gz - false - target @@ -38,37 +36,6 @@ ${server.output.dir.prefix}-web-${version}/** - - **/*.sh - ${server.output.dir.prefix}-web-${version}/domain/tmp/auth - ${server.output.dir.prefix}-web-${version}/standalone/tmp/auth - **/*-users.properties - - - - target - - - ${server.output.dir.prefix}-web-${version}/**/*.sh - - 0755 - - - target - - - ${server.output.dir.prefix}-web-${version}/**/*-users.properties - - 0600 - - - target - - - ${server.output.dir.prefix}-web-${version}/domain/tmp/auth - ${server.output.dir.prefix}-web-${version}/standalone/tmp/auth - - 0700 diff --git a/web-dist/pom.xml b/web-dist/pom.xml index c7525369ab05..e30a237729d0 100644 --- a/web-dist/pom.xml +++ b/web-dist/pom.xml @@ -41,14 +41,20 @@ org.wildfly - wildfly-web-build + wildfly-web-feature-pack pom provided org.wildfly - wildfly-web-build + wildfly-web-feature-pack zip + + + * + * + + @@ -57,17 +63,17 @@ ${server.output.dir.prefix}-web-${project.version} - org.wildfly.core - wildfly-build-plugin + org.wildfly.build + wildfly-server-provisioning-maven-plugin - create-server + server-provisioning build - package + compile - server-build.xml + server-provisioning.xml @@ -103,8 +109,8 @@ true ${server.output.dir.prefix}-web-${project.version} false - target/ - target/assembly/work + ${project.build.directory} + ${project.build.directory}/assembly/work gnu @@ -120,8 +126,8 @@ ${server.output.dir.prefix}-web-${project.version} true - target/ - target/assembly-src/work + ${project.build.directory} + ${project.build.directory}/assembly-src/work gnu diff --git a/web-dist/server-build.xml b/web-dist/server-build.xml deleted file mode 100644 index bf828c1fd872..000000000000 --- a/web-dist/server-build.xml +++ /dev/null @@ -1,53 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/web-dist/server-provisioning.xml b/web-dist/server-provisioning.xml new file mode 100644 index 000000000000..cfcd06f0d49f --- /dev/null +++ b/web-dist/server-provisioning.xml @@ -0,0 +1,26 @@ + + + + + + \ No newline at end of file diff --git a/web-feature-pack/assembly.xml b/web-feature-pack/assembly.xml new file mode 100644 index 000000000000..053d18174b48 --- /dev/null +++ b/web-feature-pack/assembly.xml @@ -0,0 +1,39 @@ + + + + + web-feature-pack + + zip + + false + + + target/${server.output.dir.prefix}-web-${project.version} + + + + diff --git a/web-build/server-build.xml b/web-feature-pack/feature-pack-build.xml similarity index 87% rename from web-build/server-build.xml rename to web-feature-pack/feature-pack-build.xml index bc749389d41f..42c28a91f704 100644 --- a/web-build/server-build.xml +++ b/web-feature-pack/feature-pack-build.xml @@ -20,15 +20,10 @@ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. --> - - - - - - - - - + + + + diff --git a/web-feature-pack/pom.xml b/web-feature-pack/pom.xml new file mode 100644 index 000000000000..719b15ac04b5 --- /dev/null +++ b/web-feature-pack/pom.xml @@ -0,0 +1,529 @@ + + + + + + 4.0.0 + + + org.wildfly + wildfly-parent + 9.0.0.Alpha1-SNAPSHOT + + + wildfly-web-feature-pack + + WildFly: Web Feature Pack + pom + + + + + + + org.wildfly.core + wildfly-core-feature-pack + zip + + + * + * + + + + + + + + io.undertow + undertow-servlet + + + * + * + + + + + + io.undertow + undertow-websockets-jsr + + + * + * + + + + + + io.undertow.jastow + jastow + + + * + * + + + + + + javax.activation + activation + + + + javax.validation + validation-api + + + + javax.enterprise + cdi-api + + + + javax.inject + javax.inject + + + + org.eclipse.jdt.core.compiler + ecj + + + + org.glassfish + javax.enterprise.concurrent + + + + org.glassfish + javax.el-impl + + + + org.jboss + jboss-remote-naming + + + * + * + + + + + + org.jboss.spec.javax.annotation + jboss-annotations-api_1.2_spec + + + + org.jboss.spec.javax.enterprise.concurrent + jboss-concurrency-api_1.0_spec + + + + org.jboss.spec.javax.el + jboss-el-api_3.0_spec + + + + org.jboss.spec.javax.security.auth.message + jboss-jaspi-api_1.1_spec + + + + org.jboss.spec.javax.servlet + jboss-servlet-api_3.1_spec + + + + org.jboss.spec.javax.servlet.jsp + jboss-jsp-api_2.3_spec + + + + org.jboss.spec.javax.servlet.jstl + jboss-jstl-api_1.2_spec + + + + org.jboss.spec.javax.security.jacc + jboss-jacc-api_1.5_spec + + + + org.jboss.spec.javax.transaction + jboss-transaction-api_1.2_spec + + + + org.jboss.spec.javax.websocket + jboss-websocket-api_1.0_spec + + + + org.jboss.metadata + jboss-metadata-common + + + * + * + + + + + + org.jboss.metadata + jboss-metadata-ear + + + * + * + + + + + + org.jboss.metadata + jboss-metadata-web + + + * + * + + + + + + org.jboss.security + jboss-negotiation-common + + + * + * + + + + + + org.jboss.security + jboss-negotiation-extras + + + * + * + + + + + + org.jboss.security + jboss-negotiation-net + + + * + * + + + + + + org.jboss.security + jboss-negotiation-ntlm + + + * + * + + + + + + org.jboss.security + jboss-negotiation-spnego + + + * + * + + + + + + org.picketbox + picketbox + + + * + * + + + + + + org.picketbox + picketbox-commons + + + * + * + + + + + + org.picketbox + picketbox-infinispan + + + * + * + + + + + + org.wildfly + wildfly-ee + + + * + * + + + + + + org.wildfly + wildfly-naming + + + * + * + + + + + + org.wildfly + wildfly-security + + + * + * + + + + + + org.wildfly + wildfly-security-manager + + + * + * + + + + + + org.wildfly + wildfly-undertow + + + * + * + + + + + + org.wildfly + wildfly-web-common + + + * + * + + + + + + xalan + serializer + + + + xalan + xalan + + + + + + ${server.output.dir.prefix}-web-${project.version} + + + org.apache.maven.plugins + maven-resources-plugin + + + + org.wildfly.build + wildfly-feature-pack-build-maven-plugin + + + feature-pack-build + + build + + compile + + feature-pack-build.xml + + + + + + + org.apache.maven.plugins + maven-assembly-plugin + + + assemble + package + + single + + + + assembly.xml + + true + ${server.output.dir.prefix}-web-feature-pack-${project.version} + false + ${project.build.directory} + ${project.build.directory}/assembly/work + gnu + + + + + + + + + + enforce + + + !skip-enforce + + + + + + org.apache.maven.plugins + maven-enforcer-plugin + + + ban-transitive-deps + + enforce + + + + + + + com.sun:tools + sun.jdk:jconsole + + + + + + + + + + + + + javadocDist + + WildFly public API - ${project.version} + + + + + org.apache.maven.plugins + maven-javadoc-plugin + ${version.javadoc.plugin} + + + javadocs-dist + + aggregate-jar + + validate + + true + true + 2400m + + ISO-8859-1 + + ${javadoc.branding} public API + ${javadoc.branding} public API +
${javadoc.branding}
+
${javadoc.branding}
+ + true + + + + + + + + + + + + + + + + + + + + + + diff --git a/web-build/src/main/resources/configuration/domain/subsystems.xml b/web-feature-pack/src/main/resources/configuration/domain/subsystems.xml similarity index 100% rename from web-build/src/main/resources/configuration/domain/subsystems.xml rename to web-feature-pack/src/main/resources/configuration/domain/subsystems.xml diff --git a/web-build/src/main/resources/configuration/domain/template.xml b/web-feature-pack/src/main/resources/configuration/domain/template.xml similarity index 100% rename from web-build/src/main/resources/configuration/domain/template.xml rename to web-feature-pack/src/main/resources/configuration/domain/template.xml diff --git a/web-build/src/main/resources/configuration/standalone/subsystems.xml b/web-feature-pack/src/main/resources/configuration/standalone/subsystems.xml similarity index 100% rename from web-build/src/main/resources/configuration/standalone/subsystems.xml rename to web-feature-pack/src/main/resources/configuration/standalone/subsystems.xml diff --git a/web-build/src/main/resources/configuration/standalone/template.xml b/web-feature-pack/src/main/resources/configuration/standalone/template.xml similarity index 100% rename from web-build/src/main/resources/configuration/standalone/template.xml rename to web-feature-pack/src/main/resources/configuration/standalone/template.xml diff --git a/web-build/src/main/resources/LICENSE.txt b/web-feature-pack/src/main/resources/content/LICENSE.txt similarity index 100% rename from web-build/src/main/resources/LICENSE.txt rename to web-feature-pack/src/main/resources/content/LICENSE.txt diff --git a/web-build/src/main/resources/README.txt b/web-feature-pack/src/main/resources/content/README.txt similarity index 100% rename from web-build/src/main/resources/README.txt rename to web-feature-pack/src/main/resources/content/README.txt diff --git a/web-build/src/main/resources/copyright.txt b/web-feature-pack/src/main/resources/content/copyright.txt similarity index 100% rename from web-build/src/main/resources/copyright.txt rename to web-feature-pack/src/main/resources/content/copyright.txt diff --git a/web-build/src/main/resources/standalone/configuration/application-roles.properties b/web-feature-pack/src/main/resources/content/standalone/configuration/application-roles.properties similarity index 100% rename from web-build/src/main/resources/standalone/configuration/application-roles.properties rename to web-feature-pack/src/main/resources/content/standalone/configuration/application-roles.properties diff --git a/web-build/src/main/resources/standalone/configuration/application-users.properties b/web-feature-pack/src/main/resources/content/standalone/configuration/application-users.properties similarity index 100% rename from web-build/src/main/resources/standalone/configuration/application-users.properties rename to web-feature-pack/src/main/resources/content/standalone/configuration/application-users.properties diff --git a/web-build/src/main/resources/standalone/configuration/logging.properties b/web-feature-pack/src/main/resources/content/standalone/configuration/logging.properties similarity index 100% rename from web-build/src/main/resources/standalone/configuration/logging.properties rename to web-feature-pack/src/main/resources/content/standalone/configuration/logging.properties diff --git a/web-build/src/main/resources/standalone/configuration/mgmt-groups.properties b/web-feature-pack/src/main/resources/content/standalone/configuration/mgmt-groups.properties similarity index 100% rename from web-build/src/main/resources/standalone/configuration/mgmt-groups.properties rename to web-feature-pack/src/main/resources/content/standalone/configuration/mgmt-groups.properties diff --git a/web-build/src/main/resources/standalone/configuration/mgmt-users.properties b/web-feature-pack/src/main/resources/content/standalone/configuration/mgmt-users.properties similarity index 100% rename from web-build/src/main/resources/standalone/configuration/mgmt-users.properties rename to web-feature-pack/src/main/resources/content/standalone/configuration/mgmt-users.properties diff --git a/web-build/src/main/resources/standalone/deployments/README.txt b/web-feature-pack/src/main/resources/content/standalone/deployments/README.txt similarity index 100% rename from web-build/src/main/resources/standalone/deployments/README.txt rename to web-feature-pack/src/main/resources/content/standalone/deployments/README.txt diff --git a/web-build/src/main/resources/welcome-content/bkg.gif b/web-feature-pack/src/main/resources/content/welcome-content/bkg.gif similarity index 100% rename from web-build/src/main/resources/welcome-content/bkg.gif rename to web-feature-pack/src/main/resources/content/welcome-content/bkg.gif diff --git a/web-build/src/main/resources/welcome-content/documentation.html b/web-feature-pack/src/main/resources/content/welcome-content/documentation.html similarity index 100% rename from web-build/src/main/resources/welcome-content/documentation.html rename to web-feature-pack/src/main/resources/content/welcome-content/documentation.html diff --git a/web-build/src/main/resources/welcome-content/favicon.ico b/web-feature-pack/src/main/resources/content/welcome-content/favicon.ico similarity index 100% rename from web-build/src/main/resources/welcome-content/favicon.ico rename to web-feature-pack/src/main/resources/content/welcome-content/favicon.ico diff --git a/web-build/src/main/resources/welcome-content/index.html b/web-feature-pack/src/main/resources/content/welcome-content/index.html similarity index 100% rename from web-build/src/main/resources/welcome-content/index.html rename to web-feature-pack/src/main/resources/content/welcome-content/index.html diff --git a/web-build/src/main/resources/welcome-content/index_noconsole.html b/web-feature-pack/src/main/resources/content/welcome-content/index_noconsole.html similarity index 100% rename from web-build/src/main/resources/welcome-content/index_noconsole.html rename to web-feature-pack/src/main/resources/content/welcome-content/index_noconsole.html diff --git a/web-build/src/main/resources/welcome-content/jbosscommunity_logo_hori_white.png b/web-feature-pack/src/main/resources/content/welcome-content/jbosscommunity_logo_hori_white.png similarity index 100% rename from web-build/src/main/resources/welcome-content/jbosscommunity_logo_hori_white.png rename to web-feature-pack/src/main/resources/content/welcome-content/jbosscommunity_logo_hori_white.png diff --git a/web-build/src/main/resources/welcome-content/noconsole.html b/web-feature-pack/src/main/resources/content/welcome-content/noconsole.html similarity index 100% rename from web-build/src/main/resources/welcome-content/noconsole.html rename to web-feature-pack/src/main/resources/content/welcome-content/noconsole.html diff --git a/web-build/src/main/resources/welcome-content/noredirect.html b/web-feature-pack/src/main/resources/content/welcome-content/noredirect.html similarity index 100% rename from web-build/src/main/resources/welcome-content/noredirect.html rename to web-feature-pack/src/main/resources/content/welcome-content/noredirect.html diff --git a/web-build/src/main/resources/welcome-content/wildfly.css b/web-feature-pack/src/main/resources/content/welcome-content/wildfly.css similarity index 100% rename from web-build/src/main/resources/welcome-content/wildfly.css rename to web-feature-pack/src/main/resources/content/welcome-content/wildfly.css diff --git a/web-build/src/main/resources/welcome-content/wildfly_logo.png b/web-feature-pack/src/main/resources/content/welcome-content/wildfly_logo.png similarity index 100% rename from web-build/src/main/resources/welcome-content/wildfly_logo.png rename to web-feature-pack/src/main/resources/content/welcome-content/wildfly_logo.png diff --git a/web-build/src/main/resources/modules/system/layers/base/io/undertow/jsp/main/module.xml b/web-feature-pack/src/main/resources/modules/system/layers/base/io/undertow/jsp/main/module.xml similarity index 100% rename from web-build/src/main/resources/modules/system/layers/base/io/undertow/jsp/main/module.xml rename to web-feature-pack/src/main/resources/modules/system/layers/base/io/undertow/jsp/main/module.xml diff --git a/web-build/src/main/resources/modules/system/layers/base/io/undertow/servlet/main/module.xml b/web-feature-pack/src/main/resources/modules/system/layers/base/io/undertow/servlet/main/module.xml similarity index 100% rename from web-build/src/main/resources/modules/system/layers/base/io/undertow/servlet/main/module.xml rename to web-feature-pack/src/main/resources/modules/system/layers/base/io/undertow/servlet/main/module.xml diff --git a/web-build/src/main/resources/modules/system/layers/base/io/undertow/websocket/main/module.xml b/web-feature-pack/src/main/resources/modules/system/layers/base/io/undertow/websocket/main/module.xml similarity index 100% rename from web-build/src/main/resources/modules/system/layers/base/io/undertow/websocket/main/module.xml rename to web-feature-pack/src/main/resources/modules/system/layers/base/io/undertow/websocket/main/module.xml diff --git a/web-build/src/main/resources/modules/system/layers/base/javax/activation/api/main/module.xml b/web-feature-pack/src/main/resources/modules/system/layers/base/javax/activation/api/main/module.xml similarity index 100% rename from web-build/src/main/resources/modules/system/layers/base/javax/activation/api/main/module.xml rename to web-feature-pack/src/main/resources/modules/system/layers/base/javax/activation/api/main/module.xml diff --git a/web-build/src/main/resources/modules/system/layers/base/javax/annotation/api/main/module.xml b/web-feature-pack/src/main/resources/modules/system/layers/base/javax/annotation/api/main/module.xml similarity index 100% rename from web-build/src/main/resources/modules/system/layers/base/javax/annotation/api/main/module.xml rename to web-feature-pack/src/main/resources/modules/system/layers/base/javax/annotation/api/main/module.xml diff --git a/web-build/src/main/resources/modules/system/layers/base/javax/el/api/main/module.xml b/web-feature-pack/src/main/resources/modules/system/layers/base/javax/el/api/main/module.xml similarity index 100% rename from web-build/src/main/resources/modules/system/layers/base/javax/el/api/main/module.xml rename to web-feature-pack/src/main/resources/modules/system/layers/base/javax/el/api/main/module.xml diff --git a/web-build/src/main/resources/modules/system/layers/base/javax/enterprise/api/main/module.xml b/web-feature-pack/src/main/resources/modules/system/layers/base/javax/enterprise/api/main/module.xml similarity index 100% rename from web-build/src/main/resources/modules/system/layers/base/javax/enterprise/api/main/module.xml rename to web-feature-pack/src/main/resources/modules/system/layers/base/javax/enterprise/api/main/module.xml diff --git a/web-build/src/main/resources/modules/system/layers/base/javax/enterprise/concurrent/api/main/module.xml b/web-feature-pack/src/main/resources/modules/system/layers/base/javax/enterprise/concurrent/api/main/module.xml similarity index 100% rename from web-build/src/main/resources/modules/system/layers/base/javax/enterprise/concurrent/api/main/module.xml rename to web-feature-pack/src/main/resources/modules/system/layers/base/javax/enterprise/concurrent/api/main/module.xml diff --git a/web-build/src/main/resources/modules/system/layers/base/javax/inject/api/main/module.xml b/web-feature-pack/src/main/resources/modules/system/layers/base/javax/inject/api/main/module.xml similarity index 100% rename from web-build/src/main/resources/modules/system/layers/base/javax/inject/api/main/module.xml rename to web-feature-pack/src/main/resources/modules/system/layers/base/javax/inject/api/main/module.xml diff --git a/web-build/src/main/resources/modules/system/layers/base/javax/security/auth/message/api/main/module.xml b/web-feature-pack/src/main/resources/modules/system/layers/base/javax/security/auth/message/api/main/module.xml similarity index 100% rename from web-build/src/main/resources/modules/system/layers/base/javax/security/auth/message/api/main/module.xml rename to web-feature-pack/src/main/resources/modules/system/layers/base/javax/security/auth/message/api/main/module.xml diff --git a/web-build/src/main/resources/modules/system/layers/base/javax/security/jacc/api/main/module.xml b/web-feature-pack/src/main/resources/modules/system/layers/base/javax/security/jacc/api/main/module.xml similarity index 100% rename from web-build/src/main/resources/modules/system/layers/base/javax/security/jacc/api/main/module.xml rename to web-feature-pack/src/main/resources/modules/system/layers/base/javax/security/jacc/api/main/module.xml diff --git a/web-build/src/main/resources/modules/system/layers/base/javax/servlet/api/main/module.xml b/web-feature-pack/src/main/resources/modules/system/layers/base/javax/servlet/api/main/module.xml similarity index 100% rename from web-build/src/main/resources/modules/system/layers/base/javax/servlet/api/main/module.xml rename to web-feature-pack/src/main/resources/modules/system/layers/base/javax/servlet/api/main/module.xml diff --git a/web-build/src/main/resources/modules/system/layers/base/javax/servlet/jsp/api/main/module.xml b/web-feature-pack/src/main/resources/modules/system/layers/base/javax/servlet/jsp/api/main/module.xml similarity index 100% rename from web-build/src/main/resources/modules/system/layers/base/javax/servlet/jsp/api/main/module.xml rename to web-feature-pack/src/main/resources/modules/system/layers/base/javax/servlet/jsp/api/main/module.xml diff --git a/web-build/src/main/resources/modules/system/layers/base/javax/servlet/jstl/api/main/module.xml b/web-feature-pack/src/main/resources/modules/system/layers/base/javax/servlet/jstl/api/main/module.xml similarity index 100% rename from web-build/src/main/resources/modules/system/layers/base/javax/servlet/jstl/api/main/module.xml rename to web-feature-pack/src/main/resources/modules/system/layers/base/javax/servlet/jstl/api/main/module.xml diff --git a/web-build/src/main/resources/modules/system/layers/base/javax/transaction/api/main/module.xml b/web-feature-pack/src/main/resources/modules/system/layers/base/javax/transaction/api/main/module.xml similarity index 100% rename from web-build/src/main/resources/modules/system/layers/base/javax/transaction/api/main/module.xml rename to web-feature-pack/src/main/resources/modules/system/layers/base/javax/transaction/api/main/module.xml diff --git a/web-build/src/main/resources/modules/system/layers/base/javax/validation/api/main/module.xml b/web-feature-pack/src/main/resources/modules/system/layers/base/javax/validation/api/main/module.xml similarity index 100% rename from web-build/src/main/resources/modules/system/layers/base/javax/validation/api/main/module.xml rename to web-feature-pack/src/main/resources/modules/system/layers/base/javax/validation/api/main/module.xml diff --git a/web-build/src/main/resources/modules/system/layers/base/javax/websocket/api/main/module.xml b/web-feature-pack/src/main/resources/modules/system/layers/base/javax/websocket/api/main/module.xml similarity index 100% rename from web-build/src/main/resources/modules/system/layers/base/javax/websocket/api/main/module.xml rename to web-feature-pack/src/main/resources/modules/system/layers/base/javax/websocket/api/main/module.xml diff --git a/web-build/src/main/resources/modules/system/layers/base/org/apache/xalan/main/module.xml b/web-feature-pack/src/main/resources/modules/system/layers/base/org/apache/xalan/main/module.xml similarity index 100% rename from web-build/src/main/resources/modules/system/layers/base/org/apache/xalan/main/module.xml rename to web-feature-pack/src/main/resources/modules/system/layers/base/org/apache/xalan/main/module.xml diff --git a/web-build/src/main/resources/modules/system/layers/base/org/glassfish/javax/el/main/module.xml b/web-feature-pack/src/main/resources/modules/system/layers/base/org/glassfish/javax/el/main/module.xml similarity index 100% rename from web-build/src/main/resources/modules/system/layers/base/org/glassfish/javax/el/main/module.xml rename to web-feature-pack/src/main/resources/modules/system/layers/base/org/glassfish/javax/el/main/module.xml diff --git a/web-build/src/main/resources/modules/system/layers/base/org/glassfish/javax/enterprise/concurrent/main/module.xml b/web-feature-pack/src/main/resources/modules/system/layers/base/org/glassfish/javax/enterprise/concurrent/main/module.xml similarity index 100% rename from web-build/src/main/resources/modules/system/layers/base/org/glassfish/javax/enterprise/concurrent/main/module.xml rename to web-feature-pack/src/main/resources/modules/system/layers/base/org/glassfish/javax/enterprise/concurrent/main/module.xml diff --git a/web-build/src/main/resources/modules/system/layers/base/org/jboss/as/ee/main/module.xml b/web-feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/ee/main/module.xml similarity index 100% rename from web-build/src/main/resources/modules/system/layers/base/org/jboss/as/ee/main/module.xml rename to web-feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/ee/main/module.xml diff --git a/web-build/src/main/resources/modules/system/layers/base/org/jboss/as/naming/main/module.xml b/web-feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/naming/main/module.xml similarity index 100% rename from web-build/src/main/resources/modules/system/layers/base/org/jboss/as/naming/main/module.xml rename to web-feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/naming/main/module.xml diff --git a/web-build/src/main/resources/modules/system/layers/base/org/jboss/as/security/main/module.xml b/web-feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/security/main/module.xml similarity index 100% rename from web-build/src/main/resources/modules/system/layers/base/org/jboss/as/security/main/module.xml rename to web-feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/security/main/module.xml diff --git a/web-build/src/main/resources/modules/system/layers/base/org/jboss/as/web-common/main/module.xml b/web-feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/web-common/main/module.xml similarity index 100% rename from web-build/src/main/resources/modules/system/layers/base/org/jboss/as/web-common/main/module.xml rename to web-feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/web-common/main/module.xml diff --git a/web-build/src/main/resources/modules/system/layers/base/org/jboss/metadata/common/main/module.xml b/web-feature-pack/src/main/resources/modules/system/layers/base/org/jboss/metadata/common/main/module.xml similarity index 100% rename from web-build/src/main/resources/modules/system/layers/base/org/jboss/metadata/common/main/module.xml rename to web-feature-pack/src/main/resources/modules/system/layers/base/org/jboss/metadata/common/main/module.xml diff --git a/web-build/src/main/resources/modules/system/layers/base/org/jboss/metadata/ear/main/module.xml b/web-feature-pack/src/main/resources/modules/system/layers/base/org/jboss/metadata/ear/main/module.xml similarity index 100% rename from web-build/src/main/resources/modules/system/layers/base/org/jboss/metadata/ear/main/module.xml rename to web-feature-pack/src/main/resources/modules/system/layers/base/org/jboss/metadata/ear/main/module.xml diff --git a/web-build/src/main/resources/modules/system/layers/base/org/jboss/metadata/web/main/module.xml b/web-feature-pack/src/main/resources/modules/system/layers/base/org/jboss/metadata/web/main/module.xml similarity index 100% rename from web-build/src/main/resources/modules/system/layers/base/org/jboss/metadata/web/main/module.xml rename to web-feature-pack/src/main/resources/modules/system/layers/base/org/jboss/metadata/web/main/module.xml diff --git a/web-build/src/main/resources/modules/system/layers/base/org/jboss/remote-naming/main/module.xml b/web-feature-pack/src/main/resources/modules/system/layers/base/org/jboss/remote-naming/main/module.xml similarity index 100% rename from web-build/src/main/resources/modules/system/layers/base/org/jboss/remote-naming/main/module.xml rename to web-feature-pack/src/main/resources/modules/system/layers/base/org/jboss/remote-naming/main/module.xml diff --git a/web-build/src/main/resources/modules/system/layers/base/org/jboss/security/negotiation/main/module.xml b/web-feature-pack/src/main/resources/modules/system/layers/base/org/jboss/security/negotiation/main/module.xml similarity index 100% rename from web-build/src/main/resources/modules/system/layers/base/org/jboss/security/negotiation/main/module.xml rename to web-feature-pack/src/main/resources/modules/system/layers/base/org/jboss/security/negotiation/main/module.xml diff --git a/web-build/src/main/resources/modules/system/layers/base/org/picketbox/main/module.xml b/web-feature-pack/src/main/resources/modules/system/layers/base/org/picketbox/main/module.xml similarity index 100% rename from web-build/src/main/resources/modules/system/layers/base/org/picketbox/main/module.xml rename to web-feature-pack/src/main/resources/modules/system/layers/base/org/picketbox/main/module.xml diff --git a/web-build/src/main/resources/modules/system/layers/base/org/wildfly/extension/security/manager/main/module.xml b/web-feature-pack/src/main/resources/modules/system/layers/base/org/wildfly/extension/security/manager/main/module.xml similarity index 100% rename from web-build/src/main/resources/modules/system/layers/base/org/wildfly/extension/security/manager/main/module.xml rename to web-feature-pack/src/main/resources/modules/system/layers/base/org/wildfly/extension/security/manager/main/module.xml diff --git a/web-build/src/main/resources/modules/system/layers/base/org/wildfly/extension/undertow/main/module.xml b/web-feature-pack/src/main/resources/modules/system/layers/base/org/wildfly/extension/undertow/main/module.xml similarity index 100% rename from web-build/src/main/resources/modules/system/layers/base/org/wildfly/extension/undertow/main/module.xml rename to web-feature-pack/src/main/resources/modules/system/layers/base/org/wildfly/extension/undertow/main/module.xml