[SM-2187]Increase default PermGen size to 256MB
git-svn-id: https://svn.apache.org/repos/asf/servicemix/smx5/trunk@1574064 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/assembly/pom.xml b/assembly/pom.xml
index d1b719a..6033eb2 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -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>
diff --git a/assembly/src/main/resources/setenv-unix b/assembly/src/main/resources/setenv-unix
new file mode 100644
index 0000000..899b597
--- /dev/null
+++ b/assembly/src/main/resources/setenv-unix
@@ -0,0 +1 @@
+export JAVA_MAX_PERM_MEM=256M
diff --git a/assembly/src/main/resources/setenv-win b/assembly/src/main/resources/setenv-win
new file mode 100644
index 0000000..d658385
--- /dev/null
+++ b/assembly/src/main/resources/setenv-win
@@ -0,0 +1 @@
+set JAVA_MAX_PERM_MEM=256M
diff --git a/itests/src/test/scala/org/apache/servicemix/itests/ExamplesIntegrationTests.scala b/itests/src/test/scala/org/apache/servicemix/itests/ExamplesIntegrationTests.scala
index 92b1170..eef5189 100644
--- a/itests/src/test/scala/org/apache/servicemix/itests/ExamplesIntegrationTests.scala
+++ b/itests/src/test/scala/org/apache/servicemix/itests/ExamplesIntegrationTests.scala
@@ -82,7 +82,6 @@
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" )
