incubator-lokahi-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tob...@apache.org
Subject svn commit: r417859 - in /incubator/lokahi/lokahi/trunk: docs/README.TXT src/www/Core/Entity/index.vm src/www/Core/User/addToProject.vm src/www/Core/User/index.vm
Date Wed, 28 Jun 2006 19:44:08 GMT
Author: toback
Date: Wed Jun 28 12:44:08 2006
New Revision: 417859

URL: http://svn.apache.org/viewvc?rev=417859&view=rev
Log:
Consistency updates.

Modified:
    incubator/lokahi/lokahi/trunk/docs/README.TXT
    incubator/lokahi/lokahi/trunk/src/www/Core/Entity/index.vm
    incubator/lokahi/lokahi/trunk/src/www/Core/User/addToProject.vm
    incubator/lokahi/lokahi/trunk/src/www/Core/User/index.vm

Modified: incubator/lokahi/lokahi/trunk/docs/README.TXT
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/docs/README.TXT?rev=417859&r1=417858&r2=417859&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/docs/README.TXT (original)
+++ incubator/lokahi/lokahi/trunk/docs/README.TXT Wed Jun 28 12:44:08 2006
@@ -48,7 +48,7 @@
       > @schema_priv.sql <SCH>
 
    4. Login from sqlplus as <SCHEMA> and run:
-      SQL> @install.sql
+      > @install.sql
 
       Install.sql will call recompile.sql to recompile any invalid object and report
       install status at the end. Make sure there is no invalid object and no error
@@ -70,7 +70,7 @@
 
    1.	copy the files in $LOKAHI_SOURCE/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/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
+      > $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
 
 
    SECTION V: Console Install

Modified: incubator/lokahi/lokahi/trunk/src/www/Core/Entity/index.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Core/Entity/index.vm?rev=417859&r1=417858&r2=417859&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Core/Entity/index.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Core/Entity/index.vm Wed Jun 28 12:44:08 2006
@@ -20,27 +20,21 @@
 #parse("/layout/header.vm")
 <div align="center" class="contentbox">
 <br /><br />
-<table width="700" border="0" cellspacing="0" cellpadding="0" >
-<tr valign="top" class="info">
-	<td valign="top" height="25" align="center"> Manage Assets </td>
-</tr>
-<tr valign="top" class="body">
-	<td align="center" valign="top" style="border-right-color:#666666;border-right-style:solid;border-right-width:1px;"><br
/>
-
-    <a href="$appRoot/Core/File/list.vm">&nbsp;Manage Files&nbsp;</a><br
/>
-
-    <a href="$appRoot/Core/Environment/list.vm">&nbsp;Manage Environments&nbsp;</a><br
/>
-
-      <a href="$appRoot/Core/Instance/list.vm">&nbsp;Manage Instances&nbsp;</a><br
/>
-
-      <a href="$appRoot/Core/User/addAdmin.vm">&nbsp;Manage Alerts&nbsp;</a>fix
this link<br />
-
-
-	</td>
-</tr>
 
+<table width="700" border="0" cellspacing="0" cellpadding="0" >
+	<tr valign="top" class="info">
+		<td valign="top" height="25" align="center"> Manage Assets </td>
+	</tr>
+	<tr valign="top" class="body">
+		<td align="center" valign="top" style="border-right-color:#666666;border-right-style:solid;border-right-width:1px;"><br
/>
+			<a href="$appRoot/Core/File/list.vm">&nbsp;Manage Files&nbsp;</a><br
/>
+			<a href="$appRoot/Core/Environment/list.vm">&nbsp;Manage Environments&nbsp;</a><br
/>
+			<a href="$appRoot/Core/Instance/list.vm">&nbsp;Manage Instances&nbsp;</a><br
/>
+			<a href="$appRoot/Core/User/addAdmin.vm">&nbsp;Manage Alerts&nbsp;</a>fix
this link<br />
+			<BR>
+		</td>
+	</tr>
 </table>
-
 </form>
 
 <br />

Modified: incubator/lokahi/lokahi/trunk/src/www/Core/User/addToProject.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Core/User/addToProject.vm?rev=417859&r1=417858&r2=417859&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Core/User/addToProject.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Core/User/addToProject.vm Wed Jun 28 12:44:08 2006
@@ -20,22 +20,21 @@
 #parse("/layout/header.vm")
 
 #if ($request.getParameter("project"))
