incubator-lokahi-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tob...@apache.org
Subject svn commit: r419344 [1/7] - in /incubator/lokahi/lokahi/trunk: ./ conf/ database/ docs/ src/java/org/apache/lokahi/core/agent/ src/java/org/apache/lokahi/core/agent/dao/ src/java/org/apache/lokahi/core/agent/job/ src/java/org/apache/lokahi/core/agent/r...
Date Wed, 05 Jul 2006 21:11:36 GMT
Author: toback
Date: Wed Jul  5 14:11:29 2006
New Revision: 419344

URL: http://svn.apache.org/viewvc?rev=419344&view=rev
Log:
Update to the flow of jobs two and from the agent to further insure delivery.

Added:
    incubator/lokahi/lokahi/trunk/src/www/Core/File/confirm.vm   (with props)
    incubator/lokahi/lokahi/trunk/src/www/Core/Instance/confirm.vm   (with props)
    incubator/lokahi/lokahi/trunk/src/www/Help/confirm.vm   (with props)
Modified:
    incubator/lokahi/lokahi/trunk/build.properties
    incubator/lokahi/lokahi/trunk/build.xml
    incubator/lokahi/lokahi/trunk/conf/ApplicationResources.properties
    incubator/lokahi/lokahi/trunk/conf/agent.properties
    incubator/lokahi/lokahi/trunk/conf/db.properties
    incubator/lokahi/lokahi/trunk/conf/struts-config.xml
    incubator/lokahi/lokahi/trunk/database/procs.sql
    incubator/lokahi/lokahi/trunk/database/tmc_rel_function_user_data.sql
    incubator/lokahi/lokahi/trunk/docs/README.TXT
    incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/agent/JobSOAP.java
    incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/agent/TMCAgent.java
    incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/agent/dao/AgentJob.java
    incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/agent/job/ScheduledJob.java
    incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/agent/runnable/JobScheduler.java
    incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/agent/runnable/ReportingThread.java
    incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/agent/task/HttpsdctlTask.java
    incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/agent/util/CommandLineProcess.java
    incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/agent/util/TaskFactory.java
    incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/api/function/Function.java
    incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/api/user/UserModel.java
    incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/collection/TMCDataStore.java
    incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/message/Message.java
    incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/message/TMCSOAPMessage.java
    incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/gui/help/HelpItemDAO.java
    incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/httpd/api/server/ApacheModel.java
    incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/tomcat/gui/www/TomcatWorkerAction.java
    incubator/lokahi/lokahi/trunk/src/www/Apache/Entity/add.vm
    incubator/lokahi/lokahi/trunk/src/www/Apache/Entity/confirm.vm
    incubator/lokahi/lokahi/trunk/src/www/Apache/Entity/list.vm
    incubator/lokahi/lokahi/trunk/src/www/Apache/Entity/modify.vm
    incubator/lokahi/lokahi/trunk/src/www/Apache/Entity/view.vm
    incubator/lokahi/lokahi/trunk/src/www/Apache/Pool/update.vm
    incubator/lokahi/lokahi/trunk/src/www/Apache/Server/update.vm
    incubator/lokahi/lokahi/trunk/src/www/Core/Alerts/add.vm
    incubator/lokahi/lokahi/trunk/src/www/Core/Alerts/confirm.vm
    incubator/lokahi/lokahi/trunk/src/www/Core/Alerts/delete.vm
    incubator/lokahi/lokahi/trunk/src/www/Core/Alerts/details.vm
    incubator/lokahi/lokahi/trunk/src/www/Core/Alerts/list.vm
    incubator/lokahi/lokahi/trunk/src/www/Core/Alerts/menu/global.vm
    incubator/lokahi/lokahi/trunk/src/www/Core/Alerts/menu/indiv.vm
    incubator/lokahi/lokahi/trunk/src/www/Core/Alerts/update.vm
    incubator/lokahi/lokahi/trunk/src/www/Core/Entity/index.vm
    incubator/lokahi/lokahi/trunk/src/www/Core/Entity/search.vm
    incubator/lokahi/lokahi/trunk/src/www/Core/Environment/add.vm
    incubator/lokahi/lokahi/trunk/src/www/Core/Environment/details.vm
    incubator/lokahi/lokahi/trunk/src/www/Core/Environment/menu/global.vm
    incubator/lokahi/lokahi/trunk/src/www/Core/Environment/menu/indiv.vm
    incubator/lokahi/lokahi/trunk/src/www/Core/Environment/update.vm
    incubator/lokahi/lokahi/trunk/src/www/Core/File/add.vm
    incubator/lokahi/lokahi/trunk/src/www/Core/File/delete.vm
    incubator/lokahi/lokahi/trunk/src/www/Core/File/details.vm
    incubator/lokahi/lokahi/trunk/src/www/Core/File/list.vm
    incubator/lokahi/lokahi/trunk/src/www/Core/File/menu/global.vm
    incubator/lokahi/lokahi/trunk/src/www/Core/File/menu/indiv.vm
    incubator/lokahi/lokahi/trunk/src/www/Core/File/update.vm
    incubator/lokahi/lokahi/trunk/src/www/Core/Function/add.vm
    incubator/lokahi/lokahi/trunk/src/www/Core/Function/details.vm
    incubator/lokahi/lokahi/trunk/src/www/Core/Function/update.vm
    incubator/lokahi/lokahi/trunk/src/www/Core/Instance/add.vm
    incubator/lokahi/lokahi/trunk/src/www/Core/Instance/details.vm
    incubator/lokahi/lokahi/trunk/src/www/Core/Instance/menu/global.vm
    incubator/lokahi/lokahi/trunk/src/www/Core/Instance/menu/indiv.vm
    incubator/lokahi/lokahi/trunk/src/www/Core/Instance/update.vm
    incubator/lokahi/lokahi/trunk/src/www/Core/Ip/add.vm
    incubator/lokahi/lokahi/trunk/src/www/Core/Ip/details.vm
    incubator/lokahi/lokahi/trunk/src/www/Core/JobPool/details.vm
    incubator/lokahi/lokahi/trunk/src/www/Core/JobPool/recent.vm
    incubator/lokahi/lokahi/trunk/src/www/Core/JobPool/running.vm
    incubator/lokahi/lokahi/trunk/src/www/Core/JobPool/search.vm
    incubator/lokahi/lokahi/trunk/src/www/Core/Pool/add.vm
    incubator/lokahi/lokahi/trunk/src/www/Core/Pool/confirm.vm
    incubator/lokahi/lokahi/trunk/src/www/Core/Pool/details.vm
    incubator/lokahi/lokahi/trunk/src/www/Core/Pool/list.vm
    incubator/lokahi/lokahi/trunk/src/www/Core/Pool/menu/global.vm
    incubator/lokahi/lokahi/trunk/src/www/Core/Pool/menu/indiv.vm
    incubator/lokahi/lokahi/trunk/src/www/Core/Pool/search.vm
    incubator/lokahi/lokahi/trunk/src/www/Core/Pool/update.vm
    incubator/lokahi/lokahi/trunk/src/www/Core/Pool/viewapacheconf.vm
    incubator/lokahi/lokahi/trunk/src/www/Core/Pool/viewapacheprop.vm
    incubator/lokahi/lokahi/trunk/src/www/Core/Pool/viewserverxml.vm
    incubator/lokahi/lokahi/trunk/src/www/Core/Project/add.vm
    incubator/lokahi/lokahi/trunk/src/www/Core/Project/availtemplates.vm
    incubator/lokahi/lokahi/trunk/src/www/Core/Project/delete.vm
    incubator/lokahi/lokahi/trunk/src/www/Core/Project/details.vm
    incubator/lokahi/lokahi/trunk/src/www/Core/Project/index.vm
    incubator/lokahi/lokahi/trunk/src/www/Core/Project/list.vm
    incubator/lokahi/lokahi/trunk/src/www/Core/Project/search.vm
    incubator/lokahi/lokahi/trunk/src/www/Core/Project/user.vm
    incubator/lokahi/lokahi/trunk/src/www/Core/Server/add.vm
    incubator/lokahi/lokahi/trunk/src/www/Core/Server/confirm.vm
    incubator/lokahi/lokahi/trunk/src/www/Core/Server/details.vm
    incubator/lokahi/lokahi/trunk/src/www/Core/Server/menu/global.vm
    incubator/lokahi/lokahi/trunk/src/www/Core/Server/menu/indiv.vm
    incubator/lokahi/lokahi/trunk/src/www/Core/Server/search.vm
    incubator/lokahi/lokahi/trunk/src/www/Core/Server/update.vm
    incubator/lokahi/lokahi/trunk/src/www/Core/State/add.vm
    incubator/lokahi/lokahi/trunk/src/www/Core/State/details.vm
    incubator/lokahi/lokahi/trunk/src/www/Core/State/update.vm
    incubator/lokahi/lokahi/trunk/src/www/Core/User/add.vm
    incubator/lokahi/lokahi/trunk/src/www/Core/User/addAdmin.vm
    incubator/lokahi/lokahi/trunk/src/www/Core/User/addToProject.vm
    incubator/lokahi/lokahi/trunk/src/www/Core/User/confirm.vm
    incubator/lokahi/lokahi/trunk/src/www/Core/User/details.vm
    incubator/lokahi/lokahi/trunk/src/www/Core/User/index.vm
    incubator/lokahi/lokahi/trunk/src/www/Core/User/list.vm
    incubator/lokahi/lokahi/trunk/src/www/Core/User/menu/global.vm
    incubator/lokahi/lokahi/trunk/src/www/Core/User/menu/indiv.vm
    incubator/lokahi/lokahi/trunk/src/www/Core/User/update.vm
    incubator/lokahi/lokahi/trunk/src/www/Core/Worker/menu/search.vm
    incubator/lokahi/lokahi/trunk/src/www/Core/Worker/search.vm
    incubator/lokahi/lokahi/trunk/src/www/Core/infrastructure.vm
    incubator/lokahi/lokahi/trunk/src/www/Help/add.vm
    incubator/lokahi/lokahi/trunk/src/www/Help/delete.vm
    incubator/lokahi/lokahi/trunk/src/www/Help/details.vm
    incubator/lokahi/lokahi/trunk/src/www/Help/index.vm
    incubator/lokahi/lokahi/trunk/src/www/Help/list.vm
    incubator/lokahi/lokahi/trunk/src/www/Help/menu/global.vm
    incubator/lokahi/lokahi/trunk/src/www/Help/menu/indiv.vm
    incubator/lokahi/lokahi/trunk/src/www/Help/update.vm
    incubator/lokahi/lokahi/trunk/src/www/Template/addInternetProject.vm
    incubator/lokahi/lokahi/trunk/src/www/Template/addVhost.vm
    incubator/lokahi/lokahi/trunk/src/www/Template/addsite.vm
    incubator/lokahi/lokahi/trunk/src/www/Template/deploy.vm
    incubator/lokahi/lokahi/trunk/src/www/Tomcat/Entity/add.vm
    incubator/lokahi/lokahi/trunk/src/www/Tomcat/Entity/addExistingToVhost.vm
    incubator/lokahi/lokahi/trunk/src/www/Tomcat/Entity/confirm.vm
    incubator/lokahi/lokahi/trunk/src/www/Tomcat/Entity/details.vm
    incubator/lokahi/lokahi/trunk/src/www/Tomcat/Entity/menu/global.vm
    incubator/lokahi/lokahi/trunk/src/www/Tomcat/Entity/update.vm
    incubator/lokahi/lokahi/trunk/src/www/Tomcat/Entity/view.vm
    incubator/lokahi/lokahi/trunk/src/www/Tomcat/Pool/add.vm
    incubator/lokahi/lokahi/trunk/src/www/Tomcat/Pool/confirm.vm
    incubator/lokahi/lokahi/trunk/src/www/Tomcat/Pool/details.vm
    incubator/lokahi/lokahi/trunk/src/www/Tomcat/Pool/menu/global.vm
    incubator/lokahi/lokahi/trunk/src/www/Tomcat/Pool/menu/indiv.vm
    incubator/lokahi/lokahi/trunk/src/www/Tomcat/Pool/update.vm
    incubator/lokahi/lokahi/trunk/src/www/Tomcat/Pool/viewconf.vm
    incubator/lokahi/lokahi/trunk/src/www/Tomcat/Server/menu/global.vm
    incubator/lokahi/lokahi/trunk/src/www/Tomcat/Server/menu/indiv.vm
    incubator/lokahi/lokahi/trunk/src/www/Tomcat/Worker/add.vm
    incubator/lokahi/lokahi/trunk/src/www/Tomcat/Worker/confirm.vm
    incubator/lokahi/lokahi/trunk/src/www/Tomcat/Worker/details.vm
    incubator/lokahi/lokahi/trunk/src/www/Tomcat/Worker/menu/global.vm
    incubator/lokahi/lokahi/trunk/src/www/Tomcat/Worker/menu/indiv.vm
    incubator/lokahi/lokahi/trunk/src/www/Tomcat/Worker/update.vm
    incubator/lokahi/lokahi/trunk/src/www/Tomcat/Worker/viewconf.vm
    incubator/lokahi/lokahi/trunk/src/www/error/404.vm
    incubator/lokahi/lokahi/trunk/src/www/home.vm
    incubator/lokahi/lokahi/trunk/src/www/js/common.js
    incubator/lokahi/lokahi/trunk/src/www/js/popup.js
    incubator/lokahi/lokahi/trunk/src/www/layout/checksession.vm
    incubator/lokahi/lokahi/trunk/src/www/layout/footer.vm
    incubator/lokahi/lokahi/trunk/src/www/layout/header.vm
    incubator/lokahi/lokahi/trunk/src/www/layout/list2.vm
    incubator/lokahi/lokahi/trunk/src/www/layout/login.vm
    incubator/lokahi/lokahi/trunk/src/www/layout/menu/EntityTop.vm
    incubator/lokahi/lokahi/trunk/src/www/layout/menu/HelpTop.vm
    incubator/lokahi/lokahi/trunk/src/www/layout/menu/HomeTop.vm
    incubator/lokahi/lokahi/trunk/src/www/layout/menu/PoolTop.vm
    incubator/lokahi/lokahi/trunk/src/www/layout/menu/ProjectTop.vm
    incubator/lokahi/lokahi/trunk/src/www/layout/menu/UserTop.vm
    incubator/lokahi/lokahi/trunk/src/www/layout/menu/top.vm

