Minor cleanup on the policy properties

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@748007 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 21 insertions, 20 deletions

diff --git a/branches/sca-java-1.x/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/confidentiality/ConfidentialityPolicy.java b/branches/sca-java-1.x/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/confidentiality/ConfidentialityPolicy.java
index 7c97b38968..5301e13269 100644
--- a/branches/sca-java-1.x/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/confidentiality/ConfidentialityPolicy.java
+++ b/branches/sca-java-1.x/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/confidentiality/ConfidentialityPolicy.java
@@ -46,13 +46,23 @@ import org.apache.tuscany.sca.policy.Policy;
 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 @@ public class ConfidentialityPolicy implements Policy {
         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 @@ public class ConfidentialityPolicy implements Policy {
         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;
     }
diff --git a/branches/sca-java-1.x/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/confidentiality/ConfidentialityPolicyProcessor.java b/branches/sca-java-1.x/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/confidentiality/ConfidentialityPolicyProcessor.java
index 8d9621da96..8ca351d180 100644
--- a/branches/sca-java-1.x/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/confidentiality/ConfidentialityPolicyProcessor.java
+++ b/branches/sca-java-1.x/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/confidentiality/ConfidentialityPolicyProcessor.java
@@ -151,7 +151,6 @@ public class ConfidentialityPolicyProcessor implements StAXArtifactProcessor<Con
     }
 
     public void resolve(ConfidentialityPolicy model, ModelResolver resolver) throws ContributionResolveException {
-        // TODO Auto-generated method stub
 
     }