You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by ev...@apache.org on 2003/05/02 11:38:54 UTC
cvs commit: maven-new/server/src/java/org/apache/maven/server XMLThing.java
evenisse 2003/05/02 02:38:54
Modified: core project.xml
plugins/ashkelon project.xml
plugins/jelly project.xml
plugins/jelly/src/test/org/apache/maven/plugins/jelly
DefaultJellyPluginTest.java
plugins/suiterunner project.xml
server project.xml
server/src/java/org/apache/maven/server XMLThing.java
Log:
Update to plexus-0.5
Revision Changes Path
1.9 +1 -1 maven-new/core/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/maven-new/core/project.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- project.xml 1 May 2003 16:21:58 -0000 1.8
+++ project.xml 2 May 2003 09:38:54 -0000 1.9
@@ -308,7 +308,7 @@
<dependency>
<groupId>plexus</groupId>
<artifactId>plexus</artifactId>
- <version>0.3</version>
+ <version>0.5</version>
</dependency>
<dependency>
1.4 +1 -1 maven-new/plugins/ashkelon/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/maven-new/plugins/ashkelon/project.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- project.xml 1 May 2003 16:21:58 -0000 1.3
+++ project.xml 2 May 2003 09:38:54 -0000 1.4
@@ -26,7 +26,7 @@
<dependency>
<groupId>plexus</groupId>
<artifactId>plexus</artifactId>
- <version>0.3</version>
+ <version>0.5</version>
</dependency>
<dependency>
1.5 +1 -1 maven-new/plugins/jelly/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/maven-new/plugins/jelly/project.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- project.xml 2 May 2003 08:49:59 -0000 1.4
+++ project.xml 2 May 2003 09:38:54 -0000 1.5
@@ -30,7 +30,7 @@
<dependency>
<groupId>plexus</groupId>
<artifactId>plexus</artifactId>
- <version>0.3</version>
+ <version>0.5</version>
</dependency>
<dependency>
1.2 +3 -4 maven-new/plugins/jelly/src/test/org/apache/maven/plugins/jelly/DefaultJellyPluginTest.java
Index: DefaultJellyPluginTest.java
===================================================================
RCS file: /home/cvs/maven-new/plugins/jelly/src/test/org/apache/maven/plugins/jelly/DefaultJellyPluginTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DefaultJellyPluginTest.java 26 Apr 2003 23:48:59 -0000 1.1
+++ DefaultJellyPluginTest.java 2 May 2003 09:38:54 -0000 1.2
@@ -11,7 +11,7 @@
import org.apache.maven.plugin.PluginGoal;
import org.apache.plexus.PlexusTestCase;
-import org.apache.plexus.context.DefaultPlexusContext;
+import org.apache.plexus.context.DefaultContext;
/**
* @author <a href="bwalding@jakarta.org">Ben Walding</a>
@@ -56,9 +56,8 @@
public void test2() throws Exception
{
- djp.runGoal("goal1", new DefaultPlexusContext());
+ djp.runGoal("goal1", new DefaultContext());
}
-
}
1.5 +1 -1 maven-new/plugins/suiterunner/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/maven-new/plugins/suiterunner/project.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- project.xml 2 May 2003 08:19:02 -0000 1.4
+++ project.xml 2 May 2003 09:38:54 -0000 1.5
@@ -30,7 +30,7 @@
<dependency>
<groupId>plexus</groupId>
<artifactId>plexus</artifactId>
- <version>0.3</version>
+ <version>0.5</version>
</dependency>
<dependency>
1.8 +1 -1 maven-new/server/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/maven-new/server/project.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- project.xml 1 May 2003 16:21:58 -0000 1.7
+++ project.xml 2 May 2003 09:38:54 -0000 1.8
@@ -26,7 +26,7 @@
<dependency>
<groupId>plexus</groupId>
<artifactId>plexus</artifactId>
- <version>0.3</version>
+ <version>0.5</version>
</dependency>
<dependency>
1.6 +4 -3 maven-new/server/src/java/org/apache/maven/server/XMLThing.java
Index: XMLThing.java
===================================================================
RCS file: /home/cvs/maven-new/server/src/java/org/apache/maven/server/XMLThing.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- XMLThing.java 30 Apr 2003 13:56:53 -0000 1.5
+++ XMLThing.java 2 May 2003 09:38:54 -0000 1.6
@@ -8,6 +8,7 @@
import java.io.File;
import java.io.InputStream;
+import java.io.InputStreamReader;
import java.util.Vector;
import org.apache.maven.Maven;
@@ -28,7 +29,7 @@
{
container = new DefaultPlexusContainer();
InputStream is = org.apache.maven.Maven.class.getResourceAsStream("MavenPlexusContainer.xml");
- container.setConfigurationResource(is);
+ container.setConfigurationResource(new InputStreamReader(is));
container.initialize();
this.user = user;
this.password = password;
@@ -59,7 +60,7 @@
System.out.println("Processing:" + projectFile);
String goal = (String) params.get(1);
- Maven maven = (Maven) container.getServiceRepository().lookup(Maven.ROLE);
+ Maven maven = (Maven) container.getComponentRepository().lookup(Maven.ROLE);
maven.setMavenHome(new File(System.getProperty("maven.home")));
maven.setMavenRepoLocal(new File(System.getProperty("maven.home"), "repository"));
maven.setProjectFile(new File(projectFile));
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org