Author: ivol37 at gmail.com
Date: Thu Nov 11 13:43:07 2010
New Revision: 402
Log:
[AMDATU-129] Fixed compile errors during release build
Modified:
trunk/amdatu-example/course-gadget/pom.xml
trunk/amdatu-example/course-service/pom.xml
trunk/amdatu-example/friends-gadget/pom.xml
trunk/amdatu-release/pom.xml
Modified: trunk/amdatu-example/course-gadget/pom.xml
==============================================================================
--- trunk/amdatu-example/course-gadget/pom.xml (original)
+++ trunk/amdatu-example/course-gadget/pom.xml Thu Nov 11 13:43:07 2010
@@ -7,8 +7,8 @@
<artifactId>org.amdatu.example</artifactId>
<version>0.0.6-SNAPSHOT</version>
</parent>
- <groupId>org.amdatu.example</groupId>
- <artifactId>coursegadget</artifactId>
+ <groupId>org.amdatu.example.course</groupId>
+ <artifactId>gadget</artifactId>
<packaging>bundle</packaging>
<name>Amdatu Example - Course gadget</name>
<description>This gadget provides an example gadget to display courses
relevant for a particular student</description>
Modified: trunk/amdatu-example/course-service/pom.xml
==============================================================================
--- trunk/amdatu-example/course-service/pom.xml (original)
+++ trunk/amdatu-example/course-service/pom.xml Thu Nov 11 13:43:07 2010
@@ -7,8 +7,8 @@
<artifactId>org.amdatu.example</artifactId>
<version>0.0.6-SNAPSHOT</version>
</parent>
- <groupId>org.amdatu.example</groupId>
- <artifactId>courseservice</artifactId>
+ <groupId>org.amdatu.example.course</groupId>
+ <artifactId>service</artifactId>
<packaging>bundle</packaging>
<name>Amdatu Example - Course service</name>
<description>Provides an example service to retrieve course
information</description>
Modified: trunk/amdatu-example/friends-gadget/pom.xml
==============================================================================
--- trunk/amdatu-example/friends-gadget/pom.xml (original)
+++ trunk/amdatu-example/friends-gadget/pom.xml Thu Nov 11 13:43:07 2010
@@ -7,8 +7,8 @@
<artifactId>org.amdatu.example</artifactId>
<version>0.0.6-SNAPSHOT</version>
</parent>
- <groupId>org.amdatu.example</groupId>
- <artifactId>friendsgadget</artifactId>
+ <groupId>org.amdatu.example.friends</groupId>
+ <artifactId>gadget</artifactId>
<packaging>bundle</packaging>
<name>Amdatu Example - Friends gadget</name>
<description>Provides an example gadget to display all friends of the user
currently logged in</description>
Modified: trunk/amdatu-release/pom.xml
==============================================================================
--- trunk/amdatu-release/pom.xml (original)
+++ trunk/amdatu-release/pom.xml Thu Nov 11 13:43:07 2010
@@ -10,71 +10,14 @@
<name>Amdatu Release</name>
<dependencies>
- <!-- Application bundles -->
+ <!-- Authorization bundles -->
<dependency>
- <groupId>org.amdatu.application</groupId>
- <artifactId>dashboard</artifactId>
- <version>0.0.6-SNAPSHOT</version>
- <scope>compile</scope>
- <type>bundle</type>
- </dependency>
- <dependency>
- <groupId>org.amdatu.application</groupId>
- <artifactId>gadgetmanagement</artifactId>
- <version>${platform.version}</version>
- <scope>compile</scope>
- <type>bundle</type>
- </dependency>
-
- <!-- Web bundles -->
- <dependency>
- <groupId>org.amdatu.web</groupId>
- <artifactId>jsp</artifactId>
+ <groupId>org.amdatu.authorization.login</groupId>
+ <artifactId>gadget</artifactId>
<version>${platform.version}</version>
<scope>compile</scope>
<type>bundle</type>
</dependency>
-
- <!-- Example bundles -->
- <dependency>
- <groupId>org.amdatu.example</groupId>
- <artifactId>coursegadget</artifactId>
- <version>${platform.version}</version>
- <scope>compile</scope>
- <type>bundle</type>
- </dependency>
- <dependency>
- <groupId>org.amdatu.example</groupId>
- <artifactId>courseservice</artifactId>
- <version>${platform.version}</version>
- <scope>compile</scope>
- <type>bundle</type>
- </dependency>
- <dependency>
- <groupId>org.amdatu.examples</groupId>
- <artifactId>friendsgadget</artifactId>
- <version>${platform.version}</version>
- <scope>compile</scope>
- <type>bundle</type>
- </dependency>
-
- <!-- Gadget bundles -->
- <dependency>
- <groupId>org.amdatu.gadget</groupId>
- <artifactId>login</artifactId>
- <version>${platform.version}</version>
- <scope>compile</scope>
- <type>bundle</type>
- </dependency>
- <dependency>
- <groupId>org.amdatu.gadget</groupId>
- <artifactId>sparqlendpoint</artifactId>
- <version>${platform.version}</version>
- <scope>compile</scope>
- <type>bundle</type>
- </dependency>
-
- <!-- Platform bundles -->
<dependency>
<groupId>org.amdatu.authorization.login</groupId>
<artifactId>service</artifactId>
@@ -82,6 +25,8 @@
<scope>compile</scope>
<type>bundle</type>
</dependency>
+
+ <!-- Core bundles -->
<dependency>
<groupId>org.amdatu.core.cassandra</groupId>
<artifactId>application</artifactId>
@@ -104,12 +49,12 @@
<type>bundle</type>
</dependency>
<dependency>
- <groupId>org.amdatu.core.config</groupId>
- <artifactId>templates</artifactId>
+ <groupId>org.amdatu.core.cassandra</groupId>
+ <artifactId>useradminstore</artifactId>
<version>${platform.version}</version>
<scope>runtime</scope>
<type>bundle</type>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.amdatu.core.config</groupId>
<artifactId>filebased</artifactId>
@@ -118,8 +63,8 @@
<type>bundle</type>
</dependency>
<dependency>
- <groupId>org.amdatu.web</groupId>
- <artifactId>httpcontext</artifactId>
+ <groupId>org.amdatu.core.config</groupId>
+ <artifactId>templates</artifactId>
<version>${platform.version}</version>
<scope>runtime</scope>
<type>bundle</type>
@@ -130,21 +75,60 @@
<version>${platform.version}</version>
<scope>runtime</scope>
<type>bundle</type>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.amdatu.core</groupId>
- <artifactId>profile</artifactId>
+ <artifactId>tenant</artifactId>
<version>${platform.version}</version>
<scope>runtime</scope>
<type>bundle</type>
- </dependency>
+ </dependency>
+
+ <!-- Example bundles -->
+ <dependency>
+ <groupId>org.amdatu.example.course</groupId>
+ <artifactId>gadget</artifactId>
+ <version>${platform.version}</version>
+ <scope>compile</scope>
+ <type>bundle</type>
+ </dependency>
+ <dependency>
+ <groupId>org.amdatu.example.course</groupId>
+ <artifactId>service</artifactId>
+ <version>${platform.version}</version>
+ <scope>compile</scope>
+ <type>bundle</type>
+ </dependency>
+ <dependency>
+ <groupId>org.amdatu.example.friends</groupId>
+ <artifactId>gadget</artifactId>
+ <version>${platform.version}</version>
+ <scope>compile</scope>
+ <type>bundle</type>
+ </dependency>
+
+ <!-- Open Social bundles -->
<dependency>
- <groupId>org.amdatu.semanticweb</groupId>
- <artifactId>sesame</artifactId>
+ <groupId>org.amdatu.opensocial</groupId>
+ <artifactId>dashboard</artifactId>
+ <version>${platform.version}</version>
+ <scope>compile</scope>
+ <type>bundle</type>
+ </dependency>
+ <dependency>
+ <groupId>org.amdatu.opensocial</groupId>
+ <artifactId>gadgetmanagement</artifactId>
+ <version>${platform.version}</version>
+ <scope>compile</scope>
+ <type>bundle</type>
+ </dependency>
+ <dependency>
+ <groupId>org.amdatu.opensocial</groupId>
+ <artifactId>profile</artifactId>
<version>${platform.version}</version>
<scope>runtime</scope>
<type>bundle</type>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.amdatu.opensocial</groupId>
<artifactId>shindig</artifactId>
@@ -152,28 +136,53 @@
<scope>runtime</scope>
<type>bundle</type>
</dependency>
+
+ <!-- Semantic Web bundles -->
<dependency>
- <groupId>org.amdatu.core</groupId>
- <artifactId>tenant</artifactId>
+ <groupId>org.amdatu.semanticweb</groupId>
+ <artifactId>sesame</artifactId>
<version>${platform.version}</version>
<scope>runtime</scope>
<type>bundle</type>
</dependency>
<dependency>
- <groupId>org.amdatu.core.cassandra</groupId>
- <artifactId>useradminstore</artifactId>
+ <groupId>org.amdatu.semanticweb</groupId>
+ <artifactId>sparqlendpoint</artifactId>
+ <version>${platform.version}</version>
+ <scope>compile</scope>
+ <type>bundle</type>
+ </dependency>
+
+ <!-- Web bundles -->
+ <dependency>
+ <groupId>org.amdatu.web</groupId>
+ <artifactId>httpcontext</artifactId>
<version>${platform.version}</version>
<scope>runtime</scope>
<type>bundle</type>
- </dependency>
+ </dependency>
+ <dependency>
+ <groupId>org.amdatu.web</groupId>
+ <artifactId>jsp</artifactId>
+ <version>${platform.version}</version>
+ <scope>compile</scope>
+ <type>bundle</type>
+ </dependency>
+ <dependency>
+ <groupId>org.amdatu.web.rest</groupId>
+ <artifactId>jaxrs</artifactId>
+ <version>${platform.version}</version>
+ <scope>runtime</scope>
+ <type>bundle</type>
+ </dependency>
<dependency>
<groupId>org.amdatu.web.rest</groupId>
<artifactId>wink</artifactId>
<version>${platform.version}</version>
<scope>runtime</scope>
<type>bundle</type>
- </dependency>
-
+ </dependency>
+
<!-- System bundles -->
<dependency>
<groupId>org.apache.felix</groupId>
