From 09e476c9ae64da67ca16f5114ca6f12127c0edd4 Mon Sep 17 00:00:00 2001 From: Doug MacEachern Date: Tue, 27 Jun 2006 12:44:52 +0000 Subject: [PATCH] rename net.hyperic.sigar -> org.hyperic.sigar --- bindings/java/build.xml | 18 +++++------ bindings/java/examples/ProcessState.java | 2 +- bindings/java/examples/ServiceStatus.java | 4 +-- bindings/java/src/jni/generate.pl | 6 ++-- bindings/java/src/jni/javasigar.h | 4 +-- bindings/java/src/jni/win32/win32bindings.h | 2 +- .../{net => org}/hyperic/sigar/CpuPerc.java | 2 +- .../{net => org}/hyperic/sigar/CpuTimer.java | 2 +- .../hyperic/sigar/CurrentProcessSummary.java | 4 +-- .../{net => org}/hyperic/sigar/FileInfo.java | 2 +- .../hyperic/sigar/FileSystemMap.java | 2 +- .../{net => org}/hyperic/sigar/FileTail.java | 2 +- .../hyperic/sigar/FileWatcher.java | 2 +- .../hyperic/sigar/FileWatcherThread.java | 2 +- .../hyperic/sigar/MultiProcCpu.java | 4 +-- .../hyperic/sigar/MultiProcMem.java | 4 +-- .../{net => org}/hyperic/sigar/NetFlags.java | 4 +-- .../hyperic/sigar/NetServices.java | 2 +- .../{net => org}/hyperic/sigar/NetStat.java | 2 +- .../hyperic/sigar/NfsFileSystem.java | 2 +- .../sigar/NfsUnreachableException.java | 2 +- .../hyperic/sigar/OperatingSystem.java | 2 +- .../{net => org}/hyperic/sigar/ProcCpu.java | 2 +- .../{net => org}/hyperic/sigar/ProcEnv.java | 6 ++-- .../{net => org}/hyperic/sigar/ProcUtil.java | 2 +- .../src/{net => org}/hyperic/sigar/RPC.java | 2 +- .../src/{net => org}/hyperic/sigar/Sigar.java | 4 +-- .../hyperic/sigar/SigarCacheObject.java | 2 +- .../hyperic/sigar/SigarException.java | 2 +- .../sigar/SigarFileNotFoundException.java | 2 +- .../hyperic/sigar/SigarInvoker.java | 2 +- .../hyperic/sigar/SigarLoader.java | 2 +- .../{net => org}/hyperic/sigar/SigarLog.java | 2 +- .../sigar/SigarNotImplementedException.java | 2 +- .../sigar/SigarPermissionDeniedException.java | 2 +- .../hyperic/sigar/SigarProxy.java | 2 +- .../hyperic/sigar/SigarProxyCache.java | 4 +-- .../hyperic/sigar/SigarVersion.java.in | 2 +- .../hyperic/sigar/SudoFileInputStream.java | 2 +- .../hyperic/sigar/cmd/CpuInfo.java | 12 +++---- .../{net => org}/hyperic/sigar/cmd/Df.java | 18 +++++------ .../{net => org}/hyperic/sigar/cmd/Du.java | 6 ++-- .../{net => org}/hyperic/sigar/cmd/Free.java | 8 ++--- .../hyperic/sigar/cmd/Ifconfig.java | 12 +++---- .../hyperic/sigar/cmd/Iostat.java | 16 +++++----- .../{net => org}/hyperic/sigar/cmd/Kill.java | 4 +-- .../hyperic/sigar/cmd/MemWatch.java | 6 ++-- .../hyperic/sigar/cmd/MultiPs.java | 12 +++---- .../hyperic/sigar/cmd/NetInfo.java | 6 ++-- .../hyperic/sigar/cmd/Netstat.java | 10 +++--- .../{net => org}/hyperic/sigar/cmd/PTQL.java | 24 +++++++------- .../hyperic/sigar/cmd/ProcFileInfo.java | 10 +++--- .../hyperic/sigar/cmd/ProcInfo.java | 6 ++-- .../hyperic/sigar/cmd/ProcModuleInfo.java | 6 ++-- .../sigar/cmd/ProcessQueryGenerate.java | 6 ++-- .../{net => org}/hyperic/sigar/cmd/Ps.java | 18 +++++------ .../{net => org}/hyperic/sigar/cmd/Route.java | 8 ++--- .../hyperic/sigar/cmd/Runner.java | 14 ++++---- .../{net => org}/hyperic/sigar/cmd/Shell.java | 32 +++++++++---------- .../hyperic/sigar/cmd/ShowArgs.java | 6 ++-- .../hyperic/sigar/cmd/ShowEnv.java | 4 +-- .../hyperic/sigar/cmd/SigarCommandBase.java | 26 +++++++-------- .../hyperic/sigar/cmd/SysInfo.java | 4 +-- .../{net => org}/hyperic/sigar/cmd/Tail.java | 12 +++---- .../{net => org}/hyperic/sigar/cmd/Time.java | 6 ++-- .../{net => org}/hyperic/sigar/cmd/Top.java | 18 +++++------ .../hyperic/sigar/cmd/Ulimit.java | 8 ++--- .../hyperic/sigar/cmd/Uptime.java | 10 +++--- .../hyperic/sigar/cmd/Version.java | 10 +++--- .../{net => org}/hyperic/sigar/cmd/Watch.java | 14 ++++---- .../{net => org}/hyperic/sigar/cmd/Who.java | 6 ++-- .../hyperic/sigar/cmd/Win32Service.java | 8 ++--- .../hyperic/sigar/cmd/package.html | 0 .../hyperic/sigar/jmx/SigarInvokerJMX.java | 12 +++---- .../hyperic/sigar/jmx/SigarProcess.java | 16 +++++----- .../hyperic/sigar/jmx/SigarProcessMBean.java | 2 +- .../{net => org}/hyperic/sigar/package.html | 0 .../sigar/pager/DefaultPagerProcessor.java | 2 +- .../hyperic/sigar/pager/ListPageFetcher.java | 2 +- .../hyperic/sigar/pager/PageControl.java | 2 +- .../sigar/pager/PageFetchException.java | 2 +- .../hyperic/sigar/pager/PageFetcher.java | 2 +- .../hyperic/sigar/pager/PageList.java | 2 +- .../hyperic/sigar/pager/Pager.java | 4 +-- .../sigar/pager/PagerEventHandler.java | 2 +- .../hyperic/sigar/pager/PagerProcessor.java | 2 +- .../sigar/pager/PagerProcessorExt.java | 2 +- .../hyperic/sigar/pager/SortAttribute.java | 2 +- .../sigar/pager/StaticPageFetcher.java | 2 +- .../sigar/ptql/MalformedQueryException.java | 2 +- .../hyperic/sigar/ptql/PidFileQuery.java | 4 +-- .../hyperic/sigar/ptql/PidQuery.java | 6 ++-- .../hyperic/sigar/ptql/ProcessFinder.java | 12 +++---- .../hyperic/sigar/ptql/ProcessQuery.java | 6 ++-- .../sigar/ptql/ProcessQueryBuilder.java | 10 +++--- .../sigar/ptql/ProcessQueryClassLoader.java | 2 +- .../sigar/ptql/ProcessQueryFactory.java | 4 +-- .../sigar/ptql/ProcessQueryGenerator.java | 10 +++--- .../sigar/ptql/ProcessQueryHelper.java | 8 ++--- .../hyperic/sigar/ptql/QueryBranch.java | 2 +- .../hyperic/sigar/ptql/QueryBranchMap.java | 2 +- .../sigar/ptql/QueryLoadException.java | 2 +- .../hyperic/sigar/ptql/StringOp.java | 2 +- .../hyperic/sigar/ptql/StringPattern.java | 4 +-- .../sigar/ptql/WindowsServiceQuery.java | 8 ++--- .../hyperic/sigar/ptql/package.html | 0 .../sigar/shell/CollectionCompleter.java | 4 +-- .../hyperic/sigar/shell/FileCompleter.java | 4 +-- .../sigar/shell/MultiwordShellCommand.java | 4 +-- .../shell/NormalQuitCommandException.java | 2 +- .../hyperic/sigar/shell/SIGINT.java | 2 +- .../hyperic/sigar/shell/ShellBase.java | 18 +++++------ .../hyperic/sigar/shell/ShellCommandBase.java | 2 +- .../shell/ShellCommandExecException.java | 2 +- .../sigar/shell/ShellCommandHandler.java | 2 +- .../shell/ShellCommandInitException.java | 2 +- .../sigar/shell/ShellCommandMapper.java | 2 +- .../shell/ShellCommandUsageException.java | 2 +- .../sigar/shell/ShellCommand_alias.java | 2 +- .../hyperic/sigar/shell/ShellCommand_get.java | 2 +- .../sigar/shell/ShellCommand_help.java | 4 +-- .../sigar/shell/ShellCommand_quit.java | 2 +- .../hyperic/sigar/shell/ShellCommand_set.java | 2 +- .../sigar/shell/ShellCommand_sleep.java | 2 +- .../sigar/shell/ShellCommand_source.java | 4 +-- .../hyperic/sigar/shell/ShellIntHandler.java | 2 +- .../hyperic/sigar/shell/package.html | 0 .../hyperic/sigar/test/GetPass.java | 4 +-- .../hyperic/sigar/test/Proxy.java | 16 +++++----- .../hyperic/sigar/test/RunThreadCpu.java | 8 ++--- .../hyperic/sigar/test/SigarTestCase.java | 4 +-- .../hyperic/sigar/test/SigarTestPrinter.java | 4 +-- .../hyperic/sigar/test/SigarTestRunner.java | 20 ++++++------ .../hyperic/sigar/test/TestCpu.java | 12 +++---- .../hyperic/sigar/test/TestCpuInfo.java | 6 ++-- .../hyperic/sigar/test/TestFQDN.java | 2 +- .../hyperic/sigar/test/TestFileInfo.java | 12 +++---- .../hyperic/sigar/test/TestFileSystem.java | 12 +++---- .../hyperic/sigar/test/TestInvoker.java | 14 ++++---- .../hyperic/sigar/test/TestLoadAverage.java | 6 ++-- .../hyperic/sigar/test/TestLog.java | 4 +-- .../hyperic/sigar/test/TestMem.java | 6 ++-- .../hyperic/sigar/test/TestNetIf.java | 14 ++++---- .../hyperic/sigar/test/TestNetInfo.java | 6 ++-- .../hyperic/sigar/test/TestNetRoute.java | 8 ++--- .../hyperic/sigar/test/TestNetStat.java | 12 +++---- .../hyperic/sigar/test/TestPTQL.java | 20 ++++++------ .../hyperic/sigar/test/TestProcArgs.java | 8 ++--- .../hyperic/sigar/test/TestProcEnv.java | 10 +++--- .../hyperic/sigar/test/TestProcExe.java | 10 +++--- .../hyperic/sigar/test/TestProcFd.java | 12 +++---- .../hyperic/sigar/test/TestProcList.java | 4 +-- .../hyperic/sigar/test/TestProcMem.java | 8 ++--- .../hyperic/sigar/test/TestProcModules.java | 8 ++--- .../hyperic/sigar/test/TestProcStat.java | 6 ++-- .../hyperic/sigar/test/TestProcState.java | 8 ++--- .../hyperic/sigar/test/TestProcTime.java | 8 ++--- .../hyperic/sigar/test/TestResourceLimit.java | 6 ++-- .../hyperic/sigar/test/TestSwap.java | 6 ++-- .../hyperic/sigar/test/TestThreadCpu.java | 10 +++--- .../hyperic/sigar/test/TestThreads.java | 12 +++---- .../hyperic/sigar/test/TestUptime.java | 6 ++-- .../hyperic/sigar/test/TestWho.java | 8 ++--- .../hyperic/sigar/util/Getline.java | 2 +- .../hyperic/sigar/util/GetlineCompleter.java | 2 +- .../hyperic/sigar/util/IteratorIterator.java | 2 +- .../hyperic/sigar/util/PrintfFormat.java | 2 +- .../hyperic/sigar/util/ReferenceMap.java | 4 +-- .../hyperic/sigar/util/WeakReferenceMap.java | 2 +- .../hyperic/sigar/util/package.html | 0 .../hyperic/sigar/win32/EventLog.java | 2 +- .../sigar/win32/EventLogNotification.java | 2 +- .../hyperic/sigar/win32/EventLogRecord.java | 2 +- .../hyperic/sigar/win32/EventLogThread.java | 2 +- .../hyperic/sigar/win32/MetaBase.java | 2 +- .../{net => org}/hyperic/sigar/win32/Pdh.java | 2 +- .../hyperic/sigar/win32/RegistryKey.java | 2 +- .../hyperic/sigar/win32/Service.java | 2 +- .../hyperic/sigar/win32/ServiceConfig.java | 2 +- .../hyperic/sigar/win32/Win32.java | 6 ++-- .../hyperic/sigar/win32/Win32Exception.java | 4 +-- .../sigar/win32/test/TestEventLog.java | 14 ++++---- .../sigar/win32/test/TestMetaBase.java | 2 +- .../hyperic/sigar/win32/test/TestPdh.java | 6 ++-- .../sigar/win32/test/TestRegistryKey.java | 4 +-- .../hyperic/sigar/win32/test/TestService.java | 10 +++--- 186 files changed, 544 insertions(+), 544 deletions(-) rename bindings/java/src/{net => org}/hyperic/sigar/CpuPerc.java (98%) rename bindings/java/src/{net => org}/hyperic/sigar/CpuTimer.java (99%) rename bindings/java/src/{net => org}/hyperic/sigar/CurrentProcessSummary.java (96%) rename bindings/java/src/{net => org}/hyperic/sigar/FileInfo.java (99%) rename bindings/java/src/{net => org}/hyperic/sigar/FileSystemMap.java (98%) rename bindings/java/src/{net => org}/hyperic/sigar/FileTail.java (98%) rename bindings/java/src/{net => org}/hyperic/sigar/FileWatcher.java (99%) rename bindings/java/src/{net => org}/hyperic/sigar/FileWatcherThread.java (98%) rename bindings/java/src/{net => org}/hyperic/sigar/MultiProcCpu.java (96%) rename bindings/java/src/{net => org}/hyperic/sigar/MultiProcMem.java (87%) rename bindings/java/src/{net => org}/hyperic/sigar/NetFlags.java (98%) rename bindings/java/src/{net => org}/hyperic/sigar/NetServices.java (99%) rename bindings/java/src/{net => org}/hyperic/sigar/NetStat.java (99%) rename bindings/java/src/{net => org}/hyperic/sigar/NfsFileSystem.java (98%) rename bindings/java/src/{net => org}/hyperic/sigar/NfsUnreachableException.java (87%) rename bindings/java/src/{net => org}/hyperic/sigar/OperatingSystem.java (99%) rename bindings/java/src/{net => org}/hyperic/sigar/ProcCpu.java (98%) rename bindings/java/src/{net => org}/hyperic/sigar/ProcEnv.java (85%) rename bindings/java/src/{net => org}/hyperic/sigar/ProcUtil.java (99%) rename bindings/java/src/{net => org}/hyperic/sigar/RPC.java (98%) rename bindings/java/src/{net => org}/hyperic/sigar/Sigar.java (99%) rename bindings/java/src/{net => org}/hyperic/sigar/SigarCacheObject.java (74%) rename bindings/java/src/{net => org}/hyperic/sigar/SigarException.java (87%) rename bindings/java/src/{net => org}/hyperic/sigar/SigarFileNotFoundException.java (82%) rename bindings/java/src/{net => org}/hyperic/sigar/SigarInvoker.java (99%) rename bindings/java/src/{net => org}/hyperic/sigar/SigarLoader.java (98%) rename bindings/java/src/{net => org}/hyperic/sigar/SigarLog.java (98%) rename bindings/java/src/{net => org}/hyperic/sigar/SigarNotImplementedException.java (95%) rename bindings/java/src/{net => org}/hyperic/sigar/SigarPermissionDeniedException.java (96%) rename bindings/java/src/{net => org}/hyperic/sigar/SigarProxy.java (99%) rename bindings/java/src/{net => org}/hyperic/sigar/SigarProxyCache.java (98%) rename bindings/java/src/{net => org}/hyperic/sigar/SigarVersion.java.in (84%) rename bindings/java/src/{net => org}/hyperic/sigar/SudoFileInputStream.java (98%) rename bindings/java/src/{net => org}/hyperic/sigar/cmd/CpuInfo.java (88%) rename bindings/java/src/{net => org}/hyperic/sigar/cmd/Df.java (90%) rename bindings/java/src/{net => org}/hyperic/sigar/cmd/Du.java (87%) rename bindings/java/src/{net => org}/hyperic/sigar/cmd/Free.java (92%) rename bindings/java/src/{net => org}/hyperic/sigar/cmd/Ifconfig.java (94%) rename bindings/java/src/{net => org}/hyperic/sigar/cmd/Iostat.java (90%) rename bindings/java/src/{net => org}/hyperic/sigar/cmd/Kill.java (95%) rename bindings/java/src/{net => org}/hyperic/sigar/cmd/MemWatch.java (94%) rename bindings/java/src/{net => org}/hyperic/sigar/cmd/MultiPs.java (85%) rename bindings/java/src/{net => org}/hyperic/sigar/cmd/NetInfo.java (89%) rename bindings/java/src/{net => org}/hyperic/sigar/cmd/Netstat.java (96%) rename bindings/java/src/{net => org}/hyperic/sigar/cmd/PTQL.java (88%) rename bindings/java/src/{net => org}/hyperic/sigar/cmd/ProcFileInfo.java (88%) rename bindings/java/src/{net => org}/hyperic/sigar/cmd/ProcInfo.java (92%) rename bindings/java/src/{net => org}/hyperic/sigar/cmd/ProcModuleInfo.java (91%) rename bindings/java/src/{net => org}/hyperic/sigar/cmd/ProcessQueryGenerate.java (90%) rename bindings/java/src/{net => org}/hyperic/sigar/cmd/Ps.java (91%) rename bindings/java/src/{net => org}/hyperic/sigar/cmd/Route.java (92%) rename bindings/java/src/{net => org}/hyperic/sigar/cmd/Runner.java (95%) rename bindings/java/src/{net => org}/hyperic/sigar/cmd/Shell.java (89%) rename bindings/java/src/{net => org}/hyperic/sigar/cmd/ShowArgs.java (93%) rename bindings/java/src/{net => org}/hyperic/sigar/cmd/ShowEnv.java (94%) rename bindings/java/src/{net => org}/hyperic/sigar/cmd/SigarCommandBase.java (89%) rename bindings/java/src/{net => org}/hyperic/sigar/cmd/SysInfo.java (94%) rename bindings/java/src/{net => org}/hyperic/sigar/cmd/Tail.java (87%) rename bindings/java/src/{net => org}/hyperic/sigar/cmd/Time.java (92%) rename bindings/java/src/{net => org}/hyperic/sigar/cmd/Top.java (83%) rename bindings/java/src/{net => org}/hyperic/sigar/cmd/Ulimit.java (93%) rename bindings/java/src/{net => org}/hyperic/sigar/cmd/Uptime.java (91%) rename bindings/java/src/{net => org}/hyperic/sigar/cmd/Version.java (94%) rename bindings/java/src/{net => org}/hyperic/sigar/cmd/Watch.java (94%) rename bindings/java/src/{net => org}/hyperic/sigar/cmd/Who.java (88%) rename bindings/java/src/{net => org}/hyperic/sigar/cmd/Win32Service.java (93%) rename bindings/java/src/{net => org}/hyperic/sigar/cmd/package.html (100%) rename bindings/java/src/{net => org}/hyperic/sigar/jmx/SigarInvokerJMX.java (94%) rename bindings/java/src/{net => org}/hyperic/sigar/jmx/SigarProcess.java (90%) rename bindings/java/src/{net => org}/hyperic/sigar/jmx/SigarProcessMBean.java (93%) rename bindings/java/src/{net => org}/hyperic/sigar/package.html (100%) rename bindings/java/src/{net => org}/hyperic/sigar/pager/DefaultPagerProcessor.java (95%) rename bindings/java/src/{net => org}/hyperic/sigar/pager/ListPageFetcher.java (98%) rename bindings/java/src/{net => org}/hyperic/sigar/pager/PageControl.java (99%) rename bindings/java/src/{net => org}/hyperic/sigar/pager/PageFetchException.java (84%) rename bindings/java/src/{net => org}/hyperic/sigar/pager/PageFetcher.java (91%) rename bindings/java/src/{net => org}/hyperic/sigar/pager/PageList.java (98%) rename bindings/java/src/{net => org}/hyperic/sigar/pager/Pager.java (99%) rename bindings/java/src/{net => org}/hyperic/sigar/pager/PagerEventHandler.java (91%) rename bindings/java/src/{net => org}/hyperic/sigar/pager/PagerProcessor.java (94%) rename bindings/java/src/{net => org}/hyperic/sigar/pager/PagerProcessorExt.java (97%) rename bindings/java/src/{net => org}/hyperic/sigar/pager/SortAttribute.java (98%) rename bindings/java/src/{net => org}/hyperic/sigar/pager/StaticPageFetcher.java (97%) rename bindings/java/src/{net => org}/hyperic/sigar/ptql/MalformedQueryException.java (89%) rename bindings/java/src/{net => org}/hyperic/sigar/ptql/PidFileQuery.java (95%) rename bindings/java/src/{net => org}/hyperic/sigar/ptql/PidQuery.java (80%) rename bindings/java/src/{net => org}/hyperic/sigar/ptql/ProcessFinder.java (94%) rename bindings/java/src/{net => org}/hyperic/sigar/ptql/ProcessQuery.java (52%) rename bindings/java/src/{net => org}/hyperic/sigar/ptql/ProcessQueryBuilder.java (99%) rename bindings/java/src/{net => org}/hyperic/sigar/ptql/ProcessQueryClassLoader.java (94%) rename bindings/java/src/{net => org}/hyperic/sigar/ptql/ProcessQueryFactory.java (98%) rename bindings/java/src/{net => org}/hyperic/sigar/ptql/ProcessQueryGenerator.java (90%) rename bindings/java/src/{net => org}/hyperic/sigar/ptql/ProcessQueryHelper.java (95%) rename bindings/java/src/{net => org}/hyperic/sigar/ptql/QueryBranch.java (97%) rename bindings/java/src/{net => org}/hyperic/sigar/ptql/QueryBranchMap.java (89%) rename bindings/java/src/{net => org}/hyperic/sigar/ptql/QueryLoadException.java (89%) rename bindings/java/src/{net => org}/hyperic/sigar/ptql/StringOp.java (93%) rename bindings/java/src/{net => org}/hyperic/sigar/ptql/StringPattern.java (96%) rename bindings/java/src/{net => org}/hyperic/sigar/ptql/WindowsServiceQuery.java (77%) rename bindings/java/src/{net => org}/hyperic/sigar/ptql/package.html (100%) rename bindings/java/src/{net => org}/hyperic/sigar/shell/CollectionCompleter.java (97%) rename bindings/java/src/{net => org}/hyperic/sigar/shell/FileCompleter.java (97%) rename bindings/java/src/{net => org}/hyperic/sigar/shell/MultiwordShellCommand.java (98%) rename bindings/java/src/{net => org}/hyperic/sigar/shell/NormalQuitCommandException.java (86%) rename bindings/java/src/{net => org}/hyperic/sigar/shell/SIGINT.java (65%) rename bindings/java/src/{net => org}/hyperic/sigar/shell/ShellBase.java (98%) rename bindings/java/src/{net => org}/hyperic/sigar/shell/ShellCommandBase.java (97%) rename bindings/java/src/{net => org}/hyperic/sigar/shell/ShellCommandExecException.java (84%) rename bindings/java/src/{net => org}/hyperic/sigar/shell/ShellCommandHandler.java (97%) rename bindings/java/src/{net => org}/hyperic/sigar/shell/ShellCommandInitException.java (84%) rename bindings/java/src/{net => org}/hyperic/sigar/shell/ShellCommandMapper.java (90%) rename bindings/java/src/{net => org}/hyperic/sigar/shell/ShellCommandUsageException.java (84%) rename bindings/java/src/{net => org}/hyperic/sigar/shell/ShellCommand_alias.java (97%) rename bindings/java/src/{net => org}/hyperic/sigar/shell/ShellCommand_get.java (96%) rename bindings/java/src/{net => org}/hyperic/sigar/shell/ShellCommand_help.java (97%) rename bindings/java/src/{net => org}/hyperic/sigar/shell/ShellCommand_quit.java (92%) rename bindings/java/src/{net => org}/hyperic/sigar/shell/ShellCommand_set.java (98%) rename bindings/java/src/{net => org}/hyperic/sigar/shell/ShellCommand_sleep.java (96%) rename bindings/java/src/{net => org}/hyperic/sigar/shell/ShellCommand_source.java (95%) rename bindings/java/src/{net => org}/hyperic/sigar/shell/ShellIntHandler.java (97%) rename bindings/java/src/{net => org}/hyperic/sigar/shell/package.html (100%) rename bindings/java/src/{net => org}/hyperic/sigar/test/GetPass.java (84%) rename bindings/java/src/{net => org}/hyperic/sigar/test/Proxy.java (97%) rename bindings/java/src/{net => org}/hyperic/sigar/test/RunThreadCpu.java (96%) rename bindings/java/src/{net => org}/hyperic/sigar/test/SigarTestCase.java (97%) rename bindings/java/src/{net => org}/hyperic/sigar/test/SigarTestPrinter.java (98%) rename bindings/java/src/{net => org}/hyperic/sigar/test/SigarTestRunner.java (85%) rename bindings/java/src/{net => org}/hyperic/sigar/test/TestCpu.java (91%) rename bindings/java/src/{net => org}/hyperic/sigar/test/TestCpuInfo.java (88%) rename bindings/java/src/{net => org}/hyperic/sigar/test/TestFQDN.java (96%) rename bindings/java/src/{net => org}/hyperic/sigar/test/TestFileInfo.java (94%) rename bindings/java/src/{net => org}/hyperic/sigar/test/TestFileSystem.java (90%) rename bindings/java/src/{net => org}/hyperic/sigar/test/TestInvoker.java (91%) rename bindings/java/src/{net => org}/hyperic/sigar/test/TestLoadAverage.java (82%) rename bindings/java/src/{net => org}/hyperic/sigar/test/TestLog.java (83%) rename bindings/java/src/{net => org}/hyperic/sigar/test/TestMem.java (86%) rename bindings/java/src/{net => org}/hyperic/sigar/test/TestNetIf.java (89%) rename bindings/java/src/{net => org}/hyperic/sigar/test/TestNetInfo.java (68%) rename bindings/java/src/{net => org}/hyperic/sigar/test/TestNetRoute.java (75%) rename bindings/java/src/{net => org}/hyperic/sigar/test/TestNetStat.java (84%) rename bindings/java/src/{net => org}/hyperic/sigar/test/TestPTQL.java (91%) rename bindings/java/src/{net => org}/hyperic/sigar/test/TestProcArgs.java (91%) rename bindings/java/src/{net => org}/hyperic/sigar/test/TestProcEnv.java (84%) rename bindings/java/src/{net => org}/hyperic/sigar/test/TestProcExe.java (90%) rename bindings/java/src/{net => org}/hyperic/sigar/test/TestProcFd.java (80%) rename bindings/java/src/{net => org}/hyperic/sigar/test/TestProcList.java (91%) rename bindings/java/src/{net => org}/hyperic/sigar/test/TestProcMem.java (89%) rename bindings/java/src/{net => org}/hyperic/sigar/test/TestProcModules.java (87%) rename bindings/java/src/{net => org}/hyperic/sigar/test/TestProcStat.java (85%) rename bindings/java/src/{net => org}/hyperic/sigar/test/TestProcState.java (88%) rename bindings/java/src/{net => org}/hyperic/sigar/test/TestProcTime.java (85%) rename bindings/java/src/{net => org}/hyperic/sigar/test/TestResourceLimit.java (69%) rename bindings/java/src/{net => org}/hyperic/sigar/test/TestSwap.java (85%) rename bindings/java/src/{net => org}/hyperic/sigar/test/TestThreadCpu.java (82%) rename bindings/java/src/{net => org}/hyperic/sigar/test/TestThreads.java (91%) rename bindings/java/src/{net => org}/hyperic/sigar/test/TestUptime.java (75%) rename bindings/java/src/{net => org}/hyperic/sigar/test/TestWho.java (68%) rename bindings/java/src/{net => org}/hyperic/sigar/util/Getline.java (98%) rename bindings/java/src/{net => org}/hyperic/sigar/util/GetlineCompleter.java (71%) rename bindings/java/src/{net => org}/hyperic/sigar/util/IteratorIterator.java (97%) rename bindings/java/src/{net => org}/hyperic/sigar/util/PrintfFormat.java (99%) rename bindings/java/src/{net => org}/hyperic/sigar/util/ReferenceMap.java (96%) rename bindings/java/src/{net => org}/hyperic/sigar/util/WeakReferenceMap.java (87%) rename bindings/java/src/{net => org}/hyperic/sigar/util/package.html (100%) rename bindings/java/src/{net => org}/hyperic/sigar/win32/EventLog.java (99%) rename bindings/java/src/{net => org}/hyperic/sigar/win32/EventLogNotification.java (91%) rename bindings/java/src/{net => org}/hyperic/sigar/win32/EventLogRecord.java (98%) rename bindings/java/src/{net => org}/hyperic/sigar/win32/EventLogThread.java (99%) rename bindings/java/src/{net => org}/hyperic/sigar/win32/MetaBase.java (99%) rename bindings/java/src/{net => org}/hyperic/sigar/win32/Pdh.java (99%) rename bindings/java/src/{net => org}/hyperic/sigar/win32/RegistryKey.java (99%) rename bindings/java/src/{net => org}/hyperic/sigar/win32/Service.java (99%) rename bindings/java/src/{net => org}/hyperic/sigar/win32/ServiceConfig.java (99%) rename bindings/java/src/{net => org}/hyperic/sigar/win32/Win32.java (94%) rename bindings/java/src/{net => org}/hyperic/sigar/win32/Win32Exception.java (80%) rename bindings/java/src/{net => org}/hyperic/sigar/win32/test/TestEventLog.java (92%) rename bindings/java/src/{net => org}/hyperic/sigar/win32/test/TestMetaBase.java (92%) rename bindings/java/src/{net => org}/hyperic/sigar/win32/test/TestPdh.java (90%) rename bindings/java/src/{net => org}/hyperic/sigar/win32/test/TestRegistryKey.java (94%) rename bindings/java/src/{net => org}/hyperic/sigar/win32/test/TestService.java (88%) diff --git a/bindings/java/build.xml b/bindings/java/build.xml index aae05d62..712559db 100644 --- a/bindings/java/build.xml +++ b/bindings/java/build.xml @@ -59,8 +59,8 @@ - - + - Copyright © ${copyright.year} Hyperic, LLC]]>. All Rights Reserved. + Copyright © ${copyright.year} Hyperic]]>. All Rights Reserved. @@ -118,7 +118,7 @@ + value="src/org/hyperic/sigar/SigarVersion.java"/> @@ -263,7 +263,7 @@ + value="org.hyperic.sigar.cmd.Runner"/> @@ -291,8 +291,8 @@ - - + + @@ -395,7 +395,7 @@ - + diff --git a/bindings/java/examples/ProcessState.java b/bindings/java/examples/ProcessState.java index aaaecb28..bf378468 100644 --- a/bindings/java/examples/ProcessState.java +++ b/bindings/java/examples/ProcessState.java @@ -1,4 +1,4 @@ -import net.hyperic.sigar.*; +import org.hyperic.sigar.*; /* diff --git a/bindings/java/examples/ServiceStatus.java b/bindings/java/examples/ServiceStatus.java index a2d43601..37c9df5e 100644 --- a/bindings/java/examples/ServiceStatus.java +++ b/bindings/java/examples/ServiceStatus.java @@ -1,7 +1,7 @@ import java.util.Arrays; import java.util.List; -import net.hyperic.sigar.win32.Service; -import net.hyperic.sigar.win32.Win32Exception; +import org.hyperic.sigar.win32.Service; +import org.hyperic.sigar.win32.Win32Exception; /* diff --git a/bindings/java/src/jni/generate.pl b/bindings/java/src/jni/generate.pl index 9d65e0a9..90b13757 100644 --- a/bindings/java/src/jni/generate.pl +++ b/bindings/java/src/jni/generate.pl @@ -1,7 +1,7 @@ use strict; use File::Path; -my $package = 'net.hyperic.sigar'; +my $package = 'org.hyperic.sigar'; my %platforms = ( A => "AIX", @@ -1122,7 +1122,7 @@ print "generating $cfile\n"; chdir $build_src; -my $jsrc = 'net/hyperic/sigar'; +my $jsrc = 'org/hyperic/sigar'; mkpath([$jsrc], 0, 0755) unless -d $jsrc; open CFH, ">$cfile" or die "open $cfile: $!"; @@ -1547,7 +1547,7 @@ my $jsigar = "../../src/jni/javasigar.c"; open JSIGAR, $jsigar or die "open $jsigar: $!"; while () { next unless /SIGAR_JNI\(([A-Za-z_]+)\)/; - print DFH "Java_net_hyperic_sigar_$1\n"; + print DFH "Java_org_hyperic_sigar_$1\n"; } close CFH; diff --git a/bindings/java/src/jni/javasigar.h b/bindings/java/src/jni/javasigar.h index 69b36ab1..ddee2610 100644 --- a/bindings/java/src/jni/javasigar.h +++ b/bindings/java/src/jni/javasigar.h @@ -1,8 +1,8 @@ #define JENV (*env) -#define SIGAR_PACKAGE "net/hyperic/sigar/" +#define SIGAR_PACKAGE "org/hyperic/sigar/" -#define SIGAR_JNI(m) JNICALL Java_net_hyperic_sigar_##m +#define SIGAR_JNI(m) JNICALL Java_org_hyperic_sigar_##m #define SIGAR_FIND_CLASS(name) \ JENV->FindClass(env, SIGAR_PACKAGE name) diff --git a/bindings/java/src/jni/win32/win32bindings.h b/bindings/java/src/jni/win32/win32bindings.h index 190336db..68017a37 100644 --- a/bindings/java/src/jni/win32/win32bindings.h +++ b/bindings/java/src/jni/win32/win32bindings.h @@ -12,7 +12,7 @@ /* Include java jni headers */ #include -#define WIN32_PACKAGE "net/hyperic/sigar/win32/" +#define WIN32_PACKAGE "org/hyperic/sigar/win32/" #define WIN32_FIND_CLASS(name) \ JENV->FindClass(env, WIN32_PACKAGE name) diff --git a/bindings/java/src/net/hyperic/sigar/CpuPerc.java b/bindings/java/src/org/hyperic/sigar/CpuPerc.java similarity index 98% rename from bindings/java/src/net/hyperic/sigar/CpuPerc.java rename to bindings/java/src/org/hyperic/sigar/CpuPerc.java index cbc227a2..6eecc8d4 100644 --- a/bindings/java/src/net/hyperic/sigar/CpuPerc.java +++ b/bindings/java/src/org/hyperic/sigar/CpuPerc.java @@ -1,4 +1,4 @@ -package net.hyperic.sigar; +package org.hyperic.sigar; /** * CPU percentage usage diff --git a/bindings/java/src/net/hyperic/sigar/CpuTimer.java b/bindings/java/src/org/hyperic/sigar/CpuTimer.java similarity index 99% rename from bindings/java/src/net/hyperic/sigar/CpuTimer.java rename to bindings/java/src/org/hyperic/sigar/CpuTimer.java index 7b25de34..992a299a 100644 --- a/bindings/java/src/net/hyperic/sigar/CpuTimer.java +++ b/bindings/java/src/org/hyperic/sigar/CpuTimer.java @@ -1,4 +1,4 @@ -package net.hyperic.sigar; +package org.hyperic.sigar; import java.io.PrintStream; diff --git a/bindings/java/src/net/hyperic/sigar/CurrentProcessSummary.java b/bindings/java/src/org/hyperic/sigar/CurrentProcessSummary.java similarity index 96% rename from bindings/java/src/net/hyperic/sigar/CurrentProcessSummary.java rename to bindings/java/src/org/hyperic/sigar/CurrentProcessSummary.java index 711a4417..85f47493 100644 --- a/bindings/java/src/net/hyperic/sigar/CurrentProcessSummary.java +++ b/bindings/java/src/org/hyperic/sigar/CurrentProcessSummary.java @@ -1,8 +1,8 @@ -package net.hyperic.sigar; +package org.hyperic.sigar; /** * This class provides a summary of current process states. - * @see net.hyperic.sigar.cmd.Top + * @see org.hyperic.sigar.cmd.Top */ public class CurrentProcessSummary { private int total=0, sleeping=0, running=0, zombie=0, stopped=0; diff --git a/bindings/java/src/net/hyperic/sigar/FileInfo.java b/bindings/java/src/org/hyperic/sigar/FileInfo.java similarity index 99% rename from bindings/java/src/net/hyperic/sigar/FileInfo.java rename to bindings/java/src/org/hyperic/sigar/FileInfo.java index 05f0bc56..c087c3d3 100644 --- a/bindings/java/src/net/hyperic/sigar/FileInfo.java +++ b/bindings/java/src/org/hyperic/sigar/FileInfo.java @@ -1,4 +1,4 @@ -package net.hyperic.sigar; +package org.hyperic.sigar; import java.text.SimpleDateFormat; import java.util.ArrayList; diff --git a/bindings/java/src/net/hyperic/sigar/FileSystemMap.java b/bindings/java/src/org/hyperic/sigar/FileSystemMap.java similarity index 98% rename from bindings/java/src/net/hyperic/sigar/FileSystemMap.java rename to bindings/java/src/org/hyperic/sigar/FileSystemMap.java index 3a08e012..4d7f5f65 100644 --- a/bindings/java/src/net/hyperic/sigar/FileSystemMap.java +++ b/bindings/java/src/org/hyperic/sigar/FileSystemMap.java @@ -1,4 +1,4 @@ -package net.hyperic.sigar; +package org.hyperic.sigar; import java.util.HashMap; diff --git a/bindings/java/src/net/hyperic/sigar/FileTail.java b/bindings/java/src/org/hyperic/sigar/FileTail.java similarity index 98% rename from bindings/java/src/net/hyperic/sigar/FileTail.java rename to bindings/java/src/org/hyperic/sigar/FileTail.java index 36be4ffe..2f64c32d 100644 --- a/bindings/java/src/net/hyperic/sigar/FileTail.java +++ b/bindings/java/src/org/hyperic/sigar/FileTail.java @@ -1,4 +1,4 @@ -package net.hyperic.sigar; +package org.hyperic.sigar; import java.io.FileReader; import java.io.IOException; diff --git a/bindings/java/src/net/hyperic/sigar/FileWatcher.java b/bindings/java/src/org/hyperic/sigar/FileWatcher.java similarity index 99% rename from bindings/java/src/net/hyperic/sigar/FileWatcher.java rename to bindings/java/src/org/hyperic/sigar/FileWatcher.java index 2ad3ec75..ae2ab1a8 100644 --- a/bindings/java/src/net/hyperic/sigar/FileWatcher.java +++ b/bindings/java/src/org/hyperic/sigar/FileWatcher.java @@ -1,4 +1,4 @@ -package net.hyperic.sigar; +package org.hyperic.sigar; import java.io.File; diff --git a/bindings/java/src/net/hyperic/sigar/FileWatcherThread.java b/bindings/java/src/org/hyperic/sigar/FileWatcherThread.java similarity index 98% rename from bindings/java/src/net/hyperic/sigar/FileWatcherThread.java rename to bindings/java/src/org/hyperic/sigar/FileWatcherThread.java index f8cc5ec2..60e6e0fd 100644 --- a/bindings/java/src/net/hyperic/sigar/FileWatcherThread.java +++ b/bindings/java/src/org/hyperic/sigar/FileWatcherThread.java @@ -1,4 +1,4 @@ -package net.hyperic.sigar; +package org.hyperic.sigar; import java.util.Collections; import java.util.HashSet; diff --git a/bindings/java/src/net/hyperic/sigar/MultiProcCpu.java b/bindings/java/src/org/hyperic/sigar/MultiProcCpu.java similarity index 96% rename from bindings/java/src/net/hyperic/sigar/MultiProcCpu.java rename to bindings/java/src/org/hyperic/sigar/MultiProcCpu.java index aa979ce5..50be940c 100644 --- a/bindings/java/src/net/hyperic/sigar/MultiProcCpu.java +++ b/bindings/java/src/org/hyperic/sigar/MultiProcCpu.java @@ -1,9 +1,9 @@ -package net.hyperic.sigar; +package org.hyperic.sigar; import java.util.HashMap; import java.util.Map; -import net.hyperic.sigar.ptql.ProcessFinder; +import org.hyperic.sigar.ptql.ProcessFinder; /** * Provide multi process cpu metrics. diff --git a/bindings/java/src/net/hyperic/sigar/MultiProcMem.java b/bindings/java/src/org/hyperic/sigar/MultiProcMem.java similarity index 87% rename from bindings/java/src/net/hyperic/sigar/MultiProcMem.java rename to bindings/java/src/org/hyperic/sigar/MultiProcMem.java index 3db3b554..d82ef2fc 100644 --- a/bindings/java/src/net/hyperic/sigar/MultiProcMem.java +++ b/bindings/java/src/org/hyperic/sigar/MultiProcMem.java @@ -1,6 +1,6 @@ -package net.hyperic.sigar; +package org.hyperic.sigar; -import net.hyperic.sigar.ptql.ProcessFinder; +import org.hyperic.sigar.ptql.ProcessFinder; public class MultiProcMem extends ProcMem { diff --git a/bindings/java/src/net/hyperic/sigar/NetFlags.java b/bindings/java/src/org/hyperic/sigar/NetFlags.java similarity index 98% rename from bindings/java/src/net/hyperic/sigar/NetFlags.java rename to bindings/java/src/org/hyperic/sigar/NetFlags.java index 2cc7f2ea..47b8ab7d 100644 --- a/bindings/java/src/net/hyperic/sigar/NetFlags.java +++ b/bindings/java/src/org/hyperic/sigar/NetFlags.java @@ -1,4 +1,4 @@ -package net.hyperic.sigar; +package org.hyperic.sigar; /** * Flag constants for network related ops. @@ -135,7 +135,7 @@ public class NetFlags { /** * @param flags network interface flags. * @return String representation of network interface flags. - * @see net.hyperic.sigar.NetInterfaceConfig#getFlags + * @see org.hyperic.sigar.NetInterfaceConfig#getFlags */ public static String getIfFlagsString(long flags) { String retval = ""; diff --git a/bindings/java/src/net/hyperic/sigar/NetServices.java b/bindings/java/src/org/hyperic/sigar/NetServices.java similarity index 99% rename from bindings/java/src/net/hyperic/sigar/NetServices.java rename to bindings/java/src/org/hyperic/sigar/NetServices.java index b2b12201..b4d54495 100644 --- a/bindings/java/src/net/hyperic/sigar/NetServices.java +++ b/bindings/java/src/org/hyperic/sigar/NetServices.java @@ -1,4 +1,4 @@ -package net.hyperic.sigar; +package org.hyperic.sigar; import java.io.BufferedReader; import java.io.File; diff --git a/bindings/java/src/net/hyperic/sigar/NetStat.java b/bindings/java/src/org/hyperic/sigar/NetStat.java similarity index 99% rename from bindings/java/src/net/hyperic/sigar/NetStat.java rename to bindings/java/src/org/hyperic/sigar/NetStat.java index 99e2b14b..5e0f04bf 100644 --- a/bindings/java/src/net/hyperic/sigar/NetStat.java +++ b/bindings/java/src/org/hyperic/sigar/NetStat.java @@ -1,4 +1,4 @@ -package net.hyperic.sigar; +package org.hyperic.sigar; import java.util.HashMap; import java.util.Iterator; diff --git a/bindings/java/src/net/hyperic/sigar/NfsFileSystem.java b/bindings/java/src/org/hyperic/sigar/NfsFileSystem.java similarity index 98% rename from bindings/java/src/net/hyperic/sigar/NfsFileSystem.java rename to bindings/java/src/org/hyperic/sigar/NfsFileSystem.java index a99bff0a..cd3ab58e 100644 --- a/bindings/java/src/net/hyperic/sigar/NfsFileSystem.java +++ b/bindings/java/src/org/hyperic/sigar/NfsFileSystem.java @@ -1,4 +1,4 @@ -package net.hyperic.sigar; +package org.hyperic.sigar; import java.net.InetAddress; import java.net.UnknownHostException; diff --git a/bindings/java/src/net/hyperic/sigar/NfsUnreachableException.java b/bindings/java/src/org/hyperic/sigar/NfsUnreachableException.java similarity index 87% rename from bindings/java/src/net/hyperic/sigar/NfsUnreachableException.java rename to bindings/java/src/org/hyperic/sigar/NfsUnreachableException.java index 4748f4b7..0a029f4c 100644 --- a/bindings/java/src/net/hyperic/sigar/NfsUnreachableException.java +++ b/bindings/java/src/org/hyperic/sigar/NfsUnreachableException.java @@ -1,4 +1,4 @@ -package net.hyperic.sigar; +package org.hyperic.sigar; public class NfsUnreachableException extends SigarException { public NfsUnreachableException () { super(); } diff --git a/bindings/java/src/net/hyperic/sigar/OperatingSystem.java b/bindings/java/src/org/hyperic/sigar/OperatingSystem.java similarity index 99% rename from bindings/java/src/net/hyperic/sigar/OperatingSystem.java rename to bindings/java/src/org/hyperic/sigar/OperatingSystem.java index 401257d2..3070317b 100644 --- a/bindings/java/src/net/hyperic/sigar/OperatingSystem.java +++ b/bindings/java/src/org/hyperic/sigar/OperatingSystem.java @@ -1,4 +1,4 @@ -package net.hyperic.sigar; +package org.hyperic.sigar; import java.io.IOException; import java.io.File; diff --git a/bindings/java/src/net/hyperic/sigar/ProcCpu.java b/bindings/java/src/org/hyperic/sigar/ProcCpu.java similarity index 98% rename from bindings/java/src/net/hyperic/sigar/ProcCpu.java rename to bindings/java/src/org/hyperic/sigar/ProcCpu.java index 60f96f2d..e29657af 100644 --- a/bindings/java/src/net/hyperic/sigar/ProcCpu.java +++ b/bindings/java/src/org/hyperic/sigar/ProcCpu.java @@ -1,4 +1,4 @@ -package net.hyperic.sigar; +package org.hyperic.sigar; import java.util.HashMap; import java.util.Map; diff --git a/bindings/java/src/net/hyperic/sigar/ProcEnv.java b/bindings/java/src/org/hyperic/sigar/ProcEnv.java similarity index 85% rename from bindings/java/src/net/hyperic/sigar/ProcEnv.java rename to bindings/java/src/org/hyperic/sigar/ProcEnv.java index 11cef8cb..4bd84052 100644 --- a/bindings/java/src/net/hyperic/sigar/ProcEnv.java +++ b/bindings/java/src/org/hyperic/sigar/ProcEnv.java @@ -1,4 +1,4 @@ -package net.hyperic.sigar; +package org.hyperic.sigar; import java.util.Map; @@ -14,7 +14,7 @@ class ProcEnv { * @param pid Process id. * @return Map of environment. * @exception SigarException on failure. - * @see net.hyperic.sigar.Sigar#getProcEnv + * @see org.hyperic.sigar.Sigar#getProcEnv */ public static native Map getAll(Sigar sigar, long pid) throws SigarException; @@ -25,7 +25,7 @@ class ProcEnv { * @param key Environment variable name. * @return Environment variable value. * @exception SigarException on failure. - * @see net.hyperic.sigar.Sigar#getProcEnv + * @see org.hyperic.sigar.Sigar#getProcEnv */ public static native String getValue(Sigar sigar, long pid, String key) throws SigarException; diff --git a/bindings/java/src/net/hyperic/sigar/ProcUtil.java b/bindings/java/src/org/hyperic/sigar/ProcUtil.java similarity index 99% rename from bindings/java/src/net/hyperic/sigar/ProcUtil.java rename to bindings/java/src/org/hyperic/sigar/ProcUtil.java index ab3ac070..84b3dcba 100644 --- a/bindings/java/src/net/hyperic/sigar/ProcUtil.java +++ b/bindings/java/src/org/hyperic/sigar/ProcUtil.java @@ -1,4 +1,4 @@ -package net.hyperic.sigar; +package org.hyperic.sigar; import java.io.File; import java.io.IOException; diff --git a/bindings/java/src/net/hyperic/sigar/RPC.java b/bindings/java/src/org/hyperic/sigar/RPC.java similarity index 98% rename from bindings/java/src/net/hyperic/sigar/RPC.java rename to bindings/java/src/org/hyperic/sigar/RPC.java index 4e76ef98..850dba60 100644 --- a/bindings/java/src/net/hyperic/sigar/RPC.java +++ b/bindings/java/src/org/hyperic/sigar/RPC.java @@ -1,4 +1,4 @@ -package net.hyperic.sigar; +package org.hyperic.sigar; import java.util.HashMap; import java.util.List; diff --git a/bindings/java/src/net/hyperic/sigar/Sigar.java b/bindings/java/src/org/hyperic/sigar/Sigar.java similarity index 99% rename from bindings/java/src/net/hyperic/sigar/Sigar.java rename to bindings/java/src/org/hyperic/sigar/Sigar.java index c8446de2..e1d4140c 100644 --- a/bindings/java/src/net/hyperic/sigar/Sigar.java +++ b/bindings/java/src/org/hyperic/sigar/Sigar.java @@ -1,4 +1,4 @@ -package net.hyperic.sigar; +package org.hyperic.sigar; import java.io.BufferedReader; import java.io.File; @@ -555,7 +555,7 @@ public class Sigar implements SigarProxy { * @param name Name of the directory on which filesystem is mounted. * @exception SigarException If given directory is not mounted. * @exception NfsUnreachableException If NFS server is unreachable. - * @see net.hyperic.sigar.Sigar#getFileSystemUsage + * @see org.hyperic.sigar.Sigar#getFileSystemUsage */ public FileSystemUsage getMountedFileSystemUsage(String name) throws SigarException, NfsUnreachableException { diff --git a/bindings/java/src/net/hyperic/sigar/SigarCacheObject.java b/bindings/java/src/org/hyperic/sigar/SigarCacheObject.java similarity index 74% rename from bindings/java/src/net/hyperic/sigar/SigarCacheObject.java rename to bindings/java/src/org/hyperic/sigar/SigarCacheObject.java index 8f386446..09aced3a 100644 --- a/bindings/java/src/net/hyperic/sigar/SigarCacheObject.java +++ b/bindings/java/src/org/hyperic/sigar/SigarCacheObject.java @@ -1,4 +1,4 @@ -package net.hyperic.sigar; +package org.hyperic.sigar; class SigarCacheObject { diff --git a/bindings/java/src/net/hyperic/sigar/SigarException.java b/bindings/java/src/org/hyperic/sigar/SigarException.java similarity index 87% rename from bindings/java/src/net/hyperic/sigar/SigarException.java rename to bindings/java/src/org/hyperic/sigar/SigarException.java index 78830ca1..831f0af5 100644 --- a/bindings/java/src/net/hyperic/sigar/SigarException.java +++ b/bindings/java/src/org/hyperic/sigar/SigarException.java @@ -1,4 +1,4 @@ -package net.hyperic.sigar; +package org.hyperic.sigar; /** * Sigar base exception class. diff --git a/bindings/java/src/net/hyperic/sigar/SigarFileNotFoundException.java b/bindings/java/src/org/hyperic/sigar/SigarFileNotFoundException.java similarity index 82% rename from bindings/java/src/net/hyperic/sigar/SigarFileNotFoundException.java rename to bindings/java/src/org/hyperic/sigar/SigarFileNotFoundException.java index 18c2fa6f..815427d0 100644 --- a/bindings/java/src/net/hyperic/sigar/SigarFileNotFoundException.java +++ b/bindings/java/src/org/hyperic/sigar/SigarFileNotFoundException.java @@ -1,4 +1,4 @@ -package net.hyperic.sigar; +package org.hyperic.sigar; public class SigarFileNotFoundException extends SigarException { diff --git a/bindings/java/src/net/hyperic/sigar/SigarInvoker.java b/bindings/java/src/org/hyperic/sigar/SigarInvoker.java similarity index 99% rename from bindings/java/src/net/hyperic/sigar/SigarInvoker.java rename to bindings/java/src/org/hyperic/sigar/SigarInvoker.java index b01e7e41..90741732 100644 --- a/bindings/java/src/net/hyperic/sigar/SigarInvoker.java +++ b/bindings/java/src/org/hyperic/sigar/SigarInvoker.java @@ -1,4 +1,4 @@ -package net.hyperic.sigar; +package org.hyperic.sigar; import java.util.Arrays; import java.util.HashMap; diff --git a/bindings/java/src/net/hyperic/sigar/SigarLoader.java b/bindings/java/src/org/hyperic/sigar/SigarLoader.java similarity index 98% rename from bindings/java/src/net/hyperic/sigar/SigarLoader.java rename to bindings/java/src/org/hyperic/sigar/SigarLoader.java index 8941b93d..b9589360 100644 --- a/bindings/java/src/net/hyperic/sigar/SigarLoader.java +++ b/bindings/java/src/org/hyperic/sigar/SigarLoader.java @@ -1,4 +1,4 @@ -package net.hyperic.sigar; +package org.hyperic.sigar; import net.hyperic.jni.ArchLoader; import net.hyperic.jni.ArchLoaderException; diff --git a/bindings/java/src/net/hyperic/sigar/SigarLog.java b/bindings/java/src/org/hyperic/sigar/SigarLog.java similarity index 98% rename from bindings/java/src/net/hyperic/sigar/SigarLog.java rename to bindings/java/src/org/hyperic/sigar/SigarLog.java index dd2da10d..319b02ad 100644 --- a/bindings/java/src/net/hyperic/sigar/SigarLog.java +++ b/bindings/java/src/org/hyperic/sigar/SigarLog.java @@ -1,4 +1,4 @@ -package net.hyperic.sigar; +package org.hyperic.sigar; import org.apache.log4j.BasicConfigurator; import org.apache.log4j.Level; diff --git a/bindings/java/src/net/hyperic/sigar/SigarNotImplementedException.java b/bindings/java/src/org/hyperic/sigar/SigarNotImplementedException.java similarity index 95% rename from bindings/java/src/net/hyperic/sigar/SigarNotImplementedException.java rename to bindings/java/src/org/hyperic/sigar/SigarNotImplementedException.java index 90d4fb52..32595335 100644 --- a/bindings/java/src/net/hyperic/sigar/SigarNotImplementedException.java +++ b/bindings/java/src/org/hyperic/sigar/SigarNotImplementedException.java @@ -1,4 +1,4 @@ -package net.hyperic.sigar; +package org.hyperic.sigar; /** * Sigar exception class, thrown for methods which are not implemented diff --git a/bindings/java/src/net/hyperic/sigar/SigarPermissionDeniedException.java b/bindings/java/src/org/hyperic/sigar/SigarPermissionDeniedException.java similarity index 96% rename from bindings/java/src/net/hyperic/sigar/SigarPermissionDeniedException.java rename to bindings/java/src/org/hyperic/sigar/SigarPermissionDeniedException.java index 2b217cb9..b22c1fe0 100644 --- a/bindings/java/src/net/hyperic/sigar/SigarPermissionDeniedException.java +++ b/bindings/java/src/org/hyperic/sigar/SigarPermissionDeniedException.java @@ -1,4 +1,4 @@ -package net.hyperic.sigar; +package org.hyperic.sigar; public class SigarPermissionDeniedException extends SigarException { diff --git a/bindings/java/src/net/hyperic/sigar/SigarProxy.java b/bindings/java/src/org/hyperic/sigar/SigarProxy.java similarity index 99% rename from bindings/java/src/net/hyperic/sigar/SigarProxy.java rename to bindings/java/src/org/hyperic/sigar/SigarProxy.java index 734564d9..6fcb8988 100644 --- a/bindings/java/src/net/hyperic/sigar/SigarProxy.java +++ b/bindings/java/src/org/hyperic/sigar/SigarProxy.java @@ -1,4 +1,4 @@ -package net.hyperic.sigar; +package org.hyperic.sigar; import java.util.List; import java.util.Map; diff --git a/bindings/java/src/net/hyperic/sigar/SigarProxyCache.java b/bindings/java/src/org/hyperic/sigar/SigarProxyCache.java similarity index 98% rename from bindings/java/src/net/hyperic/sigar/SigarProxyCache.java rename to bindings/java/src/org/hyperic/sigar/SigarProxyCache.java index c0d668b9..0ec962ae 100644 --- a/bindings/java/src/net/hyperic/sigar/SigarProxyCache.java +++ b/bindings/java/src/org/hyperic/sigar/SigarProxyCache.java @@ -1,4 +1,4 @@ -package net.hyperic.sigar; +package org.hyperic.sigar; import java.util.Map; @@ -7,7 +7,7 @@ import java.lang.reflect.InvocationTargetException; import java.lang.reflect.InvocationHandler; import java.lang.reflect.Method; -import net.hyperic.sigar.util.ReferenceMap; +import org.hyperic.sigar.util.ReferenceMap; /** * This class implements a caching mechanism to avoid system calls diff --git a/bindings/java/src/net/hyperic/sigar/SigarVersion.java.in b/bindings/java/src/org/hyperic/sigar/SigarVersion.java.in similarity index 84% rename from bindings/java/src/net/hyperic/sigar/SigarVersion.java.in rename to bindings/java/src/org/hyperic/sigar/SigarVersion.java.in index 094eb22f..e3ad4b6d 100644 --- a/bindings/java/src/net/hyperic/sigar/SigarVersion.java.in +++ b/bindings/java/src/org/hyperic/sigar/SigarVersion.java.in @@ -1,4 +1,4 @@ -package net.hyperic.sigar; +package org.hyperic.sigar; class SigarVersion { diff --git a/bindings/java/src/net/hyperic/sigar/SudoFileInputStream.java b/bindings/java/src/org/hyperic/sigar/SudoFileInputStream.java similarity index 98% rename from bindings/java/src/net/hyperic/sigar/SudoFileInputStream.java rename to bindings/java/src/org/hyperic/sigar/SudoFileInputStream.java index d6178112..699112a9 100644 --- a/bindings/java/src/net/hyperic/sigar/SudoFileInputStream.java +++ b/bindings/java/src/org/hyperic/sigar/SudoFileInputStream.java @@ -1,4 +1,4 @@ -package net.hyperic.sigar; +package org.hyperic.sigar; import java.io.File; import java.io.FileNotFoundException; diff --git a/bindings/java/src/net/hyperic/sigar/cmd/CpuInfo.java b/bindings/java/src/org/hyperic/sigar/cmd/CpuInfo.java similarity index 88% rename from bindings/java/src/net/hyperic/sigar/cmd/CpuInfo.java rename to bindings/java/src/org/hyperic/sigar/cmd/CpuInfo.java index 84b221e5..48803f4b 100644 --- a/bindings/java/src/net/hyperic/sigar/cmd/CpuInfo.java +++ b/bindings/java/src/org/hyperic/sigar/cmd/CpuInfo.java @@ -1,8 +1,8 @@ -package net.hyperic.sigar.cmd; +package org.hyperic.sigar.cmd; -import net.hyperic.sigar.CpuPerc; -import net.hyperic.sigar.Sigar; -import net.hyperic.sigar.SigarException; +import org.hyperic.sigar.CpuPerc; +import org.hyperic.sigar.Sigar; +import org.hyperic.sigar.SigarException; /** * Display cpu information for each cpu found on the system. @@ -34,13 +34,13 @@ public class CpuInfo extends SigarCommandBase { } public void output(String[] args) throws SigarException { - net.hyperic.sigar.CpuInfo[] infos = + org.hyperic.sigar.CpuInfo[] infos = this.sigar.getCpuInfoList(); CpuPerc[] cpus = null; println(infos.length + " total CPUs.."); - net.hyperic.sigar.CpuInfo info = infos[0]; + org.hyperic.sigar.CpuInfo info = infos[0]; long cacheSize = info.getCacheSize(); println("Vendor........" + info.getVendor()); println("Model........." + info.getModel()); diff --git a/bindings/java/src/net/hyperic/sigar/cmd/Df.java b/bindings/java/src/org/hyperic/sigar/cmd/Df.java similarity index 90% rename from bindings/java/src/net/hyperic/sigar/cmd/Df.java rename to bindings/java/src/org/hyperic/sigar/cmd/Df.java index f4f20075..7f1b8123 100644 --- a/bindings/java/src/net/hyperic/sigar/cmd/Df.java +++ b/bindings/java/src/org/hyperic/sigar/cmd/Df.java @@ -1,16 +1,16 @@ -package net.hyperic.sigar.cmd; +package org.hyperic.sigar.cmd; import java.util.ArrayList; -import net.hyperic.sigar.Sigar; -import net.hyperic.sigar.SigarException; -import net.hyperic.sigar.FileSystem; -import net.hyperic.sigar.FileSystemMap; -import net.hyperic.sigar.FileSystemUsage; -import net.hyperic.sigar.NfsFileSystem; +import org.hyperic.sigar.Sigar; +import org.hyperic.sigar.SigarException; +import org.hyperic.sigar.FileSystem; +import org.hyperic.sigar.FileSystemMap; +import org.hyperic.sigar.FileSystemUsage; +import org.hyperic.sigar.NfsFileSystem; -import net.hyperic.sigar.shell.FileCompleter; -import net.hyperic.sigar.util.GetlineCompleter; +import org.hyperic.sigar.shell.FileCompleter; +import org.hyperic.sigar.util.GetlineCompleter; /** * Report filesytem disk space usage. diff --git a/bindings/java/src/net/hyperic/sigar/cmd/Du.java b/bindings/java/src/org/hyperic/sigar/cmd/Du.java similarity index 87% rename from bindings/java/src/net/hyperic/sigar/cmd/Du.java rename to bindings/java/src/org/hyperic/sigar/cmd/Du.java index c55e5bbd..abac5014 100644 --- a/bindings/java/src/net/hyperic/sigar/cmd/Du.java +++ b/bindings/java/src/org/hyperic/sigar/cmd/Du.java @@ -1,7 +1,7 @@ -package net.hyperic.sigar.cmd; +package org.hyperic.sigar.cmd; -import net.hyperic.sigar.DirUsage; -import net.hyperic.sigar.SigarException; +import org.hyperic.sigar.DirUsage; +import org.hyperic.sigar.SigarException; /** * Display usage for a directory recursively diff --git a/bindings/java/src/net/hyperic/sigar/cmd/Free.java b/bindings/java/src/org/hyperic/sigar/cmd/Free.java similarity index 92% rename from bindings/java/src/net/hyperic/sigar/cmd/Free.java rename to bindings/java/src/org/hyperic/sigar/cmd/Free.java index a633b7b3..5b4b64bc 100644 --- a/bindings/java/src/net/hyperic/sigar/cmd/Free.java +++ b/bindings/java/src/org/hyperic/sigar/cmd/Free.java @@ -1,8 +1,8 @@ -package net.hyperic.sigar.cmd; +package org.hyperic.sigar.cmd; -import net.hyperic.sigar.Mem; -import net.hyperic.sigar.Swap; -import net.hyperic.sigar.SigarException; +import org.hyperic.sigar.Mem; +import org.hyperic.sigar.Swap; +import org.hyperic.sigar.SigarException; /** * Display amount of free and used memory in the system. diff --git a/bindings/java/src/net/hyperic/sigar/cmd/Ifconfig.java b/bindings/java/src/org/hyperic/sigar/cmd/Ifconfig.java similarity index 94% rename from bindings/java/src/net/hyperic/sigar/cmd/Ifconfig.java rename to bindings/java/src/org/hyperic/sigar/cmd/Ifconfig.java index 696cf219..9b2a8209 100644 --- a/bindings/java/src/net/hyperic/sigar/cmd/Ifconfig.java +++ b/bindings/java/src/org/hyperic/sigar/cmd/Ifconfig.java @@ -1,13 +1,13 @@ -package net.hyperic.sigar.cmd; +package org.hyperic.sigar.cmd; import java.util.Arrays; import java.util.Collection; -import net.hyperic.sigar.Sigar; -import net.hyperic.sigar.SigarException; -import net.hyperic.sigar.NetInterfaceConfig; -import net.hyperic.sigar.NetInterfaceStat; -import net.hyperic.sigar.NetFlags; +import org.hyperic.sigar.Sigar; +import org.hyperic.sigar.SigarException; +import org.hyperic.sigar.NetInterfaceConfig; +import org.hyperic.sigar.NetInterfaceStat; +import org.hyperic.sigar.NetFlags; /** * Display network interface configuration and metrics. diff --git a/bindings/java/src/net/hyperic/sigar/cmd/Iostat.java b/bindings/java/src/org/hyperic/sigar/cmd/Iostat.java similarity index 90% rename from bindings/java/src/net/hyperic/sigar/cmd/Iostat.java rename to bindings/java/src/org/hyperic/sigar/cmd/Iostat.java index f853cdfe..34229a9c 100644 --- a/bindings/java/src/net/hyperic/sigar/cmd/Iostat.java +++ b/bindings/java/src/org/hyperic/sigar/cmd/Iostat.java @@ -1,15 +1,15 @@ -package net.hyperic.sigar.cmd; +package org.hyperic.sigar.cmd; import java.util.ArrayList; -import net.hyperic.sigar.Sigar; -import net.hyperic.sigar.SigarException; -import net.hyperic.sigar.FileSystem; -import net.hyperic.sigar.FileSystemMap; -import net.hyperic.sigar.FileSystemUsage; +import org.hyperic.sigar.Sigar; +import org.hyperic.sigar.SigarException; +import org.hyperic.sigar.FileSystem; +import org.hyperic.sigar.FileSystemMap; +import org.hyperic.sigar.FileSystemUsage; -import net.hyperic.sigar.shell.FileCompleter; -import net.hyperic.sigar.util.GetlineCompleter; +import org.hyperic.sigar.shell.FileCompleter; +import org.hyperic.sigar.util.GetlineCompleter; /** * Report filesytem disk space usage. diff --git a/bindings/java/src/net/hyperic/sigar/cmd/Kill.java b/bindings/java/src/org/hyperic/sigar/cmd/Kill.java similarity index 95% rename from bindings/java/src/net/hyperic/sigar/cmd/Kill.java rename to bindings/java/src/org/hyperic/sigar/cmd/Kill.java index f66c5bd4..81a40690 100644 --- a/bindings/java/src/net/hyperic/sigar/cmd/Kill.java +++ b/bindings/java/src/org/hyperic/sigar/cmd/Kill.java @@ -1,6 +1,6 @@ -package net.hyperic.sigar.cmd; +package org.hyperic.sigar.cmd; -import net.hyperic.sigar.SigarException; +import org.hyperic.sigar.SigarException; /** * Send a signal to a process. diff --git a/bindings/java/src/net/hyperic/sigar/cmd/MemWatch.java b/bindings/java/src/org/hyperic/sigar/cmd/MemWatch.java similarity index 94% rename from bindings/java/src/net/hyperic/sigar/cmd/MemWatch.java rename to bindings/java/src/org/hyperic/sigar/cmd/MemWatch.java index e2d23ee4..35e91cb1 100644 --- a/bindings/java/src/net/hyperic/sigar/cmd/MemWatch.java +++ b/bindings/java/src/org/hyperic/sigar/cmd/MemWatch.java @@ -1,7 +1,7 @@ -package net.hyperic.sigar.cmd; +package org.hyperic.sigar.cmd; -import net.hyperic.sigar.Sigar; -import net.hyperic.sigar.ProcMem; +import org.hyperic.sigar.Sigar; +import org.hyperic.sigar.ProcMem; /** * Watch for changes in program memory usage. diff --git a/bindings/java/src/net/hyperic/sigar/cmd/MultiPs.java b/bindings/java/src/org/hyperic/sigar/cmd/MultiPs.java similarity index 85% rename from bindings/java/src/net/hyperic/sigar/cmd/MultiPs.java rename to bindings/java/src/org/hyperic/sigar/cmd/MultiPs.java index 4772dd21..0769f6c7 100644 --- a/bindings/java/src/net/hyperic/sigar/cmd/MultiPs.java +++ b/bindings/java/src/org/hyperic/sigar/cmd/MultiPs.java @@ -1,10 +1,10 @@ -package net.hyperic.sigar.cmd; +package org.hyperic.sigar.cmd; -import net.hyperic.sigar.Sigar; -import net.hyperic.sigar.SigarException; -import net.hyperic.sigar.CpuPerc; -import net.hyperic.sigar.MultiProcCpu; -import net.hyperic.sigar.ProcMem; +import org.hyperic.sigar.Sigar; +import org.hyperic.sigar.SigarException; +import org.hyperic.sigar.CpuPerc; +import org.hyperic.sigar.MultiProcCpu; +import org.hyperic.sigar.ProcMem; /** * Show multi process status. diff --git a/bindings/java/src/net/hyperic/sigar/cmd/NetInfo.java b/bindings/java/src/org/hyperic/sigar/cmd/NetInfo.java similarity index 89% rename from bindings/java/src/net/hyperic/sigar/cmd/NetInfo.java rename to bindings/java/src/org/hyperic/sigar/cmd/NetInfo.java index 95a25a07..30fd0153 100644 --- a/bindings/java/src/net/hyperic/sigar/cmd/NetInfo.java +++ b/bindings/java/src/org/hyperic/sigar/cmd/NetInfo.java @@ -1,6 +1,6 @@ -package net.hyperic.sigar.cmd; +package org.hyperic.sigar.cmd; -import net.hyperic.sigar.SigarException; +import org.hyperic.sigar.SigarException; /** * Display network info. @@ -20,7 +20,7 @@ public class NetInfo extends SigarCommandBase { } public void output(String[] args) throws SigarException { - net.hyperic.sigar.NetInfo info = + org.hyperic.sigar.NetInfo info = this.sigar.getNetInfo(); println("host name............." + diff --git a/bindings/java/src/net/hyperic/sigar/cmd/Netstat.java b/bindings/java/src/org/hyperic/sigar/cmd/Netstat.java similarity index 96% rename from bindings/java/src/net/hyperic/sigar/cmd/Netstat.java rename to bindings/java/src/org/hyperic/sigar/cmd/Netstat.java index cf35a8bf..e75191c3 100644 --- a/bindings/java/src/net/hyperic/sigar/cmd/Netstat.java +++ b/bindings/java/src/org/hyperic/sigar/cmd/Netstat.java @@ -1,13 +1,13 @@ -package net.hyperic.sigar.cmd; +package org.hyperic.sigar.cmd; import java.net.InetAddress; import java.net.UnknownHostException; import java.util.ArrayList; -import net.hyperic.sigar.NetServices; -import net.hyperic.sigar.SigarException; -import net.hyperic.sigar.NetConnection; -import net.hyperic.sigar.NetFlags; +import org.hyperic.sigar.NetServices; +import org.hyperic.sigar.SigarException; +import org.hyperic.sigar.NetConnection; +import org.hyperic.sigar.NetFlags; /** * Display network connections. diff --git a/bindings/java/src/net/hyperic/sigar/cmd/PTQL.java b/bindings/java/src/org/hyperic/sigar/cmd/PTQL.java similarity index 88% rename from bindings/java/src/net/hyperic/sigar/cmd/PTQL.java rename to bindings/java/src/org/hyperic/sigar/cmd/PTQL.java index c60ee06c..f99c534a 100644 --- a/bindings/java/src/net/hyperic/sigar/cmd/PTQL.java +++ b/bindings/java/src/org/hyperic/sigar/cmd/PTQL.java @@ -1,26 +1,26 @@ -package net.hyperic.sigar.cmd; +package org.hyperic.sigar.cmd; import java.util.ArrayList; import java.util.Map; import java.lang.reflect.Method; -import net.hyperic.sigar.SigarException; +import org.hyperic.sigar.SigarException; -import net.hyperic.sigar.util.GetlineCompleter; +import org.hyperic.sigar.util.GetlineCompleter; -import net.hyperic.sigar.ptql.ProcessQueryBuilder; +import org.hyperic.sigar.ptql.ProcessQueryBuilder; -import net.hyperic.sigar.shell.CollectionCompleter; -import net.hyperic.sigar.shell.MultiwordShellCommand; -import net.hyperic.sigar.shell.ShellBase; -import net.hyperic.sigar.shell.ShellCommandExecException; -import net.hyperic.sigar.shell.ShellCommandInitException; -import net.hyperic.sigar.shell.ShellCommandHandler; -import net.hyperic.sigar.shell.ShellCommandUsageException; +import org.hyperic.sigar.shell.CollectionCompleter; +import org.hyperic.sigar.shell.MultiwordShellCommand; +import org.hyperic.sigar.shell.ShellBase; +import org.hyperic.sigar.shell.ShellCommandExecException; +import org.hyperic.sigar.shell.ShellCommandInitException; +import org.hyperic.sigar.shell.ShellCommandHandler; +import org.hyperic.sigar.shell.ShellCommandUsageException; /** * Run process table queries. - * @see net.hyperic.sigar.ptql.ProcessQueryBuilder + * @see org.hyperic.sigar.ptql.ProcessQueryBuilder */ public class PTQL extends MultiwordShellCommand diff --git a/bindings/java/src/net/hyperic/sigar/cmd/ProcFileInfo.java b/bindings/java/src/org/hyperic/sigar/cmd/ProcFileInfo.java similarity index 88% rename from bindings/java/src/net/hyperic/sigar/cmd/ProcFileInfo.java rename to bindings/java/src/org/hyperic/sigar/cmd/ProcFileInfo.java index 4ae49e1e..357f9de4 100644 --- a/bindings/java/src/net/hyperic/sigar/cmd/ProcFileInfo.java +++ b/bindings/java/src/org/hyperic/sigar/cmd/ProcFileInfo.java @@ -1,9 +1,9 @@ -package net.hyperic.sigar.cmd; +package org.hyperic.sigar.cmd; -import net.hyperic.sigar.SigarException; -import net.hyperic.sigar.SigarPermissionDeniedException; -import net.hyperic.sigar.ProcFd; -import net.hyperic.sigar.ProcExe; +import org.hyperic.sigar.SigarException; +import org.hyperic.sigar.SigarPermissionDeniedException; +import org.hyperic.sigar.ProcFd; +import org.hyperic.sigar.ProcExe; /** * Display process file information. diff --git a/bindings/java/src/net/hyperic/sigar/cmd/ProcInfo.java b/bindings/java/src/org/hyperic/sigar/cmd/ProcInfo.java similarity index 92% rename from bindings/java/src/net/hyperic/sigar/cmd/ProcInfo.java rename to bindings/java/src/org/hyperic/sigar/cmd/ProcInfo.java index 520decfb..fef189b6 100644 --- a/bindings/java/src/net/hyperic/sigar/cmd/ProcInfo.java +++ b/bindings/java/src/org/hyperic/sigar/cmd/ProcInfo.java @@ -1,7 +1,7 @@ -package net.hyperic.sigar.cmd; +package org.hyperic.sigar.cmd; -import net.hyperic.sigar.SigarException; -import net.hyperic.sigar.SigarPermissionDeniedException; +import org.hyperic.sigar.SigarException; +import org.hyperic.sigar.SigarPermissionDeniedException; /** * Display all process information. diff --git a/bindings/java/src/net/hyperic/sigar/cmd/ProcModuleInfo.java b/bindings/java/src/org/hyperic/sigar/cmd/ProcModuleInfo.java similarity index 91% rename from bindings/java/src/net/hyperic/sigar/cmd/ProcModuleInfo.java rename to bindings/java/src/org/hyperic/sigar/cmd/ProcModuleInfo.java index 23724ee9..72763769 100644 --- a/bindings/java/src/net/hyperic/sigar/cmd/ProcModuleInfo.java +++ b/bindings/java/src/org/hyperic/sigar/cmd/ProcModuleInfo.java @@ -1,9 +1,9 @@ -package net.hyperic.sigar.cmd; +package org.hyperic.sigar.cmd; import java.util.List; -import net.hyperic.sigar.SigarException; -import net.hyperic.sigar.SigarNotImplementedException; +import org.hyperic.sigar.SigarException; +import org.hyperic.sigar.SigarNotImplementedException; /** * Display process module info. diff --git a/bindings/java/src/net/hyperic/sigar/cmd/ProcessQueryGenerate.java b/bindings/java/src/org/hyperic/sigar/cmd/ProcessQueryGenerate.java similarity index 90% rename from bindings/java/src/net/hyperic/sigar/cmd/ProcessQueryGenerate.java rename to bindings/java/src/org/hyperic/sigar/cmd/ProcessQueryGenerate.java index 02cbcd91..115c525d 100644 --- a/bindings/java/src/net/hyperic/sigar/cmd/ProcessQueryGenerate.java +++ b/bindings/java/src/org/hyperic/sigar/cmd/ProcessQueryGenerate.java @@ -1,8 +1,8 @@ -package net.hyperic.sigar.cmd; +package org.hyperic.sigar.cmd; -import net.hyperic.sigar.SigarException; +import org.hyperic.sigar.SigarException; -import net.hyperic.sigar.ptql.ProcessQueryGenerator; +import org.hyperic.sigar.ptql.ProcessQueryGenerator; public class ProcessQueryGenerate extends SigarCommandBase { diff --git a/bindings/java/src/net/hyperic/sigar/cmd/Ps.java b/bindings/java/src/org/hyperic/sigar/cmd/Ps.java similarity index 91% rename from bindings/java/src/net/hyperic/sigar/cmd/Ps.java rename to bindings/java/src/org/hyperic/sigar/cmd/Ps.java index 097cf63c..042d6014 100644 --- a/bindings/java/src/net/hyperic/sigar/cmd/Ps.java +++ b/bindings/java/src/org/hyperic/sigar/cmd/Ps.java @@ -1,13 +1,13 @@ -package net.hyperic.sigar.cmd; +package org.hyperic.sigar.cmd; -import net.hyperic.sigar.Sigar; -import net.hyperic.sigar.SigarProxy; -import net.hyperic.sigar.SigarException; -import net.hyperic.sigar.ProcCredName; -import net.hyperic.sigar.ProcMem; -import net.hyperic.sigar.ProcTime; -import net.hyperic.sigar.ProcState; -import net.hyperic.sigar.ProcUtil; +import org.hyperic.sigar.Sigar; +import org.hyperic.sigar.SigarProxy; +import org.hyperic.sigar.SigarException; +import org.hyperic.sigar.ProcCredName; +import org.hyperic.sigar.ProcMem; +import org.hyperic.sigar.ProcTime; +import org.hyperic.sigar.ProcState; +import org.hyperic.sigar.ProcUtil; import java.util.ArrayList; import java.util.Iterator; diff --git a/bindings/java/src/net/hyperic/sigar/cmd/Route.java b/bindings/java/src/org/hyperic/sigar/cmd/Route.java similarity index 92% rename from bindings/java/src/net/hyperic/sigar/cmd/Route.java rename to bindings/java/src/org/hyperic/sigar/cmd/Route.java index d435bca3..586df5af 100644 --- a/bindings/java/src/net/hyperic/sigar/cmd/Route.java +++ b/bindings/java/src/org/hyperic/sigar/cmd/Route.java @@ -1,10 +1,10 @@ -package net.hyperic.sigar.cmd; +package org.hyperic.sigar.cmd; import java.util.ArrayList; -import net.hyperic.sigar.NetFlags; -import net.hyperic.sigar.NetRoute; -import net.hyperic.sigar.SigarException; +import org.hyperic.sigar.NetFlags; +import org.hyperic.sigar.NetRoute; +import org.hyperic.sigar.SigarException; public class Route extends SigarCommandBase { diff --git a/bindings/java/src/net/hyperic/sigar/cmd/Runner.java b/bindings/java/src/org/hyperic/sigar/cmd/Runner.java similarity index 95% rename from bindings/java/src/net/hyperic/sigar/cmd/Runner.java rename to bindings/java/src/org/hyperic/sigar/cmd/Runner.java index 4070c9e1..9dc34d1d 100644 --- a/bindings/java/src/net/hyperic/sigar/cmd/Runner.java +++ b/bindings/java/src/org/hyperic/sigar/cmd/Runner.java @@ -1,4 +1,4 @@ -package net.hyperic.sigar.cmd; +package org.hyperic.sigar.cmd; import java.io.File; import java.io.FileFilter; @@ -13,7 +13,7 @@ import java.lang.reflect.InvocationTargetException; import java.net.URLClassLoader; import java.net.URL; -import net.hyperic.sigar.SigarLoader; +import org.hyperic.sigar.SigarLoader; public class Runner { @@ -151,11 +151,11 @@ public class Runner { Class cmd = null; String[] packages = { - "net.hyperic.sigar.cmd.", - "net.hyperic.sigar.test.", - "net.hyperic.sigar.", - "net.hyperic.sigar.win32.", - "net.hyperic.sigar.jmx.", + "org.hyperic.sigar.cmd.", + "org.hyperic.sigar.test.", + "org.hyperic.sigar.", + "org.hyperic.sigar.win32.", + "org.hyperic.sigar.jmx.", }; for (int i=0; i * % java -jar sigar-bin/lib/sigar.jar Top State.Name.eq=java * - * @see net.hyperic.sigar.ptql.ProcessQueryBuilder + * @see org.hyperic.sigar.ptql.ProcessQueryBuilder */ public class Top { private static final int SLEEP_TIME = 1000 * 5; diff --git a/bindings/java/src/net/hyperic/sigar/cmd/Ulimit.java b/bindings/java/src/org/hyperic/sigar/cmd/Ulimit.java similarity index 93% rename from bindings/java/src/net/hyperic/sigar/cmd/Ulimit.java rename to bindings/java/src/org/hyperic/sigar/cmd/Ulimit.java index 58a62a8c..2d6b8c07 100644 --- a/bindings/java/src/net/hyperic/sigar/cmd/Ulimit.java +++ b/bindings/java/src/org/hyperic/sigar/cmd/Ulimit.java @@ -1,8 +1,8 @@ -package net.hyperic.sigar.cmd; +package org.hyperic.sigar.cmd; -import net.hyperic.sigar.ResourceLimit; -import net.hyperic.sigar.SigarException; -import net.hyperic.sigar.jmx.SigarInvokerJMX; +import org.hyperic.sigar.ResourceLimit; +import org.hyperic.sigar.SigarException; +import org.hyperic.sigar.jmx.SigarInvokerJMX; /** * Display system resource limits. diff --git a/bindings/java/src/net/hyperic/sigar/cmd/Uptime.java b/bindings/java/src/org/hyperic/sigar/cmd/Uptime.java similarity index 91% rename from bindings/java/src/net/hyperic/sigar/cmd/Uptime.java rename to bindings/java/src/org/hyperic/sigar/cmd/Uptime.java index d9ac63bc..625fd26b 100644 --- a/bindings/java/src/net/hyperic/sigar/cmd/Uptime.java +++ b/bindings/java/src/org/hyperic/sigar/cmd/Uptime.java @@ -1,9 +1,9 @@ -package net.hyperic.sigar.cmd; +package org.hyperic.sigar.cmd; -import net.hyperic.sigar.SigarProxy; -import net.hyperic.sigar.SigarException; -import net.hyperic.sigar.SigarNotImplementedException; -import net.hyperic.sigar.util.PrintfFormat; +import org.hyperic.sigar.SigarProxy; +import org.hyperic.sigar.SigarException; +import org.hyperic.sigar.SigarNotImplementedException; +import org.hyperic.sigar.util.PrintfFormat; import java.text.SimpleDateFormat; import java.util.Date; diff --git a/bindings/java/src/net/hyperic/sigar/cmd/Version.java b/bindings/java/src/org/hyperic/sigar/cmd/Version.java similarity index 94% rename from bindings/java/src/net/hyperic/sigar/cmd/Version.java rename to bindings/java/src/org/hyperic/sigar/cmd/Version.java index b8d50f21..0636dc3e 100644 --- a/bindings/java/src/net/hyperic/sigar/cmd/Version.java +++ b/bindings/java/src/org/hyperic/sigar/cmd/Version.java @@ -1,14 +1,14 @@ -package net.hyperic.sigar.cmd; +package org.hyperic.sigar.cmd; import java.io.PrintStream; import java.net.InetAddress; import java.net.UnknownHostException; -import net.hyperic.sigar.OperatingSystem; -import net.hyperic.sigar.Sigar; -import net.hyperic.sigar.SigarException; +import org.hyperic.sigar.OperatingSystem; +import org.hyperic.sigar.Sigar; +import org.hyperic.sigar.SigarException; -import net.hyperic.sigar.SigarLoader; +import org.hyperic.sigar.SigarLoader; /** * Display Sigar, java and system version information. */ diff --git a/bindings/java/src/net/hyperic/sigar/cmd/Watch.java b/bindings/java/src/org/hyperic/sigar/cmd/Watch.java similarity index 94% rename from bindings/java/src/net/hyperic/sigar/cmd/Watch.java rename to bindings/java/src/org/hyperic/sigar/cmd/Watch.java index c6733d13..c0d598cd 100644 --- a/bindings/java/src/net/hyperic/sigar/cmd/Watch.java +++ b/bindings/java/src/org/hyperic/sigar/cmd/Watch.java @@ -1,16 +1,16 @@ -package net.hyperic.sigar.cmd; +package org.hyperic.sigar.cmd; import java.io.File; import java.io.FileFilter; import java.io.IOException; import java.util.Date; -import net.hyperic.sigar.Sigar; -import net.hyperic.sigar.SigarException; -import net.hyperic.sigar.DirStat; -import net.hyperic.sigar.FileInfo; -import net.hyperic.sigar.FileWatcher; -import net.hyperic.sigar.FileWatcherThread; +import org.hyperic.sigar.Sigar; +import org.hyperic.sigar.SigarException; +import org.hyperic.sigar.DirStat; +import org.hyperic.sigar.FileInfo; +import org.hyperic.sigar.FileWatcher; +import org.hyperic.sigar.FileWatcherThread; /** * Watch a file or directory displaying attribute changes. diff --git a/bindings/java/src/net/hyperic/sigar/cmd/Who.java b/bindings/java/src/org/hyperic/sigar/cmd/Who.java similarity index 88% rename from bindings/java/src/net/hyperic/sigar/cmd/Who.java rename to bindings/java/src/org/hyperic/sigar/cmd/Who.java index bd5fd131..846621a5 100644 --- a/bindings/java/src/net/hyperic/sigar/cmd/Who.java +++ b/bindings/java/src/org/hyperic/sigar/cmd/Who.java @@ -1,9 +1,9 @@ -package net.hyperic.sigar.cmd; +package org.hyperic.sigar.cmd; import java.util.Date; import java.text.SimpleDateFormat; -import net.hyperic.sigar.SigarException; +import org.hyperic.sigar.SigarException; public class Who extends SigarCommandBase { @@ -28,7 +28,7 @@ public class Who extends SigarCommandBase { } public void output(String[] args) throws SigarException { - net.hyperic.sigar.Who[] who = this.sigar.getWhoList(); + org.hyperic.sigar.Who[] who = this.sigar.getWhoList(); for (int i=0; i 0) { if (type.startsWith("Proc")) { arg = this.pids.getName(iter); diff --git a/bindings/java/src/net/hyperic/sigar/test/RunThreadCpu.java b/bindings/java/src/org/hyperic/sigar/test/RunThreadCpu.java similarity index 96% rename from bindings/java/src/net/hyperic/sigar/test/RunThreadCpu.java rename to bindings/java/src/org/hyperic/sigar/test/RunThreadCpu.java index f52c4d94..4d900a16 100644 --- a/bindings/java/src/net/hyperic/sigar/test/RunThreadCpu.java +++ b/bindings/java/src/org/hyperic/sigar/test/RunThreadCpu.java @@ -1,11 +1,11 @@ -package net.hyperic.sigar.test; +package org.hyperic.sigar.test; import java.io.File; import java.io.FileInputStream; -import net.hyperic.sigar.Sigar; -import net.hyperic.sigar.SigarException; -import net.hyperic.sigar.ThreadCpu; +import org.hyperic.sigar.Sigar; +import org.hyperic.sigar.SigarException; +import org.hyperic.sigar.ThreadCpu; //import java.lang.management.ManagementFactory; diff --git a/bindings/java/src/net/hyperic/sigar/test/SigarTestCase.java b/bindings/java/src/org/hyperic/sigar/test/SigarTestCase.java similarity index 97% rename from bindings/java/src/net/hyperic/sigar/test/SigarTestCase.java rename to bindings/java/src/org/hyperic/sigar/test/SigarTestCase.java index 9ca761a3..6e9d05fe 100644 --- a/bindings/java/src/net/hyperic/sigar/test/SigarTestCase.java +++ b/bindings/java/src/org/hyperic/sigar/test/SigarTestCase.java @@ -1,4 +1,4 @@ -package net.hyperic.sigar.test; +package org.hyperic.sigar.test; import java.io.PrintStream; import java.io.IOException; @@ -9,7 +9,7 @@ import java.util.Properties; import junit.framework.TestCase; -import net.hyperic.sigar.Sigar; +import org.hyperic.sigar.Sigar; //helper to add optional tracing. public abstract class SigarTestCase extends TestCase { diff --git a/bindings/java/src/net/hyperic/sigar/test/SigarTestPrinter.java b/bindings/java/src/org/hyperic/sigar/test/SigarTestPrinter.java similarity index 98% rename from bindings/java/src/net/hyperic/sigar/test/SigarTestPrinter.java rename to bindings/java/src/org/hyperic/sigar/test/SigarTestPrinter.java index 8baab2fe..d2f35f0a 100644 --- a/bindings/java/src/net/hyperic/sigar/test/SigarTestPrinter.java +++ b/bindings/java/src/org/hyperic/sigar/test/SigarTestPrinter.java @@ -1,4 +1,4 @@ -package net.hyperic.sigar.test; +package org.hyperic.sigar.test; import java.io.PrintStream; import java.util.HashMap; @@ -12,7 +12,7 @@ import junit.framework.TestSuite; import junit.textui.ResultPrinter; import junit.textui.TestRunner; -import net.hyperic.sigar.cmd.Version; +import org.hyperic.sigar.cmd.Version; import org.apache.log4j.PropertyConfigurator; diff --git a/bindings/java/src/net/hyperic/sigar/test/SigarTestRunner.java b/bindings/java/src/org/hyperic/sigar/test/SigarTestRunner.java similarity index 85% rename from bindings/java/src/net/hyperic/sigar/test/SigarTestRunner.java rename to bindings/java/src/org/hyperic/sigar/test/SigarTestRunner.java index 4674b612..a3f22743 100644 --- a/bindings/java/src/net/hyperic/sigar/test/SigarTestRunner.java +++ b/bindings/java/src/org/hyperic/sigar/test/SigarTestRunner.java @@ -1,19 +1,19 @@ -package net.hyperic.sigar.test; +package org.hyperic.sigar.test; import java.util.ArrayList; import java.util.Collection; -import net.hyperic.sigar.SigarException; -import net.hyperic.sigar.SigarLoader; +import org.hyperic.sigar.SigarException; +import org.hyperic.sigar.SigarLoader; -import net.hyperic.sigar.cmd.SigarCommandBase; -import net.hyperic.sigar.cmd.Shell; +import org.hyperic.sigar.cmd.SigarCommandBase; +import org.hyperic.sigar.cmd.Shell; -import net.hyperic.sigar.win32.test.TestEventLog; -import net.hyperic.sigar.win32.test.TestMetaBase; -import net.hyperic.sigar.win32.test.TestPdh; -import net.hyperic.sigar.win32.test.TestRegistryKey; -import net.hyperic.sigar.win32.test.TestService; +import org.hyperic.sigar.win32.test.TestEventLog; +import org.hyperic.sigar.win32.test.TestMetaBase; +import org.hyperic.sigar.win32.test.TestPdh; +import org.hyperic.sigar.win32.test.TestRegistryKey; +import org.hyperic.sigar.win32.test.TestService; public class SigarTestRunner extends SigarCommandBase { diff --git a/bindings/java/src/net/hyperic/sigar/test/TestCpu.java b/bindings/java/src/org/hyperic/sigar/test/TestCpu.java similarity index 91% rename from bindings/java/src/net/hyperic/sigar/test/TestCpu.java rename to bindings/java/src/org/hyperic/sigar/test/TestCpu.java index 7c61c06a..06ef4be6 100644 --- a/bindings/java/src/net/hyperic/sigar/test/TestCpu.java +++ b/bindings/java/src/org/hyperic/sigar/test/TestCpu.java @@ -1,10 +1,10 @@ -package net.hyperic.sigar.test; +package org.hyperic.sigar.test; -import net.hyperic.sigar.Sigar; -import net.hyperic.sigar.SigarException; -import net.hyperic.sigar.SigarNotImplementedException; -import net.hyperic.sigar.Cpu; -import net.hyperic.sigar.CpuPerc; +import org.hyperic.sigar.Sigar; +import org.hyperic.sigar.SigarException; +import org.hyperic.sigar.SigarNotImplementedException; +import org.hyperic.sigar.Cpu; +import org.hyperic.sigar.CpuPerc; public class TestCpu extends SigarTestCase { diff --git a/bindings/java/src/net/hyperic/sigar/test/TestCpuInfo.java b/bindings/java/src/org/hyperic/sigar/test/TestCpuInfo.java similarity index 88% rename from bindings/java/src/net/hyperic/sigar/test/TestCpuInfo.java rename to bindings/java/src/org/hyperic/sigar/test/TestCpuInfo.java index 30951ac4..9181bbb5 100644 --- a/bindings/java/src/net/hyperic/sigar/test/TestCpuInfo.java +++ b/bindings/java/src/org/hyperic/sigar/test/TestCpuInfo.java @@ -1,7 +1,7 @@ -package net.hyperic.sigar.test; +package org.hyperic.sigar.test; -import net.hyperic.sigar.Sigar; -import net.hyperic.sigar.CpuInfo; +import org.hyperic.sigar.Sigar; +import org.hyperic.sigar.CpuInfo; public class TestCpuInfo extends SigarTestCase { diff --git a/bindings/java/src/net/hyperic/sigar/test/TestFQDN.java b/bindings/java/src/org/hyperic/sigar/test/TestFQDN.java similarity index 96% rename from bindings/java/src/net/hyperic/sigar/test/TestFQDN.java rename to bindings/java/src/org/hyperic/sigar/test/TestFQDN.java index be47a644..15c5be6c 100644 --- a/bindings/java/src/net/hyperic/sigar/test/TestFQDN.java +++ b/bindings/java/src/org/hyperic/sigar/test/TestFQDN.java @@ -1,4 +1,4 @@ -package net.hyperic.sigar.test; +package org.hyperic.sigar.test; public class TestFQDN extends SigarTestCase { diff --git a/bindings/java/src/net/hyperic/sigar/test/TestFileInfo.java b/bindings/java/src/org/hyperic/sigar/test/TestFileInfo.java similarity index 94% rename from bindings/java/src/net/hyperic/sigar/test/TestFileInfo.java rename to bindings/java/src/org/hyperic/sigar/test/TestFileInfo.java index 30e9e785..53a22530 100644 --- a/bindings/java/src/net/hyperic/sigar/test/TestFileInfo.java +++ b/bindings/java/src/org/hyperic/sigar/test/TestFileInfo.java @@ -1,15 +1,15 @@ -package net.hyperic.sigar.test; +package org.hyperic.sigar.test; import java.io.IOException; import java.io.File; import java.io.FileOutputStream; import java.util.Date; -import net.hyperic.sigar.Sigar; -import net.hyperic.sigar.SigarException; -import net.hyperic.sigar.SigarNotImplementedException; -import net.hyperic.sigar.DirStat; -import net.hyperic.sigar.FileInfo; +import org.hyperic.sigar.Sigar; +import org.hyperic.sigar.SigarException; +import org.hyperic.sigar.SigarNotImplementedException; +import org.hyperic.sigar.DirStat; +import org.hyperic.sigar.FileInfo; public class TestFileInfo extends SigarTestCase { diff --git a/bindings/java/src/net/hyperic/sigar/test/TestFileSystem.java b/bindings/java/src/org/hyperic/sigar/test/TestFileSystem.java similarity index 90% rename from bindings/java/src/net/hyperic/sigar/test/TestFileSystem.java rename to bindings/java/src/org/hyperic/sigar/test/TestFileSystem.java index 78288057..05a329d3 100644 --- a/bindings/java/src/net/hyperic/sigar/test/TestFileSystem.java +++ b/bindings/java/src/org/hyperic/sigar/test/TestFileSystem.java @@ -1,10 +1,10 @@ -package net.hyperic.sigar.test; +package org.hyperic.sigar.test; -import net.hyperic.sigar.Sigar; -import net.hyperic.sigar.SigarException; -import net.hyperic.sigar.FileSystem; -import net.hyperic.sigar.FileSystemMap; -import net.hyperic.sigar.FileSystemUsage; +import org.hyperic.sigar.Sigar; +import org.hyperic.sigar.SigarException; +import org.hyperic.sigar.FileSystem; +import org.hyperic.sigar.FileSystemMap; +import org.hyperic.sigar.FileSystemUsage; public class TestFileSystem extends SigarTestCase { diff --git a/bindings/java/src/net/hyperic/sigar/test/TestInvoker.java b/bindings/java/src/org/hyperic/sigar/test/TestInvoker.java similarity index 91% rename from bindings/java/src/net/hyperic/sigar/test/TestInvoker.java rename to bindings/java/src/org/hyperic/sigar/test/TestInvoker.java index 218bb856..b10ba0e1 100644 --- a/bindings/java/src/net/hyperic/sigar/test/TestInvoker.java +++ b/bindings/java/src/org/hyperic/sigar/test/TestInvoker.java @@ -1,11 +1,11 @@ -package net.hyperic.sigar.test; +package org.hyperic.sigar.test; -import net.hyperic.sigar.Sigar; -import net.hyperic.sigar.SigarException; -import net.hyperic.sigar.SigarNotImplementedException; -import net.hyperic.sigar.SigarProxy; -import net.hyperic.sigar.SigarProxyCache; -import net.hyperic.sigar.jmx.SigarInvokerJMX; +import org.hyperic.sigar.Sigar; +import org.hyperic.sigar.SigarException; +import org.hyperic.sigar.SigarNotImplementedException; +import org.hyperic.sigar.SigarProxy; +import org.hyperic.sigar.SigarProxyCache; +import org.hyperic.sigar.jmx.SigarInvokerJMX; public class TestInvoker extends SigarTestCase { diff --git a/bindings/java/src/net/hyperic/sigar/test/TestLoadAverage.java b/bindings/java/src/org/hyperic/sigar/test/TestLoadAverage.java similarity index 82% rename from bindings/java/src/net/hyperic/sigar/test/TestLoadAverage.java rename to bindings/java/src/org/hyperic/sigar/test/TestLoadAverage.java index 5e37b035..e75125bf 100644 --- a/bindings/java/src/net/hyperic/sigar/test/TestLoadAverage.java +++ b/bindings/java/src/org/hyperic/sigar/test/TestLoadAverage.java @@ -1,7 +1,7 @@ -package net.hyperic.sigar.test; +package org.hyperic.sigar.test; -import net.hyperic.sigar.Sigar; -import net.hyperic.sigar.SigarNotImplementedException; +import org.hyperic.sigar.Sigar; +import org.hyperic.sigar.SigarNotImplementedException; public class TestLoadAverage extends SigarTestCase { diff --git a/bindings/java/src/net/hyperic/sigar/test/TestLog.java b/bindings/java/src/org/hyperic/sigar/test/TestLog.java similarity index 83% rename from bindings/java/src/net/hyperic/sigar/test/TestLog.java rename to bindings/java/src/org/hyperic/sigar/test/TestLog.java index a1182b99..f74a6b99 100644 --- a/bindings/java/src/net/hyperic/sigar/test/TestLog.java +++ b/bindings/java/src/org/hyperic/sigar/test/TestLog.java @@ -1,6 +1,6 @@ -package net.hyperic.sigar.test; +package org.hyperic.sigar.test; -import net.hyperic.sigar.Sigar; +import org.hyperic.sigar.Sigar; public class TestLog extends SigarTestCase { diff --git a/bindings/java/src/net/hyperic/sigar/test/TestMem.java b/bindings/java/src/org/hyperic/sigar/test/TestMem.java similarity index 86% rename from bindings/java/src/net/hyperic/sigar/test/TestMem.java rename to bindings/java/src/org/hyperic/sigar/test/TestMem.java index f7278f91..18db019a 100644 --- a/bindings/java/src/net/hyperic/sigar/test/TestMem.java +++ b/bindings/java/src/org/hyperic/sigar/test/TestMem.java @@ -1,7 +1,7 @@ -package net.hyperic.sigar.test; +package org.hyperic.sigar.test; -import net.hyperic.sigar.Sigar; -import net.hyperic.sigar.Mem; +import org.hyperic.sigar.Sigar; +import org.hyperic.sigar.Mem; public class TestMem extends SigarTestCase { diff --git a/bindings/java/src/net/hyperic/sigar/test/TestNetIf.java b/bindings/java/src/org/hyperic/sigar/test/TestNetIf.java similarity index 89% rename from bindings/java/src/net/hyperic/sigar/test/TestNetIf.java rename to bindings/java/src/org/hyperic/sigar/test/TestNetIf.java index f258ccda..a8b202ab 100644 --- a/bindings/java/src/net/hyperic/sigar/test/TestNetIf.java +++ b/bindings/java/src/org/hyperic/sigar/test/TestNetIf.java @@ -1,11 +1,11 @@ -package net.hyperic.sigar.test; +package org.hyperic.sigar.test; -import net.hyperic.sigar.Sigar; -import net.hyperic.sigar.SigarException; -import net.hyperic.sigar.SigarNotImplementedException; -import net.hyperic.sigar.NetInterfaceConfig; -import net.hyperic.sigar.NetInterfaceStat; -import net.hyperic.sigar.NetFlags; +import org.hyperic.sigar.Sigar; +import org.hyperic.sigar.SigarException; +import org.hyperic.sigar.SigarNotImplementedException; +import org.hyperic.sigar.NetInterfaceConfig; +import org.hyperic.sigar.NetInterfaceStat; +import org.hyperic.sigar.NetFlags; public class TestNetIf extends SigarTestCase { diff --git a/bindings/java/src/net/hyperic/sigar/test/TestNetInfo.java b/bindings/java/src/org/hyperic/sigar/test/TestNetInfo.java similarity index 68% rename from bindings/java/src/net/hyperic/sigar/test/TestNetInfo.java rename to bindings/java/src/org/hyperic/sigar/test/TestNetInfo.java index 8f660fd6..72c0893c 100644 --- a/bindings/java/src/net/hyperic/sigar/test/TestNetInfo.java +++ b/bindings/java/src/org/hyperic/sigar/test/TestNetInfo.java @@ -1,7 +1,7 @@ -package net.hyperic.sigar.test; +package org.hyperic.sigar.test; -import net.hyperic.sigar.NetInfo; -import net.hyperic.sigar.SigarException; +import org.hyperic.sigar.NetInfo; +import org.hyperic.sigar.SigarException; public class TestNetInfo extends SigarTestCase { diff --git a/bindings/java/src/net/hyperic/sigar/test/TestNetRoute.java b/bindings/java/src/org/hyperic/sigar/test/TestNetRoute.java similarity index 75% rename from bindings/java/src/net/hyperic/sigar/test/TestNetRoute.java rename to bindings/java/src/org/hyperic/sigar/test/TestNetRoute.java index 340396a0..9a8b089b 100644 --- a/bindings/java/src/net/hyperic/sigar/test/TestNetRoute.java +++ b/bindings/java/src/org/hyperic/sigar/test/TestNetRoute.java @@ -1,8 +1,8 @@ -package net.hyperic.sigar.test; +package org.hyperic.sigar.test; -import net.hyperic.sigar.NetRoute; -import net.hyperic.sigar.SigarException; -import net.hyperic.sigar.SigarNotImplementedException; +import org.hyperic.sigar.NetRoute; +import org.hyperic.sigar.SigarException; +import org.hyperic.sigar.SigarNotImplementedException; public class TestNetRoute extends SigarTestCase { diff --git a/bindings/java/src/net/hyperic/sigar/test/TestNetStat.java b/bindings/java/src/org/hyperic/sigar/test/TestNetStat.java similarity index 84% rename from bindings/java/src/net/hyperic/sigar/test/TestNetStat.java rename to bindings/java/src/org/hyperic/sigar/test/TestNetStat.java index 021dd8a3..e5192d7b 100644 --- a/bindings/java/src/net/hyperic/sigar/test/TestNetStat.java +++ b/bindings/java/src/org/hyperic/sigar/test/TestNetStat.java @@ -1,10 +1,10 @@ -package net.hyperic.sigar.test; +package org.hyperic.sigar.test; -import net.hyperic.sigar.NetConnection; -import net.hyperic.sigar.NetFlags; -import net.hyperic.sigar.NetStat; -import net.hyperic.sigar.Sigar; -import net.hyperic.sigar.SigarNotImplementedException; +import org.hyperic.sigar.NetConnection; +import org.hyperic.sigar.NetFlags; +import org.hyperic.sigar.NetStat; +import org.hyperic.sigar.Sigar; +import org.hyperic.sigar.SigarNotImplementedException; public class TestNetStat extends SigarTestCase { private static boolean printListeners = diff --git a/bindings/java/src/net/hyperic/sigar/test/TestPTQL.java b/bindings/java/src/org/hyperic/sigar/test/TestPTQL.java similarity index 91% rename from bindings/java/src/net/hyperic/sigar/test/TestPTQL.java rename to bindings/java/src/org/hyperic/sigar/test/TestPTQL.java index 1af3ff14..5cfee1cc 100644 --- a/bindings/java/src/net/hyperic/sigar/test/TestPTQL.java +++ b/bindings/java/src/org/hyperic/sigar/test/TestPTQL.java @@ -1,15 +1,15 @@ -package net.hyperic.sigar.test; +package org.hyperic.sigar.test; -import net.hyperic.sigar.SigarException; -import net.hyperic.sigar.SigarProxy; -import net.hyperic.sigar.SigarProxyCache; -import net.hyperic.sigar.SigarNotImplementedException; +import org.hyperic.sigar.SigarException; +import org.hyperic.sigar.SigarProxy; +import org.hyperic.sigar.SigarProxyCache; +import org.hyperic.sigar.SigarNotImplementedException; -import net.hyperic.sigar.ptql.ProcessQuery; -import net.hyperic.sigar.ptql.ProcessQueryFactory; -import net.hyperic.sigar.ptql.ProcessFinder; -import net.hyperic.sigar.ptql.MalformedQueryException; -import net.hyperic.sigar.ptql.QueryLoadException; +import org.hyperic.sigar.ptql.ProcessQuery; +import org.hyperic.sigar.ptql.ProcessQueryFactory; +import org.hyperic.sigar.ptql.ProcessFinder; +import org.hyperic.sigar.ptql.MalformedQueryException; +import org.hyperic.sigar.ptql.QueryLoadException; public class TestPTQL extends SigarTestCase { diff --git a/bindings/java/src/net/hyperic/sigar/test/TestProcArgs.java b/bindings/java/src/org/hyperic/sigar/test/TestProcArgs.java similarity index 91% rename from bindings/java/src/net/hyperic/sigar/test/TestProcArgs.java rename to bindings/java/src/org/hyperic/sigar/test/TestProcArgs.java index b6b920bd..cf5d60b2 100644 --- a/bindings/java/src/net/hyperic/sigar/test/TestProcArgs.java +++ b/bindings/java/src/org/hyperic/sigar/test/TestProcArgs.java @@ -1,8 +1,8 @@ -package net.hyperic.sigar.test; +package org.hyperic.sigar.test; -import net.hyperic.sigar.Sigar; -import net.hyperic.sigar.SigarException; -import net.hyperic.sigar.SigarNotImplementedException; +import org.hyperic.sigar.Sigar; +import org.hyperic.sigar.SigarException; +import org.hyperic.sigar.SigarNotImplementedException; public class TestProcArgs extends SigarTestCase { diff --git a/bindings/java/src/net/hyperic/sigar/test/TestProcEnv.java b/bindings/java/src/org/hyperic/sigar/test/TestProcEnv.java similarity index 84% rename from bindings/java/src/net/hyperic/sigar/test/TestProcEnv.java rename to bindings/java/src/org/hyperic/sigar/test/TestProcEnv.java index afcbfb75..7f3c31ae 100644 --- a/bindings/java/src/net/hyperic/sigar/test/TestProcEnv.java +++ b/bindings/java/src/org/hyperic/sigar/test/TestProcEnv.java @@ -1,12 +1,12 @@ -package net.hyperic.sigar.test; +package org.hyperic.sigar.test; import java.io.File; import java.util.Map; -import net.hyperic.sigar.Sigar; -import net.hyperic.sigar.SigarException; -import net.hyperic.sigar.SigarNotImplementedException; -import net.hyperic.sigar.SigarPermissionDeniedException; +import org.hyperic.sigar.Sigar; +import org.hyperic.sigar.SigarException; +import org.hyperic.sigar.SigarNotImplementedException; +import org.hyperic.sigar.SigarPermissionDeniedException; public class TestProcEnv extends SigarTestCase { diff --git a/bindings/java/src/net/hyperic/sigar/test/TestProcExe.java b/bindings/java/src/org/hyperic/sigar/test/TestProcExe.java similarity index 90% rename from bindings/java/src/net/hyperic/sigar/test/TestProcExe.java rename to bindings/java/src/org/hyperic/sigar/test/TestProcExe.java index f09f35ff..61a33b39 100644 --- a/bindings/java/src/net/hyperic/sigar/test/TestProcExe.java +++ b/bindings/java/src/org/hyperic/sigar/test/TestProcExe.java @@ -1,11 +1,11 @@ -package net.hyperic.sigar.test; +package org.hyperic.sigar.test; import java.io.File; -import net.hyperic.sigar.Sigar; -import net.hyperic.sigar.SigarException; -import net.hyperic.sigar.ProcExe; -import net.hyperic.sigar.SigarNotImplementedException; +import org.hyperic.sigar.Sigar; +import org.hyperic.sigar.SigarException; +import org.hyperic.sigar.ProcExe; +import org.hyperic.sigar.SigarNotImplementedException; public class TestProcExe extends SigarTestCase { diff --git a/bindings/java/src/net/hyperic/sigar/test/TestProcFd.java b/bindings/java/src/org/hyperic/sigar/test/TestProcFd.java similarity index 80% rename from bindings/java/src/net/hyperic/sigar/test/TestProcFd.java rename to bindings/java/src/org/hyperic/sigar/test/TestProcFd.java index 432cc044..e58cbc4f 100644 --- a/bindings/java/src/net/hyperic/sigar/test/TestProcFd.java +++ b/bindings/java/src/org/hyperic/sigar/test/TestProcFd.java @@ -1,13 +1,13 @@ -package net.hyperic.sigar.test; +package org.hyperic.sigar.test; import java.io.File; import java.io.FileInputStream; -import net.hyperic.sigar.Sigar; -import net.hyperic.sigar.SigarException; -import net.hyperic.sigar.SigarLoader; -import net.hyperic.sigar.SigarNotImplementedException; -import net.hyperic.sigar.SigarPermissionDeniedException; +import org.hyperic.sigar.Sigar; +import org.hyperic.sigar.SigarException; +import org.hyperic.sigar.SigarLoader; +import org.hyperic.sigar.SigarNotImplementedException; +import org.hyperic.sigar.SigarPermissionDeniedException; public class TestProcFd extends SigarTestCase { diff --git a/bindings/java/src/net/hyperic/sigar/test/TestProcList.java b/bindings/java/src/org/hyperic/sigar/test/TestProcList.java similarity index 91% rename from bindings/java/src/net/hyperic/sigar/test/TestProcList.java rename to bindings/java/src/org/hyperic/sigar/test/TestProcList.java index 58675386..03821f09 100644 --- a/bindings/java/src/net/hyperic/sigar/test/TestProcList.java +++ b/bindings/java/src/org/hyperic/sigar/test/TestProcList.java @@ -1,8 +1,8 @@ -package net.hyperic.sigar.test; +package org.hyperic.sigar.test; import java.util.ArrayList; -import net.hyperic.sigar.Sigar; +import org.hyperic.sigar.Sigar; public class TestProcList extends SigarTestCase { diff --git a/bindings/java/src/net/hyperic/sigar/test/TestProcMem.java b/bindings/java/src/org/hyperic/sigar/test/TestProcMem.java similarity index 89% rename from bindings/java/src/net/hyperic/sigar/test/TestProcMem.java rename to bindings/java/src/org/hyperic/sigar/test/TestProcMem.java index 8ea29471..8619ba25 100644 --- a/bindings/java/src/net/hyperic/sigar/test/TestProcMem.java +++ b/bindings/java/src/org/hyperic/sigar/test/TestProcMem.java @@ -1,8 +1,8 @@ -package net.hyperic.sigar.test; +package org.hyperic.sigar.test; -import net.hyperic.sigar.Sigar; -import net.hyperic.sigar.SigarException; -import net.hyperic.sigar.ProcMem; +import org.hyperic.sigar.Sigar; +import org.hyperic.sigar.SigarException; +import org.hyperic.sigar.ProcMem; public class TestProcMem extends SigarTestCase { diff --git a/bindings/java/src/net/hyperic/sigar/test/TestProcModules.java b/bindings/java/src/org/hyperic/sigar/test/TestProcModules.java similarity index 87% rename from bindings/java/src/net/hyperic/sigar/test/TestProcModules.java rename to bindings/java/src/org/hyperic/sigar/test/TestProcModules.java index 5e3096ee..3d278f34 100644 --- a/bindings/java/src/net/hyperic/sigar/test/TestProcModules.java +++ b/bindings/java/src/org/hyperic/sigar/test/TestProcModules.java @@ -1,10 +1,10 @@ -package net.hyperic.sigar.test; +package org.hyperic.sigar.test; import java.util.List; -import net.hyperic.sigar.Sigar; -import net.hyperic.sigar.SigarException; -import net.hyperic.sigar.SigarNotImplementedException; +import org.hyperic.sigar.Sigar; +import org.hyperic.sigar.SigarException; +import org.hyperic.sigar.SigarNotImplementedException; public class TestProcModules extends SigarTestCase { diff --git a/bindings/java/src/net/hyperic/sigar/test/TestProcStat.java b/bindings/java/src/org/hyperic/sigar/test/TestProcStat.java similarity index 85% rename from bindings/java/src/net/hyperic/sigar/test/TestProcStat.java rename to bindings/java/src/org/hyperic/sigar/test/TestProcStat.java index 53aeb02f..16915b24 100644 --- a/bindings/java/src/net/hyperic/sigar/test/TestProcStat.java +++ b/bindings/java/src/org/hyperic/sigar/test/TestProcStat.java @@ -1,7 +1,7 @@ -package net.hyperic.sigar.test; +package org.hyperic.sigar.test; -import net.hyperic.sigar.Sigar; -import net.hyperic.sigar.ProcStat; +import org.hyperic.sigar.Sigar; +import org.hyperic.sigar.ProcStat; public class TestProcStat extends SigarTestCase { diff --git a/bindings/java/src/net/hyperic/sigar/test/TestProcState.java b/bindings/java/src/org/hyperic/sigar/test/TestProcState.java similarity index 88% rename from bindings/java/src/net/hyperic/sigar/test/TestProcState.java rename to bindings/java/src/org/hyperic/sigar/test/TestProcState.java index 51fdbc0f..333815e6 100644 --- a/bindings/java/src/net/hyperic/sigar/test/TestProcState.java +++ b/bindings/java/src/org/hyperic/sigar/test/TestProcState.java @@ -1,8 +1,8 @@ -package net.hyperic.sigar.test; +package org.hyperic.sigar.test; -import net.hyperic.sigar.Sigar; -import net.hyperic.sigar.SigarException; -import net.hyperic.sigar.ProcState; +import org.hyperic.sigar.Sigar; +import org.hyperic.sigar.SigarException; +import org.hyperic.sigar.ProcState; public class TestProcState extends SigarTestCase { diff --git a/bindings/java/src/net/hyperic/sigar/test/TestProcTime.java b/bindings/java/src/org/hyperic/sigar/test/TestProcTime.java similarity index 85% rename from bindings/java/src/net/hyperic/sigar/test/TestProcTime.java rename to bindings/java/src/org/hyperic/sigar/test/TestProcTime.java index 019e7d01..64978b4c 100644 --- a/bindings/java/src/net/hyperic/sigar/test/TestProcTime.java +++ b/bindings/java/src/org/hyperic/sigar/test/TestProcTime.java @@ -1,10 +1,10 @@ -package net.hyperic.sigar.test; +package org.hyperic.sigar.test; import java.util.Date; -import net.hyperic.sigar.Sigar; -import net.hyperic.sigar.SigarException; -import net.hyperic.sigar.ProcTime; +import org.hyperic.sigar.Sigar; +import org.hyperic.sigar.SigarException; +import org.hyperic.sigar.ProcTime; public class TestProcTime extends SigarTestCase { diff --git a/bindings/java/src/net/hyperic/sigar/test/TestResourceLimit.java b/bindings/java/src/org/hyperic/sigar/test/TestResourceLimit.java similarity index 69% rename from bindings/java/src/net/hyperic/sigar/test/TestResourceLimit.java rename to bindings/java/src/org/hyperic/sigar/test/TestResourceLimit.java index b3c6df33..41ba5764 100644 --- a/bindings/java/src/net/hyperic/sigar/test/TestResourceLimit.java +++ b/bindings/java/src/org/hyperic/sigar/test/TestResourceLimit.java @@ -1,7 +1,7 @@ -package net.hyperic.sigar.test; +package org.hyperic.sigar.test; -import net.hyperic.sigar.ResourceLimit; -import net.hyperic.sigar.SigarException; +import org.hyperic.sigar.ResourceLimit; +import org.hyperic.sigar.SigarException; public class TestResourceLimit extends SigarTestCase { diff --git a/bindings/java/src/net/hyperic/sigar/test/TestSwap.java b/bindings/java/src/org/hyperic/sigar/test/TestSwap.java similarity index 85% rename from bindings/java/src/net/hyperic/sigar/test/TestSwap.java rename to bindings/java/src/org/hyperic/sigar/test/TestSwap.java index d97395a3..92a876c3 100644 --- a/bindings/java/src/net/hyperic/sigar/test/TestSwap.java +++ b/bindings/java/src/org/hyperic/sigar/test/TestSwap.java @@ -1,7 +1,7 @@ -package net.hyperic.sigar.test; +package org.hyperic.sigar.test; -import net.hyperic.sigar.Sigar; -import net.hyperic.sigar.Swap; +import org.hyperic.sigar.Sigar; +import org.hyperic.sigar.Swap; public class TestSwap extends SigarTestCase { diff --git a/bindings/java/src/net/hyperic/sigar/test/TestThreadCpu.java b/bindings/java/src/org/hyperic/sigar/test/TestThreadCpu.java similarity index 82% rename from bindings/java/src/net/hyperic/sigar/test/TestThreadCpu.java rename to bindings/java/src/org/hyperic/sigar/test/TestThreadCpu.java index dbbc15d7..c329e27d 100644 --- a/bindings/java/src/net/hyperic/sigar/test/TestThreadCpu.java +++ b/bindings/java/src/org/hyperic/sigar/test/TestThreadCpu.java @@ -1,9 +1,9 @@ -package net.hyperic.sigar.test; +package org.hyperic.sigar.test; -import net.hyperic.sigar.CpuTimer; -import net.hyperic.sigar.Sigar; -import net.hyperic.sigar.SigarNotImplementedException; -import net.hyperic.sigar.ThreadCpu; +import org.hyperic.sigar.CpuTimer; +import org.hyperic.sigar.Sigar; +import org.hyperic.sigar.SigarNotImplementedException; +import org.hyperic.sigar.ThreadCpu; public class TestThreadCpu extends SigarTestCase { diff --git a/bindings/java/src/net/hyperic/sigar/test/TestThreads.java b/bindings/java/src/org/hyperic/sigar/test/TestThreads.java similarity index 91% rename from bindings/java/src/net/hyperic/sigar/test/TestThreads.java rename to bindings/java/src/org/hyperic/sigar/test/TestThreads.java index d5c88f2c..1195a7ea 100644 --- a/bindings/java/src/net/hyperic/sigar/test/TestThreads.java +++ b/bindings/java/src/org/hyperic/sigar/test/TestThreads.java @@ -1,4 +1,4 @@ -package net.hyperic.sigar.test; +package org.hyperic.sigar.test; import java.io.ByteArrayOutputStream; import java.io.PrintStream; @@ -7,11 +7,11 @@ import java.util.ArrayList; import junit.framework.TestCase; -import net.hyperic.sigar.Sigar; -import net.hyperic.sigar.SigarException; -import net.hyperic.sigar.SigarProxy; -import net.hyperic.sigar.SigarProxyCache; -import net.hyperic.sigar.test.Proxy; +import org.hyperic.sigar.Sigar; +import org.hyperic.sigar.SigarException; +import org.hyperic.sigar.SigarProxy; +import org.hyperic.sigar.SigarProxyCache; +import org.hyperic.sigar.test.Proxy; //test concurrency public class TestThreads extends TestCase { diff --git a/bindings/java/src/net/hyperic/sigar/test/TestUptime.java b/bindings/java/src/org/hyperic/sigar/test/TestUptime.java similarity index 75% rename from bindings/java/src/net/hyperic/sigar/test/TestUptime.java rename to bindings/java/src/org/hyperic/sigar/test/TestUptime.java index 23ef47e8..74bf76dd 100644 --- a/bindings/java/src/net/hyperic/sigar/test/TestUptime.java +++ b/bindings/java/src/org/hyperic/sigar/test/TestUptime.java @@ -1,7 +1,7 @@ -package net.hyperic.sigar.test; +package org.hyperic.sigar.test; -import net.hyperic.sigar.Sigar; -import net.hyperic.sigar.Uptime; +import org.hyperic.sigar.Sigar; +import org.hyperic.sigar.Uptime; public class TestUptime extends SigarTestCase { diff --git a/bindings/java/src/net/hyperic/sigar/test/TestWho.java b/bindings/java/src/org/hyperic/sigar/test/TestWho.java similarity index 68% rename from bindings/java/src/net/hyperic/sigar/test/TestWho.java rename to bindings/java/src/org/hyperic/sigar/test/TestWho.java index c77ac765..e7e81a1f 100644 --- a/bindings/java/src/net/hyperic/sigar/test/TestWho.java +++ b/bindings/java/src/org/hyperic/sigar/test/TestWho.java @@ -1,8 +1,8 @@ -package net.hyperic.sigar.test; +package org.hyperic.sigar.test; -import net.hyperic.sigar.OperatingSystem; -import net.hyperic.sigar.SigarException; -import net.hyperic.sigar.Who; +import org.hyperic.sigar.OperatingSystem; +import org.hyperic.sigar.SigarException; +import org.hyperic.sigar.Who; public class TestWho extends SigarTestCase { diff --git a/bindings/java/src/net/hyperic/sigar/util/Getline.java b/bindings/java/src/org/hyperic/sigar/util/Getline.java similarity index 98% rename from bindings/java/src/net/hyperic/sigar/util/Getline.java rename to bindings/java/src/org/hyperic/sigar/util/Getline.java index fd07af86..53ebf5f9 100644 --- a/bindings/java/src/net/hyperic/sigar/util/Getline.java +++ b/bindings/java/src/org/hyperic/sigar/util/Getline.java @@ -1,4 +1,4 @@ -package net.hyperic.sigar.util; +package org.hyperic.sigar.util; import java.io.BufferedReader; import java.io.IOException; diff --git a/bindings/java/src/net/hyperic/sigar/util/GetlineCompleter.java b/bindings/java/src/org/hyperic/sigar/util/GetlineCompleter.java similarity index 71% rename from bindings/java/src/net/hyperic/sigar/util/GetlineCompleter.java rename to bindings/java/src/org/hyperic/sigar/util/GetlineCompleter.java index dbf37bd1..739e94f7 100644 --- a/bindings/java/src/net/hyperic/sigar/util/GetlineCompleter.java +++ b/bindings/java/src/org/hyperic/sigar/util/GetlineCompleter.java @@ -1,4 +1,4 @@ -package net.hyperic.sigar.util; +package org.hyperic.sigar.util; public interface GetlineCompleter { diff --git a/bindings/java/src/net/hyperic/sigar/util/IteratorIterator.java b/bindings/java/src/org/hyperic/sigar/util/IteratorIterator.java similarity index 97% rename from bindings/java/src/net/hyperic/sigar/util/IteratorIterator.java rename to bindings/java/src/org/hyperic/sigar/util/IteratorIterator.java index 048e8044..a89b4746 100644 --- a/bindings/java/src/net/hyperic/sigar/util/IteratorIterator.java +++ b/bindings/java/src/org/hyperic/sigar/util/IteratorIterator.java @@ -1,4 +1,4 @@ -package net.hyperic.sigar.util; +package org.hyperic.sigar.util; import java.util.ArrayList; import java.util.Iterator; diff --git a/bindings/java/src/net/hyperic/sigar/util/PrintfFormat.java b/bindings/java/src/org/hyperic/sigar/util/PrintfFormat.java similarity index 99% rename from bindings/java/src/net/hyperic/sigar/util/PrintfFormat.java rename to bindings/java/src/org/hyperic/sigar/util/PrintfFormat.java index a6f12540..4b22207d 100644 --- a/bindings/java/src/net/hyperic/sigar/util/PrintfFormat.java +++ b/bindings/java/src/org/hyperic/sigar/util/PrintfFormat.java @@ -26,7 +26,7 @@ // information for the Java Technology. // -package net.hyperic.sigar.util; +package org.hyperic.sigar.util; import java.util.Enumeration; import java.util.Vector; diff --git a/bindings/java/src/net/hyperic/sigar/util/ReferenceMap.java b/bindings/java/src/org/hyperic/sigar/util/ReferenceMap.java similarity index 96% rename from bindings/java/src/net/hyperic/sigar/util/ReferenceMap.java rename to bindings/java/src/org/hyperic/sigar/util/ReferenceMap.java index d5111590..66aec6a0 100644 --- a/bindings/java/src/net/hyperic/sigar/util/ReferenceMap.java +++ b/bindings/java/src/org/hyperic/sigar/util/ReferenceMap.java @@ -1,4 +1,4 @@ -package net.hyperic.sigar.util; +package org.hyperic.sigar.util; import java.util.AbstractMap; import java.util.Collections; @@ -14,7 +14,7 @@ import java.lang.ref.WeakReference; public class ReferenceMap extends AbstractMap { private static final boolean SOFTCACHE = - ! "false".equals(System.getProperty("net.hyperic.sigar.softcache")); + ! "false".equals(System.getProperty("org.hyperic.sigar.softcache")); protected ReferenceQueue queue; protected Map map; diff --git a/bindings/java/src/net/hyperic/sigar/util/WeakReferenceMap.java b/bindings/java/src/org/hyperic/sigar/util/WeakReferenceMap.java similarity index 87% rename from bindings/java/src/net/hyperic/sigar/util/WeakReferenceMap.java rename to bindings/java/src/org/hyperic/sigar/util/WeakReferenceMap.java index 851c1baf..8a56b79b 100644 --- a/bindings/java/src/net/hyperic/sigar/util/WeakReferenceMap.java +++ b/bindings/java/src/org/hyperic/sigar/util/WeakReferenceMap.java @@ -1,4 +1,4 @@ -package net.hyperic.sigar.util; +package org.hyperic.sigar.util; public class WeakReferenceMap extends ReferenceMap { diff --git a/bindings/java/src/net/hyperic/sigar/util/package.html b/bindings/java/src/org/hyperic/sigar/util/package.html similarity index 100% rename from bindings/java/src/net/hyperic/sigar/util/package.html rename to bindings/java/src/org/hyperic/sigar/util/package.html diff --git a/bindings/java/src/net/hyperic/sigar/win32/EventLog.java b/bindings/java/src/org/hyperic/sigar/win32/EventLog.java similarity index 99% rename from bindings/java/src/net/hyperic/sigar/win32/EventLog.java rename to bindings/java/src/org/hyperic/sigar/win32/EventLog.java index bdfa4139..1ea0e65b 100644 --- a/bindings/java/src/net/hyperic/sigar/win32/EventLog.java +++ b/bindings/java/src/org/hyperic/sigar/win32/EventLog.java @@ -1,4 +1,4 @@ -package net.hyperic.sigar.win32; +package org.hyperic.sigar.win32; public class EventLog extends Win32 { diff --git a/bindings/java/src/net/hyperic/sigar/win32/EventLogNotification.java b/bindings/java/src/org/hyperic/sigar/win32/EventLogNotification.java similarity index 91% rename from bindings/java/src/net/hyperic/sigar/win32/EventLogNotification.java rename to bindings/java/src/org/hyperic/sigar/win32/EventLogNotification.java index 44b89a41..21c3cf3b 100644 --- a/bindings/java/src/net/hyperic/sigar/win32/EventLogNotification.java +++ b/bindings/java/src/org/hyperic/sigar/win32/EventLogNotification.java @@ -1,4 +1,4 @@ -package net.hyperic.sigar.win32; +package org.hyperic.sigar.win32; /** * Register for event log notifications. diff --git a/bindings/java/src/net/hyperic/sigar/win32/EventLogRecord.java b/bindings/java/src/org/hyperic/sigar/win32/EventLogRecord.java similarity index 98% rename from bindings/java/src/net/hyperic/sigar/win32/EventLogRecord.java rename to bindings/java/src/org/hyperic/sigar/win32/EventLogRecord.java index 28e23d00..ef3a020e 100644 --- a/bindings/java/src/net/hyperic/sigar/win32/EventLogRecord.java +++ b/bindings/java/src/org/hyperic/sigar/win32/EventLogRecord.java @@ -1,4 +1,4 @@ -package net.hyperic.sigar.win32; +package org.hyperic.sigar.win32; /** * Class to represent event log records diff --git a/bindings/java/src/net/hyperic/sigar/win32/EventLogThread.java b/bindings/java/src/org/hyperic/sigar/win32/EventLogThread.java similarity index 99% rename from bindings/java/src/net/hyperic/sigar/win32/EventLogThread.java rename to bindings/java/src/org/hyperic/sigar/win32/EventLogThread.java index 15f0e61d..fae7c1ed 100644 --- a/bindings/java/src/net/hyperic/sigar/win32/EventLogThread.java +++ b/bindings/java/src/org/hyperic/sigar/win32/EventLogThread.java @@ -1,4 +1,4 @@ -package net.hyperic.sigar.win32; +package org.hyperic.sigar.win32; import java.io.IOException; import java.util.Collections; diff --git a/bindings/java/src/net/hyperic/sigar/win32/MetaBase.java b/bindings/java/src/org/hyperic/sigar/win32/MetaBase.java similarity index 99% rename from bindings/java/src/net/hyperic/sigar/win32/MetaBase.java rename to bindings/java/src/org/hyperic/sigar/win32/MetaBase.java index 26ec71aa..82a5a436 100644 --- a/bindings/java/src/net/hyperic/sigar/win32/MetaBase.java +++ b/bindings/java/src/org/hyperic/sigar/win32/MetaBase.java @@ -1,4 +1,4 @@ -package net.hyperic.sigar.win32; +package org.hyperic.sigar.win32; import java.util.Collection; import java.util.Vector; diff --git a/bindings/java/src/net/hyperic/sigar/win32/Pdh.java b/bindings/java/src/org/hyperic/sigar/win32/Pdh.java similarity index 99% rename from bindings/java/src/net/hyperic/sigar/win32/Pdh.java rename to bindings/java/src/org/hyperic/sigar/win32/Pdh.java index d5f1865a..b4db1c97 100644 --- a/bindings/java/src/net/hyperic/sigar/win32/Pdh.java +++ b/bindings/java/src/org/hyperic/sigar/win32/Pdh.java @@ -1,4 +1,4 @@ -package net.hyperic.sigar.win32; +package org.hyperic.sigar.win32; import java.util.ArrayList; import java.util.List; diff --git a/bindings/java/src/net/hyperic/sigar/win32/RegistryKey.java b/bindings/java/src/org/hyperic/sigar/win32/RegistryKey.java similarity index 99% rename from bindings/java/src/net/hyperic/sigar/win32/RegistryKey.java rename to bindings/java/src/org/hyperic/sigar/win32/RegistryKey.java index f9b5e2b5..7d326a97 100644 --- a/bindings/java/src/net/hyperic/sigar/win32/RegistryKey.java +++ b/bindings/java/src/org/hyperic/sigar/win32/RegistryKey.java @@ -1,4 +1,4 @@ -package net.hyperic.sigar.win32; +package org.hyperic.sigar.win32; import java.util.Collection; import java.util.Vector; diff --git a/bindings/java/src/net/hyperic/sigar/win32/Service.java b/bindings/java/src/org/hyperic/sigar/win32/Service.java similarity index 99% rename from bindings/java/src/net/hyperic/sigar/win32/Service.java rename to bindings/java/src/org/hyperic/sigar/win32/Service.java index 0c7819ee..efbf126b 100644 --- a/bindings/java/src/net/hyperic/sigar/win32/Service.java +++ b/bindings/java/src/org/hyperic/sigar/win32/Service.java @@ -1,4 +1,4 @@ -package net.hyperic.sigar.win32; +package org.hyperic.sigar.win32; import java.io.PrintStream; import java.util.Arrays; diff --git a/bindings/java/src/net/hyperic/sigar/win32/ServiceConfig.java b/bindings/java/src/org/hyperic/sigar/win32/ServiceConfig.java similarity index 99% rename from bindings/java/src/net/hyperic/sigar/win32/ServiceConfig.java rename to bindings/java/src/org/hyperic/sigar/win32/ServiceConfig.java index affd441d..bc154b74 100644 --- a/bindings/java/src/net/hyperic/sigar/win32/ServiceConfig.java +++ b/bindings/java/src/org/hyperic/sigar/win32/ServiceConfig.java @@ -1,4 +1,4 @@ -package net.hyperic.sigar.win32; +package org.hyperic.sigar.win32; import java.util.ArrayList; import java.util.List; diff --git a/bindings/java/src/net/hyperic/sigar/win32/Win32.java b/bindings/java/src/org/hyperic/sigar/win32/Win32.java similarity index 94% rename from bindings/java/src/net/hyperic/sigar/win32/Win32.java rename to bindings/java/src/org/hyperic/sigar/win32/Win32.java index 33f7c208..749de859 100644 --- a/bindings/java/src/net/hyperic/sigar/win32/Win32.java +++ b/bindings/java/src/org/hyperic/sigar/win32/Win32.java @@ -1,9 +1,9 @@ -package net.hyperic.sigar.win32; +package org.hyperic.sigar.win32; import java.io.File; -import net.hyperic.sigar.Sigar; -import net.hyperic.sigar.SigarException; +import org.hyperic.sigar.Sigar; +import org.hyperic.sigar.SigarException; public abstract class Win32 { diff --git a/bindings/java/src/net/hyperic/sigar/win32/Win32Exception.java b/bindings/java/src/org/hyperic/sigar/win32/Win32Exception.java similarity index 80% rename from bindings/java/src/net/hyperic/sigar/win32/Win32Exception.java rename to bindings/java/src/org/hyperic/sigar/win32/Win32Exception.java index b32e3907..922b3685 100644 --- a/bindings/java/src/net/hyperic/sigar/win32/Win32Exception.java +++ b/bindings/java/src/org/hyperic/sigar/win32/Win32Exception.java @@ -1,6 +1,6 @@ -package net.hyperic.sigar.win32; +package org.hyperic.sigar.win32; -import net.hyperic.sigar.SigarException; +import org.hyperic.sigar.SigarException; public class Win32Exception extends SigarException { diff --git a/bindings/java/src/net/hyperic/sigar/win32/test/TestEventLog.java b/bindings/java/src/org/hyperic/sigar/win32/test/TestEventLog.java similarity index 92% rename from bindings/java/src/net/hyperic/sigar/win32/test/TestEventLog.java rename to bindings/java/src/org/hyperic/sigar/win32/test/TestEventLog.java index 193ea04d..a7e7e94c 100644 --- a/bindings/java/src/net/hyperic/sigar/win32/test/TestEventLog.java +++ b/bindings/java/src/org/hyperic/sigar/win32/test/TestEventLog.java @@ -1,11 +1,11 @@ -package net.hyperic.sigar.win32.test; +package org.hyperic.sigar.win32.test; -import net.hyperic.sigar.test.SigarTestCase; -import net.hyperic.sigar.win32.EventLog; -import net.hyperic.sigar.win32.EventLogNotification; -import net.hyperic.sigar.win32.EventLogRecord; -import net.hyperic.sigar.win32.EventLogThread; -import net.hyperic.sigar.win32.Win32Exception; +import org.hyperic.sigar.test.SigarTestCase; +import org.hyperic.sigar.win32.EventLog; +import org.hyperic.sigar.win32.EventLogNotification; +import org.hyperic.sigar.win32.EventLogRecord; +import org.hyperic.sigar.win32.EventLogThread; +import org.hyperic.sigar.win32.Win32Exception; public class TestEventLog extends SigarTestCase { diff --git a/bindings/java/src/net/hyperic/sigar/win32/test/TestMetaBase.java b/bindings/java/src/org/hyperic/sigar/win32/test/TestMetaBase.java similarity index 92% rename from bindings/java/src/net/hyperic/sigar/win32/test/TestMetaBase.java rename to bindings/java/src/org/hyperic/sigar/win32/test/TestMetaBase.java index 9a806fc5..f5c2a1be 100644 --- a/bindings/java/src/net/hyperic/sigar/win32/test/TestMetaBase.java +++ b/bindings/java/src/org/hyperic/sigar/win32/test/TestMetaBase.java @@ -1,4 +1,4 @@ -package net.hyperic.sigar.win32.test; +package org.hyperic.sigar.win32.test; import junit.framework.TestCase; diff --git a/bindings/java/src/net/hyperic/sigar/win32/test/TestPdh.java b/bindings/java/src/org/hyperic/sigar/win32/test/TestPdh.java similarity index 90% rename from bindings/java/src/net/hyperic/sigar/win32/test/TestPdh.java rename to bindings/java/src/org/hyperic/sigar/win32/test/TestPdh.java index ead43a57..b75b0a12 100644 --- a/bindings/java/src/net/hyperic/sigar/win32/test/TestPdh.java +++ b/bindings/java/src/org/hyperic/sigar/win32/test/TestPdh.java @@ -1,7 +1,7 @@ -package net.hyperic.sigar.win32.test; +package org.hyperic.sigar.win32.test; -import net.hyperic.sigar.test.SigarTestCase; -import net.hyperic.sigar.win32.Pdh; +import org.hyperic.sigar.test.SigarTestCase; +import org.hyperic.sigar.win32.Pdh; public class TestPdh extends SigarTestCase { diff --git a/bindings/java/src/net/hyperic/sigar/win32/test/TestRegistryKey.java b/bindings/java/src/org/hyperic/sigar/win32/test/TestRegistryKey.java similarity index 94% rename from bindings/java/src/net/hyperic/sigar/win32/test/TestRegistryKey.java rename to bindings/java/src/org/hyperic/sigar/win32/test/TestRegistryKey.java index 1becf84b..b9eea26a 100644 --- a/bindings/java/src/net/hyperic/sigar/win32/test/TestRegistryKey.java +++ b/bindings/java/src/org/hyperic/sigar/win32/test/TestRegistryKey.java @@ -1,7 +1,7 @@ -package net.hyperic.sigar.win32.test; +package org.hyperic.sigar.win32.test; import junit.framework.TestCase; -import net.hyperic.sigar.win32.RegistryKey; +import org.hyperic.sigar.win32.RegistryKey; public class TestRegistryKey extends TestCase { diff --git a/bindings/java/src/net/hyperic/sigar/win32/test/TestService.java b/bindings/java/src/org/hyperic/sigar/win32/test/TestService.java similarity index 88% rename from bindings/java/src/net/hyperic/sigar/win32/test/TestService.java rename to bindings/java/src/org/hyperic/sigar/win32/test/TestService.java index 1fbae95a..d58d304f 100644 --- a/bindings/java/src/net/hyperic/sigar/win32/test/TestService.java +++ b/bindings/java/src/org/hyperic/sigar/win32/test/TestService.java @@ -1,10 +1,10 @@ -package net.hyperic.sigar.win32.test; +package org.hyperic.sigar.win32.test; -import net.hyperic.sigar.test.SigarTestCase; +import org.hyperic.sigar.test.SigarTestCase; -import net.hyperic.sigar.win32.Service; -import net.hyperic.sigar.win32.ServiceConfig; -import net.hyperic.sigar.win32.Win32Exception; +import org.hyperic.sigar.win32.Service; +import org.hyperic.sigar.win32.ServiceConfig; +import org.hyperic.sigar.win32.Win32Exception; public class TestService extends SigarTestCase { private static final String TEST_NAME = "MyTestService";