Fri Feb 10 17:00:47 UTC 2006

Author: green

Update of /cvs/extras/rpms/azureus/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6956

Modified Files:
	.cvsignore azureus.script azureus.spec sources 
Added Files:
	azureus-no-restart.patch 
	azureus-no-update-manager-AzureusCoreImpl.patch 
	azureus-no-update-manager-CorePatchChecker.patch 
	azureus-no-update-manager-CoreUpdateChecker.patch 
	azureus-no-update-manager-MainWindow.patch 
	azureus-no-update-manager-PluginInstallerImpl-2.patch 
	azureus-no-update-manager-PluginInstallerImpl.patch 
	azureus-no-update-manager-PluginUpdatePlugin.patch 
	azureus-no-update-manager-SWTUpdateChecker.patch 
	azureus-no-update-manager-TableView.patch 
	azureus-no-update-manager-UpdateMonitor.patch 
	azureus-no-updates-PluginInitializer.patch 
	azureus-no-updates-PluginInterfaceImpl.patch 
Log Message:
Update to latest cvs sources in preparation for 2.4.0.0 release candidate.
Disable all updates.
Integrate two plugins.  More coming.


azureus-no-restart.patch:

--- NEW FILE azureus-no-restart.patch ---
--- org/gudy/azureus2/ui/swt/mainwindow/MainMenu.java~	2006-02-09 20:09:11.000000000 -0500
+++ org/gudy/azureus2/ui/swt/mainwindow/MainMenu.java	2006-02-09 20:09:17.000000000 -0500
@@ -171,17 +171,6 @@
       if(!Constants.isOSX) {
         new MenuItem(fileMenu, SWT.SEPARATOR);
 
-        MenuItem file_restart = new MenuItem(fileMenu, SWT.NULL);
-        Messages.setLanguageText(file_restart, "MainWindow.menu.file.restart"); //$NON-NLS-1$
-
-        file_restart.addListener(SWT.Selection, new Listener() {
-
-        public void handleEvent(Event event) {
-
-            MainWindow.getWindow().dispose(true,false);
-         }
-        });
-
         final MenuItem file_exit = new MenuItem(fileMenu, SWT.NULL);
         if(!COConfigurationManager.getBooleanParameter("Enable System Tray") || !COConfigurationManager.getBooleanParameter("Close To Tray")) {
             KeyBindings.setAccelerator(file_exit, "MainWindow.menu.file.exit");

azureus-no-update-manager-AzureusCoreImpl.patch:

--- NEW FILE azureus-no-update-manager-AzureusCoreImpl.patch ---
--- com/aelitis/azureus/core/impl/AzureusCoreImpl.java.orig	2006-02-09 23:23:01.000000000 -0500
+++ com/aelitis/azureus/core/impl/AzureusCoreImpl.java	2006-02-09 23:23:19.000000000 -0500
@@ -391,13 +391,6 @@
 			if (Logger.isEnabled())
 				Logger.log(new LogEvent(LOGID, "Stop operation completes"));
 	
-				// if any installers exist then we need to closedown via the updater
-			
-			if ( 	apply_updates && 
-					getPluginManager().getDefaultPluginInterface().getUpdateManager().getInstallers().length > 0 ){
-				
-				AzureusRestarterFactory.create( this ).restart( true );
-			}
 		}finally{
 			
 			stopping_sem.releaseForever();

azureus-no-update-manager-CorePatchChecker.patch:

--- NEW FILE azureus-no-update-manager-CorePatchChecker.patch ---
--- 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 @@
 				
 				System.out.println( "CorePatchChecker: TESTING !!!!" );
 			}
-			
-			plugin_interface.getUpdateManager().registerUpdatableComponent( this, false );
 		}
 	}
 	
@@ -86,18 +84,7 @@
 	checkForUpdate(
 		UpdateChecker	checker )
 	{
-		try{
-			UpdateCheckInstance	inst = checker.getCheckInstance();
-		
-			inst.addListener( this );
-		
-			checker.addUpdate( "Core Patch Checker", new String[0], "",
-								new ResourceDownloader[0],
-								Update.RESTART_REQUIRED_MAYBE );
-		}finally{
-			
-			checker.completed();
-		}
+	    checker.completed();
 	}
 	
 	public void

azureus-no-update-manager-CoreUpdateChecker.patch:

--- NEW FILE azureus-no-update-manager-CoreUpdateChecker.patch ---
--- org/gudy/azureus2/update/CoreUpdateChecker.java.orig	2006-02-09 23:27:55.000000000 -0500
+++ org/gudy/azureus2/update/CoreUpdateChecker.java	2006-02-09 23:28:47.000000000 -0500
@@ -124,8 +124,6 @@
 		props.setProperty( "plugin.version", plugin_interface.getAzureusVersion());
 		
 		rdf = plugin_interface.getUtilities().getResourceDownloaderFactory();
-	
-		plugin_interface.getUpdateManager().registerUpdatableComponent( this, true );
 	}
 	
 	public String
