| 49,6 → 49,7 |
|---|
| import org.osgi.service.http.HttpService; |
| import org.osgi.service.http.NamespaceException; |
| import org.ow2.util.archive.api.IArchive; |
| import org.ow2.util.archive.api.IArchiveMetadata; |
| import org.ow2.util.archive.impl.ArchiveManager; |
| import org.ow2.util.ee.deploy.api.deployable.IDeployable; |
| import org.ow2.util.ee.deploy.impl.helper.DeployableHelper; |
| 115,6 → 116,14 |
|---|
| |
| for (File deployableFile : jonasBaseDeployContents) { |
| IArchive archive = ArchiveManager.getInstance().getArchive(deployableFile); |
| if (archive == null) { |
| continue; |
| } |
| IArchiveMetadata metadata = archive.getMetadata(); |
| if (metadata == null) { |
| continue; |
| } |
| |
| IDeployable<?> deployable; |
| try { |
| deployable = DeployableHelper.getDeployable(archive); |
| 123,11 → 132,12 |
|---|
| exception.initCause(e); |
| throw exception; |
| } |
| if (deployable == null) { |
| continue; |
| } |
| |
| String versionNumber = deployable.getArchive().getMetadata().get( |
| Attributes.Name.IMPLEMENTATION_VERSION.toString()); |
| String versionNumber = metadata.get(Attributes.Name.IMPLEMENTATION_VERSION.toString()); |
| String name = deployable.getModuleName(); |
| |
| if (name != null && versionNumber != null) { |
| String versionNumberSuffixShort = "-" + versionNumber; |
| String versionNumberSuffixLong = "-version" + versionNumber; |
| 169,5 → 179,4 |
|---|
| public void destroy() { |
| // Nothing to do |
| } |
| |
| } |
jonas