geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject cvs commit: incubator-geronimo/modules/assembly maven.xml project.xml
Date Thu, 19 Aug 2004 00:22:23 GMT
djencks     2004/08/18 17:22:23

  Modified:    modules/maven-plugin plugin.jelly
               modules/assembly maven.xml project.xml
  Log:
  Modify assembly to build and install a jar distribution of the built geronimo server.  Add
an unpack goal to the maven plugin to deploy it in your project.  See wiki for details
  
  Revision  Changes    Path
  1.5       +16 -0     incubator-geronimo/modules/maven-plugin/plugin.jelly
  
  Index: plugin.jelly
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/maven-plugin/plugin.jelly,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- plugin.jelly	1 Aug 2004 02:09:06 -0000	1.4
  +++ plugin.jelly	19 Aug 2004 00:22:23 -0000	1.5
  @@ -49,6 +49,22 @@
               className="org.apache.geronimo.deployment.mavenplugin.StopRemoteServer"
               method="execute"/>
   
  +        <define:tag name="unpackServer" xmlns="jelly:ant">
  +            <j:if test="${geronimoVersion == null}">
  +                <fail>Missing required attribute: geronimoVersion</fail>
  +            </j:if>
  +            <j:if test="${targetDir == null}">
  +                <j:set var="targetDir" value="target/geronimo"/>
  +                <!--fail>Missing required attribute: targetDir</fail-->
  +            </j:if>
  +            <j:if test="${geronimoName == null}">
  +                <j:set var="geronimoName" value="geronimo"/>
  +                <!--fail>Missing required attribute: targetDir</fail-->
  +            </j:if>
  +
  +            <unjar src="${maven.repo.local}/${geronimoName}/jars/${geronimoName}-assembly-${geronimoVersion}.jar"
