geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r821961 [1/30] - in /geronimo/sandbox/djencks/osgi/framework: ./ buildsupport/ buildsupport/car-maven-plugin/ buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/ buildsupport/geronimo-maven-plugin/src/main/java...
Date Mon, 05 Oct 2009 18:54:56 GMT
Author: djencks
Date: Mon Oct  5 18:54:50 2009
New Revision: 821961

URL: http://svn.apache.org/viewvc?rev=821961&view=rev
Log:
copy over plexus code to avoid getting lost in plexus goo.  Fix a lotta problems, server almost starts

Added:
    geronimo/sandbox/djencks/osgi/framework/bundles/asm-3.1/
      - copied from r820127, servicemix/smx4/bundles/trunk/asm-2.2.3/
    geronimo/sandbox/djencks/osgi/framework/bundles/asm-commons-3.1/
      - copied from r820127, servicemix/smx4/bundles/trunk/asm-2.2.3/
    geronimo/sandbox/djencks/osgi/framework/bundles/commons-cli/
      - copied from r817123, geronimo/sandbox/djencks/osgi/framework/bundles/sxc-jaxb/
    geronimo/sandbox/djencks/osgi/framework/bundles/plexus-logging/
      - copied from r817123, geronimo/sandbox/djencks/osgi/framework/bundles/plexus-archiver/
    geronimo/sandbox/djencks/osgi/framework/bundles/wstx-asl/
      - copied from r817123, geronimo/sandbox/djencks/osgi/framework/bundles/sxc-jaxb/
    geronimo/sandbox/djencks/osgi/framework/configs/karaf-framework/src/main/distribution/instance/
      - copied from r817123, geronimo/sandbox/djencks/osgi/framework/configs/geronimo-boilerplate/src/main/underlay/instance/
    geronimo/sandbox/djencks/osgi/framework/configs/karaf-framework/src/main/distribution/text/LICENSE
      - copied unchanged from r817123, geronimo/sandbox/djencks/osgi/framework/configs/geronimo-boilerplate/src/main/underlay/contents/LICENSE
    geronimo/sandbox/djencks/osgi/framework/configs/karaf-framework/src/main/distribution/text/NOTICE
      - copied unchanged from r817123, geronimo/sandbox/djencks/osgi/framework/configs/geronimo-boilerplate/src/main/underlay/contents/NOTICE
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/archiver/
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/archiver/AbstractArchiveFinalizer.java   (with props)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/archiver/AbstractArchiver.java   (with props)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/archiver/AbstractUnArchiver.java   (with props)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/archiver/ArchiveEntry.java   (with props)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/archiver/ArchiveFile.java   (with props)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/archiver/ArchiveFileFilter.java   (with props)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/archiver/ArchiveFilterException.java   (with props)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/archiver/ArchiveFinalizer.java   (with props)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/archiver/ArchivedFileSet.java   (with props)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/archiver/Archiver.java   (with props)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/archiver/ArchiverException.java   (with props)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/archiver/BaseFileSet.java   (with props)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/archiver/DotDirectiveArchiveFinalizer.java   (with props)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/archiver/FileSet.java   (with props)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/archiver/FilterEnabled.java   (with props)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/archiver/FinalizerEnabled.java   (with props)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/archiver/ResourceIterator.java   (with props)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/archiver/UnArchiver.java   (with props)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/archiver/UnArchiverException.java   (with props)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/archiver/UnixStat.java   (with props)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/archiver/bzip2/
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/archiver/bzip2/BZip2Archiver.java   (with props)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/archiver/bzip2/BZip2Compressor.java   (with props)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/archiver/bzip2/BZip2Constants.java   (with props)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/archiver/bzip2/BZip2UnArchiver.java   (with props)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/archiver/bzip2/CBZip2InputStream.java   (with props)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/archiver/bzip2/CBZip2OutputStream.java   (with props)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/archiver/bzip2/CRC.java   (with props)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/archiver/bzip2/PlexusIoBzip2ResourceCollection.java   (with props)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/archiver/dir/
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/archiver/dir/DirectoryArchiver.java   (with props)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/archiver/ear/
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/archiver/ear/EarArchiver.java   (with props)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/archiver/filters/
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/archiver/filters/JarSecurityFileFilter.java   (with props)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/archiver/filters/JarSecurityFileSelector.java   (with props)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/archiver/gzip/
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/archiver/gzip/GZipArchiver.java   (with props)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/archiver/gzip/GZipCompressor.java   (with props)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/archiver/gzip/GZipUnArchiver.java   (with props)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/archiver/gzip/PlexusIoGzipResourceCollection.java   (with props)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/archiver/jar/
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/archiver/jar/JarArchiver.java   (with props)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/archiver/jar/Manifest.java   (with props)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/archiver/jar/ManifestException.java   (with props)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/archiver/manager/
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/archiver/manager/ArchiverManager.java   (with props)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/archiver/manager/NoSuchArchiverException.java   (with props)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/archiver/tar/
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/archiver/tar/BZip2TarFile.java   (with props)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/archiver/tar/GZipTarFile.java   (with props)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/archiver/tar/PlexusIoTarBZip2FileResourceCollection.java   (with props)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/archiver/tar/PlexusIoTarFileResourceCollection.java   (with props)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/archiver/tar/PlexusIoTarGZipFileResourceCollection.java   (with props)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/archiver/tar/TarArchiver.java   (with props)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/archiver/tar/TarBZip2UnArchiver.java   (with props)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/archiver/tar/TarBuffer.java   (with props)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/archiver/tar/TarCompressionMethod.java   (with props)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/archiver/tar/TarConstants.java   (with props)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/archiver/tar/TarEntry.java   (with props)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/archiver/tar/TarFile.java   (with props)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/archiver/tar/TarGZipUnArchiver.java   (with props)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/archiver/tar/TarInputStream.java   (with props)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/archiver/tar/TarLongFileMode.java   (with props)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/archiver/tar/TarOutputStream.java   (with props)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/archiver/tar/TarResource.java   (with props)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/archiver/tar/TarUnArchiver.java   (with props)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/archiver/tar/TarUtils.java   (with props)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/archiver/util/
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/archiver/util/AbstractFileSet.java   (with props)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/archiver/util/ArchiveEntryUtils.java   (with props)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/archiver/util/Compressor.java   (with props)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/archiver/util/DefaultArchivedFileSet.java   (with props)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/archiver/util/DefaultFileSet.java   (with props)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/archiver/util/EnumeratedAttribute.java   (with props)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/archiver/util/FilterSupport.java   (with props)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/archiver/util/ResourceUtils.java   (with props)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/archiver/war/
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/archiver/war/WarArchiver.java   (with props)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/archiver/zip/
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/archiver/zip/AbstractZipArchiver.java   (with props)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/archiver/zip/AbstractZipUnArchiver.java   (with props)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/archiver/zip/AsiExtraField.java   (with props)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/archiver/zip/ExtraFieldUtils.java   (with props)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/archiver/zip/PlexusIoZipFileResourceCollection.java   (with props)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/archiver/zip/UnrecognizedExtraField.java   (with props)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/archiver/zip/ZipArchiver.java   (with props)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/archiver/zip/ZipEntry.java   (with props)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/archiver/zip/ZipExtraField.java   (with props)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/archiver/zip/ZipFile.java   (with props)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/archiver/zip/ZipLong.java   (with props)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/archiver/zip/ZipOutputStream.java   (with props)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/archiver/zip/ZipResource.java   (with props)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/archiver/zip/ZipShort.java   (with props)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/archiver/zip/ZipUnArchiver.java   (with props)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/io/
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/io/attributes/
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/io/attributes/AttributeConstants.java   (with props)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/io/attributes/FileAttributes.java   (with props)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/io/attributes/PlexusIoResourceAttributeUtils.java   (with props)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/io/attributes/PlexusIoResourceAttributes.java   (with props)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/io/attributes/SimpleResourceAttributes.java   (with props)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/io/filemappers/
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/io/filemappers/AbstractFileMapper.java   (with props)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/io/filemappers/FileExtensionMapper.java   (with props)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/io/filemappers/FileMapper.java   (with props)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/io/filemappers/FlattenFileMapper.java   (with props)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/io/filemappers/IdentityMapper.java   (with props)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/io/filemappers/MergeFileMapper.java   (with props)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/io/filemappers/PrefixFileMapper.java   (with props)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/io/filemappers/RegExpFileMapper.java   (with props)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/io/filemappers/package.html   (with props)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/io/fileselectors/
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/io/fileselectors/AllFilesFileSelector.java   (with props)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/io/fileselectors/FileInfo.java   (with props)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/io/fileselectors/FileSelector.java   (with props)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/io/fileselectors/IncludeExcludeFileSelector.java   (with props)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/io/fileselectors/package.html   (with props)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/io/resources/
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/io/resources/AbstractPlexusIoArchiveResourceCollection.java   (with props)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/io/resources/AbstractPlexusIoResource.java   (with props)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/io/resources/AbstractPlexusIoResourceCollection.java   (with props)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/io/resources/AbstractPlexusIoResourceWithAttributes.java   (with props)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/io/resources/PlexusIOResourceCollectionWithAttributes.java   (with props)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/io/resources/PlexusIoArchivedResourceCollection.java   (with props)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/io/resources/PlexusIoCompressedFileResourceCollection.java   (with props)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/io/resources/PlexusIoFileResource.java   (with props)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/io/resources/PlexusIoFileResourceCollection.java   (with props)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/io/resources/PlexusIoResource.java   (with props)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/io/resources/PlexusIoResourceCollection.java   (with props)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/io/resources/PlexusIoResourceWithAttributes.java   (with props)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/io/resources/PlexusIoURLResource.java   (with props)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/io/resources/PlexusIoZipFileResourceCollection.java   (with props)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/io/resources/package.html   (with props)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/io/resources/proxy/
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/io/resources/proxy/PlexusIoProxyResource.java   (with props)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/io/resources/proxy/PlexusIoProxyResourceCollection.java   (with props)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/io/resources/proxy/PlexusIoProxyResourceWithAttributes.java   (with props)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/util/
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/util/AbstractScanner.java   (with props)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/util/Base64.java   (with props)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/util/CachedMap.java   (with props)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/util/CollectionUtils.java   (with props)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/util/DirectoryScanner.java   (with props)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/util/DirectoryWalkListener.java   (with props)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/util/DirectoryWalker.java   (with props)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/util/ExceptionUtils.java   (with props)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/util/Expand.java   (with props)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/util/FastMap.java   (with props)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/util/FileUtils.java   (with props)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/util/IOUtil.java   (with props)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/util/InterpolationFilterReader.java   (with props)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/util/LineOrientedInterpolatingReader.java   (with props)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/util/Os.java   (with props)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/util/PathTool.java   (with props)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/util/PropertyUtils.java   (with props)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/util/ReaderFactory.java   (with props)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/util/ReflectionUtils.java   (with props)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/util/Scanner.java   (with props)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/util/SelectorUtils.java   (with props)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/util/StringInputStream.java   (with props)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/util/StringOutputStream.java   (with props)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/util/StringUtils.java   (with props)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/util/SweeperPool.java   (with props)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/util/TypeFormat.java   (with props)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/util/WriterFactory.java   (with props)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/util/cli/
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/util/cli/Arg.java   (with props)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/util/cli/CommandLineException.java   (with props)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/util/cli/CommandLineTimeOutException.java   (with props)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/util/cli/CommandLineUtils.java   (with props)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/util/cli/Commandline.java   (with props)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/util/cli/DefaultConsumer.java   (with props)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/util/cli/EnhancedStringTokenizer.java   (with props)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/util/cli/StreamConsumer.java   (with props)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/util/cli/StreamFeeder.java   (with props)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/util/cli/StreamPumper.java   (with props)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/util/cli/WriterStreamConsumer.java   (with props)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/util/cli/shell/
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/util/cli/shell/BourneShell.java   (with props)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/util/cli/shell/CmdShell.java   (with props)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/util/cli/shell/CommandShell.java   (with props)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/util/cli/shell/Shell.java   (with props)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/util/dag/
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/util/dag/CycleDetectedException.java   (with props)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/util/dag/CycleDetector.java   (with props)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/util/dag/DAG.java   (with props)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/util/dag/TopologicalSorter.java   (with props)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/util/dag/Vertex.java   (with props)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/util/introspection/
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/util/introspection/ClassMap.java   (with props)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/util/introspection/MethodMap.java   (with props)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/util/introspection/ReflectionValueExtractor.java   (with props)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/util/io/
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/util/io/FileInputStreamFacade.java   (with props)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/util/io/InputStreamFacade.java   (with props)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/util/io/RawInputStreamFacade.java   (with props)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/util/io/URLInputStreamFacade.java   (with props)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/util/reflection/
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/util/reflection/Reflector.java   (with props)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/util/reflection/ReflectorException.java   (with props)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/util/xml/
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/util/xml/CompactXMLWriter.java   (with props)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/util/xml/PrettyPrintXMLWriter.java   (with props)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/util/xml/SerializerXMLWriter.java   (with props)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/util/xml/XMLWriter.java   (with props)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/util/xml/XmlReader.java   (with props)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/util/xml/XmlReaderException.java   (with props)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/util/xml/XmlStreamReader.java   (with props)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/util/xml/XmlStreamReaderException.java   (with props)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/util/xml/XmlStreamWriter.java   (with props)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/util/xml/XmlUtil.java   (with props)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/util/xml/XmlWriterUtil.java   (with props)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/util/xml/Xpp3Dom.java   (with props)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/util/xml/Xpp3DomBuilder.java   (with props)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/util/xml/Xpp3DomUtils.java   (with props)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/util/xml/Xpp3DomWriter.java   (with props)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/util/xml/pull/
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/util/xml/pull/MXParser.java   (with props)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/util/xml/pull/MXSerializer.java   (with props)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/util/xml/pull/XmlPullParser.java   (with props)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/util/xml/pull/XmlPullParserException.java   (with props)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/util/xml/pull/XmlSerializer.java   (with props)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/osgi/
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/osgi/BootActivator.java
      - copied, changed from r817123, geronimo/sandbox/djencks/osgi/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/osgi/KernelActivator.java
