Skip to Content.
Sympa Menu

perfsonar-dev - perfsonar: r4459 - in trunk/geant2-java-rrd-ma: . ant conf conf/axis-1.4 conf/axis-1.4/WEB-INF packaging/deb packaging/rpm

Subject: perfsonar development work

List archive

perfsonar: r4459 - in trunk/geant2-java-rrd-ma: . ant conf conf/axis-1.4 conf/axis-1.4/WEB-INF packaging/deb packaging/rpm


Chronological Thread 
  • From:
  • To:
  • Subject: perfsonar: r4459 - in trunk/geant2-java-rrd-ma: . ant conf conf/axis-1.4 conf/axis-1.4/WEB-INF packaging/deb packaging/rpm
  • Date: Fri, 5 Sep 2008 08:31:29 -0400
Author: roman
Date: 2008-09-05 08:31:28 -0400 (Fri, 05 Sep 2008)
New Revision: 4459

Added:
trunk/geant2-java-rrd-ma/conf/schema.rng
Modified:
trunk/geant2-java-rrd-ma/ant/libs-download-targets.xml
trunk/geant2-java-rrd-ma/conf/axis-1.4/WEB-INF/web.xml
trunk/geant2-java-rrd-ma/conf/axis-1.4/welcome.htm
trunk/geant2-java-rrd-ma/packaging/deb/changelog
trunk/geant2-java-rrd-ma/packaging/deb/conffiles
trunk/geant2-java-rrd-ma/packaging/rpm/geant2-java-rrd-ma.specs
trunk/geant2-java-rrd-ma/pom.xml
Log:
new version of the webadmin (0.9.2b)



Modified: trunk/geant2-java-rrd-ma/ant/libs-download-targets.xml
===================================================================
--- trunk/geant2-java-rrd-ma/ant/libs-download-targets.xml 2008-09-05
12:00:36 UTC (rev 4458)
+++ trunk/geant2-java-rrd-ma/ant/libs-download-targets.xml 2008-09-05
12:31:28 UTC (rev 4459)
@@ -59,11 +59,11 @@
<dependency groupId="perfsonar" artifactId="perfsonar-web-admin"
version="0.9.2b"/>
<dependency groupId="nmwg" artifactId="nmwg"
version="1.0.20080630"/>

- <dependency groupId="Validation" artifactId="msv"
version="1.0"/>
- <dependency groupId="Validation" artifactId="xsdlib"
version="1.0"/>
- <dependency groupId="Validation" artifactId="isorelax"
version="1.0"/>
- <dependency groupId="Validation"
artifactId="isorelax-jaxp-bridge" version="1.0"/>
- <dependency groupId="Validation" artifactId="relaxngDatatype"
version="1.0"/>
+ <dependency groupId="Validation" artifactId="msv"
version="1.0"/>
+ <dependency groupId="Validation" artifactId="xsdlib"
version="1.0"/>
+ <dependency groupId="Validation" artifactId="isorelax"
version="1.0"/>
+ <dependency groupId="Validation" artifactId="isorelax-jaxp-bridge"
version="1.0"/>
+ <dependency groupId="Validation" artifactId="relaxngDatatype"
version="1.0"/>

<localRepository refid="local.repository"/>
<remoteRepository refid="remote.repository"/>

Modified: trunk/geant2-java-rrd-ma/conf/axis-1.4/WEB-INF/web.xml
===================================================================
--- trunk/geant2-java-rrd-ma/conf/axis-1.4/WEB-INF/web.xml 2008-09-05
12:00:36 UTC (rev 4458)
+++ trunk/geant2-java-rrd-ma/conf/axis-1.4/WEB-INF/web.xml 2008-09-05
12:31:28 UTC (rev 4459)
@@ -156,7 +156,29 @@
</servlet-mapping>


+ <!-- pS Stitching Servlet -->

+ <servlet>
+ <servlet-name>
+ MetadataAdmin
+ </servlet-name>
+ <servlet-class>
+ perfSONARWebAdmin.admin.stitching.StitchingServlet
+ </servlet-class>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>
+ MetadataAdmin
+ </servlet-name>
+ <url-pattern>
+ /MetadataAdmin
+ </url-pattern>
+ </servlet-mapping>
+
+
+
+
<welcome-file-list id="WelcomeFileList">
<welcome-file>index.jsp</welcome-file>
<welcome-file>index.html</welcome-file>

Modified: trunk/geant2-java-rrd-ma/conf/axis-1.4/welcome.htm
===================================================================
--- trunk/geant2-java-rrd-ma/conf/axis-1.4/welcome.htm 2008-09-05 12:00:36
UTC (rev 4458)
+++ trunk/geant2-java-rrd-ma/conf/axis-1.4/welcome.htm 2008-09-05 12:31:28
UTC (rev 4459)
@@ -3,11 +3,11 @@
<head>
<meta http-equiv="Content-Type" content="text/html;
charset=iso-8859-1"/>
<title>Untitled Document</title>
- <link rel="stylesheet" type="text/css" href="main.css"/>
+ <link rel="stylesheet" type="text/css" href="main.css"/>
</head>
<body style="background-color: #FFFFFF" >
<div class="centerWindow" >
- <p class="welcometext">Welcome to the perfSONAR service web
admin administration interface</p>
+ <p class="welcometext">Welcome to the perfSONAR service web
admin administration interface</p>
<p class="heading1">
Configuration Settings
</p>
@@ -33,7 +33,7 @@
</p>
</td>
</tr>
- <tr>
+ <tr>
<td >
<p>
&nbsp;
@@ -46,7 +46,7 @@
</p>
</td>
</tr>
- <tr>
+ <tr>
<td >
<p>
&nbsp;
@@ -59,7 +59,7 @@
</p>
</td>
</tr>
- <tr><td> </td></tr>
+ <tr><td> </td></tr>
<tr>
<td>
<img src="graphics/step_1_bottom.gif"
width="350" height="18">
@@ -114,6 +114,19 @@
</td>
</tr>
<tr>
+ <td class="configheadinglavender">
+ <p>
+ <a href="MetadataAdmin"
target="main">Metadata Configuration File</a>
+ </p>
+ <p>
+ &nbsp;
+ </p>
+ <p>
+ &nbsp;
+ </p>
+ </td>
+ </tr>
+ <tr>
<td>
<img src="graphics/step_2_bottom.gif"
width="350" height="18">
</td>

