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 2015/10/09 17:09:47 UTC

svn commit: r1707755 - in /sling/trunk/tooling/ide: ./ eclipse-sightly-core/ eclipse-sightly-core/META-INF/ eclipse-sightly-core/src/ eclipse-sightly-core/src/org/ eclipse-sightly-core/src/org/apache/ eclipse-sightly-core/src/org/apache/sling/ eclipse-...

Author: rombert
Date: Fri Oct  9 15:09:46 2015
New Revision: 1707755

URL: http://svn.apache.org/viewvc?rev=1707755&view=rev
Log:
SLING-4189 - Add basic code completion for Sightly 

Add a basic Sightly feature which includes

- create a Sightly facet, which activates all Sightly-related features
- proposal completion for tag names and attribute names
- ensures that using the 'sly' tag is not a validation error

Added:
    sling/trunk/tooling/ide/eclipse-sightly-core/
    sling/trunk/tooling/ide/eclipse-sightly-core/.options
    sling/trunk/tooling/ide/eclipse-sightly-core/META-INF/
    sling/trunk/tooling/ide/eclipse-sightly-core/META-INF/MANIFEST.MF
    sling/trunk/tooling/ide/eclipse-sightly-core/build.properties
    sling/trunk/tooling/ide/eclipse-sightly-core/plugin.xml
    sling/trunk/tooling/ide/eclipse-sightly-core/pom.xml
    sling/trunk/tooling/ide/eclipse-sightly-core/src/
    sling/trunk/tooling/ide/eclipse-sightly-core/src/org/
    sling/trunk/tooling/ide/eclipse-sightly-core/src/org/apache/
    sling/trunk/tooling/ide/eclipse-sightly-core/src/org/apache/sling/
    sling/trunk/tooling/ide/eclipse-sightly-core/src/org/apache/sling/ide/
    sling/trunk/tooling/ide/eclipse-sightly-core/src/org/apache/sling/ide/eclipse/
    sling/trunk/tooling/ide/eclipse-sightly-core/src/org/apache/sling/ide/eclipse/sightly/
    sling/trunk/tooling/ide/eclipse-sightly-core/src/org/apache/sling/ide/eclipse/sightly/FacetHelper.java
    sling/trunk/tooling/ide/eclipse-sightly-core/src/org/apache/sling/ide/eclipse/sightly/internal/
    sling/trunk/tooling/ide/eclipse-sightly-core/src/org/apache/sling/ide/eclipse/sightly/internal/Activator.java
    sling/trunk/tooling/ide/eclipse-sightly-core/src/org/apache/sling/ide/eclipse/sightly/internal/SightlyFacetInstallDelegate.java
    sling/trunk/tooling/ide/eclipse-sightly-core/src/org/apache/sling/ide/eclipse/sightly/internal/SightlyFacetUninstallDelegate.java
    sling/trunk/tooling/ide/eclipse-sightly-core/src/org/apache/sling/ide/eclipse/sightly/internal/Validator.java
    sling/trunk/tooling/ide/eclipse-sightly-core/src/org/apache/sling/ide/eclipse/sightly/model/
    sling/trunk/tooling/ide/eclipse-sightly-core/src/org/apache/sling/ide/eclipse/sightly/model/Attribute.java
    sling/trunk/tooling/ide/eclipse-sightly-core/src/org/apache/sling/ide/eclipse/sightly/model/ModelElements.java
    sling/trunk/tooling/ide/eclipse-sightly-core/src/org/apache/sling/ide/eclipse/sightly/model/ProposalDescription.java
    sling/trunk/tooling/ide/eclipse-sightly-core/src/org/apache/sling/ide/eclipse/sightly/model/Tag.java
    sling/trunk/tooling/ide/eclipse-sightly-core/src/org/apache/sling/ide/eclipse/sightly/model/messages.properties
    sling/trunk/tooling/ide/eclipse-sightly-core/src/org/apache/sling/ide/eclipse/sightly/validation/
    sling/trunk/tooling/ide/eclipse-sightly-core/src/org/apache/sling/ide/eclipse/sightly/validation/ValidatorReporter.java
    sling/trunk/tooling/ide/eclipse-sightly-ui/
    sling/trunk/tooling/ide/eclipse-sightly-ui/.options
    sling/trunk/tooling/ide/eclipse-sightly-ui/META-INF/
    sling/trunk/tooling/ide/eclipse-sightly-ui/META-INF/MANIFEST.MF
    sling/trunk/tooling/ide/eclipse-sightly-ui/build.properties
    sling/trunk/tooling/ide/eclipse-sightly-ui/icons/
    sling/trunk/tooling/ide/eclipse-sightly-ui/icons/obj16/
    sling/trunk/tooling/ide/eclipse-sightly-ui/icons/obj16/sightly.gif
    sling/trunk/tooling/ide/eclipse-sightly-ui/plugin.xml
    sling/trunk/tooling/ide/eclipse-sightly-ui/pom.xml
    sling/trunk/tooling/ide/eclipse-sightly-ui/src/
    sling/trunk/tooling/ide/eclipse-sightly-ui/src/org/
    sling/trunk/tooling/ide/eclipse-sightly-ui/src/org/apache/
    sling/trunk/tooling/ide/eclipse-sightly-ui/src/org/apache/sling/
    sling/trunk/tooling/ide/eclipse-sightly-ui/src/org/apache/sling/ide/
    sling/trunk/tooling/ide/eclipse-sightly-ui/src/org/apache/sling/ide/eclipse/
    sling/trunk/tooling/ide/eclipse-sightly-ui/src/org/apache/sling/ide/eclipse/sightly/
    sling/trunk/tooling/ide/eclipse-sightly-ui/src/org/apache/sling/ide/eclipse/sightly/ui/
    sling/trunk/tooling/ide/eclipse-sightly-ui/src/org/apache/sling/ide/eclipse/sightly/ui/internal/
    sling/trunk/tooling/ide/eclipse-sightly-ui/src/org/apache/sling/ide/eclipse/sightly/ui/internal/ProposalComputer.java
    sling/trunk/tooling/ide/eclipse-sightly-ui/src/org/apache/sling/ide/eclipse/sightly/ui/internal/SharedImages.java
    sling/trunk/tooling/ide/eclipse-sightly-ui/src/org/apache/sling/ide/eclipse/sightly/ui/internal/TotalValidator.java
    sling/trunk/tooling/ide/sightly-feature/
    sling/trunk/tooling/ide/sightly-feature/META-INF/
    sling/trunk/tooling/ide/sightly-feature/META-INF/LICENSE
    sling/trunk/tooling/ide/sightly-feature/META-INF/NOTICE
    sling/trunk/tooling/ide/sightly-feature/build.properties
    sling/trunk/tooling/ide/sightly-feature/feature.xml
    sling/trunk/tooling/ide/sightly-feature/pom.xml
