Skip to content

Commit

Permalink
Merge pull request #113 from diging/develop
Browse files Browse the repository at this point in the history
Version 3
  • Loading branch information
jdamerow authored Jul 14, 2016
2 parents f7cbec1 + 9494535 commit 857508b
Show file tree
Hide file tree
Showing 318 changed files with 125,393 additions and 38,610 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
ConceptpowerPlus/build
Conceptpower+Spring/target
*.DS_STORE
2 changes: 1 addition & 1 deletion Conceptpower+Spring/.classpath
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
<attributes>
<attribute name="owner.project.facets" value="java"/>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="output" path="target/classes"/>
Expand Down
291 changes: 288 additions & 3 deletions Conceptpower+Spring/.settings/org.eclipse.jdt.core.prefs

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion Conceptpower+Spring/.settings/org.eclipse.m2e.core.prefs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
activeProfiles=dev
activeProfiles=dev, dev
eclipse.preferences.version=1
resolveWorkspaceProjects=true
version=1
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
<fixed facet="jst.web"/>
<fixed facet="jst.java"/>
<installed facet="jst.web" version="2.5"/>
<installed facet="jst.java" version="1.8"/>
<installed facet="jpt.jpa" version="2.0"/>
<installed facet="jst.java" version="1.7"/>
</faceted-project>
766 changes: 383 additions & 383 deletions Conceptpower+Spring/lib/db4o-8.0/db4o.license.html

Large diffs are not rendered by default.

