Author: ffang
Date: Tue Mar 4 12:44:07 2014
New Revision: 1574064
URL: http://svn.apache.org/r1574064
Log:
[SM-2187]Increase default PermGen size to 256MB
Added:
servicemix/smx5/trunk/assembly/src/main/resources/setenv-unix
servicemix/smx5/trunk/assembly/src/main/resources/setenv-win
Modified:
servicemix/smx5/trunk/assembly/pom.xml
servicemix/smx5/trunk/itests/src/test/scala/org/apache/servicemix/itests/ExamplesIntegrationTests.scala
Modified: servicemix/smx5/trunk/assembly/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx5/trunk/assembly/pom.xml?rev=1574064&r1=1574063&r2=1574064&view=diff
==============================================================================
--- servicemix/smx5/trunk/assembly/pom.xml (original)
+++ servicemix/smx5/trunk/assembly/pom.xml Tue Mar 4 12:44:07 2014
@@ -251,6 +251,25 @@
</target>
</configuration>
</execution>
+ <execution>
+ <id>increase-perm-mem</id>
+ <phase>prepare-package</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <target name="increase-perm-mem">
+ <echo message="Updating bin/setenv in unix
assembly" />
+ <concat
destfile="target/dependencies/unix/apache-karaf-${karaf.version}/bin/setenv"
append="true" eol="unix">
+ <fileset file="target/classes/setenv-unix"
/>
+ </concat>
+ <echo message="Updating bin/setenv.bat in
windows assembly" />
+ <concat
destfile="target/dependencies/win/apache-karaf-${karaf.version}/bin/setenv.bat"
append="true" eol="dos">
+ <fileset file="target/classes/setenv-win"
/>
+ </concat>
+ </target>
+ </configuration>
+ </execution>
</executions>
</plugin>
<plugin>
Added: servicemix/smx5/trunk/assembly/src/main/resources/setenv-unix
URL:
http://svn.apache.org/viewvc/servicemix/smx5/trunk/assembly/src/main/resources/setenv-unix?rev=1574064&view=auto
==============================================================================
--- servicemix/smx5/trunk/assembly/src/main/resources/setenv-unix (added)
+++ servicemix/smx5/trunk/assembly/src/main/resources/setenv-unix Tue Mar 4
12:44:07 2014
@@ -0,0 +1 @@
+export JAVA_MAX_PERM_MEM=256M
Added: servicemix/smx5/trunk/assembly/src/main/resources/setenv-win
URL:
http://svn.apache.org/viewvc/servicemix/smx5/trunk/assembly/src/main/resources/setenv-win?rev=1574064&view=auto
==============================================================================
--- servicemix/smx5/trunk/assembly/src/main/resources/setenv-win (added)
+++ servicemix/smx5/trunk/assembly/src/main/resources/setenv-win Tue Mar 4
12:44:07 2014
@@ -0,0 +1 @@
+set JAVA_MAX_PERM_MEM=256M
Modified:
servicemix/smx5/trunk/itests/src/test/scala/org/apache/servicemix/itests/ExamplesIntegrationTests.scala
URL:
http://svn.apache.org/viewvc/servicemix/smx5/trunk/itests/src/test/scala/org/apache/servicemix/itests/ExamplesIntegrationTests.scala?rev=1574064&r1=1574063&r2=1574064&view=diff
==============================================================================
---
servicemix/smx5/trunk/itests/src/test/scala/org/apache/servicemix/itests/ExamplesIntegrationTests.scala
(original)
+++
servicemix/smx5/trunk/itests/src/test/scala/org/apache/servicemix/itests/ExamplesIntegrationTests.scala
Tue Mar 4 12:44:07 2014
@@ -82,7 +82,6 @@ class ActivitiExamplesTest extends Examp
class CamelExamplesTest extends ExamplesIntegrationTests {
@Test
- @Ignore("Example requires more PermGen memory than the default, cfr.
https://issues.apache.org/jira/browse/SM-2187";)
def testCamelDroolsExample = testWithFeature("examples-camel-drools") {
expect {
logging.containsEvent( _.getLoggerName == "ServeDrink" )
