Skip to Content.
Sympa Menu

perfsonar-dev - [GEANT/SA2/ps-java-services] r5470 - in branches/new-structure-with-base2/ps-mdm-web-admin: . ant conf src/main/java/org/perfsonar/webadmin/base2/config src/main/java/org/perfsonar/webadmin/base2/util tomcat tomcat/styles

Subject: perfsonar development work

List archive

[GEANT/SA2/ps-java-services] r5470 - in branches/new-structure-with-base2/ps-mdm-web-admin: . ant conf src/main/java/org/perfsonar/webadmin/base2/config src/main/java/org/perfsonar/webadmin/base2/util tomcat tomcat/styles


Chronological Thread 
  • From:
  • To:
  • Subject: [GEANT/SA2/ps-java-services] r5470 - in branches/new-structure-with-base2/ps-mdm-web-admin: . ant conf src/main/java/org/perfsonar/webadmin/base2/config src/main/java/org/perfsonar/webadmin/base2/util tomcat tomcat/styles
  • Date: Tue, 26 Jan 2010 14:29:56 GMT
Author: psnc.trzaszczka
Date: 2010-01-26 14:29:56 +0000 (Tue, 26 Jan 2010)
New Revision: 5470

Modified:
branches/new-structure-with-base2/ps-mdm-web-admin/
branches/new-structure-with-base2/ps-mdm-web-admin/ant/
branches/new-structure-with-base2/ps-mdm-web-admin/ant/build.xml
branches/new-structure-with-base2/ps-mdm-web-admin/ant/tomcat.properties
branches/new-structure-with-base2/ps-mdm-web-admin/conf/configuration.xml
branches/new-structure-with-base2/ps-mdm-web-admin/conf/webAdminConfig.xml

branches/new-structure-with-base2/ps-mdm-web-admin/src/main/java/org/perfsonar/webadmin/base2/config/HTMLGenerator.java

branches/new-structure-with-base2/ps-mdm-web-admin/src/main/java/org/perfsonar/webadmin/base2/util/HTMLUtilStringBuffer.java
branches/new-structure-with-base2/ps-mdm-web-admin/tomcat/

branches/new-structure-with-base2/ps-mdm-web-admin/tomcat/styles/default.css
branches/new-structure-with-base2/ps-mdm-web-admin/tomcat/web.xml
Log:



Property changes on: branches/new-structure-with-base2/ps-mdm-web-admin
___________________________________________________________________
Name: svn:ignore
+ *



Property changes on: branches/new-structure-with-base2/ps-mdm-web-admin/ant
___________________________________________________________________
Name: svn:ignore
- ant

+ tomcat.properties


Modified: branches/new-structure-with-base2/ps-mdm-web-admin/ant/build.xml
===================================================================
--- branches/new-structure-with-base2/ps-mdm-web-admin/ant/build.xml
2010-01-26 14:07:54 UTC (rev 5469)
+++ branches/new-structure-with-base2/ps-mdm-web-admin/ant/build.xml
2010-01-26 14:29:56 UTC (rev 5470)
@@ -227,6 +227,51 @@
<javadoc packagenames="org.perfsonar.*" sourcepath="${src}"
defaultexcludes="yes" destdir="${basedir}/tmp/doc/api" author="true"
version="true" use="true" linksource="yes" windowtitle="Test API" />

</target>
+
+ <!-- ======================= preapre WAR structure
=================== -->
+ <target name="prepare-war-structure" depends="build-web-admin">
+
+ <mkdir dir="${build}/flatten" />
+ <copy todir="${build}/flatten" flatten="true">
+ <fileset dir="${lib}">
+ <exclude name="jaxme2" />
+ <exclude name="saxon" />
+ <exclude name="xalan" />
+ <exclude name="xmldb" />
+ </fileset>
+ <fileset dir="${basedir}/lib/repository">
+ <exclude name="**/*junit*.jar" />
+ <include name="**/*.jar" />
+ </fileset>
+ <fileset dir="build" includes="*.jar" />
+ </copy>
+
+ <delete dir="build/war" includeemptydirs="true" />
+ <mkdir dir="build/war/WEB-INF/lib" />
+ <mkdir dir="build/war/WEB-INF/classes/perfsonar/conf" />
+
+ <copy todir="build/war/wa">
+ <fileset dir="tomcat" excludes="web.xml, index.jsp" />
+ </copy>
+
+ <copy todir="build/war/" file="tomcat/index.jsp"/>
+
+ <copy todir="build/war/WEB-INF/classes/perfsonar/conf">
+ <fileset dir="conf/" />
+ </copy>
+
+ <copy todir="build/war/WEB-INF/classes">
+ <fileset dir="log4j/production"/>
+ </copy>
+
+ <copy todir="build/war/WEB-INF/lib">
+ <fileset dir="${build}/flatten">
+ <exclude name="${lib}/servlet/*"/>
+ </fileset>
+ </copy>
+
+ </target>
+
<!-- ======================= WAR creation =================== -->
<target name="war" depends="build-web-admin">

