Skip to content

Commit

Permalink
HV-685 Cleanup and improvements of AS setup code. Externalizing groov…
Browse files Browse the repository at this point in the history 
…y script. For now we use the AS provided EL API and impl
  • Loading branch information
@hferentschik
hferentschik committed Feb 1, 2013
1 parent fe6dc1c commit 84df4fe
Show file tree
Hide file tree
Showing 7 changed files with 55 additions and 61 deletions.
4 changes: 2 additions & 2 deletions engine/pom.xml
View file
Expand Up @@ -57,11 +57,11 @@
</dependency>
<dependency>
<groupId>de.odysseus.juel</groupId>
<artifactId>juel-api</artifactId>
<artifactId>juel-spi</artifactId>
</dependency>
<dependency>
<groupId>de.odysseus.juel</groupId>
<artifactId>juel-spi</artifactId>
<artifactId>juel-api</artifactId>
</dependency>
<dependency>
<groupId>de.odysseus.juel</groupId>
Expand Down
11 changes: 6 additions & 5 deletions pom.xml
View file
Expand Up @@ -91,6 +91,7 @@
<org.codehaus.mojo.chronos.version>1.0-beta-3</org.codehaus.mojo.chronos.version>
<bv.api.version>1.1.0-SNAPSHOT</bv.api.version>
<classmate.version>0.8.0</classmate.version>
<juel.version>2.2.5</juel.version>
<jbossas.version>7.1.1.Final</jbossas.version>
<arquillian.version>1.0.2.Final</arquillian.version>
</properties>
Expand All @@ -114,18 +115,18 @@
</dependency>
<dependency>
<groupId>de.odysseus.juel</groupId>
<artifactId>juel-api</artifactId>
<version>2.2.5</version>
<artifactId>juel-spi</artifactId>
<version>${juel.version}</version>
</dependency>
<dependency>
<groupId>de.odysseus.juel</groupId>
<artifactId>juel-spi</artifactId>
<version>2.2.5</version>
<artifactId>juel-api</artifactId>
<version>${juel.version}</version>
</dependency>
<dependency>
<groupId>de.odysseus.juel</groupId>
<artifactId>juel-impl</artifactId>
<version>2.2.5</version>
<version>${juel.version}</version>
</dependency>
<dependency>
<groupId>javax.enterprise</groupId>
Expand Down
50 changes: 4 additions & 46 deletions tck-runner/pom.xml
View file
Expand Up @@ -15,7 +15,9 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>

<parent>
Expand Down Expand Up @@ -305,50 +307,7 @@
</goals>
<configuration>
<source>
println "[INFO] ------------------------------------------------------------------------";
println "[INFO] TCK SETUP BUILD INFO ";
println "[INFO] ------------------------------------------------------------------------";
println "[INFO] Updating default JBoss AS modules ";
println "[INFO] ------------------------------------------------------------------------";

def toDir = new File(project.properties['jbossTargetDir'], 'modules/javax/validation')
def fromDir = new File(project.basedir, 'src/as7config/modules/javax/validation')

log.info('Deleting old Bean Validation 1.0 module from ' + fromDir )
ant.delete(dir : toDir)

log.info('Copying Bean Validation 1.1 module from ' + fromDir + ' to ' + toDir)
ant.copy(todir: toDir, filtering: true) {
fileset(dir: fromDir)
filterset() {
filter(token:'BV-API-VERSION', value:project.properties['bv.api.version'])
}
}

toDir = new File(project.properties['jbossTargetDir'], 'modules/org/hibernate/validator')
fromDir = new File(project.basedir, 'src/as7config/modules/org/hibernate/validator')

log.info('Deleting old Hibernate Validator module from ' + fromDir )
ant.delete(dir : toDir)

log.info('Copying updated Hibernate Validator module from ' + fromDir + ' to ' + toDir)
ant.copy(todir: toDir, filtering: true) {
fileset(dir: fromDir)
filterset() {
filter(token:'HV-VERSION', value:project.version)
}
}

toDir = new File(project.properties['jbossTargetDir'], 'modules/com/fasterxml')
fromDir = new File(project.basedir, 'src/as7config/modules/com/fasterxml')

