You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ol...@apache.org on 2012/12/01 21:28:07 UTC
[3/6] git commit: take of empty sys props and comment the reason of
the other main method
take of empty sys props and comment the reason of the other main method
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/59404a2d
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/59404a2d
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/59404a2d
Branch: refs/heads/dynamic-logging-impl
Commit: 59404a2d2a8e9cf5d851954c720157b0f0bf273b
Parents: 347026e
Author: olivier lamy <ol...@apache.org>
Authored: Sat Dec 1 17:24:16 2012 +0100
Committer: olivier lamy <ol...@apache.org>
Committed: Sat Dec 1 17:24:16 2012 +0100
----------------------------------------------------------------------
.../org/apache/maven/cli/startup/MavenStartup.java | 18 ++++++++++++--
1 files changed, 15 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/59404a2d/maven-embedder/src/main/java/org/apache/maven/cli/startup/MavenStartup.java
----------------------------------------------------------------------
diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/startup/MavenStartup.java b/maven-embedder/src/main/java/org/apache/maven/cli/startup/MavenStartup.java
index f449bd1..1760f28 100644
--- a/maven-embedder/src/main/java/org/apache/maven/cli/startup/MavenStartup.java
+++ b/maven-embedder/src/main/java/org/apache/maven/cli/startup/MavenStartup.java
@@ -19,6 +19,7 @@ package org.apache.maven.cli.startup;
* under the License.
*/
+import org.apache.maven.cli.MavenCli;
import org.codehaus.plexus.classworlds.ClassWorld;
import org.codehaus.plexus.classworlds.realm.ClassRealm;
import org.codehaus.plexus.classworlds.realm.NoSuchRealmException;
@@ -30,10 +31,14 @@ import java.net.URL;
*/
public class MavenStartup
{
+ /**
+ * just here to prevent "warning" from classworld which try to get this method
+ * @param args
+ * @return
+ */
public static int main( String[] args )
{
- //int result = doMain( args, null );
-
+ System.out.println("this main method cannot be used");
return 1;
}
@@ -41,6 +46,12 @@ public class MavenStartup
{
String loggerImplRealmId = System.getProperty( "maven.logger.impl", "log4j2" );
+ // take care of empty sys props !
+ if (loggerImplRealmId == null || loggerImplRealmId.length()<1)
+ {
+ loggerImplRealmId = "log4j2";
+ }
+
try
{
ClassRealm classRealm = classWorld.getRealm( loggerImplRealmId );
@@ -48,7 +59,8 @@ public class MavenStartup
{
classWorld.getRealm( "plexus.core" ).addURL( url );
}
- return org.apache.maven.cli.MavenCli.doMain( args, classWorld );
+ //return org.apache.maven.cli.MavenCli.doMain( args, classWorld );
+ return MavenCli.doMain( args, classWorld );
}
catch ( NoSuchRealmException e )
{