geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject cvs commit: incubator-geronimo/modules/assembly/src/plan debug-tool.xml server-config.xml system-config.xml
Date Tue, 17 Feb 2004 07:21:02 GMT
dain        2004/02/16 23:21:02

  Added:       modules/assembly .cvsignore maven.xml project.xml
               modules/assembly/src/etc resolver-catalog.xml
               modules/assembly/src/plan debug-tool.xml server-config.xml
                        system-config.xml
  Log:
  moved from /assembly
  
  Revision  Changes    Path
  1.1                  incubator-geronimo/modules/assembly/.cvsignore
  
  Index: .cvsignore
  ===================================================================
  .project
  .classpath
  maven.log
  junit*.properties
  target
  
  
  
  1.1                  incubator-geronimo/modules/assembly/maven.xml
  
  Index: maven.xml
  ===================================================================
  <?xml version="1.0" encoding="ISO-8859-1"?>
  <!-- $Revision: 1.1 $ $Date: 2004/02/17 07:21:02 $ -->
  
  <project default="default"
      xmlns:j="jelly:core"
      xmlns:ant="jelly:ant">
  
      <!-- ================= -->
      <!-- 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"/>
  
      <!-- 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">
          <!-- 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:if test="${dependency.artifactId == 'geronimo-system'}">
                  <j:set var="system.artifact" value="${artifact.path}"/>
              </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}/specs/schema">
                  <ant:include name="src/j2ee_1_4schema/*.xsd"/>
                  <ant:include name="src/j2ee_1_3dtd/*.dtd"/>
              </ant:fileset>
              <ant:fileset dir="${project.root}/modules/deployment">
                  <ant:include name="src/schema/*.xsd"/>
              </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="geronimo/**"/>
                  <ant:include name="geronimo-spec/**"/>
  
                  <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>
  
          <!-- Create the server.jar file used to run the server-->
          <ant:touch file="${distDir}/.empty.temp.file"/>
          <ant:mkdir dir="${distDir}/bin"/>
          <ant:jar destfile="${distDir}/bin/server.jar">
              <zipfileset file="${distDir}/.empty.temp.file" fullpath="META-INF/startup-jar"/>
              <manifest>
                  <attribute name="Main-Class" value="org.apache.geronimo.Geronimo"/>
                  <attribute name="Class-Path" value="${server.classpath}"/>
              </manifest>
          </ant:jar>
  
          <!-- Create the deploy.jar file used to deploy things -->
          <ant:jar destfile="${distDir}/bin/deploy.jar">
              <zipfileset file="${distDir}/.empty.temp.file" fullpath="META-INF/startup-jar"/>
              <manifest>
                  <attribute name="Main-Class" value="org.apache.geronimo.deployment.Deployer"/>
                  <attribute name="Class-Path" value="${deploy.classpath}"/>
              </manifest>
          </ant:jar>
          <ant:delete file="${distDir}/.empty.temp.file"/>
  
          <!-- bootstrap the service deployer -->
          <ant:echo>Bootstrapping service deployer</ant:echo>
          <ant:mkdir dir="${distDir}/config"/>
          <ant:mkdir dir="${distDir}/config-store"/>
          <j:invokeStatic className="org.apache.geronimo.deployment.Bootstrap" method="bootstrap">
              <j:arg type="java.lang.String" value="${distDir}/config/service-deployer.car"/>
              <j:arg type="java.lang.String" value="${distDir}/config-store"/>
              <j:arg type="java.lang.String" value="${system.artifact}"/>
          </j:invokeStatic>
  
          <!-- build the system configuration -->
          <ant:echo>Building system configuration</ant:echo>
          <ant:java fork="true" jar="${distDir}/bin/deploy.jar">
              <ant:sysproperty key="geronimo.base.dir" value="${distDir}"/>
              <ant:arg value="--install"/>
              <ant:arg value="--plan"/>
              <ant:arg value="src/plan/system-config.xml"/>
              <ant:arg value="--outfile"/>
              <ant:arg value="${distDir}/config/system.car"/>
              <ant:arg value="--store"/>
              <ant:arg value="${distDir}/config-store"/>
              <ant:arg value="--deployer"/>
              <ant:arg value="org/apache/geronimo/ServiceDeployer"/>
          </ant:java>
  
          <!-- build the J2EEServer configuration -->
          <ant:echo>Building server configuration</ant:echo>
          <ant:java fork="true" jar="${distDir}/bin/deploy.jar">
              <ant:sysproperty key="geronimo.base.dir" value="${distDir}"/>
              <ant:arg value="--install"/>
              <ant:arg value="--plan"/>
              <ant:arg value="src/plan/server-config.xml"/>
              <ant:arg value="--outfile"/>
              <ant:arg value="${distDir}/config/J2EEServer.car"/>
              <ant:arg value="--store"/>
              <ant:arg value="${distDir}/config-store"/>
              <ant:arg value="--deployer"/>
              <ant:arg value="org/apache/geronimo/ServiceDeployer"/>
          </ant:java>
  
          <!-- build the Debug Tool configuration -->
  <!--
  uncomment to build the debug tool config - but remember to remove the absolute path first
  THIS IS A TEMPORARY HACK AND WILL BE REPLACED BY THE WAR DEPLOYER
  
          <ant:echo>Building debug tool configuration</ant:echo>
          <ant:java fork="true" jar="${distDir}/bin/deploy.jar">
              <ant:sysproperty key="geronimo.base.dir" value="${distDir}"/>
  
         REMOVE THIS LINE AND THE SPACE BETWEEN THE DASHES BELOW
              <ant:arg value="- -install"/>
              <ant:arg value="- -plan"/>
              <ant:arg value="src/plan/debug-tool.xml"/>
              <ant:arg value="- -outfile"/>
              <ant:arg value="${distDir}/config/debug-tool.car"/>
              <ant:arg value="- -store"/>
              <ant:arg value="${distDir}/config-store"/>
              <ant:arg value="- -deployer"/>
              <ant:arg value="org/apache/geronimo/ServiceDeployer"/>
          </ant:java>
  -->
      </goal>
  
  </project>
  
  
  
  1.1                  incubator-geronimo/modules/assembly/project.xml
  
  Index: project.xml
  ===================================================================
  <?xml version="1.0" encoding="ISO-8859-1"?>
  
  <!-- $Revision: 1.1 $ $Date: 2004/02/17 07:21:02 $ -->
  
  <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>
  
      <currentVersion>DEV</currentVersion>
  
      <!-- ============ -->
      <!-- 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 -->
          <!--         geronimojars are always copied to repository)      -->
          <!-- ========================================================== -->
          <dependency>
              <groupId>geronimo</groupId>
              <artifactId>geronimo-clustering</artifactId>
              <version>DEV</version>
          </dependency>
  
          <dependency>
              <groupId>geronimo</groupId>
              <artifactId>geronimo-common</artifactId>
              <version>DEV</version>
              <properties>
                  <lib>true</lib>
                  <deploy>true</deploy>
                  <module>true</module>
              </properties>
          </dependency>
  
          <dependency>
              <groupId>geronimo</groupId>
              <artifactId>geronimo-connector</artifactId>
              <version>DEV</version>
          </dependency>
  
          <dependency>
              <groupId>geronimo</groupId>
              <artifactId>geronimo-core</artifactId>
              <version>DEV</version>
          </dependency>
  
          <dependency>
              <groupId>geronimo</groupId>
              <artifactId>geronimo-deployment</artifactId>
              <version>DEV</version>
              <properties>
                  <lib>true</lib>
                  <deploy>true</deploy>
                  <module>true</module>
              </properties>
          </dependency>
  
          <dependency>
              <groupId>geronimo</groupId>
              <artifactId>geronimo-jetty</artifactId>
              <version>DEV</version>
          </dependency>
  
          <dependency>
              <groupId>geronimo</groupId>
              <artifactId>geronimo-kernel</artifactId>
              <version>DEV</version>
              <properties>
                  <lib>true</lib>
                  <server>true</server>
                  <deploy>true</deploy>
                  <module>true</module>
              </properties>
          </dependency>
  
          <dependency>
              <groupId>geronimo</groupId>
              <artifactId>geronimo-naming</artifactId>
              <version>DEV</version>
          </dependency>
  
          <dependency>
              <groupId>geronimo</groupId>
              <artifactId>geronimo-remoting</artifactId>
              <version>DEV</version>
          </dependency>
  
          <dependency>
              <groupId>geronimo</groupId>
              <artifactId>geronimo-security</artifactId>
              <version>DEV</version>
          </dependency>
  
          <dependency>
              <groupId>geronimo</groupId>
              <artifactId>geronimo-system</artifactId>
              <version>DEV</version>
          </dependency>
  
          <dependency>
              <groupId>geronimo</groupId>
              <artifactId>geronimo-transaction</artifactId>
              <version>DEV</version>
          </dependency>
  
          <dependency>
              <groupId>geronimo-spec</groupId>
              <artifactId>geronimo-spec-j2ee</artifactId>
              <version>DEV</version>
          </dependency>
  
          <dependency>
              <groupId>ant</groupId>
              <artifactId>ant</artifactId>
              <version>1.5</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>
                  <deploy>true</deploy>
              </properties>
          </dependency>
  
          <dependency>
              <groupId>commons-el</groupId>
              <artifactId>commons-el</artifactId>
              <version>1.0</version>
              <url>http://jakarta.apache.org/commons/el/</url>
              <properties>
                  <repository>true</repository>
              </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>jetty</groupId>
              <artifactId>org.mortbay.jetty</artifactId>
              <version>5.0.beta0</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>
                  <repository>true</repository>
              </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>tomcat</groupId>
              <artifactId>jasper-compiler</artifactId>
              <version>5.0.16</version>
              <properties>
                  <repository>true</repository>
              </properties>
          </dependency>
  
          <dependency>
              <groupId>tomcat</groupId>
              <artifactId>jasper-runtime</artifactId>
              <version>5.0.16</version>
              <properties>
                  <repository>true</repository>
              </properties>
          </dependency>
  
          <dependency>
              <groupId>xmlbeans</groupId>
              <artifactId>xbean-apache</artifactId>
              <version>1.0-DEV</version>
              <properties>
                  <lib>true</lib>
                  <deploy>true</deploy>
              </properties>
          </dependency>
      </dependencies>
  </project>
  
  
  
  1.1                  incubator-geronimo/modules/assembly/src/etc/resolver-catalog.xml
  
  Index: resolver-catalog.xml
  ===================================================================
  <catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
  
      <public publicId="http://java.sun.com/xml/ns/j2ee"
          uri="j2ee_1_4.xsd"/>
  
      <public publicId="http://www.w3.org/XML/1998/namespace"
          uri="xml.xsd"/>
  
      <system systemId="http://www.ibm.com/webservices/xsd/j2ee_web_services_client_1_1.xsd"
          uri="j2ee_web_services_client_1_1.xsd"/>
  
  </catalog>
  
  
  1.1                  incubator-geronimo/modules/assembly/src/plan/debug-tool.xml
  
  Index: debug-tool.xml
  ===================================================================
  <?xml version="1.0" encoding="UTF-8"?>
  
  <!--
  THIS FILE IS A SERIOUS HACK UNTIL THE WAR DEPLOYER IS AVAILABLE
  IT IS AN EXAMPLE OF HOW TO DO IT THE HARD WAY AND SHOULD NOT BE
  TAKEN AS REPRESENTATIVE OF HOW THIS SHOULD WORK
  -->
  <configuration
      xmlns="http://geronimo.apache.org/xml/ns/deployment"
      configId="org/apache/geronimo/DebugConsole"
      parentId="org/apache/geronimo/Server"
      >
  
      <gbean name="geronimo.server:type=WebApp,container=Jetty,app=test" class="org.apache.geronimo.jetty.JettyWebApplicationContext">
          <attribute name="URI" type="java.net.URI">file:/D:/apache/incubator-geronimo/modules/console-web/target/geronimo-web-console/</attribute>
          <attribute name="ContextPath" type="java.lang.String">/debug-tool</attribute>
          <reference name="JettyContainer">geronimo.server:type=WebContainer,container=Jetty</reference>
      </gbean>
  </configuration>
  
  
  1.1                  incubator-geronimo/modules/assembly/src/plan/server-config.xml
  
  Index: server-config.xml
  ===================================================================
  <?xml version="1.0" encoding="UTF-8"?>
  
  <!--
  Configuration for the main ring of a Geronimo server.
  
  This configuration should contain those services normally provided
  by the server.
  -->
  <configuration
      xmlns="http://geronimo.apache.org/xml/ns/deployment"
      configId="org/apache/geronimo/Server"
      parentId="org/apache/geronimo/System"
      >
  
      <dependency>
          <uri>geronimo-spec/jars/geronimo-spec-j2ee-DEV.jar</uri>
      </dependency>
      <dependency>
          <uri>geronimo/jars/geronimo-jetty-DEV.jar</uri>
      </dependency>
      <dependency>
          <uri>geronimo/jars/geronimo-connector-DEV.jar</uri>
      </dependency>
      <dependency>
          <uri>geronimo/jars/geronimo-transaction-DEV.jar</uri>
      </dependency>
      <dependency>
          <uri>geronimo/jars/geronimo-naming-DEV.jar</uri>
      </dependency>
  
      <!-- default WAR container using Jetty -->
      <gbean name="geronimo.server:type=WebContainer,container=Jetty" class="org.apache.geronimo.jetty.JettyContainerImpl">
      </gbean>
  
      <gbean name="geronimo.server:type=WebConnector,container=Jetty,port=8080" class="org.apache.geronimo.jetty.connector.HTTPConnector">
          <attribute name="Port" type="int">8080</attribute>
          <reference name="JettyContainer">geronimo.server:type=WebContainer,container=Jetty</reference>
  <!--        <attribute name="MaxConnections" type="int">10</attribute>-->
  <!--        <attribute name="MaxIdleTime" type="int">10</attribute>-->
      </gbean>
  </configuration>
  
  
  1.1                  incubator-geronimo/modules/assembly/src/plan/system-config.xml
  
  Index: system-config.xml
  ===================================================================
  <?xml version="1.0" encoding="UTF-8"?>
  
  <!--
  Configuration for the innermost ring of a Geronimo server.
  This configuration should only contain critical services needed to
  run other Configurations - for example, the ServerInfo, Logging
  and Repository services used to load them.
  
  This configuration should *NOT* be used to provide server or application
  specific services - those should be provided by children.
  -->
  <configuration
      xmlns="http://geronimo.apache.org/xml/ns/deployment"
      configId="org/apache/geronimo/System"
      >
  
      <include>
          <uri>geronimo/jars/geronimo-system-DEV.jar</uri>
      </include>
      <include>
          <uri>log4j/jars/log4j-1.2.8.jar</uri>
      </include>
  
      <!-- ServerInfo service -->
      <gbean name="geronimo.system:role=ServerInfo" class="org.apache.geronimo.system.serverinfo.ServerInfo">
      </gbean>
  
      <!-- Logging service -->
      <gbean name="geronimo.system:role=Logger" class="org.apache.geronimo.system.logging.log4j.Log4jService">
          <attribute name="RefreshPeriod" type="int">60</attribute>
          <attribute name="ConfigurationURL" type="java.net.URL">log4j.xml</attribute>
          <reference name="ServerInfo">geronimo.system:role=ServerInfo</reference>
      </gbean>
  
      <gbean name="geronimo.system:role=LogAppender,type=ConsoleAppender" class="org.apache.geronimo.system.logging.log4j.appender.ConsoleAppenderService">
          <attribute name="Threshold" type="java.lang.String">INFO</attribute>
          <attribute name="LayoutPattern" type="java.lang.String">%d{ABSOLUTE} %-5p
