Author: angelo.vandersijpt at luminis.eu
Date: Fri Oct 8 17:02:54 2010
New Revision: 142
Log:
Replaced tabs by spaces.
Modified:
trunk/example-bundles/course-service/src/main/java/org/amdatu/example/course/service/Course.java
trunk/example-bundles/course-service/src/main/java/org/amdatu/example/course/service/CourseList.java
trunk/example-bundles/course-service/src/main/java/org/amdatu/example/course/service/CourseService.java
trunk/platform-bundles/profile-service/src/main/java/org/amdatu/platform/profile/Friend.java
trunk/platform-bundles/profile-service/src/main/java/org/amdatu/platform/profile/osgi/Activator.java
trunk/platform-bundles/sesame-application/src/main/java/org/amdatu/platform/sesame/application/osgi/Activator.java
trunk/platform-bundles/shindig-application/src/main/java/org/amdatu/platform/shindig/application/module/PropertiesModule.java
trunk/platform-bundles/shindig-application/src/main/java/org/amdatu/platform/shindig/application/service/PersonServiceDispatcher.java
trunk/platform-bundles/shindig-application/src/main/java/org/amdatu/platform/shindig/application/service/ShindigConfigurator.java
trunk/platform-bundles/tenant-service/src/main/java/org/amdatu/platform/tenant/service/TenantColumnFamilyProvider.java
Modified:
trunk/example-bundles/course-service/src/main/java/org/amdatu/example/course/service/Course.java
==============================================================================
---
trunk/example-bundles/course-service/src/main/java/org/amdatu/example/course/service/Course.java
(original)
+++
trunk/example-bundles/course-service/src/main/java/org/amdatu/example/course/service/Course.java
Fri Oct 8 17:02:54 2010
@@ -35,7 +35,7 @@
@XmlRootElement(name = "course")
@XmlAccessorType(XmlAccessType.FIELD)
public class Course {
- // Name of the course
+ // Name of the course
@XmlAttribute(name="name")
private String m_name;
@@ -50,13 +50,13 @@
/**
* Default constructor.
*/
- public Course() {
- }
-
- /**
- * Constructor. Creates a new course with the specified name.
- * @param name name of the course
- */
+ public Course() {
+ }
+
+ /**
+ * Constructor. Creates a new course with the specified name.
+ * @param name name of the course
+ */
public Course(String name) {
m_name = name;
}
Modified:
trunk/example-bundles/course-service/src/main/java/org/amdatu/example/course/service/CourseList.java
==============================================================================
---
trunk/example-bundles/course-service/src/main/java/org/amdatu/example/course/service/CourseList.java
(original)
+++
trunk/example-bundles/course-service/src/main/java/org/amdatu/example/course/service/CourseList.java
Fri Oct 8 17:02:54 2010
@@ -43,23 +43,23 @@
@XmlSeeAlso({Course.class})
public class CourseList {
// The user to which this list of courses applies
- @XmlAttribute(name="user")
+ @XmlAttribute(name="user")
private String m_user;
-
- // List of courses
- @XmlElementRef
- private List<Course> m_courses;
-
- /**
- * Default constructor.
- */
- public CourseList() {
- }
-
- /**
- * Sets the user.
- * @param user the user to set
- */
+
+ // List of courses
+ @XmlElementRef
+ private List<Course> m_courses;
+
+ /**
+ * Default constructor.
+ */
+ public CourseList() {
+ }
+
+ /**
+ * Sets the user.
+ * @param user the user to set
+ */
public void setUser(String user) {
m_user = user;
}
Modified:
trunk/example-bundles/course-service/src/main/java/org/amdatu/example/course/service/CourseService.java
==============================================================================
---
trunk/example-bundles/course-service/src/main/java/org/amdatu/example/course/service/CourseService.java
(original)
+++
trunk/example-bundles/course-service/src/main/java/org/amdatu/example/course/service/CourseService.java
Fri Oct 8 17:02:54 2010
@@ -38,13 +38,13 @@
*/
public static final String EDUCA_DATA_URI_BASE =
"/examples/course/rdf/educa/data";
- /**
- * Returns the list of available courses for the specified person.
- * @param person the person to retrieve available courses for.
- * @return the list of available courses for the specified person.
- */
- List<Course> getAvailableCourses(Person person) throws IOException;
-
+ /**
+ * Returns the list of available courses for the specified person.
+ * @param person the person to retrieve available courses for.
+ * @return the list of available courses for the specified person.
+ */
+ List<Course> getAvailableCourses(Person person) throws IOException;
+
/**
* Returns the base url of all ontologies for this bundle.
* @return The base url for all ontologies
Modified:
trunk/platform-bundles/profile-service/src/main/java/org/amdatu/platform/profile/Friend.java
==============================================================================
---
trunk/platform-bundles/profile-service/src/main/java/org/amdatu/platform/profile/Friend.java
(original)
+++
trunk/platform-bundles/profile-service/src/main/java/org/amdatu/platform/profile/Friend.java
Fri Oct 8 17:02:54 2010
@@ -21,27 +21,27 @@
* @author ivol
*/
public interface Friend {
- /**
- * Returns the id of the user that has the friend.
- * @return Id of the user that has the friend.
- */
+ /**
+ * Returns the id of the user that has the friend.
+ * @return Id of the user that has the friend.
+ */
String getId();
/**
* Sets the id of the user that has the friend.
* @param if Id of the user that has the friend.
*/
- void setId(String id);
+ void setId(String id);
- /**
- * Returns the user id of the friend.
- * @return the user id of the friend.
- */
- String getFriendId();
+ /**
+ * Returns the user id of the friend.
+ * @return the user id of the friend.
+ */
+ String getFriendId();
- /**
- * Sets the user id of the friend.
- * @param friendId The user id of the friend
- */
- void setFriendId(String friendId);
+ /**
+ * Sets the user id of the friend.
+ * @param friendId The user id of the friend
+ */
+ void setFriendId(String friendId);
}
Modified:
trunk/platform-bundles/profile-service/src/main/java/org/amdatu/platform/profile/osgi/Activator.java
==============================================================================
---
trunk/platform-bundles/profile-service/src/main/java/org/amdatu/platform/profile/osgi/Activator.java
(original)
+++
trunk/platform-bundles/profile-service/src/main/java/org/amdatu/platform/profile/osgi/Activator.java
Fri Oct 8 17:02:54 2010
@@ -43,7 +43,7 @@
// will be instantiated by the Felix dependency manager for each
available tenant.
String filter = "(" + ColumnFamilyAvailable.FILTER_NAME + "=" +
FriendColumnFamilyProvider.CF_FRIEND + ")";
manager.add(
- createComponent()
+ createComponent()
.setImplementation(PersonServiceImpl.class)
.setInterface(new String[]{PersonService.class.getName(),
org.apache.shindig.social.opensocial.spi.PersonService.class.getName()}, null)
.add(createServiceDependency().setService(LogService.class).setRequired(true))
Modified:
trunk/platform-bundles/sesame-application/src/main/java/org/amdatu/platform/sesame/application/osgi/Activator.java
==============================================================================
---
trunk/platform-bundles/sesame-application/src/main/java/org/amdatu/platform/sesame/application/osgi/Activator.java
(original)
+++
trunk/platform-bundles/sesame-application/src/main/java/org/amdatu/platform/sesame/application/osgi/Activator.java
Fri Oct 8 17:02:54 2010
@@ -35,9 +35,9 @@
*/
@Override
public void init(BundleContext context, DependencyManager manager) throws
Exception {
- System.out.println("Starting Sesame application bundle...");
+ System.out.println("Starting Sesame application bundle...");
- // Register the Sesame service
+ // Register the Sesame service
manager.add(
createComponent()
.setImplementation(SesameServiceImpl.class)
Modified:
trunk/platform-bundles/shindig-application/src/main/java/org/amdatu/platform/shindig/application/module/PropertiesModule.java
==============================================================================
---
trunk/platform-bundles/shindig-application/src/main/java/org/amdatu/platform/shindig/application/module/PropertiesModule.java
(original)
+++
trunk/platform-bundles/shindig-application/src/main/java/org/amdatu/platform/shindig/application/module/PropertiesModule.java
Fri Oct 8 17:02:54 2010
@@ -35,8 +35,8 @@
*/
public class PropertiesModule extends AbstractModule {
// The default properties file
- // FIXME: this file should be retrieved from a central configuration
service
- // See http://jira.amdatu.org/jira/browse/AMDATU-5.
+ // FIXME: this file should be retrieved from a central configuration
service
+ // See http://jira.amdatu.org/jira/browse/AMDATU-5.
private final static String DEFAULT_PROPERTIES = "shindig.properties";
// Instance variables
Modified:
trunk/platform-bundles/shindig-application/src/main/java/org/amdatu/platform/shindig/application/service/PersonServiceDispatcher.java
==============================================================================
---
trunk/platform-bundles/shindig-application/src/main/java/org/amdatu/platform/shindig/application/service/PersonServiceDispatcher.java
(original)
+++
trunk/platform-bundles/shindig-application/src/main/java/org/amdatu/platform/shindig/application/service/PersonServiceDispatcher.java
Fri Oct 8 17:02:54 2010
@@ -41,80 +41,80 @@
* @author ivol
*/
public class PersonServiceDispatcher implements PersonService {
- // The bundle context
- BundleContext m_bundleContext;
+ // The bundle context
+ BundleContext m_bundleContext;
- // The log service
- private LogService m_logService;
+ // The log service
+ private LogService m_logService;
- /**
- * Constructor.
- * @param bundleContext The bundle context
- */
- public PersonServiceDispatcher(BundleContext bundleContext, LogService
logService) {
- m_bundleContext = bundleContext;
- m_logService = logService;
- }
+ /**
+ * Constructor.
+ * @param bundleContext The bundle context
+ */
+ public PersonServiceDispatcher(BundleContext bundleContext, LogService
logService) {
+ m_bundleContext = bundleContext;
+ m_logService = logService;
+ }
- /**
- * {@inheritDoc}
- */
- public Future<RestfulCollection<Person>> getPeople(Set<UserId> userIds,
GroupId groupId,
- CollectionOptions collectionOptions, Set<String>
fields, SecurityToken token) throws ProtocolException {
- ServiceReference[] serviceReferences;
- try {
- // TODO: For now we just loop over all tenants and see
if one of them can identify the person
- // we are looking for.
- serviceReferences =
m_bundleContext.getServiceReferences(PersonService.class.getName(), null);
- if (serviceReferences != null &&
serviceReferences.length > 0) {
- for (ServiceReference serviceReference :
serviceReferences) {
- PersonService personService =
(PersonService) m_bundleContext.getService(serviceReference);
- Future<RestfulCollection<Person>>
people = personService.getPeople(userIds, groupId, collectionOptions, fields,
token);
- if (people != null) {
- try {
- if
(people.get().getTotalResults() > 0) {
- return people;
- }
- } catch (InterruptedException
e) {
-
m_logService.log(LogService.LOG_ERROR, "Could not retrieve people for userIds
'" + userIds + "'", e);
- } catch (ExecutionException e) {
-
m_logService.log(LogService.LOG_ERROR, "Could not retrieve people for userIds
'" + userIds + "'", e);
- }
- }
- }
- } else {
- m_logService.log(LogService.LOG_ERROR, "No
person service implementation available");
- }
- } catch (InvalidSyntaxException e) {
- m_logService.log(LogService.LOG_ERROR, "An error
occurred while dispatching method call to person service", e);
- }
- return null;
- }
+ /**
+ * {@inheritDoc}
+ */
+ public Future<RestfulCollection<Person>> getPeople(Set<UserId> userIds,
GroupId groupId,
+ CollectionOptions collectionOptions, Set<String> fields,
SecurityToken token) throws ProtocolException {
+ ServiceReference[] serviceReferences;
+ try {
+ // TODO: For now we just loop over all tenants and see if one of
them can identify the person
+ // we are looking for.
+ serviceReferences =
m_bundleContext.getServiceReferences(PersonService.class.getName(), null);
+ if (serviceReferences != null && serviceReferences.length > 0) {
+ for (ServiceReference serviceReference : serviceReferences) {
+ PersonService personService = (PersonService)
m_bundleContext.getService(serviceReference);
+ Future<RestfulCollection<Person>> people =
personService.getPeople(userIds, groupId, collectionOptions, fields, token);
+ if (people != null) {
+ try {
+ if (people.get().getTotalResults() > 0) {
+ return people;
+ }
+ } catch (InterruptedException e) {
+ m_logService.log(LogService.LOG_ERROR, "Could not
retrieve people for userIds '" + userIds + "'", e);
+ } catch (ExecutionException e) {
+ m_logService.log(LogService.LOG_ERROR, "Could not
retrieve people for userIds '" + userIds + "'", e);
+ }
+ }
+ }
+ } else {
+ m_logService.log(LogService.LOG_ERROR, "No person service
implementation available");
+ }
+ } catch (InvalidSyntaxException e) {
+ m_logService.log(LogService.LOG_ERROR, "An error occurred while
dispatching method call to person service", e);
+ }
+ return null;
+ }
- /**
- * {@inheritDoc}
- */
- public Future<Person> getPerson(UserId id, Set<String> fields,
SecurityToken token) throws ProtocolException {
- ServiceReference[] serviceReferences;
- try {
- // TODO: For now we just loop over all tenants and see
if one of them can identify the person
- // we are looking for.
- serviceReferences =
m_bundleContext.getServiceReferences(PersonService.class.getName(), null);
- if (serviceReferences != null &&
serviceReferences.length > 0) {
- for (ServiceReference serviceReference :
serviceReferences) {
- PersonService personService =
(PersonService) m_bundleContext.getService(serviceReference);
- Future<Person> person =
personService.getPerson(id, fields, token);
- if (person != null) {
- return person;
- }
- }
- } else {
- m_logService.log(LogService.LOG_ERROR, "No
person service implementation available");
- }
- } catch (InvalidSyntaxException e) {
- m_logService.log(LogService.LOG_ERROR, "An error
occurred while dispatching method call to person service", e);
- }
- return null;
- }
+ /**
+ * {@inheritDoc}
+ */
+ public Future<Person> getPerson(UserId id, Set<String> fields,
SecurityToken token) throws ProtocolException {
+ ServiceReference[] serviceReferences;
+ try {
+ // TODO: For now we just loop over all tenants and see if one of
them can identify the person
+ // we are looking for.
+ serviceReferences =
m_bundleContext.getServiceReferences(PersonService.class.getName(), null);
+ if (serviceReferences != null && serviceReferences.length > 0) {
+ for (ServiceReference serviceReference : serviceReferences) {
+ PersonService personService = (PersonService)
m_bundleContext.getService(serviceReference);
+ Future<Person> person = personService.getPerson(id,
fields, token);
+ if (person != null) {
+ return person;
+ }
+ }
+ } else {
+ m_logService.log(LogService.LOG_ERROR, "No person service
implementation available");
+ }
+ } catch (InvalidSyntaxException e) {
+ m_logService.log(LogService.LOG_ERROR, "An error occurred while
dispatching method call to person service", e);
+ }
+ return null;
+ }
}
Modified:
trunk/platform-bundles/shindig-application/src/main/java/org/amdatu/platform/shindig/application/service/ShindigConfigurator.java
==============================================================================
---
trunk/platform-bundles/shindig-application/src/main/java/org/amdatu/platform/shindig/application/service/ShindigConfigurator.java
(original)
+++
trunk/platform-bundles/shindig-application/src/main/java/org/amdatu/platform/shindig/application/service/ShindigConfigurator.java
Fri Oct 8 17:02:54 2010
@@ -59,7 +59,7 @@
Dictionary properties = config.getProperties();
if (properties == null) {
// FIXME: Properties not yet set, initialize the defaults
- // See http://jira.amdatu.org/jira/browse/AMDATU-5.
+ // See http://jira.amdatu.org/jira/browse/AMDATU-5.
properties = new Hashtable();
properties.put("shindig.signing.global-callback-url",
"http://localhost:3737/gadgets/oauthcallback";);
config.update(properties);
Modified:
trunk/platform-bundles/tenant-service/src/main/java/org/amdatu/platform/tenant/service/TenantColumnFamilyProvider.java
==============================================================================
---
trunk/platform-bundles/tenant-service/src/main/java/org/amdatu/platform/tenant/service/TenantColumnFamilyProvider.java
(original)
+++
trunk/platform-bundles/tenant-service/src/main/java/org/amdatu/platform/tenant/service/TenantColumnFamilyProvider.java
Fri Oct 8 17:02:54 2010
@@ -38,7 +38,7 @@
* ColumnFamily
*/
public final static String TENANT_AVAILABLE_FILTER = "(" +
ColumnFamilyAvailable.FILTER_NAME + "=" + CF_TENANT + ")";
-
+
/**
* @see ColumnFamilyProvider#getColumnFamilies()
*/
