Hi, On Wed, Nov 02, 2011 at 09:25:01AM -0500, David Gersic wrote: > I've added an option to the JBoss RA to allow specifying the JVM options. I > needed this to be able to increase the memory and stack size from the JVM's > defaults.
Hunks 2 and 3 fail, don't know if it's due to space being mangled or the jboss RA version you worked on is old: patching file jboss Hunk #2 FAILED at 101. Hunk #3 FAILED at 129. Hunk #4 succeeded at 286 with fuzz 1 (offset 11 lines). Hunk #5 succeeded at 357 with fuzz 2 (offset 11 lines). 2 out of 5 hunks FAILED -- saving rejects to file jboss.rej Can you please produce a new patch and attach it to the message. Also, was there a reason removing \n in the export lines? I don't really mind either way, but if the change is not necessary then we shouldn't make it. Cheers, Dejan > > > --- jboss-original 2011-05-02 14:08:37.000000000 -0500 > +++ jboss 2011-05-09 09:47:08.000000000 -0500 > @@ -33,6 +33,7 @@ > # OCF_RESKEY_user - A user name to start a JBoss. Default is root > # OCF_RESKEY_statusurl - URL for state confirmation. Default is > http://127.0.0.1:8080 > # OCF_RESKEY_java_home - Home directory of the Java. Default is > ${JAVA_HOME} > +# OCF_RESKEY_java_opts - Options for Java. > # OCF_RESKEY_jboss_home - Home directory of Jboss. Default is None > # is it possible to devise this string from options? I'm afraid > # that allowing users to set this could be error prone. > @@ -100,8 +101,9 @@ > >> "$CONSOLE" 2>&1 & > else > su - -s /bin/bash "$JBOSS_USER" \ > - -c "export JAVA_HOME=${JAVA_HOME};\n > - export JBOSS_HOME=${JBOSS_HOME};\n > + -c "export JAVA_HOME=${JAVA_HOME};\ > + export JAVA_OPTS='${JAVA_OPTS}';\ > + export JBOSS_HOME=${JBOSS_HOME};\ > $JBOSS_HOME/bin/run.sh $RUN_OPTS" \ > >> "$CONSOLE" 2>&1 & > fi > @@ -127,8 +129,8 @@ > >> "$CONSOLE" 2>&1 & > else > su - -s /bin/bash "$JBOSS_USER" \ > - -c "export JAVA_HOME=${JAVA_HOME};\n > - export JBOSS_HOME=${JBOSS_HOME};\n > + -c "export JAVA_HOME=${JAVA_HOME};\ > + export JBOSS_HOME=${JBOSS_HOME};\ > $JBOSS_HOME/bin/shutdown.sh $SHUTDOWN_OPTS -S" \ > >> "$CONSOLE" 2>&1 & > > @@ -273,6 +275,14 @@ > <content type="string" default=""/> > </parameter> > > +<parameter name="java_opts" unique="0" required="0"> > +<longdesc lang="en"> > +Java options. > +</longdesc> > +<shortdesc>Java options.</shortdesc> > +<content type="string" default=""/> > +</parameter> > + > <parameter name="jboss_home" unique="1" required="1"> > <longdesc lang="en"> > Home directory of Jboss. > @@ -336,6 +346,7 @@ > PSTRING="${OCF_RESKEY_pstring-java -Dprogram.name=run.sh}" > RUN_OPTS="${OCF_RESKEY_run_opts--c default -l lpg4j}" > SHUTDOWN_OPTS="${OCF_RESKEY_shutdown_opts--s 127.0.0.1:1099}" > +JAVA_OPTS="${OCF_RESKEY_java_opts-}" > > # test if these two are set and if directories exist and if the > # required scripts/binaries exist; use OCF_ERR_INSTALLED > > > > > _______________________________________________________ > Linux-HA-Dev: [email protected] > http://lists.linux-ha.org/mailman/listinfo/linux-ha-dev > Home Page: http://linux-ha.org/ _______________________________________________________ Linux-HA-Dev: [email protected] http://lists.linux-ha.org/mailman/listinfo/linux-ha-dev Home Page: http://linux-ha.org/
