Add tycho entry to the catalog

14 files changed, 327 insertions, 10 deletions

diff --git a/org.eclipse.m2e.discovery-directory/directory.xml b/org.eclipse.m2e.discovery-directory/directory.xml
index f766cc7d..85397a85 100644
--- a/org.eclipse.m2e.discovery-directory/directory.xml
+++ b/org.eclipse.m2e.discovery-directory/directory.xml
@@ -1,3 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <directory xmlns="http://www.eclipse.org/mylyn/discovery/directory/">
+	<entry url="http://download.eclipse.org/technology/m2e/discovery/org.eclipse.m2e.discovery.oss-1.0.0.jar" permitCategories="true"/>
 </directory>
\ No newline at end of file
diff --git a/org.eclipse.m2e.discovery-directory/org.eclipse.m2e.discovery-parent/pom.xml b/org.eclipse.m2e.discovery-directory/org.eclipse.m2e.discovery-parent/pom.xml
new file mode 100644
index 00000000..e2d1e1c5
--- /dev/null
+++ b/org.eclipse.m2e.discovery-directory/org.eclipse.m2e.discovery-parent/pom.xml
@@ -0,0 +1,33 @@
+<project
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+	xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>org.eclipse.m2e</groupId>
+	<artifactId>org.eclipse.m2e.discovery-parent</artifactId>
+	<packaging>pom</packaging>
+	<version>1.0.0-SNAPSHOT</version>
+
+	<distributionManagement>
+		<repository>
+			<id>forge-releases</id>
+			<url>http://repository.sonatype.org:8081/service/local/staging/deploy/maven2</url>
+		</repository>
+		<snapshotRepository>
+			<id>forge-snapshots</id>
+			<url>http://repository.sonatype.org/content/repositories/snapshots</url>
+		</snapshotRepository>
+	</distributionManagement>
+
+	<properties>
+		<discovery.folder>/home/data/users/prapicau/downloads/technology/m2e/discovery/</discovery.folder>
+	</properties>
+	<build>
+		<extensions>
+			<extension>
+				<groupId>org.apache.maven.wagon</groupId>
+				<artifactId>wagon-ssh-external</artifactId>
+				<version>1.0-beta-7</version>
+			</extension>
+		</extensions>
+	</build>
+</project>
\ No newline at end of file
diff --git a/org.eclipse.m2e.discovery-directory/org.eclipse.m2e.discovery.oss/.classpath b/org.eclipse.m2e.discovery-directory/org.eclipse.m2e.discovery.oss/.classpath
new file mode 100644
index 00000000..b6fb50ec
--- /dev/null
+++ b/org.eclipse.m2e.discovery-directory/org.eclipse.m2e.discovery.oss/.classpath
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"/>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git a/org.eclipse.m2e.discovery-directory/org.eclipse.m2e.discovery.oss/.project b/org.eclipse.m2e.discovery-directory/org.eclipse.m2e.discovery.oss/.project
new file mode 100644
index 00000000..20236ee5
--- /dev/null
+++ b/org.eclipse.m2e.discovery-directory/org.eclipse.m2e.discovery.oss/.project
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.m2e.discovery.oss</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</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>
+	</natures>
+</projectDescription>
diff --git a/org.eclipse.m2e.discovery-directory/org.eclipse.m2e.discovery.oss/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.m2e.discovery-directory/org.eclipse.m2e.discovery.oss/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 00000000..615e426a
--- /dev/null
+++ b/org.eclipse.m2e.discovery-directory/org.eclipse.m2e.discovery.oss/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,6 @@
+#Mon Jan 17 11:55:50 EST 2011
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.compliance=1.5
+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.oss/.settings/org.eclipse.m2e.core.prefs b/org.eclipse.m2e.discovery-directory/org.eclipse.m2e.discovery.oss/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 00000000..8c792633
--- /dev/null
+++ b/org.eclipse.m2e.discovery-directory/org.eclipse.m2e.discovery.oss/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,5 @@
+#Mon Jan 17 11:55:49 EST 2011
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/org.eclipse.m2e.discovery-directory/org.eclipse.m2e.discovery.oss/META-INF/MANIFEST.MF b/org.eclipse.m2e.discovery-directory/org.eclipse.m2e.discovery.oss/META-INF/MANIFEST.MF
new file mode 100755
index 00000000..c1c44fd5
--- /dev/null
+++ b/org.eclipse.m2e.discovery-directory/org.eclipse.m2e.discovery.oss/META-INF/MANIFEST.MF
@@ -0,0 +1,9 @@
+Manifest-Version: 1.0

+Bundle-ManifestVersion: 2

+Bundle-Name: %Bundle-Name

