Skip to Content.
Sympa Menu

perfsonar-dev - perfsonar: r4614 - in trunk/geant2_java-sshtelnet-mp: . ant conf conf/axis-1.4 conf/axis-1.4/WEB-INF/classes/perfsonar/conf doc packaging packaging/deb packaging/rpm src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/internalChecks src/main/java/org/perfsonar/service/measurementPoint/webAdmin

Subject: perfsonar development work

List archive

perfsonar: r4614 - in trunk/geant2_java-sshtelnet-mp: . ant conf conf/axis-1.4 conf/axis-1.4/WEB-INF/classes/perfsonar/conf doc packaging packaging/deb packaging/rpm src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/internalChecks src/main/java/org/perfsonar/service/measurementPoint/webAdmin


Chronological Thread 
  • From:
  • To:
  • Subject: perfsonar: r4614 - in trunk/geant2_java-sshtelnet-mp: . ant conf conf/axis-1.4 conf/axis-1.4/WEB-INF/classes/perfsonar/conf doc packaging packaging/deb packaging/rpm src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/internalChecks src/main/java/org/perfsonar/service/measurementPoint/webAdmin
  • Date: Mon, 13 Oct 2008 10:42:44 -0400
Author: melis
Date: 2008-10-13 10:42:43 -0400 (Mon, 13 Oct 2008)
New Revision: 4614

Added:
trunk/geant2_java-sshtelnet-mp/packaging/
trunk/geant2_java-sshtelnet-mp/packaging/deb/
trunk/geant2_java-sshtelnet-mp/packaging/deb/changelog
trunk/geant2_java-sshtelnet-mp/packaging/deb/conffiles
trunk/geant2_java-sshtelnet-mp/packaging/deb/control
trunk/geant2_java-sshtelnet-mp/packaging/deb/copyright
trunk/geant2_java-sshtelnet-mp/packaging/deb/dirs
trunk/geant2_java-sshtelnet-mp/packaging/deb/docs
trunk/geant2_java-sshtelnet-mp/packaging/deb/files
trunk/geant2_java-sshtelnet-mp/packaging/deb/install
trunk/geant2_java-sshtelnet-mp/packaging/deb/postinst
trunk/geant2_java-sshtelnet-mp/packaging/deb/postrm
trunk/geant2_java-sshtelnet-mp/packaging/deb/rules
trunk/geant2_java-sshtelnet-mp/packaging/rpm/
trunk/geant2_java-sshtelnet-mp/packaging/rpm/ps-mdm-sshtelnet-mp.specs
Modified:
trunk/geant2_java-sshtelnet-mp/ant/axis-deploy-targets.xml
trunk/geant2_java-sshtelnet-mp/ant/configure-targets.xml
trunk/geant2_java-sshtelnet-mp/ant/const.properties
trunk/geant2_java-sshtelnet-mp/ant/const.properties.template
trunk/geant2_java-sshtelnet-mp/ant/libs-download-targets.xml
trunk/geant2_java-sshtelnet-mp/ant/webapp-package-targets.xml

trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/WEB-INF/classes/perfsonar/conf/log4j.properties

trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/WEB-INF/classes/perfsonar/conf/log4j.syslog.properties

trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/WEB-INF/classes/perfsonar/conf/service.properties

trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/WEB-INF/classes/perfsonar/conf/wizard.properties
trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/index.jsp
trunk/geant2_java-sshtelnet-mp/conf/log4j.properties
trunk/geant2_java-sshtelnet-mp/conf/log4j.properties.template
trunk/geant2_java-sshtelnet-mp/conf/log4j.syslog.properties
trunk/geant2_java-sshtelnet-mp/conf/log4j.syslog.properties.template
trunk/geant2_java-sshtelnet-mp/conf/service.properties
trunk/geant2_java-sshtelnet-mp/conf/service.properties.template
trunk/geant2_java-sshtelnet-mp/conf/wizard.properties
trunk/geant2_java-sshtelnet-mp/doc/changelog.txt

trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/internalChecks/InternalChecker.java

trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/webAdmin/SSHTelnetHandler.java
Log:
Updating trunk to version 1.3.4RC3

Modified: trunk/geant2_java-sshtelnet-mp/ant/axis-deploy-targets.xml
===================================================================
--- trunk/geant2_java-sshtelnet-mp/ant/axis-deploy-targets.xml 2008-10-13
14:41:02 UTC (rev 4613)
+++ trunk/geant2_java-sshtelnet-mp/ant/axis-deploy-targets.xml 2008-10-13
14:42:43 UTC (rev 4614)
@@ -50,7 +50,7 @@
depends="copy-dep-base-service-jars">

<copy
file="${basedir}/lib/repository/nmwg/nmwg/1.0.20071008/nmwg-1.0.20071008.jar"
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
- <copy
file="${basedir}/lib/repository/perfsonar/perfsonar-base/1.0.20080721/perfsonar-base-1.0.20080721.jar"
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
+ <copy
file="${basedir}/lib/repository/perfsonar/perfsonar-base/1.0.20080902/perfsonar-base-1.0.20080902.jar"
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>

<copy file="${basedir}/conf/eventType-map.xml"
todir="${service.home}/${deploy.root}/WEB-INF/classes/perfsonar/conf"/>
<copy file="${basedir}/conf/eventType-rules.xml"
todir="${service.home}/${deploy.root}/WEB-INF/classes/perfsonar/conf"/>

Modified: trunk/geant2_java-sshtelnet-mp/ant/configure-targets.xml
===================================================================
--- trunk/geant2_java-sshtelnet-mp/ant/configure-targets.xml 2008-10-13
14:41:02 UTC (rev 4613)
+++ trunk/geant2_java-sshtelnet-mp/ant/configure-targets.xml 2008-10-13
14:42:43 UTC (rev 4614)
@@ -79,11 +79,6 @@

<propertyfile file="${basedir}/conf/service.properties">

- <entry key="service.sax_parser.config"
value="${service.home}/${deploy.root}/WEB-INF/classes/perfsonar/conf/objects.config"/>
- <entry key="service.log.log4j.config"
value="${service.home}/${deploy.root}/WEB-INF/classes/perfsonar/conf/log4j.properties"/>
-
- <entry key="service.ls.registration_file"
value="${service.home}/${deploy.root}/WEB-INF/classes/perfsonar/conf/metadata.xml"/>
-
<!-- for LookupInfoRequest message -->
<entry key="service.r.service_type" value="mp"/>
<entry key="service.r.type" value="mp"/>

Modified: trunk/geant2_java-sshtelnet-mp/ant/const.properties
===================================================================
--- trunk/geant2_java-sshtelnet-mp/ant/const.properties 2008-10-13 14:41:02
UTC (rev 4613)
+++ trunk/geant2_java-sshtelnet-mp/ant/const.properties 2008-10-13 14:42:43
UTC (rev 4614)
@@ -8,10 +8,10 @@

target.server=127.0.0.1

-service.name=geant2-java-sshtelnet-mp
+service.name=ps-mdm-sshtelnet-mp

jarfilename=perfsonar-sshtelnet-mp
-version=1.3.3
+version=1.3.4RC3

exist.war.file=exist-1.0.1.war

exist.war.download.url=http://www.perfsonar.net/download/dependencies/preinstall_download.php?product=exist-war&amp;version=1.0.1

Modified: trunk/geant2_java-sshtelnet-mp/ant/const.properties.template
===================================================================
--- trunk/geant2_java-sshtelnet-mp/ant/const.properties.template
2008-10-13 14:41:02 UTC (rev 4613)
+++ trunk/geant2_java-sshtelnet-mp/ant/const.properties.template
2008-10-13 14:42:43 UTC (rev 4614)
@@ -8,10 +8,10 @@

target.server=127.0.0.1

-service.name=geant2-java-sshtelnet-mp
+service.name=ps-mdm-sshtelnet-mp

jarfilename=perfsonar-sshtelnet-mp
-version=1.3.3
+version=1.3.4RC3

exist.war.file=exist-1.0.1.war

exist.war.download.url=http://www.perfsonar.net/download/dependencies/preinstall_download.php?product=exist-war&amp;version=1.0.1

