Author: ivol37 at gmail.com
Date: Tue Nov 9 17:00:21 2010
New Revision: 313
Log:
[AMDATU-129] Ongoing Refactoring/moving of SVN layout
Modified:
trunk/amdatu-authorization/login-gadget/src/main/java/org/amdatu/authorization/logingadget/osgi/Activator.java
trunk/amdatu-authorization/login-service/pom.xml
trunk/amdatu-authorization/login-service/src/main/java/org/amdatu/authorization/loginservice/AuthorizationService.java
trunk/amdatu-authorization/login-service/src/main/java/org/amdatu/authorization/loginservice/osgi/Activator.java
trunk/amdatu-authorization/login-service/src/main/java/org/amdatu/authorization/loginservice/service/AuthorizationServiceImpl.java
trunk/amdatu-example/course-service/src/main/java/org/amdatu/example/courseservice/impl/CourseResource.java
trunk/amdatu-example/course-service/src/main/java/org/amdatu/example/courseservice/impl/ProfileDataProvider.java
trunk/amdatu-opensocial/dashboard-bundle/pom.xml
trunk/amdatu-opensocial/gadget-management/pom.xml
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/service/PersonServiceImpl.java
trunk/amdatu-release/pom.xml
trunk/amdatu-web/httpcontext/src/main/java/org/amdatu/web/httpcontext/ExtHttpContext.java
Modified:
trunk/amdatu-authorization/login-gadget/src/main/java/org/amdatu/authorization/logingadget/osgi/Activator.java
==============================================================================
---
trunk/amdatu-authorization/login-gadget/src/main/java/org/amdatu/authorization/logingadget/osgi/Activator.java
(original)
+++
trunk/amdatu-authorization/login-gadget/src/main/java/org/amdatu/authorization/logingadget/osgi/Activator.java
Tue Nov 9 17:00:21 2010
@@ -18,7 +18,7 @@
import org.amdatu.opensocial.gadgetmanagement.GadgetManagement;
import org.amdatu.authorization.logingadget.service.LoginServiceImpl;
-import org.amdatu.platform.authorization.AuthorizationService;
+import org.amdatu.authorization.loginservice.AuthorizationService;
import org.amdatu.web.httpcontext.HttpContextServiceFactory;
import org.amdatu.web.httpcontext.ResourceProvider;
import org.apache.felix.dm.DependencyActivatorBase;
Modified: trunk/amdatu-authorization/login-service/pom.xml
==============================================================================
--- trunk/amdatu-authorization/login-service/pom.xml (original)
+++ trunk/amdatu-authorization/login-service/pom.xml Tue Nov 9 17:00:21 2010
@@ -59,9 +59,9 @@
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
-
<Bundle-Activator>org.amdatu.platform.authorization.osgi.Activator</Bundle-Activator>
-
<Bundle-SymbolicName>org.amdatu.platform.authorization</Bundle-SymbolicName>
- <Export-Package>org.amdatu.platform.authorization</Export-Package>
+
<Bundle-Activator>org.amdatu.authorization.loginservice.osgi.Activator</Bundle-Activator>
+
<Bundle-SymbolicName>org.amdatu.authorization.loginservice</Bundle-SymbolicName>
+
<Export-Package>org.amdatu.authorization.loginservice</Export-Package>
<Embed-Dependency>*;scope=compile</Embed-Dependency>
<Embed-Transitive>true</Embed-Transitive>
</instructions>
Modified:
trunk/amdatu-authorization/login-service/src/main/java/org/amdatu/authorization/loginservice/AuthorizationService.java
==============================================================================
---
trunk/amdatu-authorization/login-service/src/main/java/org/amdatu/authorization/loginservice/AuthorizationService.java
(original)
+++
trunk/amdatu-authorization/login-service/src/main/java/org/amdatu/authorization/loginservice/AuthorizationService.java
Tue Nov 9 17:00:21 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.authorization;
+package org.amdatu.authorization.loginservice;
/**
Modified:
trunk/amdatu-authorization/login-service/src/main/java/org/amdatu/authorization/loginservice/osgi/Activator.java
==============================================================================
---
trunk/amdatu-authorization/login-service/src/main/java/org/amdatu/authorization/loginservice/osgi/Activator.java
(original)
+++
trunk/amdatu-authorization/login-service/src/main/java/org/amdatu/authorization/loginservice/osgi/Activator.java
Tue Nov 9 17:00:21 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.platform.authorization.osgi;
+package org.amdatu.authorization.loginservice.osgi;
-import org.amdatu.platform.authorization.AuthorizationService;
-import org.amdatu.platform.authorization.service.AuthorizationServiceImpl;
+import org.amdatu.authorization.loginservice.AuthorizationService;
+import org.amdatu.authorization.loginservice.service.AuthorizationServiceImpl;
import org.amdatu.platform.configtemplatemanager.ConfigTemplateManager;
import org.amdatu.web.httpcontext.HttpContextServiceFactory;
import org.apache.felix.dm.DependencyActivatorBase;
Modified:
trunk/amdatu-authorization/login-service/src/main/java/org/amdatu/authorization/loginservice/service/AuthorizationServiceImpl.java
==============================================================================
---
trunk/amdatu-authorization/login-service/src/main/java/org/amdatu/authorization/loginservice/service/AuthorizationServiceImpl.java
(original)
+++
trunk/amdatu-authorization/login-service/src/main/java/org/amdatu/authorization/loginservice/service/AuthorizationServiceImpl.java
Tue Nov 9 17:00:21 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.authorization.service;
+package org.amdatu.authorization.loginservice.service;
import javax.servlet.http.HttpServletRequest;
import javax.ws.rs.*;
@@ -23,8 +23,8 @@
import javax.ws.rs.core.Response;
import java.net.URL;
-import org.amdatu.platform.authorization.AuthorizationService;
-import org.amdatu.platform.authorization.osgi.Activator;
+import org.amdatu.authorization.loginservice.AuthorizationService;
+import org.amdatu.authorization.loginservice.osgi.Activator;
import org.amdatu.web.httpcontext.BasicHttpSession;
import org.amdatu.web.httpcontext.HttpContextServiceFactory;
import org.amdatu.web.httpcontext.ResourceProvider;
Modified:
trunk/amdatu-example/course-service/src/main/java/org/amdatu/example/courseservice/impl/CourseResource.java
==============================================================================
---
trunk/amdatu-example/course-service/src/main/java/org/amdatu/example/courseservice/impl/CourseResource.java
(original)
+++
trunk/amdatu-example/course-service/src/main/java/org/amdatu/example/courseservice/impl/CourseResource.java
Tue Nov 9 17:00:21 2010
@@ -33,7 +33,7 @@
import org.amdatu.example.courseservice.Course;
import org.amdatu.example.courseservice.CourseList;
import org.amdatu.example.courseservice.CourseService;
-import org.amdatu.platform.authorization.AuthorizationService;
+import org.amdatu.authorization.loginservice.AuthorizationService;
import org.amdatu.platform.configtemplatemanager.ConfigTemplateManager;
import org.amdatu.web.httpcontext.HttpContextServiceFactory;
import org.amdatu.web.httpcontext.ResourceProvider;
Modified:
trunk/amdatu-example/course-service/src/main/java/org/amdatu/example/courseservice/impl/ProfileDataProvider.java
==============================================================================
---
trunk/amdatu-example/course-service/src/main/java/org/amdatu/example/courseservice/impl/ProfileDataProvider.java
(original)
+++
trunk/amdatu-example/course-service/src/main/java/org/amdatu/example/courseservice/impl/ProfileDataProvider.java
Tue Nov 9 17:00:21 2010
@@ -16,7 +16,7 @@
*/
package org.amdatu.example.courseservice.impl;
-import org.amdatu.platform.authorization.AuthorizationService;
+import org.amdatu.authorization.loginservice.AuthorizationService;
import org.amdatu.opensocial.profile.PersonService;
import org.amdatu.opensocial.profile.SerializablePersonImpl;
import org.apache.shindig.social.core.model.NameImpl;
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 17:00:21 2010
@@ -15,8 +15,8 @@
<dependencies>
<dependency>
- <groupId>org.amdatu.platform</groupId>
- <artifactId>authorization</artifactId>
+ <groupId>org.amdatu.authorization</groupId>
+ <artifactId>loginservice</artifactId>
<scope>provided</scope>
<type>bundle</type>
</dependency>
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 17:00:21 2010
@@ -21,8 +21,8 @@
<type>bundle</type>
</dependency>
<dependency>
- <groupId>org.amdatu.platform</groupId>
- <artifactId>authorization</artifactId>
+ <groupId>org.amdatu.authorization</groupId>
+ <artifactId>loginservice</artifactId>
<scope>provided</scope>
<type>bundle</type>
</dependency>
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/opensocial/gadgetmanagement/service/GadgetManagementServiceImpl.java
(original)
+++
trunk/amdatu-opensocial/gadget-management/src/main/java/org/amdatu/opensocial/gadgetmanagement/service/GadgetManagementServiceImpl.java
Tue Nov 9 17:00:21 2010
@@ -45,7 +45,7 @@
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.authorization.loginservice.AuthorizationService;
import org.amdatu.platform.cassandra.persistencemanager.CassandraException;
import org.amdatu.web.httpcontext.BasicHttpSession;
import org.amdatu.web.httpcontext.HttpContextServiceFactory;
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 17:00:21 2010
@@ -45,8 +45,8 @@
<type>bundle</type>
</dependency>
<dependency>
- <groupId>org.amdatu.platform</groupId>
- <artifactId>authorization</artifactId>
+ <groupId>org.amdatu.authorization</groupId>
+ <artifactId>loginservice</artifactId>
<scope>provided</scope>
<type>bundle</type>
</dependency>
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/opensocial/profile/service/PersonServiceImpl.java
(original)
+++
trunk/amdatu-opensocial/profile-service/src/main/java/org/amdatu/opensocial/profile/service/PersonServiceImpl.java
Tue Nov 9 17:00:21 2010
@@ -22,7 +22,7 @@
import java.util.Set;
import java.util.concurrent.Future;
-import org.amdatu.platform.authorization.AuthorizationService;
+import org.amdatu.authorization.loginservice.AuthorizationService;
import org.amdatu.opensocial.profile.PersonService;
import org.apache.shindig.auth.SecurityToken;
import org.apache.shindig.common.util.ImmediateFuture;
Modified: trunk/amdatu-release/pom.xml
==============================================================================
--- trunk/amdatu-release/pom.xml (original)
+++ trunk/amdatu-release/pom.xml Tue Nov 9 17:00:21 2010
@@ -76,8 +76,8 @@
<!-- Platform bundles -->
<dependency>
- <groupId>org.amdatu.platform</groupId>
- <artifactId>authorization</artifactId>
+ <groupId>org.amdatu.authorization</groupId>
+ <artifactId>loginservice</artifactId>
<version>${platform.version}</version>
<scope>compile</scope>
<type>bundle</type>
Modified:
trunk/amdatu-web/httpcontext/src/main/java/org/amdatu/web/httpcontext/ExtHttpContext.java
==============================================================================
---
trunk/amdatu-web/httpcontext/src/main/java/org/amdatu/web/httpcontext/ExtHttpContext.java
(original)
+++
trunk/amdatu-web/httpcontext/src/main/java/org/amdatu/web/httpcontext/ExtHttpContext.java
Tue Nov 9 17:00:21 2010
@@ -23,7 +23,7 @@
/**
* Extension of the normal HttContext, needed for proper filter registration
and deregistration
* in Pax Web.
- * @see org.amdatu.platform.authorization.service.AuthorizationService
+ * @see org.amdatu.authorization.loginservice.service.AuthorizationService
* @author ivol
*/
public interface ExtHttpContext extends HttpContext {
