Skip to content

Commit 857508b

Browse files
jdamerowjdamerow
authored
Merge pull request #113 from diging/develop
Version 3
2 parents f7cbec1 + 9494535 commit 857508b

File tree

318 files changed

+125393
-38610
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

318 files changed

+125393
-38610
lines changed

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
ConceptpowerPlus/build
22
Conceptpower+Spring/target
3+
*.DS_STORE

‎Conceptpower+Spring/.classpath

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
</classpathentry>
3131
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
3232
<attributes>
33-
<attribute name="owner.project.facets" value="java"/>
33+
<attribute name="maven.pomderived" value="true"/>
3434
</attributes>
3535
</classpathentry>
3636
<classpathentry kind="output" path="target/classes"/>

‎Conceptpower+Spring/.settings/org.eclipse.jdt.core.prefs

Lines changed: 288 additions & 3 deletions
Large diffs are not rendered by default.

‎Conceptpower+Spring/.settings/org.eclipse.m2e.core.prefs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
activeProfiles=dev
1+
activeProfiles=dev, dev
22
eclipse.preferences.version=1
33
resolveWorkspaceProjects=true
44
version=1

‎Conceptpower+Spring/.settings/org.eclipse.wst.common.project.facet.core.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@
33
<fixed facet="jst.web"/>
44
<fixed facet="jst.java"/>
55
<installed facet="jst.web" version="2.5"/>
6-
<installed facet="jst.java" version="1.8"/>
76
<installed facet="jpt.jpa" version="2.0"/>
7+
<installed facet="jst.java" version="1.7"/>
88
</faceted-project>

‎Conceptpower+Spring/lib/db4o-8.0/db4o.license.html

Lines changed: 383 additions & 383 deletions
Large diffs are not rendered by default.

‎Conceptpower+Spring/lib/db4o-8.0/readme.html

