Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'TEIID-3727' of https://github.com/rareddy/teiid
- Loading branch information
Showing
21 changed files
with
529 additions
and
25 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
31 changes: 31 additions & 0 deletions
31
build/kits/jboss-as7/overlay/docs/teiid/datasources/salesforce/salesforce-34.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,31 @@ | ||
| <!-- If susbsytem is already defined, only copy the contents under it and edit to suit your needs --> | ||
| <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"/> | ||
| <transaction-support>NoTransaction</transaction-support> | ||
| <connection-definitions> | ||
| <connection-definition class-name="org.teiid.resource.adapter.salesforce.SalesForceManagedConnectionFactory" | ||
| jndi-name="java:/sfDS" | ||
| enabled="true" | ||
| use-java-context="true" | ||
| pool-name="teiid-sf-ds"> | ||
|
|
||
| <!-- URL; the below is test; replace with actual URL you need to connect to --> | ||
| <config-property name="URL">https://www.salesforce.com/services/Soap/u/34.0</config-property> | ||
|
|
||
| <config-property name="username">user</config-property> | ||
| <config-property name="password">pass</config-property> | ||
|
|
||
| <!-- | ||
| optional properties to set timeouts, which can also be done through the CXF config | ||
| <config-property name="requestTimeout">long value</config-property> | ||
| <config-property name="connectTimeout">long value</config-property> | ||
| --> | ||
|
|
||
| </connection-definition> | ||
| </connection-definitions> | ||
| </resource-adapter> | ||
| </resource-adapters> | ||
| </subsystem> | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,29 @@ | ||
| <!--This script builds a zip for Embedded Installation --> | ||
| <assembly> | ||
|
|
||
| <id>embedded-dist</id> | ||
|
|
||
| <formats> | ||
| <format>zip</format> | ||
| </formats> | ||
|
|
||
| <includeBaseDirectory>false</includeBaseDirectory> | ||
|
|
||
| <fileSets> | ||
| <fileSet> | ||
| <directory>kits/embedded</directory> | ||
| <outputDirectory>/</outputDirectory> | ||
| <filtered>true</filtered> | ||
| <includes> | ||
| <include>**/*</include> | ||
| </includes> | ||
| </fileSet> | ||
| </fileSets> | ||
| <files> | ||
| <file> | ||
| <source>${project.build.directory}/${project.artifactId}-${project.version}.jar</source> | ||
| <outputDirectory>optional/salesforce-34</outputDirectory> | ||
| </file> | ||
| </files> | ||
|
|
||
| </assembly> |
27 changes: 27 additions & 0 deletions
27
connectors/connector-salesforce-34/kits/jboss-as7-dist.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,27 @@ | ||
| <!--This script builds a zip for Teiid Server Installation --> | ||
| <assembly> | ||
|
|
||
| <id>jboss-as7-dist</id> | ||
|
|
||
| <formats> | ||
| <format>zip</format> | ||
| </formats> | ||
|
|
||
| <includeBaseDirectory>false</includeBaseDirectory> | ||
| <baseDirectory>modules</baseDirectory> | ||
|
|
||
| <fileSets> | ||
| <fileSet> | ||
| <directory>kits/jboss-as7/modules</directory> | ||
| <outputDirectory>${jbossas-module-root}</outputDirectory> | ||
| <filtered>true</filtered> | ||
| <includes> | ||
| <include>**/*</include> | ||
| </includes> | ||
| </fileSet> | ||
| <fileSet> | ||
| <directory>${project.build.directory}/rar-unpack</directory> | ||
| <outputDirectory>${jbossas-module-root}/org/jboss/teiid/resource-adapter/salesforce/34</outputDirectory> | ||
| </fileSet> | ||
| </fileSets> | ||
| </assembly> |
52 changes: 52 additions & 0 deletions
52
...force-34/kits/jboss-as7/modules/org/jboss/teiid/resource-adapter/salesforce/34/module.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,52 @@ | ||
| <module xmlns="urn:jboss:module:1.1" name="org.jboss.teiid.resource-adapter.salesforce" slot="34"> | ||
| <properties> | ||
| <property name="jboss.api" value="private"/> | ||
| </properties> | ||
|
|
||
| <resources> | ||
| <resource-root path="connector-salesforce-${project.version}.jar"/> | ||
| <resource-root path="."/> | ||
| <!-- Insert resources here --> | ||
| </resources> | ||
|
|
||
| <dependencies> | ||
| <module name="sun.jdk" /> | ||
| <module name="javax.api"/> | ||
| <module name="javax.xml.ws.api"/> | ||
| <module name="javax.resource.api"/> | ||
| <module name="org.jboss.teiid.common-core"/> | ||
| <module name="org.jboss.teiid.api"/> | ||
| <module name="javax.jws.api"/> | ||
| <module name="javax.wsdl4j.api"/> | ||
| <module name="org.jboss.teiid.translator.salesforce" slot="34"/> | ||
| <module name="org.apache.cxf.impl.frontend-jaxrs" services="export" export="true"/> | ||
| <module name="org.apache.cxf.impl" export="true"> | ||
| <imports> | ||
| <include path="META-INF" /> | ||
| <include path="META-INF/cxf" /> | ||
| </imports> | ||
| <exports> | ||
| <include path="META-INF" /> | ||
| <include path="META-INF/cxf" /> | ||
| </exports> | ||
| </module> | ||
| <module name="org.apache.cxf" export="true"> | ||
| <imports> | ||
| <include path="META-INF" /> | ||
| <include path="META-INF/cxf" /> | ||
| </imports> | ||
| <exports> | ||
| <include path="META-INF" /> | ||
| <include path="META-INF/cxf" /> | ||
| </exports> | ||
| </module> | ||
| <module name="org.springframework.spring" optional="true" export="true"> | ||
| <imports> | ||
| <include path="META-INF" /> | ||
| </imports> | ||
| <exports> | ||
| <include path="META-INF" /> | ||
| </exports> | ||
| </module> | ||
| </dependencies> | ||
| </module> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,71 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | ||
| xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> | ||
| <parent> | ||
| <artifactId>connectors</artifactId> | ||
| <groupId>org.jboss.teiid</groupId> | ||
| <version>8.12.0.Beta4-SNAPSHOT</version> | ||
| </parent> | ||
| <modelVersion>4.0.0</modelVersion> | ||
| <artifactId>connector-salesforce-34</artifactId> | ||
| <groupId>org.jboss.teiid.connectors</groupId> | ||
| <name>Salesforce Resource Adapter API 34</name> | ||
| <description>Integrates the query engine with Salesforce.com.</description> | ||
|
|
||
| <dependencies> | ||
| <dependency> | ||
| <groupId>org.jboss.teiid.connectors</groupId> | ||
| <artifactId>connector-salesforce</artifactId> | ||
| <type>rar</type> | ||
| <scope>provided</scope> | ||
| </dependency> | ||
| </dependencies> | ||
|
|
||
| <build> | ||
| <plugins> | ||
| <plugin> | ||
| <groupId>org.apache.maven.plugins</groupId> | ||
| <artifactId>maven-dependency-plugin</artifactId> | ||
| <executions> | ||
| <execution> | ||
| <id>unpack-dependencies</id> | ||
| <phase>package</phase> | ||
| <goals> | ||
| <goal>unpack-dependencies</goal> | ||
| </goals> | ||
| <configuration> | ||
| <includeGroupIds>org.jboss.teiid.connectors</includeGroupIds> | ||
| <includeArtifactIds>connector-salesforce</includeArtifactIds> | ||
| <includeTypes>rar</includeTypes> | ||
| <includeScope>provided</includeScope> | ||
| <outputDirectory>${project.build.directory}/rar-unpack</outputDirectory> | ||
| <overWriteReleases>false</overWriteReleases> | ||
| <overWriteSnapshots>true</overWriteSnapshots> | ||
| <excludeTransitive>true</excludeTransitive> | ||
| </configuration> | ||
| </execution> | ||
| </executions> | ||
| </plugin> | ||
|
|
||
| <plugin> | ||
| <artifactId>maven-assembly-plugin</artifactId> | ||
| <configuration> | ||
| <descriptors> | ||
| <descriptor>kits/jboss-as7-dist.xml</descriptor> | ||
| <descriptor>kits/embedded-dist.xml</descriptor> | ||
| </descriptors> | ||
| </configuration> | ||
| <executions> | ||
| <execution> | ||
| <id>create-assemblies</id> | ||
| <phase>package</phase> | ||
| <goals> | ||
| <goal>single</goal> | ||
| </goals> | ||
| </execution> | ||
| </executions> | ||
| </plugin> | ||
|
|
||
| </plugins> | ||
| </build> | ||
| </project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
39 changes: 39 additions & 0 deletions
39
connectors/translator-salesforce-34/kits/embedded-dist.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,39 @@ | ||
| <!--This script builds a zip for Teiid Server Installation --> | ||
| <assembly> | ||
|
|
||
| <id>embedded-dist</id> | ||
|
|
||
| <formats> | ||
| <format>zip</format> | ||
| </formats> | ||
|
|
||
| <includeBaseDirectory>false</includeBaseDirectory> | ||
|
|
||
| <fileSets> | ||
| <fileSet> | ||
| <directory>kits/embedded</directory> | ||
| <outputDirectory>/</outputDirectory> | ||
| <filtered>true</filtered> | ||
| <includes> | ||
| <include>**/*</include> | ||
| </includes> | ||
| </fileSet> | ||
| </fileSets> | ||
|
|
||
| <dependencySets> | ||
| <dependencySet> | ||
| <outputDirectory>optional/salesforce-34</outputDirectory> | ||
| <useTransitiveDependencies>true</useTransitiveDependencies> | ||
| <includes> | ||
| <include>com.force.api:force-wsc</include> | ||
| <include>com.force.api:force-partner-api</include> | ||
| </includes> | ||
| </dependencySet> | ||
| <dependencySet> | ||
| <outputDirectory>optional/salesforce-34</outputDirectory> | ||
| <unpack>false</unpack> | ||
| <useTransitiveDependencies>false</useTransitiveDependencies> | ||
| </dependencySet> | ||
| </dependencySets> | ||
|
|
||
| </assembly> |
Oops, something went wrong.