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 2015/09/29 17:44:51 UTC
svn commit: r1705880 - in /aries/trunk/subsystem/subsystem-itests: ./
src/test/java/org/apache/aries/subsystem/itests/obr/felix/
src/test/java/org/apache/aries/subsystem/itests/util/
Author: jwross
Date: Tue Sep 29 15:44:50 2015
New Revision: 1705880
URL: http://svn.apache.org/viewvc?rev=1705880&view=rev
Log:
Update itests to use R6 of cmpn and enterprise. Also use the official OSGi distributions.
Add new methods from R6 Repository interface to test repositories. Throw UnsupportedOperationException.
Remove package containing duplicate code. Use existing code from subsystem-obr isntead.
Removed:
aries/trunk/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/obr/felix/FelixCapabilityAdapter.java
aries/trunk/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/obr/felix/FelixProperty.java
aries/trunk/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/obr/felix/FelixRepositoryAdapter.java
aries/trunk/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/obr/felix/FelixRequirementAdapter.java
aries/trunk/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/obr/felix/FelixResourceAdapter.java
aries/trunk/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/obr/felix/OsgiCapabilityAdapter.java
aries/trunk/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/obr/felix/OsgiRequirementAdapter.java
aries/trunk/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/obr/felix/OsgiResourceAdapter.java
aries/trunk/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/obr/felix/RepositoryAdminRepository.java
Modified:
aries/trunk/subsystem/subsystem-itests/pom.xml
aries/trunk/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/util/RepositoryGenerator.java
aries/trunk/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/util/TestRepository.java
Modified: aries/trunk/subsystem/subsystem-itests/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/subsystem/subsystem-itests/pom.xml?rev=1705880&r1=1705879&r2=1705880&view=diff
==============================================================================
--- aries/trunk/subsystem/subsystem-itests/pom.xml (original)
+++ aries/trunk/subsystem/subsystem-itests/pom.xml Tue Sep 29 15:44:50 2015
@@ -45,20 +45,20 @@
<dependencies>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
+ <artifactId>osgi.core</artifactId>
<version>6.0.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
- <version>5.0.0</version>
+ <artifactId>osgi.cmpn</artifactId>
+ <version>6.0.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.enterprise</artifactId>
- <version>5.0.0</version>
+ <artifactId>osgi.enterprise</artifactId>
+ <version>6.0.0</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -145,6 +145,18 @@
<exclusions>
<exclusion>
<groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.aries.subsystem</groupId>
+ <artifactId>org.apache.aries.subsystem.obr</artifactId>
+ <scope>test</scope>
+ <version>1.0.2-SNAPSHOT</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
</exclusion>
</exclusions>
Modified: aries/trunk/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/util/RepositoryGenerator.java
URL: http://svn.apache.org/viewvc/aries/trunk/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/util/RepositoryGenerator.java?rev=1705880&r1=1705879&r2=1705880&view=diff
==============================================================================
--- aries/trunk/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/util/RepositoryGenerator.java (original)
+++ aries/trunk/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/util/RepositoryGenerator.java Tue Sep 29 15:44:50 2015
@@ -28,8 +28,8 @@ import javax.xml.transform.stream.Stream
import org.apache.aries.application.Content;
import org.apache.aries.application.management.BundleInfo;
-import org.apache.aries.subsystem.itests.obr.felix.FelixResourceAdapter;
-import org.apache.aries.subsystem.itests.obr.felix.OsgiResourceAdapter;
+import org.apache.aries.subsystem.util.felix.FelixResourceAdapter;
+import org.apache.aries.subsystem.util.felix.OsgiResourceAdapter;
import org.apache.felix.bundlerepository.Reason;
import org.apache.felix.bundlerepository.Repository;
import org.apache.felix.bundlerepository.RepositoryAdmin;
Modified: aries/trunk/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/util/TestRepository.java
URL: http://svn.apache.org/viewvc/aries/trunk/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/util/TestRepository.java?rev=1705880&r1=1705879&r2=1705880&view=diff
==============================================================================
--- aries/trunk/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/util/TestRepository.java (original)
+++ aries/trunk/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/util/TestRepository.java Tue Sep 29 15:44:50 2015
@@ -23,7 +23,11 @@ import org.apache.aries.subsystem.core.i
import org.osgi.resource.Capability;
import org.osgi.resource.Requirement;
import org.osgi.resource.Resource;
+import org.osgi.service.repository.ExpressionCombiner;
import org.osgi.service.repository.Repository;
+import org.osgi.service.repository.RequirementBuilder;
+import org.osgi.service.repository.RequirementExpression;
+import org.osgi.util.promise.Promise;
public class TestRepository implements Repository {
public static class Builder {
@@ -64,4 +68,19 @@ public class TestRepository implements R
}
return result;
}
+
+ @Override
+ public Promise<Collection<Resource>> findProviders(RequirementExpression expression) {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public ExpressionCombiner getExpressionCombiner() {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public RequirementBuilder newRequirementBuilder(String namespace) {
+ throw new UnsupportedOperationException();
+ }
}