perfsonar-dev - [GEANT/SA2/ps-java-services] r5576 - in branches/new-structure-with-base2/ps-mdm-as: . conf doc resources resources/axis2-1.4.1/webapp/WEB-INF resources/wa resources/wa/graphics resources/wa/scripts resources/wa/soapMessages resources/wa/styles resources/wa/views

Subject: perfsonar development work

List archive

[GEANT/SA2/ps-java-services] r5576 - in branches/new-structure-with-base2/ps-mdm-as: . conf doc resources resources/axis2-1.4.1/webapp/WEB-INF resources/wa resources/wa/graphics resources/wa/scripts resources/wa/soapMessages resources/wa/styles resources/wa/views

From:
To:
Subject: [GEANT/SA2/ps-java-services] r5576 - in branches/new-structure-with-base2/ps-mdm-as: . conf doc resources resources/axis2-1.4.1/webapp/WEB-INF resources/wa resources/wa/graphics resources/wa/scripts resources/wa/soapMessages resources/wa/styles resources/wa/views
Date: Tue, 6 Apr 2010 16:48:34 +0100

Author: rediris.montes
Date: 2010-04-06 16:48:34 +0100 (Tue, 06 Apr 2010)
New Revision: 5576

Added:
branches/new-structure-with-base2/ps-mdm-as/conf/webAdminConfig.xml
branches/new-structure-with-base2/ps-mdm-as/resources/index.jsp
branches/new-structure-with-base2/ps-mdm-as/resources/wa/
branches/new-structure-with-base2/ps-mdm-as/resources/wa/graphics/

branches/new-structure-with-base2/ps-mdm-as/resources/wa/graphics/admin_home_target.gif

branches/new-structure-with-base2/ps-mdm-as/resources/wa/graphics/apply_button.gif

branches/new-structure-with-base2/ps-mdm-as/resources/wa/graphics/apply_button_2.gif

branches/new-structure-with-base2/ps-mdm-as/resources/wa/graphics/arrow_icon.gif

branches/new-structure-with-base2/ps-mdm-as/resources/wa/graphics/arrow_icon2.gif

branches/new-structure-with-base2/ps-mdm-as/resources/wa/graphics/button_1_large.gif

branches/new-structure-with-base2/ps-mdm-as/resources/wa/graphics/button_1_small.gif

branches/new-structure-with-base2/ps-mdm-as/resources/wa/graphics/button_2_large.gif

branches/new-structure-with-base2/ps-mdm-as/resources/wa/graphics/button_2_small.gif

branches/new-structure-with-base2/ps-mdm-as/resources/wa/graphics/cancel_button.gif

branches/new-structure-with-base2/ps-mdm-as/resources/wa/graphics/create_resource_button.gif

branches/new-structure-with-base2/ps-mdm-as/resources/wa/graphics/delete_red_button.gif

branches/new-structure-with-base2/ps-mdm-as/resources/wa/graphics/edit_button.gif

branches/new-structure-with-base2/ps-mdm-as/resources/wa/graphics/edit_green_button.gif

branches/new-structure-with-base2/ps-mdm-as/resources/wa/graphics/login_panel.gif
branches/new-structure-with-base2/ps-mdm-as/resources/wa/graphics/logos.gif

branches/new-structure-with-base2/ps-mdm-as/resources/wa/graphics/logout_button.gif

branches/new-structure-with-base2/ps-mdm-as/resources/wa/graphics/manage_collections_off_tab.gif

branches/new-structure-with-base2/ps-mdm-as/resources/wa/graphics/manage_collections_on_tab.gif

branches/new-structure-with-base2/ps-mdm-as/resources/wa/graphics/manage_users_off_tab.gif

branches/new-structure-with-base2/ps-mdm-as/resources/wa/graphics/manage_users_on_tab.gif

branches/new-structure-with-base2/ps-mdm-as/resources/wa/graphics/perfsonar_logo.gif

branches/new-structure-with-base2/ps-mdm-as/resources/wa/graphics/step_1_bottom.gif

branches/new-structure-with-base2/ps-mdm-as/resources/wa/graphics/step_1_slice.gif

branches/new-structure-with-base2/ps-mdm-as/resources/wa/graphics/step_1_top.gif

branches/new-structure-with-base2/ps-mdm-as/resources/wa/graphics/step_2_bottom.gif

branches/new-structure-with-base2/ps-mdm-as/resources/wa/graphics/step_2_slice.gif

branches/new-structure-with-base2/ps-mdm-as/resources/wa/graphics/step_2_top.gif

branches/new-structure-with-base2/ps-mdm-as/resources/wa/graphics/testdepl_fail.gif

branches/new-structure-with-base2/ps-mdm-as/resources/wa/graphics/testdepl_main.gif

branches/new-structure-with-base2/ps-mdm-as/resources/wa/graphics/testdepl_return.gif

branches/new-structure-with-base2/ps-mdm-as/resources/wa/graphics/testdepl_startbn.gif

branches/new-structure-with-base2/ps-mdm-as/resources/wa/graphics/testdepl_succ.gif

branches/new-structure-with-base2/ps-mdm-as/resources/wa/graphics/top_slice.gif
branches/new-structure-with-base2/ps-mdm-as/resources/wa/scripts/

branches/new-structure-with-base2/ps-mdm-as/resources/wa/scripts/Service_Admin.js

branches/new-structure-with-base2/ps-mdm-as/resources/wa/scripts/wz_tooltip.js
branches/new-structure-with-base2/ps-mdm-as/resources/wa/soapMessages/

branches/new-structure-with-base2/ps-mdm-as/resources/wa/soapMessages/selfTest.xml
branches/new-structure-with-base2/ps-mdm-as/resources/wa/styles/
branches/new-structure-with-base2/ps-mdm-as/resources/wa/styles/default.css
branches/new-structure-with-base2/ps-mdm-as/resources/wa/styles/main.css
branches/new-structure-with-base2/ps-mdm-as/resources/wa/views/
branches/new-structure-with-base2/ps-mdm-as/resources/wa/views/banner.jsp

branches/new-structure-with-base2/ps-mdm-as/resources/wa/views/configurationSaved.jsp
branches/new-structure-with-base2/ps-mdm-as/resources/wa/views/error.jsp
branches/new-structure-with-base2/ps-mdm-as/resources/wa/views/footer.jsp

branches/new-structure-with-base2/ps-mdm-as/resources/wa/views/savedFailed.jsp
branches/new-structure-with-base2/ps-mdm-as/resources/wa/views/selfTest.jsp
branches/new-structure-with-base2/ps-mdm-as/resources/wa/views/sideBar.jsp
branches/new-structure-with-base2/ps-mdm-as/resources/wa/views/welcome.jsp
Modified:
branches/new-structure-with-base2/ps-mdm-as/conf/configuration.xml
branches/new-structure-with-base2/ps-mdm-as/doc/ChangeLog.txt
branches/new-structure-with-base2/ps-mdm-as/pom.xml

branches/new-structure-with-base2/ps-mdm-as/resources/axis2-1.4.1/webapp/WEB-INF/web.xml
Log:
- Adding: WA web elements
- Adding: WA configuration file
- Updating: pom.xml in order to add the WA dependencies

Modified: branches/new-structure-with-base2/ps-mdm-as/conf/configuration.xml
===================================================================
--- branches/new-structure-with-base2/ps-mdm-as/conf/configuration.xml
2010-04-01 15:11:09 UTC (rev 5575)
+++ branches/new-structure-with-base2/ps-mdm-as/conf/configuration.xml
2010-04-06 15:48:34 UTC (rev 5576)
@@ -5,7 +5,7 @@
<configuration xmlns="http://service.perfsonar.org/ns/config/base/0.9/";>

- <service name="PerfsonarService">
+ <service name="AuthService">


@@ -13,9 +13,9 @@


<lookupInformation>
- <option name="accessPoint"
value="http://localhost:8080/perfsonar-java-simple-service/services/AuthService"/>
+ <option name="accessPoint"
value="http://localhost:8080/perfsonar-java-as/services/AuthService"/>

- <option name="name" value="AuthService - Echo"/>
+ <option name="name" value="AuthService 1.3"/>
<option name="type" value="Echo"/>
</lookupInformation>

Added: branches/new-structure-with-base2/ps-mdm-as/conf/webAdminConfig.xml
===================================================================
--- branches/new-structure-with-base2/ps-mdm-as/conf/webAdminConfig.xml
(rev 0)
+++ branches/new-structure-with-base2/ps-mdm-as/conf/webAdminConfig.xml
2010-04-06 15:48:34 UTC (rev 5576)
@@ -0,0 +1,218 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+
+<wa:interface
+ xmlns:wa="http://webadmin.perfsonar.org/base2/waschema/v20090201";>
+
+ 
+ <wa:serviceInformation>
+
<wa:accessPoint>http://localhost:8180/perfsonar-java-as-2/services/AuthService</wa:accessPoint>
+ <wa:serviceName>Service Name</wa:serviceName>
+ <wa:version>1.23</wa:version>
+ </wa:serviceInformation>
+
+ 
+ <wa:credential>
+ <wa:username>perfsonaruser</wa:username>
+ <wa:password>perfsonarpass</wa:password>
+ </wa:credential>
+
+ <wa:basiclink>
+ <wa:pageId>basic</wa:pageId> 
+ <wa:title>Service settings</wa:title>
+ </wa:basiclink>
+
+ <wa:basiclink>
+ <wa:pageId>changePassword</wa:pageId> 
+ <wa:title>Change WA password</wa:title>
+ </wa:basiclink>
+
+ <wa:advancedlink>
+ <wa:pageId>advanced</wa:pageId> 
+ <wa:title>Advanced Service Settings</wa:title>
+ </wa:advancedlink>
+
+
+
+ <wa:map>
+
<wa:url>http://service.perfsonar.org/ns/config/base/0.9/</wa:url>
+ <wa:ns>ns1</wa:ns>
+ </wa:map>
+
+ <wa:map>
+
<wa:url>http://webadmin.perfsonar.org/base2/waschema/v20090201</wa:url>
+ <wa:ns>webAdmin</wa:ns>
+ </wa:map>
+
+ <wa:page>
+ <wa:pageId><wa:text>changePassword</wa:text></wa:pageId>
+ <wa:title><wa:text>Change Password</wa:text></wa:title>
+ <wa:plain>
+ <wa:textbox>
+ <wa:default>
+ <wa:xpath>
+
doc("classes/perfsonar/conf/webAdminConfig.xml")//webAdmin:interface/webAdmin:credential/webAdmin:username
+ </wa:xpath>
+ </wa:default>
+
<wa:title><wa:text>username</wa:text></wa:title>
+ </wa:textbox>
+ </wa:plain>
+ <wa:plain>
+ <wa:password>
+ <wa:default>
+ <wa:xpath>
+
doc("classes/perfsonar/conf/webAdminConfig.xml")//webAdmin:interface/webAdmin:credential/webAdmin:password
+ </wa:xpath>
+ </wa:default>
+
<wa:title><wa:text>password</wa:text></wa:title>
+ </wa:password>
+ </wa:plain>
+ </wa:page>
+
+ <wa:page>
+ <wa:pageId><wa:text>basic</wa:text></wa:pageId>
+ <wa:title><wa:text>Title of this page</wa:text></wa:title>
+ <wa:plain>
+ <wa:textbox>
+ <wa:default>
+ <wa:xpath>
+
doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="AuthService"]/ns1:lookupInformation/ns1:option[@name="accessPoint"]/@value
+ </wa:xpath>
+ </wa:default>
+ <wa:title><wa:text>Access
point</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="AuthService"]/ns1:lookupInformation/ns1:option[@name="name"]/@value
+ </wa:xpath>
+ </wa:default>
+ <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="AuthService"]/ns1:lookupInformation/ns1:option[@name="type"]/@value
+ </wa:xpath>
+ </wa:default>
+ <wa:title><wa:text>Service
type</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="AuthService"]/ns1:extension[@name="auth-engine"]/ns1:option[@name="service.as.maxttl"]/@value
+ </wa:xpath>
+ </wa:default>
+ <wa:title><wa:text>Allowed
TTL</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="AuthService"]/ns1:extension[@name="auth-engine"]/ns1:option[@name="service.as.truststore_file"]/@value
+ </wa:xpath>
+ </wa:default>
+ <wa:title><wa:text>Truststore
file</wa:text></wa:title>
+ </wa:textbox>
+ </wa:plain>
+
+ <wa:plain>
+ <wa:password>
+ <wa:default>
+ <wa:xpath>
+
doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="AuthService"]/ns1:extension[@name="auth-engine"]/ns1:option[@name="service.as.truststore_password"]/@value
+ </wa:xpath>
+ </wa:default>
+ <wa:title><wa:text>Truststore
password</wa:text></wa:title>
+ </wa:password>
+ </wa:plain>
+
+ <wa:plain>
+ <wa:textbox>
+ <wa:default>
+ <wa:xpath>
+
doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="AuthService"]/ns1:extension[@name="authr-engine"]/ns1:option[@name="service.as.authr_policy"]/@value
+ </wa:xpath>
+ </wa:default>
+ <wa:title><wa:text>Authorization policy
file</wa:text></wa:title>
+ </wa:textbox>
+ </wa:plain>
+
+
+
+ </wa:page>
+
+ <wa:page>
+ <wa:pageId><wa:text>advanced</wa:text></wa:pageId>
+ <wa:title><wa:text>Advanced configuration</wa:text></wa:title>
+
+ <wa:plain>
+ <wa:textbox>
+ <wa:default>
+ <wa:xpath>
+
doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="AuthService"]/ns1:extension[@name="auth-engine"]/ns1:option[@name="service.as.crypt_provider"]/@value
+ </wa:xpath>
+ </wa:default>
+ <wa:title><wa:text>Crypto
provider</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="AuthService"]/ns1:extension[@name="auth-engine"]/ns1:option[@name="service.as.valid_components"]/@value
+ </wa:xpath>
+ </wa:default>
+ <wa:title><wa:text>eduGAIN valid components
file</wa:text></wa:title>
+ </wa:textbox>
+ </wa:plain>
+
+
+ </wa:page>
+
+
+</wa:interface>

Property changes on:
branches/new-structure-with-base2/ps-mdm-as/conf/webAdminConfig.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain

Modified: branches/new-structure-with-base2/ps-mdm-as/doc/ChangeLog.txt
===================================================================
--- branches/new-structure-with-base2/ps-mdm-as/doc/ChangeLog.txt
2010-04-01 15:11:09 UTC (rev 5575)
+++ branches/new-structure-with-base2/ps-mdm-as/doc/ChangeLog.txt
2010-04-06 15:48:34 UTC (rev 5576)
@@ -1,5 +1,12 @@
AS ChangeLog

+2010-03-04 Version 1.3rc1
+- New: Use of new base library (base2)
+- Change: Removed WebAdmin
+- Change: Directory structure changed
+- Change: Url changed
+- Change: Configuration files changed
+
2009-07-06 Version 1.2
- Change the name of the package

Modified: branches/new-structure-with-base2/ps-mdm-as/pom.xml
===================================================================
--- branches/new-structure-with-base2/ps-mdm-as/pom.xml 2010-04-01 15:11:09
UTC (rev 5575)
+++ branches/new-structure-with-base2/ps-mdm-as/pom.xml 2010-04-06 15:48:34
UTC (rev 5576)
@@ -1,333 +1,378 @@
<?xml version="1.0" encoding="UTF-8"?>

