diff --git a/core/build.gradle b/core/build.gradle index 7385cfa84..4fb98c5f8 100644 --- a/core/build.gradle +++ b/core/build.gradle @@ -25,6 +25,7 @@ def screenshotsForGoldensDir = "${project.buildDir}/screenshots_for_goldens" def newGoldensDir = "${project.buildDir}/new_golden_images" def goldensDir = "${javaTestDir}/google/registry/webdriver/goldens/chrome-linux" +def jsDir = "${project.projectDir}/src/main/javascript" // Tests that conflict with (mostly unidentified) members of the main test // suite. It is unclear if they are offenders (i.e., those that pollute global @@ -480,7 +481,7 @@ task soyToJS { } task stylesheetsToJavascript { - def cssSourceDir = "${javaDir}/google/registry/ui/css" + def cssSourceDir = "${jsDir}/google/registry/ui/css" def outputDir = "${resourcesDir}/google/registry/ui/css" inputs.dir cssSourceDir outputs.dir outputDir @@ -533,8 +534,8 @@ task compileProdJS(type: JavaExec) { def outputDir = "${resourcesDir}/google/registry/ui" def nodeModulesDir = "${rootDir}/node_modules" def cssSourceDir = "${resourcesDir}/google/registry/ui/css" - def jsSourceDir = "${javaDir}/google/registry/ui/js" - def externsDir = "${javaDir}/google/registry/ui/externs" + def jsSourceDir = "${jsDir}/google/registry/ui/js" + def externsDir = "${jsDir}/google/registry/ui/externs" def soySourceDir = "${generatedDir}/google/registry/ui/soy" [nodeModulesDir, cssSourceDir, jsSourceDir, externsDir, soySourceDir].each { diff --git a/core/src/main/java/google/registry/ui/conformance_proto.txt b/core/src/main/java/google/registry/ui/conformance_proto.txt deleted file mode 100644 index 5d9179e25..000000000 --- a/core/src/main/java/google/registry/ui/conformance_proto.txt +++ /dev/null @@ -1,8 +0,0 @@ -# -*-protobuf-*- - -requirement: { - type: BANNED_PROPERTY_WRITE - error_message: 'Assignment to Element.prototype.innerHTML is not allowed. ' - 'Use goog.dom.safe.setInnerHtml instead. ' - value: 'Element.prototype.innerHTML' -} diff --git a/core/src/main/java/google/registry/ui/compile_test.js b/core/src/main/javascript/google/registry/ui/compile_test.js similarity index 100% rename from core/src/main/java/google/registry/ui/compile_test.js rename to core/src/main/javascript/google/registry/ui/compile_test.js diff --git a/core/src/main/java/google/registry/ui/css/admin-settings.css b/core/src/main/javascript/google/registry/ui/css/admin-settings.css similarity index 100% rename from core/src/main/java/google/registry/ui/css/admin-settings.css rename to core/src/main/javascript/google/registry/ui/css/admin-settings.css diff --git a/core/src/main/java/google/registry/ui/css/console.css b/core/src/main/javascript/google/registry/ui/css/console.css similarity index 100% rename from core/src/main/java/google/registry/ui/css/console.css rename to core/src/main/javascript/google/registry/ui/css/console.css diff --git a/core/src/main/java/google/registry/ui/css/contact-settings.css b/core/src/main/javascript/google/registry/ui/css/contact-settings.css similarity index 100% rename from core/src/main/java/google/registry/ui/css/contact-settings.css rename to core/src/main/javascript/google/registry/ui/css/contact-settings.css diff --git a/core/src/main/java/google/registry/ui/css/contact-us.css b/core/src/main/javascript/google/registry/ui/css/contact-us.css similarity index 100% rename from core/src/main/java/google/registry/ui/css/contact-us.css rename to core/src/main/javascript/google/registry/ui/css/contact-us.css diff --git a/core/src/main/java/google/registry/ui/css/dashboard.css b/core/src/main/javascript/google/registry/ui/css/dashboard.css similarity index 100% rename from core/src/main/java/google/registry/ui/css/dashboard.css rename to core/src/main/javascript/google/registry/ui/css/dashboard.css diff --git a/core/src/main/java/google/registry/ui/css/demo_css.css b/core/src/main/javascript/google/registry/ui/css/demo_css.css similarity index 100% rename from core/src/main/java/google/registry/ui/css/demo_css.css rename to core/src/main/javascript/google/registry/ui/css/demo_css.css diff --git a/core/src/main/java/google/registry/ui/css/epp.css b/core/src/main/javascript/google/registry/ui/css/epp.css similarity index 100% rename from core/src/main/java/google/registry/ui/css/epp.css rename to core/src/main/javascript/google/registry/ui/css/epp.css diff --git a/core/src/main/java/google/registry/ui/css/forms.css b/core/src/main/javascript/google/registry/ui/css/forms.css similarity index 100% rename from core/src/main/java/google/registry/ui/css/forms.css rename to core/src/main/javascript/google/registry/ui/css/forms.css diff --git a/core/src/main/java/google/registry/ui/css/kd_components.css b/core/src/main/javascript/google/registry/ui/css/kd_components.css similarity index 100% rename from core/src/main/java/google/registry/ui/css/kd_components.css rename to core/src/main/javascript/google/registry/ui/css/kd_components.css diff --git a/core/src/main/java/google/registry/ui/css/registrar_imports_raw.css b/core/src/main/javascript/google/registry/ui/css/registrar_imports_raw.css similarity index 100% rename from core/src/main/java/google/registry/ui/css/registrar_imports_raw.css rename to core/src/main/javascript/google/registry/ui/css/registrar_imports_raw.css diff --git a/core/src/main/java/google/registry/ui/css/registry.css b/core/src/main/javascript/google/registry/ui/css/registry.css similarity index 100% rename from core/src/main/java/google/registry/ui/css/registry.css rename to core/src/main/javascript/google/registry/ui/css/registry.css diff --git a/core/src/main/java/google/registry/ui/css/resources.css b/core/src/main/javascript/google/registry/ui/css/resources.css similarity index 100% rename from core/src/main/java/google/registry/ui/css/resources.css rename to core/src/main/javascript/google/registry/ui/css/resources.css diff --git a/core/src/main/java/google/registry/ui/css/security-settings.css b/core/src/main/javascript/google/registry/ui/css/security-settings.css similarity index 100% rename from core/src/main/java/google/registry/ui/css/security-settings.css rename to core/src/main/javascript/google/registry/ui/css/security-settings.css diff --git a/core/src/main/java/google/registry/ui/externs/json.js b/core/src/main/javascript/google/registry/ui/externs/json.js similarity index 100% rename from core/src/main/java/google/registry/ui/externs/json.js rename to core/src/main/javascript/google/registry/ui/externs/json.js diff --git a/core/src/main/java/google/registry/ui/js/component.js b/core/src/main/javascript/google/registry/ui/js/component.js similarity index 100% rename from core/src/main/java/google/registry/ui/js/component.js rename to core/src/main/javascript/google/registry/ui/js/component.js diff --git a/core/src/main/java/google/registry/ui/js/console.js b/core/src/main/javascript/google/registry/ui/js/console.js similarity index 100% rename from core/src/main/java/google/registry/ui/js/console.js rename to core/src/main/javascript/google/registry/ui/js/console.js diff --git a/core/src/main/java/google/registry/ui/js/edit_item.js b/core/src/main/javascript/google/registry/ui/js/edit_item.js similarity index 100% rename from core/src/main/java/google/registry/ui/js/edit_item.js rename to core/src/main/javascript/google/registry/ui/js/edit_item.js diff --git a/core/src/main/java/google/registry/ui/js/forms.js b/core/src/main/javascript/google/registry/ui/js/forms.js similarity index 100% rename from core/src/main/java/google/registry/ui/js/forms.js rename to core/src/main/javascript/google/registry/ui/js/forms.js diff --git a/core/src/main/java/google/registry/ui/js/menu_button.js b/core/src/main/javascript/google/registry/ui/js/menu_button.js similarity index 100% rename from core/src/main/java/google/registry/ui/js/menu_button.js rename to core/src/main/javascript/google/registry/ui/js/menu_button.js diff --git a/core/src/main/java/google/registry/ui/js/registrar/admin_settings.js b/core/src/main/javascript/google/registry/ui/js/registrar/admin_settings.js similarity index 100% rename from core/src/main/java/google/registry/ui/js/registrar/admin_settings.js rename to core/src/main/javascript/google/registry/ui/js/registrar/admin_settings.js diff --git a/core/src/main/java/google/registry/ui/js/registrar/console.js b/core/src/main/javascript/google/registry/ui/js/registrar/console.js similarity index 100% rename from core/src/main/java/google/registry/ui/js/registrar/console.js rename to core/src/main/javascript/google/registry/ui/js/registrar/console.js diff --git a/core/src/main/java/google/registry/ui/js/registrar/contact_settings.js b/core/src/main/javascript/google/registry/ui/js/registrar/contact_settings.js similarity index 100% rename from core/src/main/java/google/registry/ui/js/registrar/contact_settings.js rename to core/src/main/javascript/google/registry/ui/js/registrar/contact_settings.js diff --git a/core/src/main/java/google/registry/ui/js/registrar/contact_us.js b/core/src/main/javascript/google/registry/ui/js/registrar/contact_us.js similarity index 100% rename from core/src/main/java/google/registry/ui/js/registrar/contact_us.js rename to core/src/main/javascript/google/registry/ui/js/registrar/contact_us.js diff --git a/core/src/main/java/google/registry/ui/js/registrar/dashboard.js b/core/src/main/javascript/google/registry/ui/js/registrar/dashboard.js similarity index 100% rename from core/src/main/java/google/registry/ui/js/registrar/dashboard.js rename to core/src/main/javascript/google/registry/ui/js/registrar/dashboard.js diff --git a/core/src/main/java/google/registry/ui/js/registrar/main.js b/core/src/main/javascript/google/registry/ui/js/registrar/main.js similarity index 100% rename from core/src/main/java/google/registry/ui/js/registrar/main.js rename to core/src/main/javascript/google/registry/ui/js/registrar/main.js diff --git a/core/src/main/java/google/registry/ui/js/registrar/resources.js b/core/src/main/javascript/google/registry/ui/js/registrar/resources.js similarity index 100% rename from core/src/main/java/google/registry/ui/js/registrar/resources.js rename to core/src/main/javascript/google/registry/ui/js/registrar/resources.js diff --git a/core/src/main/java/google/registry/ui/js/registrar/security_settings.js b/core/src/main/javascript/google/registry/ui/js/registrar/security_settings.js similarity index 100% rename from core/src/main/java/google/registry/ui/js/registrar/security_settings.js rename to core/src/main/javascript/google/registry/ui/js/registrar/security_settings.js diff --git a/core/src/main/java/google/registry/ui/js/registrar/whois_settings.js b/core/src/main/javascript/google/registry/ui/js/registrar/whois_settings.js similarity index 100% rename from core/src/main/java/google/registry/ui/js/registrar/whois_settings.js rename to core/src/main/javascript/google/registry/ui/js/registrar/whois_settings.js diff --git a/core/src/main/java/google/registry/ui/js/resource.js b/core/src/main/javascript/google/registry/ui/js/resource.js similarity index 100% rename from core/src/main/java/google/registry/ui/js/resource.js rename to core/src/main/javascript/google/registry/ui/js/resource.js diff --git a/core/src/main/java/google/registry/ui/js/resource_component.js b/core/src/main/javascript/google/registry/ui/js/resource_component.js similarity index 100% rename from core/src/main/java/google/registry/ui/js/resource_component.js rename to core/src/main/javascript/google/registry/ui/js/resource_component.js diff --git a/core/src/main/java/google/registry/ui/js/session.js b/core/src/main/javascript/google/registry/ui/js/session.js similarity index 100% rename from core/src/main/java/google/registry/ui/js/session.js rename to core/src/main/javascript/google/registry/ui/js/session.js diff --git a/core/src/main/java/google/registry/ui/js/util.js b/core/src/main/javascript/google/registry/ui/js/util.js similarity index 100% rename from core/src/main/java/google/registry/ui/js/util.js rename to core/src/main/javascript/google/registry/ui/js/util.js diff --git a/core/src/test/java/google/registry/ui/js/component_test.js b/core/src/test/javascript/google/registry/ui/js/component_test.js similarity index 100% rename from core/src/test/java/google/registry/ui/js/component_test.js rename to core/src/test/javascript/google/registry/ui/js/component_test.js diff --git a/core/src/test/java/google/registry/ui/js/registrar/console_test.js b/core/src/test/javascript/google/registry/ui/js/registrar/console_test.js similarity index 100% rename from core/src/test/java/google/registry/ui/js/registrar/console_test.js rename to core/src/test/javascript/google/registry/ui/js/registrar/console_test.js diff --git a/core/src/test/java/google/registry/ui/js/registrar/console_test_util.js b/core/src/test/javascript/google/registry/ui/js/registrar/console_test_util.js similarity index 100% rename from core/src/test/java/google/registry/ui/js/registrar/console_test_util.js rename to core/src/test/javascript/google/registry/ui/js/registrar/console_test_util.js diff --git a/core/src/test/java/google/registry/ui/js/registrar/contact_settings_test.js b/core/src/test/javascript/google/registry/ui/js/registrar/contact_settings_test.js similarity index 100% rename from core/src/test/java/google/registry/ui/js/registrar/contact_settings_test.js rename to core/src/test/javascript/google/registry/ui/js/registrar/contact_settings_test.js diff --git a/core/src/test/java/google/registry/ui/js/registrar/security_settings_test.js b/core/src/test/javascript/google/registry/ui/js/registrar/security_settings_test.js similarity index 100% rename from core/src/test/java/google/registry/ui/js/registrar/security_settings_test.js rename to core/src/test/javascript/google/registry/ui/js/registrar/security_settings_test.js diff --git a/core/src/test/java/google/registry/ui/js/registrar/whois_settings_test.js b/core/src/test/javascript/google/registry/ui/js/registrar/whois_settings_test.js similarity index 100% rename from core/src/test/java/google/registry/ui/js/registrar/whois_settings_test.js rename to core/src/test/javascript/google/registry/ui/js/registrar/whois_settings_test.js diff --git a/core/src/test/java/google/registry/ui/js/testing.js b/core/src/test/javascript/google/registry/ui/js/testing.js similarity index 100% rename from core/src/test/java/google/registry/ui/js/testing.js rename to core/src/test/javascript/google/registry/ui/js/testing.js diff --git a/karma.conf.js b/karma.conf.js index 34da248ec..f985c3f81 100644 --- a/karma.conf.js +++ b/karma.conf.js @@ -28,13 +28,13 @@ module.exports = function(config) { autoWatch: false, files: [ 'node_modules/google-closure-library/closure/goog/base.js', - 'core/build/resources/test/**/*_test.js', + 'core/src/test/javascript/**/*_test.js', { - pattern: 'core/build/resources/test/**/!(*_test).js', + pattern: 'core/src/test/javascript/**/!(*_test).js', included: false }, { - pattern: 'core/build/resources/main/**/*.js', + pattern: 'core/src/main/javascript/**/*.js', included: false }, { @@ -63,9 +63,7 @@ module.exports = function(config) { 'node_modules/google-closure-library/closure/goog/deps.js': ['closure', 'closure-deps'], 'node_modules/google-closure-library/closure/goog/base.js': ['closure'], 'node_modules/google-closure-library/closure/**/*.js': ['closure'], - 'core/build/resources/test/**/*_test.js': ['closure'], - 'core/build/resources/test/**/!(*_test).js': ['closure'], - 'core/build/resources/main/**/*.js': ['closure'], + 'core/src/*/javascript/**/*.js': ['closure'], 'core/build/generated/source/custom/main/**/*.soy.js': ['closure'], 'node_modules/soyutils_usegoog.js': ['closure'] },