mirror of
https://github.com/google/nomulus.git
synced 2025-07-21 02:06:00 +02:00
Rename Java packages to use the .google TLD
The dark lord Gosling designed the Java package naming system so that ownership flows from the DNS system. Since we own the domain name registry.google, it seems only appropriate that we should use google.registry as our package name.
This commit is contained in:
parent
5012893c1d
commit
c458c05801
1309 changed files with 10981 additions and 10378 deletions
|
@ -1,8 +1,10 @@
|
|||
package(
|
||||
default_visibility = ["//java/com/google/domain/registry:registry_project"],
|
||||
default_visibility = ["//java/google/registry:registry_project"],
|
||||
)
|
||||
|
||||
load("//java/com/google/domain/registry/xjc:generated_files.bzl", "pkginfo_generated_files", "xjc_generated_files")
|
||||
licenses(["notice"]) # Apache 2.0
|
||||
|
||||
load("//java/google/registry/xjc:generated_files.bzl", "pkginfo_generated_files", "xjc_generated_files")
|
||||
|
||||
|
||||
sh_binary(
|
||||
|
@ -10,8 +12,8 @@ sh_binary(
|
|||
srcs = ["list_generated_files.sh"],
|
||||
data = [
|
||||
"bindings.xjb",
|
||||
"//java/com/google/domain/registry/xml:xml_schema_files",
|
||||
"//third_party/java/jaxb:jaxb-xjc",
|
||||
"//java/google/registry/xml:xml_schema_files",
|
||||
],
|
||||
)
|
||||
|
||||
|
@ -19,16 +21,17 @@ genrule(
|
|||
name = "jaxb_srcs",
|
||||
srcs = [
|
||||
"bindings.xjb",
|
||||
"//java/com/google/domain/registry/xml:xml_schema_files",
|
||||
"//java/google/registry/xml:xml_schema_files",
|
||||
],
|
||||
outs = xjc_generated_files,
|
||||
cmd = " && ".join([
|
||||
"XJC=$$PWD/$(location //third_party/java/jaxb:jaxb-xjc)",
|
||||
"OUT=$$PWD/$(GENDIR)",
|
||||
"OUT=$$PWD/$(GENDIR)/java",
|
||||
"mkdir -p $$OUT",
|
||||
"cp $(SRCS) /tmp",
|
||||
"cd /tmp",
|
||||
"$$XJC -npa -quiet -extension -d $$OUT/java -b *.xjb *.xsd",
|
||||
"find $$OUT/java -name '*.java' | xargs sed -i 's/" +
|
||||
"$$XJC -npa -quiet -extension -d $$OUT -b *.xjb *.xsd",
|
||||
"find $$OUT -name '*.java' | xargs sed -i 's/" +
|
||||
"public class/" +
|
||||
"@SuppressWarnings({\"unchecked\",\"serial\",\"cast\"}) " +
|
||||
"public class/'",
|
||||
|
@ -57,8 +60,8 @@ java_library(
|
|||
srcs = glob(["*.java"]) + xjc_generated_files + pkginfo_generated_files,
|
||||
deps = [
|
||||
"//java/com/google/common/collect",
|
||||
"//java/com/google/domain/registry/xml",
|
||||
"//third_party/java/joda_time",
|
||||
"//third_party/java/jsr305_annotations",
|
||||
"//java/google/registry/xml",
|
||||
],
|
||||
)
|
||||
|
|
|
@ -4,4 +4,4 @@ generated by JAXB from the XML schemas (.xsd) files.
|
|||
|
||||
Run the command `ant gensrc` and they should be available under:
|
||||
|
||||
build/gensrc/com/google/domain/registry/xjc/
|
||||
build/gensrc/google/registry/xjc/
|
||||
|
|
|
@ -12,9 +12,9 @@
|
|||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
|
||||
package com.google.domain.registry.xjc;
|
||||
package google.registry.xjc;
|
||||
|
||||
import com.google.domain.registry.xml.XmlException;
|
||||
import google.registry.xml.XmlException;
|
||||
|
||||
import java.io.OutputStream;
|
||||
import java.io.StringWriter;
|
||||
|
|
|
@ -12,14 +12,15 @@
|
|||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
|
||||
package com.google.domain.registry.xjc;
|
||||
package google.registry.xjc;
|
||||
|
||||
import static com.google.domain.registry.xml.ValidationMode.LENIENT;
|
||||
import static com.google.domain.registry.xml.ValidationMode.STRICT;
|
||||
import static google.registry.xml.ValidationMode.LENIENT;
|
||||
import static google.registry.xml.ValidationMode.STRICT;
|
||||
|
||||
import com.google.common.collect.ImmutableMap;
|
||||
import com.google.domain.registry.xml.XmlException;
|
||||
import com.google.domain.registry.xml.XmlTransformer;
|
||||
|
||||
import google.registry.xml.XmlException;
|
||||
import google.registry.xml.XmlTransformer;
|
||||
|
||||
import java.io.InputStream;
|
||||
import java.io.OutputStream;
|
||||
|
|
|
@ -9,15 +9,15 @@
|
|||
version="2.1">
|
||||
<globalBindings generateElementClass="true">
|
||||
<xjc:simple/>
|
||||
<xjc:superClass name="com.google.domain.registry.xjc.XjcObject"/>
|
||||
<xjc:superClass name="google.registry.xjc.XjcObject"/>
|
||||
<xjc:javaType name="org.joda.time.DateTime" xmlType="xsd:dateTime"
|
||||
adapter="com.google.domain.registry.xml.UtcDateTimeAdapter"/>
|
||||
adapter="google.registry.xml.UtcDateTimeAdapter"/>
|
||||
<xjc:javaType name="org.joda.time.LocalDate" xmlType="xsd:date"
|
||||
adapter="com.google.domain.registry.xml.DateAdapter"/>
|
||||
adapter="google.registry.xml.DateAdapter"/>
|
||||
</globalBindings>
|
||||
<bindings schemaLocation="epp.xsd" node="/xsd:schema">
|
||||
<schemaBindings>
|
||||
<package name="com.google.domain.registry.xjc.epp"/>
|
||||
<package name="google.registry.xjc.epp"/>
|
||||
<nameXmlTransform>
|
||||
<elementName prefix="XjcEpp"/>
|
||||
<typeName prefix="XjcEpp"/>
|
||||
|
@ -35,7 +35,7 @@
|
|||
</bindings>
|
||||
<bindings schemaLocation="eppcom.xsd" node="/xsd:schema">
|
||||
<schemaBindings>
|
||||
<package name="com.google.domain.registry.xjc.eppcom"/>
|
||||
<package name="google.registry.xjc.eppcom"/>
|
||||
<nameXmlTransform>
|
||||
<elementName prefix="XjcEppcom"/>
|
||||
<typeName prefix="XjcEppcom"/>
|
||||
|
@ -44,7 +44,7 @@
|
|||
</bindings>
|
||||
<bindings schemaLocation="domain.xsd" node="/xsd:schema">
|
||||
<schemaBindings>
|
||||
<package name="com.google.domain.registry.xjc.domain"/>
|
||||
<package name="google.registry.xjc.domain"/>
|
||||
<nameXmlTransform>
|
||||
<elementName prefix="XjcDomain"/>
|
||||
<typeName prefix="XjcDomain"/>
|
||||
|
@ -53,7 +53,7 @@
|
|||
</bindings>
|
||||
<bindings schemaLocation="host.xsd" node="/xsd:schema">
|
||||
<schemaBindings>
|
||||
<package name="com.google.domain.registry.xjc.host"/>
|
||||
<package name="google.registry.xjc.host"/>
|
||||
<nameXmlTransform>
|
||||
<elementName prefix="XjcHost"/>
|
||||
<typeName prefix="XjcHost"/>
|
||||
|
@ -62,7 +62,7 @@
|
|||
</bindings>
|
||||
<bindings schemaLocation="contact.xsd" node="/xsd:schema">
|
||||
<schemaBindings>
|
||||
<package name="com.google.domain.registry.xjc.contact"/>
|
||||
<package name="google.registry.xjc.contact"/>
|
||||
<nameXmlTransform>
|
||||
<elementName prefix="XjcContact"/>
|
||||
<typeName prefix="XjcContact"/>
|
||||
|
@ -71,7 +71,7 @@
|
|||
</bindings>
|
||||
<bindings schemaLocation="rgp.xsd" node="/xsd:schema">
|
||||
<schemaBindings>
|
||||
<package name="com.google.domain.registry.xjc.rgp"/>
|
||||
<package name="google.registry.xjc.rgp"/>
|
||||
<nameXmlTransform>
|
||||
<elementName prefix="XjcRgp"/>
|
||||
<typeName prefix="XjcRgp"/>
|
||||
|
@ -83,7 +83,7 @@
|
|||
</bindings>
|
||||
<bindings schemaLocation="mark.xsd" node="/xsd:schema">
|
||||
<schemaBindings>
|
||||
<package name="com.google.domain.registry.xjc.mark"/>
|
||||
<package name="google.registry.xjc.mark"/>
|
||||
<nameXmlTransform>
|
||||
<elementName prefix="XjcMark"/>
|
||||
<typeName prefix="XjcMark"/>
|
||||
|
@ -92,7 +92,7 @@
|
|||
</bindings>
|
||||
<bindings schemaLocation="smd.xsd" node="/xsd:schema">
|
||||
<schemaBindings>
|
||||
<package name="com.google.domain.registry.xjc.smd"/>
|
||||
<package name="google.registry.xjc.smd"/>
|
||||
<nameXmlTransform>
|
||||
<elementName prefix="XjcSmd"/>
|
||||
<typeName prefix="XjcSmd"/>
|
||||
|
@ -130,7 +130,7 @@
|
|||
</bindings>
|
||||
<bindings schemaLocation="dsig.xsd" node="/xsd:schema">
|
||||
<schemaBindings>
|
||||
<package name="com.google.domain.registry.xjc.dsig"/>
|
||||
<package name="google.registry.xjc.dsig"/>
|
||||
<nameXmlTransform>
|
||||
<elementName prefix="XjcDsig"/>
|
||||
<typeName prefix="XjcDsig"/>
|
||||
|
@ -139,7 +139,7 @@
|
|||
</bindings>
|
||||
<bindings schemaLocation="launch.xsd" node="/xsd:schema">
|
||||
<schemaBindings>
|
||||
<package name="com.google.domain.registry.xjc.launch"/>
|
||||
<package name="google.registry.xjc.launch"/>
|
||||
<nameXmlTransform>
|
||||
<elementName prefix="XjcLaunch"/>
|
||||
<typeName prefix="XjcLaunch"/>
|
||||
|
@ -148,7 +148,7 @@
|
|||
</bindings>
|
||||
<bindings schemaLocation="secdns.xsd" node="/xsd:schema">
|
||||
<schemaBindings>
|
||||
<package name="com.google.domain.registry.xjc.secdns"/>
|
||||
<package name="google.registry.xjc.secdns"/>
|
||||
<nameXmlTransform>
|
||||
<elementName prefix="XjcSecdns"/>
|
||||
<typeName prefix="XjcSecdns"/>
|
||||
|
@ -157,7 +157,7 @@
|
|||
</bindings>
|
||||
<bindings schemaLocation="rde.xsd" node="/xsd:schema">
|
||||
<schemaBindings>
|
||||
<package name="com.google.domain.registry.xjc.rde"/>
|
||||
<package name="google.registry.xjc.rde"/>
|
||||
<nameXmlTransform>
|
||||
<elementName prefix="XjcRde"/>
|
||||
<typeName prefix="XjcRde"/>
|
||||
|
@ -169,7 +169,7 @@
|
|||
</bindings>
|
||||
<bindings schemaLocation="rde-contact.xsd" node="/xsd:schema">
|
||||
<schemaBindings>
|
||||
<package name="com.google.domain.registry.xjc.rdecontact"/>
|
||||
<package name="google.registry.xjc.rdecontact"/>
|
||||
<nameXmlTransform>
|
||||
<elementName prefix="XjcRdeContact"/>
|
||||
<typeName prefix="XjcRdeContact"/>
|
||||
|
@ -187,7 +187,7 @@
|
|||
</bindings>
|
||||
<bindings schemaLocation="rde-domain.xsd" node="/xsd:schema">
|
||||
<schemaBindings>
|
||||
<package name="com.google.domain.registry.xjc.rdedomain"/>
|
||||
<package name="google.registry.xjc.rdedomain"/>
|
||||
<nameXmlTransform>
|
||||
<elementName prefix="XjcRdeDomain"/>
|
||||
<typeName prefix="XjcRdeDomain"/>
|
||||
|
@ -205,7 +205,7 @@
|
|||
</bindings>
|
||||
<bindings schemaLocation="rde-eppparams.xsd" node="/xsd:schema">
|
||||
<schemaBindings>
|
||||
<package name="com.google.domain.registry.xjc.rdeeppparams"/>
|
||||
<package name="google.registry.xjc.rdeeppparams"/>
|
||||
<nameXmlTransform>
|
||||
<elementName prefix="XjcRdeEppParams"/>
|
||||
<typeName prefix="XjcRdeEppParams"/>
|
||||
|
@ -223,7 +223,7 @@
|
|||
</bindings>
|
||||
<bindings schemaLocation="rde-header.xsd" node="/xsd:schema">
|
||||
<schemaBindings>
|
||||
<package name="com.google.domain.registry.xjc.rdeheader"/>
|
||||
<package name="google.registry.xjc.rdeheader"/>
|
||||
<nameXmlTransform>
|
||||
<elementName prefix="XjcRdeHeader"/>
|
||||
<typeName prefix="XjcRdeHeader"/>
|
||||
|
@ -241,7 +241,7 @@
|
|||
</bindings>
|
||||
<bindings schemaLocation="rde-host.xsd" node="/xsd:schema">
|
||||
<schemaBindings>
|
||||
<package name="com.google.domain.registry.xjc.rdehost"/>
|
||||
<package name="google.registry.xjc.rdehost"/>
|
||||
<nameXmlTransform>
|
||||
<elementName prefix="XjcRdeHost"/>
|
||||
<typeName prefix="XjcRdeHost"/>
|
||||
|
@ -256,7 +256,7 @@
|
|||
</bindings>
|
||||
<bindings schemaLocation="rde-idn.xsd" node="/xsd:schema">
|
||||
<schemaBindings>
|
||||
<package name="com.google.domain.registry.xjc.rdeidn"/>
|
||||
<package name="google.registry.xjc.rdeidn"/>
|
||||
<nameXmlTransform>
|
||||
<elementName prefix="XjcRdeIdn"/>
|
||||
<typeName prefix="XjcRdeIdn"/>
|
||||
|
@ -271,7 +271,7 @@
|
|||
</bindings>
|
||||
<bindings schemaLocation="rde-nndn.xsd" node="/xsd:schema">
|
||||
<schemaBindings>
|
||||
<package name="com.google.domain.registry.xjc.rdenndn"/>
|
||||
<package name="google.registry.xjc.rdenndn"/>
|
||||
<nameXmlTransform>
|
||||
<elementName prefix="XjcRdeNndn"/>
|
||||
<typeName prefix="XjcRdeNndn"/>
|
||||
|
@ -289,7 +289,7 @@
|
|||
</bindings>
|
||||
<bindings schemaLocation="rde-notification.xsd" node="/xsd:schema">
|
||||
<schemaBindings>
|
||||
<package name="com.google.domain.registry.xjc.rdenotification"/>
|
||||
<package name="google.registry.xjc.rdenotification"/>
|
||||
<nameXmlTransform>
|
||||
<elementName prefix="XjcRdeNotification"/>
|
||||
<typeName prefix="XjcRdeNotification"/>
|
||||
|
@ -307,7 +307,7 @@
|
|||
</bindings>
|
||||
<bindings schemaLocation="rde-policy.xsd" node="/xsd:schema">
|
||||
<schemaBindings>
|
||||
<package name="com.google.domain.registry.xjc.rdepolicy"/>
|
||||
<package name="google.registry.xjc.rdepolicy"/>
|
||||
<nameXmlTransform>
|
||||
<elementName prefix="XjcRdePolicy"/>
|
||||
<typeName prefix="XjcRdePolicy"/>
|
||||
|
@ -323,7 +323,7 @@
|
|||
</bindings>
|
||||
<bindings schemaLocation="rde-registrar.xsd" node="/xsd:schema">
|
||||
<schemaBindings>
|
||||
<package name="com.google.domain.registry.xjc.rderegistrar"/>
|
||||
<package name="google.registry.xjc.rderegistrar"/>
|
||||
<nameXmlTransform>
|
||||
<elementName prefix="XjcRdeRegistrar"/>
|
||||
<typeName prefix="XjcRdeRegistrar"/>
|
||||
|
@ -341,7 +341,7 @@
|
|||
</bindings>
|
||||
<bindings schemaLocation="rde-report.xsd" node="/xsd:schema">
|
||||
<schemaBindings>
|
||||
<package name="com.google.domain.registry.xjc.rdereport"/>
|
||||
<package name="google.registry.xjc.rdereport"/>
|
||||
<nameXmlTransform>
|
||||
<elementName prefix="XjcRdeReport"/>
|
||||
<typeName prefix="XjcRdeReport"/>
|
||||
|
@ -353,7 +353,7 @@
|
|||
</bindings>
|
||||
<bindings schemaLocation="iirdea.xsd" node="/xsd:schema">
|
||||
<schemaBindings>
|
||||
<package name="com.google.domain.registry.xjc.iirdea"/>
|
||||
<package name="google.registry.xjc.iirdea"/>
|
||||
<nameXmlTransform>
|
||||
<elementName prefix="XjcIirdea"/>
|
||||
<typeName prefix="XjcIirdea"/>
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
# converted from extension //java/com/google/domain/registry/xjc:generated_files
|
||||
# converted from extension //java/google/registry/xjc:generated_files
|
||||
#
|
||||
# .'``'. ...
|
||||
# :o o `....'` ;
|
||||
|
@ -14,8 +14,8 @@
|
|||
# When you make changes to the XML schemas (*.xsd) or the JAXB bindings file
|
||||
# (bindings.xjb), you must regenerate this file with the following commands:
|
||||
#
|
||||
# bazel run java/com/google/domain/registry/xjc:list_generated_files | tee /tmp/lol
|
||||
# mv /tmp/lol java/com/google/domain/registry/xjc/generated_files
|
||||
# bazel run third_party/java_src/gtld/java/google/registry/xjc:list_generated_files | tee /tmp/lol
|
||||
# mv /tmp/lol third_party/java_src/gtld/java/google/registry/xjc/generated_files
|
||||
#
|
||||
|
||||
pkginfo_generated_files = [
|
||||
|
|
|
@ -22,10 +22,10 @@ base="${PWD}"
|
|||
export LC_ALL=C
|
||||
|
||||
cd "${tmp}"
|
||||
cp "${base}/java/com/google/domain/registry/xjc/bindings.xjb" .
|
||||
cp "${base}"/java/com/google/domain/registry/xml/xsd/*.xsd .
|
||||
cp "${base}/java/google/registry/xjc/bindings.xjb" .
|
||||
cp "${base}"/java/google/registry/xml/xsd/*.xsd .
|
||||
"${base}/third_party/java/jaxb/jaxb-xjc" -extension -d "${tmp}" -b *.xjb *.xsd \
|
||||
| sed -ne s@com/google/domain/registry/xjc/@@p \
|
||||
| sed -ne s@google/registry/xjc/@@p \
|
||||
| grep -v package-info.java \
|
||||
| sort \
|
||||
> xjc_generated_files
|
||||
|
@ -46,8 +46,8 @@ cat <<EOF
|
|||
# When you make changes to the XML schemas (*.xsd) or the JAXB bindings file
|
||||
# (bindings.xjb), you must regenerate this file with the following commands:
|
||||
#
|
||||
# bazel run java/com/google/domain/registry/xjc:list_generated_files | tee /tmp/lol
|
||||
# mv /tmp/lol java/com/google/domain/registry/xjc/generated_files.bzl
|
||||
# bazel run third_party/java_src/gtld/java/google/registry/xjc:list_generated_files | tee /tmp/lol
|
||||
# mv /tmp/lol third_party/java_src/gtld/java/google/registry/xjc/generated_files.bzl
|
||||
#
|
||||
EOF
|
||||
|
||||
|
|
|
@ -13,4 +13,4 @@
|
|||
// limitations under the License.
|
||||
|
||||
@javax.annotation.ParametersAreNonnullByDefault
|
||||
package com.google.domain.registry.xjc;
|
||||
package google.registry.xjc;
|
||||
|
|
|
@ -77,7 +77,7 @@
|
|||
namespaceURI = "urn:ietf:params:xml:ns:signedMark-1.0"),
|
||||
})
|
||||
@XmlAccessorType(XmlAccessType.FIELD)
|
||||
package com.google.domain.registry.xjc.@PACKAGE@;
|
||||
package google.registry.xjc.@PACKAGE@;
|
||||
|
||||
import javax.xml.bind.annotation.XmlAccessType;
|
||||
import javax.xml.bind.annotation.XmlAccessorType;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue