svn commit: r748007 - in /tuscany/branches/sca-java-1.x/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/confidentiality: ConfidentialityPolicy.java ConfidentialityPolicyProcessor.java

[lresende]

Author: lresende
Date: Thu Feb 26 04:31:13 2009
New Revision: 748007

URL: http://svn.apache.org/viewvc?rev=748007&view=rev
Log:
Minor cleanup on the policy properties

Modified:
    
tuscany/branches/sca-java-1.x/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/confidentiality/ConfidentialityPolicy.java
    
tuscany/branches/sca-java-1.x/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/confidentiality/ConfidentialityPolicyProcessor.java

Modified: 
tuscany/branches/sca-java-1.x/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/confidentiality/ConfidentialityPolicy.java
URL: 
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/confidentiality/ConfidentialityPolicy.java?rev=748007&r1=748006&r2=748007&view=diff
==============================================================================
--- 
tuscany/branches/sca-java-1.x/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/confidentiality/ConfidentialityPolicy.java
 (original)
+++ 
tuscany/branches/sca-java-1.x/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/confidentiality/ConfidentialityPolicy.java
 Thu Feb 26 04:31:13 2009
@@ -46,13 +46,23 @@
 public class ConfidentialityPolicy implements Policy {
     public static final QName NAME = new QName(Constants.SCA10_TUSCANY_NS, 
"confidentiality");
 
+    private String trustStoreType;
     private String trustStore;
     private String trustStorePassword;
+    
+    private String keyStoreType;
     private String keyStore;
     private String keyStorePassword;
-    private String keyStoreType;
-    private String trustStoreType;
-     
+    
+    
+    public String getTrustStoreType() {
+        return trustStoreType;
+    }
+
+    public void setTrustStoreType(String trustStoreType) {
+        this.trustStoreType = trustStoreType;
+    }
+    
     public String getTrustStore() {
         return trustStore;
     }
@@ -69,6 +79,14 @@
         this.trustStorePassword = trustStorePassword;
     }
 
+    public String getKeyStoreType() {
+        return keyStoreType;
+    }
+
+    public void setKeyStoreType(String keyStoreType) {
+        this.keyStoreType = keyStoreType;
+    }
+    
     public String getKeyStore() {
         return keyStore;
     }
@@ -85,22 +103,6 @@
         this.keyStorePassword = keyStorePassword;
     }
 
-    public String getKeyStoreType() {
-        return keyStoreType;
-    }
-
-    public void setKeyStoreType(String keyStoreType) {
-        this.keyStoreType = keyStoreType;
-    }
-
-    public String getTrustStoreType() {
-        return trustStoreType;
-    }
-
-    public void setTrustStoreType(String trustStoreType) {
-        this.trustStoreType = trustStoreType;
-    }
-
     public QName getSchemaName() {
         return NAME;
     }

Modified: 
tuscany/branches/sca-java-1.x/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/confidentiality/ConfidentialityPolicyProcessor.java
URL: 
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/confidentiality/ConfidentialityPolicyProcessor.java?rev=748007&r1=748006&r2=748007&view=diff
==============================================================================
--- 
tuscany/branches/sca-java-1.x/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/confidentiality/ConfidentialityPolicyProcessor.java
 (original)
+++ 
tuscany/branches/sca-java-1.x/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/confidentiality/ConfidentialityPolicyProcessor.java
 Thu Feb 26 04:31:13 2009
@@ -151,7 +151,6 @@
     }
 
     public void resolve(ConfidentialityPolicy model, ModelResolver resolver) 
throws ContributionResolveException {
-        // TODO Auto-generated method stub
 
     }