Author: seba.wagner
Date: Tue Oct 7 06:16:36 2008
New Revision: 1601
Added:
trunk/webapp/lib/backup/
trunk/webapp/lib/velocity/
trunk/webapp/lib/velocity/jaxen-1.1.1.jar (contents, props changed)
trunk/webapp/lib/velocity/velocity-1.6-dev.jar (props changed)
- copied unchanged from r1529,
/trunk/webapp/lib/upload/velocity-1.6-dev.jar
trunk/webapp/lib/velocity/velocity-tools-view-1.3.jar (props changed)
- copied unchanged from r1529,
/trunk/webapp/lib/upload/velocity-tools-view-1.3.jar
Removed:
trunk/webapp/lib/upload/velocity-1.6-dev.jar
trunk/webapp/lib/upload/velocity-tools-view-1.3.jar
Modified:
trunk/webapp/.classpath
trunk/webapp/build.xml
trunk/webapp/filetest.keystore
Log:
Modifications for velocity to run again (although still an exception
marging mail-templates or servlets with velocity basically work)
Modified: trunk/webapp/.classpath
==============================================================================
--- trunk/webapp/.classpath (original)
+++ trunk/webapp/.classpath Tue Oct 7 06:16:36 2008
@@ -45,8 +45,6 @@
<classpathentry kind="lib" path="lib/upload/mail.jar"/>
<classpathentry kind="lib" path="lib/upload/multipartrequest.jar"/>
<classpathentry kind="lib"
path="lib/upload/mysql-connector-java-5.0.7-bin.jar"/>
- <classpathentry kind="lib" path="lib/upload/velocity-1.6-dev.jar"/>
- <classpathentry kind="lib"
path="lib/upload/velocity-tools-view-1.3.jar"/>
<classpathentry kind="lib"
path="lib/xdoclet2/lib/commons-beanutils-1.7.0.jar"/>
<classpathentry kind="lib"
path="lib/xdoclet2/lib/commons-collections-3.1.jar"/>
<classpathentry kind="lib"
path="lib/xdoclet2/lib/commons-jelly-20050813.225330.jar"/>
@@ -63,7 +61,6 @@
<classpathentry kind="lib"
path="lib/xdoclet2/lib/picocontainer-1.0.jar"/>
<classpathentry kind="lib"
path="lib/xdoclet2/lib/qdox-20051211.114207.jar"/>
<classpathentry kind="lib" path="lib/xdoclet2/lib/saxpath-1.0-FCS.jar"/>
- <classpathentry kind="lib" path="lib/xdoclet2/lib/velocity-1.4.jar"/>
<classpathentry kind="lib" path="lib/xdoclet2/lib/xdoclet-2.0.6.jar"/>
<classpathentry kind="lib" path="lib/xdoclet2/lib/xerces-2.4.0.jar"/>
<classpathentry kind="lib"
path="lib/xdoclet2/plugins/xdoclet-plugin-hibernate-1.0.4-SNAPSHOT.jar"/>
Modified: trunk/webapp/build.xml
==============================================================================
--- trunk/webapp/build.xml (original)
+++ trunk/webapp/build.xml Tue Oct 7 06:16:36 2008
@@ -47,7 +47,9 @@
<!-- Axis2 -->
<property name="axis2.lib" value="${project.lib}/axis2-1.3" />
<!-- SLF4J -->
- <property name="slf4j.lib" value="${project.lib}/slf4j" />
+ <property name="slf4j.lib" value="${project.lib}/slf4j" />
+ <!-- Velocity -->
+ <property name="velocity.lib" value="${project.lib}/velocity" />
<!-- compile classpath -->
<path id="compile.classpath">
@@ -62,6 +64,7 @@
<fileset dir="${web.lib}" includes="*.jar"/>
<fileset dir="${slf4j.lib}" includes="*.jar"/>
<fileset dir="${axis2.lib}" includes="*.jar"/>
+ <fileset dir="${velocity.lib}" includes="*.jar"/>
</path>
<!-- xDoclet classpath -->
@@ -205,6 +208,8 @@
<fileset dir="${slf4j.lib}">
</fileset>
-->
+ <fileset dir="${velocity.lib}">
+ </fileset>
<fileset dir="${hibernate.lib}">
</fileset>
<fileset dir="${upload.lib}">
Modified: trunk/webapp/filetest.keystore
==============================================================================
Binary files. No diff available.
Added: trunk/webapp/lib/velocity/jaxen-1.1.1.jar
==============================================================================
Binary file. No diff available.
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"OpenMeetings developers" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at
http://groups.google.com/group/openmeetings-dev?hl=en
-~----------~----~----~----~------~----~------~--~---