-

- </description>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>

--->
+ <properties>
+ <configurationFile>configuration.xml</configurationFile>
+ <axis2Id>axis2-1.4.1</axis2Id>
+ </properties>

-<project xmlns="http://maven.apache.org/POM/4.0.0";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>perfsonar</groupId>
+ <artifactId>perfsonar-java-as</artifactId>
+ <packaging>war</packaging>
+ <name>Authentication and Authorization Service</name>
+ <version>1.2</version>
+ <description>Authentication and Authorization Service</description>
+ <url>http://wiki.perfsonar.net</url>

- <properties>
- <configurationFile>configuration.xml</configurationFile>
- <axis2Id>axis2-1.4.1</axis2Id>
- </properties>
+ <issueManagement>
+ <system>bugzilla</system>
+ <url>http://bugzilla.perfsonar.net</url>
+ </issueManagement>

- <modelVersion>4.0.0</modelVersion>
- <groupId>perfsonar</groupId>
- <artifactId>perfsonar-java-as</artifactId>
- <packaging>war</packaging>
- <name>Authentication and Authorization Service</name>
- <version>1.2</version>
- <description>Authentication and Authorization Service</description>
- <url>http://wiki.perfsonar.net</url>
+ <inceptionYear>2009</inceptionYear>

- <issueManagement>
- <system>bugzilla</system>
- <url>http://bugzilla.perfsonar.net</url>
- </issueManagement>
+ <scm>
+ <connection>scm:svn:anonsvn.internet2.edu/svn/</connection>
+
<developerConnection>scm:svn:svn.internet2.edu/svn/perfsonar/</developerConnection>
+ </scm>

- <inceptionYear>2009</inceptionYear>
+ <organization>
+ <name>perfSONAR</name>
+ <url>http://www.perfsonar.net</url>
+ </organization>

- <scm>
- <connection>scm:svn:anonsvn.internet2.edu/svn/</connection>
-
<developerConnection>scm:svn:svn.internet2.edu/svn/perfsonar/</developerConnection>
- </scm>
+ <build>

- <organization>
- <name>perfSONAR</name>
- <url>http://www.perfsonar.net</url>
- </organization>
+ <sourceDirectory>${basedir}/src/main/java</sourceDirectory>
+
<testSourceDirectory>${basedir}/src/test/java</testSourceDirectory>
+ <outputDirectory>${basedir}/bin</outputDirectory>
+ <directory>${basedir}/build</directory>
+ <finalName>${project.artifactId}</finalName>

- <build>
+ <plugins>

- <sourceDirectory>${basedir}/src/main/java</sourceDirectory>
- <testSourceDirectory>${basedir}/src/test/java</testSourceDirectory>
- <outputDirectory>${basedir}/bin</outputDirectory>
- <directory>${basedir}/build</directory>
- <finalName>${project.artifactId}</finalName>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>

- <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>create-configuration</id>
+
<phase>process-resources</phase>
+ <configuration>
+ <tasks>
+ <delete
dir="${basedir}/conf/tmp" failonerror="false" />
+ <copy
file="${basedir}/conf/${configurationFile}" todir="${basedir}/conf/tmp" />
+ <move
file="${basedir}/conf/tmp/${configurationFile}"
+
tofile="${basedir}/conf/tmp/configuration.xml" />
+ <copy
file="${basedir}/conf/configuration-rules.xml" todir="${basedir}/conf/tmp" />
+ <copy
file="${basedir}/conf/perfSONARtruststore.jks" todir="${basedir}/conf/tmp" />
+ <copy
file="${basedir}/conf/ASValidComponentsFile" todir="${basedir}/conf/tmp" />
+ <copy
file="${basedir}/conf/basic_policy.xml" todir="${basedir}/conf/tmp" />
+ <copy
file="${basedir}/conf/webAdminConfig.xml" todir="${basedir}/conf/tmp" />
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>create-aar</id>
+ <phase>compile</phase>
+ <configuration>
+ <tasks>
+ <property
name="aar.name" value="${project.artifactId}" />
+ <copy
toDir="${basedir}/bin" failonerror="false">
+
<fileset dir="${basedir}/conf/axis2">
+
<include name="**/*.xml" />
+
</fileset>
+ </copy>
+ <mkdir
dir="${project.build.directory}" />
+ <jar
destfile="${basedir}/build/${aar.name}.aar">
+
<fileset includes="**/Axis2PerfsonarServiceConnPoint.class **/*.xml"
+
dir="${basedir}/bin" />
+ </jar>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>

- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
+ <plugin>
+ <artifactId>maven-war-plugin</artifactId>
+ <configuration>
+ <webResources>
+ <resource>
+
<directory>${basedir}/conf/tmp</directory>
+ <includes>
+
<include>**/*</include>
+ </includes>
+
<targetPath>WEB-INF/classes/perfsonar/conf</targetPath>
+ </resource>
+ <resource>
+
<directory>${basedir}/build</directory>
+ <includes>
+
<include>**/*.aar</include>
+ </includes>
+
<targetPath>WEB-INF/services</targetPath>
+ </resource>
+ <resource>
+
<directory>${basedir}/resources/${axis2Id}/webapp/axis2-web</directory>
+ <includes>
+
<include>**/*</include>
+ </includes>
+
<targetPath>axis2-web</targetPath>
+ </resource>
+ <resource>
+
<directory>${basedir}/resources/${axis2Id}/repository/modules</directory>
+ <includes>
+
<include>**/*</include>
+ </includes>
+
<targetPath>WEB-INF/modules</targetPath>
+ </resource>
+ <resource>
+
<directory>${basedir}/resources/${axis2Id}/conf</directory>
+ <includes>
+
<include>**/*.xml</include>
+ </includes>
+
<targetPath>WEB-INF/conf</targetPath>
+ </resource>
+ <resource>
+
<directory>${basedir}/conf</directory>
+ <includes>
+
<include>**/log4j.xml</include>
+
<include>**/log4j.properties</include>
+ </includes>
+
<targetPath>WEB-INF/classes</targetPath>
+ </resource>
+ <resource>
+
<directory>${basedir}/resources/wa</directory>
+ <includes>
+
<include>**/*</include>
+ </includes>
+
<targetPath>wa</targetPath>
+ </resource>
+ <resource>
+
<file>${basedir}/resources/index.jsp</file>
+
<targetPath>index.jsp</targetPath>
+ </resource>
+ </webResources>
+
<webXml>${basedir}/resources/${axis2Id}/webapp/WEB-INF/web.xml</webXml>
+ </configuration>
+ </plugin>

- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <id>create-configuration</id>
- <phase>process-resources</phase>
- <configuration>
- <tasks>
- <delete dir="${basedir}/conf/tmp" failonerror="false"/>
- <copy file="${basedir}/conf/${configurationFile}"
todir="${basedir}/conf/tmp"/>
- <move file="${basedir}/conf/tmp/${configurationFile}"
tofile="${basedir}/conf/tmp/configuration.xml"/>
- <copy file="${basedir}/conf/configuration-rules.xml"
todir="${basedir}/conf/tmp"/>
- <copy file="${basedir}/conf/perfSONARtruststore.jks"
todir="${basedir}/conf/tmp"/>
- <copy file="${basedir}/conf/ASValidComponentsFile"
todir="${basedir}/conf/tmp"/>
- <copy file="${basedir}/conf/basic_policy.xml"
todir="${basedir}/conf/tmp"/>
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- <execution>
- <id>create-aar</id>
- <phase>compile</phase>
- <configuration>
- <tasks>
- <property name="aar.name" value="${project.artifactId}"/>
- <copy toDir="${basedir}/bin" failonerror="false">
- <fileset dir="${basedir}/conf/axis2">
- <include name="**/*.xml"/>
- </fileset>
- </copy>
- <mkdir dir="${project.build.directory}"/>
- <jar destfile="${basedir}/build/${aar.name}.aar">
- <fileset includes="**/Axis2PerfsonarServiceConnPoint.class
**/*.xml" dir="${basedir}/bin"/>
- </jar>
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
+ 
+ <plugin>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>maven-jetty-plugin</artifactId>
+ <configuration>
+
<webApp>${project.build.directory}/${project.artifactId}</webApp>
+ </configuration>
+ </plugin>
+ </plugins>

- <plugin>
- <artifactId>maven-war-plugin</artifactId>
- <configuration>
- <webResources>
- <resource>
- <directory>${basedir}/conf/tmp</directory>
- <includes>
- <include>**/*</include>
- </includes>
- <targetPath>WEB-INF/classes/perfsonar/conf</targetPath>
- </resource>
- <resource>
- <directory>${basedir}/build</directory>
- <includes>
- <include>**/*.aar</include>
- </includes>
- <targetPath>WEB-INF/services</targetPath>
- </resource>
- <resource>
-
<directory>${basedir}/resources/${axis2Id}/webapp/axis2-web</directory>
- <includes>
- <include>**/*</include>
- </includes>
- <targetPath>axis2-web</targetPath>
- </resource>
- <resource>
-
<directory>${basedir}/resources/${axis2Id}/repository/modules</directory>
- <includes>
- <include>**/*</include>
- </includes>
- <targetPath>WEB-INF/modules</targetPath>
- </resource>
- <resource>
- <directory>${basedir}/resources/${axis2Id}/conf</directory>
- <includes>
- <include>**/*.xml</include>
- </includes>
- <targetPath>WEB-INF/conf</targetPath>
- </resource>
- <resource>
- <directory>${basedir}/conf</directory>
- <includes>
- <include>**/log4j.xml</include>
- <include>**/log4j.properties</include>
- </includes>
- <targetPath>WEB-INF/classes</targetPath>
- </resource>
- </webResources>
-
<webXml>${basedir}/resources/${axis2Id}/webapp/WEB-INF/web.xml</webXml>
- </configuration>
- </plugin>
+ </build>

- 
- <plugin>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>maven-jetty-plugin</artifactId>
- <configuration>
- <webApp>${project.build.directory}/${project.artifactId}</webApp>
- </configuration>
- </plugin>
- </plugins>
+ <repositories>
+ <repository>
+ <id>ibiblio</id>
+ <name>ibiblio repository</name>
+ <url>http://www.ibiblio.org/maven2</url>
+ </repository>
+ <repository>
+ <id>personar</id>
+ <name>personar repository</name>
+
<url>http://anonsvn.internet2.edu/svn/perfsonar/trunk/jar-repository/</url>
+ </repository>
+ <repository>
+ <id>personar_leg</id>
+ <name>personar repository</name>
+
<url>http://anonsvn.internet2.edu/svn/perfsonar/trunk/jar-repository/</url>
+ <layout>legacy</layout>
+ </repository>
+ <repository>
+ <id>shibboleth</id>
+ <name>shibboleth repository</name>
+
<url>http://shibboleth.internet2.edu/downloads/maven2/</url>
+ </repository>
+ <repository>
+ <id>codehaus-release-repo</id>
+ <name>Codehaus Release Repo</name>
+ <url>http://repository.codehaus.org</url>
+ </repository>
+ </repositories>

- </build>
+ <dependencies>
+ <dependency>
+ <groupId>perfsonar</groupId>
+ <artifactId>ps-mdm-base2</artifactId>
+ <version>0.0.4</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-digester</groupId>
+ <artifactId>commons-digester</artifactId>
+ <version>2.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-jaxws</artifactId>
+ <version>1.4.1</version>
+ </dependency>

- <repositories>
- <repository>
- <id>ibiblio</id>
- <name>ibiblio repository</name>
- <url>http://www.ibiblio.org/maven2</url>
- </repository>
- <repository>
- <id>personar</id>
- <name>personar repository</name>
-
<url>http://anonsvn.internet2.edu/svn/perfsonar/trunk/jar-repository/</url>
- </repository>
- <repository>
- <id>personar_leg</id>
- <name>personar repository</name>
-
<url>http://anonsvn.internet2.edu/svn/perfsonar/trunk/jar-repository/</url>
- <layout>legacy</layout>
- </repository>
- <repository>
- <id>shibboleth</id>
- <name>shibboleth repository</name>
- <url>http://shibboleth.internet2.edu/downloads/maven2/</url>
- </repository>
- <repository>
- <id>codehaus-release-repo</id>
- <name>Codehaus Release Repo</name>
- <url>http://repository.codehaus.org</url>
- </repository>
- </repositories>
+ 
+ <dependency>
+ <groupId>perfsonar</groupId>
+ <artifactId>perfsonar-authr</artifactId>
+ <version>0.5</version>
+ </dependency>
+ <dependency>
+ <groupId>opensaml</groupId>
+ <artifactId>opensaml1</artifactId>
+ <version>1.1</version>
+ </dependency>
+ <dependency>
+ <groupId>bouncycastle</groupId>
+ <artifactId>bcprov-jdk15</artifactId>
+ <version>124</version>
+ </dependency>
+ <dependency>
+ <groupId>xml-security</groupId>
+ <artifactId>xmlsec</artifactId>
+ <version>1.3.0</version>
+ </dependency>
+ <dependency>
+ <groupId>edugain</groupId>
+ <artifactId>edugain</artifactId>
+ <version>1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>1.5.6</version>
+ </dependency>
+ <dependency>
+ <groupId>org.opensaml</groupId>
+ <artifactId>opensaml</artifactId>
+ <version>2.2.3</version>
+ </dependency>
+ <dependency>
+ <groupId>xmltooling</groupId>
+ <artifactId>xmltooling</artifactId>
+ <version>1.2.0</version>
+ </dependency>
+ <dependency>
+ <groupId>wss4j</groupId>
+ <artifactId>wss4j</artifactId>
+ <version>1.5.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.rampart</groupId>
+ <artifactId>rampart-core</artifactId>
+ <version>1.4</version>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xacml</groupId>
+ <artifactId>sunxacml</artifactId>
+ <version>1.2</version>
+ </dependency>

- <dependencies>
- <dependency>
- <groupId>perfsonar</groupId>
- <artifactId>ps-mdm-base2</artifactId>
- <version>0.0.3</version>
- </dependency>
- <dependency>
- <groupId>commons-digester</groupId>
- <artifactId>commons-digester</artifactId>
- <version>2.0</version>
- </dependency>
- <dependency>
- <groupId>org.apache.axis2</groupId>
- <artifactId>axis2-jaxws</artifactId>
- <version>1.4.1</version>
- </dependency>
+ 
+ <dependency>
+ <groupId>perfsonar</groupId>
+ <artifactId>perfsonar-web-admin</artifactId>
+ <version>0.1</version>
+ </dependency>
+ <dependency>
+ <groupId>jaxme</groupId>
+ <artifactId>jaxme2</artifactId>
+ <version>0.5.1</version>
+ </dependency>
+ <dependency>
+ <groupId>jaxme</groupId>
+ <artifactId>jaxmeapi</artifactId>
+ <version>0.5.1</version>
+ </dependency>
+ <dependency>
+ <groupId>jaxme</groupId>
+ <artifactId>jaxmexs</artifactId>
+ <version>0.5.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
+ <version>4.0.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpcore</artifactId>
+ <version>4.0.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpcore-nio</artifactId>
+ <version>4.0.1</version>
+ </dependency>
+ </dependencies>

