You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by jw...@apache.org on 2016/06/15 19:23:47 UTC
svn commit: r1748624 [3/3] - in /aries/branches/java6support/blueprint: ./
blueprint-bundle/ blueprint-cm/
blueprint-cm/src/main/java/org/apache/aries/blueprint/compendium/cm/
blueprint-cm/src/main/resources/OSGI-INF/blueprint/ blueprint-core/
blueprin...
Modified: aries/branches/java6support/blueprint/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/model/BeanTest.java
URL: http://svn.apache.org/viewvc/aries/branches/java6support/blueprint/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/model/BeanTest.java?rev=1748624&r1=1748623&r2=1748624&view=diff
==============================================================================
--- aries/branches/java6support/blueprint/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/model/BeanTest.java (original)
+++ aries/branches/java6support/blueprint/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/model/BeanTest.java Wed Jun 15 19:23:47 2016
@@ -6,9 +6,9 @@
* 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
- *
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
* 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
@@ -18,15 +18,7 @@
*/
package org.apache.aries.blueprint.plugin.model;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-
-import java.util.Set;
-
-import javax.inject.Named;
-
+import com.google.common.collect.Sets;
import org.apache.aries.blueprint.plugin.bad.BadBean1;
import org.apache.aries.blueprint.plugin.bad.BadBean2;
import org.apache.aries.blueprint.plugin.bad.BadBean3;
@@ -37,11 +29,18 @@ import org.apache.aries.blueprint.plugin
import org.apache.aries.blueprint.plugin.test.MyBean1;
import org.apache.aries.blueprint.plugin.test.MyBean3;
import org.apache.aries.blueprint.plugin.test.MyBean4;
+import org.apache.aries.blueprint.plugin.test.MyBean5;
import org.apache.aries.blueprint.plugin.test.ServiceAImpl1;
import org.junit.Assert;
import org.junit.Test;
-import com.google.common.collect.Sets;
+import javax.inject.Named;
+import java.util.Set;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
public class BeanTest {
@@ -63,12 +62,12 @@ public class BeanTest {
assertEquals("serviceA", prop.ref);
Set<TransactionalDef> expectedTxs = Sets.newHashSet(new TransactionalDef("*", "RequiresNew"),
- new TransactionalDef("txNotSupported", "NotSupported"),
- new TransactionalDef("txMandatory", "Mandatory"),
- new TransactionalDef("txNever", "Never"),
- new TransactionalDef("txRequired", "Required"),
- new TransactionalDef("txOverridenWithRequiresNew", "RequiresNew"),
- new TransactionalDef("txSupports", "Supports"));
+ new TransactionalDef("txNotSupported", "NotSupported"),
+ new TransactionalDef("txMandatory", "Mandatory"),
+ new TransactionalDef("txNever", "Never"),
+ new TransactionalDef("txRequired", "Required"),
+ new TransactionalDef("txOverridenWithRequiresNew", "RequiresNew"),
+ new TransactionalDef("txSupports", "Supports"));
assertEquals(expectedTxs, bean.transactionDefs);
}
@@ -85,12 +84,12 @@ public class BeanTest {
assertTrue(bean.isPrototype);
Set<TransactionalDef> expectedTxs = Sets.newHashSet(new TransactionalDef("*", "RequiresNew"),
- new TransactionalDef("txNotSupported", "NotSupported"),
- new TransactionalDef("txMandatory", "Mandatory"),
- new TransactionalDef("txNever", "Never"),
- new TransactionalDef("txRequired", "Required"),
- new TransactionalDef("txRequiresNew", "RequiresNew"),
- new TransactionalDef("txSupports", "Supports"));
+ new TransactionalDef("txNotSupported", "NotSupported"),
+ new TransactionalDef("txMandatory", "Mandatory"),
+ new TransactionalDef("txNever", "Never"),
+ new TransactionalDef("txRequired", "Required"),
+ new TransactionalDef("txRequiresNew", "RequiresNew"),
+ new TransactionalDef("txSupports", "Supports"));
assertEquals(expectedTxs, bean.transactionDefs);
}
@@ -156,4 +155,26 @@ public class BeanTest {
public void testFieldBean4() {
new Context(FieldBean4.class).resolve();
}
+
+ @Test
+ public void testParseBeanWithConstructorInject() {
+ Bean bean = new Bean(MyBean5.class);
+ bean.resolve(new Context());
+ assertEquals(MyBean5.class, bean.clazz);
+ assertEquals("myBean5", bean.id); // Name derived from class name
+ assertNull("There should be no initMethod", bean.initMethod);
+ assertNull("There should be no destroyMethod", bean.destroyMethod);
+ assertTrue("There should be no persistenceUnit", bean.persistenceFields.isEmpty());
+ assertEquals(0, bean.properties.size());
+ assertEquals(8, bean.constructorArguments.size());
+ assertEquals("my2", bean.constructorArguments.get(0).getRef());
+ assertEquals("serviceA", bean.constructorArguments.get(1).getRef());
+ assertEquals("serviceB", bean.constructorArguments.get(2).getRef());
+ assertEquals("100", bean.constructorArguments.get(3).getValue());
+ assertEquals("ser1", bean.constructorArguments.get(4).getRef());
+ assertEquals("ser2", bean.constructorArguments.get(5).getRef());
+ assertEquals("serviceA", bean.constructorArguments.get(6).getRef());
+ assertEquals("produced2", bean.constructorArguments.get(7).getRef());
+ }
+
}
Modified: aries/branches/java6support/blueprint/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/MyBean1.java
URL: http://svn.apache.org/viewvc/aries/branches/java6support/blueprint/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/MyBean1.java?rev=1748624&r1=1748623&r2=1748624&view=diff
==============================================================================
--- aries/branches/java6support/blueprint/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/MyBean1.java (original)
+++ aries/branches/java6support/blueprint/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/MyBean1.java Wed Jun 15 19:23:47 2016
@@ -18,6 +18,8 @@
*/
package org.apache.aries.blueprint.plugin.test;
+import org.springframework.context.annotation.Lazy;
+
import javax.annotation.PostConstruct;
import javax.inject.Singleton;
import javax.transaction.Transactional;
@@ -25,6 +27,7 @@ import javax.transaction.Transactional.T
@Singleton
@Transactional(value=TxType.REQUIRES_NEW)
+@Lazy
public class MyBean1 extends ParentBean {
public void overridenInit() {
Modified: aries/branches/java6support/blueprint/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/MyBean4.java
URL: http://svn.apache.org/viewvc/aries/branches/java6support/blueprint/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/MyBean4.java?rev=1748624&r1=1748623&r2=1748624&view=diff
==============================================================================
--- aries/branches/java6support/blueprint/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/MyBean4.java (original)
+++ aries/branches/java6support/blueprint/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/MyBean4.java Wed Jun 15 19:23:47 2016
@@ -1,13 +1,33 @@
+/**
+ * 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
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * 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.
+ */
package org.apache.aries.blueprint.plugin.test;
-import javax.inject.Inject;
-
import org.osgi.framework.BundleContext;
+import org.springframework.context.annotation.DependsOn;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;
+import javax.inject.Inject;
+
@Component
+@DependsOn({"myBean5", "myBean6"})
public class MyBean4 {
@Inject
Modified: aries/branches/java6support/blueprint/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/MyFactoryBean.java
URL: http://svn.apache.org/viewvc/aries/branches/java6support/blueprint/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/MyFactoryBean.java?rev=1748624&r1=1748623&r2=1748624&view=diff
==============================================================================
--- aries/branches/java6support/blueprint/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/MyFactoryBean.java (original)
+++ aries/branches/java6support/blueprint/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/MyFactoryBean.java Wed Jun 15 19:23:47 2016
@@ -1,7 +1,29 @@
+/**
+ * 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
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * 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.
+ */
package org.apache.aries.blueprint.plugin.test;
+import org.ops4j.pax.cdi.api.OsgiService;
+import org.springframework.beans.factory.annotation.Value;
+
import javax.enterprise.inject.Produces;
import javax.inject.Inject;
+import javax.inject.Named;
import javax.inject.Singleton;
@Singleton
@@ -14,4 +36,9 @@ public class MyFactoryBean {
public MyProduced create() {
return new MyProduced("My message");
}
+
+ @Produces
+ public MyProducedWithConstructor createBeanWithParameters(MyBean1 myBean1, @Value("100") int bla, @OsgiService(filter = "myRef") @Named("ser1") ServiceC myReference) {
+ return new MyProducedWithConstructor(null);
+ }
}
Modified: aries/branches/java6support/blueprint/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/MyProduced.java
URL: http://svn.apache.org/viewvc/aries/branches/java6support/blueprint/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/MyProduced.java?rev=1748624&r1=1748623&r2=1748624&view=diff
==============================================================================
--- aries/branches/java6support/blueprint/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/MyProduced.java (original)
+++ aries/branches/java6support/blueprint/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/MyProduced.java Wed Jun 15 19:23:47 2016
@@ -1,7 +1,28 @@
+/**
+ * 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
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * 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.
+ */
package org.apache.aries.blueprint.plugin.test;
+import org.springframework.context.annotation.Lazy;
+
import javax.inject.Inject;
+@Lazy
public class MyProduced {
private String message;
Modified: aries/branches/java6support/blueprint/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/ServiceReferences.java
URL: http://svn.apache.org/viewvc/aries/branches/java6support/blueprint/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/ServiceReferences.java?rev=1748624&r1=1748623&r2=1748624&view=diff
==============================================================================
--- aries/branches/java6support/blueprint/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/ServiceReferences.java (original)
+++ aries/branches/java6support/blueprint/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/ServiceReferences.java Wed Jun 15 19:23:47 2016
@@ -1,4 +1,3 @@
-
/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
Modified: aries/branches/java6support/blueprint/blueprint-noosgi/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/java6support/blueprint/blueprint-noosgi/pom.xml?rev=1748624&r1=1748623&r2=1748624&view=diff
==============================================================================
--- aries/branches/java6support/blueprint/blueprint-noosgi/pom.xml (original)
+++ aries/branches/java6support/blueprint/blueprint-noosgi/pom.xml Wed Jun 15 19:23:47 2016
@@ -31,7 +31,7 @@
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint.noosgi</artifactId>
<packaging>jar</packaging>
- <version>1.1.2-SNAPSHOT</version>
+ <version>1.1.3-SNAPSHOT</version>
<name>Apache Aries Blueprint no-OSGI</name>
<description>
This jar contains everything needed to run Blueprint outside OSGi.
Modified: aries/branches/java6support/blueprint/blueprint-parser/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/java6support/blueprint/blueprint-parser/pom.xml?rev=1748624&r1=1748623&r2=1748624&view=diff
==============================================================================
--- aries/branches/java6support/blueprint/blueprint-parser/pom.xml (original)
+++ aries/branches/java6support/blueprint/blueprint-parser/pom.xml Wed Jun 15 19:23:47 2016
@@ -45,7 +45,7 @@
<properties>
<blueprint.api.version>1.0.0</blueprint.api.version>
- <lastReleaseVersion>1.3.0</lastReleaseVersion>
+ <lastReleaseVersion>1.4.0</lastReleaseVersion>
</properties>
<profiles>
Modified: aries/branches/java6support/blueprint/blueprint-parser/src/main/java/org/apache/aries/blueprint/NamespaceHandler2.java
URL: http://svn.apache.org/viewvc/aries/branches/java6support/blueprint/blueprint-parser/src/main/java/org/apache/aries/blueprint/NamespaceHandler2.java?rev=1748624&r1=1748623&r2=1748624&view=diff
==============================================================================
--- aries/branches/java6support/blueprint/blueprint-parser/src/main/java/org/apache/aries/blueprint/NamespaceHandler2.java (original)
+++ aries/branches/java6support/blueprint/blueprint-parser/src/main/java/org/apache/aries/blueprint/NamespaceHandler2.java Wed Jun 15 19:23:47 2016
@@ -16,20 +16,12 @@
*/
package org.apache.aries.blueprint;
-import java.net.URL;
-import java.util.Set;
-
-import org.osgi.service.blueprint.reflect.ComponentMetadata;
-import org.osgi.service.blueprint.reflect.Metadata;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
/**
* Additional namespace features
*/
public interface NamespaceHandler2 extends NamespaceHandler {
- /*
+ /**
* A namespace can return true if its parsing relies on PSVI,
* i.e. extensions from the schema for default attributes values
* for example.
Modified: aries/branches/java6support/blueprint/blueprint-spring-extender/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/java6support/blueprint/blueprint-spring-extender/pom.xml?rev=1748624&r1=1748623&r2=1748624&view=diff
==============================================================================
--- aries/branches/java6support/blueprint/blueprint-spring-extender/pom.xml (original)
+++ aries/branches/java6support/blueprint/blueprint-spring-extender/pom.xml Wed Jun 15 19:23:47 2016
@@ -59,7 +59,7 @@
org.apache.aries.blueprint.spring.extender.Activator
</aries.osgi.activator>
<blueprint.api.version>1.0.0</blueprint.api.version>
- <blueprint.core.version>1.6.0-SNAPSHOT</blueprint.core.version>
+ <blueprint.core.version>1.6.2</blueprint.core.version>
<blueprint.parser.version>1.5.0-SNAPSHOT</blueprint.parser.version>
<!--
<lastReleaseVersion>1.0.4</lastReleaseVersion>
@@ -71,7 +71,7 @@
<id>dev</id>
<properties>
<blueprint.api.version>1.0.1</blueprint.api.version>
- <blueprint.core.version>1.6.0-SNAPSHOT</blueprint.core.version>
+ <blueprint.core.version>1.7.0-SNAPSHOT</blueprint.core.version>
<blueprint.parser.version>1.5.0-SNAPSHOT</blueprint.parser.version>
</properties>
</profile>
Modified: aries/branches/java6support/blueprint/blueprint-spring/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/java6support/blueprint/blueprint-spring/pom.xml?rev=1748624&r1=1748623&r2=1748624&view=diff
==============================================================================
--- aries/branches/java6support/blueprint/blueprint-spring/pom.xml (original)
+++ aries/branches/java6support/blueprint/blueprint-spring/pom.xml Wed Jun 15 19:23:47 2016
@@ -59,8 +59,8 @@
org.apache.aries.blueprint.spring.Activator
</aries.osgi.activator>
<blueprint.api.version>1.0.0</blueprint.api.version>
- <blueprint.core.version>1.6.0-SNAPSHOT</blueprint.core.version>
- <blueprint.parser.version>1.5.0-SNAPSHOT</blueprint.parser.version>
+ <blueprint.core.version>1.6.3-SNAPSHOT</blueprint.core.version>
+ <blueprint.parser.version>1.4.0</blueprint.parser.version>
<!--
<lastReleaseVersion>1.0.4</lastReleaseVersion>
-->
@@ -71,7 +71,7 @@
<id>dev</id>
<properties>
<blueprint.api.version>1.0.1</blueprint.api.version>
- <blueprint.core.version>1.6.0-SNAPSHOT</blueprint.core.version>
+ <blueprint.core.version>1.7.0-SNAPSHOT</blueprint.core.version>
<blueprint.parser.version>1.5.0-SNAPSHOT</blueprint.parser.version>
</properties>
</profile>
Modified: aries/branches/java6support/blueprint/blueprint-spring/src/main/java/org/apache/aries/blueprint/spring/BlueprintNamespaceHandler.java
URL: http://svn.apache.org/viewvc/aries/branches/java6support/blueprint/blueprint-spring/src/main/java/org/apache/aries/blueprint/spring/BlueprintNamespaceHandler.java?rev=1748624&r1=1748623&r2=1748624&view=diff
==============================================================================
--- aries/branches/java6support/blueprint/blueprint-spring/src/main/java/org/apache/aries/blueprint/spring/BlueprintNamespaceHandler.java (original)
+++ aries/branches/java6support/blueprint/blueprint-spring/src/main/java/org/apache/aries/blueprint/spring/BlueprintNamespaceHandler.java Wed Jun 15 19:23:47 2016
@@ -22,6 +22,7 @@ import java.util.Properties;
import java.util.Set;
import org.apache.aries.blueprint.ComponentDefinitionRegistry;
+import org.apache.aries.blueprint.NamespaceHandler;
import org.apache.aries.blueprint.NamespaceHandler2;
import org.apache.aries.blueprint.ParserContext;
import org.apache.aries.blueprint.PassThroughMetadata;
@@ -55,7 +56,7 @@ import org.w3c.dom.Node;
/**
* Blueprint NamespaceHandler wrapper for a spring NamespaceHandler
*/
-public class BlueprintNamespaceHandler implements NamespaceHandler2 {
+public class BlueprintNamespaceHandler implements NamespaceHandler, NamespaceHandler2 {
public static final String SPRING_CONTEXT_ID = "." + org.springframework.beans.factory.xml.ParserContext.class.getName();
public static final String SPRING_BEAN_PROCESSOR_ID = "." + SpringBeanProcessor.class.getName();
Modified: aries/branches/java6support/blueprint/blueprint-spring/src/main/java/org/apache/aries/blueprint/spring/SpringApplicationContext.java
URL: http://svn.apache.org/viewvc/aries/branches/java6support/blueprint/blueprint-spring/src/main/java/org/apache/aries/blueprint/spring/SpringApplicationContext.java?rev=1748624&r1=1748623&r2=1748624&view=diff
==============================================================================
--- aries/branches/java6support/blueprint/blueprint-spring/src/main/java/org/apache/aries/blueprint/spring/SpringApplicationContext.java (original)
+++ aries/branches/java6support/blueprint/blueprint-spring/src/main/java/org/apache/aries/blueprint/spring/SpringApplicationContext.java Wed Jun 15 19:23:47 2016
@@ -50,6 +50,7 @@ public class SpringApplicationContext ex
}
});
prepareBeanFactory(beanFactory);
+ prepareRefresh();
}
public void process() {
Modified: aries/branches/java6support/blueprint/blueprint-testbundlea/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/java6support/blueprint/blueprint-testbundlea/pom.xml?rev=1748624&r1=1748623&r2=1748624&view=diff
==============================================================================
--- aries/branches/java6support/blueprint/blueprint-testbundlea/pom.xml (original)
+++ aries/branches/java6support/blueprint/blueprint-testbundlea/pom.xml Wed Jun 15 19:23:47 2016
@@ -31,7 +31,7 @@
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint.testbundlea</artifactId>
<name>Apache Aries Blueprint Test Bundle A</name>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<description>Blueprint Test Bundle A, provides NamespaceHandler, BeanProcessor etc implementations for Test Bundle B</description>
Modified: aries/branches/java6support/blueprint/blueprint-testbundlea/src/main/resources/OSGI-INF/blueprint/config.xml
URL: http://svn.apache.org/viewvc/aries/branches/java6support/blueprint/blueprint-testbundlea/src/main/resources/OSGI-INF/blueprint/config.xml?rev=1748624&r1=1748623&r2=1748624&view=diff
==============================================================================
--- aries/branches/java6support/blueprint/blueprint-testbundlea/src/main/resources/OSGI-INF/blueprint/config.xml (original)
+++ aries/branches/java6support/blueprint/blueprint-testbundlea/src/main/resources/OSGI-INF/blueprint/config.xml Wed Jun 15 19:23:47 2016
@@ -31,7 +31,8 @@
<bean id="NSHandlerFive" class="org.apache.aries.blueprint.testbundlea.NSHandlerFive"/>
<bean id="NSHandlerSix" class="org.apache.aries.blueprint.testbundlea.NSHandlerSix"/>
<bean id="NSHandlerSeven" class="org.apache.aries.blueprint.testbundlea.NSHandlerSeven"/>
-
+ <bean id="NSHandlerHeight" class="org.apache.aries.blueprint.testbundlea.NSHandlerHeight"/>
+
<service interface="org.apache.aries.blueprint.NamespaceHandler" ref="NSHandlerOne">
<service-properties>
<entry key="osgi.service.blueprint.namespace" value="http://ns.handler.one"/>
@@ -83,7 +84,16 @@
</entry>
</service-properties>
</service>
-
+ <service interface="org.apache.aries.blueprint.NamespaceHandler" ref="NSHandlerHeight">
+ <service-properties>
+ <entry key="osgi.service.blueprint.namespace">
+ <list>
+ <value>http://ns.handler.height</value>
+ </list>
+ </entry>
+ </service-properties>
+ </service>
+
<bean id="MultiService" class="org.apache.aries.blueprint.testbundlea.multi.MultiService"/>
<service ref="MultiService">
<interfaces>
Modified: aries/branches/java6support/blueprint/blueprint-testbundleb/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/java6support/blueprint/blueprint-testbundleb/pom.xml?rev=1748624&r1=1748623&r2=1748624&view=diff
==============================================================================
--- aries/branches/java6support/blueprint/blueprint-testbundleb/pom.xml (original)
+++ aries/branches/java6support/blueprint/blueprint-testbundleb/pom.xml Wed Jun 15 19:23:47 2016
@@ -64,7 +64,7 @@
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint.testbundlea</artifactId>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
Modified: aries/branches/java6support/blueprint/blueprint-testbundleb/src/main/resources/OSGI-INF/blueprint/config.xml
URL: http://svn.apache.org/viewvc/aries/branches/java6support/blueprint/blueprint-testbundleb/src/main/resources/OSGI-INF/blueprint/config.xml?rev=1748624&r1=1748623&r2=1748624&view=diff
==============================================================================
--- aries/branches/java6support/blueprint/blueprint-testbundleb/src/main/resources/OSGI-INF/blueprint/config.xml (original)
+++ aries/branches/java6support/blueprint/blueprint-testbundleb/src/main/resources/OSGI-INF/blueprint/config.xml Wed Jun 15 19:23:47 2016
@@ -28,6 +28,7 @@
xmlns:six="http://ns.handler.six"
xmlns:sixim="http://ns.handler.six.import"
xmlns:seven="http://ns.handler.seven"
+ xmlns:height="http://ns.handler.height"
default-availability="optional">
<ext:property-placeholder placeholder-prefix="$(" placeholder-suffix=")">
@@ -120,9 +121,15 @@
<seven:stuffinc>foo</seven:stuffinc>
<mytest:foo xmlns:mytest="http://ns.handler.mytest">blah</mytest:foo>
</seven:stuff>
- </seven:nshandlerseven>
-
-
+ </seven:nshandlerseven>
+
+ <height:nshandlerheight height:id="HEIGHT" height:attrib="foo">
+ <height:stuff>
+ <height:stuffinc>foo</height:stuffinc>
+ <mytest:foo xmlns:mytest="http://ns.handler.mytest">blah</mytest:foo>
+ </height:stuff>
+ </height:nshandlerheight>
+
<reference id="OnlyA" interface="org.apache.aries.blueprint.testbundlea.multi.InterfaceA"/>
<reference id="AandB" interface="org.apache.aries.blueprint.testbundlea.multi.InterfaceA">
<ext:additional-interfaces>
Modified: aries/branches/java6support/blueprint/blueprint-testbundles/src/main/resources/OSGI-INF/blueprint/config.xml
URL: http://svn.apache.org/viewvc/aries/branches/java6support/blueprint/blueprint-testbundles/src/main/resources/OSGI-INF/blueprint/config.xml?rev=1748624&r1=1748623&r2=1748624&view=diff
==============================================================================
--- aries/branches/java6support/blueprint/blueprint-testbundles/src/main/resources/OSGI-INF/blueprint/config.xml (original)
+++ aries/branches/java6support/blueprint/blueprint-testbundles/src/main/resources/OSGI-INF/blueprint/config.xml Wed Jun 15 19:23:47 2016
@@ -21,15 +21,19 @@
xmlns:bean="http://www.springframework.org/schema/beans"
xmlns:util="http://www.springframework.org/schema/util"
xmlns:context="http://www.springframework.org/schema/context"
+ xmlns:axon="http://www.axonframework.org/schema/core"
xsi:schemaLocation="
http://www.osgi.org/xmlns/blueprint/v1.0.0 http://www.osgi.org/xmlns/blueprint/v1.0.0/blueprint.xsd
http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-4.2.xsd
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.2.xsd
http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-4.2.xsd
- http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.2.xsd">
+ http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.2.xsd
+ http://www.axonframework.org/schema/core http://www.axonframework.org/schema/axon-core.xsd">
<annotation-driven xmlns="http://www.springframework.org/schema/tx"/>
+ <axon:annotation-config/>
+
<bean:import resource="spring/imported.xml" />
<bean:beans default-autowire="constructor">