Skip to content

Antti Väyrynen / Moya

Go to a project
Commit dc848c79 by Tuukka Kivilahti
Options

some changes

1 parent 322a429c
Inline Side-by-side
Showing with 102 additions and 31 deletions
code/LanBortal/nbproject/build-impl.xml
...@@ -150,7 +150,26 @@ exists or setup the property manually. For example like this: ...@@ -150,7 +150,26 @@ exists or setup the property manually. For example like this:
<!-- <!--
COMPILATION SECTION COMPILATION SECTION
--> -->
<target depends="init" name="deps-jar" unless="no.deps"/> <target depends="init" name="deps-jar" unless="no.deps">
<condition property="build.deploy.on.save" value="false">
<not>
<isset property="build.deploy.on.save"/>
</not>
</condition>
<ant antfile="${project.LanBortalBeansClient}/build.xml" inheritall="false" target="jar">
<property location="${build.dir}" name="dist.ear.dir"/>
<property name="deploy.on.save" value="false"/>
</ant>
<condition property="build.deploy.on.save" value="false">
<not>
<isset property="build.deploy.on.save"/>
</not>
</condition>
<ant antfile="${project.LanBortalDatabase}/build.xml" inheritall="false" target="jar">
<property location="${build.dir}" name="dist.ear.dir"/>
<property name="deploy.on.save" value="false"/>
</ant>
</target>
<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"> <condition property="build.deploy.on.save" value="false">
<not> <not>
...@@ -184,6 +203,8 @@ exists or setup the property manually. For example like this: ...@@ -184,6 +203,8 @@ exists or setup the property manually. For example like this:
<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.LanBortalWeb.dist-ear}" todir="${build.dir}//"/>
<copyfiles files="${reference.LanBortalBeans.dist-ear}" todir="${build.dir}//"/> <copyfiles files="${reference.LanBortalBeans.dist-ear}" todir="${build.dir}//"/>
<copyfiles files="${reference.LanBortalBeansClient.jar}" todir="${build.dir}//"/>
<copyfiles files="${reference.LanBortalDatabase.jar}" todir="${build.dir}//"/>
</target> </target>
<target name="post-compile"> <target name="post-compile">
<!-- Empty placeholder for easier customization. --> <!-- Empty placeholder for easier customization. -->
...@@ -455,6 +476,24 @@ exists or setup the property manually. For example like this: ...@@ -455,6 +476,24 @@ exists or setup the property manually. For example like this:
<isset property="build.deploy.on.save"/> <isset property="build.deploy.on.save"/>
</not> </not>
</condition> </condition>
<ant antfile="${project.LanBortalBeansClient}/build.xml" inheritall="false" target="clean">
<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.LanBortalDatabase}/build.xml" inheritall="false" target="clean">
<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"> <ant antfile="${project.LanBortalWeb}/build.xml" inheritall="false" target="clean-ear">
<property location="${build.dir}" name="dist.ear.dir"/> <property location="${build.dir}" name="dist.ear.dir"/>
<property name="deploy.on.save" value="${build.deploy.on.save}"/> <property name="deploy.on.save" value="${build.deploy.on.save}"/>
......
code/LanBortal/nbproject/genfiles.properties
build.xml.data.CRC32=8f943b1f build.xml.data.CRC32=717f744d
build.xml.script.CRC32=2a98f93c build.xml.script.CRC32=2a98f93c
build.xml.stylesheet.CRC32=475c2a62@1.17.1 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. # 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. # 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=8f943b1f nbproject/build-impl.xml.data.CRC32=717f744d
nbproject/build-impl.xml.script.CRC32=5677e720 nbproject/build-impl.xml.script.CRC32=da4703d3
nbproject/build-impl.xml.stylesheet.CRC32=32b5565a@1.17.1 nbproject/build-impl.xml.stylesheet.CRC32=32b5565a@1.17.1
code/LanBortal/nbproject/project.properties
...@@ -10,7 +10,6 @@ dist.jar=${dist.dir}/${jar.name} ...@@ -10,7 +10,6 @@ dist.jar=${dist.dir}/${jar.name}
endorsed.classpath=\ endorsed.classpath=\
${libs.javaee-endorsed-api-6.0.classpath} ${libs.javaee-endorsed-api-6.0.classpath}
file.reference.code-LanBortal=. 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-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 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.appclient.mainclass.args=${j2ee.appclient.tool.args}
...@@ -20,7 +19,9 @@ j2ee.server.type=gfv3ee6 ...@@ -20,7 +19,9 @@ j2ee.server.type=gfv3ee6
jar.compress=false jar.compress=false
jar.content.additional=\ jar.content.additional=\
${reference.LanBortalWeb.dist-ear}:\ ${reference.LanBortalWeb.dist-ear}:\
${reference.LanBortalBeans.dist-ear} ${reference.LanBortalBeans.dist-ear}:\
${reference.LanBortalBeansClient.jar}:\
${reference.LanBortalDatabase.jar}
jar.name=LanBortal.ear jar.name=LanBortal.ear
javac.debug=true javac.debug=true
javac.deprecation=false javac.deprecation=false
...@@ -30,11 +31,14 @@ meta.inf=src/conf ...@@ -30,11 +31,14 @@ meta.inf=src/conf
no.dependencies=false no.dependencies=false
platform.active=default_platform platform.active=default_platform
project.LanBortalBeans=../LanBortalBeans project.LanBortalBeans=../LanBortalBeans
project.LanBortalBeansClient=../LanBortalBeansClient
project.LanBortalDatabase=../LanBortalDatabase
project.LanBortalWeb=../LanBortalWeb project.LanBortalWeb=../LanBortalWeb
reference.LanBortalBeans.dist-ear=${project.LanBortalBeans}/dist/LanBortalBeans.jar reference.LanBortalBeans.dist-ear=${project.LanBortalBeans}/dist/LanBortalBeans.jar
reference.LanBortalBeansClient.jar=${project.LanBortalBeansClient}/dist/LanBortalBeansClient.jar
reference.LanBortalDatabase.jar=${project.LanBortalDatabase}/dist/LanBortalDatabase.jar
reference.LanBortalWeb.dist-ear=${project.LanBortalWeb}/dist/LanBortalWeb.war reference.LanBortalWeb.dist-ear=${project.LanBortalWeb}/dist/LanBortalWeb.war
run.classpath=\ run.classpath=\
${file.reference.LanBortalDatabase.jar}:\
${file.reference.slf4j-api-1.5.8.jar}:\ ${file.reference.slf4j-api-1.5.8.jar}:\
${file.reference.slf4j-jdk14-1.5.8.jar} ${file.reference.slf4j-jdk14-1.5.8.jar}
source.root=${file.reference.code-LanBortal} source.root=${file.reference.code-LanBortal}
code/LanBortal/nbproject/project.xml
...@@ -15,6 +15,14 @@ ...@@ -15,6 +15,14 @@
<file>${reference.LanBortalBeans.dist-ear}</file> <file>${reference.LanBortalBeans.dist-ear}</file>
<path-in-war>/</path-in-war> <path-in-war>/</path-in-war>
</library> </library>
<library>
<file>${reference.LanBortalBeansClient.jar}</file>
<path-in-war>/</path-in-war>
</library>
<library>
<file>${reference.LanBortalDatabase.jar}</file>
<path-in-war>/</path-in-war>
</library>
</web-module-additional-libraries> </web-module-additional-libraries>
</data> </data>
<references xmlns="http://www.netbeans.org/ns/ant-project-references/1"> <references xmlns="http://www.netbeans.org/ns/ant-project-references/1">
...@@ -27,6 +35,22 @@ ...@@ -27,6 +35,22 @@
<id>dist-ear</id> <id>dist-ear</id>
</reference> </reference>
<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>
<reference>
<foreign-project>LanBortalWeb</foreign-project> <foreign-project>LanBortalWeb</foreign-project>
<artifact-type>j2ee_ear_archive</artifact-type> <artifact-type>j2ee_ear_archive</artifact-type>
<script>build.xml</script> <script>build.xml</script>
......
code/LanBortalWeb/WebContent/resources/tools/user/list.xhtml 0 → 100644
<?xml version='1.0' encoding='UTF-8' ?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml"
xmlns:h="http://java.sun.com/jsf/html">
<h:head>
<title>Facelet Title</title>
</h:head>
<h:body>
Hello from Facelets
</h:body>
</html>
code/LanBortalWeb/nbproject/build-impl.xml
...@@ -538,22 +538,20 @@ exists or setup the property manually. For example like this: ...@@ -538,22 +538,20 @@ exists or setup the property manually. For example like this:
</target> </target>
<target depends="init,compile,compile-jsps,-pre-dist,-do-dist-with-manifest,-do-dist-without-manifest" name="do-dist"/> <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"> <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-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="${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}"/> <copyfiles files="${reference.LanBortalBeans.dist}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}"/>
<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"/> <mkdir dir="${build.web.dir}/META-INF"/>
<manifest file="${build.web.dir}/META-INF/MANIFEST.MF" mode="update"/> <manifest file="${build.web.dir}/META-INF/MANIFEST.MF" mode="update"/>
</target> </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-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="${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"/> <copyfiles files="${reference.LanBortalBeans.dist}" todir="${build.web.dir}/WEB-INF/lib"/>
<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>
<target depends="init" if="dist.ear.dir" name="-clean-webinf-lib"> <target depends="init" if="dist.ear.dir" name="-clean-webinf-lib">
<delete dir="${build.web.dir}/WEB-INF/lib"/> <delete dir="${build.web.dir}/WEB-INF/lib"/>
......
code/LanBortalWeb/nbproject/genfiles.properties
build.xml.data.CRC32=df1326da build.xml.data.CRC32=40f1e2b4
build.xml.script.CRC32=99b46f90 build.xml.script.CRC32=99b46f90
build.xml.stylesheet.CRC32=c0ebde35@1.21.1.1 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. # 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. # 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=df1326da nbproject/build-impl.xml.data.CRC32=40f1e2b4
nbproject/build-impl.xml.script.CRC32=837fa726 nbproject/build-impl.xml.script.CRC32=7f685a03
nbproject/build-impl.xml.stylesheet.CRC32=b139b33b@1.21.1.1 nbproject/build-impl.xml.stylesheet.CRC32=b139b33b@1.21.1.1
code/LanBortalWeb/nbproject/project.properties
...@@ -22,7 +22,6 @@ dist.war=${dist.dir}/${war.name} ...@@ -22,7 +22,6 @@ dist.war=${dist.dir}/${war.name}
endorsed.classpath=\ endorsed.classpath=\
${libs.javaee-endorsed-api-6.0.classpath} ${libs.javaee-endorsed-api-6.0.classpath}
excludes= excludes=
file.reference.LanBortalDatabase.jar=../LanBortal/EarContent/lib/LanBortalDatabase.jar
file.reference.LanBortalWeb-src=src 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-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 file.reference.slf4j-jdk14-1.5.8.jar=../LanBortal/EarContent/lib/slf4j-jdk14-1.5.8.jar
...@@ -33,12 +32,11 @@ j2ee.server.type=gfv3ee6 ...@@ -33,12 +32,11 @@ j2ee.server.type=gfv3ee6
jar.compress=false jar.compress=false
java.source.based=true 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-api-1.5.8.jar}:\
${file.reference.slf4j-jdk14-1.5.8.jar}:\ ${file.reference.slf4j-jdk14-1.5.8.jar}:\
${reference.LanBortalBeans.dist} ${reference.LanBortalBeans.dist}:\
${reference.LanBortalBeansClient.jar}:\
${reference.LanBortalDatabase.jar}
# Space-separated list of extra javac options # Space-separated list of extra javac options
javac.compilerargs= javac.compilerargs=
javac.debug=true javac.debug=true
......
code/LanBortalWeb/nbproject/project.xml
...@@ -7,27 +7,23 @@ ...@@ -7,27 +7,23 @@
<minimum-ant-version>1.6.5</minimum-ant-version> <minimum-ant-version>1.6.5</minimum-ant-version>
<web-module-libraries> <web-module-libraries>
<library dirs="200"> <library dirs="200">
<file>${reference.LanBortalBeansClient.jar}</file> <file>${file.reference.slf4j-api-1.5.8.jar}</file>
<path-in-war>WEB-INF/lib</path-in-war> <path-in-war>WEB-INF/lib</path-in-war>
</library> </library>
<library dirs="200"> <library dirs="200">
<file>${reference.LanBortalDatabase.jar}</file> <file>${file.reference.slf4j-jdk14-1.5.8.jar}</file>
<path-in-war>WEB-INF/lib</path-in-war> <path-in-war>WEB-INF/lib</path-in-war>
</library> </library>
<library dirs="200"> <library dirs="100">
<file>${file.reference.LanBortalDatabase.jar}</file> <file>${reference.LanBortalBeans.dist}</file>
<path-in-war>WEB-INF/lib</path-in-war> <path-in-war>WEB-INF/lib</path-in-war>
</library> </library>
<library dirs="200"> <library dirs="200">
<file>${file.reference.slf4j-api-1.5.8.jar}</file> <file>${reference.LanBortalBeansClient.jar}</file>
<path-in-war>WEB-INF/lib</path-in-war> <path-in-war>WEB-INF/lib</path-in-war>
</library> </library>
<library dirs="200"> <library dirs="200">
<file>${file.reference.slf4j-jdk14-1.5.8.jar}</file> <file>${reference.LanBortalDatabase.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> <path-in-war>WEB-INF/lib</path-in-war>
</library> </library>
</web-module-libraries> </web-module-libraries>
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!