Author: ffang
Date: Tue Aug 14 06:20:20 2012
New Revision: 1372740
URL: http://svn.apache.org/viewvc?rev=1372740&view=rev
Log:
[KARAF-1066]make features xml parser more forgiving
Added:
karaf/trunk/features/core/src/test/resources/org/apache/karaf/features/repo2.xml
Modified:
karaf/trunk/features/core/src/main/java/org/apache/karaf/features/internal/RepositoryImpl.java
karaf/trunk/features/core/src/test/java/org/apache/karaf/features/RepositoryTest.java
Modified:
karaf/trunk/features/core/src/main/java/org/apache/karaf/features/internal/RepositoryImpl.java
URL:
http://svn.apache.org/viewvc/karaf/trunk/features/core/src/main/java/org/apache/karaf/features/internal/RepositoryImpl.java?rev=1372740&r1=1372739&r2=1372740&view=diff
==============================================================================
---
karaf/trunk/features/core/src/main/java/org/apache/karaf/features/internal/RepositoryImpl.java
(original)
+++
karaf/trunk/features/core/src/main/java/org/apache/karaf/features/internal/RepositoryImpl.java
Tue Aug 14 06:20:20 2012
@@ -69,7 +69,9 @@ public class RepositoryImpl implements R
load();
URI[] result = new URI[features.getRepository().size()];
for (int i = 0; i < features.getRepository().size(); i++) {
- result[i] = URI.create(features.getRepository().get(i));
+ String uri = features.getRepository().get(i);
+ uri = uri.trim();
+ result[i] = URI.create(uri);
}
return result;
}
Modified:
karaf/trunk/features/core/src/test/java/org/apache/karaf/features/RepositoryTest.java
URL:
http://svn.apache.org/viewvc/karaf/trunk/features/core/src/test/java/org/apache/karaf/features/RepositoryTest.java?rev=1372740&r1=1372739&r2=1372740&view=diff
==============================================================================
---
karaf/trunk/features/core/src/test/java/org/apache/karaf/features/RepositoryTest.java
(original)
+++
karaf/trunk/features/core/src/test/java/org/apache/karaf/features/RepositoryTest.java
Tue Aug 14 06:20:20 2012
@@ -65,6 +65,48 @@ public class RepositoryTest extends Test
assertEquals(true,
features[2].getConfigurationFiles().get(0).isOverride());
assertEquals("cfloc",
features[2].getConfigurationFiles().get(0).getLocation());
}
+
+ public void testLoadFormattedRepo() throws Exception {
+ RepositoryImpl r = new
RepositoryImpl(getClass().getResource("repo2.xml").toURI());
+ // Check repo
+ URI[] repos = r.getRepositories();
+ assertNotNull(repos);
+ assertEquals(1, repos.length);
+ assertEquals(URI.create("urn:r1"), repos[0]);
+ // Check features
+ Feature[] features = r.getFeatures();
+ assertNotNull(features);
+ assertEquals(3, features.length);
+ assertNotNull(features[0]);
+ assertEquals("f1", features[0].getName());
+ assertNotNull(features[0].getConfigurations());
+ assertEquals(1, features[0].getConfigurations().size());
+ assertNotNull(features[0].getConfigurations().get("c1"));
+ assertEquals(1, features[0].getConfigurations().get("c1").size());
+ assertEquals("v", features[0].getConfigurations().get("c1").get("k"));
+ assertNotNull(features[0].getDependencies());
+ assertEquals(0, features[0].getDependencies().size());
+ assertNotNull(features[0].getBundles());
+ assertEquals(2, features[0].getBundles().size());
+ assertEquals("b1", features[0].getBundles().get(0).getLocation());
+ assertEquals("b2", features[0].getBundles().get(1).getLocation());
+ assertNotNull(features[1]);
+ assertEquals("f2", features[1].getName());
+ assertNotNull(features[1].getConfigurations());
+ assertEquals(0, features[1].getConfigurations().size());
+ assertNotNull(features[1].getDependencies());
+ assertEquals(1, features[1].getDependencies().size());
+ assertEquals("f1" +
org.apache.karaf.features.internal.model.Feature.SPLIT_FOR_NAME_AND_VERSION +
org.apache.karaf.features.internal.model.Feature.DEFAULT_VERSION,
features[1].getDependencies().get(0).toString());
+ assertNotNull(features[1].getBundles());
+ assertEquals(1, features[1].getBundles().size());
+ assertEquals("b3", features[1].getBundles().get(0).getLocation());
+ assertEquals("f3", features[2].getName());
+ assertNotNull(features[2].getConfigurationFiles());
+ assertEquals(1, features[2].getConfigurationFiles().size());
+ assertEquals("cf1",
features[2].getConfigurationFiles().get(0).getFinalname());
+ assertEquals(true,
features[2].getConfigurationFiles().get(0).isOverride());
+ assertEquals("cfloc",
features[2].getConfigurationFiles().get(0).getLocation());
+ }
public void testShowWrongUriInException() throws Exception {
String uri =
"src/test/resources/org/apache/karaf/shell/features/repo1.xml";
Added:
karaf/trunk/features/core/src/test/resources/org/apache/karaf/features/repo2.xml
URL:
http://svn.apache.org/viewvc/karaf/trunk/features/core/src/test/resources/org/apache/karaf/features/repo2.xml?rev=1372740&view=auto
==============================================================================
---
karaf/trunk/features/core/src/test/resources/org/apache/karaf/features/repo2.xml
(added)
+++
karaf/trunk/features/core/src/test/resources/org/apache/karaf/features/repo2.xml
Tue Aug 14 06:20:20 2012
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<features name="test" xmlns="http://karaf.apache.org/xmlns/features/v1.0.0";>
+ <repository>
+ urn:r1
+ </repository>
+ <feature name="f1" region="foo">
+ <config name="c1">
+ k=v
+ </config>
+ <bundle>b1</bundle>
+ <bundle>b2</bundle>
+ </feature>
+ <feature name="f2">
+ <feature>f1</feature>
+ <bundle>b3</bundle>
+ </feature>
+ <feature name="f3">
+ <configfile finalname="cf1" override="true">cfloc</configfile>
+ <bundle>b4</bundle>
+ </feature>
+</features>