@@ -144,178 +142,9 @@
 	checkForUpdate(
 		final UpdateChecker	checker )
 	{
-		try{			
-			String	current_version = plugin_interface.getAzureusVersion();
-			
-			log.log( "Update check starts: current = " + current_version );
-									
-			boolean	TESTING = false;	// !!!!TODO: REMOVE THIS
-			
-			if ( TESTING ){
-			
-				System.out.println( "CoreUpdater: !!!! Testing mode !!!!" );
-				
-			}
-				
-			Map	decoded = VersionCheckClient.getSingleton().getVersionCheckInfo(
-		  			first_check?VersionCheckClient.REASON_UPDATE_CHECK_START:VersionCheckClient.REASON_UPDATE_CHECK_PERIODIC);
-
-      
-			displayUserMessage( decoded );
-			
-			String latest_version 			= null;
-			String latest_file_name			= null;
-			
-			byte[] b_version = (byte[])decoded.get("version");
-			
-			if ( b_version != null ){
-			
-				latest_version = new String( b_version );
-				
-				plugin_interface.getPluginProperties().setProperty( LATEST_VERSION_PROPERTY, latest_version );
-				
-			}else{
-				
-				throw( new Exception( "No version found in reply" ));
-			}
-			
-			byte[] b_filename = (byte[]) decoded.get("filename");
-			
-			if ( b_filename != null ){
-			
-				latest_file_name = new String( b_filename );
-			}
-			
-			String	msg = "Core: latest_version = '" + latest_version + "', file = '" + latest_file_name + "'";
-			
-			checker.reportProgress( msg );
-			
-			log.log( msg );
-			
-			boolean	latest_is_cvs	= Constants.isCVSVersion( latest_version );
-			String	latest_base		= Constants.getBaseVersion( latest_version );
-			
-			String	current_base	= Constants.getBaseVersion();
-				
-				// currently we upgrade from, for example
-				//  1) 2.0.8.4     -> 2.0.8.6
-				//	2) 2.0.8.5_CVS -> 2.0.8.6
-				// but not to a CVS version (also currently never reported as latest...)
-				
-			if ( latest_is_cvs && !TESTING ){
-				
-				return;
-			}
-
-			if ( Constants.compareVersions( current_base, latest_base ) >= 0 && !TESTING){
-				
-				return;
-			}
-			
-			final String	f_latest_version	= latest_version;
-			final String	f_latest_file_name	= latest_file_name;
-			
-
-			ResourceDownloader[]	primary_mirrors;
-				
-			primary_mirrors = getPrimaryDownloaders( latest_file_name );
-
-				// the download hierarchy is primary mirrors first (randomised alternate)
-				// then backup mirrors (randomised alternate)
-			
-				// we don't want to load the backup mirrors until the primary mirrors fail
-			
-			ResourceDownloader		random_primary_mirrors = rdf.getRandomDownloader( primary_mirrors );
-			
-			ResourceDownloader		backup_downloader =
-				rdf.create(
-					new ResourceDownloaderDelayedFactory()
-					{
-						public ResourceDownloader
-						create()
-						{
-							ResourceDownloader[]	backup_mirrors = getBackupDownloaders( f_latest_file_name );
-						
-							return( rdf.getRandomDownloader( backup_mirrors ));
-						}
-					});
-			
-			ResourceDownloader	top_downloader = 
-				rdf.getAlternateDownloader( 
-						new ResourceDownloader[]
-							{
-								random_primary_mirrors,
-								backup_downloader,
-							});
-			
-
-			top_downloader.addListener( rd_logger );
-			
-				// get size so it is cached
-			
-			top_downloader.getSize();		
-							
-			top_downloader.addListener( 
-					new ResourceDownloaderAdapter()
-					{
-						public boolean
-						completed(
-							final ResourceDownloader	downloader,
-							InputStream					data )
-						{	
-							installUpdate( checker, downloader, f_latest_version, data );
-									
-							return( true );
-						}
-					});
-
-			byte[]	info_b = (byte[])decoded.get( "info" );
-			
-			String	info = null;
-			
-			if ( info_b != null ){
-			
-				try{
-					info = new String( info_b );
-				
-				}catch( Throwable e ){
-					
-					Debug.printStackTrace( e );
-				}
-			}
-			
-			String[]	desc;
-			
-			if ( info == null ){
-				
-				desc = new String[]{"Core Azureus Version" };
-				
-			}else{
-				
-				desc = new String[]{"Core Azureus Version", info };
-			}
-			
-			checker.addUpdate(
-						"Core Azureus Version",
-						desc,
-						latest_version,
-						top_downloader,
-						Update.RESTART_REQUIRED_YES );
-			
-		}catch( Throwable e ){
-			
-			log.log( e );
-			
-			Debug.printStackTrace( e );
-			
-			checker.failed();
-			
-		}finally{
-			
 			checker.completed();
 			
 			first_check = false;
-		}
 	}
 	
       

azureus-no-update-manager-MainWindow.patch:

