Skip to content
This repository has been archived by the owner on Nov 9, 2017. It is now read-only.

Commit

Permalink
finalise rebrand from flies->zanata: XML namespaces, media types, cla…
Browse files Browse the repository at this point in the history
…ss names - everything but config names in the database
  • Loading branch information
seanf committed May 5, 2011
1 parent 48cb942 commit b1ab256
Show file tree
Hide file tree
Showing 42 changed files with 88 additions and 108 deletions.
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<documents xmlns="http://flies.openl10n.net/api/v1/" xmlns:ns2="http://flies.openl10n.net/api/gettext/header">
<documents xmlns="http://zanata.org/namespace/api/">
<document path="foo/" name="foo.properties" xml:lang="en-US" id="foo/foo.properties" content-type="text/plain">
<document-content>
<text-flow version="1" id="FOOD">
Expand Down
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<documents xmlns="http://flies.openl10n.net/api/v1/" xmlns:ns2="http://flies.openl10n.net/api/gettext/header">
<documents xmlns="http://zanata.org/namespace/api/">
<document path="foo/" name="foo.properties" xml:lang="en-US" id="foo/foo.properties" content-type="text/plain">
<document-content>
<text-flow version="1" id="FOOD">
Expand Down
Expand Up @@ -15,7 +15,7 @@
import org.slf4j.LoggerFactory;
import org.zanata.client.VersionUtility;
import org.zanata.client.config.ConfigUtil;
import org.zanata.client.config.FliesConfig;
import org.zanata.client.config.ZanataConfig;
import org.zanata.client.config.LocaleList;
import org.zanata.client.exceptions.ConfigException;
import org.zanata.rest.client.ZanataProxyFactory;
Expand All @@ -37,7 +37,7 @@ public static void applyConfigFiles(ConfigurableOptions opts) throws Configurati
ConfigurableProjectOptions projOpts = (ConfigurableProjectOptions) opts;
if (projOpts.getProjectConfig() != null)
{
JAXBContext jc = JAXBContext.newInstance(FliesConfig.class);
JAXBContext jc = JAXBContext.newInstance(ZanataConfig.class);
Unmarshaller unmarshaller = jc.createUnmarshaller();
String projectConfigName = projOpts.getProjectConfig();
File projectConfigFile = new File(projectConfigName);
Expand All @@ -54,7 +54,7 @@ public static void applyConfigFiles(ConfigurableOptions opts) throws Configurati
if (projectConfigFile.exists())
{
log.info("Loading project config from {}", projectConfigFile);
FliesConfig projectConfig = (FliesConfig) unmarshaller.unmarshal(projectConfigFile);
ZanataConfig projectConfig = (ZanataConfig) unmarshaller.unmarshal(projectConfigFile);
// local project config is supposed to override user's zanata.ini,
// so we apply it first
applyProjectConfig(projOpts, projectConfig);
Expand Down Expand Up @@ -86,7 +86,7 @@ public static void applyConfigFiles(ConfigurableOptions opts) throws Configurati
*
* @param config
*/
private static void applyProjectConfig(ConfigurableProjectOptions opts, FliesConfig config)
private static void applyProjectConfig(ConfigurableProjectOptions opts, ZanataConfig config)
{
if (opts.getProj() == null)
{
Expand Down
Expand Up @@ -37,15 +37,15 @@
*/
@XmlType(name = "configType", propOrder = { "url", "project", "projectVersion", "locales" })
@XmlRootElement(name = "config")
public class FliesConfig implements Serializable
public class ZanataConfig implements Serializable
{
private static final long serialVersionUID = 1L;
private LocaleList locales = new LocaleList();
private String project;
private URL url;
private String projectVersion;

public FliesConfig()
public ZanataConfig()
{
}

Expand Down
Expand Up @@ -23,7 +23,7 @@
* Package-level annotations
*/
@XmlAccessorOrder(XmlAccessOrder.ALPHABETICAL)
@XmlSchema(namespace = Namespaces.FLIES_CONFIG, elementFormDefault = XmlNsForm.QUALIFIED)
@XmlSchema(namespace = Namespaces.ZANATA_CONFIG, elementFormDefault = XmlNsForm.QUALIFIED)
package org.zanata.client.config;

import javax.xml.bind.annotation.XmlAccessOrder;
Expand Down
Expand Up @@ -14,13 +14,13 @@
import org.apache.commons.configuration.FileConfiguration;
import org.apache.commons.configuration.HierarchicalINIConfiguration;
import org.apache.commons.configuration.SystemConfiguration;
import org.zanata.client.config.FliesConfig;
import org.zanata.client.config.ZanataConfig;
import org.zanata.client.config.LocaleList;
import org.zanata.client.config.LocaleMapping;

public class ZanataConfigTest extends TestCase
{
JAXBContext jc = JAXBContext.newInstance(FliesConfig.class);
JAXBContext jc = JAXBContext.newInstance(ZanataConfig.class);
Unmarshaller unmarshaller = jc.createUnmarshaller();
Marshaller marshaller = jc.createMarshaller();
File zanataProjectXml = new File(System.getProperty("user.dir"), "target/zanata.xml");
Expand All @@ -44,7 +44,7 @@ public void testWriteReadProject() throws Exception

void writeProject() throws Exception
{
FliesConfig config = new FliesConfig();
ZanataConfig config = new ZanataConfig();
config.setUrl(new URL("http://example.com"));
config.setProject("project");
config.setProjectVersion("version");
Expand All @@ -55,7 +55,7 @@ void writeProject() throws Exception

void readProject() throws Exception
{
FliesConfig config = (FliesConfig) unmarshaller.unmarshal(zanataProjectXml);
ZanataConfig config = (ZanataConfig) unmarshaller.unmarshal(zanataProjectXml);
assertEquals(new URL("http://example.com"), config.getUrl());
assertEquals("project", config.getProject());
assertEquals("version", config.getProjectVersion());
Expand Down
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<config xmlns="http://flies.openl10n.net/config/v1/">
<config xmlns="http://zanata.org/namespace/config/">
<url>http://localhost:8080/zanata/</url>
<project>sample-project</project>
<project-version>1.1</project-version>
Expand Down
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<config xmlns="http://flies.openl10n.net/config/v1/">
<config xmlns="http://zanata.org/namespace/config/">
<url>http://localhost:8080/zanata/</url>
<project>sample-project</project>
<project-version>1.1</project-version>
Expand Down
2 changes: 1 addition & 1 deletion client/zanata-maven-plugin/demo/zanata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<config xmlns="http://flies.openl10n.net/config/v1/">
<config xmlns="http://zanata.org/namespace/config/">
<url>http://localhost:8080/zanata/</url>
<project>sample-project</project>
<project-version>1.1</project-version>
Expand Down
2 changes: 1 addition & 1 deletion client/zanata-maven-plugin/sample-scripts/zanata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<config xmlns="http://flies.openl10n.net/config/v1/">
<config xmlns="http://zanata.org/namespace/config/">
<url>https://translate.jboss.org/</url>
<project>example-project</project>
<project-version>1.0</project-version>
Expand Down
Expand Up @@ -3,10 +3,10 @@
public final class Namespaces
{

public static final String FLIES = "http://flies.openl10n.net/api/v1/";
public static final String COMMENT = "http://flies.openl10n.net/api/v1/comment/";
public static final String GETTEXT = "http://flies.openl10n.net/api/v1/gettext/";
public static final String FLIES_CONFIG = "http://flies.openl10n.net/config/v1/";
public static final String ZANATA_API = "http://zanata.org/namespace/api/";
public static final String COMMENT = ZANATA_API + "comment/";
public static final String GETTEXT = ZANATA_API + "gettext/";
public static final String ZANATA_CONFIG = "http://zanata.org/namespace/config/";
public static final String XML = "http://www.w3.org/XML/1998/namespace";

private Namespaces()
Expand Down
@@ -1,3 +1,3 @@
@javax.xml.bind.annotation.XmlSchema(namespace = org.zanata.common.Namespaces.FLIES)
@javax.xml.bind.annotation.XmlSchema(namespace = org.zanata.common.Namespaces.ZANATA_API)
package org.zanata.common;

Expand Up @@ -148,7 +148,7 @@ private <T extends HasSample<T>> void write(String heading, Class<T> clazz) thro
// if (namespaceUri == null || namespaceUri.isEmpty() ) {
// return "";
// }
// if (namespaceUri.equalsIgnoreCase(Namespaces.FLIES)) {
// if (namespaceUri.equalsIgnoreCase(Namespaces.ZANATA_API)) {
// return "";
// }
// if (namespaceUri.equalsIgnoreCase(PoHeader.NAMESPACE)) {
Expand Down
Expand Up @@ -25,47 +25,27 @@ public String toString()
private static final String XML = "+xml";
private static final String JSON = "+json";

private static final String APPLICATION_VND_FLIES = "application/vnd.flies";
private static final String APPLICATION_VND_ZANATA = "application/vnd.zanata";

public static final String APPLICATION_FLIES_PROJECT = APPLICATION_VND_FLIES + ".project";
public static final String APPLICATION_FLIES_PROJECT_XML = APPLICATION_FLIES_PROJECT + XML;
public static final String APPLICATION_FLIES_PROJECT_JSON = APPLICATION_FLIES_PROJECT + JSON;
public static final String APPLICATION_ZANATA_PROJECT = APPLICATION_VND_ZANATA + ".project";
public static final String APPLICATION_ZANATA_PROJECT_XML = APPLICATION_ZANATA_PROJECT + XML;
public static final String APPLICATION_ZANATA_PROJECT_JSON = APPLICATION_ZANATA_PROJECT + JSON;

public static final String APPLICATION_FLIES_PROJECTS = APPLICATION_VND_FLIES + ".projects";
public static final String APPLICATION_FLIES_PROJECTS_XML = APPLICATION_FLIES_PROJECTS + XML;
public static final String APPLICATION_FLIES_PROJECTS_JSON = APPLICATION_FLIES_PROJECTS + JSON;
public static final String APPLICATION_ZANATA_PROJECTS = APPLICATION_VND_ZANATA + ".projects";
public static final String APPLICATION_ZANATA_PROJECTS_XML = APPLICATION_ZANATA_PROJECTS + XML;
public static final String APPLICATION_ZANATA_PROJECTS_JSON = APPLICATION_ZANATA_PROJECTS + JSON;

public static final String APPLICATION_FLIES_PROJECT_ITERATION = APPLICATION_VND_FLIES + ".project.iteration";
public static final String APPLICATION_FLIES_PROJECT_ITERATION_XML = APPLICATION_FLIES_PROJECT_ITERATION + XML;
public static final String APPLICATION_FLIES_PROJECT_ITERATION_JSON = APPLICATION_FLIES_PROJECT_ITERATION + JSON;
public static final String APPLICATION_ZANATA_PROJECT_ITERATION = APPLICATION_VND_ZANATA + ".project.iteration";
public static final String APPLICATION_ZANATA_PROJECT_ITERATION_XML = APPLICATION_ZANATA_PROJECT_ITERATION + XML;
public static final String APPLICATION_ZANATA_PROJECT_ITERATION_JSON = APPLICATION_ZANATA_PROJECT_ITERATION + JSON;

public static final String APPLICATION_FLIES_PROJECT_ITERATIONS = APPLICATION_VND_FLIES + ".project.iterations";
public static final String APPLICATION_FLIES_PROJECT_ITERATIONS_XML = APPLICATION_FLIES_PROJECT_ITERATIONS + XML;
public static final String APPLICATION_FLIES_PROJECT_ITERATIONS_JSON = APPLICATION_FLIES_PROJECT_ITERATIONS + JSON;
public static final String APPLICATION_ZANATA_ACCOUNT = APPLICATION_VND_ZANATA + ".account";
public static final String APPLICATION_ZANATA_ACCOUNT_XML = APPLICATION_ZANATA_ACCOUNT + XML;
public static final String APPLICATION_ZANATA_ACCOUNT_JSON = APPLICATION_ZANATA_ACCOUNT + JSON;

public static final String APPLICATION_FLIES_DOCUMENT = APPLICATION_VND_FLIES + ".document";
public static final String APPLICATION_FLIES_DOCUMENT_XML = APPLICATION_FLIES_DOCUMENT + XML;
public static final String APPLICATION_FLIES_DOCUMENT_JSON = APPLICATION_FLIES_DOCUMENT + JSON;

public static final String APPLICATION_FLIES_DOCUMENTS = APPLICATION_VND_FLIES + ".documents";
public static final String APPLICATION_FLIES_DOCUMENTS_XML = APPLICATION_FLIES_DOCUMENTS + XML;
public static final String APPLICATION_FLIES_DOCUMENTS_JSON = APPLICATION_FLIES_DOCUMENTS + JSON;

public static final String APPLICATION_FLIES_DOCUMENT_RESOURCE = APPLICATION_VND_FLIES + ".document.resource";
public static final String APPLICATION_FLIES_DOCUMENT_RESOURCE_XML = APPLICATION_FLIES_DOCUMENT_RESOURCE + XML;
public static final String APPLICATION_FLIES_DOCUMENT_RESOURCE_JSON = APPLICATION_FLIES_DOCUMENT_RESOURCE + JSON;

public static final String APPLICATION_FLIES_DOCUMENT_RESOURCES = APPLICATION_VND_FLIES + ".document.resources";
public static final String APPLICATION_FLIES_DOCUMENT_RESOURCES_XML = APPLICATION_FLIES_DOCUMENT_RESOURCES + XML;
public static final String APPLICATION_FLIES_DOCUMENT_RESOURCES_JSON = APPLICATION_FLIES_DOCUMENT_RESOURCES + JSON;

public static final String APPLICATION_FLIES_ACCOUNT = APPLICATION_VND_FLIES + ".account";
public static final String APPLICATION_FLIES_ACCOUNT_XML = APPLICATION_FLIES_ACCOUNT + XML;
public static final String APPLICATION_FLIES_ACCOUNT_JSON = APPLICATION_FLIES_ACCOUNT + JSON;

public static final String APPLICATION_FLIES_VERSION = APPLICATION_VND_FLIES + ".Version";
public static final String APPLICATION_FLIES_VERSION_XML = APPLICATION_FLIES_VERSION + XML;
public static final String APPLICATION_FLIES_VERSION_JSON = APPLICATION_FLIES_VERSION + JSON;
public static final String APPLICATION_ZANATA_VERSION = APPLICATION_VND_ZANATA + ".Version";
public static final String APPLICATION_ZANATA_VERSION_XML = APPLICATION_ZANATA_VERSION + XML;
public static final String APPLICATION_ZANATA_VERSION_JSON = APPLICATION_ZANATA_VERSION + JSON;

/**
* Creates a format specific MediaType string given an existing media type
Expand Down
Expand Up @@ -16,12 +16,12 @@ public interface IAccountResource

@GET
@Produces(
{MediaTypes.APPLICATION_FLIES_ACCOUNT_XML, MediaTypes.APPLICATION_FLIES_ACCOUNT_JSON})
{MediaTypes.APPLICATION_ZANATA_ACCOUNT_XML, MediaTypes.APPLICATION_ZANATA_ACCOUNT_JSON})
public ClientResponse<Account> get();

@PUT
@Consumes(
{MediaTypes.APPLICATION_FLIES_ACCOUNT_XML, MediaTypes.APPLICATION_FLIES_ACCOUNT_JSON})
{MediaTypes.APPLICATION_ZANATA_ACCOUNT_XML, MediaTypes.APPLICATION_ZANATA_ACCOUNT_JSON})
public ClientResponse put(Account account);

}
Expand Up @@ -15,11 +15,11 @@ public interface IProjectIterationResource
{

@GET
@Produces( { MediaTypes.APPLICATION_FLIES_PROJECT_ITERATION_XML, MediaTypes.APPLICATION_FLIES_PROJECT_ITERATION_JSON })
@Produces( { MediaTypes.APPLICATION_ZANATA_PROJECT_ITERATION_XML, MediaTypes.APPLICATION_ZANATA_PROJECT_ITERATION_JSON })
public ClientResponse<ProjectIteration> get();

@PUT
@Consumes( { MediaTypes.APPLICATION_FLIES_PROJECT_ITERATION_XML, MediaTypes.APPLICATION_FLIES_PROJECT_ITERATION_JSON })
@Consumes( { MediaTypes.APPLICATION_ZANATA_PROJECT_ITERATION_XML, MediaTypes.APPLICATION_ZANATA_PROJECT_ITERATION_JSON })
public ClientResponse put(ProjectIteration project);

// @Path("/documents")
Expand Down
Expand Up @@ -15,11 +15,11 @@ public interface IProjectResource
{

@GET
@Produces( { MediaTypes.APPLICATION_FLIES_PROJECT_XML, MediaTypes.APPLICATION_FLIES_PROJECT_ITERATION_JSON })
@Produces( { MediaTypes.APPLICATION_ZANATA_PROJECT_XML, MediaTypes.APPLICATION_ZANATA_PROJECT_ITERATION_JSON })
public ClientResponse<Project> get();

@PUT
@Consumes( { MediaTypes.APPLICATION_FLIES_PROJECT_XML, MediaTypes.APPLICATION_FLIES_PROJECT_ITERATION_JSON })
@Consumes( { MediaTypes.APPLICATION_ZANATA_PROJECT_XML, MediaTypes.APPLICATION_ZANATA_PROJECT_ITERATION_JSON })
public ClientResponse put(Project project);

}
Expand Up @@ -16,7 +16,7 @@ public interface IProjectsResource
{

@GET
@Produces( { MediaTypes.APPLICATION_FLIES_PROJECTS_XML, MediaTypes.APPLICATION_FLIES_PROJECTS_JSON })
@Produces( { MediaTypes.APPLICATION_ZANATA_PROJECTS_XML, MediaTypes.APPLICATION_ZANATA_PROJECTS_JSON })
public ClientResponse<List<Project>> get();

}
Expand Up @@ -32,7 +32,7 @@
public interface IVersion
{
@GET
@Produces({ MediaTypes.APPLICATION_FLIES_VERSION_XML })
@Produces({ MediaTypes.APPLICATION_ZANATA_VERSION_XML })
public VersionInfo get();

}
Expand Up @@ -155,7 +155,7 @@ public void setTribes(Set<String> tribes)
@Override
public String getMediaType(Format format)
{
return MediaTypes.APPLICATION_FLIES_ACCOUNT + format;
return MediaTypes.APPLICATION_ZANATA_ACCOUNT + format;
}

@Override
Expand Down
Expand Up @@ -176,7 +176,7 @@ public Collection<Project> createSamples()
@Override
public String getMediaType(Format format)
{
return MediaTypes.APPLICATION_FLIES_PROJECT + format;
return MediaTypes.APPLICATION_ZANATA_PROJECT + format;
}

@Override
Expand Down
Expand Up @@ -117,7 +117,7 @@ public Collection<ProjectIteration> createSamples()
@Override
public String getMediaType(Format format)
{
return MediaTypes.APPLICATION_FLIES_PROJECT_ITERATION + format;
return MediaTypes.APPLICATION_ZANATA_PROJECT_ITERATION + format;
}

@Override
Expand Down
@@ -1,3 +1,3 @@
@javax.xml.bind.annotation.XmlSchema(namespace = org.zanata.common.Namespaces.FLIES)
@javax.xml.bind.annotation.XmlSchema(namespace = org.zanata.common.Namespaces.ZANATA_API)
package org.zanata.rest.dto;

@@ -1,3 +1,3 @@
@javax.xml.bind.annotation.XmlSchema(namespace = org.zanata.common.Namespaces.FLIES)
@javax.xml.bind.annotation.XmlSchema(namespace = org.zanata.common.Namespaces.ZANATA_API)
package org.zanata.rest.dto.resource;

Expand Up @@ -39,11 +39,11 @@ public interface AccountResource
{

@GET
@Produces({ MediaTypes.APPLICATION_FLIES_ACCOUNT_XML, MediaTypes.APPLICATION_FLIES_ACCOUNT_JSON })
@Produces({ MediaTypes.APPLICATION_ZANATA_ACCOUNT_XML, MediaTypes.APPLICATION_ZANATA_ACCOUNT_JSON })
public Response get();

@PUT
@Consumes({ MediaTypes.APPLICATION_FLIES_ACCOUNT_XML, MediaTypes.APPLICATION_FLIES_ACCOUNT_JSON })
@Consumes({ MediaTypes.APPLICATION_ZANATA_ACCOUNT_XML, MediaTypes.APPLICATION_ZANATA_ACCOUNT_JSON })
public Response put(Account account);

}
Expand Up @@ -42,15 +42,15 @@ public interface ProjectIterationResource
{

@HEAD
@Produces({ MediaTypes.APPLICATION_FLIES_PROJECT_ITERATION_XML, MediaTypes.APPLICATION_FLIES_PROJECT_ITERATION_JSON, MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
@Produces({ MediaTypes.APPLICATION_ZANATA_PROJECT_ITERATION_XML, MediaTypes.APPLICATION_ZANATA_PROJECT_ITERATION_JSON, MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
public Response head();

@GET
@Produces({ MediaTypes.APPLICATION_FLIES_PROJECT_ITERATION_XML, MediaTypes.APPLICATION_FLIES_PROJECT_ITERATION_JSON, MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
@Produces({ MediaTypes.APPLICATION_ZANATA_PROJECT_ITERATION_XML, MediaTypes.APPLICATION_ZANATA_PROJECT_ITERATION_JSON, MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
public Response get();

@PUT
@Consumes({ MediaTypes.APPLICATION_FLIES_PROJECT_ITERATION_XML, MediaTypes.APPLICATION_FLIES_PROJECT_ITERATION_JSON, MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
@Consumes({ MediaTypes.APPLICATION_ZANATA_PROJECT_ITERATION_XML, MediaTypes.APPLICATION_ZANATA_PROJECT_ITERATION_JSON, MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
public Response put(InputStream messageBody);

}
Expand Up @@ -42,15 +42,15 @@ public interface ProjectResource
{

@HEAD
@Produces({ MediaTypes.APPLICATION_FLIES_PROJECT_XML, MediaTypes.APPLICATION_FLIES_PROJECT_JSON, MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
@Produces({ MediaTypes.APPLICATION_ZANATA_PROJECT_XML, MediaTypes.APPLICATION_ZANATA_PROJECT_JSON, MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
public Response head();

@GET
@Produces({ MediaTypes.APPLICATION_FLIES_PROJECT_XML, MediaTypes.APPLICATION_FLIES_PROJECT_JSON, MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
@Produces({ MediaTypes.APPLICATION_ZANATA_PROJECT_XML, MediaTypes.APPLICATION_ZANATA_PROJECT_JSON, MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
public Response get();

@PUT
@Consumes({ MediaTypes.APPLICATION_FLIES_PROJECT_XML, MediaTypes.APPLICATION_FLIES_PROJECT_JSON, MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
@Consumes({ MediaTypes.APPLICATION_ZANATA_PROJECT_XML, MediaTypes.APPLICATION_ZANATA_PROJECT_JSON, MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
public Response put(InputStream messageBody);

}

0 comments on commit b1ab256

Please sign in to comment.