Author: [email protected]
Date: Mon May 21 09:38:11 2012
New Revision: 2360
Log:
[AMDATUOPENSOCIAL-209] Pom fixes
Added:
trunk/amdatu-opensocial/opensocial-stores/mem-store-oauthdata/src/main/resources/
trunk/amdatu-opensocial/opensocial-stores/mem-store-oauthdata/src/main/resources/conf/
trunk/amdatu-opensocial/opensocial-stores/mem-store-oauthdata/src/main/resources/conf/oauthprivatekey.pem
Modified:
trunk/amdatu-opensocial/opensocial-gadgetcontainer/pom.xml
trunk/amdatu-opensocial/opensocial-gadgetmanagement/pom.xml
trunk/amdatu-opensocial/opensocial-gadgetmanagement/src/main/java/org/amdatu/opensocial/gadgetmanagement/rest/DashboardProcessor.java
trunk/amdatu-opensocial/opensocial-profile/pom.xml
trunk/amdatu-opensocial/opensocial-shindig/pom.xml
trunk/amdatu-opensocial/opensocial-stores/mem-store-oauthdata/pom.xml
trunk/amdatu-opensocial/pom.xml
Modified: trunk/amdatu-opensocial/opensocial-gadgetcontainer/pom.xml
==============================================================================
--- trunk/amdatu-opensocial/opensocial-gadgetcontainer/pom.xml (original)
+++ trunk/amdatu-opensocial/opensocial-gadgetcontainer/pom.xml Mon May 21
09:38:11 2012
@@ -30,6 +30,11 @@
<dependencies>
<!-- Provided dependencies -->
<dependency>
+ <groupId>org.amdatu.tenant</groupId>
+ <artifactId>org.amdatu.tenant.api</artifactId>
+ <type>bundle</type>
+ </dependency>
+ <dependency>
<groupId>org.amdatu.auth</groupId>
<artifactId>org.amdatu.auth.tokenprovider</artifactId>
<type>bundle</type>
Modified: trunk/amdatu-opensocial/opensocial-gadgetmanagement/pom.xml
==============================================================================
--- trunk/amdatu-opensocial/opensocial-gadgetmanagement/pom.xml (original)
+++ trunk/amdatu-opensocial/opensocial-gadgetmanagement/pom.xml Mon May 21
09:38:11 2012
@@ -73,6 +73,11 @@
<artifactId>org.amdatu.opensocial.gadgetcontainer</artifactId>
<type>bundle</type>
</dependency>
+ <dependency>
+ <groupId>org.amdatu.opensocial</groupId>
+ <artifactId>org.amdatu.opensocial.shindig-lib</artifactId>
+ <type>bundle</type>
+ </dependency>
<!-- Embedded dependencies -->
<dependency>
Modified:
trunk/amdatu-opensocial/opensocial-gadgetmanagement/src/main/java/org/amdatu/opensocial/gadgetmanagement/rest/DashboardProcessor.java
==============================================================================
---
trunk/amdatu-opensocial/opensocial-gadgetmanagement/src/main/java/org/amdatu/opensocial/gadgetmanagement/rest/DashboardProcessor.java
(original)
+++
trunk/amdatu-opensocial/opensocial-gadgetmanagement/src/main/java/org/amdatu/opensocial/gadgetmanagement/rest/DashboardProcessor.java
Mon May 21 09:38:11 2012
@@ -35,10 +35,8 @@
import javax.servlet.http.HttpServletRequest;
import javax.ws.rs.core.HttpHeaders;
-import org.apache.shindig.gadgets.spec.GadgetSpec;
import org.apache.shindig.gadgets.spec.UserPref;
import org.apache.shindig.gadgets.spec.UserPref.EnumValuePair;
-import org.osgi.service.log.LogService;
/**
* This class is responsible for preparing dashboards to be returned to the
client or
Modified: trunk/amdatu-opensocial/opensocial-profile/pom.xml
==============================================================================
--- trunk/amdatu-opensocial/opensocial-profile/pom.xml (original)
+++ trunk/amdatu-opensocial/opensocial-profile/pom.xml Mon May 21 09:38:11 2012
@@ -28,34 +28,31 @@
<description>Provides a profile service on top of the OpenSocial
services</description>
<dependencies>
+ <!-- Provided dependenceis -->
<dependency>
- <groupId>org.amdatu.tenant</groupId>
- <artifactId>org.amdatu.tenant.api</artifactId>
- <type>bundle</type>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <scope>provided</scope>
</dependency>
-
<dependency>
- <groupId>org.amdatu.auth</groupId>
- <artifactId>org.amdatu.auth.tokenprovider</artifactId>
+ <groupId>org.amdatu.tenant</groupId>
+ <artifactId>org.amdatu.tenant.api</artifactId>
<type>bundle</type>
</dependency>
-
<dependency>
<groupId>org.amdatu.web</groupId>
<artifactId>org.amdatu.web.dispatcher</artifactId>
<type>bundle</type>
</dependency>
-
<dependency>
- <groupId>org.amdatu.opensocial</groupId>
- <artifactId>org.amdatu.opensocial.shindig</artifactId>
+ <groupId>org.amdatu.auth</groupId>
+ <artifactId>org.amdatu.auth.tokenprovider</artifactId>
<type>bundle</type>
</dependency>
-
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <scope>provided</scope>
+ <groupId>org.amdatu.opensocial</groupId>
+ <artifactId>org.amdatu.opensocial.shindig-lib</artifactId>
+ <type>bundle</type>
</dependency>
</dependencies>
Modified: trunk/amdatu-opensocial/opensocial-shindig/pom.xml
==============================================================================
--- trunk/amdatu-opensocial/opensocial-shindig/pom.xml (original)
+++ trunk/amdatu-opensocial/opensocial-shindig/pom.xml Mon May 21 09:38:11 2012
@@ -122,7 +122,7 @@
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>2.3</version>
+ <version>2.2</version>
<scope>compile</scope>
</dependency>
<dependency>
Modified: trunk/amdatu-opensocial/opensocial-stores/mem-store-oauthdata/pom.xml
==============================================================================
--- trunk/amdatu-opensocial/opensocial-stores/mem-store-oauthdata/pom.xml
(original)
+++ trunk/amdatu-opensocial/opensocial-stores/mem-store-oauthdata/pom.xml
Mon May 21 09:38:11 2012
@@ -36,7 +36,7 @@
</dependency>
<dependency>
<groupId>org.amdatu.opensocial</groupId>
- <artifactId>org.amdatu.opensocial.shindig</artifactId>
+ <artifactId>org.amdatu.opensocial.shindig-lib</artifactId>
<type>bundle</type>
</dependency>
<dependency>
Added:
trunk/amdatu-opensocial/opensocial-stores/mem-store-oauthdata/src/main/resources/conf/oauthprivatekey.pem
==============================================================================
--- (empty file)
+++
trunk/amdatu-opensocial/opensocial-stores/mem-store-oauthdata/src/main/resources/conf/oauthprivatekey.pem
Mon May 21 09:38:11 2012
@@ -0,0 +1,16 @@
+-----BEGIN PRIVATE KEY-----
+MIICeAIBADANBgkqhkiG9w0BAQEFAASCAmIwggJeAgEAAoGBANzfHgF44hN/g/Dp
+mObT1EBN2AtMg+Mfjd4LifB4BZN1e61HsDx9ncwh04nsYafz4IvC2ChVx73h06GX
+MLC57718J5ilLb+N6BRJlbo8kcwgG9asi5YbM10ue2aa284ncJiGqzcu4NhbR0WR
+MAbXB5mVgjMegZJF9vtfCj9BK1TpAgMBAAECgYEAsaVGtfprIzGRhmfr0eQYN+wk
+Utokzb1oVmpDdMSj/3kjkzgwmEaUb0XZpXoZBYPSW7bIMpDjyWZj1/kJcWrrVaXt
+GNBF8wMijjzCc+RAVSXEpyIA7kjNsDwVWTzIe5v/hLB5AWG86XpbEebNjH47RNFD
+lL0fGvcRkKwzkGeBeYECQQD72xNBND3W8gTzZh+j1C+NL9yiu7P6BJVAm7QoUUXX
+soz/0nIDKM7c21doph6webBHDkJxIGrZKr9vbh6q7bQxAkEA4IGF7sPPWSHjuiIF
+f47IGpCR3UkoaWvGlcLhgMmAjZTs0+i3IaKQj7knrTEOtXLPlnmzPKlqfqm0Vr63
+6mIWOQJBAKq6JWFMEqeExEpi7gvWqK1ixoQiDazsMmjro8K45UmEpgQ9GkB+B0y7
++5LbGW6z7wUb63pYaVXxnnfhBDUGkeECQAbIYv9/svgCahrphDkCW1FSJNYGq83j
+j7BenumBLP0aDr2oPkAp5Swyb9xvqv4YZeUp8BxZEfqZrfUg9fWC2SECQQCGChog
+KQCBQDvyFNqv+E4nSb5vCdYR7XgprvndDzikzb2lajwclVTzpUEob/n9TFO28dVX
+NkLaGRhxQhYwaaCs
+-----END PRIVATE KEY-----
Modified: trunk/amdatu-opensocial/pom.xml
==============================================================================
--- trunk/amdatu-opensocial/pom.xml (original)
+++ trunk/amdatu-opensocial/pom.xml Mon May 21 09:38:11 2012
@@ -32,7 +32,7 @@
<properties>
<!-- Version of dependend components -->
- <org.amdatu.platform.version>0.4.0-RC2</org.amdatu.platform.version>
+ <org.amdatu.platform.version>1.0.0-RC1</org.amdatu.platform.version>
<org.amdatu.platform.itest.version>0.4.0-SNAPSHOT</org.amdatu.platform.itest.version>
<amdatu.auth.version>0.3.0-SNAPSHOT</amdatu.auth.version>
</properties>
@@ -161,6 +161,13 @@
</dependency>
<dependency>
<groupId>org.amdatu.opensocial</groupId>
+ <artifactId>org.amdatu.opensocial.shindig-lib</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ <type>bundle</type>
+ </dependency>
+ <dependency>
+ <groupId>org.amdatu.opensocial</groupId>
<artifactId>org.amdatu.opensocial.config</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
_______________________________________________
Amdatu-commits mailing list
[email protected]
http://lists.amdatu.org/mailman/listinfo/amdatu-commits
