Mercurial > hg > FeDeRate / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset
~ fixes the package names
authorAlexandre Bertails <alexandre@bertails.org>
Sun, 09 Jan 2011 17:42:49 -0500
changeset 300 1fe229a63701
parent 299 6dea4729cef8
child 301 0723e0dfeb73
~ fixes the package names
directmapping/src/main/scala/DirectMapping.scala
directmapping/src/test/scala/DirectMappingTest.scala
project/build/RDB2RDF.scala
rdb/src/main/scala/RDB.scala
rdf/src/main/scala/RDF.scala
rdfxml/src/main/scala/RDFXML.scala
rdfxml/src/test/scala/RDFXMLTest.scala
sparql/src/main/scala/GraphAnalyser.scala
sparql/src/main/scala/SPARQL.scala
sparql/src/test/scala/SparqlTest.scala
sparql2sparql/src/main/scala/SparqlToSparql.scala
sparql2sparql/src/test/scala/SparqlToSparqlTest.scala
sparql2sparql2sql/src/main/scala/SparqlToSparqlToSql.scala
sparql2sparql2sql/src/test/scala/SparqlToSparqlToSqlTest.scala
sparql2sql/src/main/scala/SparqlToSql.scala
sparql2sql/src/test/scala/SparqlToSqlTest.scala
sparql2sqlendpoint/src/main/scala/Servlet.scala
sql/src/main/scala/AddOrderedSet.scala
sql/src/main/scala/SQL.scala
sql/src/test/scala/SQLTest.scala
turtle/src/main/scala/turtle.scala
turtle/src/test/scala/turtleTest.scala 
--- a/directmapping/src/main/scala/DirectMapping.scala	Sun Jan 09 17:23:40 2011 -0500
+++ b/directmapping/src/main/scala/DirectMapping.scala	Sun Jan 09 17:42:49 2011 -0500
@@ -1,8 +1,8 @@
-package org.w3.sw.directmapping
+package org.w3.directmapping
 
-import org.w3.sw._
+import org.w3.rdf._
 