@@ -271,9 +316,7 @@
<exclude name="${lib}/servlet/*" />
</lib>
</war>
- <!--
<delete dir="build/war" />
- -->
</target>

<target name="war-deploy" depends="war">

Modified:
branches/new-structure-with-base2/ps-mdm-web-admin/ant/tomcat.properties
===================================================================
--- branches/new-structure-with-base2/ps-mdm-web-admin/ant/tomcat.properties
2010-01-26 14:07:54 UTC (rev 5469)
+++ branches/new-structure-with-base2/ps-mdm-web-admin/ant/tomcat.properties
2010-01-26 14:29:56 UTC (rev 5470)
@@ -1,7 +1,7 @@
# Properties for Tomcat Server


-tomcat.dir=/usr/local/apache-tomcat-5.5.27/
+tomcat.dir=/usr/local/tomcat/
tomcat.server=127.0.0.1
tomcat.manager.url=http://127.0.0.1:8080/manager
tomcat.username=tomcat

Modified:
branches/new-structure-with-base2/ps-mdm-web-admin/conf/configuration.xml
===================================================================
--- branches/new-structure-with-base2/ps-mdm-web-admin/conf/configuration.xml
2010-01-26 14:07:54 UTC (rev 5469)
+++ branches/new-structure-with-base2/ps-mdm-web-admin/conf/configuration.xml
2010-01-26 14:29:56 UTC (rev 5470)
@@ -1,22 +1,19 @@
-<!-- $Id$ -->
+<?xml version='1.0' encoding='UTF-8'?>

+
<configuration xmlns="http://service.perfsonar.org/ns/config/base/0.9/";>


- <service name="SimpleService">
-
- <a>aaa</a>
+ <service name="xmlls">

<!--
....................................................................................
-->

<!-- Lookup Info of the LS instance -->

<lookupInformation>
- <option name="accessPoint"
value="http://localhost:8080/axis2/services/SimpleService"/>
- <option name="name" value="SimpleService - Echo"/>
- <option name="type" value="Echo"/>
- <option name="acessPoints" value="Point1,Point2,Point3"/>
- <option name="authorization" value="yes"/>
+ <option name="accessPoint"
value="http://localhost:8080/perfsonar-java-xml-ls/services/LookupService"/>
+ <option name="serviceName" value="Geant3 JAVA - XML LS "/>
+ <option name="serviceType" value="LS"/>
</lookupInformation>

<!--
....................................................................................
-->
@@ -24,13 +21,49 @@
<!-- Message Handlers - message types and service engines -->

<messageHandler>
+
+ <!-- Echo -->
<message type="EchoRequest"

handler="org.perfsonar.base2.service.messages.GenericMessageHandler">
<option name="ServiceEngine"
-
value="org.perfsonar.service.simpleservice.SimpleServiceServiceEngine" />
+
value="org.perfsonar.service.lookupservice.EchoServiceEngine" />
<option name="authN" value="no" />
</message>

+ <!-- Register -->
+ <message type="LSRegisterRequest"
+
handler="org.perfsonar.service.lookupservice.LSRegistrationMessageHandler">
+ <option name="ServiceEngine"
+
value="org.perfsonar.service.lookupservice.LSRegisterServiceEngine"/>
+ <option name="authN" value="no" />
+ <option name="minTTL" value="10" />
+ <option name="maxTTL" value="100000" />
+ </message>
+
+ <!-- QUERY -->
+ <message type="LSQueryRequest"
+
handler="org.perfsonar.base2.service.messages.GenericMessageHandler">
+ <option name="ServiceEngine"
+
value="org.perfsonar.service.lookupservice.LSQueryServiceEngine" />
+ <option name="authN" value="no" />
+ </message>
+
+ <!-- Keepalive -->
+ <message type="LSKeepaliveRequest"
+
handler="org.perfsonar.base2.service.messages.GenericMessageHandler">
+ <option name="ServiceEngine"
+
value="org.perfsonar.service.lookupservice.LSKeepaliveServiceEngine" />
+ <option name="authN" value="no" />
+ </message>
+
+ <!-- Deregister -->
+ <message type="LSDeregisterRequest"
+
handler="org.perfsonar.base2.service.messages.GenericMessageHandler">
+ <option name="ServiceEngine"
+
value="org.perfsonar.service.lookupservice.LSDeregisterServiceEngine" />
+ <option name="authN" value="no" />
+ </message>
+
</messageHandler>

