Merge branch 'develop'

Conflicts: Conceptpower+Spring/pom.xml Conceptpower+Spring/src/integration-test/java/edu/asu/conceptpower/IntegrationTest.java Conceptpower+Spring/src/integration-test/java/edu/asu/conceptpower/rest/ConceptIDLookupIT.java Conceptpower+Spring/src/integration-test/java/edu/asu/conceptpower/rest/ConceptLookupIT.java Conceptpower+Spring/src/integration-test/java/edu/asu/conceptpower/rest/ConceptSearchIT.java Conceptpower+Spring/src/integration-test/java/edu/asu/conceptpower/rest/ConceptsIT.java Conceptpower+Spring/src/integration-test/java/edu/asu/conceptpower/rest/SynonymSearchIT.java Conceptpower+Spring/src/integration-test/java/edu/asu/conceptpower/rest/TypeIdLookUpIT.java Conceptpower+Spring/src/integration-test/resources/input/addConceptWithEmptyList.json Conceptpower+Spring/src/integration-test/resources/input/addConceptsWithInvalidConceptList.json Conceptpower+Spring/src/integration-test/resources/output/conceptForLocalId.xml Conceptpower+Spring/src/integration-test/resources/output/conceptLookUpForMultipletEntry.xml Conceptpower+Spring/src/integration-test/resources/output/conceptLookUpWordNetEntry.xml Conceptpower+Spring/src/integration-test/resources/output/conceptWithWordAndPos.xml Conceptpower+Spring/src/integration-test/resources/output/conceptWithWordPosAndDescription.xml Conceptpower+Spring/src/integration-test/resources/output/conceptWithWordPosAndEqualTo.xml Conceptpower+Spring/src/integration-test/resources/output/conceptWithWordPosAndSimilarTo.xml Conceptpower+Spring/src/integration-test/resources/output/conceptWithWordPosAndTypeId.xml Conceptpower+Spring/src/integration-test/resources/output/conceptWithWordPosAndTypeUri.xml Conceptpower+Spring/src/integration-test/resources/output/conceptWrapper.xml Conceptpower+Spring/src/integration-test/resources/output/noResults.xml Conceptpower+Spring/src/integration-test/resources/output/synonym.xml Conceptpower+Spring/src/integration-test/resources/output/wordNetConcept.xml Conceptpower+Spring/src/integration-test/resources/test.properties Conceptpower+Spring/src/main/java/edu/asu/conceptpower/servlet/rest/SearchParamters.java Conceptpower+Spring/src/main/java/edu/asu/conceptpower/web/DownloadFilesUtility.java Conceptpower+Spring/src/main/webapp/WEB-INF/web.xml Conceptpower+Spring/src/test/resources/db4o-config-test.xml Conceptpower+Spring/src/test/resources/rest-context-test.xml Conceptpower+Spring/src/test/resources/rest-service-test.xml Conceptpower+Spring/src/test/resources/root-context-test.xml Conceptpower+Spring/src/test/resources/servlet-context-test.xml Conceptpower+Spring/src/test/resources/wordnet-config-test.xml Conceptpower+Spring/src/test/resources/xml-config-test.xml
diging · Mar 27, 2017 · b4bd50b · b4bd50b
2 parents 741b528 + 08d8139
commit b4bd50b
Show file tree

Hide file tree

Showing 326 changed files with 10,845 additions and 4,860 deletions.
diff --git a/Conceptpower+Spring/.settings/org.eclipse.jdt.core.prefs b/Conceptpower+Spring/.settings/org.eclipse.jdt.core.prefs
@@ -1,11 +1,11 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.7
+org.eclipse.jdt.core.compiler.source=1.8
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0

diff --git a/Conceptpower+Spring/.settings/org.eclipse.m2e.core.prefs b/Conceptpower+Spring/.settings/org.eclipse.m2e.core.prefs
@@ -1,4 +1,4 @@
-activeProfiles=dev, dev
+activeProfiles=dev, integration-test, dev, integration-test
 eclipse.preferences.version=1
 resolveWorkspaceProjects=true
 version=1
