Author: ivol37 at gmail.com
Date: Tue Nov 9 16:04:09 2010
New Revision: 284
Log:
[AMDATU-129] Ongoing Refactoring/moving of SVN layout
Added:
trunk/amdatu-opensocial/dashboard-bundle/src/main/java/org/amdatu/opensocial/
- copied from r281,
/trunk/amdatu-opensocial/dashboard-bundle/src/main/java/org/amdatu/application/
trunk/amdatu-opensocial/gadget-management/src/main/java/org/amdatu/opensocial/
- copied from r281,
/trunk/amdatu-opensocial/gadget-management/src/main/java/org/amdatu/application/
trunk/amdatu-opensocial/profile-service/src/main/java/org/amdatu/opensocial/
- copied from r281,
/trunk/amdatu-opensocial/profile-service/src/main/java/org/amdatu/platform/
trunk/platform-bundles/filebased-configuration/src/main/resources/conf/org.amdatu.semanticweb.sparqlendpoint.cfg
- copied unchanged from r281,
/trunk/platform-bundles/filebased-configuration/src/main/resources/conf/org.amdatu.gadget.sparqlendpoint.cfg
Removed:
trunk/amdatu-opensocial/dashboard-bundle/src/main/java/org/amdatu/application/
trunk/amdatu-opensocial/gadget-management/src/main/java/org/amdatu/application/
trunk/amdatu-opensocial/profile-service/src/main/java/org/amdatu/platform/
trunk/platform-bundles/filebased-configuration/src/main/resources/conf/org.amdatu.gadget.sparqlendpoint.cfg
Modified:
trunk/amdatu-opensocial/dashboard-bundle/pom.xml
trunk/amdatu-opensocial/dashboard-bundle/src/main/java/org/amdatu/opensocial/dashboard/osgi/Activator.java
trunk/amdatu-opensocial/dashboard-bundle/src/main/java/org/amdatu/opensocial/dashboard/service/DashboardService.java
trunk/amdatu-opensocial/gadget-management/pom.xml
trunk/amdatu-opensocial/gadget-management/src/main/java/org/amdatu/opensocial/gadgetmanagement/DefaultGadgetRepository.java
trunk/amdatu-opensocial/gadget-management/src/main/java/org/amdatu/opensocial/gadgetmanagement/GadgetManagement.java
trunk/amdatu-opensocial/gadget-management/src/main/java/org/amdatu/opensocial/gadgetmanagement/osgi/Activator.java
trunk/amdatu-opensocial/gadget-management/src/main/java/org/amdatu/opensocial/gadgetmanagement/service/GadgetManagementServiceImpl.java
trunk/amdatu-opensocial/profile-service/pom.xml
trunk/amdatu-opensocial/profile-service/src/main/java/org/amdatu/opensocial/profile/Friend.java
trunk/amdatu-opensocial/profile-service/src/main/java/org/amdatu/opensocial/profile/PersonService.java
trunk/amdatu-opensocial/profile-service/src/main/java/org/amdatu/opensocial/profile/SerializablePersonImpl.java
trunk/amdatu-opensocial/profile-service/src/main/java/org/amdatu/opensocial/profile/domain/FriendImpl.java
trunk/amdatu-opensocial/profile-service/src/main/java/org/amdatu/opensocial/profile/osgi/Activator.java
trunk/amdatu-opensocial/profile-service/src/main/java/org/amdatu/opensocial/profile/service/FriendColumnFamilyProvider.java
trunk/amdatu-opensocial/profile-service/src/main/java/org/amdatu/opensocial/profile/service/PersonServiceImpl.java
trunk/amdatu-release/pom.xml
trunk/amdatu-semanticweb/sparqlendpoint-gadget/pom.xml
trunk/amdatu-semanticweb/sparqlendpoint-gadget/src/main/java/org/amdatu/semanticweb/sparqlendpoint/Activator.java
trunk/amdatu-semanticweb/sparqlendpoint-gadget/src/main/java/org/amdatu/semanticweb/sparqlendpoint/service/SPARQLEndpointServiceImpl.java
trunk/example-bundles/course-gadget/pom.xml
trunk/example-bundles/course-gadget/src/main/java/org/amdatu/example/course/gadget/osgi/Activator.java
trunk/example-bundles/course-gadget/src/main/java/org/amdatu/example/course/gadget/osgi/service/CourseGadgetServiceImpl.java
trunk/example-bundles/course-service/pom.xml
trunk/example-bundles/course-service/src/main/java/org/amdatu/example/course/service/impl/CourseResource.java
trunk/example-bundles/course-service/src/main/java/org/amdatu/example/course/service/impl/ProfileDataProvider.java
trunk/example-bundles/course-service/src/main/java/org/amdatu/example/course/service/osgi/Activator.java
trunk/example-bundles/friends-gadget/pom.xml
trunk/example-bundles/friends-gadget/src/main/java/org/amdatu/example/friends/gadget/osgi/Activator.java
trunk/example-bundles/friends-gadget/src/main/java/org/amdatu/example/friends/gadget/osgi/service/FriendsGadgetServiceImpl.java
trunk/gadget-bundles/login-gadget/pom.xml
trunk/gadget-bundles/login-gadget/src/main/java/org/amdatu/gadget/login/osgi/Activator.java
trunk/gadget-bundles/login-gadget/src/main/java/org/amdatu/gadget/login/service/LoginServiceImpl.java
trunk/pom.xml
trunk/src/main/resources/conf/felix-config.properties
Modified: trunk/amdatu-opensocial/dashboard-bundle/pom.xml
==============================================================================
--- trunk/amdatu-opensocial/dashboard-bundle/pom.xml (original)
+++ trunk/amdatu-opensocial/dashboard-bundle/pom.xml Tue Nov 9 16:04:09 2010
@@ -41,8 +41,8 @@
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
-
<Bundle-Activator>org.amdatu.application.dashboard.osgi.Activator</Bundle-Activator>
- <Bundle-SymbolicName>
org.amdatu.application.dashboard</Bundle-SymbolicName>
+
<Bundle-Activator>org.amdatu.opensocial.dashboard.osgi.Activator</Bundle-Activator>
+ <Bundle-SymbolicName>
org.amdatu.opensocial.dashboard</Bundle-SymbolicName>
<Embed-Dependency>*;scope=compile</Embed-Dependency>
<Embed-Transitive>true</Embed-Transitive>
<Import-Package>
Modified:
trunk/amdatu-opensocial/dashboard-bundle/src/main/java/org/amdatu/opensocial/dashboard/osgi/Activator.java
==============================================================================
---
/trunk/amdatu-opensocial/dashboard-bundle/src/main/java/org/amdatu/application/dashboard/osgi/Activator.java
(original)
+++
trunk/amdatu-opensocial/dashboard-bundle/src/main/java/org/amdatu/opensocial/dashboard/osgi/Activator.java
Tue Nov 9 16:04:09 2010
@@ -14,9 +14,9 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package org.amdatu.application.dashboard.osgi;
+package org.amdatu.opensocial.dashboard.osgi;
-import org.amdatu.application.dashboard.service.DashboardService;
+import org.amdatu.opensocial.dashboard.service.DashboardService;
import org.amdatu.web.httpcontext.HttpContextServiceFactory;
import org.amdatu.web.httpcontext.ResourceProvider;
import org.apache.felix.dm.DependencyActivatorBase;
@@ -33,7 +33,7 @@
// The resource identifier for this bundle. Resources are only considered
to be 'ours' when
// it is prefixed with this id
public final static String RESOURCE_ID = "dashboard";
-
+
@Override
public void init(BundleContext context, DependencyManager manager) throws
Exception {
Modified:
trunk/amdatu-opensocial/dashboard-bundle/src/main/java/org/amdatu/opensocial/dashboard/service/DashboardService.java
==============================================================================
---
/trunk/amdatu-opensocial/dashboard-bundle/src/main/java/org/amdatu/application/dashboard/service/DashboardService.java
(original)
+++
trunk/amdatu-opensocial/dashboard-bundle/src/main/java/org/amdatu/opensocial/dashboard/service/DashboardService.java
Tue Nov 9 16:04:09 2010
@@ -14,9 +14,9 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package org.amdatu.application.dashboard.service;
+package org.amdatu.opensocial.dashboard.service;
-import static org.amdatu.application.dashboard.osgi.Activator.RESOURCE_ID;
+import static org.amdatu.opensocial.dashboard.osgi.Activator.RESOURCE_ID;
import java.net.URL;
@@ -30,7 +30,7 @@
* The dashboard service registers the login and logout page using the
authorization
* service (which is using JSecurity, a light security framework). Furthermore
it
* is a web resource provider of dashboard JSPs and statics.
- *
+ *
* @author ivol
*/
public class DashboardService implements ResourceProvider {
Modified: trunk/amdatu-opensocial/gadget-management/pom.xml
==============================================================================
--- trunk/amdatu-opensocial/gadget-management/pom.xml (original)
+++ trunk/amdatu-opensocial/gadget-management/pom.xml Tue Nov 9 16:04:09 2010
@@ -70,8 +70,8 @@
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
-
<Bundle-Activator>org.amdatu.application.gadgetmanagement.osgi.Activator</Bundle-Activator>
- <Bundle-SymbolicName>
org.amdatu.application.gadgetmanagement</Bundle-SymbolicName>
+
<Bundle-Activator>org.amdatu.opensocial.gadgetmanagement.osgi.Activator</Bundle-Activator>
+ <Bundle-SymbolicName>
org.amdatu.opensocial.gadgetmanagement</Bundle-SymbolicName>
<Embed-Dependency>*;scope=compile</Embed-Dependency>
<Embed-Transitive>true</Embed-Transitive>
</instructions>
Modified:
trunk/amdatu-opensocial/gadget-management/src/main/java/org/amdatu/opensocial/gadgetmanagement/DefaultGadgetRepository.java
==============================================================================
---
/trunk/amdatu-opensocial/gadget-management/src/main/java/org/amdatu/application/gadgetmanagement/DefaultGadgetRepository.java
(original)
+++
trunk/amdatu-opensocial/gadget-management/src/main/java/org/amdatu/opensocial/gadgetmanagement/DefaultGadgetRepository.java
Tue Nov 9 16:04:09 2010
@@ -14,7 +14,7 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package org.amdatu.application.gadgetmanagement;
+package org.amdatu.opensocial.gadgetmanagement;
/**
* This interface holds a list of all gadget URLs that are added to the Amdatu
gadget repository by default.
Modified:
trunk/amdatu-opensocial/gadget-management/src/main/java/org/amdatu/opensocial/gadgetmanagement/GadgetManagement.java
==============================================================================
---
/trunk/amdatu-opensocial/gadget-management/src/main/java/org/amdatu/application/gadgetmanagement/GadgetManagement.java
(original)
+++
trunk/amdatu-opensocial/gadget-management/src/main/java/org/amdatu/opensocial/gadgetmanagement/GadgetManagement.java
Tue Nov 9 16:04:09 2010
@@ -14,7 +14,7 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package org.amdatu.application.gadgetmanagement;
+package org.amdatu.opensocial.gadgetmanagement;
import org.amdatu.opensocial.shindig.GadgetCategory;
import org.amdatu.opensocial.shindig.GadgetDefinition;
Modified:
trunk/amdatu-opensocial/gadget-management/src/main/java/org/amdatu/opensocial/gadgetmanagement/osgi/Activator.java
==============================================================================
---
/trunk/amdatu-opensocial/gadget-management/src/main/java/org/amdatu/application/gadgetmanagement/osgi/Activator.java
(original)
+++
trunk/amdatu-opensocial/gadget-management/src/main/java/org/amdatu/opensocial/gadgetmanagement/osgi/Activator.java
Tue Nov 9 16:04:09 2010
@@ -14,10 +14,10 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package org.amdatu.application.gadgetmanagement.osgi;
+package org.amdatu.opensocial.gadgetmanagement.osgi;
-import org.amdatu.application.gadgetmanagement.GadgetManagement;
-import
org.amdatu.application.gadgetmanagement.service.GadgetManagementServiceImpl;
+import org.amdatu.opensocial.gadgetmanagement.GadgetManagement;
+import
org.amdatu.opensocial.gadgetmanagement.service.GadgetManagementServiceImpl;
import org.amdatu.platform.cassandra.listener.ColumnFamilyAvailable;
import
org.amdatu.platform.cassandra.persistencemanager.CassandraPersistenceManager;
import org.amdatu.web.httpcontext.HttpContextServiceFactory;
Modified:
trunk/amdatu-opensocial/gadget-management/src/main/java/org/amdatu/opensocial/gadgetmanagement/service/GadgetManagementServiceImpl.java
==============================================================================
---
/trunk/amdatu-opensocial/gadget-management/src/main/java/org/amdatu/application/gadgetmanagement/service/GadgetManagementServiceImpl.java
(original)
+++
trunk/amdatu-opensocial/gadget-management/src/main/java/org/amdatu/opensocial/gadgetmanagement/service/GadgetManagementServiceImpl.java
Tue Nov 9 16:04:09 2010
@@ -14,7 +14,7 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package org.amdatu.application.gadgetmanagement.service;
+package org.amdatu.opensocial.gadgetmanagement.service;
import java.io.BufferedReader;
import java.io.IOException;
@@ -41,9 +41,9 @@
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
-import org.amdatu.application.gadgetmanagement.DefaultGadgetRepository;
-import org.amdatu.application.gadgetmanagement.GadgetManagement;
-import org.amdatu.application.gadgetmanagement.osgi.Activator;
+import org.amdatu.opensocial.gadgetmanagement.DefaultGadgetRepository;
+import org.amdatu.opensocial.gadgetmanagement.GadgetManagement;
+import org.amdatu.opensocial.gadgetmanagement.osgi.Activator;
import org.amdatu.libraries.utilities.ConversionUtil;
import org.amdatu.platform.authorization.AuthorizationService;
import org.amdatu.platform.cassandra.persistencemanager.CassandraException;
Modified: trunk/amdatu-opensocial/profile-service/pom.xml
==============================================================================
--- trunk/amdatu-opensocial/profile-service/pom.xml (original)
+++ trunk/amdatu-opensocial/profile-service/pom.xml Tue Nov 9 16:04:09 2010
@@ -8,7 +8,7 @@
<version>0.0.6-SNAPSHOT</version>
</parent>
<groupId>org.amdatu.opensocial</groupId>
- <artifactId>profile-service</artifactId>
+ <artifactId>profile</artifactId>
<packaging>bundle</packaging>
<name>Amdatu Platform - Profile Service</name>
<description>Provides a profile service on top of the OpenSocial
services</description>
@@ -59,9 +59,9 @@
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
-
<Bundle-Activator>org.amdatu.platform.profile.osgi.Activator</Bundle-Activator>
-
<Bundle-SymbolicName>org.amdatu.platform.profile-service</Bundle-SymbolicName>
- <Export-Package>org.amdatu.platform.profile</Export-Package>
+
<Bundle-Activator>org.amdatu.opensocial.profile.osgi.Activator</Bundle-Activator>
+
<Bundle-SymbolicName>org.amdatu.opensocial.profile</Bundle-SymbolicName>
+ <Export-Package>org.amdatu.opensocial.profile</Export-Package>
<Embed-Dependency>*;scope=compile</Embed-Dependency>
<Embed-Transitive>true</Embed-Transitive>
</instructions>
Modified:
trunk/amdatu-opensocial/profile-service/src/main/java/org/amdatu/opensocial/profile/Friend.java
==============================================================================
---
/trunk/amdatu-opensocial/profile-service/src/main/java/org/amdatu/platform/profile/Friend.java
(original)
+++
trunk/amdatu-opensocial/profile-service/src/main/java/org/amdatu/opensocial/profile/Friend.java
Tue Nov 9 16:04:09 2010
@@ -14,7 +14,7 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package org.amdatu.platform.profile;
+package org.amdatu.opensocial.profile;
/**
* Interface of a friend relation: associates a person with another person
(his or her friend).
Modified:
trunk/amdatu-opensocial/profile-service/src/main/java/org/amdatu/opensocial/profile/PersonService.java
==============================================================================
---
/trunk/amdatu-opensocial/profile-service/src/main/java/org/amdatu/platform/profile/PersonService.java
(original)
+++
trunk/amdatu-opensocial/profile-service/src/main/java/org/amdatu/opensocial/profile/PersonService.java
Tue Nov 9 16:04:09 2010
@@ -14,7 +14,7 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package org.amdatu.platform.profile;
+package org.amdatu.opensocial.profile;
import java.util.List;
Modified:
trunk/amdatu-opensocial/profile-service/src/main/java/org/amdatu/opensocial/profile/SerializablePersonImpl.java
==============================================================================
---
/trunk/amdatu-opensocial/profile-service/src/main/java/org/amdatu/platform/profile/SerializablePersonImpl.java
(original)
+++
trunk/amdatu-opensocial/profile-service/src/main/java/org/amdatu/opensocial/profile/SerializablePersonImpl.java
Tue Nov 9 16:04:09 2010
@@ -14,7 +14,7 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package org.amdatu.platform.profile;
+package org.amdatu.opensocial.profile;
import java.io.IOException;
import java.io.ObjectInputStream;
Modified:
trunk/amdatu-opensocial/profile-service/src/main/java/org/amdatu/opensocial/profile/domain/FriendImpl.java
==============================================================================
---
/trunk/amdatu-opensocial/profile-service/src/main/java/org/amdatu/platform/profile/domain/FriendImpl.java
(original)
+++
trunk/amdatu-opensocial/profile-service/src/main/java/org/amdatu/opensocial/profile/domain/FriendImpl.java
Tue Nov 9 16:04:09 2010
@@ -14,9 +14,9 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package org.amdatu.platform.profile.domain;
+package org.amdatu.opensocial.profile.domain;
-import org.amdatu.platform.profile.Friend;
+import org.amdatu.opensocial.profile.Friend;
/**
* This class provides the implementation of the Friend domain class.
Modified:
trunk/amdatu-opensocial/profile-service/src/main/java/org/amdatu/opensocial/profile/osgi/Activator.java
==============================================================================
---
/trunk/amdatu-opensocial/profile-service/src/main/java/org/amdatu/platform/profile/osgi/Activator.java
(original)
+++
trunk/amdatu-opensocial/profile-service/src/main/java/org/amdatu/opensocial/profile/osgi/Activator.java
Tue Nov 9 16:04:09 2010
@@ -14,13 +14,13 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package org.amdatu.platform.profile.osgi;
+package org.amdatu.opensocial.profile.osgi;
import org.amdatu.platform.cassandra.listener.ColumnFamilyAvailable;
import org.amdatu.platform.cassandra.listener.ColumnFamilyProvider;
-import org.amdatu.platform.profile.PersonService;
-import org.amdatu.platform.profile.service.FriendColumnFamilyProvider;
-import org.amdatu.platform.profile.service.PersonServiceImpl;
+import org.amdatu.opensocial.profile.PersonService;
+import org.amdatu.opensocial.profile.service.FriendColumnFamilyProvider;
+import org.amdatu.opensocial.profile.service.PersonServiceImpl;
import org.apache.felix.dm.DependencyActivatorBase;
import org.apache.felix.dm.DependencyManager;
import org.osgi.framework.BundleContext;
Modified:
trunk/amdatu-opensocial/profile-service/src/main/java/org/amdatu/opensocial/profile/service/FriendColumnFamilyProvider.java
==============================================================================
---
/trunk/amdatu-opensocial/profile-service/src/main/java/org/amdatu/platform/profile/service/FriendColumnFamilyProvider.java
(original)
+++
trunk/amdatu-opensocial/profile-service/src/main/java/org/amdatu/opensocial/profile/service/FriendColumnFamilyProvider.java
Tue Nov 9 16:04:09 2010
@@ -14,7 +14,7 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package org.amdatu.platform.profile.service;
+package org.amdatu.opensocial.profile.service;
import org.amdatu.platform.cassandra.listener.ColumnFamilyDefinition;
import
org.amdatu.platform.cassandra.listener.ColumnFamilyDefinition.ColumnType;
Modified:
trunk/amdatu-opensocial/profile-service/src/main/java/org/amdatu/opensocial/profile/service/PersonServiceImpl.java
==============================================================================
---
/trunk/amdatu-opensocial/profile-service/src/main/java/org/amdatu/platform/profile/service/PersonServiceImpl.java
(original)
+++
trunk/amdatu-opensocial/profile-service/src/main/java/org/amdatu/opensocial/profile/service/PersonServiceImpl.java
Tue Nov 9 16:04:09 2010
@@ -14,7 +14,7 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package org.amdatu.platform.profile.service;
+package org.amdatu.opensocial.profile.service;
import java.io.*;
import java.util.ArrayList;
@@ -23,7 +23,7 @@
import java.util.concurrent.Future;
import org.amdatu.platform.authorization.AuthorizationService;
-import org.amdatu.platform.profile.PersonService;
+import org.amdatu.opensocial.profile.PersonService;
import org.apache.shindig.auth.SecurityToken;
import org.apache.shindig.common.util.ImmediateFuture;
import org.apache.shindig.protocol.ProtocolException;
Modified: trunk/amdatu-release/pom.xml
==============================================================================
--- trunk/amdatu-release/pom.xml (original)
+++ trunk/amdatu-release/pom.xml Tue Nov 9 16:04:09 2010
@@ -133,7 +133,7 @@
</dependency>
<dependency>
<groupId>org.amdatu.platform</groupId>
- <artifactId>profile-service</artifactId>
+ <artifactId>profile</artifactId>
<version>${platform.version}</version>
<scope>runtime</scope>
<type>bundle</type>
Modified: trunk/amdatu-semanticweb/sparqlendpoint-gadget/pom.xml
==============================================================================
--- trunk/amdatu-semanticweb/sparqlendpoint-gadget/pom.xml (original)
+++ trunk/amdatu-semanticweb/sparqlendpoint-gadget/pom.xml Tue Nov 9
16:04:09 2010
@@ -39,7 +39,7 @@
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>org.amdatu.application</groupId>
+ <groupId>org.amdatu.opensocial</groupId>
<artifactId>gadgetmanagement</artifactId>
<scope>provided</scope>
<type>bundle</type>
Modified:
trunk/amdatu-semanticweb/sparqlendpoint-gadget/src/main/java/org/amdatu/semanticweb/sparqlendpoint/Activator.java
==============================================================================
---
trunk/amdatu-semanticweb/sparqlendpoint-gadget/src/main/java/org/amdatu/semanticweb/sparqlendpoint/Activator.java
(original)
+++
trunk/amdatu-semanticweb/sparqlendpoint-gadget/src/main/java/org/amdatu/semanticweb/sparqlendpoint/Activator.java
Tue Nov 9 16:04:09 2010
@@ -16,7 +16,7 @@
*/
package org.amdatu.semanticweb.sparqlendpoint;
-import org.amdatu.application.gadgetmanagement.GadgetManagement;
+import org.amdatu.opensocial.gadgetmanagement.GadgetManagement;
import org.amdatu.semanticweb.sparqlendpoint.service.SPARQLEndpointServiceImpl;
import org.amdatu.web.httpcontext.HttpContextServiceFactory;
import org.amdatu.web.httpcontext.ResourceProvider;
Modified:
trunk/amdatu-semanticweb/sparqlendpoint-gadget/src/main/java/org/amdatu/semanticweb/sparqlendpoint/service/SPARQLEndpointServiceImpl.java
==============================================================================
---
trunk/amdatu-semanticweb/sparqlendpoint-gadget/src/main/java/org/amdatu/semanticweb/sparqlendpoint/service/SPARQLEndpointServiceImpl.java
(original)
+++
trunk/amdatu-semanticweb/sparqlendpoint-gadget/src/main/java/org/amdatu/semanticweb/sparqlendpoint/service/SPARQLEndpointServiceImpl.java
Tue Nov 9 16:04:09 2010
@@ -23,7 +23,7 @@
import java.util.Dictionary;
import java.util.List;
-import org.amdatu.application.gadgetmanagement.GadgetManagement;
+import org.amdatu.opensocial.gadgetmanagement.GadgetManagement;
import org.amdatu.semanticweb.sparqlendpoint.Activator;
import org.amdatu.web.httpcontext.HttpContextServiceFactory;
import org.amdatu.web.httpcontext.ResourceProvider;
Modified: trunk/example-bundles/course-gadget/pom.xml
==============================================================================
--- trunk/example-bundles/course-gadget/pom.xml (original)
+++ trunk/example-bundles/course-gadget/pom.xml Tue Nov 9 16:04:09 2010
@@ -14,7 +14,7 @@
<description>This gadget provides an example gadget to display courses
relevant for a particular student</description>
<dependencies>
<dependency>
- <groupId>org.amdatu.application</groupId>
+ <groupId>org.amdatu.opensocial</groupId>
<artifactId>gadgetmanagement</artifactId>
<scope>provided</scope>
<type>bundle</type>
Modified:
trunk/example-bundles/course-gadget/src/main/java/org/amdatu/example/course/gadget/osgi/Activator.java
==============================================================================
---
trunk/example-bundles/course-gadget/src/main/java/org/amdatu/example/course/gadget/osgi/Activator.java
(original)
+++
trunk/example-bundles/course-gadget/src/main/java/org/amdatu/example/course/gadget/osgi/Activator.java
Tue Nov 9 16:04:09 2010
@@ -16,7 +16,7 @@
*/
package org.amdatu.example.course.gadget.osgi;
-import org.amdatu.application.gadgetmanagement.GadgetManagement;
+import org.amdatu.opensocial.gadgetmanagement.GadgetManagement;
import org.amdatu.example.course.gadget.osgi.service.CourseGadgetServiceImpl;
import org.amdatu.web.httpcontext.HttpContextServiceFactory;
import org.amdatu.web.httpcontext.ResourceProvider;
Modified:
trunk/example-bundles/course-gadget/src/main/java/org/amdatu/example/course/gadget/osgi/service/CourseGadgetServiceImpl.java
==============================================================================
---
trunk/example-bundles/course-gadget/src/main/java/org/amdatu/example/course/gadget/osgi/service/CourseGadgetServiceImpl.java
(original)
+++
trunk/example-bundles/course-gadget/src/main/java/org/amdatu/example/course/gadget/osgi/service/CourseGadgetServiceImpl.java
Tue Nov 9 16:04:09 2010
@@ -19,7 +19,7 @@
import java.net.URL;
import java.util.Dictionary;
-import org.amdatu.application.gadgetmanagement.GadgetManagement;
+import org.amdatu.opensocial.gadgetmanagement.GadgetManagement;
import org.amdatu.example.course.gadget.osgi.Activator;
import org.amdatu.web.httpcontext.HttpContextServiceFactory;
import org.amdatu.web.httpcontext.ResourceProvider;
Modified: trunk/example-bundles/course-service/pom.xml
==============================================================================
--- trunk/example-bundles/course-service/pom.xml (original)
+++ trunk/example-bundles/course-service/pom.xml Tue Nov 9 16:04:09 2010
@@ -45,8 +45,8 @@
<type>bundle</type>
</dependency>
<dependency>
- <groupId>org.amdatu.platform</groupId>
- <artifactId>profile-service</artifactId>
+ <groupId>org.amdatu.opensocial</groupId>
+ <artifactId>profile</artifactId>
<scope>provided</scope>
<type>bundle</type>
</dependency>
Modified:
trunk/example-bundles/course-service/src/main/java/org/amdatu/example/course/service/impl/CourseResource.java
==============================================================================
---
trunk/example-bundles/course-service/src/main/java/org/amdatu/example/course/service/impl/CourseResource.java
(original)
+++
trunk/example-bundles/course-service/src/main/java/org/amdatu/example/course/service/impl/CourseResource.java
Tue Nov 9 16:04:09 2010
@@ -37,7 +37,7 @@
import org.amdatu.platform.configtemplatemanager.ConfigTemplateManager;
import org.amdatu.web.httpcontext.HttpContextServiceFactory;
import org.amdatu.web.httpcontext.ResourceProvider;
-import org.amdatu.platform.profile.PersonService;
+import org.amdatu.opensocial.profile.PersonService;
import org.apache.felix.dm.Component;
import org.apache.shindig.social.opensocial.model.Person;
import org.osgi.framework.Bundle;
Modified:
trunk/example-bundles/course-service/src/main/java/org/amdatu/example/course/service/impl/ProfileDataProvider.java
==============================================================================
---
trunk/example-bundles/course-service/src/main/java/org/amdatu/example/course/service/impl/ProfileDataProvider.java
(original)
+++
trunk/example-bundles/course-service/src/main/java/org/amdatu/example/course/service/impl/ProfileDataProvider.java
Tue Nov 9 16:04:09 2010
@@ -17,8 +17,8 @@
package org.amdatu.example.course.service.impl;
import org.amdatu.platform.authorization.AuthorizationService;
-import org.amdatu.platform.profile.PersonService;
-import org.amdatu.platform.profile.SerializablePersonImpl;
+import org.amdatu.opensocial.profile.PersonService;
+import org.amdatu.opensocial.profile.SerializablePersonImpl;
import org.apache.shindig.social.core.model.NameImpl;
import org.osgi.framework.InvalidSyntaxException;
import org.osgi.service.log.LogService;
Modified:
trunk/example-bundles/course-service/src/main/java/org/amdatu/example/course/service/osgi/Activator.java
==============================================================================
---
trunk/example-bundles/course-service/src/main/java/org/amdatu/example/course/service/osgi/Activator.java
(original)
+++
trunk/example-bundles/course-service/src/main/java/org/amdatu/example/course/service/osgi/Activator.java
Tue Nov 9 16:04:09 2010
@@ -24,7 +24,7 @@
import org.amdatu.platform.configtemplatemanager.ConfigTemplateManager;
import org.amdatu.web.httpcontext.HttpContextServiceFactory;
import org.amdatu.web.httpcontext.ResourceProvider;
-import org.amdatu.platform.profile.PersonService;
+import org.amdatu.opensocial.profile.PersonService;
import org.amdatu.semanticweb.sesame.SesameService;
import org.apache.felix.dm.DependencyActivatorBase;
import org.apache.felix.dm.DependencyManager;
Modified: trunk/example-bundles/friends-gadget/pom.xml
==============================================================================
--- trunk/example-bundles/friends-gadget/pom.xml (original)
+++ trunk/example-bundles/friends-gadget/pom.xml Tue Nov 9 16:04:09 2010
@@ -15,7 +15,7 @@
<dependencies>
<dependency>
- <groupId>org.amdatu.application</groupId>
+ <groupId>org.amdatu.opensocial</groupId>
<artifactId>gadgetmanagement</artifactId>
<scope>provided</scope>
<type>bundle</type>
Modified:
trunk/example-bundles/friends-gadget/src/main/java/org/amdatu/example/friends/gadget/osgi/Activator.java
==============================================================================
---
trunk/example-bundles/friends-gadget/src/main/java/org/amdatu/example/friends/gadget/osgi/Activator.java
(original)
+++
trunk/example-bundles/friends-gadget/src/main/java/org/amdatu/example/friends/gadget/osgi/Activator.java
Tue Nov 9 16:04:09 2010
@@ -16,7 +16,7 @@
*/
package org.amdatu.example.friends.gadget.osgi;
-import org.amdatu.application.gadgetmanagement.GadgetManagement;
+import org.amdatu.opensocial.gadgetmanagement.GadgetManagement;
import org.amdatu.example.friends.gadget.osgi.service.FriendsGadgetServiceImpl;
import org.amdatu.web.httpcontext.HttpContextServiceFactory;
import org.amdatu.web.httpcontext.ResourceProvider;
Modified:
trunk/example-bundles/friends-gadget/src/main/java/org/amdatu/example/friends/gadget/osgi/service/FriendsGadgetServiceImpl.java
==============================================================================
---
trunk/example-bundles/friends-gadget/src/main/java/org/amdatu/example/friends/gadget/osgi/service/FriendsGadgetServiceImpl.java
(original)
+++
trunk/example-bundles/friends-gadget/src/main/java/org/amdatu/example/friends/gadget/osgi/service/FriendsGadgetServiceImpl.java
Tue Nov 9 16:04:09 2010
@@ -21,7 +21,7 @@
import java.net.URL;
import java.util.Dictionary;
-import org.amdatu.application.gadgetmanagement.GadgetManagement;
+import org.amdatu.opensocial.gadgetmanagement.GadgetManagement;
import org.amdatu.example.friends.gadget.osgi.Activator;
import org.amdatu.web.httpcontext.HttpContextServiceFactory;
import org.amdatu.web.httpcontext.ResourceProvider;
Modified: trunk/gadget-bundles/login-gadget/pom.xml
==============================================================================
--- trunk/gadget-bundles/login-gadget/pom.xml (original)
+++ trunk/gadget-bundles/login-gadget/pom.xml Tue Nov 9 16:04:09 2010
@@ -27,7 +27,7 @@
<type>bundle</type>
</dependency>
<dependency>
- <groupId>org.amdatu.application</groupId>
+ <groupId>org.amdatu.opensocial</groupId>
<artifactId>gadgetmanagement</artifactId>
<scope>provided</scope>
<type>bundle</type>
Modified:
trunk/gadget-bundles/login-gadget/src/main/java/org/amdatu/gadget/login/osgi/Activator.java
==============================================================================
---
trunk/gadget-bundles/login-gadget/src/main/java/org/amdatu/gadget/login/osgi/Activator.java
(original)
+++
trunk/gadget-bundles/login-gadget/src/main/java/org/amdatu/gadget/login/osgi/Activator.java
Tue Nov 9 16:04:09 2010
@@ -16,7 +16,7 @@
*/
package org.amdatu.gadget.login.osgi;
-import org.amdatu.application.gadgetmanagement.GadgetManagement;
+import org.amdatu.opensocial.gadgetmanagement.GadgetManagement;
import org.amdatu.gadget.login.service.LoginServiceImpl;
import org.amdatu.platform.authorization.AuthorizationService;
import org.amdatu.web.httpcontext.HttpContextServiceFactory;
Modified:
trunk/gadget-bundles/login-gadget/src/main/java/org/amdatu/gadget/login/service/LoginServiceImpl.java
==============================================================================
---
trunk/gadget-bundles/login-gadget/src/main/java/org/amdatu/gadget/login/service/LoginServiceImpl.java
(original)
+++
trunk/gadget-bundles/login-gadget/src/main/java/org/amdatu/gadget/login/service/LoginServiceImpl.java
Tue Nov 9 16:04:09 2010
@@ -19,7 +19,7 @@
import java.net.URL;
import java.util.Dictionary;
-import org.amdatu.application.gadgetmanagement.GadgetManagement;
+import org.amdatu.opensocial.gadgetmanagement.GadgetManagement;
import org.amdatu.gadget.login.osgi.Activator;
import org.amdatu.web.httpcontext.HttpContextServiceFactory;
import org.amdatu.web.httpcontext.ResourceProvider;
Modified: trunk/pom.xml
==============================================================================
--- trunk/pom.xml (original)
+++ trunk/pom.xml Tue Nov 9 16:04:09 2010
@@ -289,7 +289,7 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.amdatu.application</groupId>
+ <groupId>org.amdatu.opensocial</groupId>
<artifactId>gadgetmanagement</artifactId>
<version>${platform.version}</version>
<scope>provided</scope>
@@ -310,8 +310,8 @@
<type>bundle</type>
</dependency>
<dependency>
- <groupId>org.amdatu.platform</groupId>
- <artifactId>profile-service</artifactId>
+ <groupId>org.amdatu.opensocial</groupId>
+ <artifactId>profile</artifactId>
<version>${platform.version}</version>
<scope>provided</scope>
<type>bundle</type>
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 Tue Nov 9
16:04:09 2010
@@ -78,8 +78,8 @@
# may be specified for different start levels.
felix.auto.start.1=reference:file:system-bundles/org.apache.felix.configadmin-1.2.4.jar
reference:file:system-bundles/org.apache.felix.dependencymanager-3.0.0-SNAPSHOT.jar
reference:file:system-bundles/org.apache.felix.eventadmin-1.2.2.jar
reference:file:system-bundles/org.apache.felix.fileinstall-3.0.0.jar
reference:file:system-bundles/org.apache.felix.log-1.0.0.jar
reference:file:system-bundles/org.apache.felix.main-2.0.5.jar
reference:file:system-bundles/org.apache.felix.metatype-1.0.4.jar
reference:file:system-bundles/org.apache.felix.shell.tui-1.4.1.jar
reference:file:system-bundles/org.apache.felix.shell-1.4.2.jar
reference:file:system-bundles/org.apache.felix.webconsole-3.1.2.jar
reference:file:system-bundles/org.apache.sling.commons.mime-2.1.4.jar
reference:file:system-bundles/org.apache.sling.commons.osgi-2.0.6.jar
reference:file:system-bundles/org.osgi.compendium-1.0.0.jar
reference:file:system-bundles/org.osgi.core-1.0.0.jar
reference:file:system-bundles/pax-useradmin-service-0.0.1-SNAPSHOT.jar
reference:file:system-bundles/org.apache.felix.http.bundle-${org.apache.felix.http.version}.jar
reference:file:system-bundles/pax-swissbox-core-${pax.swissbox.version}.jar
reference:file:system-bundles/ops4j-base-lang-1.2.2.jar
reference:file:system-bundles/org.apache.felix.scr-1.6.0.jar
felix.auto.start.2=reference:file:platform-bundles/org.amdatu.platform.filebased-configuration-${platform.version}.jar
-felix.auto.start.5=reference:file:application-bundles/org.amdatu.opensocial.shindig-${platform.version}.jar
reference:file:platform-bundles/org.amdatu.platform.cassandra-application-${platform.version}.jar
reference:file:platform-bundles/org.amdatu.platform.cassandra-listener-${platform.version}.jar
reference:file:platform-bundles/org.amdatu.platform.cassandra-persistencemanager-${platform.version}.jar
reference:file:platform-bundles/org.amdatu.platform.loghandler-${platform.version}.jar
reference:file:platform-bundles/org.amdatu.platform.profile-service-${platform.version}.jar
reference:file:platform-bundles/org.amdatu.platform.tenant-service-${platform.version}.jar
reference:file:platform-bundles/org.amdatu.platform.authorization-${platform.version}.jar
reference:file:application-bundles/org.amdatu.web.httpcontext-${platform.version}.jar
reference:file:platform-bundles/org.amdatu.platform.wink-application-${platform.version}.jar
reference:file:application-bundles/org.amdatu.semanticweb.sesame-${platform.version}.jar
reference:file:platform-bundles/org.amdatu.platform.config-template-manager-${platform.version}.jar
reference:file:platform-bundles/org.amdatu.platform.useradmin-cassandra-store-${platform.version}.jar
-felix.auto.start.10=reference:file:application-bundles/org.amdatu.application.dashboard-${platform.version}.jar
reference:file:application-bundles/org.amdatu.application.gadgetmanagement-${platform.version}.jar
reference:file:application-bundles/org.amdatu.web.jsp-${platform.version}.jar
+felix.auto.start.5=reference:file:application-bundles/org.amdatu.opensocial.shindig-${platform.version}.jar
reference:file:platform-bundles/org.amdatu.platform.cassandra-application-${platform.version}.jar
reference:file:platform-bundles/org.amdatu.platform.cassandra-listener-${platform.version}.jar
reference:file:platform-bundles/org.amdatu.platform.cassandra-persistencemanager-${platform.version}.jar
reference:file:platform-bundles/org.amdatu.platform.loghandler-${platform.version}.jar
reference:file:application-bundles/org.amdatu.opensocial.profile-${platform.version}.jar
reference:file:platform-bundles/org.amdatu.platform.tenant-service-${platform.version}.jar
reference:file:platform-bundles/org.amdatu.platform.authorization-${platform.version}.jar
reference:file:application-bundles/org.amdatu.web.httpcontext-${platform.version}.jar
reference:file:platform-bundles/org.amdatu.platform.wink-application-${platform.version}.jar
reference:file:application-bundles/org.amdatu.semanticweb.sesame-${platform.version}.jar
reference:file:platform-bundles/org.amdatu.platform.config-template-manager-${platform.version}.jar
reference:file:platform-bundles/org.amdatu.platform.useradmin-cassandra-store-${platform.version}.jar
+felix.auto.start.10=reference:file:application-bundles/org.amdatu.opensocial.dashboard-${platform.version}.jar
reference:file:application-bundles/org.amdatu.opensocial.gadgetmanagement-${platform.version}.jar
reference:file:application-bundles/org.amdatu.web.jsp-${platform.version}.jar
felix.auto.start.20=reference:file:application-bundles/org.amdatu.semanticweb.sparqlendpoint-${platform.version}.jar
reference:file:gadget-bundles/org.amdatu.gadget.login-${platform.version}.jar
felix.auto.start.30=reference:file:example-bundles/org.amdatu.example.friends-gadget-${platform.version}.jar
reference:file:example-bundles/org.amdatu.example.course-gadget-${platform.version}.jar
reference:file:example-bundles/org.amdatu.example.course-service-${platform.version}.jar
