Skip to Content.
Sympa Menu

perfsonar-dev - perfsonar: r4415 - branches/GEANT2-JAVA-SQL-MA-STABLE/conf

Subject: perfsonar development work

List archive

perfsonar: r4415 - branches/GEANT2-JAVA-SQL-MA-STABLE/conf


Chronological Thread 
  • From:
  • To:
  • Subject: perfsonar: r4415 - branches/GEANT2-JAVA-SQL-MA-STABLE/conf
  • Date: Fri, 29 Aug 2008 10:35:00 -0400
Author: roman
Date: 2008-08-29 10:34:59 -0400 (Fri, 29 Aug 2008)
New Revision: 4415

Modified:
branches/GEANT2-JAVA-SQL-MA-STABLE/conf/log4j.properties
branches/GEANT2-JAVA-SQL-MA-STABLE/conf/log4j.syslog.properties
branches/GEANT2-JAVA-SQL-MA-STABLE/conf/service.properties
branches/GEANT2-JAVA-SQL-MA-STABLE/conf/wizard.properties
Log:
merged with the trunk (-r 4406:4414)



Modified: branches/GEANT2-JAVA-SQL-MA-STABLE/conf/log4j.properties
===================================================================
--- branches/GEANT2-JAVA-SQL-MA-STABLE/conf/log4j.properties 2008-08-29
14:21:44 UTC (rev 4414)
+++ branches/GEANT2-JAVA-SQL-MA-STABLE/conf/log4j.properties 2008-08-29
14:34:59 UTC (rev 4415)
@@ -126,7 +126,7 @@
log4j.appender.warnAppender.MaxFileSize=500KB

# Group=Warn message logging
-# Description=The class responsible for appending log messages the log file.
+# Description=The class responsible for appending log messages to the log
file.
log4j.appender.warnAppender=org.apache.log4j.RollingFileAppender


@@ -154,7 +154,7 @@
log4j.appender.errorAppender.MaxFileSize=500KB

# Group=Error message logging
-# Description=The class responsible for appending log messages the log file.
+# Description=The class responsible for appending log messages to the log
file.
log4j.appender.errorAppender=org.apache.log4j.RollingFileAppender


@@ -182,7 +182,7 @@
log4j.appender.fatalAppender.MaxFileSize=500KB

# Group=Fatal message logging
-# Description=The class responsible for appending log messages the log file.
+# Description=The class responsible for appending log messages to the log
file.
log4j.appender.fatalAppender=org.apache.log4j.RollingFileAppender


@@ -210,7 +210,7 @@
log4j.appender.psRootAppender.MaxFileSize=500KB

# Group=All message logging
-# Description=The class responsible for appending log messages the log file.
+# Description=The class responsible for appending log messages to the log
file.
log4j.appender.psRootAppender=org.apache.log4j.RollingFileAppender



Modified: branches/GEANT2-JAVA-SQL-MA-STABLE/conf/log4j.syslog.properties
===================================================================
--- branches/GEANT2-JAVA-SQL-MA-STABLE/conf/log4j.syslog.properties
2008-08-29 14:21:44 UTC (rev 4414)
+++ branches/GEANT2-JAVA-SQL-MA-STABLE/conf/log4j.syslog.properties
2008-08-29 14:34:59 UTC (rev 4415)
@@ -125,7 +125,7 @@
log4j.appender.warnAppender.MaxFileSize=500KB

# Group=Warn message logging
-# Description=The class responsible for appending log messages the log file.
+# Description=The class responsible for appending log messages to the log
file.
log4j.appender.warnAppender=org.apache.log4j.RollingFileAppender


@@ -153,7 +153,7 @@
log4j.appender.errorAppender.MaxFileSize=500KB

# Group=Error message logging
-# Description=The class responsible for appending log messages the log file.
+# Description=The class responsible for appending log messages to the log
file.
log4j.appender.errorAppender=org.apache.log4j.RollingFileAppender


@@ -181,7 +181,7 @@
log4j.appender.fatalAppender.MaxFileSize=500KB

# Group=Fatal message logging
-# Description=The class responsible for appending log messages the log file.
+# Description=The class responsible for appending log messages to the log
file.
log4j.appender.fatalAppender=org.apache.log4j.RollingFileAppender


@@ -209,7 +209,7 @@
log4j.appender.psRootAppender.MaxFileSize=500KB

# Group=All message logging
-# Description=The class responsible for appending log messages the log file.
+# Description=The class responsible for appending log messages to the log
file.
log4j.appender.psRootAppender=org.apache.log4j.RollingFileAppender


@@ -221,7 +221,7 @@
log4j.appender.SYSLOG=org.apache.log4j.net.SyslogAppender

# Group=Syslog logging
-# Description=IP address of the host executing syslog-ng
+# Description=The IP address of the host executing syslog-ng.
log4j.appender.SYSLOG.syslogHost=127.0.0.1