222 changes: 111 additions & 111 deletions Conceptpower+Spring/lib/db4o-8.0/readme.html
Original file line number Diff line number Diff line change
@@ -1,112 +1,112 @@
<html>
<head>
<title>Readme</title>
<Style>
BODY, P, TD { font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 10pt; color: #666666 }
H2,H3,H4,H5 { color: black; font-weight: bold; }
H2 { font-size: 13pt; }
H3 { font-size: 12pt; }
H4 { font-size: 10pt; color: black; }

</style>
</head>
<body bgcolor="#FFFFFF" color=#000000>
<p>
</p>
<p>
</p>
<h2>Content</h2>
<p>
This distribution contains documentation, binaries and sources for the open source
object database db4o. For more information about the content of a specific folder
see the readme.html file in the respective folder.</p>
</p>
<p>
<table>
<tr>
<td style="width: 100px" valign="top">
<a href="./doc">/doc</a>
</td>
<td style="width: 500px" valign="top">
documentation
</td>
</tr>
<tr>
<td style="width: 100px" valign="top">
<a href="./lib">/lib</a>
</td>
<td style="width: 500px" valign="top">
binaries
</td>
</tr>
<tr>
<td style="width: 100px" valign="top">
<a href="./ome">/ome</a>
</td>
<td style="width: 500px" valign="top">
Object Manager Enterprise - database browser plugin for your IDE
</td>
</tr>
<tr>
<td style="width: 100px" valign="top">
<a href="./src">/src</a>
</td>
<td style="width: 500px" valign="top">
sources
</td>
</tr>
</table>
<h2>
Getting Started
</h2>
For the fastest start with db4o please work through the tutorial, available in different
formats in the following folder:
<br />
<a href="./doc/tutorial/">
./doc/tutorial/</a>
<br />
If you are working with db4o for Java, it is recommended to use the interactive
HTML tutorial:
<br />
<a href="./doc/tutorial/index.html">
./doc/tutorial/index.html</a>
<br />
The PDF tutorial will work best for fulltext search:
<br />
<a href="./doc/tutorial/db4o-8.0-tutorial.pdf">
./doc/tutorial/db4o-8.0-tutorial.pdf</a>
<br />
<br />
<h2>Join The db4o Community</h2>
<p>
Join the <a href="http://developer.db4o.com" target="_blank">db4o community</a>&nbsp;for help, tips and tricks.&nbsp;&nbsp;<br>
Ask for help in the <a href="http://developer.db4o.com/Forums.aspx" target="_blank">db4o forums</a>&nbsp;at any time. <br>
And take a look at additional resources on <a href="http://developer.db4o.com/Resources.aspx" target="_blank">the community website.</a><br>
If you want to stay informed, subscribe to our <a href="http://developer.db4o.com/Blogs.aspx" target="_blank">db4o blogs</a>.<br>
<br /></p>
<h2>About this software</h2>
The software contained in this distribution is the open source object database engine
"db4o" supplied by:
<br /><br />
Versant Corporation
<br />
255 Shoreline Drive
<br />
Suite 450
<br />
Redwood City, CA 94065
<br />
USA
<br /><br />
Make sure that you have downloaded the latest version from the db4objects website:
<br />
<a href="http://www.db4o.com">
http://www.db4o.com</a>
<br /><br />
db4o may be used under the GNU General Public License, GPL. You should have received
a <a href="db4o.license.html">copy of the GPL</a> with the download.
<br />
<br />
Your db4o team.
</body>
<html>
<head>
<title>Readme</title>
<Style>
BODY, P, TD { font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 10pt; color: #666666 }
H2,H3,H4,H5 { color: black; font-weight: bold; }
H2 { font-size: 13pt; }
H3 { font-size: 12pt; }
H4 { font-size: 10pt; color: black; }

</style>
</head>
<body bgcolor="#FFFFFF" color=#000000>
<p>
</p>
<p>
</p>
<h2>Content</h2>
<p>
This distribution contains documentation, binaries and sources for the open source
object database db4o. For more information about the content of a specific folder
see the readme.html file in the respective folder.</p>
</p>
<p>
<table>
<tr>
<td style="width: 100px" valign="top">
<a href="./doc">/doc</a>
</td>
<td style="width: 500px" valign="top">
documentation
</td>
</tr>
<tr>
<td style="width: 100px" valign="top">
<a href="./lib">/lib</a>
</td>
<td style="width: 500px" valign="top">
binaries
</td>
</tr>
<tr>
<td style="width: 100px" valign="top">
<a href="./ome">/ome</a>
</td>
<td style="width: 500px" valign="top">
Object Manager Enterprise - database browser plugin for your IDE
</td>
</tr>
<tr>
<td style="width: 100px" valign="top">
<a href="./src">/src</a>
</td>
<td style="width: 500px" valign="top">
sources
</td>
</tr>
</table>
<h2>
Getting Started
</h2>
For the fastest start with db4o please work through the tutorial, available in different
formats in the following folder:
<br />
<a href="./doc/tutorial/">
./doc/tutorial/</a>
<br />
If you are working with db4o for Java, it is recommended to use the interactive
HTML tutorial:
<br />
<a href="./doc/tutorial/index.html">
./doc/tutorial/index.html</a>
<br />
The PDF tutorial will work best for fulltext search:
<br />
<a href="./doc/tutorial/db4o-8.0-tutorial.pdf">
./doc/tutorial/db4o-8.0-tutorial.pdf</a>
<br />
<br />
<h2>Join The db4o Community</h2>
<p>
Join the <a href="http://developer.db4o.com" target="_blank">db4o community</a>&nbsp;for help, tips and tricks.&nbsp;&nbsp;<br>
Ask for help in the <a href="http://developer.db4o.com/Forums.aspx" target="_blank">db4o forums</a>&nbsp;at any time. <br>
And take a look at additional resources on <a href="http://developer.db4o.com/Resources.aspx" target="_blank">the community website.</a><br>
If you want to stay informed, subscribe to our <a href="http://developer.db4o.com/Blogs.aspx" target="_blank">db4o blogs</a>.<br>
<br /></p>
<h2>About this software</h2>
The software contained in this distribution is the open source object database engine
"db4o" supplied by:
<br /><br />
Versant Corporation
<br />
255 Shoreline Drive
<br />
Suite 450
<br />
Redwood City, CA 94065
<br />
USA
<br /><br />
Make sure that you have downloaded the latest version from the db4objects website:
<br />
<a href="http://www.db4o.com">
http://www.db4o.com</a>
<br /><br />
db4o may be used under the GNU General Public License, GPL. You should have received
a <a href="db4o.license.html">copy of the GPL</a> with the download.
<br />
<br />
Your db4o team.
</body>
</html>
49 changes: 47 additions & 2 deletions Conceptpower+Spring/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<artifactId>conceptpower</artifactId>
<name>ConceptPower</name>
<packaging>war</packaging>
<version>1.0.0-BUILD-SNAPSHOT</version>
<version>2.0-BUILD-SNAPSHOT</version>
<properties>
<java-version>1.7</java-version>
<org.springframework-version>4.1.6.RELEASE</org.springframework-version>
Expand All @@ -26,6 +26,7 @@
<admin.password>admin</admin.password>
<wordnet.path>/usr/local/WordNet-3.0</wordnet.path>
<spring-security-version>3.2.8.RELEASE</spring-security-version>
<lucene.index>/Users/karthikeyanmohan/Software/Conceptpower/indexFiles</lucene.index>
<pullrequest></pullrequest>
</properties>

Expand All @@ -52,6 +53,7 @@
<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>
</properties>
</profile>
<profile>
Expand All @@ -68,6 +70,7 @@
<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>
</properties>
</profile>
<profile>
Expand All @@ -84,6 +87,7 @@
<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>
</properties>
</profile>
</profiles>
Expand Down Expand Up @@ -460,6 +464,47 @@
<artifactId>spring-security-web</artifactId>
<version>${spring-security-version}</version>
</dependency>

<!-- Apache Lucene -->
<dependency>
<groupId>org.apache.lucene</groupId>
<artifactId>lucene-core</artifactId>
<version>5.4.0</version>
</dependency>


<dependency>
<groupId>org.apache.lucene</groupId>
<artifactId>lucene-queryparser</artifactId>
<version>5.4.0</version>
</dependency>


<dependency>
<groupId>org.apache.lucene</groupId>
<artifactId>lucene-analyzers-common</artifactId>
<version>5.4.0</version>
</dependency>


<dependency>
<groupId>org.apache.lucene</groupId>
<artifactId>lucene-demos</artifactId>
<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>

</dependencies>

<scm>
Expand Down Expand Up @@ -590,4 +635,4 @@
</plugin>
</plugins>
</reporting>
</project>
</project>
Binary file not shown.
Loading

0 comments on commit 857508b

Please sign in to comment.