You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@netbeans.apache.org by ge...@apache.org on 2017/09/20 18:55:23 UTC

[05/13] incubator-netbeans git commit: [NETBEANS-64] Remove NetBeans Platform Samples

http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/b7aa832e/apisupport.osgidemo/nbproject/project.xml
----------------------------------------------------------------------
diff --git a/apisupport.osgidemo/nbproject/project.xml b/apisupport.osgidemo/nbproject/project.xml
deleted file mode 100644
index c68d558..0000000
--- a/apisupport.osgidemo/nbproject/project.xml
+++ /dev/null
@@ -1,175 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2010, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License.  When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
-<project xmlns="http://www.netbeans.org/ns/project/1">
-    <type>org.netbeans.modules.apisupport.project</type>
-    <configuration>
-        <data xmlns="http://www.netbeans.org/ns/nb-module-project/3">
-            <code-name-base>org.netbeans.modules.apisupport.osgidemo</code-name-base>
-            <module-dependencies>
-                <dependency>
-                    <code-name-base>org.netbeans.modules.projectapi</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <release-version>1</release-version>
-                        <specification-version>1.29</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.netbeans.modules.projectuiapi</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <release-version>1</release-version>
-                        <specification-version>1.78</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.openide.awt</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <specification-version>7.20</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.openide.dialogs</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <specification-version>7.14</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.openide.filesystems</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <specification-version>9.0</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.openide.util.lookup</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.openide.util.ui</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <specification-version>9.3</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.openide.util</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <specification-version>9.3</specification-version>
-                    </run-dependency>
-                </dependency>
-            </module-dependencies>
-            <test-dependencies>
-                <test-type>
-                    <name>unit</name>
-                    <test-dependency>
-                        <code-name-base>org.apache.tools.ant.module</code-name-base>
-                        <compile-dependency/>
-                    </test-dependency>
-                    <test-dependency>
-                        <code-name-base>org.netbeans.libs.freemarker</code-name-base>
-                        <recursive/>
-                        <compile-dependency/>
-                    </test-dependency>
-                    <test-dependency>
-                        <code-name-base>org.netbeans.libs.junit4</code-name-base>
-                        <compile-dependency/>
-                    </test-dependency>
-                    <test-dependency>
-                        <code-name-base>org.netbeans.modules.apisupport.ant</code-name-base>
-                        <compile-dependency/>
-                        <test/>
-                    </test-dependency>
-                    <test-dependency>
-                        <code-name-base>org.netbeans.modules.apisupport.osgidemo</code-name-base>
-                        <recursive/>
-                        <compile-dependency/>
-                    </test-dependency>
-                    <test-dependency>
-                        <code-name-base>org.netbeans.modules.apisupport.project</code-name-base>
-                        <recursive/>
-                        <compile-dependency/>
-                        <test/>
-                    </test-dependency>
-                    <test-dependency>
-                        <code-name-base>org.netbeans.modules.masterfs</code-name-base>
-                        <recursive/>
-                        <compile-dependency/>
-                    </test-dependency>
-                    <test-dependency>
-                        <code-name-base>org.netbeans.modules.nbjunit</code-name-base>
-                        <recursive/>
-                        <compile-dependency/>
-                    </test-dependency>
-                    <test-dependency>
-                        <code-name-base>org.netbeans.modules.parsing.nb</code-name-base>
-                    </test-dependency>
-                    <test-dependency>
-                        <code-name-base>org.netbeans.modules.projectapi.nb</code-name-base>
-                    </test-dependency>
-                    <test-dependency>
-                        <code-name-base>org.netbeans.modules.projectui</code-name-base>
-                    </test-dependency>
-                    <test-dependency>
-                        <code-name-base>org.openide.execution</code-name-base>
-                        <compile-dependency/>
-                    </test-dependency>
-                    <test-dependency>
-                        <code-name-base>org.openide.util.lookup</code-name-base>
-                        <test/>
-                    </test-dependency>
-                </test-type>
-            </test-dependencies>
-            <public-packages/>
-        </data>
-    </configuration>
-</project>

http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/b7aa832e/apisupport.osgidemo/osgidemo/branding/core/core.jar/org/netbeans/core/startup/Bundle.properties
----------------------------------------------------------------------
diff --git a/apisupport.osgidemo/osgidemo/branding/core/core.jar/org/netbeans/core/startup/Bundle.properties b/apisupport.osgidemo/osgidemo/branding/core/core.jar/org/netbeans/core/startup/Bundle.properties
deleted file mode 100644
index 3356fc7..0000000
--- a/apisupport.osgidemo/osgidemo/branding/core/core.jar/org/netbeans/core/startup/Bundle.properties
+++ /dev/null
@@ -1,43 +0,0 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright (c) 2010, 2016 Oracle and/or its affiliates. All rights reserved.
-#
-# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-# Other names may be trademarks of their respective owners.
-#
-# The contents of this file are subject to the terms of either the GNU
-# General Public License Version 2 only ("GPL") or the Common
-# Development and Distribution License("CDDL") (collectively, the
-# "License"). You may not use this file except in compliance with the
-# License. You can obtain a copy of the License at
-# http://www.netbeans.org/cddl-gplv2.html
-# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-# specific language governing permissions and limitations under the
-# License.  When distributing the software, include this License Header
-# Notice in each file and include the License file at
-# nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the GPL Version 2 section of the License file that
-# accompanied this code. If applicable, add the following below the
-# License Header, with the fields enclosed by brackets [] replaced by
-# your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-#
-# If you wish your version of this file to be governed by only the CDDL
-# or only the GPL Version 2, indicate your decision by adding
-# "[Contributor] elects to include this software in this distribution
-# under the [CDDL or GPL Version 2] license." If you do not indicate a
-# single choice of license, a recipient has the option to distribute
-# your version of this file under either the CDDL, the GPL Version 2 or
-# to extend the choice of license to its licensees as provided above.
-# However, if you add GPL Version 2 code and therefore, elected the GPL
-# Version 2 license, then the option applies only if the new code is
-# made subject to such option by the copyright holder.
-#
-# Contributor(s):
-currentVersion=OSGi Sample {0}
-LBL_splash_window_title=Starting OSGi Sample
-#NOI18N
-SplashProgressBarBounds=0,267,473,3
-#NOI18N
-SplashRunningTextBounds=14,278,450,12

http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/b7aa832e/apisupport.osgidemo/osgidemo/branding/core/core.jar/org/netbeans/core/startup/splash.gif
----------------------------------------------------------------------
diff --git a/apisupport.osgidemo/osgidemo/branding/core/core.jar/org/netbeans/core/startup/splash.gif b/apisupport.osgidemo/osgidemo/branding/core/core.jar/org/netbeans/core/startup/splash.gif
deleted file mode 100644
index a06db69..0000000
Binary files a/apisupport.osgidemo/osgidemo/branding/core/core.jar/org/netbeans/core/startup/splash.gif and /dev/null differ

