knguyen 2005/01/11 12:24:34 CET
Modified files:
core maven.xml project.properties project.xml
Log:
- moving spring config to head
- moving neko to head
- jackrabbit dependencies and default store
Revision Changes Path
1.24 +2 -0 jahia/core/maven.xml
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/maven.xml.diff?r1=1.23&r2=1.24&f=h
1.15 +7 -1 jahia/core/project.properties
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/project.properties.diff?r1=1.14&r2=1.15&f=h
1.36 +80 -2 jahia/core/project.xml
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/project.xml.diff?r1=1.35&r2=1.36&f=h
Index: maven.xml
===================================================================
RCS file: /home/cvs/repository/jahia/core/maven.xml,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- maven.xml 23 Dec 2004 16:19:39 -0000 1.23
+++ maven.xml 11 Jan 2005 11:24:34 -0000 1.24
@@ -51,9 +51,11 @@
<!--
<copy
file="${maven.repo.local}/struts-portlet/jars/struts-portlet-spi-0.1.jar"
todir="${catalina.shared.lib}"/>
-->
+ <!--
<copy file="./lib/jetspeed2/jetspeed-commons-2.0-a1-dev.jar"
todir="${catalina.shared.lib}"/>
<copy file="${maven.repo.local}/portlet-api/jars/portlet-api-1.0.jar"
todir="${catalina.shared.lib}"/>
<copy file="./lib/jetspeed2/jetspeed-api-2.0-a1-dev.jar"
todir="${catalina.shared.lib}"/>
+ -->
</goal>
<goal name="update:jetspeed2"
Index: project.properties
===================================================================
RCS file: /home/cvs/repository/jahia/core/project.properties,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- project.properties 23 Dec 2004 16:19:39 -0000 1.14
+++ project.properties 11 Jan 2005 11:24:34 -0000 1.15
@@ -17,7 +17,7 @@
# set to true if you only want the *.class files in the JAR, false will
include the whole contents of WEB-INF/classes
maven.war.jarclasses.justclasses=true
-maven.repo.remote = http://maven.jahia.org,
http://www.bluesunrise.com/maven/, http://www.ibiblio.org/maven/
+maven.repo.remote = http://maven.jahia.org,
http://www.bluesunrise.com/maven/, http://www.ibiblio.org/maven/,
http://www.day.com/maven/
#####################################################
# jar override
@@ -34,6 +34,12 @@
maven.jar.jsf-api = ${basedir}/lib/jsf-api-1.1.jar
maven.jar.jsf-impl = ${basedir}/lib/jsf-impl-1.1.jar
+maven.jar.jackrabbit = ${basedir}/lib/jackrabbit-0.15-dev.jar
+
+maven.jar.nekohtml = ${basedir}/lib/nekohtml-0.9.4.jar
+
+maven.jar.pdfbox = ${basedir}/lib/pdfbox-0.6.7a-patched.jar
+
# Set to true if you want JSP precompilation to happen after war:webapp goal
precompile.jsp=false
Index: project.xml
===================================================================
RCS file: /home/cvs/repository/jahia/core/project.xml,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- project.xml 23 Dec 2004 16:19:40 -0000 1.35
+++ project.xml 11 Jan 2005 11:24:34 -0000 1.36
@@ -207,6 +207,15 @@
<war.bundle>true</war.bundle>
</properties>
</dependency>
+
+ <dependency>
+ <groupId>jackrabbit</groupId>
+ <artifactId>jackrabbit</artifactId>
+ <version>0.15-dev</version>
+ <properties>
+ <war.bundle>true</war.bundle>
+ </properties>
+ </dependency>
<dependency>
<groupId>javamail</groupId>
<artifactId>javamail</artifactId>
@@ -233,6 +242,15 @@
</properties>
</dependency>
<dependency>
+ <groupId>jsr170</groupId>
+ <artifactId>jcr</artifactId>
+ <version>0.15</version>
+ <properties>
+ <war.bundle>true</war.bundle>
+ </properties>
+ <url>http://www.day.com/maven/jsr170/jars/jcr-0.15.jar</url>
+ </dependency>
+ <dependency>
<groupId>jdom</groupId>
<artifactId>jdom</artifactId>
<version>1.0</version>
@@ -346,6 +364,13 @@
</properties>
</dependency>
<dependency>
+ <id>nekohtml</id>
+ <version>0.9.4</version>
+ <properties>
+ <war.bundle>true</war.bundle>
+ </properties>
+ </dependency>
+ <dependency>
<id>ojb:db-ojb</id>
<version>1.0.1</version>
<properties>
@@ -630,8 +655,8 @@
<dependency>
<groupId>xerces</groupId>
- <artifactId>xerces</artifactId>
- <version>2.4.0</version>
+ <artifactId>xercesImpl</artifactId>
+ <version>2.6.2</version>
<properties>
<war.bundle>true</war.bundle>
</properties>
@@ -836,6 +861,59 @@
</dependency>
<!-- End of Jetspeed 2 dependencies -->
+ <dependency>
+ <id>junit</id>
+ <version>3.8.1</version>
+ </dependency>
+
+ <!-- jackrabbit dependencies -->
+ <dependency>
+ <id>concurrent</id>
+ <version>1.3.4</version>
+ <properties>
+ <war.bundle>true</war.bundle>
+ </properties>
+ </dependency>
+ <dependency>
+ <id>javacc</id>
+ <version>3.2</version>
+ <properties>
+ <war.bundle>true</war.bundle>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>geronimo-spec</groupId>
+ <artifactId>geronimo-spec-jta</artifactId>
+ <version>1.0-M1</version>
+ <properties>
+ <war.bundle>true</war.bundle>
+ </properties>
+ </dependency>
+ <!--
+ cqfs-jackrabbit and cqfs are optional runtime dependencies
+ (an alternative FileSystem implementation);
+ commons-logging is a dependency of cqfs
+ -->
+ <dependency>
+ <groupId>cqfs</groupId>
+ <artifactId>cqfs-jackrabbit</artifactId>
+ <version>3.5.6</version>
+ <url>http://www.day.com/maven/cqfs/jars/cqfs-jackrabbit-3.5.6.jar</url>
+ <properties>
+ <war.bundle>true</war.bundle>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>cqfs</groupId>
+ <artifactId>cqfs</artifactId>
+ <version>3.5.6</version>
+ <url>http://www.day.com/maven/cqfs/jars/cqfs-3.5.6.jar</url>
+ <properties>
+ <war.bundle>true</war.bundle>
+ </properties>
+ </dependency>
+
+
</dependencies>
