Permalink
Browse files

MODE-1860 - Moved the location of the ModeShape modules back to the "…

…modules" folder. To make this easier to change in the future, a root property was added which controls the location.
  • Loading branch information...
1 parent 8ad30ef commit 04037ff22f0d312560acb8ce99e448504f5e2656 @hchiorean hchiorean committed Mar 19, 2013
Showing with 65 additions and 29 deletions.
  1. 0 deploy/jbossas/kit/jboss-eap61/{modules/system/layers/base → }/javax/jcr/main/module.xml
  2. 0 deploy/jbossas/kit/jboss-eap61/{modules/system/layers/base → }/org/apache/tika/1.3/module.xml
  3. 0 ...ossas/kit/jboss-eap61/{modules/system/layers/base → }/org/hibernate/search/engine/main/module.xml
  4. 0 deploy/jbossas/kit/jboss-eap61/{modules/system/layers/base → }/org/modeshape/common/main/module.xml
  5. 0 ...ossas/kit/jboss-eap61/{modules/system/layers/base → }/org/modeshape/connector/git/main/module.xml
  6. 0 ...ssas/kit/jboss-eap61/{modules/system/layers/base → }/org/modeshape/extractor/tika/main/module.xml
  7. 0 deploy/jbossas/kit/jboss-eap61/{modules/system/layers/base → }/org/modeshape/jcr/api/main/module.xml
  8. 0 deploy/jbossas/kit/jboss-eap61/{modules/system/layers/base → }/org/modeshape/jdbc/main/module.xml
  9. 0 ...it/jboss-eap61/{modules/system/layers/base → }/org/modeshape/main/conf/modeshape-roles.properties
  10. 0 ...it/jboss-eap61/{modules/system/layers/base → }/org/modeshape/main/conf/modeshape-users.properties
  11. 0 deploy/jbossas/kit/jboss-eap61/{modules/system/layers/base → }/org/modeshape/main/module.xml
  12. 0 ...it/jboss-eap61/{modules/system/layers/base → }/org/modeshape/main/res/initial-content-default.xml
  13. 0 ...ossas/kit/jboss-eap61/{modules/system/layers/base → }/org/modeshape/sequencer/ddl/main/module.xml
  14. 0 ...sas/kit/jboss-eap61/{modules/system/layers/base → }/org/modeshape/sequencer/image/main/module.xml
  15. 0 ...ssas/kit/jboss-eap61/{modules/system/layers/base → }/org/modeshape/sequencer/java/main/module.xml
  16. 0 ...ossas/kit/jboss-eap61/{modules/system/layers/base → }/org/modeshape/sequencer/mp3/main/module.xml
  17. 0 .../kit/jboss-eap61/{modules/system/layers/base → }/org/modeshape/sequencer/msoffice/main/module.xml
  18. 0 ...sas/kit/jboss-eap61/{modules/system/layers/base → }/org/modeshape/sequencer/sramp/main/module.xml
  19. 0 ...sas/kit/jboss-eap61/{modules/system/layers/base → }/org/modeshape/sequencer/teiid/main/module.xml
  20. 0 ...ssas/kit/jboss-eap61/{modules/system/layers/base → }/org/modeshape/sequencer/text/main/module.xml
  21. 0 ...ssas/kit/jboss-eap61/{modules/system/layers/base → }/org/modeshape/sequencer/wsdl/main/module.xml
  22. 0 ...ossas/kit/jboss-eap61/{modules/system/layers/base → }/org/modeshape/sequencer/xml/main/module.xml
  23. 0 ...ossas/kit/jboss-eap61/{modules/system/layers/base → }/org/modeshape/sequencer/xsd/main/module.xml
  24. 0 ...ossas/kit/jboss-eap61/{modules/system/layers/base → }/org/modeshape/sequencer/zip/main/module.xml
  25. +22 −2 integration/modeshape-jbossas-integration-tests/pom.xml
  26. 0 .../main/resources/kit/jboss-eap61/{modules/system/layers/base → }/org/modeshape/main/res/custom.cnd
  27. 0 ...kit/jboss-eap61/{modules/system/layers/base → }/org/modeshape/main/res/initial-content-custom.xml
  28. 0 ...it/jboss-eap61/{modules/system/layers/base → }/org/modeshape/main/res/initial-content-default.xml
  29. +40 −27 modeshape-assembly-descriptors/src/main/resources/assemblies/jbosseap-61-dist.xml
  30. +3 −0 modeshape-parent/pom.xml
