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/deployment/scanner DeploymentScanner.java
Date Sun, 24 Aug 2003 22:40:24 GMT
jdillon     2003/08/24 15:40:24

  Modified:    modules/core/src/conf boot-service.xml
               modules/core/src/java/org/apache/geronimo/command
                        StartCommand.java
               modules/core/src/java/org/apache/geronimo/deployment/plan
                        CreateMBeanInstance.java
                        InitializeMBeanInstance.java
               modules/core/src/java/org/apache/geronimo/deployment/scanner
                        DeploymentScanner.java
  Log:
   o Setting geronimo.home to the value of twiddle.home
   o Moved SVP hack from DS to deployment plans as a temp solution for prop
     expansion/expr eval.
  
  Revision  Changes    Path
  1.8       +1 -1      incubator-geronimo/modules/core/src/conf/boot-service.xml
  
  Index: boot-service.xml
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/core/src/conf/boot-service.xml,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- boot-service.xml	24 Aug 2003 21:58:07 -0000	1.7
  +++ boot-service.xml	24 Aug 2003 22:40:24 -0000	1.8
  @@ -10,7 +10,7 @@
       <mbean code="org.apache.geronimo.deployment.scanner.DeploymentScanner" name="geronimo.deployment:role=DeploymentScanner">
           <constructor>
               <arg type="java.lang.String">
  -                ${twiddle.home}/deploy/
  +                ${geronimo.home}/deploy/
               </arg>
               <arg type="boolean">true</arg>
           </constructor>
  
  
  
  1.3       +2 -1      incubator-geronimo/modules/core/src/java/org/apache/geronimo/command/StartCommand.java
  
  Index: StartCommand.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/command/StartCommand.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- StartCommand.java	24 Aug 2003 19:49:09 -0000	1.2
  +++ StartCommand.java	24 Aug 2003 22:40:24 -0000	1.3
  @@ -148,6 +148,7 @@
               log.debug("Deploy URL: " + deployURL);
           }
           
  +        System.setProperty("geronimo.home", System.getProperty("twiddle.home"));
           Main main = new Main("geronimo", mletURL, deployURL);
           
           ThreadGroup group = new ThreadGroup("Geronimo");
  
  
  
  1.10      +7 -1      incubator-geronimo/modules/core/src/java/org/apache/geronimo/deployment/plan/CreateMBeanInstance.java
  
  Index: CreateMBeanInstance.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/deployment/plan/CreateMBeanInstance.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- CreateMBeanInstance.java	21 Aug 2003 04:32:41 -0000	1.9
  +++ CreateMBeanInstance.java	24 Aug 2003 22:40:24 -0000	1.10
  @@ -78,6 +78,9 @@
   
   import org.apache.commons.logging.Log;
   import org.apache.commons.logging.LogFactory;
  +
  +import org.apache.geronimo.common.StringValueParser;
  +
   import org.apache.geronimo.core.util.ClassUtil;
   import org.apache.geronimo.deployment.DeploymentException;
   import org.apache.geronimo.deployment.dependency.DependencyServiceMBean;
  @@ -256,6 +259,9 @@
       private static final Class[] stringArg = new Class[]{String.class};
   
       private Object getValue(ClassLoader cl, String typeName, String value) throws DeploymentException
{
  +        StringValueParser parser = new StringValueParser();
  +        value = parser.parse(value);
  +        
           if("java.net.URI".equals(typeName)) {
               return baseURI.resolve(value);
           }
  
  
  
  1.3       +7 -1      incubator-geronimo/modules/core/src/java/org/apache/geronimo/deployment/plan/InitializeMBeanInstance.java
  
  Index: InitializeMBeanInstance.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/deployment/plan/InitializeMBeanInstance.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- InitializeMBeanInstance.java	16 Aug 2003 23:16:24 -0000	1.2
  +++ InitializeMBeanInstance.java	24 Aug 2003 22:40:24 -0000	1.3
  @@ -71,6 +71,9 @@
   
   import org.apache.commons.logging.Log;
   import org.apache.commons.logging.LogFactory;
  +
  +import org.apache.geronimo.common.StringValueParser;
  +
   import org.apache.geronimo.core.util.ClassUtil;
   import org.apache.geronimo.deployment.DeploymentException;
   import org.apache.geronimo.deployment.service.MBeanMetadata;
  @@ -164,6 +167,9 @@
       private static final Class[] stringArg = new Class[]{String.class};
   
       private Object getValue(ClassLoader cl, String typeName, String value) throws DeploymentException
{
  +        StringValueParser parser = new StringValueParser();
  +        value = parser.parse(value);
  +        
           Class attrType = null;
           try {
               attrType = ClassUtil.getClassForName(cl, typeName);
  
  
  
  1.12      +1 -9      incubator-geronimo/modules/core/src/java/org/apache/geronimo/deployment/scanner/DeploymentScanner.java
  
  Index: DeploymentScanner.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/deployment/scanner/DeploymentScanner.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- DeploymentScanner.java	24 Aug 2003 21:58:07 -0000	1.11
  +++ DeploymentScanner.java	24 Aug 2003 22:40:24 -0000	1.12
  @@ -73,7 +73,6 @@
   import org.apache.commons.logging.Log;
   import org.apache.commons.logging.LogFactory;
   
  -import org.apache.geronimo.common.StringValueParser;
   import org.apache.geronimo.common.Strings;
   
   import org.apache.geronimo.jmx.JMXUtil;
  @@ -100,13 +99,6 @@
       public DeploymentScanner(String initialURLs, boolean recurse) 
           throws MalformedURLException
       {
  -        //
  -        // TODO: jason: move this to deployment config code, but I can not 
  -        //              find where that is right now
  -        //
  -        StringValueParser parser = new StringValueParser();
  -        initialURLs = parser.parse(initialURLs);
  -        
           StringTokenizer tokenizer = new StringTokenizer(initialURLs, " \t\r\n,[]{}");
           while (tokenizer.hasMoreTokens()) {
               addURL(tokenizer.nextToken(), recurse);
  
  
  

Mime
View raw message