Author: angelo.vandersijpt at luminis.eu Date: Tue Oct 19 14:19:59 2010 New Revision: 195
Log: Cleanup: Removed superfluous @inheritDoc and @see notes in javadoc; see http://lists.amdatu.org/pipermail/amdatu-developers/2010-October/000532.html 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/service/DashboardService.java 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/impl/CourseServiceImpl.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/src/main/java/org/amdatu/test/osgi/Activator.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/cassandra-application/src/main/java/org/amdatu/platform/cassandra/application/osgi/Activator.java trunk/platform-bundles/cassandra-application/src/main/java/org/amdatu/platform/cassandra/application/service/CassandraDaemonServiceImpl.java trunk/platform-bundles/cassandra-listener/src/main/java/org/amdatu/platform/cassandra/listener/osgi/Activator.java trunk/platform-bundles/cassandra-listener/src/main/java/org/amdatu/platform/cassandra/listener/service/ColumnFamilyProviderServiceTracker.java trunk/platform-bundles/cassandra-persistencemanager/src/main/java/org/amdatu/platform/cassandra/persistencemanager/CassandraException.java trunk/platform-bundles/cassandra-persistencemanager/src/main/java/org/amdatu/platform/cassandra/persistencemanager/osgi/Activator.java trunk/platform-bundles/cassandra-persistencemanager/src/main/java/org/amdatu/platform/cassandra/persistencemanager/service/CassandraPersistenceManagerFactoryImpl.java trunk/platform-bundles/cassandra-persistencemanager/src/main/java/org/amdatu/platform/cassandra/persistencemanager/service/CassandraPersistenceManagerImpl.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/httpcontext/src/main/java/org/amdatu/platform/httpcontext/osgi/Activator.java trunk/platform-bundles/httpcontext/src/main/java/org/amdatu/platform/httpcontext/service/HttpContextFactoryServiceImpl.java trunk/platform-bundles/httpcontext/src/main/java/org/amdatu/platform/httpcontext/service/HttpContextImpl.java trunk/platform-bundles/profile-service/src/main/java/org/amdatu/platform/profile/domain/FriendImpl.java 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/service/FriendColumnFamilyProvider.java trunk/platform-bundles/profile-service/src/main/java/org/amdatu/platform/profile/service/PersonServiceImpl.java 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/service/SesameServiceImpl.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/module/SocialApiModuleImpl.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/persistence/CassandraAppDataServiceStore.java trunk/platform-bundles/shindig-application/src/main/java/org/amdatu/platform/shindig/application/persistence/CassandraOAuthStore.java trunk/platform-bundles/shindig-application/src/main/java/org/amdatu/platform/shindig/application/persistence/GadgetColumnFamilyProvider.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/ShindigRegistrationServiceImpl.java trunk/platform-bundles/tenant-service/src/main/java/org/amdatu/platform/tenant/TenantImpl.java trunk/platform-bundles/tenant-service/src/main/java/org/amdatu/platform/tenant/dao/TenantDAOCassandraImpl.java trunk/platform-bundles/tenant-service/src/main/java/org/amdatu/platform/tenant/osgi/Activator.java 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/TenantManagementServiceImpl.java trunk/platform-bundles/tenant-service/src/test/java/org/amdatu/test/unit/InMemoryTenantDAO.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/useradmin-cassandra-store/src/main/java/org/amdatu/platform/useradmin/store/cassandra/service/RoleColumnFamilyProvider.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/platform-bundles/wink-application/src/main/java/org/amdatu/platform/wink/service/WinkRestServlet.java 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 Oct 19 14:19:59 2010 @@ -34,9 +34,7 @@ // it is prefixed with this id public final static String RESOURCE_ID = "dashboard"; - /** - * {@inheritDoc} - */ + @Override public void init(BundleContext context, DependencyManager manager) throws Exception { // Create and register the dashboard service. @@ -49,10 +47,7 @@ .add(createServiceDependency().setService(WebContainer.class).setRequired(true))); } - /** - * {@inheritDoc} - */ - @Override + @Override public void destroy(BundleContext context, DependencyManager manager) throws Exception { } } 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 Oct 19 14:19:59 2010 @@ -58,23 +58,10 @@ m_logService.log(LogService.LOG_INFO, getClass().getName() + " service destroyed"); } - /** - * {@inheritDoc} - */ - public long getBundleId() { - return m_bundleContext.getBundle().getBundleId(); - } - - /** - * {@inheritDoc} - */ public URL getResource(String name) { return null; } - /** - * {@inheritDoc} - */ public String getResourceId() { return RESOURCE_ID; } 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 Oct 19 14:19:59 2010 @@ -26,7 +26,6 @@ import org.apache.felix.dm.DependencyActivatorBase; import org.apache.felix.dm.DependencyManager; import org.osgi.framework.BundleContext; -import org.osgi.service.cm.ConfigurationAdmin; import org.osgi.service.log.LogService; import org.osgi.service.useradmin.UserAdmin; @@ -39,9 +38,6 @@ // it is prefixed with this id public final static String RESOURCE_ID = "gadgetstore"; - /** - * {@inheritDoc} - */ @Override public void init(BundleContext context, DependencyManager manager) throws Exception { // Create and register the gadget management service. @@ -61,9 +57,6 @@ .add(createServiceDependency().setService(CassandraPersistenceManager.class, keyspaceFilter).setRequired(true))); } - /** - * {@inheritDoc} - */ @Override public void destroy(BundleContext context, DependencyManager manager) throws Exception { } 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 Oct 19 14:19:59 2010 @@ -16,6 +16,12 @@ */ package org.amdatu.application.gadgetmanagement.service; +import javax.servlet.http.HttpServletRequest; +import javax.ws.rs.*; +import javax.ws.rs.core.Context; +import javax.ws.rs.core.HttpHeaders; +import javax.ws.rs.core.MediaType; +import javax.ws.rs.core.Response; import java.io.BufferedReader; import java.io.IOException; import java.io.InputStreamReader; @@ -24,24 +30,7 @@ import java.net.URLConnection; import java.nio.charset.Charset; import java.security.NoSuchAlgorithmException; -import java.util.ArrayList; -import java.util.Dictionary; -import java.util.HashMap; -import java.util.Hashtable; -import java.util.List; -import java.util.Locale; -import java.util.Map; - -import javax.servlet.http.HttpServletRequest; -import javax.ws.rs.DefaultValue; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import java.util.*; import org.amdatu.application.gadgetmanagement.DefaultGadgetRepository; import org.amdatu.application.gadgetmanagement.GadgetManagement; @@ -69,7 +58,6 @@ import org.json.JSONException; import org.json.JSONObject; import org.osgi.framework.BundleContext; -import org.osgi.service.cm.Configuration; import org.osgi.service.cm.ConfigurationAdmin; import org.osgi.service.log.LogService; import org.osgi.service.useradmin.Authorization; @@ -126,16 +114,10 @@ m_logService.log(LogService.LOG_INFO, getClass().getName() + " service destroyed"); } - /** - * @see GadgetManagement#addGadget(GadgetDefinition) - */ public boolean addGadget(GadgetDefinition gadget) { return m_gadgetStore.addGadget(gadget); } - /** - * @see GadgetManagement#getGadgets() - */ public GadgetDefinition[] getGadgets() { return m_gadgetStore.getGadgets(); } 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 Oct 19 14:19:59 2010 @@ -23,9 +23,7 @@ import org.apache.felix.dm.Component; import org.apache.felix.dm.DependencyActivatorBase; import org.apache.felix.dm.DependencyManager; -import org.ops4j.pax.web.service.WebContainer; import org.osgi.framework.BundleContext; -import org.osgi.service.cm.ConfigurationAdmin; import org.osgi.service.log.LogService; /** @@ -37,9 +35,6 @@ // it is prefixed with this id public final static String RESOURCE_ID = "examples/gadget/course"; - /** - * {@inheritDoc} - */ @Override public void init(BundleContext context, DependencyManager manager) throws Exception { // Create the CourseGadgetService which has dependencies with the Log service @@ -54,9 +49,6 @@ manager.add(friendsgadgetService); } - /** - * {@inheritDoc} - */ @Override public void destroy(BundleContext arg0, DependencyManager arg1) throws Exception { } 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 Oct 19 14:19:59 2010 @@ -16,7 +16,6 @@ */ package org.amdatu.example.course.gadget.osgi.service; -import java.io.IOException; import java.net.URL; import java.util.Dictionary; @@ -28,7 +27,6 @@ import org.amdatu.platform.shindig.application.GadgetDefinition; import org.apache.felix.dm.Component; import org.osgi.framework.BundleContext; -import org.osgi.service.cm.ConfigurationAdmin; import org.osgi.service.cm.ConfigurationException; import org.osgi.service.cm.ManagedService; import org.osgi.service.log.LogService; @@ -80,27 +78,14 @@ m_logService.log(LogService.LOG_INFO, getClass().getName() + " service destroyed"); } - /** - * {@inheritDoc} - */ public URL getResource(String name) { return null; } - /** - * {@inheritDoc} - */ public String getResourceId() { return Activator.RESOURCE_ID; } - /** - * {@inheritDoc} - */ - public long getBundleId() { - return m_bundleContext.getBundle().getBundleId(); - } - public void updated(Dictionary dictionary) throws ConfigurationException { if (dictionary != null) { checkAvailability(dictionary, new String[] {HOSTNAME, PORTNR}); 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 Oct 19 14:19:59 2010 @@ -18,11 +18,6 @@ import static org.amdatu.example.course.service.osgi.Activator.RESOURCE_ID; -import java.io.IOException; -import java.net.URL; -import java.util.ArrayList; -import java.util.List; - import javax.servlet.http.HttpServletRequest; import javax.ws.rs.GET; import javax.ws.rs.Path; @@ -30,6 +25,10 @@ import javax.ws.rs.core.Context; import javax.ws.rs.core.HttpHeaders; import javax.ws.rs.core.MediaType; +import java.io.IOException; +import java.net.URL; +import java.util.ArrayList; +import java.util.List; import org.amdatu.example.course.service.Course; import org.amdatu.example.course.service.CourseList; @@ -135,9 +134,6 @@ return courseList; } - /** - * {@inheritDoc} - */ public URL getResource(String name) { if (!name.startsWith(RESOURCE_ID)) { return null; @@ -169,17 +165,7 @@ return bundle.getResource(name); } - /** - * {@inheritDoc} - */ public String getResourceId() { return RESOURCE_ID; } - - /** - * {@inheritDoc} - */ - public long getBundleId() { - return m_bundleContext.getBundle().getBundleId(); - } } Modified: trunk/example-bundles/course-service/src/main/java/org/amdatu/example/course/service/impl/CourseServiceImpl.java ============================================================================== --- trunk/example-bundles/course-service/src/main/java/org/amdatu/example/course/service/impl/CourseServiceImpl.java (original) +++ trunk/example-bundles/course-service/src/main/java/org/amdatu/example/course/service/impl/CourseServiceImpl.java Tue Oct 19 14:19:59 2010 @@ -93,9 +93,6 @@ return courses; } - /** - * {@inheritDoc} - */ public String getOntologyBaseUrl() throws IOException { // Build the base URL for the ontologies Configuration config = m_configAdmin.getConfiguration("org.ops4j.pax.web"); 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 Oct 19 14:19:59 2010 @@ -21,7 +21,6 @@ import org.amdatu.example.course.service.impl.CourseResource; import org.amdatu.example.course.service.impl.CourseServiceImpl; import org.amdatu.example.course.service.impl.ProfileDataProvider; -import org.amdatu.platform.cassandra.listener.ColumnFamilyAvailable; import org.amdatu.platform.configtemplatemanager.ConfigTemplateManager; import org.amdatu.platform.httpcontext.HttpContextServiceFactory; import org.amdatu.platform.httpcontext.ResourceProvider; @@ -43,9 +42,6 @@ // it is prefixed with this id public final static String RESOURCE_ID = "examples/course"; - /** - * {@inheritDoc} - */ @Override public void init(BundleContext context, DependencyManager manager) throws Exception { // Create and register the course service @@ -89,9 +85,6 @@ .add(createServiceDependency().setService(UserAdmin.class).setRequired(true))); } - /** - * {@inheritDoc} - */ @Override public void destroy(BundleContext context, DependencyManager manager) throws Exception { } 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 Oct 19 14:19:59 2010 @@ -23,9 +23,7 @@ import org.apache.felix.dm.Component; import org.apache.felix.dm.DependencyActivatorBase; import org.apache.felix.dm.DependencyManager; -import org.ops4j.pax.web.service.WebContainer; import org.osgi.framework.BundleContext; -import org.osgi.service.cm.ConfigurationAdmin; import org.osgi.service.http.HttpService; import org.osgi.service.log.LogService; @@ -38,9 +36,6 @@ // it is prefixed with this id. public final static String RESOURCE_ID = "examples/gadget/friends"; - /** - * {@inheritDoc} - */ @Override public void init(BundleContext context, DependencyManager manager) throws Exception { // Create the FriendsGadgetService which has dependencies with the Log service @@ -56,9 +51,6 @@ manager.add(friendsgadgetService); } - /** - * {@inheritDoc} - */ @Override public void destroy(BundleContext arg0, DependencyManager arg1) throws Exception { } 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 Oct 19 14:19:59 2010 @@ -84,16 +84,10 @@ m_logService.log(LogService.LOG_INFO, getClass().getName() + " service destroyed"); } - /** - * {@inheritDoc} - */ public URL getResource(String name) { return null; } - /** - * {@inheritDoc} - */ public String getResourceId() { return RESOURCE_ID; } 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 Oct 19 14:19:59 2010 @@ -23,9 +23,7 @@ import org.amdatu.platform.httpcontext.ResourceProvider; import org.apache.felix.dm.DependencyActivatorBase; import org.apache.felix.dm.DependencyManager; -import org.ops4j.pax.web.service.WebContainer; import org.osgi.framework.BundleContext; -import org.osgi.service.cm.ConfigurationAdmin; import org.osgi.service.log.LogService; import org.osgi.service.useradmin.UserAdmin; @@ -38,9 +36,6 @@ // it is prefixed with this id public final static String RESOURCE_ID = "gadget/login"; - /** - * {@inheritDoc} - */ @Override public void init(BundleContext context, DependencyManager manager) throws Exception { // Create the LoginServiceImpl which has dependencies with the Log service @@ -54,9 +49,6 @@ .add(createConfigurationDependency().setPid(LoginServiceImpl.PID))); } - /** - * {@inheritDoc} - */ @Override public void destroy(BundleContext arg0, DependencyManager arg1) throws Exception { } 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 Oct 19 14:19:59 2010 @@ -16,7 +16,6 @@ */ package org.amdatu.gadget.login.service; -import java.io.IOException; import java.net.URL; import java.util.Dictionary; @@ -28,7 +27,6 @@ import org.amdatu.platform.shindig.application.GadgetDefinition; import org.apache.felix.dm.Component; import org.osgi.framework.BundleContext; -import org.osgi.service.cm.ConfigurationAdmin; import org.osgi.service.cm.ConfigurationException; import org.osgi.service.cm.ManagedService; import org.osgi.service.log.LogService; @@ -74,16 +72,10 @@ m_httpContextComponent.stop(); } - /** - * {@inheritDoc} - */ public URL getResource(String name) { return null; } - /** - * {@inheritDoc} - */ public String getResourceId() { return Activator.RESOURCE_ID; } 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 Oct 19 14:19:59 2010 @@ -23,9 +23,7 @@ import org.amdatu.platform.sesame.application.SesameService; import org.apache.felix.dm.DependencyActivatorBase; import org.apache.felix.dm.DependencyManager; -import org.ops4j.pax.web.service.WebContainer; import org.osgi.framework.BundleContext; -import org.osgi.service.cm.ConfigurationAdmin; import org.osgi.service.log.LogService; /** @@ -37,9 +35,6 @@ // it is prefixed with this id public final static String RESOURCE_ID = "gadget/sparqlendpoint"; - /** - * {@inheritDoc} - */ @Override public void init(BundleContext context, DependencyManager manager) throws Exception { // Create the SPARQLEndpointServiceImpl which has dependencies with the Log service @@ -53,9 +48,6 @@ .add(createConfigurationDependency().setPid(SPARQLEndpointServiceImpl.PID))); } - /** - * {@inheritDoc} - */ @Override public void destroy(BundleContext arg0, DependencyManager arg1) throws Exception { } 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 Oct 19 14:19:59 2010 @@ -16,22 +16,13 @@ */ package org.amdatu.gadget.sparqlendpoint.service; -import java.io.IOException; +import javax.ws.rs.*; +import javax.ws.rs.core.MediaType; +import javax.ws.rs.core.Response; import java.net.URL; import java.util.Dictionary; import java.util.List; -import javax.ws.rs.Consumes; -import javax.ws.rs.DefaultValue; -import javax.ws.rs.FormParam; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; - import org.amdatu.application.gadgetmanagement.GadgetManagement; import org.amdatu.gadget.sparqlendpoint.Activator; import org.amdatu.platform.httpcontext.HttpContextServiceFactory; @@ -47,7 +38,6 @@ import org.openrdf.query.QueryEvaluationException; import org.openrdf.query.TupleQueryResult; import org.osgi.framework.BundleContext; -import org.osgi.service.cm.ConfigurationAdmin; import org.osgi.service.cm.ConfigurationException; import org.osgi.service.cm.ManagedService; import org.osgi.service.log.LogService; @@ -165,16 +155,10 @@ return "SPARQL Endpoint online"; } - /** - * {@inheritDoc} - */ public URL getResource(String name) { return null; } - /** - * {@inheritDoc} - */ public String getResourceId() { return Activator.RESOURCE_ID; } Modified: trunk/integration-tests/src/main/java/org/amdatu/test/osgi/Activator.java ============================================================================== --- trunk/integration-tests/src/main/java/org/amdatu/test/osgi/Activator.java (original) +++ trunk/integration-tests/src/main/java/org/amdatu/test/osgi/Activator.java Tue Oct 19 14:19:59 2010 @@ -26,16 +26,10 @@ * @author ivol */ public class Activator extends DependencyActivatorBase { - /** - * {@inheritDoc} - */ @Override public void init(BundleContext context, DependencyManager manager) throws Exception { } - /** - * {@inheritDoc} - */ @Override public void destroy(BundleContext context, DependencyManager manager) throws Exception { } 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 Oct 19 14:19:59 2010 @@ -22,9 +22,7 @@ import org.amdatu.platform.httpcontext.HttpContextServiceFactory; import org.apache.felix.dm.DependencyActivatorBase; import org.apache.felix.dm.DependencyManager; -import org.ops4j.pax.web.service.WebContainer; import org.osgi.framework.BundleContext; -import org.osgi.service.cm.ConfigurationAdmin; import org.osgi.service.log.LogService; import org.osgi.service.useradmin.UserAdmin; @@ -37,9 +35,6 @@ // it is prefixed with this id public final static String RESOURCE_ID = "authorization"; - /** - * {@inheritDoc} - */ @Override public void init(BundleContext context, DependencyManager manager) throws Exception { // Create and register the authorization service. @@ -53,9 +48,6 @@ .add(createServiceDependency().setService(UserAdmin.class).setRequired(true))); } - /** - * {@inheritDoc} - */ @Override public void destroy(BundleContext context, DependencyManager manager) throws Exception { } 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 Oct 19 14:19:59 2010 @@ -16,21 +16,12 @@ */ package org.amdatu.platform.authorization.service; -import java.io.IOException; -import java.net.URL; -import java.util.Dictionary; -import java.util.Hashtable; - import javax.servlet.http.HttpServletRequest; -import javax.ws.rs.Consumes; -import javax.ws.rs.FormParam; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; +import javax.ws.rs.*; import javax.ws.rs.core.Context; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; +import java.net.URL; import org.amdatu.platform.authorization.AuthorizationService; import org.amdatu.platform.authorization.osgi.Activator; @@ -41,14 +32,8 @@ import org.json.JSONException; import org.json.JSONObject; import org.osgi.framework.BundleContext; -import org.osgi.service.cm.Configuration; -import org.osgi.service.cm.ConfigurationAdmin; import org.osgi.service.log.LogService; -import org.osgi.service.useradmin.Authorization; -import org.osgi.service.useradmin.Group; -import org.osgi.service.useradmin.Role; -import org.osgi.service.useradmin.User; -import org.osgi.service.useradmin.UserAdmin; +import org.osgi.service.useradmin.*; /** * This service is responsible for authorization handling, based on the UserAdmin OSGi service. @@ -223,16 +208,10 @@ return "Authorization service online"; } - /** - * {@inheritDoc} - */ public URL getResource(String name) { return null; } - /** - * {@inheritDoc} - */ public String getResourceId() { return Activator.RESOURCE_ID; } Modified: trunk/platform-bundles/cassandra-application/src/main/java/org/amdatu/platform/cassandra/application/osgi/Activator.java ============================================================================== --- trunk/platform-bundles/cassandra-application/src/main/java/org/amdatu/platform/cassandra/application/osgi/Activator.java (original) +++ trunk/platform-bundles/cassandra-application/src/main/java/org/amdatu/platform/cassandra/application/osgi/Activator.java Tue Oct 19 14:19:59 2010 @@ -24,7 +24,6 @@ import org.apache.felix.dm.DependencyActivatorBase; import org.apache.felix.dm.DependencyManager; import org.osgi.framework.BundleContext; -import org.osgi.service.cm.ConfigurationAdmin; import org.osgi.service.log.LogService; @@ -33,9 +32,6 @@ * @author ivol */ public class Activator extends DependencyActivatorBase { - /** - * {@inheritDoc} - */ @Override public void init(BundleContext context, DependencyManager manager) throws Exception { // Register the Cassandra configuration service @@ -56,9 +52,6 @@ .add(createServiceDependency().setService(CassandraConfigurationService.class).setRequired(true))); } - /** - * {@inheritDoc} - */ @Override public void destroy(BundleContext context, DependencyManager manager) throws Exception { } Modified: trunk/platform-bundles/cassandra-application/src/main/java/org/amdatu/platform/cassandra/application/service/CassandraDaemonServiceImpl.java ============================================================================== --- trunk/platform-bundles/cassandra-application/src/main/java/org/amdatu/platform/cassandra/application/service/CassandraDaemonServiceImpl.java (original) +++ trunk/platform-bundles/cassandra-application/src/main/java/org/amdatu/platform/cassandra/application/service/CassandraDaemonServiceImpl.java Tue Oct 19 14:19:59 2010 @@ -16,6 +16,7 @@ */ package org.amdatu.platform.cassandra.application.service; +import javax.management.*; import java.io.File; import java.io.IOException; import java.lang.management.ManagementFactory; @@ -23,13 +24,6 @@ import java.net.InetSocketAddress; import java.util.Set; -import javax.management.InstanceNotFoundException; -import javax.management.MBeanRegistrationException; -import javax.management.MBeanServer; -import javax.management.MalformedObjectNameException; -import javax.management.ObjectInstance; -import javax.management.ObjectName; - import org.amdatu.platform.cassandra.application.CassandraDaemonService; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.db.CompactionManager; @@ -199,9 +193,6 @@ } } - /** - * {@inheritDoc} - */ public CassandraServer getCassandraServer() { return m_cassandraServer; } Modified: trunk/platform-bundles/cassandra-listener/src/main/java/org/amdatu/platform/cassandra/listener/osgi/Activator.java ============================================================================== --- trunk/platform-bundles/cassandra-listener/src/main/java/org/amdatu/platform/cassandra/listener/osgi/Activator.java (original) +++ trunk/platform-bundles/cassandra-listener/src/main/java/org/amdatu/platform/cassandra/listener/osgi/Activator.java Tue Oct 19 14:19:59 2010 @@ -31,9 +31,6 @@ * @author ivol */ public class Activator extends DependencyActivatorBase { - /** - * {@inheritDoc} - */ @Override public void init(BundleContext context, DependencyManager manager) throws Exception { // Register the Cassandra listener service @@ -53,9 +50,6 @@ .add(createServiceDependency().setService(CassandraPersistenceManagerFactory.class).setRequired(true))); } - /** - * {@inheritDoc} - */ @Override public void destroy(BundleContext context, DependencyManager manager) throws Exception { } Modified: trunk/platform-bundles/cassandra-listener/src/main/java/org/amdatu/platform/cassandra/listener/service/ColumnFamilyProviderServiceTracker.java ============================================================================== --- trunk/platform-bundles/cassandra-listener/src/main/java/org/amdatu/platform/cassandra/listener/service/ColumnFamilyProviderServiceTracker.java (original) +++ trunk/platform-bundles/cassandra-listener/src/main/java/org/amdatu/platform/cassandra/listener/service/ColumnFamilyProviderServiceTracker.java Tue Oct 19 14:19:59 2010 @@ -71,17 +71,12 @@ m_queueListener.start(); } - /** - * {@inheritDoc} - */ + @Override public void close() { super.close(); m_queueListener.interrupt(); } - /** - * {@inheritDoc} - */ @Override public Object addingService(ServiceReference reference) { Object service = m_bundleContext.getService(reference); Modified: trunk/platform-bundles/cassandra-persistencemanager/src/main/java/org/amdatu/platform/cassandra/persistencemanager/CassandraException.java ============================================================================== --- trunk/platform-bundles/cassandra-persistencemanager/src/main/java/org/amdatu/platform/cassandra/persistencemanager/CassandraException.java (original) +++ trunk/platform-bundles/cassandra-persistencemanager/src/main/java/org/amdatu/platform/cassandra/persistencemanager/CassandraException.java Tue Oct 19 14:19:59 2010 @@ -126,9 +126,6 @@ return this; } - /** - * @see Exception#getMessage() - */ @Override public String getMessage() { if (super.getMessage() != null) { @@ -138,9 +135,6 @@ } } - /** - * {@inheritDoc} - */ @Override public String toString() { if (m_exception != null) { Modified: trunk/platform-bundles/cassandra-persistencemanager/src/main/java/org/amdatu/platform/cassandra/persistencemanager/osgi/Activator.java ============================================================================== --- trunk/platform-bundles/cassandra-persistencemanager/src/main/java/org/amdatu/platform/cassandra/persistencemanager/osgi/Activator.java (original) +++ trunk/platform-bundles/cassandra-persistencemanager/src/main/java/org/amdatu/platform/cassandra/persistencemanager/osgi/Activator.java Tue Oct 19 14:19:59 2010 @@ -25,10 +25,6 @@ import org.osgi.service.log.LogService; public class Activator extends DependencyActivatorBase { - - /** - * {@inheritDoc} - */ @Override public void init(BundleContext context, DependencyManager manager) throws Exception { // Create and register the tenant unaware persistence manager @@ -40,9 +36,6 @@ .add(createServiceDependency().setService(CassandraDaemonService.class).setRequired(true))); } - /** - * {@inheritDoc} - */ @Override public void destroy(BundleContext context, DependencyManager manager) throws Exception { } Modified: trunk/platform-bundles/cassandra-persistencemanager/src/main/java/org/amdatu/platform/cassandra/persistencemanager/service/CassandraPersistenceManagerFactoryImpl.java ============================================================================== --- trunk/platform-bundles/cassandra-persistencemanager/src/main/java/org/amdatu/platform/cassandra/persistencemanager/service/CassandraPersistenceManagerFactoryImpl.java (original) +++ trunk/platform-bundles/cassandra-persistencemanager/src/main/java/org/amdatu/platform/cassandra/persistencemanager/service/CassandraPersistenceManagerFactoryImpl.java Tue Oct 19 14:19:59 2010 @@ -27,7 +27,6 @@ import org.osgi.service.log.LogService; /** - * @see CassandraPersistenceManagerFactory * @author ivol */ public class CassandraPersistenceManagerFactoryImpl implements CassandraPersistenceManagerFactory { Modified: trunk/platform-bundles/cassandra-persistencemanager/src/main/java/org/amdatu/platform/cassandra/persistencemanager/service/CassandraPersistenceManagerImpl.java ============================================================================== --- trunk/platform-bundles/cassandra-persistencemanager/src/main/java/org/amdatu/platform/cassandra/persistencemanager/service/CassandraPersistenceManagerImpl.java (original) +++ trunk/platform-bundles/cassandra-persistencemanager/src/main/java/org/amdatu/platform/cassandra/persistencemanager/service/CassandraPersistenceManagerImpl.java Tue Oct 19 14:19:59 2010 @@ -17,28 +17,14 @@ package org.amdatu.platform.cassandra.persistencemanager.service; import java.lang.reflect.Method; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Set; +import java.util.*; import java.util.Map.Entry; import org.amdatu.platform.cassandra.application.CassandraDaemonService; import org.amdatu.platform.cassandra.persistencemanager.CassandraException; import org.amdatu.platform.cassandra.persistencemanager.CassandraPersistenceManager; -import org.apache.cassandra.thrift.Column; -import org.apache.cassandra.thrift.ColumnOrSuperColumn; -import org.apache.cassandra.thrift.ColumnParent; -import org.apache.cassandra.thrift.ColumnPath; -import org.apache.cassandra.thrift.ConsistencyLevel; -import org.apache.cassandra.thrift.KeyRange; -import org.apache.cassandra.thrift.KeySlice; -import org.apache.cassandra.thrift.NotFoundException; -import org.apache.cassandra.thrift.SlicePredicate; -import org.apache.cassandra.thrift.SliceRange; -import org.apache.cassandra.thrift.SuperColumn; import org.apache.cassandra.thrift.Cassandra.Iface; +import org.apache.cassandra.thrift.*; import org.apache.felix.dm.Component; import org.osgi.service.log.LogService; @@ -49,8 +35,6 @@ * on the tenant service. The tenant service however stores the tenants in Cassandra and needs * the persistence manager for that. Using this base class both bundles can use their own * implementation without needless code duplication. - * @see org.amdatu.platform.cassandra.persistencemanager.service.TenantAwareCassandraPersistenceManagerImpl - * @see org.amdatu.platform.tenant.service.TenantPersistenceManager * @author ivol */ public class CassandraPersistenceManagerImpl implements CassandraPersistenceManager { @@ -88,9 +72,6 @@ m_logService.log(LogService.LOG_INFO, "Cassandra persistence manager for keyspace '" + m_keyspace + "' is stopped"); } - /** - * @see CassandraPersistenceManager#exists(String) - */ public boolean exists(String columnFamilyName) throws CassandraException { try { ColumnParent columnParent = new ColumnParent(columnFamilyName); @@ -113,9 +94,6 @@ } } - /** - * @see CassandraPersistenceManager#exists(String,String) - */ public boolean exists(String columnFamilyName, String rowKey) throws CassandraException { try { ColumnParent columnParent = new ColumnParent(columnFamilyName); @@ -138,9 +116,6 @@ } } - /** - * @see CassandraPersistenceManager#exists(String, String, String, String) - */ public boolean exists(String columnFamilyName, String rowKey, String superColumnName, String columnName) throws CassandraException { try { @@ -165,7 +140,6 @@ /** * Returns all keys for a certain ColumnFamily (think of all primary keys of all records in a certain table) - * @see CassandraPersistenceManager#getRowKeys(String) */ public List<String> getRowKeys(String columnFamilyName) throws CassandraException { try { @@ -203,9 +177,6 @@ } } - /** - * @see CassandraPersistenceManager#getColumnNames(String, String) - */ public List<String> getColumnNames(String columnFamilyName, String rowKey) throws CassandraException { try { List<String> result = new ArrayList<String>(); @@ -239,9 +210,6 @@ } } - /** - * @see CassandraPersistenceManager#getSuperValues(String) - */ public Map<String, Map<String, Map<String, byte[]>>> getSuperValues(String columnFamilyName) throws CassandraException { try { ColumnParent columnParent = new ColumnParent(columnFamilyName); @@ -265,9 +233,6 @@ } } - /** - * @see CassandraPersistenceManager#getSuperValues(String, String) - */ public Map<String, Map<String, byte[]>> getSuperValues(String columnFamilyName, String rowKey) throws CassandraException { try { ColumnParent columnParent = new ColumnParent(columnFamilyName); @@ -296,9 +261,6 @@ } } - /** - * @see CassandraPersistenceManager#getSuperStringValues(String, String) - */ public Map<String, Map<String, String>> getSuperStringValues(String columnFamilyName, String rowKey) throws CassandraException { try { @@ -327,9 +289,7 @@ } } } - /** - * @see CassandraPersistenceManager#getValue(String, String, String, String) - */ + public byte[] getValue(String columnFamilyName, String rowKey, String superColumnName, String columnName) throws CassandraException { try { ColumnPath columnPath = new ColumnPath(columnFamilyName); @@ -349,9 +309,6 @@ } } - /** - * @see CassandraPersistenceManager#getStringValue(String, String, String, String) - */ public String getStringValue(String columnFamilyName, String rowKey, String superColumnName, String columnName) throws CassandraException { try { byte[] value = getValue(columnFamilyName, rowKey, superColumnName, columnName); @@ -370,9 +327,6 @@ } } - /** - * @see CassandraPersistenceManager#getValues(String, String, String) - */ public Map<String, byte[]> getValues(String columnFamilyName, String rowKey, String superColumnName) throws CassandraException { try { ColumnParent columnParent = new ColumnParent(columnFamilyName); @@ -401,9 +355,6 @@ } } - /** - * @see CassandraPersistenceManager#getStringValues(String, String, String) - */ public Map<String, String> getStringValues(String columnFamilyName, String rowKey, String superColumnName) throws CassandraException { try { @@ -427,9 +378,6 @@ } } - /** - * @see CassandraPersistenceManager#setValue(String, String, String, String, byte[]) - */ public void setValue(String columnFamilyName, String rowKey, String superColumnName, String columnName, byte[] value) throws CassandraException { try { long timestamp = System.currentTimeMillis(); @@ -448,9 +396,6 @@ } } - /** - * @see CassandraPersistenceManager#setStringValue(String, String, String, String, String) - */ public void setStringValue(String columnFamilyName, String rowKey, String superColumnName, String columnName, String value) throws CassandraException { try { byte[] bytes = null; @@ -469,9 +414,6 @@ } } - /** - * @see CassandraPersistenceManager#deleteRow(String, String) - */ public void deleteRow(String columnFamilyName, String rowKey) throws CassandraException { deleteColumn(columnFamilyName, rowKey, null, null); @@ -482,16 +424,10 @@ } } - /** - * @see CassandraPersistenceManager#deleteColumn(String, String, String) - */ public void deleteSuperColumn(String columnFamilyName, String rowKey, String superColumnName) throws CassandraException { deleteColumn(columnFamilyName, rowKey, superColumnName, null); } - /** - * @see CassandraPersistenceManager#deleteColumn(String, String, String) - */ public void deleteColumn(String columnFamilyName, String rowKey, String superColumnName, String columnName) throws CassandraException { try { long timestamp = System.currentTimeMillis(); @@ -514,16 +450,10 @@ } } - /** - * @see CassandraPersistenceManager#loadBean(Class, String) - */ public <T> T loadBean(Class<T> clazz, String id) throws CassandraException { return loadBean(clazz, id, clazz.getName(), DEFAULT_SUPERCOLUMN_NAME); } - /** - * @see CassandraPersistenceManager#loadBean(Class, String, String, String) - */ public <T> T loadBean(Class<T> clazz, String id, String columnFamilyName, String superColumnName) throws CassandraException { boolean exists = false; T bean; @@ -563,9 +493,6 @@ return null; } - /** - * @see CassandraPersistenceManager#persistBean(Object) - */ public void persistBean(Object bean) throws CassandraException { Method idMethod; try { @@ -583,9 +510,6 @@ } } - /** - * @see CassandraPersistenceManager#persistBean(Object, String, String, String) - */ public void persistBean(Object bean, String id, String columnFamilyName, String superColumnName) throws CassandraException { // FIXME: For now, just persist all bean properties for which getters are available Method[] methods = bean.getClass().getMethods(); 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 Oct 19 14:19:59 2010 @@ -35,9 +35,6 @@ // it is prefixed with this id public final static String RESOURCE_ID = "configtemplate"; - /** - * {@inheritDoc} - */ @Override public void init(BundleContext context, DependencyManager manager) throws Exception { // Create and register the Config Template Manager service @@ -51,9 +48,6 @@ .add(createConfigurationDependency().setPid(ConfigTemplateManagerImpl.PID))); } - /** - * {@inheritDoc} - */ @Override public void destroy(BundleContext context, DependencyManager manager) throws Exception { } 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 Oct 19 14:19:59 2010 @@ -16,15 +16,8 @@ */ package org.amdatu.platform.configtemplatemanager.service; -import java.io.BufferedReader; -import java.io.BufferedWriter; -import java.io.File; -import java.io.FileWriter; -import java.io.IOException; -import java.io.InputStreamReader; -import java.io.StringWriter; +import java.io.*; import java.net.MalformedURLException; -import java.net.URI; import java.net.URL; import java.net.URLConnection; import java.util.Dictionary; @@ -110,9 +103,6 @@ m_logService.log(LogService.LOG_INFO, getClass().getName() + " service destroyed"); } - /** - * {@inheritDoc} - */ public synchronized URL getConfigurationAsURL(URL templateURL) throws IOException { if (m_urlCache.containsKey(templateURL.toString())) { String cachedUrl = m_urlCache.get(templateURL.toString()); @@ -144,9 +134,6 @@ return url; } - /** - * {@inheritDoc} - */ public synchronized StringBuffer getConfigurationAsString(URL templateURL) throws IOException { // Write the file with replaced configuration entries to the target file BufferedWriter writer = null; @@ -162,9 +149,6 @@ return sWiter.getBuffer(); } - /** - * {@inheritDoc} - */ public void writeConfiguration(URL templateURL, File targetFile) throws IOException { if (!targetFile.exists()) { if (targetFile.getParentFile() != null && !targetFile.getParentFile().exists()) { @@ -190,9 +174,6 @@ } } - /** - * {@inheritDoc} - */ public void writeConfiguration(URL templateURL, BufferedWriter writer) throws IOException { // Now write the converted entries to the writer BufferedReader reader = null; @@ -218,9 +199,6 @@ } } - /** - * {@inheritDoc} - */ public synchronized void clear(String templateURL) { if (m_urlCache.containsKey(templateURL)) { String url = m_urlCache.get(templateURL); @@ -280,9 +258,6 @@ return newLine; } - /** - * {@inheritDoc} - */ public URL getResource(String name) { String configId = name.substring(name.lastIndexOf("/") + 1); @@ -295,9 +270,6 @@ return null; } - /** - * {@inheritDoc} - */ public String getResourceId() { return Activator.RESOURCE_ID; } Modified: trunk/platform-bundles/httpcontext/src/main/java/org/amdatu/platform/httpcontext/osgi/Activator.java ============================================================================== --- trunk/platform-bundles/httpcontext/src/main/java/org/amdatu/platform/httpcontext/osgi/Activator.java (original) +++ trunk/platform-bundles/httpcontext/src/main/java/org/amdatu/platform/httpcontext/osgi/Activator.java Tue Oct 19 14:19:59 2010 @@ -29,9 +29,6 @@ * @author ivol */ public class Activator extends DependencyActivatorBase { - /** - * {@inheritDoc} - */ @Override public void init(BundleContext context, DependencyManager manager) throws Exception { manager.add( @@ -47,9 +44,6 @@ // LogOSGIFactory.initOSGI(context); } - /** - * {@inheritDoc} - */ @Override public void destroy(BundleContext context, DependencyManager manager) throws Exception { } Modified: trunk/platform-bundles/httpcontext/src/main/java/org/amdatu/platform/httpcontext/service/HttpContextFactoryServiceImpl.java ============================================================================== --- trunk/platform-bundles/httpcontext/src/main/java/org/amdatu/platform/httpcontext/service/HttpContextFactoryServiceImpl.java (original) +++ trunk/platform-bundles/httpcontext/src/main/java/org/amdatu/platform/httpcontext/service/HttpContextFactoryServiceImpl.java Tue Oct 19 14:19:59 2010 @@ -17,11 +17,7 @@ package org.amdatu.platform.httpcontext.service; import java.net.URL; -import java.util.ArrayList; -import java.util.Dictionary; -import java.util.Enumeration; -import java.util.Hashtable; -import java.util.List; +import java.util.*; import org.amdatu.platform.httpcontext.HttpContextServiceFactory; import org.amdatu.platform.httpcontext.ResourceProvider; @@ -80,16 +76,10 @@ return component; } - /** - * {@inheritDoc} - */ public Component create(BundleContext bundleContext) { return internalCreate(bundleContext, null, null); } - /** - * {@inheritDoc} - */ public Component create(BundleContext bundleContext, ResourceProvider resourceProvider) { // Create context and bind all resources to it Bundle bundle = bundleContext.getBundle(); Modified: trunk/platform-bundles/httpcontext/src/main/java/org/amdatu/platform/httpcontext/service/HttpContextImpl.java ============================================================================== --- trunk/platform-bundles/httpcontext/src/main/java/org/amdatu/platform/httpcontext/service/HttpContextImpl.java (original) +++ trunk/platform-bundles/httpcontext/src/main/java/org/amdatu/platform/httpcontext/service/HttpContextImpl.java Tue Oct 19 14:19:59 2010 @@ -16,14 +16,13 @@ */ package org.amdatu.platform.httpcontext.service; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.net.URL; import java.util.ArrayList; import java.util.List; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - import org.amdatu.platform.httpcontext.ExtHttpContext; import org.amdatu.platform.httpcontext.ResourceProvider; import org.apache.felix.dm.Component; @@ -106,17 +105,11 @@ + "')"); } - /** - * @see org.osgi.service.http.HttpContext#getMimeType(String) - */ public String getMimeType(String name) { // Use the Apache Sling mimetype resource to return the proper mimetype of this resource return m_mimeTypeService.getMimeType(name); } - /** - * {@inheritDoc} - */ public URL getResource(String name) { m_logService.log(LogService.LOG_DEBUG, "Resource '" + name + "' requested on HTTP context for bundle " + m_bundleId); Modified: trunk/platform-bundles/profile-service/src/main/java/org/amdatu/platform/profile/domain/FriendImpl.java ============================================================================== --- trunk/platform-bundles/profile-service/src/main/java/org/amdatu/platform/profile/domain/FriendImpl.java (original) +++ trunk/platform-bundles/profile-service/src/main/java/org/amdatu/platform/profile/domain/FriendImpl.java Tue Oct 19 14:19:59 2010 @@ -39,30 +39,18 @@ myFriendId = friendId; } - /** - * {@inheritDoc} - */ public String getId() { return myId; } - /** - * {@inheritDoc} - */ public void setId(String id) { myId = id; } - /** - * {@inheritDoc} - */ public String getFriendId() { return myFriendId; } - - /** - * {@inheritDoc} - */ + public void setFriendId(String friendId) { myFriendId = 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 Tue Oct 19 14:19:59 2010 @@ -28,9 +28,6 @@ import org.osgi.service.useradmin.UserAdmin; public class Activator extends DependencyActivatorBase { - /** - * {@inheritDoc} - */ @Override public void init(BundleContext context, DependencyManager manager) throws Exception { // Create and register the FirendColumnFamilyProvider service. @@ -51,9 +48,6 @@ .add(createServiceDependency().setService(UserAdmin.class).setRequired(true))); } - /** - * {@inheritDoc} - */ @Override public void destroy(BundleContext context, DependencyManager manager) throws Exception { } Modified: trunk/platform-bundles/profile-service/src/main/java/org/amdatu/platform/profile/service/FriendColumnFamilyProvider.java ============================================================================== --- trunk/platform-bundles/profile-service/src/main/java/org/amdatu/platform/profile/service/FriendColumnFamilyProvider.java (original) +++ trunk/platform-bundles/profile-service/src/main/java/org/amdatu/platform/profile/service/FriendColumnFamilyProvider.java Tue Oct 19 14:19:59 2010 @@ -17,22 +17,18 @@ package org.amdatu.platform.profile.service; import org.amdatu.platform.cassandra.listener.ColumnFamilyDefinition; -import org.amdatu.platform.cassandra.listener.ColumnFamilyProvider; import org.amdatu.platform.cassandra.listener.ColumnFamilyDefinition.ColumnType; import org.amdatu.platform.cassandra.listener.ColumnFamilyDefinition.CompareType; +import org.amdatu.platform.cassandra.listener.ColumnFamilyProvider; /** * Provides the "Friend" ColumnFamily. - * @see ColumnFamilyProvider * @author ivol */ public class FriendColumnFamilyProvider implements ColumnFamilyProvider { // Name of the "Friend" ColumnFamily public static final String CF_FRIEND = "Friend"; - /** - * @see ColumnFamilyProvider#getColumnFamilies() - */ public ColumnFamilyDefinition[] getColumnFamilies() { // Register column families for Friend, which is a ColumnFamily specific to this bundle // <ColumnFamily Name="Friend" ColumnType="Super" CompareWith="BytesType" CompareSubcolumnsWith="BytesType" /> Modified: trunk/platform-bundles/profile-service/src/main/java/org/amdatu/platform/profile/service/PersonServiceImpl.java ============================================================================== --- trunk/platform-bundles/profile-service/src/main/java/org/amdatu/platform/profile/service/PersonServiceImpl.java (original) +++ trunk/platform-bundles/profile-service/src/main/java/org/amdatu/platform/profile/service/PersonServiceImpl.java Tue Oct 19 14:19:59 2010 @@ -16,13 +16,7 @@ */ package org.amdatu.platform.profile.service; -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.io.ObjectInputStream; -import java.io.ObjectOutputStream; -import java.io.Serializable; -import java.io.UnsupportedEncodingException; +import java.io.*; import java.util.ArrayList; import java.util.List; import java.util.Set; @@ -55,10 +49,6 @@ private volatile LogService m_logService; private volatile UserAdmin m_userAdmin; - /** - * @see org.apache.shindig.social.opensocial.spi.PersonService#getPeople(Set, GroupId, CollectionOptions, Set, - * SecurityToken) - */ public Future<RestfulCollection<Person>> getPeople(Set<UserId> userIds, GroupId groupId, CollectionOptions collectionOptions, Set<String> fields, SecurityToken token) throws ProtocolException { List<Person> friends = new ArrayList<Person>(); @@ -77,9 +67,6 @@ return ImmediateFuture.newInstance(new RestfulCollection<Person>(friends)); } - /** - * @see org.apache.shindig.social.opensocial.spi.PersonService#getPerson(UserId, Set, SecurityToken) - */ public Future<Person> getPerson(UserId id, Set<String> fields, SecurityToken token) throws ProtocolException { // TODO: determine tenant from user profile. For now we just take the first available tenant if (!"".equals(id.getUserId(token))) { @@ -96,9 +83,6 @@ } } - /** - * @see PersonService#getPersons() - */ public List<Person> getPersons() { m_logService.log(LogService.LOG_DEBUG, "Retrieving all persons"); List<Person> result = new ArrayList<Person>(); @@ -123,9 +107,6 @@ return result; } - /** - * @see PersonService#setPerson(Person, User) - */ @SuppressWarnings("unchecked") public void setPerson(Person person, User user) { // Since person is not serializable, create a Serializable proxy object from it first @@ -143,17 +124,11 @@ } } - /** - * @see PersonService#getUser(Person) - */ public User getUser(Person person) { // Retrieved all persons that match the specified profile. return m_userAdmin.getUser(AuthorizationService.USER_NAME_CREDENTIAL_KEY, person.getId()); } - /** - * @see PersonService#getPerson(User) - */ public Person getPerson(User user) { try { byte[] personBytes = (byte[]) user.getProperties().get(PersonService.OPEN_SOCIAL_PERSON_PROPERTIES_KEY); @@ -169,9 +144,6 @@ return null; } - /** - * @see PersonService#setFriends(String[], User) - */ @SuppressWarnings("unchecked") public void setFriends(String[] friends, User user) { byte[] friendBytes; @@ -185,9 +157,6 @@ } } - /** - * @see PersonService#getFriends(Person) - */ public List<Person> getFriends(Person person) { List<Person> friends = new ArrayList<Person>(); try { 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 Tue Oct 19 14:19:59 2010 @@ -29,9 +29,6 @@ * @author ivol */ public class Activator extends DependencyActivatorBase { - /** - * {@inheritDoc} - */ @Override public void init(BundleContext context, DependencyManager manager) throws Exception { System.out.println("Starting Sesame application bundle..."); @@ -44,9 +41,6 @@ .add(createServiceDependency().setService(LogService.class).setRequired(true))); } - /** - * {@inheritDoc} - */ @Override public void destroy(BundleContext context, DependencyManager manager) throws Exception { System.out.println("Stopping Sesame application bundle..."); Modified: trunk/platform-bundles/sesame-application/src/main/java/org/amdatu/platform/sesame/application/service/SesameServiceImpl.java ============================================================================== --- trunk/platform-bundles/sesame-application/src/main/java/org/amdatu/platform/sesame/application/service/SesameServiceImpl.java (original) +++ trunk/platform-bundles/sesame-application/src/main/java/org/amdatu/platform/sesame/application/service/SesameServiceImpl.java Tue Oct 19 14:19:59 2010 @@ -26,12 +26,7 @@ import org.amdatu.platform.sesame.application.SesameService; import org.openrdf.model.URI; import org.openrdf.model.ValueFactory; -import org.openrdf.query.BindingSet; -import org.openrdf.query.MalformedQueryException; -import org.openrdf.query.QueryEvaluationException; -import org.openrdf.query.QueryLanguage; -import org.openrdf.query.TupleQuery; -import org.openrdf.query.TupleQueryResult; +import org.openrdf.query.*; import org.openrdf.repository.Repository; import org.openrdf.repository.RepositoryConnection; import org.openrdf.repository.RepositoryException; @@ -70,9 +65,6 @@ } } - /** - * {@inheritDoc} - */ public Repository getRepository() { return m_repository; } @@ -97,9 +89,6 @@ return felixCacheDir.substring(0, felixCacheDir.indexOf("/")) + "/sesame"; } - /** - * {@inheritDoc} - */ public void importRDFFile(URL rdfFile) { RepositoryConnection connection = null; try { @@ -122,9 +111,6 @@ } } - /** - * {@inheritDoc} - */ public <T> T executeSPARQLQuery(String queryString, SPARQLQueryHandler<T> handler) { RepositoryConnection connection = null; TupleQueryResult result = null; @@ -159,9 +145,6 @@ return null; } - /** - * {@inheritDoc} - */ public List<String> getSubjects(String classURI) { ValueFactory factory = getRepository().getValueFactory(); URI grade = factory.createURI(classURI); 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 Tue Oct 19 14:19:59 2010 @@ -20,14 +20,13 @@ import java.util.Arrays; import java.util.Properties; -import org.amdatu.platform.shindig.application.service.ShindigConfigurator; -import org.osgi.service.cm.ConfigurationAdmin; -import org.osgi.service.log.LogService; - import com.google.inject.AbstractModule; import com.google.inject.CreationException; import com.google.inject.name.Names; import com.google.inject.spi.Message; +import org.amdatu.platform.shindig.application.service.ShindigConfigurator; +import org.osgi.service.cm.ConfigurationAdmin; +import org.osgi.service.log.LogService; /** * This is a custom properties module to read the shindig properties file. @@ -54,9 +53,6 @@ m_properties = readPropertyFile(DEFAULT_PROPERTIES); } - /** - * {@inheritDoc} - */ @Override protected void configure() { Names.bindProperties(binder(), m_properties); Modified: trunk/platform-bundles/shindig-application/src/main/java/org/amdatu/platform/shindig/application/module/SocialApiModuleImpl.java ============================================================================== --- trunk/platform-bundles/shindig-application/src/main/java/org/amdatu/platform/shindig/application/module/SocialApiModuleImpl.java (original) +++ trunk/platform-bundles/shindig-application/src/main/java/org/amdatu/platform/shindig/application/module/SocialApiModuleImpl.java Tue Oct 19 14:19:59 2010 @@ -19,6 +19,10 @@ import java.util.List; import java.util.Set; +import com.google.inject.AbstractModule; +import com.google.inject.TypeLiteral; +import com.google.inject.internal.ImmutableSet; +import com.google.inject.name.Names; import org.amdatu.platform.shindig.application.SocialApiModule; import org.amdatu.platform.shindig.application.service.PersonServiceDispatcher; import org.apache.shindig.auth.AnonymousAuthenticationHandler; @@ -46,11 +50,6 @@ import org.osgi.framework.BundleContext; import org.osgi.service.log.LogService; -import com.google.inject.AbstractModule; -import com.google.inject.TypeLiteral; -import com.google.inject.internal.ImmutableSet; -import com.google.inject.name.Names; - /** * This module binds the Social Api services. * @author ivol @@ -65,9 +64,6 @@ m_logService.log(LogService.LOG_INFO, getClass().getName() + " service started"); } - /** - * {@inheritDoc} - */ @Override protected void configure() { // Some standard bindings 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 Oct 19 14:19:59 2010 @@ -54,9 +54,6 @@ // The PID for Shindig specific configuration properties public final static String SHINDIG_CONFIG_PID = ShindigRegistrationServiceImpl.class.getName(); - /** - * {@inheritDoc} - */ @Override public void init(BundleContext context, DependencyManager manager) throws Exception { // First define a service that provides the Gadget ColumnFamily we need @@ -119,9 +116,6 @@ .add(createServiceDependency().setService(WebContainer.class).setRequired(true))); } - /** - * {@inheritDoc} - */ @Override public void destroy(BundleContext context, DependencyManager manager) throws Exception { } Modified: trunk/platform-bundles/shindig-application/src/main/java/org/amdatu/platform/shindig/application/persistence/CassandraAppDataServiceStore.java ============================================================================== --- trunk/platform-bundles/shindig-application/src/main/java/org/amdatu/platform/shindig/application/persistence/CassandraAppDataServiceStore.java (original) +++ trunk/platform-bundles/shindig-application/src/main/java/org/amdatu/platform/shindig/application/persistence/CassandraAppDataServiceStore.java Tue Oct 19 14:19:59 2010 @@ -16,14 +16,14 @@ */ package org.amdatu.platform.shindig.application.persistence; +import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.HashMap; import java.util.Map; import java.util.Set; import java.util.concurrent.Future; -import javax.servlet.http.HttpServletResponse; - +import com.google.common.collect.Maps; import org.amdatu.libraries.utilities.ConversionUtil; import org.amdatu.platform.shindig.application.OpenSocialConstants; import org.apache.shindig.auth.SecurityToken; @@ -37,8 +37,6 @@ import org.osgi.service.useradmin.Role; import org.osgi.service.useradmin.User; import org.osgi.service.useradmin.UserAdmin; - -import com.google.common.collect.Maps; /** * This class is responsible for storage of the OpenSocial content called "AppData". * @author ivol @@ -52,9 +50,6 @@ m_logService.log(LogService.LOG_INFO, getClass().getName() + " service started"); } - /** - * @see AppDataService#updatePersonData(UserId, GroupId, String, Set, Map, SecurityToken) - */ @SuppressWarnings("unchecked") public Future<Void> updatePersonData(UserId userId, GroupId groupId, String appId, Set<String> fields, Map<String, String> values, SecurityToken token) throws ProtocolException { @@ -75,9 +70,6 @@ + "' not found"); } - /** - * @see AppDataService#getPersonData(Set, GroupId, String, Set, SecurityToken) - */ @SuppressWarnings("unchecked") public Future<DataCollection> getPersonData(Set<UserId> userIds, GroupId groupId, String appId, Set<String> fields, SecurityToken token) throws ProtocolException { @@ -105,9 +97,6 @@ return ImmediateFuture.newInstance(new DataCollection(idToData)); } - /** - * @see AppDataService#deletePersonData(UserId, GroupId, String, Set, SecurityToken) - */ @SuppressWarnings("unchecked") public Future<Void> deletePersonData(UserId userId, GroupId groupId, String appId, Set<String> fields, SecurityToken token) throws ProtocolException { Modified: trunk/platform-bundles/shindig-application/src/main/java/org/amdatu/platform/shindig/application/persistence/CassandraOAuthStore.java ============================================================================== --- trunk/platform-bundles/shindig-application/src/main/java/org/amdatu/platform/shindig/application/persistence/CassandraOAuthStore.java (original) +++ trunk/platform-bundles/shindig-application/src/main/java/org/amdatu/platform/shindig/application/persistence/CassandraOAuthStore.java Tue Oct 19 14:19:59 2010 @@ -23,16 +23,11 @@ import net.oauth.OAuthConsumer; import net.oauth.OAuthServiceProvider; import net.oauth.signature.RSA_SHA1; - import org.amdatu.platform.shindig.application.GadgetDefinition; import org.amdatu.platform.shindig.application.GadgetStore; import org.apache.shindig.auth.SecurityToken; import org.apache.shindig.gadgets.GadgetException; -import org.apache.shindig.gadgets.oauth.BasicOAuthStore; -import org.apache.shindig.gadgets.oauth.BasicOAuthStoreConsumerIndex; -import org.apache.shindig.gadgets.oauth.BasicOAuthStoreConsumerKeyAndSecret; -import org.apache.shindig.gadgets.oauth.BasicOAuthStoreTokenIndex; -import org.apache.shindig.gadgets.oauth.OAuthStore; +import org.apache.shindig.gadgets.oauth.*; import org.apache.shindig.gadgets.oauth.BasicOAuthStoreConsumerKeyAndSecret.KeyType; import org.osgi.framework.BundleContext; import org.osgi.service.log.LogService; @@ -104,9 +99,6 @@ m_consumerInfos.put(providerKey, keyAndSecret); } - /** - * @see OAuthStore#getConsumerKeyAndSecret(SecurityToken, String, OAuthServiceProvider) - */ public ConsumerInfo getConsumerKeyAndSecret(SecurityToken securityToken, String serviceName, OAuthServiceProvider provider) throws GadgetException { @@ -137,30 +129,18 @@ return new ConsumerInfo(consumer, cks.getKeyName(), callback); } - /** - * @see OAuthStore#getTokenInfo(SecurityToken, org.apache.shindig.gadgets.oauth.OAuthStore.ConsumerInfo, String, - * String) - */ public TokenInfo getTokenInfo(SecurityToken securityToken, ConsumerInfo consumerInfo, String serviceName, String tokenName) throws GadgetException { BasicOAuthStoreTokenIndex tokenKey = makeBasicOAuthStoreTokenIndex(securityToken, serviceName, tokenName); return m_tokens.get(tokenKey); } - /** - * @see OAuthStore#setTokenInfo(SecurityToken, org.apache.shindig.gadgets.oauth.OAuthStore.ConsumerInfo, String, - * String, TokenInfo) - */ public void setTokenInfo(SecurityToken securityToken, ConsumerInfo consumerInfo, String serviceName, String tokenName, TokenInfo tokenInfo) throws GadgetException { BasicOAuthStoreTokenIndex tokenKey = makeBasicOAuthStoreTokenIndex(securityToken, serviceName, tokenName); m_tokens.put(tokenKey, tokenInfo); } - /** - * @see OAuthStore#removeToken(SecurityToken, org.apache.shindig.gadgets.oauth.OAuthStore.ConsumerInfo, String, - * String) - */ public void removeToken(SecurityToken securityToken, ConsumerInfo consumerInfo, String serviceName, String tokenName) throws GadgetException { BasicOAuthStoreTokenIndex tokenKey = makeBasicOAuthStoreTokenIndex(securityToken, serviceName, tokenName); Modified: trunk/platform-bundles/shindig-application/src/main/java/org/amdatu/platform/shindig/application/persistence/GadgetColumnFamilyProvider.java ============================================================================== --- trunk/platform-bundles/shindig-application/src/main/java/org/amdatu/platform/shindig/application/persistence/GadgetColumnFamilyProvider.java (original) +++ trunk/platform-bundles/shindig-application/src/main/java/org/amdatu/platform/shindig/application/persistence/GadgetColumnFamilyProvider.java Tue Oct 19 14:19:59 2010 @@ -17,9 +17,9 @@ package org.amdatu.platform.shindig.application.persistence; import org.amdatu.platform.cassandra.listener.ColumnFamilyDefinition; -import org.amdatu.platform.cassandra.listener.ColumnFamilyProvider; import org.amdatu.platform.cassandra.listener.ColumnFamilyDefinition.ColumnType; import org.amdatu.platform.cassandra.listener.ColumnFamilyDefinition.CompareType; +import org.amdatu.platform.cassandra.listener.ColumnFamilyProvider; import org.amdatu.platform.cassandra.persistencemanager.CassandraPersistenceManager; import org.amdatu.platform.shindig.application.GadgetStore; @@ -33,9 +33,6 @@ * @author ivol */ public class GadgetColumnFamilyProvider implements ColumnFamilyProvider { - /** - * {@inheritDoc} - */ public ColumnFamilyDefinition[] getColumnFamilies() { return new ColumnFamilyDefinition[]{ new ColumnFamilyDefinition( 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 Tue Oct 19 14:19:59 2010 @@ -56,9 +56,6 @@ 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; @@ -91,9 +88,6 @@ return null; } - /** - * {@inheritDoc} - */ public Future<Person> getPerson(UserId id, Set<String> fields, SecurityToken token) throws ProtocolException { ServiceReference[] serviceReferences; try { 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 Oct 19 14:19:59 2010 @@ -18,6 +18,10 @@ import static org.amdatu.platform.shindig.application.osgi.Activator.RESOURCE_ID; +import javax.servlet.ServletConfig; +import javax.servlet.ServletContext; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServlet; import java.io.File; import java.io.FileOutputStream; import java.io.IOException; @@ -28,28 +32,21 @@ import java.util.List; import java.util.Properties; -import javax.servlet.ServletConfig; -import javax.servlet.ServletContext; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; - +import com.google.inject.Guice; +import com.google.inject.Injector; +import com.google.inject.Module; +import com.google.inject.Stage; +import com.google.inject.tools.jmx.Manager; import org.amdatu.platform.httpcontext.HttpContextServiceFactory; import org.amdatu.platform.httpcontext.ResourceProvider; import org.amdatu.platform.shindig.application.OAuthModule; import org.amdatu.platform.shindig.application.SocialApiModule; -import org.amdatu.platform.shindig.application.module.OAuthModuleImpl; import org.amdatu.platform.shindig.application.module.PropertiesModule; import org.amdatu.platform.shindig.application.oauth.OAuthServlet; import org.apache.felix.dm.Component; import org.apache.shindig.auth.AuthenticationServletFilter; import org.apache.shindig.common.servlet.GuiceServletContextListener; -import org.apache.shindig.gadgets.servlet.ConcatProxyServlet; -import org.apache.shindig.gadgets.servlet.GadgetRenderingServlet; -import org.apache.shindig.gadgets.servlet.JsServlet; -import org.apache.shindig.gadgets.servlet.MakeRequestServlet; -import org.apache.shindig.gadgets.servlet.OAuthCallbackServlet; -import org.apache.shindig.gadgets.servlet.ProxyServlet; -import org.apache.shindig.gadgets.servlet.RpcServlet; +import org.apache.shindig.gadgets.servlet.*; import org.apache.shindig.protocol.DataServiceServlet; import org.apache.shindig.protocol.JsonRpcServlet; import org.ops4j.pax.web.service.WebContainer; @@ -62,12 +59,6 @@ import org.osgi.service.http.NamespaceException; import org.osgi.service.log.LogService; -import com.google.inject.Guice; -import com.google.inject.Injector; -import com.google.inject.Module; -import com.google.inject.Stage; -import com.google.inject.tools.jmx.Manager; - /** * This service is responsible for registration and unregistration of Shindig servlets, filters and static * resources. @@ -403,16 +394,10 @@ // with that new configuration } - /** - * {@inheritDoc} - */ public URL getResource(String name) { return null; } - /** - * {@inheritDoc} - */ public String getResourceId() { return RESOURCE_ID; } Modified: trunk/platform-bundles/tenant-service/src/main/java/org/amdatu/platform/tenant/TenantImpl.java ============================================================================== --- trunk/platform-bundles/tenant-service/src/main/java/org/amdatu/platform/tenant/TenantImpl.java (original) +++ trunk/platform-bundles/tenant-service/src/main/java/org/amdatu/platform/tenant/TenantImpl.java Tue Oct 19 14:19:59 2010 @@ -42,30 +42,18 @@ m_properties = properties; } - /** - * {@inheritDoc} - */ public String getId() { return m_id; } - /** - * {@inheritDoc} - */ public String getName() { return m_name; } - /** - * {@inheritDoc} - */ public void setName(String name) { m_name = name; } - /** - * @see Tenant#getProperties() - */ public Map<String, String> getProperties() { return m_properties; } @@ -105,9 +93,6 @@ return true; } - /** - * @see Tenant#matches(Map) - */ public boolean matches(Map<String, String> properties) { for (String key : properties.keySet()) { if (!m_properties.containsKey(key)) { Modified: trunk/platform-bundles/tenant-service/src/main/java/org/amdatu/platform/tenant/dao/TenantDAOCassandraImpl.java ============================================================================== --- trunk/platform-bundles/tenant-service/src/main/java/org/amdatu/platform/tenant/dao/TenantDAOCassandraImpl.java (original) +++ trunk/platform-bundles/tenant-service/src/main/java/org/amdatu/platform/tenant/dao/TenantDAOCassandraImpl.java Tue Oct 19 14:19:59 2010 @@ -45,9 +45,6 @@ // Services injected by the Felix dependency manager private volatile CassandraPersistenceManager m_pm; - /** - * @see TenantDAO#create(String, String) - */ public Tenant create(String id, String name) throws TenantException { synchronized (this) { try { @@ -63,9 +60,6 @@ } } - /** - * @see TenantDAO#readAll() - */ public List<Tenant> readAll() throws TenantException { synchronized (this) { try { @@ -85,9 +79,6 @@ } } - /** - * @see TenantDAO#read(String) - */ public Tenant read(String rowKey) throws TenantException { synchronized (this) { try { @@ -106,9 +97,6 @@ } } - /** - * @see TenantDAO#update(Tenant) - */ public void update(Tenant tenant) throws TenantException { synchronized (this) { try { @@ -124,9 +112,6 @@ } } - /** - * @see TenantDAO#delete(Tenant) - */ public void delete(Tenant tenant) throws TenantException { synchronized (this) { try { Modified: trunk/platform-bundles/tenant-service/src/main/java/org/amdatu/platform/tenant/osgi/Activator.java ============================================================================== --- trunk/platform-bundles/tenant-service/src/main/java/org/amdatu/platform/tenant/osgi/Activator.java (original) +++ trunk/platform-bundles/tenant-service/src/main/java/org/amdatu/platform/tenant/osgi/Activator.java Tue Oct 19 14:19:59 2010 @@ -39,9 +39,6 @@ * */ public class Activator extends DependencyActivatorBase { - /** - * {@inheritDoc} - */ @Override public void init(BundleContext context, DependencyManager manager) throws Exception { // Create and register the Tenant ColumnFamilyProvider @@ -56,7 +53,7 @@ String keyspaceFilter = "(" + CassandraPersistenceManager.KEYSPACE_AWARE_KEY + "=" + CassandraPersistenceManager.DEFAULT_KEYSPACE + ")"; - + // Create and register the Cassandra Tenant DAO manager.add( createComponent() @@ -80,9 +77,6 @@ .setInterface(TenantAwareServiceAdapter.class.getName(), null)); } - /** - * {@inheritDoc} - */ @Override public void destroy(BundleContext context, DependencyManager manager) throws Exception { } 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 Tue Oct 19 14:19:59 2010 @@ -18,9 +18,9 @@ import org.amdatu.platform.cassandra.listener.ColumnFamilyAvailable; import org.amdatu.platform.cassandra.listener.ColumnFamilyDefinition; -import org.amdatu.platform.cassandra.listener.ColumnFamilyProvider; import org.amdatu.platform.cassandra.listener.ColumnFamilyDefinition.ColumnType; import org.amdatu.platform.cassandra.listener.ColumnFamilyDefinition.CompareType; +import org.amdatu.platform.cassandra.listener.ColumnFamilyProvider; import org.amdatu.platform.cassandra.persistencemanager.CassandraPersistenceManager; /** @@ -39,9 +39,6 @@ */ public final static String TENANT_AVAILABLE_FILTER = "(" + ColumnFamilyAvailable.FILTER_NAME + "=" + CF_TENANT + ")"; - /** - * @see ColumnFamilyProvider#getColumnFamilies() - */ public ColumnFamilyDefinition[] getColumnFamilies() { return new ColumnFamilyDefinition[]{ new ColumnFamilyDefinition( Modified: trunk/platform-bundles/tenant-service/src/main/java/org/amdatu/platform/tenant/service/TenantManagementServiceImpl.java ============================================================================== --- trunk/platform-bundles/tenant-service/src/main/java/org/amdatu/platform/tenant/service/TenantManagementServiceImpl.java (original) +++ trunk/platform-bundles/tenant-service/src/main/java/org/amdatu/platform/tenant/service/TenantManagementServiceImpl.java Tue Oct 19 14:19:59 2010 @@ -62,16 +62,10 @@ } } - /** - * @see TenantManagementService#getAllTenants() - */ public Tenant[] getAllTenants() { return m_tenants.toArray(new Tenant[m_tenants.size()]); } - /** - * @see TenantManagementService#getTenantById(String) - */ public Tenant getTenantById(String id) { for (Tenant tenant : m_tenants) { if (tenant.getId().equals(id)) { @@ -81,9 +75,6 @@ return null; } - /** - * @see TenantManagementService#getTenants(Map) - */ public Tenant[] getTenants(Map<String, String> properties) { List<Tenant> matchingTenants = new ArrayList<Tenant>(); for (Tenant tenant : m_tenants) { @@ -94,9 +85,6 @@ return matchingTenants.toArray(new Tenant[matchingTenants.size()]); } - /** - * @see TenantManagementService#createTentant(String, String) - */ public Tenant createTentant(String id, String name) throws TenantException { synchronized (this) { Tenant tenant = m_tenantDAO.create(id, name); @@ -109,16 +97,10 @@ } } - /** - * @see TenantManagementService#updateTenant(Tenant) - */ public void updateTenant(Tenant tenant) throws TenantException { m_tenantDAO.update(tenant); } - /** - * @see TenantManagementService#deleteTenant(Tenant) - */ public void deleteTenant(Tenant tenant) throws TenantException { synchronized (this) { m_tenantDAO.delete(tenant); Modified: trunk/platform-bundles/tenant-service/src/test/java/org/amdatu/test/unit/InMemoryTenantDAO.java ============================================================================== --- trunk/platform-bundles/tenant-service/src/test/java/org/amdatu/test/unit/InMemoryTenantDAO.java (original) +++ trunk/platform-bundles/tenant-service/src/test/java/org/amdatu/test/unit/InMemoryTenantDAO.java Tue Oct 19 14:19:59 2010 @@ -33,9 +33,6 @@ // list of in-moemory tenants private List<Tenant> m_tenants = new ArrayList<Tenant>(); - /** - * @see TenantDAO#create(String, String) - */ public Tenant create(String id, String name) throws TenantException { try { read(id); @@ -48,9 +45,6 @@ throw new TenantException("Tenant with id " + id + " already exists"); } - /** - * @see TenantDAO#readAll() - */ public List<Tenant> readAll() throws TenantException { List<Tenant> tenantCopy = new ArrayList<Tenant>(); for (Tenant tenant : m_tenants) { @@ -59,9 +53,6 @@ return tenantCopy; } - /** - * @see TenantDAO#read(String) - */ public Tenant read(String id) throws TenantException { for (Tenant tenant : m_tenants) { if (id.equals(tenant.getId())) { @@ -71,17 +62,11 @@ throw new TenantException("Tenant with id '" + id + "' does not exist"); } - /** - * @see TenantDAO#update(Tenant) - */ public void update(Tenant tenant) throws TenantException { Tenant t = read(tenant.getId()); t.setName(tenant.getName()); } - /** - * @see TenantDAO#delete(Tenant) - */ public void delete(Tenant tenant) throws TenantException { for (Tenant t : m_tenants) { if (tenant.getId().equals(t.getId())) { 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 Oct 19 14:19:59 2010 @@ -47,9 +47,6 @@ // it is prefixed with this id public final static String RESOURCE_ID = "useradmin"; - /** - * {@inheritDoc} - */ @Override public void init(BundleContext context, DependencyManager manager) throws Exception { // First define a service that provides the Role ColumnFamily we need @@ -99,9 +96,6 @@ .add(createServiceDependency().setService(WebContainer.class).setRequired(true))); } - /** - * {@inheritDoc} - */ @Override public void destroy(BundleContext context, DependencyManager manager) throws Exception { } 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 Oct 19 14:19:59 2010 @@ -56,16 +56,10 @@ m_httpContextComponent.stop(); } - /** - * @see ResourceProvider#getResource(String) - */ public URL getResource(String name) { return null; } - /** - * @see ResourceProvider#getResourceId() - */ public String getResourceId() { return Activator.RESOURCE_ID; } Modified: trunk/platform-bundles/useradmin-cassandra-store/src/main/java/org/amdatu/platform/useradmin/store/cassandra/service/RoleColumnFamilyProvider.java ============================================================================== --- trunk/platform-bundles/useradmin-cassandra-store/src/main/java/org/amdatu/platform/useradmin/store/cassandra/service/RoleColumnFamilyProvider.java (original) +++ trunk/platform-bundles/useradmin-cassandra-store/src/main/java/org/amdatu/platform/useradmin/store/cassandra/service/RoleColumnFamilyProvider.java Tue Oct 19 14:19:59 2010 @@ -17,9 +17,9 @@ package org.amdatu.platform.useradmin.store.cassandra.service; import org.amdatu.platform.cassandra.listener.ColumnFamilyDefinition; -import org.amdatu.platform.cassandra.listener.ColumnFamilyProvider; import org.amdatu.platform.cassandra.listener.ColumnFamilyDefinition.ColumnType; import org.amdatu.platform.cassandra.listener.ColumnFamilyDefinition.CompareType; +import org.amdatu.platform.cassandra.listener.ColumnFamilyProvider; import org.amdatu.platform.cassandra.persistencemanager.CassandraPersistenceManager; /** @@ -32,9 +32,6 @@ * @author ivol */ public class RoleColumnFamilyProvider implements ColumnFamilyProvider { - /** - * {@inheritDoc} - */ public ColumnFamilyDefinition[] getColumnFamilies() { return new ColumnFamilyDefinition[]{ new ColumnFamilyDefinition( 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 Oct 19 14:19:59 2010 @@ -34,9 +34,6 @@ // it is prefixed with this id. public final static String RESOURCE_ID = "rest/services"; - /** - * {@inheritDoc} - */ @Override public void init(BundleContext context, DependencyManager manager) throws Exception { System.out.println("Starting Wink application bundle."); @@ -49,9 +46,6 @@ .add(createServiceDependency().setService(HttpService.class).setRequired(true))); } - /** - * {@inheritDoc} - */ @Override public void destroy(BundleContext context, DependencyManager manager) throws Exception { System.out.println("Stopping Wink application bundle."); 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 Oct 19 14:19:59 2010 @@ -18,19 +18,18 @@ import static org.amdatu.platform.wink.osgi.Activator.RESOURCE_ID; -import java.net.URL; -import java.util.ArrayList; -import java.util.Dictionary; -import java.util.Hashtable; -import java.util.List; - import javax.servlet.ServletException; import javax.ws.rs.Path; import javax.ws.rs.core.Application; -import javax.ws.rs.core.UriBuilder; import javax.ws.rs.core.Response.ResponseBuilder; +import javax.ws.rs.core.UriBuilder; import javax.ws.rs.core.Variant.VariantListBuilder; import javax.ws.rs.ext.RuntimeDelegate; +import java.net.URL; +import java.util.ArrayList; +import java.util.Dictionary; +import java.util.Hashtable; +import java.util.List; import org.amdatu.platform.httpcontext.HttpContextServiceFactory; import org.amdatu.platform.httpcontext.ResourceProvider; @@ -164,9 +163,6 @@ super(m_bundleContext, filter, null); } - /** - * {@inheritDoc} - */ public Object addingService(ServiceReference ref) { // Check if this is a JAX-RS annotated class Object service = m_bundleContext.getService(ref); @@ -177,9 +173,6 @@ return context.getService(ref); } - /** - * {@inheritDoc} - */ public void removedService(ServiceReference ref, Object obj) { // Check if this is a JAX-RS annotated class Object service = m_bundleContext.getService(ref); @@ -243,16 +236,10 @@ } } - /** - * {@inheritDoc} - */ public URL getResource(String name) { return null; } - /** - * {@inheritDoc} - */ public String getResourceId() { return RESOURCE_ID; } Modified: trunk/platform-bundles/wink-application/src/main/java/org/amdatu/platform/wink/service/WinkRestServlet.java ============================================================================== --- trunk/platform-bundles/wink-application/src/main/java/org/amdatu/platform/wink/service/WinkRestServlet.java (original) +++ trunk/platform-bundles/wink-application/src/main/java/org/amdatu/platform/wink/service/WinkRestServlet.java Tue Oct 19 14:19:59 2010 @@ -16,13 +16,12 @@ */ package org.amdatu.platform.wink.service; -import java.io.IOException; - import javax.servlet.ServletException; import javax.servlet.ServletRequest; import javax.servlet.ServletResponse; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import java.io.IOException; import org.apache.wink.server.internal.RequestProcessor; import org.apache.wink.server.internal.servlet.RestServlet; @@ -55,9 +54,6 @@ m_servletUrl = servletUrl; } - /** - * {@inheritDoc} - */ @Override protected void service(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse) throws ServletException, IOException { @@ -73,9 +69,6 @@ super.service(httpServletRequest, httpServletResponse); } - /** - * {@inheritDoc} - */ @Override public void service(ServletRequest request, ServletResponse response) throws ServletException, IOException { // The next line seems to do nothing, but it does. Without requesting parameter names here, using both @@ -90,9 +83,6 @@ super.service(request, response); } - /** - * {@inheritDoc} - */ @Override protected RequestProcessor getRequestProcessor() { if (!m_initialized) { @@ -104,9 +94,6 @@ } } - /** - * {@inheritDoc} - */ @Override protected void storeRequestProcessorOnServletContext(RequestProcessor requestProcessor) { requestProcessor.storeRequestProcessorOnServletContext(getServletContext(), m_servletUrl);
