Author: rombert
Date: Fri Sep 27 12:14:30 2013
New Revision: 1526865
URL: http://svn.apache.org/r1526865
Log:
SLING-3080 - [Tooling] (properly) include org.sonatype.tycho.m2e.feature
in target-definition
Add a new -dev target platform which should be used at development time
in the IDE. The build-only target platform now no longer references
locations of type 'Feature'
Added:
sling/branches/tooling-ide-vlt/tooling/ide/target-definition/org.apache.sling.ide.target-definition-dev.target
- copied, changed from r1526716,
sling/branches/tooling-ide-vlt/tooling/ide/target-definition/org.apache.sling.ide.target-definition.target
Modified:
sling/branches/tooling-ide-vlt/tooling/ide/target-definition/org.apache.sling.ide.target-definition.target
Copied:
sling/branches/tooling-ide-vlt/tooling/ide/target-definition/org.apache.sling.ide.target-definition-dev.target
(from r1526716,
sling/branches/tooling-ide-vlt/tooling/ide/target-definition/org.apache.sling.ide.target-definition.target)
URL:
http://svn.apache.org/viewvc/sling/branches/tooling-ide-vlt/tooling/ide/target-definition/org.apache.sling.ide.target-definition-dev.target?p2=sling/branches/tooling-ide-vlt/tooling/ide/target-definition/org.apache.sling.ide.target-definition-dev.target&p1=sling/branches/tooling-ide-vlt/tooling/ide/target-definition/org.apache.sling.ide.target-definition.target&r1=1526716&r2=1526865&rev=1526865&view=diff
==============================================================================
---
sling/branches/tooling-ide-vlt/tooling/ide/target-definition/org.apache.sling.ide.target-definition.target
(original)
+++
sling/branches/tooling-ide-vlt/tooling/ide/target-definition/org.apache.sling.ide.target-definition-dev.target
Fri Sep 27 12:14:30 2013
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde version="3.8"?><target name="Sling IDE Tools" sequenceNumber="37">
+<?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.eclipse.jst.web_ui.feature.feature.group"
version="3.3.2.v201112072049-7F7AFO7C25ToiIbpoiuW12GT78Mciy6W7iwuxaco"/>
@@ -30,7 +30,6 @@
<unit id="org.eclipse.libra.facet.feature.feature.group"
version="0.1.2.201202130952"/>
<repository location="http://download.eclipse.org/releases/indigo"/>
</location>
-<location id="org.sonatype.tycho.m2e.feature" path="${eclipse_home}"
type="Feature"/>
<location includeAllPlatforms="false" includeConfigurePhase="false"
includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.m2e.feature.feature.group"
version="1.2.0.20120903-1050"/>
<repository
location="http://download.eclipse.org/technology/m2e/releases/1.2/1.2.0.20120903-1050"/>
@@ -43,5 +42,14 @@
<unit id="org.apache.commons.httpclient" version="3.1.0.v201012070820"/>
<repository
location="http://download.eclipse.org/tools/orbit/downloads/drops/R20120526062928/repository"/>
</location>
+<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>
</locations>
+<targetJRE
path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+<launcherArgs>
+<vmArgs>-Xmx768m
+-XX:MaxPermSize=256m</vmArgs>
+</launcherArgs>
</target>
Modified:
sling/branches/tooling-ide-vlt/tooling/ide/target-definition/org.apache.sling.ide.target-definition.target
URL:
http://svn.apache.org/viewvc/sling/branches/tooling-ide-vlt/tooling/ide/target-definition/org.apache.sling.ide.target-definition.target?rev=1526865&r1=1526864&r2=1526865&view=diff
==============================================================================
---
sling/branches/tooling-ide-vlt/tooling/ide/target-definition/org.apache.sling.ide.target-definition.target
(original)
+++
sling/branches/tooling-ide-vlt/tooling/ide/target-definition/org.apache.sling.ide.target-definition.target
Fri Sep 27 12:14:30 2013
@@ -1,7 +1,11 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde version="3.8"?><target name="Sling IDE Tools" sequenceNumber="37">
+<?pde version="3.8"?><target name="Sling IDE Tools" sequenceNumber="38">
<locations>
<location includeAllPlatforms="false" includeConfigurePhase="false"
includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.m2e.feature.feature.group"
version="1.2.0.20120903-1050"/>
+<repository
location="http://download.eclipse.org/technology/m2e/releases/1.2/1.2.0.20120903-1050"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="false"
includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.jst.web_ui.feature.feature.group"
version="3.3.2.v201112072049-7F7AFO7C25ToiIbpoiuW12GT78Mciy6W7iwuxaco"/>
<unit id="org.eclipse.pde.feature.group"
version="3.7.2.v20120120-1420-7b7rFUOFEx2Xnqafnpz0E--0"/>
<unit id="org.eclipse.wst.common_core.feature.feature.group"
version="3.3.2.v201111030500-7B7DFO9F7RZHOhIjR6Mz-NJ"/>
@@ -30,11 +34,6 @@
<unit id="org.eclipse.libra.facet.feature.feature.group"
version="0.1.2.201202130952"/>
<repository location="http://download.eclipse.org/releases/indigo"/>
</location>
-<location id="org.sonatype.tycho.m2e.feature" path="${eclipse_home}"
type="Feature"/>
-<location includeAllPlatforms="false" includeConfigurePhase="false"
includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.m2e.feature.feature.group"
version="1.2.0.20120903-1050"/>
-<repository
location="http://download.eclipse.org/technology/m2e/releases/1.2/1.2.0.20120903-1050"/>
-</location>
<location includeAllPlatforms="false" includeConfigurePhase="false"
includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.json" version="1.0.0.v201011060100"/>
<unit id="org.apache.commons.io" version="2.0.1.v201105210651"/>