--- NEW FILE azureus-no-update-manager-MainWindow.patch ---
--- org/gudy/azureus2/ui/swt/mainwindow/MainWindow.java.orig	2006-02-09 23:26:57.000000000 -0500
+++ org/gudy/azureus2/ui/swt/mainwindow/MainWindow.java	2006-02-09 23:27:13.000000000 -0500
@@ -1772,12 +1772,6 @@
   private void 
   addUpdateListener() 
   {
-  	azureus_core.getPluginManager().getDefaultPluginInterface().getUpdateManager().addListener(new UpdateManagerListener () {
-      public void checkInstanceCreated(UpdateCheckInstance instance) {
-        
-      	new updateStatusChanger( instance );
-      }
-    });
   }  
   
   protected class

azureus-no-update-manager-PluginInstallerImpl-2.patch:

--- NEW FILE azureus-no-update-manager-PluginInstallerImpl-2.patch ---
--- org/gudy/azureus2/pluginsimpl/local/installer/PluginInstallerImpl.java.orig	2006-02-09 23:42:33.000000000 -0500
+++ org/gudy/azureus2/pluginsimpl/local/installer/PluginInstallerImpl.java	2006-02-09 23:42:45.000000000 -0500
@@ -237,13 +237,6 @@
 					PluginManager.registerPlugin( dummy_plugin, plugin_id );
 				
 					PluginInterface dummy_plugin_interface = manager.getPluginInterfaceByID( plugin_id );
-					
-					((InstallablePluginImpl)plugin).addUpdate( inst, pup, dummy_plugin, dummy_plugin_interface );
-							
-				}else{
-					
-					((InstallablePluginImpl)plugin).addUpdate( inst, pup, existing_plugin, existing_plugin_interface );
-	
 				}
 			}
 		

azureus-no-update-manager-PluginInstallerImpl.patch:

--- NEW FILE azureus-no-update-manager-PluginInstallerImpl.patch ---
--- org/gudy/azureus2/pluginsimpl/local/installer/PluginInstallerImpl.java.orig	2006-02-09 23:30:18.000000000 -0500
+++ org/gudy/azureus2/pluginsimpl/local/installer/PluginInstallerImpl.java	2006-02-09 23:32:16.000000000 -0500
@@ -177,13 +177,6 @@
 	{
 		PluginUpdatePlugin	pup = (PluginUpdatePlugin)manager.getPluginInterfaceByClass( PluginUpdatePlugin.class ).getPlugin();
 		
-		UpdateManager	uman = manager.getDefaultPluginInterface().getUpdateManager();
-		
-		UpdateCheckInstance	inst = 
-			uman.createEmptyUpdateCheckInstance( 
-					UpdateCheckInstance.UCI_INSTALL,
-					"update.instance.install" );
-		
 		try{
 			
 			for (int i=0;i<plugins.length;i++){
@@ -247,23 +240,6 @@
 					
 					((InstallablePluginImpl)plugin).addUpdate( inst, pup, dummy_plugin, dummy_plugin_interface );
 							
-					inst.addListener(
-						new UpdateCheckInstanceListener()
-						{
-							public void
-							cancelled(
-								UpdateCheckInstance		instance )
-							{
-								dummy_plugin.requestUnload();
-							}
-							
-							public void
-							complete(
-								UpdateCheckInstance		instance )
-							{
-								dummy_plugin.requestUnload();
-							}
-						});
 				}else{
 					
 					((InstallablePluginImpl)plugin).addUpdate( inst, pup, existing_plugin, existing_plugin_interface );
@@ -271,12 +247,8 @@
 				}
 			}
 		
-			inst.start();
-			
 		}catch( Throwable e ){
 			
-			inst.cancel();
-			
 			if ( e instanceof PluginException ){
 				
 				throw((PluginException)e);
@@ -339,137 +311,6 @@
 				throw( new PluginException( "Plugin '" + pi.getPluginID() + "' is not loaded from the file system, can't uninstall" ));
 			}
 		}
-		
-		try{
-			UpdateManager	uman = manager.getDefaultPluginInterface().getUpdateManager();
-			
-			UpdateCheckInstance	inst = 
-				uman.createEmptyUpdateCheckInstance(
-						UpdateCheckInstance.UCI_UNINSTALL,
-						"update.instance.uninstall");
-
-			for (int i=0;i<pis.length;i++){
-				
-				final PluginInterface	pi = pis[i];
-				
-				final String	plugin_dir = pi.getPluginDirectoryName();
-
-				inst.addUpdatableComponent(
-					new UpdatableComponent()
-					{
-						public String
-						getName()
-						{
-							return( pi.getPluginName());
-						}
-					
-						public int
-						getMaximumCheckTime()
-						{
-							return( 0 );
-						}
-						
-						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.isUnloadable()){
-											
-													pi.unload();
-													
-													FileUtil.recursiveDelete( new File( plugin_dir ));
-												
-												}else{
-																
-													UpdateInstaller installer = checker.createInstaller();
-													
-													installer.addRemoveAction( new File( plugin_dir ).getCanonicalPath());
-												}
-												
-											}catch( Throwable e ){
-												
-												Debug.printStackTrace(e);
-												Logger.log(new LogAlert(LogAlert.REPEATABLE,
-														"Plugin uninstall failed", e));
-											}
-												
-											return( true );
-										}
-										
-										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
-								
-								String	update_name = "";
-									
-								PluginInterface[]	ifs = manager.getPluginInterfaces();
-								
-							    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++){
-									
-									if ( ifs[i].getPluginID().equals(pi.getPluginID())){
-									
-										update_name += (update_name.length()==0?"":",") + ifs[i].getPluginName();
-									}
-								}
-								
-								checker.addUpdate(
-									update_name,
-									new String[]{ "Uninstall: " + plugin_dir},
-									pi.getPluginVersion(),
-									rd,
-									pi.isUnloadable()?Update.RESTART_REQUIRED_NO:Update.RESTART_REQUIRED_YES );
-									
-							}finally{
-								
-								checker.completed();
-							}
-								
-						}
-					}, false );
-			}
-
-			inst.start();
-			
-		}catch( Throwable e ){
-			
-			Debug.printStackTrace(e);
-		}
 	}
 	
 	protected PluginInterface