http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/b7aa832e/apisupport.osgidemo/osgidemo/branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/view/ui/Bundle.properties
----------------------------------------------------------------------
diff --git a/apisupport.osgidemo/osgidemo/branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/view/ui/Bundle.properties b/apisupport.osgidemo/osgidemo/branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/view/ui/Bundle.properties
deleted file mode 100644
index 6fcb9b2..0000000
--- a/apisupport.osgidemo/osgidemo/branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/view/ui/Bundle.properties
+++ /dev/null
@@ -1,39 +0,0 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright (c) 2010, 2016 Oracle and/or its affiliates. All rights reserved.
-#
-# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-# Other names may be trademarks of their respective owners.
-#
-# The contents of this file are subject to the terms of either the GNU
-# General Public License Version 2 only ("GPL") or the Common
-# Development and Distribution License("CDDL") (collectively, the
-# "License"). You may not use this file except in compliance with the
-# License. You can obtain a copy of the License at
-# http://www.netbeans.org/cddl-gplv2.html
-# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-# specific language governing permissions and limitations under the
-# License.  When distributing the software, include this License Header
-# Notice in each file and include the License file at
-# nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the GPL Version 2 section of the License file that
-# accompanied this code. If applicable, add the following below the
-# License Header, with the fields enclosed by brackets [] replaced by
-# your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-#
-# If you wish your version of this file to be governed by only the CDDL
-# or only the GPL Version 2, indicate your decision by adding
-# "[Contributor] elects to include this software in this distribution
-# under the [CDDL or GPL Version 2] license." If you do not indicate a
-# single choice of license, a recipient has the option to distribute
-# your version of this file under either the CDDL, the GPL Version 2 or
-# to extend the choice of license to its licensees as provided above.
-# However, if you add GPL Version 2 code and therefore, elected the GPL
-# Version 2 license, then the option applies only if the new code is
-# made subject to such option by the copyright holder.
-#
-# Contributor(s):
-CTL_MainWindow_Title=OSGi Sample {0}
-CTL_MainWindow_Title_No_Project=OSGi Sample {0}

http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/b7aa832e/apisupport.osgidemo/osgidemo/build.xml
----------------------------------------------------------------------
diff --git a/apisupport.osgidemo/osgidemo/build.xml b/apisupport.osgidemo/osgidemo/build.xml
deleted file mode 100644
index 4307660..0000000
--- a/apisupport.osgidemo/osgidemo/build.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2010, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License.  When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
-<!-- You may freely edit this file. See harness/README in the NetBeans platform -->
-<!-- for some information on what you could do (e.g. targets to override). -->
-<!-- If you delete this file and reopen the project it will be recreated. -->
-<project name="osgi-suite" basedir=".">
-    <description>Builds the module suite osgi-suite.</description>
-    <import file="nbproject/build-impl.xml"/>
-
-    <target name="-init" depends="-download-netbinox"/>
-
-    <target name="-download-netbinox" depends="suite.-init" if="netbinox.updatecenter.url">
-        <autoupdate todir="netbinox" updatecenter="${netbinox.updatecenter.url}">
-            <modules includes=".*" clusters="netbinox[0-9]*"/>
-        </autoupdate>
-    </target>
-</project>

http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/b7aa832e/apisupport.osgidemo/osgidemo/nbproject/build-impl.xml
----------------------------------------------------------------------
diff --git a/apisupport.osgidemo/osgidemo/nbproject/build-impl.xml b/apisupport.osgidemo/osgidemo/nbproject/build-impl.xml
deleted file mode 100644
index c54d182..0000000
--- a/apisupport.osgidemo/osgidemo/nbproject/build-impl.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-*** GENERATED FROM project.xml - DO NOT EDIT  ***
-***         EDIT ../build.xml INSTEAD         ***
--->
-<project name="osgi-suite-impl" basedir=".." xmlns:sproject="http://www.netbeans.org/ns/nb-module-suite-project/1">
-    <fail message="Please build using Ant 1.7.1 or higher.">
-        <condition>
-            <not>
-                <antversion atleast="1.7.1"/>
-            </not>
-        </condition>
-    </fail>
-    <property file="nbproject/private/platform-private.properties"/>
-    <property file="nbproject/platform.properties"/>
-    <macrodef name="property" uri="http://www.netbeans.org/ns/nb-module-suite-project/1">
-        <attribute name="name"/>
-        <attribute name="value"/>
-        <sequential>
-            <property name="@{name}" value="${@{value}}"/>
-        </sequential>
-    </macrodef>
-    <macrodef name="evalprops" uri="http://www.netbeans.org/ns/nb-module-suite-project/1">
-        <attribute name="property"/>
-        <attribute name="value"/>
-        <sequential>
-            <property name="@{property}" value="@{value}"/>
-        </sequential>
-    </macrodef>
-    <property file="${user.properties.file}"/>
-    <sproject:property name="harness.dir" value="nbplatform.${nbplatform.active}.harness.dir"/>
-    <sproject:property name="nbplatform.active.dir" value="nbplatform.${nbplatform.active}.netbeans.dest.dir"/>
-    <sproject:evalprops property="cluster.path.evaluated" value="${cluster.path}"/>
-    <fail message="Path to 'platform' cluster missing in $${cluster.path} property or using corrupt Netbeans Platform (missing harness).">
-        <condition>
-            <not>
-                <contains string="${cluster.path.evaluated}" substring="platform"/>
-            </not>
-        </condition>
-    </fail>
-    <fail message="Cannot find NetBeans build harness. ${line.separator}Check that nbplatform.${nbplatform.active}.netbeans.dest.dir and nbplatform.${nbplatform.active}.harness.dir are defined. ${line.separator}On a developer machine these are normally defined in ${user.properties.file}=${netbeans.user}/build.properties ${line.separator}but for automated builds you should pass these properties to Ant explicitly.">
-        <condition>
-            <not>
-                <available type="dir" file="${harness.dir}"/>
-            </not>
-        </condition>
-    </fail>
-    <import file="${harness.dir}/suite.xml"/>
-</project>

http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/b7aa832e/apisupport.osgidemo/osgidemo/nbproject/genfiles.properties
----------------------------------------------------------------------
diff --git a/apisupport.osgidemo/osgidemo/nbproject/genfiles.properties b/apisupport.osgidemo/osgidemo/nbproject/genfiles.properties
deleted file mode 100644
index ed826d3..0000000
--- a/apisupport.osgidemo/osgidemo/nbproject/genfiles.properties
+++ /dev/null
@@ -1,11 +0,0 @@
-build.xml.data.CRC32=4e759413
-build.xml.script.CRC32=b432f9be
-build.xml.stylesheet.CRC32=531c622b@1.36
-# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
-# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
-nbproject/build-impl.xml.data.CRC32=4e759413
-nbproject/build-impl.xml.script.CRC32=1e22e482
-nbproject/build-impl.xml.stylesheet.CRC32=56de960a@1.37
-nbproject/platform.xml.data.CRC32=bf1e9eb7
-nbproject/platform.xml.script.CRC32=6dcbd131
-nbproject/platform.xml.stylesheet.CRC32=4e1f53d4@2.67.1

