werken 2002/07/17 11:17:32
Modified: . build-bootstrap.xml maven.xml
src/java/org/apache/maven/app CLIManager.java Maven.java
Log:
Added --nobanner and --offline (hooked to ${maven.mode.online}, strangely)
Revision Changes Path
1.133 +3 -0 jakarta-turbine-maven/build-bootstrap.xml
Index: build-bootstrap.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/build-bootstrap.xml,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -r1.132 -r1.133
--- build-bootstrap.xml 16 Jul 2002 22:03:33 -0000 1.132
+++ build-bootstrap.xml 17 Jul 2002 18:17:31 -0000 1.133
@@ -407,6 +407,9 @@
</fileset>
</copy>
+ <copy todir="${maven.repo.local}/maven/jars/" file="bootstrap/maven.jar"/>
+ <copy todir="${maven.home}/lib/" file="bootstrap/maven.jar"/>
+
</target>
<!-- ================================================================== -->
1.23 +11 -4 jakarta-turbine-maven/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/maven.xml,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- maven.xml 15 Jul 2002 17:36:23 -0000 1.22
+++ maven.xml 17 Jul 2002 18:17:31 -0000 1.23
@@ -45,6 +45,7 @@
</j:choose>
<exec executable="${maven.bin.script}">
+ <arg line="--nobanner"/>
<arg line="-d ${plugin.parent}"/>
<arg line="-p ${plugin}"/>
</exec>
@@ -60,7 +61,12 @@
</fileScanner>
<j:forEach var="plugin" items="${plugins.iterator()}">
- <echo>Building ${plugin.parentFile.name}</echo>
+
+ <echo>
++----------------------------------------
+| Building ${plugin.parentFile.name}
++----------------------------------------
+ </echo>
<j:choose>
<j:when test="${systemScope['os.name'].startsWith('Windows')}">
@@ -72,9 +78,10 @@
</j:choose>
<exec executable="${maven.bin.script}">
- <arg line="-d ${plugin.parent}"/>
- <arg line="-p ${plugin}"/>
- </exec>
+ <arg line="--nobanner"/>
+ <arg line="-d ${plugin.parent}"/>
+ <arg line="-p ${plugin}"/>
+ </exec>
</j:forEach>
</goal>
1.6 +4 -0
jakarta-turbine-maven/src/java/org/apache/maven/app/CLIManager.java
Index: CLIManager.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/app/CLIManager.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- CLIManager.java 15 Jul 2002 21:52:57 -0000 1.5
+++ CLIManager.java 17 Jul 2002 18:17:32 -0000 1.6
@@ -127,6 +127,10 @@
options.addOption('g', "goals", false,
"Display available goals.",
false, false);
+
+ options.addOption('b', "nobanner", false,
+ "Do not display logo banner.",
+ false, false);
}
/** Parse a string-array of command-line arguments.
1.73 +26 -2 jakarta-turbine-maven/src/java/org/apache/maven/app/Maven.java
Index: Maven.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/app/Maven.java,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- Maven.java 17 Jul 2002 15:11:58 -0000 1.72
+++ Maven.java 17 Jul 2002 18:17:32 -0000 1.73
@@ -513,6 +513,8 @@
loadProperties();
+ checkOnline();
+
initializeProject();
initializeAnt();
@@ -523,6 +525,25 @@
getDir().getPath());
}
+ private void checkOnline()
+ {
+ if ( getProperty( "maven.mode.online" ) != null )
+ {
+ return;
+ }
+
+ if ( getCli().hasOption( 'o' ) )
+ {
+ getJellyContext().setVariable( "maven.mode.online",
+ Boolean.FALSE );
+ }
+ else
+ {
+ getJellyContext().setVariable( "maven.mode.online",
+ Boolean.TRUE );
+ }
+ }
+
/** Load the maven project descriptor.
*
* @throws DescriptorException If there is an error while
@@ -1484,8 +1505,11 @@
Project mavenProject = getProject();
- printConsoleMavenHeader();
- System.out.println();
+ if ( ! getCli().hasOption( 'b' ) )
+ {
+ printConsoleMavenHeader();
+ System.out.println();
+ }
printConsoleProjectHeader(mavenProject);
System.out.println();
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