Modified:
    geronimo/sandbox/djencks/osgi/framework/buildsupport/car-maven-plugin/pom.xml
    geronimo/sandbox/djencks/osgi/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/AbstractCarMojo.java
    geronimo/sandbox/djencks/osgi/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/ArchiveCarMojo.java
    geronimo/sandbox/djencks/osgi/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/ArchiveMojo.java
    geronimo/sandbox/djencks/osgi/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/PackageMojo.java
    geronimo/sandbox/djencks/osgi/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/PluginBootstrap2.java
    geronimo/sandbox/djencks/osgi/framework/buildsupport/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/reporting/SurefireReporter.java
    geronimo/sandbox/djencks/osgi/framework/buildsupport/pom.xml
    geronimo/sandbox/djencks/osgi/framework/bundles/asm-3.1/pom.xml
    geronimo/sandbox/djencks/osgi/framework/bundles/asm-commons-3.1/pom.xml
    geronimo/sandbox/djencks/osgi/framework/bundles/commons-cli/pom.xml
    geronimo/sandbox/djencks/osgi/framework/bundles/plexus-archiver/pom.xml
    geronimo/sandbox/djencks/osgi/framework/bundles/plexus-logging/pom.xml
    geronimo/sandbox/djencks/osgi/framework/bundles/plexus-utils/pom.xml
    geronimo/sandbox/djencks/osgi/framework/bundles/slf4j/pom.xml
    geronimo/sandbox/djencks/osgi/framework/bundles/wstx-asl/pom.xml
    geronimo/sandbox/djencks/osgi/framework/configs/client-system/pom.xml
    geronimo/sandbox/djencks/osgi/framework/configs/client-system/src/main/history/dependencies.xml
    geronimo/sandbox/djencks/osgi/framework/configs/geronimo-gbean-deployer-bootstrap/pom.xml
    geronimo/sandbox/djencks/osgi/framework/configs/geronimo-gbean-deployer-bootstrap/src/main/history/dependencies.xml
    geronimo/sandbox/djencks/osgi/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-2/pom.xml
    geronimo/sandbox/djencks/osgi/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system/pom.xml
    geronimo/sandbox/djencks/osgi/framework/configs/geronimo-gbean-deployer/src/main/history/dependencies.xml
    geronimo/sandbox/djencks/osgi/framework/configs/gshell-geronimo/src/main/history/dependencies.xml
    geronimo/sandbox/djencks/osgi/framework/configs/j2ee-security/src/main/history/dependencies.xml
    geronimo/sandbox/djencks/osgi/framework/configs/j2ee-system/pom.xml
    geronimo/sandbox/djencks/osgi/framework/configs/j2ee-system/src/main/history/dependencies.xml
    geronimo/sandbox/djencks/osgi/framework/configs/j2ee-system/src/main/plan/plan.xml
    geronimo/sandbox/djencks/osgi/framework/configs/jee-specs/pom.xml
    geronimo/sandbox/djencks/osgi/framework/configs/jsr88-cli/pom.xml
    geronimo/sandbox/djencks/osgi/framework/configs/jsr88-cli/src/main/history/dependencies.xml
    geronimo/sandbox/djencks/osgi/framework/configs/jsr88-deploymentfactory/pom.xml
    geronimo/sandbox/djencks/osgi/framework/configs/jsr88-deploymentfactory/src/main/history/dependencies.xml
    geronimo/sandbox/djencks/osgi/framework/configs/karaf-framework/pom.xml
    geronimo/sandbox/djencks/osgi/framework/configs/karaf-framework/src/main/descriptors/unix-bin.xml
    geronimo/sandbox/djencks/osgi/framework/configs/karaf-framework/src/main/distribution/text/etc/org.ops4j.pax.url.mvn.cfg
    geronimo/sandbox/djencks/osgi/framework/configs/karaf-framework/src/main/filtered-resources/etc/config.properties
    geronimo/sandbox/djencks/osgi/framework/configs/karaf-framework/src/main/filtered-resources/etc/startup.properties
    geronimo/sandbox/djencks/osgi/framework/configs/karaf-framework/src/main/filtered-resources/features.xml
    geronimo/sandbox/djencks/osgi/framework/configs/online-deployer/pom.xml
    geronimo/sandbox/djencks/osgi/framework/configs/online-deployer/src/main/history/dependencies.xml
    geronimo/sandbox/djencks/osgi/framework/configs/plugin/pom.xml
    geronimo/sandbox/djencks/osgi/framework/configs/plugin/src/main/history/dependencies.xml
    geronimo/sandbox/djencks/osgi/framework/configs/pom.xml
    geronimo/sandbox/djencks/osgi/framework/configs/rmi-naming/pom.xml
    geronimo/sandbox/djencks/osgi/framework/configs/server-security-config/pom.xml
    geronimo/sandbox/djencks/osgi/framework/configs/shutdown/pom.xml
    geronimo/sandbox/djencks/osgi/framework/configs/shutdown/src/main/history/dependencies.xml
    geronimo/sandbox/djencks/osgi/framework/configs/upgrade-cli/src/main/history/dependencies.xml
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-cli/pom.xml
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-commands/src/main/groovy/org/apache/geronimo/commands/GeronimoBranding.java
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/jmx/RemoteDeploymentManager.java
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-deployment/pom.xml
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/DeploymentConfigurationManager.java
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-kernel/pom.xml
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/ConfigurationModel.java
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/KernelConfigurationManager.java
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/SimpleConfigurationManager.java
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/osgi/KernelActivator.java
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/repository/AbstractRepository.java
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/pom.xml
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/ArchiverGBean.java
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/PluginInstallerGBean.java
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/ServerArchiver.java
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-security/pom.xml
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-service-builder/pom.xml
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-system/pom.xml
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/DependencyManager.java
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/logging/log4j/Log4jService.java
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/logging/log4j/URLConfigurator.java
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/serverinfo/BasicServerInfo.java
    geronimo/sandbox/djencks/osgi/framework/modules/testsupport-common/pom.xml
    geronimo/sandbox/djencks/osgi/framework/plugingroups/framework/pom.xml
    geronimo/sandbox/djencks/osgi/framework/plugingroups/framework/src/main/history/dependencies.xml
    geronimo/sandbox/djencks/osgi/framework/pom.xml

