Author: solomax
Date: Fri Mar  2 17:43:19 2012
New Revision: 1296349

URL: http://svn.apache.org/viewvc?rev=1296349&view=rev
Log:
More jar clean up; check for suppress libraries download is added

Removed:
    incubator/openmeetings/trunk/singlewebapp/lib/java_16_tools.jar
Modified:
    incubator/openmeetings/trunk/singlewebapp/.classpath
    incubator/openmeetings/trunk/singlewebapp/build.xml
    incubator/openmeetings/trunk/singlewebapp/ivy.xml

Modified: incubator/openmeetings/trunk/singlewebapp/.classpath
URL: 
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/.classpath?rev=1296349&r1=1296348&r2=1296349&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/.classpath (original)
+++ incubator/openmeetings/trunk/singlewebapp/.classpath Fri Mar  2 17:43:19 
2012
@@ -1,169 +1,167 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-       <classpathentry kind="src" path="src/app"/>
-       <classpathentry kind="src" path="src/fileservice"/>
-       <classpathentry kind="src" path="src/roomservice"/>
-       <classpathentry kind="src" path="src/templates"/>
-       <classpathentry kind="src" path="src/test"/>
-       <classpathentry kind="src" path="src/userservice"/>
-       <classpathentry kind="src" path="WebContent/WEB-INF"/>
-       <classpathentry excluding="*" including="META-INF/" kind="src" 
path="src"/>
-       <classpathentry kind="src" path="src/dtdgenerator"/>
-       <classpathentry kind="src" path="src/docgenerator"/>
-       <classpathentry kind="src" path="src/calendarservice"/>
-       <classpathentry kind="src" path="src/red5-screenshare"/>
-       <classpathentry exported="true" kind="con" 
path="org.eclipse.jst.j2ee.internal.web.container"/>
-       <classpathentry exported="true" kind="con" 
path="org.eclipse.jst.j2ee.internal.module.container"/>
-       <classpathentry exported="true" kind="con" 
path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4">
-               <attributes>
-                       <attribute 
name="org.eclipse.jst.component.nondependency" value=""/>
-               </attributes>
-       </classpathentry>
-       <classpathentry exported="true" kind="con" 
path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-       <classpathentry kind="lib" path="lib/java_16_tools.jar"/>
-       <classpathentry kind="lib" path="lib/multipartrequest.jar"/>
-       <classpathentry kind="lib" path="lib/junit/junit-4.9.jar"/>
-       <classpathentry kind="lib" 
path="lib/junit/org.springframework.test-3.0.6.RELEASE.jar"/>
-       <classpathentry kind="lib" path="lib/om/activation-jar-1.1.jar"/>
-       <classpathentry kind="lib" path="lib/om/axiom-api-bundle-1.2.12.jar"/>
-       <classpathentry kind="lib" path="lib/om/axiom-dom-bundle-1.2.12.jar"/>
-       <classpathentry kind="lib" path="lib/om/axiom-impl-bundle-1.2.12.jar"/>
-       <classpathentry kind="lib" path="lib/om/axis2-1.6.1.jar"/>
-       <classpathentry kind="lib" path="lib/om/axis2-jaxws-jar-1.6.1.jar"/>
-       <classpathentry kind="lib" path="lib/om/axis2-kernel-jar-1.6.1.jar"/>
-       <classpathentry kind="lib" path="lib/om/axis2-metadata-jar-1.6.1.jar"/>
-       <classpathentry kind="lib" path="lib/om/axis2-mex-jar-1.2.jar"/>
-       <classpathentry kind="lib" path="lib/om/axis2-saaj-jar-1.6.1.jar"/>
-       <classpathentry kind="lib" 
path="lib/om/axis2-transport-http-bundle-1.6.1.jar"/>
-       <classpathentry kind="lib" 
path="lib/om/axis2-transport-local-bundle-1.6.1.jar"/>
-       <classpathentry kind="lib" path="lib/om/batik-anim-1.7.jar"/>
-       <classpathentry kind="lib" path="lib/om/batik-awt-util-1.7.jar"/>
-       <classpathentry kind="lib" path="lib/om/batik-bridge-1.7.jar"/>
-       <classpathentry kind="lib" path="lib/om/batik-codec-1.7.jar"/>
-       <classpathentry kind="lib" path="lib/om/batik-css-1.7.jar"/>
-       <classpathentry kind="lib" path="lib/om/batik-dom-1.7.jar"/>
-       <classpathentry kind="lib" path="lib/om/batik-ext-1.7.jar"/>
-       <classpathentry kind="lib" path="lib/om/batik-extension-1.7.jar"/>
-       <classpathentry kind="lib" path="lib/om/batik-gui-util-1.7.jar"/>
-       <classpathentry kind="lib" path="lib/om/batik-gvt-1.7.jar"/>
-       <classpathentry kind="lib" path="lib/om/batik-parser-1.7.jar"/>
-       <classpathentry kind="lib" path="lib/om/batik-rasterizer-1.7.jar"/>
-       <classpathentry kind="lib" path="lib/om/batik-script-1.7.jar"/>
-       <classpathentry kind="lib" path="lib/om/batik-slideshow-1.7.jar"/>
-       <classpathentry kind="lib" path="lib/om/batik-squiggle-1.7.jar"/>
-       <classpathentry kind="lib" path="lib/om/batik-svg-dom-1.7.jar"/>
-       <classpathentry kind="lib" path="lib/om/batik-svggen-1.7.jar"/>
-       <classpathentry kind="lib" path="lib/om/batik-svgpp-1.7.jar"/>
-       <classpathentry kind="lib" path="lib/om/batik-swing-1.7.jar"/>
-       <classpathentry kind="lib" path="lib/om/batik-transcoder-1.7.jar"/>
-       <classpathentry kind="lib" path="lib/om/batik-ttf2svg-1.7.jar"/>
-       <classpathentry kind="lib" path="lib/om/batik-util-1.7.jar"/>
-       <classpathentry kind="lib" path="lib/om/batik-xml-1.7.jar"/>
-       <classpathentry kind="lib" path="lib/om/commons-codec-jar-1.3.jar"/>
-       <classpathentry kind="lib" path="lib/om/commons-dbcp-1.4.jar"/>
-       <classpathentry kind="lib" path="lib/om/commons-digester-2.1.jar"/>
-       <classpathentry kind="lib" 
path="lib/om/commons-fileupload-jar-1.2.jar"/>
-       <classpathentry kind="lib" 
path="lib/om/commons-httpclient-jar-3.1.jar"/>
-       <classpathentry kind="lib" path="lib/om/commons-io-jar-1.4.jar"/>
-       <classpathentry kind="lib" path="lib/om/commons-lang-2.6.jar"/>
-       <classpathentry kind="lib" path="lib/om/commons-logging-jar-1.1.1.jar"/>
-       <classpathentry kind="lib" path="lib/om/commons-transaction-1.2.jar"/>
-       <classpathentry kind="lib" path="lib/om/derby-10.8.2.2.jar"/>
-       <classpathentry kind="lib" path="lib/om/derbyclient-10.8.2.2.jar"/>
-       <classpathentry kind="lib" path="lib/om/dom4j-1.6.1.jar"/>
-       <classpathentry kind="lib" path="lib/om/fop-1.0.jar"/>
-       <classpathentry kind="lib" 
path="lib/om/geronimo-activation_1.1_spec-jar-1.0.2.jar"/>
-       <classpathentry kind="lib" 
path="lib/om/geronimo-annotation_1.0_spec-jar-1.1.jar"/>
-       <classpathentry kind="lib" 
path="lib/om/geronimo-javamail_1.4_spec-bundle-1.6.jar"/>
-       <classpathentry kind="lib" 
path="lib/om/geronimo-jaxws_2.2_spec-bundle-1.0.jar"/>
-       <classpathentry kind="lib" 
path="lib/om/geronimo-jta_1.1_spec-jar-1.1.jar"/>
-       <classpathentry kind="lib" 
path="lib/om/geronimo-saaj_1.3_spec-jar-1.0.1.jar"/>
-       <classpathentry kind="lib" 
path="lib/om/geronimo-stax-api_1.0_spec-bundle-1.0.1.jar"/>
-       <classpathentry kind="lib" 
path="lib/om/geronimo-ws-metadata_2.0_spec-jar-1.1.2.jar"/>
-       <classpathentry kind="lib" path="lib/om/httpcore-jar-4.0.jar"/>
-       <classpathentry kind="lib" path="lib/om/ical4j-bundle-1.0.3.jar"/>
-       <classpathentry kind="lib" path="lib/om/jaxb-api-jar-2.1.jar"/>
-       <classpathentry kind="lib" path="lib/om/jaxb-impl-jar-2.1.7.jar"/>
-       <classpathentry kind="lib" path="lib/om/jaxb-xjc-jar-2.1.7.jar"/>
-       <classpathentry kind="lib" path="lib/om/jaxen-jar-1.1.1.jar"/>
-       <classpathentry kind="lib" path="lib/om/jaxws-tools-jar-2.1.3.jar"/>
-       <classpathentry kind="lib" path="lib/om/jsr311-api-jar-1.0.jar"/>
-       <classpathentry kind="lib" 
path="lib/om/mysql-connector-java-5.1.9.jar"/>
-       <classpathentry kind="lib" path="lib/om/neethi-bundle-3.0.1.jar"/>
-       <classpathentry kind="lib" path="lib/om/openjpa-bundle-2.2.0.jar"/>
-       <classpathentry kind="lib" path="lib/om/postgresql-9.1-901.jdbc4.jar"/>
-       <classpathentry kind="lib" path="lib/om/serp-1.13.1.jar"/>
-       <classpathentry kind="lib" path="lib/om/stax-api-jar-1.0-2.jar"/>
-       <classpathentry kind="lib" path="lib/om/velocity-1.7.jar"/>
-       <classpathentry kind="lib" path="lib/om/velocity-tools-2.0.jar"/>
-       <classpathentry kind="lib" path="lib/om/woden-api-jar-1.0M9.jar"/>
-       <classpathentry kind="lib" 
path="lib/om/woden-impl-commons-jar-1.0M9.jar"/>
-       <classpathentry kind="lib" path="lib/om/woden-impl-dom-jar-1.0M9.jar"/>
-       <classpathentry kind="lib" path="lib/om/ws-commons-util-1.0.2.jar"/>
-       <classpathentry kind="lib" path="lib/om/wsdl4j-jar-1.6.2.jar"/>
-       <classpathentry kind="lib" path="lib/om/wstx-asl-jar-3.2.9.jar"/>
-       <classpathentry kind="lib" path="lib/om/xalan-jar-2.7.0.jar"/>
-       <classpathentry kind="lib" path="lib/om/xml-apis-ext-1.3.04.jar"/>
-       <classpathentry kind="lib" path="lib/om/xml-resolver-jar-1.2.jar"/>
-       <classpathentry kind="lib" path="lib/om/xmlgraphics-commons-1.4.jar"/>
-       <classpathentry kind="lib" path="lib/om/xmlrpc-client-3.1.3.jar"/>
-       <classpathentry kind="lib" path="lib/om/xmlrpc-common-3.1.3.jar"/>
-       <classpathentry kind="lib" path="lib/om/XmlSchema-bundle-1.4.7.jar"/>
-       <classpathentry kind="lib" path="lib/om/xpp3-1.1.4c.jar"/>
-       <classpathentry kind="lib" path="lib/om/xstream-1.4.2.jar"/>
-       <classpathentry kind="lib" path="lib/red5/bcprov-jdk16-145.jar"/>
-       <classpathentry kind="lib" path="lib/red5/cglib-2.2.2.jar"/>
-       <classpathentry kind="lib" 
path="lib/red5/com.springsource.javax.xml.stream-1.0.1.jar"/>
-       <classpathentry kind="lib" 
path="lib/red5/com.springsource.org.antlr-3.1.3.jar"/>
-       <classpathentry kind="lib" 
path="lib/red5/com.springsource.org.aopalliance-1.0.0.jar"/>
-       <classpathentry kind="lib" 
path="lib/red5/com.springsource.org.apache.xerces-2.9.1.jar"/>
-       <classpathentry kind="lib" 
path="lib/red5/com.springsource.org.codehaus.groovy-1.7.0.jar"/>
-       <classpathentry kind="lib" 
path="lib/red5/com.springsource.org.mozilla.javascript-1.7.0.R2.jar"/>
-       <classpathentry kind="lib" 
path="lib/red5/com.springsource.org.objectweb.asm-3.2.0.jar"/>
-       <classpathentry kind="lib" 
path="lib/red5/com.springsource.org.objectweb.asm.commons-3.2.0.jar"/>
-       <classpathentry kind="lib" 
path="lib/red5/com.springsource.slf4j.api-1.6.1.jar"/>
-       <classpathentry kind="lib" 
path="lib/red5/com.springsource.slf4j.bridge-1.6.1.jar"/>
-       <classpathentry kind="lib" path="lib/red5/commons-beanutils-1.8.3.jar"/>
-       <classpathentry kind="lib" path="lib/red5/commons-codec-1.6.jar"/>
-       <classpathentry kind="lib" 
path="lib/red5/commons-collections-3.2.1.jar"/>
-       <classpathentry kind="lib" path="lib/red5/commons-lang3-3.1.jar"/>
-       <classpathentry kind="lib" path="lib/red5/commons-modeler-2.0.1.jar"/>
-       <classpathentry kind="lib" path="lib/red5/commons-pool-1.5.6.jar"/>
-       <classpathentry kind="lib" path="lib/red5/ehcache-core-2.5.0.jar"/>
-       <classpathentry kind="lib" 
path="lib/red5/geronimo-jpa_2.0_spec-bundle-1.1.jar"/>
-       <classpathentry kind="lib" 
path="lib/red5/geronimo-jpa_2.0_spec-javadoc-1.1.jar"/>
-       <classpathentry kind="lib" 
path="lib/red5/geronimo-jpa_2.0_spec-source-1.1.jar"/>
-       <classpathentry kind="lib" path="lib/red5/httpclient-4.1.2.jar"/>
-       <classpathentry kind="lib" path="lib/red5/httpcore-4.1.3.jar"/>
-       <classpathentry kind="lib" 
path="lib/red5/jaudiotagger-2.0.4-SNAPSHOT.jar"/>
-       <classpathentry kind="lib" path="lib/red5/javaee-api-5.1.2.om.jar"/>
-       <classpathentry kind="lib" path="lib/red5/jcl-over-slf4j-1.6.1.jar"/>
-       <classpathentry kind="lib" path="lib/red5/jruby-complete-1.1.6.jar"/>
-       <classpathentry kind="lib" path="lib/red5/jul-to-slf4j-1.6.1.jar"/>
-       <classpathentry kind="lib" path="lib/red5/jython-2.5.jar"/>
-       <classpathentry kind="lib" path="lib/red5/log4j-over-slf4j-1.6.1.jar"/>
-       <classpathentry kind="lib" path="lib/red5/logback-classic-0.9.28.jar"/>
-       <classpathentry kind="lib" path="lib/red5/logback-core-0.9.28.jar"/>
-       <classpathentry kind="lib" path="lib/red5/mina-core-2.0.4.jar"/>
-       <classpathentry kind="lib" 
path="lib/red5/mina-integration-beans-2.0.4.jar"/>
-       <classpathentry kind="lib" 
path="lib/red5/mina-integration-jmx-2.0.4.jar"/>
-       <classpathentry kind="lib" 
path="lib/red5/org.springframework.aop-3.0.6.RELEASE.jar"/>
-       <classpathentry kind="lib" 
path="lib/red5/org.springframework.asm-3.0.6.RELEASE.jar"/>
-       <classpathentry kind="lib" 
path="lib/red5/org.springframework.aspects-3.0.6.RELEASE.jar"/>
-       <classpathentry kind="lib" 
path="lib/red5/org.springframework.beans-3.0.6.RELEASE.jar"/>
-       <classpathentry kind="lib" 
path="lib/red5/org.springframework.context-3.0.6.RELEASE.jar"/>
-       <classpathentry kind="lib" 
path="lib/red5/org.springframework.core-3.0.6.RELEASE.jar"/>
-       <classpathentry kind="lib" 
path="lib/red5/org.springframework.expression-3.0.6.RELEASE.jar"/>
-       <classpathentry kind="lib" 
path="lib/red5/org.springframework.jdbc-3.0.6.RELEASE.jar"/>
-       <classpathentry kind="lib" 
path="lib/red5/org.springframework.orm-3.0.6.RELEASE.jar"/>
-       <classpathentry kind="lib" 
path="lib/red5/org.springframework.transaction-3.0.6.RELEASE.jar"/>
-       <classpathentry kind="lib" 
path="lib/red5/org.springframework.web-3.0.6.RELEASE.jar"/>
-       <classpathentry kind="lib" 
path="lib/red5/org.springframework.web.servlet-3.0.6.RELEASE.jar"/>
-       <classpathentry kind="lib" path="lib/red5/quartz-1.8.5.jar"/>
-       <classpathentry kind="lib" 
path="lib/red5/spring-context-support-3.0.6.RELEASE.jar"/>
-       <classpathentry kind="lib" path="lib/red5/xmlrpc-2.0.1.jar"/>
-       <classpathentry kind="lib" path="red5-1.0.0-r4315/dist/red5.jar"/>
-       <classpathentry kind="lib" path="lib/om/servlet-api-jar-2.5.jar"/>
-       <classpathentry kind="lib" path="lib/dtd-generator/trang-20091111.jar"/>
-       <classpathentry kind="output" path="build/classes"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+       <classpathentry kind="src" path="src/app"/>
+       <classpathentry kind="src" path="src/fileservice"/>
+       <classpathentry kind="src" path="src/roomservice"/>
+       <classpathentry kind="src" path="src/templates"/>
+       <classpathentry kind="src" path="src/test"/>
+       <classpathentry kind="src" path="src/userservice"/>
+       <classpathentry kind="src" path="WebContent/WEB-INF"/>
+       <classpathentry excluding="*" including="META-INF/" kind="src" 
path="src"/>
+       <classpathentry kind="src" path="src/dtdgenerator"/>
+       <classpathentry kind="src" path="src/docgenerator"/>
+       <classpathentry kind="src" path="src/calendarservice"/>
+       <classpathentry kind="src" path="src/red5-screenshare"/>
+       <classpathentry exported="true" kind="con" 
path="org.eclipse.jst.j2ee.internal.web.container"/>
+       <classpathentry exported="true" kind="con" 
path="org.eclipse.jst.j2ee.internal.module.container"/>
+       <classpathentry exported="true" kind="con" 
path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4">
+               <attributes>
+                       <attribute 
name="org.eclipse.jst.component.nondependency" value=""/>
+               </attributes>
+       </classpathentry>
+       <classpathentry exported="true" kind="con" 
path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+       <classpathentry kind="lib" path="lib/java_16_tools.jar"/>
+       <classpathentry kind="lib" path="lib/multipartrequest.jar"/>
+       <classpathentry kind="lib" path="lib/junit/junit-4.9.jar"/>
+       <classpathentry kind="lib" 
path="lib/junit/org.springframework.test-3.0.6.RELEASE.jar"/>
+       <classpathentry kind="lib" path="lib/om/activation-jar-1.1.jar"/>
+       <classpathentry kind="lib" path="lib/om/axiom-api-bundle-1.2.12.jar"/>
+       <classpathentry kind="lib" path="lib/om/axiom-dom-bundle-1.2.12.jar"/>
+       <classpathentry kind="lib" path="lib/om/axiom-impl-bundle-1.2.12.jar"/>
+       <classpathentry kind="lib" path="lib/om/axis2-1.6.1.jar"/>
+       <classpathentry kind="lib" path="lib/om/axis2-jaxws-jar-1.6.1.jar"/>
+       <classpathentry kind="lib" path="lib/om/axis2-kernel-jar-1.6.1.jar"/>
+       <classpathentry kind="lib" path="lib/om/axis2-metadata-jar-1.6.1.jar"/>
+       <classpathentry kind="lib" path="lib/om/axis2-mex-jar-1.2.jar"/>
+       <classpathentry kind="lib" path="lib/om/axis2-saaj-jar-1.6.1.jar"/>
+       <classpathentry kind="lib" 
path="lib/om/axis2-transport-http-bundle-1.6.1.jar"/>
+       <classpathentry kind="lib" 
path="lib/om/axis2-transport-local-bundle-1.6.1.jar"/>
+       <classpathentry kind="lib" path="lib/om/batik-anim-1.7.jar"/>
+       <classpathentry kind="lib" path="lib/om/batik-awt-util-1.7.jar"/>
+       <classpathentry kind="lib" path="lib/om/batik-bridge-1.7.jar"/>
+       <classpathentry kind="lib" path="lib/om/batik-codec-1.7.jar"/>
+       <classpathentry kind="lib" path="lib/om/batik-css-1.7.jar"/>
+       <classpathentry kind="lib" path="lib/om/batik-dom-1.7.jar"/>
+       <classpathentry kind="lib" path="lib/om/batik-ext-1.7.jar"/>
+       <classpathentry kind="lib" path="lib/om/batik-extension-1.7.jar"/>
+       <classpathentry kind="lib" path="lib/om/batik-gui-util-1.7.jar"/>
+       <classpathentry kind="lib" path="lib/om/batik-gvt-1.7.jar"/>
+       <classpathentry kind="lib" path="lib/om/batik-parser-1.7.jar"/>
+       <classpathentry kind="lib" path="lib/om/batik-rasterizer-1.7.jar"/>
+       <classpathentry kind="lib" path="lib/om/batik-script-1.7.jar"/>
+       <classpathentry kind="lib" path="lib/om/batik-slideshow-1.7.jar"/>
+       <classpathentry kind="lib" path="lib/om/batik-squiggle-1.7.jar"/>
+       <classpathentry kind="lib" path="lib/om/batik-svg-dom-1.7.jar"/>
+       <classpathentry kind="lib" path="lib/om/batik-svggen-1.7.jar"/>
+       <classpathentry kind="lib" path="lib/om/batik-svgpp-1.7.jar"/>
+       <classpathentry kind="lib" path="lib/om/batik-swing-1.7.jar"/>
+       <classpathentry kind="lib" path="lib/om/batik-transcoder-1.7.jar"/>
+       <classpathentry kind="lib" path="lib/om/batik-ttf2svg-1.7.jar"/>
+       <classpathentry kind="lib" path="lib/om/batik-util-1.7.jar"/>
+       <classpathentry kind="lib" path="lib/om/batik-xml-1.7.jar"/>
+       <classpathentry kind="lib" path="lib/om/commons-codec-jar-1.3.jar"/>
+       <classpathentry kind="lib" path="lib/om/commons-dbcp-1.4.jar"/>
+       <classpathentry kind="lib" path="lib/om/commons-digester-2.1.jar"/>
+       <classpathentry kind="lib" 
path="lib/om/commons-fileupload-jar-1.2.jar"/>
+       <classpathentry kind="lib" 
path="lib/om/commons-httpclient-jar-3.1.jar"/>
+       <classpathentry kind="lib" path="lib/om/commons-io-jar-1.4.jar"/>
+       <classpathentry kind="lib" path="lib/om/commons-lang-2.6.jar"/>
+       <classpathentry kind="lib" path="lib/om/commons-logging-jar-1.1.1.jar"/>
+       <classpathentry kind="lib" path="lib/om/commons-transaction-1.2.jar"/>
+       <classpathentry kind="lib" path="lib/om/derby-10.8.2.2.jar"/>
+       <classpathentry kind="lib" path="lib/om/derbyclient-10.8.2.2.jar"/>
+       <classpathentry kind="lib" path="lib/om/dom4j-1.6.1.jar"/>
+       <classpathentry kind="lib" path="lib/om/fop-1.0.jar"/>
+       <classpathentry kind="lib" 
path="lib/om/geronimo-activation_1.1_spec-jar-1.0.2.jar"/>
+       <classpathentry kind="lib" 
path="lib/om/geronimo-annotation_1.0_spec-jar-1.1.jar"/>
+       <classpathentry kind="lib" 
path="lib/om/geronimo-javamail_1.4_spec-bundle-1.6.jar"/>
+       <classpathentry kind="lib" 
path="lib/om/geronimo-jaxws_2.2_spec-bundle-1.0.jar"/>
+       <classpathentry kind="lib" 
path="lib/om/geronimo-jta_1.1_spec-jar-1.1.jar"/>
+       <classpathentry kind="lib" 
path="lib/om/geronimo-saaj_1.3_spec-jar-1.0.1.jar"/>
+       <classpathentry kind="lib" 
path="lib/om/geronimo-stax-api_1.0_spec-bundle-1.0.1.jar"/>
+       <classpathentry kind="lib" 
path="lib/om/geronimo-ws-metadata_2.0_spec-jar-1.1.2.jar"/>
+       <classpathentry kind="lib" path="lib/om/httpcore-jar-4.0.jar"/>
+       <classpathentry kind="lib" path="lib/om/ical4j-bundle-1.0.3.jar"/>
+       <classpathentry kind="lib" path="lib/om/jaxb-api-jar-2.1.jar"/>
+       <classpathentry kind="lib" path="lib/om/jaxb-impl-jar-2.1.7.jar"/>
+       <classpathentry kind="lib" path="lib/om/jaxb-xjc-jar-2.1.7.jar"/>
+       <classpathentry kind="lib" path="lib/om/jaxen-jar-1.1.1.jar"/>
+       <classpathentry kind="lib" path="lib/om/jaxws-tools-jar-2.1.3.jar"/>
+       <classpathentry kind="lib" path="lib/om/jsr311-api-jar-1.0.jar"/>
+       <classpathentry kind="lib" 
path="lib/om/mysql-connector-java-5.1.9.jar"/>
+       <classpathentry kind="lib" path="lib/om/neethi-bundle-3.0.1.jar"/>
+       <classpathentry kind="lib" path="lib/om/openjpa-bundle-2.2.0.jar"/>
+       <classpathentry kind="lib" path="lib/om/postgresql-9.1-901.jdbc4.jar"/>
+       <classpathentry kind="lib" path="lib/om/serp-1.13.1.jar"/>
+       <classpathentry kind="lib" path="lib/om/stax-api-jar-1.0-2.jar"/>
+       <classpathentry kind="lib" path="lib/om/velocity-1.7.jar"/>
+       <classpathentry kind="lib" path="lib/om/velocity-tools-2.0.jar"/>
+       <classpathentry kind="lib" path="lib/om/woden-api-jar-1.0M9.jar"/>
+       <classpathentry kind="lib" 
path="lib/om/woden-impl-commons-jar-1.0M9.jar"/>
+       <classpathentry kind="lib" path="lib/om/woden-impl-dom-jar-1.0M9.jar"/>
+       <classpathentry kind="lib" path="lib/om/ws-commons-util-1.0.2.jar"/>
+       <classpathentry kind="lib" path="lib/om/wsdl4j-jar-1.6.2.jar"/>
+       <classpathentry kind="lib" path="lib/om/wstx-asl-jar-3.2.9.jar"/>
+       <classpathentry kind="lib" path="lib/om/xalan-jar-2.7.0.jar"/>
+       <classpathentry kind="lib" path="lib/om/xml-apis-ext-1.3.04.jar"/>
+       <classpathentry kind="lib" path="lib/om/xml-resolver-jar-1.2.jar"/>
+       <classpathentry kind="lib" path="lib/om/xmlgraphics-commons-1.4.jar"/>
+       <classpathentry kind="lib" path="lib/om/xmlrpc-client-3.1.3.jar"/>
+       <classpathentry kind="lib" path="lib/om/xmlrpc-common-3.1.3.jar"/>
+       <classpathentry kind="lib" path="lib/om/XmlSchema-bundle-1.4.7.jar"/>
+       <classpathentry kind="lib" path="lib/om/xpp3-1.1.4c.jar"/>
+       <classpathentry kind="lib" path="lib/om/xstream-1.4.2.jar"/>
+       <classpathentry kind="lib" path="lib/red5/bcprov-jdk16-145.jar"/>
+       <classpathentry kind="lib" path="lib/red5/cglib-2.2.2.jar"/>
+       <classpathentry kind="lib" 
path="lib/red5/com.springsource.javax.xml.stream-1.0.1.jar"/>
+       <classpathentry kind="lib" 
path="lib/red5/com.springsource.org.antlr-3.1.3.jar"/>
+       <classpathentry kind="lib" 
path="lib/red5/com.springsource.org.aopalliance-1.0.0.jar"/>
+       <classpathentry kind="lib" 
path="lib/red5/com.springsource.org.apache.xerces-2.9.1.jar"/>
+       <classpathentry kind="lib" 
path="lib/red5/com.springsource.org.codehaus.groovy-1.7.0.jar"/>
+       <classpathentry kind="lib" 
path="lib/red5/com.springsource.org.mozilla.javascript-1.7.0.R2.jar"/>
+       <classpathentry kind="lib" 
path="lib/red5/com.springsource.org.objectweb.asm-3.2.0.jar"/>
+       <classpathentry kind="lib" 
path="lib/red5/com.springsource.org.objectweb.asm.commons-3.2.0.jar"/>
+       <classpathentry kind="lib" 
path="lib/red5/com.springsource.slf4j.api-1.6.1.jar"/>
+       <classpathentry kind="lib" 
path="lib/red5/com.springsource.slf4j.bridge-1.6.1.jar"/>
+       <classpathentry kind="lib" path="lib/red5/commons-beanutils-1.8.3.jar"/>
+       <classpathentry kind="lib" path="lib/red5/commons-codec-1.6.jar"/>
+       <classpathentry kind="lib" 
path="lib/red5/commons-collections-3.2.1.jar"/>
+       <classpathentry kind="lib" path="lib/red5/commons-lang3-3.1.jar"/>
+       <classpathentry kind="lib" path="lib/red5/commons-modeler-2.0.1.jar"/>
+       <classpathentry kind="lib" path="lib/red5/commons-pool-1.5.6.jar"/>
+       <classpathentry kind="lib" path="lib/red5/ehcache-core-2.5.0.jar"/>
+       <classpathentry kind="lib" 
path="lib/red5/geronimo-jpa_2.0_spec-bundle-1.1.jar"/>
+       <classpathentry kind="lib" path="lib/red5/httpclient-4.1.2.jar"/>
+       <classpathentry kind="lib" path="lib/red5/httpcore-4.1.3.jar"/>
+       <classpathentry kind="lib" 
path="lib/red5/jaudiotagger-2.0.4-SNAPSHOT.jar"/>
+       <classpathentry kind="lib" path="lib/red5/javaee-api-5.1.2.om.jar"/>
+       <classpathentry kind="lib" path="lib/red5/jcl-over-slf4j-1.6.1.jar"/>
+       <classpathentry kind="lib" path="lib/red5/jruby-complete-1.1.6.jar"/>
+       <classpathentry kind="lib" path="lib/red5/jul-to-slf4j-1.6.1.jar"/>
+       <classpathentry kind="lib" path="lib/red5/jython-2.5.jar"/>
+       <classpathentry kind="lib" path="lib/red5/log4j-over-slf4j-1.6.1.jar"/>
+       <classpathentry kind="lib" path="lib/red5/logback-classic-0.9.28.jar"/>
+       <classpathentry kind="lib" path="lib/red5/logback-core-0.9.28.jar"/>
+       <classpathentry kind="lib" path="lib/red5/mina-core-2.0.4.jar"/>
+       <classpathentry kind="lib" 
path="lib/red5/mina-integration-beans-2.0.4.jar"/>
+       <classpathentry kind="lib" 
path="lib/red5/mina-integration-jmx-2.0.4.jar"/>
+       <classpathentry kind="lib" 
path="lib/red5/org.springframework.aop-3.0.6.RELEASE.jar"/>
+       <classpathentry kind="lib" 
path="lib/red5/org.springframework.asm-3.0.6.RELEASE.jar"/>
+       <classpathentry kind="lib" 
path="lib/red5/org.springframework.aspects-3.0.6.RELEASE.jar"/>
+       <classpathentry kind="lib" 
path="lib/red5/org.springframework.beans-3.0.6.RELEASE.jar"/>
+       <classpathentry kind="lib" 
path="lib/red5/org.springframework.context-3.0.6.RELEASE.jar"/>
+       <classpathentry kind="lib" 
path="lib/red5/org.springframework.core-3.0.6.RELEASE.jar"/>
+       <classpathentry kind="lib" 
path="lib/red5/org.springframework.expression-3.0.6.RELEASE.jar"/>
+       <classpathentry kind="lib" 
path="lib/red5/org.springframework.jdbc-3.0.6.RELEASE.jar"/>
+       <classpathentry kind="lib" 
path="lib/red5/org.springframework.orm-3.0.6.RELEASE.jar"/>
+       <classpathentry kind="lib" 
path="lib/red5/org.springframework.transaction-3.0.6.RELEASE.jar"/>
+       <classpathentry kind="lib" 
path="lib/red5/org.springframework.web-3.0.6.RELEASE.jar"/>
+       <classpathentry kind="lib" 
path="lib/red5/org.springframework.web.servlet-3.0.6.RELEASE.jar"/>
+       <classpathentry kind="lib" path="lib/red5/quartz-1.8.5.jar"/>
+       <classpathentry kind="lib" 
path="lib/red5/spring-context-support-3.0.6.RELEASE.jar"/>
+       <classpathentry kind="lib" path="lib/red5/xmlrpc-2.0.1.jar"/>
+       <classpathentry kind="lib" path="red5-1.0.0-r4315/dist/red5.jar"/>
+       <classpathentry kind="lib" path="lib/om/servlet-api-jar-2.5.jar"/>
+       <classpathentry kind="lib" path="lib/dtd-generator/trang-20091111.jar"/>
+       <classpathentry kind="output" path="build/classes"/>
+</classpath>

