Author: [email protected]
Date: Mon Apr 18 15:09:28 2011
New Revision: 983
Log:
[AMDATU-355] Refactored shindig module to use new parent pom as its parent
Modified:
trunk/amdatu-opensocial/dashboard/pom.xml
trunk/amdatu-opensocial/gadgetmanagement/pom.xml
trunk/amdatu-opensocial/pom.xml
trunk/amdatu-opensocial/profile/pom.xml
trunk/amdatu-opensocial/shindig/pom.xml
trunk/amdatu-release/pom.xml
trunk/pom.xml
trunk/src/main/resources/conf/felix-config.properties
Modified: trunk/amdatu-opensocial/dashboard/pom.xml
==============================================================================
--- trunk/amdatu-opensocial/dashboard/pom.xml (original)
+++ trunk/amdatu-opensocial/dashboard/pom.xml Mon Apr 18 15:09:28 2011
@@ -17,22 +17,16 @@
<dependency>
<groupId>org.amdatu.web</groupId>
<artifactId>httpcontext</artifactId>
- <version>${project.version}</version>
- <scope>provided</scope>
<type>bundle</type>
</dependency>
<dependency>
<groupId>org.amdatu.web</groupId>
<artifactId>jsp</artifactId>
- <version>${project.version}</version>
- <scope>provided</scope>
<type>bundle</type>
</dependency>
<dependency>
<groupId>org.amdatu.web</groupId>
<artifactId>resource</artifactId>
- <version>${project.version}</version>
- <scope>provided</scope>
<type>bundle</type>
</dependency>
</dependencies>
Modified: trunk/amdatu-opensocial/gadgetmanagement/pom.xml
==============================================================================
--- trunk/amdatu-opensocial/gadgetmanagement/pom.xml (original)
+++ trunk/amdatu-opensocial/gadgetmanagement/pom.xml Mon Apr 18 15:09:28 2011
@@ -16,38 +16,36 @@
<dependency>
<groupId>org.amdatu.core</groupId>
<artifactId>tenant</artifactId>
- <version>${project.version}</version>
- <scope>provided</scope>
<type>bundle</type>
</dependency>
+
<dependency>
<groupId>org.amdatu.web</groupId>
<artifactId>dispatcher</artifactId>
- <version>${project.version}</version>
- <scope>provided</scope>
<type>bundle</type>
</dependency>
<dependency>
<groupId>org.amdatu.web</groupId>
<artifactId>httpcontext</artifactId>
- <version>${project.version}</version>
- <scope>provided</scope>
<type>bundle</type>
</dependency>
<dependency>
<groupId>org.amdatu.web</groupId>
<artifactId>resource</artifactId>
- <version>${project.version}</version>
- <scope>provided</scope>
<type>bundle</type>
</dependency>
<dependency>
<groupId>org.amdatu.web.rest</groupId>
<artifactId>jaxrs</artifactId>
- <version>${project.version}</version>
- <scope>provided</scope>
<type>bundle</type>
</dependency>
+
+ <dependency>
+ <groupId>org.amdatu.libraries</groupId>
+ <artifactId>utilities</artifactId>
+ <scope>compile</scope>
+ </dependency>
+
<dependency>
<groupId>org.json</groupId>
<artifactId>json</artifactId>
@@ -55,9 +53,8 @@
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>org.amdatu.libraries</groupId>
- <artifactId>utilities</artifactId>
- <scope>compile</scope>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
</dependency>
</dependencies>
Modified: trunk/amdatu-opensocial/pom.xml
==============================================================================
--- trunk/amdatu-opensocial/pom.xml (original)
+++ trunk/amdatu-opensocial/pom.xml Mon Apr 18 15:09:28 2011
@@ -5,39 +5,147 @@
<groupId>org.amdatu</groupId>
<artifactId>amdatu</artifactId>
<version>0.2.0-SNAPSHOT</version>
+ <relativePath>../amdatu-parent/pom.xml</relativePath>
</parent>
<artifactId>org.amdatu.opensocial</artifactId>
<name>Amdatu Open Social</name>
<description>This module consists of all Open Social related
bundles</description>
<packaging>pom</packaging>
+ <properties>
+ <!-- Version of dependend components -->
+ <amdatu.core.version>0.2.0-SNAPSHOT</amdatu.core.version>
+ <amdatu.web.version>0.2.0-SNAPSHOT</amdatu.web.version>
+ <amdatu.auth.version>0.2.0-SNAPSHOT</amdatu.auth.version>
+ <amdatu.libraries.version>0.2.0-SNAPSHOT</amdatu.libraries.version>
+ <javax.servlet.version>2.5</javax.servlet.version>
+ </properties>
+
+ <repositories>
+ <repository>
+ <id>java.net.com</id>
+ <name>Download java.net</name>
+ <url>http://download.java.net/maven/2</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+ <repository>
+ <id>repo1</id>
+ <name>repo1</name>
+ <url>http://repo1.maven.org/maven2</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+ </repositories>
+
<dependencyManagement>
<dependencies>
+ <!-- Internal project dependencies -->
<dependency>
- <groupId>org.amdatu.web</groupId>
- <artifactId>httpcontext</artifactId>
+ <groupId>org.amdatu.opensocial</groupId>
+ <artifactId>gadgetmanagement</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
<type>bundle</type>
</dependency>
<dependency>
- <groupId>org.amdatu.authorization.login</groupId>
- <artifactId>service</artifactId>
+ <groupId>org.amdatu.opensocial</groupId>
+ <artifactId>shindig</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
<type>bundle</type>
</dependency>
+
+ <!-- Dependency setup for amdatu-core project -->
<dependency>
- <groupId>org.amdatu.opensocial</groupId>
- <artifactId>shindig</artifactId>
- <version>${project.version}</version>
+ <groupId>org.amdatu.core</groupId>
+ <artifactId>tenant</artifactId>
+ <version>${amdatu.core.version}</version>
<scope>provided</scope>
<type>bundle</type>
</dependency>
<dependency>
+ <groupId>org.amdatu.core.config</groupId>
+ <artifactId>templates</artifactId>
+ <version>${amdatu.core.version}</version>
+ <scope>provided</scope>
+ <type>bundle</type>
+ </dependency>
+
+ <!-- Dependency setup for amdatu-web project -->
+ <dependency>
+ <groupId>org.amdatu.web</groupId>
+ <artifactId>httpcontext</artifactId>
+ <version>${amdatu.web.version}</version>
+ <scope>provided</scope>
+ <type>bundle</type>
+ </dependency>
+ <dependency>
+ <groupId>org.amdatu.web</groupId>
+ <artifactId>jsp</artifactId>
+ <version>${amdatu.web.version}</version>
+ <scope>provided</scope>
+ <type>bundle</type>
+ </dependency>
+ <dependency>
+ <groupId>org.amdatu.web</groupId>
+ <artifactId>resource</artifactId>
+ <version>${amdatu.web.version}</version>
+ <scope>provided</scope>
+ <type>bundle</type>
+ </dependency>
+ <dependency>
+ <groupId>org.amdatu.web</groupId>
+ <artifactId>dispatcher</artifactId>
+ <version>${amdatu.web.version}</version>
+ <scope>provided</scope>
+ <type>bundle</type>
+ </dependency>
+ <dependency>
+ <groupId>org.amdatu.web.rest</groupId>
+ <artifactId>jaxrs</artifactId>
+ <version>${amdatu.web.version}</version>
+ <scope>provided</scope>
+ <type>bundle</type>
+ </dependency>
+ <dependency>
+ <groupId>org.amdatu.web</groupId>
+ <artifactId>tenantresolver-hostname</artifactId>
+ <version>${amdatu.web.version}</version>
+ <scope>provided</scope>
+ <type>bundle</type>
+ </dependency>
+
+ <!-- Dependency setup for amdatu-auth project -->
+ <dependency>
+ <groupId>org.amdatu.authentication</groupId>
+ <artifactId>tokenprovider</artifactId>
+ <version>${amdatu.auth.version}</version>
+ <scope>provided</scope>
+ <type>bundle</type>
+ </dependency>
+
+ <!-- Amdatu library -->
+ <dependency>
<groupId>org.amdatu.libraries</groupId>
<artifactId>utilities</artifactId>
- <version>${project.version}</version>
+ <version>${amdatu.libraries.version}</version>
+ <scope>compile</scope>
+ </dependency>
+
+ <!-- Other -->
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>${javax.servlet.version}</version>
<scope>provided</scope>
</dependency>
</dependencies>
@@ -50,4 +158,8 @@
<module>shindig</module>
</modules>
+ <build>
+
<finalName>${project.groupId}.${project.artifactId}-${project.version}</finalName>
+ </build>
+
</project>
\ No newline at end of file
Modified: trunk/amdatu-opensocial/profile/pom.xml
==============================================================================
--- trunk/amdatu-opensocial/profile/pom.xml (original)
+++ trunk/amdatu-opensocial/profile/pom.xml Mon Apr 18 15:09:28 2011
@@ -14,37 +14,32 @@
<dependencies>
<dependency>
- <groupId>org.amdatu.opensocial</groupId>
- <artifactId>shindig</artifactId>
- <scope>provided</scope>
+ <groupId>org.amdatu.core</groupId>
+ <artifactId>tenant</artifactId>
<type>bundle</type>
</dependency>
+
<dependency>
- <groupId>org.amdatu.authorization.login</groupId>
- <artifactId>service</artifactId>
- <scope>provided</scope>
+ <groupId>org.amdatu.web</groupId>
+ <artifactId>dispatcher</artifactId>
<type>bundle</type>
</dependency>
<dependency>
<groupId>org.amdatu.web</groupId>
- <artifactId>dispatcher</artifactId>
- <version>${project.version}</version>
- <scope>provided</scope>
+ <artifactId>tenantresolver-hostname</artifactId>
<type>bundle</type>
</dependency>
+
<dependency>
- <groupId>org.amdatu.core</groupId>
- <artifactId>tenant</artifactId>
- <version>${project.version}</version>
- <scope>provided</scope>
+ <groupId>org.amdatu.opensocial</groupId>
+ <artifactId>shindig</artifactId>
<type>bundle</type>
</dependency>
+
<dependency>
- <groupId>org.amdatu.web</groupId>
- <artifactId>tenantresolver-hostname</artifactId>
- <version>${project.version}</version>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
<scope>provided</scope>
- <type>bundle</type>
</dependency>
</dependencies>
Modified: trunk/amdatu-opensocial/shindig/pom.xml
==============================================================================
--- trunk/amdatu-opensocial/shindig/pom.xml (original)
+++ trunk/amdatu-opensocial/shindig/pom.xml Mon Apr 18 15:09:28 2011
@@ -12,8 +12,67 @@
<name>Amdatu Open Social - Apache Shindig Application</name>
<description>This bundle includes the Apache Shindig libraries and exports
the opensocial API as OSGi services</description>
+ <properties>
+ <shindig.version>2.0.0</shindig.version>
+ </properties>
+
<dependencies>
- <!-- Shindig Dependencies -->
+ <!-- OpenSocial -->
+ <dependency>
+ <groupId>org.amdatu.opensocial</groupId>
+ <artifactId>gadgetmanagement</artifactId>
+ <type>bundle</type>
+ </dependency>
+
+ <!-- Core dependencies -->
+ <dependency>
+ <groupId>org.amdatu.core</groupId>
+ <artifactId>tenant</artifactId>
+ <type>bundle</type>
+ </dependency>
+ <dependency>
+ <groupId>org.amdatu.core.config</groupId>
+ <artifactId>templates</artifactId>
+ <type>bundle</type>
+ </dependency>
+
+ <!-- Web dependencies -->
+ <dependency>
+ <groupId>org.amdatu.web</groupId>
+ <artifactId>httpcontext</artifactId>
+ <type>bundle</type>
+ </dependency>
+ <dependency>
+ <groupId>org.amdatu.web</groupId>
+ <artifactId>resource</artifactId>
+ <type>bundle</type>
+ </dependency>
+ <dependency>
+ <groupId>org.amdatu.web</groupId>
+ <artifactId>dispatcher</artifactId>
+ <type>bundle</type>
+ </dependency>
+ <dependency>
+ <groupId>org.amdatu.web</groupId>
+ <artifactId>tenantresolver-hostname</artifactId>
+ <type>bundle</type>
+ </dependency>
+
+ <!-- Auth -->
+ <dependency>
+ <groupId>org.amdatu.authentication</groupId>
+ <artifactId>tokenprovider</artifactId>
+ <type>bundle</type>
+ </dependency>
+
+ <!-- Libraries -->
+ <dependency>
+ <groupId>org.amdatu.libraries</groupId>
+ <artifactId>utilities</artifactId>
+ <scope>compile</scope>
+ </dependency>
+
+ <!-- Other Dependencies -->
<dependency>
<groupId>org.apache.shindig</groupId>
<artifactId>shindig-common</artifactId>
@@ -100,81 +159,14 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
- <version>2.5</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.ops4j</groupId>
- <artifactId>peaberry</artifactId>
- <version>1.1.1</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.amdatu.web</groupId>
- <artifactId>httpcontext</artifactId>
- <scope>provided</scope>
- <type>bundle</type>
- </dependency>
- <dependency>
- <groupId>org.amdatu.web</groupId>
- <artifactId>resource</artifactId>
- <version>${project.version}</version>
<scope>provided</scope>
- <type>bundle</type>
</dependency>
<dependency>
- <groupId>org.amdatu.libraries</groupId>
- <artifactId>utilities</artifactId>
+ <groupId>org.json</groupId>
+ <artifactId>json</artifactId>
+ <version>20070829</version>
<scope>compile</scope>
</dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.http.bundle</artifactId>
- <version>${org.apache.felix.http.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.amdatu.core</groupId>
- <artifactId>tenant</artifactId>
- <version>${project.version}</version>
- <scope>provided</scope>
- <type>bundle</type>
- </dependency>
- <dependency>
- <groupId>org.amdatu.web</groupId>
- <artifactId>dispatcher</artifactId>
- <version>${project.version}</version>
- <scope>provided</scope>
- <type>bundle</type>
- </dependency>
- <dependency>
- <groupId>org.amdatu.web</groupId>
- <artifactId>tenantresolver-hostname</artifactId>
- <version>${project.version}</version>
- <scope>provided</scope>
- <type>bundle</type>
- </dependency>
- <dependency>
- <groupId>org.amdatu.core.config</groupId>
- <artifactId>templates</artifactId>
- <version>${project.version}</version>
- <scope>provided</scope>
- <type>bundle</type>
- </dependency>
- <dependency>
- <groupId>org.amdatu.opensocial</groupId>
- <artifactId>gadgetmanagement</artifactId>
- <version>${project.version}</version>
- <scope>provided</scope>
- <type>bundle</type>
- </dependency>
- <dependency>
- <groupId>org.amdatu.authentication</groupId>
- <artifactId>tokenprovider</artifactId>
- <version>${project.version}</version>
- <scope>provided</scope>
- <type>bundle</type>
- </dependency>
</dependencies>
<build>
Modified: trunk/amdatu-release/pom.xml
==============================================================================
--- trunk/amdatu-release/pom.xml (original)
+++ trunk/amdatu-release/pom.xml Mon Apr 18 15:09:28 2011
@@ -12,6 +12,7 @@
<properties>
<cassandra.project.version>0.2.0-SNAPSHOT</cassandra.project.version>
+ <opensocial.project.version>0.2.0-SNAPSHOT</opensocial.project.version>
</properties>
<dependencies>
@@ -230,28 +231,28 @@
<dependency>
<groupId>org.amdatu.opensocial</groupId>
<artifactId>dashboard</artifactId>
- <version>${project.version}</version>
+ <version>${opensocial.project.version}</version>
<scope>compile</scope>
<type>bundle</type>
</dependency>
<dependency>
<groupId>org.amdatu.opensocial</groupId>
<artifactId>gadgetmanagement</artifactId>
- <version>${project.version}</version>
+ <version>${opensocial.project.version}</version>
<scope>compile</scope>
<type>bundle</type>
</dependency>
<dependency>
<groupId>org.amdatu.opensocial</groupId>
<artifactId>profile</artifactId>
- <version>${project.version}</version>
+ <version>${opensocial.project.version}</version>
<scope>runtime</scope>
<type>bundle</type>
</dependency>
<dependency>
<groupId>org.amdatu.opensocial</groupId>
<artifactId>shindig</artifactId>
- <version>${project.version}</version>
+ <version>${opensocial.project.version}</version>
<scope>runtime</scope>
<type>bundle</type>
</dependency>
Modified: trunk/pom.xml
==============================================================================
--- trunk/pom.xml (original)
+++ trunk/pom.xml Mon Apr 18 15:09:28 2011
@@ -76,11 +76,6 @@
<junit.version>4.8.1</junit.version>
<jmock.version>2.5.1</jmock.version>
<rdf2go.version>4.7.3</rdf2go.version>
-
- <!--
- Version numbers of platform bundles
- -->
- <shindig.version>2.0.0</shindig.version>
</properties>
<prerequisites>
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 Mon Apr 18
15:09:28 2011
@@ -123,10 +123,10 @@
reference:file:amdatu-application/org.amdatu.web.tenantresolver-hostname-${project.version}.jar
\
reference:file:amdatu-application/org.amdatu.web.resource-${project.version}.jar
\
reference:file:amdatu-application/org.amdatu.web.jsp-${project.version}.jar \
-
reference:file:amdatu-application/org.amdatu.opensocial.dashboard-${project.version}.jar
\
-
reference:file:amdatu-application/org.amdatu.opensocial.gadgetmanagement-${project.version}.jar
\
-
reference:file:amdatu-application/org.amdatu.opensocial.profile-${project.version}.jar
\
-
reference:file:amdatu-application/org.amdatu.opensocial.shindig-${project.version}.jar
\
+
reference:file:amdatu-application/org.amdatu.opensocial.dashboard-${opensocial.project.version}.jar
\
+
reference:file:amdatu-application/org.amdatu.opensocial.gadgetmanagement-${opensocial.project.version}.jar
\
+
reference:file:amdatu-application/org.amdatu.opensocial.profile-${opensocial.project.version}.jar
\
+
reference:file:amdatu-application/org.amdatu.opensocial.shindig-${opensocial.project.version}.jar
\
reference:file:amdatu-application/org.amdatu.semanticweb.rdf2go.api-${project.version}.jar
\
reference:file:amdatu-application/org.amdatu.semanticweb.rdf2go.sesamebridge-${project.version}.jar
\
reference:file:amdatu-application/org.amdatu.semanticweb.sesame-${project.version}.jar
\
_______________________________________________
Amdatu-commits mailing list
[email protected]
http://lists.amdatu.org/mailman/listinfo/amdatu-commits
