Author: snoopdave
Date: Sun Jun 3 07:06:47 2007
New Revision: 543899
URL: http://svn.apache.org/viewvc?view=rev&rev=543899
Log:
Merging from trunk
Added:
roller/branches/roller_guice/build.xml
- copied unchanged from r543760, roller/trunk/build.xml
Removed:
roller/branches/roller_guice/build.bat
roller/branches/roller_guice/build.sh
roller/branches/roller_guice/sign-release.sh
Modified:
roller/branches/roller_guice/merges.txt
roller/branches/roller_guice/nbproject/project.xml
Modified: roller/branches/roller_guice/merges.txt
URL:
http://svn.apache.org/viewvc/roller/branches/roller_guice/merges.txt?view=diff&rev=543899&r1=543898&r2=543899
==============================================================================
--- roller/branches/roller_guice/merges.txt (original)
+++ roller/branches/roller_guice/merges.txt Sun Jun 3 07:06:47 2007
@@ -2,6 +2,7 @@
Latest
May 30, 2007
+svn merge -r 542748:542905 https://svn.apache.org/repos/asf/roller/trunk
svn merge -r 541742:542748 https://svn.apache.org/repos/asf/roller/trunk
May 25, 2007
Modified: roller/branches/roller_guice/nbproject/project.xml
URL:
http://svn.apache.org/viewvc/roller/branches/roller_guice/nbproject/project.xml?view=diff&rev=543899&r1=543898&r2=543899
==============================================================================
--- roller/branches/roller_guice/nbproject/project.xml (original)
+++ roller/branches/roller_guice/nbproject/project.xml Sun Jun 3 07:06:47 2007
@@ -4,7 +4,7 @@
<configuration>
<general-data xmlns="http://www.netbeans.org/ns/freeform-project/1";>
<!--Do not use Project Properties customizer when editing this
file manually.-->
- <name>roller_guice</name>
+ <name>roller_all_guice</name>
<folders>
<source-folder>
<label>web</label>
@@ -102,9 +102,6 @@
<label>components/core/src/java</label>
<location>components/core/src/java</location>
</source-folder>
- <source-file>
- <location>build.xml</location>
- </source-file>
</items>
<context-menu>
<ide-action name="build"/>
@@ -126,7 +123,7 @@
<package-root>components/core/src/java</package-root>
<package-root>apps/weblogger/src/java</package-root>
<package-root>apps/weblogger/test/java</package-root>
- <classpath
mode="compile">tools/buildtime/junit-3.8.1.jar:tools/lib/concurrent-1.3.2.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/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:t
ools/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:../../../../../Applications/Java/groovy/embeddable/groovy-all-1.0.jar:sandbox/scripting/bsf/lib/bsf.jar:tools/lib/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:tools/struts-2.0.6/lib/antlr-2.7.2.jar:tools/struts-2.0.6/lib/commons-beanutils-1.6.jar:tools/stru
ts-2.0.6/lib/commons-chain-1.1.jar:tools/struts-2.0.6/lib/commons-fileupload-1.2.jar:tools/struts-2.0.6/lib/commons-io-1.3.1.jar:tools/struts-2.0.6/lib/commons-validator-1.3.0.jar:tools/struts-2.0.6/lib/freemarker-2.3.8.jar:tools/struts-2.0.6/lib/ognl-2.6.11.jar:tools/struts-2.0.6/lib/oro-2.0.8.jar:tools/struts-2.0.6/lib/struts2-core-2.0.6.jar:tools/struts-2.0.6/lib/struts2-spring-plugin-2.0.6.jar:tools/struts-2.0.6/lib/struts2-tiles-plugin-2.0.6.jar:tools/struts-2.0.6/lib/tiles-api-2.0-20070207.130156-4.jar:tools/struts-2.0.6/lib/tiles-core-2.0-20070207.130156-4.jar:tools/struts-2.0.6/lib/xwork-2.0.1.jar:tools/roller-core/roller-core.jar:tools/openjpa-0.9.7/geronimo-j2ee-connector_1.5_spec-1.0.1.jar:tools/openjpa-0.9.7/geronimo-jpa_3.0_spec-1.0.jar:tools/openjpa-0.9.7/geronimo-jta_1.0.1B_spec-1.0.1.jar:tools/openjpa-0.9.7/openjpa-0.9.7-incubating.jar:tools/openjpa-0.9.7/serp-1.11.0.jar</classpath>
+ <classpath
mode="compile">tools/buildtime/junit-3.8.1.jar:tools/lib/concurrent-1.3.2.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/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:t
ools/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:../../../../../Applications/Java/groovy/embeddable/groovy-all-1.0.jar:sandbox/scripting/bsf/lib/bsf.jar:tools/lib/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:tools/struts-2.0.6/lib/antlr-2.7.2.jar:tools/struts-2.0.6/lib/commons-beanutils-1.6.jar:tools/stru
ts-2.0.6/lib/commons-chain-1.1.jar:tools/struts-2.0.6/lib/commons-fileupload-1.2.jar:tools/struts-2.0.6/lib/commons-io-1.3.1.jar:tools/struts-2.0.6/lib/commons-validator-1.3.0.jar:tools/struts-2.0.6/lib/freemarker-2.3.8.jar:tools/struts-2.0.6/lib/ognl-2.6.11.jar:tools/struts-2.0.6/lib/oro-2.0.8.jar:tools/struts-2.0.6/lib/struts2-core-2.0.6.jar:tools/struts-2.0.6/lib/struts2-spring-plugin-2.0.6.jar:tools/struts-2.0.6/lib/struts2-tiles-plugin-2.0.6.jar:tools/struts-2.0.6/lib/tiles-api-2.0-20070207.130156-4.jar:tools/struts-2.0.6/lib/tiles-core-2.0-20070207.130156-4.jar:tools/struts-2.0.6/lib/xwork-2.0.1.jar:tools/roller-core/roller-core.jar:tools/openjpa-0.9.7/geronimo-j2ee-connector_1.5_spec-1.0.1.jar:tools/openjpa-0.9.7/geronimo-jpa_3.0_spec-1.0.jar:tools/openjpa-0.9.7/geronimo-jta_1.0.1B_spec-1.0.1.jar:tools/openjpa-0.9.7/openjpa-0.9.7-incubating.jar:tools/openjpa-0.9.7/serp-1.11.0.jar:tools/hibernate-3.1/hibernate3.jar:tools/lib/commons-logging-1.0.4.jar:tools/roller-core/
roller-core.jar</classpath>
<source-level>1.5</source-level>
</compilation-unit>
</java-data>
