Permalink
Browse files

Jason + Sharon: Merged the gTLD branch back into the master/core

  • Loading branch information...
Sharon Jonnalagadda
Sharon Jonnalagadda committed Mar 11, 2013
1 parent 8e2f6e8 commit 8f8e29816e7a646efea393f8ac3c8727be8af3ab
Showing with 2,794 additions and 95 deletions.
  1. +2 −1 .gitignore
  2. +0 −65 RELEASE_NOTES.txt
  3. +6 −4 build.gradle
  4. +1 −1 gradle.properties
  5. +10 −11 readme.md
  6. +1 −1 settings.gradle
  7. +8 −1 src/main/config/toolkit.properties
  8. +2 −2 src/main/java/com/ausregistry/jtoolkit2/se/DomainVariantResponseExtension.java
  9. +85 −0 src/main/java/com/ausregistry/jtoolkit2/se/DomainVariantResponseExtensionV1_1.java
  10. +6 −1 src/main/java/com/ausregistry/jtoolkit2/se/ExtendedObjectType.java
  11. +104 −0 src/main/java/com/ausregistry/jtoolkit2/se/IdnDomainVariant.java
  12. +3 −3 src/main/java/com/ausregistry/jtoolkit2/se/IdnaDomainVariant.java
  13. +37 −0 src/main/java/com/ausregistry/jtoolkit2/se/idn/DomainCreateIdnCommandExtension.java
  14. +65 −0 src/main/java/com/ausregistry/jtoolkit2/se/idn/DomainIdnResponseExtension.java
  15. +35 −0 src/main/java/com/ausregistry/jtoolkit2/se/launch/DomainCreateApplicationCommandExtension.java
  16. +69 −0 src/main/java/com/ausregistry/jtoolkit2/se/launch/DomainCreateApplicationResponse.java
  17. +34 −0 src/main/java/com/ausregistry/jtoolkit2/se/launch/DomainDeleteApplicationCommandExtension.java
  18. +36 −0 src/main/java/com/ausregistry/jtoolkit2/se/launch/DomainInfoApplicationCommandExtension.java
  19. +73 −0 src/main/java/com/ausregistry/jtoolkit2/se/launch/DomainInfoApplicationResponseExtension.java
  20. +41 −0 src/main/java/com/ausregistry/jtoolkit2/se/premium/DomainCreatePremiumCommandExtension.java
  21. +33 −0 src/main/java/com/ausregistry/jtoolkit2/se/premium/DomainTransferRequestPremiumCommandExtension.java
  22. +75 −0 src/main/java/com/ausregistry/jtoolkit2/se/rgp/DomainRestoreReportCommand.java
  23. +35 −0 src/main/java/com/ausregistry/jtoolkit2/se/rgp/DomainRestoreRequestCommand.java
  24. +34 −0 src/main/java/com/ausregistry/jtoolkit2/se/rgp/DomainRestoreResponse.java
  25. +81 −0 src/main/java/com/ausregistry/jtoolkit2/se/rgp/DomainRgpResponseExtension.java
  26. +34 −0 src/main/java/com/ausregistry/jtoolkit2/se/rgp/ReportTextElement.java
  27. +62 −0 src/main/java/com/ausregistry/jtoolkit2/se/rgp/RgpStatus.java
  28. +7 −0 src/main/java/com/ausregistry/jtoolkit2/se/rgp/package-info.java
  29. +77 −0 src/main/java/com/ausregistry/jtoolkit2/se/variant/DomainUpdateVariantCommandExtensionV1_1.java
  30. +70 −0 src/main/resources/application-1.0.xsd
  31. +28 −0 src/main/resources/idn-1.0.xsd
  32. +54 −0 src/main/resources/premium-1.0.xsd
  33. +110 −0 src/main/resources/rgp-1.0.xsd
  34. +36 −0 src/main/resources/variant-1.1.xsd
  35. +13 −0 src/test/java/com/ausregistry/jtoolkit2/se/DomainCreateCommandTest.java
  36. +46 −0 src/test/java/com/ausregistry/jtoolkit2/se/DomainCreateResponseTest.java
  37. +71 −5 src/test/java/com/ausregistry/jtoolkit2/se/DomainInfoResponseTest.java
  38. +87 −0 src/test/java/com/ausregistry/jtoolkit2/se/idn/DomainCreateCommandTest.java
  39. +101 −0 src/test/java/com/ausregistry/jtoolkit2/se/idn/DomainInfoIdnResponseTest.java
  40. +88 −0 src/test/java/com/ausregistry/jtoolkit2/se/launch/DomainCreateApplicationCommandExtensionTest.java
  41. +40 −0 src/test/java/com/ausregistry/jtoolkit2/se/launch/DomainDeleteApplicationCommandExtensionTest.java
  42. +150 −0 src/test/java/com/ausregistry/jtoolkit2/se/launch/DomainInfoApplicationCommandExtensionTest.java
  43. +154 −0 src/test/java/com/ausregistry/jtoolkit2/se/premium/DomainCreatePremiumCommandExtensionTest.java
  44. +89 −0 ...t/java/com/ausregistry/jtoolkit2/se/premium/DomainTransferRequestPremiumCommandExtensionTest.java
  45. +145 −0 src/test/java/com/ausregistry/jtoolkit2/se/rgp/DomainInfoRgpResponseTest.java
  46. +81 −0 src/test/java/com/ausregistry/jtoolkit2/se/rgp/DomainRestoreReportCommandTest.java
  47. +31 −0 src/test/java/com/ausregistry/jtoolkit2/se/rgp/DomainRestoreRequestCommandTest.java
  48. +68 −0 src/test/java/com/ausregistry/jtoolkit2/se/rgp/DomainRestoreResponseTest.java
  49. +42 −0 src/test/java/com/ausregistry/jtoolkit2/se/rgp/RgpStatusTest.java
  50. +93 −0 src/test/java/com/ausregistry/jtoolkit2/se/variant/DomainCreateVariantV1_1ResponseTest.java
  51. +141 −0 src/test/java/com/ausregistry/jtoolkit2/se/variant/DomainUpdateVariantCommandExtensionV1_1Test.java
