[teiid-commits] teiid SVN: r3902 - in trunk: build/kits/jboss-as7/domain/configuration and 8 other directories.

Author: rareddy Date: 2012-02-28 16:20:57 -0500 (Tue, 28 Feb 2012) New Revision: 3902 Modified: trunk/build/kits/jboss-as7/domain/configuration/domain-teiid.xml trunk/build/kits/jboss-as7/domain/configuration/host-teiid.xml trunk/build/kits/jboss-as7/modules/org/jboss/teiid/translator/salesforce/main/module.xml trunk/build/kits/jboss-as7/modules/org/jboss/teiid/translator/ws/main/module.xml trunk/build/kits/jboss-as7/standalone/configuration/standalone-teiid.xml trunk/jboss-integration/pom.xml trunk/jboss-integration/src/main/java/org/teiid/jboss/RoleBasedCredentialMapIdentityLoginModule.java trunk/jboss-integration/src/main/java/org/teiid/jboss/TranslatorAdd.java trunk/jboss-integration/src/main/java/org/teiid/jboss/TranslatorDependencyDeployer.java trunk/jboss-integration/src/main/java/org/teiid/jboss/VDBDependencyDeployer.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/TestReplication.java Log: TEIID-1955: upgrading to JBoss AS 7.1.0-Final as base Modified: trunk/build/kits/jboss-as7/domain/configuration/domain-teiid.xml =================================================================== --- trunk/build/kits/jboss-as7/domain/configuration/domain-teiid.xml 2012-02-28 19:35:14 UTC (rev 3901) +++ trunk/build/kits/jboss-as7/domain/configuration/domain-teiid.xml 2012-02-28 21:20:57 UTC (rev 3902) @@ -6,20 +6,24 @@ <extension module="org.jboss.as.clustering.infinispan"/> <extension module="org.jboss.as.clustering.jgroups"/> <extension module="org.jboss.as.cmp"/> + <extension module="org.jboss.as.configadmin"/> <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.jaxr"/> <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.jsr77"/> <extension module="org.jboss.as.logging"/> <extension module="org.jboss.as.mail"/> <extension module="org.jboss.as.messaging"/> <extension module="org.jboss.as.modcluster"/> <extension module="org.jboss.as.naming"/> <extension module="org.jboss.as.osgi"/> + <extension module="org.jboss.as.pojo"/> <extension module="org.jboss.as.remoting"/> <extension module="org.jboss.as.sar"/> <extension module="org.jboss.as.security"/> @@ -51,6 +55,7 @@ </formatter> <file relative-to="jboss.server.log.dir" path="server.log"/> <suffix value=".yyyy-MM-dd"/> + <append value="true"/> </periodic-rotating-file-handler> <logger category="com.arjuna"> <level name="WARN"/> @@ -75,12 +80,12 @@ </handlers> </root-logger> </subsystem> + <subsystem xmlns="urn:jboss:domain:configadmin:1.0"/> <subsystem xmlns="urn:jboss:domain:datasources:1.0"> <datasources> - <datasource jndi-name="java:jboss/datasources/ExampleDS" enabled="true" use-java-context="true" pool-name="java:jboss/datasources/ExampleDS"> + <datasource jndi-name="java:jboss/datasources/ExampleDS" pool-name="ExampleDS" enabled="true" use-java-context="true"> <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> @@ -94,7 +99,7 @@ </datasources> </subsystem> <subsystem xmlns="urn:jboss:domain:ee:1.0"/> - <subsystem xmlns="urn:jboss:domain:ejb3:1.2" > + <subsystem xmlns="urn:jboss:domain:ejb3:1.2"> <session-bean> <stateless> <bean-instance-pool-ref pool-name="slsb-strict-max-pool"/> @@ -119,7 +124,7 @@ </caches> <passivation-stores> <file-passivation-store name="file"/> - <cluster-passivation-store name="infinispan" backing-cache="sfsb"/> + <cluster-passivation-store name="infinispan" cache-container="ejb"/> </passivation-stores> <async thread-pool-name="default"/> <timer-service thread-pool-name="default"> @@ -127,49 +132,676 @@ </timer-service> <remote connector-ref="remoting-connector" thread-pool-name="default"/> <thread-pools> - <thread-pool name="default" max-threads="10" keepalive-time="100"/> + <thread-pool name="default"> + <max-threads count="10"/> + <keepalive-time time="100" unit="milliseconds"/> + </thread-pool> </thread-pools> - <iiop enable-by-default="true" use-qualified-name="true"/> </subsystem> <subsystem xmlns="urn:jboss:domain:infinispan:1.1" default-cache-container="cluster"> - <cache-container name="cluster" default-cache="default"> - <alias>ha-partition</alias> + <cache-container name="cluster" aliases="ha-partition" default-cache="default"> + <transport lock-timeout="60000"/> <replicated-cache name="default" mode="SYNC" batching="true"> <locking isolation="REPEATABLE_READ"/> </replicated-cache> </cache-container> - <cache-container name="web" default-cache="repl"> - <alias>standard-session-cache</alias> + <cache-container name="web" aliases="standard-session-cache" default-cache="repl"> + <transport lock-timeout="60000"/> <replicated-cache name="repl" mode="ASYNC" batching="true"> <file-store/> </replicated-cache> + <replicated-cache name="sso" mode="SYNC" batching="true"/> <distributed-cache name="dist" mode="ASYNC" batching="true"> <file-store/> </distributed-cache> - <replicated-cache name="registry" mode="SYNC" batching="true"/> - <replicated-cache name="sso" mode="SYNC" batching="true"/> </cache-container> - <cache-container name="sfsb" default-cache="repl"> - <alias>sfsb-cache</alias> + <cache-container name="ejb" aliases="sfsb sfsb-cache" default-cache="repl"> + <transport lock-timeout="60000"/> <replicated-cache name="repl" mode="ASYNC" batching="true"> <eviction strategy="LRU"/> <file-store/> </replicated-cache> + <!-- Clustered cache used internally by EJB subsytem for managing the client-mapping(s) of + the socketbinding referenced by the EJB remoting connector --> + <replicated-cache name="remote-connector-client-mappings" mode="SYNC" batching="true"/> <distributed-cache name="dist" mode="ASYNC" batching="true"> <eviction strategy="LRU"/> <file-store/> </distributed-cache> </cache-container> <cache-container name="hibernate" default-cache="local-query"> + <transport lock-timeout="60000"/> + <local-cache name="local-query"> + <transaction mode="NONE"/> + <eviction strategy="LRU" max-entries="10000"/> + <expiration max-idle="100000"/> + </local-cache> <invalidation-cache name="entity" mode="SYNC"> + <transaction mode="NON_XA"/> <eviction strategy="LRU" max-entries="10000"/> <expiration max-idle="100000"/> </invalidation-cache> + <replicated-cache name="timestamps" mode="ASYNC"> + <transaction mode="NONE"/> + <eviction strategy="NONE"/> + </replicated-cache> + </cache-container> + </subsystem> + <subsystem xmlns="urn:jboss:domain:jaxrs:1.0"/> + <subsystem xmlns="urn:jboss:domain:jca:1.1"> + <archive-validation enabled="true" fail-on-error="true" fail-on-warn="false"/> + <bean-validation enabled="false"/> + <default-workmanager> + <short-running-threads> + <core-threads count="50"/> + <queue-length count="50"/> + <max-threads count="50"/> + <keepalive-time time="10" unit="seconds"/> + </short-running-threads> + <long-running-threads> + <core-threads count="50"/> + <queue-length count="50"/> + <max-threads count="50"/> + <keepalive-time time="10" unit="seconds"/> + </long-running-threads> + </default-workmanager> + </subsystem> + <subsystem xmlns="urn:jboss:domain:jdr:1.0"/> + <subsystem xmlns="urn:jboss:domain:jgroups:1.1" default-stack="udp"> + <stack name="udp"> + <transport type="UDP" socket-binding="jgroups-udp" diagnostics-socket-binding="jgroups-diagnostics"/> + <protocol type="PING"/> + <protocol type="MERGE2"/> + <protocol type="FD_SOCK" socket-binding="jgroups-udp-fd"/> + <protocol type="FD"/> + <protocol type="VERIFY_SUSPECT"/> + <protocol type="BARRIER"/> + <protocol type="pbcast.NAKACK"/> + <protocol type="UNICAST2"/> + <protocol type="pbcast.STABLE"/> + <protocol type="pbcast.GMS"/> + <protocol type="UFC"/> + <protocol type="MFC"/> + <protocol type="FRAG2"/> + </stack> + <stack name="tcp"> + <transport type="TCP" socket-binding="jgroups-tcp" diagnostics-socket-binding="jgroups-diagnostics"/> + <protocol type="MPING" socket-binding="jgroups-mping"/> + <protocol type="MERGE2"/> + <protocol type="FD_SOCK" socket-binding="jgroups-tcp-fd"/> + <protocol type="FD"/> + <protocol type="VERIFY_SUSPECT"/> + <protocol type="BARRIER"/> + <protocol type="pbcast.NAKACK"/> + <protocol type="UNICAST2"/> + <protocol type="pbcast.STABLE"/> + <protocol type="pbcast.GMS"/> + <protocol type="UFC"/> + <protocol type="MFC"/> + <protocol type="FRAG2"/> + </stack> + </subsystem> + <subsystem xmlns="urn:jboss:domain:jmx:1.1"> + <show-model value="true"/> + <remoting-connector/> + </subsystem> + <subsystem xmlns="urn:jboss:domain:jpa:1.0"> + <jpa default-datasource=""/> + </subsystem> + <subsystem xmlns="urn:jboss:domain:mail:1.0"> + <mail-session jndi-name="java:jboss/mail/Default"> + <smtp-server outbound-socket-binding-ref="mail-smtp"/> + </mail-session> + </subsystem> + <subsystem xmlns="urn:jboss:domain:modcluster:1.0"> + <mod-cluster-config advertise-socket="modcluster"/> + </subsystem> + <subsystem xmlns="urn:jboss:domain:naming:1.1"/> + <subsystem xmlns="urn:jboss:domain:osgi:1.2" activation="lazy"> + <properties> + <!-- Specifies the beginning start level of the framework --> + <property name="org.osgi.framework.startlevel.beginning">1</property> + </properties> + <capabilities> + <!-- modules registered with the OSGi layer on startup --> + <capability name="javax.servlet.api:v25"/> + <capability name="javax.transaction.api"/> + <!-- bundles started in 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"/> + </capabilities> + </subsystem> + <subsystem xmlns="urn:jboss:domain:pojo:1.0"/> + <subsystem xmlns="urn:jboss:domain:remoting:1.1"> + <connector name="remoting-connector" socket-binding="remoting" security-realm="ApplicationRealm"/> + </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.1"> + <security-domains> + <security-domain name="other" cache-type="default"> + <authentication> + <login-module code="Remoting" flag="optional"> + <module-option name="password-stacking" value="useFirstPass"/> + </login-module> + <login-module code="RealmUsersRoles" flag="required"> + <module-option name="usersProperties" value="${jboss.domain.config.dir}/application-users.properties"/> + <module-option name="rolesProperties" value="${jboss.domain.config.dir}/application-roles.properties"/> + <module-option name="realm" value="ApplicationRealm"/> + <module-option name="password-stacking" value="useFirstPass"/> + </login-module> + </authentication> + </security-domain> + <security-domain name="jboss-web-policy" cache-type="default"> + <authorization> + <policy-module code="Delegating" flag="required"/> + </authorization> + </security-domain> + <security-domain name="jboss-ejb-policy" cache-type="default"> + <authorization> + <policy-module code="Delegating" flag="required"/> + </authorization> + </security-domain> + </security-domains> + </subsystem> + <subsystem xmlns="urn:jboss:domain:threads:1.1"/> + <subsystem xmlns="urn:jboss:domain:transactions:1.1"> + <core-environment> + <process-id> + <uuid/> + </process-id> + </core-environment> + <recovery-environment socket-binding="txn-recovery-environment" status-socket-binding="txn-status-manager"/> + <coordinator-environment default-timeout="300"/> + </subsystem> + <subsystem xmlns="urn:jboss:domain:web:1.1" default-virtual-server="default-host" native="false"> + <connector name="http" protocol="HTTP/1.1" scheme="http" socket-binding="http"/> + <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.1"> + <modify-wsdl-address>true</modify-wsdl-address> + <wsdl-host>${jboss.bind.address:127.0.0.1}</wsdl-host> + <endpoint-config name="Standard-Endpoint-Config"/> + <endpoint-config name="Recording-Endpoint-Config"> + <pre-handler-chain name="recording-handlers" protocol-bindings="##SOAP11_HTTP ##SOAP11_HTTP_MTOM ##SOAP12_HTTP ##SOAP12_HTTP_MTOM"> + <handler name="RecordingHandler" class="org.jboss.ws.common.invocation.RecordingServerHandler"/> + </pre-handler-chain> + </endpoint-config> + </subsystem> + <subsystem xmlns="urn:jboss:domain:weld:1.0"/> + </profile> + + <profile name="full"> + <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"> + <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"/> + <append value="true"/> + </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> + <logger category="jacorb"> + <level name="WARN"/> + </logger> + <logger category="jacorb.config"> + <level name="ERROR"/> + </logger> + <root-logger> + <level name="INFO"/> + <handlers> + <handler name="CONSOLE"/> + <handler name="FILE"/> + </handlers> + </root-logger> + </subsystem> + <subsystem xmlns="urn:jboss:domain:cmp:1.0"/> + <subsystem xmlns="urn:jboss:domain:configadmin:1.0"/> + <subsystem xmlns="urn:jboss:domain:datasources:1.0"> + <datasources> + <datasource jndi-name="java:jboss/datasources/ExampleDS" pool-name="ExampleDS" enabled="true" use-java-context="true"> + <connection-url>jdbc:h2:mem:test;DB_CLOSE_DELAY=-1</connection-url> + <driver>h2</driver> + <security> + <user-name>sa</user-name> + <password>sa</password> + </security> + </datasource> + <drivers> + <driver name="h2" module="com.h2database.h2"> + <xa-datasource-class>org.h2.jdbcx.JdbcDataSource</xa-datasource-class> + </driver> + </drivers> + </datasources> + </subsystem> + <subsystem xmlns="urn:jboss:domain:ee:1.0"/> + <subsystem xmlns="urn:jboss:domain:ejb3:1.2"> + <session-bean> + <stateless> + <bean-instance-pool-ref pool-name="slsb-strict-max-pool"/> + </stateless> + <stateful default-access-timeout="5000" cache-ref="simple"/> + <singleton default-access-timeout="5000"/> + </session-bean> + <mdb> + <resource-adapter-ref resource-adapter-name="hornetq-ra"/> + <bean-instance-pool-ref pool-name="mdb-strict-max-pool"/> + </mdb> + <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> + <caches> + <cache name="simple" aliases="NoPassivationCache"/> + <cache name="passivating" passivation-store-ref="file" aliases="SimpleStatefulCache"/> + </caches> + <passivation-stores> + <file-passivation-store name="file"/> + </passivation-stores> + <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> + <remote connector-ref="remoting-connector" thread-pool-name="default"/> + <thread-pools> + <thread-pool name="default"> + <max-threads count="10"/> + <keepalive-time time="100" unit="milliseconds"/> + </thread-pool> + </thread-pools> + <iiop enable-by-default="false" use-qualified-name="false"/> + </subsystem> + <subsystem xmlns="urn:jboss:domain:infinispan:1.1" default-cache-container="hibernate"> + <cache-container name="hibernate" default-cache="local-query"> + <local-cache name="entity"> + <transaction mode="NON_XA"/> + <eviction strategy="LRU" max-entries="10000"/> + <expiration max-idle="100000"/> + </local-cache> <local-cache name="local-query"> + <transaction mode="NONE"/> <eviction strategy="LRU" max-entries="10000"/> <expiration max-idle="100000"/> </local-cache> + <local-cache name="timestamps"> + <transaction mode="NONE"/> + <eviction strategy="NONE"/> + </local-cache> + </cache-container> + </subsystem> + <subsystem xmlns="urn:jboss:domain:jacorb:1.1"> + <orb> + <initializers transactions="spec" security="on"/> + </orb> + </subsystem> + <subsystem xmlns="urn:jboss:domain:jaxr:1.0"> + <connection-factory jndi-name="java:jboss/jaxr/ConnectionFactory"/> + <juddi-server publish-url="http://localhost:8080/juddi/publish" query-url="http://localhost:8080/juddi/query"/> + </subsystem> + <subsystem xmlns="urn:jboss:domain:jaxrs:1.0"/> + <subsystem xmlns="urn:jboss:domain:jca:1.1"> + <archive-validation enabled="true" fail-on-error="true" fail-on-warn="false"/> + <bean-validation enabled="true"/> + <default-workmanager> + <short-running-threads> + <core-threads count="50"/> + <queue-length count="50"/> + <max-threads count="50"/> + <keepalive-time time="10" unit="seconds"/> + </short-running-threads> + <long-running-threads> + <core-threads count="50"/> + <queue-length count="50"/> + <max-threads count="50"/> + <keepalive-time time="10" unit="seconds"/> + </long-running-threads> + </default-workmanager> + <cached-connection-manager/> + </subsystem> + <subsystem xmlns="urn:jboss:domain:jdr:1.0"/> + <subsystem xmlns="urn:jboss:domain:jmx:1.1"> + <show-model value="true"/> + <remoting-connector/> + </subsystem> + <subsystem xmlns="urn:jboss:domain:jpa:1.0"> + <jpa default-datasource=""/> + </subsystem> + <subsystem xmlns="urn:jboss:domain:jsr77:1.0"/> + <subsystem xmlns="urn:jboss:domain:mail:1.0"> + <mail-session jndi-name="java:jboss/mail/Default"> + <smtp-server outbound-socket-binding-ref="mail-smtp"/> + </mail-session> + </subsystem> + <subsystem xmlns="urn:jboss:domain:messaging:1.1"> + <hornetq-server> + <persistence-enabled>true</persistence-enabled> + <journal-file-size>102400</journal-file-size> + <journal-min-files>2</journal-min-files> + + <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="send" roles="guest"/> + <permission type="consume" roles="guest"/> + <permission type="createNonDurableQueue" roles="guest"/> + <permission type="deleteNonDurableQueue" 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> + <address-full-policy>BLOCK</address-full-policy> + <message-counter-history-day-limit>10</message-counter-history-day-limit> + </address-setting> + </address-settings> + + <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"/> + <entry name="java:jboss/exported/jms/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"/> + <entry name="java:jboss/exported/jms/queue/test"/> + </jms-queue> + <jms-topic name="testTopic"> + <entry name="topic/test"/> + <entry name="java:jboss/exported/jms/topic/test"/> + </jms-topic> + </jms-destinations> + </hornetq-server> + </subsystem> + <subsystem xmlns="urn:jboss:domain:naming:1.1"/> + <subsystem xmlns="urn:jboss:domain:osgi:1.2" activation="lazy"> + <properties> + <!-- Specifies the beginning start level of the framework --> + <property name="org.osgi.framework.startlevel.beginning">1</property> + </properties> + <capabilities> + <!-- modules registered with the OSGi layer on startup --> + <capability name="javax.servlet.api:v25"/> + <capability name="javax.transaction.api"/> + <!-- bundles started in 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"/> + </capabilities> + </subsystem> + <subsystem xmlns="urn:jboss:domain:pojo:1.0"/> + <subsystem xmlns="urn:jboss:domain:remoting:1.1"> + <connector name="remoting-connector" socket-binding="remoting" security-realm="ApplicationRealm"/> + </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.1"> + <security-domains> + <security-domain name="other" cache-type="default"> + <authentication> + <login-module code="Remoting" flag="optional"> + <module-option name="password-stacking" value="useFirstPass"/> + </login-module> + <login-module code="RealmUsersRoles" flag="required"> + <module-option name="usersProperties" value="${jboss.domain.config.dir}/application-users.properties"/> + <module-option name="rolesProperties" value="${jboss.domain.config.dir}/application-roles.properties"/> + <module-option name="realm" value="ApplicationRealm"/> + <module-option name="password-stacking" value="useFirstPass"/> + </login-module> + </authentication> + </security-domain> + <security-domain name="jboss-web-policy" cache-type="default"> + <authorization> + <policy-module code="Delegating" flag="required"/> + </authorization> + </security-domain> + <security-domain name="jboss-ejb-policy" cache-type="default"> + <authorization> + <policy-module code="Delegating" flag="required"/> + </authorization> + </security-domain> + </security-domains> + </subsystem> + <subsystem xmlns="urn:jboss:domain:threads:1.1"/> + <subsystem xmlns="urn:jboss:domain:transactions:1.1"> + <core-environment> + <process-id> + <uuid/> + </process-id> + </core-environment> + <recovery-environment socket-binding="txn-recovery-environment" status-socket-binding="txn-status-manager"/> + <coordinator-environment default-timeout="300"/> + </subsystem> + <subsystem xmlns="urn:jboss:domain:web:1.1" default-virtual-server="default-host" native="false"> + <connector name="http" protocol="HTTP/1.1" scheme="http" socket-binding="http"/> + <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.1"> + <modify-wsdl-address>true</modify-wsdl-address> + <wsdl-host>${jboss.bind.address:127.0.0.1}</wsdl-host> + <endpoint-config name="Standard-Endpoint-Config"/> + <endpoint-config name="Recording-Endpoint-Config"> + <pre-handler-chain name="recording-handlers" protocol-bindings="##SOAP11_HTTP ##SOAP11_HTTP_MTOM ##SOAP12_HTTP ##SOAP12_HTTP_MTOM"> + <handler name="RecordingHandler" class="org.jboss.ws.common.invocation.RecordingServerHandler"/> + </pre-handler-chain> + </endpoint-config> + </subsystem> + <subsystem xmlns="urn:jboss:domain:weld:1.0"/> + </profile> + + <profile name="full-ha"> + <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"> + <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"/> + <append value="true"/> + </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> + <logger category="jacorb"> + <level name="WARN"/> + </logger> + <logger category="jacorb.config"> + <level name="ERROR"/> + </logger> + <root-logger> + <level name="INFO"/> + <handlers> + <handler name="CONSOLE"/> + <handler name="FILE"/> + </handlers> + </root-logger> + </subsystem> + <subsystem xmlns="urn:jboss:domain:configadmin:1.0"/> + <subsystem xmlns="urn:jboss:domain:datasources:1.0"> + <datasources> + <datasource jndi-name="java:jboss/datasources/ExampleDS" pool-name="ExampleDS" enabled="true" use-java-context="true"> + <connection-url>jdbc:h2:mem:test;DB_CLOSE_DELAY=-1</connection-url> + <driver>h2</driver> + <security> + <user-name>sa</user-name> + <password>sa</password> + </security> + </datasource> + <drivers> + <driver name="h2" module="com.h2database.h2"> + <xa-datasource-class>org.h2.jdbcx.JdbcDataSource</xa-datasource-class> + </driver> + </drivers> + </datasources> + </subsystem> + <subsystem xmlns="urn:jboss:domain:ee:1.0"/> + <subsystem xmlns="urn:jboss:domain:ejb3:1.2"> + <session-bean> + <stateless> + <bean-instance-pool-ref pool-name="slsb-strict-max-pool"/> + </stateless> + <stateful default-access-timeout="5000" cache-ref="simple" clustered-cache-ref="clustered"/> + <singleton default-access-timeout="5000"/> + </session-bean> + <mdb> + <resource-adapter-ref resource-adapter-name="hornetq-ra"/> + <bean-instance-pool-ref pool-name="mdb-strict-max-pool"/> + </mdb> + <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> + <caches> + <cache name="simple" aliases="NoPassivationCache"/> + <cache name="passivating" passivation-store-ref="file" aliases="SimpleStatefulCache"/> + <cache name="clustered" passivation-store-ref="infinispan" aliases="StatefulTreeCache"/> + </caches> + <passivation-stores> + <file-passivation-store name="file"/> + <cluster-passivation-store name="infinispan" cache-container="ejb"/> + </passivation-stores> + <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> + <remote connector-ref="remoting-connector" thread-pool-name="default"/> + <thread-pools> + <thread-pool name="default"> + <max-threads count="10"/> + <keepalive-time time="100" unit="milliseconds"/> + </thread-pool> + </thread-pools> + <iiop enable-by-default="false" use-qualified-name="false"/> + </subsystem> + <subsystem xmlns="urn:jboss:domain:infinispan:1.1" default-cache-container="cluster"> + <cache-container name="cluster" aliases="ha-partition" default-cache="default"> + <transport lock-timeout="60000"/> + <replicated-cache name="default" mode="SYNC" batching="true"> + <locking isolation="REPEATABLE_READ"/> + </replicated-cache> + </cache-container> + <cache-container name="web" aliases="standard-session-cache" default-cache="repl"> + <transport lock-timeout="60000"/> + <replicated-cache name="repl" mode="ASYNC" batching="true"> + <file-store/> + </replicated-cache> + <replicated-cache name="sso" mode="SYNC" batching="true"/> + <distributed-cache name="dist" mode="ASYNC" batching="true"> + <file-store/> + </distributed-cache> + </cache-container> + <cache-container name="ejb" aliases="sfsb sfsb-cache" default-cache="repl"> + <transport lock-timeout="60000"/> + <replicated-cache name="repl" mode="ASYNC" batching="true"> + <eviction strategy="LRU"/> + <file-store/> + </replicated-cache> + <!-- Clustered cache used internally by EJB subsytem for managing the client-mapping(s) of + the socketbinding referenced by the EJB remoting connector --> + <replicated-cache name="remote-connector-client-mappings" mode="SYNC" batching="true"/> + <distributed-cache name="dist" mode="ASYNC" batching="true"> + <eviction strategy="LRU"/> + <file-store/> + </distributed-cache> + </cache-container> + <cache-container name="hibernate" default-cache="local-query"> + <transport lock-timeout="60000"/> + <local-cache name="local-query"> + <transaction mode="NONE"/> + <eviction strategy="LRU" max-entries="10000"/> + <expiration max-idle="100000"/> + </local-cache> + <invalidation-cache name="entity" mode="SYNC"> + <transaction mode="NON_XA"/> + <eviction strategy="LRU" max-entries="10000"/> + <expiration max-idle="100000"/> + </invalidation-cache> <replicated-cache name="timestamps" mode="ASYNC"> + <transaction mode="NONE"/> <eviction strategy="NONE"/> </replicated-cache> </cache-container> @@ -182,28 +814,36 @@ </replicated-cache> </cache-container> </subsystem> - <subsystem xmlns="urn:jboss:domain:jacorb:1.1"/> + <subsystem xmlns="urn:jboss:domain:jacorb:1.1"> + <orb> + <initializers transactions="spec" security="on"/> + </orb> + </subsystem> + <subsystem xmlns="urn:jboss:domain:jaxr:1.0"> + <connection-factory jndi-name="java:jboss/jaxr/ConnectionFactory"/> + <juddi-server publish-url="http://localhost:8080/juddi/publish" query-url="http://localhost:8080/juddi/query"/> + </subsystem> <subsystem xmlns="urn:jboss:domain:jaxrs:1.0"/> <subsystem xmlns="urn:jboss:domain:jca:1.1"> - <archive-validation enabled="true"/> + <archive-validation enabled="true" fail-on-error="true" fail-on-warn="false"/> <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"/> + <short-running-threads> + <core-threads count="50"/> + <queue-length count="50"/> + <max-threads count="50"/> <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"/> + <long-running-threads> + <core-threads count="50"/> + <queue-length count="50"/> + <max-threads count="50"/> <keepalive-time time="10" unit="seconds"/> </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"> + <subsystem xmlns="urn:jboss:domain:jgroups:1.1" default-stack="udp"> <stack name="udp"> <transport type="UDP" socket-binding="jgroups-udp" diagnostics-socket-binding="jgroups-diagnostics"/> <protocol type="PING"/> @@ -219,8 +859,6 @@ <protocol type="UFC"/> <protocol type="MFC"/> <protocol type="FRAG2"/> - <protocol type="pbcast.STATE_TRANSFER"/> - <protocol type="pbcast.FLUSH"/> </stack> <stack name="tcp"> <transport type="TCP" socket-binding="jgroups-tcp" diagnostics-socket-binding="jgroups-diagnostics"/> @@ -237,16 +875,16 @@ <protocol type="UFC"/> <protocol type="MFC"/> <protocol type="FRAG2"/> - <protocol type="pbcast.STATE_TRANSFER"/> - <protocol type="pbcast.FLUSH"/> </stack> </subsystem> <subsystem xmlns="urn:jboss:domain:jmx:1.1"> <show-model value="true"/> + <remoting-connector/> </subsystem> <subsystem xmlns="urn:jboss:domain:jpa:1.0"> - <jpa default-datasource=""/> + <jpa default-datasource=""/> </subsystem> + <subsystem xmlns="urn:jboss:domain:jsr77:1.0"/> <subsystem xmlns="urn:jboss:domain:mail:1.0"> <mail-session jndi-name="java:jboss/mail/Default"> <smtp-server outbound-socket-binding-ref="mail-smtp"/> @@ -254,9 +892,7 @@ </subsystem> <subsystem xmlns="urn:jboss:domain:messaging:1.1"> <hornetq-server> - <!-- disable messaging persistence --> - <persistence-enabled>false</persistence-enabled> - <!-- Default journal file size is 10Mb, reduced here to 100k for faster first boot --> + <persistence-enabled>true</persistence-enabled> <journal-file-size>102400</journal-file-size> <journal-min-files>2</journal-min-files> @@ -293,8 +929,8 @@ <expiry-address>jms.queue.ExpiryQueue</expiry-address> <redelivery-delay>0</redelivery-delay> <max-size-bytes>10485760</max-size-bytes> + <address-full-policy>BLOCK</address-full-policy> <message-counter-history-day-limit>10</message-counter-history-day-limit> - <address-full-policy>BLOCK</address-full-policy> </address-setting> </address-settings> @@ -313,6 +949,7 @@ </connectors> <entries> <entry name="RemoteConnectionFactory"/> + <entry name="java:jboss/exported/jms/RemoteConnectionFactory"/> </entries> </connection-factory> <pooled-connection-factory name="hornetq-ra"> @@ -329,9 +966,11 @@ <jms-destinations> <jms-queue name="testQueue"> <entry name="queue/test"/> + <entry name="java:jboss/exported/jms/queue/test"/> </jms-queue> <jms-topic name="testTopic"> <entry name="topic/test"/> + <entry name="java:jboss/exported/jms/topic/test"/> </jms-topic> </jms-destinations> </hornetq-server> @@ -340,56 +979,53 @@ <mod-cluster-config advertise-socket="modcluster"/> </subsystem> <subsystem xmlns="urn:jboss:domain:naming:1.1"/> - <subsystem xmlns="urn:jboss:domain:osgi:1.1" activation="lazy"> - <configuration pid="org.apache.felix.webconsole.internal.servlet.OsgiManager"> - <property name="manager.root" value="jboss-osgi"/> - </configuration> + <subsystem xmlns="urn:jboss:domain:osgi:1.2" activation="lazy"> <properties> <!-- Specifies the beginning start level of the framework --> <property name="org.osgi.framework.startlevel.beginning">1</property> </properties> <capabilities> <!-- modules registered with the OSGi layer on startup --> - <capability name="javax.api"/> - <capability name="javax.servlet.api"/> + <capability name="javax.servlet.api:v25"/> <capability name="javax.transaction.api"/> - <!-- bundles installed on startup --> - <capability name="org.apache.aries.util"/> - <capability name="org.jboss.osgi.webconsole"/> - <capability name="org.osgi.compendium"/> <!-- bundles started in 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 --> - <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 --> - <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:pojo:1.0"/> <subsystem xmlns="urn:jboss:domain:remoting:1.1"> - <connector name="remoting-connector" socket-binding="remoting"/> + <connector name="remoting-connector" socket-binding="remoting" security-realm="ApplicationRealm"/> </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.1"> <security-domains> - <security-domain name="other"> + <security-domain name="other" cache-type="default"> <authentication> - <login-module code="UsersRoles" flag="required"/> + <login-module code="Remoting" flag="optional"> + <module-option name="password-stacking" value="useFirstPass"/> + </login-module> + <login-module code="RealmUsersRoles" flag="required"> + <module-option name="usersProperties" value="${jboss.domain.config.dir}/application-users.properties"/> + <module-option name="rolesProperties" value="${jboss.domain.config.dir}/application-roles.properties"/> + <module-option name="realm" value="ApplicationRealm"/> + <module-option name="password-stacking" value="useFirstPass"/> + </login-module> </authentication> </security-domain> + <security-domain name="jboss-web-policy" cache-type="default"> + <authorization> + <policy-module code="Delegating" flag="required"/> + </authorization> + </security-domain> + <security-domain name="jboss-ejb-policy" cache-type="default"> + <authorization> + <policy-module code="Delegating" flag="required"/> + </authorization> + </security-domain> <security-domain name="teiid-security" cache-type="default"> <authentication> <login-module code="UsersRoles" flag="required"> @@ -397,7 +1033,7 @@ <module-option name="rolesProperties" value="teiid-security-roles.properties"/> </login-module> </authentication> - </security-domain> + </security-domain> </security-domains> </subsystem> <subsystem xmlns="urn:jboss:domain:teiid:1.0"> @@ -443,50 +1079,37 @@ <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"> + </subsystem> + <subsystem xmlns="urn:jboss:domain:threads:1.1"> <queueless-thread-pool name="teiid-async"> - <max-threads count="2" per-cpu="2" /> + <max-threads count="2"/> </queueless-thread-pool> - </subsystem> + </subsystem> <subsystem xmlns="urn:jboss:domain:transactions:1.1"> <core-environment> <process-id> - <uuid /> + <uuid/> </process-id> </core-environment> <recovery-environment socket-binding="txn-recovery-environment" status-socket-binding="txn-status-manager"/> <coordinator-environment default-timeout="300"/> </subsystem> - <subsystem xmlns="urn:jboss:domain:web:1.0" default-virtual-server="default-host"> + <subsystem xmlns="urn:jboss:domain:web:1.1" default-virtual-server="default-host" native="false"> <connector name="http" protocol="HTTP/1.1" scheme="http" socket-binding="http"/> <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" xmlns:javaee="http://java.sun.com/xml/ns/javaee" xmlns:jaxwsconfig="urn:jboss:jbossws-jaxws-config:4.0"> + <subsystem xmlns="urn:jboss:domain:webservices:1.1"> <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> - --> - <endpoint-config> - <jaxwsconfig:config-name>Standard-Endpoint-Config</jaxwsconfig:config-name> + <endpoint-config name="Standard-Endpoint-Config"/> + <endpoint-config name="Recording-Endpoint-Config"> + <pre-handler-chain name="recording-handlers" protocol-bindings="##SOAP11_HTTP ##SOAP11_HTTP_MTOM ##SOAP12_HTTP ##SOAP12_HTTP_MTOM"> + <handler name="RecordingHandler" class="org.jboss.ws.common.invocation.RecordingServerHandler"/> + </pre-handler-chain> </endpoint-config> - <endpoint-config> - <jaxwsconfig:config-name>Recording-Endpoint-Config</jaxwsconfig:config-name> - <jaxwsconfig:pre-handler-chains> - <javaee:handler-chain xmlns="http://java.sun.com/xml/ns/javaee"> - <javaee:protocol-bindings>##SOAP11_HTTP ##SOAP11_HTTP_MTOM ##SOAP12_HTTP ##SOAP12_HTTP_MTOM</javaee:protocol-bindings> - <javaee:handler> - <javaee:handler-name>RecordingHandler</javaee:handler-name> - <javaee:handler-class>org.jboss.ws.common.invocation.RecordingServerHandler</javaee:handler-class> - </javaee:handler> - </javaee:handler-chain> - </jaxwsconfig:pre-handler-chains> - </endpoint-config> </subsystem> <subsystem xmlns="urn:jboss:domain:weld:1.0"/> </profile> @@ -502,25 +1125,24 @@ <interfaces> <interface name="management"/> <interface name="public"/> + <interface name="unsecure"/> </interfaces> <socket-binding-groups> <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="jacorb" interface="unsecure" port="3528"/> + <socket-binding name="jacorb-ssl" interface="unsecure" 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="${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="${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" 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="modcluster" port="0" multicast-address="224.0.1.105" multicast-port="23364"/> <socket-binding name="osgi-http" interface="management" port="8090"/> <socket-binding name="remoting" port="4447"/> <socket-binding name="txn-recovery-environment" port="4712"/> @@ -536,7 +1158,7 @@ <server-groups> <server-group name="main-server-group" profile="ha"> <jvm name="default"> - <heap size="1024m" max-size="2048m"/> + <heap size="1024m" max-size="2048m"/> </jvm> <socket-binding-group ref="ha-sockets"/> </server-group> Modified: trunk/build/kits/jboss-as7/domain/configuration/host-teiid.xml =================================================================== --- trunk/build/kits/jboss-as7/domain/configuration/host-teiid.xml 2012-02-28 19:35:14 UTC (rev 3901) +++ trunk/build/kits/jboss-as7/domain/configuration/host-teiid.xml 2012-02-28 21:20:57 UTC (rev 3902) @@ -9,6 +9,11 @@ <properties path="mgmt-users.properties" relative-to="jboss.domain.config.dir"/> </authentication> </security-realm> + <security-realm name="ApplicationRealm"> + <authentication> + <properties path="application-users.properties" relative-to="jboss.domain.config.dir" /> + </authentication> + </security-realm> </security-realms> <management-interfaces> <native-interface security-realm="ManagementRealm"> @@ -33,11 +38,20 @@ <interface name="public"> <inet-address value="${jboss.bind.address:127.0.0.1}"/> </interface> + <interface name="unsecure"> + <!-- Used for IIOP sockets in the standarad configuration. + To secure JacORB you need to setup SSL --> + <inet-address value="127.0.0.1"/> + </interface> </interfaces> <jvms> <jvm name="default"> <heap size="64m" max-size="256m"/> + <permgen size="256m" max-size="256m"/> + <jvm-options> + <option value="-server"/> + </jvm-options> </jvm> </jvms> @@ -51,11 +65,17 @@ </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-bindings port-offset="150"/> </server> + <server name="server-three" group="other-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-bindings port-offset="250"/> + </server> --> - </servers> </host> Modified: trunk/build/kits/jboss-as7/modules/org/jboss/teiid/translator/salesforce/main/module.xml =================================================================== --- trunk/build/kits/jboss-as7/modules/org/jboss/teiid/translator/salesforce/main/module.xml 2012-02-28 19:35:14 UTC (rev 3901) +++ trunk/build/kits/jboss-as7/modules/org/jboss/teiid/translator/salesforce/main/module.xml 2012-02-28 21:20:57 UTC (rev 3902) @@ -12,6 +12,6 @@ <module name="org.jboss.teiid.api" /> <module name="org.jboss.teiid.translator.salesforce.api"/> <module name="org.jboss.ws.cxf.jbossws-cxf-client"/> - <module name="org.springframework.spring"/> + <module name="org.springframework.spring" optional="true"/> </dependencies> </module> \ No newline at end of file Modified: trunk/build/kits/jboss-as7/modules/org/jboss/teiid/translator/ws/main/module.xml =================================================================== --- trunk/build/kits/jboss-as7/modules/org/jboss/teiid/translator/ws/main/module.xml 2012-02-28 19:35:14 UTC (rev 3901) +++ trunk/build/kits/jboss-as7/modules/org/jboss/teiid/translator/ws/main/module.xml 2012-02-28 21:20:57 UTC (rev 3902) @@ -11,5 +11,6 @@ <module name="javax.resource.api"/> <module name="org.jboss.teiid.common-core" /> <module name="org.jboss.teiid.api" /> + <module name="org.springframework.spring" optional="true"/> </dependencies> </module> Modified: trunk/build/kits/jboss-as7/standalone/configuration/standalone-teiid.xml =================================================================== --- trunk/build/kits/jboss-as7/standalone/configuration/standalone-teiid.xml 2012-02-28 19:35:14 UTC (rev 3901) +++ trunk/build/kits/jboss-as7/standalone/configuration/standalone-teiid.xml 2012-02-28 21:20:57 UTC (rev 3902) @@ -4,11 +4,11 @@ <extensions> <extension module="org.jboss.as.clustering.infinispan"/> + <extension module="org.jboss.as.configadmin"/> <extension module="org.jboss.as.connector"/> <extension module="org.jboss.as.deployment-scanner"/> <extension module="org.jboss.as.ee"/> <extension module="org.jboss.as.ejb3"/> - <extension module="org.jboss.as.jaxr"/> <extension module="org.jboss.as.jaxrs"/> <extension module="org.jboss.as.jdr"/> <extension module="org.jboss.as.jmx"/> @@ -36,6 +36,11 @@ <properties path="mgmt-users.properties" relative-to="jboss.server.config.dir"/> </authentication> </security-realm> + <security-realm name="ApplicationRealm"> + <authentication> + <properties path="application-users.properties" relative-to="jboss.server.config.dir"/> + </authentication> + </security-realm> </security-realms> <management-interfaces> <native-interface security-realm="ManagementRealm"> @@ -86,13 +91,12 @@ </handlers> </root-logger> </subsystem> + <subsystem xmlns="urn:jboss:domain:configadmin:1.0"/> <subsystem xmlns="urn:jboss:domain:datasources:1.0"> <datasources> - <datasource jndi-name="java:jboss/datasources/ExampleDS" enabled="true" use-java-context="true" - pool-name="ExampleDS"> + <datasource jndi-name="java:jboss/datasources/ExampleDS" pool-name="ExampleDS" enabled="true" use-java-context="true"> <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> @@ -105,8 +109,8 @@ </drivers> </datasources> </subsystem> - <subsystem xmlns="urn:jboss:domain:deployment-scanner:1.0"> - <deployment-scanner scan-interval="5000" relative-to="jboss.server.base.dir" path="deployments"/> + <subsystem xmlns="urn:jboss:domain:deployment-scanner:1.1"> + <deployment-scanner path="deployments" relative-to="jboss.server.base.dir" scan-interval="5000"/> </subsystem> <subsystem xmlns="urn:jboss:domain:ee:1.0"/> <subsystem xmlns="urn:jboss:domain:ejb3:1.2"> @@ -140,20 +144,26 @@ </timer-service> <remote connector-ref="remoting-connector" thread-pool-name="default"/> <thread-pools> - <thread-pool name="default" max-threads="10" keepalive-time="100"/> + <thread-pool name="default"> + <max-threads count="10"/> + <keepalive-time time="100" unit="milliseconds"/> + </thread-pool> </thread-pools> </subsystem> <subsystem xmlns="urn:jboss:domain:infinispan:1.1" default-cache-container="hibernate"> <cache-container name="hibernate" default-cache="local-query"> <local-cache name="entity"> + <transaction mode="NON_XA"/> <eviction strategy="LRU" max-entries="10000"/> <expiration max-idle="100000"/> </local-cache> <local-cache name="local-query"> + <transaction mode="NONE"/> <eviction strategy="LRU" max-entries="10000"/> <expiration max-idle="100000"/> </local-cache> <local-cache name="timestamps"> + <transaction mode="NONE"/> <eviction strategy="NONE"/> </local-cache> </cache-container> @@ -164,25 +174,21 @@ </local-cache> </cache-container> </subsystem> - <subsystem xmlns="urn:jboss:domain:jaxr:1.0"> - <connection-factory jndi-name="java:jboss/jaxr/ConnectionFactory"/> - <juddi-server publish-url="http://localhost:8080/juddi/publish" query-url="http://localhost:8080/juddi/query"/> - </subsystem> <subsystem xmlns="urn:jboss:domain:jaxrs:1.0"/> <subsystem xmlns="urn:jboss:domain:jca:1.1"> - <archive-validation enabled="false"/> + <archive-validation enabled="true" fail-on-error="true" fail-on-warn="false"/> <bean-validation enabled="false"/> <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"/> + <short-running-threads> + <core-threads count="50"/> + <queue-length count="50"/> + <max-threads count="50"/> <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"/> + <long-running-threads> + <core-threads count="50"/> + <queue-length count="50"/> + <max-threads count="50"/> <keepalive-time time="10" unit="seconds"/> </long-running-threads> </default-workmanager> @@ -190,6 +196,7 @@ <subsystem xmlns="urn:jboss:domain:jdr:1.0"/> <subsystem xmlns="urn:jboss:domain:jmx:1.1"> <show-model value="true"/> + <remoting-connector/> </subsystem> <subsystem xmlns="urn:jboss:domain:jpa:1.0"> <jpa default-datasource=""/> @@ -200,47 +207,25 @@ </mail-session> </subsystem> <subsystem xmlns="urn:jboss:domain:naming:1.1"/> - <subsystem xmlns="urn:jboss:domain:osgi:1.1" activation="lazy"> - <configuration pid="org.apache.felix.webconsole.internal.servlet.OsgiManager"> - <property name="manager.root" value="jboss-osgi"/> - </configuration> + <subsystem xmlns="urn:jboss:domain:osgi:1.2" activation="lazy"> <properties> <!-- Specifies the beginning start level of the framework --> <property name="org.osgi.framework.startlevel.beginning">1</property> </properties> <capabilities> <!-- modules registered with the OSGi layer on startup --> - <capability name="javax.api"/> - <capability name="javax.servlet.api"/> + <capability name="javax.servlet.api:v25"/> <capability name="javax.transaction.api"/> - <!-- bundles installed on startup --> - <capability name="org.apache.aries.util"/> - <capability name="org.jboss.osgi.webconsole"/> - <capability name="org.osgi.compendium"/> <!-- bundles started in 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 --> - <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 --> - <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:pojo:1.0"/> <subsystem xmlns="urn:jboss:domain:remoting:1.1"> - <connector name="remoting-connector" socket-binding="remoting"/> + <connector name="remoting-connector" socket-binding="remoting" security-realm="ApplicationRealm"/> </subsystem> <subsystem xmlns="urn:jboss:domain:resource-adapters:1.0"/> <subsystem xmlns="urn:jboss:domain:sar:1.0"/> @@ -248,7 +233,15 @@ <security-domains> <security-domain name="other" cache-type="default"> <authentication> - <login-module code="UsersRoles" flag="required"/> + <login-module code="Remoting" flag="optional"> + <module-option name="password-stacking" value="useFirstPass"/> + </login-module> + <login-module code="RealmUsersRoles" flag="required"> + <module-option name="usersProperties" value="${jboss.server.config.dir}/application-users.properties"/> + <module-option name="rolesProperties" value="${jboss.server.config.dir}/application-roles.properties"/> + <module-option name="realm" value="ApplicationRealm"/> + <module-option name="password-stacking" value="useFirstPass"/> + </login-module> </authentication> </security-domain> <security-domain name="jboss-web-policy" cache-type="default"> @@ -314,12 +307,12 @@ <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"> + </subsystem> + <subsystem xmlns="urn:jboss:domain:threads:1.1"> <queueless-thread-pool name="teiid-async"> - <max-threads count="2" per-cpu="2"/> + <max-threads count="2"/> </queueless-thread-pool> - </subsystem> + </subsystem> <subsystem xmlns="urn:jboss:domain:transactions:1.1"> <core-environment> <process-id> @@ -329,35 +322,22 @@ <recovery-environment socket-binding="txn-recovery-environment" status-socket-binding="txn-status-manager"/> <coordinator-environment default-timeout="300"/> </subsystem> - <subsystem xmlns="urn:jboss:domain:web:1.1" default-virtual-server="default-host"> + <subsystem xmlns="urn:jboss:domain:web:1.1" default-virtual-server="default-host" native="false"> <connector name="http" protocol="HTTP/1.1" scheme="http" socket-binding="http"/> <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" xmlns:javaee="http://java.sun.com/xml/ns/javaee" xmlns:jaxwsconfig="urn:jboss:jbossws-jaxws-config:4.0"> + <subsystem xmlns="urn:jboss:domain:webservices:1.1"> <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> - --> - <endpoint-config> - <jaxwsconfig:config-name>Standard-Endpoint-Config</jaxwsconfig:config-name> + <endpoint-config name="Standard-Endpoint-Config"/> + <endpoint-config name="Recording-Endpoint-Config"> + <pre-handler-chain name="recording-handlers" protocol-bindings="##SOAP11_HTTP ##SOAP11_HTTP_MTOM ##SOAP12_HTTP ##SOAP12_HTTP_MTOM"> + <handler name="RecordingHandler" class="org.jboss.ws.common.invocation.RecordingServerHandler"/> + </pre-handler-chain> </endpoint-config> - <endpoint-config> - <jaxwsconfig:config-name>Recording-Endpoint-Config</jaxwsconfig:config-name> - <jaxwsconfig:pre-handler-chains> - <javaee:handler-chain xmlns="http://java.sun.com/xml/ns/javaee"> - <javaee:protocol-bindings>##SOAP11_HTTP ##SOAP11_HTTP_MTOM ##SOAP12_HTTP ##SOAP12_HTTP_MTOM</javaee:protocol-bindings> - <javaee:handler> - <javaee:handler-name>RecordingHandler</javaee:handler-name> - <javaee:handler-class>org.jboss.ws.common.invocation.RecordingServerHandler</javaee:handler-class> - </javaee:handler> - </javaee:handler-chain> - </jaxwsconfig:pre-handler-chains> - </endpoint-config> </subsystem> <subsystem xmlns="urn:jboss:domain:weld:1.0"/> </profile> @@ -374,14 +354,9 @@ <socket-binding-group name="standard-sockets" default-interface="public" port-offset="${jboss.socket.binding.port-offset:0}"> <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="management-native" interface="management" port="${jboss.management.native.port:9999}"/> <socket-binding name="management-http" interface="management" port="${jboss.management.http.port:9990}"/> - <socket-binding name="messaging" port="5445"/> - <socket-binding name="messaging-throughput" port="5455"/> + <socket-binding name="management-https" interface="management" port="${jboss.management.https.port:9443}"/> <socket-binding name="osgi-http" interface="management" port="8090"/> <socket-binding name="remoting" port="4447"/> <socket-binding name="txn-recovery-environment" port="4712"/> @@ -392,5 +367,4 @@ <remote-destination host="localhost" port="25"/> </outbound-socket-binding> </socket-binding-group> - </server> Modified: trunk/jboss-integration/pom.xml =================================================================== --- trunk/jboss-integration/pom.xml 2012-02-28 19:35:14 UTC (rev 3901) +++ trunk/jboss-integration/pom.xml 2012-02-28 21:20:57 UTC (rev 3902) @@ -64,7 +64,7 @@ <artifactId>jboss-as-security</artifactId> <scope>provided</scope> </dependency> - + <!-- This dependency is to read the ra.xml file details --> <dependency> <groupId>org.jboss.as</groupId> @@ -78,11 +78,11 @@ <scope>provided</scope> </dependency> - <dependency> +<!-- <dependency> <groupId>org.picketbox</groupId> <artifactId>jbosssx-client</artifactId> <scope>provided</scope> - </dependency> + </dependency> --> <dependency> <groupId>org.jboss.as</groupId> Modified: trunk/jboss-integration/src/main/java/org/teiid/jboss/RoleBasedCredentialMapIdentityLoginModule.java =================================================================== --- trunk/jboss-integration/src/main/java/org/teiid/jboss/RoleBasedCredentialMapIdentityLoginModule.java 2012-02-28 19:35:14 UTC (rev 3901) +++ trunk/jboss-integration/src/main/java/org/teiid/jboss/RoleBasedCredentialMapIdentityLoginModule.java 2012-02-28 21:20:57 UTC (rev 3902) @@ -42,9 +42,9 @@ import javax.security.auth.login.LoginException; import org.jboss.logging.Logger; -import org.jboss.resource.security.AbstractPasswordCredentialLoginModule; import org.jboss.security.Base64Utils; import org.jboss.security.SimplePrincipal; +import org.picketbox.datasource.security.AbstractPasswordCredentialLoginModule; /** * A credential mapping login module that associates currently logged in @@ -171,7 +171,6 @@ if (userRole != null && rolePassword != null) { this.mappedRole = userRole; PasswordCredential cred = new PasswordCredential(userRole, decode(rolePassword)); - cred.setManagedConnectionFactory(getMcf()); SecurityActions.addCredentials(this.subject, cred); } return super.commit(); Modified: trunk/jboss-integration/src/main/java/org/teiid/jboss/TranslatorAdd.java =================================================================== --- trunk/jboss-integration/src/main/java/org/teiid/jboss/TranslatorAdd.java 2012-02-28 19:35:14 UTC (rev 3901) +++ trunk/jboss-integration/src/main/java/org/teiid/jboss/TranslatorAdd.java 2012-02-28 21:20:57 UTC (rev 3902) @@ -100,7 +100,7 @@ module = ml.loadModule(ModuleIdentifier.create(moduleName)); translatorLoader = module.getClassLoader(); } catch (ModuleLoadException e) { - throw new OperationFailedException(e, new ModelNode().set(IntegrationPlugin.Util.getString("failed_load_module", IntegrationPlugin.Event.TEIID50007, moduleName, translatorName))); //$NON-NLS-1$ + throw new OperationFailedException(e, new ModelNode().set(IntegrationPlugin.Util.getString("failed_load_translator_module", IntegrationPlugin.Event.TEIID50007, moduleName, translatorName))); //$NON-NLS-1$ } } Modified: trunk/jboss-integration/src/main/java/org/teiid/jboss/TranslatorDependencyDeployer.java =================================================================== --- trunk/jboss-integration/src/main/java/org/teiid/jboss/TranslatorDependencyDeployer.java 2012-02-28 19:35:14 UTC (rev 3901) +++ trunk/jboss-integration/src/main/java/org/teiid/jboss/TranslatorDependencyDeployer.java 2012-02-28 21:20:57 UTC (rev 3902) @@ -41,12 +41,12 @@ try { final ModuleSpecification moduleSpecification = deploymentUnit.getAttachment(Attachments.MODULE_SPECIFICATION); final ModuleLoader moduleLoader = Module.getCallerModule().getModule(ModuleIdentifier.create("org.jboss.teiid")).getModuleLoader(); //$NON-NLS-1$ - moduleSpecification.addLocalDependency(new ModuleDependency(moduleLoader, ModuleIdentifier.create("org.jboss.teiid.api"), false, false, false)); //$NON-NLS-1$ - moduleSpecification.addLocalDependency(new ModuleDependency(moduleLoader, ModuleIdentifier.create("org.jboss.teiid.common-core"), false, false, false)); //$NON-NLS-1$ - moduleSpecification.addLocalDependency(new ModuleDependency(moduleLoader, ModuleIdentifier.create("javax.api"), false, false, false)); //$NON-NLS-1$ - moduleSpecification.addLocalDependency(new ModuleDependency(moduleLoader, ModuleIdentifier.create("javax.resource.api"), false, false, false)); //$NON-NLS-1$ - moduleSpecification.addLocalDependency(new ModuleDependency(moduleLoader, ModuleIdentifier.create("org.apache.commons.logging"), false, false, false)); //$NON-NLS-1$ - moduleSpecification.addLocalDependency(new ModuleDependency(moduleLoader, ModuleIdentifier.create("org.apache.log4j"), false, false, false)); //$NON-NLS-1$ + moduleSpecification.addLocalDependency(new ModuleDependency(moduleLoader, ModuleIdentifier.create("org.jboss.teiid.api"), false, false, false, false)); //$NON-NLS-1$ + moduleSpecification.addLocalDependency(new ModuleDependency(moduleLoader, ModuleIdentifier.create("org.jboss.teiid.common-core"), false, false, false, false)); //$NON-NLS-1$ + moduleSpecification.addLocalDependency(new ModuleDependency(moduleLoader, ModuleIdentifier.create("javax.api"), false, false, false, false)); //$NON-NLS-1$ + moduleSpecification.addLocalDependency(new ModuleDependency(moduleLoader, ModuleIdentifier.create("javax.resource.api"), false, false, false, false)); //$NON-NLS-1$ + moduleSpecification.addLocalDependency(new ModuleDependency(moduleLoader, ModuleIdentifier.create("org.apache.commons.logging"), false, false, false, false)); //$NON-NLS-1$ + moduleSpecification.addLocalDependency(new ModuleDependency(moduleLoader, ModuleIdentifier.create("org.apache.log4j"), false, false, false, false)); //$NON-NLS-1$ } catch (ModuleLoadException e) { throw new DeploymentUnitProcessingException(e); } Modified: trunk/jboss-integration/src/main/java/org/teiid/jboss/VDBDependencyDeployer.java =================================================================== --- trunk/jboss-integration/src/main/java/org/teiid/jboss/VDBDependencyDeployer.java 2012-02-28 19:35:14 UTC (rev 3901) +++ trunk/jboss-integration/src/main/java/org/teiid/jboss/VDBDependencyDeployer.java 2012-02-28 21:20:57 UTC (rev 3902) @@ -88,9 +88,9 @@ try { final ModuleSpecification moduleSpecification = deploymentUnit.getAttachment(Attachments.MODULE_SPECIFICATION); final ModuleLoader moduleLoader = Module.getCallerModule().getModule(ModuleIdentifier.create("org.jboss.teiid")).getModuleLoader(); //$NON-NLS-1$ - moduleSpecification.addLocalDependency(new ModuleDependency(moduleLoader, ModuleIdentifier.create("org.jboss.teiid.api"), false, false, false)); //$NON-NLS-1$ - moduleSpecification.addLocalDependency(new ModuleDependency(moduleLoader, ModuleIdentifier.create("org.jboss.teiid.common-core"), false, false, false)); //$NON-NLS-1$ - moduleSpecification.addLocalDependency(new ModuleDependency(moduleLoader, ModuleIdentifier.create("javax.api"), false, false, false)); //$NON-NLS-1$ + moduleSpecification.addLocalDependency(new ModuleDependency(moduleLoader, ModuleIdentifier.create("org.jboss.teiid.api"), false, false, false, false)); //$NON-NLS-1$ + moduleSpecification.addLocalDependency(new ModuleDependency(moduleLoader, ModuleIdentifier.create("org.jboss.teiid.common-core"), false, false, false, false)); //$NON-NLS-1$ + moduleSpecification.addLocalDependency(new ModuleDependency(moduleLoader, ModuleIdentifier.create("javax.api"), false, false, false, false)); //$NON-NLS-1$ } catch (ModuleLoadException e) { throw new DeploymentUnitProcessingException(IntegrationPlugin.Event.TEIID50018.name(), e); } Modified: trunk/jboss-integration/src/main/resources/org/teiid/jboss/i18n.properties =================================================================== --- trunk/jboss-integration/src/main/resources/org/teiid/jboss/i18n.properties 2012-02-28 19:35:14 UTC (rev 3901) +++ trunk/jboss-integration/src/main/resources/org/teiid/jboss/i18n.properties 2012-02-28 21:20:57 UTC (rev 3902) @@ -90,6 +90,8 @@ duplicate_source_name={3} Source names are not unique for model {0} in {1}.{2} source_name_mismatch={3} There are different sources with the name {0} in {1}.{2} TEIID50043=Invalid metadata file found at {0}; delete this file and restart server. +failed_load_module= Failed to load module {0} +failed_load_translator_module= {0} Failed to load module {1} for translator {2} # subsystem description teiid.add = Add the Teiid Subsystem Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-02-28 19:35:14 UTC (rev 3901) +++ trunk/pom.xml 2012-02-28 21:20:57 UTC (rev 3902) @@ -15,23 +15,22 @@ <properties> <ant.version>1.7.0</ant.version> <site.url>http://www.jboss.org/teiid</site.url> - <jbossas-version>7.1.0.CR1b</jbossas-version> - <version.org.jboss.jboss-common-core>2.2.17.GA</version.org.jboss.jboss-common-core> - <version.org.jboss.staxmapper>1.0.0.Final</version.org.jboss.staxmapper> + <jbossas-version>7.1.0.Final</jbossas-version> + <version.org.jboss.common-core>2.2.17.GA</version.org.jboss.common-core> + <version.org.jboss.staxmapper>1.1.0.Final</version.org.jboss.staxmapper> <version.org.jboss.jboss-dmr>1.1.1.Final</version.org.jboss.jboss-dmr> - <version.org.jboss.msc.jboss-msc>1.0.1.GA</version.org.jboss.msc.jboss-msc> - <version.org.jboss.modules.jboss-modules>1.1.0.CR6</version.org.jboss.modules.jboss-modules> - <version.org.jboss.jboss-vfs>3.1.0.CR1</version.org.jboss.jboss-vfs> - <version.org.picketbox>4.0.6.Beta2</version.org.picketbox> - <version.org.jboss.logging.jboss-logging>3.1.0.CR2</version.org.jboss.logging.jboss-logging> - <version.org.jboss.logging.jboss-logging-tools>1.0.0.CR5</version.org.jboss.logging.jboss-logging-tools> + <version.org.jboss.msc.jboss-msc>1.0.2.GA</version.org.jboss.msc.jboss-msc> + <version.org.jboss.modules.jboss-modules>1.1.1.GA</version.org.jboss.modules.jboss-modules> + <version.org.jboss.jboss-vfs>3.1.0.Final</version.org.jboss.jboss-vfs> + <version.org.picketbox>4.0.6.final</version.org.picketbox> <version.org.picketbox.jbosssx-client>3.0.0.CR2</version.org.picketbox.jbosssx-client> + <version.org.jboss.logging.jboss-logging>3.1.0.GA</version.org.jboss.logging.jboss-logging> <version.org.jboss.arquillian.core>1.0.0.CR7</version.org.jboss.arquillian.core> - <version.javax.enterprise.cdi-api>1.0-SP4</version.javax.enterprise.cdi-api> - <version.org.jboss.netty>3.2.5.Final</version.org.jboss.netty> + <version.javax.enterprise>1.0-SP4</version.javax.enterprise> + <version.org.jboss.netty>3.2.6.Final</version.org.jboss.netty> <version.net.sourceforge.saxon>9.2.1.5</version.net.sourceforge.saxon> <version.json-simple>1.1</version.json-simple> - <version.org.jgroups>3.0.1.Final</version.org.jgroups> + <version.org.jgroups>3.0.5.Final</version.org.jgroups> <version.connector-api>1.5</version.connector-api> <version.jta>1.1</version.jta> <version.sun.jaxb>2.2</version.sun.jaxb> @@ -376,7 +375,7 @@ <dependency> <groupId>org.jboss</groupId> <artifactId>jboss-common-core</artifactId> - <version>${version.org.jboss.jboss-common-core}</version> + <version>${version.org.jboss.common-core}</version> <exclusions> <exclusion> <groupId>org.jboss.logging</groupId> @@ -399,12 +398,13 @@ <artifactId>staxmapper</artifactId> <version>${version.org.jboss.staxmapper}</version> </dependency> + <!-- <dependency> <groupId>org.picketbox</groupId> <artifactId>jbosssx-client</artifactId> <version>${version.org.picketbox.jbosssx-client}</version> </dependency> - + --> <dependency> <groupId>org.jboss</groupId> <artifactId>jboss-dmr</artifactId> @@ -569,11 +569,13 @@ <artifactId>json-simple</artifactId> <version>${version.json-simple}</version> </dependency> + <!-- <dependency> <groupId>javax.enterprise</groupId> <artifactId>cdi-api</artifactId> <version>${version.javax.enterprise.cdi-api}</version> </dependency> + --> <dependency> <groupId>com.sun.xml.bind</groupId> <artifactId>jaxb-xjc</artifactId> Modified: trunk/test-integration/common/pom.xml =================================================================== --- trunk/test-integration/common/pom.xml 2012-02-28 19:35:14 UTC (rev 3901) +++ trunk/test-integration/common/pom.xml 2012-02-28 21:20:57 UTC (rev 3902) @@ -39,11 +39,13 @@ <artifactId>junit</artifactId> <scope>test</scope> </dependency> + <!-- <dependency> <groupId>javax.enterprise</groupId> <artifactId>cdi-api</artifactId> <scope>test</scope> - </dependency> + </dependency> + --> <dependency> <groupId>org.jboss.as</groupId> <artifactId>jboss-as-clustering-jgroups</artifactId> Modified: trunk/test-integration/common/src/test/java/org/teiid/systemmodel/TestReplication.java =================================================================== --- trunk/test-integration/common/src/test/java/org/teiid/systemmodel/TestReplication.java 2012-02-28 19:35:14 UTC (rev 3901) +++ trunk/test-integration/common/src/test/java/org/teiid/systemmodel/TestReplication.java 2012-02-28 21:20:57 UTC (rev 3902) @@ -32,6 +32,7 @@ import java.util.HashMap; import org.jboss.as.clustering.jgroups.ChannelFactory; +import org.jboss.as.server.ServerEnvironment; import org.jgroups.Channel; import org.jgroups.JChannel; import org.junit.BeforeClass; @@ -133,6 +134,11 @@ public Channel createChannel(String id) throws Exception { return new JChannel(this.getClass().getClassLoader().getResource("tcp.xml")); } + + @Override + public ServerEnvironment getServerEnvironment() { + return null; + } }); server.setReplicator(jor);