diff --git a/Conceptpower+Spring/.settings/org.eclipse.wst.common.component b/Conceptpower+Spring/.settings/org.eclipse.wst.common.component
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
-	<wb-module deploy-name="Conceptpower+Spring">
+	<wb-module deploy-name="conceptpower-2.0-BUILD-SNAPSHOT">
         <wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
 		<wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
 		<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>

diff --git a/Conceptpower+Spring/.settings/org.eclipse.wst.common.project.facet.core.xml b/Conceptpower+Spring/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -4,5 +4,5 @@
   <fixed facet="jst.java"/>
   <installed facet="jst.web" version="2.5"/>
   <installed facet="jpt.jpa" version="2.0"/>
-  <installed facet="jst.java" version="1.7"/>
+  <installed facet="jst.java" version="1.8"/>
 </faceted-project>
diff --git a/Conceptpower+Spring/pom.xml b/Conceptpower+Spring/pom.xml
@@ -29,11 +29,11 @@
 		<lucene.index>/Users/karthikeyanmohan/Software/Conceptpower/indexFiles</lucene.index>
 		<pullrequest></pullrequest>
 		<debug_level>debug</debug_level>
-        <skip.integration.tests>false</skip.integration.tests>
-        <skip.unit.tests>false</skip.unit.tests>
-        <concept.list.url>https://www.dropbox.com/s/48gftjus29qyp2q/conceptLists.db?raw=1</concept.list.url>
-        <concept.types.url>https://www.dropbox.com/s/mla61f63fgfil3y/conceptTypes.db?raw=1</concept.types.url>
-        <users.url>https://www.dropbox.com/s/n0vgpc5ow1xko4v/users.db?raw=1</users.url>
+		<skip.integration.tests>false</skip.integration.tests>
+		<skip.unit.tests>false</skip.unit.tests>
+		<concept.list.url>https://www.dropbox.com/s/48gftjus29qyp2q/conceptLists.db?raw=1</concept.list.url>
+		<concept.types.url>https://www.dropbox.com/s/mla61f63fgfil3y/conceptTypes.db?raw=1</concept.types.url>
+		<users.url>https://www.dropbox.com/s/n0vgpc5ow1xko4v/users.db?raw=1</users.url>
 	</properties>
 
 	<repositories>
@@ -96,27 +96,27 @@
 				<lucene.path>${lucene.index}</lucene.path>
 			</properties>
 		</profile>
-        <profile>
-            <id>integration-test</id>
-            <!-- Integration Test Properties -->
-            <properties>
-                <db.path>${db.files.path}</db.path>
-                <deploy.path>${deploy.path.test}</deploy.path>
-                <tomcat.path>${tomcat.deploy.path}</tomcat.path>
-                <email.user>${email.username}</email.user>
-                <email.pw>${email.password}</email.pw>
-                <email.port>${email.server.port}</email.port>
-                <email.host>${email.server.host}</email.host>
-                <admin.user>${admin.username}</admin.user>
-                <admin.pw>${admin.password}</admin.pw>
-                <wordnet.install.path>${wordnet.path}</wordnet.install.path>
-                <lucene.path>${lucene.index}</lucene.path>
-                <conceptList.url>${concept.list.url}</conceptList.url>
-                <conceptTypes.url>${concept.types.url}</conceptTypes.url>
-                <usersUrl>${users.url}</usersUrl>
-                <debug_level>debug</debug_level>
-            </properties>
-        </profile>
+		<profile>
+			<id>integration-test</id>
+			<!-- Integration Test Properties -->
+			<properties>
+				<db.path>${db.files.path}</db.path>
+				<deploy.path>${deploy.path.test}</deploy.path>
+				<tomcat.path>${tomcat.deploy.path}</tomcat.path>
+				<email.user>${email.username}</email.user>
+				<email.pw>${email.password}</email.pw>
+				<email.port>${email.server.port}</email.port>
+				<email.host>${email.server.host}</email.host>
+				<admin.user>${admin.username}</admin.user>
+				<admin.pw>${admin.password}</admin.pw>
+				<wordnet.install.path>${wordnet.path}</wordnet.install.path>
+				<lucene.path>${lucene.index}</lucene.path>
+				<conceptList.url>${concept.list.url}</conceptList.url>
+				<conceptTypes.url>${concept.types.url}</conceptTypes.url>
+				<usersUrl>${users.url}</usersUrl>
+				<debug_level>debug</debug_level>
+			</properties>
+		</profile>
 	</profiles>
 
 	<dependencies>