+Bundle-SymbolicName: org.eclipse.m2e.discovery.oss;singleton:=true

+Bundle-Version: 1.0.0.qualifier

+Bundle-RequiredExecutionEnvironment: J2SE-1.5	

+Bundle-Localization: plugin

+Bundle-Vendor: %Bundle-Vendor

+Require-Bundle: org.eclipse.equinox.p2.discovery.compatibility

diff --git a/org.eclipse.m2e.discovery-directory/org.eclipse.m2e.discovery.oss/build.properties b/org.eclipse.m2e.discovery-directory/org.eclipse.m2e.discovery.oss/build.properties
new file mode 100755
index 00000000..9b1bf9d4
--- /dev/null
+++ b/org.eclipse.m2e.discovery-directory/org.eclipse.m2e.discovery.oss/build.properties
@@ -0,0 +1,16 @@
+###############################################################################

+# Copyright (c) 2009 Tasktop Technologies and others.

+# All rights reserved. This program and the accompanying materials

+# are made available under the terms of the Eclipse Public License v1.0

+# which accompanies this distribution, and is available at

+# http://www.eclipse.org/legal/epl-v10.html

+#

+# Contributors:

+#      Tasktop Technologies - initial API and implementation

+###############################################################################

+bin.includes = META-INF/,\

+               .,\

+               plugin.xml,\

+               images/,\

+               plugin.properties,\

+               lifecycle/

