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 maven.xml
Date Thu, 29 Jan 2004 05:17:25 GMT
djencks     2004/01/28 21:17:25

  Modified:    .        maven.xml
  Added:       assembly .cvsignore maven.xml project.xml
  Log:
  Move assembly/run operations into a separate directory.  Makes build w/o maven repo possible
  
  Revision  Changes    Path
  1.1                  incubator-geronimo/assembly/.cvsignore
  
  Index: .cvsignore
  ===================================================================
  .project
  .classpath
  maven.log
  junit*.properties
  target
  
  
  
  1.1                  incubator-geronimo/assembly/maven.xml
  
  Index: maven.xml
  ===================================================================
  <?xml version="1.0" encoding="ISO-8859-1"?>
  <!-- $Revision: 1.1 $ $Date: 2004/01/29 05:17:25 $ -->
  
  <project default="default"
      xmlns:j="jelly:core"
      xmlns:u="jelly:util"
      xmlns:ant="jelly:ant"
      xmlns:maven="jelly:maven"
      xmlns:define="jelly:define"
      xmlns:deploy="geronimo:deploy">
  
      <!-- ================= -->
      <!-- Global Properties -->
      <!-- ================= -->
  
      <!-- Determine what the top-level project root is -->
      <j:set var="project.root" value="${pom.parentBasedir().getParentFile().getCanonicalFile()}"/>
  
      <!-- Load the global properties -->
      <ant:property file="${project.root}/etc/global.properties"/>
  
  
      <!-- ==================== -->
      <!-- Default Global Goals -->
      <!-- ==================== -->
  
      <goal name="default">
          <attainGoal name="deploy:server"/>
          <attainGoal name="install:server"/>
      </goal>
  
      <goal name="build">
          <attainGoal name="default"/>
      </goal>
  
      <goal name="rebuild">
          <attainGoal name="clean"/>
          <attainGoal name="build"/>
      </goal>
  
      <!-- ==================================================== -->
      <!-- Helper to run Apache Geronimo from the current build -->
      <!-- ==================================================== -->
  
      <goal name="deploy:server">
          <j:set var="g.repo" value="${maven.repo.local}/geronimo/jars"/>
          <ant:mkdir dir="${basedir}/target"/>
          <ant:echo message="in deploy:server"/>
          <deploy:deploy
              deployconfigid="org/apache/geronimo/Server"
              deployoutfile="target/Server.car"
              deployurl="${g.repo}/geronimo-security-package-DEV.jar,${g.repo}/geronimo-transaction-package-DEV.jar,${g.repo}/geronimo-connector-package-DEV.jar,${g.repo}/geronimo-jetty-package-DEV.jar"/>
          <ant:echo message="did deploy:server"/>
      </goal>
  
      <goal name="install:server">
          <ant:echo message="in install:server"/>
          <deploy:install
              installDomain="geronimo"
              installStoreDir="target/localConfigStore"
              installConfig="target/Server.car"/>
          <ant:echo message="did install:server"/>
      </goal>
  
      <goal name="load:server">
          <ant:echo message="in load:server"/>
          <deploy:loadAndReturn
              runDomain="geronimo"
              runStoreDir="target/localConfigStore"
              runConfigID="org/apache/geronimo/Server"/>
          <ant:echo message="did load:server"/>
      </goal>
  
      <goal name="loadAndWait:server">
          <ant:echo message="in loadAndWait:server"/>
          <deploy:loadAndWait
              runDomain="geronimo"
              runStoreDir="target/localConfigStore"
              runConfigID="org/apache/geronimo/Server"/>
          <ant:echo message="did loadAndWait:server"/>
      </goal>
  
      <goal name="run:server">
          <j:set var="run.dir" value="${basedir}"/>
  
          <j:jelly xmlns="jelly:ant">
  
              <property environment="env"/>
              <java classname="org.apache.geronimo.Geronimo"
                  fork="true"
                  maxmemory="256m"
                  failonerror="true"
                  dir="${run.dir}">
  
                  <jvmarg value="-ea"/>
  
                  <classpath>
                      <pathelement path="${env.JAVA_HOME}/lib/tools.jar"/>
                      <!--pathelement path="${run.dir}/etc"/-->
                      <fileset dir="${maven.repo.local}/cglib/jars">
                          <include name="cglib-full-2.0-RC2.jar"/>
                      </fileset>
                      <fileset dir="${maven.repo.local}/commons-logging/jars">
                          <include name="commons-logging-1.0.3.jar"/>
                      </fileset>
                      <fileset dir="${maven.repo.local}/log4j/jars">
                          <include name="log4j-1.2.8.jar"/>
                      </fileset>
                      <fileset dir="${maven.repo.local}/mx4j/jars">
                          <include name="mx4j-SNAPSHOT.jar"/>
                      </fileset>
                      <fileset dir="${maven.repo.local}/xerces/jars">
                          <include name="xercesImpl-2.6.0.jar"/>
                      </fileset>
                      <fileset dir="${maven.repo.local}/xml-apis/jars">
                          <include name="xml-apis-1.0.b2.jar"/>
                      </fileset>
                      <fileset dir="${maven.repo.local}/xml-commons-resolver/jars">
                          <include name="xml-commons-resolver-1.1.jar"/>
                      </fileset>
                      <fileset dir="${maven.repo.local}/geronimo/jars">
                          <include name="geronimo-kernel-${pom.currentVersion}.jar"/>
                          <include name="geronimo-deployment-${pom.currentVersion}.jar"/>
                          <include name="geronimo-common-${pom.currentVersion}.jar"/>
                      </fileset>
                  </classpath>
  
                  <!--sysproperty key="program.name" value="maven:run"/>
                  <sysproperty key="java.rmi.server.RMIClassLoaderSpi" value="org.apache.geronimo.rmi.RMIClassLoaderSpiImpl"/-->
  
                  <arg value="target/localConfigStore"/>
                  <arg value="org/apache/geronimo/Server"/>
              </java>
          </j:jelly>
      </goal>
  
      <goal name="debug:server">
          <j:set var="run.dir" value="${basedir}"/>
          <j:jelly xmlns="jelly:ant">
  
              <property environment="env"/>
              <java classname="org.apache.geronimo.Geronimo"
                  fork="true"
                  maxmemory="256m"
                  failonerror="true"
                  dir="${run.dir}">
  
                  <jvmarg value="-ea"/>
  
                  <classpath>
                      <pathelement path="${env.JAVA_HOME}/lib/tools.jar"/>
                      <!--pathelement path="${run.dir}/etc"/-->
                      <fileset dir="${maven.repo.local}/cglib/jars">
                          <include name="cglib-full-2.0-RC2.jar"/>
                      </fileset>
                      <fileset dir="${maven.repo.local}/commons-logging/jars">
                          <include name="commons-logging-1.0.3.jar"/>
                      </fileset>
                      <fileset dir="${maven.repo.local}/log4j/jars">
                          <include name="log4j-1.2.8.jar"/>
                      </fileset>
                      <fileset dir="${maven.repo.local}/mx4j/jars">
                          <include name="mx4j-SNAPSHOT.jar"/>
                      </fileset>
                      <fileset dir="${maven.repo.local}/xerces/jars">
                          <include name="xercesImpl-2.6.0.jar"/>
                      </fileset>
                      <fileset dir="${maven.repo.local}/xml-apis/jars">
                          <include name="xml-apis-1.0.b2.jar"/>
                      </fileset>
                      <fileset dir="${maven.repo.local}/xml-commons-resolver/jars">
                          <include name="xml-commons-resolver-1.1.jar"/>
                      </fileset>
                      <fileset dir="${maven.repo.local}/geronimo/jars">
                          <include name="geronimo-kernel-${pom.currentVersion}.jar"/>
                          <include name="geronimo-deployment-${pom.currentVersion}.jar"/>
                          <include name="geronimo-common-${pom.currentVersion}.jar"/>
                      </fileset>
                  </classpath>
  
                  <jvmarg value="-Xdebug"/>
                  <jvmarg value="-Xnoagent"/>
                  <jvmarg value="-Xrunjdwp:transport=dt_socket,address=80000,server=y,suspend=y"/>
  
                  <sysproperty key="java.compiler" value="NONE"/>
                  <!--sysproperty key="program.name" value="maven:run"/>
                  <sysproperty key="java.rmi.server.RMIClassLoaderSpi" value="org.apache.geronimo.rmi.RMIClassLoaderSpiImpl"/-->
  
                  <arg value="target/localConfigStore"/>
                  <arg value="org/apache/geronimo/Server"/>
              </java>
          </j:jelly>
      </goal>
  
      <goal name="deployinstallrun">
          <attainGoal name="deploy:server"/>
          <attainGoal name="install:server"/>
          <attainGoal name="run:server"/>
      </goal>
  
      <goal name="run:main">
          <ant:echo></ant:echo>
          <ant:echo>Please use "maven run:server or maven deployinstallrun" instead</ant:echo>
          <ant:echo></ant:echo>
      </goal>
  
  
  </project>
  
  
  
  1.1                  incubator-geronimo/assembly/project.xml
  
  Index: project.xml
  ===================================================================
  <?xml version="1.0" encoding="ISO-8859-1"?>
  
  <!-- $Revision: 1.1 $ $Date: 2004/01/29 05:17:25 $ -->
  
  <project>
      <pomVersion>3</pomVersion>
      <extend>${basedir}/../etc/project.xml</extend>
  
      <!-- ===================== -->
      <!-- Module Identification -->
      <!-- ===================== -->
  
      <name>Geronimo :: Assembly</name>
      <id>geronimo-assembly</id>
      <shortDescription>Geronimo Assembly</shortDescription>
      <description>Geronimo Assembly</description>
      <url>http://incubator.apache.org/projects/geronimo/</url>
      <siteDirectory>/www/incubator.apache.org/projects/geronimo</siteDirectory>
      <distributionDirectory>/www/incubator.apache.org/projects/geronimo/builds</distributionDirectory>
  
      <!--package>org.apache.geronimo.connector</package-->
      <currentVersion>DEV</currentVersion>
  
      <!-- ============ -->
      <!-- Dependencies -->
      <!-- ============ -->
  
      <dependencies>
  
          <dependency>
              <groupId>geronimo</groupId>
              <artifactId>geronimo-common</artifactId>
              <version>DEV</version>
              <properties>
                  <module>true</module>
              </properties>
          </dependency>
  
          <dependency>
              <groupId>geronimo</groupId>
              <artifactId>geronimo-core</artifactId>
              <version>DEV</version>
              <properties>
                  <module>true</module>
              </properties>
          </dependency>
  
          <dependency>
              <groupId>geronimo</groupId>
              <artifactId>geronimo-deployment</artifactId>
              <version>DEV</version>
              <properties>
                  <module>true</module>
              </properties>
          </dependency>
  
          <dependency>
              <groupId>geronimo</groupId>
              <artifactId>geronimo-kernel</artifactId>
              <version>DEV</version>
              <properties>
                  <module>true</module>
              </properties>
          </dependency>
  
          <dependency>
              <groupId>geronimo</groupId>
              <artifactId>geronimo-security</artifactId>
              <version>DEV</version>
              <properties>
                  <module>true</module>
              </properties>
          </dependency>
  
          <dependency>
              <groupId>geronimo</groupId>
              <artifactId>geronimo-transaction</artifactId>
              <version>DEV</version>
              <properties>
                  <module>true</module>
              </properties>
          </dependency>
  
          <dependency>
              <groupId>geronimo-spec</groupId>
              <artifactId>geronimo-spec-j2ee-jacc</artifactId>
              <version>DEV</version>
              <properties>
                  <module>true</module>
              </properties>
          </dependency>
  
          <dependency>
              <groupId>geronimo-spec</groupId>
              <artifactId>geronimo-spec-j2ee-connector</artifactId>
              <version>DEV</version>
              <properties>
                  <module>true</module>
              </properties>
          </dependency>
  
          <dependency>
              <groupId>geronimo-spec</groupId>
              <artifactId>geronimo-spec-j2ee-deployment</artifactId>
              <version>DEV</version>
              <properties>
                  <module>true</module>
              </properties>
          </dependency>
  
          <dependency>
              <groupId>geronimo-spec</groupId>
              <artifactId>geronimo-spec-jta</artifactId>
              <version>DEV</version>
              <properties>
                  <module>true</module>
              </properties>
          </dependency>
  
          <dependency>
              <id>commons-logging</id>
              <version>1.0.3</version>
              <url>http://jakarta.apache.org/commons/logging/</url>
              <properties>
                  <runtime>false</runtime>
              </properties>
          </dependency>
  
          <dependency>
              <id>concurrent</id>
              <version>1.3.2</version>
              <properties>
                  <runtime>true</runtime>
              </properties>
          </dependency>
  
          <dependency>
              <id>mx4j</id>
              <version>SNAPSHOT</version>
              <properties>
                  <runtime>false</runtime>
              </properties>
          </dependency>
  
          <dependency>
              <id>regexp</id>
              <version>1.3-dev</version>
              <url>http://jakarta.apache.org/regexp</url>
              <properties>
                  <runtime>true</runtime>
              </properties>
          </dependency>
  
      </dependencies>
  </project>
  
  
  
  1.64      +1 -168    incubator-geronimo/maven.xml
  
  Index: maven.xml
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/maven.xml,v
  retrieving revision 1.63
  retrieving revision 1.64
  diff -u -r1.63 -r1.64
  --- maven.xml	29 Jan 2004 02:43:41 -0000	1.63
  +++ maven.xml	29 Jan 2004 05:17:25 -0000	1.64
  @@ -8,7 +8,6 @@
       xmlns:ant="jelly:ant"
       xmlns:maven="jelly:maven"
       xmlns:define="jelly:define"
  -    xmlns:deploy="geronimo:deploy"
       xmlns:aggregate="local:aggregate"
       xmlns:modules="local:modules">
   
  @@ -453,172 +452,6 @@
           </j:jelly>
       </goal>
   
  -
  -    <!-- ==================================================== -->
  -    <!-- Helper to run Apache Geronimo from the current build -->
  -    <!-- ==================================================== -->
  -
  -    <goal name="deploy:server">
  -        <j:set var="g.repo" value="${maven.repo.local}/geronimo/jars"/>
  -        <ant:mkdir dir="${basedir}/target"/>
  -        <ant:echo message="in deploy:server"/>
  -        <deploy:deploy
  -            deployconfigid="org/apache/geronimo/Server"
  -            deployoutfile="target/Server.car"
  -            deployurl="${g.repo}/geronimo-security-package-DEV.jar,${g.repo}/geronimo-transaction-package-DEV.jar,${g.repo}/geronimo-connector-package-DEV.jar,${g.repo}/geronimo-jetty-package-DEV.jar"/>
  -        <ant:echo message="did deploy:server"/>
  -    </goal>
  -
  -    <goal name="install:server">
  -        <ant:echo message="in install:server"/>
  -        <deploy:install
  -            installDomain="geronimo"
  -            installStoreDir="target/localConfigStore"
  -            installConfig="target/Server.car"/>
  -        <ant:echo message="did install:server"/>
  -    </goal>
  -
  -    <goal name="load:server">
  -        <ant:echo message="in load:server"/>
  -        <deploy:loadAndReturn
  -            runDomain="geronimo"
  -            runStoreDir="target/localConfigStore"
  -            runConfigID="org/apache/geronimo/Server"/>
  -        <ant:echo message="did load:server"/>
  -    </goal>
  -
  -    <goal name="loadAndWait:server">
  -        <ant:echo message="in loadAndWait:server"/>
  -        <deploy:loadAndWait
  -            runDomain="geronimo"
  -            runStoreDir="target/localConfigStore"
  -            runConfigID="org/apache/geronimo/Server"/>
  -        <ant:echo message="did loadAndWait:server"/>
  -    </goal>
  -
  -    <goal name="run:server">
  -        <j:set var="run.dir" value="${basedir}"/>
  -
  -        <j:jelly xmlns="jelly:ant">
  -
  -            <property environment="env"/>
  -            <java classname="org.apache.geronimo.Geronimo"
  -                fork="true"
  -                maxmemory="256m"
  -                failonerror="true"
  -                dir="${run.dir}">
  -
  -                <jvmarg value="-ea"/>
  -
  -                <classpath>
  -                    <pathelement path="${env.JAVA_HOME}/lib/tools.jar"/>
  -                    <!--pathelement path="${run.dir}/etc"/-->
  -                    <fileset dir="${maven.repo.local}/cglib/jars">
  -                        <include name="cglib-full-2.0-RC2.jar"/>
  -                    </fileset>
  -                    <fileset dir="${maven.repo.local}/commons-logging/jars">
  -                        <include name="commons-logging-1.0.3.jar"/>
  -                    </fileset>
  -                    <fileset dir="${maven.repo.local}/log4j/jars">
  -                        <include name="log4j-1.2.8.jar"/>
  -                    </fileset>
  -                    <fileset dir="${maven.repo.local}/mx4j/jars">
  -                        <include name="mx4j-SNAPSHOT.jar"/>
  -                    </fileset>
  -                    <fileset dir="${maven.repo.local}/xerces/jars">
  -                        <include name="xercesImpl-2.6.0.jar"/>
  -                    </fileset>
  -                    <fileset dir="${maven.repo.local}/xml-apis/jars">
  -                        <include name="xml-apis-1.0.b2.jar"/>
  -                    </fileset>
  -                    <fileset dir="${maven.repo.local}/xml-commons-resolver/jars">
  -                        <include name="xml-commons-resolver-1.1.jar"/>
  -                    </fileset>
  -                    <fileset dir="${maven.repo.local}/geronimo/jars">
  -                        <include name="geronimo-kernel-${pom.currentVersion}.jar"/>
  -                        <include name="geronimo-deployment-${pom.currentVersion}.jar"/>
  -                        <include name="geronimo-common-${pom.currentVersion}.jar"/>
  -                    </fileset>
  -                </classpath>
  -
  -                <!--sysproperty key="program.name" value="maven:run"/>
  -                <sysproperty key="java.rmi.server.RMIClassLoaderSpi" value="org.apache.geronimo.rmi.RMIClassLoaderSpiImpl"/-->
  -
  -                <arg value="target/localConfigStore"/>
  -                <arg value="org/apache/geronimo/Server"/>
  -            </java>
  -        </j:jelly>
  -    </goal>
  -
  -    <goal name="debug:server">
  -        <j:set var="run.dir" value="${basedir}"/>
  -        <j:jelly xmlns="jelly:ant">
  -
  -            <property environment="env"/>
  -            <java classname="org.apache.geronimo.Geronimo"
  -                fork="true"
  -                maxmemory="256m"
  -                failonerror="true"
  -                dir="${run.dir}">
  -
  -                <jvmarg value="-ea"/>
  -
  -                <classpath>
  -                    <pathelement path="${env.JAVA_HOME}/lib/tools.jar"/>
  -                    <!--pathelement path="${run.dir}/etc"/-->
  -                    <fileset dir="${maven.repo.local}/cglib/jars">
  -                        <include name="cglib-full-2.0-RC2.jar"/>
  -                    </fileset>
  -                    <fileset dir="${maven.repo.local}/commons-logging/jars">
  -                        <include name="commons-logging-1.0.3.jar"/>
  -                    </fileset>
  -                    <fileset dir="${maven.repo.local}/log4j/jars">
  -                        <include name="log4j-1.2.8.jar"/>
  -                    </fileset>
  -                    <fileset dir="${maven.repo.local}/mx4j/jars">
  -                        <include name="mx4j-SNAPSHOT.jar"/>
  -                    </fileset>
  -                    <fileset dir="${maven.repo.local}/xerces/jars">
  -                        <include name="xercesImpl-2.6.0.jar"/>
  -                    </fileset>
  -                    <fileset dir="${maven.repo.local}/xml-apis/jars">
  -                        <include name="xml-apis-1.0.b2.jar"/>
  -                    </fileset>
  -                    <fileset dir="${maven.repo.local}/xml-commons-resolver/jars">
  -                        <include name="xml-commons-resolver-1.1.jar"/>
  -                    </fileset>
  -                    <fileset dir="${maven.repo.local}/geronimo/jars">
  -                        <include name="geronimo-kernel-${pom.currentVersion}.jar"/>
  -                        <include name="geronimo-deployment-${pom.currentVersion}.jar"/>
  -                        <include name="geronimo-common-${pom.currentVersion}.jar"/>
  -                    </fileset>
  -                </classpath>
  -
  -                <jvmarg value="-Xdebug"/>
  -                <jvmarg value="-Xnoagent"/>
  -                <jvmarg value="-Xrunjdwp:transport=dt_socket,address=80000,server=y,suspend=y"/>
  -
  -                <sysproperty key="java.compiler" value="NONE"/>
  -                <!--sysproperty key="program.name" value="maven:run"/>
  -                <sysproperty key="java.rmi.server.RMIClassLoaderSpi" value="org.apache.geronimo.rmi.RMIClassLoaderSpiImpl"/-->
  -
  -                <arg value="target/localConfigStore"/>
  -                <arg value="org/apache/geronimo/Server"/>
  -            </java>
  -        </j:jelly>
  -    </goal>
  -
  -    <goal name="deployinstallrun">
  -        <attainGoal name="deploy:server"/>
  -        <attainGoal name="install:server"/>
  -        <attainGoal name="run:server"/>
  -    </goal>
  -
  -    <goal name="run:main">
  -        <ant:echo></ant:echo>
  -        <ant:echo>Please use "maven run:server or maven deployinstallrun" instead</ant:echo>
  -        <ant:echo></ant:echo>
  -    </goal>
   
   
   </project>
  
  
  

Mime
View raw message