Skip to content

Commit

Permalink
Graphity -> AtomGraph
Browse files Browse the repository at this point in the history
  • Loading branch information
Martynas committed Sep 1, 2016
1 parent ff71176 commit 8a11617
Show file tree
Hide file tree
Showing 108 changed files with 843 additions and 849 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -48,13 +48,13 @@ Dependencies to other AtomGraph artifacts will be resolved automagically during
classes is attached, and you can address it as a separate artifact:

<dependency>
<groupId>org.graphity</groupId>
<groupId>com.atomgraph</groupId>
<artifactId>client</artifactId>
<version>1.1.3</version>
<classifier>classes</classifier>
</dependency>
<dependency>
<groupId>org.graphity</groupId>
<groupId>com.atomgraph</groupId>
<artifactId>client</artifactId>
<version>1.1.3</version>
<type>war</type>
Expand Down
22 changes: 11 additions & 11 deletions pom.xml
Original file line number Diff line number Diff line change
@@ -1,27 +1,27 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<groupId>org.graphity</groupId>
<groupId>com.atomgraph</groupId>
<artifactId>client</artifactId>
<version>1.1.4-SNAPSHOT</version>

<name>Graphity Client</name>
<name>AtomGraph Client</name>
<description>Generic Linked Data client</description>
<url>https://github.com/Graphity/graphity-client</url>
<url>https://github.com/AtomGraph/Web-Client</url>

<packaging>${packaging.type}</packaging>
<!-- <packaging>war</packaging> -->

<developers>
<developer>
<id>pumba-lt</id>
<email>martynas@graphity.org</email>
<email>martynas@atomgraph.com</email>
<roles>
<role>Developer</role>
<role>Founder</role>
</roles>
<organization>Graphity</organization>
<organizationUrl>http://graphityhq.com</organizationUrl>
<organization>AtomGraph</organization>
<organizationUrl>http://atomgraph.com</organizationUrl>
</developer>
</developers>

Expand All @@ -40,9 +40,9 @@
</properties>

<scm>
<url>https://github.com/Graphity/graphity-client</url>
<connection>scm:git:git://github.com/Graphity/graphity-client.git</connection>
<developerConnection>scm:git:git@github.com:pumba-lt/graphity-client.git</developerConnection>
<url>https://github.com/AtomGraph/Web-Client</url>
<connection>scm:git:git://github.com/AtomGraph/Web-Client.git</connection>
<developerConnection>scm:git:git@github.com:AtomGraph/Web-Client.git</developerConnection>
</scm>

<repositories>
Expand Down Expand Up @@ -138,8 +138,8 @@
<goal>unpack-dependencies</goal>
</goals>
<configuration>
<includeGroupIds>org.graphity</includeGroupIds>
<includes>**\/*.xsl,**\/*.ttl,**\/*.rdf,**\/*.owl</includes>
<includeGroupIds>com.atomgraph</includeGroupIds>
<includes>**\/*.ttl,**\/*.rdf,**\/*.owl</includes>
<outputDirectory>${project.build.directory}/classes</outputDirectory>
</configuration>
</execution>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* Copyright 2013 Martynas Jusevičius <martynas@graphity.org>
* Copyright 2013 Martynas Jusevičius <martynas@atomgraph.com>
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -14,7 +14,7 @@
* limitations under the License.
*
*/
package org.graphity.client;
package com.atomgraph.client;

