Change in ovirt-engine[engine_3.2]: packaging: engine-setup - make firewall checking more robust
by juan.hernandez@redhat.com
Juan Hernandez has submitted this change and it was merged.
Change subject: packaging: engine-setup - make firewall checking more robust
......................................................................
packaging: engine-setup - make firewall checking more robust
1. Don't execute systemctl if it's not available in the system.
2. append ".service" to services name for backward compatibility.
Change-Id: I1be793bb4ea938603f13b4e599edc72f83499d44
Signed-off-by: Ofer Schreiber <oschreib(a)redhat.com>
(cherry picked from commit 3a34cda66edd76d49af7905fcfeb218acbf35a50)
---
M packaging/fedora/setup/common_utils.py
1 file changed, 6 insertions(+), 3 deletions(-)
Approvals:
Juan Hernandez: Verified; Looks good to me, approved
--
To view, visit http://gerrit.ovirt.org/12859
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I1be793bb4ea938603f13b4e599edc72f83499d44
Gerrit-PatchSet: 3
Gerrit-Project: ovirt-engine
Gerrit-Branch: engine_3.2
Gerrit-Owner: Juan Hernandez <juan.hernandez(a)redhat.com>
Gerrit-Reviewer: Juan Hernandez <juan.hernandez(a)redhat.com>
Gerrit-Reviewer: Ofer Schreiber <oschreib(a)redhat.com>
11 years, 8 months
Change in ovirt-engine[engine_3.2]: core: Add commons-collections to the dal module
by juan.hernandez@redhat.com
Juan Hernandez has submitted this change and it was merged.
Change subject: core: Add commons-collections to the dal module
......................................................................
core: Add commons-collections to the dal module
Commit 81742e created a module for the DAL, but it is missing the
dependency on commons-collections.
Change-Id: I5cdbbf1b8fd8effb6aec7988dea0fb9a34da0c29
Signed-off-by: Juan Hernandez <juan.hernandez(a)redhat.com>
(cherry picked from commit 6135a4e5876780febbf9e83b70680964e425dfcf)
---
M backend/manager/modules/dal/src/main/modules/org/ovirt/engine/core/dal/main/module.xml
1 file changed, 1 insertion(+), 0 deletions(-)
Approvals:
Juan Hernandez: Verified; Looks good to me, approved
--
To view, visit http://gerrit.ovirt.org/12858
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5cdbbf1b8fd8effb6aec7988dea0fb9a34da0c29
Gerrit-PatchSet: 3
Gerrit-Project: ovirt-engine
Gerrit-Branch: engine_3.2
Gerrit-Owner: Juan Hernandez <juan.hernandez(a)redhat.com>
Gerrit-Reviewer: Juan Hernandez <juan.hernandez(a)redhat.com>
11 years, 8 months
Change in ovirt-engine[engine_3.2]: restapi: Use context classloader from YAML
by juan.hernandez@redhat.com
Juan Hernandez has submitted this change and it was merged.
Change subject: restapi: Use context classloader from YAML
......................................................................
restapi: Use context classloader from YAML
The YAML library that we use to build load the RSDL metadata assumes
that it can load classes using from its own class loader, and this is
incorrect, specially now the the library is loaded from a JBoss module.
The correct way to load classes is to use the context class loader, so
it will work regardless of where in the application the classes are
located.
Change-Id: Iad370caa7940c3c5883bc21b34d1eea73cfc63d5
Signed-off-by: Juan Hernandez <juan.hernandez(a)redhat.com>
(cherry picked from commit 2fd239a065877c20ea580926e28d6603f6fe1d75)
---
M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/rsdl/RsdlBuilder.java
M backend/manager/modules/restapi/webapp/pom.xml
A backend/manager/modules/restapi/webapp/src/main/resources/META-INF/MANIFEST.MF
3 files changed, 13 insertions(+), 1 deletion(-)
Approvals:
Juan Hernandez: Verified; Looks good to me, approved
--
To view, visit http://gerrit.ovirt.org/12857
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iad370caa7940c3c5883bc21b34d1eea73cfc63d5
Gerrit-PatchSet: 3
Gerrit-Project: ovirt-engine
Gerrit-Branch: engine_3.2
Gerrit-Owner: Juan Hernandez <juan.hernandez(a)redhat.com>
Gerrit-Reviewer: Juan Hernandez <juan.hernandez(a)redhat.com>
11 years, 8 months
Change in ovirt-engine[engine_3.2]: packaging: Don't resolve plugins
by juan.hernandez@redhat.com
Juan Hernandez has submitted this change and it was merged.
Change subject: packaging: Don't resolve plugins
......................................................................
packaging: Don't resolve plugins
Now that we have a plugin in the project that is required for the build
(the jboss modules plugin) this will always fail in the first build.
Change-Id: I20a937cb813b87808f15d7a4c5cd1bedee3c8f9e
Signed-off-by: Juan Hernandez <juan.hernandez(a)redhat.com>
(cherry picked from commit ec6327c855d6cb29f69b0516e5c5d6e4bb019c58)
---
M Makefile
1 file changed, 0 insertions(+), 4 deletions(-)
Approvals:
Juan Hernandez: Verified; Looks good to me, approved
--
To view, visit http://gerrit.ovirt.org/12856
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I20a937cb813b87808f15d7a4c5cd1bedee3c8f9e
Gerrit-PatchSet: 3
Gerrit-Project: ovirt-engine
Gerrit-Branch: engine_3.2
Gerrit-Owner: Juan Hernandez <juan.hernandez(a)redhat.com>
Gerrit-Reviewer: Juan Hernandez <juan.hernandez(a)redhat.com>
11 years, 8 months
Change in ovirt-engine[engine_3.2]: core: Move the session cleaner interceptor to bll
by juan.hernandez@redhat.com
Juan Hernandez has submitted this change and it was merged.
Change subject: core: Move the session cleaner interceptor to bll
......................................................................
core: Move the session cleaner interceptor to bll
Commit 028ff6 moved the utils library to a JBoss module, but the
application server doesn't load correctly interceptors from these
modules, so the local session cleaner interceptors has to be moved to
the same .jar file containing the intercepted bean, otherwise the
interceptor is ignored.
Change-Id: I45cfb6c2abc40239cd8e44ba5e027841a2343c4c
Signed-off-by: Juan Hernandez <juan.hernandez(a)redhat.com>
(cherry picked from commit 5eaa94df4873b2e19ad7275ea0f039fe6ca4fea2)
---
M backend/manager/modules/bll/pom.xml
M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/Backend.java
R backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/interceptors/ThreadLocalSessionCleanerInterceptor.java
M backend/manager/modules/utils/pom.xml
M backend/manager/modules/utils/src/main/modules/org/ovirt/engine/core/utils/main/module.xml
5 files changed, 9 insertions(+), 8 deletions(-)
Approvals:
Juan Hernandez: Verified; Looks good to me, approved
--
To view, visit http://gerrit.ovirt.org/12855
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I45cfb6c2abc40239cd8e44ba5e027841a2343c4c
Gerrit-PatchSet: 3
Gerrit-Project: ovirt-engine
Gerrit-Branch: engine_3.2
Gerrit-Owner: Juan Hernandez <juan.hernandez(a)redhat.com>
Gerrit-Reviewer: Juan Hernandez <juan.hernandez(a)redhat.com>
11 years, 8 months
Change in ovirt-engine[master]: build: solve m2e manifest problems
by amureini@redhat.com
Allon Mureinik has submitted this change and it was merged.
Change subject: build: solve m2e manifest problems
......................................................................
build: solve m2e manifest problems
The m2e plugin for Eclipse IDE that many developers use is incompatible
with the cutting edge manifest-related maven plugins.
This patch downgrades the version of the maven-war-plugin (to 2.1.1) and
maven-ear-plugin (to 2.6), so that Eclipse can import the project with
not problems.
Change-Id: Ib678e50b9403ae16415f5e10fb8f1e9a58d77661
Signed-off-by: Allon Mureinik <amureini(a)redhat.com>
---
M pom.xml
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
Allon Mureinik: Verified; Looks good to me, approved
--
To view, visit http://gerrit.ovirt.org/12870
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib678e50b9403ae16415f5e10fb8f1e9a58d77661
Gerrit-PatchSet: 3
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Allon Mureinik <amureini(a)redhat.com>
Gerrit-Reviewer: Allon Mureinik <amureini(a)redhat.com>
Gerrit-Reviewer: Alon Bar-Lev <alonbl(a)redhat.com>
Gerrit-Reviewer: Juan Hernandez <juan.hernandez(a)redhat.com>
Gerrit-Reviewer: Vered Volansky <vvolansk(a)redhat.com>
Gerrit-Reviewer: Yair Zaslavsky <yzaslavs(a)redhat.com>
11 years, 8 months
Change in ovirt-engine[engine_3.2]: packaging: Add beanutils as dependency of utils
by juan.hernandez@redhat.com
Juan Hernandez has submitted this change and it was merged.
Change subject: packaging: Add beanutils as dependency of utils
......................................................................
packaging: Add beanutils as dependency of utils
This is needed by the OVF related code.
Change-Id: I370c88f23689029665f8ede84984c01942e40a97
Signed-off-by: Juan Hernandez <juan.hernandez(a)redhat.com>
(cherry picked from commit b8a30538fd4a51bd40f5ec2479251a95dfda9064)
---
M backend/manager/modules/utils/src/main/modules/org/ovirt/engine/core/utils/main/module.xml
1 file changed, 1 insertion(+), 0 deletions(-)
Approvals:
Juan Hernandez: Verified; Looks good to me, approved
--
To view, visit http://gerrit.ovirt.org/12854
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I370c88f23689029665f8ede84984c01942e40a97
Gerrit-PatchSet: 3
Gerrit-Project: ovirt-engine
Gerrit-Branch: engine_3.2
Gerrit-Owner: Juan Hernandez <juan.hernandez(a)redhat.com>
Gerrit-Reviewer: Juan Hernandez <juan.hernandez(a)redhat.com>
11 years, 8 months
Change in ovirt-engine[engine_3.2]: tools: Use JBoss modules instead of class path
by juan.hernandez@redhat.com
Juan Hernandez has submitted this change and it was merged.
Change subject: tools: Use JBoss modules instead of class path
......................................................................
tools: Use JBoss modules instead of class path
Currently in order to run the tools we build the class path using mostly
the "build-classpath" script and also some ad hoc searches. This tends
to fail in environments where the jar files are installed in locations
different than expected. This patch changes the scripts that starts
the tools so that they use the JBoss modules launcher instead, thus
manual class path building is no longer required.
Change-Id: I32a6ed83071ec4243cfe468f87ad98d4f31d503d
Signed-off-by: Juan Hernandez <juan.hernandez(a)redhat.com>
(cherry picked from commit 028ff6b8eb74f532f0d001382d19e21e488d9527)
---
M backend/manager/tools/src/main/shell/engine-config.sh
M backend/manager/tools/src/main/shell/engine-manage-domains.sh
M backend/manager/tools/src/main/shell/engine-notifier.sh
M backend/manager/tools/src/main/shell/engine-prolog.sh.in
4 files changed, 60 insertions(+), 123 deletions(-)
Approvals:
Juan Hernandez: Verified; Looks good to me, approved
--
To view, visit http://gerrit.ovirt.org/12853
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I32a6ed83071ec4243cfe468f87ad98d4f31d503d
Gerrit-PatchSet: 3
Gerrit-Project: ovirt-engine
Gerrit-Branch: engine_3.2
Gerrit-Owner: Juan Hernandez <juan.hernandez(a)redhat.com>
Gerrit-Reviewer: Juan Hernandez <juan.hernandez(a)redhat.com>
11 years, 8 months
Change in ovirt-engine[engine_3.2]: core: Add jxpath as commons-configuration dep
by juan.hernandez@redhat.com
Juan Hernandez has submitted this change and it was merged.
Change subject: core: Add jxpath as commons-configuration dep
......................................................................
core: Add jxpath as commons-configuration dep
The commons-configuration module provided by JBoss AS doesn't include
commons-jxpath as a dependency, but engine-config needs it in order to
parse configuration files, so we need to add a module for commons-jxpath
and also override the commons-configuration module to include the
dependency on commons-jxpath.
Change-Id: I380834a4d1e3c017dbbd50f5437de97644113d2b
Signed-off-by: Juan Hernandez <juan.hernandez(a)redhat.com>
(cherry picked from commit 71a7c80a1fcaf026e2b0115725924aa18d91ae61)
---
M backend/manager/dependencies/pom.xml
A backend/manager/dependencies/src/main/modules/org/apache/commons/configuration/main/module.xml
A backend/manager/dependencies/src/main/modules/org/apache/commons/jxpath/main/module.xml
3 files changed, 69 insertions(+), 0 deletions(-)
Approvals:
Juan Hernandez: Verified; Looks good to me, approved
--
To view, visit http://gerrit.ovirt.org/12852
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I380834a4d1e3c017dbbd50f5437de97644113d2b
Gerrit-PatchSet: 3
Gerrit-Project: ovirt-engine
Gerrit-Branch: engine_3.2
Gerrit-Owner: Juan Hernandez <juan.hernandez(a)redhat.com>
Gerrit-Reviewer: Juan Hernandez <juan.hernandez(a)redhat.com>
11 years, 8 months
Change in ovirt-engine[engine_3.2]: core: Add JBoss modules for libraries
by juan.hernandez@redhat.com
Juan Hernandez has submitted this change and it was merged.
Change subject: core: Add JBoss modules for libraries
......................................................................
core: Add JBoss modules for libraries
This patch creates JBoss modules for the common, compat, dal, utils,
tooks and searchbackend libraries.
Change-Id: Id9a424ae79061a022885b0eba6ea702431b745a8
Signed-off-by: Juan Hernandez <juan.hernandez(a)redhat.com>
(cherry picked from commit 81742e0fd1d0fb1626f84d0b92f46e0cd65ab581)
---
M Makefile
M backend/manager/modules/common/pom.xml
A backend/manager/modules/common/src/main/modules/org/ovirt/engine/core/common/main/module.xml
M backend/manager/modules/compat/pom.xml
A backend/manager/modules/compat/src/main/modules/org/ovirt/engine/core/compat/main/module.xml
M backend/manager/modules/dal/pom.xml
A backend/manager/modules/dal/src/main/modules/org/ovirt/engine/core/dal/main/module.xml
M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/BackendApplication.java
M backend/manager/modules/restapi/webapp/pom.xml
M backend/manager/modules/searchbackend/pom.xml
A backend/manager/modules/searchbackend/src/main/modules/org/ovirt/engine/core/searchbackend/main/module.xml
M backend/manager/modules/utils/pom.xml
M backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ejb/EngineEJBUtilsStrategy.java
A backend/manager/modules/utils/src/main/modules/org/ovirt/engine/core/utils/main/module.xml
M backend/manager/tools/pom.xml
A backend/manager/tools/src/main/modules/org/ovirt/engine/core/tools/main/module.xml
M ear/pom.xml
M ear/src/main/resources/META-INF/MANIFEST.MF
M frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/server/gwt/GenericApiGWTServiceImpl.java
M frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/server/gwt/GwtDynamicHostPageServlet.java
M packaging/fedora/spec/ovirt-engine.spec.in
M pom.xml
22 files changed, 307 insertions(+), 160 deletions(-)
Approvals:
Juan Hernandez: Verified; Looks good to me, approved
--
To view, visit http://gerrit.ovirt.org/12851
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id9a424ae79061a022885b0eba6ea702431b745a8
Gerrit-PatchSet: 3
Gerrit-Project: ovirt-engine
Gerrit-Branch: engine_3.2
Gerrit-Owner: Juan Hernandez <juan.hernandez(a)redhat.com>
Gerrit-Reviewer: Juan Hernandez <juan.hernandez(a)redhat.com>
11 years, 8 months