Author: gnodet
Date: Mon Jul 27 08:28:11 2009
New Revision: 798076
URL: http://svn.apache.org/viewvc?rev=798076&view=rev
Log:
FELIX-1274: Spring deployer fails when bean class is from java.* packages
Modified:
felix/trunk/karaf/deployer/blueprint/src/main/java/org/apache/felix/karaf/deployer/blueprint/BlueprintTransformer.java
felix/trunk/karaf/deployer/blueprint/src/test/java/org/apache/felix/karaf/deployer/blueprint/BlueprintDeploymentListenerTest.java
felix/trunk/karaf/deployer/spring/src/main/java/org/apache/felix/karaf/deployer/spring/SpringTransformer.java
felix/trunk/karaf/deployer/spring/src/test/resources/test.xml
Modified:
felix/trunk/karaf/deployer/blueprint/src/main/java/org/apache/felix/karaf/deployer/blueprint/BlueprintTransformer.java
URL:
http://svn.apache.org/viewvc/felix/trunk/karaf/deployer/blueprint/src/main/java/org/apache/felix/karaf/deployer/blueprint/BlueprintTransformer.java?rev=798076&r1=798075&r2=798076&view=diff
==============================================================================
---
felix/trunk/karaf/deployer/blueprint/src/main/java/org/apache/felix/karaf/deployer/blueprint/BlueprintTransformer.java
(original)
+++
felix/trunk/karaf/deployer/blueprint/src/main/java/org/apache/felix/karaf/deployer/blueprint/BlueprintTransformer.java
Mon Jul 27 08:28:11 2009
@@ -207,7 +207,10 @@
for (int i = 0; i < parts.length; i++) {
int n = parts[i].lastIndexOf('.');
if (n > 0) {
- refers.add(parts[i].substring(0, n));
+ String pkg = parts[i].substring(0, n);
+ if (!pkg.startsWith("java.")) {
+ refers.add(pkg);
+ }
}
}
}
Modified:
felix/trunk/karaf/deployer/blueprint/src/test/java/org/apache/felix/karaf/deployer/blueprint/BlueprintDeploymentListenerTest.java
URL:
http://svn.apache.org/viewvc/felix/trunk/karaf/deployer/blueprint/src/test/java/org/apache/felix/karaf/deployer/blueprint/BlueprintDeploymentListenerTest.java?rev=798076&r1=798075&r2=798076&view=diff
==============================================================================
---
felix/trunk/karaf/deployer/blueprint/src/test/java/org/apache/felix/karaf/deployer/blueprint/BlueprintDeploymentListenerTest.java
(original)
+++
felix/trunk/karaf/deployer/blueprint/src/test/java/org/apache/felix/karaf/deployer/blueprint/BlueprintDeploymentListenerTest.java
Mon Jul 27 08:28:11 2009
@@ -37,9 +37,8 @@
File f = new
File(getClass().getClassLoader().getResource("test.xml").toURI());
Set<String> pkgs = BlueprintTransformer.analyze(new
DOMSource(BlueprintTransformer.parse(f.toURL())));
assertNotNull(pkgs);
- assertEquals(2, pkgs.size());
+ assertEquals(1, pkgs.size());
Iterator<String> it = pkgs.iterator();
- assertEquals("java.lang", it.next());
assertEquals("org.apache.geronimo.blueprint.sample", it.next());
}
Modified:
felix/trunk/karaf/deployer/spring/src/main/java/org/apache/felix/karaf/deployer/spring/SpringTransformer.java
URL:
http://svn.apache.org/viewvc/felix/trunk/karaf/deployer/spring/src/main/java/org/apache/felix/karaf/deployer/spring/SpringTransformer.java?rev=798076&r1=798075&r2=798076&view=diff
==============================================================================
---
felix/trunk/karaf/deployer/spring/src/main/java/org/apache/felix/karaf/deployer/spring/SpringTransformer.java
(original)
+++
felix/trunk/karaf/deployer/spring/src/main/java/org/apache/felix/karaf/deployer/spring/SpringTransformer.java
Mon Jul 27 08:28:11 2009
@@ -208,7 +208,10 @@
for (int i = 0; i < parts.length; i++) {
int n = parts[i].lastIndexOf('.');
if (n > 0) {
- refers.add(parts[i].substring(0, n));
+ String pkg = parts[i].substring(0, n);
+ if (!pkg.startsWith("java.")) {
+ refers.add(parts[i].substring(0, n));
+ }
}
}
}
Modified: felix/trunk/karaf/deployer/spring/src/test/resources/test.xml
URL:
http://svn.apache.org/viewvc/felix/trunk/karaf/deployer/spring/src/test/resources/test.xml?rev=798076&r1=798075&r2=798076&view=diff
==============================================================================
--- felix/trunk/karaf/deployer/spring/src/test/resources/test.xml (original)
+++ felix/trunk/karaf/deployer/spring/src/test/resources/test.xml Mon Jul 27
08:28:11 2009
@@ -52,4 +52,8 @@
</osgi:service-properties>
</osgi:service>
+ <bean id="uri" class="java.net.URI">
+ <constructor-arg value="urn:resource"/>
+ </bean>
+
</beans>