azureus-no-update-manager-PluginUpdatePlugin.patch:

--- NEW FILE azureus-no-update-manager-PluginUpdatePlugin.patch ---
--- org/gudy/azureus2/pluginsimpl/update/PluginUpdatePlugin.java.orig	2006-02-09 23:32:49.000000000 -0500
+++ org/gudy/azureus2/pluginsimpl/update/PluginUpdatePlugin.java	2006-02-09 23:33:49.000000000 -0500
@@ -130,20 +130,6 @@
 		
 		config.addBooleanParameter2( "enable.update", "Plugin.pluginupdate.enablecheck", true );
 				
-		UpdateManager	update_manager = plugin_interface.getUpdateManager();
-		
-		update_manager.addListener(
-			new UpdateManagerListener()
-			{
-				public void
-				checkInstanceCreated(
-					UpdateCheckInstance	inst )
-				{
-					SFPluginDetailsLoaderFactory.getSingleton().reset();
-				}
-				
-			});
-		
 		final PluginManager	plugin_manager = plugin_interface.getPluginManager();
 		
 		PluginInterface[]	plugins = plugin_manager.getPlugins();
@@ -169,134 +155,6 @@
 		
 		final int f_non_mandatory_count	= non_mandatory_count;
 		final int f_mandatory_count		= mandatory_count;