import org.apache.jena.ontology.OntDocumentManager;
import org.apache.jena.util.FileManager;
Expand All @@ -28,39 +28,39 @@
import org.apache.jena.riot.Lang;
import org.apache.jena.riot.RDFFormat;
import org.apache.jena.riot.RDFWriterRegistry;
import org.graphity.client.locator.PrefixMapper;
import org.graphity.client.mapper.ClientErrorExceptionMapper;
import org.graphity.client.mapper.NotFoundExceptionMapper;
import org.graphity.client.mapper.jersey.ClientHandlerExceptionMapper;
import org.graphity.client.mapper.jersey.UniformInterfaceExceptionMapper;
import org.graphity.client.model.impl.ProxyResourceBase;
import org.graphity.client.provider.DataManagerProvider;
import org.graphity.client.provider.MediaTypesProvider;
import org.graphity.client.provider.TemplatesProvider;
import org.graphity.client.writer.ModelXSLTWriter;
import org.graphity.core.provider.QueryParamProvider;
import org.graphity.core.provider.ResultSetProvider;
import org.graphity.core.provider.UpdateRequestReader;
import org.graphity.client.util.DataManager;
import org.graphity.client.vocabulary.GC;
import org.graphity.core.provider.ClientProvider;
import org.graphity.core.provider.ModelProvider;
import org.graphity.core.provider.SPARQLEndpointOriginProvider;
import org.graphity.core.provider.SPARQLEndpointProvider;
import org.graphity.core.vocabulary.G;
import com.atomgraph.client.locator.PrefixMapper;
import com.atomgraph.client.mapper.ClientErrorExceptionMapper;
import com.atomgraph.client.mapper.NotFoundExceptionMapper;
import com.atomgraph.client.mapper.jersey.ClientHandlerExceptionMapper;
import com.atomgraph.client.mapper.jersey.UniformInterfaceExceptionMapper;
import com.atomgraph.client.model.impl.ProxyResourceBase;
import com.atomgraph.client.provider.DataManagerProvider;
import com.atomgraph.client.provider.MediaTypesProvider;
import com.atomgraph.client.provider.TemplatesProvider;
import com.atomgraph.client.writer.ModelXSLTWriter;
import com.atomgraph.core.provider.QueryParamProvider;
import com.atomgraph.core.provider.ResultSetProvider;
import com.atomgraph.core.provider.UpdateRequestReader;
import com.atomgraph.client.util.DataManager;
import com.atomgraph.client.vocabulary.GC;
import com.atomgraph.core.provider.ClientProvider;
import com.atomgraph.core.provider.ModelProvider;
import com.atomgraph.core.provider.SPARQLEndpointOriginProvider;
import com.atomgraph.core.provider.SPARQLEndpointProvider;
import com.atomgraph.core.vocabulary.AC;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