Modified: trunk/geant2_java-sshtelnet-mp/ant/libs-download-targets.xml
===================================================================
--- trunk/geant2_java-sshtelnet-mp/ant/libs-download-targets.xml
2008-10-13 14:41:02 UTC (rev 4613)
+++ trunk/geant2_java-sshtelnet-mp/ant/libs-download-targets.xml
2008-10-13 14:42:43 UTC (rev 4614)
@@ -60,7 +60,7 @@
<artifact:dependencies>

<dependency groupId="rrdjtool" artifactId="rrdjtool"
version="1.0"/>
- <dependency groupId="perfsonar" artifactId="perfsonar-base"
version="1.0.20080721"/>
+ <dependency groupId="perfsonar" artifactId="perfsonar-base"
version="1.0.20080902"/>
<dependency groupId="nmwg" artifactId="nmwg"
version="1.0.20071008"/>



Modified: trunk/geant2_java-sshtelnet-mp/ant/webapp-package-targets.xml
===================================================================
--- trunk/geant2_java-sshtelnet-mp/ant/webapp-package-targets.xml
2008-10-13 14:41:02 UTC (rev 4613)
+++ trunk/geant2_java-sshtelnet-mp/ant/webapp-package-targets.xml
2008-10-13 14:42:43 UTC (rev 4614)
@@ -48,11 +48,11 @@

<psbase:webapp-package-directory-init-phase-1 tmpdir="${tmpdir}"/>
<antcall target="webapp-package-directory-init-phase-2" />
- <psbase:webapp-package-directory-init-phase-3 tmpdir="${tmpdir}"
+ <!--<psbase:webapp-package-directory-init-phase-3 tmpdir="${tmpdir}"

service.name="${service.name}"
version="${version}"

wsdd.file.deploy="${wsdd.file.deploy}"
-
wsdd.file.undeploy="${wsdd.file.undeploy}"/>
+
wsdd.file.undeploy="${wsdd.file.undeploy}"/>-->

<!-- ======= below it is a spece for optional additional actions
======== -->
<antcall target="webapp-package-directory-extension-init-phase" />
@@ -60,13 +60,12 @@
</target>


-
<!--
==================================================================================================
-->
<!-- Targets to be populated by a service developer -->
<!-- They are specific for a certain service -->


- <target name="webapp-package-directory-init-phase-2">
+ <target name="webapp-package-directory-init-phase-2"
xmlns:psbase="psbase:/base.perfsonar.org">

<!-- sshtelnet mp specific stuff -->

@@ -87,9 +86,9 @@
todir="${tmpdir}/WEB-INF/lib"/>
<copy
file="${basedir}/lib/repository/nmwg/nmwg/1.0.20071008/nmwg-1.0.20071008.jar"

todir="${tmpdir}/WEB-INF/lib"/>
- <copy
file="${basedir}/lib/repository/perfsonar/perfsonar-base/1.0.20080721/perfsonar-base-1.0.20080721.jar"

+ <copy
file="${basedir}/lib/repository/perfsonar/perfsonar-base/1.0.20080902/perfsonar-base-1.0.20080902.jar"

todir="${tmpdir}/WEB-INF/lib"/>
- <copy
file="${basedir}/lib/repository/perfsonar/perfsonar-web-admin/0.9.1b/perfsonar-web-admin-0.9.1b.jar"

+ <copy
file="${basedir}/lib/repository/perfsonar/perfsonar-web-admin/0.9.6b/perfsonar-web-admin-0.9.6b.jar"

todir="${tmpdir}/WEB-INF/lib"/>
<copy file="${basedir}/lib/repository/remote/j2ssh-ant.jar"
todir="${tmpdir}/WEB-INF/lib"/>
@@ -134,6 +133,41 @@

<mkdir dir="${tmpdir}/WEB-INF/classes/perfsonar/logs"/>

+ <sequential>
+ <psbase:copy-dep-base-service-jars dest-jars-path="${tmpdir}"/>
+ <psbase:copy-axis-config dest-conf-path="${tmpdir}"/>
+
+
+ <replace
file="${tmpdir}/WEB-INF/classes/perfsonar/conf/wizard.properties"
+ token="__BASEPATH__"
+ value="/opt/perfsonar/services/{service.name}/WEB-INF" />
+
+ <replace
file="${tmpdir}/WEB-INF/classes/perfsonar/conf/log4j.properties"
+ token="_LOGPATH_"
+ value="/opt/perfsonar/services/{service.name}/WEB-INF/logs"/>
+
+
+ <copy file="${basedir}/conf/wsdd/${wsdd.file.deploy}"
todir="${tmpdir}/wsdd"/>
+ <copy file="${basedir}/conf/wsdd/${wsdd.file.undeploy}"
todir="${tmpdir}/wsdd"/>
+
+ <copy todir="${tmpdir}/WEB-INF/samples" failonerror="false">
+ <fileset dir="${basedir}/samples"/>
+ </copy>
+
+ <copy todir="${tmpdir}/WEB-INF/contrib" failonerror="false">
+ <fileset dir="${basedir}/contrib"/>
+ </copy>
+
+ <copy todir="${tmpdir}/WEB-INF/doc" failonerror="false">
+ <fileset dir="${basedir}/doc"/>
+ </copy>
+
+ <copy file="${basedir}/conf/axis-1.4/WEB-INF/server-config.wsdd"
+ todir="${tmpdir}/WEB-INF"
+ failonerror="false"/>
+
+ </sequential>
+
</target>



Modified:
trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/WEB-INF/classes/perfsonar/conf/log4j.properties
===================================================================
---
trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/WEB-INF/classes/perfsonar/conf/log4j.properties
2008-10-13 14:41:02 UTC (rev 4613)
+++
trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/WEB-INF/classes/perfsonar/conf/log4j.properties
2008-10-13 14:42:43 UTC (rev 4614)
@@ -2,14 +2,6 @@
## project : perfSONAR
## author: romradz

-
-
-
-# Group=Logging
-# Description=The location of the log directory.
-logDir=_LOGPATH_
-
-
##
## All log levels in one log file.
## By default debug level is switched off (commented).
@@ -60,7 +52,7 @@

# Group=Debug message logging
# Description=The path to the log file, including the log file's name.
-log4j.appender.debugAppender.File=_LOGPATH_/perfsonar_debug.log
+log4j.appender.debugAppender.File=/var/log/ps-mdm-sshtelnet-mp/perfsonar_debug.log

# Group=Debug message logging
# Description=The class responsible for the logging layout.
@@ -88,7 +80,7 @@

# Group=Info message logging
# Description=The path to the log file, including the log file's name.
-log4j.appender.infoAppender.File=_LOGPATH_/perfsonar_info.log
+log4j.appender.infoAppender.File=/var/log/ps-mdm-sshtelnet-mp/perfsonar_info.log

# Group=Info message logging
# Description=The class responsible for the logging layout.
@@ -116,7 +108,7 @@

# Group=Warn message logging
# Description=The path to the log file, including the log file's name.
-log4j.appender.warnAppender.File=_LOGPATH_/perfsonar_warn.log
+log4j.appender.warnAppender.File=/var/log/ps-mdm-sshtelnet-mp/perfsonar_warn.log

# Group=Warn message logging
# Description=The class responsible for the logging layout.
@@ -144,7 +136,7 @@

# Group=Error message logging
# Description=The path to the log file, including the log file's name.
-log4j.appender.errorAppender.File=_LOGPATH_/perfsonar_error.log
+log4j.appender.errorAppender.File=/var/log/ps-mdm-sshtelnet-mp/perfsonar_error.log

# Group=Error message logging
# Description=The class responsible for the logging layout.
@@ -172,7 +164,7 @@

# Group=Fatal message logging
# Description=The path to the log file, including the log file's name.
-log4j.appender.fatalAppender.File=_LOGPATH_/perfsonar_fatal.log
+log4j.appender.fatalAppender.File=/var/log/ps-mdm-sshtelnet-mp/perfsonar_fatal.log

# Group=Fatal message logging
# Description=The class responsible for the logging layout.
@@ -200,7 +192,7 @@

# Group=All message logging
# Description=The path to the log file, including the log file's name.
-log4j.appender.psRootAppender.File=_LOGPATH_/perfsonar.log
+log4j.appender.psRootAppender.File=/var/log/ps-mdm-sshtelnet-mp/perfsonar.log

