Vojtech Szocs has uploaded a new change for review.
Change subject: webadmin,userportal: Decouple AspectJ configuration from
gwt-plugin.extraJvmArgs
......................................................................
webadmin,userportal: Decouple AspectJ configuration from gwt-plugin.extraJvmArgs
Some people might run into problems when trying to build WebAdmin or UserPortal
(e.g. OutOfMemoryError) and therefore need to adjust gwt-maven-plugin JVM args.
Overriding "gwt-plugin.extraJvmArgs" directly is not safe, as it also contains
AspectJ load-time weaving configuration (used to prevent GWT compiler from
pruning certain classes).
This patch includes two changes:
1. Move AspectJ-related configuration out of "gwt-plugin.extraJvmArgs",
directly into gwt-maven-plugin's extraJvmArgs config element.
2. Increase MaxPermSize from 256M to 512M
With this patch, people should be able to override "gwt-plugin.extraJvmArgs"
directly, without having to edit pom.xml file.
Change-Id: I1761efcec5197121ca97fca3a7f56aa5f1718495
Signed-off-by: Vojtech Szocs <vsz...@redhat.com>
---
M frontend/webadmin/modules/pom.xml
1 file changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/31/12831/1
diff --git a/frontend/webadmin/modules/pom.xml
b/frontend/webadmin/modules/pom.xml
index 5276a0d..a200e38 100644
--- a/frontend/webadmin/modules/pom.xml
+++ b/frontend/webadmin/modules/pom.xml
@@ -42,7 +42,7 @@
<!-- Regular expression that matches types that GWT compiler shouldn't
prune (avoid dead code optimization) -->
<gwt.dontPrune>-Dgwt.dontPrune=org\.ovirt\.engine\.core\.(common|compat)\..*</gwt.dontPrune>
<!-- This can be overridden by setting this property in your personal
settings.xml -->
- <gwt-plugin.extraJvmArgs>${aspectj.agent} -Xms1024M -Xmx2048M
-XX:PermSize=256M -XX:MaxPermSize=256M
${gwt.dontPrune}</gwt-plugin.extraJvmArgs>
+ <gwt-plugin.extraJvmArgs>-Xms1024M -Xmx2048M -XX:PermSize=256M
-XX:MaxPermSize=512M</gwt-plugin.extraJvmArgs>
<!-- Control target browsers for GWT compilation, maps to 'user.agent'
deferred binding property in *.gwt.xml -->
<!-- By default, all browsers are supported, see
[gwt-user.jar:com/google/gwt/user/UserAgent.gwt.xml] for a complete list -->
<gwt.userAgent>ie6,ie8,ie9,gecko1_8,safari,opera</gwt.userAgent>
@@ -149,7 +149,7 @@
<noServer>true</noServer>
<bindAddress>0.0.0.0</bindAddress>
<gen>${gwtGenDirectory}</gen>
- <extraJvmArgs>${gwt-plugin.extraJvmArgs}</extraJvmArgs>
+ <extraJvmArgs>${aspectj.agent} ${gwt-plugin.extraJvmArgs}
${gwt.dontPrune}</extraJvmArgs>
<copyWebapp>true</copyWebapp>
<compileSourcesArtifacts>
<compileSourcesArtifact>${engine.groupId}:gwt-extension</compileSourcesArtifact>
--
To view, visit http://gerrit.ovirt.org/12831
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1761efcec5197121ca97fca3a7f56aa5f1718495
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Vojtech Szocs <vsz...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
