Author: rareddy Date: 2011-10-03 11:15:05 -0400 (Mon, 03 Oct 2011) New Revision: 3515 Added: branches/as7/build/kits/jboss-as7/docs/teiid/datasources/mysql.xml branches/as7/build/kits/jboss-as7/docs/teiid/datasources/postgresql.xml branches/as7/build/kits/jboss-as7/docs/teiid/datasources/salesforce.xml branches/as7/build/kits/jboss-as7/docs/teiid/datasources/ws.xml branches/as7/build/kits/jboss-as7/domain/configuration/host.xml Modified: branches/as7/build/kits/jboss-as7/docs/teiid/datasources/oracle.xml branches/as7/build/kits/jboss-as7/domain/configuration/domain-teiid.xml branches/as7/build/kits/jboss-as7/standalone/configuration/standalone-teiid.xml branches/as7/engine/src/main/java/org/teiid/dqp/internal/datamgr/ConnectorManager.java branches/as7/jboss-integration/src/main/java/org/teiid/jboss/VDBDependencyDeployer.java branches/as7/jboss-integration/src/main/java/org/teiid/jboss/VDBDeployer.java branches/as7/jboss-integration/src/test/java/org/teiid/jboss/TestTeiidAdminOperations.java branches/as7/runtime/src/main/java/org/teiid/deployers/UDFMetaData.java Log: TEIID-1720: Automatic dependency jar loading for UDF functions, and tests Added: branches/as7/build/kits/jboss-as7/docs/teiid/datasources/mysql.xml =================================================================== --- branches/as7/build/kits/jboss-as7/docs/teiid/datasources/mysql.xml (rev 0) +++ branches/as7/build/kits/jboss-as7/docs/teiid/datasources/mysql.xml 2011-10-03 15:15:05 UTC (rev 3515) @@ -0,0 +1,23 @@ +<!-- If susbsytem is already defined, only copy the contents under it and edit to suit your needs --> +<subsystem xmlns="urn:jboss:domain:datasources:1.0"> + <datasources> + <datasource jndi-name="java:/mysql-ds" pool-name="mysqlDS"> + <connection-url>jdbc:mysql://{host}:3306/{database}</connection-url> + <driver>mysql</driver> + <pool> + <prefill>false</prefill> + <use-strict-min>false</use-strict-min> + <flush-strategy>FailingConnectionOnly</flush-strategy> + </pool> + <security> + <user-name>user</user-name> + <password>password</password> + </security> + </datasource> + <drivers> + <driver name="mysql" module="com.mysql"> + <xa-datasource-class>com.mysql.jdbc.jdbc2.optional.MysqlXADataSource</xa-datasource-class> + </driver> + </drivers> + </datasources> +</subsystem> \ No newline at end of file Property changes on: branches/as7/build/kits/jboss-as7/docs/teiid/datasources/mysql.xml ___________________________________________________________________ Added: svn:mime-type + text/plain Modified: branches/as7/build/kits/jboss-as7/docs/teiid/datasources/oracle.xml =================================================================== --- branches/as7/build/kits/jboss-as7/docs/teiid/datasources/oracle.xml 2011-10-03 15:12:45 UTC (rev 3514) +++ branches/as7/build/kits/jboss-as7/docs/teiid/datasources/oracle.xml 2011-10-03 15:15:05 UTC (rev 3515) @@ -1,7 +1,7 @@ <!-- If susbsytem is already defined, only copy the contents under it and edit to suit your needs --> <subsystem xmlns="urn:jboss:domain:datasources:1.0"> <datasources> - <datasource jndi-name="java:/Oracle11_PushDS" pool-name="OracleDS" enabled="true" jta="true" use-java-context="true" use-ccm="true"> + <datasource jndi-name="java:/OracleDS" pool-name="OracleDS" enabled="true" jta="true" use-java-context="true" use-ccm="true"> <connection-url>jdbc:oracle:thin:{host}:1521:orcl</connection-url> <driver>oracle</driver> <pool> Added: branches/as7/build/kits/jboss-as7/docs/teiid/datasources/postgresql.xml =================================================================== --- branches/as7/build/kits/jboss-as7/docs/teiid/datasources/postgresql.xml (rev 0) +++ branches/as7/build/kits/jboss-as7/docs/teiid/datasources/postgresql.xml 2011-10-03 15:15:05 UTC (rev 3515) @@ -0,0 +1,23 @@ +<!-- If susbsytem is already defined, only copy the contents under it and edit to suit your needs --> +<subsystem xmlns="urn:jboss:domain:datasources:1.0"> + <datasources> + <datasource jndi-name="java:/postgres-ds" pool-name="PostgreDS"> + <connection-url>jdbc:postgresql://{host}:5432/{database}</connection-url> + <driver>postgresql</driver> + <pool> + <prefill>false</prefill> + <use-strict-min>false</use-strict-min> + <flush-strategy>FailingConnectionOnly</flush-strategy> + </pool> + <security> + <user-name>user</user-name> + <password>pass</password> + </security> + </datasource> + <drivers> + <driver name="postgresql" module="org.postgresql"> + <xa-datasource-class>org.postgresql.xa.PGXADataSource</xa-datasource-class> + </driver> + </drivers> + </datasources> +</subsystem> \ No newline at end of file Property changes on: branches/as7/build/kits/jboss-as7/docs/teiid/datasources/postgresql.xml ___________________________________________________________________ Added: svn:mime-type + text/plain Added: branches/as7/build/kits/jboss-as7/docs/teiid/datasources/salesforce.xml =================================================================== --- branches/as7/build/kits/jboss-as7/docs/teiid/datasources/salesforce.xml (rev 0) +++ branches/as7/build/kits/jboss-as7/docs/teiid/datasources/salesforce.xml 2011-10-03 15:15:05 UTC (rev 3515) @@ -0,0 +1,30 @@ +<!-- 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.0"> + <resource-adapters> + <resource-adapter> + <archive>teiid-connector-salesforce.rar</archive> + <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://test.salesforce.com/services/Soap/u/10.0&... + + <config-property name="username">user</config-property> + <config-property name="password">pass</config-property> + + <!-- + Uncomment this property to supply specific configuration for SalesForce service. This configuration + must contain config for "SforceService" service with namespace "urn:partner.soap.sforce.com" + <config-property name="configFile">path/to/jbossws-cxf.xml</config-property> + --> + </connection-definition> + </connection-definitions> + </resource-adapter> + </resource-adapters> +</subsystem> + Property changes on: branches/as7/build/kits/jboss-as7/docs/teiid/datasources/salesforce.xml ___________________________________________________________________ Added: svn:mime-type + text/plain Added: branches/as7/build/kits/jboss-as7/docs/teiid/datasources/ws.xml =================================================================== --- branches/as7/build/kits/jboss-as7/docs/teiid/datasources/ws.xml (rev 0) +++ branches/as7/build/kits/jboss-as7/docs/teiid/datasources/ws.xml 2011-10-03 15:15:05 UTC (rev 3515) @@ -0,0 +1,27 @@ +<!-- 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.0"> + <resource-adapters> + <resource-adapter> + <archive>teiid-connector-ws.rar</archive> + <transaction-support>NoTransaction</transaction-support> + <connection-definitions> + <connection-definition class-name="org.teiid.resource.adapter.ws.WSManagedConnectionFactory" + jndi-name="java:/wsDS" + enabled="true" + use-java-context="true" + pool-name="teiid-ws-ds"> + + <!-- End point for the web service --> + <config-property name="EndPoint">endpoint url</config-property> + + <!-- + Uncomment these properties to supply specific CXF configuration for this service. This file + must contain configuration for name defined on "configName" property. + <config-property name="configFile">path/to/jbossws-cxf.xml</config-property> + <config-property name="configName">webSVC</config-property> + --> + </connection-definition> + </connection-definitions> + </resource-adapter> + </resource-adapters> +</subsystem> Property changes on: branches/as7/build/kits/jboss-as7/docs/teiid/datasources/ws.xml ___________________________________________________________________ Added: svn:mime-type + text/plain Modified: branches/as7/build/kits/jboss-as7/domain/configuration/domain-teiid.xml =================================================================== --- branches/as7/build/kits/jboss-as7/domain/configuration/domain-teiid.xml 2011-10-03 15:12:45 UTC (rev 3514) +++ branches/as7/build/kits/jboss-as7/domain/configuration/domain-teiid.xml 2011-10-03 15:15:05 UTC (rev 3515) @@ -51,285 +51,6 @@ </system-properties> <profiles> - <profile name="default"> - <subsystem xmlns="urn:jboss:domain:logging:1.1"> - <console-handler name="CONSOLE"> - <level name="INFO"/> - <formatter> - <pattern-formatter pattern="%d{HH:mm:ss,SSS} %-5p [%c] (%t) %s%E%n"/> - </formatter> - </console-handler> - - <periodic-rotating-file-handler name="FILE"> - <level name="INFO"/> - <formatter> - <pattern-formatter pattern="%d{HH:mm:ss,SSS} %-5p [%c] (%t) %s%E%n"/> - </formatter> - <file relative-to="jboss.server.log.dir" path="server.log"/> - <suffix value=".yyyy-MM-dd"/> - </periodic-rotating-file-handler> - - <logger category="com.arjuna"> - <level name="WARN"/> - </logger> - <logger category="org.apache.tomcat.util.modeler"> - <level name="WARN"/> - </logger> - <logger category="sun.rmi"> - <level name="WARN"/> - </logger> - - <root-logger> - <level name="INFO"/> - <handlers> - <handler name="CONSOLE"/> - <handler name="FILE"/> - </handlers> - </root-logger> - </subsystem> - <subsystem xmlns="urn:jboss:domain:datasources:1.0"> - <datasources> - <datasource jndi-name="java:jboss/datasources/ExampleDS" enabled="true" use-java-context="true" pool-name="H2DS"> - <connection-url>jdbc:h2:mem:test;DB_CLOSE_DELAY=-1</connection-url> - <driver>h2</driver> - <pool></pool> - <security> - <user-name>sa</user-name> - <password>sa</password> - </security> - </datasource> - <datasource jndi-name="java:/Oracle11_PushDS" pool-name="OracleDS" enabled="true" jta="true" use-java-context="true" use-ccm="true"> - <connection-url>jdbc:oracle:thin:@englxdbs11.mw.lab.eng.bos.redhat.com:1521:orcl</connection-url> - <driver>oracle</driver> - <pool> - <prefill>false</prefill> - <use-strict-min>false</use-strict-min> - <flush-strategy>FailingConnectionOnly</flush-strategy> - </pool> - <security> - <user-name>bqt2_ro</user-name> - <password>mm</password> - </security> - </datasource> - <drivers> - <driver name="h2" module="com.h2database.h2"> - <xa-datasource-class>org.h2.jdbcx.JdbcDataSource</xa-datasource-class> - </driver> - <driver name="oracle" module="com.oracle"> - <xa-datasource-class>oracle.jdbc.xa.client.OracleXADataSource</xa-datasource-class> - </driver> - </drivers> - </datasources> - </subsystem> - <subsystem xmlns="urn:jboss:domain:ee:1.0"/> - <subsystem xmlns="urn:jboss:domain:ejb3:1.1" lite="true"> - <!-- EJB3 pools --> - <pools> - <bean-instance-pools> - <strict-max-pool name="slsb-strict-max-pool" max-pool-size="20" instance-acquisition-timeout="5" - instance-acquisition-timeout-unit="MINUTES"/> - </bean-instance-pools> - </pools> - - <!-- Session bean configurations --> - <session-bean> - <stateless> - <bean-instance-pool-ref pool-name="slsb-strict-max-pool"/> - </stateless> - </session-bean> - - </subsystem> - <subsystem xmlns="urn:jboss:domain:infinispan:1.0" default-cache-container="hibernate"> - <cache-container name="hibernate" default-cache="local-query"> - <local-cache name="entity"> - <eviction strategy="LRU" max-entries="10000"/> - <expiration max-idle="100000"/> - </local-cache> - <local-cache name="local-query"> - <eviction strategy="LRU" max-entries="10000"/> - <expiration max-idle="100000"/> - </local-cache> - <local-cache name="timestamps"> - <eviction strategy="NONE"/> - </local-cache> - </cache-container> - <cache-container name="teiid" default-cache="resultset"> - <local-cache name="resultset"> - <expiration lifespan="7200" /> - <eviction max-entries="1024" strategy="LRU"/> - </local-cache> - </cache-container> - </subsystem> - <subsystem xmlns="urn:jboss:domain:jaxrs:1.0"/> - <subsystem xmlns="urn:jboss:domain:jca:1.0"> - <archive-validation enabled="true"/> - <bean-validation enabled="true"/> - <default-workmanager> - <short-running-threads blocking="true"> - <core-threads count="10" per-cpu="20"/> - <queue-length count="10" per-cpu="20"/> - <max-threads count="10" per-cpu="20"/> - <keepalive-time time="10" unit="seconds"/> - </short-running-threads> - <long-running-threads blocking="true"> - <core-threads count="10" per-cpu="20"/> - <queue-length count="10" per-cpu="20"/> - <max-threads count="10" per-cpu="20"/> - <keepalive-time time="10" unit="seconds"/> - </long-running-threads> - </default-workmanager> - </subsystem> - <subsystem xmlns="urn:jboss:domain:jmx:1.0"> - <jmx-connector registry-binding="jmx-connector-registry" server-binding="jmx-connector-server" /> - </subsystem> - <subsystem xmlns="urn:jboss:domain:jpa:1.0"> - <jpa default-datasource=""/> - </subsystem> - <subsystem xmlns="urn:jboss:domain:naming:1.0"/> - <subsystem xmlns="urn:jboss:domain:osgi:1.0" activation="lazy"> - <configuration pid="org.apache.felix.webconsole.internal.servlet.OsgiManager"> - <property name="manager.root">jboss-osgi</property> - </configuration> - <properties> - <!-- - A comma seperated list of module identifiers. Each system module - is added as a dependency to the OSGi framework module. The packages - from these system modules can be made visible as framework system packages. - http://www.osgi.org/javadoc/r4v42/org/osgi/framework/Constants.html#FRAME... - --> - <property name="org.jboss.osgi.system.modules"> - org.apache.commons.logging, - org.apache.log4j, - org.jboss.as.osgi, - org.slf4j, - </property> - <!-- - Framework environment property identifying extra packages which the system bundle - must export from the current execution environment - --> - <property name="org.osgi.framework.system.packages.extra"> - org.apache.commons.logging;version=1.1.1, - org.apache.log4j;version=1.2, - org.jboss.as.osgi.service;version=7.0, - org.jboss.osgi.deployment.interceptor;version=1.0, - org.jboss.osgi.spi.capability;version=1.0, - org.jboss.osgi.spi.util;version=1.0, - org.jboss.osgi.testing;version=1.0, - org.jboss.osgi.vfs;version=1.0, - org.slf4j;version=1.5.10, - </property> - <!-- Specifies the beginning start level of the framework --> - <property name="org.osgi.framework.startlevel.beginning">1</property> - </properties> - <modules> - <!-- modules registered with the OSGi layer on startup --> - <module identifier="javaee.api"/> - <module identifier="org.jboss.logging"/> - <!-- bundles installed on startup --> - <module identifier="org.apache.aries.util"/> - <module identifier="org.jboss.osgi.webconsole"/> - <module identifier="org.osgi.compendium"/> - <!-- bundles started in startlevel 1 --> - <module identifier="org.apache.felix.log" startlevel="1"/> - <module identifier="org.jboss.osgi.logging" startlevel="1"/> - <module identifier="org.apache.felix.configadmin" startlevel="1"/> - <module identifier="org.jboss.as.osgi.configadmin" startlevel="1"/> - <!-- bundles started in startlevel 2 --> - <module identifier="org.apache.aries.jmx" startlevel="2"/> - <module identifier="org.apache.felix.eventadmin" startlevel="2"/> - <module identifier="org.apache.felix.metatype" startlevel="2"/> - <module identifier="org.apache.felix.webconsole" startlevel="2"/> - <module identifier="org.jboss.osgi.jmx" startlevel="2"/> - <module identifier="org.jboss.osgi.http" startlevel="2"/> - <!-- bundles started in startlevel 3 --> - <module identifier="org.jboss.osgi.blueprint" startlevel="3"/> - <module identifier="org.jboss.osgi.webapp" startlevel="3"/> - <module identifier="org.jboss.osgi.xerces" startlevel="3"/> - </modules> - </subsystem> - <subsystem xmlns="urn:jboss:domain:remoting:1.0"/> - <subsystem xmlns="urn:jboss:domain:resource-adapters:1.0"/> - <subsystem xmlns="urn:jboss:domain:sar:1.0"/> - <subsystem xmlns="urn:jboss:domain:security:1.0"> - <security-domains> - <security-domain name="other"> - <authentication> - <login-module code="UsersRoles" flag="required"/> - </authentication> - </security-domain> - <security-domain name="teiid-security" cache-type="default"> - <authentication> - <login-module code="UsersRoles" flag="required"> - <module-option name="usersProperties" value="teiid-security-users.properties"/> - <module-option name="rolesProperties" value="teiid-security-roles.properties"/> - </login-module> - </authentication> - </security-domain> - </security-domains> - </subsystem> - <subsystem xmlns="urn:jboss:domain:teiid:1.0"> - <async-thread-group>teiid-async</async-thread-group> - <resultset-cache container-name="teiid" name="resultset"/> - - <query-engine name = "default"> - <security-domain>teiid-security</security-domain> - <jdbc socket-binding="teiid-jdbc"/> - <odbc socket-binding="teiid-odbc"/> - </query-engine> - - <translator name="jdbc-simple" module="org.jboss.teiid.translator.jdbc"/> - <translator name="jdbc-ansi" module="org.jboss.teiid.translator.jdbc"/> - <translator name="access" module="org.jboss.teiid.translator.jdbc"/> - <translator name="db2" module="org.jboss.teiid.translator.jdbc"/> - <translator name="derby" module="org.jboss.teiid.translator.jdbc"/> - <translator name="h2" module="org.jboss.teiid.translator.jdbc"/> - <translator name="hsql" module="org.jboss.teiid.translator.jdbc"/> - <translator name="informix" module="org.jboss.teiid.translator.jdbc"/> - <translator name="metamatrix" module="org.jboss.teiid.translator.jdbc"/> - <translator name="mysql" module="org.jboss.teiid.translator.jdbc"/> - <translator name="mysql5" module="org.jboss.teiid.translator.jdbc"/> - <translator name="oracle" module="org.jboss.teiid.translator.jdbc"/> - <translator name="postgresql" module="org.jboss.teiid.translator.jdbc"/> - <translator name="sqlserver" module="org.jboss.teiid.translator.jdbc"/> - <translator name="sybase" module="org.jboss.teiid.translator.jdbc"/> - <translator name="teiid" module="org.jboss.teiid.translator.jdbc"/> - <translator name="teradata" module="org.jboss.teiid.translator.jdbc"/> - <translator name="modeshape" module="org.jboss.teiid.translator.jdbc"/> - <translator name="ingres" module="org.jboss.teiid.translator.jdbc"/> - <translator name="ingres93" module="org.jboss.teiid.translator.jdbc"/> - <translator name="intersystems-cache" module="org.jboss.teiid.translator.jdbc"/> - <translator name="netezza" module="org.jboss.teiid.translator.jdbc"/> - <translator name="file" module="org.jboss.teiid.translator.file"/> - <translator name="ldap" module="org.jboss.teiid.translator.ldap"/> - <translator name="loopback" module="org.jboss.teiid.translator.loopback"/> - <translator name="olap" module="org.jboss.teiid.translator.olap"/> - <translator name="ws" module="org.jboss.teiid.translator.ws"/> - </subsystem> - - <subsystem xmlns="urn:jboss:domain:threads:1.0"> - <queueless-thread-pool name="teiid-async"> - <max-threads count="2" per-cpu="2" /> - </queueless-thread-pool> - </subsystem> - <subsystem xmlns="urn:jboss:domain:transactions:1.0"> - <recovery-environment socket-binding="txn-recovery-environment" status-socket-binding="txn-status-manager"/> - <core-environment> - <process-id> - <uuid /> - </process-id> - </core-environment> - <coordinator-environment default-timeout="300"/> - </subsystem> - <subsystem xmlns="urn:jboss:domain:web:1.0" default-virtual-server="default-host"> - <connector name="http" scheme="http" protocol="HTTP/1.1" socket-binding="http"/> - <virtual-server name="default-host"> - <alias name="localhost" /> - <alias name="example.com" /> - </virtual-server> - </subsystem> - <subsystem xmlns="urn:jboss:domain:weld:1.0"/> - </profile> - <profile name="ha"> <subsystem xmlns="urn:jboss:domain:logging:1.1"> <console-handler name="CONSOLE"> @@ -377,26 +98,10 @@ <password>sa</password> </security> </datasource> - <datasource jndi-name="java:/Oracle11_PushDS" pool-name="OracleDS" enabled="true" jta="true" use-java-context="true" use-ccm="true"> - <connection-url>jdbc:oracle:thin:@englxdbs11.mw.lab.eng.bos.redhat.com:1521:orcl</connection-url> - <driver>oracle</driver> - <pool> - <prefill>false</prefill> - <use-strict-min>false</use-strict-min> - <flush-strategy>FailingConnectionOnly</flush-strategy> - </pool> - <security> - <user-name>bqt2_ro</user-name> - <password>mm</password> - </security> - </datasource> <drivers> <driver name="h2" module="com.h2database.h2"> <xa-datasource-class>org.h2.jdbcx.JdbcDataSource</xa-datasource-class> </driver> - <driver name="oracle" module="com.oracle"> - <xa-datasource-class>oracle.jdbc.xa.client.OracleXADataSource</xa-datasource-class> - </driver> </drivers> </datasources> </subsystem> @@ -695,19 +400,6 @@ </interfaces> <socket-binding-groups> - <socket-binding-group name="standard-sockets" default-interface="public"> - <socket-binding name="http" port="8080"/> - <socket-binding name="https" port="8443"/> - <socket-binding name="jmx-connector-registry" port="1090"/> - <socket-binding name="jmx-connector-server" port="1091"/> - <socket-binding name="jndi" port="1099"/> - <socket-binding name="osgi-http" port="8090"/> - <socket-binding name="remoting" port="4447"/> - <socket-binding name="txn-recovery-environment" port="4712"/> - <socket-binding name="txn-status-manager" port="4713"/> - <socket-binding name="teiid-jdbc" port="31000"/> - <socket-binding name="teiid-odbc" port="35432"/> - </socket-binding-group> <socket-binding-group name="ha-sockets" default-interface="public"> <socket-binding name="http" port="8080"/> <socket-binding name="https" port="8443"/> @@ -731,17 +423,10 @@ </socket-binding-groups> <server-groups> - <server-group name="main-server-group" profile="default"> + <server-group name="main-server-group" profile="ha"> <jvm name="default"> <heap size="64m" max-size="512m"/> </jvm> - <socket-binding-group ref="standard-sockets"/> - </server-group> - - <server-group name="other-server-group" profile="ha"> - <jvm name="default"> - <heap size="64m" max-size="512m"/> - </jvm> <socket-binding-group ref="ha-sockets"/> </server-group> </server-groups> Added: branches/as7/build/kits/jboss-as7/domain/configuration/host.xml =================================================================== --- branches/as7/build/kits/jboss-as7/domain/configuration/host.xml (rev 0) +++ branches/as7/build/kits/jboss-as7/domain/configuration/host.xml 2011-10-03 15:15:05 UTC (rev 3515) @@ -0,0 +1,82 @@ +<!-- + ~ JBoss, Home of Professional Open Source. + ~ Copyright 2010, 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. + ~ + ~ This is free software; you can redistribute it and/or modify it + ~ under the terms of the GNU Lesser General Public License as + ~ published by the Free Software Foundation; either version 2.1 of + ~ the License, or (at your option) any later version. + ~ + ~ This software is distributed in the hope that it will be useful, + ~ but WITHOUT ANY WARRANTY; without even the implied warranty of + ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + ~ Lesser General Public License for more details. + ~ + ~ You should have received a copy of the GNU Lesser General Public + ~ License along with this software; if not, write to the Free + ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. + --> + +<host xmlns="urn:jboss:domain:1.0" + name="master"> + + <management> + <security-realms> + <security-realm name="PropertiesMgmtSecurityRealm"> + <authentication> + <properties path="mgmt-users.properties" relative-to="jboss.domain.config.dir" /> + </authentication> + </security-realm> + </security-realms> + <management-interfaces> + <native-interface interface="management" port="9999" /> + <http-interface interface="management" port="9990"/> + </management-interfaces> + </management> + + <domain-controller> + <local/> + <!-- Alternative remote domain controller configuration with a host and port --> + <!-- <remote host="192.168.100.1" port="9999"/> --> + </domain-controller> + + <interfaces> + <interface name="management"> + <inet-address value="${jboss.bind.address.management:127.0.0.1}"/> + </interface> + <interface name="public"> + <inet-address value="${jboss.bind.address.public:127.0.0.1}"/> + </interface> + </interfaces> + + <jvms> + <jvm name="default"> + <heap size="64m" max-size="128m"/> + </jvm> + </jvms> + + <servers> + <server name="server-one" group="main-server-group"> + <!-- server-one inherits the default socket-group declared in the server-group --> + <jvm name="default"/> + </server> + + <server name="server-two" group="main-server-group" auto-start="true"> + <!-- server-two avoids port conflicts by incrementing the ports in + the default socket-group declared in the server-group --> + <socket-binding-group ref="ha-sockets" port-offset="150"/> + <jvm name="default"> + <heap size="64m" max-size="256m"/> + </jvm> + </server> + + <server name="server-three" group="main-server-group" auto-start="false"> + <!-- server-three avoids port conflicts by incrementing the ports in + the default socket-group declared in the server-group --> + <socket-binding-group ref="ha-sockets" port-offset="250"/> + </server> + </servers> +</host> Property changes on: branches/as7/build/kits/jboss-as7/domain/configuration/host.xml ___________________________________________________________________ Added: svn:mime-type + text/plain Modified: branches/as7/build/kits/jboss-as7/standalone/configuration/standalone-teiid.xml =================================================================== --- branches/as7/build/kits/jboss-as7/standalone/configuration/standalone-teiid.xml 2011-10-03 15:12:45 UTC (rev 3514) +++ branches/as7/build/kits/jboss-as7/standalone/configuration/standalone-teiid.xml 2011-10-03 15:15:05 UTC (rev 3515) @@ -108,7 +108,7 @@ </datasource> <datasource jndi-name="java:/postgres-ds" pool-name="PostgreDS"> <connection-url>jdbc:postgresql://127.0.0.1:5432/txns</connection-url> - <driver>postgresql-8.3-603.jdbc3.jar</driver> + <driver>postgresql</driver> <pool> <prefill>false</prefill> <use-strict-min>false</use-strict-min> @@ -121,7 +121,7 @@ </datasource> <datasource jndi-name="java:/mysql-ds" pool-name="mysqlDS"> <connection-url>jdbc:mysql://localhost:3306/txns</connection-url> - <driver>mysql-connector-java-5.1.5.jar</driver> + <driver>mysql</driver> <pool> <prefill>false</prefill> <use-strict-min>false</use-strict-min> @@ -139,6 +139,8 @@ <driver name="oracle" module="com.oracle"> <xa-datasource-class>oracle.jdbc.xa.client.OracleXADataSource</xa-datasource-class> </driver> + <driver name="com.mysql" module="com.mysql"/> + <driver name="postgresql" module="com.mysql"/> </drivers> </datasources> </subsystem> Modified: branches/as7/engine/src/main/java/org/teiid/dqp/internal/datamgr/ConnectorManager.java =================================================================== --- branches/as7/engine/src/main/java/org/teiid/dqp/internal/datamgr/ConnectorManager.java 2011-10-03 15:12:45 UTC (rev 3514) +++ branches/as7/engine/src/main/java/org/teiid/dqp/internal/datamgr/ConnectorManager.java 2011-10-03 15:15:05 UTC (rev 3515) @@ -33,7 +33,6 @@ import java.util.concurrent.ConcurrentHashMap; import javax.naming.InitialContext; -import javax.naming.NamingException; import javax.resource.ResourceException; import org.teiid.core.TeiidComponentException; @@ -41,10 +40,10 @@ import org.teiid.dqp.message.AtomicRequestID; import org.teiid.dqp.message.AtomicRequestMessage; import org.teiid.logging.CommandLogMessage; +import org.teiid.logging.CommandLogMessage.Event; import org.teiid.logging.LogConstants; import org.teiid.logging.LogManager; import org.teiid.logging.MessageLevel; -import org.teiid.logging.CommandLogMessage.Event; import org.teiid.metadata.Datatype; import org.teiid.metadata.FunctionMethod; import org.teiid.metadata.MetadataFactory; @@ -66,7 +65,7 @@ */ public class ConnectorManager { - private static final String JAVA_CONTEXT = "java:"; //$NON-NLS-1$ + private static final String JAVA_CONTEXT = "java:/"; //$NON-NLS-1$ private String translatorName; private String connectionName; @@ -257,12 +256,12 @@ InitialContext ic = new InitialContext(); try { return ic.lookup(jndiName); - } catch (NamingException e) { + } catch (Exception e) { if (!jndiName.equals(this.connectionName)) { return ic.lookup(this.connectionName); } } - } catch (NamingException e) { + } catch (Exception e) { throw new TranslatorException(e, QueryPlugin.Util.getString("connection_factory_not_found", this.connectionName)); //$NON-NLS-1$ } } Modified: branches/as7/jboss-integration/src/main/java/org/teiid/jboss/VDBDependencyDeployer.java =================================================================== --- branches/as7/jboss-integration/src/main/java/org/teiid/jboss/VDBDependencyDeployer.java 2011-10-03 15:12:45 UTC (rev 3514) +++ branches/as7/jboss-integration/src/main/java/org/teiid/jboss/VDBDependencyDeployer.java 2011-10-03 15:15:05 UTC (rev 3515) @@ -25,8 +25,17 @@ import java.io.IOException; import java.util.List; -import org.jboss.as.server.deployment.*; -import org.jboss.as.server.deployment.module.*; +import org.jboss.as.server.deployment.Attachments; +import org.jboss.as.server.deployment.DeploymentPhaseContext; +import org.jboss.as.server.deployment.DeploymentUnit; +import org.jboss.as.server.deployment.DeploymentUnitProcessingException; +import org.jboss.as.server.deployment.DeploymentUnitProcessor; +import org.jboss.as.server.deployment.module.ModuleDependency; +import org.jboss.as.server.deployment.module.ModuleRootMarker; +import org.jboss.as.server.deployment.module.ModuleSpecification; +import org.jboss.as.server.deployment.module.MountHandle; +import org.jboss.as.server.deployment.module.ResourceRoot; +import org.jboss.as.server.deployment.module.TempFileProviderService; import org.jboss.modules.Module; import org.jboss.modules.ModuleIdentifier; import org.jboss.modules.ModuleLoadException; Modified: branches/as7/jboss-integration/src/main/java/org/teiid/jboss/VDBDeployer.java =================================================================== --- branches/as7/jboss-integration/src/main/java/org/teiid/jboss/VDBDeployer.java 2011-10-03 15:12:45 UTC (rev 3514) +++ branches/as7/jboss-integration/src/main/java/org/teiid/jboss/VDBDeployer.java 2011-10-03 15:15:05 UTC (rev 3515) @@ -25,15 +25,20 @@ import java.util.List; import java.util.concurrent.Executor; +import javax.naming.InitialContext; + +import org.jboss.as.server.deployment.Attachments; import org.jboss.as.server.deployment.DeploymentPhaseContext; import org.jboss.as.server.deployment.DeploymentUnit; import org.jboss.as.server.deployment.DeploymentUnitProcessingException; import org.jboss.as.server.deployment.DeploymentUnitProcessor; +import org.jboss.modules.Module; import org.jboss.msc.service.ServiceBuilder; import org.jboss.msc.service.ServiceBuilder.DependencyType; import org.jboss.msc.service.ServiceController; import org.jboss.msc.service.ServiceController.Mode; import org.teiid.adminapi.Translator; +import org.teiid.adminapi.impl.ModelMetaData; import org.teiid.adminapi.impl.VDBMetaData; import org.teiid.adminapi.impl.VDBTranslatorMetaData; import org.teiid.deployers.TeiidAttachments; @@ -49,7 +54,7 @@ class VDBDeployer implements DeploymentUnitProcessor { - + private static final String JAVA_CONTEXT = "java:/"; //$NON-NLS-1$ private TranslatorRepository translatorRepository; private String asyncThreadPoolName; @@ -91,10 +96,14 @@ throw new DeploymentUnitProcessingException(RuntimePlugin.Util.getString("translator_type_not_found", deploymentName)); //$NON-NLS-1$ } } - + // check if this is a VDB with index files, if there are then build the TransformationMetadata UDFMetaData udf = deploymentUnit.getAttachment(TeiidAttachments.UDF_METADATA); if (udf != null) { + final Module module = deploymentUnit.getAttachment(Attachments.MODULE); + if (module != null) { + udf.setFunctionClassLoader(module.getClassLoader()); + } deployment.addAttchment(UDFMetaData.class, udf); } @@ -111,14 +120,15 @@ ArrayList<String> unAvailableDS = new ArrayList<String>(); VDBService vdb = new VDBService(deployment); ServiceBuilder<VDBMetaData> vdbService = context.getServiceTarget().addService(TeiidServiceNames.vdbServiceName(deployment.getName(), deployment.getVersion()), vdb); -// for (ModelMetaData model:deployment.getModelMetaDatas().values()) { -// for (String sourceName:model.getSourceNames()) { -// vdbService.addDependency(ServiceName.JBOSS.append("data-source", model.getSourceConnectionJndiName(sourceName))); //$NON-NLS-1$ -// if (context.getServiceRegistry().getService(ServiceName.JBOSS.append("data-source", model.getSourceConnectionJndiName(sourceName))) == null) { //$NON-NLS-1$ -// unAvailableDS.add(model.getSourceConnectionJndiName(sourceName)); -// } -// } -// } + for (ModelMetaData model:deployment.getModelMetaDatas().values()) { + for (String sourceName:model.getSourceNames()) { + //TODO: need to make the service as dependency; otherwise dynamic vdbs will not work correctly. + //vdbService.addDependency(ServiceName.JBOSS.append("data-source", model.getSourceConnectionJndiName(sourceName))); //$NON-NLS-1$ + if (!isSourceAvailable(model.getSourceConnectionJndiName(sourceName))) { + unAvailableDS.add(model.getSourceConnectionJndiName(sourceName)); + } + } + } // adding the translator services is redundant, however if one is removed then it is an issue. for (Translator t: deployment.getOverrideTranslators()) { @@ -141,6 +151,26 @@ } + private boolean isSourceAvailable(String name) { + String jndiName = name; + if (!name.startsWith(JAVA_CONTEXT)) { + jndiName = JAVA_CONTEXT + jndiName; + } + try { + InitialContext ic = new InitialContext(); + try { + ic.lookup(jndiName); + } catch (Exception e) { + if (!jndiName.equals(name)) { + ic.lookup(name); + } + } + } catch (Exception e) { + return false; + } + return true; + } + @Override public void undeploy(final DeploymentUnit deploymentUnit) { if (!TeiidAttachments.isVDBDeployment(deploymentUnit)) { Modified: branches/as7/jboss-integration/src/test/java/org/teiid/jboss/TestTeiidAdminOperations.java =================================================================== --- branches/as7/jboss-integration/src/test/java/org/teiid/jboss/TestTeiidAdminOperations.java 2011-10-03 15:12:45 UTC (rev 3514) +++ branches/as7/jboss-integration/src/test/java/org/teiid/jboss/TestTeiidAdminOperations.java 2011-10-03 15:15:05 UTC (rev 3515) @@ -8,6 +8,9 @@ import java.io.FileReader; import java.io.IOException; import java.net.URL; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; import java.util.List; import javax.xml.transform.Source; @@ -188,13 +191,9 @@ } @Test - public void testOperatrions() throws Exception { + public void testQueryOperatrions() throws Exception { String subsystemXml = ObjectConverterUtil.convertToString(new FileReader("src/test/resources/teiid-sample-config.xml")); - String json = ObjectConverterUtil.convertToString(new FileReader("src/test/resources/teiid-model-json.txt")); - ModelNode testModel = ModelNode.fromJSONString(json); - String triggered = outputModel(testModel); - KernelServices services = super.installInController( new AdditionalInitialization() { @Override @@ -203,5 +202,39 @@ } }, subsystemXml); - } + + PathAddress addr = PathAddress.pathAddress( + PathElement.pathElement(SUBSYSTEM, TeiidExtension.TEIID_SUBSYSTEM), + PathElement.pathElement("query-engine", "default")); + ModelNode addOp = new ModelNode(); + addOp.get(OP).set("read-operation-names"); + addOp.get(OP_ADDR).set(addr.toModelNode()); + + ModelNode result = services.executeOperation(addOp); + Assert.assertEquals(SUCCESS, result.get(OUTCOME).asString()); + + List<String> opNames = getList(result); + assertEquals(22, opNames.size()); + String [] ops = {"add", "cancel-request", "execute-query", "list-requests", "list-sessions", "list-transactions", + "long-running-queries", "read-attribute", "read-children-names", "read-children-resources", + "read-children-types", "read-operation-description", "read-operation-names", "read-resource", + "read-resource-description", "remove", "requests-per-session", "requests-per-vdb", + "terminate-session", "terminate-transaction", "workerpool-statistics", "write-attribute"}; + assertEquals(Arrays.asList(ops), opNames); + } + + private static List<String> getList(ModelNode operationResult) { + if(!operationResult.hasDefined("result")) + return Collections.emptyList(); + + List<ModelNode> nodeList = operationResult.get("result").asList(); + if(nodeList.isEmpty()) + return Collections.emptyList(); + + List<String> list = new ArrayList<String>(nodeList.size()); + for(ModelNode node : nodeList) { + list.add(node.asString()); + } + return list; + } } Modified: branches/as7/runtime/src/main/java/org/teiid/deployers/UDFMetaData.java =================================================================== --- branches/as7/runtime/src/main/java/org/teiid/deployers/UDFMetaData.java 2011-10-03 15:12:45 UTC (rev 3514) +++ branches/as7/runtime/src/main/java/org/teiid/deployers/UDFMetaData.java 2011-10-03 15:15:05 UTC (rev 3515) @@ -22,9 +22,12 @@ package org.teiid.deployers; import java.io.IOException; -import java.util.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashMap; +import java.util.List; +import java.util.Map; -import javax.xml.bind.JAXBException; import javax.xml.stream.XMLStreamException; import org.jboss.vfs.VirtualFile; @@ -86,5 +89,14 @@ for (Map.Entry<String, Collection<FunctionMethod>> entry : funcs.getFunctions().entrySet()) { addFunctions(entry.getKey(), entry.getValue()); } + } + + public void setFunctionClassLoader(ClassLoader functionClassLoader) { + for (String name : this.methods.keySet()) { + Collection <FunctionMethod> funcs = this.methods.get(name); + for(FunctionMethod fm:funcs) { + fm.setClassloader(functionClassLoader); + } + } } }