oracle · sid-srini · Sep 19, 2024
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,6 @@
 build/
 netbeans/
+netbeans-l10n/
 .DS_STORE
 .idea/
+*.iml
diff --git a/build.xml b/build.xml
@@ -33,7 +33,8 @@
     <property name="nb_all" location="netbeans" />
     <loadresource property="patch-files-l10n">
         <string>
-            patches/l10n/adding-ja-and-zh_CN.diff
+            patches/l10n/filter-enabled-clusters-disabled-modules-code-cleanup.diff
+            patches/l10n/adding-java.lsp.server-ja-and-zh_CN.diff
         </string>
         <filterchain>
             <tokenfilter delimoutput=" ">
@@ -58,7 +59,7 @@
             patches/rename-debugger.diff
             patches/remove-db.diff
             patches/nbjavac-not-required.diff
-            patches/l10n-liscence.diff
+            patches/l10n-licence.diff
         </string>
         <filterchain>
             <tokenfilter delimoutput=" ">
@@ -129,27 +130,36 @@
     </target>
 
     <property name="netbeans.l10n.dir" location="netbeans-l10n"/>
-    <property name="javavscode.nbuild.nb.dir" location="netbeans/nbbuild/netbeans"/>
-    <property name="javavscode.nbcode.extra.dir" location="vscode/nbcode/extra"/>
+    <property name="nbcode.l10n.dir" location="nbcode/l10n"/>
+    <property name="vscode.nbcode.extra.dir" location="vscode/nbcode/extra"/>
 
-    <target name="build-l10n-ant-text-jar">
+    <target name="build-l10n-ant-ext-jar">
         <ant dir="${netbeans.l10n.dir}/l10nantext" inheritall="false" inheritrefs="false">
             <property name="file.reference.ant.jar" value="${ant.home}/lib/ant.jar"/>
         </ant>
     </target>
 
     <target name="build-l10n">
-        <ant dir="${netbeans.l10n.dir}/locale_${locale}" target="build" inheritall="false" inheritrefs="false">
-            <property name="nbplatform.default.harness.dir" location="${javavscode.nbuild.nb.dir}/harness"/>
-            <property name="nbplatform.default.netbeans.dest.dir" location="${javavscode.nbuild.nb.dir}"/>
+        <ant dir="${nbcode.l10n.dir}/locale_${locale}" target="build" inheritall="false" inheritrefs="false">
+            <property name="nbplatform.default.harness.dir" location="${nbplatform.default.harness.dir}"/>
+            <property name="nbplatform.default.netbeans.dest.dir" location="${nbplatform.default.netbeans.dest.dir}"/>
+            <property name="netbeans.l10n.dir" location="${netbeans.l10n.dir}"/>
+            <property name="nbantext.jar" location="${nbantext.jar}"/>
         </ant>
-        <copy todir="${javavscode.nbcode.extra.dir}">
-            <fileset dir="${netbeans.l10n.dir}/locale_${locale}/build/cluster"/>
+        <copy todir="${vscode.nbcode.extra.dir}">
+            <fileset dir="${nbcode.l10n.dir}/locale_${locale}/build/cluster"/>
         </copy>
     </target>
     <target name="clean-l10n">
-        <delete dir="${netbeans.l10n.dir}/locale_${locale}/build"/>
-        <delete dir="${netbeans.l10n.dir}/locale_${locale}/release"/>
+        <delete dir="${nbcode.l10n.dir}/locale_${locale}/build" includeemptydirs="true" quiet="true"/>
+        <delete dir="${nbcode.l10n.dir}/locale_${locale}/release" includeemptydirs="true" quiet="true"/>
+        <delete includeemptydirs="true" quiet="true">
+            <fileset dir="${vscode.nbcode.extra.dir}">
+                <include name="**/*${locale}.jar"/>
+                <include name="**/*${locale}.xml"/>
+                <include name="**/*${locale}.html"/>
+            </fileset>
+        </delete>
     </target>
     <target name="clean-l10n-bundles">
         <delete dir="${netbeans.l10n.dir}/l10nantext/build"/>
@@ -162,11 +172,10 @@
         </ant>
     </target>
     <target name="no-l10n">
-        <property name="javavscode.disablel0n" value="true"/>
+        <property name="disable.netbeans.l10n" value="true"/>
     </target>
-    <target name="build-l10n-bundles" depends="clean-l10n-bundles,build-l10n-ant-text-jar" description="builds l10n language bundles for vs code extension"
-    unless="${javavscode.disablel0n}"
-    >
+    <target name="build-l10n-bundles" depends="clean-l10n-bundles,build-l10n-ant-ext-jar" description="builds l10n language bundles for vs code extension"
+            unless="${disable.netbeans.l10n}">
         <ant target="build-l10n">
             <property name="locale" value="ja" description="japanese"/>
         </ant>
