Author: jdcasey Date: Wed Nov 7 22:44:26 2007 New Revision: 593040 URL: http://svn.apache.org/viewvc?rev=593040&view=rev Log: Moving offline notice to avoid embedded cases.
Modified: maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestPopulator.java Modified: maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java?rev=593040&r1=593039&r2=593040&view=diff ============================================================================== --- maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java (original) +++ maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java Wed Nov 7 22:44:26 2007 @@ -168,6 +168,11 @@ mavenEmbedder = new MavenEmbedder( configuration ); logger = mavenEmbedder.getLogger(); + + if ( mavenEmbedder.isOffline( request ) ) + { + logger.info( "You are working in offline mode." ); + } } catch ( MavenEmbedderException e ) { Modified: maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java?rev=593040&r1=593039&r2=593040&view=diff ============================================================================== --- maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java (original) +++ maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java Wed Nov 7 22:44:26 2007 @@ -778,6 +778,15 @@ // Start of new embedder API // ---------------------------------------------------------------------- + public boolean isOffline( MavenExecutionRequest request ) + throws MavenEmbedderException + { + // first, grab defaults including settings, in case <offline>true</offline> is set. + request = populator.populateDefaults( request, configuration ); + + return request.isOffline(); + } + public MavenExecutionResult execute( MavenExecutionRequest request ) { LoggerManager loggerManager = container.getLoggerManager(); Modified: maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestPopulator.java URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestPopulator.java?rev=593040&r1=593039&r2=593040&view=diff ============================================================================== --- maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestPopulator.java (original) +++ maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestPopulator.java Wed Nov 7 22:44:26 2007 @@ -470,8 +470,6 @@ if ( request.isOffline() ) { - getLogger().info( "You are working in offline mode." ); - wagonManager.setOnline( false ); } else