Author: svkrish
Date: Thu Jan 17 02:53:38 2008
New Revision: 612792

URL: http://svn.apache.org/viewvc?rev=612792&view=rev
Log:
fixes to get this to work either with manual JDK security settings or thro the 
programmatic setting of the system property

Modified:
    
incubator/tuscany/branches/sca-java-1.1/samples/calculator-implementation-policies/src/main/java/calculator/CalculatorClient.java
    
incubator/tuscany/branches/sca-java-1.1/samples/calculator-implementation-policies/src/test/java/calculator/CalculatorTestCase.java

Modified: 
incubator/tuscany/branches/sca-java-1.1/samples/calculator-implementation-policies/src/main/java/calculator/CalculatorClient.java
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.1/samples/calculator-implementation-policies/src/main/java/calculator/CalculatorClient.java?rev=612792&r1=612791&r2=612792&view=diff
==============================================================================
--- 
incubator/tuscany/branches/sca-java-1.1/samples/calculator-implementation-policies/src/main/java/calculator/CalculatorClient.java
 (original)
+++ 
incubator/tuscany/branches/sca-java-1.1/samples/calculator-implementation-policies/src/main/java/calculator/CalculatorClient.java
 Thu Jan 17 02:53:38 2008
@@ -27,7 +27,16 @@
  */
 public class CalculatorClient {
     public static void main(String[] args) throws Exception {
-       System.setProperty("java.security.auth.login.config", 
"target/classes/CalculatorJass.config");
+        
+        try {
+            Configuration secConf = Configuration.getConfiguration();
+        } catch ( java.lang.SecurityException e ) {
+            if ( e.getMessage().equals("Unable to locate a login 
configuration") ) {
+                System.setProperty("java.security.auth.login.config", 
"target/classes/CalculatorJass.config");
+            } else {
+                throw e;
+            }
+        }
 
         SCADomain scaDomain = SCADomain.newInstance("Calculator.composite");
         

Modified: 
incubator/tuscany/branches/sca-java-1.1/samples/calculator-implementation-policies/src/test/java/calculator/CalculatorTestCase.java
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.1/samples/calculator-implementation-policies/src/test/java/calculator/CalculatorTestCase.java?rev=612792&r1=612791&r2=612792&view=diff
==============================================================================
--- 
incubator/tuscany/branches/sca-java-1.1/samples/calculator-implementation-policies/src/test/java/calculator/CalculatorTestCase.java
 (original)
+++ 
incubator/tuscany/branches/sca-java-1.1/samples/calculator-implementation-policies/src/test/java/calculator/CalculatorTestCase.java
 Thu Jan 17 02:53:38 2008
@@ -33,7 +33,16 @@
 
     @Override
     protected void setUp() throws Exception {
-        System.setProperty("java.security.auth.login.config", 
"target/classes/CalculatorJass.config");
+        try {
+            Configuration secConf = Configuration.getConfiguration();
+        } catch ( java.lang.SecurityException e ) {
+            if ( e.getMessage().equals("Unable to locate a login 
configuration") ) {
+                System.setProperty("java.security.auth.login.config", 
"target/classes/CalculatorJass.config");
+            } else {
+                throw e;
+            }
+        }
+        
         scaDomain = SCADomain.newInstance("Calculator.composite");
         calculatorService = scaDomain.getService(CalculatorService.class, 
"CalculatorServiceComponent");
         anotherCalculatorService = 
scaDomain.getService(CalculatorService.class, 
"AnotherCalculatorServiceComponent");



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to