Author: ivol37 at gmail.com
Date: Wed Nov 10 11:21:31 2010
New Revision: 327
Log:
[AMDATU-129] Ongoing Refactoring/moving of SVN layout
Added:
trunk/amdatu-authorization/loginservice/src/main/java/org/amdatu/authorization/loginservice/LoginService.java
- copied, changed from r325,
/trunk/amdatu-authorization/loginservice/src/main/java/org/amdatu/authorization/loginservice/AuthorizationService.java
trunk/amdatu-authorization/loginservice/src/main/java/org/amdatu/authorization/loginservice/service/LoginServiceImpl.java
- copied, changed from r325,
/trunk/amdatu-authorization/loginservice/src/main/java/org/amdatu/authorization/loginservice/service/AuthorizationServiceImpl.java
trunk/amdatu-core/config-filebased/
- copied from r324, /trunk/amdatu-core/filebased-configuration/
trunk/amdatu-core/config-templates/
- copied from r324, /trunk/amdatu-core/config-template-manager/
Removed:
trunk/amdatu-authorization/loginservice/src/main/java/org/amdatu/authorization/loginservice/AuthorizationService.java
trunk/amdatu-authorization/loginservice/src/main/java/org/amdatu/authorization/loginservice/service/AuthorizationServiceImpl.java
trunk/amdatu-core/config-template-manager/pom.xml
trunk/amdatu-core/config-template-manager/src/
trunk/amdatu-core/filebased-configuration/pom.xml
trunk/amdatu-core/filebased-configuration/src/
Modified:
trunk/amdatu-authorization/logingadget/src/main/java/org/amdatu/authorization/logingadget/osgi/Activator.java
trunk/amdatu-authorization/loginservice/src/main/java/org/amdatu/authorization/loginservice/osgi/Activator.java
trunk/amdatu-core/config-filebased/pom.xml
trunk/amdatu-core/config-templates/pom.xml
trunk/amdatu-core/pom.xml
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/gadget-management/src/main/java/org/amdatu/opensocial/gadgetmanagement/service/GadgetManagementServiceImpl.java
trunk/amdatu-opensocial/profile-service/src/main/java/org/amdatu/opensocial/profile/service/PersonServiceImpl.java
Modified:
trunk/amdatu-authorization/logingadget/src/main/java/org/amdatu/authorization/logingadget/osgi/Activator.java
==============================================================================
---
trunk/amdatu-authorization/logingadget/src/main/java/org/amdatu/authorization/logingadget/osgi/Activator.java
(original)
+++
trunk/amdatu-authorization/logingadget/src/main/java/org/amdatu/authorization/logingadget/osgi/Activator.java
Wed Nov 10 11:21:31 2010
@@ -18,7 +18,7 @@
import org.amdatu.opensocial.gadgetmanagement.GadgetManagement;
import org.amdatu.authorization.logingadget.service.LoginGadgetImpl;
-import org.amdatu.authorization.loginservice.AuthorizationService;
+import org.amdatu.authorization.loginservice.LoginService;
import org.amdatu.web.httpcontext.HttpContextServiceFactory;
import org.amdatu.web.httpcontext.ResourceProvider;
import org.apache.felix.dm.DependencyActivatorBase;
@@ -46,7 +46,7 @@
.add(createServiceDependency().setService(UserAdmin.class).setRequired(true))
.add(createServiceDependency().setService(GadgetManagement.class).setRequired(true))
.add(createServiceDependency().setService(HttpContextServiceFactory.class).setRequired(true))
-
.add(createServiceDependency().setService(AuthorizationService.class).setRequired(true))
+
.add(createServiceDependency().setService(LoginService.class).setRequired(true))
.add(createConfigurationDependency().setPid(LoginGadgetImpl.PID)));
}
Copied:
trunk/amdatu-authorization/loginservice/src/main/java/org/amdatu/authorization/loginservice/LoginService.java
(from r325,
/trunk/amdatu-authorization/loginservice/src/main/java/org/amdatu/authorization/loginservice/AuthorizationService.java)
==============================================================================
---
/trunk/amdatu-authorization/loginservice/src/main/java/org/amdatu/authorization/loginservice/AuthorizationService.java
(original)
+++
trunk/amdatu-authorization/loginservice/src/main/java/org/amdatu/authorization/loginservice/LoginService.java
Wed Nov 10 11:21:31 2010
@@ -21,7 +21,7 @@
* This interface defines the authorization service.
* @author ivol
*/
-public interface AuthorizationService {
+public interface LoginService {
/**
* Key under which the username is stored in the credentials of the User.
*/
Modified:
trunk/amdatu-authorization/loginservice/src/main/java/org/amdatu/authorization/loginservice/osgi/Activator.java
==============================================================================
---
trunk/amdatu-authorization/loginservice/src/main/java/org/amdatu/authorization/loginservice/osgi/Activator.java
(original)
+++
trunk/amdatu-authorization/loginservice/src/main/java/org/amdatu/authorization/loginservice/osgi/Activator.java
Wed Nov 10 11:21:31 2010
@@ -16,8 +16,8 @@
*/
package org.amdatu.authorization.loginservice.osgi;
-import org.amdatu.authorization.loginservice.AuthorizationService;
-import org.amdatu.authorization.loginservice.service.AuthorizationServiceImpl;
+import org.amdatu.authorization.loginservice.LoginService;
+import org.amdatu.authorization.loginservice.service.LoginServiceImpl;
import org.amdatu.core.configtemplatemanager.ConfigTemplateManager;
import org.amdatu.web.httpcontext.HttpContextServiceFactory;
import org.apache.felix.dm.DependencyActivatorBase;
@@ -40,8 +40,8 @@
// Create and register the authorization service.
manager.add(
createComponent()
- .setInterface(AuthorizationService.class.getName(), null)
- .setImplementation(AuthorizationServiceImpl.class)
+ .setInterface(LoginService.class.getName(), null)
+ .setImplementation(LoginServiceImpl.class)
.add(createServiceDependency().setService(HttpContextServiceFactory.class).setRequired(true))
.add(createServiceDependency().setService(LogService.class).setRequired(true))
.add(createServiceDependency().setService(ConfigTemplateManager.class).setRequired(true))
Copied:
trunk/amdatu-authorization/loginservice/src/main/java/org/amdatu/authorization/loginservice/service/LoginServiceImpl.java
(from r325,
/trunk/amdatu-authorization/loginservice/src/main/java/org/amdatu/authorization/loginservice/service/AuthorizationServiceImpl.java)
==============================================================================
---
/trunk/amdatu-authorization/loginservice/src/main/java/org/amdatu/authorization/loginservice/service/AuthorizationServiceImpl.java
(original)
+++
trunk/amdatu-authorization/loginservice/src/main/java/org/amdatu/authorization/loginservice/service/LoginServiceImpl.java
Wed Nov 10 11:21:31 2010
@@ -23,7 +23,7 @@
import javax.ws.rs.core.Response;
import java.net.URL;
-import org.amdatu.authorization.loginservice.AuthorizationService;
+import org.amdatu.authorization.loginservice.LoginService;
import org.amdatu.authorization.loginservice.osgi.Activator;
import org.amdatu.web.httpcontext.BasicHttpSession;
import org.amdatu.web.httpcontext.HttpContextServiceFactory;
@@ -40,7 +40,7 @@
* @author ivol
*/
@Path ("authorization")
-public class AuthorizationServiceImpl implements ResourceProvider,
AuthorizationService {
+public class LoginServiceImpl implements ResourceProvider, LoginService {
// Default Administrator user credentials
private static final String DEFAULT_USERNAME = "Administrator";
private static final String DEFAULT_PASSWORD = "Administrator";
Modified: trunk/amdatu-core/config-filebased/pom.xml
==============================================================================
--- /trunk/amdatu-core/filebased-configuration/pom.xml (original)
+++ trunk/amdatu-core/config-filebased/pom.xml Wed Nov 10 11:21:31 2010
@@ -8,8 +8,8 @@
<version>0.0.6-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.amdatu.core</groupId>
- <artifactId>filebased-configuration</artifactId>
+ <groupId>org.amdatu.core.config</groupId>
+ <artifactId>filebased</artifactId>
<packaging>bundle</packaging>
<name>Amdatu Core - File Based Configuration</name>
<description>This bundle contains the configuration files of all Amdatu
bundles and is repsonsible for registration of these configs in
ConfigAdmin.</description>
Modified: trunk/amdatu-core/config-templates/pom.xml
==============================================================================
--- /trunk/amdatu-core/config-template-manager/pom.xml (original)
+++ trunk/amdatu-core/config-templates/pom.xml Wed Nov 10 11:21:31 2010
@@ -7,10 +7,10 @@
<artifactId>org.amdatu.core</artifactId>
<version>0.0.6-SNAPSHOT</version>
</parent>
- <groupId>org.amdatu.core</groupId>
- <artifactId>config-template-manager</artifactId>
+ <groupId>org.amdatu.core.config</groupId>
+ <artifactId>templates</artifactId>
<packaging>bundle</packaging>
- <name>Amdatu Core - Configuration Template Manager</name>
+ <name>Amdatu Core - Configuration Templates</name>
<description>The template manager can be used to replace configurable
properties in any file with configuration properties provided by
ConfigAdmin</description>
<dependencies>
Modified: trunk/amdatu-core/pom.xml
==============================================================================
--- trunk/amdatu-core/pom.xml (original)
+++ trunk/amdatu-core/pom.xml Wed Nov 10 11:21:31 2010
@@ -17,12 +17,12 @@
<module>cassandra-application</module>
<module>cassandra-listener</module>
<module>cassandra-persistencemanager</module>
- <module>config-template-manager</module>
+ <module>config-templates</module>
+ <module>config-filebased</module>
<module>loghandler</module>
<module>tenant-service</module>
<module>useradmin-cassandra-store</module>
<module>wink-application</module>
- <module>filebased-configuration</module>
</modules>
<build>
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
Wed Nov 10 11:21:31 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.authorization.loginservice.AuthorizationService;
+import org.amdatu.authorization.loginservice.LoginService;
import org.amdatu.core.configtemplatemanager.ConfigTemplateManager;
import org.amdatu.web.httpcontext.HttpContextServiceFactory;
import org.amdatu.web.httpcontext.ResourceProvider;
@@ -114,7 +114,7 @@
return courseList;
} else {
// Get the profile
- User user =
m_userAdmin.getUser(AuthorizationService.USER_NAME_CREDENTIAL_KEY, viewer);
+ User user =
m_userAdmin.getUser(LoginService.USER_NAME_CREDENTIAL_KEY, viewer);
if (user != null) {
// Loop over all person services until we found a service
that knows this person (which
// means the person is available in that tenant).
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
Wed Nov 10 11:21:31 2010
@@ -16,7 +16,7 @@
*/
package org.amdatu.example.courseservice.impl;
-import org.amdatu.authorization.loginservice.AuthorizationService;
+import org.amdatu.authorization.loginservice.LoginService;
import org.amdatu.opensocial.profile.PersonService;
import org.amdatu.opensocial.profile.SerializablePersonImpl;
import org.apache.shindig.social.core.model.NameImpl;
@@ -87,7 +87,7 @@
user = (User) m_userAdmin.createRole(id, Role.USER);
}
if (user != null) {
-
user.getCredentials().put(AuthorizationService.PASSWORD_CREDENTIAL_KEY, id);
+ user.getCredentials().put(LoginService.PASSWORD_CREDENTIAL_KEY,
id);
SerializablePersonImpl person = new SerializablePersonImpl();
person.setId(id);
person.setDisplayName(name);
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
Wed Nov 10 11:21:31 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.authorization.loginservice.AuthorizationService;
+import org.amdatu.authorization.loginservice.LoginService;
import org.amdatu.core.cassandra.persistencemanager.CassandraException;
import org.amdatu.web.httpcontext.BasicHttpSession;
import org.amdatu.web.httpcontext.HttpContextServiceFactory;
@@ -255,7 +255,7 @@
User user = null;
String[] gadgetUrls = null;
if (viewer != null && !"anonymous".equals(viewer)) {
- user =
m_userAdmin.getUser(AuthorizationService.USER_NAME_CREDENTIAL_KEY, viewer);
+ user =
m_userAdmin.getUser(LoginService.USER_NAME_CREDENTIAL_KEY, viewer);
byte[] bytesValue = (byte[])
user.getProperties().get(OpenSocialConstants.APP_DATA);
if (bytesValue != null) {
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
Wed Nov 10 11:21:31 2010
@@ -22,7 +22,7 @@
import java.util.Set;
import java.util.concurrent.Future;
-import org.amdatu.authorization.loginservice.AuthorizationService;
+import org.amdatu.authorization.loginservice.LoginService;
import org.amdatu.opensocial.profile.PersonService;
import org.apache.shindig.auth.SecurityToken;
import org.apache.shindig.common.util.ImmediateFuture;
@@ -126,7 +126,7 @@
public User getUser(Person person) {
// Retrieved all persons that match the specified profile.
- return
m_userAdmin.getUser(AuthorizationService.USER_NAME_CREDENTIAL_KEY,
person.getId());
+ return m_userAdmin.getUser(LoginService.USER_NAME_CREDENTIAL_KEY,
person.getId());
}
public Person getPerson(User user) {
@@ -182,7 +182,7 @@
// Returns the person with the specified id.
private Person getPerson(String id) {
- User user =
m_userAdmin.getUser(AuthorizationService.USER_NAME_CREDENTIAL_KEY, id);
+ User user = m_userAdmin.getUser(LoginService.USER_NAME_CREDENTIAL_KEY,
id);
if (user != null) {
try {
byte[] personBytes = (byte[])
user.getProperties().get(PersonService.OPEN_SOCIAL_PERSON_PROPERTIES_KEY);
