TEIID-4028: renaming the salesforce-34 resource module not use the sl…

…ot mechanism
teiid · Mar 13, 2016 · 70630d7 · 70630d7
1 parent a5c627e
commit 70630d7
Show file tree

Hide file tree

Showing 8 changed files with 6 additions and 8 deletions.
diff --git a/connectors/connector-salesforce-34/kits/wildfly-dist.xml b/connectors/connector-salesforce-34/kits/wildfly-dist.xml
@@ -22,7 +22,7 @@
     </fileSets>
     <dependencySets>
         <dependencySet>
-            <outputDirectory>${wildfly-module-root}/org/jboss/teiid/resource-adapter/salesforce/34</outputDirectory>
+            <outputDirectory>${wildfly-module-root}/org/jboss/teiid/resource-adapter/salesforce-34/main</outputDirectory>
             <includes>
                 <include>org.jboss.teiid.connectors:connector-salesforce</include>
             </includes>

diff --git a/...dapter/salesforce/34/META-INF/MANIFEST.MF → ...r/salesforce-34/main/META-INF/MANIFEST.MF b/...dapter/salesforce/34/META-INF/MANIFEST.MF → ...r/salesforce-34/main/META-INF/MANIFEST.MF
diff --git a/...rce-adapter/salesforce/34/META-INF/ra.xml → ...dapter/salesforce-34/main/META-INF/ra.xml b/...rce-adapter/salesforce/34/META-INF/ra.xml → ...dapter/salesforce-34/main/META-INF/ra.xml
diff --git a/...resource-adapter/salesforce/34/module.xml → ...rce-adapter/salesforce-34/main/module.xml b/...resource-adapter/salesforce/34/module.xml → ...rce-adapter/salesforce-34/main/module.xml
@@ -1,4 +1,4 @@
-<module xmlns="urn:jboss:module:1.1" name="org.jboss.teiid.resource-adapter.salesforce" slot="34">
+<module xmlns="urn:jboss:module:1.1" name="org.jboss.teiid.resource-adapter.salesforce-34">
     <properties>
         <property name="jboss.api" value="private"/>
     </properties>

diff --git a/...translator-salesforce-34/kits/wildfly/docs/teiid/datasources/salesforce/salesforce-34.xml b/...translator-salesforce-34/kits/wildfly/docs/teiid/datasources/salesforce/salesforce-34.xml
@@ -2,7 +2,7 @@
 <subsystem xmlns="urn:jboss:domain:resource-adapters:1.1">
     <resource-adapters>
         <resource-adapter id="sf34">
-            <module slot="34" id="org.jboss.teiid.resource-adapter.salesforce"/>
+            <module id="org.jboss.teiid.resource-adapter.salesforce-34"/>
             <transaction-support>NoTransaction</transaction-support>
             <connection-definitions>
                 <connection-definition class-name="org.teiid.resource.adapter.salesforce.SalesForceManagedConnectionFactory" 

diff --git a/jboss-integration/kits/wildfly/bin/scripts/teiid-domain-mode-install.cli b/jboss-integration/kits/wildfly/bin/scripts/teiid-domain-mode-install.cli
@@ -110,8 +110,7 @@ connect
 /profile=ha/subsystem=resource-adapters/resource-adapter=google:add(module=org.jboss.teiid.resource-adapter.google)
 /profile=ha/subsystem=resource-adapters/resource-adapter=ldap:add(module=org.jboss.teiid.resource-adapter.ldap)
 /profile=ha/subsystem=resource-adapters/resource-adapter=salesforce:add(module=org.jboss.teiid.resource-adapter.salesforce)
-# slot does not work- add manually
-#/profile=ha/subsystem=resource-adapters/resource-adapter=salesforce-34:add(module=org.jboss.teiid.resource-adapter.salesforce, slot="34")
+#/profile=ha/subsystem=resource-adapters/resource-adapter=salesforce-34:add(module=org.jboss.teiid.resource-adapter.salesforce-34)
 /profile=ha/subsystem=resource-adapters/resource-adapter=webservice:add(module=org.jboss.teiid.resource-adapter.webservice)
 /profile=ha/subsystem=resource-adapters/resource-adapter=mongodb:add(module=org.jboss.teiid.resource-adapter.mongodb)
 /profile=ha/subsystem=resource-adapters/resource-adapter=cassandra:add(module=org.jboss.teiid.resource-adapter.cassandra)

diff --git a/jboss-integration/kits/wildfly/bin/scripts/teiid-standalone-mode-install.cli b/jboss-integration/kits/wildfly/bin/scripts/teiid-standalone-mode-install.cli
@@ -102,8 +102,7 @@ connect
 /subsystem=resource-adapters/resource-adapter=google:add(module=org.jboss.teiid.resource-adapter.google)
 /subsystem=resource-adapters/resource-adapter=ldap:add(module=org.jboss.teiid.resource-adapter.ldap)
 /subsystem=resource-adapters/resource-adapter=salesforce:add(module=org.jboss.teiid.resource-adapter.salesforce)
-# slot does not work- add manually
-#/subsystem=resource-adapters/resource-adapter=salesforce-34:add(module=org.jboss.teiid.resource-adapter.salesforce, slot="34")
+#/subsystem=resource-adapters/resource-adapter=salesforce-34:add(module=org.jboss.teiid.resource-adapter.salesforce-34)
 /subsystem=resource-adapters/resource-adapter=webservice:add(module=org.jboss.teiid.resource-adapter.webservice)
 /subsystem=resource-adapters/resource-adapter=mongodb:add(module=org.jboss.teiid.resource-adapter.mongodb)
 /subsystem=resource-adapters/resource-adapter=cassandra:add(module=org.jboss.teiid.resource-adapter.cassandra)

diff --git a/jboss-integration/kits/wildfly/standalone/configuration/standalone-teiid.xml b/jboss-integration/kits/wildfly/standalone/configuration/standalone-teiid.xml
@@ -346,7 +346,7 @@
                     <module slot="main" id="org.jboss.teiid.resource-adapter.salesforce"/>
                 </resource-adapter>
                 <resource-adapter id="salesforce-34">
-                    <module slot="34" id="org.jboss.teiid.resource-adapter.salesforce"/>
+                    <module id="org.jboss.teiid.resource-adapter.salesforce-34"/>
                 </resource-adapter>                
                 <resource-adapter id="webservice">
                     <module slot="main" id="org.jboss.teiid.resource-adapter.webservice"/>