@@ -230,11 +230,11 @@
 		</dependency>
 
 		<!-- Servlet -->
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>javax.servlet-api</artifactId>
-            <version>3.0.1</version>
-        </dependency>
+		<dependency>
+			<groupId>javax.servlet</groupId>
+			<artifactId>javax.servlet-api</artifactId>
+			<version>3.0.1</version>
+		</dependency>
 
 		<dependency>
 			<groupId>javax.servlet.jsp</groupId>
@@ -491,12 +491,12 @@
 			<artifactId>spring-security-web</artifactId>
 			<version>${spring-security-version}</version>
 		</dependency>
-        
-        <dependency>
-            <groupId>com.jayway.jsonpath</groupId>
-            <artifactId>json-path</artifactId>
-            <version>2.1.0</version>
-        </dependency>
+
+		<dependency>
+			<groupId>com.jayway.jsonpath</groupId>
+			<artifactId>json-path</artifactId>
+			<version>2.1.0</version>
+		</dependency>
 
 		<!-- Apache Lucene -->
 		<dependency>
@@ -526,18 +526,25 @@
 			<version>3.0.3</version>
 		</dependency>
 
-	<!-- JSON Converter -->
-	<dependency>
-		<groupId>com.fasterxml.jackson.core</groupId>
-		<artifactId>jackson-databind</artifactId>
-		<version>2.1.0</version>
-	</dependency>
-	<dependency>
-		<groupId>com.fasterxml.jackson.core</groupId>
-		<artifactId>jackson-core</artifactId>
-		<version>2.1.0</version>
-	</dependency>
+		<!-- JSON Converter -->
+		<dependency>
+			<groupId>com.fasterxml.jackson.core</groupId>
+			<artifactId>jackson-databind</artifactId>
+			<version>2.1.0</version>
+		</dependency>
+		<dependency>
+			<groupId>com.fasterxml.jackson.core</groupId>
+			<artifactId>jackson-core</artifactId>
+			<version>2.1.0</version>
+		</dependency>
 
+		<!-- Apache Jena for RDF -->
+		<dependency>
+			<groupId>org.apache.jena</groupId>
+			<artifactId>apache-jena-libs</artifactId>
+			<type>pom</type>
+			<version>3.0.1</version>
+		</dependency>
 	</dependencies>
 
 	<scm>
@@ -641,86 +648,82 @@
 					<format>#{0} ({1,date,yyyy-MM-dd HH:mm:ss})</format>
 				</configuration>
 			</plugin>
