Skip to Content.
Sympa Menu

perfsonar-dev - perfsonar: r4343 - in branches/WebAdmin: . ant

Subject: perfsonar development work

List archive

perfsonar: r4343 - in branches/WebAdmin: . ant


Chronological Thread 
  • From:
  • To:
  • Subject: perfsonar: r4343 - in branches/WebAdmin: . ant
  • Date: Thu, 7 Aug 2008 01:48:47 -0400
Author: michalis
Date: 2008-08-07 01:48:47 -0400 (Thu, 07 Aug 2008)
New Revision: 4343

Added:
branches/WebAdmin/index_sqlma.jsp
Removed:
branches/WebAdmin/index_sqlma.html
Modified:
branches/WebAdmin/ant/libs-download-targets.xml
branches/WebAdmin/wizard.properties
branches/WebAdmin/wizardproperties.dtd
Log:


Modified: branches/WebAdmin/ant/libs-download-targets.xml
===================================================================
--- branches/WebAdmin/ant/libs-download-targets.xml 2008-08-07 05:33:29
UTC (rev 4342)
+++ branches/WebAdmin/ant/libs-download-targets.xml 2008-08-07 05:48:47
UTC (rev 4343)
@@ -57,7 +57,11 @@
<dependency groupId="commons-io" artifactId="commons-io"
version="1.3.2"/>
<dependency groupId="commons-codec" artifactId="commons-codec"
version="1.3"/>
<dependency groupId="commons-fileupload"
artifactId="commons-fileupload" version="1.2"/>
-
+ <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"/>


Deleted: branches/WebAdmin/index_sqlma.html

Added: branches/WebAdmin/index_sqlma.jsp

