xlawrence 2005/01/07 14:26:58 CET
Modified files:
calClient project.xml
webapp/admin project.xml
webapp maven.xml project.xml
webapp/uiclient project.xml
Log:
Updated dependencies for the struts(portlet webapps
Revision Changes Path
1.2 +0 -16 uwcal_JSR168/calClient/project.xml
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/uwcal_JSR168/calClient/project.xml.diff?r1=1.1&r2=1.2&f=h
1.4 +11 -0 uwcal_JSR168/webapp/admin/project.xml
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/uwcal_JSR168/webapp/admin/project.xml.diff?r1=1.3&r2=1.4&f=h
1.2 +12 -0 uwcal_JSR168/webapp/maven.xml
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/uwcal_JSR168/webapp/maven.xml.diff?r1=1.1&r2=1.2&f=h
1.4 +35 -16 uwcal_JSR168/webapp/project.xml
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/uwcal_JSR168/webapp/project.xml.diff?r1=1.3&r2=1.4&f=h
1.4 +11 -0 uwcal_JSR168/webapp/uiclient/project.xml
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/uwcal_JSR168/webapp/uiclient/project.xml.diff?r1=1.3&r2=1.4&f=h
Index: project.xml
===================================================================
RCS file: /home/cvs/repository/uwcal_JSR168/calClient/project.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- project.xml 5 Jan 2005 10:02:56 -0000 1.1
+++ project.xml 7 Jan 2005 13:26:57 -0000 1.2
@@ -125,14 +125,6 @@
</dependency>
<dependency>
<groupId>uwCal</groupId>
- <artifactId>appsuite</artifactId>
- <version>2.1</version>
- <properties>
- <war.bundle>true</war.bundle>
- </properties>
- </dependency>
- <dependency>
- <groupId>uwCal</groupId>
<artifactId>rpiutil</artifactId>
<version>2.1</version>
<properties>
@@ -195,14 +187,6 @@
<war.bundle>true</war.bundle>
</properties>
</dependency>
- <dependency>
- <groupId>uwCal</groupId>
- <artifactId>uwcalwebcommon</artifactId>
- <version>2.1</version>
- <properties>
- <war.bundle>true</war.bundle>
- </properties>
- </dependency>
</dependencies>
<build>
Index: project.xml
===================================================================
RCS file: /home/cvs/repository/uwcal_JSR168/webapp/admin/project.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- project.xml 6 Jan 2005 15:22:12 -0000 1.3
+++ project.xml 7 Jan 2005 13:26:58 -0000 1.4
@@ -34,6 +34,17 @@
<package>org.jahia.suite.calendar.webApp.admin</package>
+ <dependencies>
+ <dependency>
+ <groupId>uwCal</groupId>
+ <artifactId>democaladmin</artifactId>
+ <version>2.1</version>
+ <properties>
+ <war.bundle>true</war.bundle>
+ </properties>
+ </dependency>
+ </dependencies>
+
<build>
<sourceDirectory>src/java</sourceDirectory>
<resources>
Index: maven.xml
===================================================================
RCS file: /home/cvs/repository/uwcal_JSR168/webapp/maven.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- maven.xml 6 Jan 2005 15:22:13 -0000 1.1
+++ maven.xml 7 Jan 2005 13:26:58 -0000 1.2
@@ -44,4 +44,16 @@
/>
</goal>
+ <goal name="allBuild"
+ description="Builds all the war files of the webApps">
+
+ <maven:reactor
+ basedir="${basedir}"
+ includes="admin/project.xml, uiclient/project.xml"
+ goals="war"
+ banner="Building..."
+ ignoreFailures="false"
+ />
+ </goal>
+
</project>
\ No newline at end of file
Index: project.xml
===================================================================
RCS file: /home/cvs/repository/uwcal_JSR168/webapp/project.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- project.xml 6 Jan 2005 15:22:13 -0000 1.3
+++ project.xml 7 Jan 2005 13:26:58 -0000 1.4
@@ -122,6 +122,41 @@
</properties>
</dependency>
<dependency>
+ <groupId>commons-dbcp</groupId>
+ <artifactId>commons-dbcp</artifactId>
+ <version>1.2.1</version>
+ <url>http://jakarta.apache.org/commons/dbcp/</url>
+ <properties>
+ <war.bundle>true</war.bundle>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>commons-pool</groupId>
+ <artifactId>commons-pool</artifactId>
+ <version>1.2</version>
+ <url>http://jakarta.apache.org/commons/pool/</url>
+ <properties>
+ <war.bundle>true</war.bundle>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>commons-resources</groupId>
+ <artifactId>commons-resources</artifactId>
+ <version>0.1-dev</version>
+ <url>http://jakarta.apache.org/commons/resources/</url>
+ <properties>
+ <war.bundle>true</war.bundle>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>commons-services</groupId>
+ <artifactId>commons-services</artifactId>
+ <version>1.0-dev</version>
+ <properties>
+ <war.bundle>true</war.bundle>
+ </properties>
+ </dependency>
+ <dependency>
<groupId>oro</groupId>
<artifactId>oro</artifactId>
<version>2.0.7</version>
@@ -165,14 +200,6 @@
</dependency>
<dependency>
<groupId>uwCal</groupId>
- <artifactId>appsuite</artifactId>
- <version>2.1</version>
- <properties>
- <war.bundle>true</war.bundle>
- </properties>
- </dependency>
- <dependency>
- <groupId>uwCal</groupId>
<artifactId>rpiutil</artifactId>
<version>2.1</version>
<properties>
@@ -221,14 +248,6 @@
</dependency>
<dependency>
<groupId>uwCal</groupId>
- <artifactId>synchcommon</artifactId>
- <version>2.1</version>
- <properties>
- <war.bundle>true</war.bundle>
- </properties>
- </dependency>
- <dependency>
- <groupId>uwCal</groupId>
<artifactId>uwcalcommon</artifactId>
<version>2.1</version>
<properties>
Index: project.xml
===================================================================
RCS file: /home/cvs/repository/uwcal_JSR168/webapp/uiclient/project.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- project.xml 6 Jan 2005 15:22:12 -0000 1.3
+++ project.xml 7 Jan 2005 13:26:58 -0000 1.4
@@ -34,6 +34,17 @@
<package>org.jahia.suite.calendar.webApp.uiclient</package>
+ <dependencies>
+ <dependency>
+ <groupId>uwCal</groupId>
+ <artifactId>democal</artifactId>
+ <version>2.1</version>
+ <properties>
+ <war.bundle>true</war.bundle>
+ </properties>
+ </dependency>
+ </dependencies>
+
<build>
<sourceDirectory>src/java</sourceDirectory>
<resources>
