You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ro...@apache.org on 2014/05/27 15:35:52 UTC
svn commit: r1597782 - in /sling/trunk/tooling/ide: ./ m2e-feature/
p2update/ p2update/siteTemplate/ target-definition/
Author: rombert
Date: Tue May 27 13:35:52 2014
New Revision: 1597782
URL: http://svn.apache.org/r1597782
Log:
SLING-3608 - Sling bundle projects are not properly configured if the
m2e tycho configurator is not installed
- updated the m2e-feature to import the org.sonatype.tycho.m2e.feature ;
this solves the root problem
- the p2update site now uses the jboss repository-utils to add a
reference to the m2e-tycho update site
- since the repository-utils automatically generates a p2 update site,
I've replaced it with a basic template
- since the -dev and basic target definitions are now the same, I
deleted the -dev one.
Added:
sling/trunk/tooling/ide/p2update/siteTemplate/
sling/trunk/tooling/ide/p2update/siteTemplate/index.html (with props)
Removed:
sling/trunk/tooling/ide/target-definition/org.apache.sling.ide.target-definition-dev.target
Modified:
sling/trunk/tooling/ide/m2e-feature/feature.xml
sling/trunk/tooling/ide/p2update/pom.xml
sling/trunk/tooling/ide/pom.xml
sling/trunk/tooling/ide/target-definition/org.apache.sling.ide.target-definition.target
Modified: sling/trunk/tooling/ide/m2e-feature/feature.xml
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/m2e-feature/feature.xml?rev=1597782&r1=1597781&r2=1597782&view=diff
==============================================================================
--- sling/trunk/tooling/ide/m2e-feature/feature.xml (original)
+++ sling/trunk/tooling/ide/m2e-feature/feature.xml Tue May 27 13:35:52 2014
@@ -211,6 +211,10 @@
</license>
+ <requires>
+ <import feature="org.sonatype.tycho.m2e.feature"/>
+ </requires>
+
<plugin
id="org.apache.sling.ide.eclipse-m2e-ui"
download-size="0"
Modified: sling/trunk/tooling/ide/p2update/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/p2update/pom.xml?rev=1597782&r1=1597781&r2=1597782&view=diff
==============================================================================
--- sling/trunk/tooling/ide/p2update/pom.xml (original)
+++ sling/trunk/tooling/ide/p2update/pom.xml Tue May 27 13:35:52 2014
@@ -9,5 +9,34 @@
</parent>
<artifactId>org.apache.sling.ide.p2update</artifactId>
<packaging>eclipse-repository</packaging>
- <name>Sling IDE Tools: P2 Repository</name>
+ <name>Sling IDE Tools: Update Site</name>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.jboss.tools.tycho-plugins</groupId>
+ <artifactId>repository-utils</artifactId>
+ <version>0.16.0</version>
+ <executions>
+ <execution>
+ <id>generate-facade</id>
+ <phase>package</phase>
+ <goals>
+ <goal>generate-repository-facade</goal>
+ </goals>
+ <configuration>
+ <siteTemplateFolder>siteTemplate</siteTemplateFolder>
+ <symbols>
+ <update.site.name>${project.name}</update.site.name>
+ <target.eclipse.version>Kepler or newer</target.eclipse.version>
+ </symbols>
+ <associateSites>
+ <site>http://repo1.maven.org/maven2/.m2e/connectors/m2eclipse-tycho/0.6.0/N/0.6.0.201207302152/</site>
+ </associateSites>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</project>
Added: sling/trunk/tooling/ide/p2update/siteTemplate/index.html
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/p2update/siteTemplate/index.html?rev=1597782&view=auto
==============================================================================
--- sling/trunk/tooling/ide/p2update/siteTemplate/index.html (added)
+++ sling/trunk/tooling/ide/p2update/siteTemplate/index.html Tue May 27 13:35:52 2014
@@ -0,0 +1,19 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="UTF-8">
+<title>${update.site.name}</title>
+</head>
+<body>
+<h1>${update.site.name}</h1>
+
+
+<ol>
+ <li>To install from this site, start up Eclipse ${target.eclipse.version}, then do: Help > Install New Software... > </li>
+ <li>Copy this site's URL into Eclipse, and hit Enter.</li>
+ <li>When the site loads, select the features to install, or click the Select All button.</li>
+ <li>Click Next, agree to the license terms, and install.</li>
+</ol>
+
+</body>
+</html>
\ No newline at end of file
Propchange: sling/trunk/tooling/ide/p2update/siteTemplate/index.html
------------------------------------------------------------------------------
svn:eol-style = native
Modified: sling/trunk/tooling/ide/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/pom.xml?rev=1597782&r1=1597781&r2=1597782&view=diff
==============================================================================
--- sling/trunk/tooling/ide/pom.xml (original)
+++ sling/trunk/tooling/ide/pom.xml Tue May 27 13:35:52 2014
@@ -66,6 +66,14 @@
</pluginManagement>
</build>
+ <pluginRepositories>
+ <pluginRepository>
+ <id>jboss-public-repository-group</id>
+ <name>JBoss Public Repository Group</name>
+ <url>http://repository.jboss.org/nexus/content/groups/public/</url>
+ </pluginRepository>
+ </pluginRepositories>
+
<properties>
<tycho.version>0.20.0</tycho.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
Modified: sling/trunk/tooling/ide/target-definition/org.apache.sling.ide.target-definition.target
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/target-definition/org.apache.sling.ide.target-definition.target?rev=1597782&r1=1597781&r2=1597782&view=diff
==============================================================================
--- sling/trunk/tooling/ide/target-definition/org.apache.sling.ide.target-definition.target (original)
+++ sling/trunk/tooling/ide/target-definition/org.apache.sling.ide.target-definition.target Tue May 27 13:35:52 2014
@@ -1,7 +1,11 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde version="3.8"?><target name="Sling IDE Tools" sequenceNumber="42">
+<?pde version="3.8"?><target name="Sling IDE Tools" sequenceNumber="43">
<locations>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.sonatype.tycho.m2e.feature.feature.group" version="0.6.0.201207302152"/>
+<repository location="http://repo1.maven.org/maven2/.m2e/connectors/m2eclipse-tycho/0.6.0/N/0.6.0.201207302152/"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.jst.web_ui.feature.feature.group" version="3.5.2.v201311051900-7F7GFVuC27Svmclpwjkc0enMD7nrQ9V2nvprn2h2"/>
<unit id="org.eclipse.wst.web_ui.feature.feature.group" version="3.5.2.v201401062113-7O7QG3wEMkBS3Graz0gRCYqCz-PVayJqBmOpb93L"/>
<unit id="org.eclipse.jst.enterprise_ui.feature.feature.group" version="3.5.2.v201311051900-7b7KIawFSK2WQyUFC2y01XXyUmRm"/>