@@ -259,7 +259,27 @@
<version>${version.resources.plugin}</version>
<executions>
<execution>
- <id>copy-test-profile</id>
+ <id>overwrite-modules</id>
+ <phase>process-test-classes</phase>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${project.build.directory}/${jboss.eap.root.folder}/${jboss.eap.modules.location}</outputDirectory>
+ <overwrite>true</overwrite>
+ <resources>
+ <resource>
+ <directory>src/main/resources/kit/jboss-eap61</directory>
+ <filtering>false</filtering>
+ <excludes>
+ <exclude>standalone/**</exclude>
+ </excludes>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
+ <execution>
+ <id>overwrite-configuration</id>
<phase>process-test-classes</phase>
<goals>
<goal>copy-resources</goal>
@@ -272,7 +292,7 @@
<directory>src/main/resources/kit/jboss-eap61</directory>
<filtering>false</filtering>
<includes>
- <include>**/*.*</include>
+ <include>standalone/**</include>
</includes>
</resource>
</resources>
@@ -14,17 +14,30 @@
-->
<fileSet>
<directory>${project.build.directory}/hsearch-71-kit/modules</directory>
- <outputDirectory>modules/system/layers/base/</outputDirectory>
+ <outputDirectory>${jboss.eap.modules.location}</outputDirectory>
<excludes>
<exclude>**/hibernate/search/**/module.xml</exclude>
</excludes>
</fileSet>
- <!-- The files for the kit -->
+ <!-- The modules part of the kit -->
+ <fileSet>
+ <directory>../deploy/jbossas/kit/jboss-eap61</directory>
+ <outputDirectory>${jboss.eap.modules.location}</outputDirectory>
+ <excludes>
+ <exclude>standalone/**</exclude>
+ </excludes>
+ <filtered>true</filtered>
+ </fileSet>
+
+ <!-- The configuration part -->
<fileSet>
<directory>../deploy/jbossas/kit/jboss-eap61</directory>
<outputDirectory>/</outputDirectory>
- <filtered>true</filtered>
+ <includes>
+ <include>standalone/**</include>
+ </includes>
+ <filtered>true</filtered>
</fileSet>
<!-- ModeShape subsystem XSD(s) -->
@@ -39,19 +52,19 @@
<!-- Deployment for the ModeShape RESTful service WAR (as an exploded directory) -->
<fileSet>
<directory>../deploy/jbossas/modeshape-jbossas-web-rest-war/target/modeshape-jbossas-web-rest-war-${project.version}</directory>
- <outputDirectory>modules/system/layers/base/org/modeshape/main/deployments/modeshape-rest.war</outputDirectory>
+ <outputDirectory>${jboss.eap.modules.location}/org/modeshape/main/deployments/modeshape-rest.war</outputDirectory>
</fileSet>
<!-- Deployment for the ModeShape WebDAV service WAR (as an exploded directory) -->
<fileSet>
<directory>../deploy/jbossas/modeshape-jbossas-web-webdav-war/target/modeshape-jbossas-web-webdav-war-${project.version}</directory>
- <outputDirectory>modules/system/layers/base/org/modeshape/main/deployments/modeshape-webdav.war</outputDirectory>
+ <outputDirectory>${jboss.eap.modules.location}/org/modeshape/main/deployments/modeshape-webdav.war</outputDirectory>
</fileSet>
<!-- Deployment for the ModeShape CMIS service WAR (as an exploded directory) -->
<fileSet>
<directory>../deploy/jbossas/modeshape-jbossas-cmis-war/target/modeshape-jbossas-cmis-war-${project.version}</directory>
- <outputDirectory>modules/system/layers/base/org/modeshape/main/deployments/modeshape-cmis.war</outputDirectory>
+ <outputDirectory>${jboss.eap.modules.location}/org/modeshape/main/deployments/modeshape-cmis.war</outputDirectory>
</fileSet>
</fileSets>
@@ -60,7 +73,7 @@
<!-- Module for the standard JCR API -->
<dependencySet>
<useProjectArtifact>false</useProjectArtifact>
- <outputDirectory>modules/system/layers/base/javax/jcr/main</outputDirectory>
+ <outputDirectory>${jboss.eap.modules.location}/javax/jcr/main</outputDirectory>
<includes>
<include>javax.jcr:jcr</include>
</includes>
@@ -70,7 +83,7 @@
<!-- Module for the ModeShape API (extension of the JCR API) -->
<dependencySet>
<useProjectArtifact>false</useProjectArtifact>
- <outputDirectory>modules/system/layers/base/org/modeshape/jcr/api/main</outputDirectory>
+ <outputDirectory>${jboss.eap.modules.location}/org/modeshape/jcr/api/main</outputDirectory>
<includes>
<include>org.modeshape:modeshape-jcr-api:jar</include>
</includes>
@@ -80,7 +93,7 @@
<!--Commons module-->
<dependencySet>
<useProjectArtifact>false</useProjectArtifact>
- <outputDirectory>modules/system/layers/base/org/modeshape/common/main</outputDirectory>
+ <outputDirectory>${jboss.eap.modules.location}/org/modeshape/common/main</outputDirectory>
<includes>
<include>org.modeshape:modeshape-common:jar</include>
</includes>
@@ -90,7 +103,7 @@
<!-- Module for the ModeShape engine (and dependencies) -->
<dependencySet>
<useProjectArtifact>false</useProjectArtifact>
- <outputDirectory>modules/system/layers/base/org/modeshape/main</outputDirectory>
+ <outputDirectory>${jboss.eap.modules.location}/org/modeshape/main</outputDirectory>
<includes>
<include>org.modeshape:modeshape-jcr:jar</include>
<include>org.modeshape:modeshape-jbossas-subsystem:jar</include>
@@ -102,7 +115,7 @@
<!-- Module for Tika (self-contained) -->
<dependencySet>
<useProjectArtifact>false</useProjectArtifact>
- <outputDirectory>modules/system/layers/base/org/apache/tika/${tika.version}</outputDirectory>
+ <outputDirectory>${jboss.eap.modules.location}/org/apache/tika/${tika.version}</outputDirectory>
<includes>
<include>org.apache.tika:*:jar</include>
<include>org.apache.commons:commons-compress:jar</include>
@@ -132,7 +145,7 @@
<!--Connectors-->
<dependencySet>
<useProjectArtifact>false</useProjectArtifact>
- <outputDirectory>modules/system/layers/base/org/modeshape/connector/git/main</outputDirectory>
+ <outputDirectory>${jboss.eap.modules.location}/org/modeshape/connector/git/main</outputDirectory>
<includes>
<include>org.modeshape:modeshape-connector-git:jar</include>
<include>org.eclipse.jgit:org.eclipse.jgit:jar</include>
@@ -143,23 +156,23 @@
<!--Sequencers-->
<dependencySet>
<useProjectArtifact>false</useProjectArtifact>
- <outputDirectory>modules/system/layers/base/org/modeshape/sequencer/ddl/main</outputDirectory>
+ <outputDirectory>${jboss.eap.modules.location}/org/modeshape/sequencer/ddl/main</outputDirectory>
<includes>
<include>org.modeshape:modeshape-sequencer-ddl:jar</include>
</includes>
</dependencySet>
<dependencySet>
<useProjectArtifact>false</useProjectArtifact>
- <outputDirectory>modules/system/layers/base/org/modeshape/sequencer/image/main</outputDirectory>
+ <outputDirectory>${jboss.eap.modules.location}/org/modeshape/sequencer/image/main</outputDirectory>
<includes>
<include>org.modeshape:modeshape-sequencer-images:jar</include>
</includes>
</dependencySet>
<dependencySet>
<useProjectArtifact>false</useProjectArtifact>
- <outputDirectory>modules/system/layers/base/org/modeshape/sequencer/java/main</outputDirectory>
+ <outputDirectory>${jboss.eap.modules.location}/org/modeshape/sequencer/java/main</outputDirectory>
<useTransitiveDependencies>true</useTransitiveDependencies>
<includes>
<include>org.modeshape:modeshape-sequencer-java:jar</include>
@@ -179,7 +192,7 @@
<dependencySet>
<useProjectArtifact>false</useProjectArtifact>
- <outputDirectory>modules/system/layers/base/org/modeshape/sequencer/mp3/main</outputDirectory>
+ <outputDirectory>${jboss.eap.modules.location}/org/modeshape/sequencer/mp3/main</outputDirectory>
<includes>
<include>org.modeshape:modeshape-sequencer-mp3:jar</include>
<include>org:jaudiotagger:jar</include>
@@ -188,7 +201,7 @@
<dependencySet>
<useProjectArtifact>false</useProjectArtifact>
- <outputDirectory>modules/system/layers/base/org/modeshape/sequencer/msoffice/main</outputDirectory>
+ <outputDirectory>${jboss.eap.modules.location}/org/modeshape/sequencer/msoffice/main</outputDirectory>
<includes>
<include>org.modeshape:modeshape-sequencer-msoffice:jar</include>
<include>org.apache*:poi:jar</include>
@@ -198,14 +211,14 @@
<dependencySet>
<useProjectArtifact>false</useProjectArtifact>
- <outputDirectory>modules/system/layers/base/org/modeshape/sequencer/sramp/main</outputDirectory>
+ <outputDirectory>${jboss.eap.modules.location}/org/modeshape/sequencer/sramp/main</outputDirectory>
<includes>
<include>org.modeshape:modeshape-sequencer-sramp:jar</include>
</includes>
</dependencySet>
<dependencySet>
- <outputDirectory>modules/system/layers/base/org/modeshape/sequencer/teiid/main</outputDirectory>
+ <outputDirectory>${jboss.eap.modules.location}/org/modeshape/sequencer/teiid/main</outputDirectory>
<includes>
<include>org.modeshape:modeshape-sequencer-teiid:jar</include>
<include>com.beust:jcommander:jar</include>
@@ -214,15 +227,15 @@
<dependencySet>
<useProjectArtifact>false</useProjectArtifact>
- <outputDirectory>modules/system/layers/base/org/modeshape/sequencer/text/main</outputDirectory>
+ <outputDirectory>${jboss.eap.modules.location}/org/modeshape/sequencer/text/main</outputDirectory>
<includes>
<include>org.modeshape:modeshape-sequencer-text:jar</include>
</includes>
</dependencySet>
<dependencySet>
<useProjectArtifact>false</useProjectArtifact>
- <outputDirectory>modules/system/layers/base/org/modeshape/sequencer/wsdl/main</outputDirectory>
+ <outputDirectory>${jboss.eap.modules.location}/org/modeshape/sequencer/wsdl/main</outputDirectory>
<includes>
<include>org.modeshape:modeshape-sequencer-wsdl:jar</include>
<include>wsdl4j:wsdl4j:jar</include>
@@ -231,15 +244,15 @@
<dependencySet>
<useProjectArtifact>false</useProjectArtifact>
- <outputDirectory>modules/system/layers/base/org/modeshape/sequencer/xml/main</outputDirectory>
+ <outputDirectory>${jboss.eap.modules.location}/org/modeshape/sequencer/xml/main</outputDirectory>
<includes>
<include>org.modeshape:modeshape-sequencer-xml:jar</include>
</includes>
</dependencySet>
<dependencySet>
<useProjectArtifact>false</useProjectArtifact>
- <outputDirectory>modules/system/layers/base/org/modeshape/sequencer/xsd/main</outputDirectory>
+ <outputDirectory>${jboss.eap.modules.location}/org/modeshape/sequencer/xsd/main</outputDirectory>
<includes>
<include>org.modeshape:modeshape-sequencer-xsd:jar</include>
<include>org.eclipse*:xsd:jar:${eclipse.xsd.version}</include>
@@ -252,15 +265,15 @@
<dependencySet>
<useProjectArtifact>false</useProjectArtifact>
- <outputDirectory>modules/system/layers/base/org/modeshape/sequencer/zip/main</outputDirectory>
+ <outputDirectory>${jboss.eap.modules.location}/org/modeshape/sequencer/zip/main</outputDirectory>
<includes>
<include>org.modeshape:modeshape-sequencer-zip:jar</include>
</includes>
</dependencySet>
<dependencySet>
<useProjectArtifact>false</useProjectArtifact>
- <outputDirectory>modules/system/layers/base/org/modeshape/extractor/tika/main</outputDirectory>
+ <outputDirectory>${jboss.eap.modules.location}/org/modeshape/extractor/tika/main</outputDirectory>
<useTransitiveDependencies>true</useTransitiveDependencies>
<includes>
<include>org.modeshape:modeshape-extractor-tika:jar</include>
@@ -270,7 +283,7 @@
<!-- Module for the ModeShape JDBC driver -->
<dependencySet>
<useProjectArtifact>false</useProjectArtifact>
- <outputDirectory>modules/system/layers/base/org/modeshape/jdbc/main</outputDirectory>
+ <outputDirectory>${jboss.eap.modules.location}/org/modeshape/jdbc/main</outputDirectory>
<includes>
<include>org.modeshape:modeshape-jdbc-local:jar</include>
</includes>
@@ -283,7 +296,7 @@
-->
<dependencySet>
<useProjectArtifact>false</useProjectArtifact>
- <outputDirectory>modules/system/layers/base/org/hibernate/search/engine/main</outputDirectory>
+ <outputDirectory>${jboss.eap.modules.location}/org/hibernate/search/engine/main</outputDirectory>
<unpack>false</unpack>
<useTransitiveFiltering>true</useTransitiveFiltering>
<includes>
@@ -343,6 +343,9 @@
<jboss.eap.version>6.1.0.Alpha1</jboss.eap.version>
<jboss.eap.root.folder>jboss-eap-6.1</jboss.eap.root.folder>
+ <!--The root folder under EAP/AS where the ModeShape & related modules should be placed-->
+ <jboss.eap.modules.location>modules</jboss.eap.modules.location>
+
<!-- The id of the maven distribution which is building the current kit -->
<jboss.eap.distribution.id>jbosseap-61-dist</jboss.eap.distribution.id>

0 comments on commit 04037ff

Please sign in to comment.