Author: rareddy Date: 2011-11-22 11:17:43 -0500 (Tue, 22 Nov 2011) New Revision: 3686 Added: trunk/build/kits/jboss-as7/domain/configuration/host-teiid.xml Removed: trunk/build/kits/jboss-as7/domain/configuration/host.xml Modified: trunk/admin/pom.xml trunk/admin/src/main/java/org/teiid/adminapi/AdminFactory.java trunk/build/kits/jboss-as7/domain/configuration/domain-teiid.xml trunk/build/kits/jboss-as7/modules/org/jboss/teiid/main/module.xml trunk/cache-jbosscache/pom.xml trunk/cache-jbosscache/src/main/java/org/teiid/replication/jboss/JGroupsObjectReplicator.java trunk/cache-jbosscache/src/main/java/org/teiid/replication/jboss/JGroupsOutputStream.java trunk/jboss-integration/src/main/java/org/teiid/jboss/TeiidAdd.java trunk/jboss-integration/src/main/resources/org/teiid/jboss/i18n.properties trunk/pom.xml trunk/test-integration/common/pom.xml trunk/test-integration/common/src/test/java/org/teiid/systemmodel/TestMatViewReplication.java Log: TEIID-1720: upgrading to latest AS nightly Modified: trunk/admin/pom.xml =================================================================== --- trunk/admin/pom.xml 2011-11-22 16:05:22 UTC (rev 3685) +++ trunk/admin/pom.xml 2011-11-22 16:17:43 UTC (rev 3686) @@ -31,10 +31,6 @@ </dependency> <dependency> <groupId>org.jboss.as</groupId> - <artifactId>jboss-as-controller-client</artifactId> - </dependency> - <dependency> - <groupId>org.jboss.as</groupId> <artifactId>jboss-as-cli</artifactId> </dependency> </dependencies> Modified: trunk/admin/src/main/java/org/teiid/adminapi/AdminFactory.java =================================================================== --- trunk/admin/src/main/java/org/teiid/adminapi/AdminFactory.java 2011-11-22 16:05:22 UTC (rev 3685) +++ trunk/admin/src/main/java/org/teiid/adminapi/AdminFactory.java 2011-11-22 16:17:43 UTC (rev 3686) @@ -30,7 +30,17 @@ import java.math.BigDecimal; import java.math.BigInteger; import java.net.UnknownHostException; -import java.util.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.Enumeration; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Properties; +import java.util.Set; import javax.security.auth.callback.Callback; import javax.security.auth.callback.CallbackHandler; @@ -45,7 +55,6 @@ import org.jboss.as.cli.operation.impl.DefaultOperationRequestAddress; import org.jboss.as.cli.operation.impl.DefaultOperationRequestBuilder; import org.jboss.as.controller.client.ModelControllerClient; -import org.jboss.as.protocol.old.StreamUtils; import org.jboss.dmr.ModelNode; import org.jboss.dmr.ModelType; import org.teiid.adminapi.PropertyDefinition.RestartType; @@ -192,8 +201,12 @@ @Override public void close() { if (this.connection != null) { - StreamUtils.safeClose(this.connection); - this.connection = null; + try { + connection.close(); + } catch (Throwable t) { + //ignore + } + this.connection = null; this.domainMode = false; } } Modified: trunk/build/kits/jboss-as7/domain/configuration/domain-teiid.xml =================================================================== --- trunk/build/kits/jboss-as7/domain/configuration/domain-teiid.xml 2011-11-22 16:05:22 UTC (rev 3685) +++ trunk/build/kits/jboss-as7/domain/configuration/domain-teiid.xml 2011-11-22 16:17:43 UTC (rev 3686) @@ -20,7 +20,7 @@ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. --> -<domain xmlns="urn:jboss:domain:1.0"> +<domain xmlns="urn:jboss:domain:1.1"> <extensions> <extension module="org.jboss.as.clustering.infinispan"/> @@ -28,10 +28,13 @@ <extension module="org.jboss.as.connector"/> <extension module="org.jboss.as.ee"/> <extension module="org.jboss.as.ejb3"/> + <extension module="org.jboss.as.jacorb"/> <extension module="org.jboss.as.jaxrs"/> + <extension module="org.jboss.as.jdr"/> <extension module="org.jboss.as.jmx"/> <extension module="org.jboss.as.jpa"/> <extension module="org.jboss.as.logging"/> + <extension module="org.jboss.as.messaging"/> <extension module="org.jboss.as.modcluster"/> <extension module="org.jboss.as.naming"/> <extension module="org.jboss.as.osgi"/> @@ -42,6 +45,7 @@ <extension module="org.jboss.as.threads"/> <extension module="org.jboss.as.transactions"/> <extension module="org.jboss.as.web"/> + <extension module="org.jboss.as.webservices" /> <extension module="org.jboss.as.weld"/> </extensions> @@ -61,7 +65,6 @@ </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> @@ -78,6 +81,13 @@ <logger category="sun.rmi"> <level name="WARN"/> </logger> + <logger category="jacorb"> + <level name="WARN"/> + </logger> + <!-- set jacorb.config to ERROR to avoid the "jacorb.properties not found" messages during startup --> + <logger category="jacorb.config"> + <level name="ERROR"/> + </logger> <root-logger> <level name="INFO"/> @@ -106,22 +116,44 @@ </datasources> </subsystem> <subsystem xmlns="urn:jboss:domain:ee:1.0"/> - <subsystem xmlns="urn:jboss:domain:ejb3:1.1" lite="true"> + <subsystem xmlns="urn:jboss:domain:ejb3:1.2" > + + <remote connector-ref="remoting-connector" thread-pool-name="default" /> + <async thread-pool-name="default" /> + + <timer-service thread-pool-name="default" > + <data-store path="timer-service-data" relative-to="jboss.server.data.dir"/> + </timer-service> + <!-- 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"/> + + <strict-max-pool name="mdb-strict-max-pool" max-pool-size="20" instance-acquisition-timeout="5" + instance-acquisition-timeout-unit="MINUTES"/> </bean-instance-pools> </pools> + <!-- Default MDB configurations --> + <mdb> + <resource-adapter-ref resource-adapter-name="hornetq-ra"/> + <bean-instance-pool-ref pool-name="mdb-strict-max-pool"/> + </mdb> + <!-- Session bean configurations --> <session-bean> <stateless> <bean-instance-pool-ref pool-name="slsb-strict-max-pool"/> </stateless> + <stateful default-access-timeout="5000"/> + <singleton default-access-timeout="5000"/> </session-bean> + <thread-pools> + <thread-pool name="default" max-threads="10" keepalive-time="100" /> + </thread-pools> </subsystem> <subsystem xmlns="urn:jboss:domain:infinispan:1.0" default-cache-container="cluster"> <cache-container name="cluster" default-cache="default"> @@ -133,11 +165,9 @@ <cache-container name="web" default-cache="repl"> <alias>standard-session-cache</alias> <replicated-cache name="repl" mode="ASYNC" batching="true"> - <locking isolation="REPEATABLE_READ"/> <file-store/> </replicated-cache> <distributed-cache name="dist" mode="ASYNC" batching="true"> - <locking isolation="REPEATABLE_READ"/> <file-store/> </distributed-cache> </cache-container> @@ -145,7 +175,6 @@ <alias>sfsb-cache</alias> <alias>jboss.cache:service=EJB3SFSBClusteredCache</alias> <replicated-cache name="repl" mode="ASYNC" batching="true"> - <locking isolation="REPEATABLE_READ"/> <eviction strategy="LRU" max-entries="10000"/> <file-store/> </replicated-cache> @@ -172,6 +201,7 @@ </replicated-cache> </cache-container> </subsystem> + <subsystem xmlns="urn:jboss:domain:jacorb:1.1"/> <subsystem xmlns="urn:jboss:domain:jaxrs:1.0"/> <subsystem xmlns="urn:jboss:domain:jca:1.0"> <archive-validation enabled="true"/> @@ -191,6 +221,7 @@ </long-running-threads> </default-workmanager> </subsystem> + <subsystem xmlns="urn:jboss:domain:jdr:1.0"/> <subsystem xmlns="urn:jboss:domain:jgroups:1.0" default-stack="udp"> <stack name="udp"> <transport type="UDP" socket-binding="jgroups-udp" diagnostics-socket-binding="jgroups-diagnostics"/> @@ -201,14 +232,13 @@ <protocol type="VERIFY_SUSPECT"/> <protocol type="BARRIER"/> <protocol type="pbcast.NAKACK"/> - <protocol type="UNICAST"/> + <protocol type="UNICAST2"/> <protocol type="pbcast.STABLE"/> - <protocol type="VIEW_SYNC"/> <protocol type="pbcast.GMS"/> <protocol type="UFC"/> <protocol type="MFC"/> <protocol type="FRAG2"/> - <protocol type="pbcast.STREAMING_STATE_TRANSFER"/> + <protocol type="pbcast.STATE_TRANSFER"/> <protocol type="pbcast.FLUSH"/> </stack> <stack name="tcp"> @@ -220,89 +250,153 @@ <protocol type="VERIFY_SUSPECT"/> <protocol type="BARRIER"/> <protocol type="pbcast.NAKACK"/> - <protocol type="UNICAST"/> + <protocol type="UNICAST2"/> <protocol type="pbcast.STABLE"/> - <protocol type="VIEW_SYNC"/> <protocol type="pbcast.GMS"/> <protocol type="UFC"/> <protocol type="MFC"/> <protocol type="FRAG2"/> - <protocol type="pbcast.STREAMING_STATE_TRANSFER"/> + <protocol type="pbcast.STATE_TRANSFER"/> <protocol type="pbcast.FLUSH"/> </stack> </subsystem> - <subsystem xmlns="urn:jboss:domain:jmx:1.0"> + <subsystem xmlns="urn:jboss:domain:jmx:1.1" show-model="true"> <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:messaging:1.1"> + <hornetq-server> + <!-- Default journal file size is 10Mb, reduced here to 100k for faster first boot --> + <journal-file-size>102400</journal-file-size> + <journal-min-files>2</journal-min-files> + <journal-type>NIO</journal-type> + <!-- disable messaging persistence --> + <persistence-enabled>false</persistence-enabled> + + <connectors> + <netty-connector name="netty" socket-binding="messaging"/> + <netty-connector name="netty-throughput" socket-binding="messaging-throughput"> + <param key="batch-delay" value="50"/> + </netty-connector> + <in-vm-connector name="in-vm" server-id="0"/> + </connectors> + + <acceptors> + <netty-acceptor name="netty" socket-binding="messaging"/> + <netty-acceptor name="netty-throughput" socket-binding="messaging-throughput"> + <param key="batch-delay" value="50"/> + <param key="direct-deliver" value="false"/> + </netty-acceptor> + <in-vm-acceptor name="in-vm" server-id="0"/> + </acceptors> + + <security-settings> + <security-setting match="#"> + <permission type="createNonDurableQueue" roles="guest"/> + <permission type="deleteNonDurableQueue" roles="guest"/> + <permission type="consume" roles="guest"/> + <permission type="send" roles="guest"/> + </security-setting> + </security-settings> + + <address-settings> + <!--default for catch all--> + <address-setting match="#"> + <dead-letter-address>jms.queue.DLQ</dead-letter-address> + <expiry-address>jms.queue.ExpiryQueue</expiry-address> + <redelivery-delay>0</redelivery-delay> + <max-size-bytes>10485760</max-size-bytes> + <message-counter-history-day-limit>10</message-counter-history-day-limit> + <address-full-policy>BLOCK</address-full-policy> + </address-setting> + </address-settings> + + <!--JMS Stuff--> + <jms-connection-factories> + <connection-factory name="InVmConnectionFactory"> + <connectors> + <connector-ref connector-name="in-vm"/> + </connectors> + <entries> + <entry name="java:/ConnectionFactory"/> + </entries> + </connection-factory> + <connection-factory name="RemoteConnectionFactory"> + <connectors> + <connector-ref connector-name="netty"/> + </connectors> + <entries> + <entry name="RemoteConnectionFactory"/> + </entries> + </connection-factory> + <pooled-connection-factory name="hornetq-ra"> + <transaction mode="xa"/> + <connectors> + <connector-ref connector-name="in-vm"/> + </connectors> + <entries> + <entry name="java:/JmsXA"/> + </entries> + </pooled-connection-factory> + </jms-connection-factories> + + <jms-destinations> + <jms-queue name="testQueue"> + <entry name="queue/test"/> + </jms-queue> + <jms-topic name="testTopic"> + <entry name="topic/test"/> + </jms-topic> + </jms-destinations> + </hornetq-server> + </subsystem> <subsystem xmlns="urn:jboss:domain:modcluster:1.0"> <mod-cluster-config advertise-socket="modcluster"/> </subsystem> <subsystem xmlns="urn:jboss:domain:naming:1.0"/> - <subsystem xmlns="urn:jboss:domain:osgi:1.0" activation="lazy"> + <subsystem xmlns="urn:jboss:domain:osgi:1.1" activation="lazy"> <configuration pid="org.apache.felix.webconsole.internal.servlet.OsgiManager"> - <property name="manager.root">jboss-osgi</property> + <property name="manager.root" value="jboss-osgi"/> </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> + <capabilities> <!-- modules registered with the OSGi layer on startup --> - <module identifier="javaee.api"/> - <module identifier="org.jboss.logging"/> + <capability name="javax.api"/> + <capability name="javax.servlet.api"/> + <capability name="javax.transaction.api"/> <!-- bundles installed on startup --> - <module identifier="org.apache.aries.util"/> - <module identifier="org.jboss.osgi.webconsole"/> - <module identifier="org.osgi.compendium"/> + <capability name="org.apache.aries.util"/> + <capability name="org.jboss.osgi.webconsole"/> + <capability name="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"/> + <capability name="org.apache.felix.log" startlevel="1"/> + <capability name="org.jboss.osgi.logging" startlevel="1"/> + <capability name="org.apache.felix.configadmin" startlevel="1"/> + <capability name="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"/> + <capability name="org.apache.aries.jmx" startlevel="2"/> + <capability name="org.apache.felix.eventadmin" startlevel="2"/> + <capability name="org.apache.felix.metatype" startlevel="2"/> + <capability name="org.apache.felix.scr" startlevel="2"/> + <capability name="org.apache.felix.webconsole" startlevel="2"/> + <capability name="org.jboss.netty" startlevel="2"/> + <capability name="org.jboss.osgi.jmx" startlevel="2"/> + <capability name="org.jboss.osgi.http" startlevel="2"/> + <capability name="org.projectodd.stilts" 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> + <capability name="org.jboss.osgi.blueprint" startlevel="3"/> + <capability name="org.jboss.osgi.webapp" startlevel="3"/> + <capability name="org.jboss.osgi.xerces" startlevel="3"/> + </capabilities> </subsystem> - <subsystem xmlns="urn:jboss:domain:remoting:1.0"/> + <subsystem xmlns="urn:jboss:domain:remoting:1.0"> + <connector name="remoting-connector" socket-binding="remoting"/> + </subsystem> <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"> @@ -312,14 +406,6 @@ <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"> @@ -327,11 +413,13 @@ <object-replicator stack="udp" cluster-name="teiid-rep"/> <resultset-cache container-name="teiid" name="resultset"/> + <transport name="embedded"/> <transport name="jdbc" protocol="teiid" socket-binding="teiid-jdbc"> - <authentication security-domain="teiid-security" /> + <ssl mode="login"/> + <authentication security-domain="teiid-security"/> </transport> <transport name="odbc" protocol="pg" socket-binding="teiid-odbc"> - <authentication security-domain="teiid-security" /> + <authentication security-domain="teiid-security"/> </transport> <translator name="jdbc-simple" module="org.jboss.teiid.translator.jdbc"/> @@ -361,6 +449,8 @@ <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"/> + <translator name="salesforce" module="org.jboss.teiid.translator.salesforce"/> + <translator name="hive" module="org.jboss.teiid.translator.hive"/> </subsystem> <subsystem xmlns="urn:jboss:domain:threads:1.0"> <queueless-thread-pool name="teiid-async"> @@ -378,16 +468,24 @@ </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"> + <virtual-server name="default-host" enable-welcome-root="true"> <alias name="localhost" /> <alias name="example.com" /> </virtual-server> </subsystem> + <subsystem xmlns="urn:jboss:domain:webservices:1.0"> + <modify-wsdl-address>true</modify-wsdl-address> + <wsdl-host>${jboss.bind.address:127.0.0.1}</wsdl-host> + <!-- + <wsdl-port>8080</wsdl-port> + <wsdl-secure-port>8443</wsdl-secure-port> + --> + </subsystem> <subsystem xmlns="urn:jboss:domain:weld:1.0"/> </profile> + </profiles> - <!-- Named interfaces that can be referenced elsewhere in the configuration. The configuration for how to associate these logical names with an actual network interface can either @@ -401,20 +499,37 @@ </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="jacorb" port="3528"/> + <socket-binding name="jacorb-ssl" port="3529"/> + <socket-binding name="jmx-connector-registry" interface="management" port="1090"/> + <socket-binding name="jmx-connector-server" interface="management" port="1091"/> + <socket-binding name="messaging" port="5445" /> + <socket-binding name="messaging-throughput" port="5455"/> + <socket-binding name="osgi-http" interface="management" 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-group> <socket-binding-group name="ha-sockets" default-interface="public"> <socket-binding name="http" port="8080"/> <socket-binding name="https" port="8443"/> + <socket-binding name="jacorb" port="3528"/> + <socket-binding name="jacorb-ssl" port="3529"/> <socket-binding name="jgroups-diagnostics" port="0" multicast-address="224.0.75.75" multicast-port="7500"/> - <socket-binding name="jgroups-mping" port="0" multicast-address="230.0.0.4" multicast-port="45700"/> + <socket-binding name="jgroups-mping" port="0" multicast-address="${jboss.default.multicast.address:230.0.0.4}" multicast-port="45700"/> <socket-binding name="jgroups-tcp" port="7600"/> <socket-binding name="jgroups-tcp-fd" port="57600"/> - <socket-binding name="jgroups-udp" port="55200" multicast-address="230.0.0.4" multicast-port="45688"/> + <socket-binding name="jgroups-udp" port="55200" multicast-address="${jboss.default.multicast.address:230.0.0.4}" multicast-port="45688"/> <socket-binding name="jgroups-udp-fd" port="54200"/> - <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="jmx-connector-registry" interface="management" port="1090"/> + <socket-binding name="jmx-connector-server" interface="management" port="1091"/> + <socket-binding name="messaging" port="5445" /> + <socket-binding name="messaging-throughput" port="5455"/> <socket-binding name="modcluster" port="0" multicast-address="224.0.1.105" multicast-port="23364"/> - <socket-binding name="osgi-http" port="8090"/> + <socket-binding name="osgi-http" interface="management" port="8090"/> <socket-binding name="remoting" port="4447"/> <socket-binding name="txn-recovery-environment" port="4712"/> <socket-binding name="txn-status-manager" port="4713"/> @@ -426,7 +541,7 @@ <server-groups> <server-group name="main-server-group" profile="ha"> <jvm name="default"> - <heap size="64m" max-size="512m"/> + <heap size="512m" max-size="1024m"/> </jvm> <socket-binding-group ref="ha-sockets"/> </server-group> Copied: trunk/build/kits/jboss-as7/domain/configuration/host-teiid.xml (from rev 3677, trunk/build/kits/jboss-as7/domain/configuration/host.xml) =================================================================== --- trunk/build/kits/jboss-as7/domain/configuration/host-teiid.xml (rev 0) +++ trunk/build/kits/jboss-as7/domain/configuration/host-teiid.xml 2011-11-22 16:17:43 UTC (rev 3686) @@ -0,0 +1,92 @@ +<!-- + ~ 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.1" + name="master"> + + <management> + <security-realms> + <security-realm name="ManagementRealm"> + <authentication> + <properties path="mgmt-users.properties" relative-to="jboss.domain.config.dir"/> + </authentication> + </security-realm> + </security-realms> + <management-interfaces> + <native-interface security-realm="ManagementRealm"> + <socket interface="management" port="9999"/> + </native-interface> + <http-interface security-realm="ManagementRealm"> + <socket interface="management" port="9990"/> + </http-interface> + </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: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"> + <!-- Remote JPDA debugging for a specific server + <jvm-options> + <option value="-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=n"/> + </jvm-options> + --> + </jvm> + </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="512m" max-size="1024m"/> + </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: trunk/build/kits/jboss-as7/domain/configuration/host-teiid.xml ___________________________________________________________________ Added: svn:mime-type + text/plain Deleted: trunk/build/kits/jboss-as7/domain/configuration/host.xml =================================================================== --- trunk/build/kits/jboss-as7/domain/configuration/host.xml 2011-11-22 16:05:22 UTC (rev 3685) +++ trunk/build/kits/jboss-as7/domain/configuration/host.xml 2011-11-22 16:17:43 UTC (rev 3686) @@ -1,82 +0,0 @@ -<!-- - ~ 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> Modified: trunk/build/kits/jboss-as7/modules/org/jboss/teiid/main/module.xml =================================================================== --- trunk/build/kits/jboss-as7/modules/org/jboss/teiid/main/module.xml 2011-11-22 16:05:22 UTC (rev 3685) +++ trunk/build/kits/jboss-as7/modules/org/jboss/teiid/main/module.xml 2011-11-22 16:17:43 UTC (rev 3686) @@ -45,6 +45,7 @@ <module name="org.jboss.as.connector"/> <module name="org.jboss.ironjacamar.api"/> <module name="org.jboss.ironjacamar.impl"/> + <module name="org.jgroups"/> </dependencies> </module> \ No newline at end of file Modified: trunk/cache-jbosscache/pom.xml =================================================================== --- trunk/cache-jbosscache/pom.xml 2011-11-22 16:05:22 UTC (rev 3685) +++ trunk/cache-jbosscache/pom.xml 2011-11-22 16:17:43 UTC (rev 3686) @@ -26,8 +26,8 @@ <scope>provided</scope> </dependency> <dependency> - <groupId>org.infinispan</groupId> - <artifactId>infinispan-core</artifactId> + <groupId>org.jboss.as</groupId> + <artifactId>jboss-as-clustering-infinispan</artifactId> <scope>provided</scope> </dependency> <dependency> Modified: trunk/cache-jbosscache/src/main/java/org/teiid/replication/jboss/JGroupsObjectReplicator.java =================================================================== --- trunk/cache-jbosscache/src/main/java/org/teiid/replication/jboss/JGroupsObjectReplicator.java 2011-11-22 16:05:22 UTC (rev 3685) +++ trunk/cache-jbosscache/src/main/java/org/teiid/replication/jboss/JGroupsObjectReplicator.java 2011-11-22 16:17:43 UTC (rev 3686) @@ -44,13 +44,17 @@ import org.jboss.as.clustering.jgroups.ChannelFactory; import org.jgroups.Address; import org.jgroups.Channel; -import org.jgroups.ExtendedReceiverAdapter; +import org.jgroups.MembershipListener; import org.jgroups.Message; +import org.jgroups.MessageListener; +import org.jgroups.Receiver; +import org.jgroups.ReceiverAdapter; import org.jgroups.View; import org.jgroups.blocks.GroupRequest; import org.jgroups.blocks.MethodCall; import org.jgroups.blocks.MethodLookup; import org.jgroups.blocks.RequestOptions; +import org.jgroups.blocks.ResponseMode; import org.jgroups.blocks.RpcDispatcher; import org.jgroups.util.Promise; import org.jgroups.util.RspList; @@ -93,23 +97,24 @@ } } - private final static class ReplicatedInvocationHandler<S> extends ExtendedReceiverAdapter implements - InvocationHandler, Serializable { + private final static class ReplicatedInvocationHandler<S> implements + InvocationHandler, Serializable, MessageListener, Receiver, + MembershipListener { private static final long serialVersionUID = -2943462899945966103L; private final S object; private RpcDispatcher disp; private final HashMap<Method, Short> methodMap; - protected Vector<Address> remoteMembers = new Vector<Address>(); + protected List<Address> remoteMembers = new ArrayList<Address>(); protected final transient Promise<Boolean> state_promise=new Promise<Boolean>(); + protected transient ThreadLocal<Promise<Boolean>> threadLocalPromise = new ThreadLocal<Promise<Boolean>>() { protected org.jgroups.util.Promise<Boolean> initialValue() { return new Promise<Boolean>(); } }; - private ReplicatedInvocationHandler(S object, - HashMap<Method, Short> methodMap) { + private ReplicatedInvocationHandler(S object,HashMap<Method, Short> methodMap) { this.object = object; this.methodMap = methodMap; } @@ -144,9 +149,9 @@ } catch (InvocationTargetException e) { throw e.getCause(); } - Vector<Address> dests = null; + List<Address> dests = null; synchronized (remoteMembers) { - dests = new Vector<Address>(remoteMembers); + dests = new ArrayList<Address>(remoteMembers); } ReplicatedObject ro = (ReplicatedObject)object; String stateId = (String)args[0]; @@ -188,11 +193,11 @@ dests = new Vector<Address>(remoteMembers); } } - RspList responses = disp.callRemoteMethods(dests, call, new RequestOptions().setMode(annotation.asynch()?GroupRequest.GET_NONE:GroupRequest.GET_ALL).setTimeout(annotation.timeout())); + RspList responses = disp.callRemoteMethods(dests, call, new RequestOptions().setMode(annotation.asynch()?ResponseMode.GET_NONE:ResponseMode.GET_ALL).setTimeout(annotation.timeout())); if (annotation.asynch()) { return null; } - Vector<Object> results = responses.getResults(); + List<Object> results = responses.getResults(); if (method.getReturnType() == boolean.class) { for (Object o : results) { if (!Boolean.TRUE.equals(o)) { @@ -212,7 +217,7 @@ throw new RuntimeException(method + " " + args + " failed"); //$NON-NLS-1$ //$NON-NLS-2$ } } - + @Override public void viewAccepted(View newView) { if (newView.getMembers() != null) { @@ -254,7 +259,6 @@ } } - @Override public void setState(String stateId, InputStream istream) { LogManager.logDetail(LogConstants.CTX_RUNTIME, object, "loading state"); //$NON-NLS-1$ try { @@ -268,7 +272,6 @@ } } - @Override public void getState(String stateId, OutputStream ostream) { LogManager.logDetail(LogConstants.CTX_RUNTIME, object, "getting state"); //$NON-NLS-1$ try { Modified: trunk/cache-jbosscache/src/main/java/org/teiid/replication/jboss/JGroupsOutputStream.java =================================================================== --- trunk/cache-jbosscache/src/main/java/org/teiid/replication/jboss/JGroupsOutputStream.java 2011-11-22 16:05:22 UTC (rev 3685) +++ trunk/cache-jbosscache/src/main/java/org/teiid/replication/jboss/JGroupsOutputStream.java 2011-11-22 16:17:43 UTC (rev 3686) @@ -25,11 +25,12 @@ import java.io.IOException; import java.io.OutputStream; import java.util.Arrays; -import java.util.Vector; +import java.util.List; import org.jgroups.Address; -import org.jgroups.blocks.GroupRequest; import org.jgroups.blocks.MethodCall; +import org.jgroups.blocks.RequestOptions; +import org.jgroups.blocks.ResponseMode; import org.jgroups.blocks.RpcDispatcher; import org.teiid.core.types.Streamable; @@ -38,7 +39,7 @@ static final int CHUNK_SIZE=Streamable.STREAMING_BATCH_SIZE_IN_BYTES; protected final RpcDispatcher disp; - protected final Vector<Address> dests; + protected final List<Address> dests; protected final String stateId; protected final short methodOffset; @@ -46,12 +47,16 @@ private final byte[] buffer=new byte[CHUNK_SIZE]; private int index=0; - public JGroupsOutputStream(RpcDispatcher disp, Vector<Address> dests, String stateId, short methodOffset) { + public JGroupsOutputStream(RpcDispatcher disp, List<Address> dests, String stateId, short methodOffset) throws IOException { this.disp=disp; this.dests=dests; this.stateId=stateId; this.methodOffset = methodOffset; - disp.callRemoteMethods(this.dests, new MethodCall(methodOffset, new Object[] {stateId}), GroupRequest.GET_NONE, 0); + try { + disp.callRemoteMethods(this.dests, new MethodCall(methodOffset, new Object[] {stateId}), new RequestOptions(ResponseMode.GET_NONE, 0)); + } catch(Exception e) { + throw new IOException(e); + } } public void close() throws IOException { @@ -60,7 +65,7 @@ } flush(); try { - disp.callRemoteMethods(dests, new MethodCall((short)(methodOffset + 2), new Object[] {stateId}), GroupRequest.GET_NONE, 0); + disp.callRemoteMethods(dests, new MethodCall((short)(methodOffset + 2), new Object[] {stateId}), new RequestOptions(ResponseMode.GET_NONE, 0)); } catch(Exception e) { } closed=true; @@ -72,7 +77,7 @@ if(index == 0) { return; } - disp.callRemoteMethods(dests, new MethodCall((short)(methodOffset + 1), new Object[] {stateId, Arrays.copyOf(buffer, index)}), GroupRequest.GET_NONE, 0); + disp.callRemoteMethods(dests, new MethodCall((short)(methodOffset + 1), new Object[] {stateId, Arrays.copyOf(buffer, index)}), new RequestOptions(ResponseMode.GET_NONE, 0)); index=0; } catch(Exception e) { throw new IOException(e); Modified: trunk/jboss-integration/src/main/java/org/teiid/jboss/TeiidAdd.java =================================================================== --- trunk/jboss-integration/src/main/java/org/teiid/jboss/TeiidAdd.java 2011-11-22 16:05:22 UTC (rev 3685) +++ trunk/jboss-integration/src/main/java/org/teiid/jboss/TeiidAdd.java 2011-11-22 16:17:43 UTC (rev 3686) @@ -303,7 +303,7 @@ JGroupsObjectReplicatorService replicatorService = new JGroupsObjectReplicatorService(clusterName); replicatorService.setBufferManager(bufferManager.getBufferManager()); ServiceBuilder<JGroupsObjectReplicator> serviceBuilder = target.addService(TeiidServiceNames.OBJECT_REPLICATOR, replicatorService); - serviceBuilder.addDependency(ServiceName.JBOSS.append("jgroups", stack), ChannelFactory.class, replicatorService.channelFactoryInjector); //$NON-NLS-1$ + serviceBuilder.addDependency(ServiceName.JBOSS.append("jgroups", "stack", stack), ChannelFactory.class, replicatorService.channelFactoryInjector); //$NON-NLS-1$ //$NON-NLS-2$ newControllers.add(serviceBuilder.install()); } Modified: trunk/jboss-integration/src/main/resources/org/teiid/jboss/i18n.properties =================================================================== --- trunk/jboss-integration/src/main/resources/org/teiid/jboss/i18n.properties 2011-11-22 16:05:22 UTC (rev 3685) +++ trunk/jboss-integration/src/main/resources/org/teiid/jboss/i18n.properties 2011-11-22 16:17:43 UTC (rev 3686) @@ -244,7 +244,7 @@ clear-cache.describe=Clear the caches in the system of the given type clear-cache.cache-type.describe=cache type to be cleared. (PREPARED_PLAN_CACHE, QUERY_SERVICE_RESULT_SET_CACHE) clear-cache.vdb-name.describe=VDB name -clear-cache.vdb_version.describe=VDB version +clear-cache.vdb-version.describe=VDB version execute-query.describe=Execute a sql query execute-query.vdb-name.describe=vdb name @@ -300,8 +300,8 @@ requests-per-session.session.describe=The session Identifier requests-per-vdb.describe=Current active requests in progress in the query engine for a given VDB name and its version. -requests-per-vdb.vdb_name.describe=VDB Name -requests-per-vdb.vdb_version.describe=VDB Version +requests-per-vdb.vdb-name.describe=VDB Name +requests-per-vdb.vdb-version.describe=VDB Version terminate-session.describe=Terminate the session terminate-session.session.describe=The session Identifier of session to be terminated Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-11-22 16:05:22 UTC (rev 3685) +++ trunk/pom.xml 2011-11-22 16:17:43 UTC (rev 3686) @@ -10,7 +10,7 @@ <properties> <ant.version>1.7.0</ant.version> <site.url>http://www.jboss.org/teiid</site.url> - <jbossas-version>7.1.0.Alpha1-SNAPSHOT</jbossas-version> + <jbossas-version>7.1.0.Alpha2-SNAPSHOT</jbossas-version> </properties> <scm> <connection>scm:svn:https://anonsvn.jboss.org/repos/teiid/trunk</con... @@ -389,6 +389,11 @@ <version>${jbossas-version}</version> </dependency> <dependency> + <groupId>org.jboss.as</groupId> + <artifactId>jboss-as-clustering</artifactId> + <version>${jbossas-version}</version> + </dependency> + <dependency> <groupId>org.jboss</groupId> <artifactId>staxmapper</artifactId> <version>1.0.0.Final</version> @@ -466,6 +471,11 @@ <version>1.0.0.CR1</version> </dependency> <dependency> + <groupId>org.jboss.as</groupId> + <artifactId>jboss-as-clustering-infinispan</artifactId> + <version>${jbossas-version}</version> + </dependency> + <dependency> <groupId>org.jboss.logging</groupId> <artifactId>jboss-logging-spi</artifactId> <version>2.2.0.CR1</version> @@ -480,11 +490,6 @@ <artifactId>jboss-as-subsystem-test</artifactId> <version>${jbossas-version}</version> </dependency> - <dependency> - <groupId>org.infinispan</groupId> - <artifactId>infinispan-core</artifactId> - <version>5.0.0.FINAL</version> - </dependency> <dependency> <groupId>net.sourceforge.saxon</groupId> <artifactId>saxonhe</artifactId> Modified: trunk/test-integration/common/pom.xml =================================================================== --- trunk/test-integration/common/pom.xml 2011-11-22 16:05:22 UTC (rev 3685) +++ trunk/test-integration/common/pom.xml 2011-11-22 16:17:43 UTC (rev 3686) @@ -45,7 +45,13 @@ <groupId>javax.enterprise</groupId> <artifactId>cdi-api</artifactId> <version>1.0</version> - </dependency> + </dependency> + <dependency> + <groupId>org.jgroups</groupId> + <artifactId>jgroups</artifactId> + <version>3.0.0.CR5</version> + <scope>test</scope> + </dependency> </dependencies> <profiles> <profile> Modified: trunk/test-integration/common/src/test/java/org/teiid/systemmodel/TestMatViewReplication.java =================================================================== --- trunk/test-integration/common/src/test/java/org/teiid/systemmodel/TestMatViewReplication.java 2011-11-22 16:05:22 UTC (rev 3685) +++ trunk/test-integration/common/src/test/java/org/teiid/systemmodel/TestMatViewReplication.java 2011-11-22 16:17:43 UTC (rev 3686) @@ -22,7 +22,8 @@ package org.teiid.systemmodel; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; import java.sql.Connection; import java.sql.ResultSet; @@ -32,8 +33,8 @@ import java.util.HashMap; import org.jboss.as.clustering.jgroups.ChannelFactory; +import org.jboss.as.clustering.jgroups.JChannelFactory; import org.jgroups.Channel; -import org.jgroups.JChannelFactory; import org.junit.BeforeClass; import org.junit.Ignore; import org.junit.Test; @@ -41,9 +42,9 @@ import org.teiid.core.util.UnitTestUtil; import org.teiid.jdbc.FakeServer; import org.teiid.metadata.FunctionMethod; -import org.teiid.metadata.FunctionParameter; import org.teiid.metadata.FunctionMethod.Determinism; import org.teiid.metadata.FunctionMethod.PushDown; +import org.teiid.metadata.FunctionParameter; import org.teiid.replication.jboss.JGroupsObjectReplicator; @SuppressWarnings("nls")