Modified: geronimo/sandbox/djencks/osgi/framework/buildsupport/car-maven-plugin/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/buildsupport/car-maven-plugin/pom.xml?rev=821961&r1=821960&r2=821961&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/buildsupport/car-maven-plugin/pom.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/buildsupport/car-maven-plugin/pom.xml Mon Oct  5 18:54:50 2009
@@ -18,7 +18,8 @@
 
 <!-- $Rev$ $Date$ -->
 
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
 
@@ -33,20 +34,22 @@
     <packaging>maven-plugin</packaging>
 
     <description>
-        The car-maven-plugin handles all aspects of "predeploying" a module into a Geronimo car file and installing car files into a Geronimo server.
-        As part of this it processes plan files to include the module Id and dependencies, and generates geronimo-plugin.xml metadata files and
+        The car-maven-plugin handles all aspects of "predeploying" a module into a Geronimo car file and installing car
+        files into a Geronimo server.
+        As part of this it processes plan files to include the module Id and dependencies, and generates
+        geronimo-plugin.xml metadata files and
         manages a geronimo-plugins.xml catalog in the local maven repository.
     </description>
 
     <dependencies>
         <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jaxb_2.1_spec</artifactId>
+            <groupId>org.apache.servicemix.specs</groupId>
+            <artifactId>org.apache.servicemix.specs.jaxb-api-2.1</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>com.sun.xml.bind</groupId>
-            <artifactId>jaxb-impl</artifactId>
+            <groupId>org.apache.servicemix.bundles</groupId>
+            <artifactId>org.apache.servicemix.bundles.jaxb-impl</artifactId>
         </dependency>
 
         <dependency>