Modified:
    sling/trunk/tooling/ide/p2update/category.xml
    sling/trunk/tooling/ide/pom.xml

Added: sling/trunk/tooling/ide/eclipse-sightly-core/.options
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-sightly-core/.options?rev=1707755&view=auto
==============================================================================
    (empty)

Added: sling/trunk/tooling/ide/eclipse-sightly-core/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-sightly-core/META-INF/MANIFEST.MF?rev=1707755&view=auto
==============================================================================
--- sling/trunk/tooling/ide/eclipse-sightly-core/META-INF/MANIFEST.MF (added)
+++ sling/trunk/tooling/ide/eclipse-sightly-core/META-INF/MANIFEST.MF Fri Oct  9 15:09:46 2015
@@ -0,0 +1,27 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.apache.sling.ide.eclipse-sightly-core;singleton:=true
+Bundle-Version: 1.0.9.qualifier
+Bundle-ActivationPolicy: lazy
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Require-Bundle: org.eclipse.core.runtime,
+ org.eclipse.core.resources,
+ org.eclipse.swt
+Import-Package: org.eclipse.jface.resource,
+ org.eclipse.jface.text,
+ org.eclipse.jface.text.contentassist,
+ org.eclipse.wst.common.project.facet.core,
+ org.eclipse.wst.html.core.internal.validation,
+ org.eclipse.wst.html.internal.validation,
+ org.eclipse.wst.sse.core,
+ org.eclipse.wst.sse.core.internal.provisional,
+ org.eclipse.wst.sse.core.internal.provisional.text,
+ org.eclipse.wst.sse.core.internal.validate,
+ org.eclipse.wst.validation,
+ org.eclipse.wst.validation.internal.core,
+ org.eclipse.wst.validation.internal.provisional.core,
+ org.eclipse.wst.xml.core.internal.provisional.document,
+ org.eclipse.wst.xml.core.internal.regions
+Export-Package: org.apache.sling.ide.eclipse.sightly,
+ org.apache.sling.ide.eclipse.sightly.model,
+ org.apache.sling.ide.eclipse.sightly.validation

Added: sling/trunk/tooling/ide/eclipse-sightly-core/build.properties
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-sightly-core/build.properties?rev=1707755&view=auto
==============================================================================
--- sling/trunk/tooling/ide/eclipse-sightly-core/build.properties (added)
+++ sling/trunk/tooling/ide/eclipse-sightly-core/build.properties Fri Oct  9 15:09:46 2015
@@ -0,0 +1,5 @@
+output.. = bin/
+bin.includes = META-INF/,\
+               .,\
+               plugin.xml
+source.. = src/

Added: sling/trunk/tooling/ide/eclipse-sightly-core/plugin.xml
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-sightly-core/plugin.xml?rev=1707755&view=auto
==============================================================================
--- sling/trunk/tooling/ide/eclipse-sightly-core/plugin.xml (added)
+++ sling/trunk/tooling/ide/eclipse-sightly-core/plugin.xml Fri Oct  9 15:09:46 2015
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or
+    more contributor license agreements. See the NOTICE file
+    distributed with this work for additional information regarding
+    copyright ownership. The ASF licenses this file to you under the
+    Apache License, Version 2.0 (the "License"); you may not use
+    this file except in compliance with the License. You may obtain
+    a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0 Unless required by
+    applicable law or agreed to in writing, software distributed
+    under the License is distributed on an "AS IS" BASIS, WITHOUT
+    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions
+    and limitations under the License.
+-->
+<?eclipse version="3.0"?>
+<plugin>
+
+	<!-- Full validation in the editor -->
+	<extension id="org.apache.sling.ide.eclipse.sightly.internal.Validator" name="Sightly Validator" point="org.eclipse.wst.validation.validatorV2">
+      <validator
+            build="true"
+            class="org.apache.sling.ide.eclipse.sightly.internal.Validator"
+            sourceid="org.apache.sling.ide.eclipse.sightly.htmlSyntaxTotalValidator"
+            manual="true"
+            version="1"
+            markerId="org.eclipse.wst.html.core.validationMarker">
+         <include>
+            <rules>
+               <contentType id="org.eclipse.wst.html.core.htmlsource"></contentType>
+               <fileext caseSensitive="false" ext="html"/>
+            </rules>
+         </include>
+         <group id="org.eclipse.wst.sse.core.structuredModelGroup"/>
+      </validator>
+   </extension>
+   
+   <!-- Sightly facets -->
+	<extension point="org.eclipse.wst.common.project.facet.core.facets">
+		<project-facet id="sightly">
+			<label>Sightly</label>
+			<description>Adds enhanced validation and content proposal to the HTML editor, assuming that all HTML files are Sightly templates.</description>
+		</project-facet>
+		
+  		<project-facet-version facet="sightly" version="1.1"/>
+  		
+  		<action facet="sightly" version="1.1" type="INSTALL">
+  			<delegate class="org.apache.sling.ide.eclipse.sightly.internal.SightlyFacetInstallDelegate"/>
+  		</action>
+
+  		<action facet="sightly" version="1.1" type="UNINSTALL">
+  			<delegate class="org.apache.sling.ide.eclipse.sightly.internal.SightlyFacetUninstallDelegate"/>
+  		</action>
+	</extension>
+</plugin>
\ No newline at end of file