Modified: incubator/openmeetings/trunk/singlewebapp/build.xml
URL: 
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/build.xml?rev=1296349&r1=1296348&r2=1296349&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/build.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/build.xml Fri Mar  2 17:43:19 2012
@@ -520,11 +520,14 @@
                <echo message="Enhancing complete." />
        </target>
 
+       <path id="svntask.classpath">
+               <fileset dir="${svntask.lib.dir}" includes="*.jar" />
+               <fileset dir="${project.lib}" includes="svn*.jar" />
+       </path>
        <target name="current_revision" depends="-retrieve-svntask">
                <typedef resource="org/tigris/subversion/svnant/svnantlib.xml">
                        <classpath>
-                               <fileset dir="${svntask.lib.dir}" 
includes="*.jar" />
-                               <fileset dir="${project.lib}" 
includes="svn*.jar" />
+                               <path refid="svntask.classpath" />
                        </classpath>
                </typedef>
 
@@ -538,12 +541,15 @@
        <!-- Build entire project -->
        <target name="build project" depends="clean, prepare, compile" />
 
+       <path id="rat.classpath">
+               <fileset dir="${rat.lib.dir}" includes="*.jar" />
+               <path refid="compile.classpath" />
+       </path>
        <target name="report_rat" depends="-retrieve-rat">
                <!-- define the RAT task -->
                <taskdef uri="antlib:org.apache.rat.anttasks" 
