[weld-commits] Weld SVN: r5253 - in core/trunk: jboss-as and 1 other directory.
weld-commits at lists.jboss.org
weld-commits at lists.jboss.org
Wed Dec 9 11:07:40 EST 2009
Author: pete.muir at jboss.org
Date: 2009-12-09 11:07:40 -0500 (Wed, 09 Dec 2009)
New Revision: 5253
Added:
core/trunk/jboss-as/pom.xml
Removed:
core/trunk/lib/
Modified:
core/trunk/jboss-as/build.properties
core/trunk/jboss-as/build.xml
core/trunk/pom.xml
Log:
switch to using maven for jboss-as update
Modified: core/trunk/jboss-as/build.properties
===================================================================
--- core/trunk/jboss-as/build.properties 2009-12-09 14:40:47 UTC (rev 5252)
+++ core/trunk/jboss-as/build.properties 2009-12-09 16:07:40 UTC (rev 5253)
@@ -1,5 +1,5 @@
# Container a number of properties associated with installing Weld into JBoss AS and running the TCK in JBoss AS
-jboss.home=/Applications/jboss-6.0.0.M1
+#jboss.home=/Applications/jboss-6.0.0.M1
org.jboss.testharness.container.javaOpts=-Xms128m -Xmx512m -XX:MaxPermSize=192m -Dorg.jboss.resolver.warning=true -Dsun.rmi.dgc.client.gcInterval=3600000 -Dsun.rmi.dgc.server.gcInterval=3600000
# time to allow before attempting to restart JBoss AS
Modified: core/trunk/jboss-as/build.xml
===================================================================
--- core/trunk/jboss-as/build.xml 2009-12-09 14:40:47 UTC (rev 5252)
+++ core/trunk/jboss-as/build.xml 2009-12-09 16:07:40 UTC (rev 5253)
@@ -1,171 +1,8 @@
<?xml version="1.0"?>
-<project name="JBoss5DeployerInstall" default="update" basedir="." xmlns:artifact="urn:maven-artifact-ant">
+<project name="JBoss5DeployerInstall" default="update" basedir=".">
- <path id="maven-ant-tasks.classpath" path="../lib/maven-ant-tasks.jar" />
- <typedef resource="org/apache/maven/artifact/ant/antlib.xml" uri="urn:maven-artifact-ant" classpathref="maven-ant-tasks.classpath" />
-
- <property name="maven.dir" location="${basedir}/lib/maven" />
-
- <property file="local.build.properties" />
- <property file="build.properties" />
-
- <target name="clean" description="Clean up after the JBoss updater">
- <delete dir="target" failonerror="false" />
+ <target name="update" description="Update JBoss 5.x or 6.x for Weld">
+ <fail message="Use mvn -Pupdate-jboss-as"/>
</target>
- <target name="update" depends="install-weld.deployer, install-javassist-update" description="Update JBoss 5.x or 6.x for Weld" />
-
- <target name="install-weld.deployer">
- <echo message="Installing Weld ${weld.version} to ${jboss.home}" />
- <fail unless="jboss.home" message="Please pass in -Djboss.home=..." />
-
- <delete dir="${jboss.home}/server/default/deployers/weld.deployer" failonerror="false" />
- <delete dir="${jboss.home}/server/default/deployers/webbeans.deployer" failonerror="false" />
- <delete dir="target" failonerror="false" />
-
- <artifact:dependencies filesetId="weld.deployer.fileset" versionsId="weld.deployer.versions">
- <dependency groupId="org.jboss.weld.integration" artifactId="weld-jboss-int-deployer-assembly" version="${weld-deployer.version}" type="zip" />
- <dependency groupId="org.jboss.weld" artifactId="weld-core" version="${weld.version}" />
- <remoteRepository id="repository.jboss.org" url="http://repository.jboss.org/maven2" />
- <remoteRepository id="snapshots.jboss.org" url="http://snapshots.jboss.org/maven2" />
- </artifact:dependencies>
-
- <mkdir dir="target/dependency/lib" />
- <copy todir="target/dependency/lib">
- <fileset refid="weld.deployer.fileset" />
- <chainedmapper>
- <flattenmapper />
- <mapper classpathref="maven-ant-tasks.classpath" classname="org.apache.maven.artifact.ant.VersionMapper" from="${weld.deployer.versions}" to="flatten" />
- </chainedmapper>
- </copy>
-
- <unzip dest="target" src="target/dependency/lib/weld-jboss-int-deployer-assembly.zip" />
-
- <copy todir="target/weld.deployer/lib-int/" overwrite="true">
- <fileset dir="target/dependency/lib">
- <include name="weld-core.jar" />
- </fileset>
- </copy>
-
- <copy todir="${jboss.home}/client" overwrite="true">
- <fileset dir="target/dependency/lib">
- <include name="weld-api.jar" />
- <include name="cdi-api.jar" />
- </fileset>
- </copy>
- <copy todir="${jboss.home}/common/lib" overwrite="true">
- <fileset dir="target/dependency/lib">
- <include name="weld-api.jar" />
- <include name="cdi-api.jar" />
- </fileset>
- </copy>
-
-
- <delete dir="target/dependency" />
-
- <copy todir="${jboss.home}/server/default/deployers/weld.deployer">
- <fileset dir="target/weld.deployer">
- <include name="**/*" />
- </fileset>
- </copy>
-
-
- </target>
-
- <target name="install-javassist-update">
- <echo message="Upgrading Javassist to ${javassist.version} for ${jboss.home}" />
- <fail unless="jboss.home" message="Please pass in -Djboss.home=..." />
-
- <artifact:dependencies filesetId="javassist.fileset" versionsId="javassist.versions">
- <dependency groupId="javassist" artifactId="javassist" version="${javassist.version}" />
- <remoteRepository id="repository.jboss.org" url="http://repository.jboss.org/maven2" />
- <remoteRepository id="snapshots.jboss.org" url="http://snapshots.jboss.org/maven2" />
- </artifact:dependencies>
-
- <mkdir dir="target/dependency/lib" />
- <copy todir="target/dependency/lib">
- <fileset refid="javassist.fileset" />
- <chainedmapper>
- <flattenmapper />
- <mapper classpathref="maven-ant-tasks.classpath" classname="org.apache.maven.artifact.ant.VersionMapper" from="${javassist.versions}" to="flatten" />
- </chainedmapper>
- </copy>
-
- <copy todir="${jboss.home}/lib">
- <fileset dir="target/dependency/lib">
- <include name="javassist.jar" />
- </fileset>
- </copy>
- </target>
-
- <target name="install-validation-update">
- <echo message="Upgrading Bean Validation API to ${validation.version} for ${jboss.home}" />
- <fail unless="jboss.home" message="Please pass in -Djboss.home=..." />
-
- <artifact:dependencies filesetId="validation.fileset" versionsId="validation.versions">
- <dependency groupId="javax.validation" artifactId="validation-api" version="${validation.version}" />
- <remoteRepository id="repository.jboss.org" url="http://repository.jboss.org/maven2" />
- <remoteRepository id="snapshots.jboss.org" url="http://snapshots.jboss.org/maven2" />
- </artifact:dependencies>
-
- <mkdir dir="target/dependency/lib" />
- <copy todir="target/dependency/lib">
- <fileset refid="validation.fileset" />
- <chainedmapper>
- <flattenmapper />
- <mapper classpathref="maven-ant-tasks.classpath" classname="org.apache.maven.artifact.ant.VersionMapper" from="${validation.versions}" to="flatten" />
- </chainedmapper>
- </copy>
-
- <copy todir="${jboss.home}/common/lib">
- <fileset dir="target/dependency/lib">
- <include name="validation-api.jar" />
- </fileset>
- </copy>
- </target>
-
- <target name="install-jboss-ejb3-update">
-
- <fail unless="jboss.home" message="Please pass in -Djboss.home=..." />
-
- <artifact:dependencies filesetId="jboss.ejb3.plugin.fileset" versionsId="jboss.ejb3.plugin.versions">
- <dependency groupId="org.jboss.ejb3" artifactId="jboss-ejb3-plugin" version="${jboss-ejb3.version}" classifier="installer" />
- <remoteRepository id="repository.jboss.org" url="http://repository.jboss.org/maven2" />
- </artifact:dependencies>
-
- <mkdir dir="target/ejb3.plugin" />
- <copy todir="target/ejb3.plugin">
- <fileset refid="jboss.ejb3.plugin.fileset" />
- <chainedmapper>
- <flattenmapper />
- <mapper classpathref="maven-ant-tasks.classpath" classname="org.apache.maven.artifact.ant.VersionMapper" from="${jboss.ejb3.plugin.versions}" to="flatten" />
- </chainedmapper>
- </copy>
- <java jar="target/ejb3.plugin/jboss-ejb3-plugin-installer.jar" fork="true" failonerror="true">
- <arg line="${jboss.home}" />
- </java>
- </target>
-
- <macrodef name="maven">
- <attribute name="target" />
- <attribute name="basedir" />
- <element name="args" implicit="true" optional="true" />
- <sequential>
- <java classname="org.codehaus.classworlds.Launcher" fork="true" dir="@{basedir}" failonerror="true">
- <classpath>
- <fileset dir="${maven.dir}/boot">
- <include name="*.jar" />
- </fileset>
- <fileset dir="${maven.dir}/bin">
- <include name="*.*" />
- </fileset>
- </classpath>
- <sysproperty key="classworlds.conf" value="${maven.dir}/bin/m2.conf" />
- <sysproperty key="maven.home" value="${maven.dir}" />
- <args />
- <arg line="@{target}" />
- </java>
- </sequential>
- </macrodef>
-
</project>
Added: core/trunk/jboss-as/pom.xml
===================================================================
--- core/trunk/jboss-as/pom.xml (rev 0)
+++ core/trunk/jboss-as/pom.xml 2009-12-09 16:07:40 UTC (rev 5253)
@@ -0,0 +1,135 @@
+<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>
+ <groupId>org.jboss.weld</groupId>
+ <artifactId>weld-core-jboss-as-updater</artifactId>
+ <packaging>pom</packaging>
+ <version>1.0.1-SNAPSHOT</version>
+
+ <parent>
+ <groupId>org.jboss.weld</groupId>
+ <artifactId>weld-core-parent</artifactId>
+ <version>1.0.1-SNAPSHOT</version>
+ <relativePath>../parent/pom.xml</relativePath>
+ </parent>
+
+ <name>Weld JBoss AS Updater</name>
+
+ <!-- Minimal metadata -->
+ <description>A script to update Weld in JBoss AS</description>
+
+ <!-- SCM and distribution management -->
+ <scm>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/weld/core/trunk</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/core/trunk</developerConnection>
+ <url>http://fisheye.jboss.org/browse/Weld</url>
+ </scm>
+
+ <properties>
+ <weld-deployer.version>5.2.0-SNAPSHOT</weld-deployer.version>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.weld.integration</groupId>
+ <artifactId>weld-jboss-int-deployer-assembly</artifactId>
+ <version>${weld-deployer.version}</version>
+ <type>zip</type>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.weld</groupId>
+ <artifactId>weld-core</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
+ <build>
+ <defaultGoal>package</defaultGoal>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy-dependencies</id>
+ <phase>process-resources</phase>
+ <goals>
+ <goal>copy-dependencies</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${project.build.directory}/dependency/lib</outputDirectory>
+ <overwriteSnapshots>true</overwriteSnapshots>
+ <stripVersion>true</stripVersion>
+ <includeArtifactIds>cdi-api,weld-api,weld-core,weld-jboss-int-deployer-assembly</includeArtifactIds>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>update-jboss-as</id>
+ <phase>package</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <tasks>
+ <property file="${project.directory}/local.build.properties" />
+ <property file="${project.directory}/build.properties" />
+ <property name="jboss.home" value="${env.JBOSS_HOME}" />
+ <delete
+ dir="${jboss.home}/server/default/deployers/weld.deployer"
+ failonerror="false" />
+ <delete
+ dir="${jboss.home}/server/default/deployers/webbeans.deployer"
+ failonerror="false" />
+
+ <unzip dest="${project.build.directory}"
+ src="${project.build.directory}/dependency/lib/weld-jboss-int-deployer-assembly.zip" />
+
+ <copy todir="target/weld.deployer/lib-int/"
+ overwrite="true">
+ <fileset dir="target/dependency/lib">
+ <include name="weld-core.jar" />
+ </fileset>
+ </copy>
+
+ <copy todir="${jboss.home}/client"
+ overwrite="true">
+ <fileset dir="target/dependency/lib">
+ <include name="weld-api.jar" />
+ <include name="cdi-api.jar" />
+ </fileset>
+ </copy>
+ <copy todir="${jboss.home}/common/lib"
+ overwrite="true">
+ <fileset dir="target/dependency/lib">
+ <include name="weld-api.jar" />
+ <include name="cdi-api.jar" />
+ </fileset>
+ </copy>
+
+ <copy
+ todir="${jboss.home}/server/default/deployers/weld.deployer">
+ <fileset dir="target/weld.deployer">
+ <include name="**/*" />
+ </fileset>
+ </copy>
+ </tasks>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
Modified: core/trunk/pom.xml
===================================================================
--- core/trunk/pom.xml 2009-12-09 14:40:47 UTC (rev 5252)
+++ core/trunk/pom.xml 2009-12-09 16:07:40 UTC (rev 5253)
@@ -41,6 +41,20 @@
</modules>
</profile>
<profile>
+ <id>update-jboss-as</id>
+ <modules>
+ <module>bom</module>
+ <module>parent</module>
+ <module>impl</module>
+ <module>tests</module>
+ <module>porting-package</module>
+ <module>inject-tck-runner</module>
+ <module>jboss-tck-runner</module>
+ <module>osgi-bundle</module>
+ <module>jboss-as</module>
+ </modules>
+ </profile>
+ <profile>
<id>skip-tests</id>
<modules>
<module>bom</module>
More information about the weld-commits
mailing list