diff --git a/org.eclipse.m2e.discovery-directory/org.eclipse.m2e.discovery.oss/images/extras-48.png b/org.eclipse.m2e.discovery-directory/org.eclipse.m2e.discovery.oss/images/extras-48.png
new file mode 100755
index 00000000..74d4e62a
--- /dev/null
+++ b/org.eclipse.m2e.discovery-directory/org.eclipse.m2e.discovery.oss/images/extras-48.png
diff --git a/org.eclipse.m2e.discovery-directory/org.eclipse.m2e.discovery.oss/lifecycle/org.eclipse.m2e.discovery.lifecycles.tycho.xml b/org.eclipse.m2e.discovery-directory/org.eclipse.m2e.discovery.oss/lifecycle/org.eclipse.m2e.discovery.lifecycles.tycho.xml
new file mode 100755
index 00000000..d4227b06
--- /dev/null
+++ b/org.eclipse.m2e.discovery-directory/org.eclipse.m2e.discovery.oss/lifecycle/org.eclipse.m2e.discovery.lifecycles.tycho.xml
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<lifecycleMappingMetadata>
+	<lifecycleMappings>
+		<!-- Tycho packaging types -->
+		<lifecycleMapping>
+			<packagingType>eclipse-plugin</packagingType>
+			<lifecycleMappingId>org.sonatype.tycho.m2e.tychoLifecycleMapping
+			</lifecycleMappingId>
+		</lifecycleMapping>
+		<lifecycleMapping>
+			<packagingType>eclipse-test-plugin</packagingType>
+			<lifecycleMappingId>org.sonatype.tycho.m2e.tychoLifecycleMapping
+			</lifecycleMappingId>
+		</lifecycleMapping>
+		<lifecycleMapping>
+			<packagingType>eclipse-feature</packagingType>
+			<lifecycleMappingId>org.sonatype.tycho.m2e.tychoLifecycleMapping
+			</lifecycleMappingId>
+		</lifecycleMapping>
+		<lifecycleMapping>
+			<packagingType>eclipse-update-site</packagingType>
+			<lifecycleMappingId>org.sonatype.tycho.m2e.tychoLifecycleMapping
+			</lifecycleMappingId>
+		</lifecycleMapping>
+		<lifecycleMapping>
+			<packagingType>eclipse-application</packagingType>
+			<lifecycleMappingId>org.sonatype.tycho.m2e.tychoLifecycleMapping
+			</lifecycleMappingId>
+		</lifecycleMapping>
+		<!-- maven-bundle-plugin packaging types -->
+		<lifecycleMapping>
+			<packagingType>bundle</packagingType>
+			<lifecycleMappingId>org.eclipse.m2e.jdt.JarLifecycleMapping
+			</lifecycleMappingId>
+			<pluginExecutions>
+				<pluginExecution>
+					<pluginExecutionFilter>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-compiler-plugin</artifactId>
+						<versionRange>[2.0,)</versionRange>
+						<goals>
+							<goal>compile</goal>
+							<goal>testCompile</goal>
+						</goals>
+					</pluginExecutionFilter>
+					<action>
+						<configurator>
+							<id>org.eclipse.m2e.jdt.javaConfigurator</id>
+						</configurator>
+					</action>
+				</pluginExecution>
+			</pluginExecutions>
+		</lifecycleMapping>
+	</lifecycleMappings>
+	<pluginExecutions>
+		<!-- Tycho mojos -->
+		<pluginExecution>
+			<pluginExecutionFilter>
+				<groupId>org.sonatype.tycho</groupId>
+				<artifactId>maven-osgi-compiler-plugin</artifactId>
+				<versionRange>[0.9.0,)</versionRange>
+				<goals>
+					<goal>compile</goal>
+					<goal>testCompile</goal>
+				</goals>
+			</pluginExecutionFilter>
+			<action>
+				<ignore />
+			</action>
+		</pluginExecution>
+		<pluginExecution>
+			<pluginExecutionFilter>
+				<groupId>org.sonatype.tycho</groupId>
+				<artifactId>maven-osgi-packaging-plugin</artifactId>
+				<versionRange>[0.9.0,)</versionRange>
+				<goals>
+					<goal>build-qualifier</goal>
+					<goal>validate-version</goal>
+				</goals>
+			</pluginExecutionFilter>
+			<action>
+				<ignore />
+			</action>
+		</pluginExecution>
+		<!-- maven-bundle-plugin mojos -->
+		<pluginExecution>
+			<pluginExecutionFilter>
+				<groupId>org.apache.felix</groupId>
+				<artifactId>maven-bundle-plugin</artifactId>
+				<versionRange>[1.0.0,)</versionRange>
+				<goals>
+					<goal>manifest</goal>
+					<goal>bundle</goal>
+				</goals>
+			</pluginExecutionFilter>
+			<action>
+				<configurator>
+					<id>maven-bundle-plugin</id>
+				</configurator>
+			</action>
+		</pluginExecution>
+	</pluginExecutions>
+</lifecycleMappingMetadata>
\ No newline at end of file
diff --git a/org.eclipse.m2e.discovery-directory/org.eclipse.m2e.discovery.oss/plugin.properties b/org.eclipse.m2e.discovery-directory/org.eclipse.m2e.discovery.oss/plugin.properties
new file mode 100755
index 00000000..6e008fbc
--- /dev/null
+++ b/org.eclipse.m2e.discovery-directory/org.eclipse.m2e.discovery.oss/plugin.properties
@@ -0,0 +1,18 @@
+#
+# Copyright (c) 2011 Sonatype, Inc.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+
+Bundle-Vendor = Eclipse.org
+category.name.lifecycles = Lifecycle Mappings
+category.description.lifecycles = Lifecycle Mappings 
+
+# Tycho
+configuratorDescriptor.tycho.name = Tycho Configurator
+configuratorDescriptor.tycho.description = Tycho Configurator bridges tycho based projects and PDE
+configuratorDescriptor.tycho.license = EPL
+configuratorDescriptor.tycho.provider = Sonatype, Inc.
+configuratorDescriptor.tycho.overview-summary = Tycho is focused on a Maven-centric, manifest-first approach to building Eclipse plug-ins, features, update sites, RCP applications and OSGi bundles. Tycho is a set of Maven plugins and extensions for building Eclipse plugins and OSGi bundles with Maven. Eclipse plugins and OSGi bundles have their own metadata for expressing dependencies, source folder locations, etc. that are normally found in a Maven POM. Tycho uses native metadata for Eclipse plugins and OSGi bundles and uses the POM to configure and drive the build. Tycho supports bundles, fragments, features, update site projects and RCP applications. Tycho also knows how to run JUnit test plugins using OSGi runtime and there is also support for sharing build results using Maven artifact repositories. Tycho plugins introduce new packaging types and the corresponding lifecycle bindings that allow Maven to use OSGi and Eclipse metadata during a Maven build. 
diff --git a/org.eclipse.m2e.discovery-directory/org.eclipse.m2e.discovery.oss/plugin.xml b/org.eclipse.m2e.discovery-directory/org.eclipse.m2e.discovery.oss/plugin.xml
new file mode 100755
index 00000000..7893e3fa
--- /dev/null
+++ b/org.eclipse.m2e.discovery-directory/org.eclipse.m2e.discovery.oss/plugin.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<?eclipse version="3.4"?>

+<plugin>

+   <extension point="org.eclipse.mylyn.discovery.core.connectorDiscovery">

+		<connectorCategory description="%category.description.lifecycles" id="org.eclipse.m2e.discovery.category.lifecycles" name="%category.name.lifecycles" relevance="30">

+  			<icon image48="images/extras-48.png" /> 

+         <group id="lifecycles">

+         </group>

+  		</connectorCategory>

+   </extension>

+   

