You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by an...@apache.org on 2013/12/24 18:34:11 UTC
svn commit: r1553307 - in /jena/trunk:
jena-arq/src/main/java/com/hp/hpl/jena/query/
jena-arq/src/main/java/com/hp/hpl/jena/sparql/
jena-arq/src/main/java/com/hp/hpl/jena/sparql/mgt/
jena-arq/src/main/java/org/apache/jena/riot/ jena-fuseki/src/main/jav...
Author: andy
Date: Tue Dec 24 17:34:10 2013
New Revision: 1553307
URL: http://svn.apache.org/r1553307
Log:
JENA-614 (Remove JMX support) : step 1 : all JMX specific code pulled into ARQMgt
Modified:
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/query/ARQ.java
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/SystemARQ.java
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/mgt/SystemInfo.java
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/RIOT.java
jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/Fuseki.java
jena/trunk/jena-sdb/src/main/java/com/hp/hpl/jena/sdb/SDB.java
jena/trunk/jena-spatial/src/main/java/org/apache/jena/query/spatial/SpatialQuery.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/TDB.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/mgt/TDBMgt.java
jena/trunk/jena-text/src/main/java/org/apache/jena/query/text/TextQuery.java
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/query/ARQ.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/query/ARQ.java?rev=1553307&r1=1553306&r2=1553307&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/query/ARQ.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/query/ARQ.java Tue Dec 24 17:34:10 2013
@@ -489,8 +489,7 @@ public class ARQ
MappingRegistry.addPrefixMapping(ARQ.arqSymbolPrefix, ARQ.arqParamNS) ;
// This is the pattern for any subsystem to register.
- SystemInfo sysInfo = new SystemInfo(ARQ.arqIRI, ARQ.VERSION, ARQ.BUILD_DATE) ;
- ARQMgt.register(PATH+".system:type=SystemInfo", sysInfo) ;
+ SystemInfo sysInfo = new SystemInfo(ARQ.arqIRI, ARQ.PATH, ARQ.VERSION, ARQ.BUILD_DATE) ;
SystemARQ.registerSubSystem(sysInfo) ;
// Register RIOT details here, not earlier, to avoid
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/SystemARQ.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/SystemARQ.java?rev=1553307&r1=1553306&r2=1553307&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/SystemARQ.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/SystemARQ.java Tue Dec 24 17:34:10 2013
@@ -33,6 +33,7 @@ import com.hp.hpl.jena.rdf.model.Model ;
import com.hp.hpl.jena.reasoner.InfGraph ;
import com.hp.hpl.jena.sparql.core.DatasetGraph ;
import com.hp.hpl.jena.sparql.graph.GraphWrapper ;
+import com.hp.hpl.jena.sparql.mgt.ARQMgt ;
import com.hp.hpl.jena.sparql.mgt.SystemInfo ;
public class SystemARQ
@@ -114,6 +115,7 @@ public class SystemARQ
private static List<SystemInfo> versions = new ArrayList<SystemInfo>() ;
public static void registerSubSystem(SystemInfo systemInfo)
{
+ ARQMgt.register(systemInfo.getJmxPath()+".system:type=SystemInfo", systemInfo) ;
versions.add(systemInfo) ;
}
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/mgt/SystemInfo.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/mgt/SystemInfo.java?rev=1553307&r1=1553306&r2=1553307&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/mgt/SystemInfo.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/mgt/SystemInfo.java Tue Dec 24 17:34:10 2013
@@ -16,55 +16,56 @@
* limitations under the License.
*/
-package com.hp.hpl.jena.sparql.mgt;
+package com.hp.hpl.jena.sparql.mgt ;
import org.apache.jena.riot.system.IRIResolver ;
import com.hp.hpl.jena.graph.Node ;
import com.hp.hpl.jena.graph.NodeFactory ;
-public class SystemInfo implements SystemInfoMBean
-{
+public class SystemInfo implements SystemInfoMBean {
private final String name ;
private final Node iri ;
+ private final String jmxPath ;
private final String version ;
private final String buildDate ;
- public SystemInfo(String name, String version, String buildDate)
- {
+ public SystemInfo(String name, String jmxPath, String version, String buildDate) {
this.name = name ;
this.iri = createIRI(name) ;
+ this.jmxPath = jmxPath ;
this.version = version ;
this.buildDate = buildDate ;
}
-
- private static Node createIRI(String iriStr)
- {
+
+ private static Node createIRI(String iriStr) {
try {
return NodeFactory.createURI(IRIResolver.resolveString(iriStr)) ;
- } catch (RuntimeException ex) { return null ; }
+ } catch (RuntimeException ex) {
+ return null ;
+ }
}
-
+
@Override
- public String getBuildDate()
- {
+ public String getBuildDate() {
return buildDate ;
}
@Override
- public String getVersion()
- {
+ public String getVersion() {
return version ;
}
@Override
- public String getName()
- {
+ public String getName() {
return name ;
}
-
- public Node getIRI()
- {
+
+ public Node getIRI() {
return NodeFactory.createURI(name) ;
}
+
+ public String getJmxPath() {
+ return jmxPath ;
+ }
}
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/RIOT.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/RIOT.java?rev=1553307&r1=1553306&r2=1553307&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/RIOT.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/RIOT.java Tue Dec 24 17:34:10 2013
@@ -16,53 +16,47 @@
* limitations under the License.
*/
-package org.apache.jena.riot;
-
+package org.apache.jena.riot ;
import com.hp.hpl.jena.query.ARQ ;
import com.hp.hpl.jena.sparql.SystemARQ ;
-import com.hp.hpl.jena.sparql.mgt.ARQMgt ;
import com.hp.hpl.jena.sparql.mgt.SystemInfo ;
-public class RIOT
-{
- /** IRI for ARQ */
+public class RIOT {
+ /** IRI for ARQ */
public static final String riotIRI = "http://jena.apache.org/#riot" ;
- /** The product name */
- public static final String NAME = "RIOT";
+ /** The product name */
+ public static final String NAME = "RIOT" ;
// Unsafe to touch ARQ in class initialization
- // See init(). these are set in register()
-// public static final String VERSION = NAME+"/"+ARQ.VERSION ;
-// public static final String BUILD_DATE = ARQ.BUILD_DATE ;
-
- public static String VERSION ;
- public static String BUILD_DATE ;
-
- /** The root package name for RIOT */
- public static final String PATH = "org.apache.jena.riot";
+ // See init(). these are set in register()
+ // public static final String VERSION = NAME+"/"+ARQ.VERSION ;
+ // public static final String BUILD_DATE = ARQ.BUILD_DATE ;
+
+ public static String VERSION ;
+ public static String BUILD_DATE ;
+
+ /** The root package name for RIOT */
+ public static final String PATH = "org.apache.jena.riot" ;
- public static void setStrictMode(boolean state)
- {
+ public static void setStrictMode(boolean state) {
SysRIOT.strictMode = state ;
SysRIOT.StrictXSDLexicialForms = state ;
}
private static volatile boolean initialized = false ;
- private static Object initLock = new Object () ;
-
- public static void init()
- {
+ private static Object initLock = new Object() ;
+
+ public static void init() {
if ( initialized )
return ;
- synchronized(initLock)
- {
+ synchronized (initLock) {
if ( initialized )
return ;
initialized = true ;
// Becareful with what this touches - don't touch ARQ.*
- // because that depends on Jena core and we may be
+ // because that depends on Jena core and we may be
// initializing because IO_Ctl (ie. Jena core)
// called RIOT.init.
RDFLanguages.init() ;
@@ -70,29 +64,32 @@ public class RIOT
RDFWriterRegistry.init() ;
IO_Jena.wireIntoJena() ;
-
+
// Don't register JMX info with ARQ as it may not be initialized
// itself and we can get into a circularity.
// This is done in ARQ.init at the proper moment.
}
}
-
+
private static boolean registered = false ;
- public static void register()
- {
+
+ public static void register() {
if ( registered )
return ;
registered = true ;
- String NS = RIOT.PATH ;
VERSION = getVersion() ;
BUILD_DATE = getBuildDate() ;
- SystemInfo sysInfo2 = new SystemInfo(RIOT.riotIRI, VERSION, BUILD_DATE ) ;
- ARQMgt.register(NS+".system:type=SystemInfo", sysInfo2) ;
+ SystemInfo sysInfo2 = new SystemInfo(RIOT.riotIRI, RIOT.PATH, VERSION, BUILD_DATE) ;
SystemARQ.registerSubSystem(sysInfo2) ;
}
-
- public static String getVersion() { return ARQ.VERSION ; }
- public static String getBuildDate() { return ARQ.BUILD_DATE ; }
+
+ public static String getVersion() {
+ return ARQ.VERSION ;
+ }
+
+ public static String getBuildDate() {
+ return ARQ.BUILD_DATE ;
+ }
}
Modified: jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/Fuseki.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/Fuseki.java?rev=1553307&r1=1553306&r2=1553307&view=diff
==============================================================================
--- jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/Fuseki.java (original)
+++ jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/Fuseki.java Tue Dec 24 17:34:10 2013
@@ -29,7 +29,6 @@ import org.slf4j.LoggerFactory ;
import com.hp.hpl.jena.query.ARQ ;
import com.hp.hpl.jena.sparql.SystemARQ ;
import com.hp.hpl.jena.sparql.lib.Metadata ;
-import com.hp.hpl.jena.sparql.mgt.ARQMgt ;
import com.hp.hpl.jena.sparql.mgt.SystemInfo ;
import com.hp.hpl.jena.sparql.util.Context ;
import com.hp.hpl.jena.sparql.util.MappingRegistry ;
@@ -140,8 +139,7 @@ public class Fuseki
return ;
initialized = true ;
ARQ.init() ;
- SystemInfo sysInfo = new SystemInfo(FusekiIRI, VERSION, BUILD_DATE) ;
- ARQMgt.register(PATH+".system:type=SystemInfo", sysInfo) ;
+ SystemInfo sysInfo = new SystemInfo(FusekiIRI, PATH, VERSION, BUILD_DATE) ;
SystemARQ.registerSubSystem(sysInfo) ;
RIOT.init() ;
TDB.init() ;
Modified: jena/trunk/jena-sdb/src/main/java/com/hp/hpl/jena/sdb/SDB.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-sdb/src/main/java/com/hp/hpl/jena/sdb/SDB.java?rev=1553307&r1=1553306&r2=1553307&view=diff
==============================================================================
--- jena/trunk/jena-sdb/src/main/java/com/hp/hpl/jena/sdb/SDB.java (original)
+++ jena/trunk/jena-sdb/src/main/java/com/hp/hpl/jena/sdb/SDB.java Tue Dec 24 17:34:10 2013
@@ -32,7 +32,6 @@ import com.hp.hpl.jena.sparql.ARQInterna
import com.hp.hpl.jena.sparql.SystemARQ ;
import com.hp.hpl.jena.sparql.core.assembler.AssemblerUtils ;
import com.hp.hpl.jena.sparql.lib.Metadata ;
-import com.hp.hpl.jena.sparql.mgt.ARQMgt ;
import com.hp.hpl.jena.sparql.mgt.SystemInfo ;
import com.hp.hpl.jena.sparql.util.Context ;
import com.hp.hpl.jena.sparql.util.MappingRegistry ;
@@ -173,9 +172,7 @@ public class SDB
private static void initlization2()
{
- String NS = SDB.PATH ;
- SystemInfo systemInfo = new SystemInfo(SDB.sdbIRI, SDB.VERSION, SDB.BUILD_DATE) ;
- ARQMgt.register(NS+".system:type=SystemInfo", systemInfo) ;
+ SystemInfo systemInfo = new SystemInfo(SDB.sdbIRI, SDB.PATH, SDB.VERSION, SDB.BUILD_DATE) ;
SystemARQ.registerSubSystem(systemInfo) ;
}
}
Modified: jena/trunk/jena-spatial/src/main/java/org/apache/jena/query/spatial/SpatialQuery.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-spatial/src/main/java/org/apache/jena/query/spatial/SpatialQuery.java?rev=1553307&r1=1553306&r2=1553307&view=diff
==============================================================================
--- jena/trunk/jena-spatial/src/main/java/org/apache/jena/query/spatial/SpatialQuery.java (original)
+++ jena/trunk/jena-spatial/src/main/java/org/apache/jena/query/spatial/SpatialQuery.java Tue Dec 24 17:34:10 2013
@@ -18,26 +18,18 @@
package org.apache.jena.query.spatial;
-import org.apache.jena.query.spatial.assembler.SpatialAssembler;
-import org.apache.jena.query.spatial.pfunction.library.EastPF;
-import org.apache.jena.query.spatial.pfunction.library.IntersectsBoxPF;
-import org.apache.jena.query.spatial.pfunction.library.IsNearByPF;
-import org.apache.jena.query.spatial.pfunction.library.IsWithinBoxPF;
-import org.apache.jena.query.spatial.pfunction.library.IsWithinCirclePF;
-import org.apache.jena.query.spatial.pfunction.library.NorthPF;
-import org.apache.jena.query.spatial.pfunction.library.SouthPF;
-import org.apache.jena.query.spatial.pfunction.library.WestPF;
+import org.apache.jena.query.spatial.assembler.SpatialAssembler ;
+import org.apache.jena.query.spatial.pfunction.library.* ;
-import com.hp.hpl.jena.sparql.SystemARQ;
-import com.hp.hpl.jena.sparql.lib.Metadata;
-import com.hp.hpl.jena.sparql.mgt.ARQMgt;
-import com.hp.hpl.jena.sparql.mgt.SystemInfo;
-import com.hp.hpl.jena.sparql.pfunction.PropertyFunction;
-import com.hp.hpl.jena.sparql.pfunction.PropertyFunctionFactory;
-import com.hp.hpl.jena.sparql.pfunction.PropertyFunctionRegistry;
-import com.hp.hpl.jena.sparql.util.Symbol;
-import com.hp.hpl.jena.tdb.TDB;
-import com.spatial4j.core.context.SpatialContext;
+import com.hp.hpl.jena.sparql.SystemARQ ;
+import com.hp.hpl.jena.sparql.lib.Metadata ;
+import com.hp.hpl.jena.sparql.mgt.SystemInfo ;
+import com.hp.hpl.jena.sparql.pfunction.PropertyFunction ;
+import com.hp.hpl.jena.sparql.pfunction.PropertyFunctionFactory ;
+import com.hp.hpl.jena.sparql.pfunction.PropertyFunctionRegistry ;
+import com.hp.hpl.jena.sparql.util.Symbol ;
+import com.hp.hpl.jena.tdb.TDB ;
+import com.spatial4j.core.context.SpatialContext ;
public class SpatialQuery
{
@@ -72,8 +64,7 @@ public class SpatialQuery
TDB.init() ;
SpatialAssembler.init() ;
- SystemInfo sysInfo = new SystemInfo(IRI, VERSION, BUILD_DATE) ;
- ARQMgt.register(PATH+".system:type=SystemInfo", sysInfo) ;
+ SystemInfo sysInfo = new SystemInfo(IRI, PATH, VERSION, BUILD_DATE) ;
SystemARQ.registerSubSystem(sysInfo) ;
PropertyFunctionRegistry.get().put("http://jena.apache.org/spatial#withinCircle", new PropertyFunctionFactory() {
Modified: jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/TDB.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/TDB.java?rev=1553307&r1=1553306&r2=1553307&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/TDB.java (original)
+++ jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/TDB.java Tue Dec 24 17:34:10 2013
@@ -38,7 +38,6 @@ import com.hp.hpl.jena.sparql.core.assem
import com.hp.hpl.jena.sparql.engine.main.StageBuilder ;
import com.hp.hpl.jena.sparql.engine.main.StageGenerator ;
import com.hp.hpl.jena.sparql.lib.Metadata ;
-import com.hp.hpl.jena.sparql.mgt.ARQMgt ;
import com.hp.hpl.jena.sparql.mgt.SystemInfo ;
import com.hp.hpl.jena.sparql.util.Context ;
import com.hp.hpl.jena.sparql.util.MappingRegistry ;
@@ -255,10 +254,7 @@ public class TDB {
private static void initialization2() {
// Set management information.
- // Needs ARQ > 2.8.0
- String NS = TDB.PATH ;
- SystemInfo systemInfo = new SystemInfo(TDB.tdbIRI, TDB.VERSION, TDB.BUILD_DATE) ;
- ARQMgt.register(NS + ".system:type=SystemInfo", systemInfo) ;
+ SystemInfo systemInfo = new SystemInfo(TDB.tdbIRI, TDB.PATH, TDB.VERSION, TDB.BUILD_DATE) ;
SystemARQ.registerSubSystem(systemInfo) ;
}
Modified: jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/mgt/TDBMgt.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/mgt/TDBMgt.java?rev=1553307&r1=1553306&r2=1553307&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/mgt/TDBMgt.java (original)
+++ jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/mgt/TDBMgt.java Tue Dec 24 17:34:10 2013
@@ -18,7 +18,6 @@
package com.hp.hpl.jena.tdb.mgt;
-import com.hp.hpl.jena.sparql.mgt.ARQMgt ;
import com.hp.hpl.jena.sparql.mgt.SystemInfo ;
import com.hp.hpl.jena.tdb.TDB ;
@@ -27,9 +26,8 @@ public class TDBMgt
public static void init()
{
String NS = TDB.PATH ;
-
- SystemInfo sysInfo = new SystemInfo(TDB.tdbIRI, TDB.VERSION, TDB.BUILD_DATE) ;
- ARQMgt.register(NS+".system:type=SystemInfo", sysInfo) ;
- ARQMgt.register(NS+".system2:type=SystemInfo", new TDBSystemInfo()) ;
+ SystemInfo sysInfo = new SystemInfo(TDB.tdbIRI, TDB.PATH, TDB.VERSION, TDB.BUILD_DATE) ;
+// ARQMgt.register(NS+".system:type=SystemInfo", sysInfo) ;
+// ARQMgt.register(NS+".system2:type=SystemInfo", new TDBSystemInfo()) ;
}
}
Modified: jena/trunk/jena-text/src/main/java/org/apache/jena/query/text/TextQuery.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-text/src/main/java/org/apache/jena/query/text/TextQuery.java?rev=1553307&r1=1553306&r2=1553307&view=diff
==============================================================================
--- jena/trunk/jena-text/src/main/java/org/apache/jena/query/text/TextQuery.java (original)
+++ jena/trunk/jena-text/src/main/java/org/apache/jena/query/text/TextQuery.java Tue Dec 24 17:34:10 2013
@@ -22,7 +22,6 @@ import org.apache.jena.query.text.assemb
import com.hp.hpl.jena.sparql.SystemARQ ;
import com.hp.hpl.jena.sparql.lib.Metadata ;
-import com.hp.hpl.jena.sparql.mgt.ARQMgt ;
import com.hp.hpl.jena.sparql.mgt.SystemInfo ;
import com.hp.hpl.jena.sparql.pfunction.PropertyFunction ;
import com.hp.hpl.jena.sparql.pfunction.PropertyFunctionFactory ;
@@ -58,8 +57,7 @@ public class TextQuery
TDB.init() ;
TextAssembler.init() ;
- SystemInfo sysInfo = new SystemInfo(IRI, VERSION, BUILD_DATE) ;
- ARQMgt.register(PATH+".system:type=SystemInfo", sysInfo) ;
+ SystemInfo sysInfo = new SystemInfo(IRI, PATH, VERSION, BUILD_DATE) ;
SystemARQ.registerSubSystem(sysInfo) ;
PropertyFunctionRegistry.get().put("http://jena.apache.org/text#query", new PropertyFunctionFactory() {