You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by be...@apache.org on 2010/12/29 10:02:06 UTC

svn commit: r1053571 - in /mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/extension: xep0050_adhoc_commands/ xep0133_service_administration/

Author: berndf
Date: Wed Dec 29 09:02:05 2010
New Revision: 1053571

URL: http://svn.apache.org/viewvc?rev=1053571&view=rev
Log:
export admin service as a runtime service

Modified:
    mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0050_adhoc_commands/AdhocCommandsModule.java
    mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0133_service_administration/ServerAdministrationService.java
    mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0133_service_administration/ServiceAdministrationModule.java

Modified: mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0050_adhoc_commands/AdhocCommandsModule.java
URL: http://svn.apache.org/viewvc/mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0050_adhoc_commands/AdhocCommandsModule.java?rev=1053571&r1=1053570&r2=1053571&view=diff
==============================================================================
--- mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0050_adhoc_commands/AdhocCommandsModule.java (original)
+++ mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0050_adhoc_commands/AdhocCommandsModule.java Wed Dec 29 09:02:05 2010
@@ -54,6 +54,7 @@ public class AdhocCommandsModule extends
                    ServerRuntimeContextService, AdhocCommandsService {
 
     public static final String ADHOC_COMMANDS = "adhoc_commands";
+    
     private final Logger logger = LoggerFactory.getLogger(org.apache.vysper.xmpp.modules.extension.xep0050_adhoc_commands.AdhocCommandsModule.class);
 
     protected ServerRuntimeContext serverRuntimeContext;

Modified: mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0133_service_administration/ServerAdministrationService.java
URL: http://svn.apache.org/viewvc/mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0133_service_administration/ServerAdministrationService.java?rev=1053571&r1=1053570&r2=1053571&view=diff
==============================================================================
--- mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0133_service_administration/ServerAdministrationService.java (original)
+++ mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0133_service_administration/ServerAdministrationService.java Wed Dec 29 09:02:05 2010
@@ -8,6 +8,8 @@ import java.util.Collection;
  */
 public interface ServerAdministrationService {
 
+    public static final String SERVICE_ID = "ServerAdministrationService";
+    
     void setAddAdminJIDs(Collection<Entity> admins);
 
     void setAddAdmins(Collection<String> admins);

Modified: mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0133_service_administration/ServiceAdministrationModule.java
URL: http://svn.apache.org/viewvc/mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0133_service_administration/ServiceAdministrationModule.java?rev=1053571&r1=1053570&r2=1053571&view=diff
==============================================================================
--- mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0133_service_administration/ServiceAdministrationModule.java (original)
+++ mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0133_service_administration/ServiceAdministrationModule.java Wed Dec 29 09:02:05 2010
@@ -117,7 +117,7 @@ public class ServiceAdministrationModule
     }
 
     public String getServiceName() {
-        return getName();
+        return ServerAdministrationService.SERVICE_ID;
     }
     
     public Collection<CommandInfo> getCommandInfosForInfoRequest(InfoRequest infoRequest, boolean hintListAll) {