Skip to content

Commit

Permalink
Release 2.6.0
Browse files Browse the repository at this point in the history 
Merge from branch '2.5.x'
  • Loading branch information
@goglepox
goglepox committed Jan 29, 2013
2 parents 812f438 + 94f1ad2 commit 5b4bcea
Show file tree
Hide file tree
Showing 2,560 changed files with 251,028 additions and 213,359 deletions.
42 changes: 33 additions & 9 deletions externals/com.hp.hpl.jena.arq/META-INF/MANIFEST.MF
View file
Expand Up @@ -2,15 +2,17 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Jena
Bundle-SymbolicName: com.hp.hpl.jena.arq;singleton:=true
Bundle-Version: 2.8.2
Bundle-Version: 2.8.8
Require-Bundle: org.eclipse.core.runtime,
slf4j.api;bundle-version="1.5.0",
com.hp.hpl.jena;bundle-version="2.6.2"
slf4j.api,
com.hp.hpl.jena
Bundle-ClassPath: .
Bundle-Activator: net.bioclipse.jena.arq.Activator
Bundle-ActivationPolicy: lazy
Bundle-Vendor: The Bioclipse Team
Import-Package: org.apache.log4j,
org.apache.xerces.impl.dv,
org.apache.xerces.impl.validation,
org.apache.xerces.impl.xpath.regex,
org.apache.xerces.util
Export-Package: arq,
Expand All @@ -21,7 +23,7 @@ Export-Package: arq,
com.hp.hpl.jena.sparql,
com.hp.hpl.jena.sparql.algebra,
com.hp.hpl.jena.sparql.algebra.op,
com.hp.hpl.jena.sparql.algebra.opt,
com.hp.hpl.jena.sparql.algebra.optimize,
com.hp.hpl.jena.sparql.algebra.table,
com.hp.hpl.jena.sparql.core,
com.hp.hpl.jena.sparql.core.assembler,
Expand All @@ -40,18 +42,16 @@ Export-Package: arq,
com.hp.hpl.jena.sparql.expr.nodevalue,
com.hp.hpl.jena.sparql.function,
com.hp.hpl.jena.sparql.function.library,
com.hp.hpl.jena.sparql.graph,
com.hp.hpl.jena.sparql.lang,
com.hp.hpl.jena.sparql.lang.arq,
com.hp.hpl.jena.sparql.lang.rdql,
com.hp.hpl.jena.sparql.lang.sparql_10,
com.hp.hpl.jena.sparql.lang.sparql_11,
com.hp.hpl.jena.sparql.lib,
com.hp.hpl.jena.sparql.lib.cache,
com.hp.hpl.jena.sparql.lib.iterator,
com.hp.hpl.jena.sparql.lib.org.json,
com.hp.hpl.jena.sparql.mgt,
com.hp.hpl.jena.sparql.modify,
com.hp.hpl.jena.sparql.modify.op,
com.hp.hpl.jena.sparql.modify.request,
com.hp.hpl.jena.sparql.path,
com.hp.hpl.jena.sparql.pfunction,
com.hp.hpl.jena.sparql.pfunction.library,
Expand All @@ -69,4 +69,28 @@ Export-Package: arq,
com.hp.hpl.jena.sparql.util.graph,
com.hp.hpl.jena.sparql.vocabulary,
com.hp.hpl.jena.update,
net.bioclipse.jena.arq
net.bioclipse.jena.arq,
org.openjena.atlas,
org.openjena.atlas.event,
org.openjena.atlas.io,
org.openjena.atlas.iterator,
org.openjena.atlas.json,
org.openjena.atlas.json.io,
org.openjena.atlas.json.io.parser,
org.openjena.atlas.json.io.parserjavacc,
org.openjena.atlas.json.io.parserjavacc.javacc,
org.openjena.atlas.lib,
org.openjena.atlas.lib.cache,
org.openjena.atlas.logging,
org.openjena.atlas.logging.java,
org.openjena.atlas.test,
org.openjena.atlas.web,
org.openjena.riot,
org.openjena.riot.checker,
org.openjena.riot.lang,
org.openjena.riot.out,
org.openjena.riot.pipeline,
org.openjena.riot.pipeline.inf,
org.openjena.riot.pipeline.normalize,
org.openjena.riot.system,
org.openjena.riot.tokens
4 changes: 0 additions & 4 deletions externals/com.hp.hpl.jena.arq/src/META-INF/MANIFEST.MF
View file

This file was deleted.

8 changes: 3 additions & 5 deletions externals/com.hp.hpl.jena.arq/src/arq/arq.java
View file
Expand Up @@ -6,12 +6,10 @@

package arq;

import java.util.* ;
import java.util.ArrayList ;
import java.util.List ;

/** A program to execute queries from the command line in ARQ mode.
*
* @author Andy Seaborne
*/
/** A program to execute queries from the command line in ARQ mode. */

