Author: gtrasuk
Date: Tue Jun 21 17:02:34 2011
New Revision: 1138089
URL: http://svn.apache.org/viewvc?rev=1138089&view=rev
Log:
Fixed a couple of misplaced library dependencies
Modified:
river/jtsk/skunk/surrogate/nbproject/build-impl.xml
river/jtsk/skunk/surrogate/nbproject/genfiles.properties
river/jtsk/skunk/surrogate/nbproject/project.properties
river/jtsk/skunk/surrogate/nbproject/project.xml
Modified: river/jtsk/skunk/surrogate/nbproject/build-impl.xml
URL:
http://svn.apache.org/viewvc/river/jtsk/skunk/surrogate/nbproject/build-impl.xml?rev=1138089&r1=1138088&r2=1138089&view=diff
==============================================================================
--- river/jtsk/skunk/surrogate/nbproject/build-impl.xml (original)
+++ river/jtsk/skunk/surrogate/nbproject/build-impl.xml Tue Jun 21 17:02:34 2011
@@ -504,13 +504,6 @@ is divided into following sections:
<propertyfile file="${built-jar.properties}">
<entry key="${basedir}" value=""/>
</propertyfile>
- <antcall target="-maybe-call-dep">
- <param name="call.built.properties"
value="${built-jar.properties}"/>
- <param location="${project.RiverContainerLiaison}"
name="call.subproject"/>
- <param location="${project.RiverContainerLiaison}/build.xml"
name="call.script"/>
- <param name="call.target" value="jar"/>
- <param name="transfer.built-jar.properties"
value="${built-jar.properties}"/>
- </antcall>
</target>
<target depends="init,-check-automatic-build,-clean-after-automatic-build"
name="-verify-automatic-build"/>
<target depends="init" name="-check-automatic-build">
@@ -872,13 +865,6 @@ is divided into following sections:
<propertyfile file="${built-clean.properties}">
<entry key="${basedir}" value=""/>
</propertyfile>
- <antcall target="-maybe-call-dep">
- <param name="call.built.properties"
value="${built-clean.properties}"/>
- <param location="${project.RiverContainerLiaison}"
name="call.subproject"/>
- <param location="${project.RiverContainerLiaison}/build.xml"
name="call.script"/>
- <param name="call.target" value="clean"/>
- <param name="transfer.built-clean.properties"
value="${built-clean.properties}"/>
- </antcall>
</target>
<target depends="init" name="-do-clean">
<delete dir="${build.dir}"/>
Modified: river/jtsk/skunk/surrogate/nbproject/genfiles.properties
URL:
http://svn.apache.org/viewvc/river/jtsk/skunk/surrogate/nbproject/genfiles.properties?rev=1138089&r1=1138088&r2=1138089&view=diff
==============================================================================
--- river/jtsk/skunk/surrogate/nbproject/genfiles.properties (original)
+++ river/jtsk/skunk/surrogate/nbproject/genfiles.properties Tue Jun 21
17:02:34 2011
@@ -3,8 +3,8 @@ build.xml.script.CRC32=8dea2037
[email protected]
# This file is used by a NetBeans-based IDE to track changes in generated
files such as build-impl.xml.
# Do not edit this file. You may delete it but then the IDE will never
regenerate such files for you.
-nbproject/build-impl.xml.data.CRC32=2c97db21
-nbproject/build-impl.xml.script.CRC32=c7be12f9
+nbproject/build-impl.xml.data.CRC32=092f50fa
+nbproject/build-impl.xml.script.CRC32=b9aa5753
nbproject/[email protected]
nbproject/management-build-impl.xml.data.CRC32=318d2fde
nbproject/management-build-impl.xml.script.CRC32=630dcf8f
Modified: river/jtsk/skunk/surrogate/nbproject/project.properties
URL:
http://svn.apache.org/viewvc/river/jtsk/skunk/surrogate/nbproject/project.properties?rev=1138089&r1=1138088&r2=1138089&view=diff
==============================================================================
--- river/jtsk/skunk/surrogate/nbproject/project.properties (original)
+++ river/jtsk/skunk/surrogate/nbproject/project.properties Tue Jun 21 17:02:34
2011
@@ -35,7 +35,6 @@ jar.index=${jnlp.enabled}
javac.classpath=\
${libs.ApacheRiverPlatform.classpath}:\
${libs.ApacheRiverLib.classpath}:\
- ${reference.RiverContainerLiaison.jar}:\
${libs.ApacheCommonsLogging-1_1_1.classpath}:\
${libs.ApacheCommonsVFS-1_0.classpath}
# Space-separated list of extra javac options
@@ -77,12 +76,9 @@ main.class=org.apache.river.container.Bo
manifest.file=manifest.mf
meta.inf.dir=${src.dir}/META-INF
platform.active=default_platform
-project.RiverContainerLiaison=../RiverContainerLiaison
-reference.RiverContainerLiaison.jar=${project.RiverContainerLiaison}/dist/RiverContainerLiaison.jar
run.classpath=\
${javac.classpath}:\
- ${build.classes.dir}:\
- ${libs.ApacheRiverServices.classpath}
+ ${build.classes.dir}
# Space-separated list of JVM arguments used when running the project
# (you may also define separate properties like run-sys-prop.name=value
instead of -Dname=value
# or test-sys-prop.name=value to set system properties for unit tests):
Modified: river/jtsk/skunk/surrogate/nbproject/project.xml
URL:
http://svn.apache.org/viewvc/river/jtsk/skunk/surrogate/nbproject/project.xml?rev=1138089&r1=1138088&r2=1138089&view=diff
==============================================================================
--- river/jtsk/skunk/surrogate/nbproject/project.xml (original)
+++ river/jtsk/skunk/surrogate/nbproject/project.xml Tue Jun 21 17:02:34 2011
@@ -12,15 +12,6 @@
</test-roots>
</data>
<data xmlns="http://www.netbeans.org/ns/jmx/1"; version="0.4"/>
- <references
xmlns="http://www.netbeans.org/ns/ant-project-references/1";>
- <reference>
- <foreign-project>RiverContainerLiaison</foreign-project>
- <artifact-type>jar</artifact-type>
- <script>build.xml</script>
- <target>jar</target>
- <clean-target>clean</clean-target>
- <id>jar</id>
- </reference>
- </references>
+ <references
xmlns="http://www.netbeans.org/ns/ant-project-references/1"/>
</configuration>
</project>
