Author: clement
Date: Tue Aug 25 15:14:42 2009
New Revision: 807664
URL: http://svn.apache.org/viewvc?rev=807664&view=rev
Log:
Fix a link issue in the web console plugin.
Modified:
felix/trunk/ipojo/manipulator/src/main/java/org/apache/felix/ipojo/manipulator/Pojoization.java
felix/trunk/ipojo/webconsole-plugin/src/main/java/org/apache/felix/org/apache/felix/ipojo/webconsole/IPOJOServlet.java
Modified:
felix/trunk/ipojo/manipulator/src/main/java/org/apache/felix/ipojo/manipulator/Pojoization.java
URL:
http://svn.apache.org/viewvc/felix/trunk/ipojo/manipulator/src/main/java/org/apache/felix/ipojo/manipulator/Pojoization.java?rev=807664&r1=807663&r2=807664&view=diff
==============================================================================
---
felix/trunk/ipojo/manipulator/src/main/java/org/apache/felix/ipojo/manipulator/Pojoization.java
(original)
+++
felix/trunk/ipojo/manipulator/src/main/java/org/apache/felix/ipojo/manipulator/Pojoization.java
Tue Aug 25 15:14:42 2009
@@ -661,6 +661,7 @@
String root = m_dir.getAbsolutePath();
String path = absolutePath.substring(root.length() + 1);
return path.replace('\\', '/'); // To support Windows systems, the \
are replaced by /
+ //return path.replace('/', File.separatorChar);
}
/**
Modified:
felix/trunk/ipojo/webconsole-plugin/src/main/java/org/apache/felix/org/apache/felix/ipojo/webconsole/IPOJOServlet.java
URL:
http://svn.apache.org/viewvc/felix/trunk/ipojo/webconsole-plugin/src/main/java/org/apache/felix/org/apache/felix/ipojo/webconsole/IPOJOServlet.java?rev=807664&r1=807663&r2=807664&view=diff
==============================================================================
---
felix/trunk/ipojo/webconsole-plugin/src/main/java/org/apache/felix/org/apache/felix/ipojo/webconsole/IPOJOServlet.java
(original)
+++
felix/trunk/ipojo/webconsole-plugin/src/main/java/org/apache/felix/org/apache/felix/ipojo/webconsole/IPOJOServlet.java
Tue Aug 25 15:14:42 2009
@@ -209,7 +209,7 @@
+ getInvalidCount() + " invalid instances."
+ "</div></div>");
// Button Line
- writer.write("<form action=\"ipojo\" method=\"get\">"
+ writer.write("<form action=\"iPOJO\" method=\"get\">"
+ "<div class=\"fullwidth\">"
+ "<div class=\"buttons\">"
+ "<button style=\"margin-left: 30px;\" name=\"" + INSTANCE +
"\" value=\"all\" type=\"submit\">Instances</button>"
@@ -244,7 +244,7 @@
}
// Button Line
- writer.write("<form action=\"ipojo\" method=\"get\">"
+ writer.write("<form action=\"iPOJO\" method=\"get\">"
+ "<div class=\"fullwidth\">"
+ "<div class=\"buttons\">"
+ "<button style=\"margin-left: 30px;\" name=\"" + INSTANCE +
"\" value=\"all\" type=\"submit\">Instances</button>"
@@ -416,7 +416,7 @@
String n = id.getComponentDescription().getName();
for (Factory f : m_factories) { // Cannot be null, an empty list is
returned.
if (f.getName().equals(n)) {
- return "<a href=\"ipojo?factory=" + n + "\">" + n + "</a>";
+ return "<a href=\"iPOJO?factory=" + n + "\">" + n + "</a>";
}
}
@@ -477,7 +477,7 @@
* @return the HTML link targetting the instance detail
*/
private String getInstanceLink(String name) {
- return "<a href=\"ipojo?instance=" + name + "\">" + name + "</a>";
+ return "<a href=\"iPOJO?instance=" + name + "\">" + name + "</a>";
}
/**
@@ -528,7 +528,7 @@
if (ref.getProperty("instance.name") == null) {
s += ref.getProperty(Constants.SERVICE_ID);
} else {
- s += "<a href=\"ipojo?instance="
+ s += "<a href=\"iPOJO?instance="
+ ref.getProperty("instance.name") + "\">"
+ ref.getProperty("instance.name") + " (" +
ref.getProperty(Constants.SERVICE_ID) + ")</a>";
}
@@ -645,7 +645,7 @@
String bundle =
factory.getBundleContext().getBundle().getSymbolicName()
+ " (" + factory.getBundleContext().getBundle().getBundleId()
+ ")";
pw.write("<tr>"
- + "<td><a href=\"ipojo?factory=" + name + "\">"
+ + "<td><a href=\"iPOJO?factory=" + name + "\">"
+ (version == null ? name : name + " (" + version +
")")
+ "</a></td>"
+ "<td>" + bundle + "</td>"
