Chronological Thread 

< Chronological >      < Thread >

---

Author: dante.delvaux
Date: 2013-02-05 13:49:17 +0000 (Tue, 05 Feb 2013)
New Revision: 6117

Added:

trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-component/src/main/java/org/perfsonar/webadmin/config/

trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-component/src/main/java/org/perfsonar/webadmin/filters/

trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-component/src/main/java/org/perfsonar/webadmin/servlet/

trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-component/src/main/java/org/perfsonar/webadmin/servlet/BasicServlet.java

trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-component/src/main/java/org/perfsonar/webadmin/servlet/ConfigurationServlet.java

trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-component/src/main/java/org/perfsonar/webadmin/servlet/LoginServlet.java

trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-component/src/main/java/org/perfsonar/webadmin/servlet/SelfTestServlet.java

trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-component/src/main/java/org/perfsonar/webadmin/servlet/util/

trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-component/src/main/java/org/perfsonar/webadmin/test/

trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-component/src/main/java/org/perfsonar/webadmin/util/
Removed:

trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-component/src/main/java/org/perfsonar/webadmin/base2/
Modified:
trunk/parent/

trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-component/src/main/java/org/perfsonar/webadmin/config/HTMLGenerator.java

trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-component/src/main/java/org/perfsonar/webadmin/config/ObjectMap.java

trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-component/src/main/java/org/perfsonar/webadmin/filters/AuthFilter.java

trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-component/src/main/java/org/perfsonar/webadmin/servlet/util/ConfigurationServletHelper.java

trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-component/src/main/java/org/perfsonar/webadmin/test/SOAPClient.java

trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-component/src/main/java/org/perfsonar/webadmin/test/SOAPClientException.java

trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-component/src/main/java/org/perfsonar/webadmin/util/HTMLUtil.java

trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-component/src/main/java/org/perfsonar/webadmin/util/NSContext.java

trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-component/src/main/java/org/perfsonar/webadmin/util/Tuple.java

trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-component/src/main/java/org/perfsonar/webadmin/util/WAXMLReader.java

trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-component/src/main/java/org/perfsonar/webadmin/util/WAXMLWriter.java

trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-component/src/main/java/org/perfsonar/webadmin/util/XMLUtil.java

trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-component/src/main/resources/wa.xsd

trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-component/src/main/webapp/WEB-INF/web.xml

trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-component/src/main/webapp/index.jsp

trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-component/src/main/webapp/views/banner.jsp

trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-component/src/main/webapp/views/sideBar.jsp

trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-component/src/main/webapp/views/welcome.jsp

trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-exampleservice/src/main/java/org/perfsonar/webadmin/example/servlet/ExampleServlet.java

trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-exampleservice/src/main/webapp/WEB-INF/classes/perfsonar/conf/webAdminConfig.xml

trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-exampleservice/src/main/webapp/WEB-INF/web.xml

trunk/perfsonar-java-xml-ls/src/main/java/org/perfsonar/service/lookupservice/servlets/ExistDbInitializerServlet.java

trunk/perfsonar-java-xml-ls/src/main/resources/perfsonar/conf/webAdminConfig.xml
trunk/perfsonar-java-xml-ls/src/main/webapp/WEB-INF/web.xml

trunk/servlet-context-redirector/src/main/java/org/perfsonar/filters/RedirectionFilter.java
Log:
Web-Admin: renaming the package to org.perfsonar.webadmin (without .base2) as
it doesn't depend on psBase2 (or any other psBase), this avoids any confusion
for the future.


Property changes on: trunk/parent
___________________________________________________________________
Added: svn:ignore
+ .settings

.project


Modified:
trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-component/src/main/java/org/perfsonar/webadmin/config/HTMLGenerator.java
===================================================================
---
trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-component/src/main/java/org/perfsonar/webadmin/base2/config/HTMLGenerator.java
2013-01-17 17:39:05 UTC (rev 6115)
+++
trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-component/src/main/java/org/perfsonar/webadmin/config/HTMLGenerator.java
2013-02-05 13:49:17 UTC (rev 6117)
@@ -1,23 +1,23 @@
-package org.perfsonar.webadmin.base2.config;
+package org.perfsonar.webadmin.config;

import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
import java.util.Set;

-import org.perfsonar.webadmin.base2.util.HTMLUtil;
-import org.perfsonar.webadmin.base2.util.NSContext;
-import org.perfsonar.webadmin.base2.util.Tuple;
-import org.perfsonar.webadmin.base2.util.XMLUtil;
-import org.perfsonar.webadmin.base2.waschema.v20090201.BaseType;
-import org.perfsonar.webadmin.base2.waschema.v20090201.BaseUIType;
-import org.perfsonar.webadmin.base2.waschema.v20090201.ComplexGroupUIType;
-import org.perfsonar.webadmin.base2.waschema.v20090201.ComplexUIType;
-import org.perfsonar.webadmin.base2.waschema.v20090201.GroupsType;
-import org.perfsonar.webadmin.base2.waschema.v20090201.LinkType;
-import org.perfsonar.webadmin.base2.waschema.v20090201.PageType;
-import org.perfsonar.webadmin.base2.waschema.v20090201.PlainType;
-import org.perfsonar.webadmin.base2.waschema.v20090201.WebAdminInterface;
+import org.perfsonar.webadmin.waschema.v20130205.BaseType;
+import org.perfsonar.webadmin.waschema.v20130205.BaseUIType;
+import org.perfsonar.webadmin.waschema.v20130205.ComplexGroupUIType;
+import org.perfsonar.webadmin.waschema.v20130205.ComplexUIType;
+import org.perfsonar.webadmin.waschema.v20130205.GroupsType;
+import org.perfsonar.webadmin.waschema.v20130205.LinkType;
+import org.perfsonar.webadmin.waschema.v20130205.PageType;
+import org.perfsonar.webadmin.waschema.v20130205.PlainType;
+import org.perfsonar.webadmin.waschema.v20130205.WebAdminInterface;
+import org.perfsonar.webadmin.util.HTMLUtil;
+import org.perfsonar.webadmin.util.NSContext;
+import org.perfsonar.webadmin.util.Tuple;
+import org.perfsonar.webadmin.util.XMLUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.w3c.dom.NodeList;