Modified: incubator/lokahi/lokahi/trunk/build.properties
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/build.properties?rev=419344&r1=419343&r2=419344&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/build.properties (original)
+++ incubator/lokahi/lokahi/trunk/build.properties Wed Jul  5 14:11:29 2006
@@ -1,19 +1,106 @@
+##################
+#
+# Lokahi Build Properties
+# $Id$
+#
+##################
+
+# Set tomcat.home to be the path to your installation of Tomcat
+# on your build server.
+#
 tomcat.home=/opt/tmc/tomcat5.5.9/
+
+
+# Set java.home to be the path to your installation of JDK 1.5
+# on your build server.
+#
 java.home=/usr/local/java/jdk1.5.0_04/
+
+
+#
+#
 app.name=lokahi
-app.virtualhost.name=supernova:8058
+
+
+# If you intend to run Lokahi in a Tomcat server
+# that's behind an Apache server using mod_jk,
+# enter the virtual host under which Lokahi will
+# run.
+#
+# If you want to run Lokahi straight out of Tomcat
+# over the JVM's HTTP port, you can do this by
+# specifying the hostname and port here instead.
+#
+#app.virtualhost.name=www.mydomain.com
+#app.virtualhost.name=hostname:1234
+#
+app.virtualhost.name=hostname:8058
+
+# By default, app.authenticationmodule is set to NoAuthentication
+# so you can get it working relatively quickly.
+# User data is stored in the Lokahi database.
+#
+# To turn on authentication, you need to write a class
+# that implements the _______ interface. [TO DO: fully explain this]
+#
+# For more information, see the Lokahi website.
+# http://incubator.apache.org/lokahi  [TO DO: post directions & specific URL]
+#
+#app.authenticationmodule=org.apache.lokahi.core.common.authentication.DatabaseAuthentication
+#
 app.authenticationmodule=org.apache.lokahi.core.common.authentication.NoAuthentication
+
+
+# Set console.log.location to the path to where you want log messages
+# generated by the GUI and controller to be recorded.
+# This file will exist only on the machines hosting the
+# Lokahi GUI and controller.
+#
 console.log.location=/www/httpd/logs/websites/lokahi_log4j.log
+
+
+# Set agent.log.location to the path where you want log messages
+# generated by the agent to be recorded.  All machines
+# managed by Lokahi will have the Lokahi agent installed
+# on them, and will record their messages in this location.
+#
 agent.log.location=/www/httpd/logs/websites/agent_log4j.log
-database.uri=jdbc:oracle:thin:@wimt:25099:WIMT
-database.user=LOKAHI_TST
-database.password=LOKAHIMERCK
+
+
+# This release of Lokahi supports only Oracle databases.
+#
+#database.uri=jdbc:oracle:thin:@<HOST_ALIAS>:<PORT>:<SCHEMA>
+#database.user=<USERNAME>
+#database.password=<PASSWORD>
+#database.driver=<DRIVER>
+#
+database.uri=jdbc:oracle:thin:@<HOST_ALIAS>:<PORT>:<SCHEMA>
+database.user=<USERNAME>
+database.password=<PASSWORD>
 database.driver=oracle.jdbc.driver.OracleDriver
-initial.instance.name=WHS
+
+
+# Lokahi pre-populates your database with the initial instance
+# during the build process.  For more information on instances,
+# see the glossary on the Lokahi website.
+# http://incubator.apache.org/lokahi/glossary.html
+#
+initial.instance.name=
+
+
+# Set initial.user.name to the userID of the superuser account.
+#
 initial.user.name=
-install.location=/www/websites/
 
 
+# Set install.location to where you want the Lokahi home directory to be.
+#
+install.location=/www/
+
+#
+# Agent install location, also refered to as $AGENT_HOME
+#
+agent.install.location=
 
 app.home=.
 app.lib=${app.home}/lib
@@ -25,7 +112,7 @@
 app.src.www=${app.src}/www
 app.src.test=${app.src}/test
 
-app.compile=/tmp/target/compile
+app.compile=/tmp/compile
 
 app.build=${app.home}/build/${app.name}
 app.build.db=${app.home}/build/${app.name}/database

Modified: incubator/lokahi/lokahi/trunk/build.xml
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/build.xml?rev=419344&r1=419343&r2=419344&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/build.xml (original)
+++ incubator/lokahi/lokahi/trunk/build.xml Wed Jul  5 14:11:29 2006
@@ -20,7 +20,7 @@
   <target name="copy-db">
     <copy todir="${app.build.db}">
       <fileset dir="${app.src.db}"/>
-           <filterchain>
+      <filterchain>
         <replacetokens begintoken="@" endtoken="@">
           <token key="INITIAL_INSTANCE_NAME" value="${initial.instance.name}"/>
         </replacetokens>
@@ -92,6 +92,7 @@
       <entry key="tmc.database.driver" value="${database.driver}"/>
       <entry key="tmc.instance.name" value="${initial.instance.name}"/>
       <entry key="prop.location" value="${install.location}/${app.name}"/>
+      <entry key="function.prop.location" value="${install.location}/${app.name}/WEB-INF/classes/function.xml"/>
     </propertyfile>
   </target>
 
@@ -121,11 +122,12 @@
       </fileset>
     </copy>
     <copy todir="${app.build.agent}">
-    <fileset dir="${app.conf}">
+      <fileset dir="${app.conf}">
         <include name="agent.properties"/>
         <include name="agent.wsdd"/>
         <include name="agent.log4j.xml"/>
         <include name="log4j.dtd"/>
+        <include name="function.xml"/>
       </fileset>
       <filterchain>
         <replacetokens begintoken="@" endtoken="@">
@@ -133,6 +135,11 @@
         </replacetokens>
       </filterchain>
     </copy>
+    <propertyfile
+        file="${app.build.agent}/agent.properties"
+        comment="Generated automatically.  See conf/agent.properties for comments.">
+      <entry key="function.prop.location" value="${agent.install.location}/function.xml"/>
+    </propertyfile>
     <move file="${app.build.agent}/agent.wsdd" tofile="${app.build.agent}/server-config.wsdd"/>
   </target>
 
@@ -156,7 +163,8 @@
 
   <target name="javadoc" depends="init">
     <mkdir dir="${app.src.doc}/javadocs"/>
-    <javadoc sourcepath="${app.src.java}" use="true" version="true" author="true" packagenames="org.apache.lokahi.*" destdir="${app.src.doc}/javadocs" >
+    <javadoc sourcepath="${app.src.java}" use="true" version="true" author="true" packagenames="org.apache.lokahi.*"
+             destdir="${app.src.doc}/javadocs">
       <classpath>
         <fileset refid="libs"/>
         <fileset dir="${tomcat.common.lib}">

Modified: incubator/lokahi/lokahi/trunk/conf/ApplicationResources.properties
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/conf/ApplicationResources.properties?rev=419344&r1=419343&r2=419344&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/conf/ApplicationResources.properties (original)
+++ incubator/lokahi/lokahi/trunk/conf/ApplicationResources.properties Wed Jul  5 14:11:29 2006
@@ -25,8 +25,8 @@
 
 # Common errors
 error.emptyField={0} is required.
-error.db=A database error has occured. Please contact an administrator.
-error.fatal=The following fatal error occured: {0}.  Please contact an administrator.
+error.db=A database error has occurred. Please contact an administrator.
+error.fatal=The following fatal error occurred: {0}.  Please contact an administrator.
 error.nothingToDelete=Please select something to delete.
 error.nothingToSearch=Please select one of the options to search.
 error.badData=An error has occurred with the input data.  Please try again.
