Author: [email protected]
Date: Fri Apr 6 10:59:57 2012
New Revision: 2193
Log:
[AMDATUOPENSOCIAL-210] Moved REST tools also needed by Auth from OpenSocial to
Auth
Modified:
trunk/amdatu-opensocial/opensocial-gadgetmanagement/pom.xml
trunk/amdatu-opensocial/opensocial-gadgetmanagement/src/main/java/org/amdatu/opensocial/gadgetmanagement/UserPreferencesBean.java
trunk/amdatu-opensocial/opensocial-gadgetmanagement/src/main/java/org/amdatu/opensocial/gadgetmanagement/bean/dashboard/Dashboard.java
trunk/amdatu-opensocial/opensocial-gadgetmanagement/src/main/java/org/amdatu/opensocial/gadgetmanagement/bean/dashboard/Dashboards.java
trunk/amdatu-opensocial/opensocial-gadgetmanagement/src/main/java/org/amdatu/opensocial/gadgetmanagement/bean/dashboard/Definition.java
trunk/amdatu-opensocial/opensocial-gadgetmanagement/src/main/java/org/amdatu/opensocial/gadgetmanagement/bean/dashboard/Gadget.java
trunk/amdatu-opensocial/opensocial-gadgetmanagement/src/main/java/org/amdatu/opensocial/gadgetmanagement/bean/dashboard/Layout.java
trunk/amdatu-opensocial/opensocial-gadgetmanagement/src/main/java/org/amdatu/opensocial/gadgetmanagement/bean/dashboard/Metadata.java
trunk/amdatu-opensocial/opensocial-gadgetmanagement/src/main/java/org/amdatu/opensocial/gadgetmanagement/rest/DashboardRESTServiceImpl.java
trunk/amdatu-opensocial/opensocial-gadgetmanagement/src/main/java/org/amdatu/opensocial/gadgetmanagement/rest/GadgetManagementRESTServiceImpl.java
trunk/amdatu-opensocial/opensocial-gadgetmanagement/src/main/java/org/amdatu/opensocial/gadgetmanagement/service/InternalGadgetStore.java
trunk/amdatu-opensocial/opensocial-gadgetmanagement/src/main/java/org/amdatu/opensocial/gadgetmanagement/service/InternalGadgetStoreImpl.java
trunk/amdatu-opensocial/opensocial-shindig/pom.xml
trunk/amdatu-opensocial/pom.xml
trunk/amdatu-opensocial/tools/
Modified: trunk/amdatu-opensocial/opensocial-gadgetmanagement/pom.xml
==============================================================================
--- trunk/amdatu-opensocial/opensocial-gadgetmanagement/pom.xml (original)
+++ trunk/amdatu-opensocial/opensocial-gadgetmanagement/pom.xml Fri Apr 6
10:59:57 2012
@@ -90,13 +90,13 @@
<artifactId>servlet-api</artifactId>
</dependency>
<dependency>
- <groupId>org.amdatu.opensocial</groupId>
- <artifactId>org.amdatu.opensocial.rest.doclet</artifactId>
+ <groupId>org.amdatu.auth</groupId>
+ <artifactId>org.amdatu.auth.tools.rest.doclet</artifactId>
<type>jar</type>
</dependency>
<dependency>
- <groupId>org.amdatu.opensocial</groupId>
- <artifactId>org.amdatu.opensocial.rest.tools</artifactId>
+ <groupId>org.amdatu.auth</groupId>
+ <artifactId>org.amdatu.auth.tools.rest</artifactId>
<type>jar</type>
</dependency>
</dependencies>
@@ -146,12 +146,12 @@
</executions>
<configuration>
<useStandardDocletOptions>false</useStandardDocletOptions>
- <doclet>org.amdatu.opensocial.rest.doclet.RESTDoclet</doclet>
+ <doclet>org.amdatu.auth.tools.rest.doclet.RESTDoclet</doclet>
<docletArtifacts>
<docletArtifact>
- <groupId>org.amdatu.opensocial</groupId>
- <artifactId>org.amdatu.opensocial.rest.doclet</artifactId>
- <version>${project.version}</version>
+ <groupId>org.amdatu.auth</groupId>
+ <artifactId>org.amdatu.auth.tools.rest.doclet</artifactId>
+ <version>${amdatu.auth.version}</version>
</docletArtifact>
<docletArtifact>
<groupId>com.cenqua.clover</groupId>
@@ -173,7 +173,7 @@
<instructions>
<Bundle-Activator>org.amdatu.opensocial.gadgetmanagement.osgi.Activator</Bundle-Activator>
<Bundle-SymbolicName>
org.amdatu.opensocial.gadgetmanagement</Bundle-SymbolicName>
-
<Embed-Dependency>!org.amdatu.opensocial.rest.doclet;scope=compile</Embed-Dependency>
+
<Embed-Dependency>!org.amdatu.auth.tools.rest.doclet;scope=compile</Embed-Dependency>
<Export-Package>org.amdatu.opensocial.gadgetmanagement</Export-Package>
<Include-Resource>
{maven-resources}, {maven-dependencies},
static/help=target/restdocs/html
Modified:
trunk/amdatu-opensocial/opensocial-gadgetmanagement/src/main/java/org/amdatu/opensocial/gadgetmanagement/UserPreferencesBean.java
==============================================================================
---
trunk/amdatu-opensocial/opensocial-gadgetmanagement/src/main/java/org/amdatu/opensocial/gadgetmanagement/UserPreferencesBean.java
(original)
+++
trunk/amdatu-opensocial/opensocial-gadgetmanagement/src/main/java/org/amdatu/opensocial/gadgetmanagement/UserPreferencesBean.java
Fri Apr 6 10:59:57 2012
@@ -15,10 +15,10 @@
*/
package org.amdatu.opensocial.gadgetmanagement;
+import org.amdatu.auth.tools.rest.RESTInvocationContext;
+import org.amdatu.auth.tools.rest.ReferenceableResource;
+import org.amdatu.auth.tools.rest.ResourceLinkBuilder;
import org.amdatu.opensocial.gadgetmanagement.bean.dashboard.RestBean;
-import org.amdatu.opensocial.rest.tools.RESTInvocationContext;
-import org.amdatu.opensocial.rest.tools.ReferenceableResource;
-import org.amdatu.opensocial.rest.tools.ResourceLinkBuilder;
import java.util.ArrayList;
import java.util.List;
Modified:
trunk/amdatu-opensocial/opensocial-gadgetmanagement/src/main/java/org/amdatu/opensocial/gadgetmanagement/bean/dashboard/Dashboard.java
==============================================================================
---
trunk/amdatu-opensocial/opensocial-gadgetmanagement/src/main/java/org/amdatu/opensocial/gadgetmanagement/bean/dashboard/Dashboard.java
(original)
+++
trunk/amdatu-opensocial/opensocial-gadgetmanagement/src/main/java/org/amdatu/opensocial/gadgetmanagement/bean/dashboard/Dashboard.java
Fri Apr 6 10:59:57 2012
@@ -15,11 +15,11 @@
*/
package org.amdatu.opensocial.gadgetmanagement.bean.dashboard;
-import org.amdatu.opensocial.rest.tools.LinkResource;
-import org.amdatu.opensocial.rest.tools.RESTInvocationContext;
-import org.amdatu.opensocial.rest.tools.ReferenceableResource;
-import org.amdatu.opensocial.rest.tools.ResourceLinkBuilder;
-import org.amdatu.opensocial.rest.tools.annotation.ResID;
+import org.amdatu.auth.tools.rest.LinkResource;
+import org.amdatu.auth.tools.rest.RESTInvocationContext;
+import org.amdatu.auth.tools.rest.ReferenceableResource;
+import org.amdatu.auth.tools.rest.ResourceLinkBuilder;
+import org.amdatu.auth.tools.rest.annotation.ResID;
import java.util.ArrayList;
import java.util.List;
Modified:
trunk/amdatu-opensocial/opensocial-gadgetmanagement/src/main/java/org/amdatu/opensocial/gadgetmanagement/bean/dashboard/Dashboards.java
==============================================================================
---
trunk/amdatu-opensocial/opensocial-gadgetmanagement/src/main/java/org/amdatu/opensocial/gadgetmanagement/bean/dashboard/Dashboards.java
(original)
+++
trunk/amdatu-opensocial/opensocial-gadgetmanagement/src/main/java/org/amdatu/opensocial/gadgetmanagement/bean/dashboard/Dashboards.java
Fri Apr 6 10:59:57 2012
@@ -15,10 +15,10 @@
*/
package org.amdatu.opensocial.gadgetmanagement.bean.dashboard;
-import org.amdatu.opensocial.rest.tools.LinkResource;
-import org.amdatu.opensocial.rest.tools.RESTInvocationContext;
-import org.amdatu.opensocial.rest.tools.ReferenceableResource;
-import org.amdatu.opensocial.rest.tools.ResourceLinkBuilder;
+import org.amdatu.auth.tools.rest.LinkResource;
+import org.amdatu.auth.tools.rest.RESTInvocationContext;
+import org.amdatu.auth.tools.rest.ReferenceableResource;
+import org.amdatu.auth.tools.rest.ResourceLinkBuilder;
import java.util.ArrayList;
import java.util.List;
Modified:
trunk/amdatu-opensocial/opensocial-gadgetmanagement/src/main/java/org/amdatu/opensocial/gadgetmanagement/bean/dashboard/Definition.java
==============================================================================
---
trunk/amdatu-opensocial/opensocial-gadgetmanagement/src/main/java/org/amdatu/opensocial/gadgetmanagement/bean/dashboard/Definition.java
(original)
+++
trunk/amdatu-opensocial/opensocial-gadgetmanagement/src/main/java/org/amdatu/opensocial/gadgetmanagement/bean/dashboard/Definition.java
Fri Apr 6 10:59:57 2012
@@ -15,9 +15,9 @@
*/
package org.amdatu.opensocial.gadgetmanagement.bean.dashboard;
+import org.amdatu.auth.tools.rest.RESTInvocationContext;
+import org.amdatu.auth.tools.rest.ReferenceableResource;
import org.amdatu.opensocial.gadgetmanagement.UserPreferenceBean;
-import org.amdatu.opensocial.rest.tools.RESTInvocationContext;
-import org.amdatu.opensocial.rest.tools.ReferenceableResource;
import java.util.ArrayList;
import java.util.List;
Modified:
trunk/amdatu-opensocial/opensocial-gadgetmanagement/src/main/java/org/amdatu/opensocial/gadgetmanagement/bean/dashboard/Gadget.java
==============================================================================
---
trunk/amdatu-opensocial/opensocial-gadgetmanagement/src/main/java/org/amdatu/opensocial/gadgetmanagement/bean/dashboard/Gadget.java
(original)
+++
trunk/amdatu-opensocial/opensocial-gadgetmanagement/src/main/java/org/amdatu/opensocial/gadgetmanagement/bean/dashboard/Gadget.java
Fri Apr 6 10:59:57 2012
@@ -15,12 +15,12 @@
*/
package org.amdatu.opensocial.gadgetmanagement.bean.dashboard;
+import org.amdatu.auth.tools.rest.LinkResource;
+import org.amdatu.auth.tools.rest.RESTInvocationContext;
+import org.amdatu.auth.tools.rest.ReferenceableResource;
+import org.amdatu.auth.tools.rest.ResourceLinkBuilder;
+import org.amdatu.auth.tools.rest.annotation.ResID;
import org.amdatu.opensocial.gadgetmanagement.UserPreferencesBean;
-import org.amdatu.opensocial.rest.tools.LinkResource;
-import org.amdatu.opensocial.rest.tools.RESTInvocationContext;
-import org.amdatu.opensocial.rest.tools.ReferenceableResource;
-import org.amdatu.opensocial.rest.tools.ResourceLinkBuilder;
-import org.amdatu.opensocial.rest.tools.annotation.ResID;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
Modified:
trunk/amdatu-opensocial/opensocial-gadgetmanagement/src/main/java/org/amdatu/opensocial/gadgetmanagement/bean/dashboard/Layout.java
==============================================================================
---
trunk/amdatu-opensocial/opensocial-gadgetmanagement/src/main/java/org/amdatu/opensocial/gadgetmanagement/bean/dashboard/Layout.java
(original)
+++
trunk/amdatu-opensocial/opensocial-gadgetmanagement/src/main/java/org/amdatu/opensocial/gadgetmanagement/bean/dashboard/Layout.java
Fri Apr 6 10:59:57 2012
@@ -15,7 +15,7 @@
*/
package org.amdatu.opensocial.gadgetmanagement.bean.dashboard;
-import org.amdatu.opensocial.rest.tools.annotation.ResID;
+import org.amdatu.auth.tools.rest.annotation.ResID;
public class Layout {
@ResID
Modified:
trunk/amdatu-opensocial/opensocial-gadgetmanagement/src/main/java/org/amdatu/opensocial/gadgetmanagement/bean/dashboard/Metadata.java
==============================================================================
---
trunk/amdatu-opensocial/opensocial-gadgetmanagement/src/main/java/org/amdatu/opensocial/gadgetmanagement/bean/dashboard/Metadata.java
(original)
+++
trunk/amdatu-opensocial/opensocial-gadgetmanagement/src/main/java/org/amdatu/opensocial/gadgetmanagement/bean/dashboard/Metadata.java
Fri Apr 6 10:59:57 2012
@@ -15,8 +15,7 @@
*/
package org.amdatu.opensocial.gadgetmanagement.bean.dashboard;
-import org.amdatu.opensocial.gadgetmanagement.bean.dashboard.Label;
-import org.amdatu.opensocial.rest.tools.RESTInvocationContext;
+import org.amdatu.auth.tools.rest.RESTInvocationContext;
import java.util.ArrayList;
import java.util.List;
Modified:
trunk/amdatu-opensocial/opensocial-gadgetmanagement/src/main/java/org/amdatu/opensocial/gadgetmanagement/rest/DashboardRESTServiceImpl.java
==============================================================================
---
trunk/amdatu-opensocial/opensocial-gadgetmanagement/src/main/java/org/amdatu/opensocial/gadgetmanagement/rest/DashboardRESTServiceImpl.java
(original)
+++
trunk/amdatu-opensocial/opensocial-gadgetmanagement/src/main/java/org/amdatu/opensocial/gadgetmanagement/rest/DashboardRESTServiceImpl.java
Fri Apr 6 10:59:57 2012
@@ -17,6 +17,9 @@
import static
org.amdatu.opensocial.gadgetmanagement.OpenSocialContainer.APP_DATA;
+import org.amdatu.auth.tools.rest.ResourceLinkBuilder;
+import org.amdatu.auth.tools.rest.annotation.InputTypeHint;
+import org.amdatu.auth.tools.rest.annotation.OutputTypeHint;
import org.amdatu.libraries.utilities.ConversionUtil;
import org.amdatu.opensocial.gadgetmanagement.GadgetDefinition;
import org.amdatu.opensocial.gadgetmanagement.UserPreferencesBean;
@@ -27,9 +30,6 @@
import org.amdatu.opensocial.gadgetmanagement.bean.dashboard.Layout;
import org.amdatu.opensocial.gadgetmanagement.bean.dashboard.State;
import org.amdatu.opensocial.gadgetmanagement.osgi.Activator;
-import org.amdatu.opensocial.rest.tools.ResourceLinkBuilder;
-import org.amdatu.opensocial.rest.tools.annotation.InputTypeHint;
-import org.amdatu.opensocial.rest.tools.annotation.OutputTypeHint;
import org.amdatu.web.httpcontext.ResourceProvider;
import java.io.IOException;
Modified:
trunk/amdatu-opensocial/opensocial-gadgetmanagement/src/main/java/org/amdatu/opensocial/gadgetmanagement/rest/GadgetManagementRESTServiceImpl.java
==============================================================================
---
trunk/amdatu-opensocial/opensocial-gadgetmanagement/src/main/java/org/amdatu/opensocial/gadgetmanagement/rest/GadgetManagementRESTServiceImpl.java
(original)
+++
trunk/amdatu-opensocial/opensocial-gadgetmanagement/src/main/java/org/amdatu/opensocial/gadgetmanagement/rest/GadgetManagementRESTServiceImpl.java
Fri Apr 6 10:59:57 2012
@@ -15,6 +15,14 @@
*/
package org.amdatu.opensocial.gadgetmanagement.rest;
+import org.amdatu.opensocial.gadgetmanagement.GadgetCategory;
+import org.amdatu.opensocial.gadgetmanagement.GadgetDefinition;
+import org.amdatu.opensocial.gadgetmanagement.bean.Categories;
+import org.amdatu.opensocial.gadgetmanagement.bean.Category;
+import org.amdatu.opensocial.gadgetmanagement.bean.Widget;
+import org.amdatu.opensocial.gadgetmanagement.bean.Widgets;
+import org.amdatu.opensocial.gadgetmanagement.osgi.Activator;
+
import java.net.URI;
import java.util.Map;
@@ -33,14 +41,6 @@
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
-import org.amdatu.opensocial.gadgetmanagement.GadgetCategory;
-import org.amdatu.opensocial.gadgetmanagement.GadgetDefinition;
-import org.amdatu.opensocial.gadgetmanagement.bean.Categories;
-import org.amdatu.opensocial.gadgetmanagement.bean.Category;
-import org.amdatu.opensocial.gadgetmanagement.bean.Widget;
-import org.amdatu.opensocial.gadgetmanagement.bean.Widgets;
-import org.amdatu.opensocial.gadgetmanagement.osgi.Activator;
-
import org.osgi.service.log.LogService;
import org.osgi.service.useradmin.User;
Modified:
trunk/amdatu-opensocial/opensocial-gadgetmanagement/src/main/java/org/amdatu/opensocial/gadgetmanagement/service/InternalGadgetStore.java
==============================================================================
---
trunk/amdatu-opensocial/opensocial-gadgetmanagement/src/main/java/org/amdatu/opensocial/gadgetmanagement/service/InternalGadgetStore.java
(original)
+++
trunk/amdatu-opensocial/opensocial-gadgetmanagement/src/main/java/org/amdatu/opensocial/gadgetmanagement/service/InternalGadgetStore.java
Fri Apr 6 10:59:57 2012
@@ -15,12 +15,12 @@
*/
package org.amdatu.opensocial.gadgetmanagement.service;
-import java.util.List;
-
import org.amdatu.opensocial.gadgetmanagement.GadgetCategory;
import org.amdatu.opensocial.gadgetmanagement.GadgetDefinition;
import org.amdatu.opensocial.gadgetmanagement.GadgetStorageException;
+import java.util.List;
+
/**
* Interface of the internal gadget store.
Modified:
trunk/amdatu-opensocial/opensocial-gadgetmanagement/src/main/java/org/amdatu/opensocial/gadgetmanagement/service/InternalGadgetStoreImpl.java
==============================================================================
---
trunk/amdatu-opensocial/opensocial-gadgetmanagement/src/main/java/org/amdatu/opensocial/gadgetmanagement/service/InternalGadgetStoreImpl.java
(original)
+++
trunk/amdatu-opensocial/opensocial-gadgetmanagement/src/main/java/org/amdatu/opensocial/gadgetmanagement/service/InternalGadgetStoreImpl.java
Fri Apr 6 10:59:57 2012
@@ -15,13 +15,14 @@
*/
package org.amdatu.opensocial.gadgetmanagement.service;
-import java.util.ArrayList;
-import java.util.List;
-
import org.amdatu.core.tenant.Tenant;
import org.amdatu.opensocial.gadgetmanagement.GadgetCategory;
import org.amdatu.opensocial.gadgetmanagement.GadgetDefinition;
import org.amdatu.opensocial.gadgetmanagement.GadgetDefinitionProvider;
+
+import java.util.ArrayList;
+import java.util.List;
+
import org.apache.felix.dm.Component;
import org.apache.felix.dm.DependencyManager;
import org.apache.felix.dm.ServiceDependency;
Modified: trunk/amdatu-opensocial/opensocial-shindig/pom.xml
==============================================================================
--- trunk/amdatu-opensocial/opensocial-shindig/pom.xml (original)
+++ trunk/amdatu-opensocial/opensocial-shindig/pom.xml Fri Apr 6 10:59:57 2012
@@ -237,7 +237,7 @@
<instructions>
<Bundle-Activator>org.amdatu.opensocial.shindig.osgi.Activator</Bundle-Activator>
<Bundle-SymbolicName>org.amdatu.opensocial.shindig</Bundle-SymbolicName>
-
<Embed-Dependency>!guice|guice-jmx|guice-multibindings|commons-beanutils|commons-beanutils-core|commons-collections|commons-digester|jdom|org.amdatu.opensocial.rest.doclet;scope=compile</Embed-Dependency>
+
<Embed-Dependency>!guice|guice-jmx|guice-multibindings|commons-beanutils|commons-beanutils-core|commons-collections|commons-digester|jdom|org.amdatu.auth.tools.rest.doclet;scope=compile</Embed-Dependency>
<Embed-Transitive>true</Embed-Transitive>
<Import-Package>
!org.jdom.*,
Modified: trunk/amdatu-opensocial/pom.xml
==============================================================================
--- trunk/amdatu-opensocial/pom.xml (original)
+++ trunk/amdatu-opensocial/pom.xml Fri Apr 6 10:59:57 2012
@@ -176,20 +176,6 @@
<scope>provided</scope>
<type>jar</type>
</dependency>
- <dependency>
- <groupId>org.amdatu.opensocial</groupId>
- <artifactId>org.amdatu.opensocial.rest.doclet</artifactId>
- <version>${project.version}</version>
- <scope>compile</scope>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.amdatu.opensocial</groupId>
- <artifactId>org.amdatu.opensocial.rest.tools</artifactId>
- <version>${project.version}</version>
- <scope>compile</scope>
- <type>jar</type>
- </dependency>
<!-- Dependency setup for amdatu-core project -->
<dependency>
@@ -259,7 +245,20 @@
<scope>provided</scope>
<type>bundle</type>
</dependency>
-
+ <dependency>
+ <groupId>org.amdatu.auth</groupId>
+ <artifactId>org.amdatu.auth.tools.rest.doclet</artifactId>
+ <version>${amdatu.auth.version}</version>
+ <scope>compile</scope>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.amdatu.auth</groupId>
+ <artifactId>org.amdatu.auth.tools.rest</artifactId>
+ <version>${amdatu.auth.version}</version>
+ <scope>compile</scope>
+ <type>jar</type>
+ </dependency>
<dependency>
<groupId>org.amdatu.auth</groupId>
<artifactId>org.amdatu.auth.tools.config</artifactId>
@@ -309,7 +308,6 @@
<module>release-demo</module>
<module>test-integration</module>
<module>test-performance</module>
- <module>tools</module>
</modules>
<build>
_______________________________________________
Amdatu-commits mailing list
[email protected]
http://lists.amdatu.org/mailman/listinfo/amdatu-commits
