Alon Bar-Lev has uploaded a new change for review.
Change subject: build: remove last traces of legacy devenv
......................................................................
build: remove last traces of legacy devenv
Change-Id: I5af49cd3111bf08d7e42c1eefa13342f525502bd
Signed-off-by: Alon Bar-Lev <alo...@redhat.com>
---
D backend/manager/conf/login-config.xml
D backend/manager/conf/postgres-ds.xml
D backend/manager/conf/standalone.xml
D backend/manager/conf/transaction-jboss-beans.xml
M ear/pom.xml
M pom.xml
6 files changed, 0 insertions(+), 802 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/39/19739/1
diff --git a/backend/manager/conf/login-config.xml
b/backend/manager/conf/login-config.xml
deleted file mode 100644
index 18a91d9..0000000
--- a/backend/manager/conf/login-config.xml
+++ /dev/null
@@ -1,161 +0,0 @@
-<?xml version='1.0'?>
-
-<!-- The XML based JAAS login configuration read by the
-org.jboss.security.auth.login.XMLLoginConfig mbean. Add
-an application-policy element for each security domain.
-
-The outline of the application-policy is:
-<application-policy name="security-domain-name">
- <authentication>
- <login-module code="login.module1.class.name" flag="control_flag">
- <module-option name = "option1-name">option1-value</module-option>
- <module-option name = "option2-name">option2-value</module-option>
- ...
- </login-module>
-
- <login-module code="login.module2.class.name" flag="control_flag">
- ...
- </login-module>
- ...
- </authentication>
-</application-policy>
-
-$Id: login-config.xml 87078 2009-04-09 14:23:47Z bstansbe...@jboss.com $
-$Revision: 87078 $
--->
-
-<policy>
- <!-- Used by clients within the application server VM such as
- mbeans and servlets that access EJBs.
- -->
- <application-policy name="client-login">
- <authentication>
- <login-module code="org.jboss.security.ClientLoginModule"
- flag="required">
- <!-- Any existing security context will be restored on logout -->
- <module-option name="restore-login-identity">true</module-option>
- </login-module>
- </authentication>
- </application-policy>
-
- <!-- Security domains for testing new jca framework -->
- <application-policy name="HsqlDbRealm">
- <authentication>
- <login-module
code="org.jboss.resource.security.ConfiguredIdentityLoginModule"
- flag="required">
- <module-option name="principal">sa</module-option>
- <module-option name="userName">sa</module-option>
- <module-option name="password"></module-option>
- <module-option
name="managedConnectionFactoryName">jboss.jca:service=LocalTxCM,name=DefaultDS</module-option>
- </login-module>
- </authentication>
- </application-policy>
-
- <application-policy name="JmsXARealm">
- <authentication>
- <login-module
code="org.jboss.resource.security.ConfiguredIdentityLoginModule"
- flag="required">
- <module-option name="principal">guest</module-option>
- <module-option name="userName">guest</module-option>
- <module-option name="password">guest</module-option>
- <module-option
name="managedConnectionFactoryName">jboss.jca:service=TxCM,name=JmsXA</module-option>
- </login-module>
- </authentication>
- </application-policy>
-
- <!-- A template configuration for the jmx-console web application. This
- defaults to the UsersRolesLoginModule the same as other and should be
- changed to a stronger authentication mechanism as required.
- -->
- <application-policy name="jmx-console">
- <authentication>
- <login-module code="org.jboss.security.auth.spi.UsersRolesLoginModule"
- flag="required">
- <module-option
name="usersProperties">props/jmx-console-users.properties</module-option>
- <module-option
name="rolesProperties">props/jmx-console-roles.properties</module-option>
- </login-module>
- </authentication>
- </application-policy>
-
- <!-- A template configuration for the web-console web application. This
- defaults to the UsersRolesLoginModule the same as other and should be
- changed to a stronger authentication mechanism as required.
- -->
- <application-policy name="web-console">
- <authentication>
- <login-module code="org.jboss.security.auth.spi.UsersRolesLoginModule"
- flag="required">
- <module-option
name="usersProperties">web-console-users.properties</module-option>
- <module-option
name="rolesProperties">web-console-roles.properties</module-option>
- </login-module>
- </authentication>
- </application-policy>
-
- <!--
- A template configuration for the JBossWS security domain.
- This defaults to the UsersRolesLoginModule the same as other and should be
- changed to a stronger authentication mechanism as required.
- -->
- <application-policy name="JBossWS">
- <authentication>
- <login-module code="org.jboss.security.auth.spi.UsersRolesLoginModule"
- flag="required">
- <module-option
name="usersProperties">props/jbossws-users.properties</module-option>
- <module-option
name="rolesProperties">props/jbossws-roles.properties</module-option>
- <module-option name="unauthenticatedIdentity">anonymous</module-option>
- </login-module>
- </authentication>
- </application-policy>
-
- <!-- The default login configuration used by any security domain that
- does not have a application-policy entry with a matching name
- -->
-<!-- A simple server login module, which can be used when the number
- of users is relatively small. It uses two properties files:
- users.properties, which holds users (key) and their password (value).
- roles.properties, which holds users (key) and a comma-separated list of
- their roles (value).
- The unauthenticatedIdentity property defines the name of the principal
- that will be used when a null username and password are presented as is
- the case for an unuathenticated web client or MDB. If you want to
- allow such users to be authenticated add the property, e.g.,
- unauthenticatedIdentity="nobody"
- -->
-
-<!--
- <application-policy name="other">
- <authentication>
- <login-module code="org.jboss.security.auth.spi.UsersRolesLoginModule"
- flag="required"/>
- </authentication>
- </application-policy>
--->
-
-<application-policy name="EngineKerberosAuth">
- <authentication>
- <login-module code="com.sun.security.auth.module.Krb5LoginModule"
flag="required">
- <!--
- <module-option name="debug">true</module-option>
- <module-option
name="principal">HTTP/principal@REALM</module-option>
- <module-option name="storeKey">true</module-option>
- <module-option name="useKeyTab">true</module-option>
- <module-option name="doNotPrompt">true</module-option>
- <module-option
name="keyTab">/path/to/keytabfile.keytab</module-option>
--->
- </login-module>
- </authentication>
-</application-policy>
-
-<!-- oVirt Engine SecureIdentityLoginModule -->
- <application-policy name="EncryptDBPassword">
- <authentication>
- <login-module
code="org.jboss.resource.security.SecureIdentityLoginModule" flag="required">
- <module-option name="username">sa</module-option>
- <module-option
name="password">EncryptDBPassword</module-option>
- <module-option
name="managedConnectionFactoryName">jboss.jca:name=ENGINEDataSource,service=LocalTxCM</module-option>
- </login-module>
- </authentication>
- </application-policy>
-</policy>
-
-
diff --git a/backend/manager/conf/postgres-ds.xml
b/backend/manager/conf/postgres-ds.xml
deleted file mode 100644
index 8aa3364..0000000
--- a/backend/manager/conf/postgres-ds.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<datasources>
- <local-tx-datasource>
- <jndi-name>ENGINEDataSource</jndi-name>
-
<connection-url>jdbc:postgresql://localhost:5432/engine</connection-url>
- <driver-class>org.postgresql.Driver</driver-class>
- <user-name>postgres</user-name>
- <password>ENGINEadmin2009!</password>
- <max-pool-size>100</max-pool-size>
- <check-valid-connection-sql>select
1</check-valid-connection-sql>
- </local-tx-datasource>
-
-</datasources>
diff --git a/backend/manager/conf/standalone.xml
b/backend/manager/conf/standalone.xml
deleted file mode 100644
index 241473a..0000000
--- a/backend/manager/conf/standalone.xml
+++ /dev/null
@@ -1,393 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-
-<server xmlns="urn:jboss:domain:1.1">
-
- <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.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.mail"/>
- <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"/>
- <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>
-
- <system-properties>
-
- <!-- Don't let quartz call home to check for updates: -->
- <property name="org.quartz.scheduler.skipUpdateCheck" value="true"/>
-
- <!-- Configure quartz thread pool: -->
- <property name="org.quartz.threadPool.class"
value="org.quartz.simpl.SimpleThreadPool"/>
- <property name="org.quartz.threadPool.threadCount" value="100"/>
- <property name="org.quartz.jobStore.misfireThreshold" value="60000"/>
- <property name="org.quartz.jobStore.class"
value="org.quartz.simpl.RAMJobStore"/>
-
- <!-- Enable compression for html content and REST API: -->
- <property name="org.apache.coyote.http11.Http11Protocol.COMPRESSION"
value="on"/>
- <property
name="org.apache.coyote.http11.Http11Protocol.COMPRESSION_MIME_TYPES"
value="text/javascript,text/css,text/html,text/xml,text/json,application/x-yaml,application/xml,application/json"/>
-
- </system-properties>
-
- <management>
- <security-realms>
- <security-realm name="ManagementRealm">
- <authentication>
- <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">
- <socket-binding native="management-native"/>
- </native-interface>
- <http-interface security-realm="ManagementRealm">
- <socket-binding http="management-http"/>
- </http-interface>
- </management-interfaces>
- </management>
-
- <profile>
- <subsystem xmlns="urn:jboss:domain:logging:1.1">
- <console-handler name="CONSOLE">
- <level name="INFO"/>
- <formatter>
- <pattern-formatter pattern="%d %-5p [%c] (%t) %s%E%n"/>
- </formatter>
- </console-handler>
- <periodic-rotating-file-handler name="FILE">
- <formatter>
- <pattern-formatter pattern="%d %-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>
- <size-rotating-file-handler name="ENGINE_LOG" autoflush="true">
- <level name="INFO"/>
- <formatter>
- <pattern-formatter pattern="%d %-5p [%c] (%t) %s%E%n"/>
- </formatter>
- <file relative-to="jboss.server.log.dir"
path="engine/engine.log"/>
- <rotate-size value="10M"/>
- <max-backup-index value="30"/>
- <append value="true"/>
- </size-rotating-file-handler>
- <size-rotating-file-handler name="FRONTEND_LOG" autoflush="true">
- <level name="DEBUG"/>
- <formatter>
- <pattern-formatter pattern="%d %-5p [%c] (%t) %s%E%n"/>
- </formatter>
- <file relative-to="jboss.server.log.dir"
path="engine/engine-ui.log"/>
- <rotate-size value="10M"/>
- <max-backup-index value="9"/>
- <append value="true"/>
- </size-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="org.ovirt">
- <level name="INFO"/>
- <handlers>
- <handler name="ENGINE_LOG"/>
- </handlers>
- </logger>
- <logger category="org.ovirt.engine.ui">
- <level name="INFO"/>
- <handlers>
- <handler name="FRONTEND_LOG"/>
- </handlers>
- </logger>
- <logger category="org.ovirt.engine.core.bll">
- <level name="INFO"/>
- </logger>
- <logger
category="org.ovirt.engine.core.dal.dbbroker.PostgresDbEngineDialect$PostgresJdbcTemplate">
- <level name="WARN"/>
- </logger>
- <logger category="org.springframework.ldap">
- <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:/ENGINEDataSource"
pool-name="ENGINEDataSource" enabled="true">
- <connection-url>
- jdbc:postgresql://localhost:5432/engine
- </connection-url>
- <driver>
- postgresql
- </driver>
- <transaction-isolation>
- TRANSACTION_READ_COMMITTED
- </transaction-isolation>
- <pool>
- <min-pool-size>
- 1
- </min-pool-size>
- <max-pool-size>
- 100
- </max-pool-size>
- <prefill>
- true
- </prefill>
- </pool>
- <security>
- <user-name>
- postgres
- </user-name>
- </security>
- <statement>
- <prepared-statement-cache-size>
- 100
- </prepared-statement-cache-size>
- </statement>
- <validation>
- <check-valid-connection-sql>select
1</check-valid-connection-sql>
- </validation>
- </datasource>
- <drivers>
- <driver name="postgresql" module="org.postgresql">
- <xa-datasource-class>
- org.postgresql.xa.PGXADataSource
- </xa-datasource-class>
- </driver>
- </drivers>
- </datasources>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:deployment-scanner:1.1">
- <deployment-scanner path="deployments"
relative-to="jboss.server.base.dir" scan-enabled="true" scan-interval="5000"/>
- </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>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:infinispan:1.1"
default-cache-container="ovirt-engine">
- <cache-container name="ovirt-engine" default-cache="timeout-base"
jndi-name="java:jboss/infinispan/ovirt-engine" start="EAGER">
- <local-cache name="timeout-base">
- <transaction mode="NONE"/>
- <eviction max-entries="10000"/>
- <expiration interval="60000"/>
- </local-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: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: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.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">
- <authorization>
- <policy-module code="Delegating" flag="required"/>
- </authorization>
- </security-domain>
- <security-domain name="EngineKerberosAuth">
- <authentication>
- <login-module
code="com.sun.security.auth.module.Krb5LoginModule" flag="required"/>
- </authentication>
- </security-domain>
- <security-domain name="EncryptDBPassword">
- <authentication>
- <login-module
code="org.picketbox.datasource.security.SecureIdentityLoginModule"
flag="required">
- <module-option name="username" value="engine"/>
- <module-option name="password"
value="EncryptDBPassword"/>
- <module-option name="managedConnectionFactoryName"
value="jboss.jca:name=ENGINEDataSource,service=LocalTxCM"/>
- </login-module>
- </authentication>
- </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="600"/>
- </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"/>
- <connector name="ajp" protocol="AJP/1.3" scheme="http"
socket-binding="ajp"/>
- <virtual-server name="default-host" enable-welcome-root="false">
- <alias name="localhost"/>
- <rewrite pattern="^/RHEVManager(.*)$"
substitution="/OvirtEngine$1" flags="last"/>
- </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>
-
- <interfaces>
- <interface name="management">
- <inet-address value="${jboss.bind.address.management:127.0.0.1}"/>
- </interface>
- <interface name="public">
- <any-address/>
- </interface>
- </interfaces>
-
- <socket-binding-group name="standard-sockets" default-interface="public"
port-offset="${jboss.socket.binding.port-offset:0}">
- <socket-binding name="http" port="8700"/>
- <socket-binding name="https" port="8701"/>
- <socket-binding name="ajp" port="8702"/>
- <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="management-https" interface="management"
port="${jboss.management.https.port:9443}"/>
- <socket-binding name="osgi-http" interface="management" port="8090"/>
- <socket-binding name="remoting" port="8703"/>
- <socket-binding name="txn-recovery-environment" port="8704"/>
- <socket-binding name="txn-status-manager" port="8705"/>
- <outbound-socket-binding name="mail-smtp">
- <remote-destination host="localhost" port="25"/>
- </outbound-socket-binding>
- </socket-binding-group>
-</server>
diff --git a/backend/manager/conf/transaction-jboss-beans.xml
b/backend/manager/conf/transaction-jboss-beans.xml
deleted file mode 100644
index 46b64b4..0000000
--- a/backend/manager/conf/transaction-jboss-beans.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
- <bean name="TransactionManager"
class="com.arjuna.ats.jbossatx.jta.TransactionManagerService">
-
<annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss:service=TransactionManager",
exposedInterface=com.arjuna.ats.jbossatx.jta.TransactionManagerServiceMBean.class,
registerDirectly=true)</annotation>
-
<annotation>@org.jboss.managed.api.annotation.ManagementObject(name="TransactionManager",componentType=@org.jboss.managed.api.annotation.ManagementComponent(type
= "MCBean", subtype =
"JTA"),targetInterface=com.arjuna.ats.jbossatx.jta.TransactionManagerServiceMBean.class)</annotation>
-
- <property name="transactionTimeout">600</property>
- <property
name="objectStoreDir">${jboss.server.data.dir}/tx-object-store</property>
- <property name="mbeanServer"><inject bean="JMXKernel"
property="mbeanServer"/></property>
-
- <property name="transactionStatusManagerInetAddress">
- <value-factory bean="ServiceBindingManager"
- method="getInetAddressBinding">
- <parameter>TransactionManager</parameter>
- <parameter>transactionStatusManager</parameter>
- </value-factory>
- </property>
- <property name="transactionStatusManagerPort">
- <value-factory bean="ServiceBindingManager"
- method="getIntBinding" >
- <parameter>TransactionManager</parameter>
- <parameter>transactionStatusManager</parameter>
- </value-factory>
- </property>
-
- <property name="recoveryInetAddress">
- <value-factory bean="ServiceBindingManager"
- method="getInetAddressBinding">
- <parameter>TransactionManager</parameter>
- <parameter>recoveryManager</parameter>
- </value-factory>
- </property>
- <property name="recoveryPort">
- <value-factory bean="ServiceBindingManager"
- method="getIntBinding" >
- <parameter>TransactionManager</parameter>
- <parameter>recoveryManager</parameter>
- </value-factory>
- </property>
-
- <property name="socketProcessIdPort">0</property>
-
- </bean>
-
- <!-- Make javax.transaction.TransactionManager available for injection -->
- <bean name="RealTransactionManager">
- <constructor factoryMethod="getTransactionManager">
- <factory bean="TransactionManager"/>
- </constructor>
- </bean>
-
- <!-- Handles user transaction providers and listeners -->
- <bean name="UserTransactionRegistry"
class="org.jboss.tm.usertx.UserTransactionRegistry">
- <!-- Register providers -->
- <incallback method="addProvider"/>
- <uncallback method="removeProvider"/>
- <!-- Register listeners -->
- <incallback method="addListener"/>
- <uncallback method="removeListener"/>
- </bean>
-
- <!-- The provider for default in process UserTransactions -->
- <bean name="DefaultUserTransactionprovider"
class="org.jboss.tm.usertx.client.ServerVMClientUserTransaction">
- <constructor
factoryClass="org.jboss.tm.usertx.client.ServerVMClientUserTransaction"
factoryMethod="getSingleton"/>
- <demand>TransactionManager</demand>
- </bean>
-
-</deployment>
diff --git a/ear/pom.xml b/ear/pom.xml
index a057ff7..199993c 100644
--- a/ear/pom.xml
+++ b/ear/pom.xml
@@ -15,7 +15,6 @@
<properties>
<earDirectory>${project.build.directory}/${project.build.finalName}</earDirectory>
- <backendConfFiles>${basedir}/../backend/manager/conf</backendConfFiles>
</properties>
<dependencies>
@@ -236,166 +235,4 @@
</plugins>
</build>
-
- <profiles>
-
- <profile>
- <id>dep</id>
-
- <properties>
- <engine.rootDir>..</engine.rootDir>
-
<engine.deploymentName>${project.build.finalName}.ear</engine.deploymentName>
-
<engine.deploymentsDir>${jbossServer}/deployments</engine.deploymentsDir>
-
<engine.deploymentDir>${engine.deploymentsDir}/${engine.deploymentName}</engine.deploymentDir>
- </properties>
-
- <build>
- <plugins>
-
- <!-- Deploy the modules: -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <id>deploy-modules</id>
- <phase>package</phase>
- <goals>
- <goal>unpack</goal>
- </goals>
- <configuration>
- <overWrite>true</overWrite>
- <outputDirectory>${jbossHome}/modules</outputDirectory>
- <artifactItems>
- <artifactItem>
- <groupId>org.ovirt.engine.core</groupId>
- <artifactId>dependencies</artifactId>
- <version>${engine.version}</version>
- <classifier>modules</classifier>
- <type>zip</type>
- </artifactItem>
- <artifactItem>
- <groupId>org.ovirt.engine.core</groupId>
- <artifactId>common</artifactId>
- <version>${engine.version}</version>
- <classifier>modules</classifier>
- <type>zip</type>
- </artifactItem>
- <artifactItem>
- <groupId>org.ovirt.engine.core</groupId>
- <artifactId>compat</artifactId>
- <version>${engine.version}</version>
- <classifier>modules</classifier>
- <type>zip</type>
- </artifactItem>
- <artifactItem>
- <groupId>org.ovirt.engine.core</groupId>
- <artifactId>dal</artifactId>
- <version>${engine.version}</version>
- <classifier>modules</classifier>
- <type>zip</type>
- </artifactItem>
- <artifactItem>
- <groupId>org.ovirt.engine.core</groupId>
- <artifactId>searchbackend</artifactId>
- <version>${engine.version}</version>
- <classifier>modules</classifier>
- <type>zip</type>
- </artifactItem>
- <artifactItem>
- <groupId>org.ovirt.engine.core</groupId>
- <artifactId>tools</artifactId>
- <version>${engine.version}</version>
- <classifier>modules</classifier>
- <type>zip</type>
- </artifactItem>
- <artifactItem>
- <groupId>org.ovirt.engine.core</groupId>
- <artifactId>utils</artifactId>
- <version>${engine.version}</version>
- <classifier>modules</classifier>
- <type>zip</type>
- </artifactItem>
- </artifactItems>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- <!-- Deploy the contents of the ear: -->
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <id>deploy-ear</id>
- <phase>package</phase>
-
- <configuration>
- <tasks>
- <property name="deployment.dir"
location="${engine.deploymentDir}"/>
- <echo>*** Copying updated files to
${deployment.dir}${file.separator}...</echo>
- <unjar
src="${project.build.directory}/${project.build.finalName}.ear"
dest="${engine.deploymentDir}"/>
- <property name="deployment.descriptor.file"
location="${deployment.dir}/META-INF/application.xml"/>
- <echo>*** Touching ${deployment.descriptor.file} to force
redeployment of ${engine.deploymentName}...</echo>
- <touch file="${deployment.descriptor.file}"/>
- <echo>*** Touching ${engine.deploymentName}.dodeploy to
force deployment of ${engine.deploymentName}...</echo>
- <touch
file="${jbossServer}/deployments/${engine.deploymentName}.dodeploy"/>
- </tasks>
- </configuration>
-
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
-
- <execution>
- <id>undeploy-ear</id>
- <phase>clean</phase>
-
- <configuration>
- <tasks>
- <property name="deployment.dir"
location="${engine.deploymentDir}"/>
- <echo>*** Deleting
${deployment.dir}${file.separator}...</echo>
- <delete dir="${deployment.dir}"/>
- </tasks>
- </configuration>
-
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
-
- <profile>
- <id>setup</id>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <id>setup</id>
- <phase>install</phase>
-
- <configuration>
- <tasks>
- <echo>*** Copying configuration file from
${backendConfFiles}/standalone.xml to ${jbossServer}/configuration</echo>
- <copy overwrite="true"
file="${backendConfFiles}/standalone.xml" todir="${jbossServer}/configuration"/>
- </tasks>
- </configuration>
-
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
</project>
diff --git a/pom.xml b/pom.xml
index befc2a5..716a3e8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -37,8 +37,6 @@
<engine.groupId>org.ovirt.engine</engine.groupId>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <!-- <jbossHome>${env.JBOSS_HOME}</jbossHome> -->
- <jbossServer>${jbossHome}/standalone</jbossServer>
<maven.compiler.source>1.7</maven.compiler.source>
<maven.compiler.target>1.7</maven.compiler.target>
<animal.sniffer.signature>java17</animal.sniffer.signature>
--
To view, visit http://gerrit.ovirt.org/19739
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5af49cd3111bf08d7e42c1eefa13342f525502bd
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Alon Bar-Lev <alo...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