Added: sling/trunk/tooling/ide/eclipse-sightly-core/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-sightly-core/pom.xml?rev=1707755&view=auto
==============================================================================
--- sling/trunk/tooling/ide/eclipse-sightly-core/pom.xml (added)
+++ sling/trunk/tooling/ide/eclipse-sightly-core/pom.xml Fri Oct  9 15:09:46 2015
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or
+    more contributor license agreements. See the NOTICE file
+    distributed with this work for additional information regarding
+    copyright ownership. The ASF licenses this file to you under the
+    Apache License, Version 2.0 (the "License"); you may not use
+    this file except in compliance with the License. You may obtain
+    a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0 Unless required by
+    applicable law or agreed to in writing, software distributed
+    under the License is distributed on an "AS IS" BASIS, WITHOUT
+    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions
+    and limitations under the License.
+-->
+<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>
+  <parent>
+    <groupId>org.apache.sling.ide</groupId>
+    <artifactId>reactor</artifactId>
+    <version>1.0.9-SNAPSHOT</version>
+  </parent>
+  <artifactId>org.apache.sling.ide.eclipse-sightly-core</artifactId>
+  <packaging>eclipse-plugin</packaging>
+  <name>Sling IDE Tools: Eclipse Sightly Core</name>
+
+  <scm>
+    <connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/tooling/ide/eclipse-sightly-core</connection>
+    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/tooling/ide/eclipse-sightly-core</developerConnection>
+    <url>http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-sightly-core</url>
+  </scm>
+  
+  <build>
+    <!-- ensure that extra files are picked up by the maven-source-plugin -->
+    <resources>
+        <resource>
+            <directory>.</directory>
+            <includes>
+                <include>build.properties</include>
+                <include>.options</include>
+                <include>plugin.xml</include>
+                <include>META-INF/*</include>
+            </includes>
+        </resource>
+    </resources>
+    <plugins>
+        <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-source-plugin</artifactId>
+            <configuration>
+                <archive>
+                    <manifestFile>META-INF/MANIFEST.MF</manifestFile>
+                </archive>
+            </configuration>
+        </plugin>        
+    </plugins>
+  </build>  
+</project>

Added: sling/trunk/tooling/ide/eclipse-sightly-core/src/org/apache/sling/ide/eclipse/sightly/FacetHelper.java
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-sightly-core/src/org/apache/sling/ide/eclipse/sightly/FacetHelper.java?rev=1707755&view=auto
==============================================================================
--- sling/trunk/tooling/ide/eclipse-sightly-core/src/org/apache/sling/ide/eclipse/sightly/FacetHelper.java (added)
+++ sling/trunk/tooling/ide/eclipse-sightly-core/src/org/apache/sling/ide/eclipse/sightly/FacetHelper.java Fri Oct  9 15:09:46 2015
@@ -0,0 +1,47 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.sling.ide.eclipse.sightly;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.wst.common.project.facet.core.IFacetedProject;
+import org.eclipse.wst.common.project.facet.core.IProjectFacet;
+import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
+
+public class FacetHelper {
+
+
+    private static final String SIGHTLY_FACET = "sightly";
+
+    public static boolean hasSightlyFacet(IProject project) {
+        
+        return containsFacet(project, SIGHTLY_FACET);
+    }
+    
+    // TODO - copied from eclipse-core/.../ProjectHelper
+    private static boolean containsFacet(IProject project, String facetId) {
+        // deleted modules can trigger a publish call without having an attached project
+        if (project == null) {
+            return false;
+        }
+        IFacetedProject facetedProject = (IFacetedProject) project.getAdapter(IFacetedProject.class);
+        if (facetedProject==null ) {
+            return false;
+        }
+        IProjectFacet facet = ProjectFacetsManager.getProjectFacet(facetId);
+        return facetedProject.hasProjectFacet(facet);
+    }
+}

Added: sling/trunk/tooling/ide/eclipse-sightly-core/src/org/apache/sling/ide/eclipse/sightly/internal/Activator.java
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-sightly-core/src/org/apache/sling/ide/eclipse/sightly/internal/Activator.java?rev=1707755&view=auto
==============================================================================
--- sling/trunk/tooling/ide/eclipse-sightly-core/src/org/apache/sling/ide/eclipse/sightly/internal/Activator.java (added)
+++ sling/trunk/tooling/ide/eclipse-sightly-core/src/org/apache/sling/ide/eclipse/sightly/internal/Activator.java Fri Oct  9 15:09:46 2015
@@ -0,0 +1,55 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.sling.ide.eclipse.sightly.internal;
+
+import org.eclipse.core.runtime.Plugin;
+import org.osgi.framework.BundleContext;
+
+public class Activator extends Plugin {
+
+    // The plug-in ID
+    public static final String PLUGIN_ID = "org.apache.sling.ide.eclipse-sightly-core"; //$NON-NLS-1$
+
+    // The shared instance
+    private static Activator plugin;
+
+
+    public void start(BundleContext context) throws Exception {
+        super.start(context);
+        plugin = this;
+    }
+
+    /*
+     * (non-Javadoc)
+     * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
+     */
+    public void stop(BundleContext context) throws Exception {
+
+        plugin = null;
+        super.stop(context);
+    }
+
+    /**
+     * Returns the shared instance
+     *
+     * @return the shared instance
+     */
+    public static Activator getDefault() {
+        return plugin;
+    }
+}
+

Added: sling/trunk/tooling/ide/eclipse-sightly-core/src/org/apache/sling/ide/eclipse/sightly/internal/SightlyFacetInstallDelegate.java
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-sightly-core/src/org/apache/sling/ide/eclipse/sightly/internal/SightlyFacetInstallDelegate.java?rev=1707755&view=auto
==============================================================================
--- sling/trunk/tooling/ide/eclipse-sightly-core/src/org/apache/sling/ide/eclipse/sightly/internal/SightlyFacetInstallDelegate.java (added)
+++ sling/trunk/tooling/ide/eclipse-sightly-core/src/org/apache/sling/ide/eclipse/sightly/internal/SightlyFacetInstallDelegate.java Fri Oct  9 15:09:46 2015
@@ -0,0 +1,33 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.sling.ide.eclipse.sightly.internal;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.wst.common.project.facet.core.IDelegate;
+import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
+
+public class SightlyFacetInstallDelegate implements IDelegate {
+
+    @Override
+    public void execute(IProject project, IProjectFacetVersion version, Object config, IProgressMonitor monitor)
+            throws CoreException {
+
+        
+    }
+}

Added: sling/trunk/tooling/ide/eclipse-sightly-core/src/org/apache/sling/ide/eclipse/sightly/internal/SightlyFacetUninstallDelegate.java
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-sightly-core/src/org/apache/sling/ide/eclipse/sightly/internal/SightlyFacetUninstallDelegate.java?rev=1707755&view=auto
==============================================================================
--- sling/trunk/tooling/ide/eclipse-sightly-core/src/org/apache/sling/ide/eclipse/sightly/internal/SightlyFacetUninstallDelegate.java (added)
+++ sling/trunk/tooling/ide/eclipse-sightly-core/src/org/apache/sling/ide/eclipse/sightly/internal/SightlyFacetUninstallDelegate.java Fri Oct  9 15:09:46 2015
@@ -0,0 +1,32 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.sling.ide.eclipse.sightly.internal;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.wst.common.project.facet.core.IDelegate;
+import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
+
+public class SightlyFacetUninstallDelegate implements IDelegate {
+
+    @Override
+    public void execute(IProject project, IProjectFacetVersion version, Object config, IProgressMonitor monitor)
+            throws CoreException {
+        
+    }
+}