[%c{1}] %m%n</attribute>
          <attribute name="Target" type="java.lang.String">System.out</attribute>
      </gbean>
  
      <gbean name="geronimo.system:role=LogAppender,type=DailyRollingFileAppender" class="org.apache.geronimo.system.logging.log4j.appender.RollingFileAppenderService">
          <attribute name="Threshold" type="java.lang.String">DEBUG</attribute>
          <attribute name="LayoutPattern" type="java.lang.String">%d{ABSOLUTE} %-5p
[%c{1}] %m%n</attribute>
          <attribute name="Append" type="boolean">true</attribute>
          <attribute name="File" type="java.lang.String">log/geronimo.log</attribute>
          <attribute name="BufferedIO" type="boolean">false</attribute>
          <attribute name="BufferedSize" type="int">8192</attribute>
          <attribute name="MaxBackupIndex" type="int">1</attribute>
          <attribute name="MaxFileSize" type="java.lang.String">10MB</attribute>
          <reference name="ServerInfo">geronimo.system:role=ServerInfo</reference>
      </gbean>
  
      <!-- Repository -->
      <gbean name="geronimo.system:role=Repository" class="org.apache.geronimo.system.repository.ReadOnlyRepository">
          <attribute name="Root" type="java.net.URI">repository/</attribute>
          <reference name="ServerInfo">geronimo.system:role=ServerInfo</reference>
      </gbean>
  </configuration>
  
  

Mime
View raw message