<!--
....................................................................................
-->
@@ -38,34 +71,147 @@
<!-- Additional auxiliary components -->

<auxiliaryComponents>
+
+ <!-- exist datasource contains optionally read-only credentials -->
+ <component name="existDataSource"
+
className="org.perfsonar.service.lookupservice.components.DataSourceComponent">
+ <option name="url"
value="xmldb:exist://localhost:8080/exist/xmlrpc/db"/>
+ <option name="username" value="lookupservice"/>
+ <option name="password" value="sonar"/>
+ <option name="usernameRO" value="guest"/>
+ <option name="passwordRO" value="guest"/>
+ </component>
+
+ <!-- provides access to ExistDb with all permissions -->
+ <component name="existAccessManager"
className="org.perfsonar.service.lookupservice.components.XMLDBComponent">
+ <option name="dataSource-ref" value="existDataSource"/>
+ </component>
+
+ <!-- provides access to ExistDb with read-only permissions -->
+ <component name="existAccessManagerRO"
className="org.perfsonar.service.lookupservice.components.XMLDBComponent">
+ <option name="dataSource-ref" value="existDataSource"/>
+ <option name="readOnly" value="true"/>
+ </component>
+
+ <!-- Lookup Service DAO -->
+ <component name="lsdao"
className="org.perfsonar.service.lookupservice.storage.exist.dao.MultipleFilesDAOImpl">
+ <option name="dbAccessManager-ref" value="existAccessManager"/>
+ </component>
+
+ <!-- Lookup Service DAO with read-only permission. It is used in
LSQueryRequest -->
+ <component name="lsdao-ro"
className="org.perfsonar.service.lookupservice.storage.exist.dao.MultipleFilesDAOImpl">
+ <option name="dbAccessManager-ref" value="existAccessManagerRO"/>
+ </component>
+
+ <!-- Summarization Service DAO -->
+ <component name="summarizationdao"
className="org.perfsonar.service.lookupservice.storage.exist.dao.SummarizationDAOImpl">
+ <option name="dbAccessManager-ref" value="existAccessManager"/>
+ </component>
+
+ <!-- contains a nr of changes in DB - is used to synchronization -->
+ <component name="modificationCounterComponent"
className="org.perfsonar.service.lookupservice.components.ModificationCounterComponent"/>
+
+ <!-- Scheduler -->
+ <component name="scheduling"
+
className="org.perfsonar.base2.service.scheduler.SchedulingComponent">
+
+ <option name="schedulerClassName"
value="org.perfsonar.base2.service.scheduler.singleThread.SingleThreadScheduler"/>
+ <option name="interval" value="60"/> <!-- sec -->
+ <actions>
+
+ <!--
+ action invokes cleanup operations on database. lsTTL -
default value of Time to live parameter.
+ After lsTTL time, if service didn't re-register, service will
be removed.
+ -->
+ <action name="LSCleanup_1"
className="org.perfsonar.service.lookupservice.schedulerActions.CleanupSchedulerAction">
+ <option name="status" value="on" />
+ <option name="interval" value="300" />
+ <option name="lsTTL" value="86400"/>
+ </action>
+
+ <!--
+ this action supports synchronization of summarized data
stored in LSStore-summary with data stored in LSStore.xml
+ nrOfModifications - nr of changes in db after which
summarization process is executed immediately
+ nrOfIterations - after this nr of iteration if there are
some changes in db - summarization process is executed
+ -->
+ <action name="LSSummarySynchronization"
className="org.perfsonar.service.lookupservice.schedulerActions.SummarySynchronizationAction">
+ <option name="status" value="on" />
+ <option name="interval" value="60" />
+ <option name="nrOfModifications" value="10"/>
+ <option name="nrOfIterations" value="4"/>
+ </action>
+
+ <action name="registration"
className="org.perfsonar.service.lookupservice.schedulerActions.GLSRegistrationAction">
+
+ <option name="status" value="on" />
+ <option name="interval" value="43200" />
+
+ <option name="registerDataSource"
+
value="org.perfsonar.service.lookupservice.registration.LSSummaryRegisterDataSource"/>
+
+ <option name="registerEventType"
+
value="http://ogf.org/ns/nmwg/tools/org/perfsonar/service/lookup/registration/summary/2.0"/>
+ <!--
+ <option name="registerEventType"
+
value="http://ogf.org/ns/nmwg/tools/org/perfsonar/service/lookup/registration/service/2.0"/>
+ -->
+ <option name="registrator"
+
value="org.perfsonar.base2.service.registration.GenericLSRegistrator"/>
+
+ <!-- define lsAddresses (lsAddress-1,lsAddress-2,..) where
this LS will be registered -->
+ <!--
+ <option name="lsAddress-1"
+
value="http://localhost:8080/perfsonar-java-xml-ls/services/LookupService"/>
+ -->
+ <!-- or define localizations of the root.hints
(lsList-1,lsList-2,...) which consists of gls addresses -->
+
+ <option name="lsList-1"
value="http://www.perfsonar.net/gls.root.hints"/>
+
+ <!-- number of registration to GLS in a single iteration -->
+ <option name="nrOfGLSRegistration" value="1"/>
+
+ </action>