Added: sling/trunk/tooling/ide/eclipse-sightly-core/src/org/apache/sling/ide/eclipse/sightly/internal/Validator.java
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-sightly-core/src/org/apache/sling/ide/eclipse/sightly/internal/Validator.java?rev=1707755&view=auto
==============================================================================
--- sling/trunk/tooling/ide/eclipse-sightly-core/src/org/apache/sling/ide/eclipse/sightly/internal/Validator.java (added)
+++ sling/trunk/tooling/ide/eclipse-sightly-core/src/org/apache/sling/ide/eclipse/sightly/internal/Validator.java Fri Oct  9 15:09:46 2015
@@ -0,0 +1,39 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.sling.ide.eclipse.sightly.internal;
+
+import org.apache.sling.ide.eclipse.sightly.FacetHelper;
+import org.apache.sling.ide.eclipse.sightly.validation.ValidatorReporter;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.wst.html.core.internal.validation.HTMLValidationReporter;
+import org.eclipse.wst.html.core.internal.validation.HTMLValidator;
+import org.eclipse.wst.validation.internal.provisional.core.IReporter;
+import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
+
+@SuppressWarnings("restriction")
+public class Validator extends HTMLValidator {
+
+    @Override
+    protected HTMLValidationReporter getReporter(IReporter reporter, IFile file, IDOMModel model) {
+        
+        if ( FacetHelper.hasSightlyFacet(file.getProject() )) {
+            return new ValidatorReporter(this, reporter, file, model);
+        }
+        
+        return super.getReporter(reporter, file, model);
+    }
+}

Added: sling/trunk/tooling/ide/eclipse-sightly-core/src/org/apache/sling/ide/eclipse/sightly/model/Attribute.java
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-sightly-core/src/org/apache/sling/ide/eclipse/sightly/model/Attribute.java?rev=1707755&view=auto
==============================================================================
--- sling/trunk/tooling/ide/eclipse-sightly-core/src/org/apache/sling/ide/eclipse/sightly/model/Attribute.java (added)
+++ sling/trunk/tooling/ide/eclipse-sightly-core/src/org/apache/sling/ide/eclipse/sightly/model/Attribute.java Fri Oct  9 15:09:46 2015
@@ -0,0 +1,43 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.sling.ide.eclipse.sightly.model;
+
+public class Attribute implements ProposalDescription {
+
+    private final String attributeName;
+    private final String additionalInfo;
+
+    public Attribute(String attributeName) {
+        this.attributeName = attributeName;
+        this.additionalInfo = ModelElements.props.getProperty("dataSly" + Character.toUpperCase(attributeName.charAt(0))
+                + attributeName.substring(1) + "_description");
+    }
+
+    public String getLabel() {
+        return "data-sly-" + attributeName;
+    }
+
+    @Override
+    public String getInsertionText() {
+        return getLabel() + "=\"\"";
+    }
+
+    @Override
+    public String getAdditionalInfo() {
+        return additionalInfo;
+    }
+}
\ No newline at end of file

Added: sling/trunk/tooling/ide/eclipse-sightly-core/src/org/apache/sling/ide/eclipse/sightly/model/ModelElements.java
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-sightly-core/src/org/apache/sling/ide/eclipse/sightly/model/ModelElements.java?rev=1707755&view=auto
==============================================================================
--- sling/trunk/tooling/ide/eclipse-sightly-core/src/org/apache/sling/ide/eclipse/sightly/model/ModelElements.java (added)
+++ sling/trunk/tooling/ide/eclipse-sightly-core/src/org/apache/sling/ide/eclipse/sightly/model/ModelElements.java Fri Oct  9 15:09:46 2015
@@ -0,0 +1,39 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.sling.ide.eclipse.sightly.model;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Properties;
+
+
+public class ModelElements {
+
+    static final Properties props = new Properties();
+
+    static {
+        try (InputStream is = ModelElements.class.getResourceAsStream("messages.properties")) {
+            props.load(is);
+        } catch (IOException e) {
+            throw new ExceptionInInitializerError(e);
+        }
+    }
+    
+    public static final String[] TAG_NAMES = new String[] { "sly" };
+    public static final String[] ATTRIBUTE_NAMES = new String[] { "attribute", "call", "element", "include", "list",
+            "repeat", "resource", "template", "test", "text", "unwrap", "use" };
+}

Added: sling/trunk/tooling/ide/eclipse-sightly-core/src/org/apache/sling/ide/eclipse/sightly/model/ProposalDescription.java
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-sightly-core/src/org/apache/sling/ide/eclipse/sightly/model/ProposalDescription.java?rev=1707755&view=auto
==============================================================================
--- sling/trunk/tooling/ide/eclipse-sightly-core/src/org/apache/sling/ide/eclipse/sightly/model/ProposalDescription.java (added)
+++ sling/trunk/tooling/ide/eclipse-sightly-core/src/org/apache/sling/ide/eclipse/sightly/model/ProposalDescription.java Fri Oct  9 15:09:46 2015
@@ -0,0 +1,26 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.sling.ide.eclipse.sightly.model;
+
+public interface ProposalDescription {
+
+    String getLabel();
+
+    String getInsertionText();
+
+    String getAdditionalInfo();
+}
\ No newline at end of file

Added: sling/trunk/tooling/ide/eclipse-sightly-core/src/org/apache/sling/ide/eclipse/sightly/model/Tag.java
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-sightly-core/src/org/apache/sling/ide/eclipse/sightly/model/Tag.java?rev=1707755&view=auto
==============================================================================
--- sling/trunk/tooling/ide/eclipse-sightly-core/src/org/apache/sling/ide/eclipse/sightly/model/Tag.java (added)
+++ sling/trunk/tooling/ide/eclipse-sightly-core/src/org/apache/sling/ide/eclipse/sightly/model/Tag.java Fri Oct  9 15:09:46 2015
@@ -0,0 +1,42 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.sling.ide.eclipse.sightly.model;
+
+public class Tag implements ProposalDescription {
+
+    private final String tagName;
+    private final String additionalInfo;
+
+    public Tag(String tagName) {
+        this.tagName = tagName;
+        this.additionalInfo = ModelElements.props.getProperty(tagName + "_description");
+    }
+
+    public String getLabel() {
+        return tagName;
+    }
+
+    @Override
+    public String getInsertionText() {
+        return "<" + getLabel() + " />";
+    }
+
+    @Override
+    public String getAdditionalInfo() {
+        return additionalInfo;
+    }
+}
\ No newline at end of file