@@ -55,17 +58,17 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-stax-api_1.0_spec</artifactId>
+            <groupId>org.apache.servicemix.specs</groupId>
+            <artifactId>org.apache.servicemix.specs.stax-api-1.0</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.codehaus.woodstox</groupId>
-            <artifactId>wstx-asl</artifactId>
+            <groupId>org.apache.servicemix.bundles</groupId>
+            <artifactId>org.apache.servicemix.bundles.woodstox</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-activation_1.1_spec</artifactId>
+            <groupId>org.apache.servicemix.specs</groupId>
+            <artifactId>org.apache.servicemix.specs.activation-api-1.1</artifactId>
         </dependency>
 
         <dependency>
@@ -113,73 +116,87 @@
         <dependency>
             <groupId>org.apache.maven</groupId>
             <artifactId>maven-project</artifactId>
-            <version>2.0.9</version>
+            <version>2.2.1</version>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.maven</groupId>
             <artifactId>maven-artifact</artifactId>
-            <version>2.0.9</version>
+            <version>2.2.1</version>
         </dependency>
         <dependency>
             <groupId>org.apache.maven</groupId>
             <artifactId>maven-plugin-api</artifactId>
-            <version>2.0.4</version>
+            <version>2.2.1</version>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.maven</groupId>
             <artifactId>maven-archiver</artifactId>
             <version>2.2</version>
+            <!--<scope>provided</scope>-->
         </dependency>
 
         <dependency>
             <groupId>org.apache.maven.shared</groupId>
             <artifactId>maven-dependency-tree</artifactId>
             <version>1.1</version>
+            <!--<scope>provided</scope>-->
         </dependency>
 
         <dependency>
             <groupId>org.apache.maven.shared</groupId>
             <artifactId>maven-filtering</artifactId>
             <version>1.0-beta-2</version>
+            <!--<scope>provided</scope>-->
         </dependency>
 
         <dependency>
-          <groupId>org.codehaus.plexus</groupId>
-          <artifactId>plexus-container-default</artifactId>
-          <version>1.0-alpha-9-stable-1</version>
+            <groupId>org.codehaus.plexus</groupId>
+            <artifactId>plexus-container-default</artifactId>
+            <version>1.0-alpha-9-stable-1</version>
+            <scope>provided</scope>
         </dependency>
+        <!--<dependency>-->
+            <!--<groupId>org.codehaus.plexus</groupId>-->
+            <!--<artifactId>plexus-classworlds</artifactId>-->
+            <!--<version>1.5.0</version>-->
+            <!--<scope>test</scope>-->
+        <!--</dependency>-->
         <dependency>
-          <groupId>org.codehaus.plexus</groupId>
-          <artifactId>plexus-classworlds</artifactId>
-          <version>1.2-alpha-10</version>
+            <groupId>classworlds</groupId>
+            <artifactId>classworlds</artifactId>
+            <version>1.1</version>
+            <scope>test</scope>
         </dependency>
 
         <dependency>
-          <groupId>org.codehaus.plexus</groupId>
-          <artifactId>plexus-utils</artifactId>
+            <groupId>org.codehaus.plexus</groupId>
+            <artifactId>plexus-utils</artifactId>
+            <!--<scope>provided</scope>-->
         </dependency>
 
         <dependency>
-          <groupId>org.codehaus.plexus</groupId>
-          <artifactId>plexus-interpolation</artifactId>
-          <version>1.7</version>
+            <groupId>org.codehaus.plexus</groupId>
+            <artifactId>plexus-interpolation</artifactId>
+            <version>1.7</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
-            <groupId>commons-cli</groupId>
+            <groupId>org.apache.geronimo.bundles</groupId>
             <artifactId>commons-cli</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>com.thoughtworks.xstream</groupId>
-            <artifactId>xstream</artifactId>
+            <groupId>org.apache.servicemix.bundles</groupId>
+            <artifactId>org.apache.servicemix.bundles.xstream</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>xpp3</groupId>
-            <artifactId>xpp3_min</artifactId>
+            <groupId>org.apache.servicemix.bundles</groupId>
+            <artifactId>org.apache.servicemix.bundles.xpp3</artifactId>
         </dependency>
 
         <dependency>

Modified: geronimo/sandbox/djencks/osgi/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/AbstractCarMojo.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/AbstractCarMojo.java?rev=821961&r1=821960&r2=821961&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/AbstractCarMojo.java (original)
+++ geronimo/sandbox/djencks/osgi/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/AbstractCarMojo.java Mon Oct  5 18:54:50 2009
@@ -689,8 +689,50 @@
                         "org.slf4j;version=\"1.5\"," +
                         "org.slf4j.bridge," +
                         "org.apache.geronimo.mavenplugins.car," +
+
+                        "org.codehaus.classworlds," +
+                        "org.codehaus.classworlds.realm," +
+
+                        "org.codehaus.plexus," +
+                        "org.codehaus.plexus.archiver," +
+                        "org.codehaus.plexus.archiver.jar," +
+                        "org.codehaus.plexus.archiver.tar," +
+                        "org.codehaus.plexus.archiver.util," +
+                        "org.codehaus.plexus.archiver.zip," +
                         "org.codehaus.plexus.component," +