@@ -34,8 +34,8 @@
 error.errorForward=The following error has occurred. "{0}"
 error.loggedin=You already are logged in.
 error.name.notAllowed=That name is not allowed.
-error.notAuthorized=An authorization error has occured, please contact an administrator.
-error.notauthorized=An authorization error has occured while trying to "{0}", please contact an administrator.
+error.notAuthorized=An authorization error has occurred, please contact an administrator.
+error.notauthorized=An authorization error has occurred while trying to "{0}", please contact an administrator.
 login.error=Login failed please try again.
 login.error.account.inactive=Account "{0}" is deactivated temporarily.
 

Modified: incubator/lokahi/lokahi/trunk/conf/agent.properties
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/conf/agent.properties?rev=419344&r1=419343&r2=419344&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/conf/agent.properties (original)
+++ incubator/lokahi/lokahi/trunk/conf/agent.properties Wed Jul  5 14:11:29 2006
@@ -1,2 +1,5 @@
-tmc.agent.store.failure=
-tmc.agent.store.success=
\ No newline at end of file
+tmc.agent.store.failure=Error adding job.
+tmc.agent.store.success=Thanks! New Job added.
+agent.delim.options=:
+function.prop.location=/home/toback/asf/build/lokahi/agent/function.xml
+path.to.sudo=/usr/bin/sudo
\ No newline at end of file

Modified: incubator/lokahi/lokahi/trunk/conf/db.properties
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/conf/db.properties?rev=419344&r1=419343&r2=419344&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/conf/db.properties (original)
+++ incubator/lokahi/lokahi/trunk/conf/db.properties Wed Jul  5 14:11:29 2006
@@ -30,7 +30,7 @@
 oracle.core.environment.update=sp_tmc_update_enviroment
 oracle.core.environment.delete=sp_tmc_drop_environment
 oracle.core.file.by.id=f_tmc_get_file_by_id
-oracle.core.file.delete=sp_tmc_delete_file
+oracle.core.file.delete=sp_tmc_drop_file
 oracle.core.file.all=f_tmc_get_all_files
 oracle.core.function.by.id=f_tmc_get_function_by_id
 oracle.core.function.by.command=f_tmc_get_function_by_command

Modified: incubator/lokahi/lokahi/trunk/conf/struts-config.xml
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/conf/struts-config.xml?rev=419344&r1=419343&r2=419344&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/conf/struts-config.xml (original)
+++ incubator/lokahi/lokahi/trunk/conf/struts-config.xml Wed Jul  5 14:11:29 2006
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="ISO-8859-1" ?>
 
 <!DOCTYPE struts-config SYSTEM
-          "struts-config_1_2.dtd">
+    "struts-config_1_2.dtd">
 
 <struts-config>
 
@@ -11,7 +11,7 @@
       <form-property name="userName" type="java.lang.String"/>
       <form-property name="passWord" type="java.lang.String"/>
       <form-property name="wap" type="java.lang.String" initial="false"/>
-      <form-property name="redirectUrl" type="java.lang.String" initial="" />
+      <form-property name="redirectUrl" type="java.lang.String" initial=""/>
       <form-property name="logout" type="java.lang.String"/>
     </form-bean>
     <form-bean name="ContextForm" type="org.apache.struts.validator.DynaValidatorForm" dynamic="true">
@@ -19,7 +19,7 @@
       <form-property name="wap" type="java.lang.String" initial="false"/>
       <form-property name="contextName" type="java.lang.String"/>
       <form-property name="contextId" type="java.lang.String" initial="0"/>
-      <form-property name="appxml" type="java.lang.String" />
+      <form-property name="appxml" type="java.lang.String"/>
       <form-property name="docBase" type="java.lang.String"/>
       <form-property name="stateId" type="java.lang.String"/>
       <form-property name="vhostId" type="java.lang.String" initial="0"/>
@@ -47,7 +47,7 @@
       <form-property name="firstName" type="java.lang.String"/>
       <form-property name="lastName" type="java.lang.String"/>
       <form-property name="email" type="java.lang.String"/>
-      <form-property name="comments" type="java.lang.String"/>
+      <form-property name="comments" type="java.lang.String" initial=""/>
       <form-property name="jobTitle" type="java.lang.String"/>
       <form-property name="projects" type="java.lang.String[]"/>
       <form-property name="wap" type="java.lang.String" initial="false"/>
@@ -72,7 +72,7 @@
     <form-bean name="EnvironmentForm" type="org.apache.struts.validator.DynaValidatorForm" dynamic="true">
       <form-property name="envId" type="java.lang.String"/>
       <form-property name="envName" type="java.lang.String"/>
-      <form-property name="comments" type="java.lang.String"/>
+      <form-property name="comments" type="java.lang.String" initial=""/>
       <form-property name="wap" type="java.lang.String" initial="false"/>
       <form-property name="methodToCall" type="java.lang.String"/>
     </form-bean>
@@ -100,7 +100,7 @@
       <form-property name="hardwareId" type="java.lang.String"/>
       <form-property name="hardwareName" type="java.lang.String"/>
       <form-property name="physicalLocation" type="java.lang.String"/>
-      <form-property name="comments" type="java.lang.String"/>
+      <form-property name="comments" type="java.lang.String" initial=""/>
       <form-property name="instanceId" type="java.lang.String"/>
       <form-property name="envId" type="java.lang.String"/>
       <form-property name="statusId" type="java.lang.String"/>
@@ -264,7 +264,8 @@
       <form-property name="ipId" type="java.lang.String[]"/>
       <form-property name="methodToCall" type="java.lang.String"/>
     </form-bean>
-    <form-bean name="AddExistingContextVhostTemplateForm" type="org.apache.struts.validator.DynaValidatorForm" dynamic="true">
+    <form-bean name="AddExistingContextVhostTemplateForm" type="org.apache.struts.validator.DynaValidatorForm"
+               dynamic="true">
       <form-property name="vhostid" type="java.lang.String"/>
       <form-property name="projectId" type="java.lang.String"/>
       <form-property name="contextId" type="java.lang.String"/>
@@ -273,7 +274,7 @@
     </form-bean>
 
     <form-bean name="AddUserToProjectForm" type="org.apache.struts.validator.DynaValidatorForm" dynamic="true">
-      <form-property name="userName" type="java.lang.String" />
+      <form-property name="userName" type="java.lang.String"/>
       <form-property name="projectId" type="java.lang.String" initial="-1"/>
       <form-property name="contextFunction" type="java.lang.String[]"/>
       <form-property name="vhostFunctions" type="java.lang.String[]"/>
@@ -281,9 +282,9 @@
       <form-property name="methodToCall" type="java.lang.String"/>
     </form-bean>
     <form-bean name="AddAdminUserForm" type="org.apache.struts.validator.DynaValidatorForm" dynamic="true">
-      <form-property name="userName" type="java.lang.String" />
+      <form-property name="userName" type="java.lang.String"/>
       <form-property name="functions" type="java.lang.String[]"/>
-      <form-property name="global" type="java.lang.String" initial="1" />
+      <form-property name="global" type="java.lang.String" initial="1"/>
       <form-property name="wap" type="java.lang.String" initial="false"/>
       <form-property name="methodToCall" type="java.lang.String"/>
     </form-bean>
@@ -334,7 +335,7 @@
       <form-property name="methodToCall" type="java.lang.String"/>
     </form-bean>
 
-   </form-beans>
+  </form-beans>
 
   <global-forwards>
     <forward name="application.forward.error" path="/index.vm?forward=/Core/JobPool/recent.vm"/>
@@ -346,7 +347,6 @@
   </global-forwards>
 
 
-
   <!-- ============== ACTION MAPPING DEFINITIONS ========= -->
   <action-mappings>
     <!--    <action-->
@@ -359,69 +359,108 @@
     <!-- I am incredibly lazy I know...  -toback
         so here is the reference url:
        http://jakarta.apache.org/struts/userGuide/building_controller.html#action_mapping_wildcards -->
-    <action path="/administration/AlertAction" type="org.apache.lokahi.core.gui.www.AlertAction" name="AlertForm" scope="request" validate="true" />
-    <action path="/administration/ApacheAction" type="org.apache.lokahi.httpd.gui.www.ApacheAction" name="ApacheForm" scope="request" validate="true" />
-    <action path="/administration/ApachePoolAction" type="org.apache.lokahi.httpd.gui.www.ApachePoolAction" name="ApachePoolForm" scope="request" validate="true" />
-    <action path="/administration/ApacheWorkerAction" type="org.apache.lokahi.httpd.gui.www.ApacheWorkerAction" name="ApacheWorkerForm" scope="request" validate="true" />
-    <action path="/administration/ContextAction" type="org.apache.lokahi.tomcat.gui.www.ContextAction" name="ContextForm" scope="request" validate="true" />
-    <action path="/administration/EnvironmentAction" type="org.apache.lokahi.core.gui.www.EnvironmentAction" name="EnvironmentForm" scope="request" validate="true" />
-    <action path="/administration/FileAction" type="org.apache.lokahi.core.gui.www.FileAction" name="FileForm" scope="request" validate="true" />
-    <action path="/administration/HardwareAction" type="org.apache.lokahi.core.gui.www.HardwareAction" name="HardwareForm" scope="request" validate="true" />
-    <action path="/administration/HostingPoolAction" type="org.apache.lokahi.core.gui.www.HostingPoolAction" name="HostingPoolForm" scope="request" validate="true" />
-    <action path="/administration/InstanceAction" type="org.apache.lokahi.core.gui.www.InstanceAction" name="InstanceForm" scope="request" validate="true" />
-    <action path="/administration/ProjectAction" type="org.apache.lokahi.core.gui.www.ProjectAction" name="ProjectForm" scope="request" validate="true" />
-    <action path="/administration/TomcatAction" type="org.apache.lokahi.tomcat.gui.www.TomcatAction" name="TomcatForm" scope="request" validate="true" />
-    <action path="/administration/TomcatPoolAction" type="org.apache.lokahi.tomcat.gui.www.TomcatPoolAction" name="TomcatPoolForm" scope="request" validate="true" />
-    <action path="/administration/TomcatWorkerAction" type="org.apache.lokahi.tomcat.gui.www.TomcatWorkerAction" name="TomcatWorkerForm" scope="request" validate="true" />
-    <action path="/administration/UserAction" type="org.apache.lokahi.core.gui.www.UserAction" name="UserForm" scope="request" validate="true" />
-    <action path="/administration/VirtualHostAction" type="org.apache.lokahi.httpd.gui.www.VirtualHostAction" name="VirtualHostForm" scope="request" validate="true" />
+    <action path="/administration/AlertAction" type="org.apache.lokahi.core.gui.www.AlertAction" name="AlertForm"
+            scope="request" validate="true"/>
+    <action path="/administration/ApacheAction" type="org.apache.lokahi.httpd.gui.www.ApacheAction" name="ApacheForm"
+            scope="request" validate="true"/>
+    <action path="/administration/ApachePoolAction" type="org.apache.lokahi.httpd.gui.www.ApachePoolAction"
+            name="ApachePoolForm" scope="request" validate="true"/>
+    <action path="/administration/ApacheWorkerAction" type="org.apache.lokahi.httpd.gui.www.ApacheWorkerAction"
+            name="ApacheWorkerForm" scope="request" validate="true"/>
+    <action path="/administration/ContextAction" type="org.apache.lokahi.tomcat.gui.www.ContextAction"
+            name="ContextForm" scope="request" validate="true"/>
+    <action path="/administration/EnvironmentAction" type="org.apache.lokahi.core.gui.www.EnvironmentAction"
+            name="EnvironmentForm" scope="request" validate="true"/>
+    <action path="/administration/FileAction" type="org.apache.lokahi.core.gui.www.FileAction" name="FileForm"
+            scope="request" validate="true"/>
+    <action path="/administration/HardwareAction" type="org.apache.lokahi.core.gui.www.HardwareAction"
+            name="HardwareForm" scope="request" validate="true"/>
+    <action path="/administration/HostingPoolAction" type="org.apache.lokahi.core.gui.www.HostingPoolAction"
+            name="HostingPoolForm" scope="request" validate="true"/>
+    <action path="/administration/InstanceAction" type="org.apache.lokahi.core.gui.www.InstanceAction"
+            name="InstanceForm" scope="request" validate="true"/>
+    <action path="/administration/ProjectAction" type="org.apache.lokahi.core.gui.www.ProjectAction" name="ProjectForm"
+            scope="request" validate="true"/>
+    <action path="/administration/TomcatAction" type="org.apache.lokahi.tomcat.gui.www.TomcatAction" name="TomcatForm"
+            scope="request" validate="true"/>
+    <action path="/administration/TomcatPoolAction" type="org.apache.lokahi.tomcat.gui.www.TomcatPoolAction"
+            name="TomcatPoolForm" scope="request" validate="true"/>
+    <action path="/administration/TomcatWorkerAction" type="org.apache.lokahi.tomcat.gui.www.TomcatWorkerAction"
+            name="TomcatWorkerForm" scope="request" validate="true"/>
+    <action path="/administration/UserAction" type="org.apache.lokahi.core.gui.www.UserAction" name="UserForm"
+            scope="request" validate="true"/>
+    <action path="/administration/VirtualHostAction" type="org.apache.lokahi.httpd.gui.www.VirtualHostAction"
+            name="VirtualHostForm" scope="request" validate="true"/>
     <action
