You are viewing a plain text version of this content. The canonical link for it is here.
Posted to m2-dev@maven.apache.org by jv...@apache.org on 2004/09/18 03:52:38 UTC
cvs commit: maven-components/maven-core/src/main/java/org/apache/maven/plugin DefaultPluginManager.java OgnlProjectValueExtractor.java
jvanzyl 2004/09/17 18:52:38
Modified: maven-core/src/bin classworlds.conf
maven-core/src/main/java/org/apache/maven/plugin
DefaultPluginManager.java
OgnlProjectValueExtractor.java
Log:
Revision Changes Path
1.7 +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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- classworlds.conf 17 Sep 2004 22:13:29 -0000 1.6
+++ classworlds.conf 18 Sep 2004 01:52:38 -0000 1.7
@@ -3,7 +3,7 @@
set maven.home default ${user.home}/m2
[plexus.core]
-load ${maven.home}/core/plexus-0.17.jar
+load ${maven.home}/core/plexus-0.17-SNAPSHOT.jar
load ${maven.home}/core/xstream-1.0-SNAPSHOT.jar
load ${maven.home}/core/xpp3-1.1.3.3.jar
1.9 +6 -3 maven-components/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
Index: DefaultPluginManager.java
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- DefaultPluginManager.java 15 Sep 2004 12:34:16 -0000 1.8
+++ DefaultPluginManager.java 18 Sep 2004 01:52:38 -0000 1.9
@@ -254,7 +254,8 @@
}
}
- public void addPlugin( Artifact pluginArtifact ) throws Exception
+ public void addPlugin( Artifact pluginArtifact )
+ throws Exception
{
artifactResolver = (ArtifactResolver) container.lookup( ArtifactResolver.ROLE );
@@ -268,12 +269,14 @@
excludes );
}
- public void contextualize( Context context ) throws ContextException
+ public void contextualize( Context context )
+ throws ContextException
{
container = (ArtifactEnabledContainer) context.get( PlexusConstants.PLEXUS_KEY );
}
- public void initialize() throws Exception
+ public void initialize()
+ throws Exception
{
// TODO: move this to be configurable from the Maven component
remotePluginRepositories = new HashSet();
1.7 +3 -1 maven-components/maven-core/src/main/java/org/apache/maven/plugin/OgnlProjectValueExtractor.java
Index: OgnlProjectValueExtractor.java
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/main/java/org/apache/maven/plugin/OgnlProjectValueExtractor.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- OgnlProjectValueExtractor.java 11 Sep 2004 12:50:12 -0000 1.6
+++ OgnlProjectValueExtractor.java 18 Sep 2004 01:52:38 -0000 1.7
@@ -35,6 +35,8 @@
{
String role = expression.substring( 11 );
+ System.out.println( "role = " + role );
+
try
{
value = context.lookup( role );