rpms/modello/devel modello-use-old-pdcontainer.patch,1.1,1.2

Andrew Overholt overholt at fedoraproject.org
Thu Aug 20 19:34:04 UTC 2009


Author: overholt

Update of /cvs/pkgs/rpms/modello/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9187

Added Files:
	modello-use-old-pdcontainer.patch 
Log Message:
Add patch

modello-use-old-pdcontainer.patch:
 Modello.java |    8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

Index: modello-use-old-pdcontainer.patch
===================================================================
RCS file: modello-use-old-pdcontainer.patch
diff -N modello-use-old-pdcontainer.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ modello-use-old-pdcontainer.patch	20 Aug 2009 19:34:04 -0000	1.2
@@ -0,0 +1,33 @@
+diff -up modello-core/src/main/java/org/codehaus/modello/Modello.java.sav modello-1.0-alpha-15/modello-core/src/main/java/org/codehaus/modello/Modello.java
+--- modello-core/src/main/java/org/codehaus/modello/Modello.java.sav	2008-06-20 16:34:47.000000000 -0400
++++ modello-core/src/main/java/org/codehaus/modello/Modello.java	2008-06-20 16:36:02.000000000 -0400
+@@ -30,8 +30,6 @@ import org.codehaus.modello.core.Modello
+ import org.codehaus.modello.model.Model;
+ import org.codehaus.modello.model.ModelValidationException;
+ import org.codehaus.plexus.embed.Embedder;
+-import org.codehaus.plexus.PlexusContainer;
+-import org.codehaus.plexus.DefaultPlexusContainer;
+ 
+ /**
+  * @author <a href="mailto:jason at maven.org">Jason van Zyl</a>
+@@ -40,7 +38,7 @@ import org.codehaus.plexus.DefaultPlexus
+  */
+ public class Modello
+ {
+-    PlexusContainer container;
++    Embedder embedder = new Embedder();
+ 
+     ModelloCore core;
+ 
+@@ -49,9 +47,9 @@ public class Modello
+     {
+         try
+         {
+-            container = new DefaultPlexusContainer();
++            embedder.start();
+ 
+-            core = (ModelloCore) container.lookup( ModelloCore.ROLE );
++            core = (ModelloCore) embedder.lookup( ModelloCore.ROLE );
+         }
+         catch( Exception ex )
+         {




More information about the scm-commits mailing list