Skip to content

Antti Väyrynen / Moya

Go to a project
Commit e013754f by Tuukka Kivilahti
Options

fixing debencys

1 parent a9d5b29f
Inline Side-by-side
Showing with 116 additions and 17 deletions
code/LanBortalBeansClient/nbproject/build-impl.xml
......@@ -379,6 +379,13 @@ 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.LanBortalDatabase}" name="call.subproject"/>
<param location="${project.LanBortalDatabase}/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">
......@@ -765,6 +772,13 @@ 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.LanBortalDatabase}" name="call.subproject"/>
<param location="${project.LanBortalDatabase}/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}"/>
......
code/LanBortalBeansClient/nbproject/genfiles.properties
build.xml.data.CRC32=7b768e44
build.xml.data.CRC32=c4f39d2a
build.xml.script.CRC32=9e7e8017
build.xml.stylesheet.CRC32=958a1d3e@1.32.1.45
# 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=7b768e44
nbproject/build-impl.xml.script.CRC32=81f477a3
nbproject/build-impl.xml.data.CRC32=c4f39d2a
nbproject/build-impl.xml.script.CRC32=044841d4
nbproject/build-impl.xml.stylesheet.CRC32=576378a2@1.32.1.45
code/LanBortalBeansClient/nbproject/private/private.properties
compile.on.save=true
do.depend=false
do.jar=true
javac.debug=true
javadoc.preview=true
jaxbwiz.endorsed.dirs=/usr/local/netbeans-6.8/ide12/modules/ext/jaxb/api
user.properties.file=/home/tuukka/.netbeans/6.8/build.properties
code/LanBortalBeansClient/nbproject/project.properties
application.title=LanBortalBeansClient
application.vendor=tuukka
build.classes.dir=${build.dir}/classes
build.classes.excludes=**/*.java,**/*.form
# This directory is removed when the project is cleaned:
......@@ -18,11 +20,14 @@ debug.test.classpath=\
dist.dir=dist
dist.jar=${dist.dir}/LanBortalBeansClient.jar
dist.javadoc.dir=${dist.dir}/javadoc
endorsed.classpath=
excludes=
file.reference.LanBortalBeansClient-ejbModule=ejbModule
includes=**
jar.compress=false
javac.classpath=
javac.classpath=\
${libs.javaee-api-6.0.classpath}:\
${reference.LanBortalDatabase.jar}
# Space-separated list of extra javac options
javac.compilerargs=
javac.deprecation=false
......@@ -49,6 +54,8 @@ main.class=
manifest.file=manifest.mf
meta.inf.dir=${src.dir}/META-INF
platform.active=default_platform
project.LanBortalDatabase=../LanBortalDatabase
reference.LanBortalDatabase.jar=${project.LanBortalDatabase}/dist/LanBortalDatabase.jar
run.classpath=\
${javac.classpath}:\
${build.classes.dir}
......
code/LanBortalBeansClient/nbproject/project.xml
......@@ -9,5 +9,15 @@
</source-roots>
<test-roots/>
</data>
<references xmlns="http://www.netbeans.org/ns/ant-project-references/1">
<reference>
<foreign-project>LanBortalDatabase</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>
code/LanBortalDatabase/nbproject/private/private.properties
compile.on.save=true
do.depend=false
do.jar=true
javac.debug=true
javadoc.preview=true
jaxbwiz.endorsed.dirs=/usr/local/netbeans-6.8/ide12/modules/ext/jaxb/api
user.properties.file=/home/tuukka/.netbeans/6.8/build.properties
code/LanBortalDatabase/nbproject/project.properties
application.title=LanBortalDatabase
application.vendor=tuukka
build.classes.dir=${build.dir}/classes
build.classes.excludes=**/*.java,**/*.form
# This directory is removed when the project is cleaned:
......@@ -18,11 +20,13 @@ debug.test.classpath=\
dist.dir=dist
dist.jar=${dist.dir}/LanBortalDatabase.jar
dist.javadoc.dir=${dist.dir}/javadoc
endorsed.classpath=
excludes=
file.reference.LanBortalDatabase-src=src
includes=**
jar.compress=false
javac.classpath=
javac.classpath=\
${libs.javaee-api-6.0.classpath}
# Space-separated list of extra javac options
javac.compilerargs=
javac.deprecation=false
......
code/LanBortalDatabase/src/fi/insomnia/bortal/model/DiscountInstance.java
......@@ -25,7 +25,7 @@ import javax.persistence.Version;
*/
@Entity
@Table(name = "discount_instances")
@NamedQueries( { @NamedQuery(name = "DiscountInstance.findAll", query = "SELECT d FROM DiscountInstance d"), })
@NamedQueries( { @NamedQuery(name = "DiscountInstance.findAll", query = "SELECT d FROM DiscountInstance d") })
public class DiscountInstance implements ModelInterface {
private static final long serialVersionUID = 1L;
......
code/LanBortalWeb/nbproject/build-impl.xml
......@@ -383,8 +383,22 @@ exists or setup the property manually. For example like this:
<!--
COMPILATION SECTION
-->
<target depends="init" if="no.dist.ear.dir" name="deps-module-jar" unless="no.deps"/>
<target depends="init" if="dist.ear.dir" name="deps-ear-jar" unless="no.deps"/>
<target depends="init" if="no.dist.ear.dir" name="deps-module-jar" unless="no.deps">
<ant antfile="${project.LanBortalBeansClient}/build.xml" inheritall="false" target="jar">
<property name="deploy.on.save" value="false"/>
</ant>
<ant antfile="${project.LanBortalDatabase}/build.xml" inheritall="false" target="jar">
<property name="deploy.on.save" value="false"/>
</ant>
</target>
<target depends="init" if="dist.ear.dir" name="deps-ear-jar" unless="no.deps">
<ant antfile="${project.LanBortalBeansClient}/build.xml" inheritall="false" target="jar">
<property name="deploy.on.save" value="false"/>
</ant>
<ant antfile="${project.LanBortalDatabase}/build.xml" inheritall="false" target="jar">
<property name="deploy.on.save" value="false"/>
</ant>
</target>
<target depends="init, deps-module-jar, deps-ear-jar" name="deps-jar" unless="no.deps"/>
<target depends="init,deps-jar" name="-pre-pre-compile">
<mkdir dir="${build.classes.dir}"/>
......@@ -520,10 +534,15 @@ exists or setup the property manually. For example like this:
</target>
<target depends="init,compile,compile-jsps,-pre-dist,-do-dist-with-manifest,-do-dist-without-manifest" name="do-dist"/>
<target depends="init" if="dist.ear.dir" name="library-inclusion-in-manifest">
<copyfiles files="${reference.LanBortalBeansClient.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
<copyfiles files="${reference.LanBortalDatabase.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
<mkdir dir="${build.web.dir}/META-INF"/>
<manifest file="${build.web.dir}/META-INF/MANIFEST.MF" mode="update"/>
</target>
<target depends="init" name="library-inclusion-in-archive" unless="dist.ear.dir"/>
<target depends="init" name="library-inclusion-in-archive" unless="dist.ear.dir">
<copyfiles files="${reference.LanBortalBeansClient.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
<copyfiles files="${reference.LanBortalDatabase.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
</target>
<target depends="init" if="dist.ear.dir" name="-clean-webinf-lib">
<delete dir="${build.web.dir}/WEB-INF/lib"/>
</target>
......@@ -815,7 +834,10 @@ exists or setup the property manually. For example like this:
CLEANUP SECTION
-->
<target depends="init" if="no.dist.ear.dir" name="deps-clean" unless="no.deps"/>
<target depends="init" if="no.dist.ear.dir" name="deps-clean" unless="no.deps">
<ant antfile="${project.LanBortalBeansClient}/build.xml" inheritall="false" target="clean"/>
<ant antfile="${project.LanBortalDatabase}/build.xml" inheritall="false" target="clean"/>
</target>
<target depends="init" name="do-clean">
<condition property="build.dir.to.clean" value="${build.web.dir}">
<isset property="dist.ear.dir"/>
......
code/LanBortalWeb/nbproject/genfiles.properties
build.xml.data.CRC32=464d725e
build.xml.data.CRC32=288efe07
build.xml.script.CRC32=99b46f90
build.xml.stylesheet.CRC32=c0ebde35@1.21.1.1
# 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=464d725e
nbproject/build-impl.xml.script.CRC32=03d064bc
nbproject/build-impl.xml.data.CRC32=288efe07
nbproject/build-impl.xml.script.CRC32=c554f30c
nbproject/build-impl.xml.stylesheet.CRC32=b139b33b@1.21.1.1
code/LanBortalWeb/nbproject/private/private.properties
......@@ -6,5 +6,7 @@ j2ee.platform.wsgen.classpath=/usr/local/sges-v3/glassfish/modules/webservices-o
j2ee.platform.wsimport.classpath=/usr/local/sges-v3/glassfish/modules/webservices-osgi.jar:/usr/local/sges-v3/glassfish/modules/endorsed/webservices-api-osgi.jar:/usr/local/sges-v3/glassfish/modules/jaxb-osgi.jar:/usr/local/sges-v3/glassfish/modules/endorsed/jaxb-api-osgi.jar
j2ee.platform.wsit.classpath=
j2ee.server.instance=[/usr/local/sges-v3/glassfish]deployer:gfv3ee6:localhost:36570
javac.debug=true
javadoc.preview=true
jaxbwiz.endorsed.dirs=/usr/local/netbeans-6.8/ide12/modules/ext/jaxb/api
user.properties.file=/home/tuukka/.netbeans/6.8/build.properties
code/LanBortalWeb/nbproject/project.properties
......@@ -28,7 +28,9 @@ j2ee.platform=1.6-web
j2ee.server.type=gfv3ee6
jar.compress=false
java.source.based=true
javac.classpath=
javac.classpath=\
${reference.LanBortalBeansClient.jar}:\
${reference.LanBortalDatabase.jar}
# Space-separated list of extra javac options
javac.compilerargs=
javac.debug=true
......@@ -54,9 +56,12 @@ javadoc.version=false
javadoc.windowtitle=
jaxbwiz.endorsed.dirs="${netbeans.home}/../ide12/modules/ext/jaxb/api"
jspcompilation.classpath=${jspc.classpath}:${javac.classpath}
no.dependencies=false
persistence.xml.dir=${conf.dir}
platform.active=default_platform
project.LanBortalBeansClient=../LanBortalBeansClient
project.LanBortalDatabase=../LanBortalDatabase
reference.LanBortalBeansClient.jar=${project.LanBortalBeansClient}/dist/LanBortalBeansClient.jar
reference.LanBortalDatabase.jar=${project.LanBortalDatabase}/dist/LanBortalDatabase.jar
resource.dir=setup
run.test.classpath=\
${javac.test.classpath}:\
......
code/LanBortalWeb/nbproject/project.xml
......@@ -5,12 +5,39 @@
<data xmlns="http://www.netbeans.org/ns/web-project/3">
<name>LanBortalWeb</name>
<minimum-ant-version>1.6.5</minimum-ant-version>
<web-module-libraries/>
<web-module-libraries>
<library dirs="200">
<file>${reference.LanBortalBeansClient.jar}</file>
<path-in-war>WEB-INF/lib</path-in-war>
</library>
<library dirs="200">
<file>${reference.LanBortalDatabase.jar}</file>
<path-in-war>WEB-INF/lib</path-in-war>
</library>
</web-module-libraries>
<web-module-additional-libraries/>
<source-roots>
<root id="src.dir" name="Source Packages"/>
<root id="src.dir"/>
</source-roots>
<test-roots/>
</data>
<references xmlns="http://www.netbeans.org/ns/ant-project-references/1">
<reference>
<foreign-project>LanBortalBeansClient</foreign-project>
<artifact-type>jar</artifact-type>
<script>build.xml</script>
<target>jar</target>
<clean-target>clean</clean-target>
<id>jar</id>
</reference>
<reference>
<foreign-project>LanBortalDatabase</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>
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!