Pinaki Poddar e8b0679ed1 Resolve conflicted file ...

git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@946836 13f79535-47bb-0310-9956-ffa450edef68

2010-05-21 00:30:21 +00:00

..

src/main

Resolve conflicted file

2010-05-21 00:30:21 +00:00

web

Add JSP based web client

2010-05-20 22:11:38 +00:00

build.jee.xml

Add JSE/JEE Ant build files

2010-05-20 22:12:24 +00:00

build.jse.xml

Add JSE/JEE Ant build files

2010-05-20 22:12:24 +00:00

build.properties

git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@945877 13f79535-47bb-0310-9956-ffa450edef68

2010-05-18 20:49:52 +00:00

build.xml

Add JSE/JEE Ant build files

2010-05-20 22:12:24 +00:00

index.html

Add JSE/JEE Ant build files

2010-05-20 22:12:24 +00:00

LICENSE.txt

updated License/Notice files to only include requirements for this source code and not the rest of OpenJPA

2010-05-14 16:13:39 +00:00

NOTICE.txt

updated License/Notice files to only include requirements for this source code and not the rest of OpenJPA

2010-05-14 16:13:39 +00:00

pom.xml

openbooks updates: copy run files to target dir for easy testing, added a run profile to pom.xml to allow launching of app from maven

2010-05-14 21:42:37 +00:00

run.properties

openbooks updates: put separate run/build.properties back, created a pom.xml that can be used to generate the jar but is not hooked into the build right now, updated build.xml to use standard /target for all output (still need think about how these *_.java files are getting updated in the source for every build...)

2010-05-14 20:29:27 +00:00

run.xml

openbooks updates: copy run files to target dir for easy testing, added a run profile to pom.xml to allow launching of app from maven

2010-05-14 21:42:37 +00:00