Author: jsdelfino
Date: Mon Mar 3 16:39:04 2008
New Revision: 633336
URL: http://svn.apache.org/viewvc?rev=633336&view=rev
Log:
Represent qnames as valid IRIs.
Modified:
incubator/tuscany/java/sca/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/CompositeCollectionImpl.java
incubator/tuscany/java/sca/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/DeployableCompositeCollectionImpl.java
incubator/tuscany/java/sca/modules/workspace-admin/src/test/java/org/apache/tuscany/sca/workspace/admin/impl/AdminTestCase.java
Modified:
incubator/tuscany/java/sca/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/CompositeCollectionImpl.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/CompositeCollectionImpl.java?rev=633336&r1=633335&r2=633336&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/CompositeCollectionImpl.java
(original)
+++
incubator/tuscany/java/sca/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/CompositeCollectionImpl.java
Mon Mar 3 16:39:04 2008
@@ -64,7 +64,7 @@
/**
* Implementation of a composite collection service.
*
- * @version $Rev$ $Date$
+ * @version $Rev: 632617 $ $Date: 2008-03-01 08:24:33 -0800 (Sat, 01 Mar 2008)
$
*/
@Scope("COMPOSITE")
public class CompositeCollectionImpl implements CompositeCollection {
@@ -245,23 +245,23 @@
* @return
*/
private static QName qname(String name) {
- int i = name.indexOf('}');
+ int i = name.indexOf(';');
if (i != -1) {
- return new QName(name.substring(1, i), name.substring(i + 1));
+ return new QName(name.substring(0, i), name.substring(i + 1));
} else {
return new QName(name);
}
}
/**
- * Returns a qname expressed as namespace#localpart.
+ * Returns a qname expressed as namespace;localpart.
* @param qname
* @return
*/
private static String name(QName qname) {
String ns = qname.getNamespaceURI();
if (ns != null) {
- return '{' + ns + '}' + qname.getLocalPart();
+ return ns + ';' + qname.getLocalPart();
} else {
return qname.getLocalPart();
}
Modified:
incubator/tuscany/java/sca/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/DeployableCompositeCollectionImpl.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/DeployableCompositeCollectionImpl.java?rev=633336&r1=633335&r2=633336&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/DeployableCompositeCollectionImpl.java
(original)
+++
incubator/tuscany/java/sca/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/DeployableCompositeCollectionImpl.java
Mon Mar 3 16:39:04 2008
@@ -229,20 +229,6 @@
}
/**
- * Returns a qname object from its expression as namespace#localpart.
- * @param name
- * @return
- */
- private static QName qname(String name) {
- int i = name.indexOf('}');
- if (i != -1) {
- return new QName(name.substring(1, i), name.substring(i + 1));
- } else {
- return new QName(name);
- }
- }
-
- /**
* Returns a qname expressed as namespace#localpart.
* @param qname
* @return
@@ -250,7 +236,7 @@
private static String name(QName qname) {
String ns = qname.getNamespaceURI();
if (ns != null) {
- return '{' + ns + '}' + qname.getLocalPart();
+ return ns + ';' + qname.getLocalPart();
} else {
return qname.getLocalPart();
}
Modified:
incubator/tuscany/java/sca/modules/workspace-admin/src/test/java/org/apache/tuscany/sca/workspace/admin/impl/AdminTestCase.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/workspace-admin/src/test/java/org/apache/tuscany/sca/workspace/admin/impl/AdminTestCase.java?rev=633336&r1=633335&r2=633336&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/workspace-admin/src/test/java/org/apache/tuscany/sca/workspace/admin/impl/AdminTestCase.java
(original)
+++
incubator/tuscany/java/sca/modules/workspace-admin/src/test/java/org/apache/tuscany/sca/workspace/admin/impl/AdminTestCase.java
Mon Mar 3 16:39:04 2008
@@ -99,7 +99,7 @@
public void testDeployables() {
Entry<String, Item>[] entries = deployableCollection.getAll();
assertEquals(1, entries.length);
- assertEquals("{http://store}store";, entries[0].getKey());
+ assertEquals("http://store;store";, entries[0].getKey());
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