-      path="/User/*Action"
-      type="org.apache.lokahi.core.gui.www.UserAction"
-      name="{1}Form"
-      scope="request"
-      validate="true"
-      />
+        path="/User/*Action"
+        type="org.apache.lokahi.core.gui.www.UserAction"
+        name="{1}Form"
+        scope="request"
+        validate="true"
+        />
     <action
-      path="/help/HelpItemAction"
-      type="org.apache.lokahi.core.gui.help.HelpItemAction"
-      name="HelpItemForm"
-      scope="request"
-      validate="true"
-      />
-    <action path="/ApachePool/SubmitJobAction" type="org.apache.lokahi.httpd.gui.www.ApachePoolAction" name="ApachePoolMultipleForm" scope="request" validate="true" />
-    <action path="/ApacheWorker/SubmitJobAction" type="org.apache.lokahi.httpd.gui.www.ApacheWorkerAction" name="ApacheWorkerMultipleForm" scope="request" validate="true" />
-    <action path="/Context/SubmitJobAction" type="org.apache.lokahi.tomcat.gui.www.ContextAction" name="ContextMultipleForm" scope="request" validate="true" />
-    <action path="/HostingPool/SubmitJobAction" type="org.apache.lokahi.core.gui.www.HostingPoolAction" name="HostingPoolMultipleForm" scope="request" validate="true" />
-    <action path="/TomcatPool/SubmitJobAction" type="org.apache.lokahi.tomcat.gui.www.TomcatPoolAction" name="TomcatPoolMultipleForm" scope="request" validate="true" />
-    <action path="/TomcatWorker/SubmitJobAction" type="org.apache.lokahi.tomcat.gui.www.TomcatWorkerAction" name="TomcatWorkerMultipleForm" scope="request" validate="true" />
-    <action path="/administration/Apache/Delete" type="org.apache.lokahi.httpd.gui.www.ApacheAction" name="DeleteForm" scope="request" validate="true" />
-<action path="/administration/ApachePool/Delete" type="org.apache.lokahi.httpd.gui.www.ApachePoolAction" name="DeleteForm" scope="request" validate="true" />
-<action path="/administration/ApacheWorker/Delete" type="org.apache.lokahi.httpd.gui.www.ApacheWorkerAction" name="DeleteForm" scope="request" validate="true" />
-<action path="/administration/Context/Delete" type="org.apache.lokahi.tomcat.gui.www.ContextAction" name="DeleteForm" scope="request" validate="true" />
-<action path="/administration/Environment/Delete" type="org.apache.lokahi.core.gui.www.EnvironmentAction" name="DeleteForm" scope="request" validate="true" />
-<action path="/administration/File/Delete" type="org.apache.lokahi.core.gui.www.FileAction" name="DeleteForm" scope="request" validate="true" />
-<action path="/administration/Hardware/Delete" type="org.apache.lokahi.core.gui.www.HardwareAction" name="DeleteForm" scope="request" validate="true" />
-<action path="/administration/HostingPool/Delete" type="org.apache.lokahi.core.gui.www.HostingPoolAction" name="DeleteForm" scope="request" validate="true" />
-<action path="/administration/Instance/Delete" type="org.apache.lokahi.core.gui.www.InstanceAction" name="DeleteForm" scope="request" validate="true" />
-<action path="/administration/Project/Delete" type="org.apache.lokahi.core.gui.www.ProjectAction" name="DeleteForm" scope="request" validate="true" />
-<action path="/administration/Tomcat/Delete" type="org.apache.lokahi.tomcat.gui.www.TomcatAction" name="DeleteForm" scope="request" validate="true" />
-<action path="/administration/TomcatPool/Delete" type="org.apache.lokahi.tomcat.gui.www.TomcatPoolAction" name="DeleteForm" scope="request" validate="true" />
-<action path="/administration/TomcatWorker/Delete" type="org.apache.lokahi.tomcat.gui.www.TomcatWorkerAction" name="DeleteForm" scope="request" validate="true" />
-<action path="/administration/User/Delete" type="org.apache.lokahi.core.gui.www.UserAction" name="DeleteForm" scope="request" validate="true" />
-<action path="/administration/VirtualHost/Delete" type="org.apache.lokahi.httpd.gui.www.VirtualHostAction" name="DeleteForm" scope="request" validate="true" />
+        path="/help/HelpItemAction"
+        type="org.apache.lokahi.core.gui.help.HelpItemAction"
+        name="HelpItemForm"
+        scope="request"
+        validate="true"
+        />
+    <action path="/ApachePool/SubmitJobAction" type="org.apache.lokahi.httpd.gui.www.ApachePoolAction"
+            name="ApachePoolMultipleForm" scope="request" validate="true"/>
+    <action path="/ApacheWorker/SubmitJobAction" type="org.apache.lokahi.httpd.gui.www.ApacheWorkerAction"
+            name="ApacheWorkerMultipleForm" scope="request" validate="true"/>
+    <action path="/Context/SubmitJobAction" type="org.apache.lokahi.tomcat.gui.www.ContextAction"
+            name="ContextMultipleForm" scope="request" validate="true"/>
+    <action path="/HostingPool/SubmitJobAction" type="org.apache.lokahi.core.gui.www.HostingPoolAction"
+            name="HostingPoolMultipleForm" scope="request" validate="true"/>
+    <action path="/TomcatPool/SubmitJobAction" type="org.apache.lokahi.tomcat.gui.www.TomcatPoolAction"
+            name="TomcatPoolMultipleForm" scope="request" validate="true"/>
+    <action path="/TomcatWorker/SubmitJobAction" type="org.apache.lokahi.tomcat.gui.www.TomcatWorkerAction"
+            name="TomcatWorkerMultipleForm" scope="request" validate="true"/>
+    <action path="/administration/Apache/Delete" type="org.apache.lokahi.httpd.gui.www.ApacheAction" name="DeleteForm"
+            scope="request" validate="true"/>
+    <action path="/administration/ApachePool/Delete" type="org.apache.lokahi.httpd.gui.www.ApachePoolAction"
+            name="DeleteForm" scope="request" validate="true"/>
+    <action path="/administration/ApacheWorker/Delete" type="org.apache.lokahi.httpd.gui.www.ApacheWorkerAction"
+            name="DeleteForm" scope="request" validate="true"/>
+    <action path="/administration/Context/Delete" type="org.apache.lokahi.tomcat.gui.www.ContextAction"
+            name="DeleteForm" scope="request" validate="true"/>
+    <action path="/administration/Environment/Delete" type="org.apache.lokahi.core.gui.www.EnvironmentAction"
+            name="DeleteForm" scope="request" validate="true"/>
+    <action path="/administration/File/Delete" type="org.apache.lokahi.core.gui.www.FileAction" name="DeleteForm"
+            scope="request" validate="true"/>
+    <action path="/administration/Hardware/Delete" type="org.apache.lokahi.core.gui.www.HardwareAction"
+            name="DeleteForm" scope="request" validate="true"/>
+    <action path="/administration/Help/Delete" type="org.apache.lokahi.core.gui.help.HelpItemAction" name="DeleteForm"
+            scope="request" validate="true"/>
+    <action path="/administration/HostingPool/Delete" type="org.apache.lokahi.core.gui.www.HostingPoolAction"
+            name="DeleteForm" scope="request" validate="true"/>
+    <action path="/administration/Instance/Delete" type="org.apache.lokahi.core.gui.www.InstanceAction"
+            name="DeleteForm" scope="request" validate="true"/>
+    <action path="/administration/Project/Delete" type="org.apache.lokahi.core.gui.www.ProjectAction" name="DeleteForm"
+            scope="request" validate="true"/>
+    <action path="/administration/Tomcat/Delete" type="org.apache.lokahi.tomcat.gui.www.TomcatAction" name="DeleteForm"
+            scope="request" validate="true"/>
+    <action path="/administration/TomcatPool/Delete" type="org.apache.lokahi.tomcat.gui.www.TomcatPoolAction"
+            name="DeleteForm" scope="request" validate="true"/>
+    <action path="/administration/TomcatWorker/Delete" type="org.apache.lokahi.tomcat.gui.www.TomcatWorkerAction"
+            name="DeleteForm" scope="request" validate="true"/>
+    <action path="/administration/User/Delete" type="org.apache.lokahi.core.gui.www.UserAction" name="DeleteForm"
+            scope="request" validate="true"/>
+    <action path="/administration/VirtualHost/Delete" type="org.apache.lokahi.httpd.gui.www.VirtualHostAction"
+            name="DeleteForm" scope="request" validate="true"/>
     <action