Added: trunk/geant2-java-rrd-ma/conf/schema.rng

Modified: trunk/geant2-java-rrd-ma/packaging/deb/changelog
===================================================================
--- trunk/geant2-java-rrd-ma/packaging/deb/changelog 2008-09-05 12:00:36
UTC (rev 4458)
+++ trunk/geant2-java-rrd-ma/packaging/deb/changelog 2008-09-05 12:31:28
UTC (rev 4459)
@@ -6,10 +6,10 @@
* New: performance improvements for MetadataKeyRequest message which
fetches all metadata elements
* Change: format of log messages changed
* Change: use of pSbase v1.0.20080902
- * Change: use of web admin library v0.9.1b
+ * Change: use of web admin library v0.9.2b
* Change: obsolete authRealm removed from metadata configuration file

- -- Roman Lapacz
<>
Wed, 03 Sep 2008 12:00:00 +0200
+ -- Roman Lapacz
<>
Wed, 05 Sep 2008 12:00:00 +0200

geant2-java-rrd-ma (3.0-1) stable; urgency=low


Modified: trunk/geant2-java-rrd-ma/packaging/deb/conffiles
===================================================================
--- trunk/geant2-java-rrd-ma/packaging/deb/conffiles 2008-09-05 12:00:36
UTC (rev 4458)
+++ trunk/geant2-java-rrd-ma/packaging/deb/conffiles 2008-09-05 12:31:28
UTC (rev 4459)
@@ -9,5 +9,6 @@

/var/lib/tomcat5.5/webapps/geant2-java-rrd-ma/WEB-INF/classes/perfsonar/conf/rrd-database_TEST.xml

/var/lib/tomcat5.5/webapps/geant2-java-rrd-ma/WEB-INF/classes/perfsonar/conf/wizard.properties

/var/lib/tomcat5.5/webapps/geant2-java-rrd-ma/WEB-INF/classes/perfsonar/conf/wizardproperties.dtd
+/var/lib/tomcat5.5/webapps/geant2-java-rrd-ma/WEB-INF/classes/perfsonar/conf/schema.rng
/var/lib/tomcat5.5/webapps/geant2-java-rrd-ma/WEB-INF/web.xml
/var/lib/tomcat5.5/webapps/geant2-java-rrd-ma/WEB-INF/server-config.wsdd

Modified: trunk/geant2-java-rrd-ma/packaging/rpm/geant2-java-rrd-ma.specs
===================================================================
--- trunk/geant2-java-rrd-ma/packaging/rpm/geant2-java-rrd-ma.specs
2008-09-05 12:00:36 UTC (rev 4458)
+++ trunk/geant2-java-rrd-ma/packaging/rpm/geant2-java-rrd-ma.specs
2008-09-05 12:31:28 UTC (rev 4459)
@@ -79,6 +79,7 @@
%{__ln_s} %{prefix}/WEB-INF/classes/perfsonar/conf/*.properties
%{_sysconfdir}/%{name}
%{__ln_s} %{prefix}/WEB-INF/classes/perfsonar/conf/objects.config
%{_sysconfdir}/%{name}
%{__ln_s} %{prefix}/WEB-INF/classes/perfsonar/conf/*.xml
%{_sysconfdir}/%{name}
+%{__ln_s} %{prefix}/WEB-INF/classes/perfsonar/conf/*.rng
%{_sysconfdir}/%{name}
%{__ln_s} %{_var}/log/tomcat5 %{_var}/log/%{name}
## restart tomcat
/sbin/service tomcat5 restart

Modified: trunk/geant2-java-rrd-ma/pom.xml
===================================================================
--- trunk/geant2-java-rrd-ma/pom.xml 2008-09-05 12:00:36 UTC (rev 4458)
+++ trunk/geant2-java-rrd-ma/pom.xml 2008-09-05 12:31:28 UTC (rev 4459)
@@ -172,6 +172,31 @@
<version>2.3</version>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>Validation</groupId>
+ <artifactId>msv</artifactId>
+ <version>1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>Validation</groupId>
+ <artifactId>xsdlib</artifactId>
+ <version>1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>Validation</groupId>
+ <artifactId>isorelax</artifactId>
+ <version>1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>Validation</groupId>
+ <artifactId>isorelax-jaxp-bridge</artifactId>
+ <version>1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>Validation</groupId>
+ <artifactId>relaxngDatatype</artifactId>
+ <version>1.0</version>
+ </dependency>
</dependencies>
<reporting>
<excludeDefaults>true</excludeDefaults>


  • perfsonar: r4459 - in trunk/geant2-java-rrd-ma: . ant conf conf/axis-1.4 conf/axis-1.4/WEB-INF packaging/deb packaging/rpm, svnlog, 09/05/2008

Archive powered by MHonArc 2.6.16.

Top of Page