You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by sn...@apache.org on 2007/04/09 18:59:33 UTC
svn commit: r526829 - in /roller/trunk: apps/planet/build.xml build.xml
nbproject/project.xml properties.xmlf
Author: snoopdave
Date: Mon Apr 9 09:59:32 2007
New Revision: 526829
URL: http://svn.apache.org/viewvc?view=rev&rev=526829
Log:
Having Ant 1.6.2 in the test path causes problems with Ant 1.7
Modified:
roller/trunk/apps/planet/build.xml
roller/trunk/build.xml
roller/trunk/nbproject/project.xml
roller/trunk/properties.xmlf
Modified: roller/trunk/apps/planet/build.xml
URL: http://svn.apache.org/viewvc/roller/trunk/apps/planet/build.xml?view=diff&rev=526829&r1=526828&r2=526829
==============================================================================
--- roller/trunk/apps/planet/build.xml (original)
+++ roller/trunk/apps/planet/build.xml Mon Apr 9 09:59:32 2007
@@ -119,7 +119,6 @@
<fileset dir="${tools}/buildtime/mockrunner-0.35/lib">
<include name="*.jar"/>
</fileset>
- <pathelement location="${tools}/buildtime/ant-1.6.2/ant.jar"/>
<pathelement location="${tools}/buildtime/junit-3.8.1.jar"/>
<pathelement location="${tools}/buildtime/derby.jar"/>
<pathelement location="${tools}/buildtime/derbyclient.jar"/>
@@ -329,6 +328,7 @@
<classpath>
<path refid="test.path"/>
+ <pathelement location="${tools}/buildtime/ant-1.6.2/ant.jar"/>
</classpath>
</javac>
Modified: roller/trunk/build.xml
URL: http://svn.apache.org/viewvc/roller/trunk/build.xml?view=diff&rev=526829&r1=526828&r2=526829
==============================================================================
--- roller/trunk/build.xml (original)
+++ roller/trunk/build.xml Mon Apr 9 09:59:32 2007
@@ -862,6 +862,7 @@
<classpath>
<path refid="tests.path"/>
+ <pathelement location="${ro.tools}/buildtime/ant-1.6.2/ant.jar"/>
&custom-jars;
</classpath>
</javac>
Modified: roller/trunk/nbproject/project.xml
URL: http://svn.apache.org/viewvc/roller/trunk/nbproject/project.xml?view=diff&rev=526829&r1=526828&r2=526829
==============================================================================
--- roller/trunk/nbproject/project.xml (original)
+++ roller/trunk/nbproject/project.xml Mon Apr 9 09:59:32 2007
@@ -24,58 +24,62 @@
<location>src</location>
</source-folder>
<source-folder>
- <label>sandbox/standalone/src</label>
+ <label>tests</label>
<type>java</type>
- <location>sandbox/standalone/src</location>
+ <location>tests</location>
</source-folder>
<source-folder>
- <label>contrib/plugins/src</label>
+ <label>apps/planet/src/java</label>
<type>java</type>
- <location>contrib/plugins/src</location>
+ <location>apps/planet/src/java</location>
</source-folder>
<source-folder>
- <label>tests</label>
+ <label>apps/planet/test/java</label>
<type>java</type>
- <location>tests</location>
+ <location>apps/planet/test/java</location>
</source-folder>
<source-folder>
- <label>generated/web</label>
+ <label>sandbox/standalone/src</label>
<type>java</type>
- <location>build/generated/web</location>
+ <location>sandbox/standalone/src</location>
</source-folder>
<source-folder>
- <label>generated/business</label>
+ <label>sandbox/scripting/bsf/src</label>
<type>java</type>
- <location>build/generated/business</location>
+ <location>sandbox/scripting/bsf/src</location>
</source-folder>
<source-folder>
- <label>sandbox/scripting/src</label>
+ <label>sandbox/scripting/groovy/src</label>
<type>java</type>
- <location>sandbox/scripting/src</location>
+ <location>sandbox/scripting/groovy/src</location>
</source-folder>
<source-folder>
- <label>apps/planet/src/java</label>
+ <label>sandbox/scripting/jruby/src</label>
<type>java</type>
- <location>apps/planet/src/java</location>
+ <location>sandbox/scripting/jruby/src</location>
</source-folder>
<source-folder>
- <label>apps/planet/test/java</label>
+ <label>generated/web</label>
<type>java</type>
- <location>apps/planet/test/java</location>
+ <location>build/generated/web</location>
</source-folder>
<source-folder>
- <label>sandbox/jdobackend/src</label>
+ <label>generated/business</label>
<type>java</type>
- <location>sandbox/jdobackend/src</location>
+ <location>build/generated/business</location>
+ </source-folder>
+ <source-folder>
+ <label>custom/src</label>
+ <type>java</type>
+ <location>custom/src</location>
</source-folder>
</folders>
<ide-actions>
<action name="build">
- <target>build</target>
+ <target>stage-webapp</target>
</action>
<action name="clean">
- <target>clean</target>
- <target>all</target>
+ <target>rebuild</target>
</action>
<action name="javadoc">
<target>javadoc</target>
@@ -84,9 +88,8 @@
<target>tests</target>
</action>
<action name="rebuild">
- <target>clean</target>
- <target>all</target>
- <target>build</target>
+ <target>rebuild</target>
+ <target>stage-webapp</target>
</action>
<action name="debug.single">
<target>debug-selected-files</target>
@@ -116,6 +119,19 @@
<script>nbproject/ide-targets.xml</script>
<target>debug-nb</target>
</action>
+ <action name="debug.single">
+ <script>nbproject/ide-file-targets.xml</script>
+ <target>debug-selected-file-in-tests</target>
+ <context>
+ <property>debug.class</property>
+ <folder>tests</folder>
+ <pattern>\.java$</pattern>
+ <format>java-name</format>
+ <arity>
+ <one-file-only/>
+ </arity>
+ </context>
+ </action>
</ide-actions>
<view>
<items>
@@ -128,40 +144,44 @@
<location>src</location>
</source-folder>
<source-folder style="packages">
- <label>sandbox/standalone/src</label>
- <location>sandbox/standalone/src</location>
+ <label>tests</label>
+ <location>tests</location>
</source-folder>
<source-folder style="packages">
- <label>contrib/plugins/src</label>
- <location>contrib/plugins/src</location>
+ <label>apps/planet/src/java</label>
+ <location>apps/planet/src/java</location>
</source-folder>
<source-folder style="packages">
- <label>tests</label>
- <location>tests</location>
+ <label>apps/planet/test/java</label>
+ <location>apps/planet/test/java</location>
</source-folder>
<source-folder style="packages">
- <label>generated/web</label>
- <location>build/generated/web</location>
+ <label>sandbox/standalone/src</label>
+ <location>sandbox/standalone/src</location>
</source-folder>
<source-folder style="packages">
- <label>generated/business</label>
- <location>build/generated/business</location>
+ <label>sandbox/scripting/bsf/src</label>
+ <location>sandbox/scripting/bsf/src</location>
</source-folder>
<source-folder style="packages">
- <label>sandbox/scripting/src</label>
- <location>sandbox/scripting/src</location>
+ <label>sandbox/scripting/groovy/src</label>
+ <location>sandbox/scripting/groovy/src</location>
</source-folder>
<source-folder style="packages">
- <label>apps/planet/src/java</label>
- <location>apps/planet/src/java</location>
+ <label>sandbox/scripting/jruby/src</label>
+ <location>sandbox/scripting/jruby/src</location>
</source-folder>
<source-folder style="packages">
- <label>apps/planet/test/java</label>
- <location>apps/planet/test/java</location>
+ <label>generated/web</label>
+ <location>build/generated/web</location>
+ </source-folder>
+ <source-folder style="packages">
+ <label>generated/business</label>
+ <location>build/generated/business</location>
</source-folder>
<source-folder style="packages">
- <label>sandbox/jdobackend/src</label>
- <location>sandbox/jdobackend/src</location>
+ <label>custom/src</label>
+ <location>custom/src</location>
</source-folder>
<source-file>
<location>build.xml</location>
@@ -182,15 +202,16 @@
<compilation-unit>
<package-root>src</package-root>
<package-root>sandbox/standalone/src</package-root>
- <package-root>contrib/plugins/src</package-root>
<package-root>tests</package-root>
<package-root>build/generated/web</package-root>
<package-root>build/generated/business</package-root>
- <package-root>sandbox/scripting/src</package-root>
<package-root>apps/planet/src/java</package-root>
<package-root>apps/planet/test/java</package-root>
- <package-root>sandbox/jdobackend/src</package-root>
- <classpath mode="compile">tools/buildtime/junit-3.8.1.jar:tools/lib/commons-betwixt-1.0-beta-1.jar:tools/lib/commons-httpclient-2.0.2.jar:tools/lib/concurrent-1.3.2.jar:tools/lib/ekitapplet.jar:tools/lib/jazzy-core.jar:tools/lib/log4j-1.2.4.jar:tools/lib/lucene-1.4.3.jar:tools/lib/taglibs-string.jar:tools/lib/velocity-1.4.jar:tools/lib/velocity-dep-1.4.jar:tools/lib/velocity-tools-1.1.jar:tools/lib/xmlrpc-1.2-b1.jar:tools/struts-1.2.4/lib/antlr.jar:tools/struts-1.2.4/lib/commons-beanutils.jar:tools/struts-1.2.4/lib/commons-collections.jar:tools/struts-1.2.4/lib/commons-digester.jar:tools/struts-1.2.4/lib/commons-fileupload.jar:tools/struts-1.2.4/lib/commons-lang-2.0.jar:tools/struts-1.2.4/lib/commons-logging.jar:tools/struts-1.2.4/lib/commons-validator.jar:tools/struts-1.2.4/lib/jakarta-oro.jar:tools/struts-1.2.4/lib/struts-el.jar:tools/struts-1.2.4/lib/struts.jar:tools/buildtime/mockrunner-0.35/lib/mockrunner-servlet.jar:tools/buildtime/mockrunner-0.35/lib/m
ockrunner-struts.jar:tools/buildtime/mockrunner-0.35/lib/mockrunner.jar:tools/buildtime/mockrunner-0.35/lib/nekohtml.jar:tools/standard-1.0.3/lib/jaxen-full.jar:tools/standard-1.0.3/lib/jstl.jar:tools/standard-1.0.3/lib/standard.jar:tools/buildtime/tomcat-5.0.28/servlet-api.jar:tools/buildtime/tomcat-5.0.28/jsp-api.jar:tools/lib/jdom.jar:tools/spring-1.2/acegi-security-0.9.0.jar:tools/spring-1.2/spring.jar:tools/lib/rome-0.8.jar:tools/lib/rome-fetcher-0.8.jar:tools/lib/commons-codec-1.3.jar:tools/hibernate-3.1/hibernate3.jar:contrib/lib/textile4j-1.20.jar:tools/buildtime/derby.jar:tools/buildtime/ant-1.6.2/ant.jar:tools/buildtime/derbynet.jar:tools/lib/rome-0.9.jar:tools/lib/rome-fetcher-0.9.jar:tools/buildtime/activation.jar:tools/buildtime/mail.jar:tools/spring-1.2/acegi-security-1.0.1.jar:tools/spring-1.2/spring.jar:sandbox/jdobackend/lib/bcel-5.1.jar:sandbox/jdobackend/lib/jdo2-api-2.0.jar:sandbox/jdobackend/lib/jdom.jar:sandbox/jdobackend/lib/jpox-1.1.0-beta-5.jar:sandb
ox/jdobackend/lib/jpox-1.1.0.jar:sandbox/jdobackend/lib/jpox-enhancer-1.1.0-beta-5.jar:sandbox/jdobackend/lib/jpox-enhancer-1.1.0.jar:sandbox/jdobackend/lib/toplink-essentials.jar</classpath>
+ <package-root>sandbox/scripting/groovy/src</package-root>
+ <package-root>sandbox/scripting/bsf/src</package-root>
+ <package-root>custom/src</package-root>
+ <package-root>sandbox/scripting/jruby/src</package-root>
+ <classpath mode="compile">tools/buildtime/junit-3.8.1.jar:tools/lib/commons-betwixt-1.0-beta-1.jar:tools/lib/commons-httpclient-2.0.2.jar:tools/lib/concurrent-1.3.2.jar:tools/lib/ekitapplet.jar:tools/lib/jazzy-core.jar:tools/lib/log4j-1.2.4.jar:tools/lib/lucene-1.4.3.jar:tools/lib/taglibs-string.jar:tools/struts-1.2.4/lib/antlr.jar:tools/struts-1.2.4/lib/commons-beanutils.jar:tools/struts-1.2.4/lib/commons-digester.jar:tools/struts-1.2.4/lib/commons-fileupload.jar:tools/struts-1.2.4/lib/commons-validator.jar:tools/struts-1.2.4/lib/jakarta-oro.jar:tools/struts-1.2.4/lib/struts-el.jar:tools/struts-1.2.4/lib/struts.jar:tools/buildtime/mockrunner-0.35/lib/mockrunner-servlet.jar:tools/buildtime/mockrunner-0.35/lib/mockrunner-struts.jar:tools/buildtime/mockrunner-0.35/lib/mockrunner.jar:tools/buildtime/mockrunner-0.35/lib/nekohtml.jar:tools/standard-1.0.3/lib/jaxen-full.jar:tools/standard-1.0.3/lib/jstl.jar:tools/standard-1.0.3/lib/standard.jar:tools/buildtime/tomc
at-5.0.28/servlet-api.jar:tools/buildtime/tomcat-5.0.28/jsp-api.jar:tools/lib/jdom.jar:tools/spring-1.2/acegi-security-0.9.0.jar:tools/spring-1.2/spring.jar:tools/lib/rome-0.8.jar:tools/lib/rome-fetcher-0.8.jar:tools/lib/commons-codec-1.3.jar:tools/hibernate-3.1/hibernate3.jar:contrib/lib/textile4j-1.20.jar:tools/buildtime/derby.jar:tools/buildtime/ant-1.6.2/ant.jar:tools/buildtime/derbynet.jar:tools/lib/rome-0.9.jar:tools/lib/rome-fetcher-0.9.jar:tools/buildtime/activation.jar:tools/buildtime/mail.jar:tools/spring-1.2/spring.jar:sandbox/jdobackend/lib/bcel-5.1.jar:sandbox/jdobackend/lib/jdo2-api-2.0.jar:sandbox/jdobackend/lib/jdom.jar:sandbox/jdobackend/lib/jpox-1.1.0-beta-5.jar:sandbox/jdobackend/lib/jpox-1.1.0.jar:sandbox/jdobackend/lib/jpox-enhancer-1.1.0-beta-5.jar:sandbox/jdobackend/lib/jpox-enhancer-1.1.0.jar:sandbox/jdobackend/lib/toplink-essentials.jar:../../../../../../Applications/Java/groovy/embeddable/groovy-all-1.0.jar:sandbox/scripting/bsf/lib/bsf.jar:tools/li
b/commons-collections-3.1.jar:tools/lib/commons-lang-2.1.jar:tools/lib/commons-logging-1.0.4.jar:tools/lib/velocity-1.5.jar:tools/lib/velocity-dep-1.5.jar:tools/xmlrpc-3.0/lib/ws-commons-util-1.0.1.jar:tools/xmlrpc-3.0/lib/xmlrpc-client-3.0.jar:tools/xmlrpc-3.0/lib/xmlrpc-common-3.0.jar:tools/xmlrpc-3.0/lib/xmlrpc-server-3.0.jar:tools/spring-1.2/acegi-security-1.0.3.jar</classpath>
<source-level>1.4</source-level>
</compilation-unit>
</java-data>
Modified: roller/trunk/properties.xmlf
URL: http://svn.apache.org/viewvc/roller/trunk/properties.xmlf?view=diff&rev=526829&r1=526828&r2=526829
==============================================================================
--- roller/trunk/properties.xmlf (original)
+++ roller/trunk/properties.xmlf Mon Apr 9 09:59:32 2007
@@ -215,7 +215,6 @@
<include name="*.jar"/>
</fileset>
<fileset refid="commons-httpclient.jar"/>
- <pathelement location="${ro.tools}/buildtime/ant-1.6.2/ant.jar"/>
<pathelement location="${ro.tools}/buildtime/junit-3.8.1.jar"/>
<pathelement location="${ro.tools}/buildtime/derby.jar"/>
<pathelement location="${ro.tools}/buildtime/derbyclient.jar"/>