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/03 18:28:26 UTC

cvs commit: maven-new/server maven-server.conf

evenisse    2003/05/03 09:28:26

  Modified:    cli      maven-cli.conf
               core/src/java/org/apache/maven/plugin
                        DefaultPluginManager.java
               server   maven-server.conf
  Log:
  Minor correction with correct jar names.
  Now client and server work fine.
  
  Revision  Changes    Path
  1.2       +1 -1      maven-new/cli/maven-cli.conf
  
  Index: maven-cli.conf
  ===================================================================
  RCS file: /home/cvs/maven-new/cli/maven-cli.conf,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- maven-cli.conf	28 Apr 2003 08:35:23 -0000	1.1
  +++ maven-cli.conf	3 May 2003 16:28:26 -0000	1.2
  @@ -1,6 +1,6 @@
   main is org.apache.maven.cli.CLI from root.maven.cli
   
   [root.maven.cli]
  -	load ${maven.repo.local}/maven-new/jars/cli-SNAPSHOT.jar
  +	load ${maven.repo.local}/maven-new/jars/maven-cli-1.0-beta-11-SNAPSHOT.jar
       load ${maven.repo.local}/xmlrpc/jars/xmlrpc-1.2-a3-dev.jar
   	
  
  
  
  1.8       +4 -4      maven-new/core/src/java/org/apache/maven/plugin/DefaultPluginManager.java
  
  Index: DefaultPluginManager.java
  ===================================================================
  RCS file: /home/cvs/maven-new/core/src/java/org/apache/maven/plugin/DefaultPluginManager.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- DefaultPluginManager.java	30 Apr 2003 14:01:22 -0000	1.7
  +++ DefaultPluginManager.java	3 May 2003 16:28:26 -0000	1.8
  @@ -213,7 +213,7 @@
               IllegalAccessException
       {
           ClassRealm realm = configurePluginRealm("suiterunner");
  -        realm.addConstituent(getJar("maven-new", "plugin-suiterunner", "SNAPSHOT"));
  +        realm.addConstituent(getJar("maven-new", "maven-plugin-suiterunner", "1.0-beta-11-SNAPSHOT"));
   
           Class c = realm.loadClass("org.apache.maven.plugins.suiterunner.DefaultSuiteRunnerPlugin");
           return (Plugin) c.newInstance();
  @@ -229,7 +229,7 @@
               IllegalAccessException
       {
           ClassRealm realm = configurePluginRealm("ashkelon");
  -        realm.addConstituent(getJar("maven-new", "plugin-ashkelon", "SNAPSHOT"));
  +        realm.addConstituent(getJar("maven-new", "maven-plugin-ashkelon", "1.0-beta-11-SNAPSHOT"));
           realm.addConstituent(getJar("ashkelon", "ashkelon", "SNAPSHOT"));
           
           Class c = realm.loadClass("org.apache.maven.plugins.ashkelon.DefaultAshkelonPlugin");
  @@ -243,12 +243,12 @@
   
           try
           {
  -            realm = classWorld.newRealm("maven-new:plugin-" + pluginArtifactId);
  +            realm = classWorld.newRealm("maven-new:maven-plugin-" + pluginArtifactId);
               realm.setParent(classWorld.getRealm("root.maven"));
           }
           catch (DuplicateRealmException e)
           {
  -            realm = classWorld.getRealm("maven-new:plugin-" + pluginArtifactId);
  +            realm = classWorld.getRealm("maven-new:maven-plugin-" + pluginArtifactId);
           }
   
           realm.importFrom("root.maven", "org.apache.maven.plugin.");
  
  
  
  1.3       +3 -3      maven-new/server/maven-server.conf
  
  Index: maven-server.conf
  ===================================================================
  RCS file: /home/cvs/maven-new/server/maven-server.conf,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- maven-server.conf	28 Apr 2003 10:28:32 -0000	1.2
  +++ maven-server.conf	3 May 2003 16:28:26 -0000	1.3
  @@ -1,10 +1,10 @@
   main is org.apache.maven.server.DefaultServer from root.maven
   
   [root.maven]
  -    load ${maven.repo.local}/maven-new/jars/server-SNAPSHOT.jar
  -    load ${maven.repo.local}/maven-new/jars/core-SNAPSHOT.jar
  +    load ${maven.repo.local}/maven-new/jars/maven-server-1.0-beta-11-SNAPSHOT.jar
  +    load ${maven.repo.local}/maven-new/jars/maven-core-1.0-beta-11-SNAPSHOT.jar
       load ${maven.repo.local}/xmlrpc/jars/xmlrpc-1.2-a3-dev.jar
  -    load ${maven.repo.local}/plexus/jars/plexus-0.3.jar
  +    load ${maven.repo.local}/plexus/jars/plexus-0.5.jar
       load ${maven.repo.local}/avalon/jars/avalon-framework-api-4.1.4.jar
       load ${maven.repo.local}/log4j/jars/log4j-1.2.6.jar
       load ${maven.repo.local}/werkz/jars/werkz-1.0-beta-9.jar
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org