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/src/plan default-database-plan.xml
Date Sun, 25 Jul 2004 08:29:05 GMT
djencks     2004/07/25 01:29:05

  Modified:    modules/assembly maven.xml project.xml
               modules/assembly/src/plan default-database-plan.xml
  Log:
  rename default db config and add a small sample of maven plugin usage
  
  Revision  Changes    Path
  1.19      +46 -6     incubator-geronimo/modules/assembly/maven.xml
  
  Index: maven.xml
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/assembly/maven.xml,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- maven.xml	18 Jul 2004 22:18:59 -0000	1.18
  +++ maven.xml	25 Jul 2004 08:29:05 -0000	1.19
  @@ -22,6 +22,7 @@
       xmlns:j="jelly:core"
       xmlns:ant="jelly:ant"
       xmlns:define="jelly:define"
  +    xmlns:deploy="geronimo:deploy"
       xmlns:bootstrap="geronimo:bootstrap">
   
       <!-- ================= -->
  @@ -113,10 +114,10 @@
               </ant:fileset>
           </ant:copy>
   
  -<!--        <ant:mkdirs dir="${distDir}/repository/jdk/jars"/>-->
  -<!--        <ant:copy file="${java.home}/../lib/tools.jar" todir="${distDir}/repository/jdk/jars">-->
  -<!---->
  -<!--        </ant:copy>-->
  +        <!--        <ant:mkdirs dir="${distDir}/repository/jdk/jars"/>-->
  +        <!--        <ant:copy file="${java.home}/../lib/tools.jar" todir="${distDir}/repository/jdk/jars">-->
  +        <!---->
  +        <!--        </ant:copy>-->
   
           <ant:copy todir="${distDir}/repository">
               <mapper type="glob" from="${maven.repo.local}*" to="*"/>
  @@ -235,10 +236,49 @@
               <ant:attribute name="Main-Class" value="org.apache.geronimo.console.cli.Deployer"/>
               <ant:attribute name="Class-Path" value="${clideployer.classpath}"/>
           </ant:manifest>
  -        <ant:jar basedir="${cliDeployer}/jar" 
  +        <ant:jar basedir="${cliDeployer}/jar"
               destfile="${distDir}/bin/cli-deployer.jar"
               manifest="${cliDeployer}/MANIFEST.MF"/>
   
  +    </goal>
  +
  +    <goal name="startdb">
  +
  +        <!--deploy:startServer
  +            geronimoHome="${distDir}"
  +            kernelName="geronimo.deployer"
  +            domainName="geronimo"
  +            configs="org/apache/geronimo/Server"
  +            /-->
  +        <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"/>
  +        <!--deploy:stopServer
  +            kernelName="geronimo.deployer"
  +            /-->
       </goal>
   
   </project>
  
  
  
  1.34      +1 -7      incubator-geronimo/modules/assembly/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/assembly/project.xml,v
  retrieving revision 1.33
  retrieving revision 1.34
  diff -u -r1.33 -r1.34
  --- project.xml	18 Jul 2004 22:18:59 -0000	1.33
  +++ project.xml	25 Jul 2004 08:29:05 -0000	1.34
  @@ -433,12 +433,6 @@
               </properties>
           </dependency>
   
  -        <!--dependency>
  -            <groupId>openejb</groupId>
  -            <artifactId>openejb-jca</artifactId>
  -            <version>2.0-SNAPSHOT</version>
  -        </dependency-->
  -
           <dependency>
               <groupId>openejb</groupId>
               <artifactId>openejb-itests</artifactId>
  
  
  
  1.3       +1 -1      incubator-geronimo/modules/assembly/src/plan/default-database-plan.xml
  
  Index: default-database-plan.xml
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/assembly/src/plan/default-database-plan.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- default-database-plan.xml	23 Jul 2004 06:12:22 -0000	1.2
  +++ default-database-plan.xml	25 Jul 2004 08:29:05 -0000	1.3
  @@ -2,7 +2,7 @@
   
   <connector xmlns="http://geronimo.apache.org/xml/ns/j2ee"
       version="1.5"
  -    configId="org/tranql/connector/axion"
  +    configId="org/apache/geronimo/DefaultDatabase"
       parentId="org/apache/geronimo/Server">
       <resourceadapter>
           <outbound-resourceadapter>
  
  
  

Mime
View raw message