+ </actions>
+ </component>
+
</auxiliaryComponents>

+
<!--
....................................................................................
-->

<!-- Protocol mappings, XML elements and their bingings -->

<protocolMappings>

+
<!-- default mapping -->
- <element name="*"
- mapping="org.perfsonar.base2.xml.Element"/>

+
<!-- general mappings -->
- <element name="{http://ggf.org/ns/nmwg/base/2.0/}message";
+ <element name="{*}message"
mapping="org.perfsonar.base2.xml.nmwg.Message"/>
- <element name="{http://ggf.org/ns/nmwg/base/2.0/}metadata";
+ <element name="{*}metadata"
mapping="org.perfsonar.base2.xml.nmwg.Metadata"/>
- <element name="{http://ggf.org/ns/nmwg/base/2.0/}eventType";
+ <element name="{*}eventType"
mapping="org.perfsonar.base2.xml.nmwg.EventType"/>
- <element name="{http://ggf.org/ns/nmwg/base/2.0/}data";
+ <element name="{*}data"
mapping="org.perfsonar.base2.xml.nmwg.Data"/>
-
+ <element name="{*}subject"
+ mapping="org.perfsonar.base2.xml.nmwg.Subject"/>
+ <element name="{*}parameters"
+ mapping="org.perfsonar.base2.xml.nmwg.Parameters"/>
+ <element name="{*}parameter"
+ mapping="org.perfsonar.base2.xml.nmwg.Parameter"/>
+ <element name="*"
+ mapping="org.perfsonar.base2.xml.Element"/>
+ <element
name="{http://ggf.org/ns/nmwg/tools/org/perfsonar/service/lookup/xquery/1.0/}subject";

+ mapping="org.perfsonar.base2.xml.TextElement"/>
+
+
</protocolMappings>

- <!--
....................................................................................
-->

-
</service>



Modified:
branches/new-structure-with-base2/ps-mdm-web-admin/conf/webAdminConfig.xml
===================================================================
---
branches/new-structure-with-base2/ps-mdm-web-admin/conf/webAdminConfig.xml
2010-01-26 14:07:54 UTC (rev 5469)
+++
branches/new-structure-with-base2/ps-mdm-web-admin/conf/webAdminConfig.xml
2010-01-26 14:29:56 UTC (rev 5470)
@@ -79,44 +79,55 @@
<wa:textbox>
<wa:default>
<wa:xpath>
-
doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="SimpleService"]/ns1:lookupInformation/ns1:option[@name="accessPoint"]/@value
+
doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="xmlls"]/ns1:lookupInformation/ns1:option[@name="accessPoint"]/@value
</wa:xpath>
</wa:default>
- <wa:title><wa:text>Default
title</wa:text></wa:title>
+ <wa:title><wa:text>Access
point</wa:text></wa:title>
</wa:textbox>
</wa:plain>
-
<wa:plain>
<wa:textbox>
<wa:default>
- <wa:text>
- This should be updated
in-place
- </wa:text>
+ <wa:xpath>
+
doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="xmlls"]/ns1:lookupInformation/ns1:option[@name="serviceName"]/@value
+ </wa:xpath>
</wa:default>
- <wa:title><wa:text>Another
title</wa:text></wa:title>
+ <wa:title><wa:text>Service
name</wa:text></wa:title>
</wa:textbox>
</wa:plain>
+ <wa:plain>
+ <wa:textbox>
+ <wa:default>
+ <wa:xpath>
+
doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="xmlls"]/ns1:lookupInformation/ns1:option[@name="serviceType"]/@value
+ </wa:xpath>
+ </wa:default>
+ <wa:title><wa:text>Service
type</wa:text></wa:title>
+ </wa:textbox>
+ </wa:plain>

