Removed unnecessary items from the module layer.
Only XML profiles remain on the module layer.
This is a fix of issue #51684.
1.1 --- a/vcs.profiles.clearcase/build.xml Wed Jan 26 16:14:29 2005 +0000
1.2 +++ b/vcs.profiles.clearcase/build.xml Wed Jan 26 16:50:31 2005 +0000
1.3 @@ -54,36 +54,22 @@
1.4
1.5 <target name="jars" depends="compile">
1.6 <makelayer topdir="src" destfile="src/org/netbeans/modules/vcs/profiles/clearcase/layer-includes-config.xml" absolutepath="true">
1.7 - <include name="org/netbeans/modules/vcs/profiles/clearcase/config/*.*"/>
1.8 - <exclude name="org/netbeans/modules/vcs/profiles/clearcase/config/*_ja.*"/>
1.9 - <exclude name="org/netbeans/modules/vcs/profiles/clearcase/config/*_XX.*"/>
1.10 - <exclude name="org/netbeans/modules/vcs/profiles/clearcase/config/.nbattrs"/>
1.11 - <exclude name="org/netbeans/modules/vcs/profiles/clearcase/config/Bundle.properties"/>
1.12 - <exclude name="org/netbeans/modules/vcs/profiles/clearcase/config/Bundle_*.properties"/>
1.13 - </makelayer>
1.14 - <makelayer topdir="src" destfile="src/org/netbeans/modules/vcs/profiles/clearcase/layer-includes-configRB.xml" absolutepath="true">
1.15 - <include name="org/netbeans/modules/vcs/profiles/clearcase/config/Bundle.properties"/>
1.16 - <include name="org/netbeans/modules/vcs/profiles/clearcase/config/Bundle_*.properties"/>
1.17 - </makelayer>
1.18 - <makelayer topdir="src" destfile="src/org/netbeans/modules/vcs/profiles/clearcase/layer-includes-list.xml" absolutepath="true">
1.19 - <include name="org/netbeans/modules/vcs/profiles/clearcase/list/*.class"/>
1.20 - <include name="org/netbeans/modules/vcs/profiles/clearcase/list/*.properties"/>
1.21 + <include name="org/netbeans/modules/vcs/profiles/clearcase/config/*.xml"/>
1.22 </makelayer>
1.23 <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}"/>
1.24 <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
1.25 <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
1.26 - <locjar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}/clearcase-profile.jar"
1.27 + <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}/clearcase-profile.jar"
1.28 manifest="manifest-subst.mf"
1.29 basedir="src"
1.30 excludesfile="${nbroot1}/nbbuild/standard-jar-excludes.txt"
1.31 excludes="org/netbeans/modules/vcs/profiles/clearcase/mf-layer_XX.xml"
1.32 - compress="${build.package.compress}" index="${build.package.index}">
1.33 - <locale name="ja"/>
1.34 + compress="${build.package.compress}">
1.35 <fileset dir="src/" excludesfile="${nbroot1}/nbbuild/standard-jar-excludes.txt">
1.36 <include name="**/*"/>
1.37 <exclude name="org/netbeans/modules/vcs/profiles/clearcase/config/*_XX.*"/>
1.38 </fileset>
1.39 - </locjar>
1.40 + </jar>
1.41 <createmodulexml xmldir="${netbeans.dest.dir}/${cluster.dir}/${nb.system.dir}/Modules">
1.42 <enabled dir="${netbeans.dest.dir}/${cluster.dir}">
1.43 <include name="${nb.modules.dir}/clearcase-profile.jar"/>
2.1 --- a/vcs.profiles.clearcase/src/org/netbeans/modules/vcs/profiles/clearcase/mf-layer.xml Wed Jan 26 16:14:29 2005 +0000
2.2 +++ b/vcs.profiles.clearcase/src/org/netbeans/modules/vcs/profiles/clearcase/mf-layer.xml Wed Jan 26 16:50:31 2005 +0000
2.3 @@ -8,30 +8,14 @@
2.4 http://www.sun.com/
2.5
2.6 The Original Code is NetBeans. The Initial Developer of the Original
2.7 -Code is Sun Microsystems, Inc. Portions Copyright 1997-2001 Sun
2.8 +Code is Sun Microsystems, Inc. Portions Copyright 1997-2005 Sun
2.9 Microsystems, Inc. All Rights Reserved.
2.10 -->
2.11
2.12 <!DOCTYPE filesystem PUBLIC "-//NetBeans//DTD Filesystem 1.0//EN" "http://www.netbeans.org/dtds/filesystem-1_0.dtd" [
2.13 <!ENTITY includefiles_config SYSTEM "layer-includes-config.xml">
2.14 - <!ENTITY includefiles_list SYSTEM "layer-includes-list.xml">
2.15 ]>
2.16 <filesystem>
2.17 - <folder name="org">
2.18 - <folder name="netbeans">
2.19 - <folder name="modules">
2.20 - <folder name="vcs">
2.21 - <folder name="profiles">
2.22 - <folder name="clearcase">
2.23 - <folder name="list">
2.24 - &includefiles_list;
2.25 - </folder>
2.26 - </folder>
2.27 - </folder>
2.28 - </folder>
2.29 - </folder>
2.30 - </folder>
2.31 - </folder>
2.32 <folder name="vcs">
2.33 <folder name="config">
2.34 &includefiles_config;
3.1 --- a/vcs.profiles.starteam/build.xml Wed Jan 26 16:14:29 2005 +0000
3.2 +++ b/vcs.profiles.starteam/build.xml Wed Jan 26 16:50:31 2005 +0000
3.3 @@ -52,46 +52,23 @@
3.4 </target>
3.5
3.6 <target name="jars" depends="compile">
3.7 - <!--
3.8 - <makelayer topdir="src" destfile="src/org/netbeans/modules/vcs/profiles/starteam/layer-includes-commands.xml" absolutepath="true">
3.9 - <include name="org/netbeans/modules/vcs/profiles/starteam/commands/*.class"/>
3.10 - <include name="org/netbeans/modules/vcs/profiles/starteam/commands/*.properties"/>
3.11 - </makelayer>
3.12 - -->
3.13 <makelayer topdir="src" destfile="src/org/netbeans/modules/vcs/profiles/starteam/layer-includes-config.xml" absolutepath="true">
3.14 - <include name="org/netbeans/modules/vcs/profiles/starteam/config/*.*"/>
3.15 - <exclude name="org/netbeans/modules/vcs/profiles/starteam/config/*_ja.*"/>
3.16 - <exclude name="org/netbeans/modules/vcs/profiles/starteam/config/*_XX.*"/>
3.17 - <exclude name="org/netbeans/modules/vcs/profiles/starteam/config/Bundle.properties"/>
3.18 - <exclude name="org/netbeans/modules/vcs/profiles/starteam/config/Bundle_*.properties"/>
3.19 - </makelayer>
3.20 - <makelayer topdir="src" destfile="src/org/netbeans/modules/vcs/profiles/starteam/layer-includes-configRB.xml" absolutepath="true">
3.21 - <include name="org/netbeans/modules/vcs/profiles/starteam/config/Bundle.properties"/>
3.22 - <include name="org/netbeans/modules/vcs/profiles/starteam/config/Bundle_*.properties"/>
3.23 - </makelayer>
3.24 - <makelayer topdir="src" destfile="src/org/netbeans/modules/vcs/profiles/starteam/layer-includes-config_ja.xml" absolutepath="true">
3.25 - <include name="org/netbeans/modules/vcs/profiles/starteam/config/*_ja.*"/>
3.26 - <exclude name="org/netbeans/modules/vcs/profiles/starteam/config/Bundle_ja.properties"/>
3.27 - </makelayer>
3.28 - <makelayer topdir="src" destfile="src/org/netbeans/modules/vcs/profiles/starteam/layer-includes-list.xml" absolutepath="true">
3.29 - <include name="org/netbeans/modules/vcs/profiles/starteam/list/*.class"/>
3.30 - <include name="org/netbeans/modules/vcs/profiles/starteam/list/*.properties"/>
3.31 + <include name="org/netbeans/modules/vcs/profiles/starteam/config/*.xml"/>
3.32 </makelayer>
3.33 <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}"/>
3.34 <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
3.35 <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
3.36 - <locjar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}/starteam-profile.jar"
3.37 + <jar jarfile="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}/starteam-profile.jar"
3.38 manifest="manifest-subst.mf"
3.39 basedir="src"
3.40 excludesfile="${nbroot}/nbbuild/standard-jar-excludes.txt"
3.41 excludes="org/netbeans/modules/vcs/profiles/starteam/mf-layer_XX.xml"
3.42 - compress="${build.package.compress}" index="${build.package.index}">
3.43 - <locale name="ja"/>
3.44 + compress="${build.package.compress}">
3.45 <fileset dir="src/" excludesfile="${nbroot}/nbbuild/standard-jar-excludes.txt">
3.46 <include name="**/*"/>
3.47 <exclude name="org/netbeans/modules/vcs/profiles/starteam/config/*_XX.*"/>
3.48 </fileset>
3.49 - </locjar>
3.50 + </jar>
3.51 <createmodulexml xmldir="${netbeans.dest.dir}/${cluster.dir}/${nb.system.dir}/Modules">
3.52 <enabled dir="${netbeans.dest.dir}/${cluster.dir}">
3.53 <include name="${nb.modules.dir}/starteam-profile.jar"/>
4.1 --- a/vcs.profiles.starteam/manifest.mf Wed Jan 26 16:14:29 2005 +0000
4.2 +++ b/vcs.profiles.starteam/manifest.mf Wed Jan 26 16:50:31 2005 +0000
4.3 @@ -3,7 +3,7 @@
4.4 OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/vcs/profiles/starteam/Bundle.properties
4.5 OpenIDE-Module-Specification-Version: 1.2
4.6 OpenIDE-Module-Implementation-Version: @BUILD_NUMBER_SUBST@
4.7 -OpenIDE-Module-IDE-Dependencies: IDE/1 > 1.24
4.8 +OpenIDE-Module-IDE-Dependencies: IDE/1 > 3.18
4.9 OpenIDE-Module-Module-Dependencies:
4.10 org.netbeans.modules.vcscore/1,
4.11 org.netbeans.modules.vcs.advanced/1
5.1 --- a/vcs.profiles.starteam/src/org/netbeans/modules/vcs/profiles/starteam/mf-layer.xml Wed Jan 26 16:14:29 2005 +0000
5.2 +++ b/vcs.profiles.starteam/src/org/netbeans/modules/vcs/profiles/starteam/mf-layer.xml Wed Jan 26 16:50:31 2005 +0000
5.3 @@ -14,28 +14,8 @@
5.4
5.5 <!DOCTYPE filesystem PUBLIC "-//NetBeans//DTD Filesystem 1.0//EN" "http://www.netbeans.org/dtds/filesystem-1_0.dtd" [
5.6 <!ENTITY includefiles_config SYSTEM "layer-includes-config.xml">
5.7 - <!ENTITY includefiles_configRB SYSTEM "layer-includes-configRB.xml">
5.8 - <!ENTITY includefiles_list SYSTEM "layer-includes-list.xml">
5.9 ]>
5.10 <filesystem>
5.11 - <folder name="org">
5.12 - <folder name="netbeans">
5.13 - <folder name="modules">
5.14 - <folder name="vcs">
5.15 - <folder name="profiles">
5.16 - <folder name="starteam">
5.17 - <folder name="config">
5.18 - &includefiles_configRB;
5.19 - </folder>
5.20 - <folder name="list">
5.21 - &includefiles_list;
5.22 - </folder>
5.23 - </folder>
5.24 - </folder>
5.25 - </folder>
5.26 - </folder>
5.27 - </folder>
5.28 - </folder>
5.29 <folder name="vcs">
5.30 <folder name="config">
5.31 &includefiles_config;
6.1 --- a/vcs.profiles.subversion/build.xml Wed Jan 26 16:14:29 2005 +0000
6.2 +++ b/vcs.profiles.subversion/build.xml Wed Jan 26 16:50:31 2005 +0000
6.3 @@ -8,7 +8,7 @@
6.4 http://www.sun.com/
6.5
6.6 The Original Code is NetBeans. The Initial Developer of the Original
6.7 -Code is Sun Microsystems, Inc. Portions Copyright 1997-2004 Sun
6.8 +Code is Sun Microsystems, Inc. Portions Copyright 1997-2005 Sun
6.9 Microsystems, Inc. All Rights Reserved.
6.10 -->
6.11
6.12 @@ -43,22 +43,8 @@
6.13 </target>
6.14
6.15 <target name="jars" depends="compile">
6.16 - <!--
6.17 - <makelayer topdir="src" destfile="src/org/netbeans/modules/vcs/profiles/subversion/layer-includes-commands.xml" absolutepath="true">
6.18 - <include name="org/netbeans/modules/vcs/profiles/subversion/commands/*.class"/>
6.19 - <include name="org/netbeans/modules/vcs/profiles/subversion/commands/*.properties"/>
6.20 - </makelayer>
6.21 - -->
6.22 <makelayer topdir="src" destfile="src/org/netbeans/modules/vcs/profiles/subversion/layer-includes-config.xml" absolutepath="true">
6.23 - <include name="org/netbeans/modules/vcs/profiles/subversion/config/*.*"/>
6.24 - <exclude name="org/netbeans/modules/vcs/profiles/subversion/config/Bundle.properties"/>
6.25 - </makelayer>
6.26 - <makelayer topdir="src" destfile="src/org/netbeans/modules/vcs/profiles/subversion/layer-includes-configRB.xml" absolutepath="true">
6.27 - <include name="org/netbeans/modules/vcs/profiles/subversion/config/Bundle.properties"/>
6.28 - </makelayer>
6.29 - <makelayer topdir="src" destfile="src/org/netbeans/modules/vcs/profiles/subversion/layer-includes-list.xml" absolutepath="true">
6.30 - <include name="org/netbeans/modules/vcs/profiles/subversion/list/*.class"/>
6.31 - <include name="org/netbeans/modules/vcs/profiles/subversion/list/*.properties"/>
6.32 + <include name="org/netbeans/modules/vcs/profiles/subversion/config/*.xml"/>
6.33 </makelayer>
6.34 <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}"/>
6.35 <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
7.1 --- a/vcs.profiles.subversion/src/org/netbeans/modules/vcs/profiles/subversion/config/svn.xml Wed Jan 26 16:14:29 2005 +0000
7.2 +++ b/vcs.profiles.subversion/src/org/netbeans/modules/vcs/profiles/subversion/config/svn.xml Wed Jan 26 16:50:31 2005 +0000
7.3 @@ -93,7 +93,7 @@
7.4 <value>""</value>
7.5 </variable>
7.6 <variable name="ICONS_FOR_FILE_STATUSES" basic="false">
7.7 - <value>"vcs/resources/badgeUpToDate.gif", "vcs/resources/badgeLocModified.gif", "vcs/resources/badgeMergeConflict.gif", "vcs/resources/badgeLocRemoved.gif", "vcs/resources/badgeLocModified.gif", "", "vcs/resources/badgeLocModified.gif", "vcs/resources/badgeLocModified.gif", "", "vcs/resources/badgeLocRemoved.gif", ""</value>
7.8 + <value>"org/netbeans/modules/vcs/profiles/resources/badgeUpToDate.gif", "org/netbeans/modules/vcs/profiles/resources/badgeLocModified.gif", "org/netbeans/modules/vcs/profiles/resources/badgeMergeConflict.gif", "org/netbeans/modules/vcs/profiles/resources/badgeLocRemoved.gif", "org/netbeans/modules/vcs/profiles/resources/badgeLocModified.gif", "", "org/netbeans/modules/vcs/profiles/resources/badgeLocModified.gif", "org/netbeans/modules/vcs/profiles/resources/badgeLocModified.gif", "", "org/netbeans/modules/vcs/profiles/resources/badgeLocRemoved.gif", ""</value>
7.9 </variable>
7.10 <variable basic="false" name="LOCAL_FILES_FILTERED_OUT">
7.11 <value xml:space="preserve">.svn</value>
8.1 --- a/vcs.profiles.subversion/src/org/netbeans/modules/vcs/profiles/subversion/mf-layer.xml Wed Jan 26 16:14:29 2005 +0000
8.2 +++ b/vcs.profiles.subversion/src/org/netbeans/modules/vcs/profiles/subversion/mf-layer.xml Wed Jan 26 16:50:31 2005 +0000
8.3 @@ -8,34 +8,14 @@
8.4 http://www.sun.com/
8.5
8.6 The Original Code is NetBeans. The Initial Developer of the Original
8.7 -Code is Sun Microsystems, Inc. Portions Copyright 1997-2003 Sun
8.8 +Code is Sun Microsystems, Inc. Portions Copyright 1997-2005 Sun
8.9 Microsystems, Inc. All Rights Reserved.
8.10 -->
8.11
8.12 <!DOCTYPE filesystem PUBLIC "-//NetBeans//DTD Filesystem 1.0//EN" "http://www.netbeans.org/dtds/filesystem-1_0.dtd" [
8.13 <!ENTITY includefiles_config SYSTEM "layer-includes-config.xml">
8.14 - <!ENTITY includefiles_configRB SYSTEM "layer-includes-configRB.xml">
8.15 - <!ENTITY includefiles_list SYSTEM "layer-includes-list.xml">
8.16 ]>
8.17 <filesystem>
8.18 - <folder name="org">
8.19 - <folder name="netbeans">
8.20 - <folder name="modules">
8.21 - <folder name="vcs">
8.22 - <folder name="profiles">
8.23 - <folder name="subversion">
8.24 - <folder name="config">
8.25 - &includefiles_configRB;
8.26 - </folder>
8.27 - <folder name="list">
8.28 - &includefiles_list;
8.29 - </folder>
8.30 - </folder>
8.31 - </folder>
8.32 - </folder>
8.33 - </folder>
8.34 - </folder>
8.35 - </folder>
8.36 <folder name="vcs">
8.37 <folder name="config">
8.38 &includefiles_config;
9.1 --- a/vcs.profiles.teamware/build.xml Wed Jan 26 16:14:29 2005 +0000
9.2 +++ b/vcs.profiles.teamware/build.xml Wed Jan 26 16:50:31 2005 +0000
9.3 @@ -8,7 +8,7 @@
9.4 http://www.sun.com/
9.5
9.6 The Original Code is NetBeans. The Initial Developer of the Original
9.7 -Code is Sun Microsystems, Inc. Portions Copyright 1997-2004 Sun
9.8 +Code is Sun Microsystems, Inc. Portions Copyright 1997-2005 Sun
9.9 Microsystems, Inc. All Rights Reserved.
9.10 -->
9.11
9.12 @@ -48,15 +48,7 @@
9.13
9.14 <target name="jars" depends="compile">
9.15 <makelayer topdir="src" destfile="src/org/netbeans/modules/vcs/profiles/teamware/layer-includes-config.xml" absolutepath="true">
9.16 - <include name="org/netbeans/modules/vcs/profiles/teamware/config/*.*"/>
9.17 - <exclude name="org/netbeans/modules/vcs/profiles/teamware/config/Bundle.properties"/>
9.18 - </makelayer>
9.19 - <makelayer topdir="src" destfile="src/org/netbeans/modules/vcs/profiles/teamware/layer-includes-configRB.xml" absolutepath="true">
9.20 - <include name="org/netbeans/modules/vcs/profiles/teamware/config/Bundle.properties"/>
9.21 - </makelayer>
9.22 - <makelayer topdir="src" destfile="src/org/netbeans/modules/vcs/profiles/teamware/layer-includes-commands.xml" absolutepath="true">
9.23 - <include name="org/netbeans/modules/vcs/profiles/teamware/commands/*.class"/>
9.24 - <include name="org/netbeans/modules/vcs/profiles/teamware/commands/*.properties"/>
9.25 + <include name="org/netbeans/modules/vcs/profiles/teamware/config/*.xml"/>
9.26 </makelayer>
9.27 <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.modules.dir}"/>
9.28
10.1 --- a/vcs.profiles.teamware/src/org/netbeans/modules/vcs/profiles/teamware/mf-layer.xml Wed Jan 26 16:14:29 2005 +0000
10.2 +++ b/vcs.profiles.teamware/src/org/netbeans/modules/vcs/profiles/teamware/mf-layer.xml Wed Jan 26 16:50:31 2005 +0000
10.3 @@ -8,34 +8,14 @@
10.4 http://www.sun.com/
10.5
10.6 The Original Code is NetBeans. The Initial Developer of the Original
10.7 -Code is Sun Microsystems, Inc. Portions Copyright 1997-2003 Sun
10.8 +Code is Sun Microsystems, Inc. Portions Copyright 1997-2005 Sun
10.9 Microsystems, Inc. All Rights Reserved.
10.10 -->
10.11
10.12 <!DOCTYPE filesystem PUBLIC "-//NetBeans//DTD Filesystem 1.0//EN" "http://www.netbeans.org/dtds/filesystem-1_0.dtd" [
10.13 <!ENTITY includefiles_config SYSTEM "layer-includes-config.xml">
10.14 - <!ENTITY includefiles_configRB SYSTEM "layer-includes-configRB.xml">
10.15 - <!ENTITY includefiles_commands SYSTEM "layer-includes-commands.xml">
10.16 ]>
10.17 <filesystem>
10.18 - <folder name="org">
10.19 - <folder name="netbeans">
10.20 - <folder name="modules">
10.21 - <folder name="vcs">
10.22 - <folder name="profiles">
10.23 - <folder name="teamware">
10.24 - <folder name="config">
10.25 - &includefiles_configRB;
10.26 - </folder>
10.27 - <folder name="commands">
10.28 - &includefiles_commands;
10.29 - </folder>
10.30 - </folder>
10.31 - </folder>
10.32 - </folder>
10.33 - </folder>
10.34 - </folder>
10.35 - </folder>
10.36 <folder name="vcs">
10.37 <folder name="config">
10.38 &includefiles_config;