From 12b081ffbaa8eadd783479c6a37aa5a9f24d1f5a Mon Sep 17 00:00:00 2001
From: pompert <sdos@astron.nl>
Date: Mon, 28 Aug 2006 08:27:54 +0000
Subject: [PATCH] BugID: 701 Improved project XML file with proper log4j
reference and jOTDB2 project reference
---
JAVA/CEP/jParmFacade/nbproject/build-impl.xml | 8 ++++++--
JAVA/CEP/jParmFacade/nbproject/genfiles.properties | 6 +++---
JAVA/CEP/jParmFacade/nbproject/project.properties | 9 +++++----
JAVA/CEP/jParmFacade/nbproject/project.xml | 10 ++++++++++
4 files changed, 24 insertions(+), 9 deletions(-)
diff --git a/JAVA/CEP/jParmFacade/nbproject/build-impl.xml b/JAVA/CEP/jParmFacade/nbproject/build-impl.xml
index d9b615550db..1da6d535b33 100644
--- a/JAVA/CEP/jParmFacade/nbproject/build-impl.xml
+++ b/JAVA/CEP/jParmFacade/nbproject/build-impl.xml
@@ -233,7 +233,9 @@ is divided into following sections:
COMPILATION SECTION
===================
-->
- <target name="deps-jar" depends="init" unless="no.deps"/>
+ <target name="deps-jar" depends="init" unless="no.deps">
+ <ant target="jar" inheritall="false" antfile="${project.jOTDB2}/build.xml"/>
+ </target>
<target name="-pre-pre-compile" depends="init,deps-jar">
<mkdir dir="${build.classes.dir}"/>
</target>
@@ -528,7 +530,9 @@ is divided into following sections:
CLEANUP SECTION
===============
-->
- <target name="deps-clean" depends="init" unless="no.deps"/>
+ <target name="deps-clean" depends="init" unless="no.deps">
+ <ant target="clean" inheritall="false" antfile="${project.jOTDB2}/build.xml"/>
+ </target>
<target name="-do-clean" depends="init">
<delete dir="${build.dir}"/>
<delete dir="${dist.dir}"/>
diff --git a/JAVA/CEP/jParmFacade/nbproject/genfiles.properties b/JAVA/CEP/jParmFacade/nbproject/genfiles.properties
index 2f411630fd2..9d3acb30ff9 100644
--- a/JAVA/CEP/jParmFacade/nbproject/genfiles.properties
+++ b/JAVA/CEP/jParmFacade/nbproject/genfiles.properties
@@ -1,8 +1,8 @@
-build.xml.data.CRC32=1fc8ec8b
+build.xml.data.CRC32=84c025fa
build.xml.script.CRC32=396fe1e4
build.xml.stylesheet.CRC32=d5b6853a
# 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=1fc8ec8b
-nbproject/build-impl.xml.script.CRC32=0d8554a3
+nbproject/build-impl.xml.data.CRC32=84c025fa
+nbproject/build-impl.xml.script.CRC32=44edace8
nbproject/build-impl.xml.stylesheet.CRC32=99b91518
diff --git a/JAVA/CEP/jParmFacade/nbproject/project.properties b/JAVA/CEP/jParmFacade/nbproject/project.properties
index 60ad63ad88e..2c4fa8b72e4 100644
--- a/JAVA/CEP/jParmFacade/nbproject/project.properties
+++ b/JAVA/CEP/jParmFacade/nbproject/project.properties
@@ -16,12 +16,11 @@ debug.test.classpath=\
dist.dir=dist
dist.jar=${dist.dir}/jParmFacade.jar
dist.javadoc.dir=${dist.dir}/javadoc
-file.reference.jOTDB2.jar=../../../../../transfer/jOTDB2.jar
-file.reference.log4j-1.2.13.jar=../../../../../transfer/log4j-1.2.13.jar
+file.reference.log4j-1.2.13.jar=../../../../../../opt/lofar/external/java/lib/log4j-1.2.13.jar
jar.compress=false
javac.classpath=\
- ${file.reference.log4j-1.2.13.jar}:\
- ${file.reference.jOTDB2.jar}
+ ${reference.jOTDB2.jar}:\
+ ${file.reference.log4j-1.2.13.jar}
# Space-separated list of extra javac options
javac.compilerargs=
javac.deprecation=false
@@ -46,6 +45,8 @@ main.class=nl.astron.lofar.java.cep.jparmfacade.jParmFacadeServer
manifest.file=manifest.mf
meta.inf.dir=${src.dir}/META-INF
platform.active=default_platform
+project.jOTDB2=../../../SAS/OTB/jOTDB2
+reference.jOTDB2.jar=${project.jOTDB2}/dist/jOTDB2.jar
run.classpath=\
${javac.classpath}:\
${build.classes.dir}
diff --git a/JAVA/CEP/jParmFacade/nbproject/project.xml b/JAVA/CEP/jParmFacade/nbproject/project.xml
index a8fdc17b35c..6080cb4804c 100644
--- a/JAVA/CEP/jParmFacade/nbproject/project.xml
+++ b/JAVA/CEP/jParmFacade/nbproject/project.xml
@@ -12,5 +12,15 @@
<root id="test.src.dir"/>
</test-roots>
</data>
+ <references xmlns="http://www.netbeans.org/ns/ant-project-references/1">
+ <reference>
+ <foreign-project>jOTDB2</foreign-project>
+ <artifact-type>jar</artifact-type>
+ <script>build.xml</script>
+ <target>jar</target>
+ <clean-target>clean</clean-target>
+ <id>jar</id>
+ </reference>
+ </references>
</configuration>
</project>
--
GitLab