IIOP: remove deprecated security attributes

iiop-openjdk/src/main/java/org/wildfly/iiop/openjdk/IIOPExtension.java

@@ -48,6 +48,7 @@ public class IIOPExtension implements Extension {
     public static final String SUBSYSTEM_NAME = "iiop-openjdk";
 
     protected static final PathElement PATH_SUBSYSTEM = PathElement.pathElement(SUBSYSTEM, SUBSYSTEM_NAME);
+
     protected static final PathElement PATH_ORB = PathElement.pathElement(Constants.CONFIGURATION,
             Constants.ORB);
     protected static final PathElement PATH_TCP = PathElement.pathElement(Constants.SETTING,
@@ -75,6 +76,7 @@ public class IIOPExtension implements Extension {
     static final ModelVersion VERSION_1 = ModelVersion.create(1);
     private static final ModelVersion CURRENT_MODEL_VERSION = ModelVersion.create(3);
 
+
     static ResourceDescriptionResolver getResourceDescriptionResolver(final String... keyPrefix) {
         StringBuilder prefix = new StringBuilder(IIOPExtension.SUBSYSTEM_NAME);
         for (String kp : keyPrefix) {

iiop-openjdk/src/main/java/org/wildfly/iiop/openjdk/IIOPRootDefinition.java

@@ -152,6 +152,7 @@ class IIOPRootDefinition extends PersistentResourceDefinition {
     @Deprecated
     public static final AttributeDefinition ADD_COMPONENT_INTERCEPTOR = new SimpleAttributeDefinitionBuilder(
             Constants.SECURITY_ADD_COMP_VIA_INTERCEPTOR, ModelType.BOOLEAN, true)
+            .setDeprecated(IIOPExtension.VERSION_1)
             .setAttributeGroup(Constants.SECURITY)
             .setDefaultValue(new ModelNode(true))
             .setFlags(AttributeAccess.Flag.RESTART_ALL_SERVICES)
@@ -162,6 +163,7 @@ class IIOPRootDefinition extends PersistentResourceDefinition {
     @Deprecated
     public static final AttributeDefinition CLIENT_SUPPORTS = new SimpleAttributeDefinitionBuilder(
             Constants.SECURITY_CLIENT_SUPPORTS, ModelType.STRING, true)
+            .setDeprecated(IIOPExtension.VERSION_1)
             .setAttributeGroup(Constants.SECURITY)
             .setDefaultValue(new ModelNode().set(SSLConfigValue.MUTUALAUTH.toString()))
             .setValidator(SSL_CONFIG_VALIDATOR)
@@ -172,6 +174,7 @@ class IIOPRootDefinition extends PersistentResourceDefinition {
 
     public static final AttributeDefinition CLIENT_REQUIRES = new SimpleAttributeDefinitionBuilder(
             Constants.SECURITY_CLIENT_REQUIRES, ModelType.STRING, true)
+            .setDeprecated(IIOPExtension.VERSION_1)
             .setAttributeGroup(Constants.SECURITY)
             .setDefaultValue(new ModelNode().set(SSLConfigValue.NONE.toString()))
             .setValidator(SSL_CONFIG_VALIDATOR)
@@ -183,6 +186,7 @@ class IIOPRootDefinition extends PersistentResourceDefinition {
     @Deprecated
     public static final AttributeDefinition SERVER_SUPPORTS = new SimpleAttributeDefinitionBuilder(
             Constants.SECURITY_SERVER_SUPPORTS, ModelType.STRING, true)
+            .setDeprecated(IIOPExtension.VERSION_1)
             .setAttributeGroup(Constants.SECURITY)
             .setDefaultValue(new ModelNode().set(SSLConfigValue.MUTUALAUTH.toString()))
             .setValidator(SSL_CONFIG_VALIDATOR)
@@ -194,6 +198,7 @@ class IIOPRootDefinition extends PersistentResourceDefinition {
     @Deprecated
     public static final AttributeDefinition SERVER_REQUIRES = new SimpleAttributeDefinitionBuilder(
             Constants.SECURITY_SERVER_REQUIRES, ModelType.STRING, true)
+            .setDeprecated(IIOPExtension.VERSION_1)
             .setAttributeGroup(Constants.SECURITY)
             .setDefaultValue(new ModelNode().set(SSLConfigValue.NONE.toString()))
             .setValidator(SSL_CONFIG_VALIDATOR)

iiop-openjdk/src/main/java/org/wildfly/iiop/openjdk/IIOPSubsystemAdd.java

@@ -382,6 +382,6 @@ private IORSecurityConfigMetaData createIORSecurityConfigMetaData(final Operatio
     private void configureClientSecurity(final Properties props) {
         final SSLConfigValue clientRequiresSSL = SSLConfigValue
                 .fromValue(props.getProperty(Constants.SECURITY_CLIENT_REQUIRES));
-        CSIV2IORToSocketInfo.setClientTransportConfigMetaData(clientRequiresSSL);
+        CSIV2IORToSocketInfo.setClientRequiresSSL(clientRequiresSSL);
     }
 }

iiop-openjdk/src/main/java/org/wildfly/iiop/openjdk/Namespace.java

@@ -2,7 +2,7 @@
 
 /*
  * JBoss, Home of Professional Open Source.
- * Copyright 2014, Red Hat, Inc., and individual contributors
+ * Copyright 2016, Red Hat, Inc., and individual contributors
  * as indicated by the @author tags. See the copyright.txt file in the
  * distribution for a full listing of individual contributors.
  *
@@ -37,6 +37,7 @@ enum Namespace {
 
     static final Namespace CURRENT = IIOP_OPENJDK_3_0;
 
+
     private final String namespaceURI;
 
     /**

iiop-openjdk/src/main/java/org/wildfly/iiop/openjdk/csiv2/CSIV2IORToSocketInfo.java

@@ -74,7 +74,7 @@ public class CSIV2IORToSocketInfo implements IORToSocketInfo {
 
     private static SSLConfigValue clientRequiresSsl;
 
-    public static void setClientTransportConfigMetaData(final SSLConfigValue clientRequiresSSL) {
+    public static void setClientRequiresSSL(final SSLConfigValue clientRequiresSSL) {
         CSIV2IORToSocketInfo.clientRequiresSsl = clientRequiresSSL;
     }
 

iiop-openjdk/src/main/resources/org/wildfly/iiop/openjdk/LocalDescriptions.properties

@@ -27,10 +27,14 @@ iiop-openjdk.export-corbaloc=Indicates whether the root context should be export
 iiop-openjdk.support-ssl=Indicates whether SSL is to be supported (on) or not (off).
 iiop-openjdk.security-domain=The name of the security domain that holds the key and trust stores that will be used to establish SSL connections.
 iiop-openjdk.add-component-via-interceptor=Indicates whether SSL components should be added by an IOR interceptor (on) or not (off).
+iiop-openjdk.add-component-via-interceptor.deprecated=Indicates whether SSL components should be added by an IOR interceptor (on) or not (off).
 iiop-openjdk.client-supports=Value that indicates the client SSL supported parameters (None, ServerAuth, ClientAuth, MutualAuth).
+iiop-openjdk.client-supports.deprecated=Value that indicates the client SSL supported parameters (None, ServerAuth, ClientAuth, MutualAuth).
 iiop-openjdk.client-requires=Value that indicates the client SSL required parameters (None, ServerAuth, ClientAuth, MutualAuth).
 iiop-openjdk.server-supports=Value that indicates the server SSL supported parameters (None, ServerAuth, ClientAuth, MutualAuth).
+iiop-openjdk.server-supports.deprecated=Value that indicates the server SSL supported parameters (None, ServerAuth, ClientAuth, MutualAuth).
 iiop-openjdk.server-requires=Value that indicates the server SSL required parameters (None, ServerAuth, ClientAuth, MutualAuth).
+iiop-openjdk.server-requires.deprecated=Value that indicates the server SSL required parameters (None, ServerAuth, ClientAuth, MutualAuth).
 
 # IOR settings properties.
 iiop-openjdk.trust-in-client=Indicates if the transport must require trust in client to be established. Valid values are 'none', 'supported' and 'required'.

iiop-openjdk/src/main/resources/schema/jboss-as-iiop-openjdk_1_0.xsd → iiop-openjdk/src/main/resources/schema/wildfly-iiop-openjdk_1_0.xsd

@@ -80,7 +80,7 @@
                 <![CDATA[
                 The orbTCPConfigType specifies the attributes used to configure the TCP connections.
 
-                * high-water-mark: each time the number of connections exceeds this value ORB tries to reclaim connections. 
+                * high-water-mark: each time the number of connections exceeds this value ORB tries to reclaim connections.
                 * number-to-reclaim: number of reclaimed connections is specified by this property.
                         ]]>
             </xs:documentation>