dain 2004/04/06 14:41:45
Added: modules/assembly .cvsignore maven.xml project.xml
Log:
Added an assembly module
Fixed remaining not serializable bugs
Added configuration files for itests to deploy into new assembly
Revision Changes Path
1.1 openejb/modules/assembly/.cvsignore
Index: .cvsignore
===================================================================
.project
.classpath
maven.log
junit*.properties
target
1.1 openejb/modules/assembly/maven.xml
Index: maven.xml
===================================================================
<?xml version="1.0" encoding="ISO-8859-1"?>
<!-- $Revision: 1.1 $ $Date: 2004/04/06 18:41:45 $ -->
<project default="default"
xmlns:j="jelly:core"
xmlns:ant="jelly:ant"
xmlns:define="jelly:define"
xmlns:bootstrap="geronimo:bootstrap">
<!-- ================= -->
<!-- Global Properties -->
<!-- ================= -->
<!-- Determine what the top-level project root is -->
<j:set var="project.root"
value="${pom.parentBasedir().getParentFile().getCanonicalFile()}"/>
<!-- Determine what the top-level project root is -->
<j:set var="distDir" value="${project.root}/target/assembly"/>
<!-- Load the global properties -->
<ant:property file="${project.root}/etc/global.properties"/>
<!-- ==================== -->
<!-- Default Global Goals -->
<!-- ==================== -->
<goal name="default">
<attainGoal name="build"/>
</goal>
<goal name="build">
<attainGoal name="assemble"/>
</goal>
<goal name="rebuild">
<attainGoal name="clean"/>
<attainGoal name="build"/>
</goal>
<postGoal name="clean:clean">
<ant:delete dir="${distDir}"/>
</postGoal>
<!-- ==================================================== -->
<!-- Assemble server installation from generated modules -->
<!-- ==================================================== -->
<goal name="assemble">
<!-- delete the dist directory first, to remove any cruft -->
<ant:delete dir="${distDir}"/>
<!-- Copy the runtime dependencies into lib and create a classpath for the
server.jar file -->
<j:set var="libDir" value="${distDir}/lib"/>
<ant:mkdir dir="${libDir}"/>
<j:forEach var="artifact" items="${pom.artifacts}">
<j:set var="dependency" value="${artifact.dependency}"/>
<j:if test="${dependency.getProperty('lib') == 'true'}">
<ant:copy todir="${libDir}" file="${artifact.path}"/>
<j:set var="classpath" value="${classpath} ../lib/${artifact.name}"/>
</j:if>
<j:if test="${dependency.getProperty('server') == 'true'}">
<j:set var="server.classpath" value="${server.classpath}
../lib/${artifact.name}"/>
</j:if>
<j:if test="${dependency.getProperty('deploy') == 'true'}">
<j:set var="deploy.classpath" value="${deploy.classpath}
../lib/${artifact.name}"/>
</j:if>
</j:forEach>
<!-- Create directory for XML schema documents -->
<ant:mkdir dir="${distDir}/schema"/>
<ant:copy todir="${distDir}/schema" flatten="true">
<ant:fileset dir="${project.root}/modules/core/src/schema">
<ant:include name="*.xsd"/>
<ant:include name="*.dtd"/>
</ant:fileset>
<ant:fileset dir="src/etc"/>
</ant:copy>
<!-- Pre-load the server's repository -->
<ant:mkdir dir="${distDir}/repository"/>
<ant:copy todir="${distDir}/repository">
<ant:fileset dir="${maven.repo.local}">
<ant:include name="openejb/**"/>
<j:forEach var="artifact" items="${pom.artifacts}">
<j:set var="dependency" value="${artifact.dependency}"/>
<j:if test="${dependency.getProperty('repository') == 'true'}">
<ant:include
name="${dependency.getArtifactDirectory()}/${dependency.getType()}s/${dependency.getArtifact()}"/>
</j:if>
</j:forEach>
</ant:fileset>
</ant:copy>
<ant:copy todir="${distDir}/repository">
<mapper type="glob" from="${maven.repo.local}*" to="*"/>
<ant:fileset dir="${maven.repo.local}">
<j:forEach var="artifact" items="${pom.artifacts}">
<j:set var="dependency" value="${artifact.dependency}"/>
<j:if test="${dependency.getProperty('repository') == 'true'}">
<ant:fileset include="${artifact.path}"/>
</j:if>
</j:forEach>
</ant:fileset>
</ant:copy>
<!-- bootstrap the deployer -->
<ant:echo>Bootstrapping service deployer</ant:echo>
<ant:mkdir dir="${distDir}/bin"/>
<ant:mkdir dir="${distDir}/config-store"/>
<define:taglib uri="geronimo:bootstrap">
<define:jellybean
name="bootstrap"
className="org.apache.geronimo.deployment.Bootstrap"
method="bootstrap"/>
</define:taglib>
<bootstrap:bootstrap
deployerJar="${distDir}/bin/deployer.jar"
storeDir="${distDir}/config-store"
repositoryDir="${distDir}/repository"
deployerSystemPlan="${basedir}/src/plan/deployer-system-plan.xml"
j2eeDeployerPlan="${basedir}/src/plan/j2ee-deployer-plan.xml"
deployerClassPath="${deploy.classpath}"
deployerGBean="geronimo.deployment:role=Deployer,config=org/apache/geronimo/J2EEDeployer"
/>
<!-- build the system configuration and server.jar -->
<ant:echo>Building system configuration</ant:echo>
<ant:mkdir dir="${distDir}/bin"/>
<ant:java fork="true" jar="${distDir}/bin/deployer.jar" failonerror="true">
<ant:arg value="--install"/>
<ant:arg value="--plan"/>
<ant:arg value="src/plan/system-plan.xml"/>
<ant:arg value="--outfile"/>
<ant:arg value="${distDir}/bin/server.jar"/>
</ant:java>
<!-- build the J2EEServer configuration -->
<ant:echo>Building server configuration</ant:echo>
<ant:java fork="true" jar="${distDir}/bin/deployer.jar" failonerror="true">
<ant:arg value="--install"/>
<ant:arg value="--plan"/>
<ant:arg value="src/plan/j2ee-server-plan.xml"/>
</ant:java>
<!-- build the itests configuration -->
<ant:echo>Building server configuration</ant:echo>
<ant:java fork="true" jar="${distDir}/bin/deployer.jar" failonerror="true">
<ant:arg value="--install"/>
<ant:arg value="--module"/>
<ant:arg
value="${project.root}/modules/itests/target/openejb-itests-beans2.jar"/>
</ant:java>
</goal>
</project>
1.1 openejb/modules/assembly/project.xml
Index: project.xml
===================================================================
<?xml version="1.0" encoding="ISO-8859-1"?>
<!-- $Revision: 1.1 $ $Date: 2004/04/06 18:41:45 $ -->
<project>
<pomVersion>3</pomVersion>
<extend>${basedir}/../../etc/project.xml</extend>
<!-- ===================== -->
<!-- Module Identification -->
<!-- ===================== -->
<name>OpenEJB :: Assembly</name>
<id>openejb-assembly</id>
<shortDescription>OpenEJb Assembly</shortDescription>
<description>OpenEJb Assembly</description>
<!-- ============ -->
<!-- Dependencies -->
<!-- ============ -->
<dependencies>
<!-- ========================================================== -->
<!-- We use the follow properties in this build: -->
<!-- lib: copy dependency into lib -->
<!-- server: include dependency in server classpath -->
<!-- deploy: include dependency in deployer classpath -->
<!-- repository: copy dependency into repository (Note: all -->
<!-- OpenEJB jars are always copied to repository) -->
<!-- ========================================================== -->
<dependency>
<groupId>openejb</groupId>
<artifactId>openejb-core</artifactId>
<version>${pom.currentVersion}</version>
<properties>
<repository>true</repository>
</properties>
</dependency>
<dependency>
<groupId>openejb</groupId>
<artifactId>openejb-itests</artifactId>
<version>${pom.currentVersion}</version>
</dependency>
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-common</artifactId>
<version>${pom.currentVersion}</version>
<properties>
<lib>true</lib>
<deploy>true</deploy>
<repository>true</repository>
</properties>
</dependency>
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-connector</artifactId>
<version>${pom.currentVersion}</version>
<properties>
<repository>true</repository>
</properties>
</dependency>
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-core</artifactId>
<version>${pom.currentVersion}</version>
<properties>
<repository>true</repository>
</properties>
</dependency>
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-deployment</artifactId>
<version>${pom.currentVersion}</version>
<properties>
<lib>true</lib>
<deploy>true</deploy>
<repository>true</repository>
</properties>
</dependency>
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-j2ee</artifactId>
<version>${pom.currentVersion}</version>
<properties>
<repository>true</repository>
</properties>
</dependency>
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-kernel</artifactId>
<version>${pom.currentVersion}</version>
<properties>
<lib>true</lib>
<server>true</server>
<deploy>true</deploy>
<repository>true</repository>
</properties>
</dependency>
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-naming</artifactId>
<version>${pom.currentVersion}</version>
<properties>
<repository>true</repository>
</properties>
</dependency>
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-remoting</artifactId>
<version>${pom.currentVersion}</version>
<properties>
<repository>true</repository>
</properties>
</dependency>
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-security</artifactId>
<version>${pom.currentVersion}</version>
<properties>
<repository>true</repository>
</properties>
</dependency>
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-system</artifactId>
<version>${pom.currentVersion}</version>
<properties>
<lib>true</lib>
<server>true</server>
<deploy>true</deploy>
<repository>true</repository>
</properties>
</dependency>
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-transaction</artifactId>
<version>${pom.currentVersion}</version>
<properties>
<repository>true</repository>
</properties>
</dependency>
<dependency>
<groupId>geronimo-spec</groupId>
<artifactId>geronimo-spec-j2ee</artifactId>
<version>${pom.currentVersion}</version>
<properties>
<repository>true</repository>
</properties>
</dependency>
<dependency>
<groupId>geronimo-spec</groupId>
<artifactId>geronimo-spec-j2eeschema</artifactId>
<version>${pom.currentVersion}</version>
<properties>
<repository>true</repository>
</properties>
</dependency>
<dependency>
<groupId>cglib</groupId>
<artifactId>cglib-full</artifactId>
<version>2.0-RC2</version>
<url>http://cglib.sf.net/</url>
<properties>
<lib>true</lib>
<server>true</server>
<deploy>true</deploy>
</properties>
</dependency>
<dependency>
<groupId>commons-cli</groupId>
<artifactId>commons-cli</artifactId>
<version>1.0</version>
<url>http://jakarta.apache.org/commons/cli/</url>
<properties>
<lib>true</lib>
<server>true</server>
<deploy>true</deploy>
</properties>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>1.0.3</version>
<url>http://jakarta.apache.org/commons/logging/</url>
<properties>
<lib>true</lib>
<server>true</server>
<deploy>true</deploy>
</properties>
</dependency>
<dependency>
<groupId>concurrent</groupId>
<artifactId>concurrent</artifactId>
<version>1.3.2</version>
<properties>
<repository>true</repository>
</properties>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.8</version>
<url>http://jakarta.apache.org/log4j</url>
<properties>
<lib>true</lib>
<server>true</server>
<deploy>true</deploy>
</properties>
</dependency>
<dependency>
<groupId>mx4j</groupId>
<artifactId>mx4j</artifactId>
<version>SNAPSHOT</version>
<properties>
<lib>true</lib>
<server>true</server>
<deploy>true</deploy>
</properties>
</dependency>
<dependency>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
<version>2.6.0</version>
<properties>
<lib>true</lib>
<server>true</server>
</properties>
</dependency>
<dependency>
<groupId>xerces</groupId>
<artifactId>xmlParserAPIs</artifactId>
<version>2.2.1</version>
<properties>
<lib>true</lib>
<server>true</server>
</properties>
</dependency>
<dependency>
<groupId>xmlbeans</groupId>
<artifactId>xbean-apache</artifactId>
<version>1.0-DEV</version>
<properties>
<lib>true</lib>
<deploy>true</deploy>
</properties>
</dependency>
<dependency>
<groupId>tranql</groupId>
<artifactId>tranql</artifactId>
<version>SNAPSHOT</version>
<properties>
<repository>true</repository>
</properties>
</dependency>
<dependency>
<groupId>castor</groupId>
<artifactId>castor</artifactId>
<version>0.9.3.9</version>
<properties>
<repository>true</repository>
</properties>
</dependency>
<dependency>
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
<version>1.0</version>
<properties>
<repository>true</repository>
</properties>
</dependency>
<dependency>
<groupId>idb</groupId>
<artifactId>idb</artifactId>
<version>3.26</version>
<properties>
<repository>true</repository>
</properties>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>3.8</version>
<properties>
<repository>true</repository>
</properties>
</dependency>
</dependencies>
</project>