-#set ($projectId = $request.getParameter("project"))
+	#set ($projectId = $request.getParameter("project"))
 #end
 
 #if ($request.getParameter("seluser"))
-#set ($selUserId = $request.getParameter("seluser"))
+	#set ($selUserId = $request.getParameter("seluser"))
 #end
 
 #if ($request.getParameter("env"))
-#set ($envname = $request.getParameter("env"))
+	#set ($envname = $request.getParameter("env"))
 #end
 
 #if ($request.getParameter("tryuser"))
-#set ($tryuser = $request.getParameter("tryuser"))
-#set ($user = $User.getUser($tryuser))
-#set ($selUserId = $user.getPk())
-
+	#set ($tryuser = $request.getParameter("tryuser"))
+	#set ($user = $User.getUser($tryuser))
+	#set ($selUserId = $user.getPk())
 #end
 
 <div align="center" class="contentbox">
@@ -43,20 +42,20 @@
 
 <div class="projectbox">
 <table width="100%" border="0" cellspacing="0" cellpadding="1">
-<tr class="info" valign="top">
-	<td colspan=3>Administration - <b>User</b>
-  </td>
-  <td align="right">
-  #parse("Core/User/menu/global.vm")
-  </td>
-</tr>
+	<tr class="info" valign="top">
+		<td colspan=3>Administration - <b>User</b>
+	  	</td>
+  		<td align="right">
+			#parse("Core/User/menu/global.vm")
+		</td>
+	</tr>
 </table>
 <br />
 <div class="messagebox">
 
 <SCRIPT LANGUAGE=javascript>
 <!--