+                        "org.codehaus.plexus.component.annotations," +
+                        "org.codehaus.plexus.component.composition," +
                         "org.codehaus.plexus.component.configurator," +
+                        "org.codehaus.plexus.component.configurator.converters," +
+                        "org.codehaus.plexus.component.configurator.expression," +
+                        "org.codehaus.plexus.component.discovery," +
+                        "org.codehaus.plexus.component.factory," +
+                        "org.codehaus.plexus.component.manager," +
+                        "org.codehaus.plexus.component.repository," +
+                        "org.codehaus.plexus.component.repository.exception," +
+                        "org.codehaus.plexus.component.repository.io," +
+                        "org.codehaus.plexus.configuration," +
+                        "org.codehaus.plexus.configuration.processor," +
+                        "org.codehaus.plexus.configuration.xml," +
+                        "org.codehaus.plexus.context," +
+                        "org.codehaus.plexus.embed," +
+                        "org.codehaus.plexus.lifecycle," +
+                        "org.codehaus.plexus.lifecycle.phase," +
+                        "org.codehaus.plexus.logging," +
+                        "org.codehaus.plexus.logging.console," +
+                        "org.codehaus.plexus.personality," +
+                        "org.codehaus.plexus.personality.plexus," +
+                        "org.codehaus.plexus.personality.plexus.lifecycle," +
+                        "org.codehaus.plexus.personality.plexus.lifecycle.phase," +
+                        "org.codehaus.plexus.util," +
+                        "org.codehaus.plexus.util.xml," +
+
+                        "org.apache.maven," +
+                        "org.apache.maven.plugin," +
+                        "org.apache.maven.lifecyle," +
+                        "org.apache.maven.shared," +
+                        "org.apache.maven.shared.filtering," +
+
                         "com.thoughtworks.xstream," +
                         "com.thoughtworks.xstream.alias," +
                         "com.thoughtworks.xstream.converters," +

Modified: geronimo/sandbox/djencks/osgi/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/ArchiveCarMojo.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/ArchiveCarMojo.java?rev=821961&r1=821960&r2=821961&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/ArchiveCarMojo.java (original)
+++ geronimo/sandbox/djencks/osgi/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/ArchiveCarMojo.java Mon Oct  5 18:54:50 2009
@@ -20,12 +20,8 @@
 package org.apache.geronimo.mavenplugins.car;
 
 import java.io.File;
-import java.io.FileInputStream;
-import java.io.InputStream;
 import java.io.FileReader;
 import java.io.Reader;
-import java.util.HashSet;
-import java.util.Set;
 
 import org.apache.maven.archiver.MavenArchiveConfiguration;
 import org.apache.maven.archiver.MavenArchiver;
@@ -34,12 +30,8 @@
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugin.MojoFailureException;
 import org.apache.maven.model.License;
-import org.apache.geronimo.kernel.config.ConfigurationUtil;
-import org.apache.geronimo.kernel.config.ConfigurationData;
 import org.apache.geronimo.kernel.osgi.ConfigurationActivator;
-import org.apache.geronimo.kernel.osgi.KernelActivator;
-import org.apache.geronimo.kernel.repository.Maven2Repository;
-import org.apache.geronimo.gbean.GBeanData;
+import org.apache.geronimo.system.osgi.BootActivator;
 import org.codehaus.plexus.archiver.jar.JarArchiver;
 
 /**
@@ -150,6 +142,12 @@
      */
     private File resourcesDir;
 
+    /**
+     * whether this is a boot bundle (starts kernel, and the config) or a normal plugin bundle.
+     * @parameter
+     */
+    private boolean boot;
+
     //
     // Mojo
     //
@@ -224,12 +222,13 @@
             File configFile = new File(new File(getArtifactInRepositoryDir(), "META-INF"), "imports.txt");
 
             if (configFile.exists()) {
-//                if (classpath != null) {
-//                    archive.addManifestEntry("Class-Path", getClassPath());
-//                    archive.addManifestEntry("Bundle-Activator", KernelActivator.class.getName());
-//                } else {
+                StringBuilder imports = new StringBuilder("org.apache.geronimo.kernel.osgi,");
+                if (boot) {
+                    archive.addManifestEntry("Bundle-Activator", BootActivator.class.getName());
+                    imports.append("org.apache.geronimo.system.osgi,");
+                } else {
                     archive.addManifestEntry("Bundle-Activator", ConfigurationActivator.class.getName());
-//                }
+                }
                 archive.addManifestEntry("Bundle-Name", project.getName());
                 archive.addManifestEntry("Bundle-Vendor", project.getOrganization().getName());
                 ArtifactVersion version = project.getArtifact().getSelectedVersion();
@@ -243,9 +242,7 @@
                 archive.addManifestEntry("Bundle-License", ((License)project.getLicenses().get(0)).getUrl());
                 archive.addManifestEntry("Bundle-DocURL", project.getUrl());
                 archive.addManifestEntry("Bundle-SymbolicName", project.getGroupId() + "." + project.getArtifactId());
-//            Maven2Repository repo = new Maven2Repository(targetRepository);
                 Reader in = new FileReader(configFile);
-                StringBuilder imports = new StringBuilder("org.apache.geronimo.kernel.osgi,");
                 char[] buf = new char[1024];
                 try {
                     int i;
@@ -256,7 +253,7 @@
                     in.close();
                 }
                 archive.addManifestEntry("Import-Package", imports.toString());
-
+                archive.addManifestEntry("DynamicImport-Package", "*");
             }
 
             archiver.createArchive(project, archive);

Modified: geronimo/sandbox/djencks/osgi/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/ArchiveMojo.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/ArchiveMojo.java?rev=821961&r1=821960&r2=821961&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/ArchiveMojo.java (original)
+++ geronimo/sandbox/djencks/osgi/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/ArchiveMojo.java Mon Oct  5 18:54:50 2009
@@ -25,13 +25,11 @@
 
 import org.apache.geronimo.kernel.repository.Artifact;
 import org.apache.geronimo.system.plugin.ArchiverGBean;
+import org.apache.geronimo.system.plugin.plexus.archiver.ArchiverException;
 import org.apache.geronimo.system.serverinfo.BasicServerInfo;
 import org.apache.geronimo.system.serverinfo.ServerInfo;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugin.MojoFailureException;
