Author: hibou
Date: Mon Dec 13 14:37:33 2010
New Revision: 1045136
URL: http://svn.apache.org/viewvc?rev=1045136&view=rev
Log:
Make the MANIFEST.MF parser have a typedef name and make it part of the "OSGi
core"
Added:
ant/ivy/core/trunk/src/java/org/apache/ivy/osgi/core/BundleInfoAdapter.java
- copied, changed from r1045135,
ant/ivy/core/trunk/src/java/org/apache/ivy/osgi/repo/BundleInfoAdapter.java
ant/ivy/core/trunk/src/java/org/apache/ivy/osgi/core/OSGiManifestParser.java
- copied, changed from r1045135,
ant/ivy/core/trunk/src/java/org/apache/ivy/osgi/repo/ManifestMDParser.java
Removed:
ant/ivy/core/trunk/src/java/org/apache/ivy/osgi/repo/BundleInfoAdapter.java
ant/ivy/core/trunk/src/java/org/apache/ivy/osgi/repo/ManifestMDParser.java
Modified:
ant/ivy/core/trunk/src/java/org/apache/ivy/ant/ConvertManifestTask.java
ant/ivy/core/trunk/src/java/org/apache/ivy/core/settings/typedef.properties
ant/ivy/core/trunk/src/java/org/apache/ivy/osgi/repo/BundleRepoResolver.java
ant/ivy/core/trunk/src/java/org/apache/ivy/osgi/repo/ResolverManifestIterable.java
Modified:
ant/ivy/core/trunk/src/java/org/apache/ivy/ant/ConvertManifestTask.java
URL:
http://svn.apache.org/viewvc/ant/ivy/core/trunk/src/java/org/apache/ivy/ant/ConvertManifestTask.java?rev=1045136&r1=1045135&r2=1045136&view=diff
==============================================================================
--- ant/ivy/core/trunk/src/java/org/apache/ivy/ant/ConvertManifestTask.java
(original)
+++ ant/ivy/core/trunk/src/java/org/apache/ivy/ant/ConvertManifestTask.java Mon
Dec 13 14:37:33 2010
@@ -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;
Modified:
ant/ivy/core/trunk/src/java/org/apache/ivy/core/settings/typedef.properties
URL:
http://svn.apache.org/viewvc/ant/ivy/core/trunk/src/java/org/apache/ivy/core/settings/typedef.properties?rev=1045136&r1=1045135&r2=1045136&view=diff
==============================================================================
--- ant/ivy/core/trunk/src/java/org/apache/ivy/core/settings/typedef.properties
(original)
+++ ant/ivy/core/trunk/src/java/org/apache/ivy/core/settings/typedef.properties
Mon Dec 13 14:37:33 2010
@@ -57,4 +57,6 @@ log = org.apache.ivy.plugins.tr
cache =
org.apache.ivy.core.cache.DefaultRepositoryCacheManager
-pgp =
org.apache.ivy.plugins.signer.bouncycastle.OpenPGPSignatureGenerator
\ No newline at end of file
+pgp =
org.apache.ivy.plugins.signer.bouncycastle.OpenPGPSignatureGenerator
+
+osgi-manifest-parser = org.apache.ivy.osgi.core.OSGiManifestParser
Copied:
ant/ivy/core/trunk/src/java/org/apache/ivy/osgi/core/BundleInfoAdapter.java
(from r1045135,
ant/ivy/core/trunk/src/java/org/apache/ivy/osgi/repo/BundleInfoAdapter.java)
URL:
http://svn.apache.org/viewvc/ant/ivy/core/trunk/src/java/org/apache/ivy/osgi/core/BundleInfoAdapter.java?p2=ant/ivy/core/trunk/src/java/org/apache/ivy/osgi/core/BundleInfoAdapter.java&p1=ant/ivy/core/trunk/src/java/org/apache/ivy/osgi/repo/BundleInfoAdapter.java&r1=1045135&r2=1045136&rev=1045136&view=diff
==============================================================================
--- ant/ivy/core/trunk/src/java/org/apache/ivy/osgi/repo/BundleInfoAdapter.java
(original)
+++ ant/ivy/core/trunk/src/java/org/apache/ivy/osgi/core/BundleInfoAdapter.java
Mon Dec 13 14:37:33 2010
@@ -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.descri
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;
Copied:
ant/ivy/core/trunk/src/java/org/apache/ivy/osgi/core/OSGiManifestParser.java
(from r1045135,
ant/ivy/core/trunk/src/java/org/apache/ivy/osgi/repo/ManifestMDParser.java)
URL:
http://svn.apache.org/viewvc/ant/ivy/core/trunk/src/java/org/apache/ivy/osgi/core/OSGiManifestParser.java?p2=ant/ivy/core/trunk/src/java/org/apache/ivy/osgi/core/OSGiManifestParser.java&p1=ant/ivy/core/trunk/src/java/org/apache/ivy/osgi/repo/ManifestMDParser.java&r1=1045135&r2=1045136&rev=1045136&view=diff
==============================================================================
--- ant/ivy/core/trunk/src/java/org/apache/ivy/osgi/repo/ManifestMDParser.java
(original)
+++
ant/ivy/core/trunk/src/java/org/apache/ivy/osgi/core/OSGiManifestParser.java
Mon Dec 13 14:37:33 2010
@@ -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 Ab
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,
Modified:
ant/ivy/core/trunk/src/java/org/apache/ivy/osgi/repo/BundleRepoResolver.java
URL:
http://svn.apache.org/viewvc/ant/ivy/core/trunk/src/java/org/apache/ivy/osgi/repo/BundleRepoResolver.java?rev=1045136&r1=1045135&r2=1045136&view=diff
==============================================================================
---
ant/ivy/core/trunk/src/java/org/apache/ivy/osgi/repo/BundleRepoResolver.java
(original)
+++
ant/ivy/core/trunk/src/java/org/apache/ivy/osgi/repo/BundleRepoResolver.java
Mon Dec 13 14:37:33 2010
@@ -47,6 +47,7 @@ import org.apache.ivy.core.resolve.IvyNo
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;
Modified:
ant/ivy/core/trunk/src/java/org/apache/ivy/osgi/repo/ResolverManifestIterable.java
URL:
http://svn.apache.org/viewvc/ant/ivy/core/trunk/src/java/org/apache/ivy/osgi/repo/ResolverManifestIterable.java?rev=1045136&r1=1045135&r2=1045136&view=diff
==============================================================================
---
ant/ivy/core/trunk/src/java/org/apache/ivy/osgi/repo/ResolverManifestIterable.java
(original)
+++
ant/ivy/core/trunk/src/java/org/apache/ivy/osgi/repo/ResolverManifestIterable.java
Mon Dec 13 14:37:33 2010
@@ -38,6 +38,7 @@ import org.apache.ivy.core.search.Organi
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;
