From lokahi-commits-returnmichaelchan@example.org Mon Jun 05 15:21:37 2006 Return-Path: <lokahi-commits-returnmichaelchan@example.org> Delivered-To: michaelchan@example.org Received: (qmail 84790 invoked from network); 5 Jun 2006 15:21:37 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 5 Jun 2006 15:21:37 -0000 Received: (qmail 79204 invoked by uid 500); 5 Jun 2006 15:21:37 -0000 Delivered-To: michaelchan@example.org Received: (qmail 79182 invoked by uid 500); 5 Jun 2006 15:21:37 -0000 Mailing-List: contact michaelchan@example.org; run by ezmlm Precedence: bulk List-Help: <mailto:michaelchan@example.org> List-Unsubscribe: <mailto:michaelchan@example.org> List-Post: <mailto:michaelchan@example.org> List-Id: <lokahi-commits.incubator.apache.org> Reply-To: michaelchan@example.org Delivered-To: mailing list michaelchan@example.org Received: (qmail 79173 invoked by uid 99); 5 Jun 2006 15:21:37 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 05 Jun 2006 08:21:37 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: local policy) Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 05 Jun 2006 08:21:36 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 811F71A983A; Mon, 5 Jun 2006 08:21:16 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r411814 - /incubator/lokahi/lokahi/trunk/STATUS Date: Mon, 05 Jun 2006 15:21:16 -0000 To: michaelchan@example.org From: michaelchan@example.org X-Mailer: svnmailer-1.0.8 Message-Id: <michaelchan@example.org> X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: toback Date: Mon Jun 5 08:21:15 2006 New Revision: 411814 URL: http://svn.apache.org/viewvc?rev=411814&view=rev Log: Added new status file with basic todo items. Added: incubator/lokahi/lokahi/trunk/STATUS Added: incubator/lokahi/lokahi/trunk/STATUS URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/STATUS?rev=411814&view=auto ============================================================================== --- incubator/lokahi/lokahi/trunk/STATUS (added) +++ incubator/lokahi/lokahi/trunk/STATUS Mon Jun 5 08:21:15 2006 @@ -0,0 +1,25 @@ +Current To-do: +====================== + +Major: +====================== +Refactor the TMC* classes to a final Lokahi name to provide a final api. + +Track down the exceptions that have not been correctly moved to the org.apache.lokahi namespace. + +Correct the Agent startup thread including having a Mbean to manage it (patch almost complete) + +Eliminate the CheckJVMThread and controller.AdminBean by completing the ControllerThread class. + +Minor: +====================== +Several of the .vm files including Apache\Worker\view.vm and Tomcat\Worker\view.vm need to be corrected. Those two in particular are currently empty and should look like Apache\Pool\view.vm + +The JMX error messages when a non-JMX jvm is running on the same box and is identified need to be suppressed, instead of passed back with the agent job results. + + +Ideas needing expansion: +====================== +There needs to be a CLI to the agent that calls back the controller with the proper information when a job is submitted directly to the Agent from the CLI. + + From lokahi-commits-returnmichaelchan@example.org Mon Jun 05 17:15:57 2006 Return-Path: <lokahi-commits-returnmichaelchan@example.org> Delivered-To: michaelchan@example.org Received: (qmail 28090 invoked from network); 5 Jun 2006 17:15:57 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 5 Jun 2006 17:15:57 -0000 Received: (qmail 16160 invoked by uid 500); 5 Jun 2006 17:15:57 -0000 Delivered-To: michaelchan@example.org Received: (qmail 16124 invoked by uid 500); 5 Jun 2006 17:15:57 -0000 Mailing-List: contact michaelchan@example.org; run by ezmlm Precedence: bulk List-Help: <mailto:michaelchan@example.org> List-Unsubscribe: <mailto:michaelchan@example.org> List-Post: <mailto:michaelchan@example.org> List-Id: <lokahi-commits.incubator.apache.org> Reply-To: michaelchan@example.org Delivered-To: mailing list michaelchan@example.org Received: (qmail 16114 invoked by uid 99); 5 Jun 2006 17:15:57 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 05 Jun 2006 10:15:56 -0700 X-ASF-Spam-Status: No, hits=-8.5 required=10.0 tests=ALL_TRUSTED,INFO_TLD,NO_REAL_NAME,SUBJECT_NOVOWEL X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: local policy) Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 05 Jun 2006 10:15:55 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id ED1391A984A; Mon, 5 Jun 2006 10:15:34 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r411861 - /incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/controller/CheckJvmThread.java Date: Mon, 05 Jun 2006 17:15:34 -0000 To: michaelchan@example.org From: michaelchan@example.org X-Mailer: svnmailer-1.0.8 Message-Id: <michaelchan@example.org> X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: toback Date: Mon Jun 5 10:15:34 2006 New Revision: 411861 URL: http://svn.apache.org/viewvc?rev=411861&view=rev Log: moved package names to proper org.apache.lokahi from just straight lokahi Modified: incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/controller/CheckJvmThread.java Modified: incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/controller/CheckJvmThread.java URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/controller/CheckJvmThread.java?rev=411861&r1=411860&r2=411861&view=diff ============================================================================== --- incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/controller/CheckJvmThread.java (original) +++ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/controller/CheckJvmThread.java Mon Jun 5 10:15:34 2006 @@ -55,7 +55,7 @@ // jvmHttp value private static String jvmHttp; - private static lokahi.core.api.state.State state; + private static org.apache.lokahi.core.api.state.State state; // private static tmc.dao.State sentState; private static final String myContext; @@ -89,7 +89,7 @@ final long keepAliveTime = 300; //how long till existing idle threads are killed tpe = new ThreadPoolExecutor(corePoolSize, maximumPoolSize, keepAliveTime, TimeUnit.SECONDS, new LinkedBlockingQueue<Runnable>(25)); - state = lokahi.core.api.state.State.getState(0); + state = org.apache.lokahi.core.api.state.State.getState(0); myContext = PropertiesFile.getConstantValue("application.root"); protocol = PropertiesFile.getConstantValue("tmc.thread.protocol"); statusPage = PropertiesFile.getConstantValue("tmc.thread.statuspage"); @@ -219,7 +219,7 @@ } // end run - public static void iterateJobPools(lokahi.core.api.state.State s) { + public static void iterateJobPools(org.apache.lokahi.core.api.state.State s) { if (s != null) { Collection<JobPool> c = null; try { @@ -283,7 +283,7 @@ } // for (int i=0; i<=2; i++){ // try { -// iterateJobPools(tmc.dao.State.getState(i)); +// iterateJobPools(org.apache.lokahi.core.api.State.getState(i)); // } catch (SQLException e) { // if (logger.isInfoEnabled()) { // logger.info("Exception: " + e.getMessage()); @@ -357,7 +357,7 @@ } if (pingMachine(primaryTomcatWorker)) { iterateJobPools(state); - iterateJobPools(lokahi.core.api.state.State.getState(1)); + iterateJobPools(org.apache.lokahi.core.api.state.State.getState(1)); } else { admin_jvms.put("PRIMARY", myTomcatWorker); admin_jvms.put("BACKUP", primaryTomcatWorker); From lokahi-commits-returnmichaelchan@example.org Mon Jun 05 17:18:42 2006 Return-Path: <lokahi-commits-returnmichaelchan@example.org> Delivered-To: michaelchan@example.org Received: (qmail 29910 invoked from network); 5 Jun 2006 17:18:42 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 5 Jun 2006 17:18:42 -0000 Received: (qmail 19772 invoked by uid 500); 5 Jun 2006 17:18:42 -0000 Delivered-To: michaelchan@example.org Received: (qmail 19755 invoked by uid 500); 5 Jun 2006 17:18:42 -0000 Mailing-List: contact michaelchan@example.org; run by ezmlm Precedence: bulk List-Help: <mailto:michaelchan@example.org> List-Unsubscribe: <mailto:michaelchan@example.org> List-Post: <mailto:michaelchan@example.org> List-Id: <lokahi-commits.incubator.apache.org> Reply-To: michaelchan@example.org Delivered-To: mailing list michaelchan@example.org Received: (qmail 19746 invoked by uid 99); 5 Jun 2006 17:18:42 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 05 Jun 2006 10:18:42 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: local policy) Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 05 Jun 2006 10:18:41 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 665AC1A983A; Mon, 5 Jun 2006 10:18:21 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r411862 - /incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/interfaces/LokahiModel.java Date: Mon, 05 Jun 2006 17:18:21 -0000 To: michaelchan@example.org From: michaelchan@example.org X-Mailer: svnmailer-1.0.8 Message-Id: <michaelchan@example.org> X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: toback Date: Mon Jun 5 10:18:20 2006 New Revision: 411862 URL: http://svn.apache.org/viewvc?rev=411862&view=rev Log: removed explicit exception declaration. Modified: incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/interfaces/LokahiModel.java Modified: incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/interfaces/LokahiModel.java URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/interfaces/LokahiModel.java?rev=411862&r1=411861&r2=411862&view=diff ============================================================================== --- incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/interfaces/LokahiModel.java (original) +++ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/interfaces/LokahiModel.java Mon Jun 5 10:18:20 2006 @@ -106,7 +106,7 @@ if (ex instanceof UnsupportedParameterException) { throw new UnsupportedParameterException(ex.getMessage()); } - if (ex instanceof lokahi.core.common.exception.TMCIllegalArgumentException) { + if (ex instanceof TMCIllegalArgumentException) { throw new IllegalArgumentException(ex.getMessage()); } if (ex instanceof AuthorizationException) { From lokahi-commits-returnmichaelchan@example.org Mon Jun 05 18:11:11 2006 Return-Path: <lokahi-commits-returnmichaelchan@example.org> Delivered-To: michaelchan@example.org Received: (qmail 58282 invoked from network); 5 Jun 2006 18:11:11 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 5 Jun 2006 18:11:11 -0000 Received: (qmail 22901 invoked by uid 500); 5 Jun 2006 18:11:11 -0000 Delivered-To: michaelchan@example.org Received: (qmail 22877 invoked by uid 500); 5 Jun 2006 18:11:11 -0000 Mailing-List: contact michaelchan@example.org; run by ezmlm Precedence: bulk List-Help: <mailto:michaelchan@example.org> List-Unsubscribe: <mailto:michaelchan@example.org> List-Post: <mailto:michaelchan@example.org> List-Id: <lokahi-commits.incubator.apache.org> Reply-To: michaelchan@example.org Delivered-To: mailing list michaelchan@example.org Received: (qmail 22866 invoked by uid 99); 5 Jun 2006 18:11:11 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 05 Jun 2006 11:11:11 -0700 X-ASF-Spam-Status: No, hits=-8.6 required=10.0 tests=ALL_TRUSTED,INFO_TLD,NO_REAL_NAME X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: local policy) Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 05 Jun 2006 11:11:10 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id DAC5B1A983A; Mon, 5 Jun 2006 11:10:49 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r411880 - in /incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/httpd/gui/www: ApachePoolAction.java ApacheWorkerAction.java Date: Mon, 05 Jun 2006 18:10:49 -0000 To: michaelchan@example.org From: michaelchan@example.org X-Mailer: svnmailer-1.0.8 Message-Id: <michaelchan@example.org> X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: toback Date: Mon Jun 5 11:10:48 2006 New Revision: 411880 URL: http://svn.apache.org/viewvc?rev=411880&view=rev Log: changed exception packages to be correct. Modified: incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/httpd/gui/www/ApachePoolAction.java incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/httpd/gui/www/ApacheWorkerAction.java Modified: incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/httpd/gui/www/ApachePoolAction.java URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/httpd/gui/www/ApachePoolAction.java?rev=411880&r1=411879&r2=411880&view=diff ============================================================================== --- incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/httpd/gui/www/ApachePoolAction.java (original) +++ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/httpd/gui/www/ApachePoolAction.java Mon Jun 5 11:10:48 2006 @@ -18,8 +18,7 @@ import org.apache.lokahi.core.api.function.Function; import org.apache.lokahi.core.api.user.User; import org.apache.lokahi.core.common.collection.TMCSet; -import org.apache.lokahi.core.common.exception.AuthorizationException; -import org.apache.lokahi.core.common.exception.TMCException; +import org.apache.lokahi.core.common.exception.*; import org.apache.lokahi.core.gui.www.TMCAction; import org.apache.lokahi.httpd.api.pool.ApachePool; import org.apache.lokahi.httpd.api.pool.ApachePoolModel; @@ -61,7 +60,7 @@ logger.info("Exception: " + e.getMessage()); } messages = this.addMessage(messages, new ActionMessage("error.db")); - } catch (lokahi.core.common.exception.TMCIllegalArgumentException e) { + } catch (TMCIllegalArgumentException e) { messages = this.addMessage(messages, new ActionMessage("error.badData")); if (logger.isInfoEnabled()) { logger.info("Exception: " + e.getMessage()); Modified: incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/httpd/gui/www/ApacheWorkerAction.java URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/httpd/gui/www/ApacheWorkerAction.java?rev=411880&r1=411879&r2=411880&view=diff ============================================================================== --- incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/httpd/gui/www/ApacheWorkerAction.java (original) +++ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/httpd/gui/www/ApacheWorkerAction.java Mon Jun 5 11:10:48 2006 @@ -18,8 +18,7 @@ import org.apache.lokahi.core.api.function.Function; import org.apache.lokahi.core.api.user.User; import org.apache.lokahi.core.common.collection.TMCSet; -import org.apache.lokahi.core.common.exception.AuthorizationException; -import org.apache.lokahi.core.common.exception.TMCException; +import org.apache.lokahi.core.common.exception.*; import org.apache.lokahi.core.gui.www.TMCAction; import org.apache.lokahi.httpd.api.worker.ApacheWorker; import org.apache.lokahi.httpd.api.worker.ApacheWorkerModel; @@ -55,7 +54,7 @@ logger.info("Exception: " + e.getMessage()); } messages = this.addMessage(messages, new ActionMessage("error.db")); - } catch (lokahi.core.common.exception.TMCIllegalArgumentException e) { + } catch (TMCIllegalArgumentException e) { messages = this.addMessage(messages, new ActionMessage("error.badData")); if (logger.isInfoEnabled()) { logger.info("Exception: " + e.getMessage()); From lokahi-commits-returnmichaelchan@example.org Tue Jun 06 14:21:03 2006 Return-Path: <lokahi-commits-returnmichaelchan@example.org> Delivered-To: michaelchan@example.org Received: (qmail 1657 invoked from network); 6 Jun 2006 14:21:03 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 6 Jun 2006 14:21:03 -0000 Received: (qmail 90610 invoked by uid 500); 6 Jun 2006 14:21:02 -0000 Delivered-To: michaelchan@example.org Received: (qmail 90587 invoked by uid 500); 6 Jun 2006 14:21:02 -0000 Mailing-List: contact michaelchan@example.org; run by ezmlm Precedence: bulk List-Help: <mailto:michaelchan@example.org> List-Unsubscribe: <mailto:michaelchan@example.org> List-Post: <mailto:michaelchan@example.org> List-Id: <lokahi-commits.incubator.apache.org> Reply-To: michaelchan@example.org Delivered-To: mailing list michaelchan@example.org Received: (qmail 90578 invoked by uid 99); 6 Jun 2006 14:21:02 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 06 Jun 2006 07:21:02 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: local policy) Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 06 Jun 2006 07:21:02 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id D6CAC1A983A; Tue, 6 Jun 2006 07:20:41 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r412128 - /incubator/lokahi/lokahi/trunk/database/types.sql Date: Tue, 06 Jun 2006 14:20:41 -0000 To: michaelchan@example.org From: michaelchan@example.org X-Mailer: svnmailer-1.0.8 Message-Id: <michaelchan@example.org> X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: toback Date: Tue Jun 6 07:20:41 2006 New Revision: 412128 URL: http://svn.apache.org/viewvc?rev=412128&view=rev Log: added missing type bi_list Added: incubator/lokahi/lokahi/trunk/database/types.sql Added: incubator/lokahi/lokahi/trunk/database/types.sql URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/database/types.sql?rev=412128&view=auto ============================================================================== --- incubator/lokahi/lokahi/trunk/database/types.sql (added) +++ incubator/lokahi/lokahi/trunk/database/types.sql Tue Jun 6 07:20:41 2006 @@ -0,0 +1,4 @@ +CREATE TYPE BI_TYPE AS OBJECT ( COL1 VARCHAR2(2000), COL2 VARCHAR2(2000) ); +/ +CREATE TYPE BI_LIST AS TABLE OF BI_TYPE; +/ From lokahi-commits-returnmichaelchan@example.org Tue Jun 06 14:58:34 2006 Return-Path: <lokahi-commits-returnmichaelchan@example.org> Delivered-To: michaelchan@example.org Received: (qmail 19546 invoked from network); 6 Jun 2006 14:58:34 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 6 Jun 2006 14:58:34 -0000 Received: (qmail 88411 invoked by uid 500); 6 Jun 2006 14:58:34 -0000 Delivered-To: michaelchan@example.org Received: (qmail 88391 invoked by uid 500); 6 Jun 2006 14:58:34 -0000 Mailing-List: contact michaelchan@example.org; run by ezmlm Precedence: bulk List-Help: <mailto:michaelchan@example.org> List-Unsubscribe: <mailto:michaelchan@example.org> List-Post: <mailto:michaelchan@example.org> List-Id: <lokahi-commits.incubator.apache.org> Reply-To: michaelchan@example.org Delivered-To: mailing list michaelchan@example.org Received: (qmail 88382 invoked by uid 99); 6 Jun 2006 14:58:34 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 06 Jun 2006 07:58:34 -0700 X-ASF-Spam-Status: No, hits=-8.6 required=10.0 tests=ALL_TRUSTED,INFO_TLD,NO_REAL_NAME X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: local policy) Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 06 Jun 2006 07:58:32 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id D5BA51A983A; Tue, 6 Jun 2006 07:58:12 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r412136 - in /incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core: common/interfaces/LokahiModel.java gui/www/HostingPoolAction.java Date: Tue, 06 Jun 2006 14:58:12 -0000 To: michaelchan@example.org From: michaelchan@example.org X-Mailer: svnmailer-1.0.8 Message-Id: <michaelchan@example.org> X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: toback Date: Tue Jun 6 07:58:11 2006 New Revision: 412136 URL: http://svn.apache.org/viewvc?rev=412136&view=rev Log: making the exceptions reflect the correct package name. Modified: incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/interfaces/LokahiModel.java incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/gui/www/HostingPoolAction.java Modified: incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/interfaces/LokahiModel.java URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/interfaces/LokahiModel.java?rev=412136&r1=412135&r2=412136&view=diff ============================================================================== --- incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/interfaces/LokahiModel.java (original) +++ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/interfaces/LokahiModel.java Tue Jun 6 07:58:11 2006 @@ -20,10 +20,7 @@ import org.apache.lokahi.core.api.project.Project; import org.apache.lokahi.core.api.state.State; import org.apache.lokahi.core.api.user.User; -import org.apache.lokahi.core.common.exception.AlreadyExistException; -import org.apache.lokahi.core.common.exception.AuthorizationException; -import org.apache.lokahi.core.common.exception.TMCException; -import org.apache.lokahi.core.common.exception.UnsupportedParameterException; +import org.apache.lokahi.core.common.exception.*; import org.apache.log4j.Logger; import java.lang.reflect.InvocationTargetException; Modified: incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/gui/www/HostingPoolAction.java URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/gui/www/HostingPoolAction.java?rev=412136&r1=412135&r2=412136&view=diff ============================================================================== --- incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/gui/www/HostingPoolAction.java (original) +++ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/gui/www/HostingPoolAction.java Tue Jun 6 07:58:11 2006 @@ -20,8 +20,7 @@ import org.apache.lokahi.core.api.pool.HostingPoolModel; import org.apache.lokahi.core.api.user.User; import org.apache.lokahi.core.common.collection.TMCSet; -import org.apache.lokahi.core.common.exception.AuthorizationException; -import org.apache.lokahi.core.common.exception.TMCException; +import org.apache.lokahi.core.common.exception.*; import org.apache.log4j.Logger; import org.apache.struts.action.ActionMessage; import org.apache.struts.action.ActionMessages; @@ -59,7 +58,7 @@ logger.info("Exception: " + e.getMessage()); } messages = this.addMessage(messages, new ActionMessage("error.db")); - } catch (lokahi.core.common.exception.TMCIllegalArgumentException e) { + } catch (TMCIllegalArgumentException e) { messages = this.addMessage(messages, new ActionMessage("error.badData")); if (logger.isInfoEnabled()) { logger.info("Exception: " + e.getMessage()); From lokahi-commits-returnmichaelchan@example.org Tue Jun 06 15:02:03 2006 Return-Path: <lokahi-commits-returnmichaelchan@example.org> Delivered-To: michaelchan@example.org Received: (qmail 20531 invoked from network); 6 Jun 2006 15:02:03 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 6 Jun 2006 15:02:03 -0000 Received: (qmail 96398 invoked by uid 500); 6 Jun 2006 15:02:03 -0000 Delivered-To: michaelchan@example.org Received: (qmail 96379 invoked by uid 500); 6 Jun 2006 15:02:03 -0000 Mailing-List: contact michaelchan@example.org; run by ezmlm Precedence: bulk List-Help: <mailto:michaelchan@example.org> List-Unsubscribe: <mailto:michaelchan@example.org> List-Post: <mailto:michaelchan@example.org> List-Id: <lokahi-commits.incubator.apache.org> Reply-To: michaelchan@example.org Delivered-To: mailing list michaelchan@example.org Received: (qmail 96370 invoked by uid 99); 6 Jun 2006 15:02:03 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 06 Jun 2006 08:02:03 -0700 X-ASF-Spam-Status: No, hits=-8.6 required=10.0 tests=ALL_TRUSTED,INFO_TLD,NO_REAL_NAME X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: local policy) Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 06 Jun 2006 08:02:02 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 5F8451A983A; Tue, 6 Jun 2006 08:01:42 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r412138 - /incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/util/TMCVelocityViewTool.java Date: Tue, 06 Jun 2006 15:01:42 -0000 To: michaelchan@example.org From: michaelchan@example.org X-Mailer: svnmailer-1.0.8 Message-Id: <michaelchan@example.org> X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: toback Date: Tue Jun 6 08:01:41 2006 New Revision: 412138 URL: http://svn.apache.org/viewvc?rev=412138&view=rev Log: removed unnecessary try/catch Modified: incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/util/TMCVelocityViewTool.java Modified: incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/util/TMCVelocityViewTool.java URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/util/TMCVelocityViewTool.java?rev=412138&r1=412137&r2=412138&view=diff ============================================================================== --- incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/util/TMCVelocityViewTool.java (original) +++ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/util/TMCVelocityViewTool.java Tue Jun 6 08:01:41 2006 @@ -585,16 +585,10 @@ /** @deprecated */ public Collection<State> getStates() { Collection<State> c = null; - try { c = State.getStates(); if (c instanceof TMCCollectionImpl) { c = ((TMCCollectionImpl<State>) c).orderByName().values(); } - } catch (SQLException e) { - if (logger.isInfoEnabled()) { - logger.info("Exception: " + e.getMessage()); - } - } return c; } From lokahi-commits-returnmichaelchan@example.org Tue Jun 06 15:27:48 2006 Return-Path: <lokahi-commits-returnmichaelchan@example.org> Delivered-To: michaelchan@example.org Received: (qmail 33401 invoked from network); 6 Jun 2006 15:27:48 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 6 Jun 2006 15:27:48 -0000 Received: (qmail 1588 invoked by uid 500); 6 Jun 2006 15:27:48 -0000 Delivered-To: michaelchan@example.org Received: (qmail 1564 invoked by uid 500); 6 Jun 2006 15:27:48 -0000 Mailing-List: contact michaelchan@example.org; run by ezmlm Precedence: bulk List-Help: <mailto:michaelchan@example.org> List-Unsubscribe: <mailto:michaelchan@example.org> List-Post: <mailto:michaelchan@example.org> List-Id: <lokahi-commits.incubator.apache.org> Reply-To: michaelchan@example.org Delivered-To: mailing list michaelchan@example.org Received: (qmail 1555 invoked by uid 99); 6 Jun 2006 15:27:47 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 06 Jun 2006 08:27:47 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: local policy) Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 06 Jun 2006 08:27:47 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 14B6A1A983A; Tue, 6 Jun 2006 08:27:27 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r412149 - in /incubator/lokahi/lokahi/trunk/database: install.sql packages.sql recompile.sql schema_priv.sql types.sql Date: Tue, 06 Jun 2006 15:27:26 -0000 To: michaelchan@example.org From: michaelchan@example.org X-Mailer: svnmailer-1.0.8 Message-Id: <michaelchan@example.org> X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: toback Date: Tue Jun 6 08:27:25 2006 New Revision: 412149 URL: http://svn.apache.org/viewvc?rev=412149&view=rev Log: moved what was in types to packages, and added the other 3 to improve the install process Added: incubator/lokahi/lokahi/trunk/database/install.sql incubator/lokahi/lokahi/trunk/database/recompile.sql incubator/lokahi/lokahi/trunk/database/schema_priv.sql Removed: incubator/lokahi/lokahi/trunk/database/types.sql Modified: incubator/lokahi/lokahi/trunk/database/packages.sql Added: incubator/lokahi/lokahi/trunk/database/install.sql URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/database/install.sql?rev=412149&view=auto ============================================================================== --- incubator/lokahi/lokahi/trunk/database/install.sql (added) +++ incubator/lokahi/lokahi/trunk/database/install.sql Tue Jun 6 08:27:25 2006 @@ -0,0 +1,24 @@ + +spool install.log + +@sequences.sql +@tables.sql +@triggers.sql +@views.sql + +@packages.sql +@functions.sql +@procs.sql + +select status, count(*) from user_objects +group by status +/ + +spool off + +@recompile.sql + +prompt *** Check ORA- Error in Log Files *** +! grep ORA- install.log +! grep ORA- recompile.log + Modified: incubator/lokahi/lokahi/trunk/database/packages.sql URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/database/packages.sql?rev=412149&r1=412148&r2=412149&view=diff ============================================================================== --- incubator/lokahi/lokahi/trunk/database/packages.sql (original) +++ incubator/lokahi/lokahi/trunk/database/packages.sql Tue Jun 6 08:27:25 2006 @@ -1,3 +1,9 @@ + +CREATE TYPE BI_TYPE AS OBJECT ( COL1 VARCHAR2(2000), COL2 VARCHAR2(2000) ); +/ +CREATE TYPE BI_LIST AS TABLE OF BI_TYPE; +/ + CREATE OR REPLACE PACKAGE tmctypes AS TYPE cursorType IS REF CURSOR; Added: incubator/lokahi/lokahi/trunk/database/recompile.sql URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/database/recompile.sql?rev=412149&view=auto ============================================================================== --- incubator/lokahi/lokahi/trunk/database/recompile.sql (added) +++ incubator/lokahi/lokahi/trunk/database/recompile.sql Tue Jun 6 08:27:25 2006 @@ -0,0 +1,39 @@ + +spool recompile.run +set head off +set feed off + +select 'alter '||object_type||' '||object_name||' compile;' +from user_objects +where status = 'INVALID' +and object_type in ( 'FUNCTION', 'PROCEDURE', 'VIEW', 'PACKAGE', 'PACKAGE BODY' ) +/ +spool off + +set echo on +set feed on + +spool recompile.log + +@recompile.run + +set head on +set echo off + +prompt *** Install Status *** + +select object_type, status, count(*) from user_objects +group by status, object_type +/ + +prompt *** List of Invalid Objects *** + +select object_type, object_name, status from user_objects +where status = 'INVALID' +/ + +prompt *** End of Install *** + +spool off + + Added: incubator/lokahi/lokahi/trunk/database/schema_priv.sql URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/database/schema_priv.sql?rev=412149&view=auto ============================================================================== --- incubator/lokahi/lokahi/trunk/database/schema_priv.sql (added) +++ incubator/lokahi/lokahi/trunk/database/schema_priv.sql Tue Jun 6 08:27:25 2006 @@ -0,0 +1,13 @@ +def owner=&1 + +set verify off + +grant create session to &owner; +grant create table to &owner; +grant create procedure to &owner; +grant create view to &owner; +grant create sequence to &owner; +grant create type to &owner; + + + From lokahi-commits-returnmichaelchan@example.org Tue Jun 06 15:33:19 2006 Return-Path: <lokahi-commits-returnmichaelchan@example.org> Delivered-To: michaelchan@example.org Received: (qmail 35373 invoked from network); 6 Jun 2006 15:33:19 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 6 Jun 2006 15:33:19 -0000 Received: (qmail 12985 invoked by uid 500); 6 Jun 2006 15:33:19 -0000 Delivered-To: michaelchan@example.org Received: (qmail 12963 invoked by uid 500); 6 Jun 2006 15:33:19 -0000 Mailing-List: contact michaelchan@example.org; run by ezmlm Precedence: bulk List-Help: <mailto:michaelchan@example.org> List-Unsubscribe: <mailto:michaelchan@example.org> List-Post: <mailto:michaelchan@example.org> List-Id: <lokahi-commits.incubator.apache.org> Reply-To: michaelchan@example.org Delivered-To: mailing list michaelchan@example.org Received: (qmail 12953 invoked by uid 99); 6 Jun 2006 15:33:18 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 06 Jun 2006 08:33:18 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: local policy) Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 06 Jun 2006 08:33:17 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 3E0BB1A983A; Tue, 6 Jun 2006 08:32:57 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r412151 - /incubator/lokahi/lokahi/trunk/docs/README.TXT Date: Tue, 06 Jun 2006 15:32:56 -0000 To: michaelchan@example.org From: michaelchan@example.org X-Mailer: svnmailer-1.0.8 Message-Id: <michaelchan@example.org> X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: toback Date: Tue Jun 6 08:32:56 2006 New Revision: 412151 URL: http://svn.apache.org/viewvc?rev=412151&view=rev Log: Updated to reflect new sql scripts. Modified: incubator/lokahi/lokahi/trunk/docs/README.TXT Modified: incubator/lokahi/lokahi/trunk/docs/README.TXT URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/docs/README.TXT?rev=412151&r1=412150&r2=412151&view=diff ============================================================================== --- incubator/lokahi/lokahi/trunk/docs/README.TXT (original) +++ incubator/lokahi/lokahi/trunk/docs/README.TXT Tue Jun 6 08:32:56 2006 @@ -11,8 +11,12 @@ 5. run ant to build the package. Database setup: -1. run the build/database/*.sql scripts against your database to set up the schema. -2. create a user, instance. (ok, so we need a script to do this, java!) +1. Create the lokahi schema <SCH> in your Oracle database with default tablespace and enough quota on that tablespace (100 MB is sufficient for install) +2. Run schema_priv.sql as DBA to grant system privileges to <SCH>. > @schema_priv.sql <SCH> +3. Login as <SCH> and run install.sql + Install.sql will call recompile.sql to recompile any invalid object and report install status at the end. +4. Make sure there is no invalid object and no error message in install.log and recompile.log +5. create a user, instance. (ok, so we need a script to do this, java!) Agent install: 1. copy the files in ./build/agent to a directory on each server. From lokahi-commits-returnmichaelchan@example.org Wed Jun 07 19:15:20 2006 Return-Path: <lokahi-commits-returnmichaelchan@example.org> Delivered-To: michaelchan@example.org Received: (qmail 90937 invoked from network); 7 Jun 2006 19:15:20 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 7 Jun 2006 19:15:20 -0000 Received: (qmail 6722 invoked by uid 500); 7 Jun 2006 19:15:20 -0000 Delivered-To: michaelchan@example.org Received: (qmail 6698 invoked by uid 500); 7 Jun 2006 19:15:19 -0000 Mailing-List: contact michaelchan@example.org; run by ezmlm Precedence: bulk List-Help: <mailto:michaelchan@example.org> List-Unsubscribe: <mailto:michaelchan@example.org> List-Post: <mailto:michaelchan@example.org> List-Id: <lokahi-commits.incubator.apache.org> Reply-To: michaelchan@example.org Delivered-To: mailing list michaelchan@example.org Received: (qmail 6689 invoked by uid 99); 7 Jun 2006 19:15:19 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 07 Jun 2006 12:15:19 -0700 X-ASF-Spam-Status: No, hits=-8.6 required=10.0 tests=ALL_TRUSTED,INFO_TLD,NO_REAL_NAME X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: local policy) Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 07 Jun 2006 12:15:18 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 4945B1A9844; Wed, 7 Jun 2006 12:14:58 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r412490 - in /incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core: agent/ api/function/ common/interfaces/ Date: Wed, 07 Jun 2006 19:14:57 -0000 To: michaelchan@example.org From: michaelchan@example.org X-Mailer: svnmailer-1.0.8 Message-Id: <michaelchan@example.org> X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: toback Date: Wed Jun 7 12:14:56 2006 New Revision: 412490 URL: http://svn.apache.org/viewvc?rev=412490&view=rev Log: added some javadocs. Modified: incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/agent/TMCAgent.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/common/interfaces/Cacheable.java incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/interfaces/Collectable.java incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/interfaces/Dao.java incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/interfaces/GenericDatabaseBroker.java incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/interfaces/ReadOnlyBroker.java 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=412490&r1=412489&r2=412490&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 Jun 7 12:14:56 2006 @@ -27,16 +27,30 @@ import java.sql.SQLException; /** + * Main thread that controls the Agent's sub threads. + * * @author Stephen Toback * @version $Id: TMCAgent.java,v 1.1 2006/03/02 19:19:44 drtobes Exp $ */ public class TMCAgent { static final Logger logger = Logger.getLogger(TMCAgent.class); + + /** + * <code>true</code> if thread should keep running + */ private static volatile boolean run = false; private TMCAgent() { } + /** + * Starts the main thread for either + * stopping or starting the Agent. + * + * @param args first argument should be either 'start' + * or 'stop'. All other will cause a help + * message to display. + */ public static void main(String[] args) { //todo write the 'bootstrappage' //check to see if starting or stopping; @@ -48,14 +62,16 @@ if (logger.isInfoEnabled()) { logger.info("Exception: " + e.getMessage()); } - } catch (SQLException e) { - if (logger.isInfoEnabled()) { - logger.info("Exception: " + e.getMessage()); - } } - } + /** + * Starts all services and threads needed for + * the agent to run. + * + * @throws IOException if the socket can't be opened + * or a property file can't be opened. + */ public static void init() throws IOException { //todo init log4j! @@ -71,11 +87,22 @@ new Thread(new JobScheduler(), "JobScheduler"); } - public static void destroy() throws SQLException { + /** + * Stops all services and threads needed for + * the agent to run. + * + */ + public static void destroy() { //stop the Job Scheduler JobScheduler.setRun(false); - DerbyBroker.shutDown(); + try { + DerbyBroker.shutDown(); + } catch (SQLException e) { + if (logger.isInfoEnabled()) { + logger.info("Exception: " + e.getMessage()); + } + } } } 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=412490&r1=412489&r2=412490&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 Jun 7 12:14:56 2006 @@ -29,20 +29,43 @@ import java.util.LinkedHashMap; /** + * Represents the actions that a user can perform on configurable + * items that lokahi maintains and controls. + * * @author Stephen Toback * @version $Id: Function.java,v 1.4 2006/03/13 21:56:59 drtobes Exp $ */ 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); + + /** + * primary key + */ private int id; + + /** + * value displayed to the user identifing + * the ability + */ private String name; + + /** + * short version of the function that is + * an identifier to lokahi as to what the + * function allows users to do + */ private String command; public int getPk() { return this.id; } + /** + * Sets the primary key + * + * @param pk + */ public void setPk(int pk) { this.id = pk; } @@ -51,21 +74,42 @@ return this.name; } + /** + * Sets the name + * + * @param name + */ public void setName(String name) { this.name = name; } + /** + * @return the Command + */ public String getCommand() { return command; } + /** + * Sets the command + * + * @param command + */ public void setCommand(String command) { this.command = command; } + /** + * Default constructor, public for the sake of reflection + */ public Function() { } + /** + * Prefered constructor for creation of new functions + * @param name + * @param command + */ public Function(String name, String command) { this.setName(name); this.setCommand(command); Modified: incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/interfaces/Cacheable.java URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/interfaces/Cacheable.java?rev=412490&r1=412489&r2=412490&view=diff ============================================================================== --- incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/interfaces/Cacheable.java (original) +++ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/interfaces/Cacheable.java Wed Jun 7 12:14:56 2006 @@ -19,9 +19,19 @@ import java.util.Collection; /** + * Implementation required for use of lokahi caching of + * <code>Dao</code> objects. + * * @author Stephen Toback * @version $Id: Cacheable.java,v 1.1 2006/03/07 20:18:51 drtobes Exp $ */ public interface Cacheable extends Dao { + /** + * Gets all of the particular <code>Dao</code> + * from the datastore without going to the cache + * + * @return a collection + * @throws SQLException + */ <T extends Cacheable> Collection<T> getAll() throws SQLException; } Modified: incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/interfaces/Collectable.java URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/interfaces/Collectable.java?rev=412490&r1=412489&r2=412490&view=diff ============================================================================== --- incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/interfaces/Collectable.java (original) +++ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/interfaces/Collectable.java Wed Jun 7 12:14:56 2006 @@ -16,12 +16,24 @@ package org.apache.lokahi.core.common.interfaces; /** + * Implementation required for use of lokahi collections classes. + * * @author Stephen Toback * @version $Id: Collectable.java,v 1.1 2006/03/07 20:18:51 drtobes Exp $ */ public interface Collectable { + /** + * Gets the primary key + * + * @return the <code>int</code> primary key + */ int getPk(); + /** + * Gets the name. + * + * @return the <code>String</code> name. + */ String getName(); } Modified: incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/interfaces/Dao.java URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/interfaces/Dao.java?rev=412490&r1=412489&r2=412490&view=diff ============================================================================== --- incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/interfaces/Dao.java (original) +++ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/interfaces/Dao.java Wed Jun 7 12:14:56 2006 @@ -19,9 +19,21 @@ import java.sql.SQLException; /** + * Required for use of any of the database brokers. + * * @author Stephen Toback * @version $Id: Dao.java,v 1.2 2006/03/07 22:05:23 drtobes Exp $ + * @see GenericDatabaseBroker */ public interface Dao<T extends Dao> { + /** + * Creates the Dao from the passed resultset, + * internally calling the appriate constructor. + * + * @param r the resultset from a database call, + * should include the entire object + * @return Object populated from the resultset + * @throws SQLException + */ T fillObject(ResultSet r) throws SQLException; } Modified: incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/interfaces/GenericDatabaseBroker.java URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/interfaces/GenericDatabaseBroker.java?rev=412490&r1=412489&r2=412490&view=diff ============================================================================== --- incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/interfaces/GenericDatabaseBroker.java (original) +++ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/interfaces/GenericDatabaseBroker.java Wed Jun 7 12:14:56 2006 @@ -22,12 +22,33 @@ import java.sql.SQLException; /** + * Base class for interaction with sql databases. + * <p> + * Currently implements methods to build callable + * statements and build singular objects from the + * result set. + * * @author Stephen Toback * @version $Id: GenericDatabaseBroker.java,v 1.4 2006/03/07 22:05:24 drtobes Exp $ */ public abstract class GenericDatabaseBroker<T extends Dao> { static final Logger logger = Logger.getLogger(GenericDatabaseBroker.class); + /** + * Builds the parameter list for a <code>CallableStatement</code> object + * based upon the parameters passed, currently supports only objects of + * <code>Integer</code>, <code>String</code>, and <code>byte[]</code> + * (for blobs) types. + * <p> + * Prevents the need to explictitly code all <code>CallableStatement</code>s + * + * @param csmt + * @param returns <code>true</code> if the statement being built returns any value + * @param returnType as specified by the jdbc driver + * @param params passed to the stored procedure or function + * @return built <code>CallableStatement</code> populated with the objects in params + * @throws SQLException + */ protected CallableStatement buildParams(CallableStatement csmt, boolean returns, int returnType, Object... params) throws SQLException { int modifier = 1; if (returns) { @@ -59,15 +80,20 @@ return csmt; } + /** + * Finds and calls the appropriate <code>fillObject</code> for the given class + * + * @param c <code>Class</code> <i>that must</i> implements the + * <code>Dao</code> interface that the + * returned object is expected to be. + * @param r <code>ResultSet</code> to build the object out of + * @return populated object of <code>Class T</code> or <code>null</code> + */ protected T fillObject(Class<T> c, ResultSet r) { T dao = null; try { dao = c.newInstance(); dao = (T) dao.fillObject(r); -// } catch (NoSuchMethodException e) { -// if (logger.isInfoEnabled()) { -// logger.info("NoSuchMethodException: " + e.getMessage()); -// } } catch (SecurityException e) { if (logger.isInfoEnabled()) { logger.info("SecurityException: " + e.getMessage()); @@ -80,10 +106,6 @@ if (logger.isInfoEnabled()) { logger.info("IllegalAccessException: " + e.getMessage()); } -// } catch (InvocationTargetException e) { -// if (logger.isInfoEnabled()) { -// logger.info("InvocationTargetException: " + e.getMessage()); -// } } catch (SQLException e) { if (logger.isInfoEnabled()) { logger.info("SQLException: " + e.getMessage()); Modified: incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/interfaces/ReadOnlyBroker.java URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/interfaces/ReadOnlyBroker.java?rev=412490&r1=412489&r2=412490&view=diff ============================================================================== --- incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/interfaces/ReadOnlyBroker.java (original) +++ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/interfaces/ReadOnlyBroker.java Wed Jun 7 12:14:56 2006 @@ -19,13 +19,35 @@ import java.util.Collection; /** + * Allows reads to implementing datastores. + * * @author Stephen Toback * @version $Id: ReadOnlyBroker.java,v 1.3 2006/03/07 20:18:52 drtobes Exp $ */ public interface ReadOnlyBroker<T extends Dao> { + /** + * Gets a singular object from the datastore. + * + * @param c <code>Class</code> of the expected object return. + * @param statement key to get the object from the datastore. + * @param cache <code>true</code> a cached object will suffice. + * @param params objects to look up the desired object by. + * @return object of <code>Class</code> c populated. + * @throws SQLException + */ T getObject(Class<T> c, String statement, boolean cache, Object... params) throws SQLException; + /** + * Gets a collection of objects from the datastore. + * + * @param c <code>Class</code> of the expected object return. + * @param statement key to get the object from the datastore. + * @param cache <code>true</code> a cached object will suffice. + * @param params objects to look up the desired object by. + * @return object of <code>Class</code> c populated. + * @throws SQLException + */ Collection<T> getObjects(Class<T> c, boolean cache, String statement, Object... params) throws SQLException; } From lokahi-commits-returnmichaelchan@example.org Wed Jun 07 19:20:21 2006 Return-Path: <lokahi-commits-returnmichaelchan@example.org> Delivered-To: michaelchan@example.org Received: (qmail 94264 invoked from network); 7 Jun 2006 19:20:20 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 7 Jun 2006 19:20:20 -0000 Received: (qmail 18629 invoked by uid 500); 7 Jun 2006 19:20:20 -0000 Delivered-To: michaelchan@example.org Received: (qmail 18614 invoked by uid 500); 7 Jun 2006 19:20:20 -0000 Mailing-List: contact michaelchan@example.org; run by ezmlm Precedence: bulk List-Help: <mailto:michaelchan@example.org> List-Unsubscribe: <mailto:michaelchan@example.org> List-Post: <mailto:michaelchan@example.org> List-Id: <lokahi-commits.incubator.apache.org> Reply-To: michaelchan@example.org Delivered-To: mailing list michaelchan@example.org Received: (qmail 18605 invoked by uid 99); 7 Jun 2006 19:20:20 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 07 Jun 2006 12:20:20 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: local policy) Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 07 Jun 2006 12:20:20 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 171591A983A; Wed, 7 Jun 2006 12:20:00 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r412493 - /incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/interfaces/Dao.java Date: Wed, 07 Jun 2006 19:19:59 -0000 To: michaelchan@example.org From: michaelchan@example.org X-Mailer: svnmailer-1.0.8 Message-Id: <michaelchan@example.org> X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: toback Date: Wed Jun 7 12:19:59 2006 New Revision: 412493 URL: http://svn.apache.org/viewvc?rev=412493&view=rev Log: testing the auto id insertion. Modified: incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/interfaces/Dao.java Modified: incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/interfaces/Dao.java URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/interfaces/Dao.java?rev=412493&r1=412492&r2=412493&view=diff ============================================================================== --- incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/interfaces/Dao.java (original) +++ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/interfaces/Dao.java Wed Jun 7 12:19:59 2006 @@ -22,7 +22,7 @@ * Required for use of any of the database brokers. * * @author Stephen Toback - * @version $Id: Dao.java,v 1.2 2006/03/07 22:05:23 drtobes Exp $ + * @version $Id$ * @see GenericDatabaseBroker */ public interface Dao<T extends Dao> { From lokahi-commits-returnmichaelchan@example.org Thu Jun 08 17:07:07 2006 Return-Path: <lokahi-commits-returnmichaelchan@example.org> Delivered-To: michaelchan@example.org Received: (qmail 84436 invoked from network); 8 Jun 2006 17:07:07 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 8 Jun 2006 17:07:07 -0000 Received: (qmail 11298 invoked by uid 500); 8 Jun 2006 17:07:07 -0000 Delivered-To: michaelchan@example.org Received: (qmail 11278 invoked by uid 500); 8 Jun 2006 17:07:07 -0000 Mailing-List: contact michaelchan@example.org; run by ezmlm Precedence: bulk List-Help: <mailto:michaelchan@example.org> List-Unsubscribe: <mailto:michaelchan@example.org> List-Post: <mailto:michaelchan@example.org> List-Id: <lokahi-commits.incubator.apache.org> Reply-To: michaelchan@example.org Delivered-To: mailing list michaelchan@example.org Received: (qmail 11268 invoked by uid 99); 8 Jun 2006 17:07:07 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 08 Jun 2006 10:07:07 -0700 X-ASF-Spam-Status: No, hits=-8.6 required=10.0 tests=ALL_TRUSTED,INFO_TLD,NO_REAL_NAME X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: local policy) Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 08 Jun 2006 10:07:05 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 2DE271A983A; Thu, 8 Jun 2006 10:06:45 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r412803 - /incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/agent/TMCAgent.java Date: Thu, 08 Jun 2006 17:06:44 -0000 To: michaelchan@example.org From: michaelchan@example.org X-Mailer: svnmailer-1.0.8 Message-Id: <michaelchan@example.org> X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: toback Date: Thu Jun 8 10:06:44 2006 New Revision: 412803 URL: http://svn.apache.org/viewvc?rev=412803&view=rev Log: quick fix to ensure the agent starts. Modified: incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/agent/TMCAgent.java 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=412803&r1=412802&r2=412803&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 Thu Jun 8 10:06:44 2006 @@ -19,6 +19,7 @@ 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 javax.net.ServerSocketFactory; import javax.net.ssl.SSLServerSocketFactory; @@ -51,18 +52,28 @@ * or 'stop'. All other will cause a help * message to display. */ - public static void main(String[] args) { //todo write the 'bootstrappage' + public static void main(String[] args) { //check to see if starting or stopping; - + if (args != null && args.length >= 1) { + if ("start".equalsIgnoreCase(args[0])) { try { init(); - //holding pattern; + run = true; + while(run) {} destroy(); } catch (IOException e) { if (logger.isInfoEnabled()) { logger.info("Exception: " + e.getMessage()); } } + } else if ("stop".equalsIgnoreCase(args[0])) { + + } else { + //help + } + } else { + //help + } } /** @@ -73,8 +84,7 @@ * or a property file can't be opened. */ public static void init() throws IOException { - //todo init log4j! - + DOMConfigurator.configure("log4j.xml"); int port = 5665; SimpleAxisServer sas = new SimpleAxisServer(); ServerSocketFactory sf = SSLServerSocketFactory.getDefault(); From lokahi-commits-returnmichaelchan@example.org Thu Jun 08 17:47:10 2006 Return-Path: <lokahi-commits-returnmichaelchan@example.org> Delivered-To: michaelchan@example.org Received: (qmail 98007 invoked from network); 8 Jun 2006 17:47:10 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 8 Jun 2006 17:47:10 -0000 Received: (qmail 4908 invoked by uid 500); 8 Jun 2006 17:47:08 -0000 Delivered-To: michaelchan@example.org Received: (qmail 4875 invoked by uid 500); 8 Jun 2006 17:47:08 -0000 Mailing-List: contact michaelchan@example.org; run by ezmlm Precedence: bulk List-Help: <mailto:michaelchan@example.org> List-Unsubscribe: <mailto:michaelchan@example.org> List-Post: <mailto:michaelchan@example.org> List-Id: <lokahi-commits.incubator.apache.org> Reply-To: michaelchan@example.org Delivered-To: mailing list michaelchan@example.org Received: (qmail 4851 invoked by uid 99); 8 Jun 2006 17:47:07 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 08 Jun 2006 10:47:07 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: local policy) Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 08 Jun 2006 10:47:07 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id C7C8E1A983A; Thu, 8 Jun 2006 10:46:46 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r412815 - in /incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core: api/function/Function.java common/interfaces/RestObject.java common/interfaces/Restable.java Date: Thu, 08 Jun 2006 17:46:46 -0000 To: michaelchan@example.org From: michaelchan@example.org X-Mailer: svnmailer-1.0.8 Message-Id: <michaelchan@example.org> X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: toback Date: Thu Jun 8 10:46:45 2006 New Revision: 412815 URL: http://svn.apache.org/viewvc?rev=412815&view=rev Log: more javadocs. Modified: incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/api/function/Function.java incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/interfaces/RestObject.java incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/interfaces/Restable.java 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=412815&r1=412814&r2=412815&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 Thu Jun 8 10:46:45 2006 @@ -31,7 +31,7 @@ /** * Represents the actions that a user can perform on configurable * items that lokahi maintains and controls. - * + * * @author Stephen Toback * @version $Id: Function.java,v 1.4 2006/03/13 21:56:59 drtobes Exp $ */ @@ -107,6 +107,7 @@ /** * Prefered constructor for creation of new functions + * * @param name * @param command */ @@ -115,12 +116,26 @@ this.setCommand(command); } + /** + * Full Constructor, mainly for use when creating objects + * from the datastore. + * + * @param pk + * @param name + * @param command + */ public Function(int pk, String name, String command) { this.setPk(pk); this.setName(name); this.setCommand(command); } + /** + * 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) { Function f = null; try { @@ -137,16 +152,22 @@ } /** - * @param id + * Gets the function object by the primary key. * - * @return function - * @deprecated + * @param id primary key of the Function to find. + * @return Function object or null. */ public static Function getFunction(int id) { Function f = new Function(); return f.get(id); } + /** + * 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) { Function f = null; try { @@ -161,7 +182,11 @@ } return f; } - + /** + * Gets all function objects. + * + * @return Function object or null. + */ public static Collection<Function> getFunctions() throws SQLException { Collection<Function> c; try { Modified: incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/interfaces/RestObject.java URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/interfaces/RestObject.java?rev=412815&r1=412814&r2=412815&view=diff ============================================================================== --- incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/interfaces/RestObject.java (original) +++ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/interfaces/RestObject.java Thu Jun 8 10:46:45 2006 @@ -18,10 +18,20 @@ import java.util.Map; /** + * Convience methods for creating an object to be displayed in the rest servlet. + * * @author Stephen Toback * @version $Id: RestObject.java,v 1.1 2006/03/07 20:18:51 drtobes Exp $ */ public abstract class RestObject implements Restable { + /** + * Takes the name, and map of key, values and creates + * an xml represenatation. + * + * @param name of the xml object + * @param a Map of key, value pairs + * @return a xml object. + */ protected static StringBuilder elementBuilder(String name, Map<String, String> a) { StringBuilder ret = new StringBuilder(); ret.append('<'); @@ -37,6 +47,13 @@ return ret; } + /** + * builds an individual xml element. + * + * @param name of the element. + * @param value of the named element. + * @return representation of the element. + */ protected static StringBuilder elementBuilder(String name, String value) { StringBuilder ret = new StringBuilder(); ret.append('<'); Modified: incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/interfaces/Restable.java URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/interfaces/Restable.java?rev=412815&r1=412814&r2=412815&view=diff ============================================================================== --- incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/interfaces/Restable.java (original) +++ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/interfaces/Restable.java Thu Jun 8 10:46:45 2006 @@ -16,12 +16,27 @@ package org.apache.lokahi.core.common.interfaces; /** + * Implemented by objects that are intended + * to be displayed by the rest servlet. + * * @author Stephen Toback * @version $Id: Restable.java,v 1.1 2006/03/07 20:18:51 drtobes Exp $ */ public interface Restable extends Collectable { - StringBuilder buildXMLRepresention(); + /** + * Builds a xml representation of this object + * + * @return the xml representation + */ + StringBuilder buildXMLRepresention(); + + /** + * Builds a short xml representation of this object + * containing name, and primary key. + * + * @return the xml representation + */ StringBuilder buildShortXMLRepresentation(); } From lokahi-commits-returnmichaelchan@example.org Fri Jun 09 14:34:42 2006 Return-Path: <lokahi-commits-returnmichaelchan@example.org> Delivered-To: michaelchan@example.org Received: (qmail 25218 invoked from network); 9 Jun 2006 14:34:42 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 9 Jun 2006 14:34:42 -0000 Received: (qmail 97298 invoked by uid 500); 9 Jun 2006 14:34:42 -0000 Delivered-To: michaelchan@example.org Received: (qmail 97269 invoked by uid 500); 9 Jun 2006 14:34:41 -0000 Mailing-List: contact michaelchan@example.org; run by ezmlm Precedence: bulk List-Help: <mailto:michaelchan@example.org> List-Unsubscribe: <mailto:michaelchan@example.org> List-Post: <mailto:michaelchan@example.org> List-Id: <lokahi-commits.incubator.apache.org> Reply-To: michaelchan@example.org Delivered-To: mailing list michaelchan@example.org Received: (qmail 97260 invoked by uid 99); 9 Jun 2006 14:34:41 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 09 Jun 2006 07:34:41 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: local policy) Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 09 Jun 2006 07:34:40 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id B06781A983A; Fri, 9 Jun 2006 07:34:20 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r413056 - in /incubator/lokahi/lokahi/trunk: conf/lokahi.properties conf/tmc.properties docs/README.TXT Date: Fri, 09 Jun 2006 14:34:20 -0000 To: michaelchan@example.org From: michaelchan@example.org X-Mailer: svnmailer-1.0.8 Message-Id: <michaelchan@example.org> X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: toback Date: Fri Jun 9 07:34:19 2006 New Revision: 413056 URL: http://svn.apache.org/viewvc?rev=413056&view=rev Log: moved tmc.properties -> lokahi.properties and updated the install instructions to match the README.TXT Added: incubator/lokahi/lokahi/trunk/conf/lokahi.properties Removed: incubator/lokahi/lokahi/trunk/conf/tmc.properties Modified: incubator/lokahi/lokahi/trunk/docs/README.TXT Added: incubator/lokahi/lokahi/trunk/conf/lokahi.properties URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/conf/lokahi.properties?rev=413056&view=auto ============================================================================== --- incubator/lokahi/lokahi/trunk/conf/lokahi.properties (added) +++ incubator/lokahi/lokahi/trunk/conf/lokahi.properties Fri Jun 9 07:34:19 2006 @@ -0,0 +1,57 @@ +#context name +application.root=/tmc +#full site app is being hosted at +application.full.url=http://tmcg2.sourceforge.net/tmc/ +#full site for controller access +AGENT_REPLY_TO_ADDRESS=https://tmcg2.sourceforge.net/tmc/services/TmcJob +#full url for the rest servlet +rest.servlet.url=http://tmcg2.sourceforge.net/tmc/rest/ +#authentication Module to use +AuthenticateModule=tmc.authentication.NoAuthentication +#database info +tmc.database.uri=jdbc:oracle:thin:@some.server.net:PORT:SCHEMA +tmc.database.user=tmc +tmc.database.password=tmc +tmc.database.driver=oracle.jdbc.driver.OracleDriver +#instance for this controller +tmc.instance.name=WHS Intranet +#location of properties files - should just be the context root on the filesystem. the install directory +prop.location=/websites/tmcg2.sourceforge.net/java/tmc + + + +AGENT_METHOD_TO_CALL_BACK=receiveResponse +AGENT_REPLY_WEB_SERVICE_NAME=TmcJob +AGENT_PROTOCOL=https:// +AGENT_PORT=5665 +AGENT_ENDPOINT=/mod_soap + +tmc.thread.run=true +tmc.thread.protocol=http +tmc.thread.statuspage=services/TmcController +tmc.thread.contentmatch=STATUS OK +tmc.thread.waittime=10 + + +agent.delim.message=^ +agent.delim.options=: +agent.reply.message=Thanks! New Job added. + +PrimaryDataSource=Database +ConsoleContextName=tmc +SchemaOwner=tmc +DatabasePropertiesFile=dbpool.props +LogActivity=yes +ApacheConfFile=httpsd.conf +WorkersProperties=workers.properties +TimeoutForURLThread=5 +TimeoutForContextOp=20 +SleepTimeForMainThread=60 +SleepTimeForChildThread=60 + +wap.function.HostingPool=RestartTomcat,StartTomcat,StopTomcat,DeployTomcatConfig,DeployApacheConfig,ConfigtestApache,GracefulApache, +StopApache,StartApache +wap.function.ApachePool=DeployApacheConfig,ConfigtestApache,GracefulApache,StopApache,StartApache +wap.function.TomcatPool=RestartTomcat,StartTomcat,StopTomcat,DeployTomcatConfig +wap.function.ApacheWorker=DeployApacheConfig,ConfigtestApache,GracefulApache,StopApache,StartApache +wap.function.TomcatWorker=RestartTomcat,StartTomcat,StopTomcat,DeployTomcatConfig \ No newline at 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=413056&r1=413055&r2=413056&view=diff ============================================================================== --- incubator/lokahi/lokahi/trunk/docs/README.TXT (original) +++ incubator/lokahi/lokahi/trunk/docs/README.TXT Fri Jun 9 07:34:19 2006 @@ -25,7 +25,7 @@ Console install: 1. in build/gui/WEB-INF/log4j.xml set this line to a valid path: <param name="File" value="/www/httpd/logs/websites/tmc_log4j.log"/> 2. in build/gui/WEB-INF/classes/tmc/ApplicationResources.properties: application.root should be set to the context path, and rss.link.location should be set to <website>/<context>/rss/alert -3. in build/gui/WEB-INF/classes/tmc.properties set these: +3. in build/gui/WEB-INF/classes/lokahi.properties set these: #context name application.root=/tmc From lokahi-commits-returnmichaelchan@example.org Fri Jun 09 15:51:08 2006 Return-Path: <lokahi-commits-returnmichaelchan@example.org> Delivered-To: michaelchan@example.org Received: (qmail 53724 invoked from network); 9 Jun 2006 15:51:07 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 9 Jun 2006 15:51:07 -0000 Received: (qmail 48252 invoked by uid 500); 9 Jun 2006 15:51:07 -0000 Delivered-To: michaelchan@example.org Received: (qmail 48223 invoked by uid 500); 9 Jun 2006 15:51:07 -0000 Mailing-List: contact michaelchan@example.org; run by ezmlm Precedence: bulk List-Help: <mailto:michaelchan@example.org> List-Unsubscribe: <mailto:michaelchan@example.org> List-Post: <mailto:michaelchan@example.org> List-Id: <lokahi-commits.incubator.apache.org> Reply-To: michaelchan@example.org Delivered-To: mailing list michaelchan@example.org Received: (qmail 48213 invoked by uid 99); 9 Jun 2006 15:51:07 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 09 Jun 2006 08:51:07 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: local policy) Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 09 Jun 2006 08:51:06 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 2E79D1A983A; Fri, 9 Jun 2006 08:50:46 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r413077 - /incubator/lokahi/lokahi/trunk/conf/web.xml Date: Fri, 09 Jun 2006 15:50:45 -0000 To: michaelchan@example.org From: michaelchan@example.org X-Mailer: svnmailer-1.0.8 Message-Id: <michaelchan@example.org> X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: toback Date: Fri Jun 9 08:50:45 2006 New Revision: 413077 URL: http://svn.apache.org/viewvc?rev=413077&view=rev Log: moved to org.apache namespace for startup servlet... Modified: incubator/lokahi/lokahi/trunk/conf/web.xml Modified: incubator/lokahi/lokahi/trunk/conf/web.xml URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/conf/web.xml?rev=413077&r1=413076&r2=413077&view=diff ============================================================================== --- incubator/lokahi/lokahi/trunk/conf/web.xml (original) +++ incubator/lokahi/lokahi/trunk/conf/web.xml Fri Jun 9 08:50:45 2006 @@ -7,7 +7,7 @@ <web-app> <servlet> <servlet-name>TMCStartupServlet</servlet-name> - <servlet-class>lokahi.core.gui.www.TMCStartupServlet</servlet-class> + <servlet-class>org.apache.lokahi.core.gui.www.TMCStartupServlet</servlet-class> <init-param> <param-name>log4j-init-file</param-name> @@ -45,7 +45,7 @@ <servlet> <servlet-name>velocity</servlet-name> - <servlet-class>lokahi.core.gui.www.TMCVelocityServlet</servlet-class> + <servlet-class>org.apache.lokahi.core.gui.www.TMCVelocityServlet</servlet-class> <init-param> <param-name>org.apache.velocity.toolbox</param-name> <param-value>/WEB-INF/toolbox.xml</param-value> @@ -77,13 +77,13 @@ <servlet> <servlet-name>TMCRSSAlertFeed</servlet-name> <display-name>TMC Alert RSS Feed</display-name> - <servlet-class>lokahi.core.gui.www.TMCRSSAlertServlet</servlet-class> + <servlet-class>org.apache.lokahi.core.gui.www.TMCRSSAlertServlet</servlet-class> </servlet> <servlet> <servlet-name>TMCRest</servlet-name> <display-name>TMC Rest</display-name> - <servlet-class>lokahi.core.gui.www.RestServlet</servlet-class> + <servlet-class>org.apache.lokahi.core.gui.www.RestServlet</servlet-class> </servlet> <servlet-mapping> From lokahi-commits-returnmichaelchan@example.org Fri Jun 09 17:40:09 2006 Return-Path: <lokahi-commits-returnmichaelchan@example.org> Delivered-To: michaelchan@example.org Received: (qmail 89636 invoked from network); 9 Jun 2006 17:40:09 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 9 Jun 2006 17:40:09 -0000 Received: (qmail 55721 invoked by uid 500); 9 Jun 2006 17:40:09 -0000 Delivered-To: michaelchan@example.org Received: (qmail 55691 invoked by uid 500); 9 Jun 2006 17:40:09 -0000 Mailing-List: contact michaelchan@example.org; run by ezmlm Precedence: bulk List-Help: <mailto:michaelchan@example.org> List-Unsubscribe: <mailto:michaelchan@example.org> List-Post: <mailto:michaelchan@example.org> List-Id: <lokahi-commits.incubator.apache.org> Reply-To: michaelchan@example.org Delivered-To: mailing list michaelchan@example.org Received: (qmail 55682 invoked by uid 99); 9 Jun 2006 17:40:09 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 09 Jun 2006 10:40:09 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: local policy) Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 09 Jun 2006 10:40:07 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id D19DD1A983A; Fri, 9 Jun 2006 10:39:47 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r413105 - in /incubator/lokahi/lokahi/trunk: build.xml conf/agent.log4j.xml conf/agent.wsdd docs/README.TXT Date: Fri, 09 Jun 2006 17:39:46 -0000 To: michaelchan@example.org From: michaelchan@example.org X-Mailer: svnmailer-1.0.8 Message-Id: <michaelchan@example.org> X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: toback Date: Fri Jun 9 10:39:46 2006 New Revision: 413105 URL: http://svn.apache.org/viewvc?rev=413105&view=rev Log: added log4j, axis config for agent, and added those files the build.xml. README.TXT tmc -> lokahi changes. Added: incubator/lokahi/lokahi/trunk/conf/agent.log4j.xml incubator/lokahi/lokahi/trunk/conf/agent.wsdd Modified: incubator/lokahi/lokahi/trunk/build.xml incubator/lokahi/lokahi/trunk/docs/README.TXT Modified: incubator/lokahi/lokahi/trunk/build.xml URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/build.xml?rev=413105&r1=413104&r2=413105&view=diff ============================================================================== --- incubator/lokahi/lokahi/trunk/build.xml (original) +++ incubator/lokahi/lokahi/trunk/build.xml Fri Jun 9 10:39:46 2006 @@ -1,4 +1,4 @@ -<project name="tmc" default="install"> +<project name="lokahi" default="install"> <target name="install" depends="init,jar,copy-www,copy-db,build-agent,copy-docs,post-process"/> @@ -33,7 +33,7 @@ <fileset dir="${app.conf}"> <exclude name="dbpool.props"/> <exclude name="ApplicationResources.properties"/> - <exclude name="tmc.properties"/> + <exclude name="lokahi.properties"/> <exclude name="db.properties"/> <exclude name="state.xml"/> <exclude name="function.xml"/> @@ -48,13 +48,13 @@ <copy todir="${app.build.web-inf.classes}"> <fileset dir="${app.conf}"> <include name="dbpool.props"/> - <include name="tmc.properties"/> + <include name="lokahi.properties"/> <include name="db.properties"/> <include name="state.xml"/> <include name="function.xml"/> </fileset> </copy> - <copy todir="${app.build.web-inf.classes}/tmc"> + <copy todir="${app.build.web-inf.classes}/lokahi"> <fileset dir="${app.conf}" > <include name="ApplicationResources.properties"/> </fileset> @@ -76,6 +76,11 @@ </fileset> <fileset dir="${app.conf}" > <include name="agent.properties"/> + </fileset> + <fileset dir="${app.conf}"> + <include name="agent.wsdd"/> + <include name="agentlog4j.xml"/> + <include name="log4j.dtd" /> </fileset> </copy> </target> Added: incubator/lokahi/lokahi/trunk/conf/agent.log4j.xml URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/conf/agent.log4j.xml?rev=413105&view=auto ============================================================================== --- incubator/lokahi/lokahi/trunk/conf/agent.log4j.xml (added) +++ incubator/lokahi/lokahi/trunk/conf/agent.log4j.xml Fri Jun 9 10:39:46 2006 @@ -0,0 +1,42 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd"> +<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/"> + +<!-- <appender name="console" class="org.apache.log4j.ConsoleAppender">--> +<!-- <param name="Target" value="System.Out"/>--> +<!-- <layout class="org.apache.log4j.PatternLayout">--> +<!-- <param name="ConversionPattern" value="[%d{MM/dd/yyyy HH:mm:ss.SSS}] [%-5p] [%F:%L] [%888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4%M] %m%n"/>--> +<!-- </layout>--> +<!-- </appender>--> + + <appender name="file" class="org.apache.log4j.RollingFileAppender"> + <param name="File" value="/www/httpd/logs/websites/tmc_agent_log4j.log"/> + <param name="MaxFileSize" value="500000KB"/> + <param name="MaxBackupIndex" value="5"/> + <param name="Append" value="true"/> + <layout class="org.apache.log4j.PatternLayout"> + <param name="ConversionPattern" value="[%d{MM/dd/yyyy HH:mm:ss.SSS}] [%-5p] [%F:%L] [%888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4%M] %m%n"/> + </layout> + </appender> + + <category name="org.apache.lokahi"> + <priority value="DEBUG"/> + </category> + <category name="org.apache"> + <priority value="ERROR"/> + </category> + <category name="org.apache.lokahi.core.api.function.Function"> + <priority value="INFO"/> + </category> + <category name="org.apache.lokahi.dao.TMCCollectionImpl"> + <priority value="INFO"/> + </category> + + + <root> + <priority value="DEBUG"/> +<!-- <appender-ref ref="console"/>--> + <appender-ref ref="file"/> + </root> + +</log4j:configuration> Added: incubator/lokahi/lokahi/trunk/conf/agent.wsdd URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/conf/agent.wsdd?rev=413105&view=auto ============================================================================== --- incubator/lokahi/lokahi/trunk/conf/agent.wsdd (added) +++ incubator/lokahi/lokahi/trunk/conf/agent.wsdd Fri Jun 9 10:39:46 2006 @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<deployment xmlns="http://xml.apache.org/axis/wsdd/" + xmlns:java="http://xml.apache.org/axis/wsdd/providers/java"> + <service name="JobHandler" provider="java:RPC"> + <parameter name="className" value="org.apache.lokahi.core.agent.JobSOAP"/> + <parameter name="allowedMethods" value="scheduleJob"/> + </service> +</deployment> \ No newline at 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=413105&r1=413104&r2=413105&view=diff ============================================================================== --- incubator/lokahi/lokahi/trunk/docs/README.TXT (original) +++ incubator/lokahi/lokahi/trunk/docs/README.TXT Fri Jun 9 10:39:46 2006 @@ -20,7 +20,7 @@ Agent install: 1. copy the files in ./build/agent to a directory on each server. -2. start the agent buy running: $JAVA_HOME/bin/java classpath $JAVA_HOME/lib/tools.jar:$AGENT_HOME/tmc.jar:$AGENT_HOME/log4j-1.2.8.jar tmc.agent.TMCAgent start +2. start the agent buy running: $JAVA_HOME/bin/java classpath $JAVA_HOME/lib/tools.jar:$AGENT_HOME/lokahi.jar:$AGENT_HOME/log4j-1.2.8.jar org.apache.lokahi.core.agent.TMCAgent start Console install: 1. in build/gui/WEB-INF/log4j.xml set this line to a valid path: <param name="File" value="/www/httpd/logs/websites/tmc_log4j.log"/> From lokahi-commits-returnmichaelchan@example.org Fri Jun 09 20:37:01 2006 Return-Path: <lokahi-commits-returnmichaelchan@example.org> Delivered-To: michaelchan@example.org Received: (qmail 53597 invoked from network); 9 Jun 2006 20:37:01 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 9 Jun 2006 20:37:01 -0000 Received: (qmail 50922 invoked by uid 500); 9 Jun 2006 20:37:01 -0000 Delivered-To: michaelchan@example.org Received: (qmail 50901 invoked by uid 500); 9 Jun 2006 20:37:00 -0000 Mailing-List: contact michaelchan@example.org; run by ezmlm Precedence: bulk List-Help: <mailto:michaelchan@example.org> List-Unsubscribe: <mailto:michaelchan@example.org> List-Post: <mailto:michaelchan@example.org> List-Id: <lokahi-commits.incubator.apache.org> Reply-To: michaelchan@example.org Delivered-To: mailing list michaelchan@example.org Received: (qmail 50892 invoked by uid 99); 9 Jun 2006 20:37:00 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 09 Jun 2006 13:37:00 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: local policy) Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 09 Jun 2006 13:36:59 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 90ADB1A983A; Fri, 9 Jun 2006 13:36:39 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r413153 - in /incubator/lokahi/lokahi/trunk: build.xml conf/lokahi.properties conf/struts-config.xml conf/toolbox.xml docs/README.TXT src/java/org/apache/lokahi/core/agent/TMCAgent.java Date: Fri, 09 Jun 2006 20:36:37 -0000 To: michaelchan@example.org From: michaelchan@example.org X-Mailer: svnmailer-1.0.8 Message-Id: <michaelchan@example.org> X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: toback Date: Fri Jun 9 13:36:36 2006 New Revision: 413153 URL: http://svn.apache.org/viewvc?rev=413153&view=rev Log: removed some of the tmc refs. added a line to TMCAgent.java so the server starts listening. Modified: incubator/lokahi/lokahi/trunk/build.xml incubator/lokahi/lokahi/trunk/conf/lokahi.properties incubator/lokahi/lokahi/trunk/conf/struts-config.xml incubator/lokahi/lokahi/trunk/conf/toolbox.xml incubator/lokahi/lokahi/trunk/docs/README.TXT incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/agent/TMCAgent.java Modified: incubator/lokahi/lokahi/trunk/build.xml URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/build.xml?rev=413153&r1=413152&r2=413153&view=diff ============================================================================== --- incubator/lokahi/lokahi/trunk/build.xml (original) +++ incubator/lokahi/lokahi/trunk/build.xml Fri Jun 9 13:36:36 2006 @@ -73,6 +73,8 @@ </fileset> <fileset dir="${app.lib}"> <include name="log4j*.jar"/> + <include name="axis.jar"/> + <include name="commons-logging.jar"/> </fileset> <fileset dir="${app.conf}" > <include name="agent.properties"/> Modified: incubator/lokahi/lokahi/trunk/conf/lokahi.properties URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/conf/lokahi.properties?rev=413153&r1=413152&r2=413153&view=diff ============================================================================== --- incubator/lokahi/lokahi/trunk/conf/lokahi.properties (original) +++ incubator/lokahi/lokahi/trunk/conf/lokahi.properties Fri Jun 9 13:36:36 2006 @@ -7,7 +7,7 @@ #full url for the rest servlet rest.servlet.url=http://tmcg2.sourceforge.net/tmc/rest/ #authentication Module to use -AuthenticateModule=tmc.authentication.NoAuthentication +AuthenticateModule=org.apache.lokahi.core.common.authentication.NoAuthentication #database info tmc.database.uri=jdbc:oracle:thin:@some.server.net:PORT:SCHEMA tmc.database.user=tmc Modified: incubator/lokahi/lokahi/trunk/conf/struts-config.xml URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/conf/struts-config.xml?rev=413153&r1=413152&r2=413153&view=diff ============================================================================== --- incubator/lokahi/lokahi/trunk/conf/struts-config.xml (original) +++ incubator/lokahi/lokahi/trunk/conf/struts-config.xml Fri Jun 9 13:36:36 2006 @@ -359,7 +359,7 @@ http://jakarta.apache.org/struts/userGuide/building_controller.html#action_mapping_wildcards --> <action path="/administration/*Action" - type="lokahi.actions.{1}Action" + type="org.apache.lokahi.actions.{1}Action" name="{1}Form" scope="request" validate="true" @@ -367,7 +367,7 @@ </action> <action path="/User/*Action" - type="lokahi.core.gui.www.UserAction" + type="org.apache.lokahi.core.gui.www.UserAction" name="{1}Form" scope="request" validate="true" @@ -375,7 +375,7 @@ </action> <action path="/help/HelpItemAction" - type="lokahi.core.gui.help.HelpItemAction" + type="org.apache.lokahi.core.gui.help.HelpItemAction" name="HelpItemForm" scope="request" validate="true" @@ -383,7 +383,7 @@ </action> <action path="/*/SubmitJobAction" - type="lokahi.actions.{1}Action" +
{'source': 'Apache Software Foundation Public Mail Archives'}