369864 Work in progress towards a p2 based build
diff --git a/build-bundlor/build.xml b/build-bundlor/build.xml
index 17ebfef..2b7c574 100644
--- a/build-bundlor/build.xml
+++ b/build-bundlor/build.xml
@@ -1,20 +1,178 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="build-bundlor" default="precommit">
-
- <target name="precommit" depends="clean, clean-integration, test"
- description="Performs a CI server-like build, should be run prior to performing an svn commit"/>
-
+
+ <target name="precommit" depends="clean, clean-integration, test" description="Performs a CI server-like build, should be run prior to performing an svn commit"/>
+
<path id="bundles">
<pathelement location="../org.eclipse.virgo.bundlor"/>
- <pathelement location="../org.eclipse.virgo.bundlor.blint" />
+ <pathelement location="../org.eclipse.virgo.bundlor.diff"/>
+ <pathelement location="../org.eclipse.virgo.bundlor.blint"/>
<pathelement location="../org.eclipse.virgo.bundlor.commandline"/>
<pathelement location="../org.eclipse.virgo.bundlor.ant"/>
<pathelement location="../org.eclipse.virgo.bundlor.maven"/>
</path>
-
+
<property file="${basedir}/../build.properties"/>
<property file="${basedir}/../build.versions"/>
- <import file="${basedir}/package-top-level.xml"/>
<import file="${basedir}/../virgo-build/multi-bundle/default.xml"/>
+
+ <!-- <target name="package"> SAVED FOR REFERENCE IF THE P2 PACKAGING TARGET NEED WORK
+ <delete dir="${package.output.dir}" quiet="true"/>
+ <mkdir dir="${package.output.dir}"/>
+ <delete file="${package.output.file}" quiet="true"/>
+ <mkdir dir="${artifacts.dir}"/>
+ <all-bundles target="package">
+ <property name="package.output.dir" value="${package.output.dir}"/>
+ </all-bundles>
+
+ <copy todir="${package.output.dir}" failonerror="false">
+ <fileset dir="resources"/>
+ </copy>
+
+ <copy todir="${package.output.dir}/bin" failonerror="false">
+ <fileset dir="scripts"/>
+ </copy>
+
+ <path id="doc.projects">
+ <path location="${basedir}/../user-guide"/>
+ </path>
+
+ <all-bundles target="doc" buildpathRef="doc.projects"/>
+ <all-bundles target="package" buildpathRef="doc.projects">
+ <property name="package.output.dir" value="${package.output.dir}"/>
+ </all-bundles>
+
+ <copy todir="${package.output.dir}/projects">
+ <fileset dir="${basedir}/..">
+ <exclude name=".git/**"/>
+ <exclude name="**/target/**"/>
+ <exclude name="**/integration-repo/**"/>
+ <exclude name="**/ivy-cache/**"/>
+ <exclude name="**/virgo-build/lib/docbook/**" />
+ <exclude name="**/virgo-build/lib/findbugs/**" />
+ <exclude name="**/*OLD*/**"/>
+ </fileset>
+ </copy>
+
+ <chmod perm="755">
+ <fileset dir="${package.output.dir}">
+ <include name="**/*.sh"/>
+ </fileset>
+ </chmod>
+
+ <replaceregexp match="build.stamp.*\n" replace="" flags="g"
+ file="${package.output.dir}/projects/build.properties"/>
+ <replaceregexp match="release.type=.*" replace="release.type=integration" flags="g"
+ file="${package.output.dir}/projects/build.properties"/>
+
+ <zip destfile="${package.output.file}">
+ <zipfileset dir="${package.dir}" includes="${package.basename}/**/*.sh" filemode="755"/>
+ <zipfileset dir="${package.dir}" excludes="${package.basename}/**/*.sh"/>
+ </zip>
+ </target> -->
+
+ <target name="package" description="Package a Zip and P2 repo of Bundlor">
+ <delete dir="${package.output.dir}" quiet="true"/>
+ <mkdir dir="${package.output.dir}"/>
+ <mkdir dir="${artifacts.dir}"/>
+ <all-bundles target="package">
+ <property name="package.output.dir" value="${target.dir}/assembly/plugins"/>
+ </all-bundles>
+
+ <!-- Prepare the features for publishing -->
+ <copy todir="${target.dir}/assembly/features" failonerror="false">
+ <fileset dir="${basedir}/publish_resources/features" excludes="keystore"/>
+ <filterset>
+ <filter token="BUNDLOR.VERSION" value="${bundle.version}"/>
+ </filterset>
+ </copy>
+
+ <antcall target="fetch-unzipped-virgo-build-tools"/>
+ <antcall target="p2.generate-inf">
+ <param name="source" value="${target.dir}/assembly/features"/>
+ </antcall>
+
+ <!-- Add in the resources -->
+ <zip destfile="${target.dir}/binary/resources.zip">
+ <zipfileset dir="${basedir}/resources"/>
+ </zip>
+ <antcall target="p2.publish-binary">
+ <param name="repository" value="${p2.repository.dir}"/>
+ <param name="source" value="${target.dir}/binary/resources.zip"/>
+ </antcall>
+ <echo message="Published the resources and scripts to ${p2.repository.dir}."/>
+
+ <!-- Publish some features in to the P2 repo -->
+ <antcall target="p2.publish-bundles-features">
+ <param name="repository" value="${p2.repository.dir}"/>
+ <param name="source" value="${target.dir}/assembly"/>
+ </antcall>
+ <echo message="Published bundles and features to ${p2.repository.dir}."/>
+
+ <antcall target="p2.publish-product">
+ <param name="repository" value="${p2.repository.dir}"/>
+ <param name="product.file.location" value="${basedir}/publish_resources/products/bundlor/bundlor.product"/>
+ </antcall>
+ <echo message="Published bundlor product to ${p2.repository.dir}."/>
+
+ <!-- Create the zipped updatesite -->
+ <zip destfile="${updatesite.output.file}">
+ <zipfileset dir="${p2.repository.dir}"/>
+ </zip>
+
+ <!-- Prepare the Bundlor zip -->
+ <antcall target="p2.install-virgo-product">
+ <param name="repository" value="${p2.repository.dir}"/>
+ <param name="destination" value="${package.output.dir}"/>
+ <param name="product.iu" value="bundlor.product"/>
+ </antcall>
+ <echo message="Installed Bundlor for distribution purposes."/>
+
+ <zip destfile="${package.output.file}">
+ <zipfileset dir="${package.dir}" includes="${package.basename}/**/*.sh" filemode="755"/>
+ <zipfileset dir="${package.dir}" excludes="${package.basename}/**/*.sh"/>
+ </zip>
+
+ <!-- Tidy up -->
+ <delete dir="${target.dir}/assembly" quiet="true"/>
+
+ </target>
+
+ <target name="publish-updatesite-download">
+ <fail message="The 'project.key' property must be set on this project.">
+ <condition>
+ <not>
+ <isset property="project.key"/>
+ </not>
+ </condition>
+ </fail>
+ <checksum
+ file="${updatesite.output.file}"
+ algorithm="sha1"/>
+ <sshexec
+ host="build.eclipse.org"
+ username="${eclipse.committerId}"
+ keyfile="${key.file}"
+ passphrase="${passphrase}"
+ command="mkdir -pv /home/data/httpd/download.eclipse.org/virgo/${adjusted.release.type}/${project.key}/${bundle.version}"/>
+ <scp
+ localFile="${updatesite.output.file}"
+ todir="${eclipse.committerId}@build.eclipse.org:/home/data/httpd/download.eclipse.org/virgo/${adjusted.release.type}/${project.key}"
+ keyfile="${key.file}"
+ passphrase="${passphrase}"/>
+ <sshexec
+ host="build.eclipse.org"
+ username="${eclipse.committerId}"
+ keyfile="${key.file}"
+ passphrase="${passphrase}"
+ command="unzip /home/data/httpd/download.eclipse.org/virgo/${adjusted.release.type}/${project.key}/${updatesite.file.name} -d /home/data/httpd/download.eclipse.org/virgo/${adjusted.release.type}/${project.key}/${bundle.version}"/>
+ <sshexec
+ host="build.eclipse.org"
+ username="${eclipse.committerId}"
+ keyfile="${key.file}"
+ passphrase="${passphrase}"
+ command="rm /home/data/httpd/download.eclipse.org/virgo/${adjusted.release.type}/${project.key}/${updatesite.file.name}"/>
+ </target>
+
</project>
diff --git a/build-bundlor/package-bundle.xml b/build-bundlor/package-bundle.xml
index 249e640..5c19f69 100644
--- a/build-bundlor/package-bundle.xml
+++ b/build-bundlor/package-bundle.xml
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project name="package-bundle">
+<project name="package-bundle" xmlns:ivy="antlib:org.apache.ivy.ant">
<target name="package" depends="ivy.init">
<dist-jar/>
- <src-jar/>
+ <!-- <src-jar/> source jars -->
<ext-jars/>
</target>
-
+
</project>
\ No newline at end of file
diff --git a/build-bundlor/package-top-level.xml b/build-bundlor/package-top-level.xml
deleted file mode 100644
index f64692f..0000000
--- a/build-bundlor/package-top-level.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="package-top-level">
-
- <target name="package">
- <delete dir="${package.output.dir}" quiet="true"/>
- <mkdir dir="${package.output.dir}"/>
- <delete file="${package.output.file}" quiet="true"/>
- <mkdir dir="${artifacts.dir}"/>
-
- <all-bundles target="package">
- <property name="package.output.dir" value="${package.output.dir}"/>
- </all-bundles>
-
- <copy todir="${package.output.dir}" failonerror="false">
- <fileset dir="resources"/>
- </copy>
-
- <copy todir="${package.output.dir}/bin" failonerror="false">
- <fileset dir="scripts"/>
- </copy>
-
- <path id="doc.projects">
- <path location="${basedir}/../user-guide"/>
- </path>
-
- <all-bundles target="doc" buildpathRef="doc.projects"/>
- <all-bundles target="package" buildpathRef="doc.projects">
- <property name="package.output.dir" value="${package.output.dir}"/>
- </all-bundles>
-
- <copy todir="${package.output.dir}/projects">
- <fileset dir="${basedir}/..">
- <exclude name=".git/**"/>
- <exclude name="**/target/**"/>
- <exclude name="**/integration-repo/**"/>
- <exclude name="**/ivy-cache/**"/>
- <exclude name="**/virgo-build/lib/docbook/**" />
- <exclude name="**/virgo-build/lib/findbugs/**" />
- <exclude name="**/*OLD*/**"/>
- </fileset>
- </copy>
-
- <chmod perm="755">
- <fileset dir="${package.output.dir}">
- <include name="**/*.sh"/>
- </fileset>
- </chmod>
-
- <replaceregexp match="build.stamp.*\n" replace="" flags="g"
- file="${package.output.dir}/projects/build.properties"/>
- <replaceregexp match="release.type=.*" replace="release.type=integration" flags="g"
- file="${package.output.dir}/projects/build.properties"/>
-
- <zip destfile="${package.output.file}">
- <zipfileset dir="${package.dir}" includes="${package.basename}/**/*.sh" filemode="755"/>
- <zipfileset dir="${package.dir}" excludes="${package.basename}/**/*.sh"/>
- </zip>
- </target>
-
-</project>
\ No newline at end of file
diff --git a/build-bundlor/publish_resources/features/org.eclipse.virgo.bundlor.ant/.project b/build-bundlor/publish_resources/features/org.eclipse.virgo.bundlor.ant/.project
new file mode 100644
index 0000000..0d8264b
--- /dev/null
+++ b/build-bundlor/publish_resources/features/org.eclipse.virgo.bundlor.ant/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.eclipse.virgo.core.feature</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.pde.FeatureBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.pde.FeatureNature</nature>
+ </natures>
+</projectDescription>
diff --git a/build-bundlor/publish_resources/features/org.eclipse.virgo.bundlor.ant/build.properties b/build-bundlor/publish_resources/features/org.eclipse.virgo.bundlor.ant/build.properties
new file mode 100644
index 0000000..db80add
--- /dev/null
+++ b/build-bundlor/publish_resources/features/org.eclipse.virgo.bundlor.ant/build.properties
@@ -0,0 +1,4 @@
+bin.includes = feature.xml,\
+ feature.properties,\
+ epl-v10.html,\
+ eclipse_update_120.jpg
diff --git a/build-bundlor/publish_resources/features/org.eclipse.virgo.bundlor.ant/eclipse_update_120.jpg b/build-bundlor/publish_resources/features/org.eclipse.virgo.bundlor.ant/eclipse_update_120.jpg
new file mode 100755
index 0000000..bfdf708
--- /dev/null
+++ b/build-bundlor/publish_resources/features/org.eclipse.virgo.bundlor.ant/eclipse_update_120.jpg
Binary files differ
diff --git a/build-bundlor/resources/epl-v10.html b/build-bundlor/publish_resources/features/org.eclipse.virgo.bundlor.ant/epl-v10.html
old mode 100644
new mode 100755
similarity index 100%
copy from build-bundlor/resources/epl-v10.html
copy to build-bundlor/publish_resources/features/org.eclipse.virgo.bundlor.ant/epl-v10.html
diff --git a/build-bundlor/publish_resources/features/org.eclipse.virgo.bundlor.ant/feature.properties b/build-bundlor/publish_resources/features/org.eclipse.virgo.bundlor.ant/feature.properties
new file mode 100644
index 0000000..05c34c8
--- /dev/null
+++ b/build-bundlor/publish_resources/features/org.eclipse.virgo.bundlor.ant/feature.properties
@@ -0,0 +1,189 @@
+###############################################################################
+# Copyright (c) 2011 SAP AG
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# and Apache License v2.0 which accompanies this distribution.
+# The Eclipse Public License is available at
+# http://www.eclipse.org/legal/epl-v10.html
+# and the Apache License v2.0 is available at
+# http://www.opensource.org/licenses/apache2.0.php.
+# You may elect to redistribute this code under either of these licenses.
+#
+# Contributors:
+# Borislav Kapukaranov - initial contribution
+###############################################################################
+# feature.properties
+# contains externalized strings for feature.xml
+# "%foo" in feature.xml corresponds to the key "foo" in this file
+# java.io.Properties file (ISO 8859-1 with "\" escapes)
+# This file should be translated.
+
+# "featureName" property - name of the feature
+featureName=Eclipse Virgo Bundlor Ant
+
+# "providerName" property - name of the company that provides the feature
+providerName=Eclipse.org
+
+# "updateSiteName" property - label for the update site
+
+# "description" property - description of the feature
+description=This feature provides the Bundlor manifest generator Ant integration features of the Eclipse Virgo tooling.\n\
+
+# "copyright" property - text of the "Feature Update Copyright"
+copyright=\
+Copyright (c) 2009, 2010, 2011 VMware Inc. and others\n\
+\n\
+All rights reserved. This program and the accompanying materials\n\
+are made available under the terms of the Eclipse Public License v1.0\n\
+and Apache License v2.0 which accompanies this distribution.\n\
+The Eclipse Public License is available at\n\
+http://www.eclipse.org/legal/epl-v10.html\n\
+and the Apache License v2.0 is available at\n\
+http://www.opensource.org/licenses/apache2.0.php.\n\
+You may elect to redistribute this code under either of these\n\
+licenses.\n\
+\n\
+Contributors:\n\
+VMware Inc. - initial contribution\n\
+
+# "licenseURL" property - URL of the "Feature License"
+# do not translate value - just change to point to a locale-specific HTML page
+licenseURL=license.html
+
+# "license" property - text of the "Feature Update License"
+# should be plain text version of license agreement pointed to be "licenseURL"
+license=\
+Eclipse Foundation Software User Agreement\n\
+April 14, 2010\n\
+\n\
+Usage Of Content\n\
+\n\
+THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION,\n\
+INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS\n\
+(COLLECTIVELY "CONTENT"). USE OF THE CONTENT IS GOVERNED BY THE TERMS\n\
+AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF\n\
+LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.\n\
+BY USING THE CONTENT, YOU AGREE THAT YOUR USE OF THE CONTENT IS\n\
+GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY\n\
+APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
+BELOW. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS\n\
+AGREEMENT AND THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE\n\
+AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY\n\
+NOT USE THE CONTENT.\n\
+\n\
+Applicable Licenses\n\
+\n\
+Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
+is provided to you under the terms and conditions of the Eclipse Public\n\
+License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
+Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
+For purposes of the EPL, "Program" will mean the Content.\n\
+\n\
+Content includes, but is not limited to, source code, object code,\n\
+documentation and other files maintained in the Eclipse Foundation source code\n\
+repository ("Repository") in software modules ("Modules") and made available\n\
+as downloadable archives ("Downloads").\n\
+\n\
+- Content may be structured and packaged into modules to facilitate delivering,\n\
+extending, and upgrading the Content. Typical modules may include plug-ins\n\
+("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features").\n\
+- Each Plug-in or Fragment may be packaged as a sub-directory or JAR\n\
+(Java tm ARchive) in a directory named "plugins".\n\
+- A Feature is a bundle of one or more Plug-ins and/or Fragments and associated\n\
+material. Each Feature may be packaged as a sub-directory in a directory named\n\
+"features". Within a Feature, files named "feature.xml" may contain a list\n\
+of the names and version numbers of the Plug-ins and/or Fragments associated\n\
+with that Feature.\n\
+- Features may also include other Features ("Included Features").\n\
+Within a Feature, files named "feature.xml" may contain a list of the\n\
+names and version numbers of Included Features.\n\
+\n\
+The terms and conditions governing Plug-ins and Fragments should be\n\
+contained in files named "about.html" ("Abouts"). The terms and\n\
+conditions governing Features and Included Features should be contained\n\
+in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
+Licenses may be located in any directory of a Download or Module\n\
+including, but not limited to the following locations:\n\
+\n\
+- The top-level (root) directory\n\
+- Plug-in and Fragment directories\n\
+- Inside Plug-ins and Fragments packaged as JARs\n\
+- Sub-directories of the directory named "src" of certain Plug-ins\n\
+- Feature directories\n\
+\n\
+Note: if a Feature made available by the Eclipse Foundation is installed\n\
+using the Provisioning Technology (as defined below), you must agree to a\n\
+license ("Feature Update License") during the installation process.\n\
+If the Feature contains\n\
+Included Features, the Feature Update License should either provide\n\
+you with the terms and conditions governing the Included Features or inform\n\
+you where you can locate them. Feature Update Licenses may be found in\n\
+the "license" property of files named "feature.properties" found within a Feature.\n\
+Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms\n\
+and conditions (or references to such terms and conditions) that govern your\n\
+use of the associated Content in that directory.\n\
+\n\
+THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\
+TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
+SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
+\n\
+- Common Public License Version 1.0 (available at\n\
+http://www.eclipse.org/legal/cpl-v10.html)\n\
+- Apache Software License 1.1 (available at\n\
+http://www.apache.org/licenses/LICENSE)\n\
+- Apache Software License 2.0 (available at\n\
+http://www.apache.org/licenses/LICENSE-2.0)\n\
+- Metro Link Public License 1.00 (available at\n\
+http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
+- Mozilla Public License Version 1.1 (available at\n\
+http://www.mozilla.org/MPL/MPL-1.1.html)\n\
+\n\
+IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS\n\
+PRIOR TO USE OF THE CONTENT. If no About, Feature License, or Feature\n\
+Update License is provided, please contact the Eclipse Foundation to\n\
+determine what terms and conditions govern that particular Content.\n\
+\n\
+Use of Provisioning Technology\n\
+\n\
+The Eclipse Foundation makes available provisioning software, examples\n\
+of which include, but are not limited to, p2 and the Eclipse Update Manager\n\
+("Provisioning Technology") for the purpose of allowing users to install software,\n\
+documentation, information and/or other materials (collectively "Installable Software").\n\
+This capability is provided with the intent of allowing such users to install,\n\
+extend and update Eclipse-based products.\n\
+Information about packaging Installable Software is available at\n\
+http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\
+\n\
+You may use Provisioning Technology to allow other parties to install Installable Software.\n\
+You shall be responsible for enabling the applicable license agreements relating\n\
+to the Installable Software to be presented to, and accepted by,\n\
+the users of the Provisioning Technology in accordance with the Specification.\n\
+By using Provisioning Technology in such a manner and making it available in accordance\n\
+with the Specification, you further acknowledge your agreement to,\n\
+and the acquisition of all necessary rights to permit the following:\n\
+\n\
+- A series of actions may occur ("Provisioning Process") in which a user may execute the\n\
+Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
+extending or updating the functionality of an Eclipse-based product.\n\
+- During the Provisioning Process, the Provisioning Technology may cause third party\n\
+Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
+- Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
+govern the use of the Installable Software ("Installable Software Agreement")\n\
+and such Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
+with the Specification. Such Installable Software Agreement must inform the user of the terms and\n\
+conditions that govern the Installable Software and must solicit acceptance by the end user in\n\
+the manner prescribed in such Installable Software Agreement.\n\
+Upon such indication of agreement by the user, the provisioning Technology\n\
+will complete installation of the Installable Software.\n\
+\n\
+Cryptography\n\
+\n\
+Content may contain encryption software. The country in which you are\n\
+currently may have restrictions on the import, possession, and use,\n\
+and/or re-export to another country, of encryption software. BEFORE\n\
+using any encryption software, please check the country's laws,\n\
+regulations and policies concerning the import, possession, or use,\n\
+and re-export of encryption software, to see if this is permitted.\n\
+\n\
+Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n\
diff --git a/build-bundlor/publish_resources/features/org.eclipse.virgo.bundlor.ant/feature.xml b/build-bundlor/publish_resources/features/org.eclipse.virgo.bundlor.ant/feature.xml
new file mode 100755
index 0000000..000de99
--- /dev/null
+++ b/build-bundlor/publish_resources/features/org.eclipse.virgo.bundlor.ant/feature.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+ id="org.eclipse.virgo.bundlor.ant"
+ label="%featureName"
+ version="@BUNDLOR.VERSION@"
+ provider-name="%providerName"
+ image="eclipse_update_120.jpg">
+
+ <description url="http://www.eclipse.org/virgo/">
+ %description
+ </description>
+
+ <copyright url="http://www.eclipse.org/virgo/">
+ %copyright
+ </copyright>
+
+ <license url="%licenseURL">
+ %license
+ </license>
+
+ <plugin
+ id="org.eclipse.virgo.bundlor"
+ download-size="0"
+ install-size="0"
+ version="@BUNDLOR.VERSION@"
+ unpack="false"
+ autostart="false"/>
+ <plugin
+ id="org.eclipse.virgo.bundlor.blint"
+ download-size="0"
+ install-size="0"
+ version="@BUNDLOR.VERSION@"
+ unpack="false"
+ autostart="false"/>
+ <plugin
+ id="org.eclipse.virgo.bundlor.ant"
+ download-size="0"
+ install-size="0"
+ version="@BUNDLOR.VERSION@"
+ unpack="false"
+ autostart="false"/>
+
+</feature>
diff --git a/build-bundlor/publish_resources/features/org.eclipse.virgo.bundlor.commandline/.project b/build-bundlor/publish_resources/features/org.eclipse.virgo.bundlor.commandline/.project
new file mode 100644
index 0000000..0d8264b
--- /dev/null
+++ b/build-bundlor/publish_resources/features/org.eclipse.virgo.bundlor.commandline/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.eclipse.virgo.core.feature</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.pde.FeatureBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.pde.FeatureNature</nature>
+ </natures>
+</projectDescription>
diff --git a/build-bundlor/publish_resources/features/org.eclipse.virgo.bundlor.commandline/build.properties b/build-bundlor/publish_resources/features/org.eclipse.virgo.bundlor.commandline/build.properties
new file mode 100644
index 0000000..db80add
--- /dev/null
+++ b/build-bundlor/publish_resources/features/org.eclipse.virgo.bundlor.commandline/build.properties
@@ -0,0 +1,4 @@
+bin.includes = feature.xml,\
+ feature.properties,\
+ epl-v10.html,\
+ eclipse_update_120.jpg
diff --git a/build-bundlor/publish_resources/features/org.eclipse.virgo.bundlor.commandline/eclipse_update_120.jpg b/build-bundlor/publish_resources/features/org.eclipse.virgo.bundlor.commandline/eclipse_update_120.jpg
new file mode 100755
index 0000000..bfdf708
--- /dev/null
+++ b/build-bundlor/publish_resources/features/org.eclipse.virgo.bundlor.commandline/eclipse_update_120.jpg
Binary files differ
diff --git a/build-bundlor/resources/epl-v10.html b/build-bundlor/publish_resources/features/org.eclipse.virgo.bundlor.commandline/epl-v10.html
old mode 100644
new mode 100755
similarity index 100%
copy from build-bundlor/resources/epl-v10.html
copy to build-bundlor/publish_resources/features/org.eclipse.virgo.bundlor.commandline/epl-v10.html
diff --git a/build-bundlor/publish_resources/features/org.eclipse.virgo.bundlor.commandline/feature.properties b/build-bundlor/publish_resources/features/org.eclipse.virgo.bundlor.commandline/feature.properties
new file mode 100644
index 0000000..a665a7c
--- /dev/null
+++ b/build-bundlor/publish_resources/features/org.eclipse.virgo.bundlor.commandline/feature.properties
@@ -0,0 +1,189 @@
+###############################################################################
+# Copyright (c) 2011 SAP AG
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# and Apache License v2.0 which accompanies this distribution.
+# The Eclipse Public License is available at
+# http://www.eclipse.org/legal/epl-v10.html
+# and the Apache License v2.0 is available at
+# http://www.opensource.org/licenses/apache2.0.php.
+# You may elect to redistribute this code under either of these licenses.
+#
+# Contributors:
+# Borislav Kapukaranov - initial contribution
+###############################################################################
+# feature.properties
+# contains externalized strings for feature.xml
+# "%foo" in feature.xml corresponds to the key "foo" in this file
+# java.io.Properties file (ISO 8859-1 with "\" escapes)
+# This file should be translated.
+
+# "featureName" property - name of the feature
+featureName=Eclipse Virgo Bundlor Command Line
+
+# "providerName" property - name of the company that provides the feature
+providerName=Eclipse.org
+
+# "updateSiteName" property - label for the update site
+
+# "description" property - description of the feature
+description=This feature provides the Bundlor manifest generator command line integration features of the Eclipse Virgo tooling.\n\
+
+# "copyright" property - text of the "Feature Update Copyright"
+copyright=\
+Copyright (c) 2009, 2010, 2011 VMware Inc. and others\n\
+\n\
+All rights reserved. This program and the accompanying materials\n\
+are made available under the terms of the Eclipse Public License v1.0\n\
+and Apache License v2.0 which accompanies this distribution.\n\
+The Eclipse Public License is available at\n\
+http://www.eclipse.org/legal/epl-v10.html\n\
+and the Apache License v2.0 is available at\n\
+http://www.opensource.org/licenses/apache2.0.php.\n\
+You may elect to redistribute this code under either of these\n\
+licenses.\n\
+\n\
+Contributors:\n\
+VMware Inc. - initial contribution\n\
+
+# "licenseURL" property - URL of the "Feature License"
+# do not translate value - just change to point to a locale-specific HTML page
+licenseURL=license.html
+
+# "license" property - text of the "Feature Update License"
+# should be plain text version of license agreement pointed to be "licenseURL"
+license=\
+Eclipse Foundation Software User Agreement\n\
+April 14, 2010\n\
+\n\
+Usage Of Content\n\
+\n\
+THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION,\n\
+INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS\n\
+(COLLECTIVELY "CONTENT"). USE OF THE CONTENT IS GOVERNED BY THE TERMS\n\
+AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF\n\
+LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.\n\
+BY USING THE CONTENT, YOU AGREE THAT YOUR USE OF THE CONTENT IS\n\
+GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY\n\
+APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
+BELOW. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS\n\
+AGREEMENT AND THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE\n\
+AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY\n\
+NOT USE THE CONTENT.\n\
+\n\
+Applicable Licenses\n\
+\n\
+Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
+is provided to you under the terms and conditions of the Eclipse Public\n\
+License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
+Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
+For purposes of the EPL, "Program" will mean the Content.\n\
+\n\
+Content includes, but is not limited to, source code, object code,\n\
+documentation and other files maintained in the Eclipse Foundation source code\n\
+repository ("Repository") in software modules ("Modules") and made available\n\
+as downloadable archives ("Downloads").\n\
+\n\
+- Content may be structured and packaged into modules to facilitate delivering,\n\
+extending, and upgrading the Content. Typical modules may include plug-ins\n\
+("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features").\n\
+- Each Plug-in or Fragment may be packaged as a sub-directory or JAR\n\
+(Java tm ARchive) in a directory named "plugins".\n\
+- A Feature is a bundle of one or more Plug-ins and/or Fragments and associated\n\
+material. Each Feature may be packaged as a sub-directory in a directory named\n\
+"features". Within a Feature, files named "feature.xml" may contain a list\n\
+of the names and version numbers of the Plug-ins and/or Fragments associated\n\
+with that Feature.\n\
+- Features may also include other Features ("Included Features").\n\
+Within a Feature, files named "feature.xml" may contain a list of the\n\
+names and version numbers of Included Features.\n\
+\n\
+The terms and conditions governing Plug-ins and Fragments should be\n\
+contained in files named "about.html" ("Abouts"). The terms and\n\
+conditions governing Features and Included Features should be contained\n\
+in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
+Licenses may be located in any directory of a Download or Module\n\
+including, but not limited to the following locations:\n\
+\n\
+- The top-level (root) directory\n\
+- Plug-in and Fragment directories\n\
+- Inside Plug-ins and Fragments packaged as JARs\n\
+- Sub-directories of the directory named "src" of certain Plug-ins\n\
+- Feature directories\n\
+\n\
+Note: if a Feature made available by the Eclipse Foundation is installed\n\
+using the Provisioning Technology (as defined below), you must agree to a\n\
+license ("Feature Update License") during the installation process.\n\
+If the Feature contains\n\
+Included Features, the Feature Update License should either provide\n\
+you with the terms and conditions governing the Included Features or inform\n\
+you where you can locate them. Feature Update Licenses may be found in\n\
+the "license" property of files named "feature.properties" found within a Feature.\n\
+Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms\n\
+and conditions (or references to such terms and conditions) that govern your\n\
+use of the associated Content in that directory.\n\
+\n\
+THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\
+TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
+SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
+\n\
+- Common Public License Version 1.0 (available at\n\
+http://www.eclipse.org/legal/cpl-v10.html)\n\
+- Apache Software License 1.1 (available at\n\
+http://www.apache.org/licenses/LICENSE)\n\
+- Apache Software License 2.0 (available at\n\
+http://www.apache.org/licenses/LICENSE-2.0)\n\
+- Metro Link Public License 1.00 (available at\n\
+http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
+- Mozilla Public License Version 1.1 (available at\n\
+http://www.mozilla.org/MPL/MPL-1.1.html)\n\
+\n\
+IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS\n\
+PRIOR TO USE OF THE CONTENT. If no About, Feature License, or Feature\n\
+Update License is provided, please contact the Eclipse Foundation to\n\
+determine what terms and conditions govern that particular Content.\n\
+\n\
+Use of Provisioning Technology\n\
+\n\
+The Eclipse Foundation makes available provisioning software, examples\n\
+of which include, but are not limited to, p2 and the Eclipse Update Manager\n\
+("Provisioning Technology") for the purpose of allowing users to install software,\n\
+documentation, information and/or other materials (collectively "Installable Software").\n\
+This capability is provided with the intent of allowing such users to install,\n\
+extend and update Eclipse-based products.\n\
+Information about packaging Installable Software is available at\n\
+http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\
+\n\
+You may use Provisioning Technology to allow other parties to install Installable Software.\n\
+You shall be responsible for enabling the applicable license agreements relating\n\
+to the Installable Software to be presented to, and accepted by,\n\
+the users of the Provisioning Technology in accordance with the Specification.\n\
+By using Provisioning Technology in such a manner and making it available in accordance\n\
+with the Specification, you further acknowledge your agreement to,\n\
+and the acquisition of all necessary rights to permit the following:\n\
+\n\
+- A series of actions may occur ("Provisioning Process") in which a user may execute the\n\
+Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
+extending or updating the functionality of an Eclipse-based product.\n\
+- During the Provisioning Process, the Provisioning Technology may cause third party\n\
+Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
+- Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
+govern the use of the Installable Software ("Installable Software Agreement")\n\
+and such Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
+with the Specification. Such Installable Software Agreement must inform the user of the terms and\n\
+conditions that govern the Installable Software and must solicit acceptance by the end user in\n\
+the manner prescribed in such Installable Software Agreement.\n\
+Upon such indication of agreement by the user, the provisioning Technology\n\
+will complete installation of the Installable Software.\n\
+\n\
+Cryptography\n\
+\n\
+Content may contain encryption software. The country in which you are\n\
+currently may have restrictions on the import, possession, and use,\n\
+and/or re-export to another country, of encryption software. BEFORE\n\
+using any encryption software, please check the country's laws,\n\
+regulations and policies concerning the import, possession, or use,\n\
+and re-export of encryption software, to see if this is permitted.\n\
+\n\
+Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n\
diff --git a/build-bundlor/publish_resources/features/org.eclipse.virgo.bundlor.commandline/feature.xml b/build-bundlor/publish_resources/features/org.eclipse.virgo.bundlor.commandline/feature.xml
new file mode 100755
index 0000000..4cd704d
--- /dev/null
+++ b/build-bundlor/publish_resources/features/org.eclipse.virgo.bundlor.commandline/feature.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+ id="org.eclipse.virgo.bundlor.commandline"
+ label="%featureName"
+ version="@BUNDLOR.VERSION@"
+ provider-name="%providerName"
+ image="eclipse_update_120.jpg">
+
+ <description url="http://www.eclipse.org/virgo/">
+ %description
+ </description>
+
+ <copyright url="http://www.eclipse.org/virgo/">
+ %copyright
+ </copyright>
+
+ <license url="%licenseURL">
+ %license
+ </license>
+
+ <plugin
+ id="org.eclipse.virgo.bundlor"
+ download-size="0"
+ install-size="0"
+ version="@BUNDLOR.VERSION@"
+ unpack="false"
+ autostart="false"/>
+ <plugin
+ id="org.eclipse.virgo.bundlor.blint"
+ download-size="0"
+ install-size="0"
+ version="@BUNDLOR.VERSION@"
+ unpack="false"
+ autostart="false"/>
+ <plugin
+ id="org.eclipse.virgo.bundlor.commandline"
+ download-size="0"
+ install-size="0"
+ version="@BUNDLOR.VERSION@"
+ unpack="false"
+ autostart="false"/>
+
+</feature>
diff --git a/build-bundlor/publish_resources/features/org.eclipse.virgo.bundlor.maven/.project b/build-bundlor/publish_resources/features/org.eclipse.virgo.bundlor.maven/.project
new file mode 100644
index 0000000..0d8264b
--- /dev/null
+++ b/build-bundlor/publish_resources/features/org.eclipse.virgo.bundlor.maven/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.eclipse.virgo.core.feature</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.pde.FeatureBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.pde.FeatureNature</nature>
+ </natures>
+</projectDescription>
diff --git a/build-bundlor/publish_resources/features/org.eclipse.virgo.bundlor.maven/build.properties b/build-bundlor/publish_resources/features/org.eclipse.virgo.bundlor.maven/build.properties
new file mode 100644
index 0000000..db80add
--- /dev/null
+++ b/build-bundlor/publish_resources/features/org.eclipse.virgo.bundlor.maven/build.properties
@@ -0,0 +1,4 @@
+bin.includes = feature.xml,\
+ feature.properties,\
+ epl-v10.html,\
+ eclipse_update_120.jpg
diff --git a/build-bundlor/publish_resources/features/org.eclipse.virgo.bundlor.maven/eclipse_update_120.jpg b/build-bundlor/publish_resources/features/org.eclipse.virgo.bundlor.maven/eclipse_update_120.jpg
new file mode 100755
index 0000000..bfdf708
--- /dev/null
+++ b/build-bundlor/publish_resources/features/org.eclipse.virgo.bundlor.maven/eclipse_update_120.jpg
Binary files differ
diff --git a/build-bundlor/resources/epl-v10.html b/build-bundlor/publish_resources/features/org.eclipse.virgo.bundlor.maven/epl-v10.html
old mode 100644
new mode 100755
similarity index 100%
copy from build-bundlor/resources/epl-v10.html
copy to build-bundlor/publish_resources/features/org.eclipse.virgo.bundlor.maven/epl-v10.html
diff --git a/build-bundlor/publish_resources/features/org.eclipse.virgo.bundlor.maven/feature.properties b/build-bundlor/publish_resources/features/org.eclipse.virgo.bundlor.maven/feature.properties
new file mode 100644
index 0000000..a9744dd
--- /dev/null
+++ b/build-bundlor/publish_resources/features/org.eclipse.virgo.bundlor.maven/feature.properties
@@ -0,0 +1,189 @@
+###############################################################################
+# Copyright (c) 2011 SAP AG
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# and Apache License v2.0 which accompanies this distribution.
+# The Eclipse Public License is available at
+# http://www.eclipse.org/legal/epl-v10.html
+# and the Apache License v2.0 is available at
+# http://www.opensource.org/licenses/apache2.0.php.
+# You may elect to redistribute this code under either of these licenses.
+#
+# Contributors:
+# Borislav Kapukaranov - initial contribution
+###############################################################################
+# feature.properties
+# contains externalized strings for feature.xml
+# "%foo" in feature.xml corresponds to the key "foo" in this file
+# java.io.Properties file (ISO 8859-1 with "\" escapes)
+# This file should be translated.
+
+# "featureName" property - name of the feature
+featureName=Eclipse Virgo Bundlor Maven
+
+# "providerName" property - name of the company that provides the feature
+providerName=Eclipse.org
+
+# "updateSiteName" property - label for the update site
+
+# "description" property - description of the feature
+description=This feature provides the Bundlor manifest generator Maven integration features of the Eclipse Virgo tooling.\n\
+
+# "copyright" property - text of the "Feature Update Copyright"
+copyright=\
+Copyright (c) 2009, 2010, 2011 VMware Inc. and others\n\
+\n\
+All rights reserved. This program and the accompanying materials\n\
+are made available under the terms of the Eclipse Public License v1.0\n\
+and Apache License v2.0 which accompanies this distribution.\n\
+The Eclipse Public License is available at\n\
+http://www.eclipse.org/legal/epl-v10.html\n\
+and the Apache License v2.0 is available at\n\
+http://www.opensource.org/licenses/apache2.0.php.\n\
+You may elect to redistribute this code under either of these\n\
+licenses.\n\
+\n\
+Contributors:\n\
+VMware Inc. - initial contribution\n\
+
+# "licenseURL" property - URL of the "Feature License"
+# do not translate value - just change to point to a locale-specific HTML page
+licenseURL=license.html
+
+# "license" property - text of the "Feature Update License"
+# should be plain text version of license agreement pointed to be "licenseURL"
+license=\
+Eclipse Foundation Software User Agreement\n\
+April 14, 2010\n\
+\n\
+Usage Of Content\n\
+\n\
+THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION,\n\
+INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS\n\
+(COLLECTIVELY "CONTENT"). USE OF THE CONTENT IS GOVERNED BY THE TERMS\n\
+AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF\n\
+LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.\n\
+BY USING THE CONTENT, YOU AGREE THAT YOUR USE OF THE CONTENT IS\n\
+GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY\n\
+APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
+BELOW. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS\n\
+AGREEMENT AND THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE\n\
+AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY\n\
+NOT USE THE CONTENT.\n\
+\n\
+Applicable Licenses\n\
+\n\
+Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
+is provided to you under the terms and conditions of the Eclipse Public\n\
+License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
+Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
+For purposes of the EPL, "Program" will mean the Content.\n\
+\n\
+Content includes, but is not limited to, source code, object code,\n\
+documentation and other files maintained in the Eclipse Foundation source code\n\
+repository ("Repository") in software modules ("Modules") and made available\n\
+as downloadable archives ("Downloads").\n\
+\n\
+- Content may be structured and packaged into modules to facilitate delivering,\n\
+extending, and upgrading the Content. Typical modules may include plug-ins\n\
+("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features").\n\
+- Each Plug-in or Fragment may be packaged as a sub-directory or JAR\n\
+(Java tm ARchive) in a directory named "plugins".\n\
+- A Feature is a bundle of one or more Plug-ins and/or Fragments and associated\n\
+material. Each Feature may be packaged as a sub-directory in a directory named\n\
+"features". Within a Feature, files named "feature.xml" may contain a list\n\
+of the names and version numbers of the Plug-ins and/or Fragments associated\n\
+with that Feature.\n\
+- Features may also include other Features ("Included Features").\n\
+Within a Feature, files named "feature.xml" may contain a list of the\n\
+names and version numbers of Included Features.\n\
+\n\
+The terms and conditions governing Plug-ins and Fragments should be\n\
+contained in files named "about.html" ("Abouts"). The terms and\n\
+conditions governing Features and Included Features should be contained\n\
+in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
+Licenses may be located in any directory of a Download or Module\n\
+including, but not limited to the following locations:\n\
+\n\
+- The top-level (root) directory\n\
+- Plug-in and Fragment directories\n\
+- Inside Plug-ins and Fragments packaged as JARs\n\
+- Sub-directories of the directory named "src" of certain Plug-ins\n\
+- Feature directories\n\
+\n\
+Note: if a Feature made available by the Eclipse Foundation is installed\n\
+using the Provisioning Technology (as defined below), you must agree to a\n\
+license ("Feature Update License") during the installation process.\n\
+If the Feature contains\n\
+Included Features, the Feature Update License should either provide\n\
+you with the terms and conditions governing the Included Features or inform\n\
+you where you can locate them. Feature Update Licenses may be found in\n\
+the "license" property of files named "feature.properties" found within a Feature.\n\
+Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms\n\
+and conditions (or references to such terms and conditions) that govern your\n\
+use of the associated Content in that directory.\n\
+\n\
+THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\
+TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
+SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
+\n\
+- Common Public License Version 1.0 (available at\n\
+http://www.eclipse.org/legal/cpl-v10.html)\n\
+- Apache Software License 1.1 (available at\n\
+http://www.apache.org/licenses/LICENSE)\n\
+- Apache Software License 2.0 (available at\n\
+http://www.apache.org/licenses/LICENSE-2.0)\n\
+- Metro Link Public License 1.00 (available at\n\
+http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
+- Mozilla Public License Version 1.1 (available at\n\
+http://www.mozilla.org/MPL/MPL-1.1.html)\n\
+\n\
+IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS\n\
+PRIOR TO USE OF THE CONTENT. If no About, Feature License, or Feature\n\
+Update License is provided, please contact the Eclipse Foundation to\n\
+determine what terms and conditions govern that particular Content.\n\
+\n\
+Use of Provisioning Technology\n\
+\n\
+The Eclipse Foundation makes available provisioning software, examples\n\
+of which include, but are not limited to, p2 and the Eclipse Update Manager\n\
+("Provisioning Technology") for the purpose of allowing users to install software,\n\
+documentation, information and/or other materials (collectively "Installable Software").\n\
+This capability is provided with the intent of allowing such users to install,\n\
+extend and update Eclipse-based products.\n\
+Information about packaging Installable Software is available at\n\
+http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\
+\n\
+You may use Provisioning Technology to allow other parties to install Installable Software.\n\
+You shall be responsible for enabling the applicable license agreements relating\n\
+to the Installable Software to be presented to, and accepted by,\n\
+the users of the Provisioning Technology in accordance with the Specification.\n\
+By using Provisioning Technology in such a manner and making it available in accordance\n\
+with the Specification, you further acknowledge your agreement to,\n\
+and the acquisition of all necessary rights to permit the following:\n\
+\n\
+- A series of actions may occur ("Provisioning Process") in which a user may execute the\n\
+Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
+extending or updating the functionality of an Eclipse-based product.\n\
+- During the Provisioning Process, the Provisioning Technology may cause third party\n\
+Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
+- Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
+govern the use of the Installable Software ("Installable Software Agreement")\n\
+and such Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
+with the Specification. Such Installable Software Agreement must inform the user of the terms and\n\
+conditions that govern the Installable Software and must solicit acceptance by the end user in\n\
+the manner prescribed in such Installable Software Agreement.\n\
+Upon such indication of agreement by the user, the provisioning Technology\n\
+will complete installation of the Installable Software.\n\
+\n\
+Cryptography\n\
+\n\
+Content may contain encryption software. The country in which you are\n\
+currently may have restrictions on the import, possession, and use,\n\
+and/or re-export to another country, of encryption software. BEFORE\n\
+using any encryption software, please check the country's laws,\n\
+regulations and policies concerning the import, possession, or use,\n\
+and re-export of encryption software, to see if this is permitted.\n\
+\n\
+Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n\
diff --git a/build-bundlor/publish_resources/features/org.eclipse.virgo.bundlor.maven/feature.xml b/build-bundlor/publish_resources/features/org.eclipse.virgo.bundlor.maven/feature.xml
new file mode 100755
index 0000000..d30806f
--- /dev/null
+++ b/build-bundlor/publish_resources/features/org.eclipse.virgo.bundlor.maven/feature.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+ id="org.eclipse.virgo.bundlor.maven"
+ label="%featureName"
+ version="@BUNDLOR.VERSION@"
+ provider-name="%providerName"
+ image="eclipse_update_120.jpg">
+
+ <description url="http://www.eclipse.org/virgo/">
+ %description
+ </description>
+
+ <copyright url="http://www.eclipse.org/virgo/">
+ %copyright
+ </copyright>
+
+ <license url="%licenseURL">
+ %license
+ </license>
+
+ <plugin
+ id="org.eclipse.virgo.bundlor"
+ download-size="0"
+ install-size="0"
+ version="@BUNDLOR.VERSION@"
+ unpack="false"
+ autostart="false"/>
+ <plugin
+ id="org.eclipse.virgo.bundlor.blint"
+ download-size="0"
+ install-size="0"
+ version="@BUNDLOR.VERSION@"
+ unpack="false"
+ autostart="false"/>
+ <plugin
+ id="org.eclipse.virgo.bundlor.maven"
+ download-size="0"
+ install-size="0"
+ version="@BUNDLOR.VERSION@"
+ unpack="false"
+ autostart="false"/>
+
+</feature>
diff --git a/build-bundlor/publish_resources/features/org.eclipse.virgo.bundlor/.project b/build-bundlor/publish_resources/features/org.eclipse.virgo.bundlor/.project
new file mode 100644
index 0000000..0d8264b
--- /dev/null
+++ b/build-bundlor/publish_resources/features/org.eclipse.virgo.bundlor/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.eclipse.virgo.core.feature</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.pde.FeatureBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.pde.FeatureNature</nature>
+ </natures>
+</projectDescription>
diff --git a/build-bundlor/publish_resources/features/org.eclipse.virgo.bundlor/build.properties b/build-bundlor/publish_resources/features/org.eclipse.virgo.bundlor/build.properties
new file mode 100644
index 0000000..db80add
--- /dev/null
+++ b/build-bundlor/publish_resources/features/org.eclipse.virgo.bundlor/build.properties
@@ -0,0 +1,4 @@
+bin.includes = feature.xml,\
+ feature.properties,\
+ epl-v10.html,\
+ eclipse_update_120.jpg
diff --git a/build-bundlor/publish_resources/features/org.eclipse.virgo.bundlor/eclipse_update_120.jpg b/build-bundlor/publish_resources/features/org.eclipse.virgo.bundlor/eclipse_update_120.jpg
new file mode 100755
index 0000000..bfdf708
--- /dev/null
+++ b/build-bundlor/publish_resources/features/org.eclipse.virgo.bundlor/eclipse_update_120.jpg
Binary files differ
diff --git a/build-bundlor/resources/epl-v10.html b/build-bundlor/publish_resources/features/org.eclipse.virgo.bundlor/epl-v10.html
old mode 100644
new mode 100755
similarity index 100%
copy from build-bundlor/resources/epl-v10.html
copy to build-bundlor/publish_resources/features/org.eclipse.virgo.bundlor/epl-v10.html
diff --git a/build-bundlor/publish_resources/features/org.eclipse.virgo.bundlor/feature.properties b/build-bundlor/publish_resources/features/org.eclipse.virgo.bundlor/feature.properties
new file mode 100644
index 0000000..57cb24f
--- /dev/null
+++ b/build-bundlor/publish_resources/features/org.eclipse.virgo.bundlor/feature.properties
@@ -0,0 +1,189 @@
+###############################################################################
+# Copyright (c) 2011 SAP AG
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# and Apache License v2.0 which accompanies this distribution.
+# The Eclipse Public License is available at
+# http://www.eclipse.org/legal/epl-v10.html
+# and the Apache License v2.0 is available at
+# http://www.opensource.org/licenses/apache2.0.php.
+# You may elect to redistribute this code under either of these licenses.
+#
+# Contributors:
+# Borislav Kapukaranov - initial contribution
+###############################################################################
+# feature.properties
+# contains externalized strings for feature.xml
+# "%foo" in feature.xml corresponds to the key "foo" in this file
+# java.io.Properties file (ISO 8859-1 with "\" escapes)
+# This file should be translated.
+
+# "featureName" property - name of the feature
+featureName=Eclipse Virgo Bundlor
+
+# "providerName" property - name of the company that provides the feature
+providerName=Eclipse.org
+
+# "updateSiteName" property - label for the update site
+
+# "description" property - description of the feature
+description=This feature provides the Bundlor manifest generator features of the Eclipse Virgo tooling.\n\
+
+# "copyright" property - text of the "Feature Update Copyright"
+copyright=\
+Copyright (c) 2009, 2010, 2011 VMware Inc. and others\n\
+\n\
+All rights reserved. This program and the accompanying materials\n\
+are made available under the terms of the Eclipse Public License v1.0\n\
+and Apache License v2.0 which accompanies this distribution.\n\
+The Eclipse Public License is available at\n\
+http://www.eclipse.org/legal/epl-v10.html\n\
+and the Apache License v2.0 is available at\n\
+http://www.opensource.org/licenses/apache2.0.php.\n\
+You may elect to redistribute this code under either of these\n\
+licenses.\n\
+\n\
+Contributors:\n\
+VMware Inc. - initial contribution\n\
+
+# "licenseURL" property - URL of the "Feature License"
+# do not translate value - just change to point to a locale-specific HTML page
+licenseURL=license.html
+
+# "license" property - text of the "Feature Update License"
+# should be plain text version of license agreement pointed to be "licenseURL"
+license=\
+Eclipse Foundation Software User Agreement\n\
+April 14, 2010\n\
+\n\
+Usage Of Content\n\
+\n\
+THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION,\n\
+INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS\n\
+(COLLECTIVELY "CONTENT"). USE OF THE CONTENT IS GOVERNED BY THE TERMS\n\
+AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF\n\
+LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.\n\
+BY USING THE CONTENT, YOU AGREE THAT YOUR USE OF THE CONTENT IS\n\
+GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY\n\
+APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
+BELOW. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS\n\
+AGREEMENT AND THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE\n\
+AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY\n\
+NOT USE THE CONTENT.\n\
+\n\
+Applicable Licenses\n\
+\n\
+Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
+is provided to you under the terms and conditions of the Eclipse Public\n\
+License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
+Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
+For purposes of the EPL, "Program" will mean the Content.\n\
+\n\
+Content includes, but is not limited to, source code, object code,\n\
+documentation and other files maintained in the Eclipse Foundation source code\n\
+repository ("Repository") in software modules ("Modules") and made available\n\
+as downloadable archives ("Downloads").\n\
+\n\
+- Content may be structured and packaged into modules to facilitate delivering,\n\
+extending, and upgrading the Content. Typical modules may include plug-ins\n\
+("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features").\n\
+- Each Plug-in or Fragment may be packaged as a sub-directory or JAR\n\
+(Java tm ARchive) in a directory named "plugins".\n\
+- A Feature is a bundle of one or more Plug-ins and/or Fragments and associated\n\
+material. Each Feature may be packaged as a sub-directory in a directory named\n\
+"features". Within a Feature, files named "feature.xml" may contain a list\n\
+of the names and version numbers of the Plug-ins and/or Fragments associated\n\
+with that Feature.\n\
+- Features may also include other Features ("Included Features").\n\
+Within a Feature, files named "feature.xml" may contain a list of the\n\
+names and version numbers of Included Features.\n\
+\n\
+The terms and conditions governing Plug-ins and Fragments should be\n\
+contained in files named "about.html" ("Abouts"). The terms and\n\
+conditions governing Features and Included Features should be contained\n\
+in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
+Licenses may be located in any directory of a Download or Module\n\
+including, but not limited to the following locations:\n\
+\n\
+- The top-level (root) directory\n\
+- Plug-in and Fragment directories\n\
+- Inside Plug-ins and Fragments packaged as JARs\n\
+- Sub-directories of the directory named "src" of certain Plug-ins\n\
+- Feature directories\n\
+\n\
+Note: if a Feature made available by the Eclipse Foundation is installed\n\
+using the Provisioning Technology (as defined below), you must agree to a\n\
+license ("Feature Update License") during the installation process.\n\
+If the Feature contains\n\
+Included Features, the Feature Update License should either provide\n\
+you with the terms and conditions governing the Included Features or inform\n\
+you where you can locate them. Feature Update Licenses may be found in\n\
+the "license" property of files named "feature.properties" found within a Feature.\n\
+Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms\n\
+and conditions (or references to such terms and conditions) that govern your\n\
+use of the associated Content in that directory.\n\
+\n\
+THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\
+TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
+SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
+\n\
+- Common Public License Version 1.0 (available at\n\
+http://www.eclipse.org/legal/cpl-v10.html)\n\
+- Apache Software License 1.1 (available at\n\
+http://www.apache.org/licenses/LICENSE)\n\
+- Apache Software License 2.0 (available at\n\
+http://www.apache.org/licenses/LICENSE-2.0)\n\
+- Metro Link Public License 1.00 (available at\n\
+http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
+- Mozilla Public License Version 1.1 (available at\n\
+http://www.mozilla.org/MPL/MPL-1.1.html)\n\
+\n\
+IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS\n\
+PRIOR TO USE OF THE CONTENT. If no About, Feature License, or Feature\n\
+Update License is provided, please contact the Eclipse Foundation to\n\
+determine what terms and conditions govern that particular Content.\n\
+\n\
+Use of Provisioning Technology\n\
+\n\
+The Eclipse Foundation makes available provisioning software, examples\n\
+of which include, but are not limited to, p2 and the Eclipse Update Manager\n\
+("Provisioning Technology") for the purpose of allowing users to install software,\n\
+documentation, information and/or other materials (collectively "Installable Software").\n\
+This capability is provided with the intent of allowing such users to install,\n\
+extend and update Eclipse-based products.\n\
+Information about packaging Installable Software is available at\n\
+http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\
+\n\
+You may use Provisioning Technology to allow other parties to install Installable Software.\n\
+You shall be responsible for enabling the applicable license agreements relating\n\
+to the Installable Software to be presented to, and accepted by,\n\
+the users of the Provisioning Technology in accordance with the Specification.\n\
+By using Provisioning Technology in such a manner and making it available in accordance\n\
+with the Specification, you further acknowledge your agreement to,\n\
+and the acquisition of all necessary rights to permit the following:\n\
+\n\
+- A series of actions may occur ("Provisioning Process") in which a user may execute the\n\
+Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
+extending or updating the functionality of an Eclipse-based product.\n\
+- During the Provisioning Process, the Provisioning Technology may cause third party\n\
+Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
+- Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
+govern the use of the Installable Software ("Installable Software Agreement")\n\
+and such Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
+with the Specification. Such Installable Software Agreement must inform the user of the terms and\n\
+conditions that govern the Installable Software and must solicit acceptance by the end user in\n\
+the manner prescribed in such Installable Software Agreement.\n\
+Upon such indication of agreement by the user, the provisioning Technology\n\
+will complete installation of the Installable Software.\n\
+\n\
+Cryptography\n\
+\n\
+Content may contain encryption software. The country in which you are\n\
+currently may have restrictions on the import, possession, and use,\n\
+and/or re-export to another country, of encryption software. BEFORE\n\
+using any encryption software, please check the country's laws,\n\
+regulations and policies concerning the import, possession, or use,\n\
+and re-export of encryption software, to see if this is permitted.\n\
+\n\
+Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n\
diff --git a/build-bundlor/publish_resources/features/org.eclipse.virgo.bundlor/feature.xml b/build-bundlor/publish_resources/features/org.eclipse.virgo.bundlor/feature.xml
new file mode 100755
index 0000000..6f093d6
--- /dev/null
+++ b/build-bundlor/publish_resources/features/org.eclipse.virgo.bundlor/feature.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+ id="org.eclipse.virgo.bundlor"
+ label="%featureName"
+ version="@BUNDLOR.VERSION@"
+ provider-name="%providerName"
+ image="eclipse_update_120.jpg">
+
+ <description url="http://www.eclipse.org/virgo/">
+ %description
+ </description>
+
+ <copyright url="http://www.eclipse.org/virgo/">
+ %copyright
+ </copyright>
+
+ <license url="%licenseURL">
+ %license
+ </license>
+
+ <plugin
+ id="org.eclipse.virgo.bundlor"
+ download-size="0"
+ install-size="0"
+ version="@BUNDLOR.VERSION@"
+ unpack="false"
+ autostart="false"/>
+ <plugin
+ id="org.eclipse.virgo.bundlor.blint"
+ download-size="0"
+ install-size="0"
+ version="@BUNDLOR.VERSION@"
+ unpack="false"
+ autostart="false"/>
+ <!-- <plugin
+ id="org.eclipse.virgo.bundlor.diff"
+ download-size="0"
+ install-size="0"
+ version="@BUNDLOR.VERSION@"
+ unpack="false"
+ autostart="false"/> -->
+
+</feature>
diff --git a/build-bundlor/publish_resources/products/bundlor/bundlor.product b/build-bundlor/publish_resources/products/bundlor/bundlor.product
new file mode 100755
index 0000000..10b01b4
--- /dev/null
+++ b/build-bundlor/publish_resources/products/bundlor/bundlor.product
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?pde version="3.5"?>
+
+<product name="Eclipse Virgo Bundlor Product" uid="bundlor.product" version="1.0.0" useFeatures="true" includeLaunchers="false">
+
+ <configIni use="default">
+ </configIni>
+
+ <vm>
+ </vm>
+
+ <plugins>
+ </plugins>
+
+ <features>
+ <feature id="org.eclipse.virgo.bundlor" version="0.0.0"/>
+ <feature id="org.eclipse.virgo.bundlor.ant" version="0.0.0"/>
+ <feature id="org.eclipse.virgo.bundlor.maven" version="0.0.0"/>
+ <feature id="org.eclipse.virgo.bundlor.commandline" version="0.0.0"/>
+ </features>
+
+</product>
diff --git a/build-bundlor/publish_resources/products/bundlor/p2.inf b/build-bundlor/publish_resources/products/bundlor/p2.inf
new file mode 100644
index 0000000..6521b1d
--- /dev/null
+++ b/build-bundlor/publish_resources/products/bundlor/p2.inf
@@ -0,0 +1,18 @@
+###############################################################################
+# Copyright (c) 2011 SAP AG
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# and Apache License v2.0 which accompanies this distribution.
+# The Eclipse Public License is available at
+# http://www.eclipse.org/legal/epl-v10.html
+# and the Apache License v2.0 is available at
+# http://www.opensource.org/licenses/apache2.0.php.
+# You may elect to redistribute this code under either of these licenses.
+#
+# Contributors:
+# Christopher Frost - initial contribution
+###############################################################################
+requires.0.name = bundlor.product
+requires.0.namespace = org.eclipse.equinox.p2.iu
+requires.0.range = 0.0.0
diff --git a/build-bundlor/resources/About.html b/build-bundlor/resources/about/About.html
similarity index 100%
rename from build-bundlor/resources/About.html
rename to build-bundlor/resources/about/About.html
diff --git a/build-bundlor/resources/epl-v10.html b/build-bundlor/resources/about/epl-v10.html
similarity index 100%
rename from build-bundlor/resources/epl-v10.html
rename to build-bundlor/resources/about/epl-v10.html
diff --git a/build-bundlor/resources/notice.html b/build-bundlor/resources/about/notice.html
similarity index 100%
rename from build-bundlor/resources/notice.html
rename to build-bundlor/resources/about/notice.html
diff --git a/build-bundlor/scripts/bundlor.bat b/build-bundlor/resources/scripts/bundlor.bat
similarity index 100%
rename from build-bundlor/scripts/bundlor.bat
rename to build-bundlor/resources/scripts/bundlor.bat
diff --git a/build-bundlor/scripts/bundlor.sh b/build-bundlor/resources/scripts/bundlor.sh
similarity index 100%
rename from build-bundlor/scripts/bundlor.sh
rename to build-bundlor/resources/scripts/bundlor.sh
diff --git a/build.versions b/build.versions
index 0b39d0e..fc34ed4 100644
--- a/build.versions
+++ b/build.versions
@@ -2,10 +2,13 @@
org.apache.ant=1.7.0
org.apache.commons.cli=1.2.0
org.osgi.core=4.3.0
+org.osgi.compendium=4.1.0
org.objectweb.asm=3.1.0
-org.slf4j=1.5.6
+org.slf4j=1.6.1
org.apache.commons.io=1.4.0
-org.apache.maven=3.0
+org.apache.maven=3.0.4
+org.eclipse.virgo.build.tools=1.2.1.RELEASE
+org.eclipse.equinox.launcher=1.3.0.v20111003-1644
org.junit=4.7.0
org.apache.wicket.injection=1.3.3
diff --git a/org.eclipse.virgo.bundlor.ant/.settings/com.springsource.server.ide.bundlor.core.prefs b/org.eclipse.virgo.bundlor.ant/.settings/org.eclipse.virgo.ide.bundlor.core.prefs
similarity index 100%
rename from org.eclipse.virgo.bundlor.ant/.settings/com.springsource.server.ide.bundlor.core.prefs
rename to org.eclipse.virgo.bundlor.ant/.settings/org.eclipse.virgo.ide.bundlor.core.prefs
diff --git a/org.eclipse.virgo.bundlor.ant/.settings/org.eclipse.wst.common.project.facet.core.xml b/org.eclipse.virgo.bundlor.ant/.settings/org.eclipse.wst.common.project.facet.core.xml
index 801f856..92aa290 100644
--- a/org.eclipse.virgo.bundlor.ant/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ b/org.eclipse.virgo.bundlor.ant/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<faceted-project>
- <installed facet="com.springsource.server.bundle" version="1.0"/>
+ <installed facet="org.eclipse.virgo.server.bundle" version="1.0"/>
</faceted-project>
diff --git a/org.eclipse.virgo.bundlor.ant/ivy.xml b/org.eclipse.virgo.bundlor.ant/ivy.xml
index 215cb5f..0ba522d 100644
--- a/org.eclipse.virgo.bundlor.ant/ivy.xml
+++ b/org.eclipse.virgo.bundlor.ant/ivy.xml
@@ -22,7 +22,7 @@
<dependency org="org.eclipse.virgo.bundlor" name="org.eclipse.virgo.bundlor.blint" rev="latest.integration" conf="ant,provided->runtime"/>
<dependency org="org.eclipse.virgo.util" name="org.eclipse.virgo.util.osgi" rev="${org.eclipse.virgo.util}" conf="compile->runtime"/>
<dependency org="org.eclipse.virgo.util" name="org.eclipse.virgo.util.parser.manifest" rev="${org.eclipse.virgo.util}" conf="compile->runtime"/>
- <dependency org="org.apache.ant" name="com.springsource.org.apache.tools.ant" rev="${org.apache.ant}" conf="provided->runtime"/>
+ <dependency org="org.apache.ant" name="com.springsource.org.apache.tools.ant" rev="${org.apache.ant}" conf="compile->runtime"/>
</dependencies>
</ivy-module>
diff --git a/org.eclipse.virgo.bundlor.ant/template.mf b/org.eclipse.virgo.bundlor.ant/template.mf
index b6c7e84..da9746c 100644
--- a/org.eclipse.virgo.bundlor.ant/template.mf
+++ b/org.eclipse.virgo.bundlor.ant/template.mf
@@ -3,10 +3,7 @@
Bundle-Vendor: SpringSource Inc.
Bundle-SymbolicName: org.eclipse.virgo.bundlor.ant
Bundle-Version: 0
-Import-Template:
- org.eclipse.virgo.bundlor.*;version="[1.0.0, 1.0.1)",
- org.eclipse.virgo.util.*;version="${org.eclipse.virgo.util:[=.=.=, +1.0.0)}",
- org.apache.tools.ant.*;version="${org.apache.ant:[=.=.=, +1.0.0)}",
- org.springframework.util.*;version="[1.0.0, 1.0.1)"
Excluded-Exports:
- *.internal.*
+ *
+Excluded-Imports:
+ *
diff --git a/org.eclipse.virgo.bundlor.blint/.settings/com.springsource.server.ide.bundlor.core.prefs b/org.eclipse.virgo.bundlor.blint/.settings/org.eclipse.virgo.ide.bundlor.core.prefs
similarity index 100%
rename from org.eclipse.virgo.bundlor.blint/.settings/com.springsource.server.ide.bundlor.core.prefs
rename to org.eclipse.virgo.bundlor.blint/.settings/org.eclipse.virgo.ide.bundlor.core.prefs
diff --git a/org.eclipse.virgo.bundlor.blint/.settings/org.eclipse.wst.common.project.facet.core.xml b/org.eclipse.virgo.bundlor.blint/.settings/org.eclipse.wst.common.project.facet.core.xml
index 801f856..92aa290 100644
--- a/org.eclipse.virgo.bundlor.blint/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ b/org.eclipse.virgo.bundlor.blint/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<faceted-project>
- <installed facet="com.springsource.server.bundle" version="1.0"/>
+ <installed facet="org.eclipse.virgo.server.bundle" version="1.0"/>
</faceted-project>
diff --git a/org.eclipse.virgo.bundlor.blint/ivy.xml b/org.eclipse.virgo.bundlor.blint/ivy.xml
index 8cb5b37..1b64221 100644
--- a/org.eclipse.virgo.bundlor.blint/ivy.xml
+++ b/org.eclipse.virgo.bundlor.blint/ivy.xml
@@ -20,10 +20,14 @@
<dependency org="org.junit" name="com.springsource.org.junit" rev="${org.junit}" conf="test->runtime"/>
<dependency org="org.osgi" name="org.osgi.core" rev="${org.osgi.core}" conf="compile->runtime"/>
+ <dependency org="org.osgi" name="org.osgi.compendium" rev="${org.osgi.compendium}" conf="compile->runtime"/>
<dependency org="org.eclipse.virgo.bundlor" name="org.eclipse.virgo.bundlor" rev="latest.integration" conf="provided->runtime"/>
<dependency org="org.eclipse.virgo.util" name="org.eclipse.virgo.util.math" rev="${org.eclipse.virgo.util}" conf="compile->runtime"/>
<dependency org="org.eclipse.virgo.util" name="org.eclipse.virgo.util.osgi" rev="${org.eclipse.virgo.util}" conf="compile->runtime"/>
<dependency org="org.eclipse.virgo.util" name="org.eclipse.virgo.util.parser.manifest" rev="${org.eclipse.virgo.util}" conf="compile->runtime"/>
+
+ <dependency org="org.slf4j" name="com.springsource.slf4j.api" rev="${org.slf4j}" conf="compile->runtime"/>
+ <dependency org="org.slf4j" name="com.springsource.slf4j.nop" rev="${org.slf4j}" conf="compile->runtime"/>
</dependencies>
</ivy-module>
diff --git a/org.eclipse.virgo.bundlor.blint/template.mf b/org.eclipse.virgo.bundlor.blint/template.mf
index a5a7976..a6eb25c 100644
--- a/org.eclipse.virgo.bundlor.blint/template.mf
+++ b/org.eclipse.virgo.bundlor.blint/template.mf
@@ -4,7 +4,7 @@
Bundle-SymbolicName: org.eclipse.virgo.bundlor.blint
Bundle-Version: 0
Import-Template:
- org.eclipse.virgo.bundlor.*;version="[1.0.0, 1.0.1)",
+ org.eclipse.virgo.bundlor.*;version="${version:[=.=.=, =.+1.0)}",
org.eclipse.virgo.util.*;version="${org.eclipse.virgo.util:[=.=.=, +1.0.0)}",
org.osgi.framework.*;version="0"
Excluded-Exports:
diff --git a/org.eclipse.virgo.bundlor.commandline/.settings/com.springsource.server.ide.bundlor.core.prefs b/org.eclipse.virgo.bundlor.commandline/.settings/org.eclipse.virgo.ide.bundlor.core.prefs
similarity index 100%
rename from org.eclipse.virgo.bundlor.commandline/.settings/com.springsource.server.ide.bundlor.core.prefs
rename to org.eclipse.virgo.bundlor.commandline/.settings/org.eclipse.virgo.ide.bundlor.core.prefs
diff --git a/org.eclipse.virgo.bundlor.commandline/.settings/org.eclipse.wst.common.project.facet.core.xml b/org.eclipse.virgo.bundlor.commandline/.settings/org.eclipse.wst.common.project.facet.core.xml
index 801f856..92aa290 100644
--- a/org.eclipse.virgo.bundlor.commandline/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ b/org.eclipse.virgo.bundlor.commandline/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<faceted-project>
- <installed facet="com.springsource.server.bundle" version="1.0"/>
+ <installed facet="org.eclipse.virgo.server.bundle" version="1.0"/>
</faceted-project>
diff --git a/org.eclipse.virgo.bundlor.commandline/template.mf b/org.eclipse.virgo.bundlor.commandline/template.mf
index 8f212d8..b7d8fdd 100644
--- a/org.eclipse.virgo.bundlor.commandline/template.mf
+++ b/org.eclipse.virgo.bundlor.commandline/template.mf
@@ -4,9 +4,8 @@
Bundle-SymbolicName: org.eclipse.virgo.bundlor.commandline
Bundle-Version: 0
Import-Template:
- org.eclipse.virgo.bundlor.*;version="[1.0.0,1.0.1)",
+ org.eclipse.virgo.bundlor.*;version="${version:[=.=.=, =.+1.0)}",
org.eclipse.virgo.util.*;version="${org.eclipse.virgo.util:[=.=.=,+1.0.0)}",
- org.apache.commons.cli.*;version="${org.apache.commons.cli:[=.=.=,+1.0.0)}",
- org.springframework.util.*;version="[1.0.0,1.0.1)"
+ org.apache.commons.cli.*;version="${org.apache.commons.cli:[=.=.=,+1.0.0)}"
Excluded-Exports:
*.internal.*
diff --git a/org.eclipse.virgo.bundlor.diff/.classpath b/org.eclipse.virgo.bundlor.diff/.classpath
index 1279381..298edc3 100644
--- a/org.eclipse.virgo.bundlor.diff/.classpath
+++ b/org.eclipse.virgo.bundlor.diff/.classpath
@@ -5,25 +5,17 @@
<attribute name="com.springsource.server.ide.jdt.core.test.classpathentry" value="false"/>
</attributes>
</classpathentry>
- <classpathentry kind="src" path="src/main/resources">
- <attributes>
- <attribute name="com.springsource.server.ide.jdt.core.test.classpathentry" value="false"/>
- </attributes>
- </classpathentry>
+ <classpathentry kind="src" path="src/main/resources"/>
<classpathentry kind="src" output="target/test-classes" path="src/test/java">
<attributes>
<attribute name="com.springsource.server.ide.jdt.core.test.classpathentry" value="true"/>
</attributes>
</classpathentry>
- <classpathentry kind="src" output="target/test-classes" path="src/test/resources">
- <attributes>
- <attribute name="com.springsource.server.ide.jdt.core.test.classpathentry" value="true"/>
- </attributes>
- </classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="var" path="BUNDLOR_IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-4.7.0.jar" sourcepath="/BUNDLOR_IVY_CACHE/org.junit/com.springsource.org.junit/4.4.0/com.springsource.org.junit-sources-4.4.0.jar"/>
- <classpathentry kind="var" path="BUNDLOR_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi/3.0.1.RELEASE/org.eclipse.virgo.util.osgi-3.0.1.RELEASE.jar" sourcepath="/BUNDLOR_IVY_CACHE/com.springsource.util/com.springsource.util.osgi/2.0.0.RELEASE/com.springsource.util.osgi-sources-2.0.0.RELEASE.jar"/>
+ <classpathentry kind="var" path="BUNDLOR_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi/3.0.1.RELEASE/org.eclipse.virgo.util.osgi-3.0.1.RELEASE.jar" sourcepath="/BUNDLOR_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi/3.0.1.RELEASE/org.eclipse.virgo.util.osgi-sources-3.0.1.RELEASE.jar"/>
<classpathentry kind="var" path="BUNDLOR_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.parser.manifest/3.0.1.RELEASE/org.eclipse.virgo.util.parser.manifest-3.0.1.RELEASE.jar" sourcepath="/BUNDLOR_IVY_CACHE/com.springsource.util/com.springsource.util.parser.manifest/2.0.0.RELEASE/com.springsource.util.parser.manifest-sources-2.0.0.RELEASE.jar"/>
<classpathentry kind="var" path="BUNDLOR_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.common/3.0.1.RELEASE/org.eclipse.virgo.util.common-3.0.1.RELEASE.jar" sourcepath="/BUNDLOR_IVY_CACHE/com.springsource.util/com.springsource.util.common/2.0.0.RELEASE/com.springsource.util.common-sources-2.0.0.RELEASE.jar"/>
+ <classpathentry kind="var" path="BUNDLOR_IVY_CACHE/org.osgi/org.osgi.core/4.3.0/org.osgi.core-4.3.0.jar"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
diff --git a/org.eclipse.virgo.bundlor.diff/.settings/com.springsource.server.ide.bundlor.core.prefs b/org.eclipse.virgo.bundlor.diff/.settings/org.eclipse.virgo.ide.bundlor.core.prefs
similarity index 100%
rename from org.eclipse.virgo.bundlor.diff/.settings/com.springsource.server.ide.bundlor.core.prefs
rename to org.eclipse.virgo.bundlor.diff/.settings/org.eclipse.virgo.ide.bundlor.core.prefs
diff --git a/org.eclipse.virgo.bundlor.diff/.settings/org.eclipse.wst.common.project.facet.core.xml b/org.eclipse.virgo.bundlor.diff/.settings/org.eclipse.wst.common.project.facet.core.xml
index 801f856..92aa290 100644
--- a/org.eclipse.virgo.bundlor.diff/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ b/org.eclipse.virgo.bundlor.diff/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<faceted-project>
- <installed facet="com.springsource.server.bundle" version="1.0"/>
+ <installed facet="org.eclipse.virgo.server.bundle" version="1.0"/>
</faceted-project>
diff --git a/org.eclipse.virgo.bundlor.diff/build.xml b/org.eclipse.virgo.bundlor.diff/build.xml
index d88c108..6010a58 100644
--- a/org.eclipse.virgo.bundlor.diff/build.xml
+++ b/org.eclipse.virgo.bundlor.diff/build.xml
@@ -3,6 +3,7 @@
<property file="${basedir}/../build.properties"/>
<property file="${basedir}/../build.versions"/>
+ <import file="${basedir}/../build-bundlor/package-bundle.xml"/>
<import file="${basedir}/../virgo-build/standard/default.xml"/>
</project>
diff --git a/org.eclipse.virgo.bundlor.diff/src/main/resources/.gitignore b/org.eclipse.virgo.bundlor.diff/src/main/resources/.gitignore
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/org.eclipse.virgo.bundlor.diff/src/main/resources/.gitignore
diff --git a/org.eclipse.virgo.bundlor.diff/template.mf b/org.eclipse.virgo.bundlor.diff/template.mf
index b24afb7..40864ba 100644
--- a/org.eclipse.virgo.bundlor.diff/template.mf
+++ b/org.eclipse.virgo.bundlor.diff/template.mf
@@ -4,4 +4,7 @@
Bundle-SymbolicName: org.eclipse.virgo.bundlor.diff
Bundle-Version: 0
Import-Template:
- org.eclipse.virgo.util.*;version="[2.0.0, 3.0.0)"
+ org.eclipse.virgo.util.osgi.manifest.*;version="${org.eclipse.virgo.util:[=.=.=, +1.0.0)}"
+Excluded-Exports:
+ *.internal,
+ *.internal.*
\ No newline at end of file
diff --git a/org.eclipse.virgo.bundlor.maven/.classpath b/org.eclipse.virgo.bundlor.maven/.classpath
index 1398f68..35811ca 100644
--- a/org.eclipse.virgo.bundlor.maven/.classpath
+++ b/org.eclipse.virgo.bundlor.maven/.classpath
@@ -24,7 +24,7 @@
<classpathentry kind="var" path="BUNDLOR_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.parser.manifest/3.0.1.RELEASE/org.eclipse.virgo.util.parser.manifest-3.0.1.RELEASE.jar" sourcepath="/BUNDLOR_IVY_CACHE/com.springsource.util/com.springsource.util.parser.manifest/2.0.0.RELEASE/com.springsource.util.parser.manifest-sources-2.0.0.RELEASE.jar"/>
<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.virgo.bundlor"/>
<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.virgo.bundlor.blint"/>
- <classpathentry kind="var" path="BUNDLOR_IVY_CACHE/org.apache.maven/maven-plugin-api/2.2.1/maven-plugin-api-2.2.1.jar"/>
+ <classpathentry kind="var" path="BUNDLOR_IVY_CACHE/org.apache.maven/com.springsource.org.apache.maven.plugin-api/3.0.4/com.springsource.org.apache.maven.plugin-api-3.0.4.jar"/>
<classpathentry kind="var" path="BUNDLOR_IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-4.7.0.jar" sourcepath="/BUNDLOR_IVY_CACHE/org.junit/com.springsource.org.junit/4.4.0/com.springsource.org.junit-sources-4.4.0.jar"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
diff --git a/org.eclipse.virgo.bundlor.maven/.settings/com.springsource.server.ide.bundlor.core.prefs b/org.eclipse.virgo.bundlor.maven/.settings/org.eclipse.virgo.ide.bundlor.core.prefs
similarity index 100%
rename from org.eclipse.virgo.bundlor.maven/.settings/com.springsource.server.ide.bundlor.core.prefs
rename to org.eclipse.virgo.bundlor.maven/.settings/org.eclipse.virgo.ide.bundlor.core.prefs
diff --git a/org.eclipse.virgo.bundlor.maven/.settings/org.eclipse.wst.common.project.facet.core.xml b/org.eclipse.virgo.bundlor.maven/.settings/org.eclipse.wst.common.project.facet.core.xml
index 801f856..92aa290 100644
--- a/org.eclipse.virgo.bundlor.maven/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ b/org.eclipse.virgo.bundlor.maven/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<faceted-project>
- <installed facet="com.springsource.server.bundle" version="1.0"/>
+ <installed facet="org.eclipse.virgo.server.bundle" version="1.0"/>
</faceted-project>
diff --git a/org.eclipse.virgo.bundlor.maven/build.xml b/org.eclipse.virgo.bundlor.maven/build.xml
index f4ff254..df879a6 100644
--- a/org.eclipse.virgo.bundlor.maven/build.xml
+++ b/org.eclipse.virgo.bundlor.maven/build.xml
@@ -3,6 +3,14 @@
<property file="${basedir}/../build.properties"/>
<property file="${basedir}/../build.versions"/>
+
+<!-- <target name="package" depends="ivy.init">
+ <dist-jar/>
+ <src-jar/> source jars
+ <ext-jars/>
+ <copy file="${basedir}/../ivy-cache/repository/org.apache.maven/maven-plugin-api/3.0/maven-plugin-api-3.0.jar" todir="${target.dir}/assembly/plugins"/>
+ </target> -->
+
<import file="${basedir}/../build-bundlor/package-bundle.xml"/>
<import file="${basedir}/../virgo-build/standard/default.xml"/>
diff --git a/org.eclipse.virgo.bundlor.maven/ivy.xml b/org.eclipse.virgo.bundlor.maven/ivy.xml
index 73a7058..8e6c0ec 100644
--- a/org.eclipse.virgo.bundlor.maven/ivy.xml
+++ b/org.eclipse.virgo.bundlor.maven/ivy.xml
@@ -22,8 +22,7 @@
<dependency org="org.eclipse.virgo.bundlor" name="org.eclipse.virgo.bundlor.blint" rev="latest.integration" conf="ant,provided->runtime"/>
<dependency org="org.eclipse.virgo.util" name="org.eclipse.virgo.util.osgi" rev="${org.eclipse.virgo.util}" conf="compile->runtime"/>
<dependency org="org.eclipse.virgo.util" name="org.eclipse.virgo.util.parser.manifest" rev="${org.eclipse.virgo.util}" conf="compile->runtime"/>
-
- <dependency org="org.apache.maven" name="maven-plugin-api" rev="${org.apache.maven}" />
+ <dependency org="org.apache.maven" name="com.springsource.org.apache.maven.plugin-api" rev="${org.apache.maven}" conf="compile->runtime"/>
</dependencies>
</ivy-module>
diff --git a/org.eclipse.virgo.bundlor.maven/template.mf b/org.eclipse.virgo.bundlor.maven/template.mf
index 5d00030..a8b482a 100644
--- a/org.eclipse.virgo.bundlor.maven/template.mf
+++ b/org.eclipse.virgo.bundlor.maven/template.mf
@@ -3,11 +3,8 @@
Bundle-Vendor: SpringSource Inc.
Bundle-SymbolicName: org.eclipse.virgo.bundlor.maven
Bundle-Version: 0
-Import-Template:
- org.eclipse.virgo.bundlor.*;version="[1.0.0, 1.0.1)",
- org.eclipse.virgo.util.*;version="[2.0.0, 3.0.0)",
- org.apache.maven.*;version="[2.0.0, 3.0.0)"
Excluded-Exports:
- *.internal.*
-Excluded-Imports: org.codehaus.plexus.*
+ *
+Excluded-Imports:
+ *
diff --git a/org.eclipse.virgo.bundlor/.settings/com.springsource.server.ide.bundlor.core.prefs b/org.eclipse.virgo.bundlor/.settings/org.eclipse.virgo.ide.bundlor.core.prefs
similarity index 100%
rename from org.eclipse.virgo.bundlor/.settings/com.springsource.server.ide.bundlor.core.prefs
rename to org.eclipse.virgo.bundlor/.settings/org.eclipse.virgo.ide.bundlor.core.prefs
diff --git a/org.eclipse.virgo.bundlor/.settings/org.eclipse.wst.common.project.facet.core.xml b/org.eclipse.virgo.bundlor/.settings/org.eclipse.wst.common.project.facet.core.xml
index 801f856..92aa290 100644
--- a/org.eclipse.virgo.bundlor/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ b/org.eclipse.virgo.bundlor/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<faceted-project>
- <installed facet="com.springsource.server.bundle" version="1.0"/>
+ <installed facet="org.eclipse.virgo.server.bundle" version="1.0"/>
</faceted-project>
diff --git a/virgo-build b/virgo-build
index b640ab8..7e8fcd4 160000
--- a/virgo-build
+++ b/virgo-build
@@ -1 +1 @@
-Subproject commit b640ab8b07e3a56d8878ceb2e3be4b2aacb34f06
+Subproject commit 7e8fcd4ee6802abdc326a9f48d17da0110ffcdb5
