jena-jruby 0.3.0-java → 0.4.0-java

data/.gitignore

@@ -5,3 +5,4 @@ downloads/
 pkg
 .buildpath
 rdoc
+pkg

data/bin/update_jars_maven

@@ -5,7 +5,7 @@
 
 # Default TDB location
 # Can be overridden by exporting JENA_TDB_ROOT
-tdb_root=${JENA_TDB_ROOT:-~/workspace/apache-jena-tdb}
+tdb_root=${JENA_TDB_ROOT:-~/workspace/jena/jena-tdb}
 
 echo "Changing to TDB directory $tdb_root"
 pushd $tdb_root
@@ -25,8 +25,8 @@ cp $tdb_root/target/dependency/*.jar javalib
 cp $tdb_root/target/jena-tdb-*SNAPSHOT.jar $tdb_root/target/tdb-*{0,1,2,3,4,5,6,7,8,9}.jar javalib  2>/dev/null
 rm -f javalib/*test*.jar
 
-echo "Creating log4j config"
-jar -cf javalib/log4j-config.jar log4j.xml
+#echo "Creating log4j config"
+#jar -cf javalib/log4j-config.jar log4j.xml
 
 
 

data/lib/jena_jruby/jars.rb

@@ -1,19 +1,19 @@
-%w[
-commons-codec-1.5
-hamcrest-core-1.1
-httpclient-4.1.2
-httpcore-4.1.3
-icu4j-3.4.4
-jena-arq-2.9.0-incubating
-jena-core-2.7.0-incubating
-jena-iri-0.9.0-incubating
-jena-tdb-0.9.0-incubating-SNAPSHOT
-junit-4.9
-log4j-1.2.16
-slf4j-api-1.6.4
-slf4j-log4j12-1.6.4
-xercesImpl-2.10.0
-xml-apis-1.4.01
-log4j-config
-].each {|jar| require jar}
+# Note: important to get these in reverse dependency order
+# Use mvn dependency:tree to show deps from the pom.xml
 
+%w[
+log4j-1.2.16.jar
+slf4j-api-1.6.4.jar
+slf4j-log4j12-1.6.4.jar
+commons-codec-1.5.jar
+httpclient-4.1.2.jar
+httpcore-4.1.3.jar
+jena-iri-0.9.1-SNAPSHOT.jar
+xercesImpl-2.10.0.jar
+xml-apis-1.4.01.jar
+jena-core-2.7.1-SNAPSHOT.jar
+jena-arq-2.9.1-SNAPSHOT.jar
+jena-tdb-0.9.1-SNAPSHOT.jar
+].each do |jar|
+  require jar
+end

data/lib/jena_jruby/node_utils.rb

@@ -39,9 +39,6 @@ end
 module Java
   module ComHpHplJenaEnhanced
     class EnhNode
-      alias resource? isResource
-      alias literal? isLiteral
-
       def types
         Jena::Node.types self
       end
@@ -50,6 +47,11 @@ module Java
 
   module ComHpHplJenaRdfModelImpl
     class ResourceImpl
+      # Return the resource types
+      def types
+        Jena::Node.types self
+      end
+
       # Yield to the given block for each statement of this resource with predicate
       # `property`. If `property` is nil, yield to the block for every statement whose
       # subject is this resource.

data/lib/jena_jruby/version.rb

@@ -1,5 +1,5 @@
 module Jena
-  JENA_VERSION='2.6.5-SNAPSHOT'
-  TDB_VERSION='0.8.11-SNAPSHOT'
-  JENA_JRUBY_GEM_VERSION='0.3.0'
+  JENA_VERSION='2.7.1-SNAPSHOT'
+  TDB_VERSION='0.9.1-SNAPSHOT'
+  JENA_JRUBY_GEM_VERSION='0.4.0'
 end

data/lib/jena_jruby.rb

@@ -86,25 +86,7 @@ module Jena
   end
 
   module Vocab
-    java_import com.hp.hpl.jena.vocabulary.DB
-    java_import com.hp.hpl.jena.vocabulary.DC_10
-    java_import com.hp.hpl.jena.vocabulary.DC_11
-    java_import com.hp.hpl.jena.vocabulary.DC
-    java_import com.hp.hpl.jena.vocabulary.DCTerms
-    java_import com.hp.hpl.jena.vocabulary.DCTypes
-    java_import com.hp.hpl.jena.vocabulary.LocationMappingVocab
-    java_import com.hp.hpl.jena.vocabulary.OntDocManagerVocab
-    java_import com.hp.hpl.jena.vocabulary.OntEventsVocab
-    java_import com.hp.hpl.jena.vocabulary.OWL2
-    java_import com.hp.hpl.jena.vocabulary.OWL
-    java_import com.hp.hpl.jena.vocabulary.RDF
-    java_import com.hp.hpl.jena.vocabulary.RDFS
-    java_import com.hp.hpl.jena.vocabulary.RDFSyntax
-    java_import com.hp.hpl.jena.vocabulary.ReasonerVocabulary
-    java_import com.hp.hpl.jena.vocabulary.ResultSet
-    java_import com.hp.hpl.jena.vocabulary.RSS
-    java_import com.hp.hpl.jena.vocabulary.VCARD
-    java_import com.hp.hpl.jena.vocabulary.XSD
+    include_package "com.hp.hpl.jena.vocabulary"
   end
 
   module Query

data/test/node_utils_test.rb

@@ -1,4 +1,5 @@
 $LOAD_PATH.push "#{File.dirname(__FILE__)}/../lib"
+$LOAD_PATH.push "#{File.dirname(__FILE__)}/../javalib"
 require "rubygems"
 require "test/unit"
 require "jena_jruby"

data/test/query_utils_test.rb

@@ -1,4 +1,5 @@
 $LOAD_PATH.push "#{File.dirname(__FILE__)}/../lib"
+$LOAD_PATH.push "#{File.dirname(__FILE__)}/../javalib"
 require "rubygems"
 require "test/unit"
 require "jena_jruby"

metadata

@@ -1,112 +1,114 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: jena-jruby
-version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 0.3.0
+version: !ruby/object:Gem::Version
+  prerelease:
+  version: 0.4.0
 platform: java
-authors: 
-  - Ian Dickinson
-autorequire: 
+authors:
+- Ian Dickinson
+autorequire:
 bindir: bin
 cert_chain: []
-
-date: 2012-01-05 00:00:00 Z
-dependencies: 
-  - !ruby/object:Gem::Dependency 
-    name: haml
-    prerelease: false
-    requirement: &id001 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - ">="
-          - !ruby/object:Gem::Version 
-            version: "0"
-    type: :runtime
-    version_requirements: *id001
-  - !ruby/object:Gem::Dependency 
-    name: builder
-    prerelease: false
-    requirement: &id002 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - ">="
-          - !ruby/object:Gem::Version 
-            version: "0"
-    type: :runtime
-    version_requirements: *id002
+date: 2012-06-07 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: haml
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+    none: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+    none: false
+  prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency
+  name: builder
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+    none: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+    none: false
+  prerelease: false
+  type: :runtime
 description: A simple packaging of Apache Jena for JRuby
-email: 
-  - ian@epimorphics.com
+email:
+- ian@epimorphics.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
-  - README.md
-files: 
-  - .gitignore
-  - Gemfile
-  - Gemfile.lock
-  - LICENSE
-  - README.md
-  - Rakefile
-  - bin/update_jars_maven
-  - bin/update_jena
-  - jena-jruby.gemspec
-  - lib/jena_jruby.rb
-  - lib/jena_jruby/jars.rb
-  - lib/jena_jruby/namespace.rb
-  - lib/jena_jruby/node_utils.rb
-  - lib/jena_jruby/query_utils.rb
-  - lib/jena_jruby/utils.rb
-  - lib/jena_jruby/version.rb
-  - log4j.xml
-  - test/node_utils_test.rb
-  - test/query_utils_test.rb
-  - javalib/commons-codec-1.5.jar
-  - javalib/jena-iri-0.9.0-incubating.jar
-  - javalib/jena-tdb-0.9.0-incubating-SNAPSHOT.jar
-  - javalib/jena-core-2.7.0-incubating.jar
-  - javalib/httpclient-4.1.2.jar
-  - javalib/xercesImpl-2.10.0.jar
-  - javalib/slf4j-api-1.6.4.jar
-  - javalib/junit-4.9.jar
-  - javalib/slf4j-log4j12-1.6.4.jar
-  - javalib/icu4j-3.4.4.jar
-  - javalib/xml-apis-1.4.01.jar
-  - javalib/log4j-1.2.16.jar
-  - javalib/hamcrest-core-1.1.jar
-  - javalib/log4j-config.jar
-  - javalib/httpcore-4.1.3.jar
-  - javalib/jena-arq-2.9.0-incubating.jar
-homepage: ""
+extra_rdoc_files:
+- README.md
+files:
+- .gitignore
+- Gemfile
+- Gemfile.lock
+- LICENSE
+- README.md
+- Rakefile
+- bin/update_jars_maven
+- bin/update_jena
+- jena-jruby.gemspec
+- lib/jena_jruby.rb
+- lib/jena_jruby/jars.rb
+- lib/jena_jruby/namespace.rb
+- lib/jena_jruby/node_utils.rb
+- lib/jena_jruby/query_utils.rb
+- lib/jena_jruby/utils.rb
+- lib/jena_jruby/version.rb
+- log4j.xml
+- test/node_utils_test.rb
+- test/query_utils_test.rb
+- javalib/httpclient-4.1.2.jar
+- javalib/hamcrest-core-1.1.jar
+- javalib/jena-tdb-0.9.1-SNAPSHOT.jar
+- javalib/jena-core-2.7.1-SNAPSHOT.jar
+- javalib/xml-apis-1.4.01.jar
+- javalib/xercesImpl-2.10.0.jar
+- javalib/slf4j-api-1.6.4.jar
+- javalib/httpcore-4.1.3.jar
+- javalib/log4j-1.2.16.jar
+- javalib/jena-arq-2.9.1-SNAPSHOT.jar
+- javalib/jena-iri-0.9.1-SNAPSHOT.jar
+- javalib/junit-4.9.jar
+- javalib/commons-codec-1.5.jar
+- javalib/slf4j-log4j12-1.6.4.jar
+homepage: ''
 licenses: []
-
-post_install_message: 
+post_install_message:
 rdoc_options: []
-
-require_paths: 
-  - lib
-  - javalib
-required_ruby_version: !ruby/object:Gem::Requirement 
+require_paths:
+- lib
+- javalib
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
   none: false
-  requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
   none: false
-  requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
 requirements: []
-
-rubyforge_project: 
-rubygems_version: 1.8.13
-signing_key: 
+rubyforge_project:
+rubygems_version: 1.8.24
+signing_key:
 specification_version: 3
 summary: JRuby wrapper for Apache Jena
 test_files: []
-
-has_rdoc: 
+has_rdoc:
+...