log.info('Copying classmate module from ' + fromDir + ' to ' + toDir)
ant.copy(todir: toDir, filtering: true) {
fileset(dir: fromDir)
filterset() {
filter(token:'CLASSMATE-VERSION', value:project.properties['classmate.version'])
}
}
${pom.basedir}/src/script/setupAsModules.groovy
</source>
</configuration>
</execution>
Expand All @@ -365,7 +324,6 @@
</suiteXmlFiles>
<systemPropertyVariables>
<arquillian.launch>incontainer</arquillian.launch>
<validation.provider>${validation.provider}</validation.provider>
<includeIntegrationTests>true</includeIntegrationTests>
</systemPropertyVariables>
</configuration>
Expand Down
2 changes: 1 addition & 1 deletion tck-runner/src/as7config/modules/com/fasterxml/classmate/main/module.xml
View file
Expand Up @@ -17,6 +17,6 @@
-->
<module xmlns="urn:jboss:module:1.1" name="com.fasterxml.classmate">
<resources>
<resource-root path="classmate-@CLASSMATE-VERSION@.jar"/>
<resource-root path="classmate-@VERSION@.jar"/>
</resources>
</module>
2 changes: 1 addition & 1 deletion tck-runner/src/as7config/modules/javax/validation/api/main/module.xml
View file
Expand Up @@ -17,7 +17,7 @@
-->
<module xmlns="urn:jboss:module:1.1" name="javax.validation.api">
<resources>
<resource-root path="validation-api-@BV-API-VERSION@.jar"/>
<resource-root path="validation-api-@VERSION@.jar"/>
</resources>

<dependencies>
Expand Down
9 changes: 3 additions & 6 deletions tck-runner/src/as7config/modules/org/hibernate/validator/main/module.xml
View file
Expand Up @@ -17,21 +17,18 @@
-->
<module xmlns="urn:jboss:module:1.1" name="org.hibernate.validator">
<resources>
<resource-root path="hibernate-validator-@HV-VERSION@.jar"/>
<resource-root path="hibernate-validator-@VERSION@.jar"/>
</resources>

<dependencies>
<module name="com.fasterxml.classmate"/>
<module name="javax.api"/>
<module name="javax.el.api"/>
<module name="javax.persistence.api"/>
<module name="javax.validation.api"/>
<module name="javax.persistence.api"/>
<module name="javax.xml.bind.api"/>
<module name="javax.el.api"/>
<module name="org.jboss.logging"/>
<module name="org.jboss.common-core"/>
<module name="org.joda.time"/>
<module name="org.slf4j"/>
<module name="com.fasterxml.classmate"/>
<module name="org.apache.xerces" services="import"/>
<module name="sun.jdk" services="import"/>
</dependencies>
Expand Down
38 changes: 38 additions & 0 deletions tck-runner/src/script/setupAsModules.groovy
View file
@@ -0,0 +1,38 @@
// Needed while running against an AS instance which is not bundled with HV 5
println "[INFO] ------------------------------------------------------------------------";
println "[INFO] UPDATING DEFAULT JBOSS AS MODULES ";
println "[INFO] ------------------------------------------------------------------------";

def updateModule(Map args) {
// Ensure any expected parameters are defined
['from','to', 'deleteBeforeCopy', 'version'].each{ args.get(it,'') }

if (args.deleteBeforeCopy) {
log.info('Deleting ' + args.from )
ant.delete(dir : args.to)
}

ant.copy(todir: args.to, filtering: true) {
fileset(dir: args.from)
filterset() {
filter(token:'VERSION', value:args.version)
}
}
}

println "[INFO] --- Updating Bean Validation API module";
def toDir = new File(project.properties['jbossTargetDir'], 'modules/javax/validation')
def fromDir = new File(project.basedir, 'src/as7config/modules/javax/validation')
updateModule(from:fromDir, to:toDir, deleteBeforeCopy:true, version:project.properties['bv.api.version'])

println "[INFO] --- Updating Hibernate Validator module";
toDir = new File(project.properties['jbossTargetDir'], 'modules/org/hibernate/validator')
fromDir = new File(project.basedir, 'src/as7config/modules/org/hibernate/validator')
updateModule(from:fromDir, to:toDir, deleteBeforeCopy:true, version:project.version)

println "[INFO] --- Creating classmate module";
toDir = new File(project.properties['jbossTargetDir'], 'modules/com/fasterxml')
fromDir = new File(project.basedir, 'src/as7config/modules/com/fasterxml')
updateModule(from:fromDir, to:toDir, deleteBeforeCopy:false, version:project.properties['classmate.version'])

println "[INFO] ------------------------------------------------------------------------";

0 comments on commit 84df4fe

Please sign in to comment.