SF.net SVN: moduleforge:[2299] controltier/branches/controltier-3-6-support /atg/modules/AtgJBossServer

0 views
Skip to first unread message

ashor...@users.sourceforge.net

unread,
Aug 15, 2011, 7:53:27 PM8/15/11
to controltier...@googlegroups.com
Revision: 2299
http://moduleforge.svn.sourceforge.net/moduleforge/?rev=2299&view=rev
Author: ashortland
Date: 2011-08-15 23:53:27 +0000 (Mon, 15 Aug 2011)

Log Message:
-----------
Added the checkForErrors command and included in the startServiceWrapper workflow.

Tracker#: https://sourceforge.net/tracker/?func=detail&aid=3392171&group_id=151079&atid=779850

Modified Paths:
--------------
controltier/branches/controltier-3-6-support/atg/modules/AtgJBossServer/commands/startServiceWrapper.xml
controltier/branches/controltier-3-6-support/atg/modules/AtgJBossServer/type.xml

Added Paths:
-----------
controltier/branches/controltier-3-6-support/atg/modules/AtgJBossServer/commands/checkForErrors.xml

Added: controltier/branches/controltier-3-6-support/atg/modules/AtgJBossServer/commands/checkForErrors.xml
===================================================================
--- controltier/branches/controltier-3-6-support/atg/modules/AtgJBossServer/commands/checkForErrors.xml (rev 0)
+++ controltier/branches/controltier-3-6-support/atg/modules/AtgJBossServer/commands/checkForErrors.xml 2011-08-15 23:53:27 UTC (rev 2299)
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ Command Module: AtgJBossServer
+ Command Name: checkForErrors
+ Command Template: com/controltier/shared/convert/AntCommand.template.xml
+ Description: Checks the server log file for ERROR messages
+ Author:
+ Created: Mon Aug 15 13:46:21 PDT 2011
+-->
+<project name="checkForErrors" default="execute">
+ <description>Checks the server log file for ERROR messages</description>
+ <property name="command.name" value="checkForErrors"/>
+ <import file="${module.dir}/lib/command.xml"/>
+ <!--
+ -execute - Runs the handler implementation
+ -->
+ <target name="-execute" description="Runs the handler implementation">
+ <!--Generator: com.controltier.shared.convert.TypeXMLHandlerGenerator-->
+ <!--NOTE: -execute target content is auto-generated by the handler generation process. -->
+ <concat>
+ <fileset file="${opts.basedir}/log/server.log"/>
+ <filterchain>
+ <linecontainsregexp>
+ <regexp pattern="INFO .* JBoss .* Started in .*$|^Nucleus running| ERROR "/>
+ </linecontainsregexp>
+ </filterchain>
+ </concat>
+ </target>
+ <target name="-getopts" depends="-pre-opts">
+ <!--NOTE: -getopts target and content is auto-generated by the handler generation process. -->
+ <get-opts failonerror="true" usageProperty="getopts.usage" errorProperty="getopts.error" optsValue="${cmd.line}">
+ <opts>
+ <opt parameter="basedir" description="base directory of the jboss server instance" required="false" property="opts.basedir" type="string" defaultproperty="entity.attribute.jboss_basedir"/>
+ </opts>
+ </get-opts>
+ </target>
+</project>