-
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-                <version>3.0.0</version>
-                <executions>
-                    <!-- Add a new source directory to our build -->
-                    <execution>
-                        <id>add-integration-test-sources</id>
-                        <phase>generate-test-sources</phase>
-                        <goals>
-                            <goal>add-test-source</goal>
-                        </goals>
-                        <configuration>
-                            <!-- Configures the source directory of our integration tests -->
-                            <sources>
-                                <source>src/integration-test/java</source>
-                            </sources>
-                        </configuration>
-                    </execution>
-                    <!-- Add a new resource directory to our build -->
-                    <execution>
-                        <id>add-integration-test-resources</id>
-                        <phase>generate-test-resources</phase>
-                        <goals>
-                            <goal>add-test-resource</goal>
-                        </goals>
-                        <configuration>
-                            <!-- Configures the resource directory of our integration tests -->
-                            <resources>
-                                <resource>
-                                    <filtering>true</filtering>
-                                    <directory>src/integration-test/resources</directory>
-                                </resource>
-                            </resources>
-                        </configuration>
-                    </execution>
-
-                </executions>
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.18</version>
-                <configuration>
-                    <!-- Skips unit tests if the value of skip.unit.tests property is true -->
-                    <skipTests>${skip.unit.tests}</skipTests>
-                    <!-- Excludes integration tests when unit tests are run -->
-                    <excludes>
-                        <exclude>**/*IT.java</exclude>
-                    </excludes>
-                </configuration>
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-failsafe-plugin</artifactId>
-                <version>2.18</version>
-                <executions>
-                    <!--
-                        Invokes both the integration-test and the verify goals of the
-                        Failsafe Maven plugin
-                    -->
-                    <execution>
-                        <id>integration-tests</id>
-                        <goals>
-                            <goal>integration-test</goal>
-                            <goal>verify</goal>
-                        </goals>
-                        <configuration>
-                            <!--
-                                Skips integration tests if the value of skip.integration.tests
-                                property is true
-                            -->
-                            <skipTests>${skip.integration.tests}</skipTests>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
+
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>build-helper-maven-plugin</artifactId>
+				<version>3.0.0</version>
+				<executions>
+					<!-- Add a new source directory to our build -->
+					<execution>
+						<id>add-integration-test-sources</id>
+						<phase>generate-test-sources</phase>
+						<goals>
+							<goal>add-test-source</goal>
+						</goals>
+						<configuration>
+							<!-- Configures the source directory of our integration tests -->
+							<sources>
+								<source>src/integration-test/java</source>
+							</sources>
+						</configuration>
+					</execution>
+					<!-- Add a new resource directory to our build -->
+					<execution>
+						<id>add-integration-test-resources</id>
+						<phase>generate-test-resources</phase>
+						<goals>
+							<goal>add-test-resource</goal>
+						</goals>
+						<configuration>
+							<!-- Configures the resource directory of our integration tests -->
+							<resources>
+								<resource>
+									<filtering>true</filtering>
+									<directory>src/integration-test/resources</directory>
+								</resource>
+							</resources>
+						</configuration>
+					</execution>
+
+				</executions>
+			</plugin>
+
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-surefire-plugin</artifactId>
+				<version>2.18</version>
+				<configuration>
+					<!-- Skips unit tests if the value of skip.unit.tests property is true -->
+					<skipTests>${skip.unit.tests}</skipTests>
+					<!-- Excludes integration tests when unit tests are run -->
+					<excludes>
+						<exclude>**/*IT.java</exclude>
+					</excludes>
+				</configuration>
+			</plugin>
+
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-failsafe-plugin</artifactId>
+				<version>2.18</version>
+				<executions>
+					<!-- Invokes both the integration-test and the verify goals of the Failsafe 
+						Maven plugin -->
+					<execution>
+						<id>integration-tests</id>
+						<goals>
+							<goal>integration-test</goal>
+							<goal>verify</goal>
+						</goals>
+						<configuration>
+							<!-- Skips integration tests if the value of skip.integration.tests 
+								property is true -->
+							<skipTests>${skip.integration.tests}</skipTests>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
 		</plugins>
 		<resources>
 			<resource>
@@ -730,20 +733,20 @@
 					<include>**/*</include>
 				</includes>
 			</resource>
-            <resource>
-                <filtering>true</filtering>
-                <directory>src/test/resources</directory>
-                <includes>
-                    <include>**/*</include>
-                </includes>
-            </resource>
-            <resource>
-                <filtering>true</filtering>
-                <directory>src/integration-test/resources</directory>
-                <includes>
-                    <include>**/*</include>
-                </includes>
-            </resource>
+			<resource>
+				<filtering>true</filtering>
+				<directory>src/test/resources</directory>
+				<includes>
+					<include>**/*</include>
+				</includes>
+			</resource>
+			<resource>
+				<filtering>true</filtering>
+				<directory>src/integration-test/resources</directory>
+				<includes>
+					<include>**/*</include>
+				</includes>
+			</resource>
 		</resources>
 	</build>
 	<reporting>
@@ -762,4 +765,4 @@
 			</plugin>
 		</plugins>
 	</reporting>
-</project>
+</project>