# Group=All message logging
# Description=The class responsible for the logging layout.
@@ -226,7 +218,7 @@

# ROOT
#log4j.appender.rootAppender.MaxBackupIndex=11
-#log4j.appender.rootAppender.File=_LOGPATH_/perfsonar_root.log
+#log4j.appender.rootAppender.File=/var/log/ps-mdm-sshtelnet-mp/perfsonar_root.log
#log4j.appender.rootAppender.layout=org.apache.log4j.PatternLayout
#log4j.appender.rootAppender.layout.ConversionPattern=%d
%%GEANT2-JAVA-SSHTELNET-MP.%p%% %m%n
#log4j.rootLogger=DEBUG, rootAppender

Modified:
trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/WEB-INF/classes/perfsonar/conf/log4j.syslog.properties
===================================================================
---
trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/WEB-INF/classes/perfsonar/conf/log4j.syslog.properties
2008-10-13 14:41:02 UTC (rev 4613)
+++
trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/WEB-INF/classes/perfsonar/conf/log4j.syslog.properties
2008-10-13 14:42:43 UTC (rev 4614)
@@ -54,7 +54,7 @@

# Group=Debug message logging
# Description=The path to the log file, including the log file's name.
-log4j.appender.debugAppender.File=/var/log/GEANT2-JAVA-SSHTELNET-MP/perfsonar_debug.log
+log4j.appender.debugAppender.File=/var/log/ps-mdm-sshtelnet-mp/perfsonar_debug.log

# Group=Debug message logging
# Description=The class responsible for the logging layout.
@@ -82,7 +82,7 @@

# Group=Info message logging
# Description=The path to the log file, including the log file's name.
-log4j.appender.infoAppender.File=/var/log/GEANT2-JAVA-SSHTELNET-MP/perfsonar_info.log
+log4j.appender.infoAppender.File=/var/log/ps-mdm-sshtelnet-mp/perfsonar_info.log

# Group=Info message logging
# Description=The class responsible for the logging layout.
@@ -110,7 +110,7 @@

# Group=Warn message logging
# Description=The path to the log file, including the log file's name.
-log4j.appender.warnAppender.File=/var/log/GEANT2-JAVA-SSHTELNET-MP/perfsonar_warn.log
+log4j.appender.warnAppender.File=/var/log/ps-mdm-sshtelnet-mp/perfsonar_warn.log

# Group=Warn message logging
# Description=The class responsible for the logging layout.
@@ -138,7 +138,7 @@

# Group=Error message logging
# Description=The path to the log file, including the log file's name.
-log4j.appender.errorAppender.File=/var/log/GEANT2-JAVA-SSHTELNET-MP/perfsonar_error.log
+log4j.appender.errorAppender.File=/var/log/ps-mdm-sshtelnet-mp/perfsonar_error.log

# Group=Error message logging
# Description=The class responsible for the logging layout.
@@ -166,7 +166,7 @@

# Group=Fatal message logging
# Description=The path to the log file, including the log file's name.
-log4j.appender.fatalAppender.File=/var/log/GEANT2-JAVA-SSHTELNET-MP/perfsonar_fatal.log
+log4j.appender.fatalAppender.File=/var/log/ps-mdm-sshtelnet-mp/perfsonar_fatal.log

# Group=Fatal message logging
# Description=The class responsible for the logging layout.
@@ -194,7 +194,7 @@

# Group=All message logging
# Description=The path to the log file, including the log file's name.
-log4j.appender.psRootAppender.File=/var/log/GEANT2-JAVA-SSHTELNET-MP/perfsonar.log
+log4j.appender.psRootAppender.File=/var/log/ps-mdm-sshtelnet-mp/perfsonar.log

# Group=All message logging
# Description=The class responsible for the logging layout.
@@ -240,7 +240,7 @@

# ROOT
#log4j.appender.rootAppender.MaxBackupIndex=11
-#log4j.appender.rootAppender.File=/var/log/GEANT2-JAVA-SSHTELNET-MP/perfsonar_root.log
+#log4j.appender.rootAppender.File=/var/log/ps-mdm-sshtelnet-mp/perfsonar_root.log
#log4j.appender.rootAppender.layout=org.apache.log4j.PatternLayout
#log4j.appender.rootAppender.layout.ConversionPattern=%d
%%GEANT2-JAVA-SSHTELNET-MP.%p%% %m%n
#log4j.rootLogger=DEBUG, rootAppender

Modified:
trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/WEB-INF/classes/perfsonar/conf/service.properties
===================================================================
---
trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/WEB-INF/classes/perfsonar/conf/service.properties
2008-10-13 14:41:02 UTC (rev 4613)
+++
trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/WEB-INF/classes/perfsonar/conf/service.properties
2008-10-13 14:42:43 UTC (rev 4614)
@@ -18,7 +18,7 @@

#Group=eXist
# Description=The location of the metadata configuration file which is to be
uploaded in the eXist
-component.mp.xmldb.metadata_file_path=/opt/perfsonar/services/geant2-java-sshtelnet-mp/WEB-INF/classes/perfsonar/conf/sshtelnetmetadata.xml
+component.mp.xmldb.metadata_file_path=/etc/ps-mdm-sshtelnet-mp/sshtelnetmetadata.xml

# Group=eXist
# Description=The URL to the eXist DB.
@@ -37,7 +37,7 @@

# Group=Internal
# Description=The path to the log4j.properties configuration file. If you
want to enable syslog message logging, enter the path to the
log4j.syslog.properties file instead.
-service.log.log4j.config=/opt/perfsonar/services/geant2-java-sshtelnet-mp/WEB-INF/classes/perfsonar/conf/log4j.properties
+service.log.log4j.config=/etc/ps-mdm-sshtelnet-mp/log4j.properties

# Group=Internal
# Description=The name of the class which is responsible for handling the
requests
@@ -45,7 +45,7 @@

# Group=Internal
# Description=The location of the configuration for the SAX parser
-service.sax_parser.config=/opt/perfsonar/services/geant2-java-sshtelnet-mp/WEB-INF/classes/perfsonar/conf/objects.config
+service.sax_parser.config=/etc/ps-mdm-sshtelnet-mp/objects.config

# Group=Internal
# Description=A CSV of request message types supported by the service.
@@ -57,7 +57,7 @@

# Group=Internal
# Description=The path where the temporary token files will be stored (be
sure to make the path writable!)
-service.mp.tokenPath=/opt/perfsonar/services/geant2-java-sshtelnet-mp/WEB-INF/classes/perfsonar/
+service.mp.tokenPath=/usr/lib/perfsonar/services/ps-mdm-sshtelnet-mp/WEB-INF/classes/perfsonar/

#LS properties
#-------------
@@ -84,7 +84,7 @@

# Group=LS
# Description=The version of the service
-service.r.service_version=1.3.3
+service.r.service_version=1.3.4RC3

# Group=LS
# Description=The e-mail address of the contact person for the service
@@ -96,7 +96,7 @@

# Group=LS
# Description=The period of time between registrations to the LS
-component.registrator.interval=30000
+component.registrator.interval=900000

# Group=LS
# Description=The name of the scheduler component (the implementation of
this component must also be declared in the components.properties file).
@@ -104,7 +104,7 @@

# Group=LS
# Description=The name of the metadata configuration file which is to be
sent to the LS
-service.ls.registration_file=/opt/perfsonar/services/geant2-java-sshtelnet-mp/WEB-INF/classes/perfsonar/conf/sshtelnetmetadata.xml
+service.ls.registration_file=/etc/ps-mdm-sshtelnet-mp/sshtelnetmetadata.xml

# Group=LS
# Description=Enter 'xmldb' to take metadata elements for register requests
from the XML database, or 'file' to take them from the XML metadata
configuration file.

Modified:
trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/WEB-INF/classes/perfsonar/conf/wizard.properties
===================================================================
---
trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/WEB-INF/classes/perfsonar/conf/wizard.properties
2008-10-13 14:41:02 UTC (rev 4613)
+++
trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/WEB-INF/classes/perfsonar/conf/wizard.properties
2008-10-13 14:42:43 UTC (rev 4614)
@@ -21,10 +21,49 @@
<properties>
<comment>Last Modification Thu Mar 06 19:53:22 CET 2008</comment>