- 
- <dependency>
- <groupId>perfsonar</groupId>
- <artifactId>perfsonar-authr</artifactId>
- <version>0.5</version>
- </dependency>
- <dependency>
- <groupId>opensaml</groupId>
- <artifactId>opensaml1</artifactId>
- <version>1.1</version>
- </dependency>
- <dependency>
- <groupId>bouncycastle</groupId>
- <artifactId>bcprov-jdk15</artifactId>
- <version>124</version>
- </dependency>
- <dependency>
- <groupId>xml-security</groupId>
- <artifactId>xmlsec</artifactId>
- <version>1.3.0</version>
- </dependency>
- <dependency>
- <groupId>edugain</groupId>
- <artifactId>edugain</artifactId>
- <version>1.0</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>1.5.6</version>
- </dependency>
- <dependency>
- <groupId>org.opensaml</groupId>
- <artifactId>opensaml</artifactId>
- <version>2.2.3</version>
- </dependency>
- <dependency>
- <groupId>xmltooling</groupId>
- <artifactId>xmltooling</artifactId>
- <version>1.2.0</version>
- </dependency>
- <dependency>
- <groupId>wss4j</groupId>
- <artifactId>wss4j</artifactId>
- <version>1.5.1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.rampart</groupId>
- <artifactId>rampart-core</artifactId>
- <version>1.4</version>
- </dependency>
- <dependency>
- <groupId>com.sun.xacml</groupId>
- <artifactId>sunxacml</artifactId>
- <version>1.2</version>
- </dependency>
+ <reporting>
+ <excludeDefaults>true</excludeDefaults>
+ <outputDirectory>${basedir}/doc/site</outputDirectory>
+ <plugins>
+ <plugin>
+
<artifactId>maven-project-info-reports-plugin</artifactId>
+ <reportSets>
+ <reportSet>
+ <reports>
+ <report>index</report>
+
<report>summary</report>
+
<report>project-team</report>
+
<report>dependencies</report>
+
<report>mailing-list</report>
+
<report>issue-tracking</report>
+ <report>scm</report>
+ </reports>
+ </reportSet>
+ </reportSets>
+ </plugin>
+ <plugin>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <artifactId>maven-jxr-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>taglist-maven-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>javancss-maven-plugin</artifactId>
+ <configuration>
+
<failOnViolation>false</failOnViolation>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-pmd-plugin</artifactId>
+ <configuration>
+ <linkXref>true</linkXref>
+ <sourceEncoding>utf-8</sourceEncoding>
+ <minimumTokens>100</minimumTokens>
+ <targetJdk>1.5</targetJdk>
+ </configuration>
+ </plugin>
+ </plugins>
+ </reporting>

- </dependencies>
-
- <reporting>
- <excludeDefaults>true</excludeDefaults>
- <outputDirectory>${basedir}/doc/site</outputDirectory>
- <plugins>
- <plugin>
- <artifactId>maven-project-info-reports-plugin</artifactId>
- <reportSets>
- <reportSet>
- <reports>
- <report>index</report>
- <report>summary</report>
- <report>project-team</report>
- <report>dependencies</report>
- <report>mailing-list</report>
- <report>issue-tracking</report>
- <report>scm</report>
- </reports>
- </reportSet>
- </reportSets>
- </plugin>
- <plugin>
- <artifactId>maven-javadoc-plugin</artifactId>
- </plugin>
- <plugin>
- <artifactId>maven-jxr-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>taglist-maven-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>javancss-maven-plugin</artifactId>
- <configuration>
- <failOnViolation>false</failOnViolation>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-pmd-plugin</artifactId>
- <configuration>
- <linkXref>true</linkXref>
- <sourceEncoding>utf-8</sourceEncoding>
- <minimumTokens>100</minimumTokens>
- <targetJdk>1.5</targetJdk>
- </configuration>
- </plugin>
- </plugins>
- </reporting>
-
</project>

Modified:
branches/new-structure-with-base2/ps-mdm-as/resources/axis2-1.4.1/webapp/WEB-INF/web.xml
===================================================================
---
branches/new-structure-with-base2/ps-mdm-as/resources/axis2-1.4.1/webapp/WEB-INF/web.xml
2010-04-01 15:11:09 UTC (rev 5575)
+++
branches/new-structure-with-base2/ps-mdm-as/resources/axis2-1.4.1/webapp/WEB-INF/web.xml
2010-04-06 15:48:34 UTC (rev 5576)
@@ -1,23 +1,19 @@
<?xml version="1.0" encoding="ISO-8859-1"?>

-
+ 

<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application
2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd";>

@@ -70,12 +66,32 @@
<mime-type>text/plain</mime-type>
</mime-mapping>

- <welcome-file-list>
- <welcome-file>index.jsp</welcome-file>
- <welcome-file>index.html</welcome-file>
- <welcome-file>/axis2-web/index.jsp</welcome-file>
- </welcome-file-list>
+ 
+ <servlet>
+ <servlet-name>BasicConfiguration</servlet-name>
+
<servlet-class>org.perfsonar.webadmin.base2.servlet.BasicConfigurationServlet</servlet-class>
+ </servlet>

+ <servlet-mapping>
+ <servlet-name>BasicConfiguration</servlet-name>
+ <url-pattern>/config</url-pattern>
+ </servlet-mapping>
+
+ 
+ <servlet>
+ <servlet-name>SelfTestServlet</servlet-name>
+
<servlet-class>org.perfsonar.webadmin.base2.servlet.SelfTestServlet</servlet-class>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>SelfTestServlet</servlet-name>
+ <url-pattern>/selfTest</url-pattern>
+ </servlet-mapping>
+
+ <welcome-file-list>
+ <welcome-file>index.jsp</welcome-file>
+ </welcome-file-list>
+
<error-page>
<error-code>404</error-code>
<location>/axis2-web/Error/error404.jsp</location>

Added: branches/new-structure-with-base2/ps-mdm-as/resources/index.jsp
===================================================================
--- branches/new-structure-with-base2/ps-mdm-as/resources/index.jsp
(rev 0)
+++ branches/new-structure-with-base2/ps-mdm-as/resources/index.jsp
2010-04-06 15:48:34 UTC (rev 5576)
@@ -0,0 +1,70 @@
+<%@page

import="org.perfsonar.webadmin.base2.servlet.util.ConfigurationServletHelper"%>
+<%@page
import="org.perfsonar.webadmin.base2.config.HTMLGenerator"%>
+
+<html>
+ <head>
+ <title>perfSONAR Service Web Administration page</title>
+ <link rel="stylesheet" type="text/css" href="wa/styles/main.css"/>
+ <link rel="stylesheet" type="text/css" href="wa/styles/default.css"/>
+ <meta http-equiv="Content-Type" content="text/html;
charset=iso-8859-1">
+ <script src="wa/scripts/Service_Admin.js"></script>
+ </head>
+ <body>
+ <script src="wa/scripts/wz_tooltip.js"></script>
+ <%
+ HTMLGenerator htmlGenerator=new HTMLGenerator();
+ org.perfsonar.webadmin.base2.config.ObjectMap map =
ConfigurationServletHelper.objectMap(getServletContext());
+ String[] menuBasicLinks=htmlGenerator.getBasicLinks(map,false);
+ String[] menuAdvancedLinks=htmlGenerator.getAdvancedLinks(map,false);
+ String[] mainBasicLinks=htmlGenerator.getBasicLinks(map,true);
+ String[] mainAdvancedLinks=htmlGenerator.getAdvancedLinks(map,true);
+ String serviceName=htmlGenerator.getServiceName(map);
+ String serviceVersion=htmlGenerator.getVersion(map);
+ %>
+
+ <div class="adminPanel">
+ <div class="banner">
+
<%@include
file="wa/views/banner.jsp"%>
+ </div>
+ <div class="mainWindow">
+ <div class="sidebar">
+
<%@include
file="wa/views/sideBar.jsp"%>
+ </div>
+ <div class="centerWindow">
+ <%
+ String pageParam =
request.getParameter("page");
+ if(map==null){
+ %>
+ <jsp:include page="wa/views/error.jsp"/>
+
+ <%
+ }else if(pageParam != null &&
pageParam.equals("save")){
+ %>
+
+ <% if(request.getParameter("ok")!=null){ %>
+ <jsp:include
page="wa/views/configurationSaved.jsp"/>
+ <% }else { %>
+ <jsp:include
page="wa/views/savedFailed.jsp"/>
+ <% } %>
+
+ <%
+ }else if(pageParam != null &&
pageParam.equals("form")){
+
out.println(request.getAttribute("form"));
+ }else if(pageParam != null &&
pageParam.equals("selfTest")){
+ %>
+
<%@include
file="wa/views/selfTest.jsp" %>
+ <%
+ }else{
+ %>
+
<%@include
file="wa/views/welcome.jsp" %>
+ <%
+ }
+ %>
+ </div>
+ </div>
+ <div class="footer">
+ <jsp:include page="wa/views/footer.jsp"/>
+ </div>
+ </div>
+ </body>
+</html>

Property changes on:
branches/new-structure-with-base2/ps-mdm-as/resources/index.jsp
___________________________________________________________________
Name: svn:mime-type
+ text/plain

Added:
branches/new-structure-with-base2/ps-mdm-as/resources/wa/graphics/admin_home_target.gif
===================================================================
(Binary files differ)

Property changes on:
branches/new-structure-with-base2/ps-mdm-as/resources/wa/graphics/admin_home_target.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream

Added:
branches/new-structure-with-base2/ps-mdm-as/resources/wa/graphics/apply_button.gif
===================================================================
(Binary files differ)

Property changes on:
branches/new-structure-with-base2/ps-mdm-as/resources/wa/graphics/apply_button.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream

Added:
branches/new-structure-with-base2/ps-mdm-as/resources/wa/graphics/apply_button_2.gif
===================================================================
(Binary files differ)

Property changes on:
branches/new-structure-with-base2/ps-mdm-as/resources/wa/graphics/apply_button_2.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream

Added:
branches/new-structure-with-base2/ps-mdm-as/resources/wa/graphics/arrow_icon.gif
===================================================================
(Binary files differ)

Property changes on:
branches/new-structure-with-base2/ps-mdm-as/resources/wa/graphics/arrow_icon.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream

Added:
branches/new-structure-with-base2/ps-mdm-as/resources/wa/graphics/arrow_icon2.gif
===================================================================
(Binary files differ)

Property changes on:
branches/new-structure-with-base2/ps-mdm-as/resources/wa/graphics/arrow_icon2.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream

Added:
branches/new-structure-with-base2/ps-mdm-as/resources/wa/graphics/button_1_large.gif
===================================================================
(Binary files differ)

Property changes on:
branches/new-structure-with-base2/ps-mdm-as/resources/wa/graphics/button_1_large.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream

Added:
branches/new-structure-with-base2/ps-mdm-as/resources/wa/graphics/button_1_small.gif
===================================================================
(Binary files differ)

Property changes on:
branches/new-structure-with-base2/ps-mdm-as/resources/wa/graphics/button_1_small.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream

Added:
branches/new-structure-with-base2/ps-mdm-as/resources/wa/graphics/button_2_large.gif
===================================================================
(Binary files differ)

Property changes on:
branches/new-structure-with-base2/ps-mdm-as/resources/wa/graphics/button_2_large.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream

Added:
branches/new-structure-with-base2/ps-mdm-as/resources/wa/graphics/button_2_small.gif
===================================================================
(Binary files differ)

Property changes on:
branches/new-structure-with-base2/ps-mdm-as/resources/wa/graphics/button_2_small.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream

Added:
branches/new-structure-with-base2/ps-mdm-as/resources/wa/graphics/cancel_button.gif
===================================================================
(Binary files differ)

Property changes on:
branches/new-structure-with-base2/ps-mdm-as/resources/wa/graphics/cancel_button.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream

Added:
branches/new-structure-with-base2/ps-mdm-as/resources/wa/graphics/create_resource_button.gif
===================================================================
(Binary files differ)

Property changes on:
branches/new-structure-with-base2/ps-mdm-as/resources/wa/graphics/create_resource_button.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream

Added:
branches/new-structure-with-base2/ps-mdm-as/resources/wa/graphics/delete_red_button.gif
===================================================================
(Binary files differ)

Property changes on:
branches/new-structure-with-base2/ps-mdm-as/resources/wa/graphics/delete_red_button.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream

Added:
branches/new-structure-with-base2/ps-mdm-as/resources/wa/graphics/edit_button.gif
===================================================================
(Binary files differ)

Property changes on:
branches/new-structure-with-base2/ps-mdm-as/resources/wa/graphics/edit_button.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream

Added:
branches/new-structure-with-base2/ps-mdm-as/resources/wa/graphics/edit_green_button.gif
===================================================================
(Binary files differ)

Property changes on:
branches/new-structure-with-base2/ps-mdm-as/resources/wa/graphics/edit_green_button.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream

Added:
branches/new-structure-with-base2/ps-mdm-as/resources/wa/graphics/login_panel.gif
===================================================================
(Binary files differ)

Property changes on:
branches/new-structure-with-base2/ps-mdm-as/resources/wa/graphics/login_panel.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream

Added:
branches/new-structure-with-base2/ps-mdm-as/resources/wa/graphics/logos.gif
===================================================================
(Binary files differ)

Property changes on:
branches/new-structure-with-base2/ps-mdm-as/resources/wa/graphics/logos.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream

Added:
branches/new-structure-with-base2/ps-mdm-as/resources/wa/graphics/logout_button.gif
===================================================================
(Binary files differ)

Property changes on:
branches/new-structure-with-base2/ps-mdm-as/resources/wa/graphics/logout_button.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream

Added:
branches/new-structure-with-base2/ps-mdm-as/resources/wa/graphics/manage_collections_off_tab.gif
===================================================================
(Binary files differ)

Property changes on:
branches/new-structure-with-base2/ps-mdm-as/resources/wa/graphics/manage_collections_off_tab.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream

Added:
branches/new-structure-with-base2/ps-mdm-as/resources/wa/graphics/manage_collections_on_tab.gif
===================================================================
(Binary files differ)

Property changes on:
branches/new-structure-with-base2/ps-mdm-as/resources/wa/graphics/manage_collections_on_tab.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream

Added:
branches/new-structure-with-base2/ps-mdm-as/resources/wa/graphics/manage_users_off_tab.gif
===================================================================
(Binary files differ)

Property changes on:
branches/new-structure-with-base2/ps-mdm-as/resources/wa/graphics/manage_users_off_tab.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream

Added:
branches/new-structure-with-base2/ps-mdm-as/resources/wa/graphics/manage_users_on_tab.gif
===================================================================
(Binary files differ)

Property changes on:
branches/new-structure-with-base2/ps-mdm-as/resources/wa/graphics/manage_users_on_tab.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream

Added:
branches/new-structure-with-base2/ps-mdm-as/resources/wa/graphics/perfsonar_logo.gif
===================================================================
(Binary files differ)

Property changes on:
branches/new-structure-with-base2/ps-mdm-as/resources/wa/graphics/perfsonar_logo.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream

Added:
branches/new-structure-with-base2/ps-mdm-as/resources/wa/graphics/step_1_bottom.gif
===================================================================
(Binary files differ)

Property changes on:
branches/new-structure-with-base2/ps-mdm-as/resources/wa/graphics/step_1_bottom.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream

Added:
branches/new-structure-with-base2/ps-mdm-as/resources/wa/graphics/step_1_slice.gif
===================================================================
(Binary files differ)

Property changes on:
branches/new-structure-with-base2/ps-mdm-as/resources/wa/graphics/step_1_slice.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream

Added:
branches/new-structure-with-base2/ps-mdm-as/resources/wa/graphics/step_1_top.gif
===================================================================
(Binary files differ)

Property changes on:
branches/new-structure-with-base2/ps-mdm-as/resources/wa/graphics/step_1_top.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream

Added:
branches/new-structure-with-base2/ps-mdm-as/resources/wa/graphics/step_2_bottom.gif
===================================================================
(Binary files differ)

Property changes on:
branches/new-structure-with-base2/ps-mdm-as/resources/wa/graphics/step_2_bottom.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream

Added:
branches/new-structure-with-base2/ps-mdm-as/resources/wa/graphics/step_2_slice.gif
===================================================================
(Binary files differ)

Property changes on:
branches/new-structure-with-base2/ps-mdm-as/resources/wa/graphics/step_2_slice.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream

Added:
branches/new-structure-with-base2/ps-mdm-as/resources/wa/graphics/step_2_top.gif
===================================================================
(Binary files differ)

Property changes on:
branches/new-structure-with-base2/ps-mdm-as/resources/wa/graphics/step_2_top.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream

Added:
branches/new-structure-with-base2/ps-mdm-as/resources/wa/graphics/testdepl_fail.gif
===================================================================
(Binary files differ)

Property changes on:
branches/new-structure-with-base2/ps-mdm-as/resources/wa/graphics/testdepl_fail.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream

Added:
branches/new-structure-with-base2/ps-mdm-as/resources/wa/graphics/testdepl_main.gif
===================================================================
(Binary files differ)

Property changes on:
branches/new-structure-with-base2/ps-mdm-as/resources/wa/graphics/testdepl_main.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream

Added:
branches/new-structure-with-base2/ps-mdm-as/resources/wa/graphics/testdepl_return.gif
===================================================================
(Binary files differ)

Property changes on:
branches/new-structure-with-base2/ps-mdm-as/resources/wa/graphics/testdepl_return.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream

Added:
branches/new-structure-with-base2/ps-mdm-as/resources/wa/graphics/testdepl_startbn.gif
===================================================================
(Binary files differ)

Property changes on:
branches/new-structure-with-base2/ps-mdm-as/resources/wa/graphics/testdepl_startbn.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream

Added:
branches/new-structure-with-base2/ps-mdm-as/resources/wa/graphics/testdepl_succ.gif
===================================================================
(Binary files differ)

Property changes on:
branches/new-structure-with-base2/ps-mdm-as/resources/wa/graphics/testdepl_succ.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream

Added:
branches/new-structure-with-base2/ps-mdm-as/resources/wa/graphics/top_slice.gif
===================================================================
(Binary files differ)

Property changes on:
branches/new-structure-with-base2/ps-mdm-as/resources/wa/graphics/top_slice.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream

Added:
branches/new-structure-with-base2/ps-mdm-as/resources/wa/scripts/Service_Admin.js
===================================================================
---
branches/new-structure-with-base2/ps-mdm-as/resources/wa/scripts/Service_Admin.js
(rev 0)
+++
branches/new-structure-with-base2/ps-mdm-as/resources/wa/scripts/Service_Admin.js
2010-04-06 15:48:34 UTC (rev 5576)
@@ -0,0 +1,129 @@
+/**
+ * @author Michalis Michael,Cynet
+ */
+function setTip(el, description, color){
+ var text = '<span style=\"font-size: 12px; width:20px;\">' + description
+ '</span>';
+ var width;
+ if (el) {
+ el.style.cursor = 'pointer';
+ width = 250;
+ }
+ else {
+ width = 0;
+ }
+
+ Tip(text, BGCOLOR, color, WIDTH, width, TEXTALIGN, 'justify', ABOVE,
true);
+}
+
+function FloatPosition(){
+ var ns = (navigator.appName.indexOf("Netscape") != -1);
+ var x = screen.width;
+ var y = screen.height;
+ var button = document.getElementById("Button");
+ var reset_button = document.getElementById("ResetButton");
+ if (reset_button) {
+ var width = reset_button.parentNode.offsetWidth;
+ var offset = reset_button.parentNode.offsetLeft;
+ var leftoffset = parent
+ if (reset_button != null) {
+ if (y == 768) {
+ reset_button.style.top = 95 + '%';
+ reset_button.style.left = 83 + '%';
+ }
+ else {
+ //alert("Not 768 "+x);
+ reset_button.style.top = 95 + '%';
+ reset_button.style.left = 67 + '%';
+ }
+ }
+ if (button != null) {
+ if (y == 768) {
+ button.style.top = 95 + '%';
+ button.style.left = 91.5 + '%';
+ }
+ else {
+ button.style.top = 95 + '%';
+ button.style.left = 74 + '%';
+ }
+ }
+ }
+
+}
+
+onload = FloatPosition;
+onscroll = FloatPosition;
+onresize = FloatPosition;
+
+function checkStarFields(){
+
+ var divs = document.getElementsByTagName("div");
+ var filled = true;
+
+ for (var i = 0; i < divs.length; i++) {
+
+ var div = divs[i];
+ if (div.style.display == "block") {
+ var input_array = div.getElementsByTagName("input");
+
+ var text = document.createElement("td");
+ var ex = document.getElementById("extra");
+ if (ex != null) {
+ var p = ex.parentNode;
+ p.removeChild(ex);
+ }
+ text.id = "extra";
+ text.innerHTML = '<p style=\"color:red;\">Please fill in the
field!</p>';
+
+ for (var j = 0; j < input_array.length; j++) {
+
+ var input = input_array[j];
+
+ if (input.id == "required") {
+
+ var parent = input.parentNode.parentNode;
+ if (input.value == null || input.value == "" ||
input.value == " ") {
+ if
(parent.parentNode.parentNode.parentNode.style.display == "block") {
+ filled = false;
+ parent.appendChild(text);
+ return filled;
+ }
+
+ }
+
+ }
+
+ }
+ }
+
+ }
+
+ return filled;
+
+}
+
+function getDate(){
+
+ var date = document.getElementById("date");
+
+ var stampdays = new Array("Sunday", "Monday", "Tuesday", "Wednesday",
"Thursday", "Friday", "Saturday");
+
+ var stampmonths = new Array("January", "February", "March", "April",
"May", "June", "July", "August", "September", "October", "November",
"December");
+
+ var thedate = new Date();
+
+ date.innerHTML = stampdays[thedate.getDay()] + ", " +
stampmonths[thedate.getMonth()] + " " + thedate.getDate() + ", " +
thedate.getFullYear();
+
+}
+
+function highlight(el){
+ alert("Highlighted");
+ var links = document.getElementsByTagName("a");
+ for (var i = 0; i < links.length; i++) {
+
+ var link = links[i];
+
+ link.className
+ }
+}
+
+

Property changes on:
branches/new-structure-with-base2/ps-mdm-as/resources/wa/scripts/Service_Admin.js
___________________________________________________________________
Name: svn:mime-type
+ text/plain

