natas_hw
/
ant-ivy
mirror of https://github.com/apache/ant-ivy
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Make the MANIFEST.MF parser have a typedef name and make it part of the "OSGi core" 

git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/trunk@1045136 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Nicolas Lalevee 2010-12-13 14:37:33 +00:00
parent 32a82eedc4
commit 162e0521cc
6 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/java/org/apache/ivy/ant/ConvertManifestTask.java
View File

@ -27,9 +27,9 @@ import java.util.jar.Manifest;
import org.apache.ivy.ant.IvyTask;
import org.apache.ivy.core.module.descriptor.ModuleDescriptor;
import org.apache.ivy.osgi.core.BundleInfo;
import org.apache.ivy.osgi.core.BundleInfoAdapter;
import org.apache.ivy.osgi.core.ExecutionEnvironmentProfileProvider;
import org.apache.ivy.osgi.core.ManifestParser;
import org.apache.ivy.osgi.repo.BundleInfoAdapter;
import org.apache.ivy.plugins.parser.xml.XmlModuleDescriptorWriter;
import org.apache.tools.ant.BuildException;

4
src/java/org/apache/ivy/core/settings/typedef.properties
View File

@ -57,4 +57,6 @@ log = org.apache.ivy.plugins.trigger.LogTrigger
cache = org.apache.ivy.core.cache.DefaultRepositoryCacheManager
pgp = org.apache.ivy.plugins.signer.bouncycastle.OpenPGPSignatureGenerator
pgp = org.apache.ivy.plugins.signer.bouncycastle.OpenPGPSignatureGenerator
osgi-manifest-parser = org.apache.ivy.osgi.core.OSGiManifestParser

7
src/java/org/apache/ivy/osgi/repo/BundleInfoAdapter.java → src/java/org/apache/ivy/osgi/core/BundleInfoAdapter.java
View File

@ -15,7 +15,7 @@
* limitations under the License.
*
*/
package org.apache.ivy.osgi.repo;
package org.apache.ivy.osgi.core;
import java.net.MalformedURLException;
import java.net.URL;
@ -36,10 +36,7 @@ import org.apache.ivy.core.module.descriptor.DefaultModuleDescriptor;
import org.apache.ivy.core.module.id.ArtifactId;
import org.apache.ivy.core.module.id.ModuleId;
import org.apache.ivy.core.module.id.ModuleRevisionId;
import org.apache.ivy.osgi.core.BundleInfo;
import org.apache.ivy.osgi.core.BundleRequirement;
import org.apache.ivy.osgi.core.ExecutionEnvironmentProfileProvider;
import org.apache.ivy.osgi.core.ExportPackage;
import org.apache.ivy.osgi.repo.ExecutionEnvironmentProfile;
import org.apache.ivy.osgi.util.Version;
import org.apache.ivy.osgi.util.VersionRange;
import org.apache.ivy.plugins.matcher.ExactOrRegexpPatternMatcher;

10
src/java/org/apache/ivy/osgi/repo/ManifestMDParser.java → src/java/org/apache/ivy/osgi/core/OSGiManifestParser.java
View File

@ -15,25 +15,23 @@
* limitations under the License.
*
*/
package org.apache.ivy.osgi.repo;
package org.apache.ivy.osgi.core;
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.net.URL;
import java.text.ParseException;
import java.util.Locale;
import java.util.jar.Manifest;
import org.apache.ivy.core.module.descriptor.ModuleDescriptor;
import org.apache.ivy.osgi.core.BundleInfo;
import org.apache.ivy.osgi.core.ExecutionEnvironmentProfileProvider;
import org.apache.ivy.osgi.core.ManifestParser;
import org.apache.ivy.plugins.parser.AbstractModuleDescriptorParser;
import org.apache.ivy.plugins.parser.ParserSettings;
import org.apache.ivy.plugins.parser.xml.XmlModuleDescriptorWriter;
import org.apache.ivy.plugins.repository.Resource;
public class ManifestMDParser extends AbstractModuleDescriptorParser {
public class OSGiManifestParser extends AbstractModuleDescriptorParser {
private ExecutionEnvironmentProfileProvider profileProvider;
@ -45,7 +43,7 @@ public class ManifestMDParser extends AbstractModuleDescriptorParser {
if (res == null || res.getName() == null || res.getName().trim().equals("")) {
return false;
}
return res.getName().toUpperCase().endsWith("MANIFEST.MF");
return res.getName().toUpperCase(Locale.US).endsWith("MANIFEST.MF");
}
public ModuleDescriptor parseDescriptor(ParserSettings ivySettings, URL descriptorURL,

1
src/java/org/apache/ivy/osgi/repo/BundleRepoResolver.java
View File

@ -47,6 +47,7 @@ import org.apache.ivy.core.resolve.IvyNode;
import org.apache.ivy.core.resolve.ResolveData;
import org.apache.ivy.core.resolve.ResolvedModuleRevision;
import org.apache.ivy.osgi.core.BundleInfo;
import org.apache.ivy.osgi.core.BundleInfoAdapter;
import org.apache.ivy.osgi.core.ExecutionEnvironmentProfileProvider;
import org.apache.ivy.osgi.obr.xml.OBRXMLParser;
import org.apache.ivy.osgi.util.Version;

1
src/java/org/apache/ivy/osgi/repo/ResolverManifestIterable.java
View File

@ -38,6 +38,7 @@ import org.apache.ivy.core.search.OrganisationEntry;
import org.apache.ivy.core.search.RevisionEntry;
import org.apache.ivy.core.settings.IvySettings;
import org.apache.ivy.core.sort.SortEngine;
import org.apache.ivy.osgi.core.BundleInfoAdapter;
import org.apache.ivy.plugins.resolver.BasicResolver;
import org.apache.ivy.plugins.resolver.util.ResolvedResource;
import org.apache.ivy.util.Message;