[azureus/f14/master: 1/3] upgrade to 4.5.0.2
David Juran
djuran at fedoraproject.org
Thu Aug 19 14:55:36 UTC 2010
commit 18f1284ef7686e6359fbf19a59b609bea2d0cb14
Author: David Juran <djuran at redhat.com>
Date: Thu Aug 19 17:42:24 2010 +0300
upgrade to 4.5.0.2
.gitignore | 1 +
azureus-4.0.0.4-boo-updating-w32.diff | 30 ++-
azureus-no-update-manager-CorePatchChecker.patch | 15 +-
azureus-no-update-manager-CoreUpdateChecker.patch | 26 +-
...eus-no-update-manager-PluginInstallerImpl.patch | 356 +++++++-------------
azureus-no-update-manager-PluginUpdatePlugin.patch | 332 +++++++++++--------
azureus-no-update-manager-SWTUpdateChecker.patch | 30 ++-
azureus-no-update-manager-UpdateMonitor.patch | 24 +-
azureus-no-updates-PluginInitializer.patch | 58 ++--
azureus.spec | 38 ++-
sources | 2 +-
11 files changed, 459 insertions(+), 453 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 733ed59..8bf4f0b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
Vuze_4.3.1.4_source.zip
+Vuze_4502_source.zip
diff --git a/azureus-4.0.0.4-boo-updating-w32.diff b/azureus-4.0.0.4-boo-updating-w32.diff
index bb47168..9090ad7 100644
--- a/azureus-4.0.0.4-boo-updating-w32.diff
+++ b/azureus-4.0.0.4-boo-updating-w32.diff
@@ -1,6 +1,6 @@
-diff -up azureus-4.3.1.4/com/aelitis/azureus/core/update/impl/AzureusRestarterImpl.java.boo-updating-w32 azureus-4.3.1.4/com/aelitis/azureus/core/update/impl/AzureusRestarterImpl.java
---- azureus-4.3.1.4/com/aelitis/azureus/core/update/impl/AzureusRestarterImpl.java.boo-updating-w32 2010-01-11 04:26:48.000000000 +0200
-+++ azureus-4.3.1.4/com/aelitis/azureus/core/update/impl/AzureusRestarterImpl.java 2010-02-14 17:25:31.000000000 +0200
+diff -up azureus-4.5.0.0/com/aelitis/azureus/core/update/impl/AzureusRestarterImpl.java.boo-updating-w32 azureus-4.5.0.0/com/aelitis/azureus/core/update/impl/AzureusRestarterImpl.java
+--- azureus-4.5.0.0/com/aelitis/azureus/core/update/impl/AzureusRestarterImpl.java.boo-updating-w32 2010-05-04 02:58:40.000000000 +0300
++++ azureus-4.5.0.0/com/aelitis/azureus/core/update/impl/AzureusRestarterImpl.java 2010-08-06 22:40:45.000000000 +0300
@@ -30,8 +30,8 @@ import org.gudy.azureus2.core3.util.*;
import org.gudy.azureus2.platform.PlatformManager;
import org.gudy.azureus2.platform.PlatformManagerFactory;
@@ -34,7 +34,7 @@ diff -up azureus-4.3.1.4/com/aelitis/azureus/core/update/impl/AzureusRestarterIm
}
-@@ -303,131 +290,6 @@ AzureusRestarterImpl
+@@ -303,147 +290,6 @@ AzureusRestarterImpl
String backupJavaRunString,
boolean update_only)
{
@@ -67,7 +67,23 @@ diff -up azureus-4.3.1.4/com/aelitis/azureus/core/update/impl/AzureusRestarterIm
- }
- s += "\r\n";
- s += "start \"\" \"" + azRunner + "\"";
-- FileUtil.writeBytesAsFile(fileRestart.getAbsolutePath(), s.getBytes());
+-
+- byte[] bytes;
+-
+- String encoding = FileUtil.getScriptCharsetEncoding();
+-
+- if ( encoding == null ){
+- bytes = s.getBytes();
+- }else{
+- try{
+- bytes = s.getBytes( encoding );
+- }catch( Throwable e){
+- e.printStackTrace();
+-
+- bytes = s.getBytes();
+- }
+- }
+- FileUtil.writeBytesAsFile(fileRestart.getAbsolutePath(),bytes);
-
- result = accessor.shellExecute(null, fileRestart.getAbsolutePath(),
- null, SystemProperties.getApplicationPath(),
@@ -166,7 +182,7 @@ diff -up azureus-4.3.1.4/com/aelitis/azureus/core/update/impl/AzureusRestarterIm
return true;
}
-@@ -445,60 +307,15 @@ AzureusRestarterImpl
+@@ -461,60 +307,15 @@ AzureusRestarterImpl
String[] parameters,
boolean update_only)
{
@@ -231,7 +247,7 @@ diff -up azureus-4.3.1.4/com/aelitis/azureus/core/update/impl/AzureusRestarterIm
private boolean
javaSpawn(
-@@ -523,30 +340,6 @@ AzureusRestarterImpl
+@@ -539,30 +340,6 @@ AzureusRestarterImpl
}
}
diff --git a/azureus-no-update-manager-CorePatchChecker.patch b/azureus-no-update-manager-CorePatchChecker.patch
index 7dbbdf3..73e2c53 100644
--- a/azureus-no-update-manager-CorePatchChecker.patch
+++ b/azureus-no-update-manager-CorePatchChecker.patch
@@ -1,6 +1,7 @@
---- org/gudy/azureus2/update/CorePatchChecker.java.orig 2006-02-09 23:29:16.000000000 -0500
-+++ org/gudy/azureus2/update/CorePatchChecker.java 2006-02-09 23:29:53.000000000 -0500
-@@ -64,8 +64,6 @@
+diff -up azureus-4.5.0.0/org/gudy/azureus2/update/CorePatchChecker.java.no-update-manager-CorePatchChecker azureus-4.5.0.0/org/gudy/azureus2/update/CorePatchChecker.java
+--- azureus-4.5.0.0/org/gudy/azureus2/update/CorePatchChecker.java.no-update-manager-CorePatchChecker 2010-05-04 02:44:32.000000000 +0300
++++ azureus-4.5.0.0/org/gudy/azureus2/update/CorePatchChecker.java 2010-08-05 20:37:08.000000000 +0300
+@@ -67,8 +67,6 @@ CorePatchChecker
System.out.println( "CorePatchChecker: TESTING !!!!" );
}
@@ -9,7 +10,7 @@
}
}
-@@ -86,18 +84,7 @@
+@@ -89,20 +87,7 @@ CorePatchChecker
checkForUpdate(
UpdateChecker checker )
{
@@ -18,9 +19,11 @@
-
- inst.addListener( this );
-
-- checker.addUpdate( "Core Patch Checker", new String[0], "",
+- my_updates.put(
+- inst,
+- checker.addUpdate( "Core Patch Checker", new String[0], "",
- new ResourceDownloader[0],
-- Update.RESTART_REQUIRED_MAYBE );
+- Update.RESTART_REQUIRED_MAYBE ));
- }finally{
-
- checker.completed();
diff --git a/azureus-no-update-manager-CoreUpdateChecker.patch b/azureus-no-update-manager-CoreUpdateChecker.patch
index 8de39fa..0a1973d 100644
--- a/azureus-no-update-manager-CoreUpdateChecker.patch
+++ b/azureus-no-update-manager-CoreUpdateChecker.patch
@@ -1,7 +1,7 @@
-diff -up azureus-4.3.0.0/org/gudy/azureus2/update/CoreUpdateChecker.java.no-update-manager-CoreUpdateChecker azureus-4.3.0.0/org/gudy/azureus2/update/CoreUpdateChecker.java
---- azureus-4.3.0.0/org/gudy/azureus2/update/CoreUpdateChecker.java.no-update-manager-CoreUpdateChecker 2009-11-04 03:23:06.000000000 +0200
-+++ azureus-4.3.0.0/org/gudy/azureus2/update/CoreUpdateChecker.java 2009-11-19 21:15:38.000000000 +0200
-@@ -127,8 +127,6 @@ CoreUpdateChecker
+diff -up azureus-4.5.0.0/org/gudy/azureus2/update/CoreUpdateChecker.java.no-update-manager-CoreUpdateChecker azureus-4.5.0.0/org/gudy/azureus2/update/CoreUpdateChecker.java
+--- azureus-4.5.0.0/org/gudy/azureus2/update/CoreUpdateChecker.java.no-update-manager-CoreUpdateChecker 2010-07-31 01:00:36.000000000 +0300
++++ azureus-4.5.0.0/org/gudy/azureus2/update/CoreUpdateChecker.java 2010-08-05 20:43:44.000000000 +0300
+@@ -132,8 +132,6 @@ CoreUpdateChecker
props.setProperty( "plugin.version", plugin_interface.getAzureusVersion());
rdf = plugin_interface.getUtilities().getResourceDownloaderFactory();
@@ -10,7 +10,7 @@ diff -up azureus-4.3.0.0/org/gudy/azureus2/update/CoreUpdateChecker.java.no-upda
}
public String
-@@ -147,309 +145,11 @@ CoreUpdateChecker
+@@ -152,319 +150,11 @@ CoreUpdateChecker
checkForUpdate(
final UpdateChecker checker )
{
@@ -108,7 +108,7 @@ diff -up azureus-4.3.0.0/org/gudy/azureus2/update/CoreUpdateChecker.java.no-upda
- ResourceDownloader[] primary_mirrors;
-
- primary_mirrors = getPrimaryDownloaders( latest_file_name );
--
+
- // the download hierarchy is primary mirrors first (randomised alternate)
- // then backup mirrors (randomised alternate)
-
@@ -300,6 +300,16 @@ diff -up azureus-4.3.0.0/org/gudy/azureus2/update/CoreUpdateChecker.java.no-upda
-
- return( true );
- }
+-
+- public void
+- failed(
+- ResourceDownloader downloader,
+- ResourceDownloaderException e )
+- {
+- Debug.out( downloader.getName() + " failed", e );
+-
+- update.complete( false );
+- }
- });
- }catch( Throwable e ){
-
@@ -312,13 +322,11 @@ diff -up azureus-4.3.0.0/org/gudy/azureus2/update/CoreUpdateChecker.java.no-upda
- checker.failed();
-
- }finally{
--
-+
+
checker.completed();
first_check = false;
- }
-+
}
diff --git a/azureus-no-update-manager-PluginInstallerImpl.patch b/azureus-no-update-manager-PluginInstallerImpl.patch
index 4b2f3d6..e70466e 100644
--- a/azureus-no-update-manager-PluginInstallerImpl.patch
+++ b/azureus-no-update-manager-PluginInstallerImpl.patch
@@ -1,11 +1,10 @@
-diff -up azureus-4.2.0.8/org/gudy/azureus2/pluginsimpl/local/installer/PluginInstallerImpl.java.no-update-manager-PluginInstallerImpl azureus-4.2.0.8/org/gudy/azureus2/pluginsimpl/local/installer/PluginInstallerImpl.java
---- azureus-4.2.0.8/org/gudy/azureus2/pluginsimpl/local/installer/PluginInstallerImpl.java.no-update-manager-PluginInstallerImpl 2009-03-09 20:25:32.000000000 +0100
-+++ azureus-4.2.0.8/org/gudy/azureus2/pluginsimpl/local/installer/PluginInstallerImpl.java 2009-09-13 17:14:11.000000000 +0200
-@@ -464,97 +464,7 @@ PluginInstallerImpl
- throws PluginException
- {
- PluginUpdatePlugin pup = (PluginUpdatePlugin)manager.getPluginInterfaceByClass( PluginUpdatePlugin.class ).getPlugin();
--
+diff -up azureus-4.5.0.0/org/gudy/azureus2/pluginsimpl/local/installer/PluginInstallerImpl.java.no-update-manager-PluginInstallerImpl azureus-4.5.0.0/org/gudy/azureus2/pluginsimpl/local/installer/PluginInstallerImpl.java
+--- azureus-4.5.0.0/org/gudy/azureus2/pluginsimpl/local/installer/PluginInstallerImpl.java.no-update-manager-PluginInstallerImpl 2010-07-31 01:00:42.000000000 +0300
++++ azureus-4.5.0.0/org/gudy/azureus2/pluginsimpl/local/installer/PluginInstallerImpl.java 2010-08-05 20:57:52.000000000 +0300
+@@ -478,112 +478,6 @@ PluginInstallerImpl
+
+ PluginUpdatePlugin pup = (PluginUpdatePlugin)pup_pi.getPlugin();
+
- UpdateManagerImpl uman = (UpdateManagerImpl)manager.getDefaultPluginInterface().getUpdateManager();
-
- UpdateCheckInstanceImpl inst =
@@ -17,7 +16,7 @@ diff -up azureus-4.2.0.8/org/gudy/azureus2/pluginsimpl/local/installer/PluginIns
- if ( properties != null ){
-
- for ( Map.Entry<Integer,Object> entry: properties.entrySet()){
-
+-
- inst.setProperty( entry.getKey(), entry.getValue());
- }
- }
@@ -72,12 +71,19 @@ diff -up azureus-4.2.0.8/org/gudy/azureus2/pluginsimpl/local/installer/PluginIns
- protected void
- check()
- {
-- for (int i=0;i<updates.length;i++){
+- Update failed_update = null;
+-
+- for ( Update update: updates ){
-
-- if ( !updates[i].isCancelled() && !updates[i].isComplete()){
+- if ( !update.isCancelled() && !update.isComplete()){
-
- return;
- }
+-
+- if ( !update.wasSuccessful()){
+-
+- failed_update = update;
+- }
- }
-
- if ( cancelled ){
@@ -86,7 +92,16 @@ diff -up azureus-4.2.0.8/org/gudy/azureus2/pluginsimpl/local/installer/PluginIns
-
- }else{
-
-- listener.completed();
+- if ( failed_update == null ){
+-
+- listener.completed();
+-
+- }else{
+-
+- listener.failed(
+- new PluginException(
+- "Install of " + failed_update.getName() + " failed" ));
+- }
- }
- }
- });
@@ -99,13 +114,12 @@ diff -up azureus-4.2.0.8/org/gudy/azureus2/pluginsimpl/local/installer/PluginIns
try{
for (int i=0;i<plugins.length;i++){
-@@ -619,56 +529,52 @@ PluginInstallerImpl
+@@ -648,47 +542,6 @@ PluginInstallerImpl
final PluginInterface dummy_plugin_interface = manager.getPluginInterfaceByID( plugin_id, false );
- ((InstallablePluginImpl)plugin).addUpdate( inst, pup, dummy_plugin, dummy_plugin_interface );
-+// ((InstallablePluginImpl)plugin).addUpdate( inst, pup, dummy_plugin, dummy_plugin_interface );
-
+-
- inst.addListener(
- new UpdateCheckInstanceListener()
- {
@@ -114,105 +128,59 @@ diff -up azureus-4.2.0.8/org/gudy/azureus2/pluginsimpl/local/installer/PluginIns
- UpdateCheckInstance instance )
- {
- try{
-+// inst.addListener(
-+// new UpdateCheckInstanceListener()
-+// {
-+// public void
-+// cancelled(
-+// UpdateCheckInstance instance )
-+// {
-+// try{
-
+-
- dummy_plugin_interface.getPluginState().unload();
-+// dummy_plugin_interface.getPluginState().unload();
-
+-
- }catch( Throwable e ){
-+// }catch( Throwable e ){
-
+-
- Debug.out( "Failed to unload plugin", e );
- }
- }
-+// Debug.out( "Failed to unload plugin", e );
-+// }
-+// }
-
+-
- public void
- complete(
- UpdateCheckInstance instance )
- {
- PluginInterface pi = manager.getPluginInterfaceByID( plugin_id, false );
-+// public void
-+// complete(
-+// UpdateCheckInstance instance )
-+// {
-+// PluginInterface pi = manager.getPluginInterfaceByID( plugin_id, false );
-
+-
- if ( pi != null && pi.getPlugin() instanceof FailedPlugin ){
-+// if ( pi != null && pi.getPlugin() instanceof FailedPlugin ){
-
+-
- try{
- pi.getPluginState().unload();
-+// try{
-+// pi.getPluginState().unload();
-
+-
- }catch( Throwable e ){
-+// }catch( Throwable e ){
-
+-
- Debug.out( "Failed to unload plugin", e );
- }
- }
-+// Debug.out( "Failed to unload plugin", e );
-+// }
-+// }
-
+-
- }
- });
- }else{
-+// }
-+// });
-+// }else{
-
+-
- ((InstallablePluginImpl)plugin).addUpdate( inst, pup, existing_plugin, existing_plugin_interface );
-+// ((InstallablePluginImpl)plugin).addUpdate( inst, pup, existing_plugin, existing_plugin_interface );
}
}
-- inst.start();
--
- }catch( Throwable e ){
-
-- inst.cancel();
--
- if ( e instanceof PluginException ){
-
- throw((PluginException)e);
-@@ -732,138 +638,138 @@ PluginInstallerImpl
+@@ -762,154 +615,6 @@ PluginInstallerImpl
+ throw( new PluginException( "Plugin '" + pi.getPluginID() + "' is not loaded from the file system, can't uninstall" ));
}
}
-
+-
- try{
- UpdateManager uman = manager.getDefaultPluginInterface().getUpdateManager();
-+// try{
-+// UpdateManager uman = manager.getDefaultPluginInterface().getUpdateManager();
-
+-
- UpdateCheckInstance inst =
- uman.createEmptyUpdateCheckInstance(
- UpdateCheckInstance.UCI_UNINSTALL,
- "update.instance.uninstall");
-+// UpdateCheckInstance inst =
-+// uman.createEmptyUpdateCheckInstance(
-+// UpdateCheckInstance.UCI_UNINSTALL,
-+// "update.instance.uninstall");
-
+-
- for (int i=0;i<pis.length;i++){
-+// for (int i=0;i<pis.length;i++){
-
+-
- final PluginInterface pi = pis[i];
-+// final PluginInterface pi = pis[i];
-
+-
- final String plugin_dir = pi.getPluginDirectoryName();
-+// final String plugin_dir = pi.getPluginDirectoryName();
-
+-
- inst.addUpdatableComponent(
- new UpdatableComponent()
- {
@@ -227,21 +195,7 @@ diff -up azureus-4.2.0.8/org/gudy/azureus2/pluginsimpl/local/installer/PluginIns
- {
- return( 0 );
- }
-+// inst.addUpdatableComponent(
-+// new UpdatableComponent()
-+// {
-+// public String
-+// getName()
-+// {
-+// return( pi.getPluginName());
-+// }
-+
-+// public int
-+// getMaximumCheckTime()
-+// {
-+// return( 0 );
-+// }
-
+-
- public void
- checkForUpdate(
- final UpdateChecker checker )
@@ -249,103 +203,13 @@ diff -up azureus-4.2.0.8/org/gudy/azureus2/pluginsimpl/local/installer/PluginIns
- try{
- ResourceDownloader rd =
- manager.getDefaultPluginInterface().getUtilities().getResourceDownloaderFactory().create( new File( plugin_dir ));
-+// public void
-+// checkForUpdate(
-+// final UpdateChecker checker )
-+// {
-+// try{
-+// ResourceDownloader rd =
-+// manager.getDefaultPluginInterface().getUtilities().getResourceDownloaderFactory().create( new File( plugin_dir ));
-
-- rd.addListener(
-- new ResourceDownloaderAdapter()
-- {
-- public boolean
-- completed(
-- ResourceDownloader downloader,
-- InputStream data )
-- {
-- try{
-- if ( pi.getPluginState().isUnloadable()){
-+// rd.addListener(
-+// new ResourceDownloaderAdapter()
-+// {
-+// public boolean
-+// completed(
-+// ResourceDownloader downloader,
-+// InputStream data )
-+// {
-+// try{
-+// if ( pi.getPluginState().isUnloadable()){
-
-- pi.getPluginState().unload();
-+// pi.getPluginState().unload();
-
-- FileUtil.recursiveDelete( new File( plugin_dir ));
-+// FileUtil.recursiveDelete( new File( plugin_dir ));
-
-- }
-+// }
-
-- UpdateInstaller installer = checker.createInstaller();
-+// UpdateInstaller installer = checker.createInstaller();
-
-- installer.addRemoveAction( new File( plugin_dir ).getCanonicalPath());
-+// installer.addRemoveAction( new File( plugin_dir ).getCanonicalPath());
-
-
-- }catch( Throwable e ){
-+// }catch( Throwable e ){
-
-- Debug.printStackTrace(e);
-- Logger.log(new LogAlert(LogAlert.REPEATABLE,
-- "Plugin uninstall failed", e));
-- }
-+// Debug.printStackTrace(e);
-+// Logger.log(new LogAlert(LogAlert.REPEATABLE,
-+// "Plugin uninstall failed", e));
-+// }
-
-- // don't close the stream as we process it later
-+// // don't close the stream as we process it later
-
-- return( true );
-- }
-+// return( true );
-+// }
-
-- public void
-- failed(
-- ResourceDownloader downloader,
-- ResourceDownloaderException e )
-- {
-- if ( !downloader.isCancelled()){
-- Logger.log(new LogAlert(LogAlert.REPEATABLE,
-- "Plugin uninstall failed", e));
-- }
-- }
-- });
-+// public void
-+// failed(
-+// ResourceDownloader downloader,
-+// ResourceDownloaderException e )
-+// {
-+// if ( !downloader.isCancelled()){
-+// Logger.log(new LogAlert(LogAlert.REPEATABLE,
-+// "Plugin uninstall failed", e));
-+// }
-+// }
-+// });
-
+-
- // the plugin may have > 1 plugin interfaces, make the name up appropriately
-+// // the plugin may have > 1 plugin interfaces, make the name up appropriately
-
+-
- String update_name = "";
-+// String update_name = "";
-
+-
- PluginInterface[] ifs = manager.getPluginInterfaces();
-+// PluginInterface[] ifs = manager.getPluginInterfaces();
-
+-
- Arrays.sort(
- ifs,
- new Comparator()
@@ -358,70 +222,98 @@ diff -up azureus-4.2.0.8/org/gudy/azureus2/pluginsimpl/local/installer/PluginIns
- return(((PluginInterface)o1).getPluginName().compareTo(((PluginInterface)o2).getPluginName()));
- }
- });
-+// Arrays.sort(
-+// ifs,
-+// new Comparator()
-+// {
-+// public int
-+// compare(
-+// Object o1,
-+// Object o2)
-+// {
-+// return(((PluginInterface)o1).getPluginName().compareTo(((PluginInterface)o2).getPluginName()));
-+// }
-+// });
-
+-
- for (int i=0;i<ifs.length;i++){
-+// for (int i=0;i<ifs.length;i++){
-
+-
- if ( ifs[i].getPluginID().equals(pi.getPluginID())){
-+// if ( ifs[i].getPluginID().equals(pi.getPluginID())){
-
+-
- update_name += (update_name.length()==0?"":",") + ifs[i].getPluginName();
- }
- }
-+// update_name += (update_name.length()==0?"":",") + ifs[i].getPluginName();
-+// }
-+// }
-
-- checker.addUpdate(
+-
+- final Update update = checker.addUpdate(
- update_name,
- new String[]{ "Uninstall: " + plugin_dir},
- pi.getPluginVersion(),
- rd,
- pi.getPluginState().isUnloadable()?Update.RESTART_REQUIRED_NO:Update.RESTART_REQUIRED_YES );
-+// checker.addUpdate(
-+// update_name,
-+// new String[]{ "Uninstall: " + plugin_dir},
-+// pi.getPluginVersion(),
-+// rd,
-+// pi.getPluginState().isUnloadable()?Update.RESTART_REQUIRED_NO:Update.RESTART_REQUIRED_YES );
-
+-
+- rd.addListener(
+- new ResourceDownloaderAdapter()
+- {
+- public boolean
+- completed(
+- ResourceDownloader downloader,
+- InputStream data )
+- {
+- try{
+- if ( pi.getPluginState().isUnloadable()){
+-
+- pi.getPluginState().unload();
+-
+- FileUtil.recursiveDelete( new File( plugin_dir ));
+-
+- }
+-
+- UpdateInstaller installer = checker.createInstaller();
+-
+- installer.addRemoveAction( new File( plugin_dir ).getCanonicalPath());
+-
+- update.complete( true );
+-
+- try{
+- PluginInitializer.fireEvent(
+- PluginEvent.PEV_PLUGIN_UNINSTALLED,
+- pi.getPluginID());
+-
+- }catch( Throwable e ){
+-
+- Debug.out( e );
+- }
+- }catch( Throwable e ){
+-
+- update.complete( false );
+-
+- Debug.printStackTrace(e);
+-
+- Logger.log(new LogAlert(LogAlert.REPEATABLE,
+- "Plugin uninstall failed", e));
+- }
+-
+- // don't close the stream as we process it later
+-
+- return( true );
+- }
+-
+- public void
+- failed(
+- ResourceDownloader downloader,
+- ResourceDownloaderException e )
+- {
+- update.complete( false );
+-
+- if ( !downloader.isCancelled()){
+-
+- Logger.log(new LogAlert(LogAlert.REPEATABLE,
+- "Plugin uninstall failed", e));
+- }
+- }
+- });
- }finally{
-+// }finally{
-
+-
- checker.completed();
- }
-+// checker.completed();
-+// }
-
+-
- }
- }, false );
- }
-+// }
-+// }, false );
-+// }
-
+-
- inst.start();
-+// inst.start();
-
+-
- }catch( Throwable e ){
-+// }catch( Throwable e ){
-
+-
- Debug.printStackTrace(e);
- }
-+// Debug.printStackTrace(e);
-+// }
}
protected PluginInterface
diff --git a/azureus-no-update-manager-PluginUpdatePlugin.patch b/azureus-no-update-manager-PluginUpdatePlugin.patch
index 89ff3bf..259215c 100644
--- a/azureus-no-update-manager-PluginUpdatePlugin.patch
+++ b/azureus-no-update-manager-PluginUpdatePlugin.patch
@@ -1,7 +1,7 @@
-diff -up azureus-4.0.0.4/org/gudy/azureus2/pluginsimpl/update/PluginUpdatePlugin.java.no-update-manager-PluginUpdatePlugin azureus-4.0.0.4/org/gudy/azureus2/pluginsimpl/update/PluginUpdatePlugin.java
---- azureus-4.0.0.4/org/gudy/azureus2/pluginsimpl/update/PluginUpdatePlugin.java.no-update-manager-PluginUpdatePlugin 2008-09-25 14:32:04.000000000 +0300
-+++ azureus-4.0.0.4/org/gudy/azureus2/pluginsimpl/update/PluginUpdatePlugin.java 2009-09-05 17:29:07.000000000 +0300
-@@ -138,19 +138,19 @@ PluginUpdatePlugin
+diff -up azureus-4.5.0.0/org/gudy/azureus2/pluginsimpl/update/PluginUpdatePlugin.java.no-update-manager-PluginUpdatePlugin azureus-4.5.0.0/org/gudy/azureus2/pluginsimpl/update/PluginUpdatePlugin.java
+--- azureus-4.5.0.0/org/gudy/azureus2/pluginsimpl/update/PluginUpdatePlugin.java.no-update-manager-PluginUpdatePlugin 2010-07-31 01:00:38.000000000 +0300
++++ azureus-4.5.0.0/org/gudy/azureus2/pluginsimpl/update/PluginUpdatePlugin.java 2010-08-06 22:16:15.000000000 +0300
+@@ -142,19 +142,19 @@ PluginUpdatePlugin
initComplete(
final PluginConfig plugin_config )
{
@@ -32,10 +32,11 @@ diff -up azureus-4.0.0.4/org/gudy/azureus2/pluginsimpl/update/PluginUpdatePlugin
final PluginManager plugin_manager = plugin_interface.getPluginManager();
-@@ -178,133 +178,133 @@ PluginUpdatePlugin
+@@ -181,302 +181,7 @@ PluginUpdatePlugin
+
final int f_non_mandatory_count = non_mandatory_count;
final int f_mandatory_count = mandatory_count;
-
+-
- update_manager.registerUpdatableComponent(
- new UpdatableComponent()
- {
@@ -44,86 +45,53 @@ diff -up azureus-4.0.0.4/org/gudy/azureus2/pluginsimpl/update/PluginUpdatePlugin
- {
- return( "Non-mandatory plugins" );
- }
-+// update_manager.registerUpdatableComponent(
-+// new UpdatableComponent()
-+// {
-+// public String
-+// getName()
-+// {
-+// return( "Non-mandatory plugins" );
-+// }
-
+-
- public int
- getMaximumCheckTime()
- {
- return( f_non_mandatory_count * (( RD_SIZE_RETRIES * RD_SIZE_TIMEOUT )/1000));
- }
-+// public int
-+// getMaximumCheckTime()
-+// {
-+// return( f_non_mandatory_count * (( RD_SIZE_RETRIES * RD_SIZE_TIMEOUT )/1000));
-+// }
-
+-
- public void
- checkForUpdate(
- UpdateChecker checker )
- {
- if ( checkForUpdateSupport( checker, null, false ) == 0 ){
-+// public void
-+// checkForUpdate(
-+// UpdateChecker checker )
-+// {
-+// if ( checkForUpdateSupport( checker, null, false ) == 0 ){
-
-- String[] rps = VersionCheckClient.getSingleton(). getRecommendedPlugins();
-+// String[] rps = VersionCheckClient.getSingleton(). getRecommendedPlugins();
-
+-
+- VersionCheckClient vc = VersionCheckClient.getSingleton();
+-
+- String[] rps = vc.getRecommendedPlugins();
+-
- boolean found_one = false;
-+// boolean found_one = false;
-
+-
- for (int i=0;i<rps.length;i++){
-+// for (int i=0;i<rps.length;i++){
-
+-
- String rp_id = rps[i];
-+// String rp_id = rps[i];
-
+-
- if ( plugin_manager.getPluginInterfaceByID( rp_id, false ) != null ){
-+// if ( plugin_manager.getPluginInterfaceByID( rp_id, false ) != null ){
-
+-
- // already installed
-+// // already installed
-
+-
- continue;
- }
-+// continue;
-+// }
-
+-
- final String config_key = "recommended.processed." + rp_id;
-+// final String config_key = "recommended.processed." + rp_id;
-
+-
- if ( !plugin_config.getPluginBooleanParameter( config_key, false )){
-+// if ( !plugin_config.getPluginBooleanParameter( config_key, false )){
-
+-
- try{
- final PluginInstaller installer = plugin_interface.getPluginManager().getPluginInstaller();
-+// try{
-+// final PluginInstaller installer = plugin_interface.getPluginManager().getPluginInstaller();
-
+-
- StandardPlugin[] sps = installer.getStandardPlugins();
-+// StandardPlugin[] sps = installer.getStandardPlugins();
-
+-
- for (int j=0;j<sps.length;j++){
-+// for (int j=0;j<sps.length;j++){
-
+-
- final StandardPlugin sp = sps[j];
-+// final StandardPlugin sp = sps[j];
-
+-
- if ( sp.getId().equals( rp_id )){
-+// if ( sp.getId().equals( rp_id )){
-
+-
- found_one = true;
-+// found_one = true;
-
+-
- checker.getCheckInstance().addListener(
- new UpdateCheckInstanceListener()
- {
@@ -132,29 +100,15 @@ diff -up azureus-4.0.0.4/org/gudy/azureus2/pluginsimpl/update/PluginUpdatePlugin
- UpdateCheckInstance instance )
- {
- }
-+// checker.getCheckInstance().addListener(
-+// new UpdateCheckInstanceListener()
-+// {
-+// public void
-+// cancelled(
-+// UpdateCheckInstance instance )
-+// {
-+// }
-
+-
- public void
- complete(
- UpdateCheckInstance instance )
- {
- if ( instance.getUpdates().length == 0 ){
-+// public void
-+// complete(
-+// UpdateCheckInstance instance )
-+// {
-+// if ( instance.getUpdates().length == 0 ){
-
+-
- installRecommendedPlugin( installer, sp );
-+// installRecommendedPlugin( installer, sp );
-
+-
- plugin_config.setPluginParameter( config_key, true );
- }
- }
@@ -174,6 +128,172 @@ diff -up azureus-4.0.0.4/org/gudy/azureus2/pluginsimpl/update/PluginUpdatePlugin
- break;
- }
- }
+-
+- if ( !found_one ){
+-
+- Set<String> auto_install = vc.getAutoInstallPluginIDs();
+-
+- final List<String> to_do = new ArrayList<String>();
+-
+- for ( String pid: auto_install ){
+-
+- if ( plugin_manager.getPluginInterfaceByID( pid, false ) == null ){
+-
+- to_do.add( pid );
+- }
+- }
+-
+- if ( to_do.size() > 0 ){
+-
+- new AEThread2( "pup:autoinst" )
+- {
+- public void
+- run()
+- {
+- try{
+- Thread.sleep( 120*1000 );
+-
+- }catch( Throwable e ){
+-
+- Debug.out( e );
+-
+- return;
+- }
+-
+- UpdateManager update_manager = plugin_interface.getUpdateManager();
+-
+- final List<UpdateCheckInstance> l_instances = new ArrayList<UpdateCheckInstance>();
+-
+- update_manager.addListener(
+- new UpdateManagerListener()
+- {
+- public void
+- checkInstanceCreated(
+- UpdateCheckInstance instance )
+- {
+- synchronized( l_instances ){
+-
+- l_instances.add( instance );
+- }
+- }
+- });
+-
+- UpdateCheckInstance[] instances = update_manager.getCheckInstances();
+-
+- l_instances.addAll( Arrays.asList( instances ));
+-
+- long start = SystemTime.getMonotonousTime();
+-
+- while( true ){
+-
+- if ( SystemTime.getMonotonousTime() - start >= 5*60*1000 ){
+-
+- break;
+- }
+-
+- try{
+- Thread.sleep(5000);
+-
+- }catch( Throwable e ){
+-
+- Debug.out( e );
+-
+- return;
+- }
+-
+- if ( l_instances.size() > 0 ){
+-
+- boolean all_done = true;
+-
+- for ( UpdateCheckInstance instance: l_instances ){
+-
+- if ( !instance.isCompleteOrCancelled()){
+-
+- all_done = false;
+-
+- break;
+- }
+- }
+-
+- if ( all_done ){
+-
+- break;
+- }
+- }
+- }
+-
+- if ( update_manager.getInstallers().length > 0 ){
+-
+- return;
+- }
+-
+- PluginInstaller installer = plugin_interface.getPluginManager().getPluginInstaller();
+-
+- List<InstallablePlugin> sps = new ArrayList<InstallablePlugin>();
+-
+- for ( String pid: to_do ){
+-
+- try{
+- StandardPlugin sp = installer.getStandardPlugin( pid );
+-
+- if ( sp != null ){
+-
+- log.log( "Auto-installing " + pid );
+-
+- sps.add( sp );
+-
+- }else{
+-
+- log.log( "Standard plugin '" + pid + "' missing" );
+- }
+- }catch( Throwable e ){
+-
+- log.log( "Standard plugin '" + pid + "' missing", e );
+- }
+- }
+-
+- if ( sps.size() > 0 ){
+-
+- Map<Integer, Object> properties = new HashMap<Integer, Object>();
+-
+- properties.put( UpdateCheckInstance.PT_UI_STYLE, UpdateCheckInstance.PT_UI_STYLE_NONE );
+-
+- properties.put(UpdateCheckInstance.PT_UI_DISABLE_ON_SUCCESS_SLIDEY, true);
+-
+- try{
+- installer.install(
+- sps.toArray( new InstallablePlugin[ sps.size()]),
+- false,
+- properties,
+- new PluginInstallationListener() {
+-
+- public void
+- completed()
+- {
+- }
+-
+- public void
+- cancelled()
+- {
+- }
+-
+- public void
+- failed(
+- PluginException e )
+- {
+-
+- }
+- });
+-
+- }catch( Throwable e ){
+-
+- log.log( "Auto install failed", e );
+- }
+- }
+- };
+- }.start();
+- }
+- }
- }
- }
-
@@ -212,63 +332,7 @@ diff -up azureus-4.0.0.4/org/gudy/azureus2/pluginsimpl/update/PluginUpdatePlugin
- log.log( LoggerChannel.LT_INFORMATION, "**** Update check starts ****" );
- }
- });
-+// plugin_config.setPluginParameter( config_key, true );
-+// }
-+// }
-+// });
-+
-+// break;
-+// }
-+// }
-+
-+// }catch( Throwable e ){
-+
-+// }
-+// }
-+
-+// if ( found_one ){
-+
-+// break;
-+// }
-+// }
-+// }
-+// }
-+
-+// }, false );
-+
-+// update_manager.registerUpdatableComponent(
-+// new UpdatableComponent()
-+// {
-+// public String
-+// getName()
-+// {
-+// return( "Mandatory plugins" );
-+// }
-+
-+// public int
-+// getMaximumCheckTime()
-+// {
-+// return( f_mandatory_count * (( RD_SIZE_RETRIES * RD_SIZE_TIMEOUT )/1000));
-+// }
-+
-+// public void
-+// checkForUpdate(
-+// UpdateChecker checker )
-+// {
-+// checkForUpdateSupport( checker, null, true );
-+// }
-+// }, true );
-+
-+// update_manager.addListener(
-+// new UpdateManagerListener()
-+// {
-+// public void
-+// checkInstanceCreated(
-+// UpdateCheckInstance instance )
-+// {
-+// log.log( LoggerChannel.LT_INFORMATION, "**** Update check starts ****" );
-+// }
-+// });
++
}
protected void
diff --git a/azureus-no-update-manager-SWTUpdateChecker.patch b/azureus-no-update-manager-SWTUpdateChecker.patch
index c14c1f7..d5d77c6 100644
--- a/azureus-no-update-manager-SWTUpdateChecker.patch
+++ b/azureus-no-update-manager-SWTUpdateChecker.patch
@@ -1,12 +1,11 @@
-diff -up azureus-4.2.0.8/org/gudy/azureus2/ui/swt/updater2/SWTUpdateChecker.java.no-update-manager-SWTUpdateChecker azureus-4.2.0.8/org/gudy/azureus2/ui/swt/updater2/SWTUpdateChecker.java
---- azureus-4.2.0.8/org/gudy/azureus2/ui/swt/updater2/SWTUpdateChecker.java.no-update-manager-SWTUpdateChecker 2009-04-16 20:46:42.000000000 +0200
-+++ azureus-4.2.0.8/org/gudy/azureus2/ui/swt/updater2/SWTUpdateChecker.java 2009-09-13 12:57:58.000000000 +0200
-@@ -64,180 +64,14 @@ public class SWTUpdateChecker implements
+diff -up azureus-4.5.0.0/org/gudy/azureus2/ui/swt/updater2/SWTUpdateChecker.java.no-update-manager-SWTUpdateChecker azureus-4.5.0.0/org/gudy/azureus2/ui/swt/updater2/SWTUpdateChecker.java
+--- azureus-4.5.0.0/org/gudy/azureus2/ui/swt/updater2/SWTUpdateChecker.java.no-update-manager-SWTUpdateChecker 2010-05-04 02:50:24.000000000 +0300
++++ azureus-4.5.0.0/org/gudy/azureus2/ui/swt/updater2/SWTUpdateChecker.java 2010-08-06 22:20:40.000000000 +0300
+@@ -64,195 +64,12 @@ public class SWTUpdateChecker implements
public static void
initialize()
{
- PluginInitializer.getDefaultInterface().getUpdateManager().registerUpdatableComponent(new SWTUpdateChecker(),true);
-+
}
public SWTUpdateChecker() {
@@ -21,7 +20,7 @@ diff -up azureus-4.2.0.8/org/gudy/azureus2/ui/swt/updater2/SWTUpdateChecker.java
- if ( update_required ){
-
- int update_prevented_version = COConfigurationManager.getIntParameter( "swt.update.prevented.version", -1 );
-
+-
- try{
- URL swt_url = SWT.class.getClassLoader().getResource("org/eclipse/swt/SWT.class");
-
@@ -164,10 +163,25 @@ diff -up azureus-4.2.0.8/org/gudy/azureus2/ui/swt/updater2/SWTUpdateChecker.java
-
- swtDownloader.addListener(new ResourceDownloaderAdapter() {
-
-- public boolean completed(ResourceDownloader downloader, InputStream data) {
-- //On completion, process the InputStream to store temp files
+- public boolean
+- completed(
+- ResourceDownloader downloader,
+- InputStream data)
+- {
+- //On completion, process the InputStream to store temp files
+-
- return processData(checker,update,downloader,data);
- }
+-
+- public void
+- failed(
+- ResourceDownloader downloader,
+- ResourceDownloaderException e )
+- {
+- Debug.out( downloader.getName() + " failed", e );
+-
+- update.complete( false );
+- }
- });
- }
- }catch( Throwable e ){
diff --git a/azureus-no-update-manager-UpdateMonitor.patch b/azureus-no-update-manager-UpdateMonitor.patch
index 7e9ac7e..db45693 100644
--- a/azureus-no-update-manager-UpdateMonitor.patch
+++ b/azureus-no-update-manager-UpdateMonitor.patch
@@ -1,7 +1,7 @@
-diff -up azureus-4.3.0.0/org/gudy/azureus2/ui/swt/update/UpdateMonitor.java.no-update-manager-UpdateMonitor azureus-4.3.0.0/org/gudy/azureus2/ui/swt/update/UpdateMonitor.java
---- azureus-4.3.0.0/org/gudy/azureus2/ui/swt/update/UpdateMonitor.java.no-update-manager-UpdateMonitor 2009-10-21 02:26:22.000000000 +0300
-+++ azureus-4.3.0.0/org/gudy/azureus2/ui/swt/update/UpdateMonitor.java 2009-11-19 21:19:57.000000000 +0200
-@@ -98,70 +98,6 @@ public class UpdateMonitor
+diff -up azureus-4.5.0.0/org/gudy/azureus2/ui/swt/update/UpdateMonitor.java.no-update-manager-UpdateMonitor azureus-4.5.0.0/org/gudy/azureus2/ui/swt/update/UpdateMonitor.java
+--- azureus-4.5.0.0/org/gudy/azureus2/ui/swt/update/UpdateMonitor.java.no-update-manager-UpdateMonitor 2010-07-31 01:02:28.000000000 +0300
++++ azureus-4.5.0.0/org/gudy/azureus2/ui/swt/update/UpdateMonitor.java 2010-08-06 22:32:16.000000000 +0300
+@@ -100,71 +100,6 @@ public class UpdateMonitor
protected UpdateMonitor(AzureusCore _azureus_core) {
azCore = _azureus_core;
@@ -63,7 +63,8 @@ diff -up azureus-4.3.0.0/org/gudy/azureus2/ui/swt/update/UpdateMonitor.java.no-u
-
-
- SimpleTimer.addPeriodicEvent("UpdateMon:autocheck",
-- AUTO_UPDATE_CHECK_PERIOD, new TimerEventPerformer() {
+- COConfigurationManager.getBooleanParameter( "Beta Programme Enabled" )?AUTO_UPDATE_CHECK_PERIOD_BETA:AUTO_UPDATE_CHECK_PERIOD,
+- new TimerEventPerformer() {
- public void perform(TimerEvent ev) {
- performAutoCheck(false);
- }
@@ -72,7 +73,7 @@ diff -up azureus-4.3.0.0/org/gudy/azureus2/ui/swt/update/UpdateMonitor.java.no-u
DelayedTask delayed_task =
UtilitiesImpl.addDelayedTask(
"Update Check",
-@@ -381,43 +317,6 @@ public class UpdateMonitor
+@@ -384,43 +319,6 @@ public class UpdateMonitor
}
protected void performAutoCheck(final boolean start_of_day) {
@@ -116,7 +117,7 @@ diff -up azureus-4.3.0.0/org/gudy/azureus2/ui/swt/update/UpdateMonitor.java.no-u
}
public void
-@@ -427,76 +326,7 @@ public class UpdateMonitor
+@@ -430,81 +328,11 @@ public class UpdateMonitor
final boolean isRecheck,
final UpdateCheckInstanceListener l )
{
@@ -160,7 +161,12 @@ diff -up azureus-4.3.0.0/org/gudy/azureus2/ui/swt/update/UpdateMonitor.java.no-u
-
- current_update_instance.cancel();
- }
--
+
+ if ( bForce ){
+
+ VersionCheckClient.getSingleton().clearCache();
+ }
+-
- UIFunctions uiFunctions = UIFunctionsManager.getUIFunctions();
- if (uiFunctions != null) {
- // XXX What kind of format is this!?
@@ -188,7 +194,7 @@ diff -up azureus-4.3.0.0/org/gudy/azureus2/ui/swt/update/UpdateMonitor.java.no-u
- current_update_instance.start();
- }
- };
-
+-
- t.start();
}
diff --git a/azureus-no-updates-PluginInitializer.patch b/azureus-no-updates-PluginInitializer.patch
index 60c0646..c202a27 100644
--- a/azureus-no-updates-PluginInitializer.patch
+++ b/azureus-no-updates-PluginInitializer.patch
@@ -1,22 +1,20 @@
-diff -up azureus-4.2.0.8/org/gudy/azureus2/pluginsimpl/local/PluginInitializer.java.no-updates-PluginInitializer azureus-4.2.0.8/org/gudy/azureus2/pluginsimpl/local/PluginInitializer.java
---- azureus-4.2.0.8/org/gudy/azureus2/pluginsimpl/local/PluginInitializer.java.no-updates-PluginInitializer 2009-07-01 01:24:02.000000000 +0200
-+++ azureus-4.2.0.8/org/gudy/azureus2/pluginsimpl/local/PluginInitializer.java 2009-09-13 12:36:54.000000000 +0200
-@@ -39,11 +39,11 @@ import org.gudy.azureus2.core3.util.*;
+diff -up azureus-4.5.0.0/org/gudy/azureus2/pluginsimpl/local/PluginInitializer.java.no-updates-PluginInitializer azureus-4.5.0.0/org/gudy/azureus2/pluginsimpl/local/PluginInitializer.java
+--- azureus-4.5.0.0/org/gudy/azureus2/pluginsimpl/local/PluginInitializer.java.no-updates-PluginInitializer 2010-07-31 01:00:40.000000000 +0300
++++ azureus-4.5.0.0/org/gudy/azureus2/pluginsimpl/local/PluginInitializer.java 2010-08-05 20:33:30.000000000 +0300
+@@ -40,12 +40,8 @@ import org.gudy.azureus2.core3.util.*;
import org.gudy.azureus2.plugins.*;
import org.gudy.azureus2.pluginsimpl.local.launch.PluginLauncherImpl;
import org.gudy.azureus2.pluginsimpl.local.ui.UIManagerImpl;
-import org.gudy.azureus2.pluginsimpl.local.update.UpdateManagerImpl;
-+//import org.gudy.azureus2.pluginsimpl.local.update.UpdateManagerImpl;
import org.gudy.azureus2.pluginsimpl.local.utils.UtilitiesImpl;
import org.gudy.azureus2.pluginsimpl.local.utils.UtilitiesImpl.runnableWithException;
-import org.gudy.azureus2.update.UpdaterUpdateChecker;
-import org.gudy.azureus2.update.UpdaterUtils;
-+//import org.gudy.azureus2.update.UpdaterUpdateChecker;
-+//import org.gudy.azureus2.update.UpdaterUtils;
+-
import com.aelitis.azureus.core.*;
-
-@@ -92,12 +92,12 @@ PluginInitializer
+ import com.aelitis.azureus.core.versioncheck.VersionCheckClient;
+@@ -97,12 +93,12 @@ PluginInitializer
"ShareHoster",
"true",
"false"},
@@ -35,7 +33,7 @@ diff -up azureus-4.2.0.8/org/gudy/azureus2/pluginsimpl/local/PluginInitializer.j
{ PluginManagerDefaults.PID_UPNP,
"com.aelitis.azureus.plugins.upnp.UPnPPlugin",
"azbpupnp",
-@@ -122,18 +122,18 @@ PluginInitializer
+@@ -127,18 +123,18 @@ PluginInitializer
"Magnet URI Handler",
"true",
"false"},
@@ -66,7 +64,7 @@ diff -up azureus-4.2.0.8/org/gudy/azureus2/pluginsimpl/local/PluginInitializer.j
{ PluginManagerDefaults.PID_PLATFORM_CHECKER,
"org.gudy.azureus2.platform.PlatformManagerPluginDelegate",
"azplatform2",
-@@ -417,7 +417,7 @@ PluginInitializer
+@@ -457,7 +453,7 @@ PluginInitializer
core_operation = _core_operation;
@@ -75,7 +73,7 @@ diff -up azureus-4.2.0.8/org/gudy/azureus2/pluginsimpl/local/PluginInitializer.j
plugin_manager = PluginManagerImpl.getSingleton( this );
-@@ -439,7 +439,7 @@ PluginInitializer
+@@ -479,7 +475,7 @@ PluginInitializer
}
}
@@ -84,23 +82,21 @@ diff -up azureus-4.2.0.8/org/gudy/azureus2/pluginsimpl/local/PluginInitializer.j
}
protected void
-@@ -1145,8 +1145,8 @@ PluginInitializer
- if ( load_failure != null ){
- plugin_interface.setAsFailed();
-
-- // don't complain about our internal one
-- if ( !pid.equals(UpdaterUpdateChecker.getPluginID())){
-+ // // don't complain about our internal one
-+ // if ( !pid.equals(UpdaterUpdateChecker.getPluginID())){
-
- String msg = "Error loading plugin '" + pluginName + "' / '" + plugin_class_string + "'";
- LogAlert la;
-@@ -1159,7 +1159,7 @@ PluginInitializer
- Logger.log(la);
-
- System.out.println( msg + ": " + load_failure);
-- }
-+ // }
- }
+@@ -1233,9 +1229,6 @@ PluginInitializer
+ if ( load_failure != null ){
+ plugin_interface.setAsFailed();
+
+- // don't complain about our internal one
+- if ( !pid.equals(UpdaterUpdateChecker.getPluginID())){
+-
+ String msg = "Error loading plugin '" + pluginName + "' / '" + plugin_class_string + "'";
+ LogAlert la;
+ if (load_failure instanceof UnsupportedClassVersionError) {
+@@ -1247,7 +1240,6 @@ PluginInitializer
+ Logger.log(la);
+
+ System.out.println( msg + ": " + load_failure);
+- }
+ }
+ }
}
-
diff --git a/azureus.spec b/azureus.spec
index 178386c..c3747f0 100644
--- a/azureus.spec
+++ b/azureus.spec
@@ -1,19 +1,22 @@
%define _newname Vuze
Name: azureus
-Version: 4.3.1.4
+Version: 4.5.0.2
Release: 1%{?dist}
Summary: A BitTorrent Client
Group: Applications/Internet
License: GPLv2+
URL: http://azureus.sourceforge.net
-Source0: http://downloads.sourceforge.net/azureus/%{_newname}_%{version}_source.zip
+Source0: http://downloads.sourceforge.net/azureus/%{_newname}_4502_source.zip
Source1: azureus.script
Source2: Azureus.desktop
Source3: azureus.applications
+#ant build script from Azureus-4.3.0.6
+Source4: build.xml
+
#Patch0: azureus-remove-win32-osx-platforms.patch
Patch2: azureus-cache-size.patch
Patch3: azureus-remove-manifest-classpath.patch
@@ -41,6 +44,7 @@ Patch56: azureus-4.0.0.4-silly-java-tricks-are-for-kids.diff
Patch57: azureus-4.0.0.4-stupid-invalid-characters.diff
Patch58: azureus-4.2.0.4-java5.patch
+Patch59: azureus-4.5.0.0-no-Tree2.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -71,6 +75,8 @@ advanced users.
%prep
%setup -q -c
+cp %{SOURCE4} .
+
#%patch0 -p0
%patch2 -p0 -b .cache-size
%patch3 -p1 -b .remove-manifest-classpath
@@ -78,9 +84,9 @@ advanced users.
%patch12 -p1 -b .no-updates-PluginInitializer
%patch13 -p1 -b .no-updates-PluginInterfaceImpl
%patch14 -p1 -b .no-update-manager-AzureusCoreImpl
-%patch15 -p0 -b .no-update-manager-CorePatchChecker
+%patch15 -p1 -b .no-update-manager-CorePatchChecker
%patch16 -p1 -b .no-update-manager-CoreUpdateChecker
-%patch18 -p1 -b .no-update-manager-PluginInstallerImpl
+#%patch18 -p1 -b .no-update-manager-PluginInstallerImpl
%patch19 -p1 -b .no-update-manager-PluginUpdatePlugin
%patch20 -p1 -b .no-update-manager-SWTUpdateChecker
%patch22 -p1 -b .no-update-manager-UpdateMonitor
@@ -100,25 +106,15 @@ rm org/gudy/azureus2/platform/win32/PlatformManagerImpl.java
rm org/gudy/azureus2/platform/macosx/access/jnilib/OSXAccess.java
rm org/gudy/azureus2/platform/win32/access/AEWin32Access.java
rm org/gudy/azureus2/platform/win32/access/impl/AEWin32AccessInterface.java
-rm org/gudy/azureus2/platform/win32/access/impl/aereg.cpp
rm org/gudy/azureus2/platform/win32/access/impl/AEWin32AccessImpl.java
-rm org/gudy/azureus2/platform/win32/access/impl/org_gudy_azureus2_platform_win32_access_impl_AEWin32AccessInterface.h
rm org/gudy/azureus2/platform/win32/access/impl/Test.java
rm org/gudy/azureus2/platform/macosx/NativeInvocationBridge.java
rm org/gudy/azureus2/platform/macosx/PListEditor.java
rm org/gudy/azureus2/platform/win32/access/AEWin32AccessException.java
rm org/gudy/azureus2/platform/win32/access/AEWin32AccessListener.java
rm org/gudy/azureus2/platform/win32/access/AEWin32Manager.java
-rm org/gudy/azureus2/platform/win32/access/impl/aenet.cpp
-rm org/gudy/azureus2/platform/win32/access/impl/aenet.h
-rm org/gudy/azureus2/platform/win32/access/impl/aereg.dsp
-rm org/gudy/azureus2/platform/win32/access/impl/aereg.dsw
-rm org/gudy/azureus2/platform/win32/access/impl/aereg.h
rm org/gudy/azureus2/platform/win32/access/impl/AEWin32AccessCallback.java
rm org/gudy/azureus2/platform/win32/access/impl/AEWin32AccessExceptionImpl.java
-rm org/gudy/azureus2/platform/win32/access/impl/generate_ini.bat
-rm org/gudy/azureus2/platform/win32/access/impl/StdAfx.cpp
-rm org/gudy/azureus2/platform/win32/access/impl/StdAfx.h
rm org/gudy/azureus2/platform/win32/PlatformManagerUpdateChecker.java
%patch50 -p1 -b .boo-windows
@@ -126,7 +122,7 @@ rm org/gudy/azureus2/ui/swt/osx/CarbonUIEnhancer.java
rm org/gudy/azureus2/ui/swt/osx/Start.java
rm org/gudy/azureus2/ui/swt/win32/Win32UIEnhancer.java
%patch51 -p1 -b .boo-osx
-%patch52 -b .screw-w32-tests
+#%patch52 -b .screw-w32-tests
%patch53 -p1 -b .boo-updating-w32
%patch54 -b .screw-win32utils
@@ -135,7 +131,11 @@ rm org/gudy/azureus2/ui/swt/win32/Win32UIEnhancer.java
%patch58 -p1 -b .java5
-rm org/gudy/azureus2/ui/swt/test/PrintTransferTypes.java
+#hacks to org.eclipse.swt.widgets.Tree2 don't compile.
+rm -fR org/eclipse
+%patch59 -p1 -b .no-Tree2
+
+
#sed -i -e \
# "s|sun.security.action.GetPropertyAction|gnu.java.security.action.GetPropertyAction|" \
# org/gudy/azureus2/core3/internat/MessageText.java
@@ -248,6 +248,12 @@ fi
%{_datadir}/azureus
%changelog
+* Wed Aug 18 2010 David Juran <david at juran.se> - 4.5.0.2-1
+- upgrade to 4.5.0.2
+
+* Thu Aug 5 2010 David Juran <david at juran.se> - 4.5.0.0-1
+- upgrade to 4.5.0.0
+
* Fri Feb 12 2010 David Juran <djuran at redhat.com> - 4.3.1.4-1
- upgrade to 4.3.1.4
diff --git a/sources b/sources
index 39d143d..79578ac 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-46f89e6b3ed955f7b3cb8e35ff30e2d2 Vuze_4.3.1.4_source.zip
+b25a7af8f88d2c6520f7b53886dbbc17 Vuze_4502_source.zip
More information about the scm-commits
mailing list