cvs commit: incubator-geronimo/modules/jetty/src/etc/META-INF geronimo-service.xml

[dims]

dims        2004/01/29 14:42:47

  Modified:    assembly maven.xml
               modules/console-web maven.xml
               modules/jetty/src/etc/META-INF geronimo-service.xml
  Added:       modules/console-web/src/etc/META-INF geronimo-service.xml
  Log:
  package console-web separately as per djencks.
  
  Revision  Changes    Path
  1.3       +2 -2      incubator-geronimo/assembly/maven.xml
  
  Index: maven.xml
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/assembly/maven.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- maven.xml 29 Jan 2004 14:00:12 -0000      1.2
  +++ maven.xml 29 Jan 2004 22:42:46 -0000      1.3
  @@ -49,7 +49,7 @@
           <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"/>
  +            
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,${g.repo}/geronimo-web-console-package-DEV.jar"/>
           <ant:echo message="did deploy:server"/>
       </goal>
   
  
  
  
  1.2       +29 -1     incubator-geronimo/modules/console-web/maven.xml
  
  Index: maven.xml
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/console-web/maven.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- maven.xml 18 Sep 2003 04:45:26 -0000      1.1
  +++ maven.xml 29 Jan 2004 22:42:47 -0000      1.2
  @@ -10,4 +10,32 @@
       <goal name="default">
           <attainGoal name="war"/>
       </goal>
  +
  +    <!-- generate packages ready to be deployed, if appropriate -->
  +    <postGoal name="war">
  +        <ant:available property="geronimoServicePresent" 
file="${basedir}/src/etc/META-INF/geronimo-service.xml"/>
  +        <j:if test="${geronimoServicePresent == 'true'}">
  +            <ant:jar 
destfile="${basedir}/target/${pom.artifactId}-package-${pom.currentVersion}.jar">
  +                <fileset dir="${basedir}/target" 
includes="${pom.artifactId}-${pom.currentVersion}.jar"/>
  +                <fileset dir="${basedir}/target" 
includes="geronimo-web-console.war"/>
  +
  +                <fileset dir="${basedir}/src/etc" 
includes="META-INF/geronimo-service.xml"/>
  +                <j:forEach var="artifact" items="${pom.artifacts}">
  +                    <j:set var="dependency" value="${artifact.dependency}"/>
  +                    <j:if test="${dependency.getProperty('package') == 
'true'}">
  +                        <ant:echo>Processing dependency: 
${dependency.id}</ant:echo>
  +                        <fileset file="${artifact.path}"/>
  +                    </j:if>
  +                </j:forEach>
  +            </ant:jar>
  +            <ant:property name="jardir__" 
value="${maven.repo.local}/${pom.artifactDirectory}/jars"/>
  +            <ant:mkdir dir="${jardir__}"/>
  +            <ant:copy
  +                
file="${basedir}/target/${pom.artifactId}-package-${pom.currentVersion}.jar"
  +                todir="${jardir__}"
  +                overwrite="true"
  +                />
  +        </j:if>
  +    </postGoal>
  +
   </project>
  
  
  
  1.1                  
incubator-geronimo/modules/console-web/src/etc/META-INF/geronimo-service.xml
  
  Index: geronimo-service.xml
  ===================================================================
  <?xml version="1.0" encoding="UTF-8"?>
  <gbeans>
      <path>geronimo-web-console.war</path>
  
      <gbean class="org.apache.geronimo.jetty.JettyWebApplicationContext" 
objectName="geronimo.app:name=WebConsole">
          <default attribute="URI" 
type="java.net.URI">file:../modules/console-web/target/geronimo-web-console.war</default>
          <default attribute="ContextPath" 
type="java.lang.String">/geronimo-web-console</default>
          <endpoint name="JettyContainer">
              <pattern>geronimo.web:type=WebContainer,container=Jetty</pattern>
          </endpoint>
      </gbean>
  </gbeans>
  
  
  1.5       +0 -7      
incubator-geronimo/modules/jetty/src/etc/META-INF/geronimo-service.xml
  
  Index: geronimo-service.xml
  ===================================================================
  RCS file: 
/home/cvs/incubator-geronimo/modules/jetty/src/etc/META-INF/geronimo-service.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- geronimo-service.xml      29 Jan 2004 14:00:12 -0000      1.4
  +++ geronimo-service.xml      29 Jan 2004 22:42:47 -0000      1.5
  @@ -18,11 +18,4 @@
   <!--        <default attribute="MaxConnections" type="int">10</default>-->
   <!--        <default attribute="MaxIdleTime" type="int">10</default>-->
       </gbean>
  -    <gbean class="org.apache.geronimo.jetty.JettyWebApplicationContext" 
objectName="geronimo.app:name=WebConsole">
  -        <default attribute="URI" 
type="java.net.URI">file:../modules/console-web/target/geronimo-web-console.war</default>
  -        <default attribute="ContextPath" 
type="java.lang.String">/geronimo-web-console</default>
  -        <endpoint name="JettyContainer">
  -            <pattern>geronimo.web:type=WebContainer,container=Jetty</pattern>
  -        </endpoint>
  -    </gbean>
   </gbeans>