public class arq
{
Expand Down
4 changes: 1 addition & 3 deletions externals/com.hp.hpl.jena.arq/src/arq/cmd/CmdException.java
View file
Expand Up @@ -7,9 +7,7 @@
package arq.cmd;

/**
* Indicate that something went wrong - while executing the command or processing the request.
* @author Andy Seaborne
*/
* Indicate that something went wrong - while executing the command or processing the request. */

public class CmdException extends RuntimeException
{
Expand Down
5 changes: 1 addition & 4 deletions externals/com.hp.hpl.jena.arq/src/arq/cmd/CmdUtils.java
View file
Expand Up @@ -7,10 +7,7 @@
package arq.cmd;


/** Odds and ends
*
* @author Andy Seaborne
*/
/** Odds and ends */

public class CmdUtils
{
Expand Down
4 changes: 1 addition & 3 deletions externals/com.hp.hpl.jena.arq/src/arq/cmd/TerminationException.java
View file
Expand Up @@ -8,9 +8,7 @@

/** Exception used to indicate that the command should end now.
* Use instead of System.exit so that a wrapper can catch (else a command server
* wil exit wrongly).
* @author Andy Seaborne
*/
* wil exit wrongly). */

public class TerminationException extends CmdException
{
Expand Down
4 changes: 3 additions & 1 deletion externals/com.hp.hpl.jena.arq/src/arq/cmdline/Arg.java
View file
Expand Up @@ -6,7 +6,9 @@

package arq.cmdline;

import java.util.*;
import java.util.ArrayList ;
import java.util.Iterator ;
import java.util.List ;

public class Arg
{
Expand Down
9 changes: 4 additions & 5 deletions externals/com.hp.hpl.jena.arq/src/arq/cmdline/ArgDecl.java
View file
Expand Up @@ -5,12 +5,11 @@

package arq.cmdline;

import java.util.* ;
import java.util.ArrayList ;
import java.util.Iterator ;
import java.util.List ;

/** A command line argument specification.
*
* @author Andy Seaborne
*/
/** A command line argument specification. */
public class ArgDecl
{
boolean takesValue ;
Expand Down
12 changes: 7 additions & 5 deletions externals/com.hp.hpl.jena.arq/src/arq/cmdline/CmdARQ.java
View file
Expand Up @@ -6,15 +6,16 @@

package arq.cmdline;

import com.hp.hpl.jena.sparql.engine.iterator.QueryIteratorBase;
import com.hp.hpl.jena.sparql.util.Utils;

import com.hp.hpl.jena.query.ARQ;
import com.hp.hpl.jena.query.ARQ ;
import com.hp.hpl.jena.sparql.engine.iterator.QueryIteratorBase ;
import com.hp.hpl.jena.sparql.util.Utils ;

public abstract class CmdARQ extends CmdGeneral
{
protected ModSymbol modSymbol = new ModSymbol() ;
ArgDecl strictDecl = new ArgDecl(ArgDecl.NoValue, "strict", "basic") ;
ArgDecl strictDecl = new ArgDecl(ArgDecl.NoValue, "strict") ;

protected boolean cmdStrictMode = false ;

protected CmdARQ(String[] argv)
{
Expand All @@ -32,6 +33,7 @@ protected void processModulesAndArgs()
modVersion.printVersionAndExit() ;
if ( super.contains(strictDecl) )
ARQ.setStrictMode() ;
cmdStrictMode = super.contains(strictDecl) ;
if ( modGeneral.debug )
QueryIteratorBase.traceIterators = true ;
}
Expand Down
2 changes: 1 addition & 1 deletion externals/com.hp.hpl.jena.arq/src/arq/cmdline/CmdARQ_SSE.java
View file
Expand Up @@ -6,7 +6,7 @@

package arq.cmdline;

import com.hp.hpl.jena.sparql.sse.Item;
import com.hp.hpl.jena.sparql.sse.Item ;

/** Root of read an SSE file and do something */
public abstract class CmdARQ_SSE extends CmdARQ
Expand Down
6 changes: 3 additions & 3 deletions externals/com.hp.hpl.jena.arq/src/arq/cmdline/CmdArgModule.java
View file
Expand Up @@ -6,9 +6,9 @@

package arq.cmdline;

import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import java.util.ArrayList ;
import java.util.Iterator ;
import java.util.List ;

public abstract class CmdArgModule extends CmdMain
{
Expand Down
12 changes: 6 additions & 6 deletions externals/com.hp.hpl.jena.arq/src/arq/cmdline/CmdGeneral.java
View file
Expand Up @@ -6,20 +6,20 @@

package arq.cmdline;

import java.io.PrintStream;
import java.io.PrintStream ;

import arq.cmd.CmdUtils;
import arq.cmd.TerminationException;
import org.openjena.atlas.io.IndentedWriter ;
import arq.cmd.CmdUtils ;
import arq.cmd.TerminationException ;

import com.hp.hpl.jena.sparql.util.ALog;
import com.hp.hpl.jena.sparql.util.IndentedWriter;
import org.openjena.atlas.logging.Log ;

// Added usage + some common flags
// This is the usual starting point for any sub

public abstract class CmdGeneral extends CmdArgModule implements CallbackHelp//, VersionCallback
{
static { ALog.setLog4j() ; CmdUtils.setN3Params() ; }
static { Log.setLog4j() ; CmdUtils.setN3Params() ; }

protected ModGeneral modGeneral = new ModGeneral(this) ;
protected ModVersion modVersion = new ModVersion(true) ;
Expand Down
15 changes: 10 additions & 5 deletions ...hp.hpl.jena.tdb/src/atlas/lib/Action.java → ...hpl.jena.arq/src/arq/cmdline/CmdLARQ.java
View file
@@ -1,18 +1,23 @@
/*
* (c) Copyright 2007, 2008, 2009 Hewlett-Packard Development Company, LP
* (c) Copyright 2010 Talis Systems Ltd.
* All rights reserved.
* [See end of file]
*/

package atlas.lib;
package arq.cmdline;

public interface Action<T>

public abstract class CmdLARQ extends CmdARQ
{
public void apply(T item) ;
protected CmdLARQ(String[] argv)
{
super(argv) ;
}

}

/*
* (c) Copyright 2007, 2008, 2009 Hewlett-Packard Development Company, LP
* (c) Copyright 2010 Talis Systems Ltd.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Expand Down
19 changes: 10 additions & 9 deletions externals/com.hp.hpl.jena.arq/src/arq/cmdline/CmdLineArgs.java
View file
Expand Up @@ -6,19 +6,20 @@

package arq.cmdline;

import java.util.*;
import java.util.ArrayList ;
import java.util.HashMap ;
import java.util.Iterator ;
import java.util.List ;
import java.util.Map ;

import arq.cmd.CmdException;
import arq.cmd.CmdException ;

import com.hp.hpl.jena.util.FileManager;

import com.hp.hpl.jena.sparql.util.ALog;
import org.openjena.atlas.logging.Log ;
import com.hp.hpl.jena.util.FileManager ;


/** Command line, using the common named/positional arguments paradigm
* (also called options/arguments).
* @author Andy Seaborne
*/
* (also called options/arguments). */
public class CmdLineArgs extends CommandLineBase
{
public CmdLineArgs(String[] args)
Expand Down Expand Up @@ -74,7 +75,7 @@ public CmdLineArgs add(ArgDecl arg)
{
String name = iter.next();
if ( argMap.containsKey(name))
ALog.warn(this, "Argument '"+name+"' already added") ;
Log.warn(this, "Argument '"+name+"' already added") ;
argMap.put(name, arg) ;
}
return this ;
Expand Down
13 changes: 5 additions & 8 deletions externals/com.hp.hpl.jena.arq/src/arq/cmdline/CmdMain.java
View file
Expand Up @@ -6,11 +6,11 @@

package arq.cmdline;

import com.hp.hpl.jena.shared.JenaException;
import com.hp.hpl.jena.sparql.util.Utils;
import arq.cmd.CmdException ;
import arq.cmd.TerminationException ;

import arq.cmd.CmdException;
import arq.cmd.TerminationException;
import com.hp.hpl.jena.shared.JenaException ;
import com.hp.hpl.jena.sparql.util.Utils ;

/** Adds main()-like methods
*
Expand All @@ -19,10 +19,7 @@
* which never returns and routes thing to System.exit.
* or call
* new YourCommand(args).mainMethod()
* which should not call System.exit anywhere
*
* @author Andy Seaborne
*/
* which should not call System.exit anywhere */

public abstract class CmdMain extends CmdLineArgs
{
Expand Down
25 changes: 22 additions & 3 deletions externals/com.hp.hpl.jena.arq/src/arq/cmdline/CmdUpdate.java
View file
Expand Up @@ -6,19 +6,38 @@

package arq.cmdline;

import com.hp.hpl.jena.rdf.model.ModelFactory;
import com.hp.hpl.jena.update.GraphStore;
import com.hp.hpl.jena.query.Syntax ;
import com.hp.hpl.jena.rdf.model.ModelFactory ;
import com.hp.hpl.jena.update.GraphStore ;

public abstract class CmdUpdate extends CmdARQ
{
protected ModGraphStore modGraphStore = new ModGraphStore() ;

protected Syntax updateSyntax = Syntax.defaultUpdateSyntax ;

protected CmdUpdate(String[] argv)
{
super(argv) ;
modGraphStore = setModGraphStore() ;
addModule(modGraphStore) ;

}

protected ModGraphStore setModGraphStore()
{
return new ModGraphStore() ;
}


@Override
protected void processModulesAndArgs()
{
super.processModulesAndArgs() ;
if ( super.cmdStrictMode )
updateSyntax = Syntax.syntaxSPARQL_11 ;
}


@Override
protected final void exec()
{
Expand Down
7 changes: 3 additions & 4 deletions externals/com.hp.hpl.jena.arq/src/arq/cmdline/CommandLineBase.java
View file
Expand Up @@ -5,12 +5,11 @@

package arq.cmdline;

import java.util.* ;
import java.util.ArrayList ;
import java.util.List ;

/**
* Incoming String[] to a list of argument/values + items.
* @author Andy Seaborne
*/
* Incoming String[] to a list of argument/values + items. */


public class CommandLineBase
Expand Down

0 comments on commit 5b4bcea

Please sign in to comment.