cmailleux 2005/02/09 11:51:24 CET
Modified files: (Branch: JAHIA-HIBERNATE-BRANCH)
core .cvsignore project.properties project.xml
Log:
First Import of Hibernate (Acl, Site, Container, Fields)
Revision Changes Path
1.1.2.1 +9 -1 jahia/core/.cvsignore
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/.cvsignore.diff?r1=1.1&r2=1.1.2.1&f=h
1.16.2.1 +9 -9 jahia/core/project.properties
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/project.properties.diff?r1=1.16&r2=1.16.2.1&f=h
1.36.2.1 +44 -15 jahia/core/project.xml
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/project.xml.diff?r1=1.36&r2=1.36.2.1&f=h
Index: .cvsignore
===================================================================
RCS file: /home/cvs/repository/jahia/core/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- .cvsignore 30 Mar 2004 17:19:54 -0000 1.1
+++ .cvsignore 9 Feb 2005 10:51:23 -0000 1.1.2.1
@@ -1,3 +1,11 @@
target
build
-ant.build.properties
\ No newline at end of file
+ant.build.properties
+db
+exploded
+Core.iml
+jahia.ipr
+jahia.iws
+jahia.iml
+spy_oracle.log
+spy.log
Index: project.properties
===================================================================
RCS file: /home/cvs/repository/jahia/core/project.properties,v
retrieving revision 1.16
retrieving revision 1.16.2.1
diff -u -r1.16 -r1.16.2.1
--- project.properties 25 Jan 2005 14:35:12 -0000 1.16
+++ project.properties 9 Feb 2005 10:51:23 -0000 1.16.2.1
@@ -9,6 +9,8 @@
# Web.xml file location
#maven.war.webxml=${maven.src.dir}/conf/metadata/war/web.xml
+maven.compile.deprecation = true
+
# Settings for preGoal for packaging of WEB-INF/classes into a JAR in
WEB-INF/lib
# set to true if you want the contents of WEB-INF/classes to be packaged
into a JAR in WEB-INF/lib
maven.war.jarclasses=true
@@ -19,7 +21,7 @@
# Set to true if you want to exclude some libraries from packaging, which
will usually be then inserted as shared libraries.
maven.jahiawar.usesharedlibs=true
-maven.repo.remote = http://maven.jahia.org,
http://www.bluesunrise.com/maven/, http://www.ibiblio.org/maven/,
http://www.day.com/maven/
+maven.repo.remote = http://maven.jahia.org,
http://www.bluesunrise.com/maven/, http://www.ibiblio.org/maven/
#####################################################
# jar override
@@ -45,6 +47,7 @@
# Set to true if you want JSP precompilation to happen after war:webapp goal
precompile.jsp=false
+catalina.home.dir = c:/java/Tomcat 5.0
# Tomcat deployment locations
tomcat.home=${catalina.home.dir}
catalina.shared.lib=${catalina.home.dir}/shared/lib/
@@ -52,14 +55,11 @@
#catalina.version.major=4
webapp.name=jahia
deploy.war.dir=${catalina.home.dir}/webapps/
-deploy.contextdescriptor.dir=${deploy.war.dir}
+#deploy.contextdescriptor.dir=${deploy.war.dir}
# for Tomcat 5, comment the above line and replace with the one below,
making sure the directory names follow the convention :
# ${catalina.home.dir}/conf/[enginename]/[hostname]/jahia.xml.
-# deploy.contextdescriptor.dir=${catalina.home.dir}/conf/Catalina/localhost
+deploy.contextdescriptor.dir=${catalina.home.dir}/conf/Catalina/localhost
-# Javadoc plugin settings.
-maven.javadoc.customtags=tag1
-tag1.name=todo
-tag1.description=To Do:
-tag1.enabled=true
-tag1.scope=all
\ No newline at end of file
+maven.xdoclet.hibernatedoclet.force = false
+maven.xdoclet.hibernatedoclet.hibernate.0.Version=2.1
+maven.xdoclet.hibernatedoclet.fileset.0.include=**/hibernate/model/*.java
Index: project.xml
===================================================================
RCS file: /home/cvs/repository/jahia/core/project.xml,v
retrieving revision 1.36
retrieving revision 1.36.2.1
diff -u -r1.36 -r1.36.2.1
--- project.xml 11 Jan 2005 11:24:34 -0000 1.36
+++ project.xml 9 Feb 2005 10:51:23 -0000 1.36.2.1
@@ -41,16 +41,14 @@
<war.bundle>true</war.bundle>
</properties>
</dependency>
- <!--
<dependency>
- <groupId>cglib</groupId>
- <artifactId>cglib-full</artifactId>
- <version>2.0.2</version>
+ <groupId>hibernate</groupId>
+ <artifactId>c3p0</artifactId>
+ <version>0.8.4.5</version>
<properties>
<war.bundle>true</war.bundle>
</properties>
</dependency>
- -->
<dependency>
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
@@ -183,7 +181,6 @@
<war.bundle>true</war.bundle>
</properties>
</dependency>
- <!--
<dependency>
<id>dom4j</id>
<version>1.4</version>
@@ -192,13 +189,13 @@
</properties>
</dependency>
<dependency>
- <id>hibernate</id>
- <version>3.0alpha</version>
+ <groupId>hibernate</groupId>
+ <artifactId>hibernate2</artifactId>
+ <version>2.1.7c</version>
<properties>
<war.bundle>true</war.bundle>
</properties>
</dependency>
- -->
<dependency>
<groupId>hsqldb</groupId>
<artifactId>hsqldb</artifactId>
@@ -611,42 +608,42 @@
</dependency>
<dependency>
<id>cglib</id>
- <version>2.0.1</version>
+ <version>full-2.0.2</version>
<properties>
<war.bundle>true</war.bundle>
</properties>
</dependency>
<dependency>
<id>springframework:spring-core</id>
- <version>1.1.1</version>
+ <version>1.1.2</version>
<properties>
<war.bundle>true</war.bundle>
</properties>
</dependency>
<dependency>
<id>springframework:spring-aop</id>
- <version>1.1.1</version>
+ <version>1.1.2</version>
<properties>
<war.bundle>true</war.bundle>
</properties>
</dependency>
<dependency>
<id>springframework:spring-context</id>
- <version>1.1.1</version>
+ <version>1.1.2</version>
<properties>
<war.bundle>true</war.bundle>
</properties>
</dependency>
<dependency>
<id>springframework:spring-dao</id>
- <version>1.1.1</version>
+ <version>1.1.2</version>
<properties>
<war.bundle>true</war.bundle>
</properties>
</dependency>
<dependency>
<id>springframework:spring-orm</id>
- <version>1.1.1</version>
+ <version>1.1.2</version>
<properties>
<war.bundle>true</war.bundle>
</properties>
@@ -662,6 +659,15 @@
</properties>
</dependency>
+ <dependency>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
+ <version>1.0.b2</version>
+ <properties>
+ <war.bundle>true</war.bundle>
+ </properties>
+ </dependency>
+
<!-- Jetspeed 2 dependencies -->
<dependency>
<id>jetspeed</id>
@@ -913,6 +919,22 @@
</properties>
</dependency>
+ <!-- hibernate dependent package and package for test purpose -->
+ <dependency>
+ <groupId>oscache</groupId>
+ <artifactId>oscache</artifactId>
+ <version>2.0.1</version>
+ </dependency>
+ <dependency>
+ <groupId>jmock</groupId>
+ <artifactId>jmock-cglib</artifactId>
+ <version>1.0.1</version>
+ </dependency>
+ <dependency>
+ <groupId>xdoclet</groupId>
+ <artifactId>xdoclet-hibernate-module</artifactId>
+ <version>1.2.2</version>
+ </dependency>
</dependencies>
@@ -940,6 +962,13 @@
<include>**/*</include>
</includes>
</resource>
+ <resource>
+
<directory>${maven.build.dir}/xdoclet/hibernatedoclet</directory>
+ <includes>
+ <include>**/*.hbm.xml*</include>
+ </includes>
+ </resource>
+
</resources>
</build>
