You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by an...@apache.org on 2011/04/09 00:00:14 UTC
svn commit: r1090462 -
/karaf/branches/karaf-2.2.x/deployer/features/src/main/java/org/apache/karaf/deployer/features/FeatureDeploymentListener.java
Author: anierbeck
Date: Fri Apr 8 22:00:13 2011
New Revision: 1090462
URL: http://svn.apache.org/viewvc?rev=1090462&view=rev
Log:
[KARAF-518] - Unable to load features.xml with included schema attribute
Modified:
karaf/branches/karaf-2.2.x/deployer/features/src/main/java/org/apache/karaf/deployer/features/FeatureDeploymentListener.java
Modified: karaf/branches/karaf-2.2.x/deployer/features/src/main/java/org/apache/karaf/deployer/features/FeatureDeploymentListener.java
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/deployer/features/src/main/java/org/apache/karaf/deployer/features/FeatureDeploymentListener.java?rev=1090462&r1=1090461&r2=1090462&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/deployer/features/src/main/java/org/apache/karaf/deployer/features/FeatureDeploymentListener.java (original)
+++ karaf/branches/karaf-2.2.x/deployer/features/src/main/java/org/apache/karaf/deployer/features/FeatureDeploymentListener.java Fri Apr 8 22:00:13 2011
@@ -92,7 +92,7 @@ public class FeatureDeploymentListener i
Document doc = parse(artifact);
String name = doc.getDocumentElement().getLocalName();
String uri = doc.getDocumentElement().getNamespaceURI();
- if ("features".equals(name) && (uri == null || "".equals(uri))) {
+ if ("features".equals(name) && (uri == null || "".equals(uri) || "http://karaf.apache.org/xmlns/features/v1.0.0".equalsIgnoreCase(uri))) {
return true;
}
}
Re: svn commit: r1090462 - /karaf/branches/karaf-2.2.x/deployer/features/src/main/java/org/apache/karaf/deployer/features/FeatureDeploymentListener.java
Posted by Andreas Pieber <an...@gmail.com>.
np, was just a feeling that it may occurre more often :)
kind regards Andreas
On Apr 9, 2011 11:15 PM, "Achim Nierbeck" <bc...@googlemail.com> wrote:
> Andreas,
>
> after searching for other locations of this string, it's not used at all
> beside the actual xsd which is the referenced schema :)
> Therefore I leave it that way.
>
> regards, Achim
>
>> Andreas,
>>
>> your absolutely right. Will do a small refactoring while introducing
>> pax-url 1.3.2 in trunk :) I think it's OK for 2.2.x though.
>>
>> regards, Achim
>>
>>
>> Am 09.04.2011 08:35, schrieb Andreas Pieber:
>>> mhm, maybe we would like to keep
>>> "http://karaf.apache.org/xmlns/features/v1.0.0" in some constants file
>>> to avoid future changes at multiple locations?
>>>
>>> On Sat, Apr 9, 2011 at 12:00 AM, <an...@apache.org> wrote:
>>>> Author: anierbeck
>>>> Date: Fri Apr 8 22:00:13 2011
>>>> New Revision: 1090462
>>>>
>>>> URL: http://svn.apache.org/viewvc?rev=1090462&view=rev
>>>> Log:
>>>> [KARAF-518] - Unable to load features.xml with included schema
attribute
>>>>
>>>> Modified:
>>>>
karaf/branches/karaf-2.2.x/deployer/features/src/main/java/org/apache/karaf/deployer/features/FeatureDeploymentListener.java
>>>>
>>>> Modified:
karaf/branches/karaf-2.2.x/deployer/features/src/main/java/org/apache/karaf/deployer/features/FeatureDeploymentListener.java
>>>> URL:
http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/deployer/features/src/main/java/org/apache/karaf/deployer/features/FeatureDeploymentListener.java?rev=1090462&r1=1090461&r2=1090462&view=diff
>>>>
==============================================================================
>>>> ---
karaf/branches/karaf-2.2.x/deployer/features/src/main/java/org/apache/karaf/deployer/features/FeatureDeploymentListener.java
(original)
>>>> +++
karaf/branches/karaf-2.2.x/deployer/features/src/main/java/org/apache/karaf/deployer/features/FeatureDeploymentListener.java
Fri Apr 8 22:00:13 2011
>>>> @@ -92,7 +92,7 @@ public class FeatureDeploymentListener i
>>>> Document doc = parse(artifact);
>>>> String name = doc.getDocumentElement().getLocalName();
>>>> String uri = doc.getDocumentElement().getNamespaceURI();
>>>> - if ("features".equals(name) && (uri == null || "".equals(uri))) {
>>>> + if ("features".equals(name) && (uri == null || "".equals(uri) || "
http://karaf.apache.org/xmlns/features/v1.0.0".equalsIgnoreCase(uri))) {
>>>> return true;
>>>> }
>>>> }
>>>>
>>>>
>>>>
>
Re: svn commit: r1090462 - /karaf/branches/karaf-2.2.x/deployer/features/src/main/java/org/apache/karaf/deployer/features/FeatureDeploymentListener.java
Posted by Achim Nierbeck <bc...@googlemail.com>.
Andreas,
after searching for other locations of this string, it's not used at all
beside the actual xsd which is the referenced schema :)
Therefore I leave it that way.
regards, Achim
> Andreas,
>
> your absolutely right. Will do a small refactoring while introducing
> pax-url 1.3.2 in trunk :) I think it's OK for 2.2.x though.
>
> regards, Achim
>
>
> Am 09.04.2011 08:35, schrieb Andreas Pieber:
>> mhm, maybe we would like to keep
>> "http://karaf.apache.org/xmlns/features/v1.0.0" in some constants file
>> to avoid future changes at multiple locations?
>>
>> On Sat, Apr 9, 2011 at 12:00 AM, <an...@apache.org> wrote:
>>> Author: anierbeck
>>> Date: Fri Apr 8 22:00:13 2011
>>> New Revision: 1090462
>>>
>>> URL: http://svn.apache.org/viewvc?rev=1090462&view=rev
>>> Log:
>>> [KARAF-518] - Unable to load features.xml with included schema attribute
>>>
>>> Modified:
>>> karaf/branches/karaf-2.2.x/deployer/features/src/main/java/org/apache/karaf/deployer/features/FeatureDeploymentListener.java
>>>
>>> Modified: karaf/branches/karaf-2.2.x/deployer/features/src/main/java/org/apache/karaf/deployer/features/FeatureDeploymentListener.java
>>> URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/deployer/features/src/main/java/org/apache/karaf/deployer/features/FeatureDeploymentListener.java?rev=1090462&r1=1090461&r2=1090462&view=diff
>>> ==============================================================================
>>> --- karaf/branches/karaf-2.2.x/deployer/features/src/main/java/org/apache/karaf/deployer/features/FeatureDeploymentListener.java (original)
>>> +++ karaf/branches/karaf-2.2.x/deployer/features/src/main/java/org/apache/karaf/deployer/features/FeatureDeploymentListener.java Fri Apr 8 22:00:13 2011
>>> @@ -92,7 +92,7 @@ public class FeatureDeploymentListener i
>>> Document doc = parse(artifact);
>>> String name = doc.getDocumentElement().getLocalName();
>>> String uri = doc.getDocumentElement().getNamespaceURI();
>>> - if ("features".equals(name) && (uri == null || "".equals(uri))) {
>>> + if ("features".equals(name) && (uri == null || "".equals(uri) || "http://karaf.apache.org/xmlns/features/v1.0.0".equalsIgnoreCase(uri))) {
>>> return true;
>>> }
>>> }
>>>
>>>
>>>
Re: svn commit: r1090462 - /karaf/branches/karaf-2.2.x/deployer/features/src/main/java/org/apache/karaf/deployer/features/FeatureDeploymentListener.java
Posted by Achim Nierbeck <bc...@googlemail.com>.
Andreas,
your absolutely right. Will do a small refactoring while introducing
pax-url 1.3.2 in trunk :) I think it's OK for 2.2.x though.
regards, Achim
Am 09.04.2011 08:35, schrieb Andreas Pieber:
> mhm, maybe we would like to keep
> "http://karaf.apache.org/xmlns/features/v1.0.0" in some constants file
> to avoid future changes at multiple locations?
>
> On Sat, Apr 9, 2011 at 12:00 AM, <an...@apache.org> wrote:
>> Author: anierbeck
>> Date: Fri Apr 8 22:00:13 2011
>> New Revision: 1090462
>>
>> URL: http://svn.apache.org/viewvc?rev=1090462&view=rev
>> Log:
>> [KARAF-518] - Unable to load features.xml with included schema attribute
>>
>> Modified:
>> karaf/branches/karaf-2.2.x/deployer/features/src/main/java/org/apache/karaf/deployer/features/FeatureDeploymentListener.java
>>
>> Modified: karaf/branches/karaf-2.2.x/deployer/features/src/main/java/org/apache/karaf/deployer/features/FeatureDeploymentListener.java
>> URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/deployer/features/src/main/java/org/apache/karaf/deployer/features/FeatureDeploymentListener.java?rev=1090462&r1=1090461&r2=1090462&view=diff
>> ==============================================================================
>> --- karaf/branches/karaf-2.2.x/deployer/features/src/main/java/org/apache/karaf/deployer/features/FeatureDeploymentListener.java (original)
>> +++ karaf/branches/karaf-2.2.x/deployer/features/src/main/java/org/apache/karaf/deployer/features/FeatureDeploymentListener.java Fri Apr 8 22:00:13 2011
>> @@ -92,7 +92,7 @@ public class FeatureDeploymentListener i
>> Document doc = parse(artifact);
>> String name = doc.getDocumentElement().getLocalName();
>> String uri = doc.getDocumentElement().getNamespaceURI();
>> - if ("features".equals(name) && (uri == null || "".equals(uri))) {
>> + if ("features".equals(name) && (uri == null || "".equals(uri) || "http://karaf.apache.org/xmlns/features/v1.0.0".equalsIgnoreCase(uri))) {
>> return true;
>> }
>> }
>>
>>
>>
Re: svn commit: r1090462 - /karaf/branches/karaf-2.2.x/deployer/features/src/main/java/org/apache/karaf/deployer/features/FeatureDeploymentListener.java
Posted by Andreas Pieber <an...@gmail.com>.
mhm, maybe we would like to keep
"http://karaf.apache.org/xmlns/features/v1.0.0" in some constants file
to avoid future changes at multiple locations?
On Sat, Apr 9, 2011 at 12:00 AM, <an...@apache.org> wrote:
> Author: anierbeck
> Date: Fri Apr 8 22:00:13 2011
> New Revision: 1090462
>
> URL: http://svn.apache.org/viewvc?rev=1090462&view=rev
> Log:
> [KARAF-518] - Unable to load features.xml with included schema attribute
>
> Modified:
> karaf/branches/karaf-2.2.x/deployer/features/src/main/java/org/apache/karaf/deployer/features/FeatureDeploymentListener.java
>
> Modified: karaf/branches/karaf-2.2.x/deployer/features/src/main/java/org/apache/karaf/deployer/features/FeatureDeploymentListener.java
> URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/deployer/features/src/main/java/org/apache/karaf/deployer/features/FeatureDeploymentListener.java?rev=1090462&r1=1090461&r2=1090462&view=diff
> ==============================================================================
> --- karaf/branches/karaf-2.2.x/deployer/features/src/main/java/org/apache/karaf/deployer/features/FeatureDeploymentListener.java (original)
> +++ karaf/branches/karaf-2.2.x/deployer/features/src/main/java/org/apache/karaf/deployer/features/FeatureDeploymentListener.java Fri Apr 8 22:00:13 2011
> @@ -92,7 +92,7 @@ public class FeatureDeploymentListener i
> Document doc = parse(artifact);
> String name = doc.getDocumentElement().getLocalName();
> String uri = doc.getDocumentElement().getNamespaceURI();
> - if ("features".equals(name) && (uri == null || "".equals(uri))) {
> + if ("features".equals(name) && (uri == null || "".equals(uri) || "http://karaf.apache.org/xmlns/features/v1.0.0".equalsIgnoreCase(uri))) {
> return true;
> }
> }
>
>
>