resource="org/apache/rat/anttasks/antlib.xml">
                        <classpath>
-                               <fileset dir="${rat.lib.dir}" includes="*.jar" 
/>
-                               <path refid="compile.classpath" />
+                               <path refid="rat.classpath" />
                        </classpath>
                </taskdef>
 
@@ -593,9 +599,9 @@
                        </classpath>
        </taskdef>
        
-
-               <anakia basedir="${docs.src}" destdir="${docs.dest}/" 
extension=".html" style="./site.vsl" projectFile="stylesheets/project.xml" 
excludes="**/stylesheets/** empty.xml" includes="**/*.xml" 
lastModifiedCheck="true" templatePath="xdocs/stylesheets">
-               </anakia>
+               <anakia basedir="${docs.src}" destdir="${docs.dest}/" 
extension=".html" 
+                       style="./site.vsl" 
projectFile="stylesheets/project.xml" excludes="**/stylesheets/** empty.xml" 
+                       includes="**/*.xml" lastModifiedCheck="true" 
templatePath="xdocs/stylesheets" />
     </target>
 
        <target name="build.only.webservice.doc" depends="anakia">
@@ -726,10 +732,8 @@
                classpath="${project.lib}/${ivy.jar}"/>
        <property name="ivy.lib.dir" value="${project.lib}"/>
 