+ <property>
+ <entry key="servlet.username" required="true">perfsonaruser</entry>
+ <Comment>Enter the username for logging in to the admin pages:</Comment>
+ <ProposedValue>perfsonaruser</ProposedValue>
+ <Group order="1" check="false">Administration</Group>
+ </property>
+
<property>
- <entry key="service.r.service_name"
required="true">geant2-java-sshtelnet-mp</entry>
+ <entry key="servlet.password" required="true"
password="true">perfsonarpass</entry>
+ <Comment>Enter the password for logging in to the admin pages:</Comment>
+ <ProposedValue>perfsonarpass</ProposedValue>
+ <Group order="2">Administration</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="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="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="service.r.service_name"
required="true">ps-mdm-sshtelnet-mp</entry>
<Comment>Enter the service name:</Comment>
- <ProposedValue>geant2-java-sshtelnet-mp</ProposedValue>
+ <ProposedValue>ps-mdm-sshtelnet-mp</ProposedValue>
<Group order="1">LS</Group>
</property>

@@ -57,9 +96,9 @@
</property>

<property>
- <entry key="component.registrator.interval">30000</entry>
+ <entry key="component.registrator.interval">900000</entry>
<Comment>Set the registration interval (milliseconds):</Comment>
- <ProposedValue>30000</ProposedValue>
+ <ProposedValue>900000</ProposedValue>
<Group order="6">LS</Group>
</property>

@@ -72,9 +111,9 @@

<!--
<property>
- <entry key="service.ls.registration_file"
required="true">/opt/perfsonar/services/geant2-java-sshtelnet-mp/WEB-INF/classes/perfsonar/conf/sshtelnetmetadata.xml</entry>
+ <entry key="service.ls.registration_file"
required="true">/etc/ps-mdm-sshtelnet-mp/sshtelnetmetadata.xml</entry>
<Comment>Enter the path to the metadata configuration file which needs
to be uploaded to the LS:</Comment>
-
<ProposedValue>/opt/perfsonar/services/geant2-java-sshtelnet-mp/WEB-INF/classes/perfsonar/conf/sshtelnetmetadata.xml</ProposedValue>
+
<ProposedValue>/etc/ps-mdm-sshtelnet-mp/sshtelnetmetadata.xml</ProposedValue>
<Group order="8">LS</Group>
</property>
-->
@@ -104,7 +143,7 @@
<property>
<entry key="create_user" required="true">no</entry>
<Comment>Do you wish to create a user with this name?</Comment>
- <ProposedValue>no</ProposedValue>
+ <ProposedValue>yes</ProposedValue>
<Group order="4" check="true">eXist</Group>
<AcceptedValue>yes</AcceptedValue>
<AcceptedValue>no</AcceptedValue>
@@ -125,16 +164,16 @@
</property>

<property>
- <entry key="component.mp.xmldb.metadata_file_path"
required="true">/opt/perfsonar/services/geant2-java-sshtelnet-mp/WEB-INF/classes/perfsonar/conf/sshtelnetmetadata.xml</entry>
+ <entry key="component.mp.xmldb.metadata_file_path"
required="true">/etc/ps-mdm-sshtelnet-mp/sshtelnetmetadata.xml</entry>
<Comment>Enter the full path of the metadata configuration
file:</Comment>
-
<ProposedValue>/opt/perfsonar/services/geant2-java-sshtelnet-mp/WEB-INF/classes/perfsonar/conf/sshtelnetmetadata.xml</ProposedValue>
+
<ProposedValue>/etc/ps-mdm-sshtelnet-mp/sshtelnetmetadata.xml</ProposedValue>
<Group order="7">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>no</ProposedValue>
+ <ProposedValue>yes</ProposedValue>
<Group order="8" check="true">eXist</Group>
<AcceptedValue>yes</AcceptedValue>
<AcceptedValue>no</AcceptedValue>
@@ -151,7 +190,7 @@
<entry key="component.ma.xmldb.db_adminpassword_confirm" required="true"
password="true" />
<Comment>Confirm new eXist administration password:</Comment>
<ProposedValue />
- <Group order="10" dependsOn="8">eXist</Group>
+ <Group order="90" dependsOn="8">eXist</Group>
</property>

<property>
@@ -160,45 +199,4 @@
<ProposedValue />
<Group order="99" dependsOn="8">eXist</Group>
</property>
-
-
- <property>
- <entry key="servlet.username" required="true">perfsonaruser</entry>
- <Comment>Enter the username for logging in to the admin pages:</Comment>
- <ProposedValue>perfsonaruser</ProposedValue>
- <Group order="1" check="false">Administration</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>perfsonarpass</ProposedValue>
- <Group order="2">Administration</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="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="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>
</properties>
-
-

Modified: trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/index.jsp
===================================================================
--- trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/index.jsp 2008-10-13
14:41:02 UTC (rev 4613)
+++ trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/index.jsp 2008-10-13
14:42:43 UTC (rev 4614)
@@ -127,9 +127,7 @@
<br>
<a href="eXistAdmin"
target="main">eXist Database</a>
<br>
- <a href="MetadataAdmin"
target="main">Config File Management</a>
- <br>
-
+
</span>
</p>
</td>

Modified: trunk/geant2_java-sshtelnet-mp/conf/log4j.properties
===================================================================
--- trunk/geant2_java-sshtelnet-mp/conf/log4j.properties 2008-10-13
14:41:02 UTC (rev 4613)
+++ trunk/geant2_java-sshtelnet-mp/conf/log4j.properties 2008-10-13
14:42:43 UTC (rev 4614)
@@ -2,14 +2,6 @@
## project : perfSONAR
## author: romradz

-
-
-
-# Group=Logging
-# Description=The location of the log directory.
-logDir=_LOGPATH_
-
-
##
## All log levels in one log file.
## By default debug level is switched off (commented).
@@ -60,7 +52,7 @@

# Group=Debug message logging
# Description=The path to the log file, including the log file's name.
-log4j.appender.debugAppender.File=_LOGPATH_/perfsonar_debug.log
+log4j.appender.debugAppender.File=/var/log/ps-mdm-sshtelnet-mp/perfsonar_debug.log

# Group=Debug message logging
# Description=The class responsible for the logging layout.
@@ -88,7 +80,7 @@

# Group=Info message logging
# Description=The path to the log file, including the log file's name.
-log4j.appender.infoAppender.File=_LOGPATH_/perfsonar_info.log
+log4j.appender.infoAppender.File=/var/log/ps-mdm-sshtelnet-mp/perfsonar_info.log

# Group=Info message logging
# Description=The class responsible for the logging layout.
@@ -116,7 +108,7 @@

# Group=Warn message logging
# Description=The path to the log file, including the log file's name.
-log4j.appender.warnAppender.File=_LOGPATH_/perfsonar_warn.log
+log4j.appender.warnAppender.File=/var/log/ps-mdm-sshtelnet-mp/perfsonar_warn.log

# Group=Warn message logging
# Description=The class responsible for the logging layout.
@@ -144,7 +136,7 @@

# Group=Error message logging
# Description=The path to the log file, including the log file's name.
-log4j.appender.errorAppender.File=_LOGPATH_/perfsonar_error.log
+log4j.appender.errorAppender.File=/var/log/ps-mdm-sshtelnet-mp/perfsonar_error.log

# Group=Error message logging
# Description=The class responsible for the logging layout.
@@ -172,7 +164,7 @@

# Group=Fatal message logging
# Description=The path to the log file, including the log file's name.
-log4j.appender.fatalAppender.File=_LOGPATH_/perfsonar_fatal.log
+log4j.appender.fatalAppender.File=/var/log/ps-mdm-sshtelnet-mp/perfsonar_fatal.log

# Group=Fatal message logging
# Description=The class responsible for the logging layout.
@@ -200,7 +192,7 @@

# Group=All message logging
# Description=The path to the log file, including the log file's name.
-log4j.appender.psRootAppender.File=_LOGPATH_/perfsonar.log
+log4j.appender.psRootAppender.File=/var/log/ps-mdm-sshtelnet-mp/perfsonar.log