-import org.apache.maven.project.MavenProject;
-import org.apache.maven.project.MavenProjectHelper;
-import org.codehaus.plexus.archiver.ArchiverException;
 
 /**
  * Creates an archive containing a server assembly including all the dependencies in this projects pom.

Modified: geronimo/sandbox/djencks/osgi/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/PackageMojo.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/PackageMojo.java?rev=821961&r1=821960&r2=821961&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/PackageMojo.java (original)
+++ geronimo/sandbox/djencks/osgi/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/PackageMojo.java Mon Oct  5 18:54:50 2009
@@ -362,7 +362,7 @@
         kernel.boot();
         AbstractName sourceRepoName = bootDeployerSystem();
         Repository sourceRepo = (Repository) kernel.getGBean(sourceRepoName);
-        bundleContext.addBundleListener(new DependencyManager(bundleContext, Collections.<Repository>singleton(sourceRepo)));
+        new DependencyManager(bundleContext, Collections.<Repository>singleton(sourceRepo));
         Dictionary dictionary = null;
         ServiceRegistration kernelRegistration = bundleContext.registerService(Kernel.class.getName(), kernel, dictionary);
 

Modified: geronimo/sandbox/djencks/osgi/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/PluginBootstrap2.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/PluginBootstrap2.java?rev=821961&r1=821960&r2=821961&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/PluginBootstrap2.java (original)
+++ geronimo/sandbox/djencks/osgi/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/PluginBootstrap2.java Mon Oct  5 18:54:50 2009
@@ -87,7 +87,7 @@
 //        ModuleType config = ModuleDocument.Factory.parse(plan).getModule();
 
         Maven2Repository repository = new Maven2Repository(localRepo);
-        bundleContext.addBundleListener(new DependencyManager(bundleContext, Collections.<Repository>singleton(repository)));
+        new DependencyManager(bundleContext, Collections.<Repository>singleton(repository));
 
         GBeanBuilder gBeanBuilder = new GBeanBuilder(null, null);
         ServiceConfigBuilder builder = new ServiceConfigBuilder(null, Collections.<Repository>singleton(repository), Collections.<NamespaceDrivenBuilder>singleton(gBeanBuilder), new Jsr77Naming(), bundleContext);

Modified: geronimo/sandbox/djencks/osgi/framework/buildsupport/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/reporting/SurefireReporter.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/buildsupport/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/reporting/SurefireReporter.java?rev=821961&r1=821960&r2=821961&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/buildsupport/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/reporting/SurefireReporter.java (original)
+++ geronimo/sandbox/djencks/osgi/framework/buildsupport/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/reporting/SurefireReporter.java Mon Oct  5 18:54:50 2009
@@ -47,7 +47,7 @@
 import org.apache.maven.surefire.util.PrettyPrintXMLWriter;
 
 import org.codehaus.plexus.util.FileUtils;
-import org.codehaus.plexus.util.IOUtil;
+import org.apache.geronimo.system.plugin.plexus.util.IOUtil;
 import org.codehaus.plexus.util.StringUtils;
 import org.codehaus.plexus.util.xml.Xpp3Dom;
 import org.codehaus.plexus.util.xml.Xpp3DomWriter;

Modified: geronimo/sandbox/djencks/osgi/framework/buildsupport/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/buildsupport/pom.xml?rev=821961&r1=821960&r2=821961&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/buildsupport/pom.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/buildsupport/pom.xml Mon Oct  5 18:54:50 2009
@@ -75,5 +75,13 @@
             </plugin>
         </plugins>
     </reporting>
+    <profiles>
+        <profile>
+            <id>car</id>
+            <modules>
+                <module>car-maven-plugin</module>
+            </modules>
+        </profile>
+    </profiles>
 
 </project>

Modified: geronimo/sandbox/djencks/osgi/framework/bundles/asm-3.1/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/bundles/asm-3.1/pom.xml?rev=821961&r1=820127&r2=821961&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/bundles/asm-3.1/pom.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/bundles/asm-3.1/pom.xml Mon Oct  5 18:54:50 2009
@@ -21,16 +21,17 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-	    <groupId>org.apache.servicemix.bundles</groupId>
-	    <artifactId>bundles-pom</artifactId>
-	    <version>4-SNAPSHOT</version>
+        <groupId>org.apache.geronimo.framework</groupId>
+        <artifactId>framework</artifactId>
+        <version>3.0-SNAPSHOT</version>
+        <relativePath>../../pom.xml</relativePath>
     </parent>
 
-    <groupId>org.apache.servicemix.bundles</groupId>
-    <artifactId>org.apache.servicemix.bundles.asm</artifactId>
+    <groupId>org.apache.geronimo.bundles</groupId>
+    <artifactId>asm</artifactId>
     <packaging>bundle</packaging>
-    <version>2.2.3_2-SNAPSHOT</version>
-    <name>Apache ServiceMix Bundles: ${pkgArtifactId}-${pkgVersion}</name>
+    <version>3.1_1-SNAPSHOT</version>
+    <name>Apache Geronimo Bundles: ${pkgArtifactId}-${pkgVersion}</name>
     <description>
         This bundle simply wraps ${pkgArtifactId}-${pkgVersion}.jar.
     </description>
@@ -38,19 +39,13 @@
     <properties>
         <pkgGroupId>asm</pkgGroupId>
         <pkgArtifactId>asm</pkgArtifactId>
-        <pkgVersion>2.2.3</pkgVersion>
-        <servicemix.osgi.export.pkg>org.objectweb.asm</servicemix.osgi.export.pkg>
-        <servicemix.osgi.import.pkg>
-            !org.objectweb.asm*,
-            *;resolution:=optional,
-            *
-        </servicemix.osgi.import.pkg>
+        <pkgVersion>3.1</pkgVersion>
     </properties>
 
     <dependencies>
         <dependency>
             <groupId>${pkgGroupId}</groupId>
-            <artifactId>asm-all</artifactId>
+            <artifactId>asm</artifactId>
             <version>${pkgVersion}</version>
             <optional>true</optional>
         </dependency>
@@ -59,33 +54,15 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-shade-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>shade</goal>
-                        </goals>
-                        <configuration>
-                            <artifactSet>
-                                <includes>
-                                    <include>${pkgGroupId}:asm-all</include>
-                                </includes>
-                            </artifactSet>
-                            <filters>
-                                <filter>
-                                    <artifact>${pkgGroupId}:asm-all</artifact>
-                                    <excludes>
-                                        <exclude>**</exclude>
-                                    </excludes>
-                                </filter>
-                            </filters>
-                            <promoteTransitiveDependencies>true</promoteTransitiveDependencies>
-                            <createDependencyReducedPom>true</createDependencyReducedPom>
-                        </configuration>
-                    </execution>
-                </executions>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Export-Package>org.objectweb.asm*;version="3.1",*</Export-Package>
+                        <!--<Import-Package>com.envoisolutions.sxc.builder*;resolution:=optional,com.envoisolutions.sxc.compiler*;resolution:=optional,com.sun.codemodel*;resolution:=optional,com.sun.xml.fastinfoset*;resolution:=optional,com.sun.xml.txw2*;resolution:=optional,org.jvnet.fastinfoset*;resolution:=optional,org.jvnet.staxex*;resolution:=optional,sun.misc*;resolution:=optional,*</Import-Package>-->
+                        <!--<_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>-->
+                    </instructions>
+                </configuration>
             </plugin>
         </plugins>
     </build>

Modified: geronimo/sandbox/djencks/osgi/framework/bundles/asm-commons-3.1/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/bundles/asm-commons-3.1/pom.xml?rev=821961&r1=820127&r2=821961&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/bundles/asm-commons-3.1/pom.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/bundles/asm-commons-3.1/pom.xml Mon Oct  5 18:54:50 2009
@@ -21,36 +21,31 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-	    <groupId>org.apache.servicemix.bundles</groupId>
-	    <artifactId>bundles-pom</artifactId>
-	    <version>4-SNAPSHOT</version>
+        <groupId>org.apache.geronimo.framework</groupId>
+        <artifactId>framework</artifactId>
+        <version>3.0-SNAPSHOT</version>
+        <relativePath>../../pom.xml</relativePath>
     </parent>
 
-    <groupId>org.apache.servicemix.bundles</groupId>
-    <artifactId>org.apache.servicemix.bundles.asm</artifactId>
+    <groupId>org.apache.geronimo.bundles</groupId>
+    <artifactId>asm-commons</artifactId>
     <packaging>bundle</packaging>
-    <version>2.2.3_2-SNAPSHOT</version>
-    <name>Apache ServiceMix Bundles: ${pkgArtifactId}-${pkgVersion}</name>
+    <version>3.1_1-SNAPSHOT</version>
+    <name>Apache Geronimo Bundles: ${pkgArtifactId}-${pkgVersion}</name>
     <description>
         This bundle simply wraps ${pkgArtifactId}-${pkgVersion}.jar.
     </description>
 
     <properties>
         <pkgGroupId>asm</pkgGroupId>
-        <pkgArtifactId>asm</pkgArtifactId>
-        <pkgVersion>2.2.3</pkgVersion>
-        <servicemix.osgi.export.pkg>org.objectweb.asm</servicemix.osgi.export.pkg>
-        <servicemix.osgi.import.pkg>
-            !org.objectweb.asm*,
-            *;resolution:=optional,
-            *
-        </servicemix.osgi.import.pkg>
+        <pkgArtifactId>asm-commons</pkgArtifactId>
+        <pkgVersion>3.1</pkgVersion>
     </properties>
 
     <dependencies>
         <dependency>
             <groupId>${pkgGroupId}</groupId>
-            <artifactId>asm-all</artifactId>
+            <artifactId>${pkgArtifactId}</artifactId>
             <version>${pkgVersion}</version>
             <optional>true</optional>
         </dependency>
@@ -59,33 +54,15 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-shade-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>shade</goal>
-                        </goals>
-                        <configuration>
-                            <artifactSet>
-                                <includes>
-                                    <include>${pkgGroupId}:asm-all</include>
-                                </includes>
-                            </artifactSet>
-                            <filters>
-                                <filter>
-                                    <artifact>${pkgGroupId}:asm-all</artifact>
-                                    <excludes>
-                                        <exclude>**</exclude>
-                                    </excludes>
-                                </filter>
-                            </filters>
-                            <promoteTransitiveDependencies>true</promoteTransitiveDependencies>
-                            <createDependencyReducedPom>true</createDependencyReducedPom>
-                        </configuration>
-                    </execution>
-                </executions>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Export-Package>org.objectweb.asm*;version="3.1",*</Export-Package>
+                        <Import-Package>org.objectweb.asm.tree*;resolution:=optional,*</Import-Package>
+                        <!--<_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>-->
+                    </instructions>
+                </configuration>
             </plugin>
         </plugins>
     </build>

Modified: geronimo/sandbox/djencks/osgi/framework/bundles/commons-cli/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/bundles/commons-cli/pom.xml?rev=821961&r1=817123&r2=821961&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/bundles/commons-cli/pom.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/bundles/commons-cli/pom.xml Mon Oct  5 18:54:50 2009
@@ -29,8 +29,8 @@
     </parent>
 
     <groupId>org.apache.geronimo.bundles</groupId>
-    <artifactId>sxc-jaxb</artifactId>
-    <version>0.7.2_1-SNAPSHOT</version>
+    <artifactId>commons-cli</artifactId>
+    <version>1.0_1-SNAPSHOT</version>
     <packaging>bundle</packaging>
     <name>Apache Geronimo Bundles: ${pkgArtifactId}-${pkgVersion}</name>
     <description>
@@ -38,9 +38,9 @@
     </description>
 
     <properties>
-        <pkgGroupId>com.envoisolutions.sxc</pkgGroupId>
-        <pkgArtifactId>sxc-jaxb</pkgArtifactId>
-        <pkgVersion>0.7.2</pkgVersion>
+        <pkgGroupId>commons-cli</pkgGroupId>
+        <pkgArtifactId>commons-cli</pkgArtifactId>
+        <pkgVersion>1.0</pkgVersion>
     </properties>
     <dependencies>
         <dependency>
@@ -49,12 +49,6 @@
             <version>${pkgVersion}</version>
             <optional>true</optional>
         </dependency>
-        <dependency>
-            <groupId>org.apache.servicemix.bundles</groupId>
-            <artifactId>org.apache.servicemix.bundles.jaxb-impl</artifactId>
-            <version>2.1.6_2-SNAPSHOT</version>
-            <optional>true</optional>
-        </dependency>
     </dependencies>
 
     <build>
@@ -65,8 +59,8 @@
                 <!--<version>2.0.1-SNAPSHOT</version>-->
                 <configuration>
                     <instructions>
-                        <Export-Package>com.envoisolutions.sxc.jaxb*;version="0.7.2",*</Export-Package>
-                        <Import-Package>com.envoisolutions.sxc.builder*;resolution:=optional,com.envoisolutions.sxc.compiler*;resolution:=optional,com.sun.codemodel*;resolution:=optional,com.sun.xml.fastinfoset*;resolution:=optional,com.sun.xml.txw2*;resolution:=optional,org.jvnet.fastinfoset*;resolution:=optional,org.jvnet.staxex*;resolution:=optional,sun.misc*;resolution:=optional,*</Import-Package>
+                        <Export-Package>org.apache.commons.cli*;version="1.0",*</Export-Package>
+                        <!--<Import-Package>com.envoisolutions.sxc.builder*;resolution:=optional,com.envoisolutions.sxc.compiler*;resolution:=optional,com.sun.codemodel*;resolution:=optional,com.sun.xml.fastinfoset*;resolution:=optional,com.sun.xml.txw2*;resolution:=optional,org.jvnet.fastinfoset*;resolution:=optional,org.jvnet.staxex*;resolution:=optional,sun.misc*;resolution:=optional,*</Import-Package>-->
                         <!--<_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>-->
                     </instructions>
                 </configuration>

Modified: geronimo/sandbox/djencks/osgi/framework/bundles/plexus-archiver/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/bundles/plexus-archiver/pom.xml?rev=821961&r1=821960&r2=821961&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/bundles/plexus-archiver/pom.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/bundles/plexus-archiver/pom.xml Mon Oct  5 18:54:50 2009
@@ -107,8 +107,20 @@
                 <!--<version>2.0.1-SNAPSHOT</version>-->
                 <configuration>
                     <instructions>
-                        <Export-Package>org.codehaus.plexus.archiver*;version="1.0",*</Export-Package>
-                        <Import-Package>junit.framework;resolution:=optional,org.codehaus.classworlds;resolution:=optional,org.codehaus.plexus.classworlds;resolution:=optional,org.codehaus.plexus.classworlds.realm;resolution:=optional,*</Import-Package>
+                        <Export-Package>org.codehaus.plexus.archiver*;version="1.0"</Export-Package>
+                        <Import-Package>junit.framework*;resolution:=optional,
+                            org.codehaus.classworlds*;resolution:=optional,
+                            org.codehaus.plexus;resolution:=optional,
+                            org.codehaus.plexus.classworlds*;resolution:=optional,
+                            org.codehaus.plexus.classworlds.realm;resolution:=optional,
+                            org.codehaus.plexus.component*;resolution:=optional,
+                            org.codehaus.plexus.components*;resolution:=optional,
+                            org.codehaus.plexus.configuration*;resolution:=optional,
+                            org.codehaus.plexus.container*;resolution:=optional,
+                            org.codehaus.plexus.logging*;resolution:=optional,
+                            org.codehaus.plexus.personality*;resolution:=optional,
+                            org.codehaus.plexus.util*;resolution:=optional,
+                            *</Import-Package>
                         <!--<_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>-->
                     </instructions>
                 </configuration>

Modified: geronimo/sandbox/djencks/osgi/framework/bundles/plexus-logging/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/bundles/plexus-logging/pom.xml?rev=821961&r1=817123&r2=821961&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/bundles/plexus-logging/pom.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/bundles/plexus-logging/pom.xml Mon Oct  5 18:54:50 2009
@@ -29,7 +29,7 @@
     </parent>
 
     <groupId>org.apache.geronimo.bundles</groupId>
-    <artifactId>plexus-archiver</artifactId>
+    <artifactId>plexus-logging</artifactId>
     <version>1.0.9_1-SNAPSHOT</version>
     <packaging>bundle</packaging>
     <name>Apache Geronimo Bundles: ${pkgArtifactId}-${pkgVersion}</name>
@@ -107,8 +107,20 @@
                 <!--<version>2.0.1-SNAPSHOT</version>-->
                 <configuration>
                     <instructions>
-                        <Export-Package>org.codehaus.plexus.archiver*;version="1.0",*</Export-Package>
-                        <Import-Package>junit.framework;resolution:=optional,org.codehaus.classworlds;resolution:=optional,org.codehaus.plexus.classworlds;resolution:=optional,org.codehaus.plexus.classworlds.realm;resolution:=optional,*</Import-Package>
+                        <Export-Package>org.codehaus.plexus.logging*;version="1.0"</Export-Package>
+                        <Import-Package>junit.framework*;resolution:=optional,
+                            org.codehaus.classworlds*;resolution:=optional,
+                            org.codehaus.plexus;resolution:=optional,
+                            org.codehaus.plexus.classworlds*;resolution:=optional,
+                            org.codehaus.plexus.classworlds.realm;resolution:=optional,
+                            org.codehaus.plexus.component*;resolution:=optional,
+                            org.codehaus.plexus.components*;resolution:=optional,
+                            org.codehaus.plexus.configuration*;resolution:=optional,
+                            org.codehaus.plexus.container*;resolution:=optional,
+                            org.codehaus.plexus.logging*;resolution:=optional,
+                            org.codehaus.plexus.personality*;resolution:=optional,
+                            org.codehaus.plexus.util*;resolution:=optional,
+                            *</Import-Package>
                         <!--<_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>-->
                     </instructions>
                 </configuration>

Modified: geronimo/sandbox/djencks/osgi/framework/bundles/plexus-utils/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/bundles/plexus-utils/pom.xml?rev=821961&r1=821960&r2=821961&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/bundles/plexus-utils/pom.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/bundles/plexus-utils/pom.xml Mon Oct  5 18:54:50 2009
@@ -30,7 +30,7 @@
 
     <groupId>org.apache.geronimo.bundles</groupId>
     <artifactId>plexus-utils</artifactId>
-    <version>1.4.5_1-SNAPSHOT</version>
+    <version>1.5.15_1-SNAPSHOT</version>
     <packaging>bundle</packaging>
     <name>Apache Geronimo Bundles: ${pkgArtifactId}-${pkgVersion}</name>
     <description>
@@ -40,7 +40,7 @@
     <properties>
         <pkgGroupId>org.codehaus.plexus</pkgGroupId>
         <pkgArtifactId>plexus-utils</pkgArtifactId>
-        <pkgVersion>1.4.5</pkgVersion>
+        <pkgVersion>1.5.15</pkgVersion>
     </properties>
     <dependencies>
         <dependency>

Modified: geronimo/sandbox/djencks/osgi/framework/bundles/slf4j/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/bundles/slf4j/pom.xml?rev=821961&r1=821960&r2=821961&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/bundles/slf4j/pom.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/bundles/slf4j/pom.xml Mon Oct  5 18:54:50 2009
@@ -61,6 +61,12 @@
             <version>${pkgVersion}</version>
             <optional>true</optional>
         </dependency>
+        <dependency>
+            <groupId>${pkgGroupId}</groupId>
+            <artifactId>jcl-over-slf4j</artifactId>
+            <version>${pkgVersion}</version>
+            <optional>true</optional>
+        </dependency>
     </dependencies>
 
     <build>
@@ -113,8 +119,12 @@
                 <!--<version>2.0.1-SNAPSHOT</version>-->
                 <configuration>
                     <instructions>
-                        <Export-Package>org.slf4*;version="1.5.5",*</Export-Package>
-                        <Import-Package>com.sun.jdmk.comm;resolution:=optional,javax.jms;resolution:=optional,javax.mail.*;resolution:=optional,org.slf4j.helpers;resolution:=optional,*</Import-Package>
+                        <Export-Package>org.slf4*;version="1.5.5",
+                            org.apache.commons.logging*;version="1.1",*</Export-Package>
+                        <Import-Package>com.sun.jdmk.comm;resolution:=optional,
+                            javax.jms;resolution:=optional,
+                            javax.mail.*;resolution:=optional,
+                            org.slf4j.helpers;resolution:=optional,*</Import-Package>
                         <_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>
                     </instructions>
                 </configuration>



Mime
View raw message