dest="${targetDir}"/>
  +        </define:tag>
  +
       </define:taglib>
   
   </project>
  
  
  
  1.24      +45 -43    incubator-geronimo/modules/assembly/maven.xml
  
  Index: maven.xml
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/assembly/maven.xml,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- maven.xml	29 Jul 2004 02:58:36 -0000	1.23
  +++ maven.xml	19 Aug 2004 00:22:23 -0000	1.24
  @@ -32,10 +32,8 @@
       <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/${pom.groupId}-${pom.currentVersion}"/>
  -    <!-- <j:set var="distDir" value="${project.root}/target"/> -->
  -    <!-- Load the global properties -->
  -    <ant:property file="${project.root}/etc/global.properties"/>
  +    <j:set var="distDir" value="${basedir}/target/${pom.groupId}-${pom.currentVersion}"/>
  +
   
       <!-- ==================== -->
       <!-- Default Global Goals -->
  @@ -46,7 +44,7 @@
       </goal>
   
       <goal name="build">
  -        <attainGoal name="assemble"/>
  +        <attainGoal name="jar:install"/>
       </goal>
   
       <goal name="rebuild">
  @@ -54,20 +52,20 @@
           <attainGoal name="build"/>
       </goal>
   
  -    <postGoal name="clean:clean">
  -        <ant:delete dir="${distDir}"/>
  -    </postGoal>
  +    <preGoal name="jar:jar">
  +        <attainGoal name="assemble"/>
  +        <j:set var="maven.build.dest" value="${basedir}/target/${pom.groupId}-${pom.currentVersion}"/>
  +    </preGoal>
   
       <!-- ==================================================== -->
       <!-- 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'}">
  @@ -130,9 +128,9 @@
               </ant:fileset>
           </ant:copy>
   
  -        <ant:echo message="${project.root}" />
  +        <ant:echo message="${project.root}"/>
           <ant:copy todir="${distDir}">
  -          <fileset dir="${project.root}" includes="*.txt,STATUS" />
  +            <fileset dir="${project.root}" includes="*.txt,STATUS"/>
           </ant:copy>
   
           <!-- bootstrap the deployer -->
  @@ -184,6 +182,7 @@
               <ant:arg value="src/plan/j2ee-server-plan.xml"/>
           </ant:java>
   
  +        <!-- building tranql connector default database configuration-->
           <ant:echo>Building default database configuration</ant:echo>
           <ant:java fork="true" jar="${distDir}/bin/deployer.jar" failonerror="true">
               <ant:jvmarg value="-ea"/>
  @@ -213,7 +212,7 @@
               <ant:arg value="${maven.repo.local}/geronimo/wars/geronimo-demo-${pom.currentVersion}.war"/>
           </ant:java>
   
  -        <!-- build the Debug Tool configuration -->
  +        <!-- build the Debug Tool configuration "org/apache/geronimo/DebugConsole"-->
           <ant:echo>Building debug tool configuration</ant:echo>
           <ant:java fork="true" jar="${distDir}/bin/deployer.jar" failonerror="true">
               <ant:jvmarg value="-ea"/>
  @@ -221,6 +220,9 @@
               <ant:arg value="--module"/>
               <ant:arg value="${maven.repo.local}/geronimo/wars/geronimo-jmxdebug-${pom.currentVersion}.war"/>
           </ant:java>
  +    </goal>
  +
  +    <goal name="cli">
   
           <!-- build the cli deployer archive -->
           <ant:echo>Building the Command Line Deployer archive</ant:echo>
  @@ -245,35 +247,35 @@
               manifest="${cliDeployer}/MANIFEST.MF"/>
   
       </goal>
  -<!--
  -    <goal name="startdb">
  +    <!--
  +        <goal name="startdb">
   
  -        <deploy:distribute
  -            uri="deployer:geronimo:jmx:rmi://localhost/jndi/rmi:/JMXConnector"
  -            username="system"
  -            password="manager"
  -            home="${basedir}"
  -            module="${maven.repo.local}/tranql/rars/tranql-connector-SNAPSHOT.rar"
  -            plan="src/plan/default-database-plan.xml"
  -            />
  -        <deploy:start
  -            uri="deployer:geronimo:jmx:rmi://localhost/jndi/rmi:/JMXConnector"
  -            username="system"
  -            password="manager"
  -            id="org/apache/geronimo/DefaultDatabase"/>
  -    </goal>
  -    <goal name="stopdb">
  -        <deploy:stop
  -            uri="deployer:geronimo:jmx:rmi://localhost/jndi/rmi:/JMXConnector"
  -            username="system"
  -            password="manager"
  -            id="org/apache/geronimo/DefaultDatabase"/>
  -        <ant:echo>undeploy</ant:echo>
  -        <deploy:undeploy
  -            uri="deployer:geronimo:jmx:rmi://localhost/jndi/rmi:/JMXConnector"
  -            username="system"
  -            password="manager"
  -            id="org/apache/geronimo/DefaultDatabase"/>
  -    </goal-->
  +            <deploy:distribute
  +                uri="deployer:geronimo:jmx:rmi://localhost/jndi/rmi:/JMXConnector"
  +                username="system"
  +                password="manager"
  +                home="${basedir}"
  +                module="${maven.repo.local}/tranql/rars/tranql-connector-SNAPSHOT.rar"
  +                plan="src/plan/default-database-plan.xml"
  +                />
  +            <deploy:start
  +                uri="deployer:geronimo:jmx:rmi://localhost/jndi/rmi:/JMXConnector"
  +                username="system"
  +                password="manager"
  +                id="org/apache/geronimo/DefaultDatabase"/>
  +        </goal>
  +        <goal name="stopdb">
  +            <deploy:stop
  +                uri="deployer:geronimo:jmx:rmi://localhost/jndi/rmi:/JMXConnector"
  +                username="system"
  +                password="manager"
  +                id="org/apache/geronimo/DefaultDatabase"/>
  +            <ant:echo>undeploy</ant:echo>
  +            <deploy:undeploy
  +                uri="deployer:geronimo:jmx:rmi://localhost/jndi/rmi:/JMXConnector"
  +                username="system"
  +                password="manager"
  +                id="org/apache/geronimo/DefaultDatabase"/>
  +        </goal-->
   
   </project>
  
  
  
  1.37      +2 -1      incubator-geronimo/modules/assembly/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/assembly/project.xml,v
  retrieving revision 1.36
  retrieving revision 1.37
  diff -u -r1.36 -r1.37
  --- project.xml	2 Aug 2004 23:51:02 -0000	1.36
  +++ project.xml	19 Aug 2004 00:22:23 -0000	1.37
  @@ -522,4 +522,5 @@
           </dependency>
   
       </dependencies>
  +
   </project>
  
  
  

Mime
View raw message