From lokahi-commits-return-268-apmail-incubator-lokahi-commits-archive=incubator.apache.org@incubator.apache.org Thu Feb 21 18:45:11 2008 Return-Path: Delivered-To: apmail-incubator-lokahi-commits-archive@locus.apache.org Received: (qmail 79849 invoked from network); 21 Feb 2008 18:45:11 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 21 Feb 2008 18:45:11 -0000 Received: (qmail 58323 invoked by uid 500); 21 Feb 2008 18:45:06 -0000 Delivered-To: apmail-incubator-lokahi-commits-archive@incubator.apache.org Received: (qmail 58306 invoked by uid 500); 21 Feb 2008 18:45:06 -0000 Mailing-List: contact lokahi-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: lokahi-dev@incubator.apache.org Delivered-To: mailing list lokahi-commits@incubator.apache.org Received: (qmail 58297 invoked by uid 99); 21 Feb 2008 18:45:06 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 21 Feb 2008 10:45:06 -0800 X-ASF-Spam-Status: No, hits=-1998.0 required=10.0 tests=ALL_TRUSTED,URIBL_BLACK X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 21 Feb 2008 18:44:15 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id D554E1A9832; Thu, 21 Feb 2008 10:44:31 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r629916 [1/3] - in /incubator/lokahi/lokahi/trunk: conf/ database/mysql/ database/oracle/ src/java/org/apache/lokahi/core/api/server/ src/java/org/apache/lokahi/core/api/template/ src/java/org/apache/lokahi/core/common/interfaces/ src/java/... Date: Thu, 21 Feb 2008 18:44:09 -0000 To: lokahi-commits@incubator.apache.org From: toback@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080221184431.D554E1A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: toback Date: Thu Feb 21 10:43:55 2008 New Revision: 629916 URL: http://svn.apache.org/viewvc?rev=629916&view=rev Log: Added Templating engine code supplied by Jeff Feist in reference to https://issues.apache.org/jira/browse/LOKAHI-4 Added: incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/api/template/ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/api/template/Template.java (with props) incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/api/template/TemplateModel.java (with props) incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/interfaces/TemplateEngine.java (with props) incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/interfaces/Worker.java (with props) incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/templating/ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/templating/TemplateBuilder.java (with props) incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/templating/TemplateDeployer.java (with props) incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/templating/TemplateFactory.java (with props) incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/templating/VelocityTemplateBuilder.java (with props) incubator/lokahi/lokahi/trunk/src/www/Core/Template/ incubator/lokahi/lokahi/trunk/src/www/Core/Template/add.vm (with props) incubator/lokahi/lokahi/trunk/src/www/Core/Template/confirm.vm (with props) incubator/lokahi/lokahi/trunk/src/www/Core/Template/copy.vm (with props) incubator/lokahi/lokahi/trunk/src/www/Core/Template/delete.vm (with props) incubator/lokahi/lokahi/trunk/src/www/Core/Template/details.vm (with props) incubator/lokahi/lokahi/trunk/src/www/Core/Template/list.vm (with props) incubator/lokahi/lokahi/trunk/src/www/Core/Template/menu/ incubator/lokahi/lokahi/trunk/src/www/Core/Template/menu/global.vm (with props) incubator/lokahi/lokahi/trunk/src/www/Core/Template/menu/indiv.vm (with props) incubator/lokahi/lokahi/trunk/src/www/Core/Template/update.vm (with props) Removed: incubator/lokahi/lokahi/trunk/src/www/Core/File/ Modified: incubator/lokahi/lokahi/trunk/conf/ApplicationResources.properties 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/database/mysql/procs.sql incubator/lokahi/lokahi/trunk/database/mysql/tables.sql incubator/lokahi/lokahi/trunk/database/mysql/views.sql incubator/lokahi/lokahi/trunk/database/oracle/procs.sql incubator/lokahi/lokahi/trunk/database/oracle/tables.sql incubator/lokahi/lokahi/trunk/database/oracle/views.sql incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/api/server/HardwareModel.java incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/interfaces/Application.java incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/interfaces/LokahiModel.java incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/util/TMCVelocityViewTool.java incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/controller/task/BuildDeployApacheConfig.java incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/gui/www/FileAction.java incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/gui/www/TMCStartupServlet.java incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/httpd/api/server/Apache.java incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/httpd/api/worker/ApacheWorker.java incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/httpd/api/worker/ApacheWorkerModel.java incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/httpd/gui/www/ApacheAction.java incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/tomcat/api/server/Tomcat.java incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/tomcat/api/worker/TomcatWorker.java incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/tomcat/api/worker/TomcatWorkerModel.java incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/tomcat/gui/www/TomcatAction.java incubator/lokahi/lokahi/trunk/src/www/Apache/Pool/menu/global.vm incubator/lokahi/lokahi/trunk/src/www/Apache/Pool/menu/indiv.vm incubator/lokahi/lokahi/trunk/src/www/Apache/Server/add.vm incubator/lokahi/lokahi/trunk/src/www/Apache/Server/details.vm incubator/lokahi/lokahi/trunk/src/www/Apache/Server/update.vm incubator/lokahi/lokahi/trunk/src/www/Apache/Worker/add.vm incubator/lokahi/lokahi/trunk/src/www/Apache/Worker/menu/global.vm incubator/lokahi/lokahi/trunk/src/www/Apache/Worker/menu/indiv.vm incubator/lokahi/lokahi/trunk/src/www/Apache/Worker/viewconf.vm incubator/lokahi/lokahi/trunk/src/www/Core/Entity/index.vm incubator/lokahi/lokahi/trunk/src/www/Core/Project/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/Server/add.vm incubator/lokahi/lokahi/trunk/src/www/Tomcat/Server/details.vm incubator/lokahi/lokahi/trunk/src/www/Tomcat/Server/update.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/viewconf.vm incubator/lokahi/lokahi/trunk/src/www/js/common.js incubator/lokahi/lokahi/trunk/src/www/layout/list2.vm incubator/lokahi/lokahi/trunk/src/www/layout/style.vmcss Modified: incubator/lokahi/lokahi/trunk/conf/ApplicationResources.properties URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/conf/ApplicationResources.properties?rev=629916&r1=629915&r2=629916&view=diff ============================================================================== --- incubator/lokahi/lokahi/trunk/conf/ApplicationResources.properties (original) +++ incubator/lokahi/lokahi/trunk/conf/ApplicationResources.properties Thu Feb 21 10:43:55 2008 @@ -69,7 +69,7 @@ function.success.AddApacheWorker=The Apache Worker was added. function.success.AddContext=The Context was added. function.success.AddEnvironment=The Environment was added. -function.success.AddFile=The File was added. +function.success.AddFile=The Template was added. function.success.AddFunction=The Function was added. function.success.AddHardware=The Hardware was added. function.success.AddHelpItem=The Help Topic was added. @@ -94,7 +94,7 @@ function.success.DeleteApacheWorker=The apache worker has been deleted. function.success.DeleteContext=The context has been deleted. function.success.DeleteEnvironment=The environment has been deleted. -function.success.DeleteFile=The file has been deleted. +function.success.DeleteFile=The template has been deleted. function.success.DeleteFunction=The function has been deleted. function.success.DeleteHardware=The hardware has been deleted. Why would you want to do that to me? function.success.DeleteHelpItem=The Help Topic has been deleted. @@ -138,7 +138,7 @@ function.success.UpdateApacheWorker=The apache worker has been updated. function.success.UpdateContext=The context has been updated. function.success.UpdateEnvironment=The environment has been updated. -function.success.UpdateFile=The file has been updated. +function.success.UpdateFile=The template has been updated. function.success.UpdateFunction=The function has been updated. function.success.UpdateHardware=The hadware has been updated. function.success.UpdateHelpItem=The help topic has been updated. @@ -160,4 +160,4 @@ error.invalidFunction=The function {0} has not been found. name.notAllowed=That name is not allowed. -login.error.notInDatabase=Login failed please try again. \ No newline at end of file +login.error.notInDatabase=Login failed please try again. Modified: incubator/lokahi/lokahi/trunk/conf/lokahi.properties URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/conf/lokahi.properties?rev=629916&r1=629915&r2=629916&view=diff ============================================================================== --- incubator/lokahi/lokahi/trunk/conf/lokahi.properties (original) +++ incubator/lokahi/lokahi/trunk/conf/lokahi.properties Thu Feb 21 10:43:55 2008 @@ -58,3 +58,15 @@ lokahi.broker.autocommit=true lokahi.broker.type=mysql +# Config Templating support +lokahi.template.engine=org.apache.lokahi.core.common.templating.VelocityTemplateBuilder +# variables are a comma separated list explaining the substitutions (use \ for a new line) +lokahi.template.variables=server root=$worker.getApplication().getServerRoot(),\ +test=$worker.getApplication().getTest(),\ +newline=$n,\ +hosting pool tool=$hpTool,\ +virtualhost tool=$vhTool,\ +velocity view tool=$view + + + Modified: incubator/lokahi/lokahi/trunk/conf/struts-config.xml URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/conf/struts-config.xml?rev=629916&r1=629915&r2=629916&view=diff ============================================================================== --- incubator/lokahi/lokahi/trunk/conf/struts-config.xml (original) +++ incubator/lokahi/lokahi/trunk/conf/struts-config.xml Thu Feb 21 10:43:55 2008 @@ -181,12 +181,13 @@ + - + Modified: incubator/lokahi/lokahi/trunk/conf/toolbox.xml URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/conf/toolbox.xml?rev=629916&r1=629915&r2=629916&view=diff ============================================================================== --- incubator/lokahi/lokahi/trunk/conf/toolbox.xml (original) +++ incubator/lokahi/lokahi/trunk/conf/toolbox.xml Thu Feb 21 10:43:55 2008 @@ -79,4 +79,19 @@ request org.apache.lokahi.core.common.util.TMCVelocityViewTool + + hpTool + request + org.apache.lokahi.core.api.pool.HostingPool + + + vhTool + request + org.apache.lokahi.httpd.api.entity.VirtualHost + + + contextTool + request + org.apache.lokahi.tomcat.api.entity.TomcatContext + Modified: incubator/lokahi/lokahi/trunk/database/mysql/procs.sql URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/database/mysql/procs.sql?rev=629916&r1=629915&r2=629916&view=diff ============================================================================== --- incubator/lokahi/lokahi/trunk/database/mysql/procs.sql (original) +++ incubator/lokahi/lokahi/trunk/database/mysql/procs.sql Thu Feb 21 10:43:55 2008 @@ -382,7 +382,7 @@ IN V_PIDFILE VARCHAR(300), IN V_SROOT VARCHAR(300), IN V_LOGLOC VARCHAR(300), - IN V_MAINID INT + IN V_MAINID VARCHAR(300) ) BEGIN INSERT INTO AM_CONTAINER (CONTAINER_NAME, SYS_USER, SYS_GROUP, START_COMMAND, STOP_COMMAND, RESTART_COMMAND, FORK_WAIT, ENV_VARIBLES, PIDFILE_LOCATION, SERVER_ROOT, LOG_LOCATION, MAIN_ID) @@ -406,7 +406,7 @@ IN V_PIDFILE VARCHAR(300), IN V_SROOT VARCHAR(300), IN V_LOGLOC VARCHAR(300), - IN V_MAINID INT + IN V_MAINID VARCHAR(300) ) BEGIN @@ -1911,7 +1911,8 @@ IN V_JAVAHOME VARCHAR(40), IN V_STARTCLASS VARCHAR(40), IN V_OUTLOG VARCHAR(40), - IN V_ENTRY BLOB + IN V_ENTRY BLOB, + IN V_TEMPLATE_IDS VARCHAR(300) ) BEGIN @@ -1928,7 +1929,8 @@ JAVA_HOME=V_JAVAHOME, START_CLASS=V_STARTCLASS, STD_OUT_LOG=V_STDOUTLOG, - CONF_ENTRY=V_ENTRY + CONF_ENTRY=V_ENTRY, + TEMPLATE_IDS=V_TEMPLATE_IDS WHERE CONTAINER_ID=V_ID; END; @@ -1981,11 +1983,12 @@ IN V_JAVAHOME VARCHAR(300), IN V_STARTCLASS VARCHAR(40), IN V_OUTLOG VARCHAR(300), - IN V_ENTRY BLOB + IN V_ENTRY BLOB, + IN V_TEMPLATE_IDS VARCHAR(300) ) BEGIN - INSERT INTO TM_CONTAINER (CONTAINER_NAME, BASE_LOCATION, TOMCAT_HOME, HTTP_PORT, SYS_USER, SYS_GROUP, TOMCAT_TYPE, DESCRIPTION,STD_OUT_LOG, START_CLASS, JAVA_HOME, CONF_ENTRY) - VALUES ( V_NAME, V_BASELOCATION, V_TOMCATHOME, V_HTTPPORT, V_SYSUSER, V_SYSGROUP, V_TT, V_DESCRIP, V_OUTLOG, V_STARTCLASS, V_JAVAHOME, V_ENTRY); + INSERT INTO TM_CONTAINER (CONTAINER_NAME, BASE_LOCATION, TOMCAT_HOME, HTTP_PORT, SYS_USER, SYS_GROUP, TOMCAT_TYPE, DESCRIPTION,STD_OUT_LOG, START_CLASS, JAVA_HOME, CONF_ENTRY, TEMPLATE_IDS) + VALUES ( V_NAME, V_BASELOCATION, V_TOMCATHOME, V_HTTPPORT, V_SYSUSER, V_SYSGROUP, V_TT, V_DESCRIP, V_OUTLOG, V_STARTCLASS, V_JAVAHOME, V_ENTRY, V_TEMPLATE_IDS); SELECT LAST_INSERT_ID() INTO V_ID; END; / Modified: incubator/lokahi/lokahi/trunk/database/mysql/tables.sql URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/database/mysql/tables.sql?rev=629916&r1=629915&r2=629916&view=diff ============================================================================== --- incubator/lokahi/lokahi/trunk/database/mysql/tables.sql (original) +++ incubator/lokahi/lokahi/trunk/database/mysql/tables.sql Thu Feb 21 10:43:55 2008 @@ -19,7 +19,7 @@ -- SQL99 DROP TABLE IF EXISTS AM_CONTAINER;/ -CREATE TABLE AM_CONTAINER (CONTAINER_ID INT(11) NOT NULL auto_increment, PRIMARY KEY (CONTAINER_ID),CONTAINER_NAME VARCHAR(100) NOT NULL,SERVER_ROOT VARCHAR(300) ,LOG_LOCATION VARCHAR(300) ,SYS_USER VARCHAR(8) ,SYS_GROUP VARCHAR(8) ,START_COMMAND VARCHAR(4000) ,STOP_COMMAND VARCHAR(4000) ,RESTART_COMMAND VARCHAR(4000) ,FORK_WAIT INT(11) ,PIDFILE_LOCATION VARCHAR(300) ,ENV_VARIBLES VARCHAR(4000) ,MAIN_ID INT(11) , KEY (MAIN_ID));/ +CREATE TABLE AM_CONTAINER (CONTAINER_ID INT(11) NOT NULL auto_increment, PRIMARY KEY (CONTAINER_ID),CONTAINER_NAME VARCHAR(100) NOT NULL,SERVER_ROOT VARCHAR(300) ,LOG_LOCATION VARCHAR(300) ,SYS_USER VARCHAR(8) ,SYS_GROUP VARCHAR(8) ,START_COMMAND VARCHAR(4000) ,STOP_COMMAND VARCHAR(4000) ,RESTART_COMMAND VARCHAR(4000) ,FORK_WAIT INT(11) ,PIDFILE_LOCATION VARCHAR(300) ,ENV_VARIBLES VARCHAR(4000) ,MAIN_ID VARCHAR(300) , KEY (MAIN_ID));/ DROP TABLE IF EXISTS AM_POOL;/ CREATE TABLE AM_POOL (POOL_ID INT(11) NOT NULL auto_increment, PRIMARY KEY (POOL_ID),POOL_NAME VARCHAR(40) NOT NULL,ENV_ID INT(11) NOT NULL, KEY (ENV_ID));/ @@ -186,7 +186,7 @@ DROP TABLE IF EXISTS TM_CONTAINER;/ -CREATE TABLE TM_CONTAINER (CONTAINER_ID INT(11) NOT NULL auto_increment, PRIMARY KEY (CONTAINER_ID),CONTAINER_NAME VARCHAR(40) ,BASE_LOCATION VARCHAR(100) ,TOMCAT_HOME VARCHAR(100) ,HTTP_PORT INT(11) ,SYS_USER VARCHAR(8) ,SYS_GROUP VARCHAR(8) ,CONF_ENTRY BLOB ,TOMCAT_TYPE INT(11) DEFAULT 4,DESCRIPTION VARCHAR(100) ,STD_OUT_LOG VARCHAR(300) ,START_CLASS VARCHAR(40) ,JAVA_HOME VARCHAR(300) );/ +CREATE TABLE TM_CONTAINER (CONTAINER_ID INT(11) NOT NULL auto_increment, PRIMARY KEY (CONTAINER_ID),CONTAINER_NAME VARCHAR(40) ,BASE_LOCATION VARCHAR(100) ,TOMCAT_HOME VARCHAR(100) ,HTTP_PORT INT(11) ,SYS_USER VARCHAR(8) ,SYS_GROUP VARCHAR(8) ,CONF_ENTRY BLOB ,TOMCAT_TYPE INT(11) DEFAULT 4,DESCRIPTION VARCHAR(100) ,STD_OUT_LOG VARCHAR(300) ,START_CLASS VARCHAR(40) ,JAVA_HOME VARCHAR(300),TEMPLATE_IDS VARCHAR(300) );/ DROP TABLE IF EXISTS TM_ENTITY;/ @@ -375,5 +375,6 @@ #ALTER TABLE TMC_REL_HELP_TOPIC ADD ( CONSTRAINT FK_REL_HELP_ITEM_ID FOREIGN KEY (HELP_ITEM_ID) REFERENCES TMC_HELP_ITEM (HELP_ITEM_ID) ON DELETE CASCADE, CONSTRAINT FK_SUBTOPIC_ID FOREIGN KEY (SUBTOPIC_ID) REFERENCES TMC_TOPIC (TOPIC_ID) ON DELETE CASCADE, CONSTRAINT FK_TOPIC_ID FOREIGN KEY (TOPIC_ID) REFERENCES TMC_TOPIC (TOPIC_ID) ON DELETE CASCADE);/ #ALTER TABLE TM_REL_ENTITY_PROJECT ADD ( CONSTRAINT ENTITY_ID_FK FOREIGN KEY (ENTITY_ID) REFERENCES TM_ENTITY (ENTITY_ID) ON DELETE CASCADE DISABLE, CONSTRAINT PROJECT_ID_FK FOREIGN KEY (PROJECT_ID) REFERENCES TMC_PROJECT (PROJECT_ID) ON DELETE CASCADE DISABLE);/ + Modified: incubator/lokahi/lokahi/trunk/database/mysql/views.sql URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/database/mysql/views.sql?rev=629916&r1=629915&r2=629916&view=diff ============================================================================== --- incubator/lokahi/lokahi/trunk/database/mysql/views.sql (original) +++ incubator/lokahi/lokahi/trunk/database/mysql/views.sql Thu Feb 21 10:43:55 2008 @@ -86,7 +86,7 @@ (WORKER_ID, CONTAINER_ID, STATE_ID, HARDWARE_ID, CONTAINER_NAME, BASE_LOCATION, TOMCAT_HOME, HTTP_PORT, SYS_USER, SYS_GROUP, TOMCAT_TYPE, DESCRIPTION, CONF_ENTRY, STD_OUT_LOG, JAVA_HOME, - START_CLASS, HARDWARE_NAME, PHYSICAL_LOCATION, COMMENTS, INSTANCE_ID, + START_CLASS, TEMPLATE_IDS, HARDWARE_NAME, PHYSICAL_LOCATION, COMMENTS, INSTANCE_ID, ENV_ID, STATUS_ID, DEFAULT_IP_ID) AS SELECT @@ -106,6 +106,7 @@ c.std_out_log, c.java_home, c.start_class, + c.template_ids, h.hardware_name, h.physical_location, h.comments, @@ -115,6 +116,7 @@ h.default_ip_id FROM ((TM_WORKER w join TM_Container c using (container_ID)) JOIN TMC_HARDWARE h using (HARDWARE_ID));/ + Modified: incubator/lokahi/lokahi/trunk/database/oracle/procs.sql URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/database/oracle/procs.sql?rev=629916&r1=629915&r2=629916&view=diff ============================================================================== --- incubator/lokahi/lokahi/trunk/database/oracle/procs.sql (original) +++ incubator/lokahi/lokahi/trunk/database/oracle/procs.sql Thu Feb 21 10:43:55 2008 @@ -235,7 +235,7 @@ v_pidFile IN VARCHAR2, v_sRoot IN VARCHAR2, v_logLoc IN VARCHAR2, - v_mainId IN NUMBER + v_mainId IN VARCHAR2 ) AS BEGIN @@ -390,7 +390,7 @@ v_pidFile IN VARCHAR2, v_sRoot IN VARCHAR2, v_logLoc IN VARCHAR2, - v_mainId IN NUMBER + v_mainId IN VARCHAR2 ) AS BEGIN @@ -1836,13 +1836,14 @@ v_javaHome IN VARCHAR2, v_startClass IN VARCHAR2, v_outLog IN VARCHAR2, - v_entry IN BLOB + v_entry IN BLOB, + v_template_ids IN VARCHAR2 ) AS BEGIN - INSERT INTO TM_CONTAINER tc (tc.CONTAINER_ID, tc.CONTAINER_NAME, tc.BASE_LOCATION, tc.TOMCAT_HOME, tc.HTTP_PORT, tc.SYS_USER, tc.SYS_GROUP, tc.TOMCAT_TYPE, tc.DESCRIPTION,tc.STD_OUT_LOG, tc.START_CLASS, tc.JAVA_HOME, tc.CONF_ENTRY) - VALUES ( tm_tomcat4_seq.NEXTVAL, v_name, v_baseLocation, v_tomcatHome, v_httpPort, v_sysUser, v_sysGroup, v_tt, v_descrip, v_outLog, v_startClass, v_javaHome, v_entry); + INSERT INTO TM_CONTAINER tc (tc.CONTAINER_ID, tc.CONTAINER_NAME, tc.BASE_LOCATION, tc.TOMCAT_HOME, tc.HTTP_PORT, tc.SYS_USER, tc.SYS_GROUP, tc.TOMCAT_TYPE, tc.DESCRIPTION,tc.STD_OUT_LOG, tc.START_CLASS, tc.JAVA_HOME, tc.CONF_ENTRY, tc.TEMPLATE_IDS) + VALUES ( tm_tomcat4_seq.NEXTVAL, v_name, v_baseLocation, v_tomcatHome, v_httpPort, v_sysUser, v_sysGroup, v_tt, v_descrip, v_outLog, v_startClass, v_javaHome, v_entry, v_template_ids); -- get the newly added id v_id:=f_last_sequence_number('tm_tomcat4_seq'); END; @@ -1942,7 +1943,8 @@ v_javaHome IN VARCHAR2, v_startClass IN VARCHAR2, v_stdOutLog IN VARCHAR2, - v_entry IN BLOB + v_entry IN BLOB, + v_template_ids IN VARCHAR2 ) AS BEGIN @@ -1958,7 +1960,8 @@ tc.JAVA_HOME=v_javaHome, tc.START_CLASS=v_startClass, tc.STD_OUT_LOG=v_stdOutLog, - tc.conf_entry=v_entry + tc.conf_entry=v_entry, + tc.TEMPLATE_IDS=v_template_ids WHERE tc.CONTAINER_ID=v_id; END; Modified: incubator/lokahi/lokahi/trunk/database/oracle/tables.sql URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/database/oracle/tables.sql?rev=629916&r1=629915&r2=629916&view=diff ============================================================================== --- incubator/lokahi/lokahi/trunk/database/oracle/tables.sql (original) +++ incubator/lokahi/lokahi/trunk/database/oracle/tables.sql Thu Feb 21 10:43:55 2008 @@ -17,7 +17,7 @@ -- under the License. -- -CREATE TABLE AM_CONTAINER ( CONTAINER_ID NUMBER NOT NULL, CONTAINER_NAME VARCHAR2(100) NOT NULL, SERVER_ROOT VARCHAR2(300), LOG_LOCATION VARCHAR2(300), SYS_USER VARCHAR2(8), SYS_GROUP VARCHAR2(8), START_COMMAND VARCHAR2(4000), STOP_COMMAND VARCHAR2(4000), RESTART_COMMAND VARCHAR2(4000), FORK_WAIT NUMBER, PIDFILE_LOCATION VARCHAR2(300), ENV_VARIBLES VARCHAR2(4000), MAIN_ID NUMBER ) LOGGING NOCACHE NOPARALLEL; +CREATE TABLE AM_CONTAINER ( CONTAINER_ID NUMBER NOT NULL, CONTAINER_NAME VARCHAR2(100) NOT NULL, SERVER_ROOT VARCHAR2(300), LOG_LOCATION VARCHAR2(300), SYS_USER VARCHAR2(8), SYS_GROUP VARCHAR2(8), START_COMMAND VARCHAR2(4000), STOP_COMMAND VARCHAR2(4000), RESTART_COMMAND VARCHAR2(4000), FORK_WAIT NUMBER, PIDFILE_LOCATION VARCHAR2(300), ENV_VARIBLES VARCHAR2(4000), MAIN_ID VARCHAR2(300) ) LOGGING NOCACHE NOPARALLEL; CREATE TABLE AM_POOL ( POOL_ID NUMBER NOT NULL, POOL_NAME VARCHAR2(40) NOT NULL, ENV_ID NUMBER NOT NULL ) LOGGING NOCACHE NOPARALLEL; @@ -143,7 +143,7 @@ CREATE TABLE TMC_USER ( FIRST_NAME VARCHAR2(30), LAST_NAME VARCHAR2(30), JOB_TITLE VARCHAR2(100), COMMENTS VARCHAR2(2000), EMAIL VARCHAR2(60), USER_ID NUMBER NOT NULL, USER_NAME VARCHAR2(30) NOT NULL, STATE_ID NUMBER DEFAULT 8, PASSWORD VARCHAR2(32) ) LOGGING NOCACHE NOPARALLEL; -CREATE TABLE TM_CONTAINER ( CONTAINER_ID NUMBER NOT NULL, CONTAINER_NAME VARCHAR2(40), BASE_LOCATION VARCHAR2(100), TOMCAT_HOME VARCHAR2(100), HTTP_PORT NUMBER, SYS_USER VARCHAR2(8), SYS_GROUP VARCHAR2(8), CONF_ENTRY BLOB, TOMCAT_TYPE NUMBER DEFAULT 4, DESCRIPTION VARCHAR2(100), STD_OUT_LOG VARCHAR2(300), START_CLASS VARCHAR2(40), JAVA_HOME VARCHAR2(300) ) LOGGING NOCACHE NOPARALLEL; +CREATE TABLE TM_CONTAINER ( CONTAINER_ID NUMBER NOT NULL, CONTAINER_NAME VARCHAR2(40), BASE_LOCATION VARCHAR2(100), TOMCAT_HOME VARCHAR2(100), HTTP_PORT NUMBER, SYS_USER VARCHAR2(8), SYS_GROUP VARCHAR2(8), CONF_ENTRY BLOB, TOMCAT_TYPE NUMBER DEFAULT 4, DESCRIPTION VARCHAR2(100), STD_OUT_LOG VARCHAR2(300), START_CLASS VARCHAR2(40), JAVA_HOME VARCHAR2(300), TEMPLATE_IDS VARCHAR(300) ) LOGGING NOCACHE NOPARALLEL; CREATE TABLE TM_ENTITY ( ENTITY_ID NUMBER NOT NULL, ENTITY_NAME VARCHAR2(60) NOT NULL, DOC_BASE VARCHAR2(500) NOT NULL, ENTITY_STATE_ID NUMBER NOT NULL, ENV_ID NUMBER NOT NULL, TOMCAT_POOL_ID NUMBER, ENTITY_DEFIN VARCHAR2(4000), EX_PROJECT_ID NUMBER DEFAULT 0 ) LOGGING NOCACHE NOPARALLEL; @@ -326,5 +326,6 @@ ALTER TABLE TMC_REL_HELP_TOPIC ADD ( CONSTRAINT FK_REL_HELP_ITEM_ID FOREIGN KEY (HELP_ITEM_ID) REFERENCES TMC_HELP_ITEM (HELP_ITEM_ID) ON DELETE CASCADE, CONSTRAINT FK_SUBTOPIC_ID FOREIGN KEY (SUBTOPIC_ID) REFERENCES TMC_TOPIC (TOPIC_ID) ON DELETE CASCADE, CONSTRAINT FK_TOPIC_ID FOREIGN KEY (TOPIC_ID) REFERENCES TMC_TOPIC (TOPIC_ID) ON DELETE CASCADE); ALTER TABLE TM_REL_ENTITY_PROJECT ADD ( CONSTRAINT ENTITY_ID_FK FOREIGN KEY (ENTITY_ID) REFERENCES TM_ENTITY (ENTITY_ID) ON DELETE CASCADE DISABLE, CONSTRAINT PROJECT_ID_FK FOREIGN KEY (PROJECT_ID) REFERENCES TMC_PROJECT (PROJECT_ID) ON DELETE CASCADE DISABLE); + Modified: incubator/lokahi/lokahi/trunk/database/oracle/views.sql URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/database/oracle/views.sql?rev=629916&r1=629915&r2=629916&view=diff ============================================================================== --- incubator/lokahi/lokahi/trunk/database/oracle/views.sql (original) +++ incubator/lokahi/lokahi/trunk/database/oracle/views.sql Thu Feb 21 10:43:55 2008 @@ -86,7 +86,7 @@ (WORKER_ID, CONTAINER_ID, STATE_ID, HARDWARE_ID, CONTAINER_NAME, BASE_LOCATION, TOMCAT_HOME, HTTP_PORT, SYS_USER, SYS_GROUP, TOMCAT_TYPE, DESCRIPTION, CONF_ENTRY, STD_OUT_LOG, JAVA_HOME, - START_CLASS, HARDWARE_NAME, PHYSICAL_LOCATION, COMMENTS, INSTANCE_ID, + START_CLASS, TEMPLATE_IDS, HARDWARE_NAME, PHYSICAL_LOCATION, COMMENTS, INSTANCE_ID, ENV_ID, STATUS_ID, DEFAULT_IP_ID) AS SELECT @@ -106,6 +106,7 @@ c.std_out_log, c.java_home, c.start_class, + c.template_ids, h.hardware_name, h.physical_location, h.comments, @@ -115,5 +116,6 @@ h.default_ip_id FROM ((TM_WORKER w join TM_Container c using (container_ID)) JOIN TMC_HARDWARE h using (HARDWARE_ID)); + Modified: incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/api/server/HardwareModel.java URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/api/server/HardwareModel.java?rev=629916&r1=629915&r2=629916&view=diff ============================================================================== --- incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/api/server/HardwareModel.java (original) +++ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/api/server/HardwareModel.java Thu Feb 21 10:43:55 2008 @@ -100,44 +100,11 @@ JobPool.update(jp); } - public void deployJvmConf(User u, Collection c, JobPool jobPool) throws SQLException, IOException { - for (final Hardware h : c) { - this.deployJvmConf(u, h, jobPool); - } - } - - public void deployJvmConf(User u, Hardware h, JobPool jobPool) throws SQLException, IOException { - Function f = Function.getFunction("PutFile"); - Job j = new Job("./jvm.conf", h, f, jobPool); - j.setResult(this.buildJvmConf(h)); - j = Job.store(j); - j = new Job(j, "", h, Function.getFunction("UpdateTomcat"), jobPool); - Job.store(j); - } - - public String buildJvmConf(Hardware h) throws SQLException { - Collection c = TomcatWorker.getTomcatWorkers(h, false); - StringBuffer ret = new StringBuffer(); - for (final TomcatWorker tw : c) { - Tomcat t = tw.getTomcat(); - if (t != null) - ret.append(t.buildJvmconfEntry()); - } - return ret.toString(); - } - public void addHardware(User u, String hardwareName, String physicalLocation, String comments, int instanceId, int envId, int statusId, String defaultIp, String... ips) throws AuthorizationException, TMCIllegalArgumentException, SQLException, IOException { Hardware h = new Hardware(); //todo finish this this.addHardware(u, h); } -// public void addHardware(User u, Hardware h) throws AuthorizationException, TMCIllegalArgumentException, SQLException, IOException { -// Function f = Function.getFunction("AddHardware"); -// this.jpInit(f, u, h.getName()); -// if (!u.isAllowed(f)) throw new AuthorizationException("User " + u.getName() + " Not allowed to " + f.getName()); -// this.addHardware(jp, h); -// } - public void addHardware(JobPool jp, Hardware h) throws AuthorizationException, TMCIllegalArgumentException, SQLException, IOException { } @@ -173,7 +140,7 @@ } /** - * @return + * @return A collection of all of the hardware * @throws SQLException * @deprecated */ @@ -189,6 +156,7 @@ return Hardware.getHardware(id, true); } } + Added: incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/api/template/Template.java URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/api/template/Template.java?rev=629916&view=auto ============================================================================== --- incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/api/template/Template.java (added) +++ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/api/template/Template.java Thu Feb 21 10:43:55 2008 @@ -0,0 +1,288 @@ +/* +* Licensed to the Apache Software Foundation (ASF) under one +* or more contributor license agreements. See the NOTICE file +* distributed with this work for additional information +* regarding copyright ownership. The ASF licenses this file +* to you under the Apache License, Version 2.0 (the +* "License"); you may not use this file except in compliance +* with the License. You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, +* software distributed under the License is distributed on an +* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +* KIND, either express or implied. See the License for the +* specific language governing permissions and limitations +* under the License. +*/ +package org.apache.lokahi.core.api.template; + +import org.apache.log4j.Logger; +import org.apache.lokahi.core.common.database.BrokerFactory; +import org.apache.lokahi.core.common.interfaces.Entity; +import org.apache.lokahi.core.common.interfaces.TMCBroker; +import org.apache.lokahi.core.common.interfaces.TMCDao; +import org.apache.lokahi.core.common.util.PropertiesFile; + +import java.sql.Blob; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.util.Collection; +import java.util.LinkedHashMap; + +/** + * @author The Apache Incubated Lokahi project - http://incubator.apache.org/lokahi/ + * @version $Id$ + */ +public class Template extends TMCDao