svn commit: r1344862 - in /jena/trunk: jena-fuseki/soh jena-tdb/pom.xml

[an...@apache.org]

Author: andy
Date: Thu May 31 19:01:19 2012
New Revision: 1344862

URL: http://svn.apache.org/viewvc?rev=1344862&view=rev
Log:
Tweaks for release (TDB: no download).  Fuseki: POST for soh-query

Modified:
    jena/trunk/jena-fuseki/soh
    jena/trunk/jena-tdb/pom.xml

Modified: jena/trunk/jena-fuseki/soh
URL: http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/soh?rev=1344862&r1=1344861&r2=1344862&view=diff
==============================================================================
--- jena/trunk/jena-fuseki/soh (original)
+++ jena/trunk/jena-fuseki/soh Thu May 31 19:01:19 2012
@@ -471,8 +471,8 @@ end
 def cmd_sparql_query
   options={}
   optparse = OptionParser.new do |opts|
-    opts.banner = "Usage: #{$cmd} [--query QUERY] [--service URI] 'query' | @file"
-     opts.on('--service=URI', '--server=URI', 'SPARQL endpoint') do |uri|
+    opts.banner = "Usage: #{$cmd} [--query QUERY] [--service URI] [--post] 'query' | @file"
+    opts.on('--service=URI', '--server=URI', 'SPARQL endpoint') do |uri|
       options[:service]=uri
     end
     opts.on('--query=FILE','--file=FILE', 'Take query from a file') do |file|
@@ -487,6 +487,9 @@ def cmd_sparql_query
       options[:accept]=type
     end
     options[:verbose] = false
+    opts.on( '--post', 'Force use of POST' ) do
+      options[:post] = true
+    end
     opts.on( '-v', '--verbose', 'Verbose' ) do
       options[:verbose] = true
     end
@@ -508,6 +511,7 @@ def cmd_sparql_query
 
   $verbose = options[:verbose]
   $print_http = $verbose
+  usePOST = options[:post]
 
   service = options[:service]
   warn_exit 'No service specified.  Required --service=URI',1 if service.nil?
@@ -544,7 +548,12 @@ def cmd_sparql_query
 
   print "SPARQL #{service}\n" if $verbose
   #args={"output"=>"text"}
-  SPARQL_query(service, query, query_file, args)
+  if ! usePOST
+  then
+    SPARQL_query(service, query, query_file, args)
+  else
+    SPARQL_query_POST(service, query, query_file, args)
+  end
   exit(0)
 end
 

Modified: jena/trunk/jena-tdb/pom.xml
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/pom.xml?rev=1344862&r1=1344861&r2=1344862&view=diff
==============================================================================
--- jena/trunk/jena-tdb/pom.xml (original)
+++ jena/trunk/jena-tdb/pom.xml Thu May 31 19:01:19 2012
@@ -198,11 +198,12 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-resources-plugin</artifactId>
       </plugin>
-      
+
+      <!-- assembly - disable
       <plugin>
-        <!-- This must be the last plug-in attached to the package phase 
+        <!- - This must be the last plug-in attached to the package phase 
              because it replies on the packaging of the jar to happen first.
-        -->
+        - ->
         <groupId>org.apache.maven.plugins</groupId>
 
         <artifactId>maven-assembly-plugin</artifactId>
@@ -212,15 +213,15 @@
             <phase>package</phase>
             <goals><goal>single</goal></goals>
             <configuration>
-              <!-- If you place this in target/ directly - it will be 
+              <!- - If you place this in target/ directly - it will be 
                    uploaded to the repo AND its name is changed
                    to the group-artifact name (this can overwrite, silently,
                    other files.
-              -->
-              <!--
+              - ->
+              <!- -
               <finalName>dist/${assembly.root.name}</finalName>
               <appendAssemblyId>false</appendAssemblyId>
-              -->
+              - ->
               <descriptors>
                 <descriptor>assembly.xml</descriptor>
               </descriptors>
@@ -228,6 +229,7 @@
           </execution>
         </executions>
       </plugin>
+      -->
 
     </plugins>
   </build>