Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Loading…

WL-2976 #3

Merged
merged 2 commits into from

2 participants

@bdvholmes

No description provided.

@buckett buckett merged commit 8c70b96 into from
@buckett buckett deleted the branch
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Oct 23, 2013
  1. @bdvholmes
  2. @bdvholmes

    WL-2976 Documenting difference between the context properties and sak…

    bdvholmes authored
    …ai properties configurations, and some tidying up.
This page is out of date. Refresh to see the latest.
View
6 src/main/java/uk/ac/ox/oucs/sirlouie/properties/ContextProperties.java
@@ -5,11 +5,11 @@
import javax.servlet.ServletContext;
import javax.servlet.ServletException;
+/**
+ * Takes the properties from the web.xml config through the context, as opposed to being configured through sakai.propeties.
+ */
public class ContextProperties extends SirLouieProperties {
- /**
- *
- */
private static final long serialVersionUID = 1L;
public ContextProperties(ServletContext context) throws ServletException {
View
11 src/main/java/uk/ac/ox/oucs/sirlouie/properties/SakaiProperties.java
@@ -6,14 +6,10 @@
import org.sakaiproject.component.cover.ServerConfigurationService;
public class SakaiProperties extends SirLouieProperties {
-
- /**
- *
- */
+
private static final long serialVersionUID = 1L;
- public final static String CONFIG_LOCATION = "sirlouie.properties";
public final static String WEBRESOURCE_URL = "sirlouie.webresourceURL";
-
+
/**
* This class allows the location of the sirlouie filter properties to be loaded from a
* file defined in the sakai.properties file.
@@ -24,11 +20,10 @@
*/
public SakaiProperties(ServletContext context) throws ServletException {
-
super();
setProperty(WEBRESOURCE_URL, ServerConfigurationService.getString(WEBRESOURCE_URL));
}
-
+
public String getWebResourseURL() {
return getProperty(WEBRESOURCE_URL);
}
View
4 src/main/webapp/WEB-INF/web.xml
@@ -31,8 +31,8 @@
<!--
Properties taken from sakai.properties or from context
-->
- <!--param-value>uk.ac.ox.oucs.sirlouie.properties.SakaiProperties</param-value-->
- <param-value>uk.ac.ox.oucs.sirlouie.properties.ContextProperties</param-value>
+ <param-value>uk.ac.ox.oucs.sirlouie.properties.SakaiProperties</param-value>
+ <!--param-value>uk.ac.ox.oucs.sirlouie.properties.ContextProperties</param-value-->
</init-param>
<load-on-startup>1</load-on-startup>
Something went wrong with that request. Please try again.