You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@struts.apache.org by ce...@apache.org on 2002/12/17 01:59:47 UTC

cvs commit: jakarta-struts/src/share/org/apache/struts/tiles/definition ComponentDefinitionsFactoryWrapper.java ReloadableDefinitionsFactory.java

cedric      2002/12/16 16:59:47

  Modified:    src/share/org/apache/struts/tiles/definition
                        ComponentDefinitionsFactoryWrapper.java
                        ReloadableDefinitionsFactory.java
  Log:
  Remove the RequestUtils import, and thus the dependency with struts.
  This allows to compile the Tiles package with Struts1.0 or without Struts.
  In these two later compilations, struts1.1 dependent classes aren't use.
  
  Revision  Changes    Path
  1.3       +5 -5      jakarta-struts/src/share/org/apache/struts/tiles/definition/ComponentDefinitionsFactoryWrapper.java
  
  Index: ComponentDefinitionsFactoryWrapper.java
  ===================================================================
  RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/tiles/definition/ComponentDefinitionsFactoryWrapper.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ComponentDefinitionsFactoryWrapper.java	21 Nov 2002 03:42:21 -0000	1.2
  +++ ComponentDefinitionsFactoryWrapper.java	17 Dec 2002 00:59:47 -0000	1.3
  @@ -68,7 +68,7 @@
   import org.apache.struts.tiles.DefinitionsFactoryConfig;
   import org.apache.struts.tiles.DefinitionsFactoryException;
   import org.apache.struts.tiles.NoSuchDefinitionException;
  -import org.apache.struts.util.RequestUtils;
  +import org.apache.struts.tiles.TilesUtil;
   
   import javax.servlet.ServletRequest;
   import javax.servlet.ServletContext;
  @@ -181,7 +181,7 @@
     {
     try
       {
  -    Class factoryClass = RequestUtils.applicationClass(classname);
  +    Class factoryClass = TilesUtil.applicationClass(classname);
       Object factory = factoryClass.newInstance();
       return (ComponentDefinitionsFactory)factory;
       }
  
  
  
  1.5       +6 -6      jakarta-struts/src/share/org/apache/struts/tiles/definition/ReloadableDefinitionsFactory.java
  
  Index: ReloadableDefinitionsFactory.java
  ===================================================================
  RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/tiles/definition/ReloadableDefinitionsFactory.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- ReloadableDefinitionsFactory.java	21 Nov 2002 03:42:21 -0000	1.4
  +++ ReloadableDefinitionsFactory.java	17 Dec 2002 00:59:47 -0000	1.5
  @@ -76,7 +76,7 @@
   import org.apache.struts.tiles.DefinitionsFactoryException;
   import org.apache.struts.tiles.FactoryNotFoundException;
   import org.apache.struts.tiles.xmlDefinition.I18nFactorySet;
  -import org.apache.struts.util.RequestUtils;
  +import org.apache.struts.tiles.TilesUtil;
   
   /**
    * A reloadable factory.
  @@ -143,7 +143,7 @@
       // Try to create from classname
     try
       {
  -    Class factoryClass = RequestUtils.applicationClass(classname);
  +    Class factoryClass = TilesUtil.applicationClass(classname);
       ComponentDefinitionsFactory factory = (ComponentDefinitionsFactory)factoryClass.newInstance();
       factory.initFactory( servletContext, properties);
       return factory;
  
  
  

--
To unsubscribe, e-mail:   <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>