Fwd: [xwiki-commits] r1567 - xwiki/trunk
Hi Vincent, does it make sense to have the configuration files in the svn? Can't we generate them from maven? jeremi On 11/15/06, Vincent Massol <[email protected]> wrote:
Author: vmassol Date: 2006-11-15 11:00:17 +0100 (Wed, 15 Nov 2006) New Revision: 1567
Modified: xwiki/trunk/.classpath Log: Fixed Eclipse project's classpath. Some jars were modified in lib/ and the Eclipse project hasn't been modified. In addition the source dirs were not correct since the maven2 directory reorganization. It's now compiling fine. I haven't tested any web deployment though so it's likely that it won't work.
Modified: xwiki/trunk/.classpath =================================================================== --- xwiki/trunk/.classpath 2006-11-15 09:06:57 UTC (rev 1566) +++ xwiki/trunk/.classpath 2006-11-15 10:00:17 UTC (rev 1567) @@ -1,8 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry excluding="**/.svn|**/.svn/**|com/xpn/xwiki/test/MyFormAuthentication.java|com/xpn/xwiki/test/ServletAuthTest.java|com/xpn/xwiki/test/ServletVirtualTest.java|com/xpn/xwiki/test/Servleti18nTest.java" kind="src" path="src/main/java"/> - <classpathentry excluding="**/.svn|**/.svn/**" kind="src" path="src/main/web"/> <classpathentry excluding="**/.svn|**/.svn/**" kind="src" path="src/test/cactus"/> + <classpathentry kind="src" path="web/standard/src/main/webapp"/> + <classpathentry kind="src" path="core/src/main/java"/> + <classpathentry kind="src" path="core/src/test/java"/> + <classpathentry kind="src" path="core/src/main/resources"/> <classpathentry excluding="**/.svn|**/.svn/**" kind="src" path="src/test/java"/> <classpathentry exported="true" kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry exported="true" kind="lib" path="src/test/resources"/> @@ -36,7 +38,6 @@ <classpathentry exported="true" kind="lib" path="lib/commons-net-1.4.1.jar"/> <classpathentry exported="true" kind="lib" path="lib/commons-pool-1.1.jar"/> <classpathentry exported="true" kind="lib" path="lib/concurrent.jar"/> - <classpathentry exported="true" kind="lib" path="lib/derby-10.1.2.1.jar"/> <classpathentry exported="true" kind="lib" path="lib/dom4j-1.6.1.jar"/> <classpathentry exported="true" kind="lib" path="lib/ecs-1.4.2.jar"/> <classpathentry exported="true" kind="lib" path="lib/ehcache-1.1.jar"/> @@ -67,8 +68,6 @@ <classpathentry exported="true" kind="lib" path="lib/InlineJavaServer.jar"/> <classpathentry exported="true" kind="lib" path="lib/InlineJavaUser.jar"/> <classpathentry exported="true" kind="lib" path="lib/ipresolver-UNKNOWN.jar"/> - <classpathentry exported="true" kind="lib" path="lib/jackrabbit-core-1.0.1.jar"/> - <classpathentry exported="true" kind="lib" path="lib/jackrabbit-jcr-commons-1.0.1.jar"/> <classpathentry exported="true" kind="lib" path="lib/jaxrpc-1.1.jar"/> <classpathentry exported="true" kind="lib" path="lib/jcommon-1.0.5.jar"/> <classpathentry exported="true" kind="lib" path="lib/jcr-1.0.jar"/> @@ -93,7 +92,6 @@ <classpathentry exported="true" kind="lib" path="lib/org.suigeneris.jrcs.diff-0.3.0-xwiki.jar"/> <classpathentry exported="true" kind="lib" path="lib/org.suigeneris.jrcs.rcs-0.3.0-xwiki.jar"/> <classpathentry exported="true" kind="lib" path="lib/oro-2.0.8.jar"/> - <classpathentry exported="true" kind="lib" path="lib/oscache-2.3.2M.jar"/> <classpathentry exported="true" kind="lib" path="lib/picocontainer-1.1.jar"/> <classpathentry exported="true" kind="lib" path="lib/portlet-api-1.0.jar"/> <classpathentry exported="true" kind="lib" path="lib/qname-1.5.2.jar"/> @@ -121,8 +119,12 @@ <classpathentry exported="true" kind="lib" path="lib/jgroups-2.2.9.3.jar"/> <classpathentry exported="true" kind="lib" path="lib/ws-commons-util-1.0.1.jar"/> <classpathentry exported="true" kind="lib" path="lib/ws-commons-java5-1.0.1.jar"/> - <classpathentry exported="true" sourcepath="lib/xmlrpc-client-3.0-sources.jar" kind="lib" path="lib/xmlrpc-client-3.0.jar"/> - <classpathentry exported="true" sourcepath="lib/xmlrpc-common-3.0-sources.jar" kind="lib" path="lib/xmlrpc-common-3.0.jar"/> - <classpathentry exported="true" sourcepath="lib/xmlrpc-server-3.0-sources.jar" kind="lib" path="lib/xmlrpc-server-3.0.jar"/> - <classpathentry kind="output" path="build/web/WEB-INF/classes"/> + <classpathentry exported="true" kind="lib" path="lib/xmlrpc-client-3.0.jar" sourcepath="lib/xmlrpc-client-3.0-sources.jar"/> + <classpathentry exported="true" kind="lib" path="lib/xmlrpc-common-3.0.jar" sourcepath="lib/xmlrpc-common-3.0-sources.jar"/> + <classpathentry exported="true" kind="lib" path="lib/xmlrpc-server-3.0.jar" sourcepath="lib/xmlrpc-server-3.0-sources.jar"/> + <classpathentry kind="lib" path="lib/derby-10.1.3.1.jar"/> + <classpathentry kind="lib" path="lib/jackrabbit-core-1.1.jar"/> + <classpathentry kind="lib" path="lib/oscache-2.3.2-xwiki.jar"/> + <classpathentry kind="lib" path="lib/jcaptcha-all-1.0-RC3.jar"/> + <classpathentry kind="output" path="build/eclipse/web/WEB-INF/classes"/> </classpath>
-- You receive this message as a subscriber of the [email protected] mailing list. To unsubscribe: mailto:[email protected] For general help: mailto:[email protected]?subject=help ObjectWeb mailing lists service home page: http://www.objectweb.org/wws
-- jeremi -- jeremi
-----Original Message----- From: [email protected] [mailto:[email protected]] On Behalf Of jeremi joslin Sent: mercredi 15 novembre 2006 11:25 To: [email protected] Subject: [xwiki-dev] Fwd: [xwiki-commits] r1567 - xwiki/trunk
Hi Vincent, does it make sense to have the configuration files in the svn? Can't we generate them from maven?
Definitely. But right now we haven't switched to the m2 build yet so I'm simply preserving the way it used to work so far. In addition we need to find a way to share the Tomcat configs (for IDEA for ex) when we're using the m2 plugin. Last, the m2 build is not up to par with the Ant build yet (but close). Once it's ready we can take a call to remove the Ant build and these files too. Note that we also need to document the m2 build before we can abandon the Ant build (I'll do this once the m2 build is good enough to be used). Thanks -Vincent
On 11/15/06, Vincent Massol <[email protected]> wrote:
Author: vmassol Date: 2006-11-15 11:00:17 +0100 (Wed, 15 Nov 2006) New Revision: 1567
Modified: xwiki/trunk/.classpath Log: Fixed Eclipse project's classpath. Some jars were modified in lib/ and the Eclipse project hasn't been modified. In addition the source dirs were not correct since the maven2 directory reorganization. It's now compiling fine. I haven't tested any web deployment though so it's likely that it won't work.
Modified: xwiki/trunk/.classpath =================================================================== --- xwiki/trunk/.classpath 2006-11-15 09:06:57 UTC (rev 1566) +++ xwiki/trunk/.classpath 2006-11-15 10:00:17 UTC (rev 1567) @@ -1,8 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry excluding="**/.svn|**/.svn/**|com/xpn/xwiki/test/MyFormAuthentication.j ava|com/xpn/xwiki/test/ServletAuthTest.java|com/xpn/xwiki/test/ServletV irtualTest.java|com/xpn/xwiki/test/Servleti18nTest.java" kind="src" path="src/main/java"/> - <classpathentry excluding="**/.svn|**/.svn/**" kind="src" path="src/main/web"/> <classpathentry excluding="**/.svn|**/.svn/**" kind="src" path="src/test/cactus"/> + <classpathentry kind="src" path="web/standard/src/main/webapp"/> + <classpathentry kind="src" path="core/src/main/java"/> + <classpathentry kind="src" path="core/src/test/java"/> + <classpathentry kind="src" path="core/src/main/resources"/> <classpathentry excluding="**/.svn|**/.svn/**" kind="src" path="src/test/java"/> <classpathentry exported="true" kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry exported="true" kind="lib" path="src/test/resources"/> @@ -36,7 +38,6 @@ <classpathentry exported="true" kind="lib" path="lib/commons- net-1.4.1.jar"/> <classpathentry exported="true" kind="lib" path="lib/commons- pool-1.1.jar"/> <classpathentry exported="true" kind="lib" path="lib/concurrent.jar"/> - <classpathentry exported="true" kind="lib" path="lib/derby- 10.1.2.1.jar"/> <classpathentry exported="true" kind="lib" path="lib/dom4j- 1.6.1.jar"/> <classpathentry exported="true" kind="lib" path="lib/ecs- 1.4.2.jar"/> <classpathentry exported="true" kind="lib" path="lib/ehcache-1.1.jar"/> @@ -67,8 +68,6 @@ <classpathentry exported="true" kind="lib" path="lib/InlineJavaServer.jar"/> <classpathentry exported="true" kind="lib" path="lib/InlineJavaUser.jar"/> <classpathentry exported="true" kind="lib" path="lib/ipresolver-UNKNOWN.jar"/> - <classpathentry exported="true" kind="lib" path="lib/jackrabbit-core-1.0.1.jar"/> - <classpathentry exported="true" kind="lib" path="lib/jackrabbit-jcr-commons-1.0.1.jar"/> <classpathentry exported="true" kind="lib" path="lib/jaxrpc- 1.1.jar"/> <classpathentry exported="true" kind="lib" path="lib/jcommon- 1.0.5.jar"/> <classpathentry exported="true" kind="lib" path="lib/jcr-1.0.jar"/> @@ -93,7 +92,6 @@ <classpathentry exported="true" kind="lib" path="lib/org.suigeneris.jrcs.diff-0.3.0-xwiki.jar"/> <classpathentry exported="true" kind="lib" path="lib/org.suigeneris.jrcs.rcs-0.3.0-xwiki.jar"/> <classpathentry exported="true" kind="lib" path="lib/oro- 2.0.8.jar"/> - <classpathentry exported="true" kind="lib" path="lib/oscache- 2.3.2M.jar"/> <classpathentry exported="true" kind="lib" path="lib/picocontainer-1.1.jar"/> <classpathentry exported="true" kind="lib" path="lib/portlet- api-1.0.jar"/> <classpathentry exported="true" kind="lib" path="lib/qname-1.5.2.jar"/> @@ -121,8 +119,12 @@ <classpathentry exported="true" kind="lib" path="lib/jgroups- 2.2.9.3.jar"/> <classpathentry exported="true" kind="lib" path="lib/ws- commons-util-1.0.1.jar"/> <classpathentry exported="true" kind="lib" path="lib/ws- commons-java5-1.0.1.jar"/> - <classpathentry exported="true" sourcepath="lib/xmlrpc- client-3.0-sources.jar" kind="lib" path="lib/xmlrpc-client-3.0.jar"/> - <classpathentry exported="true" sourcepath="lib/xmlrpc- common-3.0-sources.jar" kind="lib" path="lib/xmlrpc-common-3.0.jar"/> - <classpathentry exported="true" sourcepath="lib/xmlrpc- server-3.0-sources.jar" kind="lib" path="lib/xmlrpc-server-3.0.jar"/> - <classpathentry kind="output" path="build/web/WEB- INF/classes"/> + <classpathentry exported="true" kind="lib" path="lib/xmlrpc- client-3.0.jar" sourcepath="lib/xmlrpc-client-3.0-sources.jar"/> + <classpathentry exported="true" kind="lib" path="lib/xmlrpc- common-3.0.jar" sourcepath="lib/xmlrpc-common-3.0-sources.jar"/> + <classpathentry exported="true" kind="lib" path="lib/xmlrpc- server-3.0.jar" sourcepath="lib/xmlrpc-server-3.0-sources.jar"/> + <classpathentry kind="lib" path="lib/derby-10.1.3.1.jar"/> + <classpathentry kind="lib" path="lib/jackrabbit-core- 1.1.jar"/> + <classpathentry kind="lib" path="lib/oscache-2.3.2- xwiki.jar"/> + <classpathentry kind="lib" path="lib/jcaptcha-all-1.0- RC3.jar"/> + <classpathentry kind="output" + path="build/eclipse/web/WEB-INF/classes"/> </classpath>
-- You receive this message as a subscriber of the xwiki- [email protected] mailing list. To unsubscribe: mailto:[email protected] For general help: mailto:[email protected]?subject=help ObjectWeb mailing lists service home page: http://www.objectweb.org/wws
-- jeremi
-- jeremi
___________________________________________________________________________ D�couvrez une nouvelle fa�on d'obtenir des r�ponses � toutes vos questions ! Profitez des connaissances, des opinions et des exp�riences des internautes sur Yahoo! Questions/R�ponses http://fr.answers.yahoo.com
participants (2)
-
jeremi joslin -
Vincent Massol