Lines changed: 111 additions & 111 deletions
Original file line numberDiff line numberDiff line change
@@ -1,112 +1,112 @@
1-
<html>
2-
<head>
3-
<title>Readme</title>
4-
<Style>
5-
BODY, P, TD { font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 10pt; color: #666666 }
6-
H2,H3,H4,H5 { color: black; font-weight: bold; }
7-
H2 { font-size: 13pt; }
8-
H3 { font-size: 12pt; }
9-
H4 { font-size: 10pt; color: black; }
10-
11-
</style>
12-
</head>
13-
<body bgcolor="#FFFFFF" color=#000000>
14-
<p>
15-
</p>
16-
<p>
17-
</p>
18-
<h2>Content</h2>
19-
<p>
20-
This distribution contains documentation, binaries and sources for the open source
21-
object database db4o. For more information about the content of a specific folder
22-
see the readme.html file in the respective folder.</p>
23-
</p>
24-
<p>
25-
<table>
26-
<tr>
27-
<td style="width: 100px" valign="top">
28-
<a href="./doc">/doc</a>
29-
</td>
30-
<td style="width: 500px" valign="top">
31-
documentation
32-
</td>
33-
</tr>
34-
<tr>
35-
<td style="width: 100px" valign="top">
36-
<a href="./lib">/lib</a>
37-
</td>
38-
<td style="width: 500px" valign="top">
39-
binaries
40-
</td>
41-
</tr>
42-
<tr>
43-
<td style="width: 100px" valign="top">
44-
<a href="./ome">/ome</a>
45-
</td>
46-
<td style="width: 500px" valign="top">
47-
Object Manager Enterprise - database browser plugin for your IDE
48-
</td>
49-
</tr>
50-
<tr>
51-
<td style="width: 100px" valign="top">
52-
<a href="./src">/src</a>
53-
</td>
54-
<td style="width: 500px" valign="top">
55-
sources
56-
</td>
57-
</tr>
58-
</table>
59-
<h2>
60-
Getting Started
61-
</h2>
62-
For the fastest start with db4o please work through the tutorial, available in different
63-
formats in the following folder:
64-
<br />
65-
<a href="./doc/tutorial/">
66-
./doc/tutorial/</a>
67-
<br />
68-
If you are working with db4o for Java, it is recommended to use the interactive
69-
HTML tutorial:
70-
<br />
71-
<a href="./doc/tutorial/index.html">
72-
./doc/tutorial/index.html</a>
73-
<br />
74-
The PDF tutorial will work best for fulltext search:
75-
<br />
76-
<a href="./doc/tutorial/db4o-8.0-tutorial.pdf">
77-
./doc/tutorial/db4o-8.0-tutorial.pdf</a>
78-
<br />
79-
<br />
80-
<h2>Join The db4o Community</h2>
81-
<p>
82-
Join the <a href="http://developer.db4o.com" target="_blank">db4o community</a>&nbsp;for help, tips and tricks.&nbsp;&nbsp;<br>
83-
Ask for help in the <a href="http://developer.db4o.com/Forums.aspx" target="_blank">db4o forums</a>&nbsp;at any time. <br>
84-
And take a look at additional resources on <a href="http://developer.db4o.com/Resources.aspx" target="_blank">the community website.</a><br>
85-
If you want to stay informed, subscribe to our <a href="http://developer.db4o.com/Blogs.aspx" target="_blank">db4o blogs</a>.<br>
86-
<br /></p>
87-
<h2>About this software</h2>
88-
The software contained in this distribution is the open source object database engine
89-
"db4o" supplied by:
90-
<br /><br />
91-
Versant Corporation
92-
<br />
93-
255 Shoreline Drive
94-
<br />
95-
Suite 450
96-
<br />
97-
Redwood City, CA 94065
98-
<br />
99-
USA
100-
<br /><br />
101-
Make sure that you have downloaded the latest version from the db4objects website:
102-
<br />
103-
<a href="http://www.db4o.com">
104-
http://www.db4o.com</a>
105-
<br /><br />
106-
db4o may be used under the GNU General Public License, GPL. You should have received
107-
a <a href="db4o.license.html">copy of the GPL</a> with the download.
108-
<br />
109-
<br />
110-
Your db4o team.
111-
</body>
1+
<html>
2+
<head>
3+
<title>Readme</title>
4+
<Style>
5+
BODY, P, TD { font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 10pt; color: #666666 }
6+
H2,H3,H4,H5 { color: black; font-weight: bold; }
7+
H2 { font-size: 13pt; }
8+
H3 { font-size: 12pt; }
9+
H4 { font-size: 10pt; color: black; }
10+
11+
</style>
12+
</head>
13+
<body bgcolor="#FFFFFF" color=#000000>
14+
<p>
15+
</p>
16+
<p>
17+
</p>
18+
<h2>Content</h2>
19+
<p>
20+
This distribution contains documentation, binaries and sources for the open source
21+
object database db4o. For more information about the content of a specific folder
22+
see the readme.html file in the respective folder.</p>
23+
</p>
24+
<p>
25+
<table>
26+
<tr>
27+
<td style="width: 100px" valign="top">
28+
<a href="./doc">/doc</a>
29+
</td>
30+
<td style="width: 500px" valign="top">
31+
documentation
32+
</td>
33+
</tr>
34+
<tr>
35+
<td style="width: 100px" valign="top">
36+
<a href="./lib">/lib</a>
37+
</td>
38+
<td style="width: 500px" valign="top">
39+
binaries
40+
</td>
41+
</tr>
42+
<tr>
43+
<td style="width: 100px" valign="top">
44+
<a href="./ome">/ome</a>
45+
</td>
46+
<td style="width: 500px" valign="top">
47+
Object Manager Enterprise - database browser plugin for your IDE
48+
</td>
49+
</tr>
50+
<tr>
51+
<td style="width: 100px" valign="top">
52+
<a href="./src">/src</a>
53+
</td>
54+
<td style="width: 500px" valign="top">
55+
sources
56+
</td>
57+
</tr>
58+
</table>
59+
<h2>
60+
Getting Started
61+
</h2>
62+
For the fastest start with db4o please work through the tutorial, available in different
63+
formats in the following folder:
64+
<br />
65+
<a href="./doc/tutorial/">
66+
./doc/tutorial/</a>
67+
<br />
68+
If you are working with db4o for Java, it is recommended to use the interactive
69+
HTML tutorial:
70+
<br />
71+
<a href="./doc/tutorial/index.html">
72+
./doc/tutorial/index.html</a>
73+
<br />
74+
The PDF tutorial will work best for fulltext search:
75+
<br />
76+
<a href="./doc/tutorial/db4o-8.0-tutorial.pdf">
77+
./doc/tutorial/db4o-8.0-tutorial.pdf</a>
78+
<br />
79+
<br />
80+
<h2>Join The db4o Community</h2>
81+
<p>
82+
Join the <a href="http://developer.db4o.com" target="_blank">db4o community</a>&nbsp;for help, tips and tricks.&nbsp;&nbsp;<br>
83+
Ask for help in the <a href="http://developer.db4o.com/Forums.aspx" target="_blank">db4o forums</a>&nbsp;at any time. <br>
84+
And take a look at additional resources on <a href="http://developer.db4o.com/Resources.aspx" target="_blank">the community website.</a><br>
85+
If you want to stay informed, subscribe to our <a href="http://developer.db4o.com/Blogs.aspx" target="_blank">db4o blogs</a>.<br>
86+
<br /></p>
87+
<h2>About this software</h2>
88+
The software contained in this distribution is the open source object database engine
89+
"db4o" supplied by:
90+
<br /><br />
91+
Versant Corporation
92+
<br />
93+
255 Shoreline Drive
94+
<br />
95+
Suite 450
96+
<br />
97+
Redwood City, CA 94065
98+
<br />
99+
USA
100+
<br /><br />
101+
Make sure that you have downloaded the latest version from the db4objects website:
102+
<br />
103+
<a href="http://www.db4o.com">
104+
http://www.db4o.com</a>
105+
<br /><br />
106+
db4o may be used under the GNU General Public License, GPL. You should have received
107+
a <a href="db4o.license.html">copy of the GPL</a> with the download.
108+
<br />
109+
<br />
110+
Your db4o team.
111+
</body>
112112
</html>

‎Conceptpower+Spring/pom.xml

Lines changed: 47 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<artifactId>conceptpower</artifactId>
77
<name>ConceptPower</name>
88
<packaging>war</packaging>
9-
<version>1.0.0-BUILD-SNAPSHOT</version>
9+
<version>2.0-BUILD-SNAPSHOT</version>
1010
<properties>
1111
<java-version>1.7</java-version>
1212
<org.springframework-version>4.1.6.RELEASE</org.springframework-version>
@@ -26,6 +26,7 @@
2626
<admin.password>admin</admin.password>
2727
<wordnet.path>/usr/local/WordNet-3.0</wordnet.path>
2828
<spring-security-version>3.2.8.RELEASE</spring-security-version>
29+
<lucene.index>/Users/karthikeyanmohan/Software/Conceptpower/indexFiles</lucene.index>
2930
<pullrequest></pullrequest>
3031
</properties>
3132

@@ -52,6 +53,7 @@
5253
<admin.user>${admin.username}</admin.user>
5354
<admin.pw>${admin.password}</admin.pw>
5455
<wordnet.install.path>${wordnet.path}</wordnet.install.path>
56+
<lucene.path>${lucene.index}</lucene.path>
5557
</properties>
5658
</profile>
5759
<profile>
@@ -68,6 +70,7 @@
6870
<admin.user>${admin.username}</admin.user>
6971
<admin.pw>${admin.password}</admin.pw>
7072
<wordnet.install.path>${wordnet.path}</wordnet.install.path>
73+
<lucene.path>${lucene.index}</lucene.path>
7174
</properties>
7275
</profile>
7376
<profile>
@@ -84,6 +87,7 @@
8487
<admin.user>${admin.username}</admin.user>
8588
<admin.pw>${admin.password}</admin.pw>
8689
<wordnet.install.path>${wordnet.path}</wordnet.install.path>
90+
<lucene.path>${lucene.index}</lucene.path>
8791
</properties>
8892
</profile>
8993
</profiles>
@@ -460,6 +464,47 @@
460464
<artifactId>spring-security-web</artifactId>
461465
<version>${spring-security-version}</version>
462466
</dependency>
467+
468+
<!-- Apache Lucene -->
469+
<dependency>
470+
<groupId>org.apache.lucene</groupId>
471+
<artifactId>lucene-core</artifactId>
472+
<version>5.4.0</version>
473+
</dependency>
474+
475+
476+
<dependency>
477+
<groupId>org.apache.lucene</groupId>
478+
<artifactId>lucene-queryparser</artifactId>
479+
<version>5.4.0</version>
480+
</dependency>
481+
482+
483+
<dependency>
484+
<groupId>org.apache.lucene</groupId>
485+
<artifactId>lucene-analyzers-common</artifactId>
486+
<version>5.4.0</version>
487+
</dependency>
488+
489+
490+
<dependency>
491+
<groupId>org.apache.lucene</groupId>
492+
<artifactId>lucene-demos</artifactId>
493+
<version>3.0.3</version>
494+
</dependency>
495+
496+
<!-- JSON Converter -->
497+
<dependency>
498+
<groupId>com.fasterxml.jackson.core</groupId>
499+
<artifactId>jackson-databind</artifactId>
500+
<version>2.1.0</version>
501+
</dependency>
502+
<dependency>
503+
<groupId>com.fasterxml.jackson.core</groupId>
504+
<artifactId>jackson-core</artifactId>
505+
<version>2.1.0</version>
506+
</dependency>
507+
463508
</dependencies>
464509

465510
<scm>
@@ -590,4 +635,4 @@
590635
</plugin>
591636
</plugins>
592637
</reporting>
593-
</project>
638+
</project>

‎Conceptpower+Spring/src/main/java/edu/asu/conceptpower/.DS_Store

8 KB
Binary file not shown.

0 commit comments

Comments
 (0)