-       <!-- !!!!!!!!!! FIXME !!!!!!!! Check for the main libraries -->
-
        <!-- Build Targets -->
-       <target name="-java6.check">
+       <target name="-java6.check" unless="java6.installed" >
                <condition property="java6.installed" value="true">
                        <and>
                        <equals arg1="${java.specification.version}" 
arg2="1.6"/>
@@ -775,6 +779,7 @@
        </target>
        
        <!-- Check for the Red5 libraries -->
+       <available classpathref="compile.classpath" 
classname="javax.persistence.spi.PersistenceProvider" 
property="red5.installed"/>
        <target name="-retrieve-red5" unless="red5.installed" 
description="Retrieves the libraries if needed" depends="prepare.mkdir">
                <!-- Ivy configuration - 
http://ant.apache.org/ivy/history/trunk/ant.html -->
                <antcall target="-retrieve" inheritAll="true" 
inheritRefs="true">
@@ -790,12 +795,13 @@
                        <param name="ivy.lib.pattern" 
value="[artifact]-[type]-[revision].[ext]"/>
                </antcall>
                <delete>
-                       <fileset dir="${om.lib.dir}" includes="*-source*.jar"/>
-                       <fileset dir="${om.lib.dir}" includes="*-javadoc*.jar"/>
+                       <fileset dir="${red5.lib.dir}" 
includes="*-source*.jar"/>
+                       <fileset dir="${red5.lib.dir}" 
includes="*-javadoc*.jar"/>
                </delete>
                <delete file="${red5.lib.dir}/javaee-api-5.1.2.jar" />
        </target>
        <!-- Check for the Red5 libraries -->