<wa:plain>
- <wa:dropdown>
+ <wa:textbox>
<wa:default>
-
<wa:xpath>doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="SimpleService"]/ns1:lookupInformation/ns1:option[@name="name"]/@value</wa:xpath>
+ <wa:xpath>
+
doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="xmlls"]/ns1:auxiliaryComponents/ns1:component[@name="existDataSource"]/ns1:option[@name="username"]/@value
+ </wa:xpath>
</wa:default>
- <wa:title><wa:text>Default dropdown
title</wa:text></wa:title>
- <wa:values><wa:text>SimpleService -
Echo,val2,val3</wa:text></wa:values>
- </wa:dropdown>
+ <wa:title><wa:text>Exist DB
username</wa:text></wa:title>
+ </wa:textbox>
</wa:plain>
-
+
<wa:plain>
- <wa:radio>
+ <wa:textbox>
<wa:default>
-
<wa:xpath>doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="SimpleService"]/ns1:lookupInformation/ns1:option[@name="authorization"]/@value</wa:xpath>
+ <wa:xpath>
+
doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="xmlls"]/ns1:auxiliaryComponents/ns1:component[@name="existDataSource"]/ns1:option[@name="password"]/@value
+ </wa:xpath>
</wa:default>
- <wa:title><wa:text>Require authorization
?</wa:text></wa:title>
-
<wa:values><wa:text>yes,no</wa:text></wa:values>
- </wa:radio>
+ <wa:title><wa:text>Exist DB
password</wa:text></wa:title>
+ </wa:textbox>
</wa:plain>
-
+
</wa:page>



