geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdil...@apache.org
Subject cvs commit: incubator-geronimo/modules/core/src/java/org/apache/geronimo Main.java
Date Thu, 14 Aug 2003 17:23:38 GMT
jdillon     2003/08/14 10:23:38

  Modified:    .        maven.xml
               modules/core maven.xml
               modules/core/src/java/org/apache/geronimo Main.java
  Log:
   o Run target will now work with the modular build system, top-level project
     needs to descend to the core module via the reactor for depends to get
     picked up
   o Changed hardcoded (ick) config URLs in Main to be relative to the core
     module and not the project
  
  Revision  Changes    Path
  1.12      +7 -16     incubator-geronimo/maven.xml
  
  Index: maven.xml
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/maven.xml,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- maven.xml	14 Aug 2003 17:08:00 -0000	1.11
  +++ maven.xml	14 Aug 2003 17:23:38 -0000	1.12
  @@ -138,21 +138,12 @@
     
     <!-- jason: need to fix this -->
     
  -  <goal name="run" prereqs="set.classpath"
  -        description="Runs the Geronimo Server using the current build">
  -    <ant:java classname="org.apache.geronimo.Main" fork="yes">
  -      <ant:classpath refid="test.classpath"/>
  -    </ant:java>
  -  </goal>
  -  
  -  <goal name="set.classpath" prereqs="java:compile, test:compile"
  -        description="Sets up the classpath for running things">
  -    <ant:path id="test.classpath">
  -      <ant:pathelement path="target/test-classes"/>
  -      <ant:pathelement path="modules/core/src/conf/"/>
  -      <ant:pathelement path="${maven.build.dest}"/>
  -      <ant:path refid="maven.dependency.classpath"/>
  -    </ant:path>
  +  <goal name="run" description="Runs the Geronimo Server using the current build">
  +    
  +    <j:set var="module" value="core"/>
  +    <j:set var="goals" value="run"/>
  +    <attainGoal name="modules:reactor"/>
  +    
     </goal>
     
   </project>
  
  
  
  1.5       +22 -1     incubator-geronimo/modules/core/maven.xml
  
  Index: maven.xml
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/core/maven.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- maven.xml	14 Aug 2003 17:08:00 -0000	1.4
  +++ maven.xml	14 Aug 2003 17:23:38 -0000	1.5
  @@ -26,4 +26,25 @@
       -->
     </preGoal>
     
  +  <!-- ============================== -->
  +  <!-- Helpers to run Apache Geronimo -->
  +  <!-- ============================== -->
  +  
  +  <!-- jason: need to fix this -->
  +  
  +  <goal name="run" description="Runs the Geronimo Server using the current build">
  +  
  +    <ant:path id="test.classpath">
  +      <ant:pathelement path="target/test-classes"/>
  +      <ant:pathelement path="src/conf/"/>
  +      <ant:pathelement path="${maven.build.dest}"/>
  +      <ant:path refid="maven.dependency.classpath"/>
  +    </ant:path>
  +    
  +    <ant:java classname="org.apache.geronimo.Main" fork="yes">
  +      <ant:classpath refid="test.classpath"/>
  +    </ant:java>
  +    
  +  </goal>
  +  
   </project>
  
  
  
  1.6       +3 -3      incubator-geronimo/modules/core/src/java/org/apache/geronimo/Main.java
  
  Index: Main.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/Main.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- Main.java	14 Aug 2003 08:41:10 -0000	1.5
  +++ Main.java	14 Aug 2003 17:23:38 -0000	1.6
  @@ -221,8 +221,8 @@
       public static void main(String[] args) {
           try {
               // @todo get these from somewhere a little more flexible
  -            URL mletURL = new URL("file:modules/core/src/conf/boot.mlet");
  -            URL deployURL = new URL("file:modules/core/src/conf/boot-service.xml");
  +            URL mletURL = new URL("file:src/conf/boot.mlet");
  +            URL deployURL = new URL("file:src/conf/boot-service.xml");
               Main main = new Main("geronimo", mletURL, deployURL);
   
               ThreadGroup group = new ThreadGroup("Geronimo");
  
  
  

Mime
View raw message