Added:
branches/new-structure-with-base2/ps-mdm-as/resources/wa/scripts/wz_tooltip.js
===================================================================
---
branches/new-structure-with-base2/ps-mdm-as/resources/wa/scripts/wz_tooltip.js
(rev 0)
+++
branches/new-structure-with-base2/ps-mdm-as/resources/wa/scripts/wz_tooltip.js
2010-04-06 15:48:34 UTC (rev 5576)
@@ -0,0 +1,1149 @@
+/* This notice must be untouched at all times.
+
+wz_tooltip.js v. 4.12
+
+The latest version is available at
+http://www.walterzorn.com
+or http://www.devira.com
+or http://www.walterzorn.de
+
+Copyright (c) 2002-2007 Walter Zorn. All rights reserved.
+Created 1.12.2002 by Walter Zorn (Web: http://www.walterzorn.com )
+Last modified: 13.7.2007
+
+Easy-to-use cross-browser tooltips.
+Just include the script at the beginning of the <body> section, and invoke
+Tip('Tooltip text') from within the desired HTML onmouseover eventhandlers.
+No container DIV, no onmouseouts required.
+By default, width of tooltips is automatically adapted to content.
+Is even capable of dynamically converting arbitrary HTML elements to tooltips
+by calling TagToTip('ID_of_HTML_element_to_be_converted') instead of Tip(),
+which means you can put important, search-engine-relevant stuff into
tooltips.
+Appearance of tooltips can be individually configured
+via commands passed to Tip() or TagToTip().
+
+Tab Width: 4
+LICENSE: LGPL
+
+This library is free software; you can redistribute it and/or
+modify it under the terms of the GNU Lesser General Public
+License (LGPL) as published by the Free Software Foundation; either
+version 2.1 of the License, or (at your option) any later version.
+
+This library is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+For more details on the GNU Lesser General Public License,
+see http://www.gnu.org/copyleft/lesser.html
+*/
+
+var config = new Object();
+
+
+//=================== GLOBAL TOOPTIP CONFIGURATION
=========================//
+var tt_Debug = true // false or true - recommended: false once
you release your page to the public
+var tt_Enabled = true // Allows to (temporarily) suppress
tooltips, e.g. by providing the user with a button that sets this global
variable to false
+var TagsToTip = true // false or true - if true, the script is
capable of converting HTML elements to tooltips
+
+// For each of the following config variables there exists a command, which
is
+// just the variablename in uppercase, to be passed to Tip() or TagToTip() to
+// configure tooltips individually. Individual commands override global
+// configuration. Order of commands is arbitrary.
+// Example: onmouseover="Tip('Tooltip text', LEFT, true, BGCOLOR, '#FF9900',
FADEIN, 400)"
+
+config. Above = false // false or true - tooltip
above mousepointer?
+config. BgColor = '#E4E7FF' // Background color
+config. BgImg = '' // Path to background image,
none if empty string ''
+config. BorderColor = '#002299'
+config. BorderStyle = 'solid' // Any permitted CSS value, but I
recommend 'solid', 'dotted' or 'dashed'
+config. BorderWidth = 1
+config. CenterMouse = false // false or true - center the tip
horizontally below (or above) the mousepointer
+config. ClickClose = false // false or true - close
tooltip if the user clicks somewhere
+config. CloseBtn = false // false or true -
closebutton in titlebar
+config. CloseBtnColors = ['#990000', '#FFFFFF', '#DD3333', '#FFFFFF'] //
[Background, text, hovered background, hovered text] - use empty strings ''
to inherit title colors
+config. CloseBtnText = ' X ' // Close button text (may
also be an image tag)
+config. CopyContent = true // When converting a HTML
element to a tooltip, copy only the element's content, rather than converting
the element by its own
+config. Delay = 400 // Time span in ms until
tooltip shows up
+config. Duration = 0 // Time span in ms after
which the tooltip disappears; 0 for infinite duration
+config. FadeIn = 0 // Fade-in duration in ms,
e.g. 400; 0 for no animation
+config. FadeOut = 0
+config. FadeInterval = 30 // Duration of each fade step in ms
(recommended: 30) - shorter is smoother but causes more CPU-load
+config. Fix = null // Fixated position - x- an
y-oordinates in brackets, e.g. [210, 480], or null for no fixation
+config. FollowMouse = true // false or true - tooltip
follows the mouse
+config. FontColor = '#000044'
+config. FontFace = 'Verdana,Geneva,sans-serif'
+config. FontSize = '12px' // E.g. '9pt' or '12px' -
unit is mandatory
+config. FontWeight = 'normal' // 'normal' or 'bold';
+config. Left = false // false or true - tooltip on
the left of the mouse
+config. OffsetX = 14 // Horizontal offset of
left-top corner from mousepointer
+config. OffsetY = 8 // Vertical offset
+config. Opacity = 100 // Integer between 0 and 100
- opacity of tooltip in percent
+config. Padding = 3 // Spacing between border and
content
+config. Shadow = false // false or true
+config. ShadowColor = '#C0C0C0'
+config. ShadowWidth = 5
+config. Sticky = false // Do NOT hide tooltip on
mouseout? false or true
+config. TextAlign = 'left' // 'left', 'right' or
'justify'
+config. Title = '' // Default title text applied
to all tips (no default title: empty string '')
+config. TitleAlign = 'left' // 'left' or 'right' - text
alignment inside the title bar
+config. TitleBgColor = '' // If empty string '', BorderColor
will be used
+config. TitleFontColor = '#ffffff' // Color of title text - if '',
BgColor (of tooltip body) will be used
+config. TitleFontFace = '' // If '' use FontFace (boldified)
+config. TitleFontSize = '' // If '' use FontSize
+config. Width = 0 // Tooltip width; 0 for
automatic adaption to tooltip content
+//======= END OF TOOLTIP CONFIG, DO NOT CHANGE ANYTHING BELOW
==============//
+
+
+
+
+//====================== PUBLIC
============================================//
+function Tip()
+{
+ tt_Tip(arguments, null);
+}
+function TagToTip()
+{
+ if(TagsToTip)
+ {
+ var t2t = tt_GetElt(arguments[0]);
+ if(t2t)
+ tt_Tip(arguments, t2t);
+ }
+}
+
+//================== PUBLIC EXTENSION API
==================================//
+// Extension eventhandlers currently supported:
+// OnLoadConfig, OnCreateContentString, OnSubDivsCreated, OnShow,
OnMoveBefore,
+// OnMoveAfter, OnHideInit, OnHide, OnKill
+
+var tt_aElt = new Array(10), // Container DIV, outer title & body DIVs,
inner title & body TDs, closebutton SPAN, shadow DIVs, and IFRAME to cover
windowed elements in IE
+tt_aV = new Array(), // Caches and enumerates config data for currently
active tooltip
+tt_sContent, // Inner tooltip text or HTML
+tt_scrlX = 0, tt_scrlY = 0,
+tt_musX, tt_musY,
+tt_over,
+tt_x, tt_y, tt_w, tt_h; // Position, width and height of currently displayed
tooltip
+
+function tt_Extension()
+{
+ tt_ExtCmdEnum();
+ tt_aExt[tt_aExt.length] = this;
+ return this;
+}
+function tt_SetTipPos(x, y)
+{
+ var css = tt_aElt[0].style;
+
+ tt_x = x;
+ tt_y = y;
+ css.left = x + "px";
+ css.top = y + "px";
+ if(tt_ie56)
+ {
+ var ifrm = tt_aElt[tt_aElt.length - 1];
+ if(ifrm)
+ {
+ ifrm.style.left = css.left;
+ ifrm.style.top = css.top;
+ }
+ }
+}
+function tt_Hide()
+{
+ if(tt_db && tt_iState)
+ {
+ if(tt_iState & 0x2)
+ {
+ tt_aElt[0].style.visibility = "hidden";
+ tt_ExtCallFncs(0, "Hide");
+ }
+ tt_tShow.EndTimer();
+ tt_tHide.EndTimer();
+ tt_tDurt.EndTimer();
+ tt_tFade.EndTimer();
+ if(!tt_op && !tt_ie)
+ {
+ tt_tWaitMov.EndTimer();
+ tt_bWait = false;
+ }
+ if(tt_aV[CLICKCLOSE])
+ tt_RemEvtFnc(document, "mouseup", tt_HideInit);
+ tt_AddRemOutFnc(false);
+ tt_ExtCallFncs(0, "Kill");
+ // In case of a TagToTip tooltip, hide converted DOM node and
+ // re-insert it into document
+ if(tt_t2t && !tt_aV[COPYCONTENT])
+ {
+ tt_t2t.style.display = "none";
+ tt_MovDomNode(tt_t2t, tt_aElt[6], tt_t2tDad);
+ }
+ tt_iState = 0;
+ tt_over = null;
+ tt_ResetMainDiv();
+ if(tt_aElt[tt_aElt.length - 1])
+ tt_aElt[tt_aElt.length - 1].style.display = "none";
+ }
+}
+function tt_GetElt(id)
+{
+ return(document.getElementById ? document.getElementById(id)
+ : document.all ? document.all[id]
+ : null);
+}
+function tt_GetDivW(el)
+{
+ return(el ? (el.offsetWidth || el.style.pixelWidth || 0) : 0);
+}
+function tt_GetDivH(el)
+{
+ return(el ? (el.offsetHeight || el.style.pixelHeight || 0) : 0);
+}
+function tt_GetScrollX()
+{
+ return(window.pageXOffset || (tt_db ? (tt_db.scrollLeft || 0) : 0));
+}
+function tt_GetScrollY()
+{
+ return(window.pageYOffset || (tt_db ? (tt_db.scrollTop || 0) : 0));
+}
+function tt_GetClientW()
+{
+ return(document.body && (typeof(document.body.clientWidth) != tt_u) ?
document.body.clientWidth
+ : (typeof(window.innerWidth) != tt_u) ?
window.innerWidth
+ : tt_db ? (tt_db.clientWidth || 0)
+ : 0);
+}
+function tt_GetClientH()
+{
+ // Exactly this order seems to yield correct values in all major
browsers
+ return(document.body && (typeof(document.body.clientHeight) != tt_u)
? document.body.clientHeight
+ : (typeof(window.innerHeight) != tt_u) ?
window.innerHeight
+ : tt_db ? (tt_db.clientHeight || 0)
+ : 0);
+}
+function tt_GetEvtX(e)
+{
+ return (e ? ((typeof(e.pageX) != tt_u) ? e.pageX : (e.clientX +
tt_scrlX)) : 0);
+}
+function tt_GetEvtY(e)
+{
+ return (e ? ((typeof(e.pageY) != tt_u) ? e.pageY : (e.clientY +
tt_scrlY)) : 0);
+}
+function tt_AddEvtFnc(el, sEvt, PFnc)
+{
+ if(el)
+ {
+ if(el.addEventListener)
+ el.addEventListener(sEvt, PFnc, false);
+ else
+ el.attachEvent("on" + sEvt, PFnc);
+ }
+}
+function tt_RemEvtFnc(el, sEvt, PFnc)
+{
+ if(el)
+ {
+ if(el.removeEventListener)
+ el.removeEventListener(sEvt, PFnc, false);
+ else
+ el.detachEvent("on" + sEvt, PFnc);
+ }
+}
+
+//====================== PRIVATE
===========================================//
+var tt_aExt = new Array(), // Array of extension objects
+
+tt_db, tt_op, tt_ie, tt_ie56, tt_bBoxOld, // Browser flags
+tt_body,
+tt_flagOpa, // Opacity support: 1=IE, 2=Khtml, 3=KHTML,
4=Moz, 5=W3C
+tt_maxPosX, tt_maxPosY,
+tt_iState = 0, // Tooltip active |= 1, shown |= 2, move with
mouse |= 4
+tt_opa, // Currently applied opacity
+tt_bJmpVert, // Tip above mouse (or ABOVE tip below mouse)
+tt_t2t, tt_t2tDad, // Tag converted to tip, and its parent
element in the document
+tt_elDeHref, // The tag from which Opera has removed the
href attribute
+// Timer
+tt_tShow = new Number(0), tt_tHide = new Number(0), tt_tDurt = new Number(0),
+tt_tFade = new Number(0), tt_tWaitMov = new Number(0),
+tt_bWait = false,
+tt_u = "undefined";
+
+
+function tt_Init()
+{
+ tt_MkCmdEnum();
+ // Send old browsers instantly to hell
+ if(!tt_Browser() || !tt_MkMainDiv())
+ return;
+ tt_IsW3cBox();
+ tt_OpaSupport();
+ tt_AddEvtFnc(document, "mousemove", tt_Move);
+ // In Debug mode we search for TagToTip() calls in order to notify
+ // the user if they've forgotten to set the TagsToTip config flag
+ if(TagsToTip || tt_Debug)
+ tt_SetOnloadFnc();
+ tt_AddEvtFnc(window, "scroll",
+ function()
+ {
+ tt_scrlX = tt_GetScrollX();
+ tt_scrlY = tt_GetScrollY();
+ if(tt_iState && !(tt_aV[STICKY] && (tt_iState & 2)))
+ tt_HideInit();
+ } );
+ // Ensure the tip be hidden when the page unloads
+ tt_AddEvtFnc(window, "unload", tt_Hide);
+ tt_Hide();
+}
+// Creates command names by translating config variable names to upper case
+function tt_MkCmdEnum()
+{
+ var n = 0;
+ for(var i in config)
+ eval("window." + i.toString().toUpperCase() + " = " + n++);
+ tt_aV.length = n;
+}
+function tt_Browser()
+{
+ var n, nv, n6, w3c;
+
+ n = navigator.userAgent.toLowerCase(),
+ nv = navigator.appVersion;
+ tt_op = (document.defaultView && typeof(eval("w" + "indow" + "." +
"o" + "p" + "er" + "a")) != tt_u);
+ tt_ie = n.indexOf("msie") != -1 && document.all && !tt_op;
+ if(tt_ie)
+ {
+ var ieOld = (!document.compatMode || document.compatMode ==
"BackCompat");
+ tt_db = !ieOld ? document.documentElement : (document.body ||
null);
+ if(tt_db)
+ tt_ie56 = parseFloat(nv.substring(nv.indexOf("MSIE")
+ 5)) >= 5.5
+ && typeof
document.body.style.maxHeight == tt_u;
+ }
+ else
+ {
+ tt_db = document.documentElement || document.body ||
+ (document.getElementsByTagName ?
document.getElementsByTagName("body")[0]
+ : null);
+ if(!tt_op)
+ {
+ n6 = document.defaultView && typeof
document.defaultView.getComputedStyle != tt_u;
+ w3c = !n6 && document.getElementById;
+ }
+ }
+ tt_body = (document.getElementsByTagName ?
document.getElementsByTagName("body")[0]
+ : (document.body || null));
+ if(tt_ie || n6 || tt_op || w3c)
+ {
+ if(tt_body && tt_db)
+ {
+ if(document.attachEvent || document.addEventListener)
+ return true;
+ }
+ else
+ tt_Err("wz_tooltip.js must be included INSIDE the
body section,"
+ + " immediately after the opening
<body> tag.");
+ }
+ tt_db = null;
+ return false;
+}
+function tt_MkMainDiv()
+{
+ // Create the tooltip DIV
+ if(tt_body.insertAdjacentHTML)
+ tt_body.insertAdjacentHTML("afterBegin", tt_MkMainDivHtm());
+ else if(typeof tt_body.innerHTML != tt_u && document.createElement &&
tt_body.appendChild)
+ tt_body.appendChild(tt_MkMainDivDom());
+ // FireFox Alzheimer bug
+ if(window.tt_GetMainDivRefs && tt_GetMainDivRefs())
+ return true;
+ tt_db = null;
+ return false;
+}
+function tt_MkMainDivHtm()
+{
+ return('<div id="WzTtDiV"></div>' +
+ (tt_ie56 ? ('<iframe id="WzTtIfRm"
src="javascript:false" scrolling="no" frameborder="0"
style="filter:Alpha(opacity=0);position:absolute;top:0px;left:0px;display:none;"></iframe>')
+ : ''));
+}
+function tt_MkMainDivDom()
+{
+ var el = document.createElement("div");
+ if(el)
+ el.id = "WzTtDiV";
+ return el;
+}
+function tt_GetMainDivRefs()
+{
+ tt_aElt[0] = tt_GetElt("WzTtDiV");
+ if(tt_ie56 && tt_aElt[0])
+ {
+ tt_aElt[tt_aElt.length - 1] = tt_GetElt("WzTtIfRm");
+ if(!tt_aElt[tt_aElt.length - 1])
+ tt_aElt[0] = null;
+ }
+ if(tt_aElt[0])
+ {
+ var css = tt_aElt[0].style;
+
+ css.visibility = "hidden";
+ css.position = "absolute";
+ css.overflow = "hidden";
+ return true;
+ }
+ return false;
+}
+function tt_ResetMainDiv()
+{
+ var w = (window.screen && screen.width) ? screen.width : 10000;
+
+ tt_SetTipPos(-w, 0);
+ tt_aElt[0].innerHTML = "";
+ tt_aElt[0].style.width = (w - 1) + "px";
+}
+function tt_IsW3cBox()
+{
+ var css = tt_aElt[0].style;
+
+ css.padding = "10px";
+ css.width = "40px";
+ tt_bBoxOld = (tt_GetDivW(tt_aElt[0]) == 40);
+ css.padding = "0px";
+ tt_ResetMainDiv();
+}
+function tt_OpaSupport()
+{
+ var css = tt_body.style;
+
+ tt_flagOpa = (typeof(css.filter) != tt_u) ? 1
+ : (typeof(css.KhtmlOpacity) != tt_u) ? 2
+ : (typeof(css.KHTMLOpacity) != tt_u) ? 3
+ : (typeof(css.MozOpacity) != tt_u) ? 4
+ : (typeof(css.opacity) != tt_u) ? 5
+ : 0;
+}
+// Ported from http://dean.edwards.name/weblog/2006/06/again/
+// (Dean Edwards et al.)
+function tt_SetOnloadFnc()
+{
+ tt_AddEvtFnc(document, "DOMContentLoaded", tt_HideSrcTags);
+ tt_AddEvtFnc(window, "load", tt_HideSrcTags);
+ if(tt_body.attachEvent)
+ tt_body.attachEvent("onreadystatechange",
+ function() {
+ if(tt_body.readyState == "complete")
+ tt_HideSrcTags();
+ } );
+ if(/WebKit|KHTML/i.test(navigator.userAgent))
+ {
+ var t = setInterval(function() {
+
if(/loaded|complete/.test(document.readyState))
+ {
+ clearInterval(t);
+ tt_HideSrcTags();
+ }
+ }, 10);
+ }
+}
+function tt_HideSrcTags()
+{
+ if(!window.tt_HideSrcTags || window.tt_HideSrcTags.done)
+ return;
+ window.tt_HideSrcTags.done = true;
+ if(!tt_HideSrcTagsRecurs(tt_body))
+ tt_Err("To enable the capability to convert HTML elements to
tooltips,"
+ + " you must set TagsToTip in the global
tooltip configuration"
+ + " to true.");
+}
+function tt_HideSrcTagsRecurs(dad)
+{
+ var a, ovr, asT2t;
+
+ // Walk the DOM tree for tags that have an onmouseover attribute
+ // containing a TagToTip('...') call.
+ // (.childNodes first since .children is bugous in Safari)
+ a = dad.childNodes || dad.children || null;
+ for(var i = a ? a.length : 0; i;)
+ {--i;
+ if(!tt_HideSrcTagsRecurs(a[i]))
+ return false;
+ ovr = a[i].getAttribute ? a[i].getAttribute("onmouseover")
+ : (typeof a[i].onmouseover == "function") ?
a[i].onmouseover
+ : null;
+ if(ovr)
+ {
+ asT2t =
ovr.toString().match(/TagToTip\s*$\s*'[^'.]+'\s*[$,]/);
+ if(asT2t && asT2t.length)
+ {
+ if(!tt_HideSrcTag(asT2t[0]))
+ return false;
+ }
+ }
+ }
+ return true;
+}
+function tt_HideSrcTag(sT2t)
+{
+ var id, el;
+
+ // The ID passed to the found TagToTip() call identifies an HTML
element
+ // to be converted to a tooltip, so hide that element
+ id = sT2t.replace(/.+'([^'.]+)'.+/, "$1");
+ el = tt_GetElt(id);
+ if(el)
+ {
+ if(tt_Debug && !TagsToTip)
+ return false;
+ else
+ el.style.display = "none";
+ }
+ else
+ tt_Err("Invalid ID\n'" + id + "'\npassed to TagToTip()."
+ + " There exists no HTML element with that
ID.");
+ return true;
+}
+function tt_Tip(arg, t2t)
+{
+ if(!tt_db)
+ return;
+ if(tt_iState)
+ tt_Hide();
+ if(!tt_Enabled)
+ return;
+ tt_t2t = t2t;
+ if(!tt_ReadCmds(arg))
+ return;
+ tt_iState = 0x1 | 0x4;
+ tt_AdaptConfig1();
+ tt_MkTipContent(arg);
+ tt_MkTipSubDivs();
+ tt_FormatTip();
+ tt_bJmpVert = false;
+ tt_maxPosX = tt_GetClientW() + tt_scrlX - tt_w - 1;
+ tt_maxPosY = tt_GetClientH() + tt_scrlY - tt_h - 1;
+ tt_AdaptConfig2();
+ // We must fake the first mousemove in order to ensure the tip
+ // be immediately shown and positioned
+ tt_Move();
+ tt_ShowInit();
+}
+function tt_ReadCmds(a)
+{
+ var i;
+
+ // First load the global config values, to initialize also values
+ // for which no command has been passed
+ i = 0;
+ for(var j in config)
+ tt_aV[i++] = config[j];
+ // Then replace each cached config value for which a command has been
+ // passed (ensure the # of command args plus value args be even)
+ if(a.length & 1)
+ {
+ for(i = a.length - 1; i > 0; i -= 2)
+ tt_aV[a[i - 1]] = a[i];
+ return true;
+ }
+ tt_Err("Incorrect call of Tip() or TagToTip().\n"
+ + "Each command must be followed by a value.");
+ return false;
+}
+function tt_AdaptConfig1()
+{
+ tt_ExtCallFncs(0, "LoadConfig");
+ // Inherit unspecified title formattings from body
+ if(!tt_aV[TITLEBGCOLOR].length)
+ tt_aV[TITLEBGCOLOR] = tt_aV[BORDERCOLOR];
+ if(!tt_aV[TITLEFONTCOLOR].length)
+ tt_aV[TITLEFONTCOLOR] = tt_aV[BGCOLOR];
+ if(!tt_aV[TITLEFONTFACE].length)
+ tt_aV[TITLEFONTFACE] = tt_aV[FONTFACE];
+ if(!tt_aV[TITLEFONTSIZE].length)
+ tt_aV[TITLEFONTSIZE] = tt_aV[FONTSIZE];
+ if(tt_aV[CLOSEBTN])
+ {
+ // Use title colors for non-specified closebutton colors
+ if(!tt_aV[CLOSEBTNCOLORS])
+ tt_aV[CLOSEBTNCOLORS] = new Array("", "", "", "");
+ for(var i = 4; i;)
+ {--i;
+ if(!tt_aV[CLOSEBTNCOLORS][i].length)
+ tt_aV[CLOSEBTNCOLORS][i] = (i & 1) ?
tt_aV[TITLEFONTCOLOR] : tt_aV[TITLEBGCOLOR];
+ }
+ // Enforce titlebar be shown
+ if(!tt_aV[TITLE].length)
+ tt_aV[TITLE] = " ";
+ }
+ // Circumvents broken display of images and fade-in flicker in Geckos
< 1.8
+ if(tt_aV[OPACITY] == 100 && typeof tt_aElt[0].style.MozOpacity !=
tt_u && !Array.every)
+ tt_aV[OPACITY] = 99;
+ // Smartly shorten the delay for fade-in tooltips
+ if(tt_aV[FADEIN] && tt_flagOpa && tt_aV[DELAY] > 100)
+ tt_aV[DELAY] = Math.max(tt_aV[DELAY] - tt_aV[FADEIN], 100);
+}
+function tt_AdaptConfig2()
+{
+ if(tt_aV[CENTERMOUSE])
+ tt_aV[OFFSETX] -= ((tt_w - (tt_aV[SHADOW] ?
tt_aV[SHADOWWIDTH] : 0)) >> 1);
+}
+// Expose content globally so extensions can modify it
+function tt_MkTipContent(a)
+{
+ if(tt_t2t)
+ {
+ if(tt_aV[COPYCONTENT])
+ tt_sContent = tt_t2t.innerHTML;
+ else
+ tt_sContent = "";
+ }
+ else
+ tt_sContent = a[0];
+ tt_ExtCallFncs(0, "CreateContentString");
+}
+function tt_MkTipSubDivs()
+{
+ var sCss =
'position:relative;margin:0px;padding:0px;border-width:0px;left:0px;top:0px;line-height:normal;width:auto;',
+ sTbTrTd = ' cellspacing=0 cellpadding=0 border=0 style="' + sCss +
'"><tbody style="' + sCss + '"><tr><td ';
+
+ tt_aElt[0].innerHTML =
+ (''
+ + (tt_aV[TITLE].length ?
+ ('<div id="WzTiTl"
style="position:relative;z-index:1;">'
+ + '<table id="WzTiTlTb"' + sTbTrTd + 'id="WzTiTlI"
style="' + sCss + '">'
+ + tt_aV[TITLE]
+ + '</td>'
+ + (tt_aV[CLOSEBTN] ?
+ ('<td align="right" style="' + sCss
+ + 'text-align:right;">'
+ + '<span id="WzClOsE"
style="padding-left:2px;padding-right:2px;'
+ + 'cursor:' + (tt_ie ? 'hand' : 'pointer')
+ + ';" onmouseover="tt_OnCloseBtnOver(1)"
onmouseout="tt_OnCloseBtnOver(0)" onclick="tt_HideInit()">'
+ + tt_aV[CLOSEBTNTEXT]
+ + '</span></td>')
+ : '')
+ + '</tr></tbody></table></div>')
+ : '')
+ + '<div id="WzBoDy" style="position:relative;z-index:0;">'
+ + '<table' + sTbTrTd + 'id="WzBoDyI" style="' + sCss + '">'
+ + tt_sContent
+ + '</td></tr></tbody></table></div>'
+ + (tt_aV[SHADOW]
+ ? ('<div id="WzTtShDwR"
style="position:absolute;overflow:hidden;"></div>'
+ + '<div id="WzTtShDwB"
style="position:relative;overflow:hidden;"></div>')
+ : '')
+ );
+ tt_GetSubDivRefs();
+ // Convert DOM node to tip
+ if(tt_t2t && !tt_aV[COPYCONTENT])
+ {
+ // Store the tag's parent element so we can restore that DOM
branch
+ // once the tooltip is hidden
+ tt_t2tDad = tt_t2t.parentNode || tt_t2t.parentElement ||
tt_t2t.offsetParent || null;
+ if(tt_t2tDad)
+ {
+ tt_MovDomNode(tt_t2t, tt_t2tDad, tt_aElt[6]);
+ tt_t2t.style.display = "block";
+ }
+ }
+ tt_ExtCallFncs(0, "SubDivsCreated");
+}
+function tt_GetSubDivRefs()
+{
+ var aId = new Array("WzTiTl", "WzTiTlTb", "WzTiTlI", "WzClOsE",
"WzBoDy", "WzBoDyI", "WzTtShDwB", "WzTtShDwR");
+
+ for(var i = aId.length; i; --i)
+ tt_aElt[i] = tt_GetElt(aId[i - 1]);
+}
+function tt_FormatTip()
+{
+ var css, w, iOffY, iOffSh;
+
+ //--------- Title DIV ----------
+ if(tt_aV[TITLE].length)
+ {
+ css = tt_aElt[1].style;
+ css.background = tt_aV[TITLEBGCOLOR];
+ css.paddingTop = (tt_aV[CLOSEBTN] ? 2 : 0) + "px";
+ css.paddingBottom = "1px";
+ css.paddingLeft = css.paddingRight = tt_aV[PADDING] + "px";
+ css = tt_aElt[3].style;
+ css.color = tt_aV[TITLEFONTCOLOR];
+ css.fontFamily = tt_aV[TITLEFONTFACE];
+ css.fontSize = tt_aV[TITLEFONTSIZE];
+ css.fontWeight = "bold";
+ css.textAlign = tt_aV[TITLEALIGN];
+ // Close button DIV
+ if(tt_aElt[4])
+ {
+ css.paddingRight = (tt_aV[PADDING] << 1) + "px";
+ css = tt_aElt[4].style;
+ css.background = tt_aV[CLOSEBTNCOLORS][0];
+ css.color = tt_aV[CLOSEBTNCOLORS][1];
+ css.fontFamily = tt_aV[TITLEFONTFACE];
+ css.fontSize = tt_aV[TITLEFONTSIZE];
+ css.fontWeight = "bold";
+ }
+ if(tt_aV[WIDTH] > 0)
+ tt_w = tt_aV[WIDTH] + ((tt_aV[PADDING] +
tt_aV[BORDERWIDTH]) << 1);
+ else
+ {
+ tt_w = tt_GetDivW(tt_aElt[3]) +
tt_GetDivW(tt_aElt[4]);
+ // Some spacing between title DIV and closebutton
+ if(tt_aElt[4])
+ tt_w += tt_aV[PADDING];
+ }
+ // Ensure the top border of the body DIV be covered by the
title DIV
+ iOffY = -tt_aV[BORDERWIDTH];
+ }
+ else
+ {
+ tt_w = 0;
+ iOffY = 0;
+ }
+
+ //-------- Body DIV ------------
+ css = tt_aElt[5].style;
+ css.top = iOffY + "px";
+ if(tt_aV[BORDERWIDTH])
+ {
+ css.borderColor = tt_aV[BORDERCOLOR];
+ css.borderStyle = tt_aV[BORDERSTYLE];
+ css.borderWidth = tt_aV[BORDERWIDTH] + "px";
+ }
+ if(tt_aV[BGCOLOR].length)
+ css.background = tt_aV[BGCOLOR];
+ if(tt_aV[BGIMG].length)
+ css.backgroundImage = "url(" + tt_aV[BGIMG] + ")";
+ css.padding = tt_aV[PADDING] + "px";
+ css.textAlign = tt_aV[TEXTALIGN];
+ // TD inside body DIV
+ css = tt_aElt[6].style;
+ css.color = tt_aV[FONTCOLOR];
+ css.fontFamily = tt_aV[FONTFACE];
+ css.fontSize = tt_aV[FONTSIZE];
+ css.fontWeight = tt_aV[FONTWEIGHT];
+ css.background = "";
+ css.textAlign = tt_aV[TEXTALIGN];
+ if(tt_aV[WIDTH] > 0)
+ w = tt_aV[WIDTH] + ((tt_aV[PADDING] + tt_aV[BORDERWIDTH]) <<
1);
+ else
+ // We measure the width of the body's inner TD, because some
browsers
+ // expand the width of the container and outer body DIV to
100%
+ w = tt_GetDivW(tt_aElt[6]) + ((tt_aV[PADDING] +
tt_aV[BORDERWIDTH]) << 1);
+ if(w > tt_w)
+ tt_w = w;
+
+ //--------- Shadow DIVs ------------
+ if(tt_aV[SHADOW])
+ {
+ tt_w += tt_aV[SHADOWWIDTH];
+ iOffSh = Math.floor((tt_aV[SHADOWWIDTH] * 4) / 3);
+ // Bottom shadow
+ css = tt_aElt[7].style;
+ css.top = iOffY + "px";
+ css.left = iOffSh + "px";
+ css.width = (tt_w - iOffSh - tt_aV[SHADOWWIDTH]) + "px";
+ css.height = tt_aV[SHADOWWIDTH] + "px";
+ css.background = tt_aV[SHADOWCOLOR];
+ // Right shadow
+ css = tt_aElt[8].style;
+ css.top = iOffSh + "px";
+ css.left = (tt_w - tt_aV[SHADOWWIDTH]) + "px";
+ css.width = tt_aV[SHADOWWIDTH] + "px";
+ css.background = tt_aV[SHADOWCOLOR];
+ }
+ else
+ iOffSh = 0;
+
+ //-------- Container DIV -------
+ tt_SetTipOpa(tt_aV[FADEIN] ? 0 : tt_aV[OPACITY]);
+ tt_FixSize(iOffY, iOffSh);
+}
+// Fixate the size so it can't dynamically change while the tooltip is
moving.
+function tt_FixSize(iOffY, iOffSh)
+{
+ var wIn, wOut, i;
+
+ tt_aElt[0].style.width = tt_w + "px";
+ tt_aElt[0].style.pixelWidth = tt_w;
+ wOut = tt_w - ((tt_aV[SHADOW]) ? tt_aV[SHADOWWIDTH] : 0);
+ // Body
+ wIn = wOut;
+ if(!tt_bBoxOld)
+ wIn -= ((tt_aV[PADDING] + tt_aV[BORDERWIDTH]) << 1);
+ tt_aElt[5].style.width = wIn + "px";
+ // Title
+ if(tt_aElt[1])
+ {
+ wIn = wOut - (tt_aV[PADDING] << 1);
+ if(!tt_bBoxOld)
+ wOut = wIn;
+ tt_aElt[1].style.width = wOut + "px";
+ tt_aElt[2].style.width = wIn + "px";
+ }
+ tt_h = tt_GetDivH(tt_aElt[0]) + iOffY;
+ // Right shadow
+ if(tt_aElt[8])
+ tt_aElt[8].style.height = (tt_h - iOffSh) + "px";
+ i = tt_aElt.length - 1;
+ if(tt_aElt[i])
+ {
+ tt_aElt[i].style.width = tt_w + "px";
+ tt_aElt[i].style.height = tt_h + "px";
+ }
+}
+function tt_DeAlt(el)
+{
+ var aKid;
+
+ if(el.alt)
+ el.alt = "";
+ if(el.title)
+ el.title = "";
+ aKid = el.childNodes || el.children || null;
+ if(aKid)
+ {
+ for(var i = aKid.length; i;)
+ tt_DeAlt(aKid[--i]);
+ }
+}
+// This hack removes the annoying native tooltips over links in Opera
+function tt_OpDeHref(el)
+{
+ if(!tt_op)
+ return;
+ if(tt_elDeHref)
+ tt_OpReHref();
+ while(el)
+ {
+ if(el.hasAttribute("href"))
+ {
+ el.t_href = el.getAttribute("href");
+ el.t_stats = window.status;
+ el.removeAttribute("href");
+ el.style.cursor = "hand";
+ tt_AddEvtFnc(el, "mousedown", tt_OpReHref);
+ window.status = el.t_href;
+ tt_elDeHref = el;
+ break;
+ }
+ el = el.parentElement;
+ }
+}
+function tt_ShowInit()
+{
+ tt_tShow.Timer("tt_Show()", tt_aV[DELAY], true);
+ if(tt_aV[CLICKCLOSE])
+ tt_AddEvtFnc(document, "mouseup", tt_HideInit);
+}
+function tt_OverInit(e)
+{
+ tt_over = e.target || e.srcElement;
+ tt_DeAlt(tt_over);
+ tt_OpDeHref(tt_over);
+ tt_AddRemOutFnc(true);
+}
+function tt_Show()
+{
+ var css = tt_aElt[0].style;
+
+ // Override the z-index of the topmost wz_dragdrop.js D&D item
+ css.zIndex = Math.max((window.dd && dd.z) ? (dd.z + 2) : 0, 1010);
+ if(tt_aV[STICKY] || !tt_aV[FOLLOWMOUSE])
+ tt_iState &= ~0x4;
+ if(tt_aV[DURATION] > 0)
+ tt_tDurt.Timer("tt_HideInit()", tt_aV[DURATION], true);
+ tt_ExtCallFncs(0, "Show")
+ css.visibility = "visible";
+ tt_iState |= 0x2;
+ if(tt_aV[FADEIN])
+ tt_Fade(0, 0, tt_aV[OPACITY], Math.round(tt_aV[FADEIN] /
tt_aV[FADEINTERVAL]));
+ tt_ShowIfrm();
+}
+function tt_ShowIfrm()
+{
+ if(tt_ie56)
+ {
+ var ifrm = tt_aElt[tt_aElt.length - 1];
+ if(ifrm)
+ {
+ var css = ifrm.style;
+ css.zIndex = tt_aElt[0].style.zIndex - 1;
+ css.display = "block";
+ }
+ }
+}
+function tt_Move(e)
+{
+ e = window.event || e;
+ if(e)
+ {
+ tt_musX = tt_GetEvtX(e);
+ tt_musY = tt_GetEvtY(e);
+ }
+ if(tt_iState)
+ {
+ if(!tt_over && e)
+ tt_OverInit(e);
+ if(tt_iState & 0x4)
+ {
+ // Protect some browsers against jam of mousemove
events
+ if(!tt_op && !tt_ie)
+ {
+ if(tt_bWait)
+ return;
+ tt_bWait = true;
+ tt_tWaitMov.Timer("tt_bWait = false;", 1,
true);
+ }
+ if(tt_aV[FIX])
+ {
+ tt_iState &= ~0x4;
+ tt_SetTipPos(tt_aV[FIX][0], tt_aV[FIX][1]);
+ }
+ else if(!tt_ExtCallFncs(e, "MoveBefore"))
+ tt_SetTipPos(tt_PosX(), tt_PosY());
+ tt_ExtCallFncs([tt_musX, tt_musY], "MoveAfter")
+ }
+ }
+}
+function tt_PosX()
+{
+ var x;
+
+ x = tt_musX;
+ if(tt_aV[LEFT])
+ x -= tt_w + tt_aV[OFFSETX] - (tt_aV[SHADOW] ?
tt_aV[SHADOWWIDTH] : 0);
+ else
+ x += tt_aV[OFFSETX];
+ // Prevent tip from extending past right/left clientarea boundary
+ if(x > tt_maxPosX)
+ x = tt_maxPosX;
+ return((x < tt_scrlX) ? tt_scrlX : x);
+}
+function tt_PosY()
+{
+ var y;
+
+ // Apply some hysteresis after the tip has snapped to the other side
of the
+ // mouse. In case of insufficient space above and below the mouse, we
place
+ // the tip below.
+ if(tt_aV[ABOVE] && (!tt_bJmpVert || tt_CalcPosYAbove() >= tt_scrlY +
16))
+ y = tt_DoPosYAbove();
+ else if(!tt_aV[ABOVE] && tt_bJmpVert && tt_CalcPosYBelow() >
tt_maxPosY - 16)
+ y = tt_DoPosYAbove();
+ else
+ y = tt_DoPosYBelow();
+ // Snap to other side of mouse if tip would extend past window
boundary
+ if(y > tt_maxPosY)
+ y = tt_DoPosYAbove();
+ if(y < tt_scrlY)
+ y = tt_DoPosYBelow();
+ return y;
+}
+function tt_DoPosYBelow()
+{
+ tt_bJmpVert = tt_aV[ABOVE];
+ return tt_CalcPosYBelow();
+}
+function tt_DoPosYAbove()
+{
+ tt_bJmpVert = !tt_aV[ABOVE];
+ return tt_CalcPosYAbove();
+}
+function tt_CalcPosYBelow()
+{
+ return(tt_musY + tt_aV[OFFSETY]);
+}
+function tt_CalcPosYAbove()
+{
+ var dy = tt_aV[OFFSETY] - (tt_aV[SHADOW] ? tt_aV[SHADOWWIDTH] : 0);
+ if(tt_aV[OFFSETY] > 0 && dy <= 0)
+ dy = 1;
+ return(tt_musY - tt_h - dy);
+}
+function tt_OnOut()
+{
+ tt_AddRemOutFnc(false);
+ if(!(tt_aV[STICKY] && (tt_iState & 0x2)))
+ tt_HideInit();
+}
+function tt_HideInit()
+{
+ tt_ExtCallFncs(0, "HideInit");
+ tt_iState &= ~0x4;
+ if(tt_flagOpa && tt_aV[FADEOUT])
+ {
+ tt_tFade.EndTimer();
+ if(tt_opa)
+ {
+ var n = Math.round(tt_aV[FADEOUT] /
(tt_aV[FADEINTERVAL] * (tt_aV[OPACITY] / tt_opa)));
+ tt_Fade(tt_opa, tt_opa, 0, n);
+ return;
+ }
+ }
+ tt_tHide.Timer("tt_Hide();", 1, false);
+}
+function tt_OpReHref()
+{
+ if(tt_elDeHref)
+ {
+ tt_elDeHref.setAttribute("href", tt_elDeHref.t_href);
+ tt_RemEvtFnc(tt_elDeHref, "mousedown", tt_OpReHref);
+ window.status = tt_elDeHref.t_stats;
+ tt_elDeHref = null;
+ }
+}
+function tt_Fade(a, now, z, n)
+{
+ if(n)
+ {
+ now += Math.round((z - now) / n);
+ if((z > a) ? (now >= z) : (now <= z))
+ now = z;
+ else
+ tt_tFade.Timer("tt_Fade("
+ + a + "," + now + ","
+ z + "," + (n - 1)
+ + ")",
+ tt_aV[FADEINTERVAL],
+ true);
+ }
+ now ? tt_SetTipOpa(now) : tt_Hide();
+}
+// To circumvent the opacity nesting flaws of IE, we set the opacity
+// for each sub-DIV separately, rather than for the container DIV.
+function tt_SetTipOpa(opa)
+{
+ tt_SetOpa(tt_aElt[5].style, opa);
+ if(tt_aElt[1])
+ tt_SetOpa(tt_aElt[1].style, opa);
+ if(tt_aV[SHADOW])
+ {
+ opa = Math.round(opa * 0.8);
+ tt_SetOpa(tt_aElt[7].style, opa);
+ tt_SetOpa(tt_aElt[8].style, opa);
+ }
+}
+function tt_OnCloseBtnOver(iOver)
+{
+ var css = tt_aElt[4].style;
+
+ iOver <<= 1;
+ css.background = tt_aV[CLOSEBTNCOLORS][iOver];
+ css.color = tt_aV[CLOSEBTNCOLORS][iOver + 1];
+}
+function tt_Int(x)
+{
+ var y;
+
+ return(isNaN(y = parseInt(x)) ? 0 : y);
+}
+// Adds or removes the document.mousemove or HoveredElem.mouseout handler
+// conveniently. Keeps track of those handlers to prevent them from being
+// set or removed redundantly.
+function tt_AddRemOutFnc(bAdd)
+{
+ var PSet = bAdd ? tt_AddEvtFnc : tt_RemEvtFnc;
+
+ if(bAdd != tt_AddRemOutFnc.bOn)
+ {
+ PSet(tt_over, "mouseout", tt_OnOut);
+ tt_AddRemOutFnc.bOn = bAdd;
+ if(!bAdd)
+ tt_OpReHref();
+ }
+}
+tt_AddRemOutFnc.bOn = false;
+Number.prototype.Timer = function(s, iT, bUrge)
+{
+ if(!this.value || bUrge)
+ this.value = window.setTimeout(s, iT);
+}
+Number.prototype.EndTimer = function()
+{
+ if(this.value)
+ {
+ window.clearTimeout(this.value);
+ this.value = 0;
+ }
+}
+function tt_SetOpa(css, opa)
+{
+ tt_opa = opa;
+ if(tt_flagOpa == 1)
+ {
+ // Hack for bugs of IE:
+ // A DIV cannot be made visible in a single step if an
opacity < 100
+ // has been applied while the DIV was hidden.
+ // Moreover, in IE6, applying an opacity < 100 has no effect
if the
+ // concerned element has no layout (position, size, zoom,
...).
+ if(opa < 100)
+ {
+ var bVis = css.visibility != "hidden";
+ css.zoom = "100%";
+ if(!bVis)
+ css.visibility = "visible";
+ css.filter = "alpha(opacity=" + opa + ")";
+ if(!bVis)
+ css.visibility = "hidden";
+ }
+ else
+ css.filter = "";
+ }
+ else
+ {
+ opa /= 100.0;
+ switch(tt_flagOpa)
+ {
+ case 2:
+ css.KhtmlOpacity = opa; break;
+ case 3:
+ css.KHTMLOpacity = opa; break;
+ case 4:
+ css.MozOpacity = opa; break;
+ case 5:
+ css.opacity = opa; break;
+ }
+ }
+}
+function tt_MovDomNode(el, dadFrom, dadTo)
+{
+ if(dadFrom)
+ dadFrom.removeChild(el);
+ if(dadTo)
+ dadTo.appendChild(el);
+}
+function tt_Err(sErr)
+{
+ if(tt_Debug)
+ alert("Tooltip Script Error Message:\n\n" + sErr);
+}
+
+//=========== DEALING WITH EXTENSIONS ==============//
+function tt_ExtCmdEnum()
+{
+ var s;
+
+ // Add new command(s) to the commands enum
+ for(var i in config)
+ {
+ s = "window." + i.toString().toUpperCase();
+ if(eval("typeof(" + s + ") == tt_u"))
+ {
+ eval(s + " = " + tt_aV.length);
+ tt_aV[tt_aV.length] = null;
+ }
+ }
+}
+function tt_ExtCallFncs(arg, sFnc)
+{
+ var b = false;
+ for(var i = tt_aExt.length; i;)
+ {--i;
+ var fnc = tt_aExt[i]["On" + sFnc];
+ // Call the method the extension has defined for this event
+ if(fnc && fnc(arg))
+ b = true;
+ }
+ return b;
+}
+
+tt_Init();

Property changes on:
branches/new-structure-with-base2/ps-mdm-as/resources/wa/scripts/wz_tooltip.js
___________________________________________________________________
Name: svn:mime-type
+ text/plain

Added:
branches/new-structure-with-base2/ps-mdm-as/resources/wa/soapMessages/selfTest.xml
===================================================================
---
branches/new-structure-with-base2/ps-mdm-as/resources/wa/soapMessages/selfTest.xml
(rev 0)
+++
branches/new-structure-with-base2/ps-mdm-as/resources/wa/soapMessages/selfTest.xml
2010-04-06 15:48:34 UTC (rev 5576)
@@ -0,0 +1,12 @@
+<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/";>
+ <soapenv:Body>
+
+ <nmwg:message xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";
id="message1262167219" type="EchoRequest">
+ <nmwg:metadata id="meta">
+
<nmwg:eventType>http://schemas.perfsonar.net/tools/admin/selftest/1.0</nmwg:eventType>
+ </nmwg:metadata>
+ <nmwg:data id="data" metadataIdRef="meta"/>
+ </nmwg:message>
+
+ </soapenv:Body>
+</soapenv:Envelope>

Property changes on:
branches/new-structure-with-base2/ps-mdm-as/resources/wa/soapMessages/selfTest.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain

Added:
branches/new-structure-with-base2/ps-mdm-as/resources/wa/styles/default.css
===================================================================
---
branches/new-structure-with-base2/ps-mdm-as/resources/wa/styles/default.css
(rev 0)
+++
branches/new-structure-with-base2/ps-mdm-as/resources/wa/styles/default.css
2010-04-06 15:48:34 UTC (rev 5576)
@@ -0,0 +1,114 @@
+a img {
+ border: none;
+}
+
+/* Wizard CSS */
+.top {
+ display: block;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 13px;
+ color: #468C46;
+ margin: 0% 1% 0 1%;
+ border-bottom: 1px dotted #468C46;
+ padding: 7px;
+ background: #ffffff;
+}
+
+.greenasterisk {
+ font-size: 130%;
+ color: #468C46;
+}
+
+.properties {
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 13px;
+ padding: 10px;
+ margin: 0% 1% 0 1%;
+}
+
+.properties em {
+ display: block;
+ color: red;
+ font-size: 95%;
+}
+
+.properties p {
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 13px;
+}
+
+.properties table {
+ border-bottom: 1px dotted #468C46;
+ margin-bottom: 20px;
+}
+
+.properties td {
+ padding: 5px;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 13px;
+}
+
+.inner_properties {
+ padding: 0px;
+ margin: 0px;
+}
+
+.inner_properties table {
+ border: none;
+ margin: 0px;
+ padding: 0px;
+}
+
+.input {
+ padding: 1em;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 13px;
+}
+
+.input_style {
+ border-color: #468C46;
+ border-style: solid;
+ border-width: 1px;
+}
+
+/*Properties Buttons CSS*/
+.floatResetButton {
+ position: fixed;
+ width: 64px;
+ height: 28px;
+ margin: 0;
+ padding: 0;
+ border: 0;
+ text-indent: -1000em;
+ cursor: pointer;
+ background: transparent url(graphics/cancel_button.gif) no-repeat
center
+ top;
+ float: right;
+}
+
+.floatSubmitButton {
+ position: fixed;;
+ width: 53px;
+ height: 28px;
+ margin: 0;
+ border: 0;
+ padding: 0;
+ text-indent: -1000em;
+ cursor: pointer;
+ background: transparent url(graphics/apply_button_2.gif) no-repeat
+ center top;
+ float: right;
+}
+
+.submit_button {
+ width: 53px;
+ height: 28px;
+ margin: 0;
+ border: 0;
+ padding: 0;
+ text-indent: -1000em;
+ cursor: pointer;
+ background: transparent url(graphics/apply_button.gif) no-repeat
center
+ top;
+ float: none;
+}
\ No newline at end of file

Property changes on:
branches/new-structure-with-base2/ps-mdm-as/resources/wa/styles/default.css
___________________________________________________________________
Name: svn:mime-type
+ text/plain

Added:
branches/new-structure-with-base2/ps-mdm-as/resources/wa/styles/main.css
===================================================================
--- branches/new-structure-with-base2/ps-mdm-as/resources/wa/styles/main.css
(rev 0)
+++ branches/new-structure-with-base2/ps-mdm-as/resources/wa/styles/main.css
2010-04-06 15:48:34 UTC (rev 5576)
@@ -0,0 +1,342 @@
+/* standard elements */
+* {
+ margin: 0;
+ padding: 0;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ text-decoration: none;
+ border-top-style: none;
+ border-right-style: none;
+ border-bottom-style: none;
+ border-left-style: none;
+}
+
+body {
+ background-color: #C0C0C0;
+ width: 95%;
+ height: 92%;
+ padding-top: 10px;
+}
+
+div.main {
+ overflow: auto;
+ width: 100%;
+ height: 100%;
+}
+
+a:link {
+ color: #468C46;
+ cursor: pointer;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 13px;
+}
+
+a:active {
+ color: #117721;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 13px;
+ font-weight: bold;
+}
+
+a:visited {
+ color: #468C46;
+ cursor: auto;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 13px;
+}
+
+a:hover {
+ color: #468C46;
+ cursor: pointer;
+ text-decoration: underline;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 13px;
+}
+
+.adminPanel {
+ width: 94%;
+ height: 50%;
+ float: left;
+ margin-left: 3%;
+ margin-right: 5%;
+ background-color: #ffffff;
+ margin-bottom: 2%;
+}
+
+.navtex {
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 13px;
+ color: #468C46;
+ text-align: right;
+ font-style: normal;
+ font-weight: normal;
+ line-height: 28px;
+ background-image: none;
+}
+
+.navtexheading {
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 13px;
+ color: #468C46;
+ text-align: right;
+ font-style: normal;
+ font-weight: bold;
+ line-height: normal;
+}
+
+.welcometext {
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 13px;
+ color: #468C46;
+ border-bottom-width: 1px;
+ border-bottom-style: dotted;
+ border-bottom-color: #468C46;
+ padding-top: 10px;
+ padding-bottom: 8px;
+ padding-right: 0px;
+ clip: rect(auto, auto, auto, auto);
+ margin-right: 0px;
+ margin-left: 2%;
+}
+
+.heading1 {
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 14px;
+ color: #468C46;
+ padding-top: 23px;
+ padding-bottom: 23px;
+ font-weight: bold;
+ margin-left: 2%;
+}
+
+.contenttable {
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 12px;
+ color: #468C46;
+ padding-top: 0px;
+ margin-left: 20px;
+ font-weight: bold;
+ background-color: #FFFFFF;
+}
+
+.configheadinglavender {
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 12px;
+ color: #8585C1;
+ font-weight: bold;
+ background-image: url(../graphics/arrow_icon2.gif);
+ background-repeat: no-repeat;
+ background-position: 17px top;
+ padding-left: 38px;
+}
+
+.configheadinglavender a:link {
+ color: #8585C1;
+ cursor: pointer;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 13px;
+}
+
+.configheadinglavender a:active {
+ color: #117721;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 13px;
+ font-weight: bold;
+}
+
+.configheadinglavender a:visited {
+ color: #8585C1;
+ cursor: auto;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 13px;
+}
+
+.configheadinglavender a:hover {
+ color: #8585C1;
+ cursor: pointer;
+ text-decoration: underline;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 13px;
+}
+
+.configheading {
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 12px;
+ color: #27752C;
+ font-weight: bold;
+ background-image: url(../graphics/arrow_icon.gif);
+ background-repeat: no-repeat;
+ background-position: 17px top;
+ padding-left: 38px;
+}
+
+.configheading a:link {
+ color: #27752C;
+ cursor: pointer;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 13px;
+}
+
+.configheading a:active {
+ color: #117721;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 13px;
+ font-weight: bold;
+}
+
+.configheading a:visited {
+ color: #27752C;
+ cursor: auto;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 13px;
+}
+
+.configheading a:hover {
+ color: #27752C;
+ cursor: pointer;
+ text-decoration: underline;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 13px;
+}
+
+.banner {
+ margin: 5px;
+ width: 99%;
+ height: 94px;
+ background-image: url(../graphics/top_slice.gif);
+ background-color: #FFFFFF;
+ padding: 0px;
+ clip: rect(auto, auto, auto, auto);
+ float: left;
+}
+
+#date {
+ padding-top: 5px;
+ float: right;
+ text-align: right;
+ margin-left: 79.5%;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 13px;
+}
+
+#serviceName {
+ padding-top: 5px;
+ float: right;
+ text-align: right;
+ margin-left: 79.5%;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 13px;
+ font-weight: bold;
+}
+
+.mainWindow {
+ border: none;
+ padding: 0px;
+ width: 100%;
+ height: 750px;
+ background-color: #ffffff;
+}
+
+.centerWindow {
+ background-color: #FFFFFF;
+ width: 82%;
+ height: 80%;
+ margin-right: 5px;
+ margin-bottom: 5px;
+ margin-left: 0;
+ float: left;
+}
+
+.centerWindow object {
+ width: 101%;
+ height: 105%;
+ background-color: #FFFFFF;
+}
+
+/* Sidebar*/
+.sidebar {
+ width: 15%;
+ height: 71.1%;
+ padding-bottom: 12.1%;
+ padding-right: 0px;
+ float: left;
+ border-right-width: 1px;
+ border-right-style: solid;
+ border-right-color: #61AF61;
+ margin-top: 0px;
+ margin-right: 5px;
+ margin-bottom: 5px;
+ margin-left: 5px;
+}
+
+.sidebar th {
+ color: #ffffff;
+ text-align: right;
+ background-color: #61AF61;
+ width: 15%;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 12px;
+ font-weight: normal;
+ text-decoration: none;
+ background-repeat: no-repeat;
+ padding-top: 10px;
+ padding-right: 8%;
+ padding-bottom: 10px;
+ padding-left: 10px;
+}
+
+.sidebar td {
+ text-align: right;
+ background-color: #ffffff;
+ padding: 10px;
+ border-bottom-width: 1px;
+ border-bottom-style: dotted;
+ border-bottom-color: #92C992;
+}
+
+.sidebar a.button {
+ color: #ffffff;
+ text-align: left;
+ background-color: #61AF61;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 12px;
+ font-weight: normal;
+ text-decoration: none;
+ background-position: 100% 50%;
+ background-image: url(../graphics/admin_home_target.gif);
+ background-repeat: no-repeat;
+}
+
+.sidebar a {
+ font-weight: normal;
+ padding-top: 0px;
+ padding-right: 0px;
+ padding-bottom: 0px;
+ padding-left: 0px;
+ margin-bottom: 0px;
+}
+
+.sidebar img {
+ float: right;
+ border: none;
+ padding-top: 0px;
+ padding-right: 0px;
+ padding-bottom: 0px;
+}
+
+.footer {
+ height: 20px;
+ text-align: right;
+ color: #61AF61;
+ background-color: #ffffff;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 10px;
+ border-top-width: 1px;
+ border-top-style: dotted;
+ border-top-color: #61AF61;
+ padding-top: 12px;
+ width: 100%;
+ border-right-style: none;
+ border-right-color: #FFFFFF;
+ border-left-color: #FFFFFF;
+ float: none;
+}
\ No newline at end of file

