svn commit: r679393 - in /maven/release/trunk: maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/InvokerMavenExecutor.java maven-release-plugin/src/it/forked-basic/pom.xml maven-release-plugin/src/it/invoker-basic/pom.xml

[bentmann]

Author: bentmann
Date: Thu Jul 24 05:36:27 2008
New Revision: 679393

URL: http://svn.apache.org/viewvc?rev=679393&view=rev
Log:
o Fixed parsing of system properties (compare MavenCli.setCliProperty())

Modified:
    maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/InvokerMavenExecutor.java
    maven/release/trunk/maven-release-plugin/src/it/forked-basic/pom.xml
    maven/release/trunk/maven-release-plugin/src/it/invoker-basic/pom.xml

Modified: maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/InvokerMavenExecutor.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/InvokerMavenExecutor.java?rev=679393&r1=679392&r2=679393&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/InvokerMavenExecutor.java (original)
+++ maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/InvokerMavenExecutor.java Thu Jul 24 05:36:27 2008
@@ -155,6 +155,7 @@
                                         .create( FAIL_NEVER ) );
     }
 
+    // TODO: Configuring an invocation request from a command line could as well be part of the Invoker API
     private void setupRequest( InvocationRequest req,
                                LoggerBridge bridge,
                                String additionalArguments )
@@ -171,8 +172,20 @@
                 Properties props = new Properties();
                 for ( int i = 0; i < properties.length; i++ )
                 {
-                    String[] parts = properties[i].split( "=" );
-                    props.setProperty( parts[0], parts[1] );
+                    String property = properties[i];
+                    String name, value;
+                    int sep = property.indexOf( "=" );
+                    if ( sep <= 0 )
+                    {
+                        name = property.trim();
+                        value = "true";
+                    }
+                    else
+                    {
+                        name = property.substring( 0, sep ).trim();
+                        value = property.substring( sep + 1 ).trim();
+                    }
+                    props.setProperty( name, value );
                 }
 
                 req.setProperties( props );

Modified: maven/release/trunk/maven-release-plugin/src/it/forked-basic/pom.xml
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-plugin/src/it/forked-basic/pom.xml?rev=679393&r1=679392&r2=679393&view=diff
==============================================================================
--- maven/release/trunk/maven-release-plugin/src/it/forked-basic/pom.xml (original)
+++ maven/release/trunk/maven-release-plugin/src/it/forked-basic/pom.xml Thu Jul 24 05:36:27 2008
@@ -38,7 +38,7 @@
       <plugin>
         <artifactId>maven-release-plugin</artifactId>
         <configuration>
-          <arguments>-s "@basedir@/src/it/settings.xml.interpolated" -D "maven.repo.local=@...@/local-repo"</arguments>
+          <arguments>-Dflag -Dfoo=bar -s "@basedir@/src/it/settings.xml.interpolated" -D "maven.repo.local=@...@/local-repo"</arguments>
           <mavenExecutorId>forked-path</mavenExecutorId>
         </configuration>
         <dependencies>

Modified: maven/release/trunk/maven-release-plugin/src/it/invoker-basic/pom.xml
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-plugin/src/it/invoker-basic/pom.xml?rev=679393&r1=679392&r2=679393&view=diff
==============================================================================
--- maven/release/trunk/maven-release-plugin/src/it/invoker-basic/pom.xml (original)
+++ maven/release/trunk/maven-release-plugin/src/it/invoker-basic/pom.xml Thu Jul 24 05:36:27 2008
@@ -38,7 +38,7 @@
       <plugin>
         <artifactId>maven-release-plugin</artifactId>
         <configuration>
-          <arguments>-s "@basedir@/src/it/settings.xml.interpolated"</arguments>
+          <arguments>-Dflag -Dfoo=bar -s "@basedir@/src/it/settings.xml.interpolated"</arguments>
           <mavenExecutorId>invoker</mavenExecutorId>
         </configuration>
         <dependencies>