diff options
author | Igor Fedorenko | 2011-03-24 19:52:27 +0000 |
---|---|---|
committer | Igor Fedorenko | 2011-03-24 19:52:27 +0000 |
commit | 4e76ac4c3f69abde7906319343d3438375e42131 (patch) | |
tree | 46198954154993cc444fcbac9fee4826e7535fa9 /org.eclipse.m2e.discovery-directory | |
parent | 5b68038bb56ca2bd777ac7d359b4524c5fbc347d (diff) | |
download | m2e-core-4e76ac4c3f69abde7906319343d3438375e42131.tar.gz m2e-core-4e76ac4c3f69abde7906319343d3438375e42131.tar.xz m2e-core-4e76ac4c3f69abde7906319343d3438375e42131.zip |
crlf
Diffstat (limited to 'org.eclipse.m2e.discovery-directory')
6 files changed, 159 insertions, 159 deletions
diff --git a/org.eclipse.m2e.discovery-directory/org.eclipse.m2e.discovery-directory.tests/.project b/org.eclipse.m2e.discovery-directory/org.eclipse.m2e.discovery-directory.tests/.project index 0c230bb5..f0b9a7c5 100644 --- a/org.eclipse.m2e.discovery-directory/org.eclipse.m2e.discovery-directory.tests/.project +++ b/org.eclipse.m2e.discovery-directory/org.eclipse.m2e.discovery-directory.tests/.project @@ -1,34 +1,34 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.m2e.discovery-directory.tests</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.m2e.core.maven2Builder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>org.eclipse.m2e.core.maven2Nature</nature>
- <nature>org.eclipse.pde.PluginNature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.m2e.discovery-directory.tests</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.jdt.core.javabuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.pde.ManifestBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.pde.SchemaBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.m2e.core.maven2Builder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.m2e.core.maven2Nature</nature> + <nature>org.eclipse.pde.PluginNature</nature> + </natures> +</projectDescription> diff --git a/org.eclipse.m2e.discovery-directory/org.eclipse.m2e.discovery-directory.tests/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.m2e.discovery-directory/org.eclipse.m2e.discovery-directory.tests/.settings/org.eclipse.jdt.core.prefs index 2619beaf..d9d81112 100644 --- a/org.eclipse.m2e.discovery-directory/org.eclipse.m2e.discovery-directory.tests/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.m2e.discovery-directory/org.eclipse.m2e.discovery-directory.tests/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ -#Fri Mar 18 09:43:06 EDT 2011
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.5
+#Fri Mar 18 09:43:06 EDT 2011 +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 +org.eclipse.jdt.core.compiler.compliance=1.5 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning +org.eclipse.jdt.core.compiler.source=1.5 diff --git a/org.eclipse.m2e.discovery-directory/org.eclipse.m2e.discovery-directory.tests/.settings/org.eclipse.m2e.core.prefs b/org.eclipse.m2e.discovery-directory/org.eclipse.m2e.discovery-directory.tests/.settings/org.eclipse.m2e.core.prefs index facff118..6ddab66d 100644 --- a/org.eclipse.m2e.discovery-directory/org.eclipse.m2e.discovery-directory.tests/.settings/org.eclipse.m2e.core.prefs +++ b/org.eclipse.m2e.discovery-directory/org.eclipse.m2e.discovery-directory.tests/.settings/org.eclipse.m2e.core.prefs @@ -1,5 +1,5 @@ -#Fri Mar 18 09:35:09 EDT 2011
-activeProfiles=
-eclipse.preferences.version=1
-resolveWorkspaceProjects=true
-version=1
+#Fri Mar 18 09:35:09 EDT 2011 +activeProfiles= +eclipse.preferences.version=1 +resolveWorkspaceProjects=true +version=1 diff --git a/org.eclipse.m2e.discovery-directory/org.eclipse.m2e.discovery-directory.tests/META-INF/MANIFEST.MF b/org.eclipse.m2e.discovery-directory/org.eclipse.m2e.discovery-directory.tests/META-INF/MANIFEST.MF index c0a83049..c9018ce9 100644 --- a/org.eclipse.m2e.discovery-directory/org.eclipse.m2e.discovery-directory.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.m2e.discovery-directory/org.eclipse.m2e.discovery-directory.tests/META-INF/MANIFEST.MF @@ -1,33 +1,33 @@ -Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name
-Bundle-SymbolicName: org.eclipse.m2e.discovery.directory.tests;singleton:=true
-Bundle-Version: 0.13.0.qualifier
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.ui,
- org.junit,
- org.eclipse.equinox.p2.discovery,
- org.eclipse.equinox.p2.discovery.compatibility,
- org.eclipse.equinox.p2.core,
- org.eclipse.equinox.p2.ui.discovery,
- org.eclipse.m2e.discovery.oss
-Bundle-RequiredExecutionEnvironment: J2SE-1.5,
- JavaSE-1.6
-Bundle-ClassPath: .
-Bundle-Vendor: %Bundle-Vendor
-MavenArtifact-GroupId: org.eclipse.m2e
-MavenArtifact-ArtifactId: org.eclipse.m2e.test
-Import-Package: org.eclipse.equinox.internal.p2.discovery,
- org.eclipse.equinox.internal.p2.discovery.compatibility,
- org.eclipse.equinox.internal.p2.discovery.compatibility.util,
- org.eclipse.equinox.internal.p2.discovery.model,
- org.eclipse.equinox.internal.p2.discovery.util,
- org.eclipse.equinox.p2.metadata,
- org.eclipse.equinox.p2.query,
- org.eclipse.equinox.p2.repository.metadata,
- org.eclipse.m2e.core.project.configurator,
- org.eclipse.m2e.internal.discovery,
- org.eclipse.m2e.internal.discovery.strategy,
- org.eclipse.m2e.internal.discovery.wizards
-Bundle-Activator: org.eclipse.m2e.discovery.directory.tests.TestActivator
-Bundle-ActivationPolicy: lazy
+Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: %Bundle-Name +Bundle-SymbolicName: org.eclipse.m2e.discovery.directory.tests;singleton:=true +Bundle-Version: 0.13.0.qualifier +Require-Bundle: org.eclipse.core.runtime, + org.eclipse.ui, + org.junit, + org.eclipse.equinox.p2.discovery, + org.eclipse.equinox.p2.discovery.compatibility, + org.eclipse.equinox.p2.core, + org.eclipse.equinox.p2.ui.discovery, + org.eclipse.m2e.discovery.oss +Bundle-RequiredExecutionEnvironment: J2SE-1.5, + JavaSE-1.6 +Bundle-ClassPath: . +Bundle-Vendor: %Bundle-Vendor +MavenArtifact-GroupId: org.eclipse.m2e +MavenArtifact-ArtifactId: org.eclipse.m2e.test +Import-Package: org.eclipse.equinox.internal.p2.discovery, + org.eclipse.equinox.internal.p2.discovery.compatibility, + org.eclipse.equinox.internal.p2.discovery.compatibility.util, + org.eclipse.equinox.internal.p2.discovery.model, + org.eclipse.equinox.internal.p2.discovery.util, + org.eclipse.equinox.p2.metadata, + org.eclipse.equinox.p2.query, + org.eclipse.equinox.p2.repository.metadata, + org.eclipse.m2e.core.project.configurator, + org.eclipse.m2e.internal.discovery, + org.eclipse.m2e.internal.discovery.strategy, + org.eclipse.m2e.internal.discovery.wizards +Bundle-Activator: org.eclipse.m2e.discovery.directory.tests.TestActivator +Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.m2e.discovery-directory/org.eclipse.m2e.discovery-directory.tests/pom.xml b/org.eclipse.m2e.discovery-directory/org.eclipse.m2e.discovery-directory.tests/pom.xml index f5dba0ec..31e2dd7e 100644 --- a/org.eclipse.m2e.discovery-directory/org.eclipse.m2e.discovery-directory.tests/pom.xml +++ b/org.eclipse.m2e.discovery-directory/org.eclipse.m2e.discovery-directory.tests/pom.xml @@ -1,36 +1,36 @@ -<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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <artifactId>org.eclipse.m2e.discovery-parent</artifactId>
- <groupId>org.eclipse.m2e</groupId>
- <version>1.0.0-SNAPSHOT</version>
- <relativePath>../org.eclipse.m2e.discovery-parent/pom.xml</relativePath>
- </parent>
- <artifactId>org.eclipse.m2e.discovery-directory.tests</artifactId>
- <packaging>eclipse-test-plugin</packaging>
-
- <repositories>
- <repository>
- <id>snapshots</id>
- <url>https://repository.sonatype.org/content/repositories/snapshots/</url>
- </repository>
- <repository>
- <id>m2e-latest-build</id>
- <layout>p2</layout>
- <url>${m2e-core.url}</url>
- </repository>
- </repositories>
-
- <build>
- <sourceDirectory>src</sourceDirectory>
- <resources>
- <resource>
- <directory>src</directory>
- <excludes>
- <exclude>**/*.java</exclude>
- </excludes>
- </resource>
- </resources>
- </build>
+<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/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + <parent> + <artifactId>org.eclipse.m2e.discovery-parent</artifactId> + <groupId>org.eclipse.m2e</groupId> + <version>1.0.0-SNAPSHOT</version> + <relativePath>../org.eclipse.m2e.discovery-parent/pom.xml</relativePath> + </parent> + <artifactId>org.eclipse.m2e.discovery-directory.tests</artifactId> + <packaging>eclipse-test-plugin</packaging> + + <repositories> + <repository> + <id>snapshots</id> + <url>https://repository.sonatype.org/content/repositories/snapshots/</url> + </repository> + <repository> + <id>m2e-latest-build</id> + <layout>p2</layout> + <url>${m2e-core.url}</url> + </repository> + </repositories> + + <build> + <sourceDirectory>src</sourceDirectory> + <resources> + <resource> + <directory>src</directory> + <excludes> + <exclude>**/*.java</exclude> + </excludes> + </resource> + </resources> + </build> </project>
\ No newline at end of file diff --git a/org.eclipse.m2e.discovery-directory/org.eclipse.m2e.discovery-directory.tests/src/org/eclipse/m2e/discovery/directory/tests/TestM2EBundleStrategy.java b/org.eclipse.m2e.discovery-directory/org.eclipse.m2e.discovery-directory.tests/src/org/eclipse/m2e/discovery/directory/tests/TestM2EBundleStrategy.java index 2d894eb6..df681e96 100644 --- a/org.eclipse.m2e.discovery-directory/org.eclipse.m2e.discovery-directory.tests/src/org/eclipse/m2e/discovery/directory/tests/TestM2EBundleStrategy.java +++ b/org.eclipse.m2e.discovery-directory/org.eclipse.m2e.discovery-directory.tests/src/org/eclipse/m2e/discovery/directory/tests/TestM2EBundleStrategy.java @@ -1,43 +1,43 @@ -package org.eclipse.m2e.discovery.directory.tests;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IContributor;
-import org.eclipse.core.runtime.IExtension;
-import org.eclipse.core.runtime.IExtensionPoint;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.SubProgressMonitor;
-import org.eclipse.equinox.internal.p2.discovery.AbstractCatalogSource;
-import org.eclipse.equinox.internal.p2.discovery.Policy;
-import org.eclipse.equinox.internal.p2.discovery.compatibility.BundleDiscoverySource;
-import org.eclipse.equinox.internal.p2.discovery.compatibility.ConnectorDiscoveryExtensionReader;
-import org.eclipse.m2e.internal.discovery.strategy.M2ERemoteBundleDiscoveryStrategy;
-
-@SuppressWarnings("restriction")
-public class TestM2EBundleStrategy extends M2ERemoteBundleDiscoveryStrategy {
-
- @Override
- public void performDiscovery(IProgressMonitor monitor) throws CoreException {
- if (items == null || categories == null) {
- throw new IllegalStateException();
- }
- IExtensionPoint extensionPoint = getExtensionRegistry().getExtensionPoint(ConnectorDiscoveryExtensionReader.EXTENSION_POINT_ID);
- IExtension[] extensions = extensionPoint.getExtensions();
- monitor.beginTask("Loading local extensions", extensions.length == 0 ? 1 : extensions.length);
- try {
- if (extensions.length > 0) {
- processExtensions(new SubProgressMonitor(monitor, extensions.length), extensions);
- }
- } finally {
- monitor.done();
- }
- }
-
- @Override
- protected AbstractCatalogSource computeDiscoverySource(IContributor contributor) {
- Policy policy = new Policy(true);
- BundleDiscoverySource bundleDiscoverySource = new BundleDiscoverySource(Platform.getBundle(contributor.getName()));
- bundleDiscoverySource.setPolicy(policy);
- return bundleDiscoverySource;
- }
-}
+package org.eclipse.m2e.discovery.directory.tests; + +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IContributor; +import org.eclipse.core.runtime.IExtension; +import org.eclipse.core.runtime.IExtensionPoint; +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.core.runtime.Platform; +import org.eclipse.core.runtime.SubProgressMonitor; +import org.eclipse.equinox.internal.p2.discovery.AbstractCatalogSource; +import org.eclipse.equinox.internal.p2.discovery.Policy; +import org.eclipse.equinox.internal.p2.discovery.compatibility.BundleDiscoverySource; +import org.eclipse.equinox.internal.p2.discovery.compatibility.ConnectorDiscoveryExtensionReader; +import org.eclipse.m2e.internal.discovery.strategy.M2ERemoteBundleDiscoveryStrategy; + +@SuppressWarnings("restriction") +public class TestM2EBundleStrategy extends M2ERemoteBundleDiscoveryStrategy { + + @Override + public void performDiscovery(IProgressMonitor monitor) throws CoreException { + if (items == null || categories == null) { + throw new IllegalStateException(); + } + IExtensionPoint extensionPoint = getExtensionRegistry().getExtensionPoint(ConnectorDiscoveryExtensionReader.EXTENSION_POINT_ID); + IExtension[] extensions = extensionPoint.getExtensions(); + monitor.beginTask("Loading local extensions", extensions.length == 0 ? 1 : extensions.length); + try { + if (extensions.length > 0) { + processExtensions(new SubProgressMonitor(monitor, extensions.length), extensions); + } + } finally { + monitor.done(); + } + } + + @Override + protected AbstractCatalogSource computeDiscoverySource(IContributor contributor) { + Policy policy = new Policy(true); + BundleDiscoverySource bundleDiscoverySource = new BundleDiscoverySource(Platform.getBundle(contributor.getName())); + bundleDiscoverySource.setPolicy(policy); + return bundleDiscoverySource; + } +} |