Revision: 1860
Author: [email protected]
Date: Tue Feb 23 10:03:00 2010
Log: Allow Wookie server URL to be configured from properties file.
http://code.google.com/p/simal/source/detail?r=1860
Modified:
/trunk/uk.ac.osswatch.simal.web/src/main/java/uk/ac/osswatch/simal/wicket/widgets/InstantiateWidgetPage.java
/trunk/uk.ac.osswatch.simal.web/src/main/java/uk/ac/osswatch/simal/wicket/widgets/WookieServerConnection.java
=======================================
---
/trunk/uk.ac.osswatch.simal.web/src/main/java/uk/ac/osswatch/simal/wicket/widgets/InstantiateWidgetPage.java
Tue Feb 16 10:06:22 2010
+++
/trunk/uk.ac.osswatch.simal.web/src/main/java/uk/ac/osswatch/simal/wicket/widgets/InstantiateWidgetPage.java
Tue Feb 23 10:03:00 2010
@@ -22,6 +22,7 @@
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.link.Link;
+import uk.ac.osswatch.simal.rdf.SimalRepositoryException;
import uk.ac.osswatch.simal.wicket.BasePage;
import uk.ac.osswatch.simal.wicket.ErrorReportPage;
import uk.ac.osswatch.simal.wicket.UserApplication;
@@ -49,6 +50,10 @@
UserReportableException error = new UserReportableException(
"Problem communicating with Wookie server",
InstantiateWidgetPage.class);
setResponsePage(new ErrorReportPage(error));
+ } catch (SimalRepositoryException e) {
+ UserReportableException error = new UserReportableException(
+ "Problem communicating with Wookie server",
InstantiateWidgetPage.class);
+ setResponsePage(new ErrorReportPage(error));
}
}
=======================================
---
/trunk/uk.ac.osswatch.simal.web/src/main/java/uk/ac/osswatch/simal/wicket/widgets/WookieServerConnection.java
Tue Feb 16 05:15:45 2010
+++
/trunk/uk.ac.osswatch.simal.web/src/main/java/uk/ac/osswatch/simal/wicket/widgets/WookieServerConnection.java
Tue Feb 23 10:03:00 2010
@@ -39,7 +39,9 @@
import org.w3c.dom.NodeList;
import org.xml.sax.SAXException;
+import uk.ac.osswatch.simal.SimalProperties;
import uk.ac.osswatch.simal.rdf.SimalException;
+import uk.ac.osswatch.simal.rdf.SimalRepositoryException;
import uk.ac.osswatch.simal.wicket.widgets.Widget.Instance;
/**
@@ -50,7 +52,6 @@
*/
public class WookieServerConnection implements Serializable {
private static final long serialVersionUID = 1L;
- private String wookieURL = "http://localhost:8888/wookie";;
private HashMap<String, Widget> widgets = new HashMap<String, Widget>();
private static final Logger logger =
LoggerFactory.getLogger(WookieServerConnection.class);
@@ -59,9 +60,10 @@
* Get the URL of the wookie server.
*
* @return
+ * @throws SimalRepositoryException
*/
- public String getURL() {
- return wookieURL;
+ public String getURL() throws SimalRepositoryException {
+ return
SimalProperties.getProperty("simal.wookie.url", "http://localhost:8888";);
}
/**
@@ -95,8 +97,9 @@
* @param widget
* @return the ID of the widget instance
* @throws IOException
+ * @throws SimalRepositoryException
*/
- public Widget.Instance getOrCreateInstance(Widget widget) throws
IOException {
+ public Widget.Instance getOrCreateInstance(Widget widget) throws
IOException, SimalRepositoryException {
StringBuffer data = new StringBuffer();
try {
data.append(URLEncoder.encode("api_key", "UTF-8"));
@@ -121,7 +124,7 @@
URL url;
Instance instance;
try {
- url = new URL(getURL() + "/widgetinstances");
+ url = new URL(getURL() + "/widgetinstances");
URLConnection conn = url.openConnection();
conn.setDoOutput(true);
OutputStreamWriter wr = new
OutputStreamWriter(conn.getOutputStream());
--
You received this message because you are subscribed to the Google Groups "Simal
Commits" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/simal-commits?hl=en.