# Group=All message logging
# Description=The class responsible for the logging layout.
@@ -226,7 +218,7 @@

# ROOT
#log4j.appender.rootAppender.MaxBackupIndex=11
-#log4j.appender.rootAppender.File=_LOGPATH_/perfsonar_root.log
+#log4j.appender.rootAppender.File=/var/log/ps-mdm-sshtelnet-mp/perfsonar_root.log
#log4j.appender.rootAppender.layout=org.apache.log4j.PatternLayout
#log4j.appender.rootAppender.layout.ConversionPattern=%d
%%GEANT2-JAVA-SSHTELNET-MP.%p%% %m%n
#log4j.rootLogger=DEBUG, rootAppender

Modified: trunk/geant2_java-sshtelnet-mp/conf/log4j.properties.template
===================================================================
--- trunk/geant2_java-sshtelnet-mp/conf/log4j.properties.template
2008-10-13 14:41:02 UTC (rev 4613)
+++ trunk/geant2_java-sshtelnet-mp/conf/log4j.properties.template
2008-10-13 14:42:43 UTC (rev 4614)
@@ -2,14 +2,6 @@
## project : perfSONAR
## author: romradz

-
-
-
-# Group=Logging
-# Description=The location of the log directory.
-logDir=_LOGPATH_
-
-
##
## All log levels in one log file.
## By default debug level is switched off (commented).
@@ -60,7 +52,7 @@

# Group=Debug message logging
# Description=The path to the log file, including the log file's name.
-log4j.appender.debugAppender.File=_LOGPATH_/perfsonar_debug.log
+log4j.appender.debugAppender.File=/var/log/ps-mdm-sshtelnet-mp/perfsonar_debug.log

# Group=Debug message logging
# Description=The class responsible for the logging layout.
@@ -88,7 +80,7 @@

# Group=Info message logging
# Description=The path to the log file, including the log file's name.
-log4j.appender.infoAppender.File=_LOGPATH_/perfsonar_info.log
+log4j.appender.infoAppender.File=/var/log/ps-mdm-sshtelnet-mp/perfsonar_info.log

# Group=Info message logging
# Description=The class responsible for the logging layout.
@@ -116,7 +108,7 @@

# Group=Warn message logging
# Description=The path to the log file, including the log file's name.
-log4j.appender.warnAppender.File=_LOGPATH_/perfsonar_warn.log
+log4j.appender.warnAppender.File=/var/log/ps-mdm-sshtelnet-mp/perfsonar_warn.log

# Group=Warn message logging
# Description=The class responsible for the logging layout.
@@ -144,7 +136,7 @@

# Group=Error message logging
# Description=The path to the log file, including the log file's name.
-log4j.appender.errorAppender.File=_LOGPATH_/perfsonar_error.log
+log4j.appender.errorAppender.File=/var/log/ps-mdm-sshtelnet-mp/perfsonar_error.log

# Group=Error message logging
# Description=The class responsible for the logging layout.
@@ -172,7 +164,7 @@

# Group=Fatal message logging
# Description=The path to the log file, including the log file's name.
-log4j.appender.fatalAppender.File=_LOGPATH_/perfsonar_fatal.log
+log4j.appender.fatalAppender.File=/var/log/ps-mdm-sshtelnet-mp/perfsonar_fatal.log

# Group=Fatal message logging
# Description=The class responsible for the logging layout.
@@ -200,7 +192,7 @@

# Group=All message logging
# Description=The path to the log file, including the log file's name.
-log4j.appender.psRootAppender.File=_LOGPATH_/perfsonar.log
+log4j.appender.psRootAppender.File=/var/log/ps-mdm-sshtelnet-mp/perfsonar.log

# Group=All message logging
# Description=The class responsible for the logging layout.
@@ -226,7 +218,7 @@

# ROOT
#log4j.appender.rootAppender.MaxBackupIndex=11
-#log4j.appender.rootAppender.File=_LOGPATH_/perfsonar_root.log
+#log4j.appender.rootAppender.File=/var/log/ps-mdm-sshtelnet-mp/perfsonar_root.log
#log4j.appender.rootAppender.layout=org.apache.log4j.PatternLayout
#log4j.appender.rootAppender.layout.ConversionPattern=%d
%%GEANT2-JAVA-SSHTELNET-MP.%p%% %m%n
#log4j.rootLogger=DEBUG, rootAppender

Modified: trunk/geant2_java-sshtelnet-mp/conf/log4j.syslog.properties
===================================================================
--- trunk/geant2_java-sshtelnet-mp/conf/log4j.syslog.properties 2008-10-13
14:41:02 UTC (rev 4613)
+++ trunk/geant2_java-sshtelnet-mp/conf/log4j.syslog.properties 2008-10-13
14:42:43 UTC (rev 4614)
@@ -54,7 +54,7 @@

# Group=Debug message logging
# Description=The path to the log file, including the log file's name.
-log4j.appender.debugAppender.File=/var/log/GEANT2-JAVA-SSHTELNET-MP/perfsonar_debug.log
+log4j.appender.debugAppender.File=/var/log/ps-mdm-sshtelnet-mp/perfsonar_debug.log

# Group=Debug message logging
# Description=The class responsible for the logging layout.
@@ -82,7 +82,7 @@

# Group=Info message logging
# Description=The path to the log file, including the log file's name.
-log4j.appender.infoAppender.File=/var/log/GEANT2-JAVA-SSHTELNET-MP/perfsonar_info.log
+log4j.appender.infoAppender.File=/var/log/ps-mdm-sshtelnet-mp/perfsonar_info.log

# Group=Info message logging
# Description=The class responsible for the logging layout.
@@ -110,7 +110,7 @@

# Group=Warn message logging
# Description=The path to the log file, including the log file's name.
-log4j.appender.warnAppender.File=/var/log/GEANT2-JAVA-SSHTELNET-MP/perfsonar_warn.log
+log4j.appender.warnAppender.File=/var/log/ps-mdm-sshtelnet-mp/perfsonar_warn.log

# Group=Warn message logging
# Description=The class responsible for the logging layout.
@@ -138,7 +138,7 @@

# Group=Error message logging
# Description=The path to the log file, including the log file's name.
-log4j.appender.errorAppender.File=/var/log/GEANT2-JAVA-SSHTELNET-MP/perfsonar_error.log
+log4j.appender.errorAppender.File=/var/log/ps-mdm-sshtelnet-mp/perfsonar_error.log

# Group=Error message logging
# Description=The class responsible for the logging layout.
@@ -166,7 +166,7 @@

# Group=Fatal message logging
# Description=The path to the log file, including the log file's name.
-log4j.appender.fatalAppender.File=/var/log/GEANT2-JAVA-SSHTELNET-MP/perfsonar_fatal.log
+log4j.appender.fatalAppender.File=/var/log/ps-mdm-sshtelnet-mp/perfsonar_fatal.log

# Group=Fatal message logging
# Description=The class responsible for the logging layout.
@@ -194,7 +194,7 @@

# Group=All message logging
# Description=The path to the log file, including the log file's name.
-log4j.appender.psRootAppender.File=/var/log/GEANT2-JAVA-SSHTELNET-MP/perfsonar.log
+log4j.appender.psRootAppender.File=/var/log/ps-mdm-sshtelnet-mp/perfsonar.log

# Group=All message logging
# Description=The class responsible for the logging layout.
@@ -240,7 +240,7 @@

# ROOT
#log4j.appender.rootAppender.MaxBackupIndex=11
-#log4j.appender.rootAppender.File=/var/log/GEANT2-JAVA-SSHTELNET-MP/perfsonar_root.log
+#log4j.appender.rootAppender.File=/var/log/ps-mdm-sshtelnet-mp/perfsonar_root.log
#log4j.appender.rootAppender.layout=org.apache.log4j.PatternLayout
#log4j.appender.rootAppender.layout.ConversionPattern=%d
%%GEANT2-JAVA-SSHTELNET-MP.%p%% %m%n
#log4j.rootLogger=DEBUG, rootAppender