Modified: branches/WebAdmin/wizard.properties
===================================================================
--- branches/WebAdmin/wizard.properties 2008-08-07 05:33:29 UTC (rev 4342)
+++ branches/WebAdmin/wizard.properties 2008-08-07 05:48:47 UTC (rev 4343)
@@ -1,128 +1,163 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE properties [
- <!ELEMENT properties ( comment?, property* )>
-<!ATTLIST properties version CDATA #FIXED "0.1">
-<!ELEMENT comment (#PCDATA) >
-<!ELEMENT property (entry,Comment,ProposedValue,Group+,AcceptedValue*) >
-<!ELEMENT entry (#PCDATA) >
-<!ATTLIST entry
-key CDATA #REQUIRED
- password (true|false) #IMPLIED
- required (true|false) #IMPLIED >
-<!ELEMENT Comment (#PCDATA) >
-<!ELEMENT ProposedValue (#PCDATA) >
-<!ELEMENT Group (#PCDATA) >
-<!ATTLIST Group
- order CDATA #REQUIRED
- check (true|false) #IMPLIED
->
-<!ELEMENT AcceptedValue (#PCDATA) >
+<!DOCTYPE properties [
+ <!ELEMENT properties ( comment?, property* )>
+<!ATTLIST properties version CDATA #FIXED "0.1">
+<!ELEMENT comment (#PCDATA) >
+<!ELEMENT property (entry,Comment,ProposedValue,Group+,AcceptedValue*) >
+<!ELEMENT entry (#PCDATA) >
+<!ATTLIST entry
+key CDATA #REQUIRED
+ password (true|false) #IMPLIED
+ required (true|false) #IMPLIED >
+<!ELEMENT Comment (#PCDATA) >
+<!ELEMENT ProposedValue (#PCDATA) >
+<!ELEMENT Group (#PCDATA) >
+<!ATTLIST Group
+ order CDATA #REQUIRED
+ check (true|false) #IMPLIED
+ dependsOn CDATA #IMPLIED
+>
+<!ELEMENT AcceptedValue (#PCDATA) >
]>
<properties>
- <comment>Last Modification Tue Apr 15 11:11:11 EEST 2008</comment>
+ <comment>Last Modification Wed Jul 23 09:21:42 EEST 2008</comment>
<property>
+ <entry key="component.ma.xmldb.db_adminpassword_confirm" required="true"
password="true" />
+ <Comment>Confirm new eXist administration password:</Comment>
+ <ProposedValue />
+ <Group order="9" dependsOn="7">eXist</Group>
+ </property>
+ <property>
<entry key="component.ma.xmldb.db_username"
required="true">rrdmaservice</entry>
<Comment>Enter the service username for the eXist user:</Comment>
<ProposedValue>rrdmaservice</ProposedValue>
- <Group order="3">eXist</Group>
+ <Group order="2">eXist</Group>
</property>
<property>
- <entry key="old_adminpassword" required="true"
password="true">perfsonar</entry>
+ <entry key="old_adminpassword" required="true" password="true" />
<Comment>Enter the old eXist administration password:</Comment>
- <ProposedValue>perfsonar</ProposedValue>
- <Group order="5">eXist</Group>
+ <ProposedValue />
+ <Group order="99" dependsOn="7">eXist</Group>
</property>
<property>
+ <entry key="service.as.authn_active" required="true">no</entry>
+ <Comment>Do you wish to enable authentication?</Comment>
+ <ProposedValue>yes</ProposedValue>
+ <Group order="1" check="true">Authentication</Group>
+ <AcceptedValue>yes</AcceptedValue>
+ <AcceptedValue>no</AcceptedValue>
+ </property>
+ <property>
<entry key="component.ma.xmldb.db_password" required="true"
password="true">perfsonar</entry>
<Comment>Enter the password for the eXist user:</Comment>
<ProposedValue>perfsonar</ProposedValue>
- <Group order="4">eXist</Group>
+ <Group order="3">eXist</Group>
</property>
<property>
- <entry key="servlet.password" required="true"
password="true">test</entry>
+ <entry key="service.as.point"
required="true">http://homer.rediris.es:8080/perfSONAR-AS/services/AuthService</entry>
+ <Comment>Enter the URL address of the Authentication Service:</Comment>
+
<ProposedValue>http://homer.rediris.es:8080/perfSONAR-AS/services/AuthService</ProposedValue>
+ <Group order="2">Authentication</Group>
+ </property>
+ <property>
+ <entry key="old_adminpassword_1" required="true" password="true" />
+ <Comment>Enter the eXist administration password:</Comment>
+ <ProposedValue />
+ <Group order="5" dependsOn="4">eXist</Group>
+ </property>
+ <property>
+ <entry key="service.as.authn_for_msg_types"
required="true">SetupDataRequest,MetadataKeyRequest</entry>
+ <Comment>Enter the message types which should be authenticated:</Comment>
+ <ProposedValue>SetupDataRequest,MetadataKeyRequest</ProposedValue>
+ <Group order="3">Authentication</Group>
+ </property>
+ <property>
+ <entry key="servlet.password" required="true"
password="true">perfsonarpass</entry>
<Comment>Enter the password for logging in to the admin pages:</Comment>
- <ProposedValue>test</ProposedValue>
+ <ProposedValue>perfsonarpass</ProposedValue>
<Group order="2">Administration</Group>
</property>
<property>
- <entry key="servlet.username" required="true">test</entry>
+ <entry key="servlet.username" required="true">perfsonaruser</entry>
<Comment>Enter the username for logging in to the admin pages:</Comment>
- <ProposedValue>test</ProposedValue>
- <Group order="1" check="false">Administration</Group>
+ <ProposedValue>perfsonaruser</ProposedValue>
+ <Group order="1">Administration</Group>
</property>
<property>
- <entry key="service.ma.conf_file"
required="true">/home/perfsonar/webapps/geant2_java-rrd-ma-x86_32-3.0rc3/WEB-INF/classes/perfsonar/conf/rrd-database_TEST.xml</entry>
+ <entry key="service.ma.conf_file"
required="true">/opt/perfsonar/services/geant2-java-rrd-ma/WEB-INF/classes/perfsonar/conf/Cynet_RRDMA_Config.xml</entry>
<Comment>Enter the full path of the metadata configuration
file:</Comment>
-
<ProposedValue>/home/perfsonar/webapps/geant2_java-rrd-ma-x86_32-3.0rc3/WEB-INF/classes/perfsonar/conf/rrd-database_TEST.xml</ProposedValue>
- <Group order="7">eXist</Group>
+
<ProposedValue>/opt/perfsonar/services/geant2-java-rrd-ma/WEB-INF/classes/perfsonar/conf/Cynet_RRDMA_Config.xml</ProposedValue>
+ <Group order="6">eXist</Group>
</property>
<property>
- <entry key="service.r.ls_url"
required="true">http://loco4.man.poznan.pl:8080/XML-LS/services/LookupService</entry>
+ <entry key="service.r.ls_url" required="true">http://somewhere</entry>
<Comment>Enter the LS URL:</Comment>
-
<ProposedValue>http://loco4.man.poznan.pl:8080/XML-LS/services/LookupService</ProposedValue>
+ <ProposedValue>http://somewhere</ProposedValue>
<Group order="5">LS</Group>
</property>
<property>
- <entry key="service.r.organization_name">CyNet</entry>
+ <entry key="service.r.organization_name">Cynet</entry>
<Comment>Enter the name of the organization running this
service:</Comment>
- <ProposedValue>CyNet</ProposedValue>
+ <ProposedValue>Cynet</ProposedValue>
<Group order="4">LS</Group>
</property>
<property>
+ <entry
key="service.r.contact_email"></entry>
+ <Comment>Enter the service administrator's email address:</Comment>
+
<ProposedValue></ProposedValue>
+ <Group order="3">LS</Group>
+ </property>
+ <property>
<entry key="component.ma.xmldb.db_uri"
required="true">xmldb:exist://localhost:8080/exist/xmlrpc</entry>
<Comment>Enter the location of the eXist database:</Comment>
<ProposedValue>xmldb:exist://localhost:8080/exist/xmlrpc</ProposedValue>
- <Group order="2">eXist</Group>
+ <Group order="1">eXist</Group>
</property>
<property>
- <entry
key="service.r.contact_email"></entry>
- <Comment>Enter the service administrator's email address:</Comment>
-
<ProposedValue></ProposedValue>
- <Group order="3">LS</Group>
+ <entry key="component.ma.xmldb.db_adminpassword" required="true"
password="true" />
+ <Comment>Enter the eXist administration password:</Comment>
+ <ProposedValue />
+ <Group order="8" dependsOn="7">eXist</Group>
</property>
<property>
- <entry key="component.ma.xmldb.db_adminpassword" required="true"
password="true">perfsonar</entry>
- <Comment>Enter the new eXist administration password:</Comment>
- <ProposedValue>perfsonar</ProposedValue>
- <Group order="6">eXist</Group>
+ <entry key="create_user" required="true">no</entry>
+ <Comment>Do you wish to create a user with this name?</Comment>
+ <ProposedValue>yes</ProposedValue>
+ <Group order="4" check="true">eXist</Group>
+ <AcceptedValue>yes</AcceptedValue>
+ <AcceptedValue>no</AcceptedValue>
</property>
<property>
- <entry key="service.r.service_description">perfSONAR JavaRRD MA</entry>
+ <entry key="service.r.service_description">RRD MA for CyNet
interfaces</entry>
<Comment>Enter a description for the service:</Comment>
- <ProposedValue>perfSONAR JavaRRD MA</ProposedValue>
+ <ProposedValue>RRD MA for CyNet interfaces</ProposedValue>
<Group order="2">LS</Group>
</property>
<property>
- <entry key="service.r.access_point"
required="true">http://perfsonartest.usr.cynet.ac.cy:8080/geant2_java-rrd-ma-x86_32/services/MeasurementArchiveService</entry>
+ <entry key="service.r.access_point"
required="true">http://somewhere</entry>
<Comment>Enter the service access point:</Comment>
-
<ProposedValue>http://perfsonartest.usr.cynet.ac.cy:8080/geant2_java-rrd-ma-x86_32/services/MeasurementArchiveService</ProposedValue>
+ <ProposedValue>http://somewhere</ProposedValue>
<Group order="7">LS</Group>
</property>
<property>
- <entry key="service.r.service_name" required="true">perfSONAR Java RRD
MA</entry>
+ <entry key="change_admin_pass" required="true">no</entry>
+ <Comment>Do you wish to change the exist Admin password?</Comment>
+ <ProposedValue>yes</ProposedValue>
+ <Group order="7" check="true">eXist</Group>
+ <AcceptedValue>yes</AcceptedValue>
+ <AcceptedValue>no</AcceptedValue>
+ </property>
+ <property>
+ <entry key="service.r.service_name" required="true">CyNet Java RRD
MA</entry>
<Comment>Enter the service name:</Comment>
- <ProposedValue>perfSONAR Java RRD MA</ProposedValue>
- <Group order="1" check="false">LS</Group>
+ <ProposedValue>CyNet Java RRD MA</ProposedValue>
+ <Group order="1">LS</Group>
</property>
<property>
- <entry key="component.registrator.interval">30000</entry>
+ <entry key="component.registrator.interval">43200000</entry>
<Comment>Set the registration interval (milliseconds):</Comment>
- <ProposedValue>30000</ProposedValue>
+ <ProposedValue>43200000</ProposedValue>
<Group order="6">LS</Group>
</property>
- <property>
- <entry key="service.as.authn_active" required="true">no</entry>
- <Comment>Do you wish to enable authentication?</Comment>
- <ProposedValue>yes</ProposedValue>
- <Group order="1" check="true">AS</Group>
- <AcceptedValue>yes</AcceptedValue>
- <AcceptedValue>no</AcceptedValue>
- </property>
- <property>
- <entry key="service.as.point"
required="true">http://homer.rediris.es:8080/perfSONAR-AS/services/AuthService</entry>
- <Comment>Enter the URL address of the Authentication Service:</Comment>
-
<ProposedValue>http://homer.rediris.es:8080/perfSONAR-AS/services/AuthService</ProposedValue>
- <Group order="2">AS</Group>
- </property>
</properties>


Modified: branches/WebAdmin/wizardproperties.dtd
===================================================================
--- branches/WebAdmin/wizardproperties.dtd 2008-08-07 05:33:29 UTC (rev
4342)
+++ branches/WebAdmin/wizardproperties.dtd 2008-08-07 05:48:47 UTC (rev
4343)
@@ -16,6 +16,8 @@
<!ATTLIST Group
order CDATA #REQUIRED
check (true|false) #IMPLIED
+ dependsOn CDATA #IMPLIED
+
>
<!ELEMENT AcceptedValue (#PCDATA) >



  • perfsonar: r4343 - in branches/WebAdmin: . ant, svnlog, 08/07/2008

Archive powered by MHonArc 2.6.16.

Top of Page