@@ -3,4 +3,5 @@
*.iml
artifacts
build
target
target
out

This file was deleted.

Oops, something went wrong.
@@ -1,13 +1,14 @@
apply plugin: 'java'
apply plugin: 'maven'
sourceCompatibility = '6'
ext {
junitVersion = '4.8.2'
artifactsDir = "$projectDir/artifacts"
artifactGroupId = 'au.com.ausregistry'
gradleWrapperVersion = '1.4'
pagesProjectDir = "$projectDir/../ari-toolkit-gitpages"
gitBranch = 'cctld'
}
version = toolkitVersion
@@ -17,11 +18,12 @@ repositories {
}
dependencies {
testCompile "junit:junit:$junitVersion"
testCompile group: "junit", name: "junit", version: junitVersion
}
tasks.withType(Compile) {
options.encoding = "UTF-8"
options.compilerArgs << "-Xlint:-options"
}
tasks.withType(Test) {
@@ -100,7 +102,7 @@ uploadArchives << {
if (!System.properties.keySet().containsAll('repoUrl', 'repoUsername', 'repoPassword')) {
copy {
from(javadoc.destinationDir)
into "$pagesProjectDir/javadoc/$gitBranch/"
into "$pagesProjectDir/javadoc/"
}
}
}
}
@@ -1 +1 @@
toolkitVersion=3.0.0.4
toolkitVersion=3.0.0.16
@@ -1,13 +1,13 @@
## Downloads
The latest ari-toolkit for ccTLDs is available for download. [ccTLD Toolkit v3.0.0.4](http://ausregistry.github.com/repo/au/com/ausregistry/arjtk-cctld/3.0.0.4/arjtk-cctld-3.0.0.4.jar) ([sources](http://ausregistry.github.com/repo/au/com/ausregistry/arjtk-cctld/3.0.0.4/arjtk-cctld-3.0.0.4-sources.jar) | [javadoc](http://ausregistry.github.com/repo/au/com/ausregistry/arjtk-cctld/3.0.0.4/arjtk-cctld-3.0.0.4-javadoc.jar))
The latest ari-toolkit for gTLDs is available for download. [ari-toolkit-gtld v3.0.0.15](http://ausregistry.github.com/repo/au/com/ausregistry/arjtk-gtld/3.0.0.15/arjtk-gtld-3.0.0.15.jar) ([sources](http://ausregistry.github.com/repo/au/com/ausregistry/arjtk-gtld/3.0.0.15/arjtk-gtld-3.0.0.15-sources.jar) | [javadoc](http://ausregistry.github.com/repo/au/com/ausregistry/arjtk-gtld/3.0.0.15/arjtk-gtld-3.0.0.15-javadoc.jar))
For more information, please read [Installation and Setup](#installation-and-setup).
## Building
To build the ari-toolkit for ccTLDs, you must have the Java Development Kit (JDK) v6.0 or above installed. The project can be built with the command `gradlew build`.
To build the ari-toolkit for gTLDs, you must have the Java Development Kit (JDK) v6.0 or above installed. The project can be built with the command `gradlew build`.
## Introduction
@@ -34,20 +34,20 @@ The service element mapping module provides a simple means of translating betwee
## Installation and Setup
### How to get the ccTLD Toolkit
### How to get the gTLD Toolkit
#### Direct download
Obtain the latest ccTLD toolkit here: [ccTLD Toolkit v3.0.0.4](http://ausregistry.github.com/repo/au/com/ausregistry/arjtk-cctld/3.0.0.4/arjtk-cctld-3.0.0.4.jar) ([sources](http://ausregistry.github.com/repo/au/com/ausregistry/arjtk-cctld/3.0.0.4/arjtk-cctld-3.0.0.4-sources.jar) | [javadoc](http://ausregistry.github.com/repo/au/com/ausregistry/arjtk-cctld/3.0.0.4/arjtk-cctld-3.0.0.4-javadoc.jar))
Obtain the latest gTLD toolkit here: [gTLD Toolkit v3.0.0.15](http://ausregistry.github.com/repo/au/com/ausregistry/arjtk-gtld/3.0.0.15/arjtk-gtld-3.0.0.15.jar) ([sources](http://ausregistry.github.com/repo/au/com/ausregistry/arjtk-gtld/3.0.0.15/arjtk-gtld-3.0.0.15-sources.jar) | [javadoc](http://ausregistry.github.com/repo/au/com/ausregistry/arjtk-gtld/3.0.0.15/arjtk-gtld-3.0.0.15-javadoc.jar))
#### Dependency Management
Use your build's dependency management tool to automatically download the toolkit from our repository.
* Repository: `http://ausregistry.github.com/repo/`
* groupId: `au.com.ausregistry`
* artifactId: `arjtk-cctld`
* version: `3.0.0.4`
* artifactId: `arjtk-gtld`
* version: `3.0.0.15`
For example (using Maven):
@@ -61,20 +61,19 @@ For example (using Maven):
<dependencies>
<dependency>
<groupId>au.com.ausregistry</groupId>
<artifactId>arjtk-cctld</artifactId>
<version>3.0.0.4</version>
<artifactId>arjtk-gtld</artifactId>
<version>3.0.0.15</version>
</dependency>
</dependencies>
#### Contribute
You can view the source on [GitHub/AusRegistry](http://github.com/ausregistry/ari-toolkit/tree/cctld). Contributions via pull requests are welcome.
You can view the source on [GitHub/AusRegistry](http://github.com/ausregistry/ari-toolkit/tree/gtld). Contributions via pull requests are welcome.
### Development documentation
The javadoc is available online: [ccTLD Toolkit javadoc](http://ausregistry.github.com/javadoc/cctld/index.html)
The javadoc is available online: [gTLD Toolkit javadoc](http://ausregistry.github.com/javadoc/gtld/index.html)
### Environment
@@ -1 +1 @@
rootProject.name='arjtk-cctld'
rootProject.name='arjtk'
@@ -4,6 +4,8 @@ epp.xmlns.xsi=http://www.w3c.org/2001/XMLSchema-instance
xml.uri.obj.domain=urn:ietf:params:xml:ns:domain-1.0
xml.uri.obj.host=urn:ietf:params:xml:ns:host-1.0
xml.uri.obj.contact=urn:ietf:params:xml:ns:contact-1.0
#xml.uri.ext.e164epp=urn:ietf:params:xml:ns:e164epp-1.0
#xml.uri.ext.auext1=urn:au:params:xml:ns:auext-1.0
xml.uri.ext.auext=urn:X-au:params:xml:ns:auext-1.1
xml.uri.ext.audomain=urn:X-au:params:xml:ns:audomain-1.0
xml.uri.ext.arext=urn:X-ar:params:xml:ns:arext-1.0
@@ -13,9 +15,14 @@ xml.uri.ext.variants=urn:X-ar:params:xml:ns:variant-1.0
xml.uri.ext.viext=urn:X-ar:params:xml:ns:viext-1.0
xml.uri.ext.secdns=urn:ietf:params:xml:ns:secDNS-1.1
xml.uri.ext.sync=urn:X-ar:params:xml:ns:sync-1.0
xml.uri.ext.kv=urn:X-ar:params:xml:ns:kv-1.0
#xml.uri.ext.aeext=urn:X-ae:params:xml:ns:aeext-1.0
#xml.uri.ext.aedomain=urn:X-ae:params:xml:ns:aedomain-1.0
xml.uri.ext.restore=urn:ietf:params:xml:ns:rgp-1.0
xml.uri.ext.kv=urn:X-ar:params:xml:ns:kv-1.0
xml.uri.ext.launch=urn:ar:params:xml:ns:application-1.0
xml.uri.ext.idn=urn:ar:params:xml:ns:idn-1.0
xml.uri.ext.variantsV1_1=urn:ar:params:xml:ns:variant-1.1
xml.uri.ext.premium=urn:ar:params:xml:ns:premium-1.0
xml.validation.enable=true
#xml.validation.enable=false
@@ -23,7 +23,7 @@
* For flexibility, this implementation extracts the data from the response
* using XPath queries, the expressions for which are defined statically.
*
* @see com.ausregistry.jtoolkit2.se.ResponseExtension
* @see ResponseExtension
*/
public final class DomainVariantResponseExtension extends
ResponseExtension {
@@ -53,7 +53,7 @@ public DomainVariantResponseExtension(String responseType) {
}
/**
* @see com.ausregistry.jtoolkit2.se.ResponseExtension#fromXML(XMLDocument)
* @see ResponseExtension#fromXML(com.ausregistry.jtoolkit2.xml.XMLDocument)
*/
public void fromXML(final XMLDocument xmlDoc)
throws XPathExpressionException {
@@ -0,0 +1,85 @@
package com.ausregistry.jtoolkit2.se;
import java.util.ArrayList;
import javax.xml.xpath.XPathExpressionException;
import com.ausregistry.jtoolkit2.xml.XMLDocument;
/**
* Extension of the domain mapping of the EPP create/info response, as defined
* in RFC5730 and RFC5731, to domain name variants, the specification of which
* are in the XML schema definition urn:X-ar:params:xml:ns:variant-1.1.
*
* Instances of this class provide an interface to access create and info data
* for a domain as provided in an EPP domain create response. This relies on the
* instance first being initialised by a suitable EPP domain create/info
* response using the method fromXML. Such a service element is sent by a EPP
* server in response to a valid domain create/info command as implemented by
* the DomainCreateCommand and DomainInfoCommand classes, optionally with the
* variant extension as implemented by the DomainInfoVariantsCommandExtension
* class.
*
* For flexibility, this implementation extracts the data from the response
* using XPath queries, the expressions for which are defined statically.
*
* @see com.ausregistry.jtoolkit2.se.ResponseExtension
*/
public final class DomainVariantResponseExtensionV1_1 extends
ResponseExtension {
private static final long serialVersionUID = -2441248857298156911L;
private static final String VARIANT_PREFIX = ExtendedObjectType.VARIANT_V1_1.getName();
private static final String VARIANT_LIST_EXPR = ResponseExtension.EXTENSION_EXPR
+ "/"
+ VARIANT_PREFIX
+ ":RESPONSE_TYPE/"
+ VARIANT_PREFIX
+ ":variant";
private static final String VARIANT_COUNT_EXPR = "count("
+ VARIANT_LIST_EXPR + ")";
private static final String VARIANT_IND_EXPR = VARIANT_LIST_EXPR + "[IDX]";
private ArrayList<IdnDomainVariant> variants;
private String responseType;
private boolean initialised;
public DomainVariantResponseExtensionV1_1(String responseType) {
this.responseType = responseType;
}
/**
* @see com.ausregistry.jtoolkit2.se.ResponseExtension#fromXML(XMLDocument)
*/
public void fromXML(final XMLDocument xmlDoc)
throws XPathExpressionException {
variants = null;
final int variantCount = xmlDoc.getNodeCount(replaceResponseType(
VARIANT_COUNT_EXPR, responseType));
final String indexExpression = replaceResponseType(VARIANT_IND_EXPR, responseType);
variants = new ArrayList<IdnDomainVariant>();
for (int i = 0; i < variantCount; i++) {
final String query = ReceiveSE.replaceIndex(indexExpression, i + 1);
final String domainName = xmlDoc.getNodeValue(query);
variants.add(new IdnDomainVariant(domainName));
}
initialised = (variantCount > 0);
}
public ArrayList<IdnDomainVariant> getVariants() {
return variants;
}
@Override
public boolean isInitialised() {
return initialised;
}
}
@@ -10,10 +10,15 @@
AU_DOMAIN("audom", "urn:X-au:params:xml:ns:audomain-1.0", "audomain-1.0.xsd", "name"),
IDNA_DOMAIN("idnadomain", "urn:X-ar:params:xml:ns:idnadomain-1.0", "idnadomain-1.0.xsd", "name"),
VARIANT("variant", "urn:X-ar:params:xml:ns:variant-1.0", "variant-1.0.xsd", "name"),
VARIANT_V1_1("variantV1_1", "urn:ar:params:xml:ns:variant-1.1", "variant-1.1.xsd", "name"),
SEC_DNS("secDNS", "urn:ietf:params:xml:ns:secDNS-1.1", "secDNS-1.1.xsd", "name"),
SYNC("sync", "urn:X-ar:params:xml:ns:sync-1.0", "sync-1.0.xsd", "name"),
KV("kv", "urn:X-ar:params:xml:ns:kv-1.0", "kv-1.0.xsd", "name"),
REGISTRANT("registrant", "urn:X-ar:params:xml:ns:registrant-1.0", "registrant-1.0.xsd", "name");
REGISTRANT("registrant", "urn:X-ar:params:xml:ns:registrant-1.0", "registrant-1.0.xsd", "name"),
RESTORE("restore", "urn:ietf:params:xml:ns:rgp-1.0", "rgp-1.0.xsd", "name"),
LAUNCH("launch", "urn:ar:params:xml:ns:application-1.0", "application-1.0.xsd", "name"),
IDN("idn", "urn:ar:params:xml:ns:idn-1.0", "idn-1.0.xsd", "name"),
PREMIUM("premium", "urn:ar:params:xml:ns:premium-1.0", "premium-1.0.xsd", "name");
private String prefix, uri, schemaDefinition, identType;
Oops, something went wrong.

0 comments on commit 8f8e298

Please sign in to comment.