-		
-		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 void
-				checkForUpdate(
-					UpdateChecker	checker )
-				{
-					if ( checkForUpdateSupport( checker, null, false ) == 0 ){
-						
-						String[] rps = VersionCheckClient.getSingleton(). getRecommendedPlugins();
-						
-						boolean	found_one = false;
-						
-						for (int i=0;i<rps.length;i++){
-							
-							String	rp_id = rps[i];
-							
-							if ( plugin_manager.getPluginInterfaceByID( rp_id ) != null ){
-								
-									// already installed
-								
-								continue;
-							}
-							
-							final String	config_key = "recommended.processed." + rp_id;
-							
-							if ( !plugin_config.getPluginBooleanParameter( config_key, false )){
-								
-								try{
-									final PluginInstaller installer = plugin_interface.getPluginManager().getPluginInstaller();
-									
-									StandardPlugin[]	sps = installer.getStandardPlugins();
-									
-									for (int j=0;j<sps.length;j++){
-										
-										final StandardPlugin	sp = sps[j];
-										
-										if ( sp.getId().equals( rp_id )){
-										
-											found_one = true;
-											
-											checker.getCheckInstance().addListener(
-												new UpdateCheckInstanceListener()
-												{
-													public void
-													cancelled(
-														UpdateCheckInstance		instance )
-													{													
-													}
-													
-													public void
-													complete(
-														UpdateCheckInstance		instance )
-													{
-														if ( instance.getUpdates().length == 0 ){
-															
-															installRecommendedPlugin( installer, sp );
-															
-															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

azureus-no-update-manager-SWTUpdateChecker.patch:

--- NEW FILE azureus-no-update-manager-SWTUpdateChecker.patch ---
--- org/gudy/azureus2/ui/swt/updater2/SWTUpdateChecker.java.orig	2006-02-09 23:23:47.000000000 -0500
+++ org/gudy/azureus2/ui/swt/updater2/SWTUpdateChecker.java	2006-02-09 23:25:02.000000000 -0500
@@ -57,77 +57,14 @@
   public static void
   initialize()
   {
-    PluginInitializer.getDefaultInterface().getUpdateManager().registerUpdatableComponent(new SWTUpdateChecker(),true);
   }
   
   public SWTUpdateChecker() {    
   }
   
   public void checkForUpdate(final UpdateChecker checker) {
-  	try{
-	    SWTVersionGetter versionGetter = new SWTVersionGetter( checker );
-	    
-	    if( versionGetter.needsUpdate() && System.getProperty("azureus.skipSWTcheck") == null ) {
-        
-        String[] mirrors = versionGetter.getMirrors();
-	      
-	      ResourceDownloader swtDownloader = null;
-	      
-          ResourceDownloaderFactory factory = ResourceDownloaderFactoryImpl.getSingleton();
-          List downloaders =  new ArrayList();
-          for(int i = 0 ; i < mirrors.length ; i++) {
-            try {
-              downloaders.add(factory.getSuffixBasedDownloader(factory.create(new URL(mirrors[i]))));
-            } catch(MalformedURLException e) {
-              //Do nothing
-            	if (Logger.isEnabled())
-								Logger.log(new LogEvent(LOGID, LogEvent.LT_WARNING,
-										"Cannot use URL " + mirrors[i] + " (not valid)"));
-            }
-          }
-          ResourceDownloader[] resourceDownloaders = 
-            (ResourceDownloader[]) 
-            downloaders.toArray(new ResourceDownloader[downloaders.size()]);
-          
-          swtDownloader = factory.getRandomDownloader(resourceDownloaders);
-          	      
-	      swtDownloader.addListener(new ResourceDownloaderAdapter() {
-	        
-	        public boolean completed(ResourceDownloader downloader, InputStream data) {
-	          //On completion, process the InputStream to store temp files
-	          return processData(checker,data);
-	        }
-	      });
-	      
-	      	// get the size so its cached up
-	      
-	      try{
-	      	swtDownloader.getSize();
-	      	
-	      }catch( ResourceDownloaderException e ){
-	      
-	      	Debug.printStackTrace( e );
-	      }
-	      
-	      checker.addUpdate("SWT Library for " + versionGetter.getPlatform(),
-	          new String[] {"SWT is the graphical library used by Azureus"},
-	          "" + versionGetter.getLatestVersion(),
-	          swtDownloader,
-	          Update.RESTART_REQUIRED_YES
-	          );      
-	      
-	    }
-  	}catch( Throwable e ){
-  		Logger.log(new LogAlert(LogAlert.UNREPEATABLE,
-					"SWT Version check failed", e));
-  		
-  		checker.failed();
-  		
-  	}finally{
   		
   		checker.completed();
-  	}
-    
   }
   
   private boolean 

azureus-no-update-manager-TableView.patch:

--- NEW FILE azureus-no-update-manager-TableView.patch ---
--- org/gudy/azureus2/ui/swt/views/TableView.java.orig	2006-02-09 16:11:50.000000000 -0500
+++ org/gudy/azureus2/ui/swt/views/TableView.java	2006-02-09 23:08:11.000000000 -0500
@@ -2711,27 +2711,7 @@
 	}
 
 	private void changeColumnIndicator() {
-		if (table == null || table.isDisposed())
-			return;
-
-		try {
-			// can't use TableColumnCore.getPosition, because user may have moved
-			// columns around, messing up the SWT column indexes.  
-			// We can either use search columnsOrdered, or search table.getColumns()
-			TableColumn[] tcs = table.getColumns();
-			for (int i = 0; i < tcs.length; i++) {
-				String sName = (String)tcs[i].getData("Name");
-				if (sName != null && sName.equals(rowSorter.sColumnName)) {
-					table.setSortDirection(rowSorter.bAscending ? SWT.UP : SWT.DOWN);
-					table.setSortColumn(tcs[i]);
-					return;
-				}
-			}
-
-			table.setSortColumn(null);
-		} catch (NoSuchMethodError e) {
-			// sWT < 3.2 doesn't have column indicaters
-		}
+	    return;
 	}
 
 	private void visibleRowsChanged() {

azureus-no-update-manager-UpdateMonitor.patch:

--- NEW FILE azureus-no-update-manager-UpdateMonitor.patch ---
--- org/gudy/azureus2/ui/swt/update/UpdateMonitor.java.orig	2006-02-09 23:25:26.000000000 -0500
+++ org/gudy/azureus2/ui/swt/update/UpdateMonitor.java	2006-02-09 23:26:30.000000000 -0500
@@ -87,147 +87,18 @@
 	{
 		azureus_core	= _azureus_core;
 		
-	  	UpdateManager um = azureus_core.getPluginManager().getDefaultPluginInterface().getUpdateManager(); 
-
-	  	um.addListener(
-	  		new UpdateManagerListener()
-			{
-	  			public void
-				checkInstanceCreated(
-					UpdateCheckInstance	instance )
-	  			{
-	  				instance.addListener( UpdateMonitor.this );
-	  			}
-			});
-	  	
-	    SimpleTimer.addPeriodicEvent( 
-	            AUTO_UPDATE_CHECK_PERIOD,
-	            new TimerEventPerformer()
-	            {
-	            	public void
-					perform(
-						TimerEvent  ev )
-					{
-	            		performAutoCheck(false);
-					}
-	            });
-	      
-	    	// wait a bit before starting check to give rest of AZ time to initialise 
-	    
-		new DelayedEvent(
-				2500,
-				new AERunnable()
-				{
-					public void
-					runSupport()
-					{
-						performAutoCheck(true);
-					}
-				});
 	}
   
 	protected void
 	performAutoCheck(
 		final boolean		start_of_day )
 	{
-		boolean check_at_start	= false;
-		boolean check_periodic	= false;
-	
-			// no update checks for java web start
-		
-		if ( !SystemProperties.isJavaWebStartInstance()){
-					
-			check_at_start	= COConfigurationManager.getBooleanParameter( "update.start", true );
-			check_periodic	= COConfigurationManager.getBooleanParameter( "update.periodic", true );
-		}
-		
-			// periodic -> check at start as well
-		
-		check_at_start = check_at_start || check_periodic;
-		
-		if (	( check_at_start && start_of_day) ||
-				( check_periodic && !start_of_day )){
-			
-			performCheck();	// this will implicitly do usage stats
-			
-		}else{
-
-			new DelayedEvent(
-					5000,
-					new AERunnable()
-					{
-						public void
-						runSupport()
-						{
-							if ( start_of_day ){
-                                MainWindow.getWindow().setStatusText("");
-							}
-
-							CoreUpdateChecker.doUsageStats();
-						}
-					});
-		}
 	}
 	
 	public void
 	performCheck()
 	{
-		if ( SystemProperties.isJavaWebStartInstance()){
-			
-				// just in case we get here somehome!
-			if (Logger.isEnabled())
-				Logger.log(new LogEvent(LOGID,
-						"skipping update check as java web start"));
-			
-			return;
-		}
 
-			// kill any existing update window
-		
-	    if ( current_update_window != null && ! current_update_window.isDisposed()){
-	    	
-	      SWTThread.getInstance().getDisplay().syncExec(
-	      		new AERunnable() 
-				{
-	      			public void 
-					runSupport() 
-	      			{               
-	      				current_update_window.dispose();
-	      			}
-	      		});
-	    }
-	    
-	    if ( current_update_instance != null ){
-	    	
-	    	current_update_instance.cancel();
-	    }
-	    
-		MainWindow mainWindow = MainWindow.getWindow();
-		
-	    mainWindow.setStatusText("MainWindow.status.checking ...");
-	    
-	    	// take this off this GUI thread in case it blocks for a while
-	    
-	   AEThread t = 
-		   	new AEThread( "UpdateMonitor:kickoff")
-				{
-			    	public void
-					runSupport()
-			    	{
-			    		UpdateManager um = azureus_core.getPluginManager().getDefaultPluginInterface().getUpdateManager(); 
-				
-			    		current_update_instance = 
-			    			um.createUpdateCheckInstance(
-			    				UpdateCheckInstance.UCI_UPDATE,
-			  					"update.instance.update" );
-			  	
-			    		current_update_instance.start();
-			    	}
-				};
-			
-		t.setDaemon( true );
-		
-		t.start();
 	}
 	
 	public void

azureus-no-updates-PluginInitializer.patch:

--- NEW FILE azureus-no-updates-PluginInitializer.patch ---
--- org/gudy/azureus2/pluginsimpl/local/PluginInitializer.java.orig	2006-02-09 22:57:59.000000000 -0500
+++ org/gudy/azureus2/pluginsimpl/local/PluginInitializer.java	2006-02-09 23:01:31.000000000 -0500
@@ -47,11 +47,8 @@
 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.*;
 import org.gudy.azureus2.pluginsimpl.local.utils.UtilitiesImpl;
 
-import org.gudy.azureus2.update.UpdaterUpdateChecker;
-
 
 
 /**
@@ -93,11 +90,6 @@
    					"azbpsharehoster", 
    					"ShareHoster",
 					"true" },
-   			{	 PluginManagerDefaults.PID_PLUGIN_UPDATE_CHECKER, 
-   					"org.gudy.azureus2.pluginsimpl.update.PluginUpdatePlugin", 
-   					"azbppluginupdate", 
-   					"PluginUpdate",
-					"true" },
 			{	 PluginManagerDefaults.PID_CLIENT_ID, 
 				    "com.aelitis.azureus.plugins.clientid.ClientIDPlugin", 
 				    "azbpclientid", 
@@ -123,16 +115,6 @@
 					"azbpmagnet", 
 					"Magnet URI Handler",
 					"true" },
-			{	 PluginManagerDefaults.PID_CORE_UPDATE_CHECKER, 
-   					"org.gudy.azureus2.update.CoreUpdateChecker", 
-   					"azbpcoreupdater", 
-   					"CoreUpdater",
-					"true" },
-			{	 PluginManagerDefaults.PID_CORE_PATCH_CHECKER, 
-   					"org.gudy.azureus2.update.CorePatchChecker", 
-   					"azbpcorepatcher", 
-   					"CorePatcher",
-					"true" },
 	   		{	 PluginManagerDefaults.PID_JPC, 
 					"com.aelitis.azureus.plugins.jpc.JPCPlugin", 
 					"azjpc", 
@@ -297,11 +279,7 @@
   	
     listener 	= _listener;
     
-    UpdateManagerImpl.getSingleton( azureus_core );	// initialise the update manager
-       
     plugin_manager = PluginManagerImpl.getSingleton( this );
-    
-    UpdaterUpdateChecker.checkPlugin();
   }
   
   	public void 
@@ -823,16 +801,11 @@
 	      
 	      if ( load_failure != null ){
 	      		  
-	    	  	// don't complain about our internal one
-	    	  
-	    	  if ( !pid.equals(UpdaterUpdateChecker.getPluginID())){
-	    		  
 		      	String	msg = "Error loading plugin '" + pluginName + "' / '" + plugin_class_string + "'";
 		   	 
 		      	Logger.log(new LogAlert(LogAlert.UNREPEATABLE, msg, load_failure));
 	
 		      	System.out.println( msg + " : " + load_failure);
-		      }
 	      }
   		}
 	      

azureus-no-updates-PluginInterfaceImpl.patch:

--- NEW FILE azureus-no-updates-PluginInterfaceImpl.patch ---
--- /usr/src/redhat/BUILD/azureus2/org/gudy/azureus2/pluginsimpl/local/PluginInterfaceImpl.java.orig	2006-02-09 23:03:10.000000000 -0500
+++ /usr/src/redhat/BUILD/azureus2/org/gudy/azureus2/pluginsimpl/local/PluginInterfaceImpl.java	2006-02-09 23:03:41.000000000 -0500
@@ -47,7 +47,6 @@
 import org.gudy.azureus2.pluginsimpl.local.ui.config.ParameterRepository;
 import org.gudy.azureus2.pluginsimpl.local.ui.config.PluginConfigUIFactoryImpl;
 import org.gudy.azureus2.pluginsimpl.local.utils.*;
-import org.gudy.azureus2.pluginsimpl.local.update.*;
 import org.gudy.azureus2.plugins.ipfilter.IPFilter;
 import org.gudy.azureus2.plugins.tracker.Tracker;
 import org.gudy.azureus2.plugins.ui.config.Parameter;
@@ -409,7 +408,7 @@
   public UpdateManager
   getUpdateManager()
   {
-  	return( UpdateManagerImpl.getSingleton( initialiser.getAzureusCore()));
+      return( null );
   }
 
   public PeerProtocolManager


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/azureus/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	9 Feb 2006 08:45:07 -0000	1.3
+++ .cvsignore	10 Feb 2006 17:00:46 -0000	1.4
@@ -1 +1,3 @@
-azureus2-cvs-20060207.tar.gz
+azplugins_1.8.8.jar
+azureus2-cvs-20060209.tar.gz
+bdcc_2.2.2.zip


Index: azureus.script
===================================================================
RCS file: /cvs/extras/rpms/azureus/devel/azureus.script,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- azureus.script	9 Feb 2006 08:45:07 -0000	1.6
+++ azureus.script	10 Feb 2006 17:00:46 -0000	1.7
@@ -1,8 +1,18 @@
 #!/bin/sh
 
+# Create the fake application dir.
 APPDIR=`(cd ~; pwd)`/.azureus/app
 if ! test -d $APPDIR; then
   mkdir -p $APPDIR;
 fi
 
-CLASSPATH=`build-classpath jakarta-commons-cli log4j swt-gtk-3.1.1 gtk2.8 glib0.2 Azureus2` java -Dgnu.gcj.runtime.VMClassLoader.library_control=never -Dazureus.install.path=$APPDIR org.gudy.azureus2.ui.swt.Main "$@"
+# Reconstruct the plugins dir.
+rm -rf $APPDIR/plugins
+mkdir -p $APPDIR/plugins
+pushd $APPDIR/plugins
+for pdir in /usr/share/azureus/plugins/*; do
+  ln -s $pdir .;
+done;
+popd
+
+CLASSPATH=`build-classpath jakarta-commons-cli log4j swt-gtk-3.1.1 gtk2.8 glib0.2`:/usr/share/azureus/Azureus2.jar java -Dgnu.gcj.runtime.VMClassLoader.library_control=never -Dazureus.install.path=$APPDIR org.gudy.azureus2.ui.swt.Main "$@"


Index: azureus.spec
===================================================================
RCS file: /cvs/extras/rpms/azureus/devel/azureus.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- azureus.spec	9 Feb 2006 09:41:56 -0000	1.16
+++ azureus.spec	10 Feb 2006 17:00:46 -0000	1.17
@@ -1,6 +1,6 @@
 Name:           azureus
-Version:        2.3.0.7
-Release:        2.20060207cvs%{?dist}
+Version:        2.4.0.0
+Release:        0.20060209cvs%{?dist}
 Summary:        A BitTorrent Client
 
 Group:          Applications/Internet
@@ -9,7 +9,7 @@
 
 # A cvs snapshot with the build and bouncycastle directories
 # removed.
-Source0:        azureus2-cvs-20060207.tar.gz
+Source0:        azureus2-cvs-20060209.tar.gz
 
 Source1:        azureus.script
 Source2:        Azureus.desktop
@@ -17,6 +17,9 @@
 Source4:        azureus-License.txt
 Source5:        azureus-ChangeLog.txt
 
+Source6:	azplugins_1.8.8.jar
+Source7:	bdcc_2.2.2.zip
+
 Patch0:         azureus-remove-win32-osx-platforms.patch
 Patch1:         azureus-remove-win32-PlatformManagerUpdateChecker.patch
 Patch2:         azureus-cache-size.patch
@@ -28,6 +31,19 @@
 Patch8:         azureus-rh-bugzilla-180418.patch
 Patch9:         azureus-no-shared-plugins.patch
 Patch10:        azureus-no-install-remove-plugins.patch
+Patch11:        azureus-no-restart.patch
+Patch12:        azureus-no-updates-PluginInitializer.patch
+Patch13:        azureus-no-updates-PluginInterfaceImpl.patch
+Patch14:        azureus-no-update-manager-AzureusCoreImpl.patch
+Patch15:        azureus-no-update-manager-CorePatchChecker.patch
+Patch16:        azureus-no-update-manager-CoreUpdateChecker.patch
+Patch17:        azureus-no-update-manager-MainWindow.patch
+Patch18:        azureus-no-update-manager-PluginInstallerImpl.patch
+Patch19:        azureus-no-update-manager-PluginUpdatePlugin.patch
+Patch20:        azureus-no-update-manager-SWTUpdateChecker.patch
+#Patch21:        azureus-no-update-manager-TableView.patch
+Patch22:        azureus-no-update-manager-UpdateMonitor.patch
+Patch23:        azureus-no-update-manager-PluginInstallerImpl-2.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -62,6 +78,19 @@
 %patch8 -p0
 %patch9 -p0
 %patch10 -p0
+%patch11 -p0
+%patch12 -p0
+%patch13 -p0
+%patch14 -p0
+%patch15 -p0
+%patch16 -p0
+%patch17 -p0
+%patch18 -p0
+%patch19 -p0
+%patch20 -p0
+#%patch21 -p0
+%patch22 -p0
+%patch23 -p0
 cp %{SOURCE4} License.txt
 cp %{SOURCE5} ChangeLog.txt
 
@@ -74,15 +103,42 @@
 find ./ -name [Ww]in32\* | xargs rm -r
 # Remove test code
 rm org/gudy/azureus2/ui/swt/test/PrintTransferTypes.java
+
 ant jar
 
+mkdir -p plugins/azplugins
+cd plugins/azplugins
+unzip -q %{SOURCE6}
+rm -f *.jar `find ./ -name \*class`
+find ./ -name \*java | xargs javac -cp `build-classpath swt-gtk-3.1.1`:../..:.
+find ./ -name \*java | xargs rm
+jar cvf azplugins_1.8.8.jar .
+cd ../..
+
+unzip -q %{SOURCE7}
+cd plugins/bdcc
+unzip *.jar
+rm -f *.jar `find ./ -name \*class`
+find ./ -name \*java | xargs javac -cp `build-classpath swt-gtk-3.1.1`:../..:.
+find ./ -name \*java | xargs rm
+jar cvf bdcc_2.2.2.jar .
+cd ../..
+
 %install
 rm -rf $RPM_BUILD_ROOT
 
-install -dm 755 $RPM_BUILD_ROOT%{_javadir}
-install -pm 644 dist/Azureus2.jar $RPM_BUILD_ROOT%{_javadir}/Azureus2.jar
+install -dm 755 $RPM_BUILD_ROOT%{_datadir}/azureus/plugins
+install -pm 644 dist/Azureus2.jar $RPM_BUILD_ROOT%{_datadir}/azureus/Azureus2.jar
 install -p -D -m 0755 %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/azureus
 
+install -dm 755 $RPM_BUILD_ROOT%{_datadir}/azureus/plugins/azplugins
+install -pm 644 plugins/azplugins/azplugins_1.8.8.jar $RPM_BUILD_ROOT%{_datadir}/azureus/plugins/azplugins/azplugins_1.8.8.jar
+install -pm 644 plugins/azplugins/plugin.properties $RPM_BUILD_ROOT%{_datadir}/azureus/plugins/azplugins/plugin.properties
+
+install -dm 755 $RPM_BUILD_ROOT%{_datadir}/azureus/plugins/bdcc
+install -pm 644 plugins/bdcc/bdcc_2.2.2.jar $RPM_BUILD_ROOT%{_datadir}/azureus/plugins/bdcc/bdcc_2.2.2.jar
+install -pm 644 plugins/bdcc/plugin.properties $RPM_BUILD_ROOT%{_datadir}/azureus/plugins/bdcc/plugin.properties
+
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps
@@ -139,10 +195,17 @@
 %{_datadir}/icons/hicolor/32x32/apps/azureus.png
 %{_datadir}/icons/hicolor/64x64/apps/azureus.png
 %{_bindir}/azureus
-%{_javadir}/*.jar
+%{_datadir}/azureus
 %{_libdir}/gcj/*
 
 %changelog
+* Fri Feb 10 2006 Anthony Green <green at redhat.com> - 2.4.0.0-0.20060207cvs
+- Update cvs sources.  Boost version number.
+- Move all jar files to /usr/share/azureus.
+- Add azplugins and bdcc.
+- Remove update and restart menu items.
+- Disable all updating.
+
 * Thu Feb  9 2006 Anthony Green <green at redhat.com> - 2.3.0.7-2.20060207cvs
 - Add libgconf dependency.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/azureus/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	9 Feb 2006 08:45:07 -0000	1.3
+++ sources	10 Feb 2006 17:00:46 -0000	1.4
@@ -1 +1,3 @@
-e37850f30f7ff46d03b65bdf228c0025  azureus2-cvs-20060207.tar.gz
+28f136e1d99d8a0d0d04ef4398f782b4  azplugins_1.8.8.jar
+ed4b5f0e19ad6632198731baeb48aac5  azureus2-cvs-20060209.tar.gz
+0e88c3952b36ba221e277420a7080b43  bdcc_2.2.2.zip


