[276600] Add source bundles to the build.

7 files changed, 79 insertions, 9 deletions

diff --git a/sourceediting/development/org.eclipse.wst.xml.vex.releng/pom.xml b/sourceediting/development/org.eclipse.wst.xml.vex.releng/pom.xml
index bc27b7b0..dc8606cb 100644
--- a/sourceediting/development/org.eclipse.wst.xml.vex.releng/pom.xml
+++ b/sourceediting/development/org.eclipse.wst.xml.vex.releng/pom.xml
@@ -11,9 +11,9 @@
 	<properties>
 		<tycho-version>0.10.0</tycho-version>
 	</properties>
- 
+
 	<modules>
-	    <!-- Vex Core functionality -->
+		<!-- Vex Core functionality -->
 		<module>../../plugins/org.eclipse.wst.xml.vex</module>
 		<module>../../plugins/org.eclipse.wst.xml.vex.core</module>
 		<module>../../plugins/org.eclipse.wst.xml.vex.ui</module>
@@ -21,6 +21,7 @@
 		<module>../../plugins/org.eclipse.wst.xml.vex.docbook</module>
 		<module>../../documentation/org.eclipse.wst.xml.vex.documentation</module>
 		<module>../../features/org.eclipse.wst.xml.vex.feature</module>
+		<module>../../features/org.eclipse.wst.xml.vex_sdk.feature</module>
 		<module>../org.eclipse.wst.xml.vex.repository</module>
 		<module>../../tests/org.eclipse.wst.xml.vex.core.tests</module>
 		<module>../../tests/org.eclipse.wst.xml.vex.ui.tests</module>
@@ -42,6 +43,22 @@
 					<resolver>p2</resolver>
 				</configuration>
 			</plugin>
+			<plugin>
+				<groupId>org.sonatype.tycho</groupId>
+				<artifactId>maven-osgi-source-plugin</artifactId>
+				<version>${tycho-version}</version>
+				<configuration>
+					<encoding>UTF-8</encoding>
+				</configuration>
+				<executions>
+					<execution>
+						<id>attach-source</id>
+						<goals>
+							<goal>plugin-source</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
 		</plugins>
 		<pluginManagement>
 			<plugins>
@@ -63,10 +80,10 @@
 				</plugin>
 				<plugin>
 					<groupId>org.sonatype.tycho</groupId>
-					<artifactId>maven-osgi-source-plugin</artifactId>
+					<artifactId>maven-osgi-packaging-plugin</artifactId>
 					<version>${tycho-version}</version>
 					<configuration>
-						<encoding>UTF-8</encoding>
+						<archiveSite>true</archiveSite>
 					</configuration>
 				</plugin>
 			</plugins>
diff --git a/sourceediting/development/org.eclipse.wst.xml.vex.repository/site.xml b/sourceediting/development/org.eclipse.wst.xml.vex.repository/site.xml
index abba1d36..d51f7b16 100644
--- a/sourceediting/development/org.eclipse.wst.xml.vex.repository/site.xml
+++ b/sourceediting/development/org.eclipse.wst.xml.vex.repository/site.xml
@@ -1,4 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <site>
-   <feature url="features/org.eclipse.wst.xml.vex.feature_0.5.0.qualifier.jar" id="org.eclipse.wst.xml.vex.feature" version="0.5.0.qualifier"/>
+   <feature url="features/org.eclipse.wst.xml.vex.feature_0.5.0.qualifier.jar" id="org.eclipse.wst.xml.vex.feature" version="0.5.0.qualifier">
+      <category name="vex_core"/>
+   </feature>
+   <feature url="features/org.eclipse.wst.xml.vex_sdk.feature_0.5.0.qualifier.jar" id="org.eclipse.wst.xml.vex_sdk.feature" version="0.5.0.qualifier">
+      <category name="vex_sdk"/>
+   </feature>
+   <category-def name="vex_core" label="Vex Core">
+      <description>
+         Vex Core Plugins.  Contains the core functionality as well as built in support for DocBook and DITA.
+      </description>
+   </category-def>
+   <category-def name="vex_sdk" label="Vex SDK Source">
+      <description>
+         SDK Feature that contains source bundles that can be installed.
+      </description>
+   </category-def>
 </site>