+   <extension point="org.eclipse.mylyn.discovery.core.connectorDiscovery">

+      <connectorDescriptor

+            categoryId="org.eclipse.m2e.discovery.category.lifecycles"

+            description="%configuratorDescriptor.tycho.description"

+            groupId="lifecycles"

+            id="org.eclipse.m2e.discovery.lifecycles.tycho"

+            kind="lifecycles"

+            license="%configuratorDescriptor.tycho.license"

+            name="%configuratorDescriptor.tycho.name"

+            provider="%configuratorDescriptor.tycho.provider"

+            siteUrl="http://repository.sonatype.org/content/sites/forge-sites/m2eclipse-tycho/0.5.0/N/0.5.0.201101121400/">

+        <iu id="org.sonatype.tycho.m2e.feature.feature.group">

+        </iu>

+         <overview

+               summary="%configuratorDescriptor.tycho.overview-summary"

+               url="http://eclipse.org/tycho/">

+         </overview>

+      </connectorDescriptor>

+   </extension>

+</plugin>

diff --git a/org.eclipse.m2e.discovery-directory/org.eclipse.m2e.discovery.oss/pom.xml b/org.eclipse.m2e.discovery-directory/org.eclipse.m2e.discovery.oss/pom.xml
new file mode 100755
index 00000000..b88e05ab
--- /dev/null
+++ b/org.eclipse.m2e.discovery-directory/org.eclipse.m2e.discovery.oss/pom.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<project

+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"

+	xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">

+	<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>

+	<modelVersion>4.0.0</modelVersion>

+

+	<groupId>org.eclipse.m2e</groupId>

+	<artifactId>org.eclipse.m2e.discovery.oss</artifactId>

+	<version>1.0.0</version>

+	<packaging>jar</packaging>

+

+	<build>

+		<resources>

+			<resource>

+				<targetPath>.</targetPath>

+				<filtering>false</filtering>

+				<directory>${basedir}/</directory>

+				<includes>

+					<include>plugin.*</include>

+					<include>images/**</include>

+					<include>lifecycle/**</include>

+				</includes>

+			</resource>

+		</resources>

+	</build>

+

+	<profiles>

+		<profile>

+			<id>publish-site</id>

+			<build>

+				<plugins>

+					<plugin>

+						<groupId>org.codehaus.mojo</groupId>

+						<artifactId>wagon-maven-plugin</artifactId>

+						<version>1.0-beta-4-SNAPSHOT</version>

+						<executions>

+							<execution>

+								<id>upload-file</id>

+								<phase>deploy</phase>

+								<goals>

+									<goal>upload</goal>

+								</goals>

+								<configuration>

+									<fromDir>${project.build.directory}</fromDir>

+									<serverId>download.eclipse.org</serverId>

+									<includes>org.eclipse.m2e.discovery.oss-1.0.0.jar</includes>

+									<url>scpexe://dev.eclipse.org/</url>

+									<toDir>${discovery.folder}/${project.artifactId}/</toDir>

+								</configuration>

+							</execution>

+						</executions>

+					</plugin>

+				</plugins>

+			</build>

+

+		</profile>

+	</profiles>

+</project>

diff --git a/org.eclipse.m2e.discovery-directory/pom.xml b/org.eclipse.m2e.discovery-directory/pom.xml
index 45af2b17..1f67a962 100644
--- a/org.eclipse.m2e.discovery-directory/pom.xml
+++ b/org.eclipse.m2e.discovery-directory/pom.xml
@@ -6,15 +6,17 @@
 	<version>1.0.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
-	<build>
-		<extensions>
-			<extension>
-				<groupId>org.apache.maven.wagon</groupId>
-				<artifactId>wagon-ssh-external</artifactId>
-				<version>1.0-beta-7</version>
-			</extension>
-		</extensions>
-	</build>
+	<parent>
+		<groupId>org.eclipse.m2e</groupId>
+		<artifactId>org.eclipse.m2e.discovery-parent</artifactId>
+		<version>1.0.0-SNAPSHOT</version>
+	</parent>
+
+
+	<modules>
+		<module>org.eclipse.m2e.discovery.oss</module>
+		<module>org.eclipse.m2e.discovery-parent</module>
+	</modules> 
 
 	<profiles>
 		<profile>
@@ -37,7 +39,7 @@
 									<serverId>download.eclipse.org</serverId>
 									<includes>directory.xml</includes>
 									<url>scpexe://dev.eclipse.org/</url>
-									<toDir>/home/data/users/prapicau/downloads/technology/m2e/discovery/</toDir>
+									<toDir>${discovery.folder}</toDir>
 								</configuration>
 							</execution>
 						</executions>