Modified: controltier/branches/controltier-3-6-support/atg/modules/AtgJBossServer/commands/startServiceWrapper.xml
===================================================================
--- controltier/branches/controltier-3-6-support/atg/modules/AtgJBossServer/commands/startServiceWrapper.xml 2011-08-15 23:47:26 UTC (rev 2298)
+++ controltier/branches/controltier-3-6-support/atg/modules/AtgJBossServer/commands/startServiceWrapper.xml 2011-08-15 23:53:27 UTC (rev 2299)
@@ -27,7 +27,7 @@
<tasksequence>
<!-- ** Initialize the cleanWorkingFiles.argline to an empty string -->
<property name="cleanWorkingFiles.argline" value=""/>
- <echo level="info">begin workflow command (1/3) -&gt; "cleanWorkingFiles ${cleanWorkingFiles.argline}" ...</echo>
+ <echo level="info">begin workflow command (1/4) -&gt; "cleanWorkingFiles ${cleanWorkingFiles.argline}" ...</echo>
<controller>
<execute>
<context project="${context.project}" resourceType="${context.type}" resourceName="${context.name}" ignoremalformed="true"/>
@@ -35,10 +35,10 @@
<arg line="${cleanWorkingFiles.argline}"/>
</execute>
</controller>
- <echo level="info">end workflow command (1/3) -&gt; "cleanWorkingFiles ${cleanWorkingFiles.argline}"</echo>
+ <echo level="info">end workflow command (1/4) -&gt; "cleanWorkingFiles ${cleanWorkingFiles.argline}"</echo>
<!-- ** Initialize the startService.argline to an empty string -->
<property name="startService.argline" value=""/>
- <echo level="info">begin workflow command (2/3) -&gt; "startService ${startService.argline}" ...</echo>
+ <echo level="info">begin workflow command (2/4) -&gt; "startService ${startService.argline}" ...</echo>
<controller>
<execute>
<context project="${context.project}" resourceType="${context.type}" resourceName="${context.name}" ignoremalformed="true"/>
@@ -46,10 +46,10 @@
<arg line="${startService.argline}"/>
</execute>
</controller>
- <echo level="info">end workflow command (2/3) -&gt; "startService ${startService.argline}"</echo>
+ <echo level="info">end workflow command (2/4) -&gt; "startService ${startService.argline}"</echo>
<!-- ** Initialize the waitforStartEvent.argline to an empty string -->
<property name="waitforStartEvent.argline" value=""/>
- <echo level="info">begin workflow command (3/3) -&gt; "waitforStartEvent ${waitforStartEvent.argline}" ...</echo>
+ <echo level="info">begin workflow command (3/4) -&gt; "waitforStartEvent ${waitforStartEvent.argline}" ...</echo>
<controller>
<execute>
<context project="${context.project}" resourceType="${context.type}" resourceName="${context.name}" ignoremalformed="true"/>
@@ -57,7 +57,18 @@
<arg line="${waitforStartEvent.argline}"/>
</execute>
</controller>
- <echo level="info">end workflow command (3/3) -&gt; "waitforStartEvent ${waitforStartEvent.argline}"</echo>
+ <echo level="info">end workflow command (3/4) -&gt; "waitforStartEvent ${waitforStartEvent.argline}"</echo>
+ <!-- ** Initialize the checkForErrors.argline to an empty string -->
+ <property name="checkForErrors.argline" value=""/>
+ <echo level="info">begin workflow command (4/4) -&gt; "checkForErrors ${checkForErrors.argline}" ...</echo>
+ <controller>
+ <execute>
+ <context project="${context.project}" resourceType="${context.type}" resourceName="${context.name}" ignoremalformed="true"/>
+ <command name="checkForErrors" resolvemodule="true"/>
+ <arg line="${checkForErrors.argline}"/>
+ </execute>
+ </controller>
+ <echo level="info">end workflow command (4/4) -&gt; "checkForErrors ${checkForErrors.argline}"</echo>
</tasksequence>
</workflow>
</execute>

Modified: controltier/branches/controltier-3-6-support/atg/modules/AtgJBossServer/type.xml
===================================================================
--- controltier/branches/controltier-3-6-support/atg/modules/AtgJBossServer/type.xml 2011-08-15 23:47:26 UTC (rev 2298)
+++ controltier/branches/controltier-3-6-support/atg/modules/AtgJBossServer/type.xml 2011-08-15 23:53:27 UTC (rev 2299)
@@ -301,6 +301,16 @@
</attributes>
</type>

