Repository: incubator-sdap-mudrod Updated Branches: refs/heads/master 7b76fa168 -> 39379fa9a
http://git-wip-us.apache.org/repos/asf/incubator-sdap-mudrod/blob/39379fa9/service/pom.xml ---------------------------------------------------------------------- diff --git a/service/pom.xml b/service/pom.xml index 1704c50..8dd59a9 100644 --- a/service/pom.xml +++ b/service/pom.xml @@ -18,7 +18,7 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>gov.nasa.jpl.mudrod</groupId> + <groupId>org.apache.sdap.mudrod</groupId> <artifactId>mudrod-parent</artifactId> <version>0.0.1-SNAPSHOT</version> <relativePath>../</relativePath> @@ -40,14 +40,14 @@ <dependencies> <!-- Core Module --> <dependency> - <groupId>gov.nasa.jpl.mudrod</groupId> + <groupId>org.apache.sdap.mudrod</groupId> <artifactId>mudrod-core</artifactId> <version>${project.version}</version> </dependency> <!-- Static web resources --> <dependency> - <groupId>gov.nasa.jpl.mudrod</groupId> + <groupId>org.apache.sdap.mudrod</groupId> <artifactId>mudrod-web</artifactId> <version>${project.version}</version> </dependency> http://git-wip-us.apache.org/repos/asf/incubator-sdap-mudrod/blob/39379fa9/service/src/main/java/gov/nasa/jpl/mudrod/services/MudrodContextListener.java ---------------------------------------------------------------------- diff --git a/service/src/main/java/gov/nasa/jpl/mudrod/services/MudrodContextListener.java b/service/src/main/java/gov/nasa/jpl/mudrod/services/MudrodContextListener.java index 84df5f6..5ea1efe 100644 --- a/service/src/main/java/gov/nasa/jpl/mudrod/services/MudrodContextListener.java +++ b/service/src/main/java/gov/nasa/jpl/mudrod/services/MudrodContextListener.java @@ -13,18 +13,19 @@ */ package gov.nasa.jpl.mudrod.services; -import gov.nasa.jpl.mudrod.driver.ESDriver; -import gov.nasa.jpl.mudrod.driver.SparkDriver; -import gov.nasa.jpl.mudrod.main.MudrodEngine; -import gov.nasa.jpl.mudrod.ontology.Ontology; -import gov.nasa.jpl.mudrod.ontology.OntologyFactory; -import gov.nasa.jpl.mudrod.ssearch.Ranker; -import gov.nasa.jpl.mudrod.ssearch.Searcher; - import javax.servlet.ServletContext; import javax.servlet.ServletContextEvent; import javax.servlet.ServletContextListener; import javax.servlet.annotation.WebListener; + +import org.apache.sdap.mudrod.driver.ESDriver; +import org.apache.sdap.mudrod.driver.SparkDriver; +import org.apache.sdap.mudrod.main.MudrodEngine; +import org.apache.sdap.mudrod.ontology.Ontology; +import org.apache.sdap.mudrod.ontology.OntologyFactory; +import org.apache.sdap.mudrod.ssearch.Ranker; +import org.apache.sdap.mudrod.ssearch.Searcher; + import java.util.Properties; /** http://git-wip-us.apache.org/repos/asf/incubator-sdap-mudrod/blob/39379fa9/service/src/main/java/gov/nasa/jpl/mudrod/services/autocomplete/AutoCompleteResource.java ---------------------------------------------------------------------- diff --git a/service/src/main/java/gov/nasa/jpl/mudrod/services/autocomplete/AutoCompleteResource.java b/service/src/main/java/gov/nasa/jpl/mudrod/services/autocomplete/AutoCompleteResource.java index 84dbbb7..4e0368a 100644 --- a/service/src/main/java/gov/nasa/jpl/mudrod/services/autocomplete/AutoCompleteResource.java +++ b/service/src/main/java/gov/nasa/jpl/mudrod/services/autocomplete/AutoCompleteResource.java @@ -14,8 +14,9 @@ package gov.nasa.jpl.mudrod.services.autocomplete; import com.google.gson.Gson; -import gov.nasa.jpl.mudrod.main.MudrodConstants; -import gov.nasa.jpl.mudrod.main.MudrodEngine; + +import org.apache.sdap.mudrod.main.MudrodConstants; +import org.apache.sdap.mudrod.main.MudrodEngine; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/incubator-sdap-mudrod/blob/39379fa9/service/src/main/java/gov/nasa/jpl/mudrod/services/ontology/OntologyResource.java ---------------------------------------------------------------------- diff --git a/service/src/main/java/gov/nasa/jpl/mudrod/services/ontology/OntologyResource.java b/service/src/main/java/gov/nasa/jpl/mudrod/services/ontology/OntologyResource.java index e0ade84..fd6a6d3 100644 --- a/service/src/main/java/gov/nasa/jpl/mudrod/services/ontology/OntologyResource.java +++ b/service/src/main/java/gov/nasa/jpl/mudrod/services/ontology/OntologyResource.java @@ -14,7 +14,8 @@ package gov.nasa.jpl.mudrod.services.ontology; import com.google.gson.Gson; -import gov.nasa.jpl.mudrod.ontology.Ontology; + +import org.apache.sdap.mudrod.ontology.Ontology; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/incubator-sdap-mudrod/blob/39379fa9/service/src/main/java/gov/nasa/jpl/mudrod/services/recommendation/HybridRecomDatasetsResource.java ---------------------------------------------------------------------- diff --git a/service/src/main/java/gov/nasa/jpl/mudrod/services/recommendation/HybridRecomDatasetsResource.java b/service/src/main/java/gov/nasa/jpl/mudrod/services/recommendation/HybridRecomDatasetsResource.java index 7ffc040..4878346 100644 --- a/service/src/main/java/gov/nasa/jpl/mudrod/services/recommendation/HybridRecomDatasetsResource.java +++ b/service/src/main/java/gov/nasa/jpl/mudrod/services/recommendation/HybridRecomDatasetsResource.java @@ -14,8 +14,6 @@ package gov.nasa.jpl.mudrod.services.recommendation; import com.google.gson.JsonObject; -import gov.nasa.jpl.mudrod.main.MudrodEngine; -import gov.nasa.jpl.mudrod.recommendation.structure.HybridRecommendation; import javax.servlet.ServletContext; import javax.ws.rs.*; @@ -23,6 +21,9 @@ import javax.ws.rs.core.Context; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; +import org.apache.sdap.mudrod.main.MudrodEngine; +import org.apache.sdap.mudrod.recommendation.structure.HybridRecommendation; + /** * A hybrid recommendation resource for datasets. */ http://git-wip-us.apache.org/repos/asf/incubator-sdap-mudrod/blob/39379fa9/service/src/main/java/gov/nasa/jpl/mudrod/services/recommendation/RecomDatasetsResource.java ---------------------------------------------------------------------- diff --git a/service/src/main/java/gov/nasa/jpl/mudrod/services/recommendation/RecomDatasetsResource.java b/service/src/main/java/gov/nasa/jpl/mudrod/services/recommendation/RecomDatasetsResource.java index 75e043c..30bcbb1 100644 --- a/service/src/main/java/gov/nasa/jpl/mudrod/services/recommendation/RecomDatasetsResource.java +++ b/service/src/main/java/gov/nasa/jpl/mudrod/services/recommendation/RecomDatasetsResource.java @@ -14,8 +14,6 @@ package gov.nasa.jpl.mudrod.services.recommendation; import com.google.gson.JsonObject; -import gov.nasa.jpl.mudrod.main.MudrodEngine; -import gov.nasa.jpl.mudrod.recommendation.structure.RecomData; import javax.servlet.ServletContext; import javax.ws.rs.*; @@ -23,6 +21,9 @@ import javax.ws.rs.core.Context; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; +import org.apache.sdap.mudrod.main.MudrodEngine; +import org.apache.sdap.mudrod.recommendation.structure.RecomData; + ; /** http://git-wip-us.apache.org/repos/asf/incubator-sdap-mudrod/blob/39379fa9/service/src/main/java/gov/nasa/jpl/mudrod/services/search/SearchDatasetDetailResource.java ---------------------------------------------------------------------- diff --git a/service/src/main/java/gov/nasa/jpl/mudrod/services/search/SearchDatasetDetailResource.java b/service/src/main/java/gov/nasa/jpl/mudrod/services/search/SearchDatasetDetailResource.java index ce20569..108cdbb 100644 --- a/service/src/main/java/gov/nasa/jpl/mudrod/services/search/SearchDatasetDetailResource.java +++ b/service/src/main/java/gov/nasa/jpl/mudrod/services/search/SearchDatasetDetailResource.java @@ -13,8 +13,8 @@ */ package gov.nasa.jpl.mudrod.services.search; -import gov.nasa.jpl.mudrod.main.MudrodConstants; -import gov.nasa.jpl.mudrod.main.MudrodEngine; +import org.apache.sdap.mudrod.main.MudrodConstants; +import org.apache.sdap.mudrod.main.MudrodEngine; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/incubator-sdap-mudrod/blob/39379fa9/service/src/main/java/gov/nasa/jpl/mudrod/services/search/SearchMetadataResource.java ---------------------------------------------------------------------- diff --git a/service/src/main/java/gov/nasa/jpl/mudrod/services/search/SearchMetadataResource.java b/service/src/main/java/gov/nasa/jpl/mudrod/services/search/SearchMetadataResource.java index b9dc501..048b88e 100644 --- a/service/src/main/java/gov/nasa/jpl/mudrod/services/search/SearchMetadataResource.java +++ b/service/src/main/java/gov/nasa/jpl/mudrod/services/search/SearchMetadataResource.java @@ -16,10 +16,11 @@ package gov.nasa.jpl.mudrod.services.search; import com.google.gson.Gson; import com.google.gson.GsonBuilder; import com.google.gson.JsonObject; -import gov.nasa.jpl.mudrod.main.MudrodConstants; -import gov.nasa.jpl.mudrod.main.MudrodEngine; -import gov.nasa.jpl.mudrod.ssearch.Ranker; -import gov.nasa.jpl.mudrod.ssearch.Searcher; + +import org.apache.sdap.mudrod.main.MudrodConstants; +import org.apache.sdap.mudrod.main.MudrodEngine; +import org.apache.sdap.mudrod.ssearch.Ranker; +import org.apache.sdap.mudrod.ssearch.Searcher; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/incubator-sdap-mudrod/blob/39379fa9/service/src/main/java/gov/nasa/jpl/mudrod/services/search/SearchVocabResource.java ---------------------------------------------------------------------- diff --git a/service/src/main/java/gov/nasa/jpl/mudrod/services/search/SearchVocabResource.java b/service/src/main/java/gov/nasa/jpl/mudrod/services/search/SearchVocabResource.java index ab4c661..b8d8bf6 100644 --- a/service/src/main/java/gov/nasa/jpl/mudrod/services/search/SearchVocabResource.java +++ b/service/src/main/java/gov/nasa/jpl/mudrod/services/search/SearchVocabResource.java @@ -15,8 +15,9 @@ package gov.nasa.jpl.mudrod.services.search; import com.google.gson.Gson; import com.google.gson.JsonObject; -import gov.nasa.jpl.mudrod.integration.LinkageIntegration; -import gov.nasa.jpl.mudrod.main.MudrodEngine; + +import org.apache.sdap.mudrod.integration.LinkageIntegration; +import org.apache.sdap.mudrod.main.MudrodEngine; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/incubator-sdap-mudrod/blob/39379fa9/service/src/main/java/gov/nasa/jpl/mudrod/services/search/SessionDetailResource.java ---------------------------------------------------------------------- diff --git a/service/src/main/java/gov/nasa/jpl/mudrod/services/search/SessionDetailResource.java b/service/src/main/java/gov/nasa/jpl/mudrod/services/search/SessionDetailResource.java index fcbe3c6..cf36d6c 100644 --- a/service/src/main/java/gov/nasa/jpl/mudrod/services/search/SessionDetailResource.java +++ b/service/src/main/java/gov/nasa/jpl/mudrod/services/search/SessionDetailResource.java @@ -15,9 +15,10 @@ package gov.nasa.jpl.mudrod.services.search; import com.google.gson.Gson; import com.google.gson.JsonObject; -import gov.nasa.jpl.mudrod.main.MudrodConstants; -import gov.nasa.jpl.mudrod.main.MudrodEngine; -import gov.nasa.jpl.mudrod.weblog.structure.Session; + +import org.apache.sdap.mudrod.main.MudrodConstants; +import org.apache.sdap.mudrod.main.MudrodEngine; +import org.apache.sdap.mudrod.weblog.structure.Session; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/incubator-sdap-mudrod/blob/39379fa9/service/src/main/webapp/WEB-INF/web.xml ---------------------------------------------------------------------- diff --git a/service/src/main/webapp/WEB-INF/web.xml b/service/src/main/webapp/WEB-INF/web.xml index 38bb88e..195ef01 100644 --- a/service/src/main/webapp/WEB-INF/web.xml +++ b/service/src/main/webapp/WEB-INF/web.xml @@ -25,25 +25,25 @@ <init-param> <param-name>jaxrs.serviceClasses</param-name> <param-value> - gov.nasa.jpl.mudrod.services.autocomplete.AutoCompleteResource, - gov.nasa.jpl.mudrod.services.search.SearchDatasetDetailResource, - gov.nasa.jpl.mudrod.services.recommendation.HybridRecomDatasetsResource, - gov.nasa.jpl.mudrod.services.recommendation.RecomDatasetsResource, - gov.nasa.jpl.mudrod.services.search.SearchMetadataResource, - gov.nasa.jpl.mudrod.services.search.SearchVocabResource, - gov.nasa.jpl.mudrod.services.search.SessionDetailResource, - gov.nasa.jpl.mudrod.services.ontology.OntologyResource, + org.apache.sdap.mudrod.services.autocomplete.AutoCompleteResource, + org.apache.sdap.mudrod.services.search.SearchDatasetDetailResource, + org.apache.sdap.mudrod.services.recommendation.HybridRecomDatasetsResource, + org.apache.sdap.mudrod.services.recommendation.RecomDatasetsResource, + org.apache.sdap.mudrod.services.search.SearchMetadataResource, + org.apache.sdap.mudrod.services.search.SearchVocabResource, + org.apache.sdap.mudrod.services.search.SessionDetailResource, + org.apache.sdap.mudrod.services.ontology.OntologyResource, </param-value> </init-param> <init-param> <param-name>jaxrs.providers</param-name> - <param-value>gov.nasa.jpl.mudrod.services.DefaultExceptionMapper</param-value> + <param-value>org.apache.sdap.mudrod.services.DefaultExceptionMapper</param-value> </init-param> <load-on-startup>1</load-on-startup> </servlet> <listener> - <listener-class>gov.nasa.jpl.mudrod.services.MudrodContextListener + <listener-class>org.apache.sdap.mudrod.services.MudrodContextListener </listener-class> </listener> http://git-wip-us.apache.org/repos/asf/incubator-sdap-mudrod/blob/39379fa9/web/.classpath ---------------------------------------------------------------------- diff --git a/web/.classpath b/web/.classpath deleted file mode 100644 index 93e3cde..0000000 --- a/web/.classpath +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<classpath> - <classpathentry kind="src" path="META-INF" output="target/classes/META-INF" excluding="**/*.java"/> - <classpathentry kind="output" path="target/classes"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> -</classpath> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-sdap-mudrod/blob/39379fa9/web/.gitignore ---------------------------------------------------------------------- diff --git a/web/.gitignore b/web/.gitignore new file mode 100644 index 0000000..b83d222 --- /dev/null +++ b/web/.gitignore @@ -0,0 +1 @@ +/target/ http://git-wip-us.apache.org/repos/asf/incubator-sdap-mudrod/blob/39379fa9/web/.project ---------------------------------------------------------------------- diff --git a/web/.project b/web/.project deleted file mode 100644 index c7705cb..0000000 --- a/web/.project +++ /dev/null @@ -1,31 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<projectDescription> - <name>mudrod-web</name> - <comment>MUDROD: Mining and Utilizing Dataset Relevancy from - Oceanographic Datasets - to Improve Data Discovery and Access. MUDROD is a semantic discovery and - search project - funded by NASA AIST (NNX15AM85G). NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse.</comment> - <projects/> - <buildSpec> - <buildCommand> - <name>org.eclipse.wst.common.project.facet.core.builder</name> - </buildCommand> - <buildCommand> - <name>org.eclipse.jdt.core.javabuilder</name> - </buildCommand> - <buildCommand> - <name>org.eclipse.m2e.core.maven2Builder</name> - </buildCommand> - <buildCommand> - <name>org.eclipse.wst.validation.validationbuilder</name> - </buildCommand> - </buildSpec> - <natures> - <nature>org.eclipse.jem.workbench.JavaEMFNature</nature> - <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature> - <nature>org.eclipse.m2e.core.maven2Nature</nature> - <nature>org.eclipse.jdt.core.javanature</nature> - <nature>org.eclipse.wst.common.project.facet.core.nature</nature> - </natures> -</projectDescription> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-sdap-mudrod/blob/39379fa9/web/pom.xml ---------------------------------------------------------------------- diff --git a/web/pom.xml b/web/pom.xml index 95b7c99..3b637b0 100644 --- a/web/pom.xml +++ b/web/pom.xml @@ -17,7 +17,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> <modelVersion>4.0.0</modelVersion> - <groupId>gov.nasa.jpl.mudrod</groupId> + <groupId>org.apache.sdap.mudrod</groupId> <artifactId>mudrod-web</artifactId> <version>0.0.1-SNAPSHOT</version> <build> @@ -31,12 +31,10 @@ <packaging>jar</packaging> <name>Mudrod :: Web</name> - <url>https://github.com/mudrod/mudrod.git</url> + <url>https://github.com/apache/incubator-sdap-mudrod.git</url> <description>MUDROD: Mining and Utilizing Dataset Relevancy from - Oceanographic Datasets - to Improve Data Discovery and Access. MUDROD is a semantic discovery and - search project - funded by NASA AIST (NNX15AM85G). + Oceanographic Datasets to Improve Data Discovery and Access. + MUDROD is a semantic discovery and search project. </description> <licenses>
