Author: dkulp Date: Mon Sep 19 20:06:41 2011 New Revision: 1172785 URL: http://svn.apache.org/viewvc?rev=1172785&view=rev Log: Merged revisions 1152174 via svnmerge from https://svn.apache.org/repos/asf/camel/trunk
........ r1152174 | jbonofre | 2011-07-29 07:39:06 -0400 (Fri, 29 Jul 2011) | 1 line [CAMEL-4280] Update the OSGi and Spring DM version. ........ Modified: camel/branches/camel-2.8.x/ (props changed) camel/branches/camel-2.8.x/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintContainerRegistry.java camel/branches/camel-2.8.x/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintPropertiesParser.java camel/branches/camel-2.8.x/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/PackageScanRouteBuilderFinder.java camel/branches/camel-2.8.x/parent/pom.xml Propchange: camel/branches/camel-2.8.x/ ------------------------------------------------------------------------------ svn:mergeinfo = /camel/trunk:1152174 Propchange: camel/branches/camel-2.8.x/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: camel/branches/camel-2.8.x/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintContainerRegistry.java URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintContainerRegistry.java?rev=1172785&r1=1172784&r2=1172785&view=diff ============================================================================== --- camel/branches/camel-2.8.x/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintContainerRegistry.java (original) +++ camel/branches/camel-2.8.x/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintContainerRegistry.java Mon Sep 19 20:06:41 2011 @@ -67,7 +67,8 @@ public class BlueprintContainerRegistry public static <T> Map<String, T> lookupByType(BlueprintContainer blueprintContainer, Class<T> type) { Map<String, T> objects = new LinkedHashMap<String, T>(); - for (ExtendedBeanMetadata metadata : blueprintContainer.getMetadata(ExtendedBeanMetadata.class)) { + for (Object metadataObject : blueprintContainer.getMetadata(ExtendedBeanMetadata.class)) { + ExtendedBeanMetadata metadata = (ExtendedBeanMetadata) metadataObject; try { Class cl = metadata.getRuntimeClass(); if (cl == null && metadata.getClassName() != null) { @@ -82,7 +83,8 @@ public class BlueprintContainerRegistry // ignore } } - for (MutableReferenceMetadata metadata : blueprintContainer.getMetadata(MutableReferenceMetadata.class)) { + for (Object metadataObject : blueprintContainer.getMetadata(MutableReferenceMetadata.class)) { + MutableReferenceMetadata metadata = (MutableReferenceMetadata) metadataObject; try { Class cl = metadata.getRuntimeInterface(); if (cl == null && metadata.getInterface() != null) { Modified: camel/branches/camel-2.8.x/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintPropertiesParser.java URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintPropertiesParser.java?rev=1172785&r1=1172784&r2=1172785&view=diff ============================================================================== --- camel/branches/camel-2.8.x/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintPropertiesParser.java (original) +++ camel/branches/camel-2.8.x/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintPropertiesParser.java Mon Sep 19 20:06:41 2011 @@ -60,7 +60,8 @@ public class BlueprintPropertiesParser e public String[] lookupPropertyPlaceholderIds() { List<String> ids = new ArrayList<String>(); - for (String id : container.getComponentIds()) { + for (Object componentId : container.getComponentIds()) { + String id = (String) componentId; ComponentMetadata meta = container.getComponentMetadata(id); if (meta instanceof ExtendedBeanMetadata) { Class clazz = ((ExtendedBeanMetadata) meta).getRuntimeClass(); Modified: camel/branches/camel-2.8.x/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/PackageScanRouteBuilderFinder.java URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/PackageScanRouteBuilderFinder.java?rev=1172785&r1=1172784&r2=1172785&view=diff ============================================================================== --- camel/branches/camel-2.8.x/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/PackageScanRouteBuilderFinder.java (original) +++ camel/branches/camel-2.8.x/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/PackageScanRouteBuilderFinder.java Mon Sep 19 20:06:41 2011 @@ -85,7 +85,8 @@ public class PackageScanRouteBuilderFind * Lets ignore beans that are explicitly configured in the Spring XML files */ protected boolean shouldIgnoreBean(Class<?> type) { - for (BeanMetadata metadata : blueprintContainer.getMetadata(BeanMetadata.class)) { + for (Object metadataObject : blueprintContainer.getMetadata(BeanMetadata.class)) { + BeanMetadata metadata = (BeanMetadata) metadataObject; if (BeanMetadata.SCOPE_SINGLETON.equals(metadata.getScope())) { Object bean = blueprintContainer.getComponentInstance(metadata.getId()); if (type.isInstance(bean)) { Modified: camel/branches/camel-2.8.x/parent/pom.xml URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/parent/pom.xml?rev=1172785&r1=1172784&r2=1172785&view=diff ============================================================================== --- camel/branches/camel-2.8.x/parent/pom.xml (original) +++ camel/branches/camel-2.8.x/parent/pom.xml Mon Sep 19 20:06:41 2011 @@ -120,7 +120,7 @@ <netty-bundle-version>3.2.4.Final_1</netty-bundle-version> <ode-version>1.3.3</ode-version> <ognl-version>2.7.3_3</ognl-version> - <osgi-version>4.1.0</osgi-version> + <osgi-version>4.2.0</osgi-version> <pax-exam-version>1.2.4</pax-exam-version> <pax-runner-version>1.6.1</pax-runner-version> <pax-tiny-bundle-version>1.2.0</pax-tiny-bundle-version> @@ -143,7 +143,7 @@ <spring-integration-version>2.0.4.RELEASE</spring-integration-version> <spring-javaconfig-version>1.0.0-20090215</spring-javaconfig-version> <spring-version>3.0.6.RELEASE</spring-version> - <spring-osgi-version>1.2.0</spring-osgi-version> + <spring-osgi-version>1.2.1</spring-osgi-version> <spring-security-version>3.0.6.RELEASE</spring-security-version> <spring-ws-version>2.0.2.RELEASE</spring-ws-version> <spymemcached-version>2.5</spymemcached-version>