-      path="/templating/*Action"
-      type="org.apache.lokahi.core.gui.www.TemplateAction"
-      name="{1}TemplateForm"
-      scope="request"
-      validate="true"
-      />
+        path="/templating/*Action"
+        type="org.apache.lokahi.core.gui.www.TemplateAction"
+        name="{1}TemplateForm"
+        scope="request"
+        validate="true"
+        />
     <action path="/Authenticate"
-      type="org.apache.lokahi.core.gui.www.Authorization"
-      name="authForm"
-      scope="request"
-      validate="true">
+            type="org.apache.lokahi.core.gui.www.Authorization"
+            name="authForm"
+            scope="request"
+            validate="true">
       <forward name="success" path="/index.vm"/>
       <forward name="failure" path="/index.vm"/>
       <forward name="wap.success" path="/wap/redirect.wml?path=/wap/home.wml"/>

Modified: incubator/lokahi/lokahi/trunk/database/procs.sql
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/database/procs.sql?rev=419344&r1=419343&r2=419344&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/database/procs.sql (original)
+++ incubator/lokahi/lokahi/trunk/database/procs.sql Wed Jul  5 14:11:29 2006
@@ -1,13 +1,37 @@
-CREATE OR REPLACE PROCEDURE sp_tmc_delete_file (v_id IN NUMBER,
-	   	  		  							    v_return OUT NUMBER)
+CREATE OR REPLACE PROCEDURE sp_tmc_update_help_rel_topic (h_id IN NUMBER,
+														  h_topic_id IN NUMBER,
+														  h_subtopic_id IN NUMBER)
 
 AS
 BEGIN