Modified: trunk/geant2_java-sshtelnet-mp/conf/log4j.syslog.properties.template
===================================================================
--- trunk/geant2_java-sshtelnet-mp/conf/log4j.syslog.properties.template
2008-10-13 14:41:02 UTC (rev 4613)
+++ trunk/geant2_java-sshtelnet-mp/conf/log4j.syslog.properties.template
2008-10-13 14:42:43 UTC (rev 4614)
@@ -54,7 +54,7 @@

# Group=Debug message logging
# Description=The path to the log file, including the log file's name.
-log4j.appender.debugAppender.File=/var/log/GEANT2-JAVA-SSHTELNET-MP/perfsonar_debug.log
+log4j.appender.debugAppender.File=/var/log/ps-mdm-sshtelnet-mp/perfsonar_debug.log

# Group=Debug message logging
# Description=The class responsible for the logging layout.
@@ -82,7 +82,7 @@

# Group=Info message logging
# Description=The path to the log file, including the log file's name.
-log4j.appender.infoAppender.File=/var/log/GEANT2-JAVA-SSHTELNET-MP/perfsonar_info.log
+log4j.appender.infoAppender.File=/var/log/ps-mdm-sshtelnet-mp/perfsonar_info.log

# Group=Info message logging
# Description=The class responsible for the logging layout.
@@ -110,7 +110,7 @@

# Group=Warn message logging
# Description=The path to the log file, including the log file's name.
-log4j.appender.warnAppender.File=/var/log/GEANT2-JAVA-SSHTELNET-MP/perfsonar_warn.log
+log4j.appender.warnAppender.File=/var/log/ps-mdm-sshtelnet-mp/perfsonar_warn.log

# Group=Warn message logging
# Description=The class responsible for the logging layout.
@@ -138,7 +138,7 @@

# Group=Error message logging
# Description=The path to the log file, including the log file's name.
-log4j.appender.errorAppender.File=/var/log/GEANT2-JAVA-SSHTELNET-MP/perfsonar_error.log
+log4j.appender.errorAppender.File=/var/log/ps-mdm-sshtelnet-mp/perfsonar_error.log

# Group=Error message logging
# Description=The class responsible for the logging layout.
@@ -166,7 +166,7 @@

# Group=Fatal message logging
# Description=The path to the log file, including the log file's name.
-log4j.appender.fatalAppender.File=/var/log/GEANT2-JAVA-SSHTELNET-MP/perfsonar_fatal.log
+log4j.appender.fatalAppender.File=/var/log/ps-mdm-sshtelnet-mp/perfsonar_fatal.log

# Group=Fatal message logging
# Description=The class responsible for the logging layout.
@@ -194,7 +194,7 @@

# Group=All message logging
# Description=The path to the log file, including the log file's name.
-log4j.appender.psRootAppender.File=/var/log/GEANT2-JAVA-SSHTELNET-MP/perfsonar.log
+log4j.appender.psRootAppender.File=/var/log/ps-mdm-sshtelnet-mp/perfsonar.log

# Group=All message logging
# Description=The class responsible for the logging layout.
@@ -240,7 +240,7 @@

# ROOT
#log4j.appender.rootAppender.MaxBackupIndex=11
-#log4j.appender.rootAppender.File=/var/log/GEANT2-JAVA-SSHTELNET-MP/perfsonar_root.log
+#log4j.appender.rootAppender.File=/var/log/ps-mdm-sshtelnet-mp/perfsonar_root.log
#log4j.appender.rootAppender.layout=org.apache.log4j.PatternLayout
#log4j.appender.rootAppender.layout.ConversionPattern=%d
%%GEANT2-JAVA-SSHTELNET-MP.%p%% %m%n
#log4j.rootLogger=DEBUG, rootAppender

Modified: trunk/geant2_java-sshtelnet-mp/conf/service.properties
===================================================================
--- trunk/geant2_java-sshtelnet-mp/conf/service.properties 2008-10-13
14:41:02 UTC (rev 4613)
+++ trunk/geant2_java-sshtelnet-mp/conf/service.properties 2008-10-13
14:42:43 UTC (rev 4614)
@@ -18,7 +18,7 @@

#Group=eXist
# Description=The location of the metadata configuration file which is to be
uploaded in the eXist
-component.mp.xmldb.metadata_file_path=/opt/perfsonar/services/geant2-java-sshtelnet-mp/WEB-INF/classes/perfsonar/conf/sshtelnetmetadata.xml
+component.mp.xmldb.metadata_file_path=/etc/ps-mdm-sshtelnet-mp/sshtelnetmetadata.xml

# Group=eXist
# Description=The URL to the eXist DB.
@@ -37,7 +37,7 @@

# Group=Internal
# Description=The path to the log4j.properties configuration file. If you
want to enable syslog message logging, enter the path to the
log4j.syslog.properties file instead.
-service.log.log4j.config=/opt/perfsonar/services/geant2-java-sshtelnet-mp/WEB-INF/classes/perfsonar/conf/log4j.properties
+service.log.log4j.config=/etc/ps-mdm-sshtelnet-mp/log4j.properties

# Group=Internal
# Description=The name of the class which is responsible for handling the
requests
@@ -45,7 +45,7 @@

# Group=Internal
# Description=The location of the configuration for the SAX parser
-service.sax_parser.config=/opt/perfsonar/services/geant2-java-sshtelnet-mp/WEB-INF/classes/perfsonar/conf/objects.config
+service.sax_parser.config=/etc/ps-mdm-sshtelnet-mp/objects.config

# Group=Internal
# Description=A CSV of request message types supported by the service.
@@ -57,7 +57,7 @@

# Group=Internal
# Description=The path where the temporary token files will be stored (be
sure to make the path writable!)
-service.mp.tokenPath=/opt/perfsonar/services/geant2-java-sshtelnet-mp/WEB-INF/classes/perfsonar/
+service.mp.tokenPath=/usr/lib/perfsonar/services/ps-mdm-sshtelnet-mp/WEB-INF/classes/perfsonar/

#LS properties
#-------------
@@ -84,7 +84,7 @@

# Group=LS
# Description=The version of the service
-service.r.service_version=1.3.3
+service.r.service_version=1.3.4RC3

# Group=LS
# Description=The e-mail address of the contact person for the service
@@ -96,7 +96,7 @@

# Group=LS
# Description=The period of time between registrations to the LS
-component.registrator.interval=30000
+component.registrator.interval=900000

# Group=LS
# Description=The name of the scheduler component (the implementation of
this component must also be declared in the components.properties file).
@@ -104,7 +104,7 @@

# Group=LS
# Description=The name of the metadata configuration file which is to be
sent to the LS
-service.ls.registration_file=/opt/perfsonar/services/geant2-java-sshtelnet-mp/WEB-INF/classes/perfsonar/conf/sshtelnetmetadata.xml
+service.ls.registration_file=/etc/ps-mdm-sshtelnet-mp/sshtelnetmetadata.xml

# Group=LS
# Description=Enter 'xmldb' to take metadata elements for register requests
from the XML database, or 'file' to take them from the XML metadata
configuration file.

Modified: trunk/geant2_java-sshtelnet-mp/conf/service.properties.template
===================================================================
--- trunk/geant2_java-sshtelnet-mp/conf/service.properties.template
2008-10-13 14:41:02 UTC (rev 4613)
+++ trunk/geant2_java-sshtelnet-mp/conf/service.properties.template
2008-10-13 14:42:43 UTC (rev 4614)
@@ -18,7 +18,7 @@

#Group=eXist
# Description=The location of the metadata configuration file which is to be
uploaded in the eXist
-component.mp.xmldb.metadata_file_path=/opt/perfsonar/services/geant2-java-sshtelnet-mp/WEB-INF/classes/perfsonar/conf/sshtelnetmetadata.xml
+component.mp.xmldb.metadata_file_path=/etc/ps-mdm-sshtelnet-mp/sshtelnetmetadata.xml

# Group=eXist
# Description=The URL to the eXist DB.
@@ -37,7 +37,7 @@

# Group=Internal
# Description=The path to the log4j.properties configuration file. If you
want to enable syslog message logging, enter the path to the
log4j.syslog.properties file instead.
-service.log.log4j.config=/opt/perfsonar/services/geant2-java-sshtelnet-mp/WEB-INF/classes/perfsonar/conf/log4j.properties
+service.log.log4j.config=/etc/ps-mdm-sshtelnet-mp/log4j.properties

