jvanzyl 2004/04/07 13:00:41
Modified: maven-core/src/bin classworlds.conf
maven-core/src/main/java/org/apache/maven
MavenCommandLineFrontEnd.java
maven-core/src/main/java/org/apache/maven/plugin/manager
DefaultPluginManagerManager.java
maven-core/src/main/java/org/apache/maven/plugin/plexus
OgnlProjectValueExtractor.java
maven-core/src/main/resources/org/apache/maven plexus.xml
Log:
Revision Changes Path
1.2 +1 -1 maven-components/maven-core/src/bin/classworlds.conf
Index: classworlds.conf
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/bin/classworlds.conf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- classworlds.conf 19 Mar 2004 04:13:17 -0000 1.1
+++ classworlds.conf 7 Apr 2004 20:00:41 -0000 1.2
@@ -1,4 +1,4 @@
-main is org.apache.maven.MavenBooter from root
+main is org.apache.maven.MavenCommandLineFrontEnd from root
[root]
load ${tools.jar}
1.3 +5 -3
maven-components/maven-core/src/main/java/org/apache/maven/MavenCommandLineFrontEnd.java
Index: MavenCommandLineFrontEnd.java
===================================================================
RCS file:
/home/cvs/maven-components/maven-core/src/main/java/org/apache/maven/MavenCommandLineFrontEnd.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- MavenCommandLineFrontEnd.java 5 Apr 2004 16:28:24 -0000 1.2
+++ MavenCommandLineFrontEnd.java 7 Apr 2004 20:00:41 -0000 1.3
@@ -67,6 +67,8 @@
embedder.addContextValue( "rootClassRealm", rootClassRealm );
+ embedder.addContextValue( "maven.home", System.getProperty( "maven.home" )
);
+
File projectFile = new File( System.getProperty( "user.dir" ),
POM_FILE_NAME );
if ( projectFile.exists() )
@@ -106,11 +108,11 @@
if ( commandLine.hasOption( WORK_OFFLINE ) )
{
- System.setProperty( MavenConstants.ONLINE, "false" );
+ System.setProperty( "maven.mode.online", "false" );
}
else
{
- System.setProperty( MavenConstants.ONLINE, "true" );
+ System.setProperty( "maven.mode.online", "true" );
}
if ( commandLine.hasOption( SET_SYSTEM_PROPERTY ) )
1.10 +1 -3
maven-components/maven-core/src/main/java/org/apache/maven/plugin/manager/DefaultPluginManagerManager.java
Index: DefaultPluginManagerManager.java
===================================================================
RCS file:
/home/cvs/maven-components/maven-core/src/main/java/org/apache/maven/plugin/manager/DefaultPluginManagerManager.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- DefaultPluginManagerManager.java 5 Apr 2004 16:58:21 -0000 1.9
+++ DefaultPluginManagerManager.java 7 Apr 2004 20:00:41 -0000 1.10
@@ -59,8 +59,6 @@
protected String mavenHome;
- protected String mavenLocalHome;
-
// ----------------------------------------------------------------------
//
// ----------------------------------------------------------------------
@@ -248,7 +246,7 @@
getLogger().info( "Initializing " + pluginManager.getId() + " plugin
manager." );
- pluginManager.initializePlugins( mavenHome, mavenLocalHome,
rootClassRealm );
+ //pluginManager.initializePlugins( mavenHome, mavenLocalHome,
rootClassRealm );
}
}
}
1.4 +6 -2
maven-components/maven-core/src/main/java/org/apache/maven/plugin/plexus/OgnlProjectValueExtractor.java
Index: OgnlProjectValueExtractor.java
===================================================================
RCS file:
/home/cvs/maven-components/maven-core/src/main/java/org/apache/maven/plugin/plexus/OgnlProjectValueExtractor.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- OgnlProjectValueExtractor.java 21 Mar 2004 00:33:17 -0000 1.3
+++ OgnlProjectValueExtractor.java 7 Apr 2004 20:00:41 -0000 1.4
@@ -33,7 +33,11 @@
{
Object value = null;
- if ( expression.startsWith( "#project" ) )
+ if ( expression.equals( "#project" ) )
+ {
+ value = project;
+ }
+ else if ( expression.startsWith( "#project" ) )
{
try
{
1.7 +0 -1
maven-components/maven-core/src/main/resources/org/apache/maven/plexus.xml
Index: plexus.xml
===================================================================
RCS file:
/home/cvs/maven-components/maven-core/src/main/resources/org/apache/maven/plexus.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- plexus.xml 5 Apr 2004 16:28:24 -0000 1.6
+++ plexus.xml 7 Apr 2004 20:00:41 -0000 1.7
@@ -87,7 +87,6 @@
</requirements>
<configuration>
<maven-home>${maven.home}</maven-home>
- <maven-local-home>${maven.home.local}</maven-local-home>
</configuration>
</component>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