+       <available classpathref="compile.classpath" 
classname="org.apache.axis2.Version" property="om.installed"/>
        <target name="-retrieve-om" unless="om.installed" 
description="Retrieves the libraries if needed" depends="prepare.mkdir">
                <antcall target="-retrieve" inheritAll="true" 
inheritRefs="true">
                        <param name="ivy.conf.name" value="openmeetings"/>
@@ -817,14 +823,16 @@
                        <fileset dir="${om.lib.dir}" includes="*-javadoc*.jar"/>
                </delete>
        </target>
-       <!-- Check for the Red5 libraries -->
-       <target name="-retrieve-anakia" unless="anakia.installed" 
description="Retrieves the libraries if needed" depends="prepare.mkdir">
+       <!-- Check for the Anakia libraries -->
+       <available classpathref="anakia.classpath" 
classname="org.apache.oro.text.GlobCompiler" property="anakia.installed"/>
+       <target name="-retrieve-anakia" unless="anakia.installed" 
description="Retrieves the libraries if needed" depends="-retrieve-red5">
                <antcall target="-retrieve" inheritAll="true" 
inheritRefs="true">
                        <param name="ivy.conf.name" value="anakia"/>
                        <param name="ivy.lib.location" 
value="${anakia.lib.dir}"/>
                </antcall>
        </target>
        <!-- Check for junit libraries -->