http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/b7aa832e/apisupport.osgidemo/osgidemo/nbproject/platform.properties
----------------------------------------------------------------------
diff --git a/apisupport.osgidemo/osgidemo/nbproject/platform.properties b/apisupport.osgidemo/osgidemo/nbproject/platform.properties
deleted file mode 100644
index b45dc77..0000000
--- a/apisupport.osgidemo/osgidemo/nbproject/platform.properties
+++ /dev/null
@@ -1,68 +0,0 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright (c) 2010, 2016 Oracle and/or its affiliates. All rights reserved.
-#
-# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-# Other names may be trademarks of their respective owners.
-#
-# The contents of this file are subject to the terms of either the GNU
-# General Public License Version 2 only ("GPL") or the Common
-# Development and Distribution License("CDDL") (collectively, the
-# "License"). You may not use this file except in compliance with the
-# License. You can obtain a copy of the License at
-# http://www.netbeans.org/cddl-gplv2.html
-# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-# specific language governing permissions and limitations under the
-# License.  When distributing the software, include this License Header
-# Notice in each file and include the License file at
-# nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the GPL Version 2 section of the License file that
-# accompanied this code. If applicable, add the following below the
-# License Header, with the fields enclosed by brackets [] replaced by
-# your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-#
-# If you wish your version of this file to be governed by only the CDDL
-# or only the GPL Version 2, indicate your decision by adding
-# "[Contributor] elects to include this software in this distribution
-# under the [CDDL or GPL Version 2] license." If you do not indicate a
-# single choice of license, a recipient has the option to distribute
-# your version of this file under either the CDDL, the GPL Version 2 or
-# to extend the choice of license to its licensees as provided above.
-# However, if you add GPL Version 2 code and therefore, elected the GPL
-# Version 2 license, then the option applies only if the new code is
-# made subject to such option by the copyright holder.
-#
-# Contributor(s):
-
-# <#if !netbinox??>
-disabled.modules.extra=org.netbeans.modules.netbinox
-# <#else>
-disabled.modules.extra=org.netbeans.libs.felix
-# </#if>
-
-cluster.path=\
-    ${nbplatform.active.dir}/harness:\
-    ${nbplatform.active.dir}/platform
-disabled.modules=\
-    org.jdesktop.layout,\
-    org.netbeans.api.visual,\
-    org.netbeans.core.execution,\
-    org.netbeans.core.multiview,\
-    org.netbeans.insane,\
-    org.netbeans.libs.felix,\
-    org.netbeans.libs.jsr223,\
-    org.netbeans.modules.autoupdate.cli,\
-    org.netbeans.modules.apisupport.harness,\
-    org.netbeans.modules.autoupdate.services,\
-    org.netbeans.modules.autoupdate.ui,\
-    org.netbeans.modules.core.kit,\
-    org.netbeans.modules.favorites,\
-    org.netbeans.modules.jellytools.platform,\
-    org.netbeans.modules.jemmy,\
-    org.openide.compat,\
-    org.openide.execution,\
-    org.openide.options,\
-    org.openide.util.enumerations
-nbplatform.active=default

http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/b7aa832e/apisupport.osgidemo/osgidemo/nbproject/platform.xml
----------------------------------------------------------------------
diff --git a/apisupport.osgidemo/osgidemo/nbproject/platform.xml b/apisupport.osgidemo/osgidemo/nbproject/platform.xml
deleted file mode 100644
index c425216..0000000
--- a/apisupport.osgidemo/osgidemo/nbproject/platform.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2014, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License.  When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
-<project name="platform" default="download" basedir="..">
-    <condition property="download.required">
-        <and>
-            <not>
-                <available file="${harness.dir}/suite.xml"/>
-            </not>
-            <isset property="bootstrap.url"/>
-            <isset property="autoupdate.catalog.url"/>
-        </and>
-    </condition>
-    <target name="download" if="download.required">
-        <mkdir dir="${harness.dir}"/>
-        <pathconvert pathsep="|" property="download.clusters">
-            <mapper type="flatten"/>
-            <path path="${cluster.path}"/>
-        </pathconvert>
-        <property name="disabled.modules" value=""/>
-        <pathconvert property="module.includes" pathsep="">
-            <mapper type="glob" from="${basedir}${file.separator}*" to="(?!^\Q*\E$)"/>
-            <path>
-                <filelist files="${disabled.modules}" dir="."/>
-            </path>
-        </pathconvert>
-        <echo message="Downloading clusters ${download.clusters}"/>
-        <property name="tasks.jar" location="${java.io.tmpdir}/tasks.jar"/>
-        <get src="${bootstrap.url}" dest="${tasks.jar}" usetimestamp="true" verbose="true"/>
-        <taskdef name="autoupdate" classname="org.netbeans.nbbuild.AutoUpdate" classpath="${tasks.jar}"/>
-        <autoupdate installdir="${nbplatform.active.dir}" updatecenter="${autoupdate.catalog.url}">
-            <modules includes="${module.includes}.*" clusters="${download.clusters}"/>
-            <modules includes="org[.]netbeans[.]modules[.]apisupport[.]harness" clusters="harness"/>
-        </autoupdate>
-    </target>
-</project>

http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/b7aa832e/apisupport.osgidemo/osgidemo/nbproject/project.properties
----------------------------------------------------------------------
diff --git a/apisupport.osgidemo/osgidemo/nbproject/project.properties b/apisupport.osgidemo/osgidemo/nbproject/project.properties
deleted file mode 100644
index 9d551e5..0000000
--- a/apisupport.osgidemo/osgidemo/nbproject/project.properties
+++ /dev/null
@@ -1,51 +0,0 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright (c) 2010, 2016 Oracle and/or its affiliates. All rights reserved.
-#
-# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-# Other names may be trademarks of their respective owners.
-#
-# The contents of this file are subject to the terms of either the GNU
-# General Public License Version 2 only ("GPL") or the Common
-# Development and Distribution License("CDDL") (collectively, the
-# "License"). You may not use this file except in compliance with the
-# License. You can obtain a copy of the License at
-# http://www.netbeans.org/cddl-gplv2.html
-# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-# specific language governing permissions and limitations under the
-# License.  When distributing the software, include this License Header
-# Notice in each file and include the License file at
-# nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the GPL Version 2 section of the License file that
-# accompanied this code. If applicable, add the following below the
-# License Header, with the fields enclosed by brackets [] replaced by
-# your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-#
-# If you wish your version of this file to be governed by only the CDDL
-# or only the GPL Version 2, indicate your decision by adding
-# "[Contributor] elects to include this software in this distribution
-# under the [CDDL or GPL Version 2] license." If you do not indicate a
-# single choice of license, a recipient has the option to distribute
-# your version of this file under either the CDDL, the GPL Version 2 or
-# to extend the choice of license to its licensees as provided above.
-# However, if you add GPL Version 2 code and therefore, elected the GPL
-# Version 2 license, then the option applies only if the new code is
-# made subject to such option by the copyright holder.
-#
-# Contributor(s):
-app.icon=branding/core/core.jar/org/netbeans/core/startup/frame48.gif
-app.name=osgisample
-branding.token=${app.name}
-modules=\
-    ${project.org.netbeans.demo.osgi.showbundles}
-project.org.netbeans.demo.osgi.showbundles=showbundles
-
-# <#if !netbinox??>
-project.license=mit
-app.title=Felix OSGi Sample
-# <#else>
-project.license=mit
-app.title=Netbinox OSGi Sample
-# </#if>

