[Sunxacml-commit] tests/com/sun/xacml/test TestDriver.java,1.1.1.1,1.2

[Seth P. <se...@us...>]

Update of /cvsroot/sunxacml/tests/com/sun/xacml/test
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6804/com/sun/xacml/test

Modified Files:
	TestDriver.java 
Log Message:
cleaned up factory initialization code


Index: TestDriver.java
===================================================================
RCS file: /cvsroot/sunxacml/tests/com/sun/xacml/test/TestDriver.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** TestDriver.java	18 May 2004 21:20:50 -0000	1.1.1.1
--- TestDriver.java	27 May 2004 19:45:11 -0000	1.2
***************
*** 41,53 ****
  import com.sun.xacml.PDPConfig;
  
- import com.sun.xacml.attr.AttributeFactory;
- import com.sun.xacml.attr.AttributeFactoryProxy;
- 
- import com.sun.xacml.combine.CombiningAlgFactory;
- import com.sun.xacml.combine.CombiningAlgFactoryProxy;
- 
- import com.sun.xacml.cond.FunctionFactory;
- import com.sun.xacml.cond.FunctionFactoryProxy;
- 
  import com.sun.xacml.finder.PolicyFinder;
  
--- 41,44 ----
***************
*** 112,136 ****
          ConfigurationStore cs = new ConfigurationStore();
  
!         // setup the attribute factory
!         final AttributeFactory attrFactory = cs.getDefaultAttributeFactory();
!         AttributeFactory.setDefaultFactory(new AttributeFactoryProxy() {
!                 private AttributeFactory factory = attrFactory;
!                 public AttributeFactory getFactory() {
!                     return attrFactory;
!                 }
!             });
! 
!         // setup the combining algorithm factory
!         final CombiningAlgFactory combFactory =
!             cs.getDefaultCombiningAlgFactory();
!         CombiningAlgFactory.setDefaultFactory(new CombiningAlgFactoryProxy() {
!                 private CombiningAlgFactory factory = combFactory;
!                 public CombiningAlgFactory getFactory() {
!                     return factory;
!                 }
!             });
! 
!         // setup the function factory
!         FunctionFactory.setDefaultFactory(cs.getDefaultFunctionFactoryProxy());
  
          // get the PDP configuration's policy finder modules...
--- 103,108 ----
          ConfigurationStore cs = new ConfigurationStore();
  
!         // use the default factories from the configuration
!         cs.useDefaultFactories();
  
          // get the PDP configuration's policy finder modules...