Rename SOLAR_JAVA to ENABLE_JAVA and HAVE_FEATURE_JAVA

Change-Id: Ib451bdb3c1c2ca42347abfde44651d5cf5eef4f3

7 files changed, 30 insertions, 30 deletions

diff --git a/scp2/source/extensions/file_extensions.scp b/scp2/source/extensions/file_extensions.scp
index df0f5d2cb316..29ecc21e0b32 100644
--- a/scp2/source/extensions/file_extensions.scp
+++ b/scp2/source/extensions/file_extensions.scp
@@ -224,7 +224,7 @@ End
 
 /* ** Script provider for BeanShell ** */
 
-#if defined SOLAR_JAVA && !defined WITHOUT_SCRIPTING_BEANSHELL
+#if defined ENABLE_JAVA && !defined WITHOUT_SCRIPTING_BEANSHELL
 
 #if !defined SYSTEM_BSH
 STD_JAR_FILE( gid_File_Jar_Bsh, bsh )
@@ -243,7 +243,7 @@ End
 
 /* ** Script provider for JavaScript ** */
 
-#if defined SOLAR_JAVA && !defined WITHOUT_SCRIPTING_JAVASCRIPT
+#if defined ENABLE_JAVA && !defined WITHOUT_SCRIPTING_JAVASCRIPT
 
 STD_JAR_FILE( gid_File_Jar_Js, js )
 
diff --git a/scp2/source/extensions/module_extensions.scp b/scp2/source/extensions/module_extensions.scp
index edff735aecc1..1c7c7c7cd19e 100644
--- a/scp2/source/extensions/module_extensions.scp
+++ b/scp2/source/extensions/module_extensions.scp
@@ -255,7 +255,7 @@ End
 
 /* ** Script provider for BeanShell ** */
 
-#if defined SOLAR_JAVA && !defined WITHOUT_SCRIPTING_BEANSHELL
+#if defined ENABLE_JAVA && !defined WITHOUT_SCRIPTING_BEANSHELL
 
 Module gid_Module_Optional_Extensions_Script_Provider_For_BS
     PackageInfo = "packinfo_extensions.txt";
@@ -274,7 +274,7 @@ End
 
 /* ** Script provider for JavaScript ** */
 
-#if defined SOLAR_JAVA && !defined WITHOUT_SCRIPTING_JAVASCRIPT
+#if defined ENABLE_JAVA && !defined WITHOUT_SCRIPTING_JAVASCRIPT
 
 Module gid_Module_Optional_Extensions_Script_Provider_For_JS
     PackageInfo = "packinfo_extensions.txt";
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index c53de33e7bf8..2e370c5fd6ed 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -26,7 +26,7 @@
  ************************************************************************/
 #include "macros.inc"
 
-#if defined SOLAR_JAVA && defined WNT
+#if defined ENABLE_JAVA && defined WNT
 File gid_File_Lib_Accessbridge
     PACKED_LIB_FILE_BODY;
     Name = "java_uno_accessbridge.dll";
@@ -346,7 +346,7 @@ SPECIAL_LIB_FILE(gid_File_Lib_Mozbootstrap,mozbootstrap)
 
 #endif
 
-#ifdef SOLAR_JAVA
+#ifdef ENABLE_JAVA
 #ifndef MACOSX
 
 File gid_File_Lib_Officebean
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index 8972d34f4f3f..4bb5ea489e90 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -282,7 +282,7 @@ End
 #endif
 
 
-#ifdef SOLAR_JAVA
+#ifdef ENABLE_JAVA
 
 #ifndef MACOSX
 
@@ -298,7 +298,7 @@ End
 #endif
 
 
-#ifdef SOLAR_JAVA
+#ifdef ENABLE_JAVA
 STD_JAR_FILE( gid_File_Jar_Report, report )
 STD_JAR_FILE( gid_File_Jar_Smoketest, smoketest )
 STD_JAR_FILE( gid_File_Jar_Table, table )
@@ -308,18 +308,18 @@ STD_JAR_FILE( gid_File_Jar_Xmerge, xmerge )
 STD_JAR_FILE( gid_File_Jar_Xmergebridge, XMergeBridge )
 #endif
 