-	v_return:=0;
-	DELETE FROM TMC_FILES
-	WHERE FILE_ID=v_id;
-	IF SQL%NOTFOUND THEN v_return:=1;
-	END IF;
+	UPDATE TMC_REL_HELP_TOPIC set TOPIC_ID = h_topic_id, SUBTOPIC_ID = h_subtopic_id
+	WHERE HELP_ITEM_ID = h_id;
+END;
+/
+CREATE OR REPLACE PROCEDURE sp_tmc_update_help_rel_keyword (h_id IN NUMBER,
+															k_id IN NUMBER)
+													   
+AS
+BEGIN
+	UPDATE TMC_REL_HELP_KEYWORD SET KEYWORD_ID = k_id
+	WHERE HELP_ITEM_ID = h_id;
+END;
+/
+CREATE OR REPLACE PROCEDURE sp_tmc_drop_file
+		  			      (
+						    v_return 	OUT NUMBER,
+						    v_Id		IN  NUMBER
+
+				     	      )
+AS
+BEGIN
+DECLARE
+  BEGIN
+    DELETE FROM TMC_FILES
+    WHERE FILE_ID=v_Id;
+    IF SQL%NOTFOUND THEN v_return:=1;
+    END IF;
+  END;
 END;
 /
 CREATE OR REPLACE PROCEDURE sp_am_delete_apache (v_aId IN NUMBER,
@@ -503,7 +527,7 @@
 AS
 BEGIN
 	v_return:=0;
-	DELETE FROM TMC_ALERTs
+	DELETE FROM TMC_ALERTS
 	WHERE ALERT_ID=v_id;
 	IF SQL%NOTFOUND THEN v_return:=1;
 	END IF;

Modified: incubator/lokahi/lokahi/trunk/database/tmc_rel_function_user_data.sql
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/database/tmc_rel_function_user_data.sql?rev=419344&r1=419343&r2=419344&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/database/tmc_rel_function_user_data.sql (original)
+++ incubator/lokahi/lokahi/trunk/database/tmc_rel_function_user_data.sql Wed Jul  5 14:11:29 2006
@@ -1,156 +1,132 @@
 rem initial data for superuser USER_ID=1
 rem automatically generated by script
-insert into TMC_REL_FUNCTION_USER values ( 1,91,0,1,0 );
-insert into TMC_REL_FUNCTION_USER values ( 1,63,0,1,0 );
-insert into TMC_REL_FUNCTION_USER values ( 1,92,0,1,0 );
-insert into TMC_REL_FUNCTION_USER values ( 1,115,0,1,0 );
-insert into TMC_REL_FUNCTION_USER values ( 1,94,0,1,0 );
-insert into TMC_REL_FUNCTION_USER values ( 1,68,0,1,0 );
-insert into TMC_REL_FUNCTION_USER values ( 1,78,0,1,0 );
-insert into TMC_REL_FUNCTION_USER values ( 1,67,0,1,0 );
-insert into TMC_REL_FUNCTION_USER values ( 1,52,0,1,0 );
-insert into TMC_REL_FUNCTION_USER values ( 1,86,0,1,0 );
-insert into TMC_REL_FUNCTION_USER values ( 1,20,0,1,0 );
-insert into TMC_REL_FUNCTION_USER values ( 1,42,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,1,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,2,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,8,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,123,0,1,0 );
 insert into TMC_REL_FUNCTION_USER values ( 1,64,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,38,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,61,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,120,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,97,0,1,0 );
 insert into TMC_REL_FUNCTION_USER values ( 1,69,0,1,0 );
-insert into TMC_REL_FUNCTION_USER values ( 1,95,0,1,0 );
-insert into TMC_REL_FUNCTION_USER values ( 1,96,0,1,0 );
-insert into TMC_REL_FUNCTION_USER values ( 1,32,0,1,0 );
-insert into TMC_REL_FUNCTION_USER values ( 1,43,0,1,0 );
-insert into TMC_REL_FUNCTION_USER values ( 1,76,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,29,0,1,0 );
 insert into TMC_REL_FUNCTION_USER values ( 1,87,0,1,0 );
-insert into TMC_REL_FUNCTION_USER values ( 1,79,0,1,0 );
-insert into TMC_REL_FUNCTION_USER values ( 1,13,0,1,0 );
-insert into TMC_REL_FUNCTION_USER values ( 1,44,0,1,0 );
-insert into TMC_REL_FUNCTION_USER values ( 1,9,0,1,0 );
-insert into TMC_REL_FUNCTION_USER values ( 1,90,0,1,0 );
-insert into TMC_REL_FUNCTION_USER values ( 1,88,0,1,0 );
-insert into TMC_REL_FUNCTION_USER values ( 1,41,0,1,0 );
-insert into TMC_REL_FUNCTION_USER values ( 1,58,0,1,0 );
-insert into TMC_REL_FUNCTION_USER values ( 1,14,0,1,0 );
-insert into TMC_REL_FUNCTION_USER values ( 1,17,0,1,0 );
-insert into TMC_REL_FUNCTION_USER values ( 1,60,0,1,0 );
 insert into TMC_REL_FUNCTION_USER values ( 1,36,0,1,0 );
-insert into TMC_REL_FUNCTION_USER values ( 1,6,0,1,0 );
-insert into TMC_REL_FUNCTION_USER values ( 1,59,0,1,0 );
-insert into TMC_REL_FUNCTION_USER values ( 1,5,0,1,0 );
-insert into TMC_REL_FUNCTION_USER values ( 1,16,0,1,0 );
-insert into TMC_REL_FUNCTION_USER values ( 1,37,0,1,0 );
-insert into TMC_REL_FUNCTION_USER values ( 1,55,0,1,0 );
-insert into TMC_REL_FUNCTION_USER values ( 1,33,0,1,0 );
-insert into TMC_REL_FUNCTION_USER values ( 1,15,0,1,0 );
-insert into TMC_REL_FUNCTION_USER values ( 1,62,0,1,0 );
-insert into TMC_REL_FUNCTION_USER values ( 1,114,0,1,0 );
-insert into TMC_REL_FUNCTION_USER values ( 1,7,0,1,0 );
-insert into TMC_REL_FUNCTION_USER values ( 1,53,0,1,0 );
-insert into TMC_REL_FUNCTION_USER values ( 1,31,0,1,0 );
-insert into TMC_REL_FUNCTION_USER values ( 1,106,0,1,0 );
-insert into TMC_REL_FUNCTION_USER values ( 1,65,0,1,0 );
-insert into TMC_REL_FUNCTION_USER values ( 1,54,0,1,0 );
-insert into TMC_REL_FUNCTION_USER values ( 1,48,0,1,0 );
-insert into TMC_REL_FUNCTION_USER values ( 1,107,0,1,0 );
-insert into TMC_REL_FUNCTION_USER values ( 1,110,0,1,0 );
-insert into TMC_REL_FUNCTION_USER values ( 1,8,0,1,0 );
-insert into TMC_REL_FUNCTION_USER values ( 1,66,0,1,0 );
-insert into TMC_REL_FUNCTION_USER values ( 1,93,0,1,0 );
-insert into TMC_REL_FUNCTION_USER values ( 1,29,0,1,0 );
-insert into TMC_REL_FUNCTION_USER values ( 1,102,0,1,0 );
-insert into TMC_REL_FUNCTION_USER values ( 1,49,0,1,0 );
-insert into TMC_REL_FUNCTION_USER values ( 1,39,0,1,0 );
-insert into TMC_REL_FUNCTION_USER values ( 1,82,0,1,0 );
-insert into TMC_REL_FUNCTION_USER values ( 1,112,0,1,0 );
-insert into TMC_REL_FUNCTION_USER values ( 1,103,0,1,0 );
-insert into TMC_REL_FUNCTION_USER values ( 1,72,0,1,0 );
-insert into TMC_REL_FUNCTION_USER values ( 1,24,0,1,0 );
-insert into TMC_REL_FUNCTION_USER values ( 1,83,0,1,0 );
-insert into TMC_REL_FUNCTION_USER values ( 1,61,0,1,0 );
-insert into TMC_REL_FUNCTION_USER values ( 1,50,0,1,0 );
-insert into TMC_REL_FUNCTION_USER values ( 1,23,0,1,0 );
-insert into TMC_REL_FUNCTION_USER values ( 1,113,0,1,0 );
-insert into TMC_REL_FUNCTION_USER values ( 1,34,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,32,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,28,0,1,0 );
 insert into TMC_REL_FUNCTION_USER values ( 1,74,0,1,0 );
-insert into TMC_REL_FUNCTION_USER values ( 1,101,0,1,0 );
-insert into TMC_REL_FUNCTION_USER values ( 1,30,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,90,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,119,0,1,0 );
 insert into TMC_REL_FUNCTION_USER values ( 1,18,0,1,0 );
-insert into TMC_REL_FUNCTION_USER values ( 1,111,0,1,0 );
-insert into TMC_REL_FUNCTION_USER values ( 1,25,0,1,0 );
-insert into TMC_REL_FUNCTION_USER values ( 1,57,0,1,0 );
-insert into TMC_REL_FUNCTION_USER values ( 1,35,0,1,0 );
-insert into TMC_REL_FUNCTION_USER values ( 1,26,0,1,0 );
-insert into TMC_REL_FUNCTION_USER values ( 1,100,0,1,0 );
-insert into TMC_REL_FUNCTION_USER values ( 1,19,0,1,0 );
-insert into TMC_REL_FUNCTION_USER values ( 1,51,0,1,0 );
-insert into TMC_REL_FUNCTION_USER values ( 1,28,0,1,0 );
-insert into TMC_REL_FUNCTION_USER values ( 1,85,0,1,0 );
-insert into TMC_REL_FUNCTION_USER values ( 1,105,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,34,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,10,0,1,0 );
 insert into TMC_REL_FUNCTION_USER values ( 1,3,0,1,0 );
-insert into TMC_REL_FUNCTION_USER values ( 1,27,0,1,0 );
-insert into TMC_REL_FUNCTION_USER values ( 1,70,0,1,0 );
-insert into TMC_REL_FUNCTION_USER values ( 1,1,0,1,0 );
-insert into TMC_REL_FUNCTION_USER values ( 1,80,0,1,0 );
-insert into TMC_REL_FUNCTION_USER values ( 1,99,0,1,0 );
-insert into TMC_REL_FUNCTION_USER values ( 1,46,0,1,0 );
-insert into TMC_REL_FUNCTION_USER values ( 1,56,0,1,0 );
-insert into TMC_REL_FUNCTION_USER values ( 1,104,0,1,0 );
-insert into TMC_REL_FUNCTION_USER values ( 1,11,0,1,0 );
-insert into TMC_REL_FUNCTION_USER values ( 1,40,0,1,0 );
-insert into TMC_REL_FUNCTION_USER values ( 1,4,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,76,0,1,0 );
 insert into TMC_REL_FUNCTION_USER values ( 1,77,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,78,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,79,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,80,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,81,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,82,0,1,0 );
 insert into TMC_REL_FUNCTION_USER values ( 1,84,0,1,0 );
-insert into TMC_REL_FUNCTION_USER values ( 1,12,0,1,0 );
-insert into TMC_REL_FUNCTION_USER values ( 1,89,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,85,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,127,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,128,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,129,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,130,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,131,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,132,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,133,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,134,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,135,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,121,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,125,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,48,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,37,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,107,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,47,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,4,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,58,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,91,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,99,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,19,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,100,0,1,0 );
 insert into TMC_REL_FUNCTION_USER values ( 1,45,0,1,0 );
-insert into TMC_REL_FUNCTION_USER values ( 1,97,0,1,0 );
-insert into TMC_REL_FUNCTION_USER values ( 1,38,0,1,0 );
-insert into TMC_REL_FUNCTION_USER values ( 1,2,0,1,0 );
-insert into TMC_REL_FUNCTION_USER values ( 1,81,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,50,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,83,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,96,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,63,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,94,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,49,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,105,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,31,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,115,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,102,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,7,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,62,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,68,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,112,0,1,0 );
 insert into TMC_REL_FUNCTION_USER values ( 1,109,0,1,0 );
-insert into TMC_REL_FUNCTION_USER values ( 1,75,0,1,0 );
-insert into TMC_REL_FUNCTION_USER values ( 1,47,0,1,0 );
-insert into TMC_REL_FUNCTION_USER values ( 1,108,0,1,0 );
-insert into TMC_REL_FUNCTION_USER values ( 1,71,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,15,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,17,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,25,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,30,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,59,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,65,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,86,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,9,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,11,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,14,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,95,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,101,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,46,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,33,0,1,0 );
 insert into TMC_REL_FUNCTION_USER values ( 1,21,0,1,0 );
-insert into TMC_REL_FUNCTION_USER values ( 1,10,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,44,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,108,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,110,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,104,0,1,0 );
 insert into TMC_REL_FUNCTION_USER values ( 1,22,0,1,0 );
-insert into TMC_REL_FUNCTION_USER values ( 1,73,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,56,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,5,0,1,0 );
 insert into TMC_REL_FUNCTION_USER values ( 1,98,0,1,0 );
-insert into TMC_REL_FUNCTION_USER values ( 1,116,0,1,0 );
-insert into TMC_REL_FUNCTION_USER values ( 1,117,0,1,0 );
-insert into TMC_REL_FUNCTION_USER values ( 1,85,2,4,1 );
-insert into TMC_REL_FUNCTION_USER values ( 1,76,2,4,1 );
-insert into TMC_REL_FUNCTION_USER values ( 1,3,2,4,1 );
-insert into TMC_REL_FUNCTION_USER values ( 1,10,2,4,1 );
-insert into TMC_REL_FUNCTION_USER values ( 1,79,2,4,1 );
-insert into TMC_REL_FUNCTION_USER values ( 1,81,2,4,1 );
-insert into TMC_REL_FUNCTION_USER values ( 1,77,2,4,1 );
-insert into TMC_REL_FUNCTION_USER values ( 1,84,2,4,1 );
-insert into TMC_REL_FUNCTION_USER values ( 1,78,2,4,1 );
-insert into TMC_REL_FUNCTION_USER values ( 1,82,2,4,1 );
-insert into TMC_REL_FUNCTION_USER values ( 1,1,2,4,1 );
-insert into TMC_REL_FUNCTION_USER values ( 1,80,2,4,1 );
-insert into TMC_REL_FUNCTION_USER values ( 1,85,1,4,1 );
-insert into TMC_REL_FUNCTION_USER values ( 1,76,1,4,1 );
-insert into TMC_REL_FUNCTION_USER values ( 1,3,1,4,1 );
-insert into TMC_REL_FUNCTION_USER values ( 1,10,1,4,1 );
-insert into TMC_REL_FUNCTION_USER values ( 1,79,1,4,1 );
-insert into TMC_REL_FUNCTION_USER values ( 1,81,1,4,1 );
-insert into TMC_REL_FUNCTION_USER values ( 1,77,1,4,1 );
-insert into TMC_REL_FUNCTION_USER values ( 1,84,1,4,1 );
-insert into TMC_REL_FUNCTION_USER values ( 1,78,1,4,1 );
-insert into TMC_REL_FUNCTION_USER values ( 1,82,1,4,1 );
-insert into TMC_REL_FUNCTION_USER values ( 1,1,1,4,1 );
-insert into TMC_REL_FUNCTION_USER values ( 1,80,1,4,1 );
-insert into TMC_REL_FUNCTION_USER values ( 1,5,8,3,1 );
-insert into TMC_REL_FUNCTION_USER values ( 1,8,8,3,1 );
-insert into TMC_REL_FUNCTION_USER values ( 1,5,1,3,1 );
-insert into TMC_REL_FUNCTION_USER values ( 1,8,1,3,1 );
-insert into TMC_REL_FUNCTION_USER values ( 1,118,0,1,0 );
-insert into TMC_REL_FUNCTION_USER values ( 1,119,0,1,0 );
-insert into TMC_REL_FUNCTION_USER values ( 1,121,0,1,0 );
-insert into TMC_REL_FUNCTION_USER values ( 1,123,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,26,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,75,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,92,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,35,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,51,0,1,0 );
 insert into TMC_REL_FUNCTION_USER values ( 1,126,0,1,0 );
-insert into TMC_REL_FUNCTION_USER values ( 1,124,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,60,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,6,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,13,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,12,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,16,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,20,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,103,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,111,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,27,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,118,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,88,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,23,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,117,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,136,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,42,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,39,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,67,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,89,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,41,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,106,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,66,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,24,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,57,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,116,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,114,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,93,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,73,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,43,0,1,0 );
+insert into TMC_REL_FUNCTION_USER values ( 1,40,0,1,0 );
+
 Commit;
 
 rem end of file

Modified: incubator/lokahi/lokahi/trunk/docs/README.TXT
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/docs/README.TXT?rev=419344&r1=419343&r2=419344&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/docs/README.TXT (original)
+++ incubator/lokahi/lokahi/trunk/docs/README.TXT Wed Jul  5 14:11:29 2006
@@ -1,4 +1,4 @@
-   Requirements:  Tomcat 5.5.9 is installed, and you know how to configure it
+   Requirements:  Tomcat 5.5.x is installed, and you know how to configure it
                   Oracle 9i database is available to you
                   JDK 1.5
                   ant 1.6.5 or later

Modified: incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/agent/JobSOAP.java
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/agent/JobSOAP.java?rev=419344&r1=419343&r2=419344&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/agent/JobSOAP.java (original)
+++ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/agent/JobSOAP.java Wed Jul  5 14:11:29 2006
@@ -15,13 +15,14 @@
 */
 package org.apache.lokahi.core.agent;
 
+import org.apache.axis.AxisFault;
+import org.apache.log4j.Logger;
 import org.apache.lokahi.core.agent.dao.AgentJob;
 import org.apache.lokahi.core.agent.job.ScheduledJob;
+import org.apache.lokahi.core.api.state.State;
 import org.apache.lokahi.core.common.database.DerbyBroker;
 import org.apache.lokahi.core.common.interfaces.TMCBroker;
 import org.apache.lokahi.core.common.util.PropertiesFile;
-import org.apache.axis.AxisFault;
-import org.apache.log4j.Logger;
 
 import java.sql.SQLException;
 
@@ -47,6 +48,9 @@
 
   private String handleJob(AgentJob j) throws AxisFault {
     try {
+      j.setStatus(State.NEW);
+      if (logger.isDebugEnabled())
+        logger.debug("Received Job:" + j);
       AgentJob.store(j);
       return PropertiesFile.getConstantValue("tmc.agent.store.success");
     } catch (SQLException e) {

Modified: incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/agent/TMCAgent.java
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/agent/TMCAgent.java?rev=419344&r1=419343&r2=419344&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/agent/TMCAgent.java (original)
+++ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/agent/TMCAgent.java Wed Jul  5 14:11:29 2006
@@ -15,15 +15,17 @@
 */
 package org.apache.lokahi.core.agent;
 
-import org.apache.lokahi.core.agent.runnable.JobScheduler;
-import org.apache.lokahi.core.agent.runnable.ReportingThread;
-import org.apache.lokahi.core.common.database.DerbyBroker;
 import org.apache.axis.transport.http.SimpleAxisServer;
 import org.apache.log4j.Logger;
 import org.apache.log4j.xml.DOMConfigurator;
+import org.apache.lokahi.core.agent.runnable.JobScheduler;
+import org.apache.lokahi.core.agent.runnable.ReportingThread;
+import org.apache.lokahi.core.common.database.DerbyBroker;
+import org.apache.lokahi.core.common.util.PropertiesFile;
 
 import javax.net.ServerSocketFactory;
-import javax.net.ssl.SSLServerSocketFactory;
+import java.io.File;
+import java.io.FileInputStream;
 import java.io.IOException;
 import java.net.ServerSocket;
 import java.sql.SQLException;
@@ -37,9 +39,7 @@
 public class TMCAgent {
   static final Logger logger = Logger.getLogger(TMCAgent.class);
 
-  /**
-   * <code>true</code> if thread should keep running
-   */
+  /** <code>true</code> if thread should keep running */
   private static volatile boolean run = false;
 
   private TMCAgent() {
@@ -55,18 +55,20 @@
    */
   public static void main(String[] args) throws Exception {
     //check to see if starting or stopping;
+    TMCAgent agent = new TMCAgent();
     if (args != null && args.length >= 1) {
       if ("start".equalsIgnoreCase(args[0])) {
-    try {
-      init();
-      run = true;
-      while(run) {}
-      destroy();
-    } catch (IOException e) {
-      if (logger.isInfoEnabled()) {
-        logger.info("Exception: " + e.getMessage());
-      }
-    }
+        try {
+          agent.init();
+          run = true;
+          while (run) {
+          }
+          agent.destroy();
+        } catch (IOException e) {
+          if (logger.isInfoEnabled()) {
+            logger.info("Exception: " + e.getMessage());
+          }
+        }
       } else if ("stop".equalsIgnoreCase(args[0])) {
 
       } else {
@@ -82,12 +84,13 @@
    * the agent to run.
    *
    * @throws IOException if the socket can't be opened
-   *         or a property file can't be opened.
+   *                     or a property file can't be opened.
    */
-  public static void init() throws Exception {
+  public void init() throws Exception {
     DOMConfigurator.configure("agent.log4j.xml");
     int port = 5665;
     System.out.println("Log4j configured");
+    PropertiesFile.load(new FileInputStream(new File("agent.properties")));
     SimpleAxisServer sas = new SimpleAxisServer();
 //    ServerSocketFactory sf = SSLServerSocketFactory.getDefault();
     ServerSocketFactory sf = ServerSocketFactory.getDefault();
@@ -98,17 +101,16 @@
 //    DerbyBroker.initalize();
 
     //start the Job Scheduler
-    new Thread(new JobScheduler(), "JobScheduler");
-    new Thread(new ReportingThread(), "ReportingThread");
+    new Thread(new JobScheduler(), "JobScheduler").start();
+    new Thread(new ReportingThread(), "ReportingThread").start();
     System.out.println("Job Scheduler started.");
   }
 
   /**
    * Stops all services and threads needed for
    * the agent to run.
-   *
    */
-  public static void destroy() {
+  public void destroy() {
     //stop the Job Scheduler
     JobScheduler.setRun(false);
 

Modified: incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/agent/dao/AgentJob.java
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/agent/dao/AgentJob.java?rev=419344&r1=419343&r2=419344&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/agent/dao/AgentJob.java (original)
+++ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/agent/dao/AgentJob.java Wed Jul  5 14:11:29 2006
@@ -15,6 +15,7 @@
 */
 package org.apache.lokahi.core.agent.dao;
 
+import org.apache.log4j.Logger;
 import org.apache.lokahi.core.api.function.Function;
 import org.apache.lokahi.core.api.state.State;
 import org.apache.lokahi.core.common.collection.TMCCollectionImpl;
@@ -33,6 +34,7 @@
  * @version $Id$
  */
 public class AgentJob implements Dao, Collectable {
+  static final Logger logger = Logger.getLogger(AgentJob.class);
   private static final TMCDataStore<AgentJob> broker = new TMCDataStore<AgentJob>();
   private int pk;
   private int type;
@@ -201,12 +203,17 @@
     return j;
   }
 
+  public static void delete(AgentJob j) throws SQLException {
+    broker.remove(j);
+  }
+
   public boolean canRunNow() {
     return (parentName == null || "".equals(parentName));
   }
 
   public static Collection<AgentJob> getJobs(State s) {
     Collection<AgentJob> c = new TMCCollectionImpl<AgentJob>();
+    if (logger.isDebugEnabled()) logger.debug("broker.size()=" + broker.size());
     for (AgentJob j : broker.values()) {
       if (j.getStatus().equals(s)) {
         c.add(j);
@@ -216,6 +223,7 @@
   }
 
   public void update() throws SQLException {
+    if (logger.isDebugEnabled()) logger.debug("Updating Job=" + this);
     broker.add(this);
   }
 
@@ -246,6 +254,21 @@
         sb.append(delim);
       }
     return sb.toString();
+  }
+
+  public String toString() {
+    final StringBuffer buf = new StringBuffer();
+    buf.append("Job");
+    buf.append("{id=").append(pk);
+    buf.append(",type=").append(type);
+    buf.append(",name=").append(name);
+    buf.append(",parentName=").append(parentName);
+    buf.append(",status=").append(status);
+    buf.append(",function=").append(function);
+    buf.append(",result=").append(result);
+    buf.append(",options=").append(join(options, ":"));
+    buf.append('}');
+    return buf.toString();
   }
 
 }

Modified: incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/agent/job/ScheduledJob.java
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/agent/job/ScheduledJob.java?rev=419344&r1=419343&r2=419344&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/agent/job/ScheduledJob.java (original)
+++ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/agent/job/ScheduledJob.java Wed Jul  5 14:11:29 2006
@@ -39,7 +39,7 @@
       opts = "";
     } else {
       functionCommand = commandOptions.substring(0, commandOptions.indexOf(PropertiesFile.getConstantValue("agent.delim.options")));
-      opts = commandOptions.substring(commandOptions.indexOf(PropertiesFile.getConstantValue("agent.delim.options")));
+      opts = commandOptions.substring(commandOptions.indexOf(PropertiesFile.getConstantValue("agent.delim.options")) + 1);
     }
     this.setFunction(Function.getFunction(functionCommand));
     this.setOptions(opts.split(PropertiesFile.getConstantValue("agent.delim.options")));

Modified: incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/agent/runnable/JobScheduler.java
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/agent/runnable/JobScheduler.java?rev=419344&r1=419343&r2=419344&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/agent/runnable/JobScheduler.java (original)
+++ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/agent/runnable/JobScheduler.java Wed Jul  5 14:11:29 2006
@@ -15,11 +15,11 @@
 */
 package org.apache.lokahi.core.agent.runnable;
 
+import org.apache.log4j.Logger;
 import org.apache.lokahi.core.agent.dao.AgentJob;
 import org.apache.lokahi.core.agent.interfaces.AgentTask;
 import org.apache.lokahi.core.agent.util.TaskFactory;
 import org.apache.lokahi.core.api.state.State;
-import org.apache.log4j.Logger;
 
 import java.sql.SQLException;
 import java.util.Collection;
@@ -45,36 +45,44 @@
   }
 
   public void run() {
+    if (logger.isDebugEnabled()) logger.debug("Starting Job Scheduler");
     while (shouldRun()) {
       Collection<AgentJob> jobs = AgentJob.getJobs(State.NEW);
+      logger.debug(jobs.size() + " Jobs to perform.");
       for (AgentJob j : jobs) {
         if (j.canRunNow()) {
-        AgentTask task = TaskFactory.getTask(j);
-        if (task != null) {
-          Runnable r = task.getRunnable();
-          if (r != null)
-            r.run();
-          if (task.isDone()) {
-            try {
-              j.setResult(task.getResult());
-              j.setStatus(State.COMPLETE);
-            } catch (Exception e) {
-              if (logger.isInfoEnabled()) {
-                logger.info("Exception: " + e.getMessage());
+          if (logger.isDebugEnabled()) logger.debug("Running Job=" + j);
+          AgentTask task = TaskFactory.getTask(j);
+          if (task != null) {
+            if (logger.isDebugEnabled()) logger.debug("task.getClass()=" + task.getClass());
+            Runnable r = task.getRunnable();
+            if (logger.isDebugEnabled()) logger.debug("r.getClass()=" + r.getClass());
+            if (r != null)
+              r.run();
+            if (logger.isDebugEnabled()) logger.debug("task.isDone()=" + task.isDone());
+            if (task.isDone()) {
+              try {
+                j.setResult(task.getResult());
+                j.setStatus(State.COMPLETE);
+              } catch (Exception e) {
+                if (logger.isInfoEnabled()) {
+                  logger.info("Exception: " + e.getMessage());
+                  e.printStackTrace();
+                  logger.info(e);
+                }
+                j.setResult(e.getMessage());
+                j.setStatus(State.FAILED);
               }
-              j.setResult(e.getMessage());
-              j.setStatus(State.FAILED);
-            }
-            try {
-              j.update();
-            } catch (SQLException e) {
-              if (logger.isInfoEnabled()) {
-                logger.info("Exception: " + e.getMessage());
+              try {
+                j.update();
+              } catch (SQLException e) {
+                if (logger.isInfoEnabled()) {
+                  logger.info("Exception: " + e.getMessage());
+                }
               }
             }
           }
         }
-      }
       }
       try {
         Thread.sleep(1000);

Modified: incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/agent/runnable/ReportingThread.java
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/agent/runnable/ReportingThread.java?rev=419344&r1=419343&r2=419344&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/agent/runnable/ReportingThread.java (original)
+++ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/agent/runnable/ReportingThread.java Wed Jul  5 14:11:29 2006
@@ -18,7 +18,13 @@
 import org.apache.log4j.Logger;
 import org.apache.lokahi.core.agent.dao.AgentJob;
 import org.apache.lokahi.core.api.state.State;
-
+import org.apache.lokahi.core.common.exception.UnsupportedParameterException;
+import org.apache.lokahi.core.common.message.Message;
+import org.apache.lokahi.core.common.message.TMCSOAPMessage;
+
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+import java.sql.SQLException;
 import java.util.Collection;
 
 /**
@@ -30,6 +36,10 @@
 
   private static volatile boolean run = false;
 
+  public ReportingThread() {
+    setRun(true);
+  }
+
   public static boolean shouldRun() {
     return run;
   }
@@ -39,13 +49,45 @@
   }
 
   public void run() {
+    if (logger.isDebugEnabled()) logger.debug("Starting Reporting Thread.");
     while (shouldRun()) {
       Collection<AgentJob> jobs = AgentJob.getJobs(State.COMPLETE);
       jobs.addAll(AgentJob.getJobs(State.FAILED));
+      if (logger.isDebugEnabled()) logger.debug("Number of Jobs to send back:" + jobs.size());
       for (AgentJob j : jobs) {
-      //check to see if the job has any childern in the queue and update accordingly
-      //report status back to the console.
-      //
+        Message m = new TMCSOAPMessage();
+        String hostName = "";
+        try {
+          InetAddress inet = InetAddress.getLocalHost();
+          hostName = inet.getHostName();
+          if (logger.isDebugEnabled()) {
+            logger.debug("hostname=" + hostName);
+          }
+        } catch (UnknownHostException e) {
+          if (logger.isInfoEnabled()) {
+            logger.info("UnknownHostException: " + e.getMessage());
+          }
+        }
+        String ret = "";
+        try {
+          ret = m.send(new String[]{j.getReturnTo(), j.getReturnEndpoint(), j.getReturnMethod(), ""}, false, "", j.getName(), j.getParentName(), j.getStatus().getPk(), j.getResult(), hostName);
+        } catch (UnsupportedParameterException e) {
+          if (logger.isInfoEnabled()) {
+            logger.info("Exception: " + e.getMessage());
+          }
+        }
+        if (logger.isDebugEnabled()) logger.debug("ret=" + ret);
+        if (ret != null && ret.indexOf("hanks") != -1) {
+          logger.debug("Job returned to console:" + j);
+          try {
+            AgentJob.delete(j);
+          } catch (SQLException e) {
+            logger.info("Exception: " + e.getMessage());
+          }
+        }
+        //check to see if the job has any childern in the queue and update accordingly
+        //report status back to the console.
+        //
       }
       try {
         Thread.sleep(1000);

Modified: incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/agent/task/HttpsdctlTask.java
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/agent/task/HttpsdctlTask.java?rev=419344&r1=419343&r2=419344&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/agent/task/HttpsdctlTask.java (original)
+++ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/agent/task/HttpsdctlTask.java Wed Jul  5 14:11:29 2006
@@ -19,6 +19,7 @@
 import org.apache.lokahi.core.agent.dao.TaskType;
 import org.apache.lokahi.core.agent.util.CommandLineProcess;
 import org.apache.lokahi.core.agent.util.TMCTaskException;
+import org.apache.lokahi.core.common.util.PropertiesFile;
 
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.FutureTask;
@@ -30,7 +31,7 @@
 public class HttpsdctlTask extends AbstractAgentTask<String> {
 
   HttpsdctlTask(int jobId, TaskType t, String apacheRoot, String command) {
-    this.task = new FutureTask<String>(new CommandLineProcess("sudo ", apacheRoot.trim() + "/bin/httpsdctl ", command));
+    this.task = new FutureTask<String>(new CommandLineProcess(PropertiesFile.getConstantValue("path.to.sudo"), apacheRoot.trim() + "/bin/apachectl", command));
     this.setJobId(jobId);
     this.setType(t);
   }

Modified: incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/agent/util/CommandLineProcess.java
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/agent/util/CommandLineProcess.java?rev=419344&r1=419343&r2=419344&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/agent/util/CommandLineProcess.java (original)
+++ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/agent/util/CommandLineProcess.java Wed Jul  5 14:11:29 2006
@@ -36,13 +36,20 @@
   private InputStream is;
 
   public CommandLineProcess(String... command) {
+    if (logger.isDebugEnabled()) {
+      StringBuilder sb = new StringBuilder();
+      for (String s : command) {
+        sb.append(s);
+        sb.append(' ');
+      }
+      logger.debug("command=" + sb.toString());
+    }
     pb = new ProcessBuilder(command);
     pb.redirectErrorStream(true);
   }
 
   public void setDirectory(String directory) {
     pb.directory(new File(directory));
-
   }
 
   public void start() throws IOException {

Modified: incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/agent/util/TaskFactory.java
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/agent/util/TaskFactory.java?rev=419344&r1=419343&r2=419344&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/agent/util/TaskFactory.java (original)
+++ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/agent/util/TaskFactory.java Wed Jul  5 14:11:29 2006
@@ -15,12 +15,15 @@
 */
 package org.apache.lokahi.core.agent.util;
 
+import org.apache.log4j.Logger;
 import org.apache.lokahi.core.agent.dao.AgentJob;
 import org.apache.lokahi.core.agent.interfaces.AgentTask;
-import org.apache.log4j.Logger;
+import org.apache.lokahi.core.api.function.Function;
 
 import java.io.IOException;
 import java.io.InputStream;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
 import java.util.Properties;
 
 /**
@@ -45,8 +48,30 @@
   }
 
   public static AgentTask getTask(AgentJob j) {
-
-    return null;
+    Function f = j.getFunction();
+    AgentTask ret = null;
+    String className = "org.apache.lokahi.core.agent.task." + f.getCommand() + "Task";
+    if (logger.isDebugEnabled()) logger.debug("className=" + className);
+    try {
+      Class c = Class.forName(className);
+      if (AgentTask.class.isAssignableFrom(c)) {
+        Constructor con = c.getConstructor(AgentJob.class);
+        ret = (AgentTask) con.newInstance(j);
+      } else {
+        if (logger.isInfoEnabled()) logger.info("Not assignable from AgentTask: " + className);
+      }
+    } catch (ClassNotFoundException e) {
+      if (logger.isInfoEnabled()) logger.info("Exception: " + e.getMessage());
+    } catch (NoSuchMethodException e) {
+      if (logger.isInfoEnabled()) logger.info("Exception: " + e.getMessage());
+    } catch (InstantiationException e) {
+      if (logger.isInfoEnabled()) logger.info("Exception: " + e.getMessage());
+    } catch (IllegalAccessException e) {
+      if (logger.isInfoEnabled()) logger.info("Exception: " + e.getMessage());
+    } catch (InvocationTargetException e) {
+      if (logger.isInfoEnabled()) logger.info("Exception: " + e.getMessage());
+    }
+    return ret;
   }
 
 }

Modified: incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/api/function/Function.java
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/api/function/Function.java?rev=419344&r1=419343&r2=419344&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/api/function/Function.java (original)
+++ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/api/function/Function.java Wed Jul  5 14:11:29 2006
@@ -15,11 +15,11 @@
 */
 package org.apache.lokahi.core.api.function;
 
+import org.apache.log4j.Logger;
 import org.apache.lokahi.core.common.database.BrokerFactory;
 import org.apache.lokahi.core.common.interfaces.ReadOnlyBroker;
 import org.apache.lokahi.core.common.interfaces.XMLDao;
 import org.apache.lokahi.core.common.util.PropertiesFile;
-import org.apache.log4j.Logger;
 import org.jdom.Element;
 
 import java.io.Serializable;
@@ -37,11 +37,9 @@
  */
 public class Function extends XMLDao<Function> implements Serializable {
   static final Logger logger = Logger.getLogger(Function.class);
-  private static final ReadOnlyBroker<Function> broker = new BrokerFactory<Function>().getBroker(new java.io.File(PropertiesFile.getConstantValue("prop.location") + "/WEB-INF/classes/function.xml"), Function.class);
+  private static final ReadOnlyBroker<Function> broker = new BrokerFactory<Function>().getBroker(new java.io.File(PropertiesFile.getConstantValue("function.prop.location")), Function.class);
 
-  /**
-   * primary key
-   */
+  /** primary key */
   private int id;
 
   /**
@@ -83,9 +81,7 @@
     this.name = name;
   }
 
-  /**
-   * @return the Command
-   */
+  /** @return the Command */
   public String getCommand() {
     return command;
   }
@@ -99,9 +95,7 @@
     this.command = command;
   }
 
-  /**
-   * Default constructor, public for the sake of reflection
-   */
+  /** Default constructor, public for the sake of reflection */
   public Function() {
   }
 
@@ -134,6 +128,7 @@
    * Gets the function object by the primary key.
    *
    * @param id primary key of the Function to find.
+   *
    * @return Function object or null.
    */
   public Function get(int id) {
@@ -155,6 +150,7 @@
    * Gets the function object by the primary key.
    *
    * @param id primary key of the Function to find.
+   *
    * @return Function object or null.
    */
   public static Function getFunction(int id) {
@@ -166,6 +162,7 @@
    * Gets the function object by the commad.
    *
    * @param command command of the Function to find.
+   *
    * @return Function object or null.
    */
   public static Function getFunction(String command) {
@@ -182,6 +179,7 @@
     }
     return f;
   }
+
   /**
    * Gets all function objects.
    *

Modified: incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/api/user/UserModel.java
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/api/user/UserModel.java?rev=419344&r1=419343&r2=419344&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/api/user/UserModel.java (original)
+++ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/api/user/UserModel.java Wed Jul  5 14:11:29 2006
@@ -15,6 +15,7 @@
 */
 package org.apache.lokahi.core.api.user;
 
+import org.apache.log4j.Logger;
 import org.apache.lokahi.core.api.function.Function;
 import org.apache.lokahi.core.api.jobpool.JobPool;
 import org.apache.lokahi.core.api.project.Project;
@@ -28,7 +29,6 @@
 import org.apache.lokahi.core.common.exception.TMCIllegalArgumentException;
 import org.apache.lokahi.core.common.interfaces.FunctionableEntity;
 import org.apache.lokahi.core.common.interfaces.LokahiModel;
-import org.apache.log4j.Logger;
 
 import java.sql.SQLException;
 import java.util.Collection;
@@ -63,7 +63,7 @@
       TMCException {
     if (s == null || s.getPk() <= 1) throw new TMCIllegalArgumentException("User can not be null");
     jpInit(f, u, s.getName());
-    if (u.isAllowed(f) && "AddUser".equals(f.getCommand())) {
+    if (u.isAllowed(f) && "DeleteUser".equals(f.getCommand())) {
       User.delete(s);
       jp.setState(State.COMPLETE);
       JobPool.update(jp);

Modified: incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/collection/TMCDataStore.java
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/collection/TMCDataStore.java?rev=419344&r1=419343&r2=419344&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/collection/TMCDataStore.java (original)
+++ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/collection/TMCDataStore.java Wed Jul  5 14:11:29 2006
@@ -15,6 +15,7 @@
 */
 package org.apache.lokahi.core.common.collection;
 
+import org.apache.log4j.Logger;
 import org.apache.lokahi.core.common.interfaces.Collectable;
 
 /**
@@ -22,6 +23,7 @@
  * @version $Id$
  */
 public class TMCDataStore<T extends Collectable> extends TMCCache<T> {
+  static final Logger logger = Logger.getLogger(TMCDataStore.class);
   private static int i = 1;
 
   public TMCDataStore() {
@@ -29,11 +31,17 @@
   }
 
   public int store(T t) {
-    Integer j = i++;
-    String name;
-    name = t.getName();
-    index.put(name, j);
-    cache.put(j, t);
+    String name = t.getName();
+    Integer j;
+    if (! index.containsKey(name)) {
+      j = i++;
+      if (logger.isDebugEnabled()) logger.debug("j=" + j);
+      if (logger.isDebugEnabled()) logger.debug("i=" + i);
+      index.put(name, j);
+      cache.put(j, t);
+    } else {
+      j = index.get(name);
+    }
     return j;
   }
 

Modified: incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/message/Message.java
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/message/Message.java?rev=419344&r1=419343&r2=419344&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/message/Message.java (original)
+++ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/message/Message.java Wed Jul  5 14:11:29 2006
@@ -22,7 +22,7 @@
  * @version $Id$
  */
 public interface Message {
-  String send(String[] obj, boolean hasAttachement, String... params) throws UnsupportedParameterException;
+  String send(String[] obj, boolean hasAttachement, Object... params) throws UnsupportedParameterException;
 }
 
 



Mime
View raw message