+       <available classpathref="compile.classpath" classname="org.junit.Test" 
property="junit.installed"/>
        <target name="-retrieve-junit" unless="junit.installed" 
description="Retrieves the libraries if needed" depends="prepare.mkdir">
                <antcall target="-retrieve" inheritAll="true" 
inheritRefs="true">
                        <param name="ivy.conf.name" value="junit"/>
@@ -832,6 +840,7 @@
                </antcall>
        </target>
        <!-- Check for rat libraries -->
+       <available classpathref="rat.classpath" 
classname="org.apache.rat.Report" property="rat.installed"/>
        <target name="-retrieve-rat" unless="rat.installed" 
description="Retrieves the libraries if needed" depends="prepare.mkdir">
                <antcall target="-retrieve" inheritAll="true" 
inheritRefs="true">
                        <param name="ivy.conf.name" value="rat"/>
@@ -839,6 +848,8 @@
                </antcall>
        </target>
        <!-- Check for dtd-generator libraries -->
+       <path id="dtd-generator.classpath" 
location="${dtd-generator.lib.dir}/*.jar"/>
+       <available classpathref="dtd-generator.classpath" 
classname="org.relaxng.datatype.Datatype" property="dtd-generator.installed"/>
        <target name="-retrieve-dtd-generator" unless="dtd-generator.installed" 
