Author: bdekruijff at gmail.com
Date: Fri Nov 26 17:37:28 2010
New Revision: 450
Log:
AMDATU-197 Replaced felix osgi core/compendium artifacts with official ones
Modified:
trunk/amdatu-core/useradminstore-fs/pom.xml
trunk/amdatu-release/pom.xml
trunk/amdatu-release/src/main/assembly/bin-component.xml
trunk/amdatu-web/pom.xml
trunk/integration-tests/pom.xml
trunk/pom.xml
trunk/src/main/resources/conf/amdatu-minimal.properties
trunk/src/main/resources/conf/amdatu-web.properties
trunk/src/main/resources/conf/felix-config.properties
Modified: trunk/amdatu-core/useradminstore-fs/pom.xml
==============================================================================
--- trunk/amdatu-core/useradminstore-fs/pom.xml (original)
+++ trunk/amdatu-core/useradminstore-fs/pom.xml Fri Nov 26 17:37:28 2010
@@ -14,12 +14,6 @@
<description>This bundle provides filebased Useradmin storage</description>
<dependencies>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.framework</artifactId>
- <version>${org.apache.felix.main.version}</version>
- <scope>provided</scope>
- </dependency>
<dependency>
<groupId>org.ops4j.pax.useradmin</groupId>
<artifactId>pax-useradmin-service</artifactId>
Modified: trunk/amdatu-release/pom.xml
==============================================================================
--- trunk/amdatu-release/pom.xml (original)
+++ trunk/amdatu-release/pom.xml Fri Nov 26 17:37:28 2010
@@ -213,22 +213,16 @@
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>org.apache.felix</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<version>${org.osgi.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>org.apache.felix</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
<version>${org.osgi.version}</version>
<scope>compile</scope>
- <exclusions>
- <exclusion>
- <groupId> org.apache.felix</groupId>
- <artifactId>org.osgi.foundation</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
Modified: trunk/amdatu-release/src/main/assembly/bin-component.xml
==============================================================================
--- trunk/amdatu-release/src/main/assembly/bin-component.xml (original)
+++ trunk/amdatu-release/src/main/assembly/bin-component.xml Fri Nov 26
17:37:28 2010
@@ -58,6 +58,7 @@
<scope>runtime</scope>
<outputDirectory>amdatu-system</outputDirectory>
<includes>
+ <include>org.osgi:*</include>
<include>org.apache.felix:*</include>
<include>org.apache.sling:*</include>
<include>org.ops4j.pax.web:*</include>
Modified: trunk/amdatu-web/pom.xml
==============================================================================
--- trunk/amdatu-web/pom.xml (original)
+++ trunk/amdatu-web/pom.xml Fri Nov 26 17:37:28 2010
@@ -38,7 +38,7 @@
<scope>provided</scope>
</dependency>
</dependencies>
-
+
<modules>
<module>httpcontext</module>
<module>jsp</module>
Modified: trunk/integration-tests/pom.xml
==============================================================================
--- trunk/integration-tests/pom.xml (original)
+++ trunk/integration-tests/pom.xml Fri Nov 26 17:37:28 2010
@@ -15,8 +15,17 @@
<dependencies>
<!-- Test scope dependencies -->
+
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>${javax.servlet.version}</version>
+ <scope>test</scope>
+ </dependency>
+
<!-- This is required to be first so that pax-exam classloader is not
messed up with a newer version of felix
which would lead to java.lang.NoSuchMethodError:
org.apache.felix.framework.Logger.<init>(I)V -->
+
<dependency>
<groupId>org.ops4j.pax.exam</groupId>
<artifactId>pax-exam</artifactId>
@@ -57,14 +66,14 @@
<dependency>
<groupId>org.amdatu.web</groupId>
<artifactId>httpcontext</artifactId>
- <version>${platform.version}</version>
+ <version>${platform.version}</version>
<scope>test</scope>
<type>bundle</type>
</dependency>
<dependency>
<groupId>org.amdatu.core.config</groupId>
<artifactId>templates</artifactId>
- <version>${platform.version}</version>
+ <version>${platform.version}</version>
<scope>test</scope>
<type>bundle</type>
</dependency>
@@ -78,21 +87,21 @@
<dependency>
<groupId>org.amdatu.opensocial</groupId>
<artifactId>shindig</artifactId>
- <version>${platform.version}</version>
+ <version>${platform.version}</version>
<scope>test</scope>
<type>bundle</type>
</dependency>
<dependency>
<groupId>org.amdatu.core</groupId>
<artifactId>tenant</artifactId>
- <version>${platform.version}</version>
+ <version>${platform.version}</version>
<scope>test</scope>
<type>bundle</type>
</dependency>
<dependency>
<groupId>org.amdatu.core</groupId>
<artifactId>tenantstore-fs</artifactId>
- <version>${platform.version}</version>
+ <version>${platform.version}</version>
<scope>test</scope>
<type>bundle</type>
</dependency>
@@ -106,21 +115,21 @@
<dependency>
<groupId>org.amdatu.cassandra</groupId>
<artifactId>persistencemanager</artifactId>
- <version>${platform.version}</version>
+ <version>${platform.version}</version>
<scope>test</scope>
<type>bundle</type>
</dependency>
<dependency>
<groupId>org.amdatu.cassandra</groupId>
<artifactId>listener</artifactId>
- <version>${platform.version}</version>
+ <version>${platform.version}</version>
<scope>test</scope>
<type>bundle</type>
</dependency>
<dependency>
<groupId>org.amdatu.cassandra</groupId>
<artifactId>useradminstore</artifactId>
- <version>${platform.version}</version>
+ <version>${platform.version}</version>
<scope>test</scope>
<type>bundle</type>
</dependency>
@@ -134,7 +143,7 @@
<dependency>
<groupId>org.amdatu.web.rest</groupId>
<artifactId>wink</artifactId>
- <version>${platform.version}</version>
+ <version>${platform.version}</version>
<scope>test</scope>
<type>bundle</type>
</dependency>
@@ -165,14 +174,8 @@
<version>${platform.version}</version>
<scope>test</scope>
<type>bundle</type>
- </dependency>
-
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.framework</artifactId>
- <version>${org.apache.felix.main.version}</version>
- <scope>test</scope>
</dependency>
+
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.configadmin</artifactId>
@@ -196,7 +199,7 @@
<artifactId>org.apache.felix.http.whiteboard</artifactId>
<version>${org.apache.felix.http.version}</version>
<scope>test</scope>
- </dependency>
+ </dependency>
<dependency>
<groupId>commons-httpclient</groupId>
<artifactId>commons-httpclient</artifactId>
@@ -239,14 +242,6 @@
<version>${org.apache.sling.commons.osgi.version}</version>
<scope>test</scope>
</dependency>
-
-
- <dependency>
- <groupId>servletapi</groupId>
- <artifactId>servletapi</artifactId>
- <version>2.3</version>
- <scope>test</scope>
- </dependency>
</dependencies>
Modified: trunk/pom.xml
==============================================================================
--- trunk/pom.xml (original)
+++ trunk/pom.xml Fri Nov 26 17:37:28 2010
@@ -43,8 +43,9 @@
<!--
Version numbers of dependent libraries
-->
+ <javax.servlet.version>2.5</javax.servlet.version>
<org.apache.felix.main.version>2.0.5</org.apache.felix.main.version>
- <org.osgi.version>1.0.0</org.osgi.version>
+ <org.osgi.version>4.2.0</org.osgi.version>
<org.apache.felix.configadmin.version>1.2.4</org.apache.felix.configadmin.version>
<org.apache.felix.log.version>1.0.0</org.apache.felix.log.version>
<org.apache.felix.file.install.version>3.0.0</org.apache.felix.file.install.version>
@@ -254,20 +255,27 @@
<dependencies>
<dependency>
- <groupId>org.apache.felix</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<version>${org.osgi.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.felix</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
<version>${org.osgi.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>${javax.servlet.version}</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.dependencymanager</artifactId>
<version>${org.apache.felix.dependencymanager.version}</version>
@@ -301,23 +309,18 @@
<dependencies>
<dependency>
- <groupId>org.apache.felix</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
- <version>${org.osgi.version}</version>
- <scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.felix</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
- <version>${org.osgi.version}</version>
- <scope>provided</scope>
- <exclusions>
- <exclusion>
- <groupId> org.apache.felix</groupId>
- <artifactId>org.osgi.foundation</artifactId>
- </exclusion>
- </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
</dependency>
<dependency>
Modified: trunk/src/main/resources/conf/amdatu-minimal.properties
==============================================================================
--- trunk/src/main/resources/conf/amdatu-minimal.properties (original)
+++ trunk/src/main/resources/conf/amdatu-minimal.properties Fri Nov 26
17:37:28 2010
@@ -88,8 +88,8 @@
reference:file:amdatu-system/org.apache.felix.webconsole-3.1.2.jar \
reference:file:amdatu-system/org.apache.sling.commons.mime-2.1.4.jar \
reference:file:amdatu-system/org.apache.sling.commons.osgi-2.0.6.jar \
-
reference:file:amdatu-system/org.osgi.compendium-1.0.0.jar \
-
reference:file:amdatu-system/org.osgi.core-1.0.0.jar \
+
reference:file:amdatu-system/org.osgi.compendium-${org.osgi.version}.jar \
+
reference:file:amdatu-system/org.osgi.core-${org.osgi.version}.jar \
reference:file:amdatu-system/pax-useradmin-service-0.0.1-SNAPSHOT.jar \
reference:file:amdatu-system/org.apache.felix.http.jetty-2.0.4.jar \
reference:file:amdatu-system/org.apache.felix.http.whiteboard-2.0.4.jar \
Modified: trunk/src/main/resources/conf/amdatu-web.properties
==============================================================================
--- trunk/src/main/resources/conf/amdatu-web.properties (original)
+++ trunk/src/main/resources/conf/amdatu-web.properties Fri Nov 26 17:37:28 2010
@@ -88,8 +88,8 @@
reference:file:amdatu-system/org.apache.felix.webconsole-3.1.2.jar \
reference:file:amdatu-system/org.apache.sling.commons.mime-2.1.4.jar \
reference:file:amdatu-system/org.apache.sling.commons.osgi-2.0.6.jar \
-
reference:file:amdatu-system/org.osgi.compendium-1.0.0.jar \
-
reference:file:amdatu-system/org.osgi.core-1.0.0.jar \
+
reference:file:amdatu-system/org.osgi.compendium-${org.osgi.version}.jar \
+
reference:file:amdatu-system/org.osgi.core-${org.osgi.version}.jar \
reference:file:amdatu-system/pax-useradmin-service-0.0.1-SNAPSHOT.jar \
reference:file:amdatu-system/org.apache.felix.http.jetty-2.0.4.jar \
reference:file:amdatu-system/org.apache.felix.http.whiteboard-2.0.4.jar \
Modified: trunk/src/main/resources/conf/felix-config.properties
==============================================================================
--- trunk/src/main/resources/conf/felix-config.properties (original)
+++ trunk/src/main/resources/conf/felix-config.properties Fri Nov 26
17:37:28 2010
@@ -88,8 +88,8 @@
reference:file:amdatu-system/org.apache.felix.webconsole-3.1.2.jar \
reference:file:amdatu-system/org.apache.sling.commons.mime-2.1.4.jar \
reference:file:amdatu-system/org.apache.sling.commons.osgi-2.0.6.jar \
-
reference:file:amdatu-system/org.osgi.compendium-1.0.0.jar \
-
reference:file:amdatu-system/org.osgi.core-1.0.0.jar \
+
reference:file:amdatu-system/org.osgi.compendium-${org.osgi.version}.jar \
+
reference:file:amdatu-system/org.osgi.core-${org.osgi.version}.jar \
reference:file:amdatu-system/pax-useradmin-service-0.0.1-SNAPSHOT.jar \
reference:file:amdatu-system/org.apache.felix.http.jetty-${org.apache.felix.http.version}.jar
\
reference:file:amdatu-system/org.apache.felix.http.whiteboard-${org.apache.felix.http.version}.jar
\