-function OnChange(dropdown)
+function OnChangeIn(dropdown)
 {
         var myindex  = dropdown.selectedIndex;
         var SelValue = dropdown.options[myindex].value;
@@ -75,7 +74,6 @@
 
         var baseURL = "$appRoot/Core/User/addToProject.vm?project=$projectId&tryuser="
+ isid;
 
-
         top.location.href = baseURL;
 
         return true;
@@ -112,26 +110,22 @@
 <form name="Form" method="post" action='$link.setAction("User/AddUserToProjectAction")'>
 <input type="hidden" name="methodToCall" value="AddUserToProject">
 #if ($projectId)
-#set ($project = $User.getProject($projectId))
- <input type="hidden" name="projectId" value="$projectId">Project: $project.getName()
<br>
+	#set ($project = $User.getProject($projectId))
+	<input type="hidden" name="projectId" value="$projectId">Project: $project.getName()
<br>
 #else
-Project:
-<select name=projectId onchange='OnChange(this);'>
-<option value="">Select one
- #foreach($project in $User.getAdministratableProjects().orderByName().values())
-  <option value="$project.getPk()">$project.getName()
- #end
-</select><br>
+	<BR>
+	Project:
+	<select name=projectId onchange='OnChangeIn(this);'>
+	<option value="">Select one
+	 #foreach($project in $User.getAdministratableProjects().orderByName().values())
+		<option value="$project.getPk()">$project.getName()
+	 #end
+	</select><br>
 #end
-<BR>
-
 
 #if ($projectId)
-
-
-
-        #if($tryuser)
-        $tryuser
+	#if($tryuser)
+    	$tryuser
         <input type=hidden name="userName" value="$tryuser">
         #set($user = $User.getUser($tryuser))
                 #if ($user)
@@ -144,8 +138,6 @@
         #end
 #end
 
-<br>
-
 #if($projectId && ($selUserId || $tryuser) && ! $envname)
 Environment:
         <select name=env onchange='OnChangeEnv(this)'>
@@ -157,44 +149,40 @@
         </select><br>
 #end
 
-<br>
 #if ($selUserId && $envname)
 
 #if($User.isAllowed("AddUserToProject",$projectId))
-<!-- Individual Stuff -->
-#if ($User.isAllowed("AddUserToProject"))
+	<!-- Individual Stuff -->
+	#if ($User.isAllowed("AddUserToProject"))
         <table>
         #if ($projectId)
-        #set ($project = $User.getProject($projectId))
-        <tr class=info>$envname Contexts
-        #foreach($context in $project.getTomcatContexts())
-        <TR>
-
-        #if ($!{context.getEnv().getName()} == $envname || $envname == 'all')
-        <TD><b> $context.getName() - $!{context.getEnv().getName()}</b></td><td>&nbsp;</td>
-        #set ($availFunctions = "")
-        #set ($availFunctions = $User.getContextFunctions($projectId,$context))
-        #set ($count = 1)
-        <td align="right">
-        #foreach($function in $availFunctions)
-                #if($user && $user.isAllowed($function, $project, $context))
-                $function.getName()&nbsp;<input type=checkbox name=contextFunction
value="$context.getPk(),$function.getPk()" checked> <br>
-                #else
-                $function.getName()&nbsp;<input type=checkbox name=contextFunction
value="$context.getPk(),$function.getPk()"> <br>
-                #end
-                #if(($count % 3) == 0)
-                </TD>
-                <td align="right">
-                #end
-                #set ($count = $math.add($count, 1))
-        #end
-        </td>
-
-        #end ## end of env selection
-        </tr>
-
-</TR>
-        #end
+        	#set ($project = $User.getProject($projectId))
+	        <tr class=info>$envname Contexts
+    	    #foreach($context in $project.getTomcatContexts())
+        		<TR>
+		        #if ($!{context.getEnv().getName()} == $envname || $envname == 'all')
+        			<TD><b> $context.getName() - $!{context.getEnv().getName()}</b></td><td>&nbsp;</td>
+			        #set ($availFunctions = "")
+			        #set ($availFunctions = $User.getContextFunctions($projectId,$context))
+			        #set ($count = 1)
+			        <td align="right">
+			        #foreach($function in $availFunctions)
+            		    #if($user && $user.isAllowed($function, $project, $context))
+		        	        $function.getName()&nbsp;<input type=checkbox name=contextFunction
value="$context.getPk(),$function.getPk()" checked> <br>
+        		        #else
+			                $function.getName()&nbsp;<input type=checkbox name=contextFunction
value="$context.getPk(),$function.getPk()"> <br>
+            		    #end
+		                #if(($count % 3) == 0)
+        			        </TD>
+			                <td align="right">
+            		    #end
+		                #set ($count = $math.add($count, 1))
+        			#end
+		        </td>
+		        #end ## end of env selection
+        	</tr>
+		</TR>
+        #end ## end of for loop
 </table>
 #end
 <BR><BR>
@@ -263,8 +251,6 @@
 
 </table>
 #end
-
-
 
 
 #end ##end If for Is allowed toproject

Modified: incubator/lokahi/lokahi/trunk/src/www/Core/User/index.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Core/User/index.vm?rev=417859&r1=417858&r2=417859&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Core/User/index.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Core/User/index.vm Wed Jun 28 12:44:08 2006
@@ -20,27 +20,26 @@
 #parse("/layout/header.vm")
 <div align="center" class="contentbox">
 <br /><br />
+
 <table width="700" border="0" cellspacing="0" cellpadding="0" >
-<tr valign="top" class="info">
-	<td valign="top" height="25" align="center"> User Access </td>
-</tr>
-<tr valign="top" class="body">
-	<td align="center" valign="top" style="border-right-color:#666666;border-right-style:solid;border-right-width:1px;"><br
/>
-  #if($User.isAllowed("AddUserToProject"))
-    <a href="$appRoot/Core/User/addToProject.vm">&nbsp;Add user to Project&nbsp;</a><br
/>
-  #end
-  #if($User.isAllowed("AddUserToProject"))
-    <a href="$appRoot/Core/User/addAdmin.vm">&nbsp;Add Admin&nbsp;</a><br
/>
-  #end
-	
+	<tr valign="top" class="info">
+		<td valign="top" height="25" align="center"> User Access </td>
+	</tr>
+	<tr valign="top" class="body">
+		<td align="center" valign="top" style="border-right-color:#666666;border-right-style:solid;border-right-width:1px;"><br
/>
+			#if($User.isAllowed("AddUserToProject"))
+				<a href="$appRoot/Core/User/addToProject.vm">&nbsp;Add user to Project&nbsp;</a><br
/>
+			#end
+			#if($User.isAllowed("AddUserToProject"))
+				<a href="$appRoot/Core/User/addAdmin.vm">&nbsp;Add Admin&nbsp;</a><br
/>
+			#end
 		
-	<A href="$appRoot/Core/User/add.vm">Add User</a><br />
-	<A href="$appRoot/Core/User/list.vm">List Users</a>
-	</td>
-</tr>
-
+			<A href="$appRoot/Core/User/add.vm">Add User</a><br />
+			<A href="$appRoot/Core/User/list.vm">List Users</a><br />
+			<BR>
+		</td>
+	</tr>
 </table>
-
 </form>
 
 <br />



Mime
View raw message