# Group=Syslog logging
@@ -229,7 +229,7 @@
log4j.appender.SYSLOG.layout=org.apache.log4j.PatternLayout

# Group=Syslog logging
-# Description=The log message format. It can includes @Location after
PERFSONAR-AS.
+# Description=The log message format. This can include @Location after
PERFSONAR-AS.
log4j.appender.SYSLOG.layout.ConversionPattern=\%GEANT2-JAVA-SQL-MA.%p\% %m%n



Modified: branches/GEANT2-JAVA-SQL-MA-STABLE/conf/service.properties
===================================================================
--- branches/GEANT2-JAVA-SQL-MA-STABLE/conf/service.properties 2008-08-29
14:21:44 UTC (rev 4414)
+++ branches/GEANT2-JAVA-SQL-MA-STABLE/conf/service.properties 2008-08-29
14:34:59 UTC (rev 4415)
@@ -24,7 +24,6 @@

# Group=Internal
# Description=A CSV of request message types supported by the service.
-##
service.ma.message_types=MetadataKeyRequest,SetupDataRequest,MeasurementArchiveStoreRequest,EchoRequest,LookupInfoRequest,CompleteMetadataStoreRequest

service.ma.message_types=MetadataKeyRequest,SetupDataRequest,EchoRequest,LookupInfoRequest

# Group=Internal

Modified: branches/GEANT2-JAVA-SQL-MA-STABLE/conf/wizard.properties
===================================================================
--- branches/GEANT2-JAVA-SQL-MA-STABLE/conf/wizard.properties 2008-08-29
14:21:44 UTC (rev 4414)
+++ branches/GEANT2-JAVA-SQL-MA-STABLE/conf/wizard.properties 2008-08-29
14:34:59 UTC (rev 4415)
@@ -29,7 +29,7 @@

<property>
<entry key="component.ma.xmldb.db_uri"
required="true">xmldb:exist://localhost:8180/exist/xmlrpc</entry>
- <Comment>Enter the location of the eXist database:</Comment>
+ <Comment>Enter the URI location of the eXist database:</Comment>
<ProposedValue>xmldb:exist://localhost:8180/exist/xmlrpc</ProposedValue>
<Group order="1">eXist</Group>
</property>
@@ -42,37 +42,69 @@
</property>

<property>
- <entry key="component.ma.xmldb.db_password" required="true"
password="true"></entry>
+ <entry key="component.ma.xmldb.db_password" required="true"
password="true">perfsonar</entry>
<Comment>Enter the password for the eXist user:</Comment>
- <ProposedValue></ProposedValue>
+ <ProposedValue>perfsonar</ProposedValue>
<Group order="3">eXist</Group>
</property>

<property>
- <entry key="component.ma.xmldb.db_adminpassword" required="true"
password="true"></entry>
- <Comment>Enter the eXist administration password:</Comment>
- <ProposedValue></ProposedValue>
- <Group order="4">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="old_adminpassword" required="true"
password="true">perfsonar</entry>
- <Comment>Enter the old eXist administration password:</Comment>
- <ProposedValue>perfsonar</ProposedValue>
- <Group order="6">eXist</Group>
+ <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.ma.conf_file"
required="true">/etc/geant2-java-sql-ma/sql-database_TEST.xml</entry>
<Comment>Enter the full path of the metadata configuration
file:</Comment>

<ProposedValue>/etc/geant2-java-sql-ma/sql-database_TEST.xml</ProposedValue>
- <Group order="7">eXist</Group>
+ <Group order="6">eXist</Group>
</property>

+ <property>
+ <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="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_confirm" required="true"
password="true" />
+ <Comment>Confirm new eXist administration password:</Comment>
+ <ProposedValue />
+ <Group order="9" dependsOn="7">eXist</Group>
+ </property>

+ <property>
+ <entry key="old_adminpassword" required="true" password="true" />
+ <Comment>Enter the old eXist administration password:</Comment>
+ <ProposedValue />
+ <Group order="99" dependsOn="7">eXist</Group>
+ </property>

+
+
+
+
<property>
<entry key="service.r.service_name" required="true">perfSONAR Java SQL
MA</entry>
<Comment>Enter the service name:</Comment>
@@ -96,7 +128,7 @@

<property>
<entry key="service.r.organization_name">Institution</entry>
- <Comment>Enter the name of the organization running this
service:</Comment>
+ <Comment>Enter the name of the organisation running this
service:</Comment>
<ProposedValue>Institution</ProposedValue>
<Group order="4">LS</Group>
</property>


  • perfsonar: r4415 - branches/GEANT2-JAVA-SQL-MA-STABLE/conf, svnlog, 08/29/2008

Archive powered by MHonArc 2.6.16.

Top of Page