perfsonar development work

Author: dante.delvaux
Date: 2014-03-13 10:38:53 +0000 (Thu, 13 Mar 2014)
New Revision: 6503

Modified:
   
trunk/perfsonar-java-sql-ma/src/main/resources/perfsonar/conf/wizard.properties
   trunk/perfsonar-java-sql-ma/src/rpm/post
   
trunk/perfsonar-java-sql-ma/src/test/resources/perfsonar/conf/wizard.properties
   
trunk/perfsonar-web-admin-0/src/main/java/perfSONARWebAdmin/admin/wizard/Wizard.java
Log:
SQL-MA: again trying to improve label to the eXist users creation.  Also 
adding links in /etc/perfsonar-java-sql-ma/ to properties file in the RPM 
package.

Modified: 
trunk/perfsonar-java-sql-ma/src/main/resources/perfsonar/conf/wizard.properties
===================================================================
--- 
trunk/perfsonar-java-sql-ma/src/main/resources/perfsonar/conf/wizard.properties
     2014-03-12 18:11:46 UTC (rev 6502)
+++ 
trunk/perfsonar-java-sql-ma/src/main/resources/perfsonar/conf/wizard.properties
     2014-03-13 10:38:53 UTC (rev 6503)
@@ -48,7 +48,7 @@
 
   <property>
     <entry key="create_user" required="true">no</entry>
-    <Comment>Do you wish to create a user with this name?</Comment>
+    <Comment>Do you wish to create new eXist user(s)?</Comment>
     <ProposedValue>yes</ProposedValue>
     <Group order="4" check="true">eXist</Group>
     <AcceptedValue>yes</AcceptedValue>

Modified: trunk/perfsonar-java-sql-ma/src/rpm/post
===================================================================
--- trunk/perfsonar-java-sql-ma/src/rpm/post    2014-03-12 18:11:46 UTC (rev 
6502)
+++ trunk/perfsonar-java-sql-ma/src/rpm/post    2014-03-13 10:38:53 UTC (rev 
6503)
@@ -1,6 +1,7 @@
 ## make symlink for easy access to conf
 %{__ln_s} -f %{prefix}/WEB-INF/classes/perfsonar/conf/*.xml 
%{_sysconfdir}/%{name}
 %{__ln_s} -f %{prefix}/WEB-INF/classes/perfsonar/conf/*.sql 
%{_sysconfdir}/%{name}
+%{__ln_s} -f %{prefix}/WEB-INF/classes/perfsonar/conf/*.properties 
%{_sysconfdir}/%{name}
 ## Remove old name directories and configuration files
 rm -rf %{_sysconfdir}/%{oldname} || true
 rm -rf %{_var}/log/%{oldname} || true

Modified: 
trunk/perfsonar-java-sql-ma/src/test/resources/perfsonar/conf/wizard.properties
===================================================================
--- 
trunk/perfsonar-java-sql-ma/src/test/resources/perfsonar/conf/wizard.properties
     2014-03-12 18:11:46 UTC (rev 6502)
+++ 
trunk/perfsonar-java-sql-ma/src/test/resources/perfsonar/conf/wizard.properties
     2014-03-13 10:38:53 UTC (rev 6503)
@@ -23,11 +23,8 @@
 
 <properties>
 
-
   <comment>$Id$</comment>
 
-
-
   <property>
     <entry key="component.ma.xmldb.db_uri" 
required="true">xmldb:exist://localhost:8081/exist/xmlrpc</entry>
     <Comment>Enter the URI location of the eXist database:</Comment>
@@ -51,7 +48,7 @@
 
   <property>
     <entry key="create_user" required="true">no</entry>
-    <Comment>Do you wish to create a user with this name?</Comment>
+    <Comment>Do you wish to create new eXist user(s)?</Comment>
     <ProposedValue>yes</ProposedValue>
     <Group order="4" check="true">eXist</Group>
     <AcceptedValue>yes</AcceptedValue>

Modified: 
trunk/perfsonar-web-admin-0/src/main/java/perfSONARWebAdmin/admin/wizard/Wizard.java
===================================================================
--- 
trunk/perfsonar-web-admin-0/src/main/java/perfSONARWebAdmin/admin/wizard/Wizard.java
        2014-03-12 18:11:46 UTC (rev 6502)
+++ 
trunk/perfsonar-web-admin-0/src/main/java/perfSONARWebAdmin/admin/wizard/Wizard.java
        2014-03-13 10:38:53 UTC (rev 6503)
@@ -200,7 +200,7 @@
                                                        
handler.handleRequest(request);
                                                        output.infoPage
                                                                ("perfSONAR 
configuration Wizard",
-                                                               "You have 
succesfully configured the service!You can restart tomcat"+
+                                                               "You have 
succesfully configured the service! You can restart tomcat"+
                                                                " for the 
changes to take effect.\n Or go "+ goBack);
                                                } 
                                                catch (MaskedException e) {