TEIIDDES-1998 writing and reading DefaultBinding and SecurityType con…

…nection info from model. * Setting default security type to None in new CP wizard
Teiid-Designer · Jan 3, 2014 · c0376be · c0376be
1 parent 51e9e91
commit c0376be
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 0 deletions.
diff --git a/...tools.ui/src/org/teiid/designer/datatools/profiles/ws/WSSoapProfileDetailsWizardPage.java b/...tools.ui/src/org/teiid/designer/datatools/profiles/ws/WSSoapProfileDetailsWizardPage.java
@@ -202,6 +202,7 @@ public void setVisible(boolean visible) {
 
         profileText.setText(wizard.getProfileName());
         descriptionText.setText(wizard.getProfileDescription());
+        setProperty(ICredentialsCommon.SECURITY_TYPE_ID, SecurityType.None.name());
     }
 
     /**

diff --git a/...nerator.wsdl/src/org/teiid/designer/modelgenerator/wsdl/WSSoapConnectionInfoProvider.java b/...nerator.wsdl/src/org/teiid/designer/modelgenerator/wsdl/WSSoapConnectionInfoProvider.java
@@ -99,6 +99,11 @@ public void setConnectionInfo( ModelResource modelResource,
 		if (endPointURI != null) {
             connectionProps.put(CONNECTION_NAMESPACE + END_POINT_URI_PROP_ID, endPointURI);
         }
+
+        String securityType = props.getProperty(SECURITY_TYPE_ID);
+        if (null != securityType) {
+            connectionProps.setProperty(CONNECTION_NAMESPACE + SECURITY_TYPE_ID, securityType);
+        }
 
         if (props.getProperty(CONNECTION_CLASS_KEY) != null) {
             connectionProps.put(CONNECTION_NAMESPACE + CONNECTION_CLASS_KEY, props.getProperty(CONNECTION_CLASS_KEY));
@@ -141,6 +146,17 @@ public Properties getConnectionProperties( ModelResource modelResource ) throws
             connectionProps.put(END_POINT_URI_PROP_ID, rawConnectionProps.get(END_POINT_URI_PROP_ID));
         }
 
+
+        if (rawConnectionProps.get(SECURITY_TYPE_ID) != null) {
+            connectionProps.put(SECURITY_TYPE_ID, rawConnectionProps.get(SECURITY_TYPE_ID));
+        }
+
+        Properties rawTranslatorConnectionProps = removeNamespaces(getHelper().getProperties(modelResource, TRANSLATOR_NAMESPACE));
+
+        if( rawTranslatorConnectionProps.getProperty(SOAP_BINDING) != null) {
+        	connectionProps.put(SOAP_BINDING, rawTranslatorConnectionProps.getProperty(SOAP_BINDING));
+        }
+
         // Security
         addSecurityProperties(rawConnectionProps, connectionProps, false);