You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by br...@apache.org on 2005/05/11 03:04:52 UTC
svn commit: r169548 - in /maven/components/trunk/maven-core/src:
main/java/org/apache/maven/ main/java/org/apache/maven/cli/
main/java/org/apache/maven/exception/ main/java/org/apache/maven/execution/
main/java/org/apache/maven/lifecycle/
main/java/org/apache/maven/monitor/event/
main/java/org/apache/maven/plugin/ main/java/org/apache/maven/reactor/
main/java/org/apache/maven/usability/ test/java/org/apache/maven/
test/java/org/apache/maven/plugin/ test/java/org/apache/maven/usability/
Author: brett
Date: Tue May 10 18:04:50 2005
New Revision: 169548
URL: http://svn.apache.org/viewcvs?rev=169548&view=rev
Log:
reformat, apply license
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/Maven.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/cli/ConsoleDownloadMonitor.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/cli/MavenCli.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/exception/MavenExceptionHandler.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/exception/MavenHomeNotDefinedException.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionResponse.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/MavenSession.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleExecutionException.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleExecutor.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/LifecyclePhaseConstants.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/Phase.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/monitor/event/DefaultEventMonitor.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/MavenPluginDiscoverer.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginConfigurationException.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginManager.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterException.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/reactor/ReactorException.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/usability/ArtifactResolverDiagnoser.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/usability/ErrorDiagnoser.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/usability/PluginConfigurationDiagnoser.java
maven/components/trunk/maven-core/src/test/java/org/apache/maven/MavenTestUtils.java
maven/components/trunk/maven-core/src/test/java/org/apache/maven/plugin/PluginParameterExpressionEvaluatorTest.java
maven/components/trunk/maven-core/src/test/java/org/apache/maven/usability/PluginErrorDiagnoserTest.java
Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java?rev=169548&r1=169547&r2=169548&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java Tue May 10 18:04:50 2005
@@ -1,20 +1,19 @@
package org.apache.maven;
-/* ====================================================================
- * Copyright 2001-2004 The Apache Software Foundation.
+/*
+ * Copyright 2001-2005 The Apache Software Foundation.
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ====================================================================
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*/
import org.apache.maven.artifact.manager.WagonManager;
@@ -75,7 +74,7 @@
protected LifecycleExecutor lifecycleExecutor;
protected PlexusContainer container;
-
+
protected Map errorDiagnosers;
// ----------------------------------------------------------------------
@@ -380,22 +379,22 @@
getLogger().info( "BUILD FAILURE" );
line();
-
+
String message = null;
- if(errorDiagnosers != null)
+ if ( errorDiagnosers != null )
{
for ( Iterator it = errorDiagnosers.values().iterator(); it.hasNext(); )
{
ErrorDiagnoser diagnoser = (ErrorDiagnoser) it.next();
-
- if( diagnoser.canDiagnose( e ) )
+
+ if ( diagnoser.canDiagnose( e ) )
{
message = diagnoser.diagnose( e );
}
}
}
-
- if( message == null )
+
+ if ( message == null )
{
message = "Reason: " + e.getMessage();
}
@@ -403,7 +402,7 @@
getLogger().info( message );
line();
-
+
if ( longMessage != null )
{
getLogger().info( longMessage );
Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/Maven.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core/src/main/java/org/apache/maven/Maven.java?rev=169548&r1=169547&r2=169548&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/Maven.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/Maven.java Tue May 10 18:04:50 2005
@@ -1,7 +1,7 @@
package org.apache.maven;
/*
- * Copyright 2001-2004 The Apache Software Foundation.
+ * Copyright 2001-2005 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -28,5 +28,6 @@
{
static String ROLE = Maven.class.getName();
- MavenExecutionResponse execute( MavenExecutionRequest request ) throws ReactorException;
+ MavenExecutionResponse execute( MavenExecutionRequest request )
+ throws ReactorException;
}
Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/cli/ConsoleDownloadMonitor.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core/src/main/java/org/apache/maven/cli/ConsoleDownloadMonitor.java?rev=169548&r1=169547&r2=169548&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/cli/ConsoleDownloadMonitor.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/cli/ConsoleDownloadMonitor.java Tue May 10 18:04:50 2005
@@ -1,20 +1,19 @@
package org.apache.maven.cli;
-/* ====================================================================
- * Copyright 2001-2005 The Apache Software Foundation.
+/*
+ * Copyright 2001-2005 The Apache Software Foundation.
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ====================================================================
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*/
import org.apache.maven.wagon.WagonConstants;
@@ -62,8 +61,9 @@
public void transferCompleted( TransferEvent transferEvent )
{
- System.out.println( ( complete / 1024 ) + "K " +
- ( transferEvent.getRequestType() == TransferEvent.REQUEST_PUT ? "uploaded" : "downloaded" ) );
+ System.out.println(
+ ( complete / 1024 ) + "K " +
+ ( transferEvent.getRequestType() == TransferEvent.REQUEST_PUT ? "uploaded" : "downloaded" ) );
}
public void transferError( TransferEvent transferEvent )
Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/cli/MavenCli.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core/src/main/java/org/apache/maven/cli/MavenCli.java?rev=169548&r1=169547&r2=169548&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/cli/MavenCli.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/cli/MavenCli.java Tue May 10 18:04:50 2005
@@ -36,15 +36,14 @@
import org.apache.maven.monitor.event.DefaultEventDispatcher;
import org.apache.maven.monitor.event.DefaultEventMonitor;
import org.apache.maven.monitor.event.EventDispatcher;
-import org.apache.maven.monitor.logging.DefaultLog;
import org.apache.maven.plugin.Mojo;
import org.apache.maven.reactor.ReactorException;
import org.apache.maven.settings.MavenSettingsBuilder;
import org.apache.maven.settings.Settings;
import org.codehaus.classworlds.ClassWorld;
import org.codehaus.plexus.PlexusContainerException;
-import org.codehaus.plexus.component.repository.exception.ComponentLookupException;
import org.codehaus.plexus.component.repository.exception.ComponentLifecycleException;
+import org.codehaus.plexus.component.repository.exception.ComponentLookupException;
import org.codehaus.plexus.embed.ArtifactEnabledEmbedder;
import org.codehaus.plexus.logging.Logger;
import org.codehaus.plexus.logging.LoggerManager;
@@ -121,9 +120,9 @@
boolean showErrors = debug || commandLine.hasOption( CLIManager.ERRORS );
- if(showErrors)
+ if ( showErrors )
{
- System.out.println("+ Error stacktraces are turned on.");
+ System.out.println( "+ Error stacktraces are turned on." );
}
// ----------------------------------------------------------------------
@@ -267,8 +266,8 @@
System.err.println( "FATAL ERROR: " + message );
if ( show )
{
- System.err.println("Error stacktrace:");
-
+ System.err.println( "Error stacktrace:" );
+
e.printStackTrace();
}
else
@@ -465,7 +464,7 @@
public static final char REACTOR = 'r';
public static final char DEBUG = 'X';
-
+
// TODO: [jc] Is there a better switch than '-e' for this?
public static final char ERRORS = 'e';
@@ -496,8 +495,8 @@
VERSION ) );
options.addOption( OptionBuilder.withLongOpt( "debug" ).withDescription( "Produce execution debug output" ).create(
DEBUG ) );
- options.addOption( OptionBuilder.withLongOpt( "errors" ).withDescription( "Produce execution error messages" ).create(
- ERRORS ) );
+ options.addOption( OptionBuilder.withLongOpt( "errors" ).withDescription(
+ "Produce execution error messages" ).create( ERRORS ) );
options.addOption( OptionBuilder.withLongOpt( "reactor" ).withDescription(
"Execute goals for project found in the reactor" ).create( REACTOR ) );
options.addOption( OptionBuilder.withLongOpt( "non-recursive" ).withDescription(
Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/exception/MavenExceptionHandler.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core/src/main/java/org/apache/maven/exception/MavenExceptionHandler.java?rev=169548&r1=169547&r2=169548&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/exception/MavenExceptionHandler.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/exception/MavenExceptionHandler.java Tue May 10 18:04:50 2005
@@ -1,20 +1,19 @@
package org.apache.maven.exception;
-/* ====================================================================
- * Copyright 2001-2004 The Apache Software Foundation.
+/*
+ * Copyright 2001-2005 The Apache Software Foundation.
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ====================================================================
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*/
/**
@@ -29,7 +28,6 @@
* o non existent goals
*
* @author <a href="mailto:jason@maven.org">Jason van Zyl</a>
- *
* @version $Id$
*/
public class MavenExceptionHandler
Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/exception/MavenHomeNotDefinedException.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core/src/main/java/org/apache/maven/exception/MavenHomeNotDefinedException.java?rev=169548&r1=169547&r2=169548&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/exception/MavenHomeNotDefinedException.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/exception/MavenHomeNotDefinedException.java Tue May 10 18:04:50 2005
@@ -1,25 +1,23 @@
package org.apache.maven.exception;
-/* ====================================================================
- * Copyright 2001-2004 The Apache Software Foundation.
+/*
+ * Copyright 2001-2005 The Apache Software Foundation.
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ====================================================================
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*/
/**
* @author <a href="mailto:jason@maven.org">Jason van Zyl</a>
- *
* @version $Id$
*/
public class MavenHomeNotDefinedException
Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java?rev=169548&r1=169547&r2=169548&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java Tue May 10 18:04:50 2005
@@ -1,20 +1,19 @@
package org.apache.maven.execution;
-/* ====================================================================
- * Copyright 2001-2004 The Apache Software Foundation.
+/*
+ * Copyright 2001-2005 The Apache Software Foundation.
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ====================================================================
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*/
import org.apache.maven.artifact.repository.ArtifactRepository;
Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java?rev=169548&r1=169547&r2=169548&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java Tue May 10 18:04:50 2005
@@ -1,20 +1,19 @@
package org.apache.maven.execution;
-/* ====================================================================
- * Copyright 2001-2004 The Apache Software Foundation.
+/*
+ * Copyright 2001-2005 The Apache Software Foundation.
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ====================================================================
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*/
import org.apache.maven.artifact.repository.ArtifactRepository;
Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionResponse.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionResponse.java?rev=169548&r1=169547&r2=169548&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionResponse.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionResponse.java Tue May 10 18:04:50 2005
@@ -1,20 +1,19 @@
package org.apache.maven.execution;
-/* ====================================================================
- * Copyright 2001-2004 The Apache Software Foundation.
+/*
+ * Copyright 2001-2005 The Apache Software Foundation.
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ====================================================================
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*/
import java.util.Date;
Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/MavenSession.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/MavenSession.java?rev=169548&r1=169547&r2=169548&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/MavenSession.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/MavenSession.java Tue May 10 18:04:50 2005
@@ -1,20 +1,19 @@
package org.apache.maven.execution;
-/* ====================================================================
- * Copyright 2001-2004 The Apache Software Foundation.
+/*
+ * Copyright 2001-2005 The Apache Software Foundation.
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ====================================================================
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*/
import org.apache.maven.artifact.repository.ArtifactRepository;
@@ -53,7 +52,7 @@
this.project = project;
this.container = container;
-
+
this.settings = settings;
this.localRepository = localRepository;
@@ -71,7 +70,7 @@
private void initializeContainerContext()
{
Context context = container.getContext();
-
+
context.put( "project", project );
context.put( "settings", settings );
context.put( "basedir", project.getBasedir().getAbsolutePath() );
Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleExecutionException.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleExecutionException.java?rev=169548&r1=169547&r2=169548&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleExecutionException.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleExecutionException.java Tue May 10 18:04:50 2005
@@ -1,20 +1,19 @@
package org.apache.maven.lifecycle;
-/* ====================================================================
- * Copyright 2001-2004 The Apache Software Foundation.
+/*
+ * Copyright 2001-2005 The Apache Software Foundation.
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ====================================================================
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*/
/**
Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleExecutor.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleExecutor.java?rev=169548&r1=169547&r2=169548&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleExecutor.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleExecutor.java Tue May 10 18:04:50 2005
@@ -1,26 +1,25 @@
package org.apache.maven.lifecycle;
-import org.apache.maven.execution.MavenExecutionResponse;
-import org.apache.maven.execution.MavenSession;
-
-import java.util.List;
-
-/* ====================================================================
- * Copyright 2001-2004 The Apache Software Foundation.
+/*
+ * Copyright 2001-2005 The Apache Software Foundation.
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ====================================================================
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*/
+
+import org.apache.maven.execution.MavenExecutionResponse;
+import org.apache.maven.execution.MavenSession;
+
+import java.util.List;
/**
* @author <a href="mailto:jason@maven.org">Jason van Zyl</a>
Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/LifecyclePhaseConstants.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/LifecyclePhaseConstants.java?rev=169548&r1=169547&r2=169548&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/LifecyclePhaseConstants.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/LifecyclePhaseConstants.java Tue May 10 18:04:50 2005
@@ -1,20 +1,19 @@
package org.apache.maven.lifecycle;
-/* ====================================================================
- * Copyright 2001-2004 The Apache Software Foundation.
+/*
+ * Copyright 2001-2005 The Apache Software Foundation.
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ====================================================================
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*/
/**
Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/Phase.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/Phase.java?rev=169548&r1=169547&r2=169548&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/Phase.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/Phase.java Tue May 10 18:04:50 2005
@@ -1,24 +1,23 @@
package org.apache.maven.lifecycle;
-import java.util.HashSet;
-import java.util.Set;
-
-/* ====================================================================
- * Copyright 2001-2004 The Apache Software Foundation.
+/*
+ * Copyright 2001-2005 The Apache Software Foundation.
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ====================================================================
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*/
+
+import java.util.HashSet;
+import java.util.Set;
/**
* @author <a href="mailto:jason@maven.org">Jason van Zyl</a>
Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/monitor/event/DefaultEventMonitor.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core/src/main/java/org/apache/maven/monitor/event/DefaultEventMonitor.java?rev=169548&r1=169547&r2=169548&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/monitor/event/DefaultEventMonitor.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/monitor/event/DefaultEventMonitor.java Tue May 10 18:04:50 2005
@@ -1,5 +1,21 @@
package org.apache.maven.monitor.event;
+/*
+ * Copyright 2001-2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
import org.codehaus.plexus.logging.Logger;
/**
@@ -8,17 +24,15 @@
public class DefaultEventMonitor
extends AbstractSelectiveEventMonitor
{
-
- private static final String[] START_EVENTS = {
- MavenEvents.MOJO_EXECUTION
- };
-
+
+ private static final String[] START_EVENTS = {MavenEvents.MOJO_EXECUTION};
+
private final Logger logger;
public DefaultEventMonitor( Logger logger )
{
super( START_EVENTS, MavenEvents.NO_EVENTS, MavenEvents.NO_EVENTS );
-
+
this.logger = logger;
}
Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/MavenPluginDiscoverer.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/MavenPluginDiscoverer.java?rev=169548&r1=169547&r2=169548&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/MavenPluginDiscoverer.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/MavenPluginDiscoverer.java Tue May 10 18:04:50 2005
@@ -1,20 +1,19 @@
package org.apache.maven.plugin;
-/* ====================================================================
- * Copyright 2001-2004 The Apache Software Foundation.
+/*
+ * Copyright 2001-2005 The Apache Software Foundation.
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ====================================================================
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*/
import org.apache.maven.plugin.descriptor.PluginDescriptorBuilder;
Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginConfigurationException.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginConfigurationException.java?rev=169548&r1=169547&r2=169548&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginConfigurationException.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginConfigurationException.java Tue May 10 18:04:50 2005
@@ -1,20 +1,19 @@
package org.apache.maven.plugin;
-/* ====================================================================
- * Copyright 2001-2004 The Apache Software Foundation.
+/*
+ * Copyright 2001-2005 The Apache Software Foundation.
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ====================================================================
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*/
/**
Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginManager.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginManager.java?rev=169548&r1=169547&r2=169548&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginManager.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginManager.java Tue May 10 18:04:50 2005
@@ -1,20 +1,19 @@
package org.apache.maven.plugin;
-/* ====================================================================
- * Copyright 2001-2004 The Apache Software Foundation.
+/*
+ * Copyright 2001-2005 The Apache Software Foundation.
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ====================================================================
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*/
import org.apache.maven.artifact.resolver.ArtifactResolutionException;
Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterException.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterException.java?rev=169548&r1=169547&r2=169548&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterException.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterException.java Tue May 10 18:04:50 2005
@@ -1,9 +1,5 @@
package org.apache.maven.plugin;
-import org.apache.maven.plugin.descriptor.MojoDescriptor;
-
-import java.util.List;
-
/*
* Copyright 2001-2005 The Apache Software Foundation.
*
@@ -20,36 +16,41 @@
* limitations under the License.
*/
+import org.apache.maven.plugin.descriptor.MojoDescriptor;
+
+import java.util.List;
+
public class PluginParameterException
extends PluginConfigurationException
{
private final List parameters;
+
private final MojoDescriptor mojo;
public PluginParameterException( MojoDescriptor mojo, List parameters )
{
super( "Invalid or missing parameters: " + parameters + " for mojo: " + mojo.getRoleHint() );
-
+
this.mojo = mojo;
-
+
this.parameters = parameters;
}
public PluginParameterException( MojoDescriptor mojo, List parameters, Throwable cause )
{
super( "Invalid or missing parameters: " + parameters + " for mojo: " + mojo.getRoleHint(), cause );
-
+
this.mojo = mojo;
-
+
this.parameters = parameters;
}
-
+
public MojoDescriptor getMojoDescriptor()
{
return mojo;
}
-
+
public List getParameters()
{
return parameters;
Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/reactor/ReactorException.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core/src/main/java/org/apache/maven/reactor/ReactorException.java?rev=169548&r1=169547&r2=169548&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/reactor/ReactorException.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/reactor/ReactorException.java Tue May 10 18:04:50 2005
@@ -1,20 +1,19 @@
package org.apache.maven.reactor;
-/* ====================================================================
- * Copyright 2001-2004 The Apache Software Foundation.
+/*
+ * Copyright 2001-2005 The Apache Software Foundation.
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ====================================================================
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*/
/**
Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/usability/ArtifactResolverDiagnoser.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core/src/main/java/org/apache/maven/usability/ArtifactResolverDiagnoser.java?rev=169548&r1=169547&r2=169548&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/usability/ArtifactResolverDiagnoser.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/usability/ArtifactResolverDiagnoser.java Tue May 10 18:04:50 2005
@@ -1,9 +1,5 @@
package org.apache.maven.usability;
-import org.apache.maven.artifact.resolver.ArtifactResolutionException;
-import org.apache.maven.artifact.resolver.TransitiveArtifactResolutionException;
-import org.apache.maven.project.ProjectBuildingException;
-
/*
* Copyright 2001-2005 The Apache Software Foundation.
*
@@ -20,6 +16,10 @@
* limitations under the License.
*/
+import org.apache.maven.artifact.resolver.ArtifactResolutionException;
+import org.apache.maven.artifact.resolver.TransitiveArtifactResolutionException;
+import org.apache.maven.project.ProjectBuildingException;
+
public class ArtifactResolverDiagnoser
implements ErrorDiagnoser
{
@@ -41,8 +41,8 @@
if ( causalityChainContains( error, TransitiveArtifactResolutionException.class ) )
{
- messageBuffer
- .append( "Error while transitively resolving artifacts (transitive path trace currently unavailable):\n\n" );
+ messageBuffer.append(
+ "Error while transitively resolving artifacts (transitive path trace currently unavailable):\n\n" );
}
else
{
Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/usability/ErrorDiagnoser.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core/src/main/java/org/apache/maven/usability/ErrorDiagnoser.java?rev=169548&r1=169547&r2=169548&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/usability/ErrorDiagnoser.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/usability/ErrorDiagnoser.java Tue May 10 18:04:50 2005
@@ -19,9 +19,9 @@
public interface ErrorDiagnoser
{
public static final String ROLE = ErrorDiagnoser.class.getName();
-
+
public boolean canDiagnose( Throwable error );
-
+
public String diagnose( Throwable error );
}
Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/usability/PluginConfigurationDiagnoser.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core/src/main/java/org/apache/maven/usability/PluginConfigurationDiagnoser.java?rev=169548&r1=169547&r2=169548&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/usability/PluginConfigurationDiagnoser.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/usability/PluginConfigurationDiagnoser.java Tue May 10 18:04:50 2005
@@ -1,19 +1,5 @@
package org.apache.maven.usability;
-import org.apache.maven.plugin.PluginConfigurationException;
-import org.apache.maven.plugin.PluginParameterException;
-import org.apache.maven.plugin.descriptor.MojoDescriptor;
-import org.apache.maven.plugin.descriptor.Parameter;
-import org.codehaus.plexus.util.StringUtils;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Stack;
-import java.util.StringTokenizer;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
/*
* Copyright 2001-2005 The Apache Software Foundation.
*
@@ -30,6 +16,20 @@
* limitations under the License.
*/
+import org.apache.maven.plugin.PluginConfigurationException;
+import org.apache.maven.plugin.PluginParameterException;
+import org.apache.maven.plugin.descriptor.MojoDescriptor;
+import org.apache.maven.plugin.descriptor.Parameter;
+import org.codehaus.plexus.util.StringUtils;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Stack;
+import java.util.StringTokenizer;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
public class PluginConfigurationDiagnoser
implements ErrorDiagnoser
{
@@ -73,9 +73,8 @@
List params = exception.getParameters();
MojoDescriptor mojo = exception.getMojoDescriptor();
- messageBuffer.append( "One or more required plugin parameters are invalid/missing for \'" )
- .append( mojo.getPluginDescriptor().getGoalPrefix() ).append( ":" ).append( mojo.getGoal() )
- .append( "\'\n" );
+ messageBuffer.append( "One or more required plugin parameters are invalid/missing for \'" ).append(
+ mojo.getPluginDescriptor().getGoalPrefix() ).append( ":" ).append( mojo.getGoal() ).append( "\'\n" );
int idx = 0;
for ( Iterator it = params.iterator(); it.hasNext(); )
@@ -93,7 +92,7 @@
}
private void decomposeParameterIntoUserInstructions( MojoDescriptor mojo, Parameter param,
- StringBuffer messageBuffer )
+ StringBuffer messageBuffer )
{
String expression = param.getExpression();
@@ -107,8 +106,8 @@
messageBuffer.append( " (aliased as: <" + alias + ">VALUE</" + alias + ">)" );
}
- messageBuffer.append( "\n inside the <configuration/> section for "
- + mojo.getPluginDescriptor().getArtifactId() );
+ messageBuffer.append( "\n inside the <configuration/> section for " +
+ mojo.getPluginDescriptor().getArtifactId() );
}
if ( StringUtils.isEmpty( expression ) )
@@ -149,8 +148,8 @@
}
else if ( "reports".equals( firstPart ) )
{
- expressionMessageBuffer
- .append( "make sure the <reports/> section of the pom.xml contains valid report names\n" );
+ expressionMessageBuffer.append(
+ "make sure the <reports/> section of the pom.xml contains valid report names\n" );
}
else if ( UNMODIFIABLE_EXPRESSIONS.contains( subExpression ) )
{
@@ -158,8 +157,8 @@
}
else
{
- expressionMessageBuffer.append( "Please provide the system property: " ).append( subExpression )
- .append( "\n (specified as \'-D" + subExpression + "=VALUE\' on the command line)\n" );
+ expressionMessageBuffer.append( "Please provide the system property: " ).append( subExpression ).append(
+ "\n (specified as \'-D" + subExpression + "=VALUE\' on the command line)\n" );
}
}
@@ -169,8 +168,8 @@
}
else
{
- messageBuffer.append( " (found static expression: \'" + expression
- + "\' which may act as a default value).\n" );
+ messageBuffer.append( " (found static expression: \'" + expression +
+ "\' which may act as a default value).\n" );
}
if ( unmodifiableElementsFound )
@@ -180,11 +179,10 @@
messageBuffer.append( " " );
}
- messageBuffer
- .append( "NOTE: One or more purely derived expression elements were detected in \'"
- + expression
- + "\'.\n If you continue to get this error after any other expression elements are specified correctly,"
- + "\n please report this issue to the Maven development team.\n" );
+ messageBuffer.append( "NOTE: One or more purely derived expression elements were detected in \'" +
+ expression +
+ "\'.\n If you continue to get this error after any other expression elements are specified correctly," +
+ "\n please report this issue to the Maven development team.\n" );
}
}
}
Modified: maven/components/trunk/maven-core/src/test/java/org/apache/maven/MavenTestUtils.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core/src/test/java/org/apache/maven/MavenTestUtils.java?rev=169548&r1=169547&r2=169548&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/test/java/org/apache/maven/MavenTestUtils.java (original)
+++ maven/components/trunk/maven-core/src/test/java/org/apache/maven/MavenTestUtils.java Tue May 10 18:04:50 2005
@@ -1,7 +1,7 @@
package org.apache.maven;
/*
- * Copyright 2001-2004 The Apache Software Foundation.
+ * Copyright 2001-2005 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -16,16 +16,16 @@
* limitations under the License.
*/
-import java.io.File;
-
import org.codehaus.classworlds.ClassRealm;
import org.codehaus.classworlds.ClassWorld;
import org.codehaus.plexus.DefaultArtifactEnabledContainer;
import org.codehaus.plexus.PlexusContainer;
+import java.io.File;
+
/**
* This is a utility class for helping to configure a PlexusTestCase for testing with maven.
- *
+ *
* @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
* @version $Id$
*/
Modified: maven/components/trunk/maven-core/src/test/java/org/apache/maven/plugin/PluginParameterExpressionEvaluatorTest.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core/src/test/java/org/apache/maven/plugin/PluginParameterExpressionEvaluatorTest.java?rev=169548&r1=169547&r2=169548&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/test/java/org/apache/maven/plugin/PluginParameterExpressionEvaluatorTest.java (original)
+++ maven/components/trunk/maven-core/src/test/java/org/apache/maven/plugin/PluginParameterExpressionEvaluatorTest.java Tue May 10 18:04:50 2005
@@ -22,7 +22,6 @@
import org.apache.maven.model.Build;
import org.apache.maven.model.Model;
import org.apache.maven.monitor.event.DefaultEventDispatcher;
-import org.apache.maven.monitor.logging.DefaultLog;
import org.apache.maven.project.MavenProject;
import org.apache.maven.settings.Settings;
import org.codehaus.plexus.PlexusContainer;
@@ -65,7 +64,8 @@
private static MavenSession createSession( MavenProject project, PlexusContainer container,
ArtifactRepository repo )
{
- return new MavenSession( project, container, new Settings(), repo, new DefaultEventDispatcher(), Collections.EMPTY_LIST );
+ return new MavenSession( project, container, new Settings(), repo, new DefaultEventDispatcher(),
+ Collections.EMPTY_LIST );
}
public void testLocalRepositoryExtraction()
@@ -87,7 +87,6 @@
Model model = new Model();
model.setBuild( build );
-
ExpressionEvaluator expressionEvaluator = createExpressionEvaluator( new MavenProject( model ) );
Object value = expressionEvaluator.evaluate( "${project.build.directory}/${project.build.finalName}" );
@@ -111,7 +110,8 @@
PlexusContainer container = getContainer();
MavenSession session = createSession( project, container, repo );
- ExpressionEvaluator expressionEvaluator = new PluginParameterExpressionEvaluator( session, null, container.getLogger() );
+ ExpressionEvaluator expressionEvaluator = new PluginParameterExpressionEvaluator( session, null,
+ container.getLogger() );
return expressionEvaluator;
}
}
Modified: maven/components/trunk/maven-core/src/test/java/org/apache/maven/usability/PluginErrorDiagnoserTest.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core/src/test/java/org/apache/maven/usability/PluginErrorDiagnoserTest.java?rev=169548&r1=169547&r2=169548&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/test/java/org/apache/maven/usability/PluginErrorDiagnoserTest.java (original)
+++ maven/components/trunk/maven-core/src/test/java/org/apache/maven/usability/PluginErrorDiagnoserTest.java Tue May 10 18:04:50 2005
@@ -1,17 +1,5 @@
package org.apache.maven.usability;
-import org.apache.maven.plugin.PluginParameterException;
-import org.apache.maven.plugin.descriptor.DuplicateParameterException;
-import org.apache.maven.plugin.descriptor.MojoDescriptor;
-import org.apache.maven.plugin.descriptor.Parameter;
-import org.apache.maven.plugin.descriptor.PluginDescriptor;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import junit.framework.TestCase;
-
/*
* Copyright 2001-2005 The Apache Software Foundation.
*
@@ -28,6 +16,17 @@
* limitations under the License.
*/
+import junit.framework.TestCase;
+import org.apache.maven.plugin.PluginParameterException;
+import org.apache.maven.plugin.descriptor.DuplicateParameterException;
+import org.apache.maven.plugin.descriptor.MojoDescriptor;
+import org.apache.maven.plugin.descriptor.Parameter;
+import org.apache.maven.plugin.descriptor.PluginDescriptor;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
public class PluginErrorDiagnoserTest
extends TestCase
{
@@ -224,9 +223,9 @@
{
IllegalArgumentException marker = new IllegalArgumentException();
- System.out.println( "---------------------------------------------------------------------\n"
- + "Visual output for " + marker.getStackTrace()[1].getMethodName()
- + ":\n---------------------------------------------------------------------" );
+ System.out.println( "---------------------------------------------------------------------\n" +
+ "Visual output for " + marker.getStackTrace()[1].getMethodName() +
+ ":\n---------------------------------------------------------------------" );
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org