Permalink
Browse files

MODE-1849 - Changed AS7 kit to EAP kit and updated the build system s…

…o that new kit and integration tests work against EAP 6.1.Alpha1
  • Loading branch information...
Horia Chiorean authored and rhauch committed Mar 12, 2013
1 parent 99ee066 commit cec88681e57f25a12d5fc1d0beb5927b54838105
Showing with 350 additions and 316 deletions.
  1. +16 −0 bin/install-eap.bat
  2. +17 −0 bin/install-eap.sh
  3. +4 −8 bin/release.py
  4. +0 −3 boms/modeshape-bom-parent/pom.xml
  5. 0 deploy/jbossas/kit/{jboss-as72 → jboss-eap61}/modules/system/layers/base/javax/jcr/main/module.xml
  6. 0 .../jbossas/kit/{jboss-as72 → jboss-eap61}/modules/system/layers/base/org/apache/tika/1.3/module.xml
  7. 0 ...{jboss-as72 → jboss-eap61}/modules/system/layers/base/org/hibernate/search/engine/main/module.xml
  8. 0 ...as/kit/{jboss-as72 → jboss-eap61}/modules/system/layers/base/org/modeshape/common/main/module.xml
  9. 0 ...{jboss-as72 → jboss-eap61}/modules/system/layers/base/org/modeshape/connector/git/main/module.xml
  10. 0 ...jboss-as72 → jboss-eap61}/modules/system/layers/base/org/modeshape/extractor/tika/main/module.xml
  11. 0 ...s/kit/{jboss-as72 → jboss-eap61}/modules/system/layers/base/org/modeshape/jcr/api/main/module.xml
  12. 0 ...ssas/kit/{jboss-as72 → jboss-eap61}/modules/system/layers/base/org/modeshape/jdbc/main/module.xml
  13. 0 ...as72 → jboss-eap61}/modules/system/layers/base/org/modeshape/main/conf/modeshape-roles.properties
  14. 0 ...as72 → jboss-eap61}/modules/system/layers/base/org/modeshape/main/conf/modeshape-users.properties
  15. +2 −0 ...y/jbossas/kit/{jboss-as72 → jboss-eap61}/modules/system/layers/base/org/modeshape/main/module.xml
  16. 0 ...as72 → jboss-eap61}/modules/system/layers/base/org/modeshape/main/res/initial-content-default.xml
  17. 0 ...{jboss-as72 → jboss-eap61}/modules/system/layers/base/org/modeshape/sequencer/ddl/main/module.xml
  18. 0 ...boss-as72 → jboss-eap61}/modules/system/layers/base/org/modeshape/sequencer/image/main/module.xml
  19. 0 ...jboss-as72 → jboss-eap61}/modules/system/layers/base/org/modeshape/sequencer/java/main/module.xml
  20. 0 ...{jboss-as72 → jboss-eap61}/modules/system/layers/base/org/modeshape/sequencer/mp3/main/module.xml
  21. 0 ...s-as72 → jboss-eap61}/modules/system/layers/base/org/modeshape/sequencer/msoffice/main/module.xml
  22. 0 ...boss-as72 → jboss-eap61}/modules/system/layers/base/org/modeshape/sequencer/sramp/main/module.xml
  23. 0 ...boss-as72 → jboss-eap61}/modules/system/layers/base/org/modeshape/sequencer/teiid/main/module.xml
  24. 0 ...jboss-as72 → jboss-eap61}/modules/system/layers/base/org/modeshape/sequencer/text/main/module.xml
  25. 0 ...jboss-as72 → jboss-eap61}/modules/system/layers/base/org/modeshape/sequencer/wsdl/main/module.xml
  26. 0 ...{jboss-as72 → jboss-eap61}/modules/system/layers/base/org/modeshape/sequencer/xml/main/module.xml
  27. 0 ...{jboss-as72 → jboss-eap61}/modules/system/layers/base/org/modeshape/sequencer/xsd/main/module.xml
  28. 0 ...{jboss-as72 → jboss-eap61}/modules/system/layers/base/org/modeshape/sequencer/zip/main/module.xml
  29. 0 deploy/jbossas/kit/{jboss-as72 → jboss-eap61}/standalone/configuration/standalone-modeshape.xml
  30. 0 deploy/jbossas/kit/{jboss-as72 → jboss-eap61}/standalone/deployments/modeshape-cmis.war.dodeploy
  31. 0 deploy/jbossas/kit/{jboss-as72 → jboss-eap61}/standalone/deployments/modeshape-rest.war.dodeploy
  32. 0 deploy/jbossas/kit/{jboss-as72 → jboss-eap61}/standalone/deployments/modeshape-webdav.war.dodeploy
  33. +0 −6 deploy/jbossas/modeshape-jbossas-subsystem/pom.xml
  34. +210 −214 integration/modeshape-jbossas-integration-tests/pom.xml
  35. 0 ...urces/kit/{jboss-as72 → jboss-eap61}/modules/system/layers/base/org/modeshape/main/res/custom.cnd
  36. 0 ...-as72 → jboss-eap61}/modules/system/layers/base/org/modeshape/main/res/initial-content-custom.xml
  37. 0 ...as72 → jboss-eap61}/modules/system/layers/base/org/modeshape/main/res/initial-content-default.xml
  38. 0 ...c/main/resources/kit/{jboss-as72 → jboss-eap61}/standalone/configuration/standalone-modeshape.xml
  39. +2 −2 integration/modeshape-jbossas-integration-tests/src/test/resources/arquillian.xml
  40. +58 −66 integration/modeshape-jbossas-kit-tests/pom.xml
  41. +2 −2 integration/modeshape-jbossas-kit-tests/src/test/resources/arquillian.xml
  42. +4 −4 ...ly-descriptors/src/main/resources/assemblies/{jbossas-72-distribution.xml → jbosseap-61-dist.xml}
  43. +2 −4 modeshape-distribution/pom.xml
  44. +33 −7 modeshape-parent/pom.xml
