RYA-198 Fixing Other Files closes #113
Project: http://git-wip-us.apache.org/repos/asf/incubator-rya/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-rya/commit/093e7c21 Tree: http://git-wip-us.apache.org/repos/asf/incubator-rya/tree/093e7c21 Diff: http://git-wip-us.apache.org/repos/asf/incubator-rya/diff/093e7c21 Branch: refs/heads/master Commit: 093e7c210996992ce0d7ccf8ade7b5f4df9ef6d4 Parents: 17bde6d Author: Aaron Mihalik <miha...@alum.mit.edu> Authored: Fri Oct 14 16:37:04 2016 -0400 Committer: Aaron Mihalik <miha...@alum.mit.edu> Committed: Fri Oct 14 16:52:41 2016 -0400 ---------------------------------------------------------------------- README.md | 4 ++-- .../org.openrdf.sail.config.SailFactory | 2 +- .../META-INF/spring/spring-shell-plugin.xml | 14 +++++++------- .../src/test/resources/RyaShellTest-context.xml | 14 +++++++------- extras/rya.manual/src/site/markdown/alx.md | 10 +++++----- extras/rya.manual/src/site/markdown/eval.md | 2 +- .../src/site/markdown/loadPrecomputedJoin.md | 4 ++-- extras/rya.manual/src/site/markdown/loaddata.md | 2 +- .../rya.manual/src/site/markdown/mapreduce.md | 2 +- .../src/site/markdown/sm-firststeps.md | 2 +- extras/rya.merger/README.md | 10 +++++----- extras/rya.merger/pom.xml | 10 +++++----- extras/rya.merger/startup_scripts/copy_tool.bat | 2 +- extras/rya.merger/startup_scripts/copy_tool.sh | 2 +- .../startup_scripts/hadoop_copy_tool.bat | 2 +- .../startup_scripts/hadoop_copy_tool.sh | 4 ++-- .../startup_scripts/hadoop_merge_tool.bat | 2 +- .../startup_scripts/hadoop_merge_tool.sh | 2 +- .../rya.merger/startup_scripts/merge_tool.bat | 2 +- extras/rya.merger/startup_scripts/merge_tool.sh | 2 +- ...rg.apache.rya.prospector.plans.IndexWorkPlan | 2 +- extras/rya.reasoning/README.md | 14 +++++++------- .../blueprint/alx.rya.console-blueprint.xml | 4 ++-- .../src/main/features/alx.rya-features.xml | 20 ++++++++++---------- .../META-INF/spring/alx.rya-spring-osgi.xml | 2 +- .../META-INF/spring/alx.rya-spring.xml | 14 +++++++------- .../services/org/apache/camel/component/cbsail | 2 +- sail/src/test/resources/reification.xml | 6 +++--- .../webapp/WEB-INF/spring/spring-accumulo.xml | 4 ++-- .../webapp/WEB-INF/spring/spring-cloudbase.xml | 4 ++-- .../webapp/WEB-INF/spring/spring-mongodb.xml | 4 ++-- .../WEB-INF/spring/spring-root-extensions.xml | 16 ++++++++-------- .../main/webapp/WEB-INF/spring/spring-root.xml | 14 +++++++------- .../webapp/WEB-INF/spring/spring-security.xml | 2 +- web/web.rya/src/main/webapp/WEB-INF/web.xml | 8 ++++---- .../controllerIntegrationTest-accumulo.xml | 6 +++--- .../controllerIntegrationTest-root.xml | 14 +++++++------- .../controllerIntegrationTest-security.xml | 2 +- .../test/resources/controllerTest-context.xml | 4 ++-- 39 files changed, 118 insertions(+), 118 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/093e7c21/README.md ---------------------------------------------------------------------- diff --git a/README.md b/README.md index 1299f0a..e129033 100644 --- a/README.md +++ b/README.md @@ -36,7 +36,7 @@ Since the data encodings changed in the 3.2.2 release, you will need to run the 3. Run ``` -hadoop jar accumulo.rya-mr.jar mvm.rya.accumulo.mr.upgrade.Upgrade322Tool -Dac.instance={} -Dac.username={} -Dac.pwd={} +hadoop jar accumulo.rya-mr.jar org.apache.rya.accumulo.mr.upgrade.Upgrade322Tool -Dac.instance={} -Dac.username={} -Dac.pwd={} ``` ## Quick Start VM @@ -167,7 +167,7 @@ Bulk loading data is done through Map Reduce jobs This Map Reduce job will read a full file into memory and parse it into statements. The statements are saved into the store. Here is an example for storing in Accumulo: ``` -hadoop jar target/accumulo.rya-3.0.4-SNAPSHOT-shaded.jar mvm.rya.accumulo.mr.fileinput.BulkNtripsInputTool -Dac.zk=localhost:2181 -Dac.instance=accumulo -Dac.username=root -Dac.pwd=secret -Drdf.tablePrefix=triplestore_ -Dio.sort.mb=64 /tmp/temp.ntrips +hadoop jar target/accumulo.rya-3.0.4-SNAPSHOT-shaded.jar org.apache.rya.accumulo.mr.fileinput.BulkNtripsInputTool -Dac.zk=localhost:2181 -Dac.instance=accumulo -Dac.username=root -Dac.pwd=secret -Drdf.tablePrefix=triplestore_ -Dio.sort.mb=64 /tmp/temp.ntrips ``` Options: http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/093e7c21/extras/indexing/src/main/resources/META-INF/services/org.openrdf.sail.config.SailFactory ---------------------------------------------------------------------- diff --git a/extras/indexing/src/main/resources/META-INF/services/org.openrdf.sail.config.SailFactory b/extras/indexing/src/main/resources/META-INF/services/org.openrdf.sail.config.SailFactory index 43f32d1..56f4407 100644 --- a/extras/indexing/src/main/resources/META-INF/services/org.openrdf.sail.config.SailFactory +++ b/extras/indexing/src/main/resources/META-INF/services/org.openrdf.sail.config.SailFactory @@ -1 +1 @@ -mvm.rya.sail.config.RyaAccumuloSailFactory +org.apache.rya.sail.config.RyaAccumuloSailFactory http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/093e7c21/extras/rya.console/src/main/resources/META-INF/spring/spring-shell-plugin.xml ---------------------------------------------------------------------- diff --git a/extras/rya.console/src/main/resources/META-INF/spring/spring-shell-plugin.xml b/extras/rya.console/src/main/resources/META-INF/spring/spring-shell-plugin.xml index b210311..02d9f4f 100644 --- a/extras/rya.console/src/main/resources/META-INF/spring/spring-shell-plugin.xml +++ b/extras/rya.console/src/main/resources/META-INF/spring/spring-shell-plugin.xml @@ -26,15 +26,15 @@ http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.1.xsd";> <!-- Tell Spring where it can find all of the Command components. --> - <context:component-scan base-package="mvm.rya.shell"/> + <context:component-scan base-package="org.apache.rya.shell"/> <!-- Define the shell state bean that will be shared across all of the commands. --> - <bean id="sharedShellState" class="mvm.rya.shell.SharedShellState" /> - <bean id="passwordPrompt" class="mvm.rya.shell.util.PasswordPrompt.JLinePasswordPrompt" /> - <bean id="installPrompt" class="mvm.rya.shell.util.InstallPrompt.JLineAccumuloInstallPrompt" /> - <bean id="sparqlPrompt" class="mvm.rya.shell.util.SparqlPrompt.JLineSparqlPrompt" /> + <bean id="sharedShellState" class="org.apache.rya.shell.SharedShellState" /> + <bean id="passwordPrompt" class="org.apache.rya.shell.util.PasswordPrompt.JLinePasswordPrompt" /> + <bean id="installPrompt" class="org.apache.rya.shell.util.InstallPrompt.JLineAccumuloInstallPrompt" /> + <bean id="sparqlPrompt" class="org.apache.rya.shell.util.SparqlPrompt.JLineSparqlPrompt" /> <!-- Define each of the beans that hold onto commands used by the shell. --> - <bean id="ryaConnectionCommands" class="mvm.rya.shell.RyaConnectionCommands" /> - <bean id="ryaAdminCommands" class="mvm.rya.shell.RyaAdminCommands" /> + <bean id="ryaConnectionCommands" class="org.apache.rya.shell.RyaConnectionCommands" /> + <bean id="ryaAdminCommands" class="org.apache.rya.shell.RyaAdminCommands" /> </beans> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/093e7c21/extras/rya.console/src/test/resources/RyaShellTest-context.xml ---------------------------------------------------------------------- diff --git a/extras/rya.console/src/test/resources/RyaShellTest-context.xml b/extras/rya.console/src/test/resources/RyaShellTest-context.xml index dfd075a..bb91f68 100644 --- a/extras/rya.console/src/test/resources/RyaShellTest-context.xml +++ b/extras/rya.console/src/test/resources/RyaShellTest-context.xml @@ -26,27 +26,27 @@ http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.1.xsd";> <!-- Tell Spring where it can find all of the Command components. --> - <context:component-scan base-package="mvm.rya.shell"/> + <context:component-scan base-package="org.apache.rya.shell"/> <!-- Define the shell state bean that will be shared across all of the commands. --> - <bean id="sharedShellState" class="mvm.rya.shell.SharedShellState" /> + <bean id="sharedShellState" class="org.apache.rya.shell.SharedShellState" /> <!-- We use a mock Password Prompt here to simulate a user entering a password. --> <bean id="passwordPrompt" class="org.mockito.Mockito" factory-method="mock"> - <constructor-arg value="mvm.rya.shell.util.PasswordPrompt" /> + <constructor-arg value="org.apache.rya.shell.util.PasswordPrompt" /> </bean> <!-- We use a mock Install Prompt here to simulate a user entering the installation configuration. --> <bean id="installPrompt" class="org.mockito.Mockito" factory-method="mock"> - <constructor-arg value="mvm.rya.shell.util.InstallPrompt"/> + <constructor-arg value="org.apache.rya.shell.util.InstallPrompt"/> </bean> <!-- We use a mock SPARQL Prompt here to simulate a user entering the installation configuration. --> <bean id="sparqlPrompt" class="org.mockito.Mockito" factory-method="mock"> - <constructor-arg value="mvm.rya.shell.util.SparqlPrompt"/> + <constructor-arg value="org.apache.rya.shell.util.SparqlPrompt"/> </bean> <!-- Define each of the beans that hold onto commands used by the shell. --> - <bean id="ryaConnectionCommands" class="mvm.rya.shell.RyaConnectionCommands" /> - <bean id="ryaAdminCommands" class="mvm.rya.shell.RyaAdminCommands" /> + <bean id="ryaConnectionCommands" class="org.apache.rya.shell.RyaConnectionCommands" /> + <bean id="ryaAdminCommands" class="org.apache.rya.shell.RyaAdminCommands" /> </beans> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/093e7c21/extras/rya.manual/src/site/markdown/alx.md ---------------------------------------------------------------------- diff --git a/extras/rya.manual/src/site/markdown/alx.md b/extras/rya.manual/src/site/markdown/alx.md index 2d0eae7..ca28501 100644 --- a/extras/rya.manual/src/site/markdown/alx.md +++ b/extras/rya.manual/src/site/markdown/alx.md @@ -28,7 +28,7 @@ Currently, the Alx Rya extension only allows interacting with an Accumulo store. ## Prerequisites - Alx 1.0.5+ (we will refer to it at the ALX_HOME directory from now on) -- alx.rya features xml (can be found in maven at `mvn:mvm.rya/alx.rya/<version>/xml/features`) +- alx.rya features xml (can be found in maven at `mvn:org.apache.rya/alx.rya/<version>/xml/features`) ## Steps @@ -40,13 +40,13 @@ Currently, the Alx Rya extension only allows interacting with an Accumulo store. That's it. To make sure, run `ls <alx.rya bundle id>` and make sure something like this pops up: ``` -mvm.rya.alx.rya (99) provides: +org.apache.rya.alx.rya (99) provides: ------------------------------ -Bundle-SymbolicName = mvm.rya.alx.rya +Bundle-SymbolicName = org.apache.rya.alx.rya Bundle-Version = 3.0.4.SNAPSHOT objectClass = org.osgi.service.cm.ManagedService service.id = 226 -service.pid = mvm.rya.alx +service.pid = org.apache.rya.alx ---- ... ``` @@ -59,7 +59,7 @@ The bundle registers a Sail Repository, so you can interact with it directly as import org.springframework.osgi.extensions.annotation.*; import org.openrdf.repository.*; import org.openrdf.model.ValueFactory; -import static mvm.rya.api.RdfCloudTripleStoreConstants.*; +import static org.apache.rya.api.RdfCloudTripleStoreConstants.*; class TstRepo { http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/093e7c21/extras/rya.manual/src/site/markdown/eval.md ---------------------------------------------------------------------- diff --git a/extras/rya.manual/src/site/markdown/eval.md b/extras/rya.manual/src/site/markdown/eval.md index fc4095b..ff894eb 100644 --- a/extras/rya.manual/src/site/markdown/eval.md +++ b/extras/rya.manual/src/site/markdown/eval.md @@ -75,5 +75,5 @@ A sample configuration file might look like the following: Run the command, filling in the correct information. ``` -hadoop jar rya.prospector-3.0.4-SNAPSHOT-shade.jar mvm.rya.prospector.mr.Prospector /tmp/prospectorConf.xml +hadoop jar rya.prospector-3.0.4-SNAPSHOT-shade.jar org.apache.rya.prospector.mr.Prospector /tmp/prospectorConf.xml ``` \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/093e7c21/extras/rya.manual/src/site/markdown/loadPrecomputedJoin.md ---------------------------------------------------------------------- diff --git a/extras/rya.manual/src/site/markdown/loadPrecomputedJoin.md b/extras/rya.manual/src/site/markdown/loadPrecomputedJoin.md index 220cf03..2616ab3 100644 --- a/extras/rya.manual/src/site/markdown/loadPrecomputedJoin.md +++ b/extras/rya.manual/src/site/markdown/loadPrecomputedJoin.md @@ -28,7 +28,7 @@ A tool has been created to load a pre-computed join. This tool will generate an Generating a pre-computed join is done using Pig to execute a series of Map Reduce jobs. The index (pre-computed join) is associated with a user defined SPARQL query. -To execute the indexing tool, compile and run `mvm.rya.accumulo.pig.IndexWritingTool` +To execute the indexing tool, compile and run `org.apache.rya.accumulo.pig.IndexWritingTool` with the following seven input arguments: `[hdfsSaveLocation] [sparqlFile] [instance] [cbzk] [user] [password] [rdfTablePrefix]` @@ -46,4 +46,4 @@ Options: # Using a Pre-computed Join An example of using a pre-computed join can be referenced in -`mvm.rya.indexing.external.ExternalSailExample` +`org.apache.rya.indexing.external.ExternalSailExample` http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/093e7c21/extras/rya.manual/src/site/markdown/loaddata.md ---------------------------------------------------------------------- diff --git a/extras/rya.manual/src/site/markdown/loaddata.md b/extras/rya.manual/src/site/markdown/loaddata.md index 74fb90b..5d3f298 100644 --- a/extras/rya.manual/src/site/markdown/loaddata.md +++ b/extras/rya.manual/src/site/markdown/loaddata.md @@ -99,7 +99,7 @@ Bulk loading data is done through Map Reduce jobs This Map Reduce job will read files into memory and parse them into statements. The statements are saved into the store. Here is an example for storing in Accumulo: ``` -hadoop jar target/rya.mapreduce-3.2.10-SNAPSHOT-shaded.jar mvm.rya.accumulo.mr.RdfFileInputTool -Dac.zk=localhost:2181 -Dac.instance=accumulo -Dac.username=root -Dac.pwd=secret -Drdf.tablePrefix=triplestore_ -Drdf.format=N-Triples /tmp/temp.ntrips +hadoop jar target/rya.mapreduce-3.2.10-SNAPSHOT-shaded.jar org.apache.rya.accumulo.mr.RdfFileInputTool -Dac.zk=localhost:2181 -Dac.instance=accumulo -Dac.username=root -Dac.pwd=secret -Drdf.tablePrefix=triplestore_ -Drdf.format=N-Triples /tmp/temp.ntrips ``` Options: http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/093e7c21/extras/rya.manual/src/site/markdown/mapreduce.md ---------------------------------------------------------------------- diff --git a/extras/rya.manual/src/site/markdown/mapreduce.md b/extras/rya.manual/src/site/markdown/mapreduce.md index fde2231..2763307 100644 --- a/extras/rya.manual/src/site/markdown/mapreduce.md +++ b/extras/rya.manual/src/site/markdown/mapreduce.md @@ -99,7 +99,7 @@ configure input and output for MapReduce jobs using the stored parameters. Expects parameters to be specified in the configuration using the names defined in MRUtils, or for secondary indexers, the names in -`mvm.rya.indexing.accumulo.ConfigUtils`. +`org.apache.rya.indexing.accumulo.ConfigUtils`. ## Examples http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/093e7c21/extras/rya.manual/src/site/markdown/sm-firststeps.md ---------------------------------------------------------------------- diff --git a/extras/rya.manual/src/site/markdown/sm-firststeps.md b/extras/rya.manual/src/site/markdown/sm-firststeps.md index 431292a..5f49b41 100644 --- a/extras/rya.manual/src/site/markdown/sm-firststeps.md +++ b/extras/rya.manual/src/site/markdown/sm-firststeps.md @@ -46,7 +46,7 @@ I find that the best way to load the data is through the Bulk Load Map Reduce jo * Bulk load the data. Here is a sample command line: ``` -hadoop jar ../rya.mapreduce-3.2.10-SNAPSHOT-job.jar mvm.rya.accumulo.mr.RdfFileInputTool -Drdf.tablePrefix=lubm_ -Dcb.username=user -Dcb.pwd=cbpwd -Dcb.instance=instance -Dcb.zk=zookeeperLocation -Drdf.format=N-Triples <RDF_HDFS_LOCATION> +hadoop jar ../rya.mapreduce-3.2.10-SNAPSHOT-job.jar org.apache.rya.accumulo.mr.RdfFileInputTool -Drdf.tablePrefix=lubm_ -Dcb.username=user -Dcb.pwd=cbpwd -Dcb.instance=instance -Dcb.zk=zookeeperLocation -Drdf.format=N-Triples <RDF_HDFS_LOCATION> ``` Once the data is loaded, it is actually a good practice to compact your tables. You can do this by opening the accumulo shell `shell` and running the `compact` command on the generated tables. Remember the generated tables will be prefixed by the `rdf.tablePrefix` property you assigned above. The default tablePrefix is `rts`. http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/093e7c21/extras/rya.merger/README.md ---------------------------------------------------------------------- diff --git a/extras/rya.merger/README.md b/extras/rya.merger/README.md index a4fdb71..9bd83e9 100644 --- a/extras/rya.merger/README.md +++ b/extras/rya.merger/README.md @@ -245,7 +245,7 @@ The Merge Tool (and Copy Tool) can be run or tested several ways. Either connect This is for testing and creates a MiniAccumuloCluster that the Merge Tool can connect to. -In Eclipse, right-click on *â/rya.merger/src/test/java/mvm/rya/accumulo/mr/merge/driver/MiniAccumuloClusterDriver.javaâ* and choose *"Run -> Java Application"*. If it successfully starts, it will say `âMiniAccumuloClusters running and populatedâ` at the bottom of the console. With the MiniAccumuloClusterDriver running in Eclipse, edit the *"merge_tool.bat"* or *"merge_tool.sh"* script using the parent and child config values displayed in the *"MiniAccumuloClusterDriver"* console (scroll up in the console to find and copy the values you need). Save the script file and run it as described below. +In Eclipse, right-click on *â/rya.merger/src/test/java/org.apache/rya/accumulo/mr/merge/driver/MiniAccumuloClusterDriver.javaâ* and choose *"Run -> Java Application"*. If it successfully starts, it will say `âMiniAccumuloClusters running and populatedâ` at the bottom of the console. With the MiniAccumuloClusterDriver running in Eclipse, edit the *"merge_tool.bat"* or *"merge_tool.sh"* script using the parent and child config values displayed in the *"MiniAccumuloClusterDriver"* console (scroll up in the console to find and copy the values you need). Save the script file and run it as described below. #### Running from the Script File @@ -295,7 +295,7 @@ The first line (`-Dac.instance=parent_instance`) corresponds to the XML section: </property> ``` -Only modify the inside of a property's `<value>...</value>` tag when configuring. Once configured, right-click on *â/rya.merger/src/main/java/mvm/rya/accumulo/mr/merge/MergeTool.javaâ* and choose *âRun As -> Run Configurations...â*. Click on the *âArgumentsâ* tab and in the *âVM argumentsâ* box add the value: +Only modify the inside of a property's `<value>...</value>` tag when configuring. Once configured, right-click on *â/rya.merger/src/main/java/org.apache/rya/accumulo/mr/merge/MergeTool.javaâ* and choose *âRun As -> Run Configurations...â*. Click on the *âArgumentsâ* tab and in the *âVM argumentsâ* box add the value: ``` -Dlog4j.configuration="file:config/log4j.xml" @@ -307,7 +307,7 @@ In the *"Program arguments"* box add the value: -conf config/configuration.xml ``` -For the Copy Tool, do the same thing for *â/rya.merger/src/main/java/mvm/rya/accumulo/mr/merge/CopyTool.javaâ but change the arguments to: +For the Copy Tool, do the same thing for *â/rya.merger/src/main/java/org.apache/rya/accumulo/mr/merge/CopyTool.javaâ but change the arguments to: ``` -Dlog4j.configuration="file:config/copy_tool_log4j.xml" @@ -427,13 +427,13 @@ If the File Output option was used with the Copy Tool then the generated directo To run the Merge Tool on the cluster, use the `scp` command to copy the config file and uber jar onto the cluster machine. They can be found in *"MergeTool/config/configuration.xml"* and *âMergeTool/target/rya.merger-{version.number}-shaded.jarâ* respectively. Once copied run the following command: -`hadoop jar rya.merger-{version.number}-shaded.jar mvm.rya.accumulo.mr.merge.MergeTool -conf configuration.xml` +`hadoop jar rya.merger-{version.number}-shaded.jar org.apache.rya.accumulo.mr.merge.MergeTool -conf configuration.xml` ##### Running the Rule-based Copy The rule-based copy requires several Accumulo jars on the hadoop classpath. The easiest way to ensure this is to use Accumulo's `tool.sh` to launch the job: -`tool.sh rya.merger-{version.number}-shaded.jar mvm.rya.accumulo.mr.merge.CopyTool -conf configuration.xml` +`tool.sh rya.merger-{version.number}-shaded.jar org.apache.rya.accumulo.mr.merge.CopyTool -conf configuration.xml` Alternatively, use `hadoop jar` as above but make sure that `HADOOP_CLASSPATH` contains accumulo-core, accumulo-fate, accumulo-trace, and libthrift jars. http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/093e7c21/extras/rya.merger/pom.xml ---------------------------------------------------------------------- diff --git a/extras/rya.merger/pom.xml b/extras/rya.merger/pom.xml index 4ce8e77..c9b42e9 100644 --- a/extras/rya.merger/pom.xml +++ b/extras/rya.merger/pom.xml @@ -197,7 +197,7 @@ under the License. <configuration> <archive> <manifest> - <mainClass>mvm.rya.accumulo.mr.merge.MergeTool</mainClass> + <mainClass>org.apache.rya.accumulo.mr.merge.MergeTool</mainClass> </manifest> </archive> <descriptorRefs> @@ -224,7 +224,7 @@ under the License. <transformers> <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer"> <manifestEntries> - <!--<Main-Class>mvm.rya.accumulo.mr.merge.MergeTool</Main-Class>--> + <!--<Main-Class>org.apache.rya.accumulo.mr.merge.MergeTool</Main-Class>--> </manifestEntries> </transformer> <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" /> @@ -282,7 +282,7 @@ under the License. <addClasspath>true</addClasspath> <classpathPrefix>lib</classpathPrefix> <!--Removing main-class from manifest so hadoop command will be able to call multiple main classes--> - <!--<mainClass>mvm.rya.accumulo.mr.merge.MergeTool</mainClass>--> + <!--<mainClass>org.apache.rya.accumulo.mr.merge.MergeTool</mainClass>--> </manifest> <manifestEntries> <Built-By></Built-By> @@ -427,7 +427,7 @@ under the License. <goal>java</goal> </goals> <configuration> - <mainClass>mvm.rya.accumulo.mr.merge.MergeTool</mainClass> + <mainClass>org.apache.rya.accumulo.mr.merge.MergeTool</mainClass> <systemProperties> <systemProperty> <key>log4j.configuration</key> @@ -446,7 +446,7 @@ under the License. <goal>java</goal> </goals> <configuration> - <mainClass>mvm.rya.accumulo.mr.merge.CopyTool</mainClass> + <mainClass>org.apache.rya.accumulo.mr.merge.CopyTool</mainClass> <systemProperties> <systemProperty> <key>log4j.configuration</key> http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/093e7c21/extras/rya.merger/startup_scripts/copy_tool.bat ---------------------------------------------------------------------- diff --git a/extras/rya.merger/startup_scripts/copy_tool.bat b/extras/rya.merger/startup_scripts/copy_tool.bat index b5eec89..813643a 100644 --- a/extras/rya.merger/startup_scripts/copy_tool.bat +++ b/extras/rya.merger/startup_scripts/copy_tool.bat @@ -23,4 +23,4 @@ echo "Launching Copy Tool..." :: so use a hard-coded filename for the jar if necessary. SET JAR_NAME=rya.merger-*.jar -java -Xms256m -Xmx1024M -Dlog4j.configuration="file:config/copy_tool_log4j.xml" -cp %JAR_NAME% mvm.rya.accumulo.mr.merge.CopyTool -conf config/copy_tool_configuration.xml \ No newline at end of file +java -Xms256m -Xmx1024M -Dlog4j.configuration="file:config/copy_tool_log4j.xml" -cp %JAR_NAME% org.apache.rya.accumulo.mr.merge.CopyTool -conf config/copy_tool_configuration.xml \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/093e7c21/extras/rya.merger/startup_scripts/copy_tool.sh ---------------------------------------------------------------------- diff --git a/extras/rya.merger/startup_scripts/copy_tool.sh b/extras/rya.merger/startup_scripts/copy_tool.sh index b03fd1a..301073d 100644 --- a/extras/rya.merger/startup_scripts/copy_tool.sh +++ b/extras/rya.merger/startup_scripts/copy_tool.sh @@ -19,4 +19,4 @@ echo "Launching Copy Tool..." -java -Xms256m -Xmx1024M -Dlog4j.configuration="file:config/copy_tool_log4j.xml" -cp rya.merger-*.jar mvm.rya.accumulo.mr.merge.CopyTool -conf config/copy_tool_configuration.xml \ No newline at end of file +java -Xms256m -Xmx1024M -Dlog4j.configuration="file:config/copy_tool_log4j.xml" -cp rya.merger-*.jar org.apache.rya.accumulo.mr.merge.CopyTool -conf config/copy_tool_configuration.xml \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/093e7c21/extras/rya.merger/startup_scripts/hadoop_copy_tool.bat ---------------------------------------------------------------------- diff --git a/extras/rya.merger/startup_scripts/hadoop_copy_tool.bat b/extras/rya.merger/startup_scripts/hadoop_copy_tool.bat index 25659bc..51d4a6c 100644 --- a/extras/rya.merger/startup_scripts/hadoop_copy_tool.bat +++ b/extras/rya.merger/startup_scripts/hadoop_copy_tool.bat @@ -23,4 +23,4 @@ echo "Launching Copy Tool..." :: so use a hard-coded filename for the jar if necessary. SET JAR_NAME=rya.merger-*-shaded.jar -hadoop jar %JAR_NAME% mvm.rya.accumulo.mr.merge.CopyTool -conf config/copy_tool_configuration.xml \ No newline at end of file +hadoop jar %JAR_NAME% org.apache.rya.accumulo.mr.merge.CopyTool -conf config/copy_tool_configuration.xml \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/093e7c21/extras/rya.merger/startup_scripts/hadoop_copy_tool.sh ---------------------------------------------------------------------- diff --git a/extras/rya.merger/startup_scripts/hadoop_copy_tool.sh b/extras/rya.merger/startup_scripts/hadoop_copy_tool.sh index faf452e..df31bea 100644 --- a/extras/rya.merger/startup_scripts/hadoop_copy_tool.sh +++ b/extras/rya.merger/startup_scripts/hadoop_copy_tool.sh @@ -19,7 +19,7 @@ echo "Launching Copy Tool..." -class=mvm.rya.accumulo.mr.merge.CopyTool +class=org.apache.rya.accumulo.mr.merge.CopyTool command="${ACCUMULO_HOME}/bin/tool.sh" if [ ! -x $command ]; then @@ -27,4 +27,4 @@ if [ ! -x $command ]; then command="hadoop jar" fi -$command rya.merger-*-shaded.jar mvm.rya.accumulo.mr.merge.CopyTool -conf config/copy_tool_configuration.xml +$command rya.merger-*-shaded.jar org.apache.rya.accumulo.mr.merge.CopyTool -conf config/copy_tool_configuration.xml http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/093e7c21/extras/rya.merger/startup_scripts/hadoop_merge_tool.bat ---------------------------------------------------------------------- diff --git a/extras/rya.merger/startup_scripts/hadoop_merge_tool.bat b/extras/rya.merger/startup_scripts/hadoop_merge_tool.bat index ef4aa01..42c9535 100644 --- a/extras/rya.merger/startup_scripts/hadoop_merge_tool.bat +++ b/extras/rya.merger/startup_scripts/hadoop_merge_tool.bat @@ -23,4 +23,4 @@ echo "Launching Merge Tool..." :: so use a hard-coded filename for the jar if necessary. SET JAR_NAME=rya.merger-*-shaded.jar -hadoop jar %JAR_NAME% mvm.rya.accumulo.mr.merge.MergeTool -conf config/configuration.xml \ No newline at end of file +hadoop jar %JAR_NAME% org.apache.rya.accumulo.mr.merge.MergeTool -conf config/configuration.xml \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/093e7c21/extras/rya.merger/startup_scripts/hadoop_merge_tool.sh ---------------------------------------------------------------------- diff --git a/extras/rya.merger/startup_scripts/hadoop_merge_tool.sh b/extras/rya.merger/startup_scripts/hadoop_merge_tool.sh index 48ee95e..7719aba 100644 --- a/extras/rya.merger/startup_scripts/hadoop_merge_tool.sh +++ b/extras/rya.merger/startup_scripts/hadoop_merge_tool.sh @@ -19,4 +19,4 @@ echo "Launching Merge Tool..." -hadoop jar rya.merger-*-shaded.jar mvm.rya.accumulo.mr.merge.MergeTool -conf config/configuration.xml \ No newline at end of file +hadoop jar rya.merger-*-shaded.jar org.apache.rya.accumulo.mr.merge.MergeTool -conf config/configuration.xml \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/093e7c21/extras/rya.merger/startup_scripts/merge_tool.bat ---------------------------------------------------------------------- diff --git a/extras/rya.merger/startup_scripts/merge_tool.bat b/extras/rya.merger/startup_scripts/merge_tool.bat index e5dd763..6abd450 100644 --- a/extras/rya.merger/startup_scripts/merge_tool.bat +++ b/extras/rya.merger/startup_scripts/merge_tool.bat @@ -23,4 +23,4 @@ echo "Launching Merge Tool..." :: so use a hard-coded filename for the jar if necessary. SET JAR_NAME=rya.merger-*.jar -java -Xms256m -Xmx1024M -Dlog4j.configuration="file:config/log4j.xml" -cp %JAR_NAME% mvm.rya.accumulo.mr.merge.MergeTool -conf config/configuration.xml \ No newline at end of file +java -Xms256m -Xmx1024M -Dlog4j.configuration="file:config/log4j.xml" -cp %JAR_NAME% org.apache.rya.accumulo.mr.merge.MergeTool -conf config/configuration.xml \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/093e7c21/extras/rya.merger/startup_scripts/merge_tool.sh ---------------------------------------------------------------------- diff --git a/extras/rya.merger/startup_scripts/merge_tool.sh b/extras/rya.merger/startup_scripts/merge_tool.sh index b0e6b58..e08ec47 100644 --- a/extras/rya.merger/startup_scripts/merge_tool.sh +++ b/extras/rya.merger/startup_scripts/merge_tool.sh @@ -19,4 +19,4 @@ echo "Launching Merge Tool..." -java -Xms256m -Xmx1024M -Dlog4j.configuration="file:config/log4j.xml" -cp rya.merger-*.jar mvm.rya.accumulo.mr.merge.MergeTool -conf config/configuration.xml \ No newline at end of file +java -Xms256m -Xmx1024M -Dlog4j.configuration="file:config/log4j.xml" -cp rya.merger-*.jar org.apache.rya.accumulo.mr.merge.MergeTool -conf config/configuration.xml \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/093e7c21/extras/rya.prospector/src/main/resources/META-INF/services/org.apache.rya.prospector.plans.IndexWorkPlan ---------------------------------------------------------------------- diff --git a/extras/rya.prospector/src/main/resources/META-INF/services/org.apache.rya.prospector.plans.IndexWorkPlan b/extras/rya.prospector/src/main/resources/META-INF/services/org.apache.rya.prospector.plans.IndexWorkPlan index 38258c1..2f5de88 100644 --- a/extras/rya.prospector/src/main/resources/META-INF/services/org.apache.rya.prospector.plans.IndexWorkPlan +++ b/extras/rya.prospector/src/main/resources/META-INF/services/org.apache.rya.prospector.plans.IndexWorkPlan @@ -1 +1 @@ -mvm.rya.prospector.plans.impl.CountPlan \ No newline at end of file +org.apache.rya.prospector.plans.impl.CountPlan \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/093e7c21/extras/rya.reasoning/README.md ---------------------------------------------------------------------- diff --git a/extras/rya.reasoning/README.md b/extras/rya.reasoning/README.md index fd988b0..533c903 100644 --- a/extras/rya.reasoning/README.md +++ b/extras/rya.reasoning/README.md @@ -128,7 +128,7 @@ triples, only the former need to be held in memory. # Usage The complete forward-chaining inference task is performed by the class -**mvm.rya.reasoning.mr.ReasoningDriver**. This will run a series of MapReduce +**org.apache.rya.reasoning.mr.ReasoningDriver**. This will run a series of MapReduce jobs on the input until no further inferences can be made. Input must be configured using properties given in a Hadoop configuration file and/or through command line parameters. Optional parameters control the output generated. @@ -221,7 +221,7 @@ The following command will run the reasoner on the triples found in Rya table `r produce file output in HDFS under `example_output/final`: ``` -hadoop jar target/rya.reasoning-3.2.10-SNAPSHOT-shaded.jar mvm.rya.reasoning.mr.ReasoningDriver -conf conf.xml -Drdf.tablePrefix=rya_ +hadoop jar target/rya.reasoning-3.2.10-SNAPSHOT-shaded.jar org.apache.rya.reasoning.mr.ReasoningDriver -conf conf.xml -Drdf.tablePrefix=rya_ ``` ## Output @@ -273,7 +273,7 @@ for intermediate storage and reasoner output (**reasoning.workingDir**). Example: ``` -hadoop jar rya.reasoning-3.2.10-SNAPSHOT-shaded.jar mvm.rya.reasoning.mr.ConformanceTest -conf conf.xml owl-test/profile-RL.rdf temp +hadoop jar rya.reasoning-3.2.10-SNAPSHOT-shaded.jar org.apache.rya.reasoning.mr.ConformanceTest -conf conf.xml owl-test/profile-RL.rdf temp ``` ---------- @@ -665,12 +665,12 @@ processType(fact): ## Classes -The main reasoning logic is located in **mvm.rya.reasoning**, while MapReduce +The main reasoning logic is located in **org.apache.rya.reasoning**, while MapReduce tools and utilities for interacting with Accumulo are located in -**mvm.rya.reasoning.mr**. Reasoning logic makes use of RDF constructs in the +**org.apache.rya.reasoning.mr**. Reasoning logic makes use of RDF constructs in the **org.openrdf.model** API, in particular: Statement, URI, Resource, and Value. -### mvm.rya.reasoning +### org.apache.rya.reasoning - **OWL2**: In general, the Sesame/openrdf API is used to represent RDF constructs and @@ -813,7 +813,7 @@ tools and utilities for interacting with Accumulo are located in if the node turns out to be a particular type, and return that information if/when that happens. (Particularly useful for property restriction rules.) -### mvm.rya.reasoning.mr +### org.apache.rya.reasoning.mr Contains MapReduce tools and utilities for interacting with HDFS, Accumulo, and Rya tables in Accumulo. http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/093e7c21/osgi/alx.rya.console/src/main/resources/OSGI-INF/blueprint/alx.rya.console-blueprint.xml ---------------------------------------------------------------------- diff --git a/osgi/alx.rya.console/src/main/resources/OSGI-INF/blueprint/alx.rya.console-blueprint.xml b/osgi/alx.rya.console/src/main/resources/OSGI-INF/blueprint/alx.rya.console-blueprint.xml index 129e9c7..5fb462d 100644 --- a/osgi/alx.rya.console/src/main/resources/OSGI-INF/blueprint/alx.rya.console-blueprint.xml +++ b/osgi/alx.rya.console/src/main/resources/OSGI-INF/blueprint/alx.rya.console-blueprint.xml @@ -24,10 +24,10 @@ under the License. <command-bundle xmlns="http://karaf.apache.org/xmlns/shell/v1.0.0";> <command name="rya/info"> - <action class="mvm.rya.alx.command.InfoRyaCommand"/> + <action class="org.apache.rya.alx.command.InfoRyaCommand"/> </command> <command name="rya/getstatements"> - <action class="mvm.rya.alx.command.GetStatementsRyaCommand"/> + <action class="org.apache.rya.alx.command.GetStatementsRyaCommand"/> </command> </command-bundle> http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/093e7c21/osgi/alx.rya/src/main/features/alx.rya-features.xml ---------------------------------------------------------------------- diff --git a/osgi/alx.rya/src/main/features/alx.rya-features.xml b/osgi/alx.rya/src/main/features/alx.rya-features.xml index 9e36c33..87794b9 100644 --- a/osgi/alx.rya/src/main/features/alx.rya-features.xml +++ b/osgi/alx.rya/src/main/features/alx.rya-features.xml @@ -74,20 +74,20 @@ under the License. <!--<feature version="[2.6,3.0)">org.openrdf.sesame.runtime</feature>--> <feature version="1.2">tinkerpop.blueprints</feature> <feature version="[10,12)">google.guava</feature> - <bundle>mvn:mvm.rya/sesame-runtime-osgi/2.6.4</bundle> - <bundle>wrap:mvn:mvm.rya/rya.api/3.0.4-SNAPSHOT</bundle> - <bundle>wrap:mvn:mvm.rya/rya.sail.impl/3.0.4-SNAPSHOT</bundle> + <bundle>mvn:org.apache.rya/sesame-runtime-osgi/2.6.4</bundle> + <bundle>wrap:mvn:org.apache.rya/rya.api/3.0.4-SNAPSHOT</bundle> + <bundle>wrap:mvn:org.apache.rya/rya.sail.impl/3.0.4-SNAPSHOT</bundle> </feature> <feature name="cloudbase.rya" version="3.0.4"> - <feature version="1.0.5">mvm.alx.connect.cloudbase.connect</feature> + <feature version="1.0.5">org.apache.alx.connect.cloudbase.connect</feature> <feature version="[10,12)">google.guava</feature> - <bundle>wrap:mvn:mvm.rya/cloudbase.rya/3.0.4-SNAPSHOT</bundle> - <bundle>wrap:mvn:mvm.rya/cloudbase.utils/1.0.1-SNAPSHOT</bundle> + <bundle>wrap:mvn:org.apache.rya/cloudbase.rya/3.0.4-SNAPSHOT</bundle> + <bundle>wrap:mvn:org.apache.rya/cloudbase.utils/1.0.1-SNAPSHOT</bundle> </feature> <feature name="accumulo.rya" version="3.0.4"> - <feature version="1.0.5">mvm.alx.accumulo.connect</feature> + <feature version="1.0.5">org.apache.alx.accumulo.connect</feature> <feature version="[10,12)">google.guava</feature> - <bundle>wrap:mvn:mvm.rya/accumulo.rya/3.0.4-SNAPSHOT</bundle> + <bundle>wrap:mvn:org.apache.rya/accumulo.rya/3.0.4-SNAPSHOT</bundle> </feature> <feature name='alx.rya' version='3.0.4'> <feature version="0.7.1">pax-web</feature> @@ -95,10 +95,10 @@ under the License. <feature version="3.0.4">rya.sail</feature> <feature version="3.0.4">accumulo.rya</feature> <!--Ehcache should already be part of alx: net.sf.ehcache:ehcache-core:jar:1.7.1:compile--> - <bundle>mvn:mvm.rya/alx.rya/3.0.4-SNAPSHOT</bundle> + <bundle>mvn:org.apache.rya/alx.rya/3.0.4-SNAPSHOT</bundle> </feature> <feature name='alx.rya.console' version='3.0.4'> <feature version="3.0.4">alx.rya</feature> - <bundle>mvn:mvm.rya/alx.rya.console/3.0.4-SNAPSHOT</bundle> + <bundle>mvn:org.apache.rya/alx.rya.console/3.0.4-SNAPSHOT</bundle> </feature> </features> http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/093e7c21/osgi/alx.rya/src/main/resources/META-INF/spring/alx.rya-spring-osgi.xml ---------------------------------------------------------------------- diff --git a/osgi/alx.rya/src/main/resources/META-INF/spring/alx.rya-spring-osgi.xml b/osgi/alx.rya/src/main/resources/META-INF/spring/alx.rya-spring-osgi.xml index 76f1bd3..2bf55a9 100644 --- a/osgi/alx.rya/src/main/resources/META-INF/spring/alx.rya-spring-osgi.xml +++ b/osgi/alx.rya/src/main/resources/META-INF/spring/alx.rya-spring-osgi.xml @@ -34,7 +34,7 @@ under the License. <!-- Configuration Admin entry --> <osgix:cm-properties id="alxProps" - persistent-id="mvm.rya.alx"> + persistent-id="org.apache.rya.alx"> <prop key="query.tblprefix">l_</prop> <prop key="query.printqueryplan">true</prop> </osgix:cm-properties> http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/093e7c21/osgi/alx.rya/src/main/resources/META-INF/spring/alx.rya-spring.xml ---------------------------------------------------------------------- diff --git a/osgi/alx.rya/src/main/resources/META-INF/spring/alx.rya-spring.xml b/osgi/alx.rya/src/main/resources/META-INF/spring/alx.rya-spring.xml index 4ef9ac0..e5d47c0 100644 --- a/osgi/alx.rya/src/main/resources/META-INF/spring/alx.rya-spring.xml +++ b/osgi/alx.rya/src/main/resources/META-INF/spring/alx.rya-spring.xml @@ -33,37 +33,37 @@ under the License. <!-- placeholder configurer --> <ctx:property-placeholder properties-ref="alxProps" /> - <bean id="configurationFactory" class="mvm.rya.alx.util.ConfigurationFactory"> - <osgix:managed-properties persistent-id="mvm.rya.alx" + <bean id="configurationFactory" class="org.apache.rya.alx.util.ConfigurationFactory"> + <osgix:managed-properties persistent-id="org.apache.rya.alx" update-strategy="bean-managed" update-method="setProperties" /> </bean> <bean id="configuration" factory-bean="configurationFactory" factory-method="getConfiguration"/> - <bean id="rdfEval" class="mvm.rya.accumulo.AccumuloRdfEvalStatsDAO" init-method="init" destroy-method="destroy"> + <bean id="rdfEval" class="org.apache.rya.accumulo.AccumuloRdfEvalStatsDAO" init-method="init" destroy-method="destroy"> <property name="connector" ref="connectorServiceOsgi"/> <property name="conf" ref="configuration"/> </bean> - <bean id="ryaDAO" class="mvm.rya.accumulo.AccumuloRyaDAO"> + <bean id="ryaDAO" class="org.apache.rya.accumulo.AccumuloRyaDAO"> <property name="connector" ref="connectorServiceOsgi"/> <property name="conf" ref="configuration"/> </bean> - <bean id="inferenceEngine" class="mvm.rya.rdftriplestore.inference.InferenceEngine"> + <bean id="inferenceEngine" class="org.apache.rya.rdftriplestore.inference.InferenceEngine"> <property name="ryaDAO" ref="ryaDAO"/> <property name="conf" ref="configuration"/> </bean> - <bean id="rts" class="mvm.rya.rdftriplestore.RdfCloudTripleStore"> + <bean id="rts" class="org.apache.rya.rdftriplestore.RdfCloudTripleStore"> <property name="ryaDAO" ref="ryaDAO"/> <property name="rdfEvalStatsDAO" ref="rdfEval"/> <property name="inferenceEngine" ref="inferenceEngine"/> <property name="conf" ref="configuration"/> </bean> - <bean id="sailRepo" class="mvm.rya.rdftriplestore.RyaSailRepository" init-method="initialize" destroy-method="shutDown"> + <bean id="sailRepo" class="org.apache.rya.rdftriplestore.RyaSailRepository" init-method="initialize" destroy-method="shutDown"> <constructor-arg ref="rts"/> </bean> http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/093e7c21/osgi/camel.rya/src/main/resources/META-INF/services/org/apache/camel/component/cbsail ---------------------------------------------------------------------- diff --git a/osgi/camel.rya/src/main/resources/META-INF/services/org/apache/camel/component/cbsail b/osgi/camel.rya/src/main/resources/META-INF/services/org/apache/camel/component/cbsail index 69cfb2d..09de021 100644 --- a/osgi/camel.rya/src/main/resources/META-INF/services/org/apache/camel/component/cbsail +++ b/osgi/camel.rya/src/main/resources/META-INF/services/org/apache/camel/component/cbsail @@ -1 +1 @@ -class=mvm.rya.camel.cbsail.CbSailComponent \ No newline at end of file +class=org.apache.rya.camel.cbsail.CbSailComponent \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/093e7c21/sail/src/test/resources/reification.xml ---------------------------------------------------------------------- diff --git a/sail/src/test/resources/reification.xml b/sail/src/test/resources/reification.xml index 5ab7722..0bc83b5 100644 --- a/sail/src/test/resources/reification.xml +++ b/sail/src/test/resources/reification.xml @@ -22,12 +22,12 @@ under the License. <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"; xmlns:cd="http://www.recshop.fake/cd#"; - xmlns:mm="http://mvm.com/owl/2010/10/mm.owl#";> + xmlns:mm="http://org.apache.com/owl/2010/10/mm.owl#";> <rdf:Description rdf:nodeID="A4"> <rdf:subject - rdf:resource="http://mvm.com/owl/2010/10/mm.owl#urn:mm:mvm:root/cimv2:Linux_Processor:0:CIM_ComputerSystem:nimbus02.bullpen.net"/> - <rdf:predicate rdf:resource="http://mvm.com/owl/2010/10/mm.owl#loadPercentage"/> + rdf:resource="http://org.apache.com/owl/2010/10/mm.owl#urn:mm:org.apache:root/cimv2:Linux_Processor:0:CIM_ComputerSystem:nimbus02.bullpen.net"/> + <rdf:predicate rdf:resource="http://org.apache.com/owl/2010/10/mm.owl#loadPercentage"/> <rdf:object rdf:datatype="http://www.w3.org/2001/XMLSchema#int";>1</rdf:object> <rdf:type rdf:resource="http://www.w3.org/1999/02/22-rdf-syntax-ns#Statement"/> <mm:reportedAt rdf:datatype="http://www.w3.org/2001/XMLSchema#dateTime";>2011-01-07T21:29:45.545Z</mm:reportedAt> http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/093e7c21/web/web.rya/src/main/webapp/WEB-INF/spring/spring-accumulo.xml ---------------------------------------------------------------------- diff --git a/web/web.rya/src/main/webapp/WEB-INF/spring/spring-accumulo.xml b/web/web.rya/src/main/webapp/WEB-INF/spring/spring-accumulo.xml index 7f9caaf..2671fd0 100644 --- a/web/web.rya/src/main/webapp/WEB-INF/spring/spring-accumulo.xml +++ b/web/web.rya/src/main/webapp/WEB-INF/spring/spring-accumulo.xml @@ -38,13 +38,13 @@ under the License. <constructor-arg value="${instance.password}"/> </bean> - <bean id="conf" class="mvm.rya.accumulo.AccumuloRdfConfiguration"> + <bean id="conf" class="org.apache.rya.accumulo.AccumuloRdfConfiguration"> <property name="tablePrefix" value="${rya.tableprefix}"/> <property name="displayQueryPlan" value="${rya.displayqueryplan}"/> <property name="useStats" value="false"/> </bean> - <bean id="ryaDAO" class="mvm.rya.accumulo.AccumuloRyaDAO" init-method="init" destroy-method="destroy"> + <bean id="ryaDAO" class="org.apache.rya.accumulo.AccumuloRyaDAO" init-method="init" destroy-method="destroy"> <property name="connector" ref="connector"/> <property name="conf" ref="conf"/> </bean> http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/093e7c21/web/web.rya/src/main/webapp/WEB-INF/spring/spring-cloudbase.xml ---------------------------------------------------------------------- diff --git a/web/web.rya/src/main/webapp/WEB-INF/spring/spring-cloudbase.xml b/web/web.rya/src/main/webapp/WEB-INF/spring/spring-cloudbase.xml index 8d5ee69..5e90e77 100644 --- a/web/web.rya/src/main/webapp/WEB-INF/spring/spring-cloudbase.xml +++ b/web/web.rya/src/main/webapp/WEB-INF/spring/spring-cloudbase.xml @@ -38,12 +38,12 @@ under the License. <constructor-arg value="${instance.password}"/> </bean> - <bean id="conf" class="mvm.rya.cloudbase.CloudbaseRdfConfiguration"> + <bean id="conf" class="org.apache.rya.cloudbase.CloudbaseRdfConfiguration"> <property name="tablePrefix" value="${rya.tableprefix}"/> <property name="displayQueryPlan" value="${rya.displayqueryplan}"/> </bean> - <bean id="ryaDAO" class="mvm.rya.cloudbase.CloudbaseRyaDAO" init-method="init" destroy-method="destroy"> + <bean id="ryaDAO" class="org.apache.rya.cloudbase.CloudbaseRyaDAO" init-method="init" destroy-method="destroy"> <property name="connector" ref="connector"/> <property name="conf" ref="conf"/> </bean> http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/093e7c21/web/web.rya/src/main/webapp/WEB-INF/spring/spring-mongodb.xml ---------------------------------------------------------------------- diff --git a/web/web.rya/src/main/webapp/WEB-INF/spring/spring-mongodb.xml b/web/web.rya/src/main/webapp/WEB-INF/spring/spring-mongodb.xml index 85ea26e..5891cee 100644 --- a/web/web.rya/src/main/webapp/WEB-INF/spring/spring-mongodb.xml +++ b/web/web.rya/src/main/webapp/WEB-INF/spring/spring-mongodb.xml @@ -28,7 +28,7 @@ under the License. http://www.springframework.org/schema/oxm http://www.springframework.org/schema/oxm/spring-oxm-3.0.xsd";> - <bean id="conf" class="mvm.rya.mongodb.MongoDBRdfConfiguration"> + <bean id="conf" class="org.apache.rya.mongodb.MongoDBRdfConfiguration"> <property name="collectionName" value="${mongo.db.collectionprefix}"/> <property name="mongoInstance" value="${mongo.db.instance}"/> <property name="mongoPort" value="${mongo.db.port}"/> @@ -37,7 +37,7 @@ under the License. <property name="useStats" value="false"/> </bean> - <bean id="ryaDAO" class="mvm.rya.mongodb.MongoDBRyaDAO" init-method="init" destroy-method="destroy"> + <bean id="ryaDAO" class="org.apache.rya.mongodb.MongoDBRyaDAO" init-method="init" destroy-method="destroy"> <property name="conf" ref="conf"/> </bean> </beans> http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/093e7c21/web/web.rya/src/main/webapp/WEB-INF/spring/spring-root-extensions.xml ---------------------------------------------------------------------- diff --git a/web/web.rya/src/main/webapp/WEB-INF/spring/spring-root-extensions.xml b/web/web.rya/src/main/webapp/WEB-INF/spring/spring-root-extensions.xml index 67feae8..9f96b6f 100644 --- a/web/web.rya/src/main/webapp/WEB-INF/spring/spring-root-extensions.xml +++ b/web/web.rya/src/main/webapp/WEB-INF/spring/spring-root-extensions.xml @@ -33,7 +33,7 @@ under the License. <property name="location" value="classpath:environment.properties"/> </bean> - <context:component-scan base-package="mvm.cloud.rdf.web.sail" /> + <context:component-scan base-package="org.apache.cloud.rdf.web.sail" /> <import resource="spring-accumulo.xml"/> <import resource="spring-security.xml"/> @@ -60,27 +60,27 @@ under the License. <!-- inference Engine is disabled --> <!-- - <bean id="inferenceEngine" class="mvm.rya.rdftriplestore.inference.InferenceEngine" init-method="init" destroy-method="destroy"> + <bean id="inferenceEngine" class="org.apache.rya.rdftriplestore.inference.InferenceEngine" init-method="init" destroy-method="destroy"> <property name="ryaDAO" ref="ryaDAO"/> <property name="conf" ref="conf"/> </bean> - <bean id="prospectTableName" class="mvm.rya.prospector.service.ProspectorServiceEvalStatsDAO" factory-method="getProspectTableName"> + <bean id="prospectTableName" class="org.apache.rya.prospector.service.ProspectorServiceEvalStatsDAO" factory-method="getProspectTableName"> <constructor-arg ref="conf"/> </bean> - <bean id="prospectorService" class="mvm.rya.prospector.service.ProspectorService"> + <bean id="prospectorService" class="org.apache.rya.prospector.service.ProspectorService"> <constructor-arg ref="connector"/> <constructor-arg ref="prospectTableName"/> </bean> - <bean id="rdfEvalStatsDAO" class="mvm.rya.prospector.service.ProspectorServiceEvalStatsDAO"> + <bean id="rdfEvalStatsDAO" class="org.apache.rya.prospector.service.ProspectorServiceEvalStatsDAO"> <property name="prospectorService" ref="prospectorService"/> <property name="conf" ref="conf"/> </bean> --> - <bean id="ryaSail" class="mvm.rya.rdftriplestore.RdfCloudTripleStore"> + <bean id="ryaSail" class="org.apache.rya.rdftriplestore.RdfCloudTripleStore"> <property name="ryaDAO" ref="ryaDAO"/> <!-- <property name="rdfEvalStatsDAO" ref="rdfEvalStatsDAO"/> @@ -89,11 +89,11 @@ under the License. <property name="conf" ref="conf"/> </bean> - <bean id="indexerSettings" class="mvm.rya.indexing.accumulo.AccumuloIndexerSettings"> + <bean id="indexerSettings" class="org.apache.rya.indexing.accumulo.AccumuloIndexerSettings"> <constructor-arg ref="hadoopConf"/> </bean> - <bean id="ryaIndexingSail" class="mvm.rya.indexing.accumulo.RyaIndexingSail"> + <bean id="ryaIndexingSail" class="org.apache.rya.indexing.accumulo.RyaIndexingSail"> <constructor-arg ref="hadoopConf"/> <constructor-arg ref="ryaSail"/> <constructor-arg ref="indexerSettings"/> http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/093e7c21/web/web.rya/src/main/webapp/WEB-INF/spring/spring-root.xml ---------------------------------------------------------------------- diff --git a/web/web.rya/src/main/webapp/WEB-INF/spring/spring-root.xml b/web/web.rya/src/main/webapp/WEB-INF/spring/spring-root.xml index b42a222..126df0e 100644 --- a/web/web.rya/src/main/webapp/WEB-INF/spring/spring-root.xml +++ b/web/web.rya/src/main/webapp/WEB-INF/spring/spring-root.xml @@ -31,38 +31,38 @@ under the License. <property name="location" value="classpath:environment.properties"/> </bean> - <context:component-scan base-package="mvm.cloud.rdf.web.sail" /> + <context:component-scan base-package="org.apache.cloud.rdf.web.sail" /> <import resource="spring-security.xml"/> <import resource="spring-accumulo.xml"/> - <bean id="inferenceEngine" class="mvm.rya.rdftriplestore.inference.InferenceEngine" init-method="init" destroy-method="destroy"> + <bean id="inferenceEngine" class="org.apache.rya.rdftriplestore.inference.InferenceEngine" init-method="init" destroy-method="destroy"> <property name="ryaDAO" ref="ryaDAO"/> <property name="conf" ref="conf"/> </bean> - <bean id="prospectTableName" class="mvm.rya.prospector.service.ProspectorServiceEvalStatsDAO" factory-method="getProspectTableName"> + <bean id="prospectTableName" class="org.apache.rya.prospector.service.ProspectorServiceEvalStatsDAO" factory-method="getProspectTableName"> <constructor-arg ref="conf"/> </bean> - <bean id="prospectorService" class="mvm.rya.prospector.service.ProspectorService"> + <bean id="prospectorService" class="org.apache.rya.prospector.service.ProspectorService"> <constructor-arg ref="connector"/> <constructor-arg ref="prospectTableName"/> </bean> - <bean id="rdfEvalStatsDAO" class="mvm.rya.prospector.service.ProspectorServiceEvalStatsDAO"> + <bean id="rdfEvalStatsDAO" class="org.apache.rya.prospector.service.ProspectorServiceEvalStatsDAO"> <property name="prospectorService" ref="prospectorService"/> <property name="conf" ref="conf"/> </bean> - <bean id="rts" class="mvm.rya.rdftriplestore.RdfCloudTripleStore"> + <bean id="rts" class="org.apache.rya.rdftriplestore.RdfCloudTripleStore"> <property name="ryaDAO" ref="ryaDAO"/> <property name="rdfEvalStatsDAO" ref="rdfEvalStatsDAO"/> <property name="inferenceEngine" ref="inferenceEngine"/> <property name="conf" ref="conf"/> </bean> - <bean id="sailRepo" class="mvm.rya.rdftriplestore.RyaSailRepository" init-method="initialize" destroy-method="shutDown"> + <bean id="sailRepo" class="org.apache.rya.rdftriplestore.RyaSailRepository" init-method="initialize" destroy-method="shutDown"> <constructor-arg ref="rts"/> </bean> </beans> http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/093e7c21/web/web.rya/src/main/webapp/WEB-INF/spring/spring-security.xml ---------------------------------------------------------------------- diff --git a/web/web.rya/src/main/webapp/WEB-INF/spring/spring-security.xml b/web/web.rya/src/main/webapp/WEB-INF/spring/spring-security.xml index c15e9d3..4f4d5bf 100644 --- a/web/web.rya/src/main/webapp/WEB-INF/spring/spring-security.xml +++ b/web/web.rya/src/main/webapp/WEB-INF/spring/spring-security.xml @@ -29,6 +29,6 @@ under the License. <context:annotation-config/> - <bean id="provider" class="mvm.cloud.rdf.web.sail.SecurityProviderImpl"/> + <bean id="provider" class="org.apache.cloud.rdf.web.sail.SecurityProviderImpl"/> </beans> http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/093e7c21/web/web.rya/src/main/webapp/WEB-INF/web.xml ---------------------------------------------------------------------- diff --git a/web/web.rya/src/main/webapp/WEB-INF/web.xml b/web/web.rya/src/main/webapp/WEB-INF/web.xml index 5f53e4b..0b8de72 100644 --- a/web/web.rya/src/main/webapp/WEB-INF/web.xml +++ b/web/web.rya/src/main/webapp/WEB-INF/web.xml @@ -42,7 +42,7 @@ under the License. </servlet-mapping> <!--<servlet>--> <!--<servlet-name>LoadDataServlet</servlet-name>--> - <!--<servlet-class>mvm.cloud.rdf.web.cloudbase.sail.LoadDataServlet</servlet-class>--> + <!--<servlet-class>org.apache.cloud.rdf.web.cloudbase.sail.LoadDataServlet</servlet-class>--> <!--<init-param>--> <!--<param-name>rts.instance</param-name>--> @@ -73,7 +73,7 @@ under the License. <!--<servlet>--> <!--<servlet-name>QueryDataServlet</servlet-name>--> - <!--<servlet-class>mvm.cloud.rdf.web.cloudbase.sail.QueryDataServlet</servlet-class>--> + <!--<servlet-class>org.apache.cloud.rdf.web.cloudbase.sail.QueryDataServlet</servlet-class>--> <!--<init-param>--> <!--<param-name>rts.instance</param-name>--> @@ -104,7 +104,7 @@ under the License. <!--<servlet>--> <!--<servlet-name>QuerySerqlDataServlet</servlet-name>--> - <!--<servlet-class>mvm.cloud.rdf.web.cloudbase.sail.QuerySerqlDataServlet</servlet-class>--> + <!--<servlet-class>org.apache.cloud.rdf.web.cloudbase.sail.QuerySerqlDataServlet</servlet-class>--> <!--<init-param>--> <!--<param-name>rts.instance</param-name>--> @@ -135,7 +135,7 @@ under the License. <!--<servlet>--> <!--<servlet-name>DeleteDataServlet</servlet-name>--> - <!--<servlet-class>mvm.cloud.rdf.web.cloudbase.sail.DeleteDataServlet</servlet-class>--> + <!--<servlet-class>org.apache.cloud.rdf.web.cloudbase.sail.DeleteDataServlet</servlet-class>--> <!--<init-param>--> <!--<param-name>rts.instance</param-name>--> http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/093e7c21/web/web.rya/src/test/resources/controllerIntegrationTest-accumulo.xml ---------------------------------------------------------------------- diff --git a/web/web.rya/src/test/resources/controllerIntegrationTest-accumulo.xml b/web/web.rya/src/test/resources/controllerIntegrationTest-accumulo.xml index 5b20d57..64c764a 100644 --- a/web/web.rya/src/test/resources/controllerIntegrationTest-accumulo.xml +++ b/web/web.rya/src/test/resources/controllerIntegrationTest-accumulo.xml @@ -24,7 +24,7 @@ under the License. http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.2.xsd";> - <bean id="controller" class="mvm.cloud.rdf.web.sail.RdfController"> + <bean id="controller" class="org.apache.cloud.rdf.web.sail.RdfController"> </bean> <bean id="zkInstance" class="org.apache.accumulo.core.client.mock.MockInstance" > @@ -37,13 +37,13 @@ under the License. <constructor-arg value=""/> </bean> - <bean id="conf" class="mvm.rya.accumulo.AccumuloRdfConfiguration"> + <bean id="conf" class="org.apache.rya.accumulo.AccumuloRdfConfiguration"> <property name="tablePrefix" value="test_"/> <property name="displayQueryPlan" value="false"/> <property name="useStats" value="false"/> </bean> - <bean id="ryaDAO" class="mvm.rya.accumulo.AccumuloRyaDAO" init-method="init" destroy-method="destroy"> + <bean id="ryaDAO" class="org.apache.rya.accumulo.AccumuloRyaDAO" init-method="init" destroy-method="destroy"> <property name="connector" ref="connector"/> <property name="conf" ref="conf"/> </bean> http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/093e7c21/web/web.rya/src/test/resources/controllerIntegrationTest-root.xml ---------------------------------------------------------------------- diff --git a/web/web.rya/src/test/resources/controllerIntegrationTest-root.xml b/web/web.rya/src/test/resources/controllerIntegrationTest-root.xml index 2928387..afed22f 100644 --- a/web/web.rya/src/test/resources/controllerIntegrationTest-root.xml +++ b/web/web.rya/src/test/resources/controllerIntegrationTest-root.xml @@ -26,38 +26,38 @@ under the License. xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-2.5.xsd";> - <context:component-scan base-package="mvm.cloud.rdf.web.sail" /> + <context:component-scan base-package="org.apache.cloud.rdf.web.sail" /> <import resource="controllerIntegrationTest-accumulo.xml"/> <import resource="controllerIntegrationTest-security.xml"/> - <bean id="inferenceEngine" class="mvm.rya.rdftriplestore.inference.InferenceEngine" init-method="init" destroy-method="destroy"> + <bean id="inferenceEngine" class="org.apache.rya.rdftriplestore.inference.InferenceEngine" init-method="init" destroy-method="destroy"> <property name="ryaDAO" ref="ryaDAO"/> <property name="conf" ref="conf"/> </bean> - <bean id="prospectTableName" class="mvm.rya.prospector.service.ProspectorServiceEvalStatsDAO" factory-method="getProspectTableName"> + <bean id="prospectTableName" class="org.apache.rya.prospector.service.ProspectorServiceEvalStatsDAO" factory-method="getProspectTableName"> <constructor-arg ref="conf"/> </bean> - <bean id="prospectorService" class="mvm.rya.prospector.service.ProspectorService"> + <bean id="prospectorService" class="org.apache.rya.prospector.service.ProspectorService"> <constructor-arg ref="connector"/> <constructor-arg ref="prospectTableName"/> </bean> - <bean id="rdfEvalStatsDAO" class="mvm.rya.prospector.service.ProspectorServiceEvalStatsDAO"> + <bean id="rdfEvalStatsDAO" class="org.apache.rya.prospector.service.ProspectorServiceEvalStatsDAO"> <property name="prospectorService" ref="prospectorService"/> <property name="conf" ref="conf"/> </bean> - <bean id="rts" class="mvm.rya.rdftriplestore.RdfCloudTripleStore"> + <bean id="rts" class="org.apache.rya.rdftriplestore.RdfCloudTripleStore"> <property name="ryaDAO" ref="ryaDAO"/> <property name="rdfEvalStatsDAO" ref="rdfEvalStatsDAO"/> <property name="inferenceEngine" ref="inferenceEngine"/> <property name="conf" ref="conf"/> </bean> - <bean id="sailRepo" class="mvm.rya.rdftriplestore.RyaSailRepository" init-method="initialize" destroy-method="shutDown"> + <bean id="sailRepo" class="org.apache.rya.rdftriplestore.RyaSailRepository" init-method="initialize" destroy-method="shutDown"> <constructor-arg ref="rts"/> </bean> </beans> http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/093e7c21/web/web.rya/src/test/resources/controllerIntegrationTest-security.xml ---------------------------------------------------------------------- diff --git a/web/web.rya/src/test/resources/controllerIntegrationTest-security.xml b/web/web.rya/src/test/resources/controllerIntegrationTest-security.xml index c15e9d3..4f4d5bf 100644 --- a/web/web.rya/src/test/resources/controllerIntegrationTest-security.xml +++ b/web/web.rya/src/test/resources/controllerIntegrationTest-security.xml @@ -29,6 +29,6 @@ under the License. <context:annotation-config/> - <bean id="provider" class="mvm.cloud.rdf.web.sail.SecurityProviderImpl"/> + <bean id="provider" class="org.apache.cloud.rdf.web.sail.SecurityProviderImpl"/> </beans> http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/093e7c21/web/web.rya/src/test/resources/controllerTest-context.xml ---------------------------------------------------------------------- diff --git a/web/web.rya/src/test/resources/controllerTest-context.xml b/web/web.rya/src/test/resources/controllerTest-context.xml index ec43c5b..39c018d 100644 --- a/web/web.rya/src/test/resources/controllerTest-context.xml +++ b/web/web.rya/src/test/resources/controllerTest-context.xml @@ -24,7 +24,7 @@ under the License. http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.2.xsd";> - <bean id="controller" class="mvm.cloud.rdf.web.sail.RdfController"> + <bean id="controller" class="org.apache.cloud.rdf.web.sail.RdfController"> </bean> <bean id="repository" class="org.openrdf.repository.sail.SailRepository" init-method="initialize"> @@ -35,6 +35,6 @@ under the License. <property name="persist" value="false"/> </bean> - <bean id="provider" class="mvm.cloud.rdf.web.sail.SecurityProviderImpl"/> + <bean id="provider" class="org.apache.cloud.rdf.web.sail.SecurityProviderImpl"/> </beans>