# Group=Internal
# Description=The name of the class which is responsible for handling the
requests
@@ -45,7 +45,7 @@

# Group=Internal
# Description=The location of the configuration for the SAX parser
-service.sax_parser.config=/opt/perfsonar/services/geant2-java-sshtelnet-mp/WEB-INF/classes/perfsonar/conf/objects.config
+service.sax_parser.config=/etc/ps-mdm-sshtelnet-mp/objects.config

# Group=Internal
# Description=A CSV of request message types supported by the service.
@@ -57,7 +57,7 @@

# Group=Internal
# Description=The path where the temporary token files will be stored (be
sure to make the path writable!)
-service.mp.tokenPath=/opt/perfsonar/services/geant2-java-sshtelnet-mp/WEB-INF/classes/perfsonar/
+service.mp.tokenPath=/usr/lib/perfsonar/services/ps-mdm-sshtelnet-mp/WEB-INF/classes/perfsonar/

#LS properties
#-------------
@@ -84,7 +84,7 @@

# Group=LS
# Description=The version of the service
-service.r.service_version=1.3.3
+service.r.service_version=1.3.4RC3

# Group=LS
# Description=The e-mail address of the contact person for the service
@@ -96,7 +96,7 @@

# Group=LS
# Description=The period of time between registrations to the LS
-component.registrator.interval=30000
+component.registrator.interval=900000

# Group=LS
# Description=The name of the scheduler component (the implementation of
this component must also be declared in the components.properties file).
@@ -104,7 +104,7 @@

# Group=LS
# Description=The name of the metadata configuration file which is to be
sent to the LS
-service.ls.registration_file=/opt/perfsonar/services/geant2-java-sshtelnet-mp/WEB-INF/classes/perfsonar/conf/sshtelnetmetadata.xml
+service.ls.registration_file=/etc/ps-mdm-sshtelnet-mp/sshtelnetmetadata.xml

# Group=LS
# Description=Enter 'xmldb' to take metadata elements for register requests
from the XML database, or 'file' to take them from the XML metadata
configuration file.

Modified: trunk/geant2_java-sshtelnet-mp/conf/wizard.properties
===================================================================
--- trunk/geant2_java-sshtelnet-mp/conf/wizard.properties 2008-10-13
14:41:02 UTC (rev 4613)
+++ trunk/geant2_java-sshtelnet-mp/conf/wizard.properties 2008-10-13
14:42:43 UTC (rev 4614)
@@ -21,10 +21,49 @@
<properties>
<comment>Last Modification Thu Mar 06 19:53:22 CET 2008</comment>

+ <property>
+ <entry key="servlet.username" required="true">perfsonaruser</entry>
+ <Comment>Enter the username for logging in to the admin pages:</Comment>
+ <ProposedValue>perfsonaruser</ProposedValue>
+ <Group order="1" check="false">Administration</Group>
+ </property>
+
<property>
- <entry key="service.r.service_name"
required="true">geant2-java-sshtelnet-mp</entry>
+ <entry key="servlet.password" required="true"
password="true">perfsonarpass</entry>
+ <Comment>Enter the password for logging in to the admin pages:</Comment>
+ <ProposedValue>perfsonarpass</ProposedValue>
+ <Group order="2">Administration</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="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="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="service.r.service_name"
required="true">ps-mdm-sshtelnet-mp</entry>
<Comment>Enter the service name:</Comment>
- <ProposedValue>geant2-java-sshtelnet-mp</ProposedValue>
+ <ProposedValue>ps-mdm-sshtelnet-mp</ProposedValue>
<Group order="1">LS</Group>
</property>

@@ -57,9 +96,9 @@
</property>

<property>
- <entry key="component.registrator.interval">30000</entry>
+ <entry key="component.registrator.interval">900000</entry>
<Comment>Set the registration interval (milliseconds):</Comment>
- <ProposedValue>30000</ProposedValue>
+ <ProposedValue>900000</ProposedValue>
<Group order="6">LS</Group>
</property>

@@ -72,9 +111,9 @@

<!--
<property>
- <entry key="service.ls.registration_file"
required="true">/opt/perfsonar/services/geant2-java-sshtelnet-mp/WEB-INF/classes/perfsonar/conf/sshtelnetmetadata.xml</entry>
+ <entry key="service.ls.registration_file"
required="true">/etc/ps-mdm-sshtelnet-mp/sshtelnetmetadata.xml</entry>
<Comment>Enter the path to the metadata configuration file which needs
to be uploaded to the LS:</Comment>
-
<ProposedValue>/opt/perfsonar/services/geant2-java-sshtelnet-mp/WEB-INF/classes/perfsonar/conf/sshtelnetmetadata.xml</ProposedValue>
+
<ProposedValue>/etc/ps-mdm-sshtelnet-mp/sshtelnetmetadata.xml</ProposedValue>
<Group order="8">LS</Group>
</property>
-->
@@ -104,7 +143,7 @@
<property>
<entry key="create_user" required="true">no</entry>
<Comment>Do you wish to create a user with this name?</Comment>
- <ProposedValue>no</ProposedValue>
+ <ProposedValue>yes</ProposedValue>
<Group order="4" check="true">eXist</Group>
<AcceptedValue>yes</AcceptedValue>
<AcceptedValue>no</AcceptedValue>
@@ -125,16 +164,16 @@
</property>

<property>
- <entry key="component.mp.xmldb.metadata_file_path"
required="true">/opt/perfsonar/services/geant2-java-sshtelnet-mp/WEB-INF/classes/perfsonar/conf/sshtelnetmetadata.xml</entry>
+ <entry key="component.mp.xmldb.metadata_file_path"
required="true">/etc/ps-mdm-sshtelnet-mp/sshtelnetmetadata.xml</entry>
<Comment>Enter the full path of the metadata configuration
file:</Comment>
-
<ProposedValue>/opt/perfsonar/services/geant2-java-sshtelnet-mp/WEB-INF/classes/perfsonar/conf/sshtelnetmetadata.xml</ProposedValue>
+
<ProposedValue>/etc/ps-mdm-sshtelnet-mp/sshtelnetmetadata.xml</ProposedValue>
<Group order="7">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>no</ProposedValue>
+ <ProposedValue>yes</ProposedValue>
<Group order="8" check="true">eXist</Group>
<AcceptedValue>yes</AcceptedValue>
<AcceptedValue>no</AcceptedValue>
@@ -151,7 +190,7 @@
<entry key="component.ma.xmldb.db_adminpassword_confirm" required="true"
password="true" />
<Comment>Confirm new eXist administration password:</Comment>
<ProposedValue />
- <Group order="10" dependsOn="8">eXist</Group>
+ <Group order="90" dependsOn="8">eXist</Group>
</property>

<property>
@@ -160,45 +199,4 @@
<ProposedValue />
<Group order="99" dependsOn="8">eXist</Group>
</property>
-
-
- <property>
- <entry key="servlet.username" required="true">perfsonaruser</entry>
- <Comment>Enter the username for logging in to the admin pages:</Comment>
- <ProposedValue>perfsonaruser</ProposedValue>
- <Group order="1" check="false">Administration</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>perfsonarpass</ProposedValue>
- <Group order="2">Administration</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="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="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>
</properties>
-
-

Modified: trunk/geant2_java-sshtelnet-mp/doc/changelog.txt
===================================================================
--- trunk/geant2_java-sshtelnet-mp/doc/changelog.txt 2008-10-13 14:41:02
UTC (rev 4613)
+++ trunk/geant2_java-sshtelnet-mp/doc/changelog.txt 2008-10-13 14:42:43
UTC (rev 4614)
@@ -1,26 +1,27 @@
Change log
----------

-1.3.4 - xx/xx/2008
+1.3.4RC1 - xx/xx/2008

- * ps-base version: 1.0.20080721
- * web-admin version: 0.8.3b
+ * ps-base version: 1.0.20080902
+ * web-admin version: 0.9.3b
* added selftest and syslogging
+ * updated webadmin

-1.3.3 - 18/06/2008
+1.3.3 - 18/06/2008

* ps-base version: 1.0.20080310
* web-admin version: 0.8.3b
* fixed the design flaw which was related to the command parameters (had to
update the list of commands for this)
* added a parameter to the service.properties file, which defines a
directory to put the temporary token files

