Skip to content

Linnea Samila / Moya

Go to a project
Commit fffdd55d by Tuomas Riihimäki
Options

Merge branch 'master' of dev.intra.insomnia.fi:/data/bortal

2 parents ab5a50cf abeabd12
Inline Side-by-side
Showing with 326 additions and 50 deletions
code/LanBortal/nbproject/build-impl.xml
......@@ -151,7 +151,26 @@ exists or setup the property manually. For example like this:
COMPILATION SECTION
-->
<target depends="init" name="deps-jar" unless="no.deps"/>
<target depends="init" name="deps-j2ee-archive" unless="no.deps"/>
<target depends="init" name="deps-j2ee-archive" unless="no.deps">
<condition property="build.deploy.on.save" value="false">
<not>
<isset property="build.deploy.on.save"/>
</not>
</condition>
<ant antfile="${project.LanBortalBeans}/build.xml" inheritall="false" target="dist-ear">
<property location="${build.dir}" name="dist.ear.dir"/>
<property name="deploy.on.save" value="${build.deploy.on.save}"/>
</ant>
<condition property="build.deploy.on.save" value="false">
<not>
<isset property="build.deploy.on.save"/>
</not>
</condition>
<ant antfile="${project.LanBortalWeb}/build.xml" inheritall="false" target="dist-ear">
<property location="${build.dir}" name="dist.ear.dir"/>
<property name="deploy.on.save" value="${build.deploy.on.save}"/>
</ant>
</target>
<target depends="init,deps-jar,deps-j2ee-archive" name="pre-pre-compile"/>
<target name="pre-compile">
<!-- Empty placeholder for easier customization. -->
......@@ -162,7 +181,10 @@ exists or setup the property manually. For example like this:
<fileset dir="${meta.inf}"/>
</copy>
</target>
<target depends="init,deps-jar,pre-pre-compile,pre-compile" name="-do-compile-deps"/>
<target depends="init,deps-jar,pre-pre-compile,pre-compile" name="-do-compile-deps">
<copyfiles files="${reference.LanBortalWeb.dist-ear}" todir="${build.dir}//"/>
<copyfiles files="${reference.LanBortalBeans.dist-ear}" todir="${build.dir}//"/>
</target>
<target name="post-compile">
<!-- Empty placeholder for easier customization. -->
<!-- You can override this target in the ../build.xml file. -->
......@@ -238,6 +260,8 @@ exists or setup the property manually. For example like this:
</target>
<target name="-run-deploy-am" unless="no.deps">
<!-- Task to deploy to the Access Manager runtime. -->
<ant antfile="${project.LanBortalBeans}/build.xml" inheritall="false" target="-run-deploy-am"/>
<ant antfile="${project.LanBortalWeb}/build.xml" inheritall="false" target="-run-deploy-am"/>
</target>
<target depends="-init-cos,dist-directory-deploy,pre-run-deploy,-pre-nbmodule-run-deploy,-run-deploy-nb,-init-deploy-ant,-deploy-ant,-run-deploy-am,-post-nbmodule-run-deploy,post-run-deploy" name="run-deploy"/>
<target if="netbeans.home" name="-run-deploy-nb">
......@@ -416,7 +440,26 @@ exists or setup the property manually. For example like this:
<!--
CLEANUP SECTION
-->
<target depends="init" name="deps-clean" unless="no.deps"/>
<target depends="init" name="deps-clean" unless="no.deps">
<condition property="build.deploy.on.save" value="false">
<not>
<isset property="build.deploy.on.save"/>
</not>
</condition>
<ant antfile="${project.LanBortalBeans}/build.xml" inheritall="false" target="clean-ear">
<property location="${build.dir}" name="dist.ear.dir"/>
<property name="deploy.on.save" value="${build.deploy.on.save}"/>
</ant>
<condition property="build.deploy.on.save" value="false">
<not>
<isset property="build.deploy.on.save"/>
</not>
</condition>
<ant antfile="${project.LanBortalWeb}/build.xml" inheritall="false" target="clean-ear">
<property location="${build.dir}" name="dist.ear.dir"/>
<property name="deploy.on.save" value="${build.deploy.on.save}"/>
</ant>
</target>
<target depends="init" name="do-clean">
<delete dir="${build.dir}"/>
<delete dir="${dist.dir}"/>
......
code/LanBortal/nbproject/genfiles.properties
build.xml.data.CRC32=33b888f0
build.xml.data.CRC32=8f943b1f
build.xml.script.CRC32=2a98f93c
build.xml.stylesheet.CRC32=475c2a62@1.17.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=33b888f0
nbproject/build-impl.xml.script.CRC32=762dc1d0
nbproject/build-impl.xml.data.CRC32=8f943b1f
nbproject/build-impl.xml.script.CRC32=5677e720
nbproject/build-impl.xml.stylesheet.CRC32=32b5565a@1.17.1
code/LanBortal/nbproject/project.properties
build.classes.excludes=**/*.java,**/*.form,**/.nbattrs
build.dir=build
build.generated.dir=${build.dir}/generated
client.module.uri=
client.urlPart=
client.module.uri=LanBortalWeb
client.urlPart=/LanBortalWeb
debug.classpath=${javac.classpath}::${jar.content.additional}:${run.classpath}
display.browser=true
dist.dir=dist
......@@ -10,12 +10,17 @@ dist.jar=${dist.dir}/${jar.name}
endorsed.classpath=\
${libs.javaee-endorsed-api-6.0.classpath}
file.reference.code-LanBortal=.
file.reference.LanBortalDatabase.jar=EarContent/lib/LanBortalDatabase.jar
file.reference.slf4j-api-1.5.8.jar=EarContent/lib/slf4j-api-1.5.8.jar
file.reference.slf4j-jdk14-1.5.8.jar=EarContent/lib/slf4j-jdk14-1.5.8.jar
j2ee.appclient.mainclass.args=${j2ee.appclient.tool.args}
j2ee.deploy.on.save=true
j2ee.platform=1.6
j2ee.server.type=gfv3ee6
jar.compress=false
jar.content.additional=
jar.content.additional=\
${reference.LanBortalWeb.dist-ear}:\
${reference.LanBortalBeans.dist-ear}
jar.name=LanBortal.ear
javac.debug=true
javac.deprecation=false
......@@ -24,4 +29,12 @@ javac.target=1.5
meta.inf=src/conf
no.dependencies=false
platform.active=default_platform
project.LanBortalBeans=../LanBortalBeans
project.LanBortalWeb=../LanBortalWeb
reference.LanBortalBeans.dist-ear=${project.LanBortalBeans}/dist/LanBortalBeans.jar
reference.LanBortalWeb.dist-ear=${project.LanBortalWeb}/dist/LanBortalWeb.war
run.classpath=\
${file.reference.LanBortalDatabase.jar}:\
${file.reference.slf4j-api-1.5.8.jar}:\
${file.reference.slf4j-jdk14-1.5.8.jar}
source.root=${file.reference.code-LanBortal}
code/LanBortal/nbproject/project.xml
......@@ -6,7 +6,34 @@
<name>LanBortal</name>
<minimum-ant-version>1.6.5</minimum-ant-version>
<web-module-libraries/>
<web-module-additional-libraries/>
<web-module-additional-libraries>
<library>
<file>${reference.LanBortalWeb.dist-ear}</file>
<path-in-war>/</path-in-war>
</library>
<library>
<file>${reference.LanBortalBeans.dist-ear}</file>
<path-in-war>/</path-in-war>
</library>
</web-module-additional-libraries>
</data>
<references xmlns="http://www.netbeans.org/ns/ant-project-references/1">
<reference>
<foreign-project>LanBortalBeans</foreign-project>
<artifact-type>j2ee_ear_archive</artifact-type>
<script>build.xml</script>
<target>dist-ear</target>
<clean-target>clean-ear</clean-target>
<id>dist-ear</id>
</reference>
<reference>
<foreign-project>LanBortalWeb</foreign-project>
<artifact-type>j2ee_ear_archive</artifact-type>
<script>build.xml</script>
<target>dist-ear</target>
<clean-target>clean-ear</clean-target>
<id>dist-ear</id>
</reference>
</references>
</configuration>
</project>
code/LanBortalBeans/nbproject/build-impl.xml
......@@ -313,8 +313,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"/>
<target depends="init,deps-jar" name="-pre-pre-compile">
<mkdir dir="${build.classes.dir}"/>
......@@ -332,6 +346,8 @@ exists or setup the property manually. For example like this:
<copyfiles files="${file.reference.lucene-snowball.jar}" todir="${build.classes.dir}"/>
<copyfiles files="${file.reference.lucene-spellchecker.jar}" todir="${build.classes.dir}"/>
<copyfiles files="${file.reference.compass-2.3.0-beta1.jar}" todir="${build.classes.dir}"/>
<copyfiles files="${reference.LanBortalDatabase.jar}" todir="${build.classes.dir}"/>
<copyfiles files="${reference.LanBortalBeansClient.jar}" todir="${build.classes.dir}"/>
</target>
<target depends="compile" name="library-inclusion-in-manifest">
<copyfiles files="${file.reference.lucene-queries.jar}" todir="${dist.ear.dir}/lib"/>
......@@ -341,6 +357,8 @@ exists or setup the property manually. For example like this:
<copyfiles files="${file.reference.lucene-snowball.jar}" todir="${dist.ear.dir}/lib"/>
<copyfiles files="${file.reference.lucene-spellchecker.jar}" todir="${dist.ear.dir}/lib"/>
<copyfiles files="${file.reference.compass-2.3.0-beta1.jar}" todir="${dist.ear.dir}/lib"/>
<copyfiles files="${reference.LanBortalDatabase.jar}" todir="${dist.ear.dir}/lib"/>
<copyfiles files="${reference.LanBortalBeansClient.jar}" todir="${dist.ear.dir}/lib"/>
<manifest file="${build.ear.classes.dir}/META-INF/MANIFEST.MF" mode="update"/>
</target>
<target name="-copy-meta-inf">
......@@ -621,7 +639,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">
<delete dir="${build.dir}"/>
<delete dir="${dist.dir}"/>
......
code/LanBortalBeans/nbproject/genfiles.properties
build.xml.data.CRC32=1b824f9e
build.xml.data.CRC32=e1cf2152
build.xml.script.CRC32=5df2cfd1
build.xml.stylesheet.CRC32=e5f4c432@1.19.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=1b824f9e
nbproject/build-impl.xml.script.CRC32=25c6ec32
nbproject/build-impl.xml.data.CRC32=e1cf2152
nbproject/build-impl.xml.script.CRC32=30a0ceec
nbproject/build-impl.xml.stylesheet.CRC32=b9c9cfe1@1.19.1
code/LanBortalBeans/nbproject/private/private.properties
......@@ -5,5 +5,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
netbeans.user=/home/tuukka/.netbeans/6.8
code/LanBortalBeans/nbproject/project.properties
......@@ -37,7 +37,9 @@ javac.classpath=\
${file.reference.lucene-core.jar}:\
${file.reference.lucene-snowball.jar}:\
${file.reference.lucene-spellchecker.jar}:\
${file.reference.compass-2.3.0-beta1.jar}
${file.reference.compass-2.3.0-beta1.jar}:\
${reference.LanBortalDatabase.jar}:\
${reference.LanBortalBeansClient.jar}
javac.debug=true
javac.deprecation=false
javac.source=1.5
......@@ -63,6 +65,10 @@ jaxbwiz.endorsed.dirs="${netbeans.home}/../ide12/modules/ext/jaxb/api"
lib.dir=libs
meta.inf=ejbModule/META-INF
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/LanBortalBeans/nbproject/project.xml
......@@ -12,10 +12,30 @@
<included-library dirs="200">file.reference.lucene-snowball.jar</included-library>
<included-library dirs="200">file.reference.lucene-spellchecker.jar</included-library>
<included-library dirs="200">file.reference.compass-2.3.0-beta1.jar</included-library>
<included-library dirs="200">reference.LanBortalDatabase.jar</included-library>
<included-library dirs="200">reference.LanBortalBeansClient.jar</included-library>
<source-roots>
<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>
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/META-INF/persistence.xml
<?xml version="1.0" encoding="UTF-8"?>
<persistence version="1.0" xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd">
<persistence-unit name="BortalDb">
<jta-data-source>jdbc/bortal</jta-data-source>
<properties>
<property name="eclipselink.ddl-generation" value="drop-and-create-tables"/>
<property name="eclipselink.ddl-generation.output-mode" value="database"/>
</properties>
</persistence-unit>
<persistence-unit name="BortalDb" transaction-type="JTA">
<jta-data-source>jdbc/bortal</jta-data-source>
<properties>
<property name="eclipselink.ddl-generation" value="drop-and-create-tables"/>
<property name="eclipselink.ddl-generation.output-mode" value="database"/>
</properties>
</persistence-unit>
</persistence>
code/LanBortalWeb/WebContent/META-INF/persistence.xml
<?xml version="1.0" encoding="UTF-8"?>
<persistence version="1.0" xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd">
<persistence-unit name="BortalDb">
<jta-data-source>jdbc/bortalDatabase</jta-data-source>
<properties>
<property name="eclipselink.ddl-generation" value="create-tables"/>
<property name="eclipselink.ddl-generation.output-mode" value="database"/>
<property name="eclipselink.target-database" value="MySQL"/>
</properties>
</persistence-unit>
<persistence-unit name="BortalDb" transaction-type="JTA">
<jta-data-source>jdbc/bortalDatabase</jta-data-source>
<properties>
<property name="eclipselink.ddl-generation" value="create-tables"/>
<property name="eclipselink.ddl-generation.output-mode" value="database"/>
<property name="eclipselink.target-database" value="MySQL"/>
</properties>
</persistence-unit>
</persistence>
code/LanBortalWeb/nbproject/build-impl.xml
......@@ -383,8 +383,26 @@ 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.LanBortalBeans}/build.xml" inheritall="false" target="dist"/>
<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.LanBortalBeans}/build.xml" inheritall="false" target="dist-ear">
<property location="${build.dir}" name="dist.ear.dir"/>
</ant>
<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 +538,23 @@ 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"/>
<copyfiles files="${file.reference.LanBortalDatabase.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
<copyfiles files="${file.reference.slf4j-api-1.5.8.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
<copyfiles files="${file.reference.slf4j-jdk14-1.5.8.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
<copyfiles files="${reference.LanBortalBeans.dist}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}"/>
<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"/>
<copyfiles files="${file.reference.LanBortalDatabase.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
<copyfiles files="${file.reference.slf4j-api-1.5.8.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
<copyfiles files="${file.reference.slf4j-jdk14-1.5.8.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
<copyfiles files="${reference.LanBortalBeans.dist}" 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 +846,11 @@ 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.LanBortalBeans}/build.xml" inheritall="false" target="clean"/>
<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=df1326da
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=df1326da
nbproject/build-impl.xml.script.CRC32=837fa726
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
auxiliary.org-netbeans-modules-projectapi.jsf_2e_language=Facelets
build.classes.dir=${build.web.dir}/WEB-INF/classes
build.classes.excludes=**/*.java,**/*.form
build.dir=build
......@@ -21,14 +22,23 @@ dist.war=${dist.dir}/${war.name}
endorsed.classpath=\
${libs.javaee-endorsed-api-6.0.classpath}
excludes=
file.reference.LanBortalDatabase.jar=../LanBortal/EarContent/lib/LanBortalDatabase.jar
file.reference.LanBortalWeb-src=src
file.reference.slf4j-api-1.5.8.jar=../LanBortal/EarContent/lib/slf4j-api-1.5.8.jar
file.reference.slf4j-jdk14-1.5.8.jar=../LanBortal/EarContent/lib/slf4j-jdk14-1.5.8.jar
includes=**
j2ee.deploy.on.save=true
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}:\
${file.reference.LanBortalDatabase.jar}:\
${file.reference.slf4j-api-1.5.8.jar}:\
${file.reference.slf4j-jdk14-1.5.8.jar}:\
${reference.LanBortalBeans.dist}
# Space-separated list of extra javac options
javac.compilerargs=
javac.debug=true
......@@ -54,9 +64,14 @@ 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.LanBortalBeans=../LanBortalBeans
project.LanBortalBeansClient=../LanBortalBeansClient
project.LanBortalDatabase=../LanBortalDatabase
reference.LanBortalBeans.dist=${project.LanBortalBeans}/dist/LanBortalBeans.jar
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,63 @@
<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>
<library dirs="200">
<file>${file.reference.LanBortalDatabase.jar}</file>
<path-in-war>WEB-INF/lib</path-in-war>
</library>
<library dirs="200">
<file>${file.reference.slf4j-api-1.5.8.jar}</file>
<path-in-war>WEB-INF/lib</path-in-war>
</library>
<library dirs="200">
<file>${file.reference.slf4j-jdk14-1.5.8.jar}</file>
<path-in-war>WEB-INF/lib</path-in-war>
</library>
<library dirs="100">
<file>${reference.LanBortalBeans.dist}</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>LanBortalBeans</foreign-project>
<artifact-type>jar</artifact-type>
<script>build.xml</script>
<target>dist</target>
<clean-target>clean</clean-target>
<id>dist</id>
</reference>
<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!