Modified:
trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-component/src/main/java/org/perfsonar/webadmin/config/ObjectMap.java
===================================================================
---
trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-component/src/main/java/org/perfsonar/webadmin/base2/config/ObjectMap.java
2013-01-17 17:39:05 UTC (rev 6115)
+++
trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-component/src/main/java/org/perfsonar/webadmin/config/ObjectMap.java
2013-02-05 13:49:17 UTC (rev 6117)
@@ -1,4 +1,4 @@
-package org.perfsonar.webadmin.base2.config;
+package org.perfsonar.webadmin.config;

import java.io.File;
import java.io.FileNotFoundException;
@@ -12,13 +12,13 @@
import javax.xml.bind.JAXBContext;
import javax.xml.bind.JAXBException;

-import org.perfsonar.webadmin.base2.util.NSContext;
-import org.perfsonar.webadmin.base2.util.Tuple;
-import org.perfsonar.webadmin.base2.util.WAXMLReader;
-import org.perfsonar.webadmin.base2.util.XMLUtil;
-import org.perfsonar.webadmin.base2.waschema.v20090201.BaseType;
-import org.perfsonar.webadmin.base2.waschema.v20090201.NsMap;
-import org.perfsonar.webadmin.base2.waschema.v20090201.WebAdminInterface;
+import org.perfsonar.webadmin.waschema.v20130205.BaseType;
+import org.perfsonar.webadmin.waschema.v20130205.NsMap;
+import org.perfsonar.webadmin.waschema.v20130205.WebAdminInterface;
+import org.perfsonar.webadmin.util.NSContext;
+import org.perfsonar.webadmin.util.Tuple;
+import org.perfsonar.webadmin.util.WAXMLReader;
+import org.perfsonar.webadmin.util.XMLUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.w3c.dom.Document;

Modified:
trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-component/src/main/java/org/perfsonar/webadmin/filters/AuthFilter.java
===================================================================
---
trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-component/src/main/java/org/perfsonar/webadmin/base2/filters/AuthFilter.java
2013-01-17 17:39:05 UTC (rev 6115)
+++
trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-component/src/main/java/org/perfsonar/webadmin/filters/AuthFilter.java
2013-02-05 13:49:17 UTC (rev 6117)
@@ -1,4 +1,4 @@
-package org.perfsonar.webadmin.base2.filters;
+package org.perfsonar.webadmin.filters;

import java.io.IOException;


Copied:
trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-component/src/main/java/org/perfsonar/webadmin/servlet/BasicServlet.java
(from rev 6115,
trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-component/src/main/java/org/perfsonar/webadmin/base2/servlet/BasicServlet.java)
===================================================================
---
trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-component/src/main/java/org/perfsonar/webadmin/servlet/BasicServlet.java
(rev 0)
+++
trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-component/src/main/java/org/perfsonar/webadmin/servlet/BasicServlet.java
2013-02-05 13:49:17 UTC (rev 6117)
@@ -0,0 +1,32 @@
+package org.perfsonar.webadmin.servlet;
+
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+
+import org.perfsonar.webadmin.config.ObjectMap;
+import org.perfsonar.webadmin.servlet.util.ConfigurationServletHelper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * This abstract Servlet is the common ancestor to all WebAdmin Servlets.
+ * It only initialise the logger and read the WebAdmin configuration file in
an objectMap.
+ *
+ * @author Antoine Delvaux - DANTE
+ *
+ */
+@SuppressWarnings("serial")
+public abstract class BasicServlet extends HttpServlet {
+
+ protected Logger logger = LoggerFactory.getLogger(getClass());
+
+ protected ObjectMap objectMap;
+
+ public void init(ServletConfig arg0) throws ServletException {
+ super.init(arg0);
+ logger.debug("perfSONAR Basic Servlet initialised");
+ objectMap =
ConfigurationServletHelper.objectMap(getServletContext());
+ }
+
+}

Copied:
trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-component/src/main/java/org/perfsonar/webadmin/servlet/ConfigurationServlet.java
(from rev 6115,
trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-component/src/main/java/org/perfsonar/webadmin/base2/servlet/ConfigurationServlet.java)
===================================================================
---
trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-component/src/main/java/org/perfsonar/webadmin/servlet/ConfigurationServlet.java
(rev 0)
+++
trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-component/src/main/java/org/perfsonar/webadmin/servlet/ConfigurationServlet.java
2013-02-05 13:49:17 UTC (rev 6117)
@@ -0,0 +1,63 @@
+package org.perfsonar.webadmin.servlet;
+
+import java.io.IOException;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.perfsonar.webadmin.servlet.util.ConfigurationServletHelper;
+
+/**
+ * The ConfigurationServlet is in charge of dispatching requests for the
configuration file edition.
+ *
+ * @author Slawomir Trzaszczka
+ * @author Antoine Delvaux - DANTE
+ *
+ */
+@SuppressWarnings("serial")
+public class ConfigurationServlet extends BasicServlet {
+
+ /**
+ * We receive a GET request and we present the config file data to be
edited in a form
+ */
+ @Override
+ protected void doGet(HttpServletRequest request,
+ HttpServletResponse response) throws
ServletException, IOException {
+
+ // We get the config file content from the
ConfigurationServletHelper
+ ConfigurationServletHelper config = new
ConfigurationServletHelper(request, response, getServletContext());
+ String htmlContent = config.getHTMLContent();
+
+ if (htmlContent != null) {
+ // The "form" attribute will store the generated FORM
+ request.setAttribute("form", htmlContent);
+ } else {
+ logger.warn("form html content is null !");
+ }
+ // We forward the request to the index.jsp that will render
our form
+ getServletConfig().getServletContext().getRequestDispatcher(
+ "/index.jsp?page=form").forward(request, response);
+ }
+
+ /**
+ * We receive a POST request and we save the received data
+ */
+ @Override
+ protected void doPost(HttpServletRequest request,
+ HttpServletResponse response) throws
ServletException, IOException {
+
+ ConfigurationServletHelper config = new
ConfigurationServletHelper(request, response, getServletContext());
+
+ String urlPath = "index.jsp?page=save";
+
+ // Try to process the received data and save it
+ if (config.processData()) {
+ // Everything went smoothly, we'll display a nice OK
page.
+ urlPath += "&ok";
+ }
+ getServletContext().removeAttribute("ObjectMap");
+ response.sendRedirect(urlPath);
+ }
+
+}

