You are viewing a plain text version of this content. The canonical link for it is here.
Posted to lokahi-commits@incubator.apache.org by to...@apache.org on 2006/06/09 20:36:37 UTC
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
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"
+ type="org.apache.lokahi.actions.{1}Action"
name="{1}MultipleForm"
scope="request"
validate="true"
@@ -391,22 +391,22 @@
</action>
<action
path="/administration/*/Delete"
- type="lokahi.actions.{1}Action"
+ type="org.apache.lokahi.actions.{1}Action"
name="DeleteForm"
scope="request"
validate="true"
- >
+ > <!-- mapping is fubared -->
</action>
<action
path="/templating/*Action"
- type="lokahi.core.gui.www.TemplateAction"
+ type="org.apache.lokahi.core.gui.www.TemplateAction"
name="{1}TemplateForm"
scope="request"
validate="true"
>
</action>
<action path="/Authenticate"
- type="lokahi.core.gui.www.Authorization"
+ type="org.apache.lokahi.core.gui.www.Authorization"
name="authForm"
scope="request"
validate="true">
Modified: incubator/lokahi/lokahi/trunk/conf/toolbox.xml
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/conf/toolbox.xml?rev=413153&r1=413152&r2=413153&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/conf/toolbox.xml (original)
+++ incubator/lokahi/lokahi/trunk/conf/toolbox.xml Fri Jun 9 13:36:36 2006
@@ -44,36 +44,21 @@
<tool>
<key>alertSet</key>
<scope>request</scope>
- <class>lokahi.core.api.alert.AlertTool</class>
+ <class>org.apache.lokahi.core.api.alert.AlertTool</class>
</tool>
<tool>
<key>helpHelper</key>
<scope>request</scope>
- <class>lokahi.core.gui.help.HelpItemTool</class>
- </tool>
- <tool>
- <key>dataList</key>
- <scope>request</scope>
- <class>lokahi.util.template.IntranetTool</class>
- </tool>
- <tool>
- <key>aTool</key>
- <scope>request</scope>
- <class>lokahi.util.template.AdminTool</class>
+ <class>org.apache.lokahi.core.gui.help.HelpItemTool</class>
</tool>
<tool>
<key>wapTool</key>
<scope>request</scope>
- <class>lokahi.core.common.util.WapTool</class>
+ <class>org.apache.lokahi.core.common.util.WapTool</class>
</tool>
<tool>
<key>view</key>
<scope>request</scope>
- <class>lokahi.core.common.util.TMCVelocityViewTool</class>
- </tool>
- <tool>
- <key>ldap</key>
- <scope>request</scope>
- <class>lokahi.util.ldap.LDAPLookUp</class>
+ <class>org.apache.lokahi.core.common.util.TMCVelocityViewTool</class>
</tool>
</toolbox>
Modified: incubator/lokahi/lokahi/trunk/docs/README.TXT
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/docs/README.TXT?rev=413153&r1=413152&r2=413153&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/docs/README.TXT (original)
+++ incubator/lokahi/lokahi/trunk/docs/README.TXT Fri Jun 9 13:36:36 2006
@@ -20,7 +20,9 @@
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/lokahi.jar:$AGENT_HOME/log4j-1.2.8.jar org.apache.lokahi.core.agent.TMCAgent start
+2. start the agent buy running:
+$JAVA_HOME/bin/java -classpath $JAVA_HOME/lib/tools.jar:$AGENT_HOME/log4j-1.2.13.jar:$AGENT_HOME/lokahi.jar:$AGENT_HOME/axis.jar:$AGENT_HOME/commons-logging.jar:$AGENT_HOME/commons-discovery-0.2.jar:$AGENT_HOME/jdom.jar:$AGENT_HOME/commons-dbcp-1.2.1.jar:$AGENT_HOME/commons-dbcp-1.2.1.jar:$AGENT_HOME/derby.jar:$AGENT_HOME:/derbyclient.jar:$AGENT_HOME/commons-pool-1.2.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"/>
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=413153&r1=413152&r2=413153&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 Fri Jun 9 13:36:36 2006
@@ -52,7 +52,7 @@
* or 'stop'. All other will cause a help
* message to display.
*/
- public static void main(String[] args) {
+ public static void main(String[] args) throws Exception {
//check to see if starting or stopping;
if (args != null && args.length >= 1) {
if ("start".equalsIgnoreCase(args[0])) {
@@ -83,13 +83,14 @@
* @throws IOException if the socket can't be opened
* or a property file can't be opened.
*/
- public static void init() throws IOException {
- DOMConfigurator.configure("log4j.xml");
+ public static void init() throws Exception {
+ DOMConfigurator.configure("agent.log4j.xml");
int port = 5665;
SimpleAxisServer sas = new SimpleAxisServer();
ServerSocketFactory sf = SSLServerSocketFactory.getDefault();
ServerSocket ss = sf.createServerSocket(port);
sas.setServerSocket(ss);
+ sas.start(false);
DerbyBroker.initalize();