Added: sling/trunk/tooling/ide/eclipse-sightly-core/src/org/apache/sling/ide/eclipse/sightly/model/messages.properties
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-sightly-core/src/org/apache/sling/ide/eclipse/sightly/model/messages.properties?rev=1707755&view=auto
==============================================================================
--- sling/trunk/tooling/ide/eclipse-sightly-core/src/org/apache/sling/ide/eclipse/sightly/model/messages.properties (added)
+++ sling/trunk/tooling/ide/eclipse-sightly-core/src/org/apache/sling/ide/eclipse/sightly/model/messages.properties Fri Oct  9 15:09:46 2015
@@ -0,0 +1,32 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+# Tags
+sly_description=The <sly> HTML tag can be used to remove the current element, allowing only its children to be displayed. Its functionality is similar to the data-sly-unwrap block element:
+
+# Attributes
+dataSlyText_description=Sets the content for the current element
+dataSlyUse_description=Exposes logic to the template
+dataSlyAttribute_description=Sets an attribute or a group of attributes on the current element.
+dataSlyElement_description=Replaces the element's tag name.
+dataSlyTest_description=Keeps, or removes the element depending on the attribute value.
+dataSlyList_description=Iterates over the content of each item in the attribute value.
+dataSlyRepeat_description=Iterates over the content of each item in the attribute value and displays the containing element as many times as items in the attribute value.
+dataSlyInclude_description=Includes the output of a rendering script run with the current context.
+dataSlyResource_description=Includes a rendered resource.
+dataSlyTemplate_description=Declares an HTML block, naming it with an identifier and defining the parameters it can get.
+dataSlyCall_description=Calls a declared HTML block, passing parameters to it.

Added: sling/trunk/tooling/ide/eclipse-sightly-core/src/org/apache/sling/ide/eclipse/sightly/validation/ValidatorReporter.java
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-sightly-core/src/org/apache/sling/ide/eclipse/sightly/validation/ValidatorReporter.java?rev=1707755&view=auto
==============================================================================
--- sling/trunk/tooling/ide/eclipse-sightly-core/src/org/apache/sling/ide/eclipse/sightly/validation/ValidatorReporter.java (added)
+++ sling/trunk/tooling/ide/eclipse-sightly-core/src/org/apache/sling/ide/eclipse/sightly/validation/ValidatorReporter.java Fri Oct  9 15:09:46 2015
@@ -0,0 +1,45 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.sling.ide.eclipse.sightly.validation;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.wst.html.core.internal.validation.HTMLValidationReporter;
+import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
+import org.eclipse.wst.sse.core.internal.validate.ErrorInfo;
+import org.eclipse.wst.validation.internal.provisional.core.IReporter;
+import org.eclipse.wst.validation.internal.provisional.core.IValidator;
+import org.w3c.dom.Node;
+
+@SuppressWarnings("restriction")
+public class ValidatorReporter extends HTMLValidationReporter {
+    public ValidatorReporter(IValidator owner, IReporter reporter, IFile file, IStructuredModel model) {
+        super(owner, reporter, file, model);
+    }
+
+    @Override
+    public void report(ErrorInfo info) {
+        int targetType = info.getTargetType();
+        if (targetType == Node.ELEMENT_NODE && info.getState() == 11) {
+            String name = info.getHint();
+            if ("sly".equals(name) ) {
+                return;
+            }
+        }
+        
+        super.report(info);
+    }
+}
\ No newline at end of file

Added: sling/trunk/tooling/ide/eclipse-sightly-ui/.options
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-sightly-ui/.options?rev=1707755&view=auto
==============================================================================
    (empty)

Added: sling/trunk/tooling/ide/eclipse-sightly-ui/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-sightly-ui/META-INF/MANIFEST.MF?rev=1707755&view=auto
==============================================================================
--- sling/trunk/tooling/ide/eclipse-sightly-ui/META-INF/MANIFEST.MF (added)
+++ sling/trunk/tooling/ide/eclipse-sightly-ui/META-INF/MANIFEST.MF Fri Oct  9 15:09:46 2015
@@ -0,0 +1,29 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.apache.sling.ide.eclipse-sightly-ui;singleton:=true
+Bundle-Version: 1.0.9.qualifier
+Bundle-ActivationPolicy: lazy
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Require-Bundle: org.eclipse.core.runtime,
+ org.eclipse.core.resources,
+ org.eclipse.swt
+Import-Package: org.apache.sling.ide.eclipse.sightly,
+ org.apache.sling.ide.eclipse.sightly.model,
+ org.apache.sling.ide.eclipse.sightly.validation,
+ org.eclipse.jface.resource,
+ org.eclipse.jface.text,
+ org.eclipse.jface.text.contentassist,
+ org.eclipse.wst.html.core.internal.validation,
+ org.eclipse.wst.html.internal.validation,
+ org.eclipse.wst.sse.core,
+ org.eclipse.wst.sse.core.internal.provisional,
+ org.eclipse.wst.sse.core.internal.provisional.text,
+ org.eclipse.wst.sse.core.internal.validate,
+ org.eclipse.wst.sse.ui.contentassist,
+ org.eclipse.wst.sse.ui.internal.reconcile.validator,
+ org.eclipse.wst.validation,
+ org.eclipse.wst.validation.internal.core,
+ org.eclipse.wst.validation.internal.provisional.core,
+ org.eclipse.wst.xml.core.internal.provisional.document,
+ org.eclipse.wst.xml.core.internal.regions,
+ org.eclipse.wst.xml.ui.internal.contentassist

