Index: appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/admin/cli/ListTimers.java =================================================================== --- appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/admin/cli/ListTimers.java (revision 50191) +++ appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/admin/cli/ListTimers.java (working copy) @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 1997-2010 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997-2011 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development @@ -40,6 +40,7 @@ package org.glassfish.ejb.admin.cli; +import com.sun.enterprise.config.serverbeans.Domain; import com.sun.enterprise.config.serverbeans.Server; import com.sun.enterprise.util.LocalStringManagerImpl; import com.sun.enterprise.util.SystemPropertyConstants; @@ -49,11 +50,7 @@ import org.glassfish.api.ActionReport; import org.glassfish.api.I18n; import org.glassfish.api.Param; -import org.glassfish.api.admin.AdminCommand; -import org.glassfish.api.admin.AdminCommandContext; -import org.glassfish.api.admin.CommandLock; -import org.glassfish.api.admin.ExecuteOn; -import org.glassfish.api.admin.RuntimeType; +import org.glassfish.api.admin.*; import org.glassfish.config.support.CommandTarget; import org.glassfish.config.support.TargetType; import org.glassfish.internal.api.Target; @@ -69,6 +66,12 @@ @I18n("list.timers") @ExecuteOn(value={RuntimeType.DAS}) @TargetType(value={CommandTarget.DAS, CommandTarget.STANDALONE_INSTANCE, CommandTarget.CLUSTER}) +@RestEndpoints({ + @RestEndpoint(configBean=Domain.class, + opType=RestEndpoint.OpType.GET, + path="list-timers", + description="list-timers") +}) public class ListTimers implements AdminCommand { final private static LocalStringManagerImpl localStrings = Index: appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/admin/cli/MigrateTimers.java =================================================================== --- appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/admin/cli/MigrateTimers.java (revision 50191) +++ appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/admin/cli/MigrateTimers.java (working copy) @@ -55,11 +55,7 @@ import org.glassfish.api.ActionReport; import org.glassfish.api.I18n; import org.glassfish.api.Param; -import org.glassfish.api.admin.AdminCommand; -import org.glassfish.api.admin.AdminCommandContext; -import org.glassfish.api.admin.FailurePolicy; -import org.glassfish.api.admin.ParameterMap; -import org.glassfish.api.admin.RuntimeType; +import org.glassfish.api.admin.*; import org.glassfish.common.util.admin.ParameterMapExtractor; import org.glassfish.config.support.CommandTarget; import org.glassfish.config.support.TargetType; @@ -75,6 +71,12 @@ @I18n("migrate.timers") @org.glassfish.api.admin.ExecuteOn(value = {RuntimeType.INSTANCE}, ifNeverStarted = FailurePolicy.Error) @TargetType(value = {CommandTarget.DAS, CommandTarget.CLUSTERED_INSTANCE}) +@RestEndpoints({ + @RestEndpoint(configBean=Cluster.class, + opType=RestEndpoint.OpType.POST, + path="migrate-timers", + description="Migrate Timers") +}) public class MigrateTimers implements AdminCommand { static StringManager localStrings = StringManager.getManager(MigrateTimers.class); Index: appserver/transaction/jta/src/main/java/org/glassfish/jta/admin/cli/FreezeTransactionService.java =================================================================== --- appserver/transaction/jta/src/main/java/org/glassfish/jta/admin/cli/FreezeTransactionService.java (revision 50191) +++ appserver/transaction/jta/src/main/java/org/glassfish/jta/admin/cli/FreezeTransactionService.java (working copy) @@ -40,6 +40,9 @@ package org.glassfish.jta.admin.cli; +import com.sun.enterprise.config.serverbeans.Cluster; +import com.sun.enterprise.config.serverbeans.Domain; +import com.sun.enterprise.config.serverbeans.Server; import com.sun.enterprise.transaction.api.JavaEETransactionManager; import com.sun.enterprise.util.i18n.StringManager; import com.sun.enterprise.util.SystemPropertyConstants; @@ -47,11 +50,6 @@ import org.glassfish.api.ActionReport; import org.glassfish.api.I18n; import org.glassfish.api.Param; -import org.glassfish.api.admin.AdminCommand; -import org.glassfish.api.admin.AdminCommandContext; -import org.glassfish.api.admin.ExecuteOn; -import org.glassfish.api.admin.FailurePolicy; -import org.glassfish.api.admin.RuntimeType; import org.glassfish.config.support.CommandTarget; import org.glassfish.config.support.TargetType; import org.jvnet.hk2.annotations.Inject; @@ -61,6 +59,7 @@ import java.util.logging.Logger; import java.util.logging.Level; +import org.glassfish.api.admin.*; @Service(name = "freeze-transaction-service") @@ -68,6 +67,26 @@ @ExecuteOn(value = {RuntimeType.INSTANCE}, ifNeverStarted=FailurePolicy.Error) @Scoped(PerLookup.class) @I18n("freeze.transaction.service") +@RestEndpoints({ + @RestEndpoint(configBean=Cluster.class, + opType=RestEndpoint.OpType.POST, + path="freeze-transaction-service", + description="Freeze Transaction Service", + params={ + @RestParam(name="target", value="$parent") + }), + @RestEndpoint(configBean=Server.class, + opType=RestEndpoint.OpType.POST, + path="freeze-transaction-service", + description="Freeze Transaction Service", + params={ + @RestParam(name="target", value="$parent") + }), + @RestEndpoint(configBean=Domain.class, + opType=RestEndpoint.OpType.POST, + path="freeze-transaction-service", + description="Freeze Transaction Service") +}) public class FreezeTransactionService implements AdminCommand { private static StringManager localStrings = Index: appserver/transaction/jta/src/main/java/org/glassfish/jta/admin/cli/UnFreezeTransactionService.java =================================================================== --- appserver/transaction/jta/src/main/java/org/glassfish/jta/admin/cli/UnFreezeTransactionService.java (revision 50191) +++ appserver/transaction/jta/src/main/java/org/glassfish/jta/admin/cli/UnFreezeTransactionService.java (working copy) @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 1997-2010 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997-2011 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development @@ -40,6 +40,9 @@ package org.glassfish.jta.admin.cli; +import com.sun.enterprise.config.serverbeans.Cluster; +import com.sun.enterprise.config.serverbeans.Domain; +import com.sun.enterprise.config.serverbeans.Server; import com.sun.enterprise.transaction.api.JavaEETransactionManager; import com.sun.enterprise.util.i18n.StringManager; import com.sun.enterprise.util.SystemPropertyConstants; @@ -47,10 +50,6 @@ import org.glassfish.api.ActionReport; import org.glassfish.api.I18n; import org.glassfish.api.Param; -import org.glassfish.api.admin.AdminCommand; -import org.glassfish.api.admin.AdminCommandContext; -import org.glassfish.api.admin.ExecuteOn; -import org.glassfish.api.admin.RuntimeType; import org.glassfish.config.support.CommandTarget; import org.glassfish.config.support.TargetType; import org.jvnet.hk2.annotations.Inject; @@ -60,6 +59,7 @@ import java.util.logging.Logger; import java.util.logging.Level; +import org.glassfish.api.admin.*; @Service(name = "unfreeze-transaction-service") @@ -67,6 +67,26 @@ @ExecuteOn(RuntimeType.INSTANCE) @Scoped(PerLookup.class) @I18n("unfreeze.transaction.service") +@RestEndpoints({ + @RestEndpoint(configBean=Cluster.class, + opType=RestEndpoint.OpType.POST, + path="unfreeze-transaction-service", + description="Unfreeze Transaction Service", + params={ + @RestParam(name="id", value="$parent") + }), + @RestEndpoint(configBean=Server.class, + opType=RestEndpoint.OpType.POST, + path="unfreeze-transaction-service", + description="Unfreeze Transaction Service", + params={ + @RestParam(name="id", value="$parent") + }), + @RestEndpoint(configBean=Domain.class, + opType=RestEndpoint.OpType.POST, + path="unfreeze-transaction-service", + description="Unfreeze Transaction Service") +}) public class UnFreezeTransactionService implements AdminCommand { private static StringManager localStrings = Index: appserver/transaction/jts/src/main/java/org/glassfish/jts/admin/cli/RecoverTransactions.java =================================================================== --- appserver/transaction/jts/src/main/java/org/glassfish/jts/admin/cli/RecoverTransactions.java (revision 50191) +++ appserver/transaction/jts/src/main/java/org/glassfish/jts/admin/cli/RecoverTransactions.java (working copy) @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 1997-2010 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997-2011 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development @@ -40,6 +40,7 @@ package org.glassfish.jts.admin.cli; +import com.sun.enterprise.config.serverbeans.Server; import org.glassfish.api.I18n; import org.glassfish.api.Param; import org.glassfish.api.ActionReport; @@ -57,14 +58,25 @@ import org.jvnet.hk2.annotations.Inject; import org.jvnet.hk2.component.PerLookup; -import java.util.logging.Logger; import java.util.logging.Level; +import org.glassfish.api.admin.RestEndpoint; +import org.glassfish.api.admin.RestEndpoints; +import org.glassfish.api.admin.RestParam; @Service(name = "recover-transactions") @TargetType({CommandTarget.DAS,CommandTarget.STANDALONE_INSTANCE, CommandTarget.CLUSTERED_INSTANCE}) @ExecuteOn(RuntimeType.DAS) @Scoped(PerLookup.class) @I18n("recover.transactions") +@RestEndpoints({ + @RestEndpoint(configBean=Server.class, + opType=RestEndpoint.OpType.POST, + path="recover-transactions", + description="Recover", + params={ + @RestParam(name="id", value="$parent") + }) +}) public class RecoverTransactions extends RecoverTransactionsBase implements AdminCommand { @Param(name="target", alias = "destination", optional = true) Index: appserver/transaction/jts/src/main/java/org/glassfish/jts/admin/cli/RecoverTransactionsInternal.java =================================================================== --- appserver/transaction/jts/src/main/java/org/glassfish/jts/admin/cli/RecoverTransactionsInternal.java (revision 50191) +++ appserver/transaction/jts/src/main/java/org/glassfish/jts/admin/cli/RecoverTransactionsInternal.java (working copy) @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 2010 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2010-2011 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development @@ -40,7 +40,7 @@ package org.glassfish.jts.admin.cli; -import org.glassfish.api.I18n; +import com.sun.enterprise.config.serverbeans.Domain; import org.glassfish.api.Param; import org.glassfish.api.admin.AdminCommand; import org.glassfish.api.admin.AdminCommandContext; @@ -56,13 +56,19 @@ import com.sun.enterprise.transaction.api.ResourceRecoveryManager; -import java.util.logging.Logger; import java.util.logging.Level; +import org.glassfish.api.admin.*; @Service(name = "_recover-transactions-internal") @TargetType({CommandTarget.DAS,CommandTarget.STANDALONE_INSTANCE, CommandTarget.CLUSTERED_INSTANCE}) @ExecuteOn(RuntimeType.INSTANCE) @Scoped(PerLookup.class) +@RestEndpoints({ + @RestEndpoint(configBean=Domain.class, + opType=RestEndpoint.OpType.POST, + path="_recover-transactions-internal", + description="_recover-transactions-internal") +}) public class RecoverTransactionsInternal extends RecoverTransactionsBase implements AdminCommand { @Param(name="target", optional = false)