@@ -221,10 +230,10 @@
             <arg value="--save" />
             <arg value="@vscode/[email protected]" />
         </exec>
-	
-	<copy file="${basedir}/LICENSE.txt" todir="${basedir}/vscode" />
-	<copy file="${basedir}/THIRD_PARTY_LICENSES.txt" todir="${basedir}/vscode" />
-	
+        
+        <copy file="${basedir}/LICENSE.txt" todir="${basedir}/vscode" />
+        <copy file="${basedir}/THIRD_PARTY_LICENSES.txt" todir="${basedir}/vscode" />
+        
         <exec executable="${build.dir}/vsce/node_modules/.bin/vsce${cmd.suffix}" failonerror="true" dir="${basedir}/vscode">
             <arg value="package" />
             <arg line="${vsce.extra.args}" />
@@ -234,9 +243,9 @@
             <arg value="https://github.com/oracle/javavscode/raw/${metabuild.hash}/vscode" />
             <arg value="--out" />
             <arg value="${build.dir}/oracle-java-${vsix.version}.vsix" />
-    </exec>
-	<delete file="${basedir}/vscode/LICENSE.txt"/>
-	<delete file="${basedir}/vscode/THIRD_PARTY_LICENSES.txt"/>
+        </exec>
+        <delete file="${basedir}/vscode/LICENSE.txt"/>
+        <delete file="${basedir}/vscode/THIRD_PARTY_LICENSES.txt"/>
     </target>
     <target name="test-lsp-server" description="Tests the LSP server behavior">
         <ant dir="nbcode" target="test" inheritall="false" inheritrefs="false">
@@ -290,7 +299,7 @@
         <condition value="true" property="should-apply">
             <and>
                 <istrue value="${has-l10n-patches}"/>
-                <isfalse value="${javavscode.disablel0n}"/>
+                <isfalse value="${disable.netbeans.l10n}"/>
             </and>
         </condition>
         <ant target="git-patch">
@@ -308,11 +317,11 @@
             import java.util.List;
             import java.util.stream.Collectors;
             public class Reverse {
-            public static void main(String[] args) {
-            List&lt;String> patches = Arrays.asList(args[0].split(" "));
-            Collections.reverse(patches);
-            System.out.print(patches.stream().collect(Collectors.joining(" ")));
-            }
+                public static void main(String[] args) {
+                    List&lt;String> patches = Arrays.asList(args[0].split(" "));
+                    Collections.reverse(patches);
+                    System.out.print(patches.stream().collect(Collectors.joining(" ")));
+                }
             }
         </echo>
         <java sourcefile="${build.dir}/Reverse.java"
@@ -339,7 +348,7 @@
         <condition value="true" property="should-apply">
             <and>
                 <istrue value="${has-l10n-patches}"/>
-                <isfalse value="${javavscode.disablel0n}"/>
+                <isfalse value="${disable.netbeans.l10n}"/>
             </and>
         </condition>
         <ant target="git-un-patch">