Copied:
trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-component/src/main/java/org/perfsonar/webadmin/servlet/LoginServlet.java
(from rev 6115,
trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-component/src/main/java/org/perfsonar/webadmin/base2/servlet/LoginServlet.java)
===================================================================
---
trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-component/src/main/java/org/perfsonar/webadmin/servlet/LoginServlet.java
(rev 0)
+++
trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-component/src/main/java/org/perfsonar/webadmin/servlet/LoginServlet.java
2013-02-05 13:49:17 UTC (rev 6117)
@@ -0,0 +1,54 @@
+package org.perfsonar.webadmin.servlet;
+
+import java.io.IOException;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.perfsonar.webadmin.waschema.v20130205.Credential;
+
+@SuppressWarnings("serial")
+public class LoginServlet extends BasicServlet {
+
+ @Override
+ protected void doGet(HttpServletRequest request,
+ HttpServletResponse response) throws
ServletException, IOException {
+
+ // Any GET request to this Servlet, removes existing
authentication
+ request.getSession().removeAttribute("logged");
+
+ getServletConfig().getServletContext().getRequestDispatcher(
+ "/index.jsp?page=login").forward(request, response);
+ }
+
+ @Override
+ protected void doPost(HttpServletRequest request, HttpServletResponse
response)
+ throws ServletException, IOException {
+
+ Credential credential = objectMap.getWA().getCredential();
+
+ // FIXME: we must use HTTPS, but how to get a correct
certificate?
+// if (request.isSecure()) {
+ // We are receiving an authentication request
+ String username = (String)
request.getParameter("username");
+ String password = (String)
request.getParameter("password");
+ logger.debug("We received the authentication form for
" + username);
+
+ if (credential.getUsername().equals(username) &&
credential.getPassword().equals(password)) {
+ logger.info("Correct login from " +
request.getRemoteAddr());
+ request.getSession().setAttribute("logged",
true);
+ // We clear the attribute meant to stop the
filtering loop
+ request.getSession().setAttribute("info",
"You have been authenticated.");
+ } else {
+ logger.debug("Incorrect login from " +
request.getRemoteAddr());
+
request.getSession().removeAttribute("logged");
+ request.getSession().setAttribute("info",
"Incorrect login or password.");
+ }
+// }
+
+ response.sendRedirect("index.jsp");
+
+ }
+
+}

Copied:
trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-component/src/main/java/org/perfsonar/webadmin/servlet/SelfTestServlet.java
(from rev 6115,
trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-component/src/main/java/org/perfsonar/webadmin/base2/servlet/SelfTestServlet.java)
===================================================================
---
trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-component/src/main/java/org/perfsonar/webadmin/servlet/SelfTestServlet.java
(rev 0)
+++
trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-component/src/main/java/org/perfsonar/webadmin/servlet/SelfTestServlet.java
2013-02-05 13:49:17 UTC (rev 6117)
@@ -0,0 +1,83 @@
+package org.perfsonar.webadmin.servlet;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.perfsonar.webadmin.config.ObjectMap;
+import org.perfsonar.webadmin.servlet.util.ConfigurationServletHelper;
+import org.perfsonar.webadmin.test.SOAPClient;
+import org.perfsonar.webadmin.test.SOAPClientException;
+
+@SuppressWarnings("serial")
+public class SelfTestServlet extends BasicServlet {
+
+ private final String SELF_TEST_FILE = "/wa/soapMessages/selfTest.xml";
+
+ @Override
+ protected void doGet(HttpServletRequest request, HttpServletResponse
response)
+ throws ServletException, IOException {
+
+ logger.debug("Performing self test");
+ String redirectURL = "index.jsp?page=selfTest";
+
+ ObjectMap objectMap =
ConfigurationServletHelper.objectMap(getServletContext());
+ String accessPoint =
objectMap.getWA().getServiceInformation().getAccessPoint();
+
+ SOAPClient soapClient = new SOAPClient(accessPoint);
+ String messageContent =
getFileContent(getServletContext().getRealPath("/") + SELF_TEST_FILE);
+
+ if (messageContent == null) {
+ logger.warn("Self test cannot be performed because
the selfTest message is empty. Please check the wa/soapMessages/selfTest.xml
file.");
+ request.setAttribute("errorMessage", "Message is
null");
+ } else {
+ try {
+ String result =
soapClient.sendMessage(messageContent);
+ if (result != null) {
+ if (result.contains("error")) {
+ logger.info("Self test
failed!");
+
getServletContext().setAttribute("errors", result);
+ } else if
(result.contains("success")) {
+ logger.info("Self test
succeeded!");
+ redirectURL = redirectURL +
"&ok";
+ } else {
+ logger.warn("Result of
selfTest is neither error nor success: " + result);
+
request.setAttribute("errorMessage", "Unknown response from service.");
+ }
+
+ } else {
+ logger.info("Self test was returned
an empty result.");
+ request.setAttribute("errorMessage",
"Result is null");
+ }
+ } catch (SOAPClientException e) {
+
getServletContext().setAttribute("errorMessage", e.getMessage());
+ }
+ }
+
+ response.sendRedirect(redirectURL);
+ }
+
+ private String getFileContent(String url) {
+
+ byte[] buffer = new byte[(int) new File(url).length()];
+ FileInputStream f;
+ try {
+ f = new FileInputStream(url);
+ f.read(buffer);
+ f.close();
+ return new String(buffer);
+ } catch (FileNotFoundException e) {
+ logger.warn("Impossible to read " + url + ", file cannot
be found.");
+ } catch (IOException e) {
+ logger.warn("Error reading " + url + " : " +
e.getMessage());
+ }
+
+ return null;
+ }
+
+}

Modified:
trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-component/src/main/java/org/perfsonar/webadmin/servlet/util/ConfigurationServletHelper.java
===================================================================
---
trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-component/src/main/java/org/perfsonar/webadmin/base2/servlet/util/ConfigurationServletHelper.java
2013-01-17 17:39:05 UTC (rev 6115)
+++
trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-component/src/main/java/org/perfsonar/webadmin/servlet/util/ConfigurationServletHelper.java
2013-02-05 13:49:17 UTC (rev 6117)
@@ -1,4 +1,4 @@
-package org.perfsonar.webadmin.base2.servlet.util;
+package org.perfsonar.webadmin.servlet.util;

import java.io.IOException;

@@ -7,9 +7,9 @@
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;

-import org.perfsonar.webadmin.base2.config.HTMLGenerator;
-import org.perfsonar.webadmin.base2.config.ObjectMap;
-import org.perfsonar.webadmin.base2.util.HTMLUtil;
+import org.perfsonar.webadmin.config.HTMLGenerator;
+import org.perfsonar.webadmin.config.ObjectMap;
+import org.perfsonar.webadmin.util.HTMLUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;


Modified:
trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-component/src/main/java/org/perfsonar/webadmin/test/SOAPClient.java
===================================================================
---
trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-component/src/main/java/org/perfsonar/webadmin/base2/test/SOAPClient.java
2013-01-17 17:39:05 UTC (rev 6115)
+++
trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-component/src/main/java/org/perfsonar/webadmin/test/SOAPClient.java
2013-02-05 13:49:17 UTC (rev 6117)
@@ -1,4 +1,4 @@
-package org.perfsonar.webadmin.base2.test;
+package org.perfsonar.webadmin.test;

import java.io.IOException;
import java.io.UnsupportedEncodingException;

Modified:
trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-component/src/main/java/org/perfsonar/webadmin/test/SOAPClientException.java
===================================================================
---
trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-component/src/main/java/org/perfsonar/webadmin/base2/test/SOAPClientException.java
2013-01-17 17:39:05 UTC (rev 6115)
+++
trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-component/src/main/java/org/perfsonar/webadmin/test/SOAPClientException.java
2013-02-05 13:49:17 UTC (rev 6117)
@@ -1,4 +1,4 @@
-package org.perfsonar.webadmin.base2.test;
+package org.perfsonar.webadmin.test;

@SuppressWarnings("serial")
public class SOAPClientException extends Exception{

Modified:
trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-component/src/main/java/org/perfsonar/webadmin/util/HTMLUtil.java
===================================================================
---
trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-component/src/main/java/org/perfsonar/webadmin/base2/util/HTMLUtil.java
2013-01-17 17:39:05 UTC (rev 6115)
+++
trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-component/src/main/java/org/perfsonar/webadmin/util/HTMLUtil.java
2013-02-05 13:49:17 UTC (rev 6117)
@@ -1,4 +1,4 @@
-package org.perfsonar.webadmin.base2.util;
+package org.perfsonar.webadmin.util;

import java.io.IOException;


Modified:
trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-component/src/main/java/org/perfsonar/webadmin/util/NSContext.java
===================================================================
---
trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-component/src/main/java/org/perfsonar/webadmin/base2/util/NSContext.java
2013-01-17 17:39:05 UTC (rev 6115)
+++
trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-component/src/main/java/org/perfsonar/webadmin/util/NSContext.java
2013-02-05 13:49:17 UTC (rev 6117)
@@ -1,4 +1,4 @@
-package org.perfsonar.webadmin.base2.util;
+package org.perfsonar.webadmin.util;

import java.util.HashMap;
import javax.xml.namespace.NamespaceContext;

Modified:
trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-component/src/main/java/org/perfsonar/webadmin/util/Tuple.java
===================================================================
---
trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-component/src/main/java/org/perfsonar/webadmin/base2/util/Tuple.java
2013-01-17 17:39:05 UTC (rev 6115)
+++
trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-component/src/main/java/org/perfsonar/webadmin/util/Tuple.java
2013-02-05 13:49:17 UTC (rev 6117)
@@ -1,4 +1,4 @@
-package org.perfsonar.webadmin.base2.util;
+package org.perfsonar.webadmin.util;

public class Tuple<A, B> {
A a;

Modified:
trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-component/src/main/java/org/perfsonar/webadmin/util/WAXMLReader.java
===================================================================
---
trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-component/src/main/java/org/perfsonar/webadmin/base2/util/WAXMLReader.java
2013-01-17 17:39:05 UTC (rev 6115)
+++
trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-component/src/main/java/org/perfsonar/webadmin/util/WAXMLReader.java
2013-02-05 13:49:17 UTC (rev 6117)
@@ -1,4 +1,4 @@
-package org.perfsonar.webadmin.base2.util;
+package org.perfsonar.webadmin.util;

import java.io.File;
import java.io.FileInputStream;
@@ -10,8 +10,8 @@
import javax.xml.bind.JAXBException;
import javax.xml.bind.Unmarshaller;

-import org.perfsonar.webadmin.base2.waschema.v20090201.PageType;
-import org.perfsonar.webadmin.base2.waschema.v20090201.WebAdminInterface;
+import org.perfsonar.webadmin.waschema.v20130205.PageType;
+import org.perfsonar.webadmin.waschema.v20130205.WebAdminInterface;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.xml.sax.InputSource;
@@ -21,7 +21,7 @@
private final static Logger logger =
LoggerFactory.getLogger(WAXMLReader.class);

// The NS of the WebAdmin configuration file schema
- private final static String CLASS_NAME =
"org.perfsonar.webadmin.base2.waschema.v20090201";
+ private final static String CLASS_NAME =
"org.perfsonar.webadmin.waschema.v20130205";

@SuppressWarnings("deprecation")
public static Tuple<WebAdminInterface, JAXBContext> parseFile(String
fileName)

Modified:
trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-component/src/main/java/org/perfsonar/webadmin/util/WAXMLWriter.java
===================================================================
---
trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-component/src/main/java/org/perfsonar/webadmin/base2/util/WAXMLWriter.java
2013-01-17 17:39:05 UTC (rev 6115)
+++
trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-component/src/main/java/org/perfsonar/webadmin/util/WAXMLWriter.java
2013-02-05 13:49:17 UTC (rev 6117)
@@ -1,4 +1,4 @@
-package org.perfsonar.webadmin.base2.util;
+package org.perfsonar.webadmin.util;

import java.io.IOException;

@@ -6,7 +6,7 @@
import javax.xml.bind.JAXBException;
import javax.xml.bind.Marshaller;

-import org.perfsonar.webadmin.base2.waschema.v20090201.WebAdminInterface;
+import org.perfsonar.webadmin.waschema.v20130205.WebAdminInterface;

public class WAXMLWriter {
public static void writeToFile(JAXBContext pContext,

Modified:
trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-component/src/main/java/org/perfsonar/webadmin/util/XMLUtil.java
===================================================================
---
trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-component/src/main/java/org/perfsonar/webadmin/base2/util/XMLUtil.java
2013-01-17 17:39:05 UTC (rev 6115)
+++
trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-component/src/main/java/org/perfsonar/webadmin/util/XMLUtil.java
2013-02-05 13:49:17 UTC (rev 6117)
@@ -1,4 +1,4 @@
-package org.perfsonar.webadmin.base2.util;
+package org.perfsonar.webadmin.util;

import java.io.BufferedInputStream;
import java.io.DataInputStream;

Modified:
trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-component/src/main/resources/wa.xsd
===================================================================
---
trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-component/src/main/resources/wa.xsd
2013-02-05 13:16:50 UTC (rev 6116)
+++
trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-component/src/main/resources/wa.xsd
2013-02-05 13:49:17 UTC (rev 6117)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>

-<xs:schema
targetNamespace="http://webadmin.perfsonar.org/base2/waschema/v20090201";
- xmlns:xs="http://www.w3.org/2001/XMLSchema";
xmlns:wa="http://webadmin.perfsonar.org/base2/waschema/v20090201";
+<xs:schema targetNamespace="http://webadmin.perfsonar.org/waschema/v20130205";
+ xmlns:xs="http://www.w3.org/2001/XMLSchema";
xmlns:wa="http://webadmin.perfsonar.org/waschema/v20130205";
elementFormDefault="qualified" attributeFormDefault="qualified">

<xs:complexType name="BaseType">

Modified:
trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-component/src/main/webapp/WEB-INF/web.xml
===================================================================
---
trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-component/src/main/webapp/WEB-INF/web.xml
2013-02-05 13:16:50 UTC (rev 6116)
+++
trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-component/src/main/webapp/WEB-INF/web.xml
2013-02-05 13:49:17 UTC (rev 6117)
@@ -8,7 +8,7 @@
<!-- Authentication checks are done through a filter -->
<filter>
<filter-name>authFilter</filter-name>
-
<filter-class>org.perfsonar.webadmin.base2.filters.AuthFilter</filter-class>
+
<filter-class>org.perfsonar.webadmin.filters.AuthFilter</filter-class>
</filter>
<filter-mapping>
<filter-name>authFilter</filter-name>
@@ -19,7 +19,7 @@
<!-- Login Servlet -->
<servlet>
<servlet-name>Authentification</servlet-name>
-
<servlet-class>org.perfsonar.webadmin.base2.servlet.LoginServlet</servlet-class>
+
<servlet-class>org.perfsonar.webadmin.servlet.LoginServlet</servlet-class>
</servlet>
<servlet-mapping>
<servlet-name>Authentification</servlet-name>
@@ -30,7 +30,7 @@
<servlet>
<servlet-name>BasicConfiguration</servlet-name>
<servlet-class>
-
org.perfsonar.webadmin.base2.servlet.ConfigurationServlet
+ org.perfsonar.webadmin.servlet.ConfigurationServlet
</servlet-class>
</servlet>
<servlet-mapping>
@@ -44,7 +44,7 @@
<servlet>
<servlet-name>SelfTestServlet</servlet-name>
<servlet-class>
- org.perfsonar.webadmin.base2.servlet.SelfTestServlet
+ org.perfsonar.webadmin.servlet.SelfTestServlet
</servlet-class>
</servlet>
<servlet-mapping>

Modified:
trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-component/src/main/webapp/index.jsp
===================================================================
---
trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-component/src/main/webapp/index.jsp
2013-02-05 13:16:50 UTC (rev 6116)
+++
trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-component/src/main/webapp/index.jsp
2013-02-05 13:49:17 UTC (rev 6117)
@@ -1,10 +1,10 @@
-<%@page

import="org.perfsonar.webadmin.base2.servlet.util.ConfigurationServletHelper"%>
-<%@page
import="org.perfsonar.webadmin.base2.config.HTMLGenerator"%>
+<%@page
import="org.perfsonar.webadmin.servlet.util.ConfigurationServletHelper"%>
+<%@page
import="org.perfsonar.webadmin.config.HTMLGenerator"%>

<html>
<head>
<% HTMLGenerator htmlGenerator = new HTMLGenerator();
- org.perfsonar.webadmin.base2.config.ObjectMap map =
ConfigurationServletHelper.objectMap(getServletContext());
+ org.perfsonar.webadmin.config.ObjectMap map =
ConfigurationServletHelper.objectMap(getServletContext());
String serviceName = htmlGenerator.getServiceName(map);
String serviceVersion = htmlGenerator.getVersion(map);
%>

Modified:
trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-component/src/main/webapp/views/banner.jsp
===================================================================
---
trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-component/src/main/webapp/views/banner.jsp
2013-02-05 13:16:50 UTC (rev 6116)
+++
trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-component/src/main/webapp/views/banner.jsp
2013-02-05 13:49:17 UTC (rev 6117)
@@ -1,8 +1,8 @@
-<%@page

import="org.perfsonar.webadmin.base2.servlet.util.ConfigurationServletHelper"%>
-<%@page
import="org.perfsonar.webadmin.base2.config.HTMLGenerator"%>
+<%@page
import="org.perfsonar.webadmin.servlet.util.ConfigurationServletHelper"%>
+<%@page
import="org.perfsonar.webadmin.config.HTMLGenerator"%>
<%
HTMLGenerator banner_htmlGenerator=new HTMLGenerator();
- org.perfsonar.webadmin.base2.config.ObjectMap banner_map =
ConfigurationServletHelper.objectMap(getServletContext());
+ org.perfsonar.webadmin.config.ObjectMap banner_map =
ConfigurationServletHelper.objectMap(getServletContext());
String
banner_serviceName=banner_htmlGenerator.getServiceName(banner_map);
String
banner_serviceVersion=banner_htmlGenerator.getVersion(banner_map);
%>

Modified:
trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-component/src/main/webapp/views/sideBar.jsp
===================================================================
---
trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-component/src/main/webapp/views/sideBar.jsp
2013-02-05 13:16:50 UTC (rev 6116)
+++
trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-component/src/main/webapp/views/sideBar.jsp
2013-02-05 13:49:17 UTC (rev 6117)
@@ -1,11 +1,11 @@
-<%@page

import="org.perfsonar.webadmin.base2.servlet.util.ConfigurationServletHelper"%>
-<%@page
import="org.perfsonar.webadmin.base2.config.HTMLGenerator"%>
+<%@page
import="org.perfsonar.webadmin.servlet.util.ConfigurationServletHelper"%>
+<%@page
import="org.perfsonar.webadmin.config.HTMLGenerator"%>
<%@ page language="java" contentType="text/html; charset=UTF-8"
pageEncoding="UTF-8"%>

<%
HTMLGenerator sideBar_htmlGenerator = new HTMLGenerator();
- org.perfsonar.webadmin.base2.config.ObjectMap sideBar_map =
ConfigurationServletHelper.objectMap(getServletContext());
+ org.perfsonar.webadmin.config.ObjectMap sideBar_map =
ConfigurationServletHelper.objectMap(getServletContext());
String[] sideBar_menuBasicLinks =
sideBar_htmlGenerator.getBasicLinks(sideBar_map,false);
String[] sideBar_menuAdvancedLinks =
sideBar_htmlGenerator.getAdvancedLinks(sideBar_map,false);
%>

Modified:
trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-component/src/main/webapp/views/welcome.jsp
===================================================================
---
trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-component/src/main/webapp/views/welcome.jsp
2013-02-05 13:16:50 UTC (rev 6116)
+++
trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-component/src/main/webapp/views/welcome.jsp
2013-02-05 13:49:17 UTC (rev 6117)
@@ -1,8 +1,8 @@
-<%@page

import="org.perfsonar.webadmin.base2.servlet.util.ConfigurationServletHelper"%>
-<%@page
import="org.perfsonar.webadmin.base2.config.HTMLGenerator"%>
+<%@page
import="org.perfsonar.webadmin.servlet.util.ConfigurationServletHelper"%>
+<%@page
import="org.perfsonar.webadmin.config.HTMLGenerator"%>
<%
HTMLGenerator welcome_htmlGenerator = new HTMLGenerator();
- org.perfsonar.webadmin.base2.config.ObjectMap welcome_map =
ConfigurationServletHelper.objectMap(getServletContext());
+ org.perfsonar.webadmin.config.ObjectMap welcome_map =
ConfigurationServletHelper.objectMap(getServletContext());
String[] welcome_mainBasicLinks =
welcome_htmlGenerator.getBasicLinks(welcome_map,true);
String[] welcome_mainAdvancedLinks =
welcome_htmlGenerator.getAdvancedLinks(welcome_map,true);
%>

Modified:
trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-exampleservice/src/main/java/org/perfsonar/webadmin/example/servlet/ExampleServlet.java
===================================================================
---
trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-exampleservice/src/main/java/org/perfsonar/webadmin/example/servlet/ExampleServlet.java
2013-02-05 13:16:50 UTC (rev 6116)
+++
trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-exampleservice/src/main/java/org/perfsonar/webadmin/example/servlet/ExampleServlet.java
2013-02-05 13:49:17 UTC (rev 6117)
@@ -9,7 +9,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

-import org.perfsonar.webadmin.base2.servlet.BasicServlet;
+import org.perfsonar.webadmin.servlet.BasicServlet;

/**
* @author Antoine Delvaux - DANTE

Modified:
trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-exampleservice/src/main/webapp/WEB-INF/classes/perfsonar/conf/webAdminConfig.xml
===================================================================
---
trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-exampleservice/src/main/webapp/WEB-INF/classes/perfsonar/conf/webAdminConfig.xml
2013-02-05 13:16:50 UTC (rev 6116)
+++
trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-exampleservice/src/main/webapp/WEB-INF/classes/perfsonar/conf/webAdminConfig.xml
2013-02-05 13:49:17 UTC (rev 6117)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>

-<wa:WebAdminInterface
xmlns:wa="http://webadmin.perfsonar.org/base2/waschema/v20090201";>
+<wa:WebAdminInterface
xmlns:wa="http://webadmin.perfsonar.org/waschema/v20130205";>

<!-- service information consists of name and version (only for
displaying
purpose) and accessPoint - selfTest -->
@@ -52,7 +52,7 @@
</wa:map>

<wa:map>
-
<wa:url>http://webadmin.perfsonar.org/base2/waschema/v20090201</wa:url>
+
<wa:url>http://webadmin.perfsonar.org/waschema/v20130205</wa:url>
<wa:ns>webAdmin</wa:ns>
</wa:map>


Modified:
trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-exampleservice/src/main/webapp/WEB-INF/web.xml
===================================================================
---
trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-exampleservice/src/main/webapp/WEB-INF/web.xml
2013-02-05 13:16:50 UTC (rev 6116)
+++
trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-exampleservice/src/main/webapp/WEB-INF/web.xml
2013-02-05 13:49:17 UTC (rev 6117)
@@ -8,7 +8,7 @@
<!-- Authentication checks are done through a filter -->
<filter>
<filter-name>authFilter</filter-name>
-
<filter-class>org.perfsonar.webadmin.base2.filters.AuthFilter</filter-class>
+
<filter-class>org.perfsonar.webadmin.filters.AuthFilter</filter-class>
</filter>
<filter-mapping>
<filter-name>authFilter</filter-name>
@@ -21,7 +21,7 @@
<!-- Login Servlet -->
<servlet>
<servlet-name>Authentification</servlet-name>
-
<servlet-class>org.perfsonar.webadmin.base2.servlet.LoginServlet</servlet-class>
+
<servlet-class>org.perfsonar.webadmin.servlet.LoginServlet</servlet-class>
</servlet>
<servlet-mapping>
<servlet-name>Authentification</servlet-name>
@@ -46,7 +46,7 @@
<servlet>
<servlet-name>BasicConfiguration</servlet-name>
<servlet-class>
-
org.perfsonar.webadmin.base2.servlet.ConfigurationServlet
+ org.perfsonar.webadmin.servlet.ConfigurationServlet
</servlet-class>
</servlet>
<servlet-mapping>
@@ -60,7 +60,7 @@
<servlet>
<servlet-name>SelfTestServlet</servlet-name>
<servlet-class>
- org.perfsonar.webadmin.base2.servlet.SelfTestServlet
+ org.perfsonar.webadmin.servlet.SelfTestServlet
</servlet-class>
</servlet>
<servlet-mapping>

Modified:
trunk/perfsonar-java-xml-ls/src/main/java/org/perfsonar/service/lookupservice/servlets/ExistDbInitializerServlet.java
===================================================================
---
trunk/perfsonar-java-xml-ls/src/main/java/org/perfsonar/service/lookupservice/servlets/ExistDbInitializerServlet.java
2013-02-05 13:16:50 UTC (rev 6116)
+++
trunk/perfsonar-java-xml-ls/src/main/java/org/perfsonar/service/lookupservice/servlets/ExistDbInitializerServlet.java
2013-02-05 13:49:17 UTC (rev 6117)
@@ -23,7 +23,7 @@
import org.perfsonar.service.lookupservice.components.DataSourceComponent;
import org.perfsonar.service.lookupservice.components.XMLDBComponent;

-import org.perfsonar.webadmin.base2.servlet.BasicServlet;
+import org.perfsonar.webadmin.servlet.BasicServlet;

/**
* This servlet initializes eXist database

Modified:
trunk/perfsonar-java-xml-ls/src/main/resources/perfsonar/conf/webAdminConfig.xml
===================================================================
---
trunk/perfsonar-java-xml-ls/src/main/resources/perfsonar/conf/webAdminConfig.xml
2013-02-05 13:16:50 UTC (rev 6116)
+++
trunk/perfsonar-java-xml-ls/src/main/resources/perfsonar/conf/webAdminConfig.xml
2013-02-05 13:49:17 UTC (rev 6117)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>

-<wa:WebAdminInterface
xmlns:wa="http://webadmin.perfsonar.org/base2/waschema/v20090201";>
+<wa:WebAdminInterface
xmlns:wa="http://webadmin.perfsonar.org/waschema/v20130205";>

<!-- service information consists of name and version (only for
displaying purpose) and accessPoint - selfTest -->
<wa:serviceInformation>
@@ -41,7 +41,7 @@
</wa:map>

<wa:map>
-
<wa:url>http://webadmin.perfsonar.org/base2/waschema/v20090201</wa:url>
+
<wa:url>http://webadmin.perfsonar.org/waschema/v20130205</wa:url>
<wa:ns>webAdmin</wa:ns>
</wa:map>

@@ -331,7 +331,7 @@

doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="xmlls"]/ns1:auxiliaryComponents/ns1:component[@name="scheduling"]/ns1:actions/ns1:action[@name="LSCleanup_1"]/ns1:option[@name="status"]/@value
</wa:xpath>
</wa:default>
- <wa:title><wa:text>Cleanup action enabled
?</wa:text></wa:title>
+ <wa:title><wa:text>Cleanup action
enabled?</wa:text></wa:title>

<wa:values><wa:text>on,off</wa:text></wa:values>
</wa:radio>
</wa:plain>
@@ -366,7 +366,7 @@

doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="xmlls"]/ns1:auxiliaryComponents/ns1:component[@name="scheduling"]/ns1:actions/ns1:action[@name="LSSummarySynchronization"]/ns1:option[@name="status"]/@value
</wa:xpath>
</wa:default>
- <wa:title><wa:text>Summarization enabled
?</wa:text></wa:title>
+ <wa:title><wa:text>Summarization
enabled?</wa:text></wa:title>

<wa:values><wa:text>on,off</wa:text></wa:values>
</wa:radio>
</wa:plain>
@@ -389,7 +389,7 @@

doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="xmlls"]/ns1:auxiliaryComponents/ns1:component[@name="scheduling"]/ns1:actions/ns1:action[@name="LSSummarySynchronization"]/ns1:option[@name="nrOfModifications"]/@value
</wa:xpath>
</wa:default>
- <wa:title><wa:text>Summarization - number of
modification </wa:text></wa:title>
+ <wa:title><wa:text>Summarization - number of
modifications</wa:text></wa:title>
</wa:textbox>
</wa:plain>

@@ -400,7 +400,7 @@

doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="xmlls"]/ns1:auxiliaryComponents/ns1:component[@name="scheduling"]/ns1:actions/ns1:action[@name="LSSummarySynchronization"]/ns1:option[@name="nrOfIterations"]/@value
</wa:xpath>
</wa:default>
- <wa:title><wa:text>Summarization - number of
iteration </wa:text></wa:title>
+ <wa:title><wa:text>Summarization - number of
iterations</wa:text></wa:title>
</wa:textbox>
</wa:plain>

@@ -411,7 +411,7 @@

doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="xmlls"]/ns1:auxiliaryComponents/ns1:component[@name="scheduling"]/ns1:actions/ns1:action[@name="registration"]/ns1:option[@name="status"]/@value
</wa:xpath>
</wa:default>
- <wa:title><wa:text>Gls registration enabled
?</wa:text></wa:title>
+ <wa:title><wa:text>gLS registration
enabled?</wa:text></wa:title>

<wa:values><wa:text>on,off</wa:text></wa:values>
</wa:radio>
</wa:plain>
@@ -423,7 +423,7 @@

doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="xmlls"]/ns1:auxiliaryComponents/ns1:component[@name="scheduling"]/ns1:actions/ns1:action[@name="registration"]/ns1:option[@name="interval"]/@value
</wa:xpath>
</wa:default>
- <wa:title><wa:text>Gls registration
interval</wa:text></wa:title>
+ <wa:title><wa:text>gLS registration
interval</wa:text></wa:title>
</wa:textbox>
</wa:plain>


Modified: trunk/perfsonar-java-xml-ls/src/main/webapp/WEB-INF/web.xml
===================================================================
--- trunk/perfsonar-java-xml-ls/src/main/webapp/WEB-INF/web.xml 2013-02-05
13:16:50 UTC (rev 6116)
+++ trunk/perfsonar-java-xml-ls/src/main/webapp/WEB-INF/web.xml 2013-02-05
13:49:17 UTC (rev 6117)
@@ -30,7 +30,7 @@
<!-- Authentication checks are done through a filter -->
<filter>
<filter-name>authFilter</filter-name>
-
<filter-class>org.perfsonar.webadmin.base2.filters.AuthFilter</filter-class>
+
<filter-class>org.perfsonar.webadmin.filters.AuthFilter</filter-class>
</filter>
<filter-mapping>
<filter-name>authFilter</filter-name>
@@ -41,7 +41,7 @@
<!-- Login Servlet -->
<servlet>
<servlet-name>Authentification</servlet-name>
-
<servlet-class>org.perfsonar.webadmin.base2.servlet.LoginServlet</servlet-class>
+
<servlet-class>org.perfsonar.webadmin.servlet.LoginServlet</servlet-class>
</servlet>
<servlet-mapping>
<servlet-name>Authentification</servlet-name>
@@ -52,7 +52,7 @@
<servlet>
<servlet-name>BasicConfiguration</servlet-name>
<servlet-class>
- org.perfsonar.webadmin.base2.servlet.ConfigurationServlet
+ org.perfsonar.webadmin.servlet.ConfigurationServlet
</servlet-class>
</servlet>
<servlet-mapping>
@@ -66,7 +66,7 @@
<servlet>
<servlet-name>SelfTestServlet</servlet-name>
<servlet-class>
- org.perfsonar.webadmin.base2.servlet.SelfTestServlet
+ org.perfsonar.webadmin.servlet.SelfTestServlet
</servlet-class>
</servlet>
<servlet-mapping>

Modified:
trunk/servlet-context-redirector/src/main/java/org/perfsonar/filters/RedirectionFilter.java
===================================================================
---
trunk/servlet-context-redirector/src/main/java/org/perfsonar/filters/RedirectionFilter.java
2013-02-05 13:16:50 UTC (rev 6116)
+++
trunk/servlet-context-redirector/src/main/java/org/perfsonar/filters/RedirectionFilter.java
2013-02-05 13:49:17 UTC (rev 6117)
@@ -1,4 +1,4 @@
-package net.geant.perfsonar.filters;
+package org.perfsonar.filters;

import java.io.IOException;

---

• [pS-dev] [GEANT/SA2/ps-java-services] r6117 - in trunk: parent perfsonar-java-web-admin/perfsonar-java -web-admin-component/src/main/java/org/perfsonar/webadmin perfsonar-java-web-admin/perfsonar-java-web-admin-componen t/src/main/java/org/perfsonar/webadmin/config perfsonar-ja va-web-admin/perfsonar-java-web-admin-component/src/main/j ava/org/perfsonar/webadmin/filters perfsonar-java-web-admi n/perfsonar-java-web-admin-component/src/main/java/org/per fsonar/webadmin/servlet perfsonar-java-web-admin/perfsonar -java-web-admin-component/src/main/java/org/perfsonar/weba dmin/servlet/util perfsonar-java-web-admin/perfsonar-java- web-admin-component/src/main/java/org/perfsonar/webadmin/t est perfsonar-java-web-admin/perfsonar-java-web-admin-comp onent/src/main/java/org/perfsonar/webadmin/util perfsonar- java-web-admin/perfsonar-java-web-admin-component/src/main /resources perfsonar-java-web-admin/perfsonar-java-web-adm in-component/src/main/webapp perfsonar-java-web-admin/perf sonar-java-web-adm in-component/src/main/webapp/WEB-INF pe rfsonar-java-web-admin/perfsonar-java-web-admin-component/ src/main/webapp/views perfsonar-java-web-admin/perfsonar-j ava-web-admin-exampleservice/src/main/java/org/perfsonar/w ebadmin/example/servlet perfsonar-java-web-admin/perfsonar -java-web-admin-exampleservice/src/main/webapp/WEB-INF per fsonar-java-web-admin/perfsonar-java-web-admin-exampleserv ice/src/main/webapp/WEB-INF/classes/perfsonar/conf perfson ar-java-xml-ls/src/main/java/org/perfsonar/service/lookups ervice/servlets perfsonar-java-xml-ls/src/main/resources/p erfsonar/conf perfsonar-java-xml-ls/src/main/webapp/WEB-IN F servlet-context-redirector/src/main/java/org/perfsonar/f ilters, svn-noreply, 02/05/2013

---

Archive powered by MHonArc 2.6.16.