+ <type role="concrete" uniqueInstances="true" name="JBossTomcatHttpMaxThreads" order="Setting">
+ <description>maxThreads option for AJP connector</description>
+ <supertype>
+ <typereference name="JBossSetting"/>
+ </supertype>
+ <attributes>
+ <attribute name="jbossTomcatHttpMaxThreads" type-property="settingValue"/>
+ </attributes>
+ </type>
+
<type role="concrete" uniqueInstances="true" name="JBossTomcatAjpMaxThreads" order="Setting">
<description>maxThreads option for AJP connector</description>
<supertype>
@@ -455,6 +465,7 @@
<attribute-default name="atgLocalConfig" value="${entity.attribute.jboss_basedir}/ATG-Data/localconfig"/>
<attribute-default name="documentRoot" value="${entity.attribute.jboss_basedir}/deploy/jbossweb-tomcat55.sar/ROOT.war"/>
<attribute-default name="atgRmiPort" value="8860"/>
+ <attribute-default name="jbossTomcatHttpMaxThreads" value="25"/>
<attribute-default name="jbossTomcatAjpMaxThreads" value="100"/>
<attribute-default name="jbossTomcatAjpStrategy" value="lf"/>
<attribute-default name="jbossTomcatAjpMinSpareThreads" value="50"/>
@@ -516,6 +527,7 @@
<typereference name="AtgRepositoryCache"/>
<typereference name="AtgRdb"/>
<typereference name="AtgEar"/>
+ <typereference name="JBossTomcatHttpMaxThreads"/>
<typereference name="JBossTomcatAjpMaxThreads"/>
<typereference name="JBossTomcatAjpStrategy"/>
<typereference name="JBossTomcatAjpMinSpareThreads"/>
@@ -541,6 +553,7 @@
<typereference name="AtgJBossTransactionTimeout"/>
<typereference name="AtgJBossStartupTimeout"/>
<typereference name="AtgJBossJvmRoute"/>
+ <typereference name="JBossTomcatHttpMaxThreads"/>
<typereference name="JBossTomcatAjpMaxThreads"/>
<typereference name="JBossTomcatAjpStrategy"/>
<typereference name="JBossTomcatAjpMinSpareThreads"/>
@@ -592,6 +605,7 @@
<command name="cleanWorkingFiles"/>
<command name="startService"/>
<command name="waitforStartEvent"/>
+ <command name="checkForErrors"/>
</workflow>
</command>

@@ -656,6 +670,7 @@
<opt parameter="timezone" description="Timezone" required="false" property="opts.timezone" type="string" defaultproperty="entity.attribute.timezone"/>
<opt parameter="transactionTimeout" description="transaction timeout" required="false" property="opts.transactionTimeout" type="string" defaultproperty="entity.attribute.transactionTimeout"/>
<opt parameter="jbossEmptySessionPath" description="jboss AJP setting" required="false" property="opts.jbossEmptySessionPath" type="string" defaultproperty="entity.attribute.jbossEmptySessionPath"/>
+ <opt parameter="httpMaxThreads" description="ajpMaxThreads setting" required="false" property="opts.httpMaxThreads" type="string" defaultproperty="entity.attribute.jbossTomcatHttpMaxThreads"/>
<opt parameter="ajpMaxThreads" description="ajpMaxThreads setting" required="false" property="opts.ajpMaxThreads" type="string" defaultproperty="entity.attribute.jbossTomcatAjpMaxThreads"/>
<opt parameter="ajpStrategy" description="ajpStrategy setting" required="false" property="opts.ajpStrategy" type="string" defaultproperty="entity.attribute.jbossTomcatAjpStrategy"/>
<opt parameter="ajpMinSpareThreads" description="ajpMinSpareThreads setting" required="false" property="opts.ajpMinSpareThreads" type="string" defaultproperty="entity.attribute.jbossTomcatAjpMinSpareThreads"/>
@@ -711,6 +726,22 @@
<opt parameter="packagetype" required="false" type="string" default="[^.]*Configuration[^.]*" property="opts.packagetype" description="regular expression of packages to include"/>
</opts>
</command>
+
+ <command name="checkForErrors" description="Checks the server log file for ERROR messages" command-type="AntCommand">
+ <implementation>
+ <concat>
+ <fileset file="${opts.basedir}/log/server.log"/>
+ <filterchain>
+ <linecontainsregexp>
+ <regexp pattern="INFO .* JBoss .* Started in .*$|^Nucleus running| ERROR "/>
+ </linecontainsregexp>
+ </filterchain>
+ </concat>
+ </implementation>
+ <opts>
+ <opt parameter="basedir" required="false" type="string" property="opts.basedir" description="base directory of the jboss server instance" defaultproperty="entity.attribute.jboss_basedir"/>
+ </opts>
+ </command>
</commands>
</type>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Reply all
Reply to author
Forward
0 new messages