Author: cschneider
Date: Wed May 31 06:37:34 2017
New Revision: 1796982
URL: http://svn.apache.org/viewvc?rev=1796982&view=rev
Log:
Merge util and util-r42 and fix javadoc errors
Added:
aries/trunk/util/src/
aries/trunk/util/src/main/
aries/trunk/util/src/main/java/
aries/trunk/util/src/main/java/org/
aries/trunk/util/src/main/java/org/apache/
aries/trunk/util/src/main/java/org/apache/aries/
aries/trunk/util/src/main/java/org/apache/aries/util/
aries/trunk/util/src/main/java/org/apache/aries/util/AriesFrameworkUtil.java
- copied, changed from r1796880,
aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/AriesFrameworkUtil.java
aries/trunk/util/src/main/java/org/apache/aries/util/FragmentBuilder.java
- copied, changed from r1796880,
aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/FragmentBuilder.java
aries/trunk/util/src/main/java/org/apache/aries/util/IORuntimeException.java
- copied, changed from r1796880,
aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/IORuntimeException.java
aries/trunk/util/src/main/java/org/apache/aries/util/ManifestHeaderUtils.java
- copied, changed from r1796880,
aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/ManifestHeaderUtils.java
aries/trunk/util/src/main/java/org/apache/aries/util/VersionRange.java
- copied, changed from r1796880,
aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/VersionRange.java
aries/trunk/util/src/main/java/org/apache/aries/util/filesystem/
aries/trunk/util/src/main/java/org/apache/aries/util/filesystem/FileSystem.java
- copied, changed from r1796880,
aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/filesystem/FileSystem.java
aries/trunk/util/src/main/java/org/apache/aries/util/filesystem/FileUtils.java
- copied, changed from r1796880,
aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/filesystem/FileUtils.java
aries/trunk/util/src/main/java/org/apache/aries/util/filesystem/ICloseableDirectory.java
- copied, changed from r1796880,
aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/filesystem/ICloseableDirectory.java
aries/trunk/util/src/main/java/org/apache/aries/util/filesystem/IDirectory.java
- copied, changed from r1796880,
aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/filesystem/IDirectory.java
aries/trunk/util/src/main/java/org/apache/aries/util/filesystem/IDirectoryFinder.java
- copied, changed from r1796880,
aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/filesystem/IDirectoryFinder.java
aries/trunk/util/src/main/java/org/apache/aries/util/filesystem/IFile.java
- copied, changed from r1796880,
aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/filesystem/IFile.java
aries/trunk/util/src/main/java/org/apache/aries/util/filesystem/impl/
aries/trunk/util/src/main/java/org/apache/aries/util/filesystem/impl/CloseableDirectory.java
- copied, changed from r1796880,
aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/filesystem/impl/CloseableDirectory.java
aries/trunk/util/src/main/java/org/apache/aries/util/filesystem/impl/DirectoryImpl.java
- copied, changed from r1796880,
aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/filesystem/impl/DirectoryImpl.java
aries/trunk/util/src/main/java/org/apache/aries/util/filesystem/impl/FileImpl.java
- copied, changed from r1796880,
aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/filesystem/impl/FileImpl.java
aries/trunk/util/src/main/java/org/apache/aries/util/filesystem/impl/FileSystemImpl.java
- copied, changed from r1796880,
aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/filesystem/impl/FileSystemImpl.java
aries/trunk/util/src/main/java/org/apache/aries/util/filesystem/impl/InputStreamClosableDirectory.java
- copied, changed from r1796880,
aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/filesystem/impl/InputStreamClosableDirectory.java
aries/trunk/util/src/main/java/org/apache/aries/util/filesystem/impl/NestedCloseableDirectory.java
- copied, changed from r1796880,
aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/filesystem/impl/NestedCloseableDirectory.java
aries/trunk/util/src/main/java/org/apache/aries/util/filesystem/impl/NestedZipDirectory.java
- copied, changed from r1796880,
aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/filesystem/impl/NestedZipDirectory.java
aries/trunk/util/src/main/java/org/apache/aries/util/filesystem/impl/NestedZipFile.java
- copied, changed from r1796880,
aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/filesystem/impl/NestedZipFile.java
aries/trunk/util/src/main/java/org/apache/aries/util/filesystem/impl/ZipCloseableDirectory.java
- copied, changed from r1796880,
aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/filesystem/impl/ZipCloseableDirectory.java
aries/trunk/util/src/main/java/org/apache/aries/util/filesystem/impl/ZipDirectory.java
- copied, changed from r1796880,
aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/filesystem/impl/ZipDirectory.java
aries/trunk/util/src/main/java/org/apache/aries/util/filesystem/impl/ZipFileImpl.java
- copied, changed from r1796880,
aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/filesystem/impl/ZipFileImpl.java
aries/trunk/util/src/main/java/org/apache/aries/util/filesystem/packageinfo
- copied, changed from r1796880,
aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/filesystem/packageinfo
aries/trunk/util/src/main/java/org/apache/aries/util/internal/
aries/trunk/util/src/main/java/org/apache/aries/util/internal/BundleToClassLoaderAdapter.java
- copied, changed from r1796880,
aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/internal/BundleToClassLoaderAdapter.java
aries/trunk/util/src/main/java/org/apache/aries/util/internal/DefaultWorker.java
- copied, changed from r1796880,
aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/internal/DefaultWorker.java
aries/trunk/util/src/main/java/org/apache/aries/util/internal/EquinoxWorker.java
- copied, changed from r1796880,
aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/internal/EquinoxWorker.java
aries/trunk/util/src/main/java/org/apache/aries/util/internal/FelixWorker.java
- copied, changed from r1796880,
aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/internal/FelixWorker.java
aries/trunk/util/src/main/java/org/apache/aries/util/internal/FrameworkUtilWorker.java
- copied, changed from r1796880,
aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/internal/FrameworkUtilWorker.java
aries/trunk/util/src/main/java/org/apache/aries/util/internal/MessageUtil.java
- copied, changed from r1796880,
aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/internal/MessageUtil.java
aries/trunk/util/src/main/java/org/apache/aries/util/internal/R43Worker.java
- copied, changed from r1796880,
aries/trunk/util/util/src/main/java/org/apache/aries/util/internal/R43Worker.java
aries/trunk/util/src/main/java/org/apache/aries/util/io/
aries/trunk/util/src/main/java/org/apache/aries/util/io/IOUtils.java
- copied, changed from r1796880,
aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/io/IOUtils.java
aries/trunk/util/src/main/java/org/apache/aries/util/io/RememberingInputStream.java
- copied, changed from r1796880,
aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/io/RememberingInputStream.java
aries/trunk/util/src/main/java/org/apache/aries/util/io/packageinfo
- copied, changed from r1796880,
aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/io/packageinfo
aries/trunk/util/src/main/java/org/apache/aries/util/log/
aries/trunk/util/src/main/java/org/apache/aries/util/log/Logger.java
- copied, changed from r1796880,
aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/log/Logger.java
aries/trunk/util/src/main/java/org/apache/aries/util/log/packageinfo
- copied, changed from r1796880,
aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/log/packageinfo
aries/trunk/util/src/main/java/org/apache/aries/util/manifest/
aries/trunk/util/src/main/java/org/apache/aries/util/manifest/BundleManifest.java
- copied, changed from r1796880,
aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/manifest/BundleManifest.java
aries/trunk/util/src/main/java/org/apache/aries/util/manifest/Constants.java
- copied, changed from r1796880,
aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/manifest/Constants.java
aries/trunk/util/src/main/java/org/apache/aries/util/manifest/ManifestHeaderProcessor.java
- copied, changed from r1796880,
aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/manifest/ManifestHeaderProcessor.java
aries/trunk/util/src/main/java/org/apache/aries/util/manifest/ManifestProcessor.java
- copied, changed from r1796880,
aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/manifest/ManifestProcessor.java
aries/trunk/util/src/main/java/org/apache/aries/util/manifest/packageinfo
- copied, changed from r1796880,
aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/manifest/packageinfo
aries/trunk/util/src/main/java/org/apache/aries/util/nls/
aries/trunk/util/src/main/java/org/apache/aries/util/nls/MessageUtil.java
- copied, changed from r1796880,
aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/nls/MessageUtil.java
aries/trunk/util/src/main/java/org/apache/aries/util/nls/packageinfo
- copied, changed from r1796880,
aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/nls/packageinfo
aries/trunk/util/src/main/java/org/apache/aries/util/packageinfo
- copied, changed from r1796880,
aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/packageinfo
aries/trunk/util/src/main/java/org/apache/aries/util/service/
aries/trunk/util/src/main/java/org/apache/aries/util/service/registry/
aries/trunk/util/src/main/java/org/apache/aries/util/service/registry/ServicePair.java
- copied, changed from r1796880,
aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/service/registry/ServicePair.java
aries/trunk/util/src/main/java/org/apache/aries/util/service/registry/packageinfo
- copied, changed from r1796880,
aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/service/registry/packageinfo
aries/trunk/util/src/main/java/org/apache/aries/util/tracker/
aries/trunk/util/src/main/java/org/apache/aries/util/tracker/BundleTrackerFactory.java
- copied, changed from r1796880,
aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/tracker/BundleTrackerFactory.java
aries/trunk/util/src/main/java/org/apache/aries/util/tracker/InternalRecursiveBundleTracker.java
- copied, changed from r1796880,
aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/tracker/InternalRecursiveBundleTracker.java
aries/trunk/util/src/main/java/org/apache/aries/util/tracker/RecursiveBundleTracker.java
- copied, changed from r1796880,
aries/trunk/util/util/src/main/java/org/apache/aries/util/tracker/RecursiveBundleTracker.java
aries/trunk/util/src/main/java/org/apache/aries/util/tracker/SingleServiceTracker.java
- copied, changed from r1796880,
aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/tracker/SingleServiceTracker.java
aries/trunk/util/src/main/java/org/apache/aries/util/tracker/hook/
aries/trunk/util/src/main/java/org/apache/aries/util/tracker/hook/BundleHookBundleTracker.java
- copied, changed from r1796880,
aries/trunk/util/util/src/main/java/org/apache/aries/util/tracker/hook/BundleHookBundleTracker.java
aries/trunk/util/src/main/java/org/apache/aries/util/tracker/packageinfo
- copied, changed from r1796880,
aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/tracker/packageinfo
aries/trunk/util/src/main/resources/
aries/trunk/util/src/main/resources/OSGi-INF/
aries/trunk/util/src/main/resources/OSGi-INF/permissions.perm
- copied, changed from r1796880,
aries/trunk/util/util-r42/src/main/resources/OSGi-INF/permissions.perm
aries/trunk/util/src/main/resources/org/
aries/trunk/util/src/main/resources/org/apache/
aries/trunk/util/src/main/resources/org/apache/aries/
aries/trunk/util/src/main/resources/org/apache/aries/util/
aries/trunk/util/src/main/resources/org/apache/aries/util/messages/
aries/trunk/util/src/main/resources/org/apache/aries/util/messages/UTILmessages.properties
- copied, changed from r1796880,
aries/trunk/util/util-r42/src/main/resources/org/apache/aries/util/messages/UTILmessages.properties
aries/trunk/util/src/test/
aries/trunk/util/src/test/java/
aries/trunk/util/src/test/java/org/
aries/trunk/util/src/test/java/org/apache/
aries/trunk/util/src/test/java/org/apache/aries/
aries/trunk/util/src/test/java/org/apache/aries/util/
aries/trunk/util/src/test/java/org/apache/aries/util/BundleToClassLoaderAdapterTest.java
- copied, changed from r1796880,
aries/trunk/util/util-r42/src/test/java/org/apache/aries/util/BundleToClassLoaderAdapterTest.java
aries/trunk/util/src/test/java/org/apache/aries/util/FragmentUtilsTest.java
- copied, changed from r1796880,
aries/trunk/util/util-r42/src/test/java/org/apache/aries/util/FragmentUtilsTest.java
aries/trunk/util/src/test/java/org/apache/aries/util/RecursiveBundleTrackerTest.java
- copied, changed from r1796880,
aries/trunk/util/util/src/test/java/org/apache/aries/util/RecursiveBundleTrackerTest.java
aries/trunk/util/src/test/java/org/apache/aries/util/SingleServiceTrackerTest.java
- copied, changed from r1796880,
aries/trunk/util/util-r42/src/test/java/org/apache/aries/util/SingleServiceTrackerTest.java
aries/trunk/util/src/test/java/org/apache/aries/util/VersionRangeTest.java
- copied, changed from r1796880,
aries/trunk/util/util-r42/src/test/java/org/apache/aries/util/VersionRangeTest.java
aries/trunk/util/src/test/java/org/apache/aries/util/filesystem/
aries/trunk/util/src/test/java/org/apache/aries/util/filesystem/FileSystemTest.java
- copied, changed from r1796880,
aries/trunk/util/util-r42/src/test/java/org/apache/aries/util/filesystem/FileSystemTest.java
aries/trunk/util/src/test/java/org/apache/aries/util/filesystem/FileUtilsTest.java
- copied, changed from r1796880,
aries/trunk/util/util-r42/src/test/java/org/apache/aries/util/filesystem/FileUtilsTest.java
aries/trunk/util/src/test/java/org/apache/aries/util/filesystem/IOUtilsTest.java
- copied, changed from r1796880,
aries/trunk/util/util-r42/src/test/java/org/apache/aries/util/filesystem/IOUtilsTest.java
aries/trunk/util/src/test/java/org/apache/aries/util/log/
aries/trunk/util/src/test/java/org/apache/aries/util/log/LoggerTest.java
- copied, changed from r1796880,
aries/trunk/util/util-r42/src/test/java/org/apache/aries/util/log/LoggerTest.java
aries/trunk/util/src/test/java/org/apache/aries/util/manifest/
aries/trunk/util/src/test/java/org/apache/aries/util/manifest/BundleManifestTest.java
- copied, changed from r1796880,
aries/trunk/util/util-r42/src/test/java/org/apache/aries/util/manifest/BundleManifestTest.java
aries/trunk/util/src/test/java/org/apache/aries/util/manifest/ManifestHeaderProcessorTest.java
- copied, changed from r1796880,
aries/trunk/util/util-r42/src/test/java/org/apache/aries/util/manifest/ManifestHeaderProcessorTest.java
aries/trunk/util/src/test/resources/
aries/trunk/util/src/test/resources/META-INF/
aries/trunk/util/src/test/resources/META-INF/APPLICATION.MF
- copied, changed from r1796880,
aries/trunk/util/util-r42/src/test/resources/META-INF/APPLICATION.MF
aries/trunk/util/src/test/resources/META-INF/APPLICATION2.MF
- copied, changed from r1796880,
aries/trunk/util/util-r42/src/test/resources/META-INF/APPLICATION2.MF
aries/trunk/util/src/test/resources/META-INF/APPLICATION3.MF
- copied, changed from r1796880,
aries/trunk/util/util-r42/src/test/resources/META-INF/APPLICATION3.MF
aries/trunk/util/src/test/resources/META-INF/APPLICATION4.MF
- copied, changed from r1796880,
aries/trunk/util/util-r42/src/test/resources/META-INF/APPLICATION4.MF
aries/trunk/util/src/test/resources/META-INF/DEPLOYMENT.MF
- copied, changed from r1796880,
aries/trunk/util/util-r42/src/test/resources/META-INF/DEPLOYMENT.MF
aries/trunk/util/src/test/resources/app1/
aries/trunk/util/src/test/resources/app1/META-INF/
aries/trunk/util/src/test/resources/app1/META-INF/APPLICATION.MF
- copied, changed from r1796880,
aries/trunk/util/util-r42/src/test/resources/app1/META-INF/APPLICATION.MF
aries/trunk/util/src/test/resources/app1/META-INF/DEPLOYMENT.MF
- copied, changed from r1796880,
aries/trunk/util/util-r42/src/test/resources/app1/META-INF/DEPLOYMENT.MF
aries/trunk/util/src/test/resources/bundles/
aries/trunk/util/src/test/resources/bundles/exploded-jar-with-name.jar/
aries/trunk/util/src/test/resources/bundles/exploded-jar-with-name.jar/META-INF/
aries/trunk/util/src/test/resources/bundles/exploded-jar-with-name.jar/META-INF/MANIFEST.MF
- copied, changed from r1796880,
aries/trunk/util/util-r42/src/test/resources/bundles/exploded-jar-with-name.jar/META-INF/MANIFEST.MF
aries/trunk/util/src/test/resources/bundles/exploded-jar-with-name.jar/META-INF/beforeManifest.file
- copied, changed from r1796880,
aries/trunk/util/util-r42/src/test/resources/bundles/exploded-jar-with-name.jar/META-INF/beforeManifest.file
aries/trunk/util/src/test/resources/bundles/exploded.jar/
aries/trunk/util/src/test/resources/bundles/exploded.jar/META-INF/
aries/trunk/util/src/test/resources/bundles/exploded.jar/META-INF/MANIFEST.MF
- copied, changed from r1796880,
aries/trunk/util/util-r42/src/test/resources/bundles/exploded.jar/META-INF/MANIFEST.MF
aries/trunk/util/src/test/resources/bundles/exploded.jar/META-INF/beforeManifest.file
- copied, changed from r1796880,
aries/trunk/util/util-r42/src/test/resources/bundles/exploded.jar/META-INF/beforeManifest.file
aries/trunk/util/src/test/resources/zip/
aries/trunk/util/src/test/resources/zip/META-INF/
aries/trunk/util/src/test/resources/zip/META-INF/APPLICATION.MF
- copied, changed from r1796880,
aries/trunk/util/util-r42/src/test/resources/zip/META-INF/APPLICATION.MF
aries/trunk/util/src/test/resources/zip/META-INF/APPLICATION2.MF
- copied, changed from r1796880,
aries/trunk/util/util-r42/src/test/resources/zip/META-INF/APPLICATION2.MF
aries/trunk/util/src/test/resources/zip/META-INF/APPLICATION3.MF
- copied, changed from r1796880,
aries/trunk/util/util-r42/src/test/resources/zip/META-INF/APPLICATION3.MF
aries/trunk/util/src/test/resources/zip/META-INF/APPLICATION4.MF
- copied, changed from r1796880,
aries/trunk/util/util-r42/src/test/resources/zip/META-INF/APPLICATION4.MF
aries/trunk/util/src/test/resources/zip/META-INF/DEPLOYMENT.MF
- copied, changed from r1796880,
aries/trunk/util/util-r42/src/test/resources/zip/META-INF/DEPLOYMENT.MF
aries/trunk/util/src/test/resources/zip/app1/
aries/trunk/util/src/test/resources/zip/app1/META-INF/
aries/trunk/util/src/test/resources/zip/app1/META-INF/APPLICATION.MF
- copied, changed from r1796880,
aries/trunk/util/util-r42/src/test/resources/zip/app1/META-INF/APPLICATION.MF
aries/trunk/util/src/test/resources/zip/app1/META-INF/DEPLOYMENT.MF
- copied, changed from r1796880,
aries/trunk/util/util-r42/src/test/resources/zip/app1/META-INF/DEPLOYMENT.MF
aries/trunk/util/src/test/resources/zip/bundles/
aries/trunk/util/src/test/resources/zip/bundles/exploded.jar/
aries/trunk/util/src/test/resources/zip/bundles/exploded.jar/META-INF/
aries/trunk/util/src/test/resources/zip/bundles/exploded.jar/META-INF/MANIFEST.MF
- copied, changed from r1796880,
aries/trunk/util/util-r42/src/test/resources/zip/bundles/exploded.jar/META-INF/MANIFEST.MF
aries/trunk/util/src/test/resources/zip/bundles/exploded.jar/META-INF/beforeManifest.file
- copied, changed from r1796880,
aries/trunk/util/util-r42/src/test/resources/zip/bundles/exploded.jar/META-INF/beforeManifest.file
aries/trunk/util/src/test/resources/zip/file.txt
- copied, changed from r1796880,
aries/trunk/util/util-r42/src/test/resources/zip/file.txt
aries/trunk/util/src/test/resources/zip/subdir/
aries/trunk/util/src/test/resources/zip/subdir/someFile.txt
- copied, changed from r1796880,
aries/trunk/util/util-r42/src/test/resources/zip/subdir/someFile.txt
Removed:
aries/trunk/util/util-r42/pom.xml
aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/AriesFrameworkUtil.java
aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/FragmentBuilder.java
aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/IORuntimeException.java
aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/ManifestHeaderUtils.java
aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/VersionRange.java
aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/filesystem/FileSystem.java
aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/filesystem/FileUtils.java
aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/filesystem/ICloseableDirectory.java
aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/filesystem/IDirectory.java
aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/filesystem/IDirectoryFinder.java
aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/filesystem/IFile.java
aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/filesystem/impl/CloseableDirectory.java
aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/filesystem/impl/DirectoryImpl.java
aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/filesystem/impl/FileImpl.java
aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/filesystem/impl/FileSystemImpl.java
aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/filesystem/impl/InputStreamClosableDirectory.java
aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/filesystem/impl/NestedCloseableDirectory.java
aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/filesystem/impl/NestedZipDirectory.java
aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/filesystem/impl/NestedZipFile.java
aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/filesystem/impl/ZipCloseableDirectory.java
aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/filesystem/impl/ZipDirectory.java
aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/filesystem/impl/ZipFileImpl.java
aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/filesystem/packageinfo
aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/internal/BundleToClassLoaderAdapter.java
aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/internal/DefaultWorker.java
aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/internal/EquinoxWorker.java
aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/internal/FelixWorker.java
aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/internal/FrameworkUtilWorker.java
aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/internal/MessageUtil.java
aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/io/IOUtils.java
aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/io/RememberingInputStream.java
aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/io/packageinfo
aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/log/Logger.java
aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/log/packageinfo
aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/manifest/BundleManifest.java
aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/manifest/Constants.java
aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/manifest/ManifestHeaderProcessor.java
aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/manifest/ManifestProcessor.java
aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/manifest/packageinfo
aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/nls/MessageUtil.java
aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/nls/packageinfo
aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/packageinfo
aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/service/registry/ServicePair.java
aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/service/registry/packageinfo
aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/tracker/BundleTrackerFactory.java
aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/tracker/InternalRecursiveBundleTracker.java
aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/tracker/SingleServiceTracker.java
aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/tracker/packageinfo
aries/trunk/util/util-r42/src/main/resources/OSGi-INF/permissions.perm
aries/trunk/util/util-r42/src/main/resources/org/apache/aries/util/messages/UTILmessages.properties
aries/trunk/util/util-r42/src/test/java/org/apache/aries/util/BundleToClassLoaderAdapterTest.java
aries/trunk/util/util-r42/src/test/java/org/apache/aries/util/FragmentUtilsTest.java
aries/trunk/util/util-r42/src/test/java/org/apache/aries/util/SingleServiceTrackerTest.java
aries/trunk/util/util-r42/src/test/java/org/apache/aries/util/VersionRangeTest.java
aries/trunk/util/util-r42/src/test/java/org/apache/aries/util/filesystem/FileSystemTest.java
aries/trunk/util/util-r42/src/test/java/org/apache/aries/util/filesystem/FileUtilsTest.java
aries/trunk/util/util-r42/src/test/java/org/apache/aries/util/filesystem/IOUtilsTest.java
aries/trunk/util/util-r42/src/test/java/org/apache/aries/util/log/LoggerTest.java
aries/trunk/util/util-r42/src/test/java/org/apache/aries/util/manifest/BundleManifestTest.java
aries/trunk/util/util-r42/src/test/java/org/apache/aries/util/manifest/ManifestHeaderProcessorTest.java
aries/trunk/util/util-r42/src/test/resources/META-INF/APPLICATION.MF
aries/trunk/util/util-r42/src/test/resources/META-INF/APPLICATION2.MF
aries/trunk/util/util-r42/src/test/resources/META-INF/APPLICATION3.MF
aries/trunk/util/util-r42/src/test/resources/META-INF/APPLICATION4.MF
aries/trunk/util/util-r42/src/test/resources/META-INF/DEPLOYMENT.MF
aries/trunk/util/util-r42/src/test/resources/app1/META-INF/APPLICATION.MF
aries/trunk/util/util-r42/src/test/resources/app1/META-INF/DEPLOYMENT.MF
aries/trunk/util/util-r42/src/test/resources/bundles/exploded-jar-with-name.jar/META-INF/MANIFEST.MF
aries/trunk/util/util-r42/src/test/resources/bundles/exploded-jar-with-name.jar/META-INF/beforeManifest.file
aries/trunk/util/util-r42/src/test/resources/bundles/exploded.jar/META-INF/MANIFEST.MF
aries/trunk/util/util-r42/src/test/resources/bundles/exploded.jar/META-INF/beforeManifest.file
aries/trunk/util/util-r42/src/test/resources/zip/META-INF/APPLICATION.MF
aries/trunk/util/util-r42/src/test/resources/zip/META-INF/APPLICATION2.MF
aries/trunk/util/util-r42/src/test/resources/zip/META-INF/APPLICATION3.MF
aries/trunk/util/util-r42/src/test/resources/zip/META-INF/APPLICATION4.MF
aries/trunk/util/util-r42/src/test/resources/zip/META-INF/DEPLOYMENT.MF
aries/trunk/util/util-r42/src/test/resources/zip/app1/META-INF/APPLICATION.MF
aries/trunk/util/util-r42/src/test/resources/zip/app1/META-INF/DEPLOYMENT.MF
aries/trunk/util/util-r42/src/test/resources/zip/bundles/exploded.jar/META-INF/MANIFEST.MF
aries/trunk/util/util-r42/src/test/resources/zip/bundles/exploded.jar/META-INF/beforeManifest.file
aries/trunk/util/util-r42/src/test/resources/zip/file.txt
aries/trunk/util/util-r42/src/test/resources/zip/subdir/someFile.txt
aries/trunk/util/util/pom.xml
aries/trunk/util/util/src/main/java/org/apache/aries/util/AriesFrameworkUtil.java
aries/trunk/util/util/src/main/java/org/apache/aries/util/internal/R43Worker.java
aries/trunk/util/util/src/main/java/org/apache/aries/util/packageinfo
aries/trunk/util/util/src/main/java/org/apache/aries/util/tracker/RecursiveBundleTracker.java
aries/trunk/util/util/src/main/java/org/apache/aries/util/tracker/hook/BundleHookBundleTracker.java
aries/trunk/util/util/src/main/java/org/apache/aries/util/tracker/packageinfo
aries/trunk/util/util/src/main/resources/OSGi-INF/permissions.perm
aries/trunk/util/util/src/main/resources/org/apache/aries/util/messages/UTILmessages.properties
aries/trunk/util/util/src/test/java/org/apache/aries/util/RecursiveBundleTrackerTest.java
aries/trunk/util/util/src/test/resources/META-INF/APPLICATION.MF
aries/trunk/util/util/src/test/resources/META-INF/APPLICATION2.MF
aries/trunk/util/util/src/test/resources/META-INF/APPLICATION3.MF
aries/trunk/util/util/src/test/resources/META-INF/APPLICATION4.MF
aries/trunk/util/util/src/test/resources/META-INF/DEPLOYMENT.MF
aries/trunk/util/util/src/test/resources/app1/META-INF/APPLICATION.MF
aries/trunk/util/util/src/test/resources/app1/META-INF/DEPLOYMENT.MF
aries/trunk/util/util/src/test/resources/bundles/exploded.jar/META-INF/MANIFEST.MF
aries/trunk/util/util/src/test/resources/bundles/exploded.jar/META-INF/beforeManifest.file
aries/trunk/util/util/src/test/resources/zip/META-INF/APPLICATION.MF
aries/trunk/util/util/src/test/resources/zip/META-INF/APPLICATION2.MF
aries/trunk/util/util/src/test/resources/zip/META-INF/APPLICATION3.MF
aries/trunk/util/util/src/test/resources/zip/META-INF/APPLICATION4.MF
aries/trunk/util/util/src/test/resources/zip/META-INF/DEPLOYMENT.MF
aries/trunk/util/util/src/test/resources/zip/app1/META-INF/APPLICATION.MF
aries/trunk/util/util/src/test/resources/zip/app1/META-INF/DEPLOYMENT.MF
aries/trunk/util/util/src/test/resources/zip/bundles/exploded.jar/META-INF/MANIFEST.MF
aries/trunk/util/util/src/test/resources/zip/bundles/exploded.jar/META-INF/beforeManifest.file
aries/trunk/util/util/src/test/resources/zip/file.txt
aries/trunk/util/util/src/test/resources/zip/subdir/someFile.txt
Modified:
aries/trunk/util/pom.xml
Modified: aries/trunk/util/pom.xml
URL:
http://svn.apache.org/viewvc/aries/trunk/util/pom.xml?rev=1796982&r1=1796981&r2=1796982&view=diff
==============================================================================
--- aries/trunk/util/pom.xml (original)
+++ aries/trunk/util/pom.xml Wed May 31 06:37:34 2017
@@ -25,26 +25,105 @@
<groupId>org.apache.aries</groupId>
<artifactId>parent</artifactId>
<version>2.0.1</version>
- <relativePath>../parent/pom.xml</relativePath>
+ <relativePath>../../parent/pom.xml</relativePath>
</parent>
- <artifactId>org.apache.aries.util-parent</artifactId>
- <packaging>pom</packaging>
- <version>1.1.4-SNAPSHOT</version>
+ <artifactId>org.apache.aries.util</artifactId>
+ <packaging>bundle</packaging>
+ <version>1.2.0-SNAPSHOT</version>
<name>Apache Aries Util</name>
<description>
This bundle contains the OSGi common util for Apache Aries
</description>
- <scm>
-
<connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/util</connection>
-
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/util</developerConnection>
- <url>http://svn.apache.org/viewvc/aries/trunk/util</url>
- </scm>
+ <!-- no scm info since this and the util-r42 project must be built
together to produce the util bundle -->
- <modules>
- <module>util-r42</module>
- <module>util</module>
- </modules>
+ <properties>
+ <!-- Export package versions are maintained in packageinfo files -->
+ <aries.osgi.export.pkg>
+ org.apache.aries.util*
+ </aries.osgi.export.pkg>
+ <aries.osgi.import.pkg>
+ org.osgi.framework.hooks.bundle;resolution:=optional,
+ org.osgi.framework.launch;resolution:=optional,
+ org.osgi.framework.wiring.*;resolution:=optional,
+ org.osgi.service.framework;resolution:=optional,
+ org.eclipse.osgi.internal.loader;resolution:=optional,
+ org.eclipse.osgi.framework.internal.core;resolution:=optional,
+ org.eclipse.osgi.framework.adaptor;resolution:=optional,
+ org.osgi.service.log;resolution:=optional,
+ *
+ </aries.osgi.import.pkg>
+ <aries.osgi.private.pkg>
+ org.apache.aries.util.internal,
+ org.apache.aries.util.filesystem.impl,
+ org.apache.aries.util.tracker.hook
+ </aries.osgi.private.pkg>
+ <lastReleaseVersion>1.1.0</lastReleaseVersion>
+ </properties>
+ <dependencies>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse</groupId>
+ <artifactId>osgi</artifactId>
+ <version>3.5.0.v20090520</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.aries.testsupport</groupId>
+ <artifactId>org.apache.aries.testsupport.unit</artifactId>
+ <version>1.0.0</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.8.1</version>
+ <executions>
+ <execution>
+ <id>javadoc-jar</id>
+ <phase>package</phase>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ <configuration>
+ <failOnError>false</failOnError>
+
<excludePackageNames>*.impl:*.internal</excludePackageNames>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.aries.versioning</groupId>
+ <artifactId>org.apache.aries.versioning.plugin</artifactId>
+ <executions>
+ <execution>
+ <id>default-verify</id>
+ <phase>verify</phase>
+ <goals>
+ <goal>version-check</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</project>
Copied:
aries/trunk/util/src/main/java/org/apache/aries/util/AriesFrameworkUtil.java
(from r1796880,
aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/AriesFrameworkUtil.java)
URL:
http://svn.apache.org/viewvc/aries/trunk/util/src/main/java/org/apache/aries/util/AriesFrameworkUtil.java?p2=aries/trunk/util/src/main/java/org/apache/aries/util/AriesFrameworkUtil.java&p1=aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/AriesFrameworkUtil.java&r1=1796880&r2=1796982&rev=1796982&view=diff
==============================================================================
(empty)
Copied:
aries/trunk/util/src/main/java/org/apache/aries/util/FragmentBuilder.java (from
r1796880,
aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/FragmentBuilder.java)
URL:
http://svn.apache.org/viewvc/aries/trunk/util/src/main/java/org/apache/aries/util/FragmentBuilder.java?p2=aries/trunk/util/src/main/java/org/apache/aries/util/FragmentBuilder.java&p1=aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/FragmentBuilder.java&r1=1796880&r2=1796982&rev=1796982&view=diff
==============================================================================
(empty)
Copied:
aries/trunk/util/src/main/java/org/apache/aries/util/IORuntimeException.java
(from r1796880,
aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/IORuntimeException.java)
URL:
http://svn.apache.org/viewvc/aries/trunk/util/src/main/java/org/apache/aries/util/IORuntimeException.java?p2=aries/trunk/util/src/main/java/org/apache/aries/util/IORuntimeException.java&p1=aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/IORuntimeException.java&r1=1796880&r2=1796982&rev=1796982&view=diff
==============================================================================
(empty)
Copied:
aries/trunk/util/src/main/java/org/apache/aries/util/ManifestHeaderUtils.java
(from r1796880,
aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/ManifestHeaderUtils.java)
URL:
http://svn.apache.org/viewvc/aries/trunk/util/src/main/java/org/apache/aries/util/ManifestHeaderUtils.java?p2=aries/trunk/util/src/main/java/org/apache/aries/util/ManifestHeaderUtils.java&p1=aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/ManifestHeaderUtils.java&r1=1796880&r2=1796982&rev=1796982&view=diff
==============================================================================
---
aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/ManifestHeaderUtils.java
(original)
+++
aries/trunk/util/src/main/java/org/apache/aries/util/ManifestHeaderUtils.java
Wed May 31 06:37:34 2017
@@ -33,13 +33,13 @@ public class ManifestHeaderUtils {
* within double quoted segments.
*
* Eg.
- * com.ibm.ws.eba.helloWorldService;version="[1.0.0, 1.0.0]" &
+ * com.ibm.ws.eba.helloWorldService;version="[1.0.0, 1.0.0]"
* com.ibm.ws.eba.helloWorldService;version="1.0.0"
* com.ibm.ws.eba.helloWorld;version="2";bundle-version="[2,30)"
* com.acme.foo;weirdAttr="one;two;three";weirdDir:="1;2;3"
* @param value the value to be split
* @param delimiter the delimiter string such as ',' etc.
- * @return List<String> the components of the split String in a list
+ * @return the components of the split String in a list
*/
public static List<String> split(String value, String delimiter)
{
Copied: aries/trunk/util/src/main/java/org/apache/aries/util/VersionRange.java
(from r1796880,
aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/VersionRange.java)
URL:
http://svn.apache.org/viewvc/aries/trunk/util/src/main/java/org/apache/aries/util/VersionRange.java?p2=aries/trunk/util/src/main/java/org/apache/aries/util/VersionRange.java&p1=aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/VersionRange.java&r1=1796880&r2=1796982&rev=1796982&view=diff
==============================================================================
(empty)
Copied:
aries/trunk/util/src/main/java/org/apache/aries/util/filesystem/FileSystem.java
(from r1796880,
aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/filesystem/FileSystem.java)
URL:
http://svn.apache.org/viewvc/aries/trunk/util/src/main/java/org/apache/aries/util/filesystem/FileSystem.java?p2=aries/trunk/util/src/main/java/org/apache/aries/util/filesystem/FileSystem.java&p1=aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/filesystem/FileSystem.java&r1=1796880&r2=1796982&rev=1796982&view=diff
==============================================================================
(empty)
Copied:
aries/trunk/util/src/main/java/org/apache/aries/util/filesystem/FileUtils.java
(from r1796880,
aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/filesystem/FileUtils.java)
URL:
http://svn.apache.org/viewvc/aries/trunk/util/src/main/java/org/apache/aries/util/filesystem/FileUtils.java?p2=aries/trunk/util/src/main/java/org/apache/aries/util/filesystem/FileUtils.java&p1=aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/filesystem/FileUtils.java&r1=1796880&r2=1796982&rev=1796982&view=diff
==============================================================================
(empty)
Copied:
aries/trunk/util/src/main/java/org/apache/aries/util/filesystem/ICloseableDirectory.java
(from r1796880,
aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/filesystem/ICloseableDirectory.java)
URL:
http://svn.apache.org/viewvc/aries/trunk/util/src/main/java/org/apache/aries/util/filesystem/ICloseableDirectory.java?p2=aries/trunk/util/src/main/java/org/apache/aries/util/filesystem/ICloseableDirectory.java&p1=aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/filesystem/ICloseableDirectory.java&r1=1796880&r2=1796982&rev=1796982&view=diff
==============================================================================
(empty)
Copied:
aries/trunk/util/src/main/java/org/apache/aries/util/filesystem/IDirectory.java
(from r1796880,
aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/filesystem/IDirectory.java)
URL:
http://svn.apache.org/viewvc/aries/trunk/util/src/main/java/org/apache/aries/util/filesystem/IDirectory.java?p2=aries/trunk/util/src/main/java/org/apache/aries/util/filesystem/IDirectory.java&p1=aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/filesystem/IDirectory.java&r1=1796880&r2=1796982&rev=1796982&view=diff
==============================================================================
(empty)
Copied:
aries/trunk/util/src/main/java/org/apache/aries/util/filesystem/IDirectoryFinder.java
(from r1796880,
aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/filesystem/IDirectoryFinder.java)
URL:
http://svn.apache.org/viewvc/aries/trunk/util/src/main/java/org/apache/aries/util/filesystem/IDirectoryFinder.java?p2=aries/trunk/util/src/main/java/org/apache/aries/util/filesystem/IDirectoryFinder.java&p1=aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/filesystem/IDirectoryFinder.java&r1=1796880&r2=1796982&rev=1796982&view=diff
==============================================================================
---
aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/filesystem/IDirectoryFinder.java
(original)
+++
aries/trunk/util/src/main/java/org/apache/aries/util/filesystem/IDirectoryFinder.java
Wed May 31 06:37:34 2017
@@ -34,7 +34,7 @@ import java.net.URI;
* <p>
*
* Implementing classes should use URIs of the form
- * <code>idirfinder://?finderID=xxx&directoryID=yyy</code> where the finder ID
+ * <code>idirfinder://?finderID=xxx&directoryID=yyy</code> where the
finder ID
* within the query part of the URI may be used to assist in determining the
* directory finder instance that can retrieve the virtual directory
identified
* by the directory ID part (or alternatively, the URI as a whole). When
Copied:
aries/trunk/util/src/main/java/org/apache/aries/util/filesystem/IFile.java
(from r1796880,
aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/filesystem/IFile.java)
URL:
http://svn.apache.org/viewvc/aries/trunk/util/src/main/java/org/apache/aries/util/filesystem/IFile.java?p2=aries/trunk/util/src/main/java/org/apache/aries/util/filesystem/IFile.java&p1=aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/filesystem/IFile.java&r1=1796880&r2=1796982&rev=1796982&view=diff
==============================================================================
(empty)
Copied:
aries/trunk/util/src/main/java/org/apache/aries/util/filesystem/impl/CloseableDirectory.java
(from r1796880,
aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/filesystem/impl/CloseableDirectory.java)
URL:
http://svn.apache.org/viewvc/aries/trunk/util/src/main/java/org/apache/aries/util/filesystem/impl/CloseableDirectory.java?p2=aries/trunk/util/src/main/java/org/apache/aries/util/filesystem/impl/CloseableDirectory.java&p1=aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/filesystem/impl/CloseableDirectory.java&r1=1796880&r2=1796982&rev=1796982&view=diff
==============================================================================
(empty)
Copied:
aries/trunk/util/src/main/java/org/apache/aries/util/filesystem/impl/DirectoryImpl.java
(from r1796880,
aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/filesystem/impl/DirectoryImpl.java)
URL:
http://svn.apache.org/viewvc/aries/trunk/util/src/main/java/org/apache/aries/util/filesystem/impl/DirectoryImpl.java?p2=aries/trunk/util/src/main/java/org/apache/aries/util/filesystem/impl/DirectoryImpl.java&p1=aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/filesystem/impl/DirectoryImpl.java&r1=1796880&r2=1796982&rev=1796982&view=diff
==============================================================================
(empty)
Copied:
aries/trunk/util/src/main/java/org/apache/aries/util/filesystem/impl/FileImpl.java
(from r1796880,
aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/filesystem/impl/FileImpl.java)
URL:
http://svn.apache.org/viewvc/aries/trunk/util/src/main/java/org/apache/aries/util/filesystem/impl/FileImpl.java?p2=aries/trunk/util/src/main/java/org/apache/aries/util/filesystem/impl/FileImpl.java&p1=aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/filesystem/impl/FileImpl.java&r1=1796880&r2=1796982&rev=1796982&view=diff
==============================================================================
(empty)
Copied:
aries/trunk/util/src/main/java/org/apache/aries/util/filesystem/impl/FileSystemImpl.java
(from r1796880,
aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/filesystem/impl/FileSystemImpl.java)
URL:
http://svn.apache.org/viewvc/aries/trunk/util/src/main/java/org/apache/aries/util/filesystem/impl/FileSystemImpl.java?p2=aries/trunk/util/src/main/java/org/apache/aries/util/filesystem/impl/FileSystemImpl.java&p1=aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/filesystem/impl/FileSystemImpl.java&r1=1796880&r2=1796982&rev=1796982&view=diff
==============================================================================
(empty)
Copied:
aries/trunk/util/src/main/java/org/apache/aries/util/filesystem/impl/InputStreamClosableDirectory.java
(from r1796880,
aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/filesystem/impl/InputStreamClosableDirectory.java)
URL:
http://svn.apache.org/viewvc/aries/trunk/util/src/main/java/org/apache/aries/util/filesystem/impl/InputStreamClosableDirectory.java?p2=aries/trunk/util/src/main/java/org/apache/aries/util/filesystem/impl/InputStreamClosableDirectory.java&p1=aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/filesystem/impl/InputStreamClosableDirectory.java&r1=1796880&r2=1796982&rev=1796982&view=diff
==============================================================================
(empty)
Copied:
aries/trunk/util/src/main/java/org/apache/aries/util/filesystem/impl/NestedCloseableDirectory.java
(from r1796880,
aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/filesystem/impl/NestedCloseableDirectory.java)
URL:
http://svn.apache.org/viewvc/aries/trunk/util/src/main/java/org/apache/aries/util/filesystem/impl/NestedCloseableDirectory.java?p2=aries/trunk/util/src/main/java/org/apache/aries/util/filesystem/impl/NestedCloseableDirectory.java&p1=aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/filesystem/impl/NestedCloseableDirectory.java&r1=1796880&r2=1796982&rev=1796982&view=diff
==============================================================================
(empty)
Copied:
aries/trunk/util/src/main/java/org/apache/aries/util/filesystem/impl/NestedZipDirectory.java
(from r1796880,
aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/filesystem/impl/NestedZipDirectory.java)
URL:
http://svn.apache.org/viewvc/aries/trunk/util/src/main/java/org/apache/aries/util/filesystem/impl/NestedZipDirectory.java?p2=aries/trunk/util/src/main/java/org/apache/aries/util/filesystem/impl/NestedZipDirectory.java&p1=aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/filesystem/impl/NestedZipDirectory.java&r1=1796880&r2=1796982&rev=1796982&view=diff
==============================================================================
(empty)
Copied:
aries/trunk/util/src/main/java/org/apache/aries/util/filesystem/impl/NestedZipFile.java
(from r1796880,
aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/filesystem/impl/NestedZipFile.java)
URL:
http://svn.apache.org/viewvc/aries/trunk/util/src/main/java/org/apache/aries/util/filesystem/impl/NestedZipFile.java?p2=aries/trunk/util/src/main/java/org/apache/aries/util/filesystem/impl/NestedZipFile.java&p1=aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/filesystem/impl/NestedZipFile.java&r1=1796880&r2=1796982&rev=1796982&view=diff
==============================================================================
(empty)
Copied:
aries/trunk/util/src/main/java/org/apache/aries/util/filesystem/impl/ZipCloseableDirectory.java
(from r1796880,
aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/filesystem/impl/ZipCloseableDirectory.java)
URL:
http://svn.apache.org/viewvc/aries/trunk/util/src/main/java/org/apache/aries/util/filesystem/impl/ZipCloseableDirectory.java?p2=aries/trunk/util/src/main/java/org/apache/aries/util/filesystem/impl/ZipCloseableDirectory.java&p1=aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/filesystem/impl/ZipCloseableDirectory.java&r1=1796880&r2=1796982&rev=1796982&view=diff
==============================================================================
(empty)
Copied:
aries/trunk/util/src/main/java/org/apache/aries/util/filesystem/impl/ZipDirectory.java
(from r1796880,
aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/filesystem/impl/ZipDirectory.java)
URL:
http://svn.apache.org/viewvc/aries/trunk/util/src/main/java/org/apache/aries/util/filesystem/impl/ZipDirectory.java?p2=aries/trunk/util/src/main/java/org/apache/aries/util/filesystem/impl/ZipDirectory.java&p1=aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/filesystem/impl/ZipDirectory.java&r1=1796880&r2=1796982&rev=1796982&view=diff
==============================================================================
(empty)
Copied:
aries/trunk/util/src/main/java/org/apache/aries/util/filesystem/impl/ZipFileImpl.java
(from r1796880,
aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/filesystem/impl/ZipFileImpl.java)
URL:
http://svn.apache.org/viewvc/aries/trunk/util/src/main/java/org/apache/aries/util/filesystem/impl/ZipFileImpl.java?p2=aries/trunk/util/src/main/java/org/apache/aries/util/filesystem/impl/ZipFileImpl.java&p1=aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/filesystem/impl/ZipFileImpl.java&r1=1796880&r2=1796982&rev=1796982&view=diff
==============================================================================
(empty)
Copied:
aries/trunk/util/src/main/java/org/apache/aries/util/filesystem/packageinfo
(from r1796880,
aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/filesystem/packageinfo)
URL:
http://svn.apache.org/viewvc/aries/trunk/util/src/main/java/org/apache/aries/util/filesystem/packageinfo?p2=aries/trunk/util/src/main/java/org/apache/aries/util/filesystem/packageinfo&p1=aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/filesystem/packageinfo&r1=1796880&r2=1796982&rev=1796982&view=diff
==============================================================================
(empty)
Copied:
aries/trunk/util/src/main/java/org/apache/aries/util/internal/BundleToClassLoaderAdapter.java
(from r1796880,
aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/internal/BundleToClassLoaderAdapter.java)
URL:
http://svn.apache.org/viewvc/aries/trunk/util/src/main/java/org/apache/aries/util/internal/BundleToClassLoaderAdapter.java?p2=aries/trunk/util/src/main/java/org/apache/aries/util/internal/BundleToClassLoaderAdapter.java&p1=aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/internal/BundleToClassLoaderAdapter.java&r1=1796880&r2=1796982&rev=1796982&view=diff
==============================================================================
(empty)
Copied:
aries/trunk/util/src/main/java/org/apache/aries/util/internal/DefaultWorker.java
(from r1796880,
aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/internal/DefaultWorker.java)
URL:
http://svn.apache.org/viewvc/aries/trunk/util/src/main/java/org/apache/aries/util/internal/DefaultWorker.java?p2=aries/trunk/util/src/main/java/org/apache/aries/util/internal/DefaultWorker.java&p1=aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/internal/DefaultWorker.java&r1=1796880&r2=1796982&rev=1796982&view=diff
==============================================================================
(empty)
Copied:
aries/trunk/util/src/main/java/org/apache/aries/util/internal/EquinoxWorker.java
(from r1796880,
aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/internal/EquinoxWorker.java)
URL:
http://svn.apache.org/viewvc/aries/trunk/util/src/main/java/org/apache/aries/util/internal/EquinoxWorker.java?p2=aries/trunk/util/src/main/java/org/apache/aries/util/internal/EquinoxWorker.java&p1=aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/internal/EquinoxWorker.java&r1=1796880&r2=1796982&rev=1796982&view=diff
==============================================================================
(empty)
Copied:
aries/trunk/util/src/main/java/org/apache/aries/util/internal/FelixWorker.java
(from r1796880,
aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/internal/FelixWorker.java)
URL:
http://svn.apache.org/viewvc/aries/trunk/util/src/main/java/org/apache/aries/util/internal/FelixWorker.java?p2=aries/trunk/util/src/main/java/org/apache/aries/util/internal/FelixWorker.java&p1=aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/internal/FelixWorker.java&r1=1796880&r2=1796982&rev=1796982&view=diff
==============================================================================
(empty)
Copied:
aries/trunk/util/src/main/java/org/apache/aries/util/internal/FrameworkUtilWorker.java
(from r1796880,
aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/internal/FrameworkUtilWorker.java)
URL:
http://svn.apache.org/viewvc/aries/trunk/util/src/main/java/org/apache/aries/util/internal/FrameworkUtilWorker.java?p2=aries/trunk/util/src/main/java/org/apache/aries/util/internal/FrameworkUtilWorker.java&p1=aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/internal/FrameworkUtilWorker.java&r1=1796880&r2=1796982&rev=1796982&view=diff
==============================================================================
(empty)
Copied:
aries/trunk/util/src/main/java/org/apache/aries/util/internal/MessageUtil.java
(from r1796880,
aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/internal/MessageUtil.java)
URL:
http://svn.apache.org/viewvc/aries/trunk/util/src/main/java/org/apache/aries/util/internal/MessageUtil.java?p2=aries/trunk/util/src/main/java/org/apache/aries/util/internal/MessageUtil.java&p1=aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/internal/MessageUtil.java&r1=1796880&r2=1796982&rev=1796982&view=diff
==============================================================================
(empty)
Copied:
aries/trunk/util/src/main/java/org/apache/aries/util/internal/R43Worker.java
(from r1796880,
aries/trunk/util/util/src/main/java/org/apache/aries/util/internal/R43Worker.java)
URL:
http://svn.apache.org/viewvc/aries/trunk/util/src/main/java/org/apache/aries/util/internal/R43Worker.java?p2=aries/trunk/util/src/main/java/org/apache/aries/util/internal/R43Worker.java&p1=aries/trunk/util/util/src/main/java/org/apache/aries/util/internal/R43Worker.java&r1=1796880&r2=1796982&rev=1796982&view=diff
==============================================================================
(empty)
Copied: aries/trunk/util/src/main/java/org/apache/aries/util/io/IOUtils.java
(from r1796880,
aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/io/IOUtils.java)
URL:
http://svn.apache.org/viewvc/aries/trunk/util/src/main/java/org/apache/aries/util/io/IOUtils.java?p2=aries/trunk/util/src/main/java/org/apache/aries/util/io/IOUtils.java&p1=aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/io/IOUtils.java&r1=1796880&r2=1796982&rev=1796982&view=diff
==============================================================================
(empty)
Copied:
aries/trunk/util/src/main/java/org/apache/aries/util/io/RememberingInputStream.java
(from r1796880,
aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/io/RememberingInputStream.java)
URL:
http://svn.apache.org/viewvc/aries/trunk/util/src/main/java/org/apache/aries/util/io/RememberingInputStream.java?p2=aries/trunk/util/src/main/java/org/apache/aries/util/io/RememberingInputStream.java&p1=aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/io/RememberingInputStream.java&r1=1796880&r2=1796982&rev=1796982&view=diff
==============================================================================
(empty)
Copied: aries/trunk/util/src/main/java/org/apache/aries/util/io/packageinfo
(from r1796880,
aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/io/packageinfo)
URL:
http://svn.apache.org/viewvc/aries/trunk/util/src/main/java/org/apache/aries/util/io/packageinfo?p2=aries/trunk/util/src/main/java/org/apache/aries/util/io/packageinfo&p1=aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/io/packageinfo&r1=1796880&r2=1796982&rev=1796982&view=diff
==============================================================================
(empty)
Copied: aries/trunk/util/src/main/java/org/apache/aries/util/log/Logger.java
(from r1796880,
aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/log/Logger.java)
URL:
http://svn.apache.org/viewvc/aries/trunk/util/src/main/java/org/apache/aries/util/log/Logger.java?p2=aries/trunk/util/src/main/java/org/apache/aries/util/log/Logger.java&p1=aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/log/Logger.java&r1=1796880&r2=1796982&rev=1796982&view=diff
==============================================================================
(empty)
Copied: aries/trunk/util/src/main/java/org/apache/aries/util/log/packageinfo
(from r1796880,
aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/log/packageinfo)
URL:
http://svn.apache.org/viewvc/aries/trunk/util/src/main/java/org/apache/aries/util/log/packageinfo?p2=aries/trunk/util/src/main/java/org/apache/aries/util/log/packageinfo&p1=aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/log/packageinfo&r1=1796880&r2=1796982&rev=1796982&view=diff
==============================================================================
(empty)
Copied:
aries/trunk/util/src/main/java/org/apache/aries/util/manifest/BundleManifest.java
(from r1796880,
aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/manifest/BundleManifest.java)
URL:
http://svn.apache.org/viewvc/aries/trunk/util/src/main/java/org/apache/aries/util/manifest/BundleManifest.java?p2=aries/trunk/util/src/main/java/org/apache/aries/util/manifest/BundleManifest.java&p1=aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/manifest/BundleManifest.java&r1=1796880&r2=1796982&rev=1796982&view=diff
==============================================================================
(empty)
Copied:
aries/trunk/util/src/main/java/org/apache/aries/util/manifest/Constants.java
(from r1796880,
aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/manifest/Constants.java)
URL:
http://svn.apache.org/viewvc/aries/trunk/util/src/main/java/org/apache/aries/util/manifest/Constants.java?p2=aries/trunk/util/src/main/java/org/apache/aries/util/manifest/Constants.java&p1=aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/manifest/Constants.java&r1=1796880&r2=1796982&rev=1796982&view=diff
==============================================================================
(empty)
Copied:
aries/trunk/util/src/main/java/org/apache/aries/util/manifest/ManifestHeaderProcessor.java
(from r1796880,
aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/manifest/ManifestHeaderProcessor.java)
URL:
http://svn.apache.org/viewvc/aries/trunk/util/src/main/java/org/apache/aries/util/manifest/ManifestHeaderProcessor.java?p2=aries/trunk/util/src/main/java/org/apache/aries/util/manifest/ManifestHeaderProcessor.java&p1=aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/manifest/ManifestHeaderProcessor.java&r1=1796880&r2=1796982&rev=1796982&view=diff
==============================================================================
---
aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/manifest/ManifestHeaderProcessor.java
(original)
+++
aries/trunk/util/src/main/java/org/apache/aries/util/manifest/ManifestHeaderProcessor.java
Wed May 31 06:37:34 2017
@@ -132,16 +132,13 @@ public class ManifestHeaderProcessor
*/
public static interface NameValueCollection {
/**
- * Add this Name & Value to the collection.
+ * Add this Name and Value to the collection.
* @param n
* @param v
*/
public void addToCollection(String n, Map<String,String> v);
}
- /**
- * Map of Name -> Value.
- */
public static class NameValueMap extends HashMap<String, Map<String,String>>
implements NameValueCollection, Map<String, Map<String,String>>{
private static final long serialVersionUID = -6446338858542599141L;
@@ -194,13 +191,13 @@ public class ManifestHeaderProcessor
* within double quoted segments.
*
* Eg.
- * com.ibm.ws.eba.helloWorldService;version="[1.0.0, 1.0.0]" &
+ * com.ibm.ws.eba.helloWorldService;version="[1.0.0, 1.0.0]"
* com.ibm.ws.eba.helloWorldService;version="1.0.0"
* com.ibm.ws.eba.helloWorld;version="2";bundle-version="[2,30)"
* com.acme.foo;weirdAttr="one;two;three";weirdDir:="1;2;3"
* @param value the value to be split
* @param delimiter the delimiter string such as ',' etc.
- * @return List<String> the components of the split String in a list
+ * @return the components of the split String in a list
*/
public static List<String> split(String value, String delimiter)
{
@@ -387,8 +384,8 @@ public class ManifestHeaderProcessor
}
/**
- * Parse a generic capability header. For example<br/>
- *
com.acme.myns;mylist:List<String>="nl,be,fr,uk";myver:Version=1.3;long:Long="1234";d:Double="3.14";myattr=xyz,
+ * Parse a generic capability header. For example<br>
+ * com.acme.myns;mylist:List String
="nl,be,fr,uk";myver:Version=1.3;long:Long="1234";d:Double="3.14";myattr=xyz,
* com.acme.myns;myattr=abc
* @param s The header to be parsed
* @return A list of GenericMetadata objects each representing an individual
capability. The values in the attribute map
@@ -399,8 +396,8 @@ public class ManifestHeaderProcessor
}
/**
- * Parse a generic capability header. For example<br/>
- *
com.acme.myns;mylist:List<String>="nl,be,fr,uk";myver:Version=1.3;long:Long="1234";d:Double="3.14";myattr=xyz,
+ * Parse a generic capability header. For example<br>
+ * com.acme.myns;mylist:List String
="nl,be,fr,uk";myver:Version=1.3;long:Long="1234";d:Double="3.14";myattr=xyz,
* com.acme.myns;myattr=abc
* @param s The header to be parsed
* @return A list of GenericMetadata objects each representing an individual
capability. The values in the attribute map
@@ -515,7 +512,7 @@ public class ManifestHeaderProcessor
/**
* Generate a filter from a set of attributes. This filter will be
suitable
* for presentation to OBR This means that, due to the way OBR works, it
- * will include a stanza of the form, (mandatory:<*mandatoryAttribute)
+ * will include a stanza of the form,
(mandatory:<*mandatoryAttribute)
* Filter strings generated by this method will therefore tend to break
the
* standard OSGi Filter class. The OBR stanza can be stripped out later
if
* required.
@@ -638,7 +635,7 @@ public class ManifestHeaderProcessor
/**
* Generate a filter from a set of attributes. This filter will be suitable
* for presentation to OBR. This means that, due to the way OBR works, it
will
- * include a stanza of the form, (mandatory:<*mandatoryAttribute) Filter
+ * include a stanza of the form, (mandatory:<*mandatoryAttribute) Filter
* strings generated by this method will therefore tend to break the standard
* OSGi Filter class. The OBR stanza can be stripped out later if required.
*
Copied:
aries/trunk/util/src/main/java/org/apache/aries/util/manifest/ManifestProcessor.java
(from r1796880,
aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/manifest/ManifestProcessor.java)
URL:
http://svn.apache.org/viewvc/aries/trunk/util/src/main/java/org/apache/aries/util/manifest/ManifestProcessor.java?p2=aries/trunk/util/src/main/java/org/apache/aries/util/manifest/ManifestProcessor.java&p1=aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/manifest/ManifestProcessor.java&r1=1796880&r2=1796982&rev=1796982&view=diff
==============================================================================
---
aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/manifest/ManifestProcessor.java
(original)
+++
aries/trunk/util/src/main/java/org/apache/aries/util/manifest/ManifestProcessor.java
Wed May 31 06:37:34 2017
@@ -43,7 +43,7 @@ import org.apache.aries.util.io.IOUtils;
public class ManifestProcessor
{
/**
- * Reads a manifest's main attributes into a String->String map.
+ * Reads a manifest's main attributes into a map String, String.
* <p>
* Will always return a map, empty if the manifest had no attributes.
*
@@ -171,13 +171,13 @@ public class ManifestProcessor
* within double quoted segments.
*
* Eg.
- * com.ibm.ws.eba.helloWorldService;version="[1.0.0, 1.0.0]" &
+ * com.ibm.ws.eba.helloWorldService;version="[1.0.0, 1.0.0]"
* com.ibm.ws.eba.helloWorldService;version="1.0.0"
* com.ibm.ws.eba.helloWorld;version="2";bundle-version="[2,30)"
* com.acme.foo;weirdAttr="one;two;three";weirdDir:="1;2;3"
* @param value the value to be split
* @param delimiter the delimiter string such as ',' etc.
- * @return List<String> the components of the split String in a list
+ * @return the components of the split String in a list
*/
public static List<String> split(String value, String delimiter)
{
Copied:
aries/trunk/util/src/main/java/org/apache/aries/util/manifest/packageinfo (from
r1796880,
aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/manifest/packageinfo)
URL:
http://svn.apache.org/viewvc/aries/trunk/util/src/main/java/org/apache/aries/util/manifest/packageinfo?p2=aries/trunk/util/src/main/java/org/apache/aries/util/manifest/packageinfo&p1=aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/manifest/packageinfo&r1=1796880&r2=1796982&rev=1796982&view=diff
==============================================================================
(empty)
Copied:
aries/trunk/util/src/main/java/org/apache/aries/util/nls/MessageUtil.java (from
r1796880,
aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/nls/MessageUtil.java)
URL:
http://svn.apache.org/viewvc/aries/trunk/util/src/main/java/org/apache/aries/util/nls/MessageUtil.java?p2=aries/trunk/util/src/main/java/org/apache/aries/util/nls/MessageUtil.java&p1=aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/nls/MessageUtil.java&r1=1796880&r2=1796982&rev=1796982&view=diff
==============================================================================
(empty)
Copied: aries/trunk/util/src/main/java/org/apache/aries/util/nls/packageinfo
(from r1796880,
aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/nls/packageinfo)
URL:
http://svn.apache.org/viewvc/aries/trunk/util/src/main/java/org/apache/aries/util/nls/packageinfo?p2=aries/trunk/util/src/main/java/org/apache/aries/util/nls/packageinfo&p1=aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/nls/packageinfo&r1=1796880&r2=1796982&rev=1796982&view=diff
==============================================================================
(empty)
Copied: aries/trunk/util/src/main/java/org/apache/aries/util/packageinfo (from
r1796880,
aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/packageinfo)
URL:
http://svn.apache.org/viewvc/aries/trunk/util/src/main/java/org/apache/aries/util/packageinfo?p2=aries/trunk/util/src/main/java/org/apache/aries/util/packageinfo&p1=aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/packageinfo&r1=1796880&r2=1796982&rev=1796982&view=diff
==============================================================================
(empty)
Copied:
aries/trunk/util/src/main/java/org/apache/aries/util/service/registry/ServicePair.java
(from r1796880,
aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/service/registry/ServicePair.java)
URL:
http://svn.apache.org/viewvc/aries/trunk/util/src/main/java/org/apache/aries/util/service/registry/ServicePair.java?p2=aries/trunk/util/src/main/java/org/apache/aries/util/service/registry/ServicePair.java&p1=aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/service/registry/ServicePair.java&r1=1796880&r2=1796982&rev=1796982&view=diff
==============================================================================
(empty)
Copied:
aries/trunk/util/src/main/java/org/apache/aries/util/service/registry/packageinfo
(from r1796880,
aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/service/registry/packageinfo)
URL:
http://svn.apache.org/viewvc/aries/trunk/util/src/main/java/org/apache/aries/util/service/registry/packageinfo?p2=aries/trunk/util/src/main/java/org/apache/aries/util/service/registry/packageinfo&p1=aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/service/registry/packageinfo&r1=1796880&r2=1796982&rev=1796982&view=diff
==============================================================================
(empty)
Copied:
aries/trunk/util/src/main/java/org/apache/aries/util/tracker/BundleTrackerFactory.java
(from r1796880,
aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/tracker/BundleTrackerFactory.java)
URL:
http://svn.apache.org/viewvc/aries/trunk/util/src/main/java/org/apache/aries/util/tracker/BundleTrackerFactory.java?p2=aries/trunk/util/src/main/java/org/apache/aries/util/tracker/BundleTrackerFactory.java&p1=aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/tracker/BundleTrackerFactory.java&r1=1796880&r2=1796982&rev=1796982&view=diff
==============================================================================
---
aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/tracker/BundleTrackerFactory.java
(original)
+++
aries/trunk/util/src/main/java/org/apache/aries/util/tracker/BundleTrackerFactory.java
Wed May 31 06:37:34 2017
@@ -61,7 +61,7 @@ public class BundleTrackerFactory {
/**
* get all bundle tracker registered in this factory
*
- * @return all the trackers registered. The collection contains a
List<BundleTracker> for each bundle scope.
+ * @return all the trackers registered. The collection contains a list of
BundleTracker for each bundle scope.
*/
public static Collection<List<BundleTracker>> getAllBundleTracker() {
return btMap.values();
Copied:
aries/trunk/util/src/main/java/org/apache/aries/util/tracker/InternalRecursiveBundleTracker.java
(from r1796880,
aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/tracker/InternalRecursiveBundleTracker.java)
URL:
http://svn.apache.org/viewvc/aries/trunk/util/src/main/java/org/apache/aries/util/tracker/InternalRecursiveBundleTracker.java?p2=aries/trunk/util/src/main/java/org/apache/aries/util/tracker/InternalRecursiveBundleTracker.java&p1=aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/tracker/InternalRecursiveBundleTracker.java&r1=1796880&r2=1796982&rev=1796982&view=diff
==============================================================================
(empty)
Copied:
aries/trunk/util/src/main/java/org/apache/aries/util/tracker/RecursiveBundleTracker.java
(from r1796880,
aries/trunk/util/util/src/main/java/org/apache/aries/util/tracker/RecursiveBundleTracker.java)
URL:
http://svn.apache.org/viewvc/aries/trunk/util/src/main/java/org/apache/aries/util/tracker/RecursiveBundleTracker.java?p2=aries/trunk/util/src/main/java/org/apache/aries/util/tracker/RecursiveBundleTracker.java&p1=aries/trunk/util/util/src/main/java/org/apache/aries/util/tracker/RecursiveBundleTracker.java&r1=1796880&r2=1796982&rev=1796982&view=diff
==============================================================================
---
aries/trunk/util/util/src/main/java/org/apache/aries/util/tracker/RecursiveBundleTracker.java
(original)
+++
aries/trunk/util/src/main/java/org/apache/aries/util/tracker/RecursiveBundleTracker.java
Wed May 31 06:37:34 2017
@@ -31,7 +31,7 @@ import org.osgi.util.tracker.BundleTrack
* order to use this class clients must create a subclass and implement the
methods of the
* <code>BundleTrackerCustomizer</code> interface. In spite of this, instances
of this class
* MUST NOT be passed as a parameter to any <code>BundleTracker</code>.</p>
- * <p/>
+ * <p>
* The model for using this is that classes should instantiate it
* and pass it a 'vanilla' bundle tracker.
*
Copied:
aries/trunk/util/src/main/java/org/apache/aries/util/tracker/SingleServiceTracker.java
(from r1796880,
aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/tracker/SingleServiceTracker.java)
URL:
http://svn.apache.org/viewvc/aries/trunk/util/src/main/java/org/apache/aries/util/tracker/SingleServiceTracker.java?p2=aries/trunk/util/src/main/java/org/apache/aries/util/tracker/SingleServiceTracker.java&p1=aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/tracker/SingleServiceTracker.java&r1=1796880&r2=1796982&rev=1796982&view=diff
==============================================================================
(empty)
Copied:
aries/trunk/util/src/main/java/org/apache/aries/util/tracker/hook/BundleHookBundleTracker.java
(from r1796880,
aries/trunk/util/util/src/main/java/org/apache/aries/util/tracker/hook/BundleHookBundleTracker.java)
URL:
http://svn.apache.org/viewvc/aries/trunk/util/src/main/java/org/apache/aries/util/tracker/hook/BundleHookBundleTracker.java?p2=aries/trunk/util/src/main/java/org/apache/aries/util/tracker/hook/BundleHookBundleTracker.java&p1=aries/trunk/util/util/src/main/java/org/apache/aries/util/tracker/hook/BundleHookBundleTracker.java&r1=1796880&r2=1796982&rev=1796982&view=diff
==============================================================================
(empty)
Copied:
aries/trunk/util/src/main/java/org/apache/aries/util/tracker/packageinfo (from
r1796880,
aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/tracker/packageinfo)
URL:
http://svn.apache.org/viewvc/aries/trunk/util/src/main/java/org/apache/aries/util/tracker/packageinfo?p2=aries/trunk/util/src/main/java/org/apache/aries/util/tracker/packageinfo&p1=aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/tracker/packageinfo&r1=1796880&r2=1796982&rev=1796982&view=diff
==============================================================================
(empty)
Copied: aries/trunk/util/src/main/resources/OSGi-INF/permissions.perm (from
r1796880,
aries/trunk/util/util-r42/src/main/resources/OSGi-INF/permissions.perm)
URL:
http://svn.apache.org/viewvc/aries/trunk/util/src/main/resources/OSGi-INF/permissions.perm?p2=aries/trunk/util/src/main/resources/OSGi-INF/permissions.perm&p1=aries/trunk/util/util-r42/src/main/resources/OSGi-INF/permissions.perm&r1=1796880&r2=1796982&rev=1796982&view=diff
==============================================================================
(empty)
Copied:
aries/trunk/util/src/main/resources/org/apache/aries/util/messages/UTILmessages.properties
(from r1796880,
aries/trunk/util/util-r42/src/main/resources/org/apache/aries/util/messages/UTILmessages.properties)
URL:
http://svn.apache.org/viewvc/aries/trunk/util/src/main/resources/org/apache/aries/util/messages/UTILmessages.properties?p2=aries/trunk/util/src/main/resources/org/apache/aries/util/messages/UTILmessages.properties&p1=aries/trunk/util/util-r42/src/main/resources/org/apache/aries/util/messages/UTILmessages.properties&r1=1796880&r2=1796982&rev=1796982&view=diff
==============================================================================
(empty)
Copied:
aries/trunk/util/src/test/java/org/apache/aries/util/BundleToClassLoaderAdapterTest.java
(from r1796880,
aries/trunk/util/util-r42/src/test/java/org/apache/aries/util/BundleToClassLoaderAdapterTest.java)
URL:
http://svn.apache.org/viewvc/aries/trunk/util/src/test/java/org/apache/aries/util/BundleToClassLoaderAdapterTest.java?p2=aries/trunk/util/src/test/java/org/apache/aries/util/BundleToClassLoaderAdapterTest.java&p1=aries/trunk/util/util-r42/src/test/java/org/apache/aries/util/BundleToClassLoaderAdapterTest.java&r1=1796880&r2=1796982&rev=1796982&view=diff
==============================================================================
(empty)
Copied:
aries/trunk/util/src/test/java/org/apache/aries/util/FragmentUtilsTest.java
(from r1796880,
aries/trunk/util/util-r42/src/test/java/org/apache/aries/util/FragmentUtilsTest.java)
URL:
http://svn.apache.org/viewvc/aries/trunk/util/src/test/java/org/apache/aries/util/FragmentUtilsTest.java?p2=aries/trunk/util/src/test/java/org/apache/aries/util/FragmentUtilsTest.java&p1=aries/trunk/util/util-r42/src/test/java/org/apache/aries/util/FragmentUtilsTest.java&r1=1796880&r2=1796982&rev=1796982&view=diff
==============================================================================
(empty)
Copied:
aries/trunk/util/src/test/java/org/apache/aries/util/RecursiveBundleTrackerTest.java
(from r1796880,
aries/trunk/util/util/src/test/java/org/apache/aries/util/RecursiveBundleTrackerTest.java)
URL:
http://svn.apache.org/viewvc/aries/trunk/util/src/test/java/org/apache/aries/util/RecursiveBundleTrackerTest.java?p2=aries/trunk/util/src/test/java/org/apache/aries/util/RecursiveBundleTrackerTest.java&p1=aries/trunk/util/util/src/test/java/org/apache/aries/util/RecursiveBundleTrackerTest.java&r1=1796880&r2=1796982&rev=1796982&view=diff
==============================================================================
(empty)
Copied:
aries/trunk/util/src/test/java/org/apache/aries/util/SingleServiceTrackerTest.java
(from r1796880,
aries/trunk/util/util-r42/src/test/java/org/apache/aries/util/SingleServiceTrackerTest.java)
URL:
http://svn.apache.org/viewvc/aries/trunk/util/src/test/java/org/apache/aries/util/SingleServiceTrackerTest.java?p2=aries/trunk/util/src/test/java/org/apache/aries/util/SingleServiceTrackerTest.java&p1=aries/trunk/util/util-r42/src/test/java/org/apache/aries/util/SingleServiceTrackerTest.java&r1=1796880&r2=1796982&rev=1796982&view=diff
==============================================================================
(empty)
Copied:
aries/trunk/util/src/test/java/org/apache/aries/util/VersionRangeTest.java
(from r1796880,
aries/trunk/util/util-r42/src/test/java/org/apache/aries/util/VersionRangeTest.java)
URL:
http://svn.apache.org/viewvc/aries/trunk/util/src/test/java/org/apache/aries/util/VersionRangeTest.java?p2=aries/trunk/util/src/test/java/org/apache/aries/util/VersionRangeTest.java&p1=aries/trunk/util/util-r42/src/test/java/org/apache/aries/util/VersionRangeTest.java&r1=1796880&r2=1796982&rev=1796982&view=diff
==============================================================================
(empty)
Copied:
aries/trunk/util/src/test/java/org/apache/aries/util/filesystem/FileSystemTest.java
(from r1796880,
aries/trunk/util/util-r42/src/test/java/org/apache/aries/util/filesystem/FileSystemTest.java)
URL:
http://svn.apache.org/viewvc/aries/trunk/util/src/test/java/org/apache/aries/util/filesystem/FileSystemTest.java?p2=aries/trunk/util/src/test/java/org/apache/aries/util/filesystem/FileSystemTest.java&p1=aries/trunk/util/util-r42/src/test/java/org/apache/aries/util/filesystem/FileSystemTest.java&r1=1796880&r2=1796982&rev=1796982&view=diff
==============================================================================
(empty)
Copied:
aries/trunk/util/src/test/java/org/apache/aries/util/filesystem/FileUtilsTest.java
(from r1796880,
aries/trunk/util/util-r42/src/test/java/org/apache/aries/util/filesystem/FileUtilsTest.java)
URL:
http://svn.apache.org/viewvc/aries/trunk/util/src/test/java/org/apache/aries/util/filesystem/FileUtilsTest.java?p2=aries/trunk/util/src/test/java/org/apache/aries/util/filesystem/FileUtilsTest.java&p1=aries/trunk/util/util-r42/src/test/java/org/apache/aries/util/filesystem/FileUtilsTest.java&r1=1796880&r2=1796982&rev=1796982&view=diff
==============================================================================
(empty)
Copied:
aries/trunk/util/src/test/java/org/apache/aries/util/filesystem/IOUtilsTest.java
(from r1796880,
aries/trunk/util/util-r42/src/test/java/org/apache/aries/util/filesystem/IOUtilsTest.java)
URL:
http://svn.apache.org/viewvc/aries/trunk/util/src/test/java/org/apache/aries/util/filesystem/IOUtilsTest.java?p2=aries/trunk/util/src/test/java/org/apache/aries/util/filesystem/IOUtilsTest.java&p1=aries/trunk/util/util-r42/src/test/java/org/apache/aries/util/filesystem/IOUtilsTest.java&r1=1796880&r2=1796982&rev=1796982&view=diff
==============================================================================
(empty)
Copied:
aries/trunk/util/src/test/java/org/apache/aries/util/log/LoggerTest.java (from
r1796880,
aries/trunk/util/util-r42/src/test/java/org/apache/aries/util/log/LoggerTest.java)
URL:
http://svn.apache.org/viewvc/aries/trunk/util/src/test/java/org/apache/aries/util/log/LoggerTest.java?p2=aries/trunk/util/src/test/java/org/apache/aries/util/log/LoggerTest.java&p1=aries/trunk/util/util-r42/src/test/java/org/apache/aries/util/log/LoggerTest.java&r1=1796880&r2=1796982&rev=1796982&view=diff
==============================================================================
(empty)
Copied:
aries/trunk/util/src/test/java/org/apache/aries/util/manifest/BundleManifestTest.java
(from r1796880,
aries/trunk/util/util-r42/src/test/java/org/apache/aries/util/manifest/BundleManifestTest.java)
URL:
http://svn.apache.org/viewvc/aries/trunk/util/src/test/java/org/apache/aries/util/manifest/BundleManifestTest.java?p2=aries/trunk/util/src/test/java/org/apache/aries/util/manifest/BundleManifestTest.java&p1=aries/trunk/util/util-r42/src/test/java/org/apache/aries/util/manifest/BundleManifestTest.java&r1=1796880&r2=1796982&rev=1796982&view=diff
==============================================================================
(empty)
Copied:
aries/trunk/util/src/test/java/org/apache/aries/util/manifest/ManifestHeaderProcessorTest.java
(from r1796880,
aries/trunk/util/util-r42/src/test/java/org/apache/aries/util/manifest/ManifestHeaderProcessorTest.java)
URL:
http://svn.apache.org/viewvc/aries/trunk/util/src/test/java/org/apache/aries/util/manifest/ManifestHeaderProcessorTest.java?p2=aries/trunk/util/src/test/java/org/apache/aries/util/manifest/ManifestHeaderProcessorTest.java&p1=aries/trunk/util/util-r42/src/test/java/org/apache/aries/util/manifest/ManifestHeaderProcessorTest.java&r1=1796880&r2=1796982&rev=1796982&view=diff
==============================================================================
(empty)
Copied: aries/trunk/util/src/test/resources/META-INF/APPLICATION.MF (from
r1796880, aries/trunk/util/util-r42/src/test/resources/META-INF/APPLICATION.MF)
URL:
http://svn.apache.org/viewvc/aries/trunk/util/src/test/resources/META-INF/APPLICATION.MF?p2=aries/trunk/util/src/test/resources/META-INF/APPLICATION.MF&p1=aries/trunk/util/util-r42/src/test/resources/META-INF/APPLICATION.MF&r1=1796880&r2=1796982&rev=1796982&view=diff
==============================================================================
(empty)
Copied: aries/trunk/util/src/test/resources/META-INF/APPLICATION2.MF (from
r1796880, aries/trunk/util/util-r42/src/test/resources/META-INF/APPLICATION2.MF)
URL:
http://svn.apache.org/viewvc/aries/trunk/util/src/test/resources/META-INF/APPLICATION2.MF?p2=aries/trunk/util/src/test/resources/META-INF/APPLICATION2.MF&p1=aries/trunk/util/util-r42/src/test/resources/META-INF/APPLICATION2.MF&r1=1796880&r2=1796982&rev=1796982&view=diff
==============================================================================
(empty)
Copied: aries/trunk/util/src/test/resources/META-INF/APPLICATION3.MF (from
r1796880, aries/trunk/util/util-r42/src/test/resources/META-INF/APPLICATION3.MF)
URL:
http://svn.apache.org/viewvc/aries/trunk/util/src/test/resources/META-INF/APPLICATION3.MF?p2=aries/trunk/util/src/test/resources/META-INF/APPLICATION3.MF&p1=aries/trunk/util/util-r42/src/test/resources/META-INF/APPLICATION3.MF&r1=1796880&r2=1796982&rev=1796982&view=diff
==============================================================================
(empty)
Copied: aries/trunk/util/src/test/resources/META-INF/APPLICATION4.MF (from
r1796880, aries/trunk/util/util-r42/src/test/resources/META-INF/APPLICATION4.MF)
URL:
http://svn.apache.org/viewvc/aries/trunk/util/src/test/resources/META-INF/APPLICATION4.MF?p2=aries/trunk/util/src/test/resources/META-INF/APPLICATION4.MF&p1=aries/trunk/util/util-r42/src/test/resources/META-INF/APPLICATION4.MF&r1=1796880&r2=1796982&rev=1796982&view=diff
==============================================================================
(empty)
Copied: aries/trunk/util/src/test/resources/META-INF/DEPLOYMENT.MF (from
r1796880, aries/trunk/util/util-r42/src/test/resources/META-INF/DEPLOYMENT.MF)
URL:
http://svn.apache.org/viewvc/aries/trunk/util/src/test/resources/META-INF/DEPLOYMENT.MF?p2=aries/trunk/util/src/test/resources/META-INF/DEPLOYMENT.MF&p1=aries/trunk/util/util-r42/src/test/resources/META-INF/DEPLOYMENT.MF&r1=1796880&r2=1796982&rev=1796982&view=diff
==============================================================================
(empty)
Copied: aries/trunk/util/src/test/resources/app1/META-INF/APPLICATION.MF (from
r1796880,
aries/trunk/util/util-r42/src/test/resources/app1/META-INF/APPLICATION.MF)
URL:
http://svn.apache.org/viewvc/aries/trunk/util/src/test/resources/app1/META-INF/APPLICATION.MF?p2=aries/trunk/util/src/test/resources/app1/META-INF/APPLICATION.MF&p1=aries/trunk/util/util-r42/src/test/resources/app1/META-INF/APPLICATION.MF&r1=1796880&r2=1796982&rev=1796982&view=diff
==============================================================================
(empty)
Copied: aries/trunk/util/src/test/resources/app1/META-INF/DEPLOYMENT.MF (from
r1796880,
aries/trunk/util/util-r42/src/test/resources/app1/META-INF/DEPLOYMENT.MF)
URL:
http://svn.apache.org/viewvc/aries/trunk/util/src/test/resources/app1/META-INF/DEPLOYMENT.MF?p2=aries/trunk/util/src/test/resources/app1/META-INF/DEPLOYMENT.MF&p1=aries/trunk/util/util-r42/src/test/resources/app1/META-INF/DEPLOYMENT.MF&r1=1796880&r2=1796982&rev=1796982&view=diff
==============================================================================
(empty)
Copied:
aries/trunk/util/src/test/resources/bundles/exploded-jar-with-name.jar/META-INF/MANIFEST.MF
(from r1796880,
aries/trunk/util/util-r42/src/test/resources/bundles/exploded-jar-with-name.jar/META-INF/MANIFEST.MF)
URL:
http://svn.apache.org/viewvc/aries/trunk/util/src/test/resources/bundles/exploded-jar-with-name.jar/META-INF/MANIFEST.MF?p2=aries/trunk/util/src/test/resources/bundles/exploded-jar-with-name.jar/META-INF/MANIFEST.MF&p1=aries/trunk/util/util-r42/src/test/resources/bundles/exploded-jar-with-name.jar/META-INF/MANIFEST.MF&r1=1796880&r2=1796982&rev=1796982&view=diff
==============================================================================
(empty)
Copied:
aries/trunk/util/src/test/resources/bundles/exploded-jar-with-name.jar/META-INF/beforeManifest.file
(from r1796880,
aries/trunk/util/util-r42/src/test/resources/bundles/exploded-jar-with-name.jar/META-INF/beforeManifest.file)
URL:
http://svn.apache.org/viewvc/aries/trunk/util/src/test/resources/bundles/exploded-jar-with-name.jar/META-INF/beforeManifest.file?p2=aries/trunk/util/src/test/resources/bundles/exploded-jar-with-name.jar/META-INF/beforeManifest.file&p1=aries/trunk/util/util-r42/src/test/resources/bundles/exploded-jar-with-name.jar/META-INF/beforeManifest.file&r1=1796880&r2=1796982&rev=1796982&view=diff
==============================================================================
(empty)