Modified:
branches/new-structure-with-base2/ps-mdm-web-admin/src/main/java/org/perfsonar/webadmin/base2/config/HTMLGenerator.java
===================================================================
---
branches/new-structure-with-base2/ps-mdm-web-admin/src/main/java/org/perfsonar/webadmin/base2/config/HTMLGenerator.java
2010-01-26 14:07:54 UTC (rev 5469)
+++
branches/new-structure-with-base2/ps-mdm-web-admin/src/main/java/org/perfsonar/webadmin/base2/config/HTMLGenerator.java
2010-01-26 14:29:56 UTC (rev 5470)
@@ -353,7 +353,7 @@
logger.debug("WA --- Drawing a password box : title: \"" +
title
+ "\" value : \"" + t.second() + "\"");
try {
- html.singlerow_begin(20);
+ html.singlerow_begin(5);
html.passtextbox(t.first() + "", title, t.second());
html.singlerow_end();
} catch (Exception e) {
@@ -367,7 +367,7 @@
logger.debug("WA --- Drawing a box : title: \"" + title
+ "\" value : \"" + t.second() + "\"");
try {
- html.singlerow_begin(20);
+ html.singlerow_begin(5);
html.textbox(t.first() + "", title, t.second());
html.singlerow_end();
} catch (Exception e) {
@@ -381,7 +381,7 @@
+ "\"");
// for( String s : values.second() ) println("\nradio value :
" + s);
try {
- html.singlerow_begin(20);
+ html.singlerow_begin(5);
html.radio(values.first() + "", title.second(),
values.second());
html.singlerow_end();
} catch (Exception e) {
@@ -396,7 +396,7 @@
// for( String s : values.second() ) println("\ndrop-down
value : " +
// s);
try {
- html.singlerow_begin(20);
+ html.singlerow_begin(5);
html.dropdown(values.first() + "", title.second(),
values.second());
html.singlerow_end();
} catch (Exception e) {
@@ -410,7 +410,7 @@
boolean enabled = false;
// FIXME: Hardcoded values
try {
- html.singlerow_begin(20);
+ html.singlerow_begin(5);
html.radiogroup_begin("key3", "Grouped box", "yes",
"no", enabled);
println(innerHTML);
html.radiogroup_end();

Modified:
branches/new-structure-with-base2/ps-mdm-web-admin/src/main/java/org/perfsonar/webadmin/base2/util/HTMLUtilStringBuffer.java
===================================================================
---
branches/new-structure-with-base2/ps-mdm-web-admin/src/main/java/org/perfsonar/webadmin/base2/util/HTMLUtilStringBuffer.java
2010-01-26 14:07:54 UTC (rev 5469)
+++
branches/new-structure-with-base2/ps-mdm-web-admin/src/main/java/org/perfsonar/webadmin/base2/util/HTMLUtilStringBuffer.java
2010-01-26 14:29:56 UTC (rev 5470)
@@ -375,39 +375,5 @@
+ tag("tr", tag("td", tag("p",
colouredtext(text, colour))))
+ "</td></tr>");
}
-
- //
- public static void main(String[] args) throws Exception {
- // PrintStream p = new PrintStream(new FileOutputStream(new
- // File(args[0])));
- // HTMLUtilStringBuffer u = new HTMLUtilStringBuffer(p);
- // //
- // u.preamble();
- // u.form_begin("fkey", "keyval", "lalala", 1);
- // u.lineoftext("Please fill in the following fields:",
"green", 20);
- //
- // u.simplelineoftext("eXist configuration", "green");
- // u.singlerow_begin(20);
- // u.dropdown("key1", "This is a drop down list", new
String[] { "Val1",
- // "Val2", "Val3" });
- // u.singlerow_end();
- //
- // u.singlerow_begin(20);
- // u.textbox("key2", "This is a textbox", "default text");
- // u.radio("key1", "Radio", new String[] { "true", "false" });
- // u.singlerow_end();
- //
- // boolean enabled = false;
- // u.singlerow_begin(20);
- // u.radiogroup_begin("key3", "Grouped box", "yes", "no",
enabled);
- // u.textbox("key6", "This is a textbox", "default hidden
text");
- // u.dropdown("key7", "This is a drop down list", new
String[] { "Val1",
- // "Val2", "Val3" });
- // u.radiogroup_end();
- // u.singlerow_end();
- //
- // u.form_end();
- // u.postscript();
- // p.close();
- }
+
};


Property changes on: branches/new-structure-with-base2/ps-mdm-web-admin/tomcat
___________________________________________________________________
Name: svn:ignore
+ *


Modified:
branches/new-structure-with-base2/ps-mdm-web-admin/tomcat/styles/default.css
===================================================================
---
branches/new-structure-with-base2/ps-mdm-web-admin/tomcat/styles/default.css
2010-01-26 14:07:54 UTC (rev 5469)
+++
branches/new-structure-with-base2/ps-mdm-web-admin/tomcat/styles/default.css
2010-01-26 14:29:56 UTC (rev 5470)
@@ -43,7 +43,7 @@
}

.properties td {
- padding: 15px;
+ padding: 5px;
font-family: Verdana, Arial, Helvetica, sans-serif;
font-size: 13px;
}

Modified: branches/new-structure-with-base2/ps-mdm-web-admin/tomcat/web.xml
===================================================================
--- branches/new-structure-with-base2/ps-mdm-web-admin/tomcat/web.xml
2010-01-26 14:07:54 UTC (rev 5469)
+++ branches/new-structure-with-base2/ps-mdm-web-admin/tomcat/web.xml
2010-01-26 14:29:56 UTC (rev 5470)
@@ -4,17 +4,15 @@
Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd";>

<web-app>
- <display-name>Apache-Axis</display-name>

+ <display-name>perfsonar web admin</display-name>

<session-config>
<!-- Default to 5 minute session timeouts -->
<session-timeout>5</session-timeout>
</session-config>

-
<!-- pS Config Servlet Admin -->
-
<servlet>
<servlet-name>BasicConfiguration</servlet-name>
<servlet-class>
@@ -44,8 +42,7 @@
</url-pattern>
</servlet-mapping>

-
- <welcome-file-list id="WelcomeFileList">
+ <welcome-file-list>
<welcome-file>index.jsp</welcome-file>
</welcome-file-list>



  • [GEANT/SA2/ps-java-services] r5470 - in branches/new-structure-with-base2/ps-mdm-web-admin: . ant conf src/main/java/org/perfsonar/webadmin/base2/config src/main/java/org/perfsonar/webadmin/base2/util tomcat tomcat/styles, svn-noreply, 01/26/2010

Archive powered by MHonArc 2.6.16.

Top of Page