http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/b7aa832e/apisupport.osgidemo/osgidemo/nbproject/project.xml
----------------------------------------------------------------------
diff --git a/apisupport.osgidemo/osgidemo/nbproject/project.xml b/apisupport.osgidemo/osgidemo/nbproject/project.xml
deleted file mode 100644
index fdbcf91..0000000
--- a/apisupport.osgidemo/osgidemo/nbproject/project.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2010, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License.  When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
-<project xmlns="http://www.netbeans.org/ns/project/1">
-    <type>org.netbeans.modules.apisupport.project.suite</type>
-    <configuration>
-        <data xmlns="http://www.netbeans.org/ns/nb-module-suite-project/1">
-            <name>osgi-suite</name>
-        </data>
-    </configuration>
-</project>

http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/b7aa832e/apisupport.osgidemo/osgidemo/showbundles/build.xml
----------------------------------------------------------------------
diff --git a/apisupport.osgidemo/osgidemo/showbundles/build.xml b/apisupport.osgidemo/osgidemo/showbundles/build.xml
deleted file mode 100644
index 2acffde..0000000
--- a/apisupport.osgidemo/osgidemo/showbundles/build.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2010, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License.  When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
-<!-- You may freely edit this file. See harness/README in the NetBeans platform -->
-<!-- for some information on what you could do (e.g. targets to override). -->
-<!-- If you delete this file and reopen the project it will be recreated. -->
-<project name="org.netbeans.demo.osgi.showbundles" default="netbeans" basedir=".">
-    <description>Builds, tests, and runs the project org.netbeans.demo.osgi.showbundles.</description>
-    <import file="nbproject/build-impl.xml"/>
-</project>

http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/b7aa832e/apisupport.osgidemo/osgidemo/showbundles/manifest.mf
----------------------------------------------------------------------
diff --git a/apisupport.osgidemo/osgidemo/showbundles/manifest.mf b/apisupport.osgidemo/osgidemo/showbundles/manifest.mf
deleted file mode 100644
index 67f98d0..0000000
--- a/apisupport.osgidemo/osgidemo/showbundles/manifest.mf
+++ /dev/null
@@ -1,10 +0,0 @@
-Manifest-Version: 1.0
-Bundle-Activator: org.netbeans.demo.osgi.showbundles.Installer
-Bundle-Localization: org/netbeans/demo/osgi/showbundles/Bundle
-Bundle-Name: %OpenIDE-Module-Name
-Bundle-SymbolicName: org.netbeans.demo.osgi.showbundles
-Bundle-Version: 1.0
-Import-Package: org.osgi.framework, javax.swing
-OpenIDE-Module-Layer: org/netbeans/demo/osgi/showbundles/layer.xml
-OpenIDE-Module-Needs: org.netbeans.Netbinox
-

http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/b7aa832e/apisupport.osgidemo/osgidemo/showbundles/nbproject/build-impl.xml
----------------------------------------------------------------------
diff --git a/apisupport.osgidemo/osgidemo/showbundles/nbproject/build-impl.xml b/apisupport.osgidemo/osgidemo/showbundles/nbproject/build-impl.xml
deleted file mode 100644
index d54af52..0000000
--- a/apisupport.osgidemo/osgidemo/showbundles/nbproject/build-impl.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-*** GENERATED FROM project.xml - DO NOT EDIT  ***
-***         EDIT ../build.xml INSTEAD         ***
--->
-<project name="org.netbeans.demo.osgi.showbundles-impl" basedir="..">
-    <fail message="Please build using Ant 1.7.1 or higher.">
-        <condition>
-            <not>
-                <antversion atleast="1.7.1"/>
-            </not>
-        </condition>
-    </fail>
-    <property file="nbproject/private/suite-private.properties"/>
-    <property file="nbproject/suite.properties"/>
-    <fail unless="suite.dir">You must set 'suite.dir' to point to your containing module suite</fail>
-    <property file="${suite.dir}/nbproject/private/platform-private.properties"/>
-    <property file="${suite.dir}/nbproject/platform.properties"/>
-    <macrodef name="property" uri="http://www.netbeans.org/ns/nb-module-project/2">
-        <attribute name="name"/>
-        <attribute name="value"/>
-        <sequential>
-            <property name="@{name}" value="${@{value}}"/>
-        </sequential>
-    </macrodef>
-    <macrodef name="evalprops" uri="http://www.netbeans.org/ns/nb-module-project/2">
-        <attribute name="property"/>
-        <attribute name="value"/>
-        <sequential>
-            <property name="@{property}" value="@{value}"/>
-        </sequential>
-    </macrodef>
-    <property file="${user.properties.file}"/>
-    <nbmproject2:property name="harness.dir" value="nbplatform.${nbplatform.active}.harness.dir" xmlns:nbmproject2="http://www.netbeans.org/ns/nb-module-project/2"/>
-    <nbmproject2:property name="nbplatform.active.dir" value="nbplatform.${nbplatform.active}.netbeans.dest.dir" xmlns:nbmproject2="http://www.netbeans.org/ns/nb-module-project/2"/>
-    <nbmproject2:evalprops property="cluster.path.evaluated" value="${cluster.path}" xmlns:nbmproject2="http://www.netbeans.org/ns/nb-module-project/2"/>
-    <fail message="Path to 'platform' cluster missing in $${cluster.path} property or using corrupt Netbeans Platform (missing harness).">
-        <condition>
-            <not>
-                <contains string="${cluster.path.evaluated}" substring="platform"/>
-            </not>
-        </condition>
-    </fail>
-    <import file="${harness.dir}/build.xml"/>
-</project>

http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/b7aa832e/apisupport.osgidemo/osgidemo/showbundles/nbproject/genfiles.properties
----------------------------------------------------------------------
diff --git a/apisupport.osgidemo/osgidemo/showbundles/nbproject/genfiles.properties b/apisupport.osgidemo/osgidemo/showbundles/nbproject/genfiles.properties
deleted file mode 100644
index 83e57b9..0000000
--- a/apisupport.osgidemo/osgidemo/showbundles/nbproject/genfiles.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-build.xml.data.CRC32=3a4a90c7
-build.xml.script.CRC32=fe55fcc8
-build.xml.stylesheet.CRC32=79c3b980@1.37
-# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
-# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
-nbproject/build-impl.xml.data.CRC32=3a4a90c7
-nbproject/build-impl.xml.script.CRC32=0acebef1
-nbproject/build-impl.xml.stylesheet.CRC32=261c4bef@1.37

http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/b7aa832e/apisupport.osgidemo/osgidemo/showbundles/nbproject/project.properties
----------------------------------------------------------------------
diff --git a/apisupport.osgidemo/osgidemo/showbundles/nbproject/project.properties b/apisupport.osgidemo/osgidemo/showbundles/nbproject/project.properties
deleted file mode 100644
index 0f9d009..0000000
--- a/apisupport.osgidemo/osgidemo/showbundles/nbproject/project.properties
+++ /dev/null
@@ -1,39 +0,0 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright (c) 2010, 2016 Oracle and/or its affiliates. All rights reserved.
-#
-# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-# Other names may be trademarks of their respective owners.
-#
-# The contents of this file are subject to the terms of either the GNU
-# General Public License Version 2 only ("GPL") or the Common
-# Development and Distribution License("CDDL") (collectively, the
-# "License"). You may not use this file except in compliance with the
-# License. You can obtain a copy of the License at
-# http://www.netbeans.org/cddl-gplv2.html
-# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-# specific language governing permissions and limitations under the
-# License.  When distributing the software, include this License Header
-# Notice in each file and include the License file at
-# nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the GPL Version 2 section of the License file that
-# accompanied this code. If applicable, add the following below the
-# License Header, with the fields enclosed by brackets [] replaced by
-# your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-#
-# If you wish your version of this file to be governed by only the CDDL
-# or only the GPL Version 2, indicate your decision by adding
-# "[Contributor] elects to include this software in this distribution
-# under the [CDDL or GPL Version 2] license." If you do not indicate a
-# single choice of license, a recipient has the option to distribute
-# your version of this file under either the CDDL, the GPL Version 2 or
-# to extend the choice of license to its licensees as provided above.
-# However, if you add GPL Version 2 code and therefore, elected the GPL
-# Version 2 license, then the option applies only if the new code is
-# made subject to such option by the copyright holder.
-#
-# Contributor(s):
-javac.source=1.6
-javac.compilerargs=-Xlint -Xlint:-serial