description="Retrieves the libraries if needed" depends="prepare.mkdir">
                <antcall target="-retrieve" inheritAll="true" 
inheritRefs="true">
                        <param name="ivy.conf.name" value="dtd"/>
@@ -846,6 +857,7 @@
                </antcall>
        </target>
        <!-- Check for svntask libraries -->
+       <available classpathref="svntask.classpath" 
classname="org.tmatesoft.svn.core.SVNCommitInfo" property="svntask.installed"/>
        <target name="-retrieve-svntask" unless="svntask.installed" 
description="Retrieves the libraries if needed" depends="prepare.mkdir">
                <antcall target="-retrieve" inheritAll="true" 
inheritRefs="true">
                        <param name="ivy.conf.name" value="svntask"/>
@@ -853,10 +865,19 @@
                        <param name="ivy.transitive" value="true" />
                </antcall>
        </target>
+       <!-- Check for JDK 1.6 tools.jar libraries -->
+       <target name="-retrieve-tools.jar" unless="tools.jar.installed" 
description="Retrieves the libraries if needed">
+               <available file="${java.home}/Classes/classes.jar" type="file" 
property="tools.jar.path" value="${java.home}/Classes/classes.jar" />
+               <available file="${java.home}/../Classes/classes.jar" 
type="file" property="tools.jar.path" 
value="${java.home}/../Classes/classes.jar" />
+               <available file="${java.home}/lib/tools.jar" type="file" 
property="tools.jar.path" value="${java.home}/lib/tools.jar" />
+               <available file="${java.home}/../lib/tools.jar" type="file" 
property="tools.jar.path" value="${java.home}/../lib/tools.jar" />
+               <available file="${tools.jar.path}" type="file" 
property="tools.jar.installed" />
+               
+               <copy file="${tools.jar.path}" 
tofile="${project.lib}/java_16_tools.jar" />
+       </target>
 
        <target name="ivyclear" description="Clears out the Ivy cache">
                <delete dir="${user.home}/.ivy2/cache/red5"/>