-#if defined SOLAR_JAVA && defined WNT
+#if defined ENABLE_JAVA && defined WNT
 STD_JAR_FILE( gid_File_Jar_Accessbridge, java_uno_accessbridge )
 #endif
 
-#ifdef SOLAR_JAVA
+#ifdef ENABLE_JAVA
 #ifndef SYSTEM_HSQLDB
 STD_JAR_FILE( gid_File_Jar_Hsqldb, hsqldb )
 #endif
 STD_JAR_FILE( gid_File_Jar_Hsqldb_Sdbc, sdbc_hsqldb )
 #endif
 
-#ifdef SOLAR_JAVA
+#ifdef ENABLE_JAVA
 File gid_File_Jar_Commonwizards
     TXT_FILE_BODY;
     Name = JARFILENAME(commonwizards);
@@ -328,12 +328,12 @@ File gid_File_Jar_Commonwizards
 End
 #endif
 
-#ifdef SOLAR_JAVA
+#ifdef ENABLE_JAVA
 STD_JAR_FILE( gid_File_Jar_Scriptframework, ScriptFramework )
 STD_JAR_FILE( gid_File_Jar_Scriptproviderforjava, ScriptProviderForJava )
 #endif
 
-#ifdef SOLAR_JAVA
+#ifdef ENABLE_JAVA
 
 File gid_File_Jar_Unoil
     TXT_FILE_BODY;
@@ -526,7 +526,7 @@ File gid_File_Share_Registry_Ctlseqcheck_Xcd
     Name (th) = "ctlseqcheck.xcd";
 End
 
-#ifdef SOLAR_JAVA
+#ifdef ENABLE_JAVA
 File gid_File_Scripts_Java
     Dir = FILELIST_DIR;
     TXT_FILE_BODY;
diff --git a/scp2/source/ooo/shortcut_ooo.scp b/scp2/source/ooo/shortcut_ooo.scp
index 2df138ab3e7d..7a204dfbc8b5 100644
--- a/scp2/source/ooo/shortcut_ooo.scp
+++ b/scp2/source/ooo/shortcut_ooo.scp
@@ -60,7 +60,7 @@ End
 
 #ifdef MACOSX
 
-#ifdef SOLAR_JAVA
+#ifdef ENABLE_JAVA
 
 // auto_ooo_lib_hsqldb defined in gbuild ($(WORKDIR)/AutoInstall/ooo)
 Shortcut gid_Shortcut_Lib_Hsqldb_2
diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp
index 0086d6cef507..0ae8e0a2d2cd 100644
--- a/scp2/source/ooo/ure.scp
+++ b/scp2/source/ooo/ure.scp
@@ -53,7 +53,7 @@ Directory gid_Dir_Ure_Share
 End
 #endif
 
-#if defined SOLAR_JAVA
+#if defined ENABLE_JAVA
 Directory gid_Dir_Ure_Java
     ParentID = SCP2_URE_SHARE_DIR;
     DosName = "java";
@@ -280,7 +280,7 @@ Unixlink gid_Unixlink_File_Dl_Store
     Target = SCP2_URE_DL_VER("store", "3");
 End
 
-#if defined SOLAR_JAVA
+#if defined ENABLE_JAVA
 
 Unixlink gid_Unixlink_File_Dl_Jvmaccess
     BIN_FILE_BODY;
@@ -312,7 +312,7 @@ File gid_File_Dl_Profile_Jvmfwk3rc
 End
 
 
-#if defined SOLAR_JAVA
+#if defined ENABLE_JAVA
 File gid_File_Dl_JrepropertiesClass
     TXT_FILE_BODY;
     Dir = SCP2_URE_DL_DIR;
@@ -322,7 +322,7 @@ File gid_File_Dl_JrepropertiesClass
 End
 #endif
 
-#if defined SOLAR_JAVA && defined MACOSX
+#if defined ENABLE_JAVA && defined MACOSX
 Unixlink gid_Unixlink_Dl_JavaUno
     BIN_FILE_BODY;
     Dir = SCP2_URE_DL_DIR;
