You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ga...@apache.org on 2008/06/09 22:03:24 UTC
svn commit: r665867 - in /geronimo/server/branches/2.1/framework/modules:
geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/jmx/
geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/
Author: gawor
Date: Mon Jun 9 13:03:24 2008
New Revision: 665867
URL: http://svn.apache.org/viewvc?rev=665867&view=rev
Log:
fixed some formatting issues in javadocs and added checkOnInstall(Object, boolean) method to PluginInstaller interface
Modified:
geronimo/server/branches/2.1/framework/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/jmx/RemoteDeploymentManager.java
geronimo/server/branches/2.1/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/PluginInstaller.java
Modified: geronimo/server/branches/2.1/framework/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/jmx/RemoteDeploymentManager.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/framework/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/jmx/RemoteDeploymentManager.java?rev=665867&r1=665866&r2=665867&view=diff
==============================================================================
--- geronimo/server/branches/2.1/framework/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/jmx/RemoteDeploymentManager.java (original)
+++ geronimo/server/branches/2.1/framework/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/jmx/RemoteDeploymentManager.java Mon Jun 9 13:03:24 2008
@@ -259,6 +259,15 @@
}
}
+ public DownloadResults checkOnInstall(Object key, boolean remove) {
+ PluginInstaller installer = getPluginInstaller();
+ try {
+ return installer.checkOnInstall(key, remove);
+ } finally {
+ kernel.getProxyManager().destroyProxy(installer);
+ }
+ }
+
private PluginInstaller getPluginInstaller() {
Set<AbstractName> set = kernel.listGBeans(new AbstractNameQuery(PluginInstaller.class.getName()));
for (AbstractName name : set) {
Modified: geronimo/server/branches/2.1/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/PluginInstaller.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/PluginInstaller.java?rev=665867&r1=665866&r2=665867&view=diff
==============================================================================
--- geronimo/server/branches/2.1/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/PluginInstaller.java (original)
+++ geronimo/server/branches/2.1/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/PluginInstaller.java Mon Jun 9 13:03:24 2008
@@ -93,7 +93,7 @@
* @param username Optional username, if the maven repo uses HTTP Basic authentication.
* Set this to null if no authentication is required.
* @param password Optional password, if the maven repo uses HTTP Basic authentication.
- * Set this to null if no authentication is required.
+ * Set this to null if no authentication is required.
*/
public DownloadResults install(PluginListType pluginsToInstall, String defaultRepository, boolean restrictToDefaultRepository, String username, String password);
@@ -112,7 +112,7 @@
* @param username Optional username, if the maven repo uses HTTP Basic authentication.
* Set this to null if no authentication is required.
* @param password Optional password, if the maven repo uses HTTP Basic authentication.
- * Set this to null if no authentication is required.
+ * Set this to null if no authentication is required.
* @param poller Will be notified with status updates as the download proceeds
*/
public void install(PluginListType pluginsToInstall, String defaultRepository, boolean restrictToDefaultRepository, String username, String password, DownloadPoller poller);
@@ -126,12 +126,12 @@
*
* @param pluginsToInstall The list of configurations to install
* @param defaultRepository
- *@param restrictToDefaultRepository
+ * @param restrictToDefaultRepository
* @param username Optional username, if the maven repo uses HTTP Basic authentication.
* Set this to null if no authentication is required.
* @param password Optional password, if the maven repo uses HTTP Basic authentication.
- * Set this to null if no authentication is required.
- * @return A key that can be passed to checkOnInstall
+ * Set this to null if no authentication is required.
+ * @return A key that can be passed to checkOnInstall
*/
public Object startInstall(PluginListType pluginsToInstall, String defaultRepository, boolean restrictToDefaultRepository, String username, String password);
@@ -149,12 +149,12 @@
* for these downloads, and the username and password arguments are
* used in conjunction with that.
* @param defaultRepository
- *@param restrictToDefaultRepository
+ * @param restrictToDefaultRepository
* @param username Optional username, if the maven repo uses HTTP Basic authentication.
* Set this to null if no authentication is required.
* @param password Optional password, if the maven repo uses HTTP Basic authentication.
- * Set this to null if no authentication is required.
- * @return A key that can be passed to checkOnInstall
+ * Set this to null if no authentication is required.
+ * @return A key that can be passed to checkOnInstall
*/
public Object startInstall(File carFile, String defaultRepository, boolean restrictToDefaultRepository, String username, String password);
@@ -167,6 +167,19 @@
* @param key Identifies the operation to check on
*/
public DownloadResults checkOnInstall(Object key);
+
+ /**
+ * Gets the current progress of a download operation.
+ *
+ * @param key Identifies the operation to check on
+ * @param remove If true and the download operation has finished, the DownloadResults
+ * will be forgotten and the next call to this function will return null.
+ * Otherwise, the DownloadResults will be retained until this function is
+ * called with the <tt>remove</tt> parameter set to true. This parameter is
+ * only used when the download operation has finished
+ * (DownloadResults.isFinished() returns true).
+ */
+ public DownloadResults checkOnInstall(Object key, boolean remove);
/**
* Ensures that a plugin artifact is installable. Checks the Geronimo version,