http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/b7aa832e/apisupport.osgidemo/osgidemo/showbundles/nbproject/project.xml
----------------------------------------------------------------------
diff --git a/apisupport.osgidemo/osgidemo/showbundles/nbproject/project.xml b/apisupport.osgidemo/osgidemo/showbundles/nbproject/project.xml
deleted file mode 100644
index 313dce5..0000000
--- a/apisupport.osgidemo/osgidemo/showbundles/nbproject/project.xml
+++ /dev/null
@@ -1,139 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2010, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License.  When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
-<project xmlns="http://www.netbeans.org/ns/project/1">
-    <type>org.netbeans.modules.apisupport.project</type>
-    <configuration>
-        <data xmlns="http://www.netbeans.org/ns/nb-module-project/3">
-            <code-name-base>org.netbeans.demo.osgi.showbundles</code-name-base>
-            <suite-component/>
-            <module-dependencies>
-                <dependency>
-                    <code-name-base>org.netbeans.libs.osgi</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <specification-version>1.0</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.netbeans.modules.settings</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <release-version>1</release-version>
-                        <specification-version>1.25</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.openide.awt</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <specification-version>7.21</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.openide.explorer</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <specification-version>6.26</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.openide.nodes</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <specification-version>7.14</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.openide.util</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <specification-version>9.3</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.openide.util.lookup</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <specification-version>8.1</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.openide.util.ui</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <specification-version>9.3</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.openide.windows</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <specification-version>6.32</specification-version>
-                    </run-dependency>
-                </dependency>
-            </module-dependencies>
-            <test-dependencies>
-                <test-type>
-                    <name>unit</name>
-                    <test-dependency>
-                        <code-name-base>org.netbeans.libs.junit4</code-name-base>
-                        <compile-dependency/>
-                    </test-dependency>
-                    <test-dependency>
-                        <code-name-base>org.netbeans.modules.nbjunit</code-name-base>
-                        <recursive/>
-                        <compile-dependency/>
-                    </test-dependency>
-                </test-type>
-            </test-dependencies>
-            <public-packages/>
-        </data>
-    </configuration>
-</project>

http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/b7aa832e/apisupport.osgidemo/osgidemo/showbundles/nbproject/suite.properties
----------------------------------------------------------------------
diff --git a/apisupport.osgidemo/osgidemo/showbundles/nbproject/suite.properties b/apisupport.osgidemo/osgidemo/showbundles/nbproject/suite.properties
deleted file mode 100644
index 78e330f..0000000
--- a/apisupport.osgidemo/osgidemo/showbundles/nbproject/suite.properties
+++ /dev/null
@@ -1,38 +0,0 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright (c) 2010, 2016 Oracle and/or its affiliates. All rights reserved.
-#
-# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-# Other names may be trademarks of their respective owners.
-#
-# The contents of this file are subject to the terms of either the GNU
-# General Public License Version 2 only ("GPL") or the Common
-# Development and Distribution License("CDDL") (collectively, the
-# "License"). You may not use this file except in compliance with the
-# License. You can obtain a copy of the License at
-# http://www.netbeans.org/cddl-gplv2.html
-# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-# specific language governing permissions and limitations under the
-# License.  When distributing the software, include this License Header
-# Notice in each file and include the License file at
-# nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the GPL Version 2 section of the License file that
-# accompanied this code. If applicable, add the following below the
-# License Header, with the fields enclosed by brackets [] replaced by
-# your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-#
-# If you wish your version of this file to be governed by only the CDDL
-# or only the GPL Version 2, indicate your decision by adding
-# "[Contributor] elects to include this software in this distribution
-# under the [CDDL or GPL Version 2] license." If you do not indicate a
-# single choice of license, a recipient has the option to distribute
-# your version of this file under either the CDDL, the GPL Version 2 or
-# to extend the choice of license to its licensees as provided above.
-# However, if you add GPL Version 2 code and therefore, elected the GPL
-# Version 2 license, then the option applies only if the new code is
-# made subject to such option by the copyright holder.
-#
-# Contributor(s):
-suite.dir=${basedir}/..

http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/b7aa832e/apisupport.osgidemo/osgidemo/showbundles/src/org/netbeans/demo/osgi/showbundles/Bundle.properties
----------------------------------------------------------------------
diff --git a/apisupport.osgidemo/osgidemo/showbundles/src/org/netbeans/demo/osgi/showbundles/Bundle.properties b/apisupport.osgidemo/osgidemo/showbundles/src/org/netbeans/demo/osgi/showbundles/Bundle.properties
deleted file mode 100644
index 22bd96e..0000000
--- a/apisupport.osgidemo/osgidemo/showbundles/src/org/netbeans/demo/osgi/showbundles/Bundle.properties
+++ /dev/null
@@ -1,43 +0,0 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright (c) 2010, 2016 Oracle and/or its affiliates. All rights reserved.
-#
-# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-# Other names may be trademarks of their respective owners.
-#
-# The contents of this file are subject to the terms of either the GNU
-# General Public License Version 2 only ("GPL") or the Common
-# Development and Distribution License("CDDL") (collectively, the
-# "License"). You may not use this file except in compliance with the
-# License. You can obtain a copy of the License at
-# http://www.netbeans.org/cddl-gplv2.html
-# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-# specific language governing permissions and limitations under the
-# License.  When distributing the software, include this License Header
-# Notice in each file and include the License file at
-# nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the GPL Version 2 section of the License file that
-# accompanied this code. If applicable, add the following below the
-# License Header, with the fields enclosed by brackets [] replaced by
-# your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-#
-# If you wish your version of this file to be governed by only the CDDL
-# or only the GPL Version 2, indicate your decision by adding
-# "[Contributor] elects to include this software in this distribution
-# under the [CDDL or GPL Version 2] license." If you do not indicate a
-# single choice of license, a recipient has the option to distribute
-# your version of this file under either the CDDL, the GPL Version 2 or
-# to extend the choice of license to its licensees as provided above.
-# However, if you add GPL Version 2 code and therefore, elected the GPL
-# Version 2 license, then the option applies only if the new code is
-# made subject to such option by the copyright holder.
-#
-# Contributor(s):
-CTL_ShowBundlesAction=ShowBundles
-CTL_ShowBundlesTopComponent=ShowBundles Window
-HINT_ShowBundlesTopComponent=This is a ShowBundles window
-OpenIDE-Module-Name=Show OSGi Bundle List
-
-LAB_AllBundles=All Bundles