Added: sling/trunk/tooling/ide/eclipse-sightly-ui/build.properties
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-sightly-ui/build.properties?rev=1707755&view=auto
==============================================================================
--- sling/trunk/tooling/ide/eclipse-sightly-ui/build.properties (added)
+++ sling/trunk/tooling/ide/eclipse-sightly-ui/build.properties Fri Oct  9 15:09:46 2015
@@ -0,0 +1,6 @@
+output.. = bin/
+bin.includes = META-INF/,\
+               .,\
+               plugin.xml,\
+               icons/
+source.. = src/

Added: sling/trunk/tooling/ide/eclipse-sightly-ui/icons/obj16/sightly.gif
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-sightly-ui/icons/obj16/sightly.gif?rev=1707755&view=auto
==============================================================================
Binary files sling/trunk/tooling/ide/eclipse-sightly-ui/icons/obj16/sightly.gif (added) and sling/trunk/tooling/ide/eclipse-sightly-ui/icons/obj16/sightly.gif Fri Oct  9 15:09:46 2015 differ

Added: sling/trunk/tooling/ide/eclipse-sightly-ui/plugin.xml
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-sightly-ui/plugin.xml?rev=1707755&view=auto
==============================================================================
--- sling/trunk/tooling/ide/eclipse-sightly-ui/plugin.xml (added)
+++ sling/trunk/tooling/ide/eclipse-sightly-ui/plugin.xml Fri Oct  9 15:09:46 2015
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or
+    more contributor license agreements. See the NOTICE file
+    distributed with this work for additional information regarding
+    copyright ownership. The ASF licenses this file to you under the
+    Apache License, Version 2.0 (the "License"); you may not use
+    this file except in compliance with the License. You may obtain
+    a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0 Unless required by
+    applicable law or agreed to in writing, software distributed
+    under the License is distributed on an "AS IS" BASIS, WITHOUT
+    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions
+    and limitations under the License.
+-->
+<?eclipse version="3.0"?>
+<plugin>
+
+   <!-- Completion proposals -->
+   <extension
+       point="org.eclipse.wst.sse.ui.completionProposal">
+    	<proposalCategory
+          icon="icons/full/obj16/sling_misc.gif"
+          id="org.apache.sling.ide.eclipse.sightly.proposalCategory.htmlTags"
+          name="Sightly" >
+        </proposalCategory>       	
+	    <proposalComputer
+	          activate="true"
+	          categoryId="org.apache.sling.ide.eclipse.sightly.proposalCategory.htmlTags"
+	          class="org.apache.sling.ide.eclipse.sightly.ui.internal.ProposalComputer"
+	          id="org.apache.sling.ide.eclipse.sightly.proposalComputer.htmlTags">
+	       <contentType
+	             id="org.eclipse.wst.html.core.htmlsource">
+	          <partitionType
+	                id="org.eclipse.wst.html.HTML_DEFAULT">
+	          </partitionType>
+	       </contentType>	       	          	       
+	    </proposalComputer>
+	</extension>
+
+	<!-- Validation -->
+	<extension point="org.eclipse.wst.sse.ui.sourcevalidation">
+		<validator
+			scope="total"
+			class="org.apache.sling.ide.eclipse.sightly.ui.internal.TotalValidator"
+			id="org.apache.sling.ide.eclipse.sightly.htmlSyntaxTotalValidator">
+			<contentTypeIdentifier
+				id="org.eclipse.wst.html.core.htmlsource">
+				<partitionType id="org.eclipse.wst.html.HTML_DEFAULT"/>
+				<partitionType id="org.eclipse.wst.html.HTML_DECLARATION"/>
+				<partitionType id="org.eclipse.wst.html.HTML_COMMENT"/>
+				<partitionType id="org.eclipse.wst.xml.XML_DEFAULT"/>
+				<partitionType id="org.eclipse.wst.sse.ST_DEFAULT"/>
+			</contentTypeIdentifier>
+		</validator>
+	</extension>
+	
+	<!-- Facet images  --> 
+    <extension point="org.eclipse.wst.common.project.facet.ui.images">
+        <image facet="sightly" path="icons/obj16/sightly.gif" />
+  </extension>	
+</plugin>
\ No newline at end of file