diff --git a/nbcode/l10n/locale_ja/build.xml b/nbcode/l10n/locale_ja/build.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
+<project name="org.apache.netbeans.l10n.ja" default="netbeans" basedir=".">
+    <description>Builds, tests, and runs the project org.apache.netbeans.l10n.ja.</description>
+    <property name="nbplatform.active" value="default"/>
+    <property name="netbeans.l10n.dir" location="${nbplatform.default.netbeans.dest.dir}/../../../netbeans-l10n"/>
+    <property file="../../nbproject/platform.properties"/>
+    <property name="src.dir" location="src"/>
+    <import file="nbproject/build-impl.xml"/>
+
+    <target name="build" depends="build-language-jars,projectized-common.build"/>
+
+    <target name="build-language-jars">
+        <property name="locale" value="ja"/>
+        <property name="dist.dir" location="${netbeans.l10n.dir}/netbeans-l10n-zip/src/${locale}"/>
+        <property name="nbms.dist.dir" location="nbms"/>
+        <property name="nbms.dir" location="${netbeans.l10n.dir}/nbbuild/${nbms.dist.dir}"/>
+        <property name="keystore" location=""/>
+        <property name="storepass" value=""/>
+        <property name="nbm_alias" value="nb_ide"/>
+
+        <taskdef name="packageBuild" classname="org.netbeans.l10n.Package">
+            <classpath>
+                <pathelement path="${netbeans.l10n.dir}/l10nantext/dist/l10nantext.jar"/>
+            </classpath>
+        </taskdef>
+        <packageBuild src="${dist.dir}" locales="${locale}" dist="release/modules/locale" nbms="${nbms.dir}" nbmsDist="${nbms.dist.dir}"
+                      enabledClusterPath="${cluster.path}" disabledModules="${disabled.modules}"
+                      keystore="${keystore}" storepass="${storepass}" alias="${nbm_alias}">
+            <classpath>
+                <pathelement location="${nbantext.jar}"/>
+                <fileset dir="${main.dir}">
+                    <include name="apisupport.harness/external/jsearch*.jar"/>
+                </fileset>
+                <fileset dir="${nbplatform.default.netbeans.dest.dir}">
+                    <include name="harness/jsearch*.jar"/>
+                </fileset>
+            </classpath>
+        </packageBuild>
+        <!--<repeat target="copy-docs-for-locale" name="one.locale" values="${locales}"/>-->
+    </target>
+
+</project>
diff --git a/nbcode/l10n/locale_ja/manifest.mf b/nbcode/l10n/locale_ja/manifest.mf
@@ -0,0 +1,6 @@
+Manifest-Version: 1.0
+AutoUpdate-Show-In-Client: true
+OpenIDE-Module: org.apache.netbeans.l10n.ja
+OpenIDE-Module-Localizing-Bundle: org/apache/netbeans/l10n/ja/Bundle.properties
+OpenIDE-Module-Specification-Version: 0.0.1
+
diff --git a/nbcode/l10n/locale_ja/nbproject/build-impl.xml b/nbcode/l10n/locale_ja/nbproject/build-impl.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+*** GENERATED FROM project.xml - DO NOT EDIT  ***
+***         EDIT ../build.xml INSTEAD         ***
+-->
+<project name="org.apache.netbeans.l10n.ja-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/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>
diff --git a/nbcode/l10n/locale_ja/nbproject/platform.properties b/nbcode/l10n/locale_ja/nbproject/platform.properties
@@ -0,0 +1,17 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+nbplatform.active=default
diff --git a/nbcode/l10n/locale_ja/nbproject/project.properties b/nbcode/l10n/locale_ja/nbproject/project.properties
@@ -0,0 +1,18 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+javac.source=1.8
+javac.compilerargs=-Xlint -Xlint:-serial
diff --git a/nbcode/l10n/locale_ja/nbproject/project.xml b/nbcode/l10n/locale_ja/nbproject/project.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
+<project 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.apache.netbeans.l10n.ja</code-name-base>
+            <standalone/>
+            <module-dependencies/>
+            <public-packages/>
+        </data>
+    </configuration>
+</project>
diff --git a/nbcode/l10n/locale_zh_CN/build.xml b/nbcode/l10n/locale_zh_CN/build.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
+<project name="org.apache.netbeans.l10n.zh_CN" default="netbeans" basedir=".">
+    <description>Builds, tests, and runs the project org.apache.netbeans.l10n.zh_CN.</description>
+    <property name="nbplatform.active" value="default"/>
+    <property name="netbeans.l10n.dir" location="${nbplatform.default.netbeans.dest.dir}/../../../netbeans-l10n"/>
+    <property file="../../nbproject/platform.properties"/>
+    <property name="src.dir" location="src"/>
+    <import file="nbproject/build-impl.xml"/>
+
+    <target name="build" depends="build-language-jars,projectized-common.build"/>
+
+    <target name="build-language-jars">
+        <property name="locale" value="zh_CN"/>
+        <property name="dist.dir" location="${netbeans.l10n.dir}/netbeans-l10n-zip/src/${locale}"/>
+        <property name="nbms.dist.dir" location="nbms"/>
+        <property name="nbms.dir" location="${netbeans.l10n.dir}/nbbuild/${nbms.dist.dir}"/>
+        <property name="keystore" location=""/>
+        <property name="storepass" value=""/>
+        <property name="nbm_alias" value="nb_ide"/>
+
+        <taskdef name="packageBuild" classname="org.netbeans.l10n.Package">
+            <classpath>
+                <pathelement path="${netbeans.l10n.dir}/l10nantext/dist/l10nantext.jar"/>
+            </classpath>
+        </taskdef>
+        <packageBuild src="${dist.dir}" locales="${locale}" dist="release/modules/locale" nbms="${nbms.dir}" nbmsDist="${nbms.dist.dir}"
+                      enabledClusterPath="${cluster.path}" disabledModules="${disabled.modules}"
+                      keystore="${keystore}" storepass="${storepass}" alias="${nbm_alias}">
+            <classpath>
+                <pathelement location="${nbantext.jar}"/>
+                <fileset dir="${main.dir}">
+                    <include name="apisupport.harness/external/jsearch*.jar"/>
+                </fileset>
+                <fileset dir="${nbplatform.default.netbeans.dest.dir}">
+                    <include name="harness/jsearch*.jar"/>
+                </fileset>
+            </classpath>
+        </packageBuild>
+        <!--<repeat target="copy-docs-for-locale" name="one.locale" values="${locales}"/>-->
+    </target>
+
+</project>