http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/b7aa832e/apisupport.osgidemo/osgidemo/showbundles/src/org/netbeans/demo/osgi/showbundles/Installer.java
----------------------------------------------------------------------
diff --git a/apisupport.osgidemo/osgidemo/showbundles/src/org/netbeans/demo/osgi/showbundles/Installer.java b/apisupport.osgidemo/osgidemo/showbundles/src/org/netbeans/demo/osgi/showbundles/Installer.java
deleted file mode 100644
index dfd15bf..0000000
--- a/apisupport.osgidemo/osgidemo/showbundles/src/org/netbeans/demo/osgi/showbundles/Installer.java
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
- *
- * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
- * Other names may be trademarks of their respective owners.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common
- * Development and Distribution License("CDDL") (collectively, the
- * "License"). You may not use this file except in compliance with the
- * License. You can obtain a copy of the License at
- * http://www.netbeans.org/cddl-gplv2.html
- * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
- * specific language governing permissions and limitations under the
- * License.  When distributing the software, include this License Header
- * Notice in each file and include the License file at
- * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the GPL Version 2 section of the License file that
- * accompanied this code. If applicable, add the following below the
- * License Header, with the fields enclosed by brackets [] replaced by
- * your own identifying information:
- * "Portions Copyrighted [year] [name of copyright owner]"
- *
- * Contributor(s):
- *
- * The Original Software is NetBeans. The Initial Developer of the Original
- * Software is Sun Microsystems, Inc. Portions Copyright 1997-2010 Sun
- * Microsystems, Inc. All Rights Reserved.
- *
- * If you wish your version of this file to be governed by only the CDDL
- * or only the GPL Version 2, indicate your decision by adding
- * "[Contributor] elects to include this software in this distribution
- * under the [CDDL or GPL Version 2] license." If you do not indicate a
- * single choice of license, a recipient has the option to distribute
- * your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above.
- * However, if you add GPL Version 2 code and therefore, elected the GPL
- * Version 2 license, then the option applies only if the new code is
- * made subject to such option by the copyright holder.
- */
-package org.netbeans.demo.osgi.showbundles;
-
-import java.awt.Image;
-import org.openide.nodes.BeanNode;
-import org.openide.nodes.Children;
-import org.openide.nodes.Node;
-import org.openide.util.Exceptions;
-import org.openide.util.ImageUtilities;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleActivator;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.BundleEvent;
-import org.osgi.framework.BundleListener;
-
-/**
- * Remembers connection to BundleContext.
- */
-public class Installer implements BundleActivator {
-    private static BundleContext context;
-
-    @Override
-    public void start(BundleContext c) throws Exception {
-        context = c;
-    }
-
-    @Override
-    public void stop(BundleContext c) throws Exception {
-        context = null;
-    }
-
-    public static Children createBundleChildren() {
-        assert context != null;
-        return new BundleChildren();
-    }
-
-    private static final class BundleChildren extends Children.Keys<Bundle>
-    implements BundleListener {
-        @Override
-        protected void addNotify() {
-            context.addBundleListener(this);
-            bundleChanged(null);
-        }
-
-        @Override
-        protected void removeNotify() {
-            context.removeBundleListener(this);
-        }
-
-        @Override
-        protected Node[] createNodes(Bundle t) {
-            try {
-                Node bn = new BeanNode<Bundle>(t) {
-                    @Override
-                    public Image getIcon(int type) {
-                        if (getBean().getLocation().startsWith("netigso:/")) { // NOI18N
-                            return ImageUtilities.loadImage("org/netbeans/demo/osgi/showbundles/module.png");
-                        } else {
-                            return ImageUtilities.loadImage("org/netbeans/demo/osgi/showbundles/bundle.png");
-                        }
-                    }
-
-                    @Override
-                    public Image getOpenedIcon(int type) {
-                        return getIcon(type);
-                    }
-                };
-                bn.setName(t.getSymbolicName());
-                return new Node[]{bn};
-            } catch (Exception ex) {
-                Exceptions.printStackTrace(ex);
-                return null;
-            }
-        }
-
-        @Override
-        public void bundleChanged(BundleEvent be) {
-            setKeys(context.getBundles());
-        }
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/b7aa832e/apisupport.osgidemo/osgidemo/showbundles/src/org/netbeans/demo/osgi/showbundles/ShowBundlesTopComponent.form
----------------------------------------------------------------------
diff --git a/apisupport.osgidemo/osgidemo/showbundles/src/org/netbeans/demo/osgi/showbundles/ShowBundlesTopComponent.form b/apisupport.osgidemo/osgidemo/showbundles/src/org/netbeans/demo/osgi/showbundles/ShowBundlesTopComponent.form
deleted file mode 100644
index 4a3b89f..0000000
--- a/apisupport.osgidemo/osgidemo/showbundles/src/org/netbeans/demo/osgi/showbundles/ShowBundlesTopComponent.form
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-
-<Form version="1.4" maxVersion="1.7" type="org.netbeans.modules.form.forminfo.JPanelFormInfo">
-  <AuxValues>
-    <AuxValue name="FormSettings_autoResourcing" type="java.lang.Integer" value="1"/>
-    <AuxValue name="FormSettings_autoSetComponentName" type="java.lang.Boolean" value="false"/>
-    <AuxValue name="FormSettings_generateFQN" type="java.lang.Boolean" value="true"/>
-    <AuxValue name="FormSettings_generateMnemonicsCode" type="java.lang.Boolean" value="true"/>
-    <AuxValue name="FormSettings_i18nAutoMode" type="java.lang.Boolean" value="true"/>
-    <AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" value="1"/>
-    <AuxValue name="FormSettings_listenerGenerationStyle" type="java.lang.Integer" value="0"/>
-    <AuxValue name="FormSettings_variablesLocal" type="java.lang.Boolean" value="false"/>
-    <AuxValue name="FormSettings_variablesModifier" type="java.lang.Integer" value="2"/>
-  </AuxValues>
-
-  <Layout>
-    <DimensionLayout dim="0">
-      <Group type="103" groupAlignment="0" attributes="0">
-          <Group type="102" alignment="0" attributes="0">
-              <EmptySpace max="-2" attributes="0"/>
-              <Component id="split" pref="1168" max="32767" attributes="0"/>
-              <EmptySpace max="-2" attributes="0"/>
-          </Group>
-      </Group>
-    </DimensionLayout>
-    <DimensionLayout dim="1">
-      <Group type="103" groupAlignment="0" attributes="0">
-          <Group type="102" alignment="0" attributes="0">
-              <EmptySpace min="-2" max="-2" attributes="0"/>
-              <Component id="split" pref="486" max="32767" attributes="0"/>
-              <EmptySpace min="-2" max="-2" attributes="0"/>
-          </Group>
-      </Group>
-    </DimensionLayout>
-  </Layout>
-  <SubComponents>
-    <Container class="javax.swing.JSplitPane" name="split">
-
-      <Layout class="org.netbeans.modules.form.compat2.layouts.support.JSplitPaneSupportLayout"/>
-      <SubComponents>
-        <Component class="org.openide.explorer.view.BeanTreeView" name="tree">
-          <Constraints>
-            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JSplitPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JSplitPaneSupportLayout$JSplitPaneConstraintsDescription">
-              <JSplitPaneConstraints position="left"/>
-            </Constraint>
-          </Constraints>
-        </Component>
-        <Component class="org.openide.explorer.propertysheet.PropertySheetView" name="sheet">
-          <Constraints>
-            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JSplitPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JSplitPaneSupportLayout$JSplitPaneConstraintsDescription">
-              <JSplitPaneConstraints position="right"/>
-            </Constraint>
-          </Constraints>
-        </Component>
-      </SubComponents>
-    </Container>
-  </SubComponents>
-</Form>

http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/b7aa832e/apisupport.osgidemo/osgidemo/showbundles/src/org/netbeans/demo/osgi/showbundles/ShowBundlesTopComponent.java
----------------------------------------------------------------------
diff --git a/apisupport.osgidemo/osgidemo/showbundles/src/org/netbeans/demo/osgi/showbundles/ShowBundlesTopComponent.java b/apisupport.osgidemo/osgidemo/showbundles/src/org/netbeans/demo/osgi/showbundles/ShowBundlesTopComponent.java
deleted file mode 100644
index 489ac2a..0000000
--- a/apisupport.osgidemo/osgidemo/showbundles/src/org/netbeans/demo/osgi/showbundles/ShowBundlesTopComponent.java
+++ /dev/null
@@ -1,192 +0,0 @@
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
- *
- * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
- * Other names may be trademarks of their respective owners.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common
- * Development and Distribution License("CDDL") (collectively, the
- * "License"). You may not use this file except in compliance with the
- * License. You can obtain a copy of the License at
- * http://www.netbeans.org/cddl-gplv2.html
- * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
- * specific language governing permissions and limitations under the
- * License.  When distributing the software, include this License Header
- * Notice in each file and include the License file at
- * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the GPL Version 2 section of the License file that
- * accompanied this code. If applicable, add the following below the
- * License Header, with the fields enclosed by brackets [] replaced by
- * your own identifying information:
- * "Portions Copyrighted [year] [name of copyright owner]"
- *
- * Contributor(s):
- *
- * The Original Software is NetBeans. The Initial Developer of the Original
- * Software is Sun Microsystems, Inc. Portions Copyright 1997-2010 Sun
- * Microsystems, Inc. All Rights Reserved.
- *
- * If you wish your version of this file to be governed by only the CDDL
- * or only the GPL Version 2, indicate your decision by adding
- * "[Contributor] elects to include this software in this distribution
- * under the [CDDL or GPL Version 2] license." If you do not indicate a
- * single choice of license, a recipient has the option to distribute
- * your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above.
- * However, if you add GPL Version 2 code and therefore, elected the GPL
- * Version 2 license, then the option applies only if the new code is
- * made subject to such option by the copyright holder.
- */
-package org.netbeans.demo.osgi.showbundles;
-
-import java.util.logging.Logger;
-import org.openide.util.NbBundle;
-import org.openide.windows.TopComponent;
-import org.openide.windows.WindowManager;
-import org.netbeans.api.settings.ConvertAsProperties;
-import org.openide.explorer.ExplorerManager;
-import org.openide.nodes.AbstractNode;
-import org.openide.util.ImageUtilities;
-
-/**
- * Top component which displays list of bundles.
- */
-@ConvertAsProperties(dtd = "-//NetBeans Demo//Show Bundles//EN",
-autostore = false)
-public final class ShowBundlesTopComponent extends TopComponent
-implements ExplorerManager.Provider {
-    private ExplorerManager em;
-    private static ShowBundlesTopComponent instance;
-    private static final String PREFERRED_ID = "ShowBundlesTopComponent";
-
-    public ShowBundlesTopComponent() {
-        setIcon(ImageUtilities.loadImage("org/netbeans/demo/osgi/showbundles/bundle.png")); // NOI18N
-        AbstractNode root = new AbstractNode(Installer.createBundleChildren());
-        root.setName("bundles"); // NOI18N
-        root.setIconBaseWithExtension("org/netbeans/demo/osgi/showbundles/bundle.png"); // NOI18N
-        root.setDisplayName(NbBundle.getMessage(ShowBundlesTopComponent.class, "LAB_AllBundles"));
-        this.em = new ExplorerManager();
-        em.setRootContext(root);
-        initComponents();
-        setName(NbBundle.getMessage(ShowBundlesTopComponent.class, "LAB_AllBundles"));
-        setToolTipText(NbBundle.getMessage(ShowBundlesTopComponent.class, "HINT_ShowBundlesTopComponent"));
-    }
-
-    /** This method is called from within the constructor to
-     * initialize the form.
-     * WARNING: Do NOT modify this code. The content of this method is
-     * always regenerated by the Form Editor.
-     */
-    // <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents
-    private void initComponents() {
-
-        split = new javax.swing.JSplitPane();
-        tree = new org.openide.explorer.view.BeanTreeView();
-        sheet = new org.openide.explorer.propertysheet.PropertySheetView();
-
-        split.setLeftComponent(tree);
-        split.setRightComponent(sheet);
-
-        javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);
-        this.setLayout(layout);
-        layout.setHorizontalGroup(
-            layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-            .addGroup(layout.createSequentialGroup()
-                .addContainerGap()
-                .addComponent(split, javax.swing.GroupLayout.DEFAULT_SIZE, 1168, Short.MAX_VALUE)
-                .addContainerGap())
-        );
-        layout.setVerticalGroup(
-            layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-            .addGroup(layout.createSequentialGroup()
-                .addContainerGap()
-                .addComponent(split, javax.swing.GroupLayout.DEFAULT_SIZE, 486, Short.MAX_VALUE)
-                .addContainerGap())
-        );
-    }// </editor-fold>//GEN-END:initComponents
-
-    // Variables declaration - do not modify//GEN-BEGIN:variables
-    private org.openide.explorer.propertysheet.PropertySheetView sheet;
-    private javax.swing.JSplitPane split;
-    private org.openide.explorer.view.BeanTreeView tree;
-    // End of variables declaration//GEN-END:variables
-    /**
-     * Gets default instance. Do not use directly: reserved for *.settings files only,
-     * i.e. deserialization routines; otherwise you could get a non-deserialized instance.
-     * To obtain the singleton instance, use {@link #findInstance}.
-     */
-    public static synchronized ShowBundlesTopComponent getDefault() {
-        if (instance == null) {
-            instance = new ShowBundlesTopComponent();
-        }
-        return instance;
-    }
-
-    /**
-     * Obtain the ShowBundlesTopComponent instance. Never call {@link #getDefault} directly!
-     */
-    public static synchronized ShowBundlesTopComponent findInstance() {
-        TopComponent win = WindowManager.getDefault().findTopComponent(PREFERRED_ID);
-        if (win == null) {
-            Logger.getLogger(ShowBundlesTopComponent.class.getName()).warning(
-                    "Cannot find " + PREFERRED_ID + " component. It will not be located properly in the window system.");
-            return getDefault();
-        }
-        if (win instanceof ShowBundlesTopComponent) {
-            return (ShowBundlesTopComponent) win;
-        }
-        Logger.getLogger(ShowBundlesTopComponent.class.getName()).warning(
-                "There seem to be multiple components with the '" + PREFERRED_ID
-                + "' ID. That is a potential source of errors and unexpected behavior.");
-        return getDefault();
-    }
-
-    @Override
-    public int getPersistenceType() {
-        return TopComponent.PERSISTENCE_ALWAYS;
-    }
-
-    @Override
-    public void componentOpened() {
-        // TODO add custom code on component opening
-    }
-
-    @Override
-    public void componentClosed() {
-        // TODO add custom code on component closing
-    }
-
-    void writeProperties(java.util.Properties p) {
-        // better to version settings since initial version as advocated at
-        // http://wiki.apidesign.org/wiki/PropertyFiles
-        p.setProperty("version", "1.0");
-        // TODO store your settings
-    }
-
-    Object readProperties(java.util.Properties p) {
-        if (instance == null) {
-            instance = this;
-        }
-        instance.readPropertiesImpl(p);
-        return instance;
-    }
-
-    private void readPropertiesImpl(java.util.Properties p) {
-        String version = p.getProperty("version");
-        // TODO read your settings according to their version
-    }
-
-    @Override
-    protected String preferredID() {
-        return PREFERRED_ID;
-    }
-
-    @Override
-    public ExplorerManager getExplorerManager() {
-        return em;
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/b7aa832e/apisupport.osgidemo/osgidemo/showbundles/src/org/netbeans/demo/osgi/showbundles/ShowBundlesTopComponentSettings.xml
----------------------------------------------------------------------
diff --git a/apisupport.osgidemo/osgidemo/showbundles/src/org/netbeans/demo/osgi/showbundles/ShowBundlesTopComponentSettings.xml b/apisupport.osgidemo/osgidemo/showbundles/src/org/netbeans/demo/osgi/showbundles/ShowBundlesTopComponentSettings.xml
deleted file mode 100644
index 4bbf0ed..0000000
--- a/apisupport.osgidemo/osgidemo/showbundles/src/org/netbeans/demo/osgi/showbundles/ShowBundlesTopComponentSettings.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2010, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License.  When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
-<!DOCTYPE settings PUBLIC "-//NetBeans//DTD Session settings 1.0//EN" "http://www.netbeans.org/dtds/sessionsettings-1_0.dtd">
-<settings version="1.0">
-    <module name="org.netbeans.demo.osgi.showbundles" spec="1.0"/>
-    <instanceof class="org.openide.windows.TopComponent"/>
-    <instanceof class="org.netbeans.demo.osgi.showbundles.ShowBundlesTopComponent"/>
-    <instance class="org.netbeans.demo.osgi.showbundles.ShowBundlesTopComponent" method="getDefault"/>
-</settings>

http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/b7aa832e/apisupport.osgidemo/osgidemo/showbundles/src/org/netbeans/demo/osgi/showbundles/ShowBundlesTopComponentWstcref.xml
----------------------------------------------------------------------
diff --git a/apisupport.osgidemo/osgidemo/showbundles/src/org/netbeans/demo/osgi/showbundles/ShowBundlesTopComponentWstcref.xml b/apisupport.osgidemo/osgidemo/showbundles/src/org/netbeans/demo/osgi/showbundles/ShowBundlesTopComponentWstcref.xml
deleted file mode 100644
index a60e023..0000000
--- a/apisupport.osgidemo/osgidemo/showbundles/src/org/netbeans/demo/osgi/showbundles/ShowBundlesTopComponentWstcref.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2010, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License.  When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
-<!DOCTYPE tc-ref PUBLIC "-//NetBeans//DTD Top Component in Mode Properties 2.0//EN" "http://www.netbeans.org/dtds/tc-ref2_0.dtd">
-<tc-ref version="2.0" >
-    <module name="org.netbeans.demo.osgi.showbundles" spec="1.0"/>
-    <tc-id id="ShowBundlesTopComponent"/>
-    <state opened="true"/>
-</tc-ref>

http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/b7aa832e/apisupport.osgidemo/osgidemo/showbundles/src/org/netbeans/demo/osgi/showbundles/bundle.png
----------------------------------------------------------------------
diff --git a/apisupport.osgidemo/osgidemo/showbundles/src/org/netbeans/demo/osgi/showbundles/bundle.png b/apisupport.osgidemo/osgidemo/showbundles/src/org/netbeans/demo/osgi/showbundles/bundle.png
deleted file mode 100644
index 02f76f1..0000000
Binary files a/apisupport.osgidemo/osgidemo/showbundles/src/org/netbeans/demo/osgi/showbundles/bundle.png and /dev/null differ

http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/b7aa832e/apisupport.osgidemo/osgidemo/showbundles/src/org/netbeans/demo/osgi/showbundles/layer.xml
----------------------------------------------------------------------
diff --git a/apisupport.osgidemo/osgidemo/showbundles/src/org/netbeans/demo/osgi/showbundles/layer.xml b/apisupport.osgidemo/osgidemo/showbundles/src/org/netbeans/demo/osgi/showbundles/layer.xml
deleted file mode 100644
index 39d3a63..0000000
--- a/apisupport.osgidemo/osgidemo/showbundles/src/org/netbeans/demo/osgi/showbundles/layer.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2010, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License.  When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
-<!DOCTYPE filesystem PUBLIC "-//NetBeans//DTD Filesystem 1.2//EN" "http://www.netbeans.org/dtds/filesystem-1_2.dtd">
-<filesystem>
-    <folder name="Actions">
-        <folder name="Window">
-            <file name="org-netbeans-demo-osgi-showbundles-ShowBundlesAction.instance">
-                <attr name="component" methodvalue="org.netbeans.demo.osgi.showbundles.ShowBundlesTopComponent.findInstance"/>
-                <attr name="displayName" bundlevalue="org.netbeans.demo.osgi.showbundles.Bundle#CTL_ShowBundlesAction"/>
-                <attr name="instanceCreate" methodvalue="org.openide.windows.TopComponent.openAction"/>
-                <attr name="iconBase" stringvalue="org/netbeans/demo/osgi/showbundles/bundle.png"/>
-            </file>
-        </folder>
-    </folder>
-    <folder name="Menu">
-        <folder name="Window">
-            <file name="ShowBundlesAction.shadow">
-                <attr name="originalFile" stringvalue="Actions/Window/org-netbeans-demo-osgi-showbundles-ShowBundlesAction.instance"/>
-                <attr name="position" intvalue="109"/>
-            </file>
-        </folder>
-    </folder>
-    <folder name="Windows2">
-        <folder name="Components">
-            <file name="ShowBundlesTopComponent.settings" url="ShowBundlesTopComponentSettings.xml"/>
-        </folder>
-        <folder name="Modes">
-            <folder name="editor">
-                <file name="ShowBundlesTopComponent.wstcref" url="ShowBundlesTopComponentWstcref.xml"/>
-            </folder>
-        </folder>
-    </folder>
-</filesystem>

http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/b7aa832e/apisupport.osgidemo/osgidemo/showbundles/src/org/netbeans/demo/osgi/showbundles/module.png
----------------------------------------------------------------------
diff --git a/apisupport.osgidemo/osgidemo/showbundles/src/org/netbeans/demo/osgi/showbundles/module.png b/apisupport.osgidemo/osgidemo/showbundles/src/org/netbeans/demo/osgi/showbundles/module.png
deleted file mode 100644
index 3a9cc50..0000000
Binary files a/apisupport.osgidemo/osgidemo/showbundles/src/org/netbeans/demo/osgi/showbundles/module.png and /dev/null differ