Author: cziegeler
Date: Mon Aug 25 04:56:50 2008
New Revision: 688701
URL: http://svn.apache.org/viewvc?rev=688701&view=rev
Log:
FELIX-700 : Don't use xml prefix for inner elements.
Modified:
felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/xml/MetaTypeIO.java
Modified:
felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/xml/MetaTypeIO.java
URL:
http://svn.apache.org/viewvc/felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/xml/MetaTypeIO.java?rev=688701&r1=688700&r2=688701&view=diff
==============================================================================
---
felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/xml/MetaTypeIO.java
(original)
+++
felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/xml/MetaTypeIO.java
Mon Aug 25 04:56:50 2008
@@ -42,25 +42,27 @@
public static final String NAMESPACE_URI =
"http://www.osgi.org/xmlns/metatype/v1.0.0";;
+ public static final String INNER_NAMESPACE_URI = "";
+
public static final String PREFIX = "metatype";
protected static final String METADATA_ELEMENT = "MetaData";
protected static final String METADATA_ELEMENT_QNAME = PREFIX + ':' +
METADATA_ELEMENT;
protected static final String OCD_ELEMENT = "OCD";
- protected static final String OCD_ELEMENT_QNAME = PREFIX + ':' +
OCD_ELEMENT;
+ protected static final String OCD_ELEMENT_QNAME = OCD_ELEMENT;
protected static final String DESIGNATE_ELEMENT = "Designate";
- protected static final String DESIGNATE_ELEMENT_QNAME = PREFIX + ':' +
DESIGNATE_ELEMENT;
+ protected static final String DESIGNATE_ELEMENT_QNAME = DESIGNATE_ELEMENT;
protected static final String OBJECT_ELEMENT = "Object";
- protected static final String OBJECT_ELEMENT_QNAME = PREFIX + ':' +
OBJECT_ELEMENT;
+ protected static final String OBJECT_ELEMENT_QNAME = OBJECT_ELEMENT;
protected static final String AD_ELEMENT = "AD";
- protected static final String AD_ELEMENT_QNAME = PREFIX + ':' + AD_ELEMENT;
+ protected static final String AD_ELEMENT_QNAME = AD_ELEMENT;
protected static final String OPTION_ELEMENT = "Option";
- protected static final String OPTION_ELEMENT_QNAME = PREFIX + ':' +
OPTION_ELEMENT;
+ protected static final String OPTION_ELEMENT_QNAME = OPTION_ELEMENT;
public static void write(MetaData metaData, File file)
throws MojoExecutionException {
@@ -116,7 +118,7 @@
IOUtils.addAttribute(ai, "name", ocd.getName());
IOUtils.addAttribute(ai, "description", ocd.getDescription());
IOUtils.indent(contentHandler, 1);
- contentHandler.startElement(NAMESPACE_URI, OCD_ELEMENT,
OCD_ELEMENT_QNAME, ai);
+ contentHandler.startElement(INNER_NAMESPACE_URI, OCD_ELEMENT,
OCD_ELEMENT_QNAME, ai);
if ( ocd.getProperties().size() > 0 ) {
IOUtils.newline(contentHandler);
@@ -128,7 +130,7 @@
IOUtils.indent(contentHandler, 1);
}
- contentHandler.endElement(NAMESPACE_URI, OCD_ELEMENT,
OCD_ELEMENT_QNAME);
+ contentHandler.endElement(INNER_NAMESPACE_URI, OCD_ELEMENT,
OCD_ELEMENT_QNAME);
IOUtils.newline(contentHandler);
}
@@ -153,7 +155,7 @@
IOUtils.addAttribute(ai, "description", ad.getDescription());
IOUtils.addAttribute(ai, "cardinality", ad.getCardinality());
IOUtils.indent(contentHandler, 2);
- contentHandler.startElement(NAMESPACE_URI, AD_ELEMENT,
AD_ELEMENT_QNAME, ai);
+ contentHandler.startElement(INNER_NAMESPACE_URI, AD_ELEMENT,
AD_ELEMENT_QNAME, ai);
if (ad.getOptions() != null && ad.getOptions().size() > 0) {
IOUtils.newline(contentHandler);
@@ -163,14 +165,14 @@
IOUtils.addAttribute(ai, "value",
String.valueOf(entry.getKey()));
IOUtils.addAttribute(ai, "label",
String.valueOf(entry.getValue()));
IOUtils.indent(contentHandler, 3);
- contentHandler.startElement(NAMESPACE_URI, OPTION_ELEMENT,
OPTION_ELEMENT_QNAME, ai);
- contentHandler.endElement(NAMESPACE_URI, OPTION_ELEMENT,
OPTION_ELEMENT_QNAME);
+ contentHandler.startElement(INNER_NAMESPACE_URI,
OPTION_ELEMENT, OPTION_ELEMENT_QNAME, ai);
+ contentHandler.endElement(INNER_NAMESPACE_URI, OPTION_ELEMENT,
OPTION_ELEMENT_QNAME);
IOUtils.newline(contentHandler);
}
IOUtils.indent(contentHandler, 2);
}
- contentHandler.endElement(NAMESPACE_URI, AD_ELEMENT, AD_ELEMENT_QNAME);
+ contentHandler.endElement(INNER_NAMESPACE_URI, AD_ELEMENT,
AD_ELEMENT_QNAME);
IOUtils.newline(contentHandler);
}
@@ -179,13 +181,13 @@
final AttributesImpl ai = new AttributesImpl();
IOUtils.addAttribute(ai, "pid", designate.getPid());
IOUtils.indent(contentHandler, 1);
- contentHandler.startElement(NAMESPACE_URI, DESIGNATE_ELEMENT,
DESIGNATE_ELEMENT_QNAME, ai);
+ contentHandler.startElement(INNER_NAMESPACE_URI, DESIGNATE_ELEMENT,
DESIGNATE_ELEMENT_QNAME, ai);
IOUtils.newline(contentHandler);
generateXML(designate.getObject(), contentHandler);
IOUtils.indent(contentHandler, 1);
- contentHandler.endElement(NAMESPACE_URI, DESIGNATE_ELEMENT,
DESIGNATE_ELEMENT_QNAME);
+ contentHandler.endElement(INNER_NAMESPACE_URI, DESIGNATE_ELEMENT,
DESIGNATE_ELEMENT_QNAME);
IOUtils.newline(contentHandler);
}
@@ -194,8 +196,8 @@
final AttributesImpl ai = new AttributesImpl();
IOUtils.addAttribute(ai, "ocdref", obj.getOcdref());
IOUtils.indent(contentHandler, 2);
- contentHandler.startElement(NAMESPACE_URI, OBJECT_ELEMENT,
OBJECT_ELEMENT_QNAME, ai);
- contentHandler.endElement(NAMESPACE_URI, OBJECT_ELEMENT,
OBJECT_ELEMENT_QNAME);
+ contentHandler.startElement(INNER_NAMESPACE_URI, OBJECT_ELEMENT,
OBJECT_ELEMENT_QNAME, ai);
+ contentHandler.endElement(INNER_NAMESPACE_URI, OBJECT_ELEMENT,
OBJECT_ELEMENT_QNAME);
IOUtils.newline(contentHandler);
}
}