Added: sling/trunk/tooling/ide/eclipse-sightly-ui/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-sightly-ui/pom.xml?rev=1707755&view=auto
==============================================================================
--- sling/trunk/tooling/ide/eclipse-sightly-ui/pom.xml (added)
+++ sling/trunk/tooling/ide/eclipse-sightly-ui/pom.xml Fri Oct  9 15:09:46 2015
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or
+    more contributor license agreements. See the NOTICE file
+    distributed with this work for additional information regarding
+    copyright ownership. The ASF licenses this file to you under the
+    Apache License, Version 2.0 (the "License"); you may not use
+    this file except in compliance with the License. You may obtain
+    a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0 Unless required by
+    applicable law or agreed to in writing, software distributed
+    under the License is distributed on an "AS IS" BASIS, WITHOUT
+    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions
+    and limitations under the License.
+-->
+<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>
+  <parent>
+    <groupId>org.apache.sling.ide</groupId>
+    <artifactId>reactor</artifactId>
+    <version>1.0.9-SNAPSHOT</version>
+  </parent>
+  <artifactId>org.apache.sling.ide.eclipse-sightly-ui</artifactId>
+  <packaging>eclipse-plugin</packaging>
+  <name>Sling IDE Tools: Eclipse Sightly UI</name>
+
+  <scm>
+    <connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/tooling/ide/eclipse-sightly-ui</connection>
+    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/tooling/ide/eclipse-sightly-ui</developerConnection>
+    <url>http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-sightly-ui</url>
+  </scm>
+  
+  <build>
+    <!-- ensure that extra files are picked up by the maven-source-plugin -->
+    <resources>
+        <resource>
+            <directory>.</directory>
+            <includes>
+                <include>build.properties</include>
+                <include>.options</include>
+                <include>plugin.xml</include>
+                <include>META-INF/*</include>
+            </includes>
+        </resource>
+    </resources>
+    <plugins>
+        <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-source-plugin</artifactId>
+            <configuration>
+                <archive>
+                    <manifestFile>META-INF/MANIFEST.MF</manifestFile>
+                </archive>
+            </configuration>
+        </plugin>        
+    </plugins>
+  </build>  
+</project>

Added: sling/trunk/tooling/ide/eclipse-sightly-ui/src/org/apache/sling/ide/eclipse/sightly/ui/internal/ProposalComputer.java
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-sightly-ui/src/org/apache/sling/ide/eclipse/sightly/ui/internal/ProposalComputer.java?rev=1707755&view=auto
==============================================================================
--- sling/trunk/tooling/ide/eclipse-sightly-ui/src/org/apache/sling/ide/eclipse/sightly/ui/internal/ProposalComputer.java (added)
+++ sling/trunk/tooling/ide/eclipse-sightly-ui/src/org/apache/sling/ide/eclipse/sightly/ui/internal/ProposalComputer.java Fri Oct  9 15:09:46 2015
@@ -0,0 +1,103 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.sling.ide.eclipse.sightly.ui.internal;
+
+import org.apache.sling.ide.eclipse.sightly.FacetHelper;
+import org.apache.sling.ide.eclipse.sightly.model.Attribute;
+import org.apache.sling.ide.eclipse.sightly.model.ModelElements;
+import org.apache.sling.ide.eclipse.sightly.model.ProposalDescription;
+import org.apache.sling.ide.eclipse.sightly.model.Tag;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IWorkspaceRoot;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.jface.text.contentassist.ICompletionProposal;
+import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
+import org.eclipse.wst.sse.ui.contentassist.CompletionProposalInvocationContext;
+import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
+import org.eclipse.wst.xml.ui.internal.contentassist.ContentAssistRequest;
+import org.eclipse.wst.xml.ui.internal.contentassist.DefaultXMLCompletionProposalComputer;
+import org.eclipse.wst.xml.ui.internal.contentassist.MarkupCompletionProposal;
+import org.eclipse.wst.xml.ui.internal.contentassist.XMLRelevanceConstants;
+
+@SuppressWarnings("restriction")
+public class ProposalComputer extends DefaultXMLCompletionProposalComputer {
+
+    @Override
+    protected void addAttributeNameProposals(ContentAssistRequest contentAssistRequest,
+            CompletionProposalInvocationContext context) {
+
+        if ( addSightlyProposals(contentAssistRequest ) ) {
+            for ( String attributeName: ModelElements.ATTRIBUTE_NAMES ) {
+                addAttributeProposal(contentAssistRequest, new Attribute(attributeName));
+            }
+        }
+        
+        super.addAttributeNameProposals(contentAssistRequest, context);
+    }
+    
+
+    @Override
+    protected void addTagInsertionProposals(ContentAssistRequest contentAssistRequest, int childPosition,
+            CompletionProposalInvocationContext context) {
+
+        if ( addSightlyProposals(contentAssistRequest)) {
+            addAttributeProposal(contentAssistRequest, new Tag("sly"));
+        }
+    }
+
+    private void addAttributeProposal(final ContentAssistRequest contentAssistRequest,
+            ProposalDescription proposalDescription) {
+
+        String replacementString = proposalDescription.getInsertionText();
+
+        int replacementOffset = contentAssistRequest.getReplacementBeginPosition();
+        int replacementLength = contentAssistRequest.getReplacementLength();
+        int cursorPosition = getCursorPositionForProposedText(replacementString);
+
+        ICompletionProposal proposal = new MarkupCompletionProposal(replacementString.toString(), replacementOffset,
+                replacementLength, cursorPosition, SharedImages.SIGHTLY_ICON.createImage(),
+                proposalDescription.getLabel(), null, proposalDescription.getAdditionalInfo(),
+                XMLRelevanceConstants.R_TAG_NAME);
+
+        contentAssistRequest.addProposal(proposal);
+    }
+    
+    private static boolean addSightlyProposals(ContentAssistRequest request) {
+
+        final IDOMNode element = (IDOMNode) request.getNode();
+        
+        IFile file = getFile(element.getModel());
+
+        return FacetHelper.hasSightlyFacet(file.getProject());
+    }
+    
+    public static final IFile getFile(IStructuredModel model) {
+        
+        String baselocation = model.getBaseLocation();
+        
+        if (baselocation != null) {
+            IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
+            IPath filePath = new Path(baselocation);
+            if (filePath.segmentCount() > 1) {
+                return root.getFile(filePath);
+            }
+        }
+        return null;
+    }    
+}

Added: sling/trunk/tooling/ide/eclipse-sightly-ui/src/org/apache/sling/ide/eclipse/sightly/ui/internal/SharedImages.java
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-sightly-ui/src/org/apache/sling/ide/eclipse/sightly/ui/internal/SharedImages.java?rev=1707755&view=auto
==============================================================================
--- sling/trunk/tooling/ide/eclipse-sightly-ui/src/org/apache/sling/ide/eclipse/sightly/ui/internal/SharedImages.java (added)
+++ sling/trunk/tooling/ide/eclipse-sightly-ui/src/org/apache/sling/ide/eclipse/sightly/ui/internal/SharedImages.java Fri Oct  9 15:09:46 2015
@@ -0,0 +1,29 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.sling.ide.eclipse.sightly.ui.internal;
+
+import org.eclipse.core.runtime.FileLocator;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.osgi.framework.FrameworkUtil;
+
+public class SharedImages {
+
+    public static final ImageDescriptor SIGHTLY_ICON = ImageDescriptor.createFromURL(
+            FileLocator.find(FrameworkUtil.getBundle(SharedImages.class), Path.fromPortableString("icons/obj16/sightly.gif"), null));
+
+}

Added: sling/trunk/tooling/ide/eclipse-sightly-ui/src/org/apache/sling/ide/eclipse/sightly/ui/internal/TotalValidator.java
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-sightly-ui/src/org/apache/sling/ide/eclipse/sightly/ui/internal/TotalValidator.java?rev=1707755&view=auto
==============================================================================
--- sling/trunk/tooling/ide/eclipse-sightly-ui/src/org/apache/sling/ide/eclipse/sightly/ui/internal/TotalValidator.java (added)
+++ sling/trunk/tooling/ide/eclipse-sightly-ui/src/org/apache/sling/ide/eclipse/sightly/ui/internal/TotalValidator.java Fri Oct  9 15:09:46 2015
@@ -0,0 +1,33 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.sling.ide.eclipse.sightly.ui.internal;
+
+import org.apache.sling.ide.eclipse.sightly.validation.ValidatorReporter;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.wst.html.core.internal.validation.HTMLValidationReporter;
+import org.eclipse.wst.html.internal.validation.HTMLSourceValidator;
+import org.eclipse.wst.validation.internal.provisional.core.IReporter;
+import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
+
+@SuppressWarnings("restriction")
+public class TotalValidator extends HTMLSourceValidator {
+
+    @Override
+    protected HTMLValidationReporter getReporter(IReporter reporter, IFile file, IDOMModel model) {
+        return new ValidatorReporter(this, reporter, file, model);
+    }
+}

Modified: sling/trunk/tooling/ide/p2update/category.xml
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/p2update/category.xml?rev=1707755&r1=1707754&r2=1707755&view=diff
==============================================================================
--- sling/trunk/tooling/ide/p2update/category.xml (original)
+++ sling/trunk/tooling/ide/p2update/category.xml Fri Oct  9 15:09:46 2015
@@ -22,5 +22,8 @@
    <feature url="features/org.apache.sling.ide.m2e-feature_0.0.0.qualifier.jar" id="org.apache.sling.ide.m2e-feature" version="0.0.0">
       <category name="sling"/>
    </feature>
+   <feature url="features/org.apache.sling.ide.sightly-feature_1.0.9.qualifier.jar" id="org.apache.sling.ide.sightly-feature" version="0.0.0">
+      <category name="sling"/>
+   </feature>
    <category-def name="sling" label="Sling"/>
 </site>

Modified: sling/trunk/tooling/ide/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/pom.xml?rev=1707755&r1=1707754&r2=1707755&view=diff
==============================================================================
--- sling/trunk/tooling/ide/pom.xml (original)
+++ sling/trunk/tooling/ide/pom.xml Fri Oct  9 15:09:46 2015
@@ -53,6 +53,9 @@
 		<module>eclipse-m2e-ui</module>
 		<module>eclipse-m2e-test</module>
 		<module>m2e-feature</module>
+		<module>eclipse-sightly-core</module>
+		<module>eclipse-sightly-ui</module>
+		<module>sightly-feature</module>
 		<module>p2update</module>
 	</modules>
 

Added: sling/trunk/tooling/ide/sightly-feature/META-INF/LICENSE
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/sightly-feature/META-INF/LICENSE?rev=1707755&view=auto
==============================================================================
--- sling/trunk/tooling/ide/sightly-feature/META-INF/LICENSE (added)
+++ sling/trunk/tooling/ide/sightly-feature/META-INF/LICENSE Fri Oct  9 15:09:46 2015
@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

Added: sling/trunk/tooling/ide/sightly-feature/META-INF/NOTICE
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/sightly-feature/META-INF/NOTICE?rev=1707755&view=auto
==============================================================================
--- sling/trunk/tooling/ide/sightly-feature/META-INF/NOTICE (added)
+++ sling/trunk/tooling/ide/sightly-feature/META-INF/NOTICE Fri Oct  9 15:09:46 2015
@@ -0,0 +1,11 @@
+
+Sling IDE Tools: M2Eclipse-based Feature
+Copyright 2007-2014 The Apache Software Foundation
+
+Apache Sling is based on source code originally developed 
+by Day Software (http://www.day.com/).
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+
+

Added: sling/trunk/tooling/ide/sightly-feature/build.properties
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/sightly-feature/build.properties?rev=1707755&view=auto
==============================================================================
--- sling/trunk/tooling/ide/sightly-feature/build.properties (added)
+++ sling/trunk/tooling/ide/sightly-feature/build.properties Fri Oct  9 15:09:46 2015
@@ -0,0 +1,3 @@
+bin.includes = feature.xml,\
+               META-INF/
+

Added: sling/trunk/tooling/ide/sightly-feature/feature.xml
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/sightly-feature/feature.xml?rev=1707755&view=auto
==============================================================================
--- sling/trunk/tooling/ide/sightly-feature/feature.xml (added)
+++ sling/trunk/tooling/ide/sightly-feature/feature.xml Fri Oct  9 15:09:46 2015
@@ -0,0 +1,244 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or
+    more contributor license agreements. See the NOTICE file
+    distributed with this work for additional information regarding
+    copyright ownership. The ASF licenses this file to you under the
+    Apache License, Version 2.0 (the "License"); you may not use
+    this file except in compliance with the License. You may obtain
+    a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0 Unless required by
+    applicable law or agreed to in writing, software distributed
+    under the License is distributed on an "AS IS" BASIS, WITHOUT
+    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions
+    and limitations under the License.
+-->
+<feature
+      id="org.apache.sling.ide.sightly-feature"
+      label="Sling IDE Tools - Sightly Integration (Optional)"
+      version="1.0.9.qualifier"
+      provider-name="The Apache Foundation">
+
+   <license url="http://www.apache.org/licenses/LICENSE-2.0">
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+      
+   </license>
+
+   <plugin
+         id="org.apache.sling.ide.eclipse-sightly-core"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.sling.ide.eclipse-sightly-ui"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+</feature>

Added: sling/trunk/tooling/ide/sightly-feature/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/sightly-feature/pom.xml?rev=1707755&view=auto
==============================================================================
--- sling/trunk/tooling/ide/sightly-feature/pom.xml (added)
+++ sling/trunk/tooling/ide/sightly-feature/pom.xml Fri Oct  9 15:09:46 2015
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or
+    more contributor license agreements. See the NOTICE file
+    distributed with this work for additional information regarding
+    copyright ownership. The ASF licenses this file to you under the
+    Apache License, Version 2.0 (the "License"); you may not use
+    this file except in compliance with the License. You may obtain
+    a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0 Unless required by
+    applicable law or agreed to in writing, software distributed
+    under the License is distributed on an "AS IS" BASIS, WITHOUT
+    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions
+    and limitations under the License.
+-->
+<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>
+  <parent>
+    <groupId>org.apache.sling.ide</groupId>
+    <artifactId>reactor</artifactId>
+    <version>1.0.9-SNAPSHOT</version>
+  </parent>
+  <artifactId>org.apache.sling.ide.sightly-feature</artifactId>
+  <packaging>eclipse-feature</packaging>
+  <name>Sling IDE Tools: Sightly Feature</name>
+
+  <scm>
+    <connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/tooling/ide/sightly-feature</connection>
+    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/tooling/ide/sightly-feature</developerConnection>
+    <url>http://svn.apache.org/viewvc/sling/trunk/tooling/ide/sightly-feature</url>
+  </scm>
+  
+  <build>
+    <!-- ensure that extra files are picked up by the maven-source-plugin -->
+    <resources>
+        <resource>
+            <directory>.</directory>
+            <includes>
+                <include>build.properties</include>
+                <include>META-INF/*</include>
+                <include>feature.xml</include>
+            </includes>
+        </resource>
+    </resources>
+  </build>  
+</project>