svn commit: r1058035 - in /incubator/river/jtsk/trunk/src/org/apache/river: config/ config/builder/ configbuilder/

[sijskes]

Author: sijskes
Date: Wed Jan 12 09:47:36 2011
New Revision: 1058035

URL: http://svn.apache.org/viewvc?rev=1058035&view=rev
Log:
added factory, changed package names

Added:
    incubator/river/jtsk/trunk/src/org/apache/river/config/
    incubator/river/jtsk/trunk/src/org/apache/river/config/builder/
    
incubator/river/jtsk/trunk/src/org/apache/river/config/builder/ConfigurationBuilder.java
      - copied, changed from r1057584, 
incubator/river/jtsk/trunk/src/org/apache/river/configbuilder/ConfigurationBuilder.java
    incubator/river/jtsk/trunk/src/org/apache/river/config/builder/Example.java
      - copied, changed from r1057584, 
incubator/river/jtsk/trunk/src/org/apache/river/configbuilder/Example.java
    
incubator/river/jtsk/trunk/src/org/apache/river/config/builder/example.config
      - copied unchanged from r1057584, 
incubator/river/jtsk/trunk/src/org/apache/river/configbuilder/example.config
Removed:
    
incubator/river/jtsk/trunk/src/org/apache/river/configbuilder/ConfigurationBuilder.java
    incubator/river/jtsk/trunk/src/org/apache/river/configbuilder/Example.java
    incubator/river/jtsk/trunk/src/org/apache/river/configbuilder/example.config

Copied: 
incubator/river/jtsk/trunk/src/org/apache/river/config/builder/ConfigurationBuilder.java
 (from r1057584, 
incubator/river/jtsk/trunk/src/org/apache/river/configbuilder/ConfigurationBuilder.java)
URL: 
http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/src/org/apache/river/config/builder/ConfigurationBuilder.java?p2=incubator/river/jtsk/trunk/src/org/apache/river/config/builder/ConfigurationBuilder.java&p1=incubator/river/jtsk/trunk/src/org/apache/river/configbuilder/ConfigurationBuilder.java&r1=1057584&r2=1058035&rev=1058035&view=diff
==============================================================================
--- 
incubator/river/jtsk/trunk/src/org/apache/river/configbuilder/ConfigurationBuilder.java
 (original)
+++ 
incubator/river/jtsk/trunk/src/org/apache/river/config/builder/ConfigurationBuilder.java
 Wed Jan 12 09:47:36 2011
@@ -16,8 +16,9 @@
  * limitations under the License.
  */
 
-package org.apache.river.configbuilder;
+package org.apache.river.config.builder;
 
+import org.apache.river.config.ConfigurationFactory;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.Reader;
@@ -30,8 +31,8 @@ import net.jini.config.ConfigurationFile
  *
  * @author sim
  */
-//TODO: abstract?
 public class ConfigurationBuilder
+    implements ConfigurationFactory
 {
 
     public ConfigurationBuilder()
@@ -69,7 +70,6 @@ public class ConfigurationBuilder
             super(reader, options);
         }
 
-        @Override
         protected Object getSpecialEntry(String name) throws 
ConfigurationException
         {
             if( "$configuration".equals(name) ) {
@@ -78,7 +78,6 @@ public class ConfigurationBuilder
             return super.getSpecialEntry(name);
         }
 
-        @Override
         protected Class getSpecialEntryType(String name) throws 
ConfigurationException
         {
             if( "$configuration".equals(name) ) {

Copied: 
incubator/river/jtsk/trunk/src/org/apache/river/config/builder/Example.java 
(from r1057584, 
incubator/river/jtsk/trunk/src/org/apache/river/configbuilder/Example.java)
URL: 
http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/src/org/apache/river/config/builder/Example.java?p2=incubator/river/jtsk/trunk/src/org/apache/river/config/builder/Example.java&p1=incubator/river/jtsk/trunk/src/org/apache/river/configbuilder/Example.java&r1=1057584&r2=1058035&rev=1058035&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/src/org/apache/river/configbuilder/Example.java 
(original)
+++ incubator/river/jtsk/trunk/src/org/apache/river/config/builder/Example.java 
Wed Jan 12 09:47:36 2011
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.apache.river.configbuilder;
+package org.apache.river.config.builder;
 
 import com.sun.jini.start.ServiceStarter;
 import java.security.Permission;
@@ -35,10 +35,9 @@ public class Example {
     {
         System.setSecurityManager(new SecurityManager() {
 
-            @Override
             public void checkPermission(Permission perm)
             {
-                //super.checkPermission(perm);
+                // ignore
             }
 
         } );