View
@@ -0,0 +1,16 @@
+@echo off
+
+REM ---------------------------------------------------------------------------------------------------------------------------------------
+REM This script installs a downloaded version of JBoss EAP into the local Maven Repository.
+REM Its purpose is to allow running the "integration" and "assembly" profiles from the build, run the AS7/EAP integration tests
+REM The values used for "artifactId", "groupId" and "version" *must* match the following properties from the modeshape-parent/pom.xml file:
+REM groupId <-> ${jboss.eap.groupId}
+REM artifactId <-> ${jboss.eap.artifactId}
+REM version <-> ${jboss.eap.version}
+REM ---------------------------------------------------------------------------------------------------------------------------------------
+
+if "%1" == "" (
+ echo "Usage: install-eap.bat <eap_zip_file>"
+) else (
+ mvn install:install-file -Dfile="%1" -DgroupId=org.jboss.as -DartifactId=jboss-eap -Dversion=6.1.0.Alpha1 -Dpackaging=zip
+)
View
@@ -0,0 +1,17 @@
+#!/bin/sh
+
+##########################################################################################################################################
+# This script installs a downloaded version of JBoss EAP into the local Maven Repository.
+# Its purpose is to allow running the "integration" and "assembly" profiles from the build, run the AS7/EAP integration tests
+# The values used for "artifactId", "groupId" and "version" *must* match the following properties from the modeshape-parent/pom.xml file:
+# groupId <-> ${jboss.eap.groupId}
+# artifactId <-> ${jboss.eap.artifactId}
+# version <-> ${jboss.eap.version}
+##########################################################################################################################################
+
+if [ "$#" -ne 1 ] ; then
+ echo "Usage: install-eap.sh <eap_zip_file>"
+ exit 1
+else
+ mvn install:install-file -Dfile="$1" -DgroupId=org.jboss.as -DartifactId=jboss-eap -Dversion=6.1.0.Alpha1 -Dpackaging=zip
+fi
View
@@ -176,10 +176,8 @@ def copy_artifacts_to_archive_location(archive_path,version):
pass
# Copy the 'modeshape-distribution' artifacts ...
- #from_files = ['dist.zip', 'source.zip', 'jbossas-71-dist.zip', 'jbossas-72-dist.zip']
- #to_files = ['dist.zip', 'source.zip', 'jbossas-71-dist.zip', 'jbossas-72-dist.zip']
- from_files = ['dist.zip', 'source.zip', 'jbossas-72-dist.zip']
- to_files = ['dist.zip', 'source.zip', 'jbossas-72-dist.zip']
+ from_files = ['dist.zip', 'source.zip', 'jbosseap-61-dist.zip']
+ to_files = ['dist.zip', 'source.zip', 'jbosseap-61-dist.zip']
for fsuffix,tsuffix in zip(from_files,to_files):
shutil.copy("modeshape-distribution/target/modeshape-%s-%s" % (version,fsuffix), "%s/modeshape-%s-%s" % (archive_path,version,tsuffix))
@@ -249,10 +247,8 @@ def upload_artifacts(base_dir, version):
os.makedirs("downloads/%s" % version)
# Copy the 'modeshape-distribution' artifacts ...
- #from_files = ['dist.zip', 'source.zip', 'jbossas-71-dist.zip', 'jbossas-72-dist.zip']
- #to_files = ['dist.zip', 'source.zip', 'jbossas-71-dist.zip', 'jbossas-72-dist.zip']
- from_files = ['dist.zip', 'source.zip', 'jbossas-72-dist.zip']
- to_files = ['dist.zip', 'source.zip', 'jbossas-72-dist.zip']
+ from_files = ['dist.zip', 'source.zip', 'jbosseap-61-dist.zip']
+ to_files = ['dist.zip', 'source.zip', 'jbosseap-61-dist.zip']
for fsuffix,tsuffix in zip(from_files,to_files):
shutil.copy("%s/modeshape-distribution/target/modeshape-%s-%s" % (base_dir,version,fsuffix), "downloads/%s/modeshape-%s-%s" % (version,version,tsuffix))
@@ -91,11 +91,8 @@
<eclipse.emf.ecorexmi.version>2.4.1</eclipse.emf.ecorexmi.version>
<!-- Versions of JBoss AS dependencies -->
- <jbossas-version>7.2.0.Final</jbossas-version>
- <!--jbossas-version>7.2.0.Alpha1-SNAPSHOT</jbossas-version-->
<javax.connector-api.version>1.5</javax.connector-api.version>
<javax.jta.version>1.1</javax.jta.version>
- <jbossas7.assembly.descriptor.version>72</jbossas7.assembly.descriptor.version>
<javax.servlet.version>2.5</javax.servlet.version>
<!-- Versions of non-ModeShape dependencies used for logging -->
@@ -47,6 +47,8 @@
<module name="org.joda.time"/>
<module name="org.jgroups"/>
+ <!--Needed in order to be able to use ChannelInjector in our kit -->
+ <module name="org.jboss.as.clustering.jgroups"/>
<module name="org.apache.tika" slot="${tika.version}" services="import"/>
<module name="org.apache.lucene" slot="3.6.2"/>
<module name="org.hibernate.search.engine" export="true"/>
@@ -50,9 +50,6 @@
<artifactId>infinispan-core</artifactId>
</dependency>
- <!--
-More compile dependencies (defined _after_ the JBoss AS7 artifacts and Infinispan)
--->
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-search-infinispan</artifactId>
@@ -62,9 +59,6 @@ More compile dependencies (defined _after_ the JBoss AS7 artifacts and Infinispa
<artifactId>infinispan-lucene-directory</artifactId>
</dependency>
- <!--
-Testing (note the scope)
--->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
Oops, something went wrong.

0 comments on commit cec8868

Please sign in to comment.