@@ -480,7 +480,7 @@ End
 
 #endif
 
-#if defined SOLAR_JAVA
+#if defined ENABLE_JAVA
 File gid_File_Dl_Jpipe
     LIB_FILE_BODY;
     Dir = SCP2_URE_DL_DIR;
@@ -490,7 +490,7 @@ File gid_File_Dl_Jpipe
 End
 #endif
 
-#if defined SOLAR_JAVA && defined WNT
+#if defined ENABLE_JAVA && defined WNT
 File gid_File_Dl_Jpipx
     LIB_FILE_BODY;
     Dir = SCP2_URE_DL_DIR;
@@ -567,7 +567,7 @@ End
 
 // Public JARs:
 
-#if defined SOLAR_JAVA
+#if defined ENABLE_JAVA
 File gid_File_Java_UnoloaderJar
     TXT_FILE_BODY;
     Dir = GID_DIR_URE_JAVA;
@@ -577,7 +577,7 @@ File gid_File_Java_UnoloaderJar
 End
 #endif
 
-#if defined SOLAR_JAVA
+#if defined ENABLE_JAVA
 File gid_File_Java_JuhJar
     TXT_FILE_BODY;
     Dir = GID_DIR_URE_JAVA;
@@ -587,7 +587,7 @@ File gid_File_Java_JuhJar
 End
 #endif
 
-#if defined SOLAR_JAVA
+#if defined ENABLE_JAVA
 File gid_File_Java_JurtJar
     TXT_FILE_BODY;
     Dir = GID_DIR_URE_JAVA;
@@ -597,7 +597,7 @@ File gid_File_Java_JurtJar
 End
 #endif
 
-#if defined SOLAR_JAVA
+#if defined ENABLE_JAVA
 File gid_File_Java_RidlJar
     TXT_FILE_BODY;
     Dir = GID_DIR_URE_JAVA;
@@ -609,7 +609,7 @@ End
 
 // Private JARs:
 
-#if defined SOLAR_JAVA
+#if defined ENABLE_JAVA
 File gid_File_Java_JavaUnoJar
     TXT_FILE_BODY;
     Dir = GID_DIR_URE_JAVA;
@@ -639,7 +639,7 @@ End
 
 // Private Miscellaneous Files:
 
-#if defined SOLAR_JAVA
+#if defined ENABLE_JAVA
 File gid_File_Misc_JavavendorsXml
     TXT_FILE_BODY;
     Dir = GID_DIR_URE_SHARE_MISC;
diff --git a/scp2/source/sdkoo/sdkoo.scp b/scp2/source/sdkoo/sdkoo.scp
index 84fe0de9fa6c..83be8fee1605 100644
--- a/scp2/source/sdkoo/sdkoo.scp
+++ b/scp2/source/sdkoo/sdkoo.scp
@@ -160,7 +160,7 @@ File gid_File_Package_odk_html
     Styles = (FILELIST,USE_INTERNAL_RIGHTS);
 End
 
-#if defined(SOLAR_JAVA)
+#if defined(ENABLE_JAVA)
 File gid_File_Package_odk_javadoc
     TXT_FILE_BODY;
     Dir = FILELIST_SDK_DIR;
@@ -199,7 +199,7 @@ File gid_File_Package_odk_settings_generated
     Styles = (FILELIST,USE_INTERNAL_RIGHTS);
 End
 
-#if defined(SOLAR_JAVA)
+#if defined(ENABLE_JAVA)
 File gid_File_Package_odk_unowinreg
     TXT_FILE_BODY;
     Dir = FILELIST_SDK_DIR;
@@ -245,7 +245,7 @@ File gid_File_Zip_Odkheaders
     Styles = (FILELIST,USE_INTERNAL_RIGHTS);
 End
 
-#if defined(SOLAR_JAVA)
+#if defined(ENABLE_JAVA)
 File gid_File_Zip_uno_loader_classes
     TXT_FILE_BODY;
     Dir = FILELIST_SDK_DIR;