You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@turbine.apache.org by sg...@apache.org on 2005/03/01 11:47:31 UTC
cvs commit: jakarta-turbine-fulcrum/yaafi/src/java/org/apache/fulcrum/yaafi/framework/util AvalonToYaafiContextMapper.java
sgoeschl 2005/03/01 02:47:31
Modified: yaafi/src/java/org/apache/fulcrum/yaafi/framework/util
AvalonToYaafiContextMapper.java
Log:
Synchronizing my development CVS with Fulrum
Revision Changes Path
1.2 +21 -18 jakarta-turbine-fulcrum/yaafi/src/java/org/apache/fulcrum/yaafi/framework/util/AvalonToYaafiContextMapper.java
Index: AvalonToYaafiContextMapper.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-fulcrum/yaafi/src/java/org/apache/fulcrum/yaafi/framework/util/AvalonToYaafiContextMapper.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AvalonToYaafiContextMapper.java 16 Feb 2005 11:24:52 -0000 1.1
+++ AvalonToYaafiContextMapper.java 1 Mar 2005 10:47:31 -0000 1.2
@@ -22,10 +22,10 @@
import org.apache.avalon.framework.context.Context;
import org.apache.avalon.framework.context.ContextException;
import org.apache.avalon.framework.context.DefaultContext;
-import org.apache.fulcrum.yaafi.framework.container.AvalonFortressConstants;
-import org.apache.fulcrum.yaafi.framework.container.AvalonMerlinConstants;
-import org.apache.fulcrum.yaafi.framework.container.AvalonPhoenixConstants;
-import org.apache.fulcrum.yaafi.framework.container.AvalonYaafiConstants;
+import org.apache.fulcrum.yaafi.framework.constant.AvalonFortressConstants;
+import org.apache.fulcrum.yaafi.framework.constant.AvalonMerlinConstants;
+import org.apache.fulcrum.yaafi.framework.constant.AvalonPhoenixConstants;
+import org.apache.fulcrum.yaafi.framework.constant.AvalonYaafiConstants;
/**
* Helper for converting Avalon Context of Fortress and Phoenix
@@ -46,7 +46,6 @@
* Constructor
*
* @param tempRootDir current temp directory
- * @param classLoader the classloader
* @param context the existing context
*/
public AvalonToYaafiContextMapper(
@@ -56,15 +55,7 @@
Validate.notNull( tempRootDir, "tempRootDir" );
this.tempRootDir = tempRootDir;
-
- if( context instanceof DefaultContext )
- {
- this.defaultContext = (DefaultContext) context;
- }
- else
- {
- this.defaultContext = new DefaultContext( context );
- }
+ this.defaultContext = new DefaultContext( context );
}
/**
@@ -101,6 +92,10 @@
{
return mapFromMerlin(context);
}
+ else if( AvalonYaafiConstants.AVALON_CONTAINER_YAAFI.equals(from) )
+ {
+ return mapFromMerlin(context);
+ }
else
{
String msg = "Don't know the following container type : " + from;
@@ -168,15 +163,23 @@
{
DefaultContext result = this.getDefaultContext();
- File urnAvalonHome = (File) context.get( AvalonMerlinConstants.URN_AVALON_HOME );
-
- result.put( AvalonYaafiConstants.COMPONENT_APP_ROOT, urnAvalonHome.getAbsolutePath() );
+ String urnAvalonPartition = (String) context.get(AvalonYaafiConstants.URN_AVALON_PARTITION);
+ File urnAvalonHome = (File) context.get(AvalonYaafiConstants.URN_AVALON_HOME);
+ File urnAvalonTemp = (File) context.get(AvalonYaafiConstants.URN_AVALON_TEMP);
+ String urnAvalonName = (String) (String) context.get(AvalonYaafiConstants.URN_AVALON_NAME);
+ ClassLoader urnAvalonClossLoader = (ClassLoader) context.get(AvalonYaafiConstants.URN_AVALON_CLASSLOADER);
+
+ result.put(AvalonMerlinConstants.URN_AVALON_PARTITION,urnAvalonPartition);
+ result.put(AvalonMerlinConstants.URN_AVALON_NAME,urnAvalonName);
+ result.put(AvalonMerlinConstants.URN_AVALON_HOME,urnAvalonHome);
+ result.put(AvalonMerlinConstants.URN_AVALON_TEMP,urnAvalonTemp);
+ result.put(AvalonMerlinConstants.URN_AVALON_CLASSLOADER,urnAvalonClossLoader);
+ result.put(AvalonYaafiConstants.COMPONENT_APP_ROOT, urnAvalonHome.getAbsolutePath());
return result;
}
-
private DefaultContext getDefaultContext()
{
return this.defaultContext;
---------------------------------------------------------------------
To unsubscribe, e-mail: turbine-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: turbine-dev-help@jakarta.apache.org