You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by gn...@apache.org on 2015/11/23 14:54:50 UTC
svn commit: r1715814 - in /aries/trunk/blueprint: ./ blueprint-spring/
blueprint-spring/src/test/java/org/apache/aries/blueprint/spring/
blueprint-spring/src/test/java/org/apache/aries/blueprint/spring/pojos/
blueprint-spring/src/test/resources/ bluepr...
Author: gnodet
Date: Mon Nov 23 13:54:50 2015
New Revision: 1715814
URL: http://svn.apache.org/viewvc?rev=1715814&view=rev
Log:
[ARIES-1456] Extract the blueprint spring test in its own bundle
Added:
aries/trunk/blueprint/blueprint-testbundles/
aries/trunk/blueprint/blueprint-testbundles/LICENSE
aries/trunk/blueprint/blueprint-testbundles/NOTICE
aries/trunk/blueprint/blueprint-testbundles/pom.xml
aries/trunk/blueprint/blueprint-testbundles/src/
aries/trunk/blueprint/blueprint-testbundles/src/main/
aries/trunk/blueprint/blueprint-testbundles/src/main/java/
aries/trunk/blueprint/blueprint-testbundles/src/main/java/org/
aries/trunk/blueprint/blueprint-testbundles/src/main/java/org/apache/
aries/trunk/blueprint/blueprint-testbundles/src/main/java/org/apache/aries/
aries/trunk/blueprint/blueprint-testbundles/src/main/java/org/apache/aries/blueprint/
aries/trunk/blueprint/blueprint-testbundles/src/main/java/org/apache/aries/blueprint/testbundles/
aries/trunk/blueprint/blueprint-testbundles/src/main/java/org/apache/aries/blueprint/testbundles/BeanA.java
- copied, changed from r1715813, aries/trunk/blueprint/blueprint-spring/src/test/java/org/apache/aries/blueprint/spring/pojos/BeanA.java
aries/trunk/blueprint/blueprint-testbundles/src/main/java/org/apache/aries/blueprint/testbundles/BeanAFactory.java
- copied, changed from r1715813, aries/trunk/blueprint/blueprint-spring/src/test/java/org/apache/aries/blueprint/spring/pojos/BeanAFactory.java
aries/trunk/blueprint/blueprint-testbundles/src/main/java/org/apache/aries/blueprint/testbundles/BeanB.java
- copied, changed from r1715813, aries/trunk/blueprint/blueprint-spring/src/test/java/org/apache/aries/blueprint/spring/pojos/BeanB.java
aries/trunk/blueprint/blueprint-testbundles/src/main/resources/
aries/trunk/blueprint/blueprint-testbundles/src/main/resources/OSGI-INF/
aries/trunk/blueprint/blueprint-testbundles/src/main/resources/OSGI-INF/blueprint/
aries/trunk/blueprint/blueprint-testbundles/src/main/resources/OSGI-INF/blueprint/config.xml
- copied, changed from r1715813, aries/trunk/blueprint/blueprint-spring/src/test/resources/test1.xml
Removed:
aries/trunk/blueprint/blueprint-spring/src/test/java/org/apache/aries/blueprint/spring/pojos/BeanA.java
aries/trunk/blueprint/blueprint-spring/src/test/java/org/apache/aries/blueprint/spring/pojos/BeanAFactory.java
aries/trunk/blueprint/blueprint-spring/src/test/java/org/apache/aries/blueprint/spring/pojos/BeanB.java
aries/trunk/blueprint/blueprint-spring/src/test/resources/test1.xml
Modified:
aries/trunk/blueprint/blueprint-spring/pom.xml
aries/trunk/blueprint/blueprint-spring/src/test/java/org/apache/aries/blueprint/spring/SpringTest.java
aries/trunk/blueprint/pom.xml
Modified: aries/trunk/blueprint/blueprint-spring/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-spring/pom.xml?rev=1715814&r1=1715813&r2=1715814&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-spring/pom.xml (original)
+++ aries/trunk/blueprint/blueprint-spring/pom.xml Mon Nov 23 13:54:50 2015
@@ -183,6 +183,12 @@
<version>4.2.2.RELEASE</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.aries.blueprint</groupId>
+ <artifactId>org.apache.aries.blueprint.testbundles</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
Modified: aries/trunk/blueprint/blueprint-spring/src/test/java/org/apache/aries/blueprint/spring/SpringTest.java
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-spring/src/test/java/org/apache/aries/blueprint/spring/SpringTest.java?rev=1715814&r1=1715813&r2=1715814&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-spring/src/test/java/org/apache/aries/blueprint/spring/SpringTest.java (original)
+++ aries/trunk/blueprint/blueprint-spring/src/test/java/org/apache/aries/blueprint/spring/SpringTest.java Mon Nov 23 13:54:50 2015
@@ -26,10 +26,10 @@ import java.util.Set;
import org.apache.aries.blueprint.NamespaceHandler;
import org.apache.aries.blueprint.parser.NamespaceHandlerSet;
-import org.apache.aries.blueprint.spring.pojos.BeanA;
-import org.apache.aries.blueprint.spring.pojos.BeanB;
import org.apache.aries.blueprint.spring.support.AbstractBlueprintTest;
import org.apache.aries.blueprint.spring.support.TestBlueprintContainer;
+import org.apache.aries.blueprint.testbundles.BeanA;
+import org.apache.aries.blueprint.testbundles.BeanB;
import org.springframework.beans.factory.xml.UtilNamespaceHandler;
import org.xml.sax.SAXException;
@@ -38,7 +38,7 @@ public class SpringTest extends Abstract
public void testSpring() throws Exception {
NamespaceHandlerSet handlers = new SpringNamespaceHandlerSet();
TestBlueprintContainer container = new TestBlueprintContainer();
- container.parse("/test1.xml", handlers);
+ container.parse("/OSGI-INF/blueprint/config.xml", handlers);
List list = (List) container.getComponentInstance("springList");
assertEquals("foo", list.get(0));
Added: aries/trunk/blueprint/blueprint-testbundles/LICENSE
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-testbundles/LICENSE?rev=1715814&view=auto
==============================================================================
--- aries/trunk/blueprint/blueprint-testbundles/LICENSE (added)
+++ aries/trunk/blueprint/blueprint-testbundles/LICENSE Mon Nov 23 13:54:50 2015
@@ -0,0 +1,203 @@
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed 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.
+
Added: aries/trunk/blueprint/blueprint-testbundles/NOTICE
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-testbundles/NOTICE?rev=1715814&view=auto
==============================================================================
--- aries/trunk/blueprint/blueprint-testbundles/NOTICE (added)
+++ aries/trunk/blueprint/blueprint-testbundles/NOTICE Mon Nov 23 13:54:50 2015
@@ -0,0 +1,8 @@
+
+Apache Aries
+Copyright 2009-2011 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+
+
Added: aries/trunk/blueprint/blueprint-testbundles/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-testbundles/pom.xml?rev=1715814&view=auto
==============================================================================
--- aries/trunk/blueprint/blueprint-testbundles/pom.xml (added)
+++ aries/trunk/blueprint/blueprint-testbundles/pom.xml Mon Nov 23 13:54:50 2015
@@ -0,0 +1,95 @@
+<?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.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.aries</groupId>
+ <artifactId>parent</artifactId>
+ <version>2.0.1</version>
+ <relativePath>../../parent/pom.xml</relativePath>
+ </parent>
+
+ <groupId>org.apache.aries.blueprint</groupId>
+ <artifactId>org.apache.aries.blueprint.testbundles</artifactId>
+ <name>Apache Aries Blueprint Test Bundle S</name>
+ <version>1.0.0-SNAPSHOT</version>
+ <packaging>bundle</packaging>
+ <description>Blueprint Test Bundle S, provides Spring test</description>
+
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/blueprint/blueprint-testbundles</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/blueprint/blueprint-testbundles</developerConnection>
+ <url>http://svn.apache.org/viewvc/aries/branches/trunk/blueprint-testbundles</url>
+ </scm>
+
+ <properties>
+ <aries.osgi.private.pkg />
+ <aries.osgi.export.pkg>${project.artifactId}*</aries.osgi.export.pkg>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.eclipse</groupId>
+ <artifactId>osgi</artifactId>
+ <version>3.5.0.v20090520</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.aries.blueprint</groupId>
+ <artifactId>org.apache.aries.blueprint.api</artifactId>
+ <version>1.0.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.aries.blueprint</groupId>
+ <artifactId>org.apache.aries.blueprint.core</artifactId>
+ <version>1.0.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ <version>4.2.2.RELEASE</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.aries.versioning</groupId>
+ <artifactId>org.apache.aries.versioning.plugin</artifactId>
+ <executions>
+ <execution>
+ <id>default-verify</id>
+ <phase>verify</phase>
+ <goals>
+ <goal>version-check</goal>
+ </goals>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
Copied: aries/trunk/blueprint/blueprint-testbundles/src/main/java/org/apache/aries/blueprint/testbundles/BeanA.java (from r1715813, aries/trunk/blueprint/blueprint-spring/src/test/java/org/apache/aries/blueprint/spring/pojos/BeanA.java)
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-testbundles/src/main/java/org/apache/aries/blueprint/testbundles/BeanA.java?p2=aries/trunk/blueprint/blueprint-testbundles/src/main/java/org/apache/aries/blueprint/testbundles/BeanA.java&p1=aries/trunk/blueprint/blueprint-spring/src/test/java/org/apache/aries/blueprint/spring/pojos/BeanA.java&r1=1715813&r2=1715814&rev=1715814&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-spring/src/test/java/org/apache/aries/blueprint/spring/pojos/BeanA.java (original)
+++ aries/trunk/blueprint/blueprint-testbundles/src/main/java/org/apache/aries/blueprint/testbundles/BeanA.java Mon Nov 23 13:54:50 2015
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.aries.blueprint.spring.pojos;
+package org.apache.aries.blueprint.testbundles;
public class BeanA {
Copied: aries/trunk/blueprint/blueprint-testbundles/src/main/java/org/apache/aries/blueprint/testbundles/BeanAFactory.java (from r1715813, aries/trunk/blueprint/blueprint-spring/src/test/java/org/apache/aries/blueprint/spring/pojos/BeanAFactory.java)
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-testbundles/src/main/java/org/apache/aries/blueprint/testbundles/BeanAFactory.java?p2=aries/trunk/blueprint/blueprint-testbundles/src/main/java/org/apache/aries/blueprint/testbundles/BeanAFactory.java&p1=aries/trunk/blueprint/blueprint-spring/src/test/java/org/apache/aries/blueprint/spring/pojos/BeanAFactory.java&r1=1715813&r2=1715814&rev=1715814&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-spring/src/test/java/org/apache/aries/blueprint/spring/pojos/BeanAFactory.java (original)
+++ aries/trunk/blueprint/blueprint-testbundles/src/main/java/org/apache/aries/blueprint/testbundles/BeanAFactory.java Mon Nov 23 13:54:50 2015
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.aries.blueprint.spring.pojos;
+package org.apache.aries.blueprint.testbundles;
public class BeanAFactory {
Copied: aries/trunk/blueprint/blueprint-testbundles/src/main/java/org/apache/aries/blueprint/testbundles/BeanB.java (from r1715813, aries/trunk/blueprint/blueprint-spring/src/test/java/org/apache/aries/blueprint/spring/pojos/BeanB.java)
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-testbundles/src/main/java/org/apache/aries/blueprint/testbundles/BeanB.java?p2=aries/trunk/blueprint/blueprint-testbundles/src/main/java/org/apache/aries/blueprint/testbundles/BeanB.java&p1=aries/trunk/blueprint/blueprint-spring/src/test/java/org/apache/aries/blueprint/spring/pojos/BeanB.java&r1=1715813&r2=1715814&rev=1715814&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-spring/src/test/java/org/apache/aries/blueprint/spring/pojos/BeanB.java (original)
+++ aries/trunk/blueprint/blueprint-testbundles/src/main/java/org/apache/aries/blueprint/testbundles/BeanB.java Mon Nov 23 13:54:50 2015
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.aries.blueprint.spring.pojos;
+package org.apache.aries.blueprint.testbundles;
import org.springframework.context.ApplicationContext;
import org.springframework.context.ApplicationContextAware;
Copied: aries/trunk/blueprint/blueprint-testbundles/src/main/resources/OSGI-INF/blueprint/config.xml (from r1715813, aries/trunk/blueprint/blueprint-spring/src/test/resources/test1.xml)
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-testbundles/src/main/resources/OSGI-INF/blueprint/config.xml?p2=aries/trunk/blueprint/blueprint-testbundles/src/main/resources/OSGI-INF/blueprint/config.xml&p1=aries/trunk/blueprint/blueprint-spring/src/test/resources/test1.xml&r1=1715813&r2=1715814&rev=1715814&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-spring/src/test/resources/test1.xml (original)
+++ aries/trunk/blueprint/blueprint-testbundles/src/main/resources/OSGI-INF/blueprint/config.xml Mon Nov 23 13:54:50 2015
@@ -25,12 +25,11 @@
http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-4.2.xsd
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.2.xsd">
- <!-- connect to the local ActiveMQ broker -->
- <bean id="beanB" class="org.apache.aries.blueprint.spring.pojos.BeanB">
+ <bean id="beanB" class="org.apache.aries.blueprint.testbundles.BeanB">
<property name="beanA" ref="beanA"/>
</bean>
- <bean name="beanA" class="org.apache.aries.blueprint.spring.pojos.BeanAFactory"
+ <bean name="beanA" class="org.apache.aries.blueprint.testbundles.BeanAFactory"
factory-method="createBean" xmlns="http://www.springframework.org/schema/beans">
<constructor-arg value="arg1"/>
</bean>
Modified: aries/trunk/blueprint/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/pom.xml?rev=1715814&r1=1715813&r2=1715814&view=diff
==============================================================================
--- aries/trunk/blueprint/pom.xml (original)
+++ aries/trunk/blueprint/pom.xml Mon Nov 23 13:54:50 2015
@@ -54,6 +54,7 @@
<module>blueprint-annotation-api</module>
<module>blueprint-annotation-impl</module>
<module>blueprint-authz</module>
+ <module>blueprint-testbundles</module>
<module>blueprint-spring</module>
<module>blueprint-sample-annotation</module>
<module>blueprint-sample-fragment</module>