-               <!-- <delete dir="${user.home}/.ivy2/cache/openmeetings"/>FIXME 
!!!!! do we need this? should it be red5 ???? -->
                <delete includeemptydirs="true">
                        <fileset dir="${project.lib}" excludes="*.jar"/>
                </delete>
@@ -864,10 +885,10 @@
        </target>
 
        <target name="prepare-eclipse" if="java6.installed" description="Build 
server core" depends="-java6.check">
-               <!-- FIXME need to move -->
                <antcall target="-retrieve-red5" inheritAll="true" 
inheritRefs="true"/>
                <antcall target="-retrieve-om" inheritAll="true" 
inheritRefs="true"/>
                <antcall target="-retrieve-junit" inheritAll="true" 
inheritRefs="true"/>
                <antcall target="-retrieve-dtd-generator" inheritAll="true" 
inheritRefs="true"/>
+               <antcall target="-retrieve-tools.jar" inheritAll="true" 
inheritRefs="true"/>
        </target>
 </project>

Modified: incubator/openmeetings/trunk/singlewebapp/ivy.xml
URL: 
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/ivy.xml?rev=1296349&r1=1296348&r2=1296349&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/ivy.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/ivy.xml Fri Mar  2 17:43:19 2012
@@ -121,12 +121,12 @@
                        rev="3.0.6.RELEASE" />
                <!-- Crypto -->
                <dependency name="bcprov-jdk16" rev="145" conf="red5->*" />
-               <dependency org="org.apache.geronimo.specs" 
name="geronimo-jpa_2.0_spec"
-                       rev="1.1" conf="red5.ext->*" transitive="false">
-                       <!-- include type="bundle" / FIXME unable to get 
openjpa without  sources -->
-               </dependency>
                <!-- MP3 -->
                <dependency name="jaudiotagger" rev="2.0.4-SNAPSHOT" />
+
+               <!-- include type="bundle" / FIXME unable to get openjpa 
without  sources -->
+               <dependency org="org.apache.geronimo.specs" 
name="geronimo-jpa_2.0_spec"
+                       rev="1.1" conf="red5.ext->*" transitive="false"/>
                <!--  END OF RED5 -->
                
                <!--  START OF ANAKIA -->


Reply via email to