Author: ivol37 at gmail.com
Date: Tue Nov 9 13:46:04 2010
New Revision: 270
Log:
[AMDATU-129] Refactored amdatu-web to conform to naming conventions - part 1
Modified:
trunk/amdatu-release/pom.xml
trunk/amdatu-web/httpcontext/pom.xml
trunk/amdatu-web/jsp-support-bundle/pom.xml
trunk/amdatu-web/jsp-support-bundle/src/main/java/org/amdatu/web/jsp/osgi/Activator.java
trunk/amdatu-web/jsp-support-bundle/src/main/java/org/amdatu/web/jsp/service/ResourceProviderJspServlet.java
trunk/amdatu-web/jsp-support-bundle/src/main/java/org/amdatu/web/jsp/service/ResourceProviderListener.java
trunk/application-bundles/dashboard-bundle/src/main/java/org/amdatu/application/dashboard/osgi/Activator.java
trunk/application-bundles/dashboard-bundle/src/main/java/org/amdatu/application/dashboard/service/DashboardService.java
trunk/application-bundles/dashboard-bundle/src/main/resources/jsp/dashboard.jsp
trunk/application-bundles/gadget-management/src/main/java/org/amdatu/application/gadgetmanagement/osgi/Activator.java
trunk/application-bundles/gadget-management/src/main/java/org/amdatu/application/gadgetmanagement/service/GadgetManagementServiceImpl.java
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/src/main/java/org/amdatu/example/course/service/impl/CourseResource.java
trunk/example-bundles/course-service/src/main/java/org/amdatu/example/course/service/osgi/Activator.java
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/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/gadget-bundles/sparqlendpoint-gadget/src/main/java/org/amdatu/gadget/sparqlendpoint/Activator.java
trunk/gadget-bundles/sparqlendpoint-gadget/src/main/java/org/amdatu/gadget/sparqlendpoint/service/SPARQLEndpointServiceImpl.java
trunk/integration-tests/pom.xml
trunk/integration-tests/src/test/java/org/amdatu/test/integration/base/IntegrationTestBase.java
trunk/integration-tests/src/test/java/org/amdatu/test/integration/tests/CassandraDaemonIntegrationTest.java
trunk/integration-tests/src/test/java/org/amdatu/test/integration/tests/HttpServiceTest.java
trunk/platform-bundles/authorization-service/src/main/java/org/amdatu/platform/authorization/osgi/Activator.java
trunk/platform-bundles/authorization-service/src/main/java/org/amdatu/platform/authorization/service/AuthorizationServiceImpl.java
trunk/platform-bundles/config-template-manager/src/main/java/org/amdatu/platform/configtemplatemanager/osgi/Activator.java
trunk/platform-bundles/config-template-manager/src/main/java/org/amdatu/platform/configtemplatemanager/service/ConfigTemplateManagerImpl.java
trunk/platform-bundles/shindig-application/src/main/java/org/amdatu/platform/shindig/application/osgi/Activator.java
trunk/platform-bundles/shindig-application/src/main/java/org/amdatu/platform/shindig/application/service/ShindigRegistrationServiceImpl.java
trunk/platform-bundles/useradmin-cassandra-store/src/main/java/org/amdatu/platform/useradmin/store/cassandra/osgi/Activator.java
trunk/platform-bundles/useradmin-cassandra-store/src/main/java/org/amdatu/platform/useradmin/store/cassandra/rest/HttpContextRegistrationServiceImpl.java
trunk/platform-bundles/wink-application/src/main/java/org/amdatu/platform/wink/osgi/Activator.java
trunk/platform-bundles/wink-application/src/main/java/org/amdatu/platform/wink/service/WinkRegistrationServiceImpl.java
trunk/src/main/resources/conf/felix-config.properties
Modified: trunk/amdatu-release/pom.xml
==============================================================================
--- trunk/amdatu-release/pom.xml (original)
+++ trunk/amdatu-release/pom.xml Tue Nov 9 13:46:04 2010
@@ -29,7 +29,7 @@
<!-- Web bundles -->
<dependency>
<groupId>org.amdatu.web</groupId>
- <artifactId>jsp-support</artifactId>
+ <artifactId>jsp</artifactId>
<version>${platform.version}</version>
<scope>compile</scope>
<type>bundle</type>
Modified: trunk/amdatu-web/httpcontext/pom.xml
==============================================================================
--- trunk/amdatu-web/httpcontext/pom.xml (original)
+++ trunk/amdatu-web/httpcontext/pom.xml Tue Nov 9 13:46:04 2010
@@ -10,7 +10,7 @@
<groupId>org.amdatu.web</groupId>
<artifactId>httpcontext</artifactId>
<packaging>bundle</packaging>
- <name>Amdatu Web - HTTP Context Service</name>
+ <name>Amdatu Web - HTTP Context</name>
<description>Provides a HTTPContext implementation</description>
<dependencies>
@@ -41,16 +41,16 @@
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
-
<Bundle-Activator>org.amdatu.platform.httpcontext.osgi.Activator</Bundle-Activator>
-
<Bundle-SymbolicName>org.amdatu.platform.httpcontext</Bundle-SymbolicName>
+
<Bundle-Activator>org.amdatu.web.httpcontext.osgi.Activator</Bundle-Activator>
+
<Bundle-SymbolicName>org.amdatu.web.httpcontext</Bundle-SymbolicName>
<Embed-Dependency>*;scope=compile;groupId=!org.apache.felix|org.osgi</Embed-Dependency>
<Import-Package>
*;resolution:=optional,
org.osgi.service.useradmin,
- org.amdatu.platform.httpcontext
+ org.amdatu.web.httpcontext
</Import-Package>
<_exportcontents>
- org.amdatu.platform.httpcontext
+ org.amdatu.web.httpcontext
</_exportcontents>
</instructions>
</configuration>
Modified: trunk/amdatu-web/jsp-support-bundle/pom.xml
==============================================================================
--- trunk/amdatu-web/jsp-support-bundle/pom.xml (original)
+++ trunk/amdatu-web/jsp-support-bundle/pom.xml Tue Nov 9 13:46:04 2010
@@ -8,7 +8,7 @@
<version>0.0.6-SNAPSHOT</version>
</parent>
<groupId>org.amdatu.web</groupId>
- <artifactId>jsp-support</artifactId>
+ <artifactId>jsp</artifactId>
<packaging>bundle</packaging>
<name>Amdatu Web - JSP Support</name>
<description>Bundle providing JSP support</description>
Modified:
trunk/amdatu-web/jsp-support-bundle/src/main/java/org/amdatu/web/jsp/osgi/Activator.java
==============================================================================
---
trunk/amdatu-web/jsp-support-bundle/src/main/java/org/amdatu/web/jsp/osgi/Activator.java
(original)
+++
trunk/amdatu-web/jsp-support-bundle/src/main/java/org/amdatu/web/jsp/osgi/Activator.java
Tue Nov 9 13:46:04 2010
@@ -16,8 +16,8 @@
*/
package org.amdatu.web.jsp.osgi;
-import org.amdatu.platform.httpcontext.HttpContextServiceFactory;
-import org.amdatu.platform.httpcontext.ResourceProvider;
+import org.amdatu.web.httpcontext.HttpContextServiceFactory;
+import org.amdatu.web.httpcontext.ResourceProvider;
import org.amdatu.web.jsp.service.ResourceProviderListener;
import org.apache.felix.dm.DependencyActivatorBase;
import org.apache.felix.dm.DependencyManager;
Modified:
trunk/amdatu-web/jsp-support-bundle/src/main/java/org/amdatu/web/jsp/service/ResourceProviderJspServlet.java
==============================================================================
---
trunk/amdatu-web/jsp-support-bundle/src/main/java/org/amdatu/web/jsp/service/ResourceProviderJspServlet.java
(original)
+++
trunk/amdatu-web/jsp-support-bundle/src/main/java/org/amdatu/web/jsp/service/ResourceProviderJspServlet.java
Tue Nov 9 13:46:04 2010
@@ -30,7 +30,7 @@
import javax.servlet.ServletResponse;
import javax.servlet.http.HttpServletRequest;
-import org.amdatu.platform.httpcontext.ResourceProvider;
+import org.amdatu.web.httpcontext.ResourceProvider;
import org.apache.jasper.Constants;
import org.apache.jasper.servlet.JspServlet;
import org.ops4j.pax.swissbox.core.ContextClassLoaderUtils;
Modified:
trunk/amdatu-web/jsp-support-bundle/src/main/java/org/amdatu/web/jsp/service/ResourceProviderListener.java
==============================================================================
---
trunk/amdatu-web/jsp-support-bundle/src/main/java/org/amdatu/web/jsp/service/ResourceProviderListener.java
(original)
+++
trunk/amdatu-web/jsp-support-bundle/src/main/java/org/amdatu/web/jsp/service/ResourceProviderListener.java
Tue Nov 9 13:46:04 2010
@@ -26,8 +26,8 @@
import javax.servlet.ServletException;
-import org.amdatu.platform.httpcontext.HttpContextServiceFactory;
-import org.amdatu.platform.httpcontext.ResourceProvider;
+import org.amdatu.web.httpcontext.HttpContextServiceFactory;
+import org.amdatu.web.httpcontext.ResourceProvider;
import org.amdatu.web.jsp.osgi.Activator;
import org.apache.felix.dm.Component;
import org.apache.felix.dm.DependencyManager;
Modified:
trunk/application-bundles/dashboard-bundle/src/main/java/org/amdatu/application/dashboard/osgi/Activator.java
==============================================================================
---
trunk/application-bundles/dashboard-bundle/src/main/java/org/amdatu/application/dashboard/osgi/Activator.java
(original)
+++
trunk/application-bundles/dashboard-bundle/src/main/java/org/amdatu/application/dashboard/osgi/Activator.java
Tue Nov 9 13:46:04 2010
@@ -17,8 +17,8 @@
package org.amdatu.application.dashboard.osgi;
import org.amdatu.application.dashboard.service.DashboardService;
-import org.amdatu.platform.httpcontext.HttpContextServiceFactory;
-import org.amdatu.platform.httpcontext.ResourceProvider;
+import org.amdatu.web.httpcontext.HttpContextServiceFactory;
+import org.amdatu.web.httpcontext.ResourceProvider;
import org.apache.felix.dm.DependencyActivatorBase;
import org.apache.felix.dm.DependencyManager;
import org.osgi.framework.BundleContext;
Modified:
trunk/application-bundles/dashboard-bundle/src/main/java/org/amdatu/application/dashboard/service/DashboardService.java
==============================================================================
---
trunk/application-bundles/dashboard-bundle/src/main/java/org/amdatu/application/dashboard/service/DashboardService.java
(original)
+++
trunk/application-bundles/dashboard-bundle/src/main/java/org/amdatu/application/dashboard/service/DashboardService.java
Tue Nov 9 13:46:04 2010
@@ -20,8 +20,8 @@
import java.net.URL;
-import org.amdatu.platform.httpcontext.HttpContextServiceFactory;
-import org.amdatu.platform.httpcontext.ResourceProvider;
+import org.amdatu.web.httpcontext.HttpContextServiceFactory;
+import org.amdatu.web.httpcontext.ResourceProvider;
import org.apache.felix.dm.Component;
import org.osgi.framework.BundleContext;
import org.osgi.service.log.LogService;
Modified:
trunk/application-bundles/dashboard-bundle/src/main/resources/jsp/dashboard.jsp
==============================================================================
---
trunk/application-bundles/dashboard-bundle/src/main/resources/jsp/dashboard.jsp
(original)
+++
trunk/application-bundles/dashboard-bundle/src/main/resources/jsp/dashboard.jsp
Tue Nov 9 13:46:04 2010
@@ -2,7 +2,7 @@
org.apache.shindig.auth.BlobCrypterSecurityToken,
org.apache.shindig.common.util.Utf8UrlCoder,
org.osgi.service.useradmin.Authorization,
- org.amdatu.platform.httpcontext.BasicHttpSession" %>
+ org.amdatu.web.httpcontext.BasicHttpSession" %>
<!DOCTYPE html>
<html>
Modified:
trunk/application-bundles/gadget-management/src/main/java/org/amdatu/application/gadgetmanagement/osgi/Activator.java
==============================================================================
---
trunk/application-bundles/gadget-management/src/main/java/org/amdatu/application/gadgetmanagement/osgi/Activator.java
(original)
+++
trunk/application-bundles/gadget-management/src/main/java/org/amdatu/application/gadgetmanagement/osgi/Activator.java
Tue Nov 9 13:46:04 2010
@@ -20,8 +20,8 @@
import
org.amdatu.application.gadgetmanagement.service.GadgetManagementServiceImpl;
import org.amdatu.platform.cassandra.listener.ColumnFamilyAvailable;
import
org.amdatu.platform.cassandra.persistencemanager.CassandraPersistenceManager;
-import org.amdatu.platform.httpcontext.HttpContextServiceFactory;
-import org.amdatu.platform.httpcontext.ResourceProvider;
+import org.amdatu.web.httpcontext.HttpContextServiceFactory;
+import org.amdatu.web.httpcontext.ResourceProvider;
import org.amdatu.platform.shindig.application.GadgetStore;
import org.apache.felix.dm.DependencyActivatorBase;
import org.apache.felix.dm.DependencyManager;
Modified:
trunk/application-bundles/gadget-management/src/main/java/org/amdatu/application/gadgetmanagement/service/GadgetManagementServiceImpl.java
==============================================================================
---
trunk/application-bundles/gadget-management/src/main/java/org/amdatu/application/gadgetmanagement/service/GadgetManagementServiceImpl.java
(original)
+++
trunk/application-bundles/gadget-management/src/main/java/org/amdatu/application/gadgetmanagement/service/GadgetManagementServiceImpl.java
Tue Nov 9 13:46:04 2010
@@ -47,9 +47,9 @@
import org.amdatu.libraries.utilities.ConversionUtil;
import org.amdatu.platform.authorization.AuthorizationService;
import org.amdatu.platform.cassandra.persistencemanager.CassandraException;
-import org.amdatu.platform.httpcontext.BasicHttpSession;
-import org.amdatu.platform.httpcontext.HttpContextServiceFactory;
-import org.amdatu.platform.httpcontext.ResourceProvider;
+import org.amdatu.web.httpcontext.BasicHttpSession;
+import org.amdatu.web.httpcontext.HttpContextServiceFactory;
+import org.amdatu.web.httpcontext.ResourceProvider;
import org.amdatu.platform.shindig.application.GadgetCategory;
import org.amdatu.platform.shindig.application.GadgetDefinition;
import org.amdatu.platform.shindig.application.GadgetStore;
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 13:46:04 2010
@@ -18,8 +18,8 @@
import org.amdatu.application.gadgetmanagement.GadgetManagement;
import org.amdatu.example.course.gadget.osgi.service.CourseGadgetServiceImpl;
-import org.amdatu.platform.httpcontext.HttpContextServiceFactory;
-import org.amdatu.platform.httpcontext.ResourceProvider;
+import org.amdatu.web.httpcontext.HttpContextServiceFactory;
+import org.amdatu.web.httpcontext.ResourceProvider;
import org.apache.felix.dm.Component;
import org.apache.felix.dm.DependencyActivatorBase;
import org.apache.felix.dm.DependencyManager;
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 13:46:04 2010
@@ -21,8 +21,8 @@
import org.amdatu.application.gadgetmanagement.GadgetManagement;
import org.amdatu.example.course.gadget.osgi.Activator;
-import org.amdatu.platform.httpcontext.HttpContextServiceFactory;
-import org.amdatu.platform.httpcontext.ResourceProvider;
+import org.amdatu.web.httpcontext.HttpContextServiceFactory;
+import org.amdatu.web.httpcontext.ResourceProvider;
import org.amdatu.platform.shindig.application.GadgetCategory;
import org.amdatu.platform.shindig.application.GadgetDefinition;
import org.apache.felix.dm.Component;
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 13:46:04 2010
@@ -35,8 +35,8 @@
import org.amdatu.example.course.service.CourseService;
import org.amdatu.platform.authorization.AuthorizationService;
import org.amdatu.platform.configtemplatemanager.ConfigTemplateManager;
-import org.amdatu.platform.httpcontext.HttpContextServiceFactory;
-import org.amdatu.platform.httpcontext.ResourceProvider;
+import org.amdatu.web.httpcontext.HttpContextServiceFactory;
+import org.amdatu.web.httpcontext.ResourceProvider;
import org.amdatu.platform.profile.PersonService;
import org.apache.felix.dm.Component;
import org.apache.shindig.social.opensocial.model.Person;
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 13:46:04 2010
@@ -22,8 +22,8 @@
import org.amdatu.example.course.service.impl.CourseServiceImpl;
import org.amdatu.example.course.service.impl.ProfileDataProvider;
import org.amdatu.platform.configtemplatemanager.ConfigTemplateManager;
-import org.amdatu.platform.httpcontext.HttpContextServiceFactory;
-import org.amdatu.platform.httpcontext.ResourceProvider;
+import org.amdatu.web.httpcontext.HttpContextServiceFactory;
+import org.amdatu.web.httpcontext.ResourceProvider;
import org.amdatu.platform.profile.PersonService;
import org.amdatu.platform.sesame.application.SesameService;
import org.apache.felix.dm.DependencyActivatorBase;
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 13:46:04 2010
@@ -18,8 +18,8 @@
import org.amdatu.application.gadgetmanagement.GadgetManagement;
import org.amdatu.example.friends.gadget.osgi.service.FriendsGadgetServiceImpl;
-import org.amdatu.platform.httpcontext.HttpContextServiceFactory;
-import org.amdatu.platform.httpcontext.ResourceProvider;
+import org.amdatu.web.httpcontext.HttpContextServiceFactory;
+import org.amdatu.web.httpcontext.ResourceProvider;
import org.apache.felix.dm.Component;
import org.apache.felix.dm.DependencyActivatorBase;
import org.apache.felix.dm.DependencyManager;
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 13:46:04 2010
@@ -23,8 +23,8 @@
import org.amdatu.application.gadgetmanagement.GadgetManagement;
import org.amdatu.example.friends.gadget.osgi.Activator;
-import org.amdatu.platform.httpcontext.HttpContextServiceFactory;
-import org.amdatu.platform.httpcontext.ResourceProvider;
+import org.amdatu.web.httpcontext.HttpContextServiceFactory;
+import org.amdatu.web.httpcontext.ResourceProvider;
import org.amdatu.platform.shindig.application.GadgetCategory;
import org.amdatu.platform.shindig.application.GadgetDefinition;
import org.apache.felix.dm.Component;
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 13:46:04 2010
@@ -19,8 +19,8 @@
import org.amdatu.application.gadgetmanagement.GadgetManagement;
import org.amdatu.gadget.login.service.LoginServiceImpl;
import org.amdatu.platform.authorization.AuthorizationService;
-import org.amdatu.platform.httpcontext.HttpContextServiceFactory;
-import org.amdatu.platform.httpcontext.ResourceProvider;
+import org.amdatu.web.httpcontext.HttpContextServiceFactory;
+import org.amdatu.web.httpcontext.ResourceProvider;
import org.apache.felix.dm.DependencyActivatorBase;
import org.apache.felix.dm.DependencyManager;
import org.osgi.framework.BundleContext;
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 13:46:04 2010
@@ -21,8 +21,8 @@
import org.amdatu.application.gadgetmanagement.GadgetManagement;
import org.amdatu.gadget.login.osgi.Activator;
-import org.amdatu.platform.httpcontext.HttpContextServiceFactory;
-import org.amdatu.platform.httpcontext.ResourceProvider;
+import org.amdatu.web.httpcontext.HttpContextServiceFactory;
+import org.amdatu.web.httpcontext.ResourceProvider;
import org.amdatu.platform.shindig.application.GadgetCategory;
import org.amdatu.platform.shindig.application.GadgetDefinition;
import org.apache.felix.dm.Component;
Modified:
trunk/gadget-bundles/sparqlendpoint-gadget/src/main/java/org/amdatu/gadget/sparqlendpoint/Activator.java
==============================================================================
---
trunk/gadget-bundles/sparqlendpoint-gadget/src/main/java/org/amdatu/gadget/sparqlendpoint/Activator.java
(original)
+++
trunk/gadget-bundles/sparqlendpoint-gadget/src/main/java/org/amdatu/gadget/sparqlendpoint/Activator.java
Tue Nov 9 13:46:04 2010
@@ -18,8 +18,8 @@
import org.amdatu.application.gadgetmanagement.GadgetManagement;
import org.amdatu.gadget.sparqlendpoint.service.SPARQLEndpointServiceImpl;
-import org.amdatu.platform.httpcontext.HttpContextServiceFactory;
-import org.amdatu.platform.httpcontext.ResourceProvider;
+import org.amdatu.web.httpcontext.HttpContextServiceFactory;
+import org.amdatu.web.httpcontext.ResourceProvider;
import org.amdatu.platform.sesame.application.SesameService;
import org.apache.felix.dm.DependencyActivatorBase;
import org.apache.felix.dm.DependencyManager;
Modified:
trunk/gadget-bundles/sparqlendpoint-gadget/src/main/java/org/amdatu/gadget/sparqlendpoint/service/SPARQLEndpointServiceImpl.java
==============================================================================
---
trunk/gadget-bundles/sparqlendpoint-gadget/src/main/java/org/amdatu/gadget/sparqlendpoint/service/SPARQLEndpointServiceImpl.java
(original)
+++
trunk/gadget-bundles/sparqlendpoint-gadget/src/main/java/org/amdatu/gadget/sparqlendpoint/service/SPARQLEndpointServiceImpl.java
Tue Nov 9 13:46:04 2010
@@ -25,8 +25,8 @@
import org.amdatu.application.gadgetmanagement.GadgetManagement;
import org.amdatu.gadget.sparqlendpoint.Activator;
-import org.amdatu.platform.httpcontext.HttpContextServiceFactory;
-import org.amdatu.platform.httpcontext.ResourceProvider;
+import org.amdatu.web.httpcontext.HttpContextServiceFactory;
+import org.amdatu.web.httpcontext.ResourceProvider;
import org.amdatu.platform.sesame.application.SPARQLQueryHandler;
import org.amdatu.platform.sesame.application.SesameService;
import org.amdatu.platform.shindig.application.GadgetCategory;
Modified: trunk/integration-tests/pom.xml
==============================================================================
--- trunk/integration-tests/pom.xml (original)
+++ trunk/integration-tests/pom.xml Tue Nov 9 13:46:04 2010
@@ -117,7 +117,7 @@
</dependency>
<dependency>
<groupId>org.amdatu.web</groupId>
- <artifactId>jsp-support</artifactId>
+ <artifactId>jsp</artifactId>
<version>${platform.version}</version>
<scope>test</scope>
<type>bundle</type>
Modified:
trunk/integration-tests/src/test/java/org/amdatu/test/integration/base/IntegrationTestBase.java
==============================================================================
---
trunk/integration-tests/src/test/java/org/amdatu/test/integration/base/IntegrationTestBase.java
(original)
+++
trunk/integration-tests/src/test/java/org/amdatu/test/integration/base/IntegrationTestBase.java
Tue Nov 9 13:46:04 2010
@@ -352,7 +352,7 @@
}
protected static MavenArtifactProvisionOption amdatuJspSupport() {
- return
mavenBundle().groupId("org.amdatu.web").artifactId("jsp-support").versionAsInProject();
+ return
mavenBundle().groupId("org.amdatu.web").artifactId("jsp").versionAsInProject();
}
protected static WrappedUrlProvisionOption commonsHttpClient() {
Modified:
trunk/integration-tests/src/test/java/org/amdatu/test/integration/tests/CassandraDaemonIntegrationTest.java
==============================================================================
---
trunk/integration-tests/src/test/java/org/amdatu/test/integration/tests/CassandraDaemonIntegrationTest.java
(original)
+++
trunk/integration-tests/src/test/java/org/amdatu/test/integration/tests/CassandraDaemonIntegrationTest.java
Tue Nov 9 13:46:04 2010
@@ -26,7 +26,7 @@
import
org.amdatu.platform.cassandra.listener.ColumnFamilyDefinition.CompareType;
import
org.amdatu.platform.cassandra.persistencemanager.CassandraPersistenceManager;
import org.amdatu.platform.configtemplatemanager.ConfigTemplateManager;
-import org.amdatu.platform.httpcontext.HttpContextServiceFactory;
+import org.amdatu.web.httpcontext.HttpContextServiceFactory;
import org.amdatu.test.integration.base.IntegrationTestBase;
import org.apache.cassandra.thrift.InvalidRequestException;
import org.apache.felix.dm.Component;
Modified:
trunk/integration-tests/src/test/java/org/amdatu/test/integration/tests/HttpServiceTest.java
==============================================================================
---
trunk/integration-tests/src/test/java/org/amdatu/test/integration/tests/HttpServiceTest.java
(original)
+++
trunk/integration-tests/src/test/java/org/amdatu/test/integration/tests/HttpServiceTest.java
Tue Nov 9 13:46:04 2010
@@ -33,8 +33,8 @@
import junit.framework.Assert;
-import org.amdatu.platform.httpcontext.HttpContextServiceFactory;
-import org.amdatu.platform.httpcontext.ResourceProvider;
+import org.amdatu.web.httpcontext.HttpContextServiceFactory;
+import org.amdatu.web.httpcontext.ResourceProvider;
import org.amdatu.test.integration.base.IntegrationTestBase;
import org.apache.commons.httpclient.Header;
import org.apache.commons.httpclient.HttpClient;
Modified:
trunk/platform-bundles/authorization-service/src/main/java/org/amdatu/platform/authorization/osgi/Activator.java
==============================================================================
---
trunk/platform-bundles/authorization-service/src/main/java/org/amdatu/platform/authorization/osgi/Activator.java
(original)
+++
trunk/platform-bundles/authorization-service/src/main/java/org/amdatu/platform/authorization/osgi/Activator.java
Tue Nov 9 13:46:04 2010
@@ -19,7 +19,7 @@
import org.amdatu.platform.authorization.AuthorizationService;
import org.amdatu.platform.authorization.service.AuthorizationServiceImpl;
import org.amdatu.platform.configtemplatemanager.ConfigTemplateManager;
-import org.amdatu.platform.httpcontext.HttpContextServiceFactory;
+import org.amdatu.web.httpcontext.HttpContextServiceFactory;
import org.apache.felix.dm.DependencyActivatorBase;
import org.apache.felix.dm.DependencyManager;
import org.osgi.framework.BundleContext;
Modified:
trunk/platform-bundles/authorization-service/src/main/java/org/amdatu/platform/authorization/service/AuthorizationServiceImpl.java
==============================================================================
---
trunk/platform-bundles/authorization-service/src/main/java/org/amdatu/platform/authorization/service/AuthorizationServiceImpl.java
(original)
+++
trunk/platform-bundles/authorization-service/src/main/java/org/amdatu/platform/authorization/service/AuthorizationServiceImpl.java
Tue Nov 9 13:46:04 2010
@@ -25,9 +25,9 @@
import org.amdatu.platform.authorization.AuthorizationService;
import org.amdatu.platform.authorization.osgi.Activator;
-import org.amdatu.platform.httpcontext.BasicHttpSession;
-import org.amdatu.platform.httpcontext.HttpContextServiceFactory;
-import org.amdatu.platform.httpcontext.ResourceProvider;
+import org.amdatu.web.httpcontext.BasicHttpSession;
+import org.amdatu.web.httpcontext.HttpContextServiceFactory;
+import org.amdatu.web.httpcontext.ResourceProvider;
import org.apache.felix.dm.Component;
import org.json.JSONException;
import org.json.JSONObject;
Modified:
trunk/platform-bundles/config-template-manager/src/main/java/org/amdatu/platform/configtemplatemanager/osgi/Activator.java
==============================================================================
---
trunk/platform-bundles/config-template-manager/src/main/java/org/amdatu/platform/configtemplatemanager/osgi/Activator.java
(original)
+++
trunk/platform-bundles/config-template-manager/src/main/java/org/amdatu/platform/configtemplatemanager/osgi/Activator.java
Tue Nov 9 13:46:04 2010
@@ -18,8 +18,8 @@
import org.amdatu.platform.configtemplatemanager.ConfigTemplateManager;
import
org.amdatu.platform.configtemplatemanager.service.ConfigTemplateManagerImpl;
-import org.amdatu.platform.httpcontext.HttpContextServiceFactory;
-import org.amdatu.platform.httpcontext.ResourceProvider;
+import org.amdatu.web.httpcontext.HttpContextServiceFactory;
+import org.amdatu.web.httpcontext.ResourceProvider;
import org.apache.felix.dm.DependencyActivatorBase;
import org.apache.felix.dm.DependencyManager;
import org.osgi.framework.BundleContext;
Modified:
trunk/platform-bundles/config-template-manager/src/main/java/org/amdatu/platform/configtemplatemanager/service/ConfigTemplateManagerImpl.java
==============================================================================
---
trunk/platform-bundles/config-template-manager/src/main/java/org/amdatu/platform/configtemplatemanager/service/ConfigTemplateManagerImpl.java
(original)
+++
trunk/platform-bundles/config-template-manager/src/main/java/org/amdatu/platform/configtemplatemanager/service/ConfigTemplateManagerImpl.java
Tue Nov 9 13:46:04 2010
@@ -28,8 +28,8 @@
import org.amdatu.platform.configtemplatemanager.ConfigTemplateManager;
import org.amdatu.platform.configtemplatemanager.osgi.Activator;
-import org.amdatu.platform.httpcontext.HttpContextServiceFactory;
-import org.amdatu.platform.httpcontext.ResourceProvider;
+import org.amdatu.web.httpcontext.HttpContextServiceFactory;
+import org.amdatu.web.httpcontext.ResourceProvider;
import org.apache.felix.dm.Component;
import org.osgi.framework.BundleContext;
import org.osgi.service.cm.Configuration;
Modified:
trunk/platform-bundles/shindig-application/src/main/java/org/amdatu/platform/shindig/application/osgi/Activator.java
==============================================================================
---
trunk/platform-bundles/shindig-application/src/main/java/org/amdatu/platform/shindig/application/osgi/Activator.java
(original)
+++
trunk/platform-bundles/shindig-application/src/main/java/org/amdatu/platform/shindig/application/osgi/Activator.java
Tue Nov 9 13:46:04 2010
@@ -19,8 +19,8 @@
import org.amdatu.platform.cassandra.listener.ColumnFamilyAvailable;
import org.amdatu.platform.cassandra.listener.ColumnFamilyProvider;
import
org.amdatu.platform.cassandra.persistencemanager.CassandraPersistenceManager;
-import org.amdatu.platform.httpcontext.HttpContextServiceFactory;
-import org.amdatu.platform.httpcontext.ResourceProvider;
+import org.amdatu.web.httpcontext.HttpContextServiceFactory;
+import org.amdatu.web.httpcontext.ResourceProvider;
import org.amdatu.platform.shindig.application.GadgetStore;
import org.amdatu.platform.shindig.application.OAuthModule;
import org.amdatu.platform.shindig.application.SocialApiModule;
Modified:
trunk/platform-bundles/shindig-application/src/main/java/org/amdatu/platform/shindig/application/service/ShindigRegistrationServiceImpl.java
==============================================================================
---
trunk/platform-bundles/shindig-application/src/main/java/org/amdatu/platform/shindig/application/service/ShindigRegistrationServiceImpl.java
(original)
+++
trunk/platform-bundles/shindig-application/src/main/java/org/amdatu/platform/shindig/application/service/ShindigRegistrationServiceImpl.java
Tue Nov 9 13:46:04 2010
@@ -31,8 +31,8 @@
import javax.servlet.Filter;
import javax.servlet.Servlet;
-import org.amdatu.platform.httpcontext.HttpContextServiceFactory;
-import org.amdatu.platform.httpcontext.ResourceProvider;
+import org.amdatu.web.httpcontext.HttpContextServiceFactory;
+import org.amdatu.web.httpcontext.ResourceProvider;
import org.amdatu.platform.shindig.application.oauth.AmdatuOAuthServlet;
import org.amdatu.platform.shindig.application.osgi.Activator;
import org.apache.felix.dm.Component;
Modified:
trunk/platform-bundles/useradmin-cassandra-store/src/main/java/org/amdatu/platform/useradmin/store/cassandra/osgi/Activator.java
==============================================================================
---
trunk/platform-bundles/useradmin-cassandra-store/src/main/java/org/amdatu/platform/useradmin/store/cassandra/osgi/Activator.java
(original)
+++
trunk/platform-bundles/useradmin-cassandra-store/src/main/java/org/amdatu/platform/useradmin/store/cassandra/osgi/Activator.java
Tue Nov 9 13:46:04 2010
@@ -22,8 +22,8 @@
import org.amdatu.platform.cassandra.listener.ColumnFamilyAvailable;
import org.amdatu.platform.cassandra.listener.ColumnFamilyProvider;
import
org.amdatu.platform.cassandra.persistencemanager.CassandraPersistenceManager;
-import org.amdatu.platform.httpcontext.HttpContextServiceFactory;
-import org.amdatu.platform.httpcontext.ResourceProvider;
+import org.amdatu.web.httpcontext.HttpContextServiceFactory;
+import org.amdatu.web.httpcontext.ResourceProvider;
import org.amdatu.platform.useradmin.store.cassandra.DummyResourceInterface;
import org.amdatu.platform.useradmin.store.cassandra.rest.GroupsResource;
import
org.amdatu.platform.useradmin.store.cassandra.rest.HttpContextRegistrationServiceImpl;
Modified:
trunk/platform-bundles/useradmin-cassandra-store/src/main/java/org/amdatu/platform/useradmin/store/cassandra/rest/HttpContextRegistrationServiceImpl.java
==============================================================================
---
trunk/platform-bundles/useradmin-cassandra-store/src/main/java/org/amdatu/platform/useradmin/store/cassandra/rest/HttpContextRegistrationServiceImpl.java
(original)
+++
trunk/platform-bundles/useradmin-cassandra-store/src/main/java/org/amdatu/platform/useradmin/store/cassandra/rest/HttpContextRegistrationServiceImpl.java
Tue Nov 9 13:46:04 2010
@@ -18,8 +18,8 @@
import java.net.URL;
-import org.amdatu.platform.httpcontext.HttpContextServiceFactory;
-import org.amdatu.platform.httpcontext.ResourceProvider;
+import org.amdatu.web.httpcontext.HttpContextServiceFactory;
+import org.amdatu.web.httpcontext.ResourceProvider;
import org.amdatu.platform.useradmin.store.cassandra.osgi.Activator;
import org.apache.felix.dm.Component;
import org.osgi.framework.BundleContext;
Modified:
trunk/platform-bundles/wink-application/src/main/java/org/amdatu/platform/wink/osgi/Activator.java
==============================================================================
---
trunk/platform-bundles/wink-application/src/main/java/org/amdatu/platform/wink/osgi/Activator.java
(original)
+++
trunk/platform-bundles/wink-application/src/main/java/org/amdatu/platform/wink/osgi/Activator.java
Tue Nov 9 13:46:04 2010
@@ -17,7 +17,7 @@
*/
package org.amdatu.platform.wink.osgi;
-import org.amdatu.platform.httpcontext.HttpContextServiceFactory;
+import org.amdatu.web.httpcontext.HttpContextServiceFactory;
import org.amdatu.platform.wink.service.WinkRegistrationServiceImpl;
import org.apache.felix.dm.DependencyActivatorBase;
import org.apache.felix.dm.DependencyManager;
Modified:
trunk/platform-bundles/wink-application/src/main/java/org/amdatu/platform/wink/service/WinkRegistrationServiceImpl.java
==============================================================================
---
trunk/platform-bundles/wink-application/src/main/java/org/amdatu/platform/wink/service/WinkRegistrationServiceImpl.java
(original)
+++
trunk/platform-bundles/wink-application/src/main/java/org/amdatu/platform/wink/service/WinkRegistrationServiceImpl.java
Tue Nov 9 13:46:04 2010
@@ -32,8 +32,8 @@
import javax.ws.rs.core.Variant.VariantListBuilder;
import javax.ws.rs.ext.RuntimeDelegate;
-import org.amdatu.platform.httpcontext.HttpContextServiceFactory;
-import org.amdatu.platform.httpcontext.ResourceProvider;
+import org.amdatu.web.httpcontext.HttpContextServiceFactory;
+import org.amdatu.web.httpcontext.ResourceProvider;
import org.apache.felix.dm.Component;
import org.apache.wink.common.internal.runtime.RuntimeDelegateImpl;
import org.apache.wink.server.utils.RegistrationUtils;
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
13:46:04 2010
@@ -79,7 +79,7 @@
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:platform-bundles/org.amdatu.platform.shindig-application-${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:platform-bundles/org.amdatu.platform.sesame-application-${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-support-${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.20=reference:file:gadget-bundles/org.amdatu.gadget.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
