This is an automated email from the ASF dual-hosted git repository.
tjwatson pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/felix-atomos.git.
from 2b935d0 Merge pull request #4 from sebratton/expose-getConnectContent
new 8925fd8 FELIX-6227 - Generalize Atomos index to be used independent
of substrate
new 7576cdb Javadoc tweaks for getConnectContent
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.gitignore | 1 -
README.md | 6 +-
.../atomos.examples.substrate.equinox/pom.xml | 2 +-
.../atomos.examples.substrate.felix/pom.xml | 2 +-
.../impl/runtime/base/AtomosRuntimeBase.java | 430 ++++++++++++++++++---
.../impl/runtime/base/AtomosRuntimeClassPath.java | 10 +-
.../content/ConnectContentCloseableJar.java | 89 +++++
.../ConnectContentFile.java} | 6 +-
.../ConnectContentIndexed.java} | 14 +-
.../ConnectContentJar.java} | 27 +-
.../{substrate => content}/package-info.java | 2 +-
.../impl/runtime/modules/AtomosRuntimeModules.java | 15 +-
...nnectContent.java => ConnectContentModule.java} | 4 +-
.../runtime/substrate/AtomosRuntimeSubstrate.java | 430 ---------------------
.../substrate/SubstrateJarConnectContent.java | 139 -------
.../apache/felix/atomos/launch/AtomosLauncher.java | 2 +-
.../apache/felix/atomos/runtime/AtomosContent.java | 13 +-
.../apache/felix/atomos/runtime/AtomosRuntime.java | 23 +-
atomos.tests/atomos.tests.index.bundles/pom.xml | 28 ++
.../atomos/tests/index/bundles/IndexLaunch.java} | 11 +-
.../tests/index/bundles/b1/ActivatorBundle1.java} | 21 +-
.../tests/index/bundles/b2/ActivatorBundle2.java} | 21 +-
.../tests/index/bundles/b3/ActivatorBundle3.java} | 21 +-
.../tests/index/bundles/b4/ActivatorBundle4.java} | 21 +-
.../main/resources/atomos/1/META-INF/MANIFEST.MF | 5 +
.../resources/atomos/1/OSGI-INF/bundle.1-1.txt | 1 +
.../resources/atomos/1/OSGI-INF/bundle.1-2.txt | 1 +
.../main/resources/atomos/1/OSGI-INF/common.txt | 1 +
.../main/resources/atomos/2/META-INF/MANIFEST.MF | 5 +
.../resources/atomos/2/OSGI-INF/bundle.2-1.txt | 1 +
.../resources/atomos/2/OSGI-INF/bundle.2-2.txt | 1 +
.../main/resources/atomos/2/OSGI-INF/common.txt | 1 +
.../main/resources/atomos/3/META-INF/MANIFEST.MF | 5 +
.../resources/atomos/3/OSGI-INF/bundle.3-1.txt | 1 +
.../resources/atomos/3/OSGI-INF/bundle.3-2.txt | 1 +
.../main/resources/atomos/3/OSGI-INF/common.txt | 1 +
.../main/resources/atomos/4/META-INF/MANIFEST.MF | 5 +
.../resources/atomos/4/OSGI-INF/bundle.4-1.txt | 1 +
.../resources/atomos/4/OSGI-INF/bundle.4-2.txt | 1 +
.../main/resources/atomos/4/OSGI-INF/common.txt | 1 +
.../src/main/resources/atomos/bundles.index | 36 ++
.../tests/index/bundles/IndexLaunchTest.java | 183 +++++++++
atomos.tests/pom.xml | 1 +
43 files changed, 867 insertions(+), 723 deletions(-)
create mode 100644
atomos.runtime/src/main/java/org/apache/felix/atomos/impl/runtime/content/ConnectContentCloseableJar.java
rename
atomos.runtime/src/main/java/org/apache/felix/atomos/impl/runtime/{base/FileConnectContent.java
=> content/ConnectContentFile.java} (96%)
rename
atomos.runtime/src/main/java/org/apache/felix/atomos/impl/runtime/{substrate/SubstrateIndexConnectContent.java
=> content/ConnectContentIndexed.java} (88%)
rename
atomos.runtime/src/main/java/org/apache/felix/atomos/impl/runtime/{base/JarConnectContent.java
=> content/ConnectContentJar.java} (76%)
rename
atomos.runtime/src/main/java/org/apache/felix/atomos/impl/runtime/{substrate =>
content}/package-info.java (91%)
rename
atomos.runtime/src/main/java/org/apache/felix/atomos/impl/runtime/modules/{ModuleConnectContent.java
=> ConnectContentModule.java} (97%)
delete mode 100644
atomos.runtime/src/main/java/org/apache/felix/atomos/impl/runtime/substrate/AtomosRuntimeSubstrate.java
delete mode 100644
atomos.runtime/src/main/java/org/apache/felix/atomos/impl/runtime/substrate/SubstrateJarConnectContent.java
create mode 100644 atomos.tests/atomos.tests.index.bundles/pom.xml
copy
atomos.tests/{atomos.tests.modulepath.service/src/main/java/org/apache/felix/atomos/tests/modulepath/service/ModulepathLaunch.java
=>
atomos.tests.index.bundles/src/main/java/org/apache/felix/atomos/tests/index/bundles/IndexLaunch.java}
(73%)
copy
atomos.tests/{atomos.tests.testbundles/atomos.tests.testbundles.service.impl.activator/src/main/java/org/apache/felix/atomos/tests/testbundles/service/impl/activator/Activator.java
=>
atomos.tests.index.bundles/src/main/java/org/apache/felix/atomos/tests/index/bundles/b1/ActivatorBundle1.java}
(52%)
copy
atomos.tests/{atomos.tests.testbundles/atomos.tests.testbundles.service.impl.activator/src/main/java/org/apache/felix/atomos/tests/testbundles/service/impl/activator/Activator.java
=>
atomos.tests.index.bundles/src/main/java/org/apache/felix/atomos/tests/index/bundles/b2/ActivatorBundle2.java}
(52%)
copy
atomos.tests/{atomos.tests.testbundles/atomos.tests.testbundles.service.impl.activator/src/main/java/org/apache/felix/atomos/tests/testbundles/service/impl/activator/Activator.java
=>
atomos.tests.index.bundles/src/main/java/org/apache/felix/atomos/tests/index/bundles/b3/ActivatorBundle3.java}
(52%)
copy
atomos.tests/{atomos.tests.testbundles/atomos.tests.testbundles.service.impl.activator/src/main/java/org/apache/felix/atomos/tests/testbundles/service/impl/activator/Activator.java
=>
atomos.tests.index.bundles/src/main/java/org/apache/felix/atomos/tests/index/bundles/b4/ActivatorBundle4.java}
(52%)
create mode 100644
atomos.tests/atomos.tests.index.bundles/src/main/resources/atomos/1/META-INF/MANIFEST.MF
create mode 100644
atomos.tests/atomos.tests.index.bundles/src/main/resources/atomos/1/OSGI-INF/bundle.1-1.txt
create mode 100644
atomos.tests/atomos.tests.index.bundles/src/main/resources/atomos/1/OSGI-INF/bundle.1-2.txt
create mode 100644
atomos.tests/atomos.tests.index.bundles/src/main/resources/atomos/1/OSGI-INF/common.txt
create mode 100644
atomos.tests/atomos.tests.index.bundles/src/main/resources/atomos/2/META-INF/MANIFEST.MF
create mode 100644
atomos.tests/atomos.tests.index.bundles/src/main/resources/atomos/2/OSGI-INF/bundle.2-1.txt
create mode 100644
atomos.tests/atomos.tests.index.bundles/src/main/resources/atomos/2/OSGI-INF/bundle.2-2.txt
create mode 100644
atomos.tests/atomos.tests.index.bundles/src/main/resources/atomos/2/OSGI-INF/common.txt
create mode 100644
atomos.tests/atomos.tests.index.bundles/src/main/resources/atomos/3/META-INF/MANIFEST.MF
create mode 100644
atomos.tests/atomos.tests.index.bundles/src/main/resources/atomos/3/OSGI-INF/bundle.3-1.txt
create mode 100644
atomos.tests/atomos.tests.index.bundles/src/main/resources/atomos/3/OSGI-INF/bundle.3-2.txt
create mode 100644
atomos.tests/atomos.tests.index.bundles/src/main/resources/atomos/3/OSGI-INF/common.txt
create mode 100644
atomos.tests/atomos.tests.index.bundles/src/main/resources/atomos/4/META-INF/MANIFEST.MF
create mode 100644
atomos.tests/atomos.tests.index.bundles/src/main/resources/atomos/4/OSGI-INF/bundle.4-1.txt
create mode 100644
atomos.tests/atomos.tests.index.bundles/src/main/resources/atomos/4/OSGI-INF/bundle.4-2.txt
create mode 100644
atomos.tests/atomos.tests.index.bundles/src/main/resources/atomos/4/OSGI-INF/common.txt
create mode 100644
atomos.tests/atomos.tests.index.bundles/src/main/resources/atomos/bundles.index
create mode 100644
atomos.tests/atomos.tests.index.bundles/src/test/java/org/apache/felix/atomos/tests/index/bundles/IndexLaunchTest.java
