Author: hibou
Date: Fri Dec 27 17:56:38 2013
New Revision: 1553708
URL: http://svn.apache.org/r1553708
Log:
OSGI: new names for CDC profiles too
Modified:
ant/ivy/core/trunk/src/java/org/apache/ivy/osgi/core/jvm-packages.properties
ant/ivy/core/trunk/test/java/org/apache/ivy/osgi/core/ExecutionEnvironmentProfileLoaderTest.java
Modified:
ant/ivy/core/trunk/src/java/org/apache/ivy/osgi/core/jvm-packages.properties
URL:
http://svn.apache.org/viewvc/ant/ivy/core/trunk/src/java/org/apache/ivy/osgi/core/jvm-packages.properties?rev=1553708&r1=1553707&r2=1553708&view=diff
==============================================================================
---
ant/ivy/core/trunk/src/java/org/apache/ivy/osgi/core/jvm-packages.properties
(original)
+++
ant/ivy/core/trunk/src/java/org/apache/ivy/osgi/core/jvm-packages.properties
Fri Dec 27 17:56:38 2013
@@ -26,11 +26,13 @@ OSGi/Minimum-1.1.pkglist =
OSGi/Minimum-1.2.aliases = OSGI_MINIMUM-1.2
OSGi/Minimum-1.2.pkglist =
-CDC-1.0_Foundation-1.0.pkglist = \
+CDC-1.0/Foundation-1.0.aliases = CDC-1.0_Foundation-1.0
+CDC-1.0/Foundation-1.0.pkglist = \
javax.microedition.io
-CDC-1.1_Foundation-1.1.extends = CDC-1.0_Foundation-1.0
-CDC-1.1_Foundation-1.1.pkglist = \
+CDC-1.1/Foundation-1.1.aliases = CDC-1.1_Foundation-1.1
+CDC-1.1/Foundation-1.1.extends = CDC-1.0/Foundation-1.0
+CDC-1.1/Foundation-1.1.pkglist = \
javax.microedition.pki,\
javax.security.auth.x500
Modified:
ant/ivy/core/trunk/test/java/org/apache/ivy/osgi/core/ExecutionEnvironmentProfileLoaderTest.java
URL:
http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/java/org/apache/ivy/osgi/core/ExecutionEnvironmentProfileLoaderTest.java?rev=1553708&r1=1553707&r2=1553708&view=diff
==============================================================================
---
ant/ivy/core/trunk/test/java/org/apache/ivy/osgi/core/ExecutionEnvironmentProfileLoaderTest.java
(original)
+++
ant/ivy/core/trunk/test/java/org/apache/ivy/osgi/core/ExecutionEnvironmentProfileLoaderTest.java
Fri Dec 27 17:56:38 2013
@@ -27,26 +27,28 @@ public class ExecutionEnvironmentProfile
public void testLoad() throws Exception {
Map<String, ExecutionEnvironmentProfile> profiles =
ExecutionEnvironmentProfileProvider.loadDefaultProfileList();
- assertEquals(19, profiles.size());
+ assertEquals(21, profiles.size());
- assertEquals(0, ((ExecutionEnvironmentProfile)
profiles.get("OSGI_MINIMUM-1.0")).getPkgNames().size());
- assertEquals(0, ((ExecutionEnvironmentProfile)
profiles.get("OSGi/Minimum-1.0")).getPkgNames().size());
- assertEquals(0, ((ExecutionEnvironmentProfile)
profiles.get("OSGI_MINIMUM-1.1")).getPkgNames().size());
- assertEquals(0, ((ExecutionEnvironmentProfile)
profiles.get("OSGi/Minimum-1.1")).getPkgNames().size());
- assertEquals(0, ((ExecutionEnvironmentProfile)
profiles.get("OSGI_MINIMUM-1.2")).getPkgNames().size());
- assertEquals(0, ((ExecutionEnvironmentProfile)
profiles.get("OSGi/Minimum-1.2")).getPkgNames().size());
- assertEquals(1, ((ExecutionEnvironmentProfile)
profiles.get("CDC-1.0_Foundation-1.0")).getPkgNames().size());
- assertEquals(3, ((ExecutionEnvironmentProfile)
profiles.get("CDC-1.1_Foundation-1.1")).getPkgNames().size());
- assertEquals(24, ((ExecutionEnvironmentProfile)
profiles.get("J2SE-1.2")).getPkgNames().size());
- assertEquals(24, ((ExecutionEnvironmentProfile)
profiles.get("JavaSE-1.2")).getPkgNames().size());
- assertEquals(40, ((ExecutionEnvironmentProfile)
profiles.get("J2SE-1.3")).getPkgNames().size());
- assertEquals(40, ((ExecutionEnvironmentProfile)
profiles.get("JavaSE-1.3")).getPkgNames().size());
- assertEquals(96, ((ExecutionEnvironmentProfile)
profiles.get("J2SE-1.4")).getPkgNames().size());
- assertEquals(96, ((ExecutionEnvironmentProfile)
profiles.get("JavaSE-1.4")).getPkgNames().size());
- assertEquals(122, ((ExecutionEnvironmentProfile)
profiles.get("J2SE-1.5")).getPkgNames().size());
- assertEquals(122, ((ExecutionEnvironmentProfile)
profiles.get("J2SE-1.5")).getPkgNames().size());
- assertEquals(158, ((ExecutionEnvironmentProfile)
profiles.get("JavaSE-1.6")).getPkgNames().size());
- assertEquals(159, ((ExecutionEnvironmentProfile)
profiles.get("JavaSE-1.7")).getPkgNames().size());
- assertEquals(159, ((ExecutionEnvironmentProfile)
profiles.get("JavaSE-1.8")).getPkgNames().size());
+ assertEquals(0, profiles.get("OSGI_MINIMUM-1.0").getPkgNames().size());
+ assertEquals(0, profiles.get("OSGi/Minimum-1.0").getPkgNames().size());
+ assertEquals(0, profiles.get("OSGI_MINIMUM-1.1").getPkgNames().size());
+ assertEquals(0, profiles.get("OSGi/Minimum-1.1").getPkgNames().size());
+ assertEquals(0, profiles.get("OSGI_MINIMUM-1.2").getPkgNames().size());
+ assertEquals(0, profiles.get("OSGi/Minimum-1.2").getPkgNames().size());
+ assertEquals(1,
profiles.get("CDC-1.0_Foundation-1.0").getPkgNames().size());
+ assertEquals(1,
profiles.get("CDC-1.0/Foundation-1.0").getPkgNames().size());
+ assertEquals(3,
profiles.get("CDC-1.1_Foundation-1.1").getPkgNames().size());
+ assertEquals(3,
profiles.get("CDC-1.1/Foundation-1.1").getPkgNames().size());
+ assertEquals(24, profiles.get("J2SE-1.2").getPkgNames().size());
+ assertEquals(24, profiles.get("JavaSE-1.2").getPkgNames().size());
+ assertEquals(40, profiles.get("J2SE-1.3").getPkgNames().size());
+ assertEquals(40, profiles.get("JavaSE-1.3").getPkgNames().size());
+ assertEquals(96, profiles.get("J2SE-1.4").getPkgNames().size());
+ assertEquals(96, profiles.get("JavaSE-1.4").getPkgNames().size());
+ assertEquals(122, profiles.get("J2SE-1.5").getPkgNames().size());
+ assertEquals(122, profiles.get("J2SE-1.5").getPkgNames().size());
+ assertEquals(158, profiles.get("JavaSE-1.6").getPkgNames().size());
+ assertEquals(159, profiles.get("JavaSE-1.7").getPkgNames().size());
+ assertEquals(159, profiles.get("JavaSE-1.8").getPkgNames().size());
}
}