Property changes on:
branches/new-structure-with-base2/ps-mdm-as/resources/wa/styles/main.css
___________________________________________________________________
Name: svn:mime-type
+ text/plain

Added:
branches/new-structure-with-base2/ps-mdm-as/resources/wa/views/banner.jsp
===================================================================
--- branches/new-structure-with-base2/ps-mdm-as/resources/wa/views/banner.jsp
(rev 0)
+++ branches/new-structure-with-base2/ps-mdm-as/resources/wa/views/banner.jsp
2010-04-06 15:48:34 UTC (rev 5576)
@@ -0,0 +1,18 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8"
+ pageEncoding="UTF-8"%>
+
+
+<table border="0" align="left" cellpadding="0" cellspacing="0"
style="width:100%">
+ <tr>
+ <td>
+ <a href="index.jsp" target="_self">
+ <img src="wa/graphics/perfsonar_logo.gif"
alt="perfSONAR" width="192" height="94" border="0" align="left"/>
+ </a>
+ </td>
+ <td
style="text-align:right;padding-right:70px;font-weight:bold;color:#468C46;font-size:14px">
+ <%
+ out.println(serviceName+" - "+serviceVersion);
+ %>
+ </td>
+ </tr>
+</table>
\ No newline at end of file

Property changes on:
branches/new-structure-with-base2/ps-mdm-as/resources/wa/views/banner.jsp
___________________________________________________________________
Name: svn:mime-type
+ text/plain