/**
* Graphity Client JAX-RS application base class.
* AtomGraph Client JAX-RS application base class.
* Can be extended or used as it is (needs to be registered in web.xml).
* Needs to register JAX-RS root resource classes and providers.
*
* @author Martynas Jusevičius <martynas@graphity.org>
* @author Martynas Jusevičius <martynas@atomgraph.com>
* @see <a href="http://docs.oracle.com/javaee/6/api/javax/ws/rs/core/Application.html">JAX-RS Application</a>
* @see <a href="http://docs.oracle.com/cd/E24329_01/web.1211/e24983/configure.htm#CACEAEGG">Packaging the RESTful Web Service Application Using web.xml With Application Subclass</a>
*/
public class Application extends org.graphity.core.Application
public class Application extends com.atomgraph.core.Application
{
private static final Logger log = LoggerFactory.getLogger(Application.class);

Expand Down Expand Up @@ -89,7 +89,7 @@ public Application(@Context ServletConfig servletConfig)
singletons.add(new MediaTypesProvider());
singletons.add(new DataManagerProvider());
singletons.add(new ClientProvider());
singletons.add(new org.graphity.core.provider.DataManagerProvider());
singletons.add(new com.atomgraph.core.provider.DataManagerProvider());
singletons.add(new NotFoundExceptionMapper());
singletons.add(new ClientErrorExceptionMapper());
singletons.add(new UniformInterfaceExceptionMapper());
Expand All @@ -101,8 +101,8 @@ public Application(@Context ServletConfig servletConfig)
/**
* Initializes (post construction) DataManager, its LocationMapper and Locators, and Context
*
* @see org.graphity.client.util.DataManager
* @see org.graphity.processor.locator
* @see com.atomgraph.client.util.DataManager
* @see com.atomgraph.processor.locator
* @see <a href="http://jena.apache.org/documentation/javadoc/jena/com/hp/hpl/jena/util/FileManager.html">FileManager</a>
* @see <a href="http://jena.apache.org/documentation/javadoc/jena/com/hp/hpl/jena/util/LocationMapper.html">LocationMapper</a>
* @see <a href="http://jena.apache.org/documentation/javadoc/jena/com/hp/hpl/jena/util/Locator.html">Locator</a>
Expand All @@ -119,8 +119,8 @@ public void init()
if (log.isDebugEnabled()) log.debug("LocationMapper.get(): {}", LocationMapper.get());

DataManager manager = new DataManager(mapper, new MediaTypesProvider().getMediaTypes(),
getBooleanParam(getServletConfig(), G.cacheModelLoads),
getBooleanParam(getServletConfig(), G.preemptiveAuth),
getBooleanParam(getServletConfig(), AC.cacheModelLoads),
getBooleanParam(getServletConfig(), AC.preemptiveAuth),
getBooleanParam(getServletConfig(), GC.resolvingUncached));
FileManager.setStdLocators(manager);
FileManager.setGlobalFileManager(manager);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2016 Martynas Jusevičius <martynas@graphity.org>.
* Copyright 2016 Martynas Jusevičius <martynas@atomgraph.com>.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -14,7 +14,7 @@
* limitations under the License.
*/

package org.graphity.client;
package com.atomgraph.client;

import com.sun.jersey.api.client.ClientResponse;
import com.sun.jersey.api.client.WebResource;
Expand All @@ -26,7 +26,7 @@

/**
*
* @author Martynas Jusevičius <martynas@graphity.org>
* @author Martynas Jusevičius <martynas@atomgraph.com>
*/
public class LinkedDataClient
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2015 Martynas Jusevičius <martynas@graphity.org>.
* Copyright 2015 Martynas Jusevičius <martynas@atomgraph.com>.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -14,13 +14,13 @@
* limitations under the License.
*/

package org.graphity.client.exception;
package com.atomgraph.client.exception;

import com.sun.jersey.api.client.ClientResponse;

/**
*
* @author Martynas Jusevičius <martynas@graphity.org>
* @author Martynas Jusevičius <martynas@atomgraph.com>
*/
public class ClientErrorException extends RuntimeException
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
* To change this template file, choose Tools | Templates
* and open the template in the editor.
*/
package org.graphity.client.exception;
package com.atomgraph.client.exception;

/**
*
* @author Martynas Jusevičius <martynas@graphity.org>
* @author Martynas Jusevičius <martynas@atomgraph.com>
*/
public class OntClassNotFoundException extends RuntimeException
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2016 Martynas Jusevičius <martynas@graphity.org>.
* Copyright 2016 Martynas Jusevičius <martynas@atomgraph.com>.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -14,11 +14,11 @@
* limitations under the License.
*/

package org.graphity.client.exception;
package com.atomgraph.client.exception;

/**
*
* @author Martynas Jusevičius <martynas@graphity.org>
* @author Martynas Jusevičius <martynas@atomgraph.com>
*/
public class SitemapException extends RuntimeException
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
* only if the new code is made subject to such option by the copyright
* holder.
*/
package org.graphity.client.filter.request;
package com.atomgraph.client.filter.request;

import com.sun.jersey.api.core.ResourceConfig;
import com.sun.jersey.core.header.MediaTypes;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2015 Martynas Jusevičius <martynas@graphity.org>.
* Copyright 2015 Martynas Jusevičius <martynas@atomgraph.com>.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -14,7 +14,7 @@
* limitations under the License.
*/

package org.graphity.client.filter.response;
package com.atomgraph.client.filter.response;

import org.apache.jena.ontology.AllValuesFromRestriction;
import org.apache.jena.ontology.OntClass;
Expand All @@ -34,7 +34,7 @@
import java.util.List;
import java.util.Map;
import java.util.Set;
import org.graphity.client.exception.SitemapException;
import com.atomgraph.client.exception.SitemapException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.topbraid.spin.inference.SPINConstructors;
Expand All @@ -46,7 +46,7 @@

/**
*
* @author Martynas Jusevičius <martynas@graphity.org>
* @author Martynas Jusevičius <martynas@atomgraph.com>
*/
public class ConstructorBase
{
Expand Down
Loading

0 comments on commit 8a11617

Please sign in to comment.