Author: [email protected]
Date: Thu Dec 8 13:04:20 2011
New Revision: 1827
Log:
AMDATU-382 Upgrade platform and release to Felix framework 4.0.2
Modified:
trunk/amdatu-core/itest/pom.xml
trunk/amdatu-core/itest/tests/src/test/java/org/amdatu/core/itest/tests/IntegrationFrameworkTest.java
trunk/amdatu-libraries/warsupport/pom.xml
trunk/amdatu-release-ams/pom.xml
trunk/amdatu-release-ams/src/main/resources/conf/amdatu-platform.properties
trunk/amdatu-release-demo/pom.xml
trunk/amdatu-release-demo/src/main/resources/conf/amdatu-platform.properties
trunk/amdatu-release/pom.xml
trunk/amdatu-release/src/main/resources/conf/amdatu-platform.properties
trunk/amdatu-web/itest/base/src/main/java/org/amdatu/web/itest/base/WebFixture.java
Modified: trunk/amdatu-core/itest/pom.xml
==============================================================================
--- trunk/amdatu-core/itest/pom.xml (original)
+++ trunk/amdatu-core/itest/pom.xml Thu Dec 8 13:04:20 2011
@@ -35,14 +35,14 @@
<pax.url.link.version>1.3.5</pax.url.link.version>
<pax.url.wrap.version>1.3.5</pax.url.wrap.version>
-
<org.apache.felix.framework.version>3.0.2</org.apache.felix.framework.version>
+
<org.apache.felix.framework.version>4.0.2</org.apache.felix.framework.version>
<org.slf4j.simple.version>1.6.1</org.slf4j.simple.version>
<pax.useradmin.version>0.0.1-amdatu1</pax.useradmin.version>
<org.apache.felix.configadmin.version>1.2.4</org.apache.felix.configadmin.version>
<org.apache.felix.eventadmin.version>1.2.2</org.apache.felix.eventadmin.version>
<org.apache.felix.log.version>1.0.0</org.apache.felix.log.version>
<org.apache.felix.prefs.version>1.0.4</org.apache.felix.prefs.version>
- <org.apache.felix.main.version>3.0.2</org.apache.felix.main.version>
+ <org.apache.felix.main.version>4.0.2</org.apache.felix.main.version>
</properties>
<modules>
Modified:
trunk/amdatu-core/itest/tests/src/test/java/org/amdatu/core/itest/tests/IntegrationFrameworkTest.java
==============================================================================
---
trunk/amdatu-core/itest/tests/src/test/java/org/amdatu/core/itest/tests/IntegrationFrameworkTest.java
(original)
+++
trunk/amdatu-core/itest/tests/src/test/java/org/amdatu/core/itest/tests/IntegrationFrameworkTest.java
Thu Dec 8 13:04:20 2011
@@ -71,7 +71,7 @@
*/
@Configuration
public Option[] configureOptions() {
- return options(CoreOptions.systemPackages("sun.misc",
"com.sun.management"),
+ return options(CoreOptions.systemPackages("sun.misc",
"com.sun.management", "org.w3c.dom.traversal"),
CoreOptions.junitBundles(),
CoreFixture.provision());
}
@@ -104,7 +104,7 @@
* Optional \@Filter specifies additional constraints on \@Inject.
*/
@Inject
- @Filter("(service.id=2)")
+ @Filter("(service.id=1)")
private PackageAdmin m_pa;
@Test
Modified: trunk/amdatu-libraries/warsupport/pom.xml
==============================================================================
--- trunk/amdatu-libraries/warsupport/pom.xml (original)
+++ trunk/amdatu-libraries/warsupport/pom.xml Thu Dec 8 13:04:20 2011
@@ -28,7 +28,7 @@
<description>Supporting classes for the Amdatu WAR assembly</description>
<properties>
- <org.apache.felix.main.version>3.0.2</org.apache.felix.main.version>
+ <org.apache.felix.main.version>4.0.2</org.apache.felix.main.version>
</properties>
<dependencies>
Modified: trunk/amdatu-release-ams/pom.xml
==============================================================================
--- trunk/amdatu-release-ams/pom.xml (original)
+++ trunk/amdatu-release-ams/pom.xml Thu Dec 8 13:04:20 2011
@@ -41,7 +41,7 @@
<org.amdatu.web.version>0.3.0-SNAPSHOT</org.amdatu.web.version>
<org.amdatu.lib.version>0.3.0-SNAPSHOT</org.amdatu.lib.version>
- <org.apache.felix.main.version>3.0.2</org.apache.felix.main.version>
+ <org.apache.felix.main.version>4.0.2</org.apache.felix.main.version>
<org.apache.felix.eventadmin.version>1.2.2</org.apache.felix.eventadmin.version>
<org.apache.felix.configadmin.version>1.2.4</org.apache.felix.configadmin.version>
<org.apache.felix.scr.version>1.6.0</org.apache.felix.scr.version>
Modified:
trunk/amdatu-release-ams/src/main/resources/conf/amdatu-platform.properties
==============================================================================
--- trunk/amdatu-release-ams/src/main/resources/conf/amdatu-platform.properties
(original)
+++ trunk/amdatu-release-ams/src/main/resources/conf/amdatu-platform.properties
Thu Dec 8 13:04:20 2011
@@ -27,7 +27,7 @@
# set this value.
# Unfortunately, Cassandra uses a cliffc lib which contains a class
'org.cliffc.high_scale_lib.NonBlockingHashMap'
# This class imports the com.sun package and so it must be exposed here.
-org.osgi.framework.system.packages.extra=sun.misc,com.sun.management
+org.osgi.framework.system.packages.extra=sun.misc,com.sun.management,org.w3c.dom.traversal
# The following property makes specified packages from the class path
# available to all bundles. You should avoid using this property.
Modified: trunk/amdatu-release-demo/pom.xml
==============================================================================
--- trunk/amdatu-release-demo/pom.xml (original)
+++ trunk/amdatu-release-demo/pom.xml Thu Dec 8 13:04:20 2011
@@ -45,7 +45,7 @@
<org.amdatu.opensocial.version>0.2.0-SNAPSHOT</org.amdatu.opensocial.version>
<org.amdatu.semanticweb.version>0.2.0-SNAPSHOT</org.amdatu.semanticweb.version>
- <org.apache.felix.main.version>3.0.2</org.apache.felix.main.version>
+ <org.apache.felix.main.version>4.0.2</org.apache.felix.main.version>
<org.apache.felix.eventadmin.version>1.2.2</org.apache.felix.eventadmin.version>
<org.apache.felix.configadmin.version>1.2.4</org.apache.felix.configadmin.version>
<org.apache.felix.scr.version>1.6.0</org.apache.felix.scr.version>
Modified:
trunk/amdatu-release-demo/src/main/resources/conf/amdatu-platform.properties
==============================================================================
---
trunk/amdatu-release-demo/src/main/resources/conf/amdatu-platform.properties
(original)
+++
trunk/amdatu-release-demo/src/main/resources/conf/amdatu-platform.properties
Thu Dec 8 13:04:20 2011
@@ -27,7 +27,7 @@
# set this value.
# Unfortunately, Cassandra uses a cliffc lib which contains a class
'org.cliffc.high_scale_lib.NonBlockingHashMap'
# This class imports the com.sun package and so it must be exposed here.
-org.osgi.framework.system.packages.extra=sun.misc,com.sun.management
+org.osgi.framework.system.packages.extra=sun.misc,com.sun.management,org.w3c.dom.traversal
# The following property makes specified packages from the class path
# available to all bundles. You should avoid using this property.
Modified: trunk/amdatu-release/pom.xml
==============================================================================
--- trunk/amdatu-release/pom.xml (original)
+++ trunk/amdatu-release/pom.xml Thu Dec 8 13:04:20 2011
@@ -41,7 +41,7 @@
<org.amdatu.web.version>0.3.0-SNAPSHOT</org.amdatu.web.version>
<org.amdatu.lib.version>0.3.0-SNAPSHOT</org.amdatu.lib.version>
- <org.apache.felix.main.version>3.0.2</org.apache.felix.main.version>
+ <org.apache.felix.main.version>4.0.2</org.apache.felix.main.version>
<org.apache.felix.eventadmin.version>1.2.2</org.apache.felix.eventadmin.version>
<org.apache.felix.configadmin.version>1.2.4</org.apache.felix.configadmin.version>
<org.apache.felix.scr.version>1.6.0</org.apache.felix.scr.version>
Modified:
trunk/amdatu-release/src/main/resources/conf/amdatu-platform.properties
==============================================================================
--- trunk/amdatu-release/src/main/resources/conf/amdatu-platform.properties
(original)
+++ trunk/amdatu-release/src/main/resources/conf/amdatu-platform.properties
Thu Dec 8 13:04:20 2011
@@ -27,7 +27,7 @@
# set this value.
# Unfortunately, Cassandra uses a cliffc lib which contains a class
'org.cliffc.high_scale_lib.NonBlockingHashMap'
# This class imports the com.sun package and so it must be exposed here.
-org.osgi.framework.system.packages.extra=sun.misc,com.sun.management
+org.osgi.framework.system.packages.extra=sun.misc,com.sun.management,org.w3c.dom.traversal
# The following property makes specified packages from the class path
# available to all bundles. You should avoid using this property.
Modified:
trunk/amdatu-web/itest/base/src/main/java/org/amdatu/web/itest/base/WebFixture.java
==============================================================================
---
trunk/amdatu-web/itest/base/src/main/java/org/amdatu/web/itest/base/WebFixture.java
(original)
+++
trunk/amdatu-web/itest/base/src/main/java/org/amdatu/web/itest/base/WebFixture.java
Thu Dec 8 13:04:20 2011
@@ -22,6 +22,7 @@
import java.util.Properties;
import org.amdatu.core.itest.base.TestContext;
+import org.ops4j.pax.exam.CoreOptions;
import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.options.ProvisionOption;
@@ -120,8 +121,13 @@
provisionOptions.add(b.getProvisionOption());
}
}
- return org.ops4j.pax.exam.CoreOptions.provision(provisionOptions
- .toArray(new ProvisionOption<?>[provisionOptions.size()]));
+
+ // Amdatu JSP support depends on org.w3c.dom.traversal
+ // as a system package (see FELIX-3235)
+ return org.ops4j.pax.exam.CoreOptions.composite(
+ CoreOptions.systemPackages("org.w3c.dom.traversal"),
+ org.ops4j.pax.exam.CoreOptions.provision(provisionOptions
+ .toArray(new ProvisionOption<?>[provisionOptions.size()])));
}
/**
_______________________________________________
Amdatu-commits mailing list
[email protected]
http://lists.amdatu.org/mailman/listinfo/amdatu-commits
