geronimo-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Jason Dillon <ja...@planet57.com>
Subject Re: svn commit: r531993 - in /geronimo/server/trunk/maven-plugins/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/server: RunClientMojo.java StartServerMojo.java
Date Tue, 24 Apr 2007 19:49:28 GMT
Gah... why on earth are these blank lines changing?

I really hate seeing commits like this that are mostly noise from  
white space changes.

Donald are you using IDEA by chance?  IDEA seems to be a PITA in this  
area as it likes to rewrite blank lines willy nilly.

--jason



On Apr 24, 2007, at 9:06 AM, dwoods@apache.org wrote:

> Author: dwoods
> Date: Tue Apr 24 09:06:15 2007
> New Revision: 531993
>
> URL: http://svn.apache.org/viewvc?view=rev&rev=531993
> Log:
> GERONIMO-3113 geronimo-maven-plugin creates a java.endorsed.dirs  
> will a null path member on Linux
>
> Modified:
>     geronimo/server/trunk/maven-plugins/geronimo-maven-plugin/src/ 
> main/java/org/apache/geronimo/mavenplugins/geronimo/server/ 
> RunClientMojo.java
>     geronimo/server/trunk/maven-plugins/geronimo-maven-plugin/src/ 
> main/java/org/apache/geronimo/mavenplugins/geronimo/server/ 
> StartServerMojo.java
>
> Modified: geronimo/server/trunk/maven-plugins/geronimo-maven-plugin/ 
> src/main/java/org/apache/geronimo/mavenplugins/geronimo/server/ 
> RunClientMojo.java
> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/maven- 
> plugins/geronimo-maven-plugin/src/main/java/org/apache/geronimo/ 
> mavenplugins/geronimo/server/RunClientMojo.java? 
> view=diff&rev=531993&r1=531992&r2=531993
> ====================================================================== 
> ========
> --- geronimo/server/trunk/maven-plugins/geronimo-maven-plugin/src/ 
> main/java/org/apache/geronimo/mavenplugins/geronimo/server/ 
> RunClientMojo.java (original)
> +++ geronimo/server/trunk/maven-plugins/geronimo-maven-plugin/src/ 
> main/java/org/apache/geronimo/mavenplugins/geronimo/server/ 
> RunClientMojo.java Tue Apr 24 09:06:15 2007
> @@ -46,7 +46,7 @@
>       * @required
>       */
>      protected String moduleId = null;
> -
> +
>      /**
>       * Set the maximum memory for the forked JVM.
>       *
> @@ -60,7 +60,7 @@
>       * @parameter expression="${timeout}" default-value="-1"
>       */
>      private int timeout = -1;
> -
> +
>      /**
>       * The arguments
>       *
> @@ -70,11 +70,11 @@
>      protected String[] arg = null;
>
>      protected void doExecute() throws Exception {
> -        ServerProxy server =
> +        ServerProxy server =
>              new ServerProxy(hostname, port, username, password);
>
>          String geronimoHomeStr = server.getGeronimoHome();
> -
> +
>          log.info("Geronimo Home: " + geronimoHomeStr);
>
>          if (geronimoHomeStr == null) {
> @@ -82,19 +82,19 @@
>          }
>
>          File geronimoHome = new File(geronimoHomeStr);
> -
> +
>          if (!geronimoHome.exists()) {
>              throw new MojoExecutionException("Geronimo  
> installation directory does not exist: " + geronimoHomeStr);
>          }
>
>          log.info("Starting Geronimo client...");
> -
> +
>          Java java = (Java)createTask("java");
>          java.setJar(new File(geronimoHome, "bin/client.jar"));
>          java.setDir(geronimoHome);
>          java.setFailonerror(true);
>          java.setFork(true);
> -
> +
>          if (timeout > 0) {
>              java.setTimeout(new Long(timeout * 1000));
>          }
> @@ -108,22 +108,22 @@
>          setSystemProperty(java, "java.io.tmpdir", new File 
> (geronimoHome, "var/temp"));
>          setSystemProperty(java, "java.endorsed.dirs",  
> appendSystemPath("java.endorsed.dirs", new File(geronimoHome, "lib/ 
> endorsed")));
>          setSystemProperty(java, "java.ext.dirs", appendSystemPath 
> ("java.ext.dirs", new File(geronimoHome, "lib/ext")));
> -
> +
>          java.createArg().setValue(moduleId);
>
>          for (int i=0;arg != null && i<arg.length;i++) {
>              java.createArg().setValue(arg[i]);
>          }
> -
> +
>          if (logOutput) {
>              File file = getLogFile();
>              FileUtils.forceMkdir(file.getParentFile());
> -
> +
>              log.info("Redirecting output to: " + file);
> -
> +
>              java.setOutput(file);
>          }
> -
> +
>          java.execute();
>      }
>
> @@ -131,10 +131,14 @@
>          assert name != null;
>          assert file != null;
>
> -        return System.getProperty(name) + File.pathSeparator +  
> file.getPath();
> +        String dirs = System.getProperty(name, "");
> +        if (dirs.length() > 0)
> +            dirs += File.pathSeparator;
> +        dirs += file.getPath();
> +        return dirs;
>      }
>
>      protected String getFullClassName() {
>          return this.getClass().getName();
> -    }
> +    }
>  }
>
> Modified: geronimo/server/trunk/maven-plugins/geronimo-maven-plugin/ 
> src/main/java/org/apache/geronimo/mavenplugins/geronimo/server/ 
> StartServerMojo.java
> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/maven- 
> plugins/geronimo-maven-plugin/src/main/java/org/apache/geronimo/ 
> mavenplugins/geronimo/server/StartServerMojo.java? 
> view=diff&rev=531993&r1=531992&r2=531993
> ====================================================================== 
> ========
> --- geronimo/server/trunk/maven-plugins/geronimo-maven-plugin/src/ 
> main/java/org/apache/geronimo/mavenplugins/geronimo/server/ 
> StartServerMojo.java (original)
> +++ geronimo/server/trunk/maven-plugins/geronimo-maven-plugin/src/ 
> main/java/org/apache/geronimo/mavenplugins/geronimo/server/ 
> StartServerMojo.java Tue Apr 24 09:06:15 2007
> @@ -60,7 +60,7 @@
>       * @parameter expression="${install}" default-value="true"
>       */
>      private boolean install = true;
> -
> +
>      /**
>       * Flag to control if we background the server or block Maven  
> execution.
>       *
> @@ -147,21 +147,21 @@
>          }
>          else {
>              log.info("Skipping assembly installation");
> -
> +
>              if (!geronimoHome.exists()) {
>                  throw new MojoExecutionException("Missing pre- 
> installed assembly directory: " + geronimoHome);
>              }
>          }
> -
> +
>          log.info("Starting Geronimo server...");
> -
> +
>          // Setup the JVM to start the server with
>          final Java java = (Java)createTask("java");
>          java.setJar(new File(geronimoHome, "bin/server.jar"));
>          java.setDir(geronimoHome);
>          java.setFailonerror(true);
>          java.setFork(true);
> -
> +
>          if (timeout > 0) {
>              java.setTimeout(new Long(timeout * 1000));
>          }
> @@ -169,13 +169,13 @@
>          if (maximumMemory != null) {
>              java.setMaxmemory(maximumMemory);
>          }
> -
> +
>          // Load the Java programming language agent for JPA
>          File javaAgentJar = new File(geronimoHome, "bin/jpa.jar");
>          if (javaAgentJar.exists()) {
>              java.createJvmarg().setValue("-javaagent:" +  
> javaAgentJar.getCanonicalPath());
>          }
> -
> +
>          // Propagate some properties from Maven to the server if  
> enabled
>          if (propagateGeronimoProperties) {
>              Properties props = System.getProperties();
> @@ -183,7 +183,7 @@
>              while (iter.hasNext()) {
>                  String name = (String)iter.next();
>                  String value = System.getProperty(name);
> -
> +
>                  if (name.equals 
> ("geronimo.bootstrap.logging.enabled")) {
>                      // Skip this property, never propagate it
>                  }
> @@ -193,7 +193,7 @@
>                  }
>              }
>          }
> -
> +
>          // Apply option sets
>          if (options != null  && (optionSets == null ||  
> optionSets.length == 0)) {
>              throw new MojoExecutionException("At least one  
> optionSet must be defined to select one using options");
> @@ -201,7 +201,7 @@
>          else if (options == null) {
>              options = "default";
>          }
> -
> +
>          if (optionSets != null && optionSets.length != 0) {
>              OptionSet[] sets = selectOptionSets();
>
> @@ -238,7 +238,7 @@
>          setSystemProperty(java, "java.io.tmpdir", new File 
> (geronimoHome, "var/temp"));
>          setSystemProperty(java, "java.endorsed.dirs",  
> appendSystemPath("java.endorsed.dirs", new File(geronimoHome, "lib/ 
> endorsed")));
>          setSystemProperty(java, "java.ext.dirs", appendSystemPath 
> ("java.ext.dirs", new File(geronimoHome, "lib/ext")));
> -
> +
>          if (quiet) {
>              java.createArg().setValue("--quiet");
>          }
> @@ -277,16 +277,16 @@
>              FileUtils.forceMkdir(file.getParentFile());
>
>              log.info("Redirecting output to: " + file);
> -
> +
>              java.setOutput(file);
>          }
>
>          // Holds any exception that was thrown during startup
>          final ObjectHolder errorHolder = new ObjectHolder();
> -
> +
>          StopWatch watch = new StopWatch();
>          watch.start();
> -
> +
>          // Start the server int a seperate thread
>          Thread t = new Thread("Geronimo Server Runner") {
>              public void run() {
> @@ -347,7 +347,7 @@
>
>          // Stop the timer, server should be up now
>          timeoutTask.cancel();
> -
> +
>          log.info("Geronimo server started in " + watch);
>
>          if (!background) {
> @@ -361,7 +361,11 @@
>          assert name != null;
>          assert file != null;
>
> -        return System.getProperty(name) + File.pathSeparator +  
> file.getPath();
> +        String dirs = System.getProperty(name, "");
> +        if (dirs.length() > 0)
> +            dirs += File.pathSeparator;
> +        dirs += file.getPath();
> +        return dirs;
>      }
>
>      private OptionSet[] selectOptionSets() throws  
> MojoExecutionException {
> @@ -371,7 +375,7 @@
>              if (log.isDebugEnabled()) {
>                  log.debug("Checking option set: " + optionSets[i]);
>              }
> -
> +
>              String id = optionSets[i].getId();
>
>              if (id == null && optionSets.length > 1) {
> @@ -397,7 +401,7 @@
>          while (stok.hasMoreTokens()) {
>              String id = stok.nextToken();
>              OptionSet set = (OptionSet)map.get(id);
> -
> +
>              if (set == null) {
>                  if ("default".equals(id)) {
>                      log.debug("Default optionSet selected, but no  
> optionSet defined with that id; ignoring");
> @@ -416,5 +420,5 @@
>
>      protected String getFullClassName() {
>          return this.getClass().getName();
> -    }
> +    }
>  }
>
>


Mime
View raw message