Added:
branches/new-structure-with-base2/ps-mdm-as/resources/wa/views/configurationSaved.jsp
===================================================================
---
branches/new-structure-with-base2/ps-mdm-as/resources/wa/views/configurationSaved.jsp
(rev 0)
+++
branches/new-structure-with-base2/ps-mdm-as/resources/wa/views/configurationSaved.jsp
2010-04-06 15:48:34 UTC (rev 5576)
@@ -0,0 +1,7 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8"
+ pageEncoding="UTF-8"%>
+
+
+ <p class="heading1">
+ The configuration files have been saved.
+ </p>
\ No newline at end of file

Property changes on:
branches/new-structure-with-base2/ps-mdm-as/resources/wa/views/configurationSaved.jsp
___________________________________________________________________
Name: svn:mime-type
+ text/plain

Added:
branches/new-structure-with-base2/ps-mdm-as/resources/wa/views/error.jsp
===================================================================
--- branches/new-structure-with-base2/ps-mdm-as/resources/wa/views/error.jsp
(rev 0)
+++ branches/new-structure-with-base2/ps-mdm-as/resources/wa/views/error.jsp
2010-04-06 15:48:34 UTC (rev 5576)
@@ -0,0 +1,11 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8"
+ pageEncoding="UTF-8"%>
+
+
+<center>
+ <h2>
+ Failed to load web admin configuration file(s). <br />
+ Please check Tomcat log files for further information. <br />
+ Restart Tomcat after saving web admin configuration files and click
+ <a href="index.jsp" target="_self"> here</a>.</h2>
+</center>
\ No newline at end of file