-import org.w3.sw.rdb.RDB._
+import org.w3.rdb.RDB._
 
 trait DirectMapping[IRI,
                     Graph <: Traversable[Triple],
--- a/directmapping/src/test/scala/DirectMappingTest.scala	Sun Jan 09 17:23:40 2011 -0500
+++ b/directmapping/src/test/scala/DirectMappingTest.scala	Sun Jan 09 17:42:49 2011 -0500
@@ -1,10 +1,10 @@
-package org.w3.sw.directmapping
+package org.w3.directmapping
 
-import org.w3.sw._
-import org.w3.sw.rdb.RDB._
-import org.w3.sw.sql
-import org.w3.sw.turtle.Turtle
-//import org.w3.sw.directmapping.DirectMapping
+import org.w3.rdf._
+import org.w3.rdb.RDB._
+import org.w3.sql
+import org.w3.rdf.turtle.Turtle
+//import org.w3.directmapping.DirectMapping
 import java.io.File
 
 import org.scalatest.FunSuite
--- a/project/build/RDB2RDF.scala	Sun Jan 09 17:23:40 2011 -0500
+++ b/project/build/RDB2RDF.scala	Sun Jan 09 17:42:49 2011 -0500
@@ -72,7 +72,7 @@
   class SPARQL2SQLEndPointJar(info: ProjectInfo) extends DefaultProject(info) with ProguardProject {
 
     // defines the default main class
-    override def mainClass: Option[String] = Some("org.w3.sw.sparql2sqlendpoint.SPARQL2SQLEndpoint")
+    override def mainClass: Option[String] = Some("org.w3.sparql2sqlendpoint.SPARQL2SQLEndpoint")
 
     // tells Proguard to take some more JAR/WAR/.class
     override def proguardInJars =
--- a/rdb/src/main/scala/RDB.scala	Sun Jan 09 17:23:40 2011 -0500
+++ b/rdb/src/main/scala/RDB.scala	Sun Jan 09 17:42:49 2011 -0500
@@ -1,4 +1,4 @@
-package org.w3.sw.rdb
+package org.w3.rdb
 
 /**
  * Relational structure
--- a/rdf/src/main/scala/RDF.scala	Sun Jan 09 17:23:40 2011 -0500
+++ b/rdf/src/main/scala/RDF.scala	Sun Jan 09 17:42:49 2011 -0500
@@ -1,4 +1,4 @@
-package org.w3.sw
+package org.w3.rdf
 
 import org.w3.isomorphic._
 
--- a/rdfxml/src/main/scala/RDFXML.scala	Sun Jan 09 17:23:40 2011 -0500
+++ b/rdfxml/src/main/scala/RDFXML.scala	Sun Jan 09 17:42:49 2011 -0500
@@ -1,6 +1,6 @@
-package org.w3.sw.rdfxml
+package org.w3.rdf.rdfxml
 
-import org.w3.sw._
+import org.w3.rdf._
 
 import com.hp.hpl.jena.rdf.arp._
 import org.xml.sax._
--- a/rdfxml/src/test/scala/RDFXMLTest.scala	Sun Jan 09 17:23:40 2011 -0500
+++ b/rdfxml/src/test/scala/RDFXMLTest.scala	Sun Jan 09 17:42:49 2011 -0500
@@ -1,6 +1,6 @@
-package org.w3.sw.rdfxml
+package org.w3.rdf.rdfxml
 
-import org.w3.sw._
+import org.w3.rdf._
 
 import org.scalatest.FunSuite
 
--- a/sparql/src/main/scala/GraphAnalyser.scala	Sun Jan 09 17:23:40 2011 -0500
+++ b/sparql/src/main/scala/GraphAnalyser.scala	Sun Jan 09 17:42:49 2011 -0500
@@ -1,4 +1,4 @@
-package org.w3.sw.util
+package org.w3.util
 
 import scala.collection.immutable._
 
--- a/sparql/src/main/scala/SPARQL.scala	Sun Jan 09 17:23:40 2011 -0500
+++ b/sparql/src/main/scala/SPARQL.scala	Sun Jan 09 17:42:49 2011 -0500
@@ -1,4 +1,4 @@
-package org.w3.sw.sparql
+package org.w3.sparql
 
 import scala.util.parsing.combinator._
 import java.net.URI
@@ -96,7 +96,7 @@
 	TableFilter(gp2.trim(terms), expr)
 
       case TriplesBlock(triplepatterns) => {
-	val r0 = new org.w3.sw.util.GraphAnalyzer[Term](Map[Term, Set[Term]]())
+	val r0 = new org.w3.util.GraphAnalyzer[Term](Map[Term, Set[Term]]())
 	/* Examine each triple, updating the compilation state. */
 	val r = triplepatterns.foldLeft(r0)((r, triple) => r.pair(triple.s, triple.o))
 	val useful = triplepatterns.foldLeft(Set[TriplePattern]())((s, t) => {
--- a/sparql/src/test/scala/SparqlTest.scala	Sun Jan 09 17:23:40 2011 -0500
+++ b/sparql/src/test/scala/SparqlTest.scala	Sun Jan 09 17:42:49 2011 -0500
@@ -1,4 +1,4 @@
-package org.w3.sw.sparql
+package org.w3.sparql
 
 import org.scalatest.FunSuite
 
--- a/sparql2sparql/src/main/scala/SparqlToSparql.scala	Sun Jan 09 17:23:40 2011 -0500
+++ b/sparql2sparql/src/main/scala/SparqlToSparql.scala	Sun Jan 09 17:42:49 2011 -0500
@@ -4,10 +4,10 @@
  * 
  */
 
-package org.w3.sw.sparql2sparql
+package org.w3.sparql2sparql
 
 import scala.util.parsing.combinator._
-import org.w3.sw.sparql
+import org.w3.sparql
 
 case class MapTarget (term:sparql.Term, nm:Option[NodePattern])
 
--- a/sparql2sparql/src/test/scala/SparqlToSparqlTest.scala	Sun Jan 09 17:23:40 2011 -0500
+++ b/sparql2sparql/src/test/scala/SparqlToSparqlTest.scala	Sun Jan 09 17:42:49 2011 -0500
@@ -2,11 +2,11 @@
  * $Id$
  */
 
-package org.w3.sw.sparql2sparql
+package org.w3.sparql2sparql
 
 import org.scalatest.FunSuite
 import java.net.URI
-import org.w3.sw.sparql.{Sparql, Var}
+import org.w3.sparql.{Sparql, Var}
 
 /* The SparqlToSparqlTest class transforms SPARQL queries to a relational data
  * structure and compares them to a structure parsed from SQL.
@@ -282,7 +282,7 @@
     ("c", "e"),
     ("e", "a"),
     ("e", "f"))
-    val r0 = new org.w3.sw.util.GraphAnalyzer[String](Map[String, Set[String]]())
+    val r0 = new org.w3.util.GraphAnalyzer[String](Map[String, Set[String]]())
     val r = graph.foldLeft(r0)((r, pair) => r.pair(pair._1, pair._2))
     val useful = graph.foldLeft(Set[(String,String)]())((s, pair) => {
       if (r.neededFor(Set("a", "f"), pair._1, Set(pair._2)) &&
--- a/sparql2sparql2sql/src/main/scala/SparqlToSparqlToSql.scala	Sun Jan 09 17:23:40 2011 -0500
+++ b/sparql2sparql2sql/src/main/scala/SparqlToSparqlToSql.scala	Sun Jan 09 17:42:49 2011 -0500
@@ -2,14 +2,14 @@
  * $Id$
  */
 
-package org.w3.sw.sparql2sparql2sql
+package org.w3.sparql2sparql2sql
 
-import org.w3.sw.rdb
-import org.w3.sw.sql
-import org.w3.sw.rdb.RDB.{RelName}
-import org.w3.sw.sparql
-import org.w3.sw.sparql2sparql
-import org.w3.sw.sparql2sql
+import org.w3.rdb
+import org.w3.sql
+import org.w3.rdb.RDB.{RelName}
+import org.w3.sparql
+import org.w3.sparql2sparql
+import org.w3.sparql2sql
 
 object SparqlToSparqlToSql {
 
--- a/sparql2sparql2sql/src/test/scala/SparqlToSparqlToSqlTest.scala	Sun Jan 09 17:23:40 2011 -0500
+++ b/sparql2sparql2sql/src/test/scala/SparqlToSparqlToSqlTest.scala	Sun Jan 09 17:42:49 2011 -0500
@@ -2,17 +2,17 @@
  * $Id$
  */
 
-package org.w3.sw.sparql2sparql2sql
+package org.w3.sparql2sparql2sql
 
 import org.scalatest.FunSuite
 import scala.util.matching.Regex
 import java.net.URI
-import org.w3.sw.sparql.{Sparql, Var}
-import org.w3.sw.sparql2sparql.{SparqlToSparql,NodePatternMap,NodePattern,SparqlMap}
-import org.w3.sw.rdb.RDB.{Database,Relation,RelName,AttrName}
-import org.w3.sw.sql.SqlParser
-import org.w3.sw.sparql2sql.{SparqlToSql,StemURI}
-import org.w3.sw.sparql2sparql2sql.SparqlToSparqlToSql.toView
+import org.w3.sparql.{Sparql, Var}
+import org.w3.sparql2sparql.{SparqlToSparql,NodePatternMap,NodePattern,SparqlMap}
+import org.w3.rdb.RDB.{Database,Relation,RelName,AttrName}
+import org.w3.sql.SqlParser
+import org.w3.sparql2sql.{SparqlToSql,StemURI}
+import org.w3.sparql2sparql2sql.SparqlToSparqlToSql.toView
 
 /* The SparqlToSparqlTest class transforms SPARQL queries to a relational data
  * structure and compares them to a structure parsed from SQL.
--- a/sparql2sql/src/main/scala/SparqlToSql.scala	Sun Jan 09 17:23:40 2011 -0500
+++ b/sparql2sql/src/main/scala/SparqlToSql.scala	Sun Jan 09 17:42:49 2011 -0500
@@ -9,16 +9,16 @@
  * with the target semantics in SQL instead of SPARQL.
  */
 
-package org.w3.sw.sparql2sql
+package org.w3.sparql2sql
 
 import scala.util.parsing.combinator._
 import java.net.URI
-import org.w3.sw.rdb
-import org.w3.sw.sql
-import org.w3.sw.sql.PrettySql.toPrettySql
-import org.w3.sw.sparql
-import org.w3.sw.sparql.rdf
-import org.w3.sw.util
+import org.w3.rdb
+import org.w3.sql
+import org.w3.sql.PrettySql.toPrettySql
+import org.w3.sparql
+import org.w3.sparql.rdf
+import org.w3.util
 
 case class StemURI(s:String)
 case class PrimaryKey(attr:rdb.RDB.AttrName)
@@ -32,8 +32,8 @@
 /**
  * Converts a SPARQL object to an SQL object equivalent over the direct graph.
  *
- * @see {@link org.w3.sw.sparql.Sparql Sparql}
- * @see {@link org.w3.sw.sql.Sql#Select Sql}
+ * @see {@link org.w3.sparql.Sparql Sparql}
+ * @see {@link org.w3.sql.Sql#Select Sql}
  */
 object SparqlToSql {
   /**
@@ -1146,7 +1146,7 @@
  *   foot
  * </pre>
  *
- * @see {@link org.w3.sw.sparql2sql.SparqlToSql}
+ * @see {@link org.w3.sparql2sql.SparqlToSql}
  * @see {@link http://www.w3.org/TR/2008/REC-rdf-sparql-XMLres-20080115/ XML Results Format}
  */
 object SqlToXMLRes {
--- a/sparql2sql/src/test/scala/SparqlToSqlTest.scala	Sun Jan 09 17:23:40 2011 -0500
+++ b/sparql2sql/src/test/scala/SparqlToSqlTest.scala	Sun Jan 09 17:42:49 2011 -0500
@@ -2,14 +2,13 @@
  * $Id$
  */
 
-package org.w3c.sw.sparql2sql
+package org.w3.sparql2sql
 
 import org.scalatest.FunSuite
 import java.net.URI
-import org.w3.sw.rdb.RDB.{RelName,AttrName,Database,Relation}
-import org.w3.sw.sql.SqlParser
-import org.w3.sw.sparql.{Sparql, Uri}
-import org.w3.sw.sparql2sql.{SparqlToSql,StemURI,SqlToXMLRes}
+import org.w3.rdb.RDB.{RelName,AttrName,Database,Relation}
+import org.w3.sql.SqlParser
+import org.w3.sparql.{Sparql, Uri}
 
 /* The SparqlToSqlTest class transforms SPARQL queries to a relational data
  * structure and compares them to a structure parsed from SQL.
--- a/sparql2sqlendpoint/src/main/scala/Servlet.scala	Sun Jan 09 17:23:40 2011 -0500
+++ b/sparql2sqlendpoint/src/main/scala/Servlet.scala	Sun Jan 09 17:42:49 2011 -0500
@@ -1,4 +1,4 @@
-package org.w3.sw.sparql2sqlendpoint
+package org.w3.sparql2sqlendpoint
 
 import javax.servlet.http.{HttpServlet, HttpServletRequest, HttpServletResponse} 
 import scala.xml.XML
@@ -8,12 +8,12 @@
 import java.sql.{Types => T}
 
 import java.net.URI
-import org.w3.sw.rdb.RDB.{RelName,AttrName}
-import org.w3.sw.sql.SqlParser
-import org.w3.sw.sparql
-import org.w3.sw.sparql.Sparql
-import org.w3.sw.sql
-import org.w3.sw.sparql2sql.{SparqlToSql,StemURI,SqlToXMLRes}
+import org.w3.rdb.RDB.{RelName,AttrName}
+import org.w3.sql.SqlParser
+import org.w3.sparql
+import org.w3.sparql.Sparql
+import org.w3.sql
+import org.w3.sparql2sql.{SparqlToSql,StemURI,SqlToXMLRes}
 
 object Control {
 
@@ -123,8 +123,8 @@
 
   val defaultSparqlQuery:String = getConfigurationValue("ui.sparql-query")
 
-  val db:org.w3.sw.rdb.RDB.Database = {
-    val DDLParser = new org.w3.sw.sql.SqlParser()
+  val db:org.w3.rdb.RDB.Database = {
+    val DDLParser = new org.w3.sql.SqlParser()
     val ddl = getConfigurationValue("ddl")
     DDLParser.parseAll(DDLParser.ddl, ddl).get
   }
--- a/sql/src/main/scala/AddOrderedSet.scala	Sun Jan 09 17:23:40 2011 -0500
+++ b/sql/src/main/scala/AddOrderedSet.scala	Sun Jan 09 17:42:49 2011 -0500
@@ -1,4 +1,4 @@
-package org.w3.sw.util
+package org.w3.util
 
 import scala.collection.immutable._
 
--- a/sql/src/main/scala/SQL.scala	Sun Jan 09 17:23:40 2011 -0500
+++ b/sql/src/main/scala/SQL.scala	Sun Jan 09 17:42:49 2011 -0500
@@ -1,7 +1,7 @@
-package org.w3.sw.sql
+package org.w3.sql
 
-import org.w3.sw.util._
-import org.w3.sw.rdb.RDB
+import org.w3.util._
+import org.w3.rdb.RDB
 
 import scala.util.parsing.combinator._
 
--- a/sql/src/test/scala/SQLTest.scala	Sun Jan 09 17:23:40 2011 -0500
+++ b/sql/src/test/scala/SQLTest.scala	Sun Jan 09 17:42:49 2011 -0500
@@ -1,7 +1,7 @@
-package org.w3.sw.sql
+package org.w3.sql
 
-import org.w3.sw.util._
-import org.w3.sw.rdb.RDB
+import org.w3.util._
+import org.w3.rdb.RDB
 
 import org.scalatest.FunSuite
 import java.net.URI
--- a/turtle/src/main/scala/turtle.scala	Sun Jan 09 17:23:40 2011 -0500
+++ b/turtle/src/main/scala/turtle.scala	Sun Jan 09 17:42:49 2011 -0500
@@ -1,7 +1,6 @@
-package org.w3.sw.turtle
+package org.w3.rdf.turtle
 
-import org.w3.sw._
-//import org.w3.sw.{RDF => RDFModel}
+import org.w3.rdf._
 import scala.util.parsing.combinator._
 import java.net.URI
 
--- a/turtle/src/test/scala/turtleTest.scala	Sun Jan 09 17:23:40 2011 -0500
+++ b/turtle/src/test/scala/turtleTest.scala	Sun Jan 09 17:42:49 2011 -0500
@@ -1,6 +1,6 @@
-package org.w3.sw.turtle
+package org.w3.rdf.turtle
 
-import org.w3.sw._
+import org.w3.rdf._
 import org.scalatest.FunSuite
 
 class TurtleTestWithRDF extends TurtleTest(RDFConcreteModuleWithImplicits)
FeDeRate

Hosted by W3C Systems Team, please report bugs to sysreq@w3.org