diff --git a/sourceediting/documentation/org.eclipse.wst.xml.vex.documentation/build.properties b/sourceediting/documentation/org.eclipse.wst.xml.vex.documentation/build.properties
index 4ef9bc13..fbe04e21 100644
--- a/sourceediting/documentation/org.eclipse.wst.xml.vex.documentation/build.properties
+++ b/sourceediting/documentation/org.eclipse.wst.xml.vex.documentation/build.properties
@@ -6,3 +6,4 @@ bin.includes = plugin.xml,\
                plugin.properties,\
                help/
 generateSourceBundle=false
+source.. = src_does_not_exist/
\ No newline at end of file
diff --git a/sourceediting/features/org.eclipse.wst.xml.vex_sdk.feature/feature.xml b/sourceediting/features/org.eclipse.wst.xml.vex_sdk.feature/feature.xml
index 89a13b85..8b992b49 100644
--- a/sourceediting/features/org.eclipse.wst.xml.vex_sdk.feature/feature.xml
+++ b/sourceediting/features/org.eclipse.wst.xml.vex_sdk.feature/feature.xml
@@ -25,9 +25,27 @@
    <includes
          id="org.eclipse.wst.xml.vex.feature"
          version="0.0.0"/>
+         
+   <plugin
+         id="org.eclipse.wst.xml.vex.ui.source"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
 
-   <includes
-         id="org.eclipse.wst.xml.vex.feature.source"
-         version="0.0.0"/>
+
+   <plugin
+         id="org.eclipse.wst.xml.vex.core.source"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.wst.xml.vex.docbook.source"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
 
 </feature>
diff --git a/sourceediting/features/org.eclipse.wst.xml.vex_sdk.feature/pom.xml b/sourceediting/features/org.eclipse.wst.xml.vex_sdk.feature/pom.xml
new file mode 100644
index 00000000..16b3853c
--- /dev/null
+++ b/sourceediting/features/org.eclipse.wst.xml.vex_sdk.feature/pom.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<artifactId>org.eclipse.wst.xml.vex_sdk.feature</artifactId>
+	<packaging>eclipse-feature</packaging>
+	<version>0.5.0-SNAPSHOT</version>
+	<name>Vex SDK Feature</name>
+
+	<parent>
+		<artifactId>org.eclipse.wst.xml.vex_parent</artifactId>
+		<groupId>org.eclipse.wst.xml.vex</groupId>
+		<version>0.5.0-SNAPSHOT</version>
+		<relativePath>../../development/org.eclipse.wst.xml.vex.releng/pom.xml</relativePath>
+	</parent>
+
+</project>
diff --git a/sourceediting/plugins/org.eclipse.wst.xml.vex.dita/build.properties b/sourceediting/plugins/org.eclipse.wst.xml.vex.dita/build.properties
index 50c3c22a..e6870c09 100644
--- a/sourceediting/plugins/org.eclipse.wst.xml.vex.dita/build.properties
+++ b/sourceediting/plugins/org.eclipse.wst.xml.vex.dita/build.properties
@@ -4,3 +4,4 @@ bin.includes = plugin.xml,\
                META-INF/,\
                css/,\
                dita11/
+source.. = src_does_not_exist/
diff --git a/sourceediting/plugins/org.eclipse.wst.xml.vex/build.properties b/sourceediting/plugins/org.eclipse.wst.xml.vex/build.properties
index 298a7cc9..5acd29ae 100644
--- a/sourceediting/plugins/org.eclipse.wst.xml.vex/build.properties
+++ b/sourceediting/plugins/org.eclipse.wst.xml.vex/build.properties
@@ -6,4 +6,5 @@ bin.includes = META-INF/,\
                plugin.properties,\
                wtp_prod32.gif,\
                wtp_prod32.png
-source = src_does_not_exist/
+source.. = src_does_not_exist/
+src.includes = about.html