Property changes on:
branches/new-structure-with-base2/ps-mdm-as/resources/wa/views/error.jsp
___________________________________________________________________
Name: svn:mime-type
+ text/plain

Added:
branches/new-structure-with-base2/ps-mdm-as/resources/wa/views/footer.jsp
===================================================================
--- branches/new-structure-with-base2/ps-mdm-as/resources/wa/views/footer.jsp
(rev 0)
+++ branches/new-structure-with-base2/ps-mdm-as/resources/wa/views/footer.jsp
2010-04-06 15:48:34 UTC (rev 5576)
@@ -0,0 +1,5 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8"
+ pageEncoding="UTF-8"%>
+
+
+PERFormance Service-Oriented Network monitoring ARchitecture  
\ No newline at end of file

Property changes on:
branches/new-structure-with-base2/ps-mdm-as/resources/wa/views/footer.jsp
___________________________________________________________________
Name: svn:mime-type
+ text/plain

Added:
branches/new-structure-with-base2/ps-mdm-as/resources/wa/views/savedFailed.jsp
===================================================================
---
branches/new-structure-with-base2/ps-mdm-as/resources/wa/views/savedFailed.jsp
(rev 0)
+++
branches/new-structure-with-base2/ps-mdm-as/resources/wa/views/savedFailed.jsp
2010-04-06 15:48:34 UTC (rev 5576)
@@ -0,0 +1,7 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8"
+ pageEncoding="UTF-8"%>
+
+
+<p class="heading1">
+ The configuration files have been saved.
+</p>
\ No newline at end of file

Property changes on:
branches/new-structure-with-base2/ps-mdm-as/resources/wa/views/savedFailed.jsp
___________________________________________________________________
Name: svn:mime-type
+ text/plain

Added:
branches/new-structure-with-base2/ps-mdm-as/resources/wa/views/selfTest.jsp
===================================================================
---
branches/new-structure-with-base2/ps-mdm-as/resources/wa/views/selfTest.jsp
(rev 0)
+++
branches/new-structure-with-base2/ps-mdm-as/resources/wa/views/selfTest.jsp
2010-04-06 15:48:34 UTC (rev 5576)
@@ -0,0 +1,39 @@
+<%@page
import="java.util.Map"%>
+<%@ page language="java" contentType="text/html; charset=UTF-8"
+ pageEncoding="UTF-8"%>
+
+
+<div class="centerWindow">
+ <p class="welcometext">
+ Welcome to the perfSONAR service web administration interface
+ </p>
+ <p class="heading1">
+ Deployment test
+ </p>
+ <%
+ if(request.getParameter("ok")!=null){
+ %>
+ <div
style="padding:10px;margin:10px;border:1px solid #468C46;
background-color:#d9ecd9;display:table">
+ <span style="font-weight:
bold">TEST SUCCESS</span><br/>
+ <hr style="border: 1px solid
#468C46"/>
+ <%
+ }else{
+ %>
+ <div
style="padding:10px;margin:10px;border:1px solid #960101;
background-color:#ff8080;display:table">
+ <span style="font-weight:
bold">TEST FAILED</span><br/>
+ <hr style="border: 1px solid
#960101"/>
+ <%
+ Map<String,String>
errors=(Map<String,String>)application.getAttribute("errors");
+ if(errors!=null){
+
out.println("<table>");
+ for(String
eventType:errors.keySet()){
+
out.println("<tr><td>"+eventType+"</td><td>"+errors.get(eventType)+"</td></tr>");
+ }
+
out.println("</table>");
+ }else{
+
out.println(application.getAttribute("errorMessage"));
+ }
+ }
+ %>
+ </div>
+</div>
\ No newline at end of file

Property changes on:
branches/new-structure-with-base2/ps-mdm-as/resources/wa/views/selfTest.jsp
___________________________________________________________________
Name: svn:mime-type
+ text/plain

Added:
branches/new-structure-with-base2/ps-mdm-as/resources/wa/views/sideBar.jsp
===================================================================
---
branches/new-structure-with-base2/ps-mdm-as/resources/wa/views/sideBar.jsp
(rev 0)
+++
branches/new-structure-with-base2/ps-mdm-as/resources/wa/views/sideBar.jsp
2010-04-06 15:48:34 UTC (rev 5576)
@@ -0,0 +1,52 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8"
+ pageEncoding="UTF-8"%>
+
+
+<table border="0" cellpadding="0" cellspacing="0">
+ <tr>
+ <th><a href="index.jsp" class="button" target="_self">Admin
+ home      </a></th>
+ </tr>
+ <tr>
+ <td>
+ <p>
+ <span class="navtexheading">
+ Basic Configuration
+ </span>
+ </p>
+ <%
+ for(String basicLink:menuBasicLinks){
+ out.println(basicLink);
+ }
+ %>
+ <span class="navtex">
+ <a href="selfTest">Test</a>
+ </span>
+ </td>
+ </tr>
+ <%
+ if (menuAdvancedLinks.length!=0) {
+ %>
+
+ <tr>
+ <td>
+ <p>
+ <span class="navtexheading">
+ Advanced Configuration
+ </span>
+ </p>
+ <%
+ for(String advancedLink:menuAdvancedLinks){
+ out.println(advancedLink);
+ }
+ %>
+ </td>
+ </tr>
+ <%
+ }
+ %>
+ <tr>
+ </tr>
+</table>
+<img src="wa/graphics/logos.gif" alt="perfSONAR project partners"
+ width="117" height="263" border="0" align="top" />

Property changes on:
branches/new-structure-with-base2/ps-mdm-as/resources/wa/views/sideBar.jsp
___________________________________________________________________
Name: svn:mime-type
+ text/plain

Added:
branches/new-structure-with-base2/ps-mdm-as/resources/wa/views/welcome.jsp
===================================================================
---
branches/new-structure-with-base2/ps-mdm-as/resources/wa/views/welcome.jsp
(rev 0)
+++
branches/new-structure-with-base2/ps-mdm-as/resources/wa/views/welcome.jsp
2010-04-06 15:48:34 UTC (rev 5576)
@@ -0,0 +1,86 @@
+<div class="centerWindow">
+<p class="welcometext">Welcome to the perfSONAR service web admin
+administration interface</p>
+<p class="heading1">Configuration Settings</p>
+<table width="0" border="0" cellpadding="0" cellspacing="0">
+ <tr>
+ <td>
+ <table width="0" border="0" cellpadding="0" cellspacing="0"
+ background="wa/graphics/step_1_slice.gif"
class="contenttable">
+ <tr>
+ <td><img src="wa/graphics/step_1_top.gif"
width="350" height="122">
+ </td>
+ </tr>
+
+ <%
+ for (String basicLink : mainBasicLinks) {
+ out.println(basicLink);
+ }
+ %>
+
+ <tr>
+ <td>
+ <p> </p>
+ <p> </p>
+ <p> </p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p> </p>
+ <p> </p>
+ <p> </p>
+ </td>
+ </tr>
+ <tr>
+ <td></td>
+ </tr>
+ <tr>
+ <td><img src="wa/graphics/step_1_bottom.gif"
width="350"
+ height="18"></td>
+ </tr>
+ </table>
+ </td>
+
+ <%
+ if (mainAdvancedLinks.length != 0) {
+ %>
+ <td>
+ <table width="0" border="0" cellpadding="0" cellspacing="0"
+ background="wa/graphics/step_2_slice.gif"
class="contenttable">
+ <tr>
+ <td><img src="wa/graphics/step_2_top.gif"
width="350" height="118">
+ </td>
+ </tr>
+ <%
+ for (String mainAdvancedLink :
mainAdvancedLinks) {
+ out.println(mainAdvancedLink);
+ }
+ %>
+
+ <tr>
+ <td><img src="wa/graphics/step_2_bottom.gif"
width="350"
+ height="18"></td>
+ </tr>
+ </table>
+ </td>
+ <%
+ }
+ %>
+ </tr>
+ <%
+ if (map.needSync()) {
+ %>
+ <tr>
+ <td align="center" colspan="3" rowspan="2">
+ <p> </p>
+ <p> </p>
+ <p><a href="/wa/index.jsp?page=save" target="_self">Save
+ Configuration to Disk</a></p>
+ </td>
+ </tr>
+ <%
+ }
+ %>
+</table>
+</div>

Property changes on:
branches/new-structure-with-base2/ps-mdm-as/resources/wa/views/welcome.jsp
___________________________________________________________________
Name: svn:mime-type
+ text/plain

[GEANT/SA2/ps-java-services] r5576 - in branches/new-structure-with-base2/ps-mdm-as: . conf doc resources resources/axis2-1.4.1/webapp/WEB-INF resources/wa resources/wa/graphics resources/wa/scripts resources/wa/soapMessages resources/wa/styles resources/wa/views, svn-noreply, 04/06/2010

List archive

[GEANT/SA2/ps-java-services] r5576 - in branches/new-structure-with-base2/ps-mdm-as: . conf doc resources resources/axis2-1.4.1/webapp/WEB-INF resources/wa resources/wa/graphics resources/wa/scripts resources/wa/soapMessages resources/wa/styles resources/wa/views