[Sunxacml-commit] sunxacml/com/sun/xacml ConfigurationStore.java,1.4,1.5

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

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

Modified Files:
	ConfigurationStore.java 
Log Message:
re-factored so standard factories are immutable


Index: ConfigurationStore.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/ConfigurationStore.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ConfigurationStore.java	13 May 2004 20:36:49 -0000	1.4
--- ConfigurationStore.java	24 May 2004 20:55:06 -0000	1.5
***************
*** 357,364 ****
  
          // check if we're starting with the standard factory setup
!         if (useStandard(root, "useStandardDatatypes"))
!             factory = StandardAttributeFactory.getNewFactory();
!         else
              factory = new BaseAttributeFactory();
  
          // now look for all datatypes specified for this factory, adding
--- 357,367 ----
  
          // check if we're starting with the standard factory setup
!         if (useStandard(root, "useStandardDatatypes")) {
!             StandardAttributeFactory sf =
!                 StandardAttributeFactory.getFactory();
!             factory = new BaseAttributeFactory(sf.getStandardDatatypes());
!         } else {
              factory = new BaseAttributeFactory();
+         }
  
          // now look for all datatypes specified for this factory, adding
***************
*** 396,403 ****
  
          // check if we're starting with the standard factory setup
!         if (useStandard(root, "useStandardAlgorithms"))
!             factory = StandardCombiningAlgFactory.getNewFactory();
!         else
              factory = new BaseCombiningAlgFactory();
  
          // now look for all algorithms specified for this factory, adding
--- 399,409 ----
  
          // check if we're starting with the standard factory setup
!         if (useStandard(root, "useStandardAlgorithms")) {
!             StandardCombiningAlgFactory sf =
!                 StandardCombiningAlgFactory.getFactory();
!             factory = new BaseCombiningAlgFactory(sf.getStandardAlgorithms());
!         } else {
              factory = new BaseCombiningAlgFactory();
+         }
  
          // now look for all algorithms specified for this factory, adding
***************
*** 441,445 ****
          // make sure that the proxy is pre-configured
          if (useStandard(root, "useStandardFunctions")) {
!             proxy = StandardFunctionFactory.getNewFactory();
  
              targetFactory = proxy.getTargetFactory();
--- 447,451 ----
          // make sure that the proxy is pre-configured
          if (useStandard(root, "useStandardFunctions")) {
!             proxy = StandardFunctionFactory.getNewFactoryProxy();
  
              targetFactory = proxy.getTargetFactory();