Author: ivol37 at gmail.com
Date: Tue Nov 9 16:09:27 2010
New Revision: 286
Log:
[AMDATU-129] Ongoing Refactoring/moving of SVN layout
Added:
trunk/amdatu-libraries/
- copied from r281, /trunk/libraries/
trunk/amdatu-opensocial/dashboard-bundle/src/main/java/org/amdatu/opensocial/dashboard/service/DashboardServiceImpl.java
- copied, changed from r284,
/trunk/amdatu-opensocial/dashboard-bundle/src/main/java/org/amdatu/opensocial/dashboard/service/DashboardService.java
Removed:
trunk/amdatu-opensocial/dashboard-bundle/src/main/java/org/amdatu/opensocial/dashboard/service/DashboardService.java
trunk/libraries/
Modified:
trunk/amdatu-opensocial/dashboard-bundle/src/main/java/org/amdatu/opensocial/dashboard/osgi/Activator.java
trunk/pom.xml
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/opensocial/dashboard/osgi/Activator.java
(original)
+++
trunk/amdatu-opensocial/dashboard-bundle/src/main/java/org/amdatu/opensocial/dashboard/osgi/Activator.java
Tue Nov 9 16:09:27 2010
@@ -16,7 +16,7 @@
*/
package org.amdatu.opensocial.dashboard.osgi;
-import org.amdatu.opensocial.dashboard.service.DashboardService;
+import org.amdatu.opensocial.dashboard.service.DashboardServiceImpl;
import org.amdatu.web.httpcontext.HttpContextServiceFactory;
import org.amdatu.web.httpcontext.ResourceProvider;
import org.apache.felix.dm.DependencyActivatorBase;
@@ -41,7 +41,7 @@
manager.add(
createComponent()
.setInterface(ResourceProvider.class.getName(), null)
- .setImplementation(DashboardService.class)
+ .setImplementation(DashboardServiceImpl.class)
.add(createServiceDependency().setService(LogService.class).setRequired(true))
.add(createServiceDependency().setService(HttpContextServiceFactory.class).setRequired(true))
.add(createServiceDependency().setService(HttpService.class).setRequired(true)));
Copied:
trunk/amdatu-opensocial/dashboard-bundle/src/main/java/org/amdatu/opensocial/dashboard/service/DashboardServiceImpl.java
(from r284,
/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/opensocial/dashboard/service/DashboardService.java
(original)
+++
trunk/amdatu-opensocial/dashboard-bundle/src/main/java/org/amdatu/opensocial/dashboard/service/DashboardServiceImpl.java
Tue Nov 9 16:09:27 2010
@@ -33,7 +33,7 @@
*
* @author ivol
*/
-public class DashboardService implements ResourceProvider {
+public class DashboardServiceImpl implements ResourceProvider {
// Services injected by the Felix dependency manager
private volatile BundleContext m_bundleContext;
private volatile LogService m_logService;
Modified: trunk/pom.xml
==============================================================================
--- trunk/pom.xml (original)
+++ trunk/pom.xml Tue Nov 9 16:09:27 2010
@@ -581,13 +581,13 @@
-->
<modules>
<module>amdatu-buildsupport</module>
+ <module>amdatu-libraries</module>
<module>amdatu-opensocial</module>
<module>amdatu-release</module>
<module>amdatu-semanticweb</module>
<module>amdatu-web</module>
<module>platform-bundles</module>
<module>gadget-bundles</module>
- <module>libraries</module>
<module>example-bundles</module>
<module>integration-tests</module>
</modules>