-1.3.2 - 06/06/2008
+1.3.2 - 06/06/2008

* ps-base version: 1.0.20080310
* web-admin version: 0.8.3b
* fixed the bug which prevented the SSHTELNET MP from registering to the LS

-1.3.1 - 28/05/2008
+1.3.1 - 28/05/2008

* ps-base version: 1.0.20080310
* web-admin version: 0.8.3b
@@ -29,28 +30,28 @@
* removed some unnecessary logging entries in some classes (too much
printlns
which don't really add anything useful)

-1.3 - 05/05/2008
+1.3 - 05/05/2008

* ps-base version: 1.0.20080310
* web-admin version: 0.8.3b
* fixed the bug which prevented the MP from connecting to the eXist database
* fixed the bug which removed the groups in the webadmin once it was used
once

-1.3RC4 - 27/03/2008
+1.3RC4 - 27/03/2008

* ps-base version: 1.0.20080310
* web-admin version: 0.8b
* no further fixes

-1.3RC3 - 06/03/2008
+1.3RC3 - 06/03/2008

* fixed timeout bug in the telnet side of the SSHTELNET MP

-1.3RC2 - 03/03/2008
+1.3RC2 - 03/03/2008

* fixed bug in the service.properties file

-1.3RC1 - 06/02/2008
+1.3RC1 - 06/02/2008

* added Authentication
* changed eventTypes to be URL based

Added: trunk/geant2_java-sshtelnet-mp/packaging/deb/changelog

Added: trunk/geant2_java-sshtelnet-mp/packaging/deb/conffiles

Added: trunk/geant2_java-sshtelnet-mp/packaging/deb/control

Added: trunk/geant2_java-sshtelnet-mp/packaging/deb/copyright

Added: trunk/geant2_java-sshtelnet-mp/packaging/deb/dirs

Added: trunk/geant2_java-sshtelnet-mp/packaging/deb/docs

Added: trunk/geant2_java-sshtelnet-mp/packaging/deb/files

Added: trunk/geant2_java-sshtelnet-mp/packaging/deb/install

Added: trunk/geant2_java-sshtelnet-mp/packaging/deb/postinst

Added: trunk/geant2_java-sshtelnet-mp/packaging/deb/postrm

Added: trunk/geant2_java-sshtelnet-mp/packaging/deb/rules

Added: trunk/geant2_java-sshtelnet-mp/packaging/rpm/ps-mdm-sshtelnet-mp.specs

Modified:
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/internalChecks/InternalChecker.java
===================================================================
---
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/internalChecks/InternalChecker.java
2008-10-13 14:41:02 UTC (rev 4613)
+++
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/internalChecks/InternalChecker.java
2008-10-13 14:42:43 UTC (rev 4614)
@@ -190,13 +190,15 @@
}
if (maximumParameterCount == 0 &&
minimumParameterCount == 0){
command =
properties.getProperty(device, command_name, "command");
+ break;
}
}

if (command.equals("")){
logger.debug("[InternalChecker][checkDevice]
No command found which doesn't need a " +
- "parameter. Will just try to log in
on the device, and then exit.");
- command = "exit";
+ "parameter. Will just try to perform
a faulty command, this will give output" +
+ " that the command is wrong, which
tells us that the router is working");
+ command = "exti";
}

} catch (PerfSONARException e) {
@@ -252,10 +254,14 @@
manager.connect(username, "Username:",
PasswordEncryptor.decryptPassword(password), "Password:");
logger.debug("[InternalChecker][takeTelnetAction]
Connected to device");

- logger.debug("[InternalChecker][takeTelnetAction]
Executing Commands...");
+ logger.debug("[InternalChecker][takeTelnetAction]
Executing Command: " + command);
manager.executeCommand(command);
- manager.executeCommand("");
- logger.debug("[InternalChecker][takeTelnetAction]
Command succesfully executed");
+ String result = manager.executeCommand("");
+ if (result.equals("An Error Occured")){
+
logger.debug("[InternalChecker][takeTelnetAction] Command not succesfully
executed");
+ clear = false;
+ } else
+
logger.debug("[InternalChecker][takeTelnetAction] Command succesfully
executed");

manager.disconnect();
} catch (Exception e) {
@@ -271,11 +277,15 @@
try {
SshManager manager = new SshManager(url, username,
PasswordEncryptor.decryptPassword(password), false, timeout);

- logger.debug("[InternalChecker][takeSshAction]
Connecting to device and executing commands...");
+ logger.debug("[InternalChecker][takeSshAction]
Connecting to device and executing command: " + command);
manager.connect(username, "Username:",
PasswordEncryptor.decryptPassword(password), "Password:");

- manager.executeCommand(command);
- logger.debug("[InternalChecker][takeSshAction]
Command succesfully executed");
+ String result = manager.executeCommand(command);
+ if (result.equals("An Error Occured")){
+
logger.debug("[InternalChecker][takeSshAction] Command not succesfully
executed");
+ clear = false;
+ } else
+
logger.debug("[InternalChecker][takeSshAction] Command succesfully executed");
} catch (PerfSONARException e) {
logger.error("[InternalChecker][takeSshAction] Error
while connecting to device " + device);
clear = false;
@@ -294,13 +304,17 @@
else
manager = new SshKeyManager(url, username,
keyUrl, PasswordEncryptor.decryptPassword(passphrase), false, timeout);

- logger.debug("[InternalChecker][takeSshAction]
Connecting to device and executing commands...");
+ logger.debug("[InternalChecker][takeKeyAction]
Connecting to device and executing command: " + command);
manager.connect(username, "Username:",
PasswordEncryptor.decryptPassword(password), "Password:");

- manager.executeCommand(command);
- logger.debug("[InternalChecker][takeSshAction]
Command succesfully executed");
+ String result = manager.executeCommand(command);
+ if (result.equals("An Error Occured")){
+
logger.debug("[InternalChecker][takeKeyAction] Command not succesfully
executed");
+ clear = false;
+ } else
+
logger.debug("[InternalChecker][takeKeyAction] Command succesfully executed");
} catch (PerfSONARException e) {
- logger.error("[InternalChecker][takeSshAction] Error
while connecting to device " + device);
+ logger.error("[InternalChecker][takeKeyAction] Error
while connecting to device " + device);
clear = false;
}


Modified:
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/webAdmin/SSHTelnetHandler.java
===================================================================
---
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/webAdmin/SSHTelnetHandler.java
2008-10-13 14:41:02 UTC (rev 4613)
+++
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/webAdmin/SSHTelnetHandler.java
2008-10-13 14:42:43 UTC (rev 4614)
@@ -360,6 +360,7 @@
// Get the parameter
String value = request.getParameter(key).trim();
// Get the property
+
WizardProperty pr =
existProperties.getWizardProperty(key);
// Set value and proposed value
pr.setPropertyValue(value);
@@ -380,6 +381,7 @@
} catch (Exception e) {
// Set doen to false if anything happens
done = false;
+ e.printStackTrace();
throw new Exception(e.getMessage());
}
return done;
@@ -873,9 +875,11 @@
if (existURI == null) {
throw new Exception("eXist xmldb URI is empty!\n");
} else {
-
+ if (existURI.endsWith("/db"))
+ existURI = existURI.substring(0,
existURI.length()-"/db".length());
+
if (createUser.equals("yes")) {
-
+
xmlDBManager manager = new
xmlDBManagerImpl(existURI, "admin",
old_adminPass1);
// Creating collection and users
@@ -901,7 +905,6 @@
xmlDBManager manager = new
xmlDBManagerImpl(existURI,
"admin",
old_adminPass);
manager.modifyUser("admin",
newAdminPass, null, null);
-
} else {
throw new Exception(
"New eXist Admin
passwords don't match.Please re-enter passwords.");


  • perfsonar: r4614 - in trunk/geant2_java-sshtelnet-mp: . ant conf conf/axis-1.4 conf/axis-1.4/WEB-INF/classes/perfsonar/conf doc packaging packaging/deb packaging/rpm src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/internalChecks src/main/java/org/perfsonar/service/measurementPoint/webAdmin, svnlog, 10/13/2008

Archive powered by MHonArc 2.6.16.

Top of Page