river-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sijs...@apache.org
Subject svn commit: r1058755 - in /incubator/river/jtsk/trunk/src/org/apache/river/config/builder: VelocityConfigurationBuilder.java template.vm
Date Thu, 13 Jan 2011 21:51:40 GMT
Author: sijskes
Date: Thu Jan 13 21:51:39 2011
New Revision: 1058755

URL: http://svn.apache.org/viewvc?rev=1058755&view=rev
Log:
removed unnecessary $configuration processing. kudos to greg trasuk!

Modified:
    incubator/river/jtsk/trunk/src/org/apache/river/config/builder/VelocityConfigurationBuilder.java
    incubator/river/jtsk/trunk/src/org/apache/river/config/builder/template.vm

Modified: incubator/river/jtsk/trunk/src/org/apache/river/config/builder/VelocityConfigurationBuilder.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/src/org/apache/river/config/builder/VelocityConfigurationBuilder.java?rev=1058755&r1=1058754&r2=1058755&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/src/org/apache/river/config/builder/VelocityConfigurationBuilder.java
(original)
+++ incubator/river/jtsk/trunk/src/org/apache/river/config/builder/VelocityConfigurationBuilder.java
Thu Jan 13 21:51:39 2011
@@ -156,47 +156,13 @@ public class VelocityConfigurationBuilde
         return sw.toString();
     }
 
-    public class ConfigurationFile2
-        extends ConfigurationFile
-    {
-
-        public ConfigurationFile2(Reader reader, String[] options, ClassLoader cl) throws
ConfigurationException
-        {
-            super(reader, options, cl);
-        }
-
-        public ConfigurationFile2(Reader reader, String[] options) throws ConfigurationException
-        {
-            super(reader, options);
-        }
-
-        @Override
-        protected Object getSpecialEntry(String name) throws ConfigurationException
-        {
-            if( "$configuration".equals(name) ) {
-                return this ;
-            }
-            return super.getSpecialEntry(name);
-        }
-
-        @Override
-        protected Class getSpecialEntryType(String name) throws ConfigurationException
-        {
-            if( "$configuration".equals(name) ) {
-                return this.getClass();
-            }
-            return super.getSpecialEntryType(name);
-        }
-
-    }
-
     @Override
     public Configuration createConfiguration() throws ConfigurationException
     {
         try {
             StringReader sr = new StringReader( getConfigurationText() );
 
-            final ConfigurationFile cf = new ConfigurationFile2(sr,null);
+            final ConfigurationFile cf = new ConfigurationFile(sr,null);
 
             return cf ;
         } catch( ConfigurationException c ) {

Modified: incubator/river/jtsk/trunk/src/org/apache/river/config/builder/template.vm
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/src/org/apache/river/config/builder/template.vm?rev=1058755&r1=1058754&r2=1058755&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/src/org/apache/river/config/builder/template.vm (original)
+++ incubator/river/jtsk/trunk/src/org/apache/river/config/builder/template.vm Thu Jan 13
21:51:39 2011
@@ -32,7 +32,7 @@ com.sun.jini.start {
         new NonActivatableServiceDescriptor(
             codebase, policy, classpath,
             "com.sun.jini.reggie.TransientRegistrarImpl",
-            $configuration, null, null )
+            this, null, null )
     };
 }
 



Mime
View raw message