Skip to content

Riina Antikainen / Moya

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

Merged stuff... :)

2 parents 1c48fc3f f4718ec8
Inline Side-by-side
Showing with 172 additions and 84 deletions
code/LanBortal/nbproject/build-impl.xml
......@@ -150,7 +150,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-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">
<condition property="build.deploy.on.save" value="false">
<not>
......@@ -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">
<copyfiles files="${reference.LanBortalWeb.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 name="post-compile">
<!-- Empty placeholder for easier customization. -->
......@@ -455,6 +476,24 @@ exists or setup the property manually. For example like this:
<isset property="build.deploy.on.save"/>
</not>
</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">
<property location="${build.dir}" name="dist.ear.dir"/>
<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.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=8f943b1f
nbproject/build-impl.xml.script.CRC32=5677e720
nbproject/build-impl.xml.data.CRC32=717f744d
nbproject/build-impl.xml.script.CRC32=da4703d3
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}
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}
......@@ -20,7 +19,9 @@ j2ee.server.type=gfv3ee6
jar.compress=false
jar.content.additional=\
${reference.LanBortalWeb.dist-ear}:\
${reference.LanBortalBeans.dist-ear}
${reference.LanBortalBeans.dist-ear}:\
${reference.LanBortalBeansClient.jar}:\
${reference.LanBortalDatabase.jar}
jar.name=LanBortal.ear
javac.debug=true
javac.deprecation=false
......@@ -30,11 +31,14 @@ meta.inf=src/conf
no.dependencies=false
platform.active=default_platform
project.LanBortalBeans=../LanBortalBeans
project.LanBortalBeansClient=../LanBortalBeansClient
project.LanBortalDatabase=../LanBortalDatabase
project.LanBortalWeb=../LanBortalWeb
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
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
......@@ -15,6 +15,14 @@
<file>${reference.LanBortalBeans.dist-ear}</file>
<path-in-war>/</path-in-war>
</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>
</data>
<references xmlns="http://www.netbeans.org/ns/ant-project-references/1">
......@@ -27,6 +35,22 @@
<id>dist-ear</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>
<reference>
<foreign-project>LanBortalWeb</foreign-project>
<artifact-type>j2ee_ear_archive</artifact-type>
<script>build.xml</script>
......
code/LanBortalDatabase/src/fi/insomnia/bortal/model/PlaceGroup.java
......@@ -29,7 +29,6 @@ import javax.persistence.Version;
@Table(name = "groups")
@NamedQueries( {
@NamedQuery(name = "PlaceGroup.findAll", query = "SELECT p FROM PlaceGroup p"),
@NamedQuery(name = "PlaceGroup.findByCreated", query = "SELECT p FROM PlaceGroup p WHERE p.created = :created"),
@NamedQuery(name = "PlaceGroup.findByEdited", query = "SELECT p FROM PlaceGroup p WHERE p.edited = :edited"),
@NamedQuery(name = "PlaceGroup.findByCode", query = "SELECT p FROM PlaceGroup p WHERE p.code = :code"),
......
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"
xmlns:f="http://java.sun.com/jsf/core"
xmlns:composite="http://java.sun.com/jsf/composite"
xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:c="http://java.sun.com/jsp/jstl/core"
xmlns:bortal="http://java.sun.com/jsf/composite/tools/user"
>
<composite:interface>
</composite:interface>
<composite:implementation>
<h:form>
<h:dataTable border="1" id="user" value="#{userView.users}" var="user">
<h:column>
<f:facet name="header">
<h:outputText value="Id" />
</f:facet>
<h:outputText value="#{user.id}" />
</h:column>
<h:column>
<f:facet name="header">
<h:outputText value="Real name" />
</f:facet>
<h:outputText value="#{user.firstnames}" />
</h:column>
<h:column>
<f:facet name="header">
<h:outputText value="Address" />
</f:facet>
<h:outputText value="#{user.address}" />
</h:column>
<h:column>
<f:facet name="header">
<h:outputText value="Town" />
</f:facet>
<h:outputText value="#{user.town}" />
</h:column>
<h:column>
<f:facet name="header">
<h:outputText value="Zip" />
</f:facet>
<h:outputText value="#{user.zip}" />
</h:column>
<h:column>
<f:facet name="header">
<h:outputText value="Phone number" />
</f:facet>
<h:outputText value="#{user.phone}" />
</h:column>
<h:column>
<f:facet name="header">
<h:outputText value="Sex" />
</f:facet>
<h:outputText value="#{user.female}" />
</h:column>
<h:column>
<f:facet name="header">
<h:outputText value="Edit" />
</f:facet>
<h:commandButton action="#{userView.edit()}" value="Edit" />
</h:column>
</h:dataTable>
</h:form>
</composite:implementation>
</html>
code/LanBortalWeb/WebContent/user/list.xhtml
......@@ -4,6 +4,7 @@
<html xmlns="http://www.w3.org/1999/xhtml"
xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:h="http://java.sun.com/jsf/html"
xmlns:bortal="http://java.sun.com/jsf/composite/tools/user"
xmlns:f="http://java.sun.com/jsf/core">
<h:head>
<title></title>
......@@ -13,58 +14,9 @@
<ui:define name="title">EditUser</ui:define>
<ui:define name="header">Edit user</ui:define>
<ui:define name="content">
<h:form>
<h:dataTable border="1" id="user" value="#{userView.users}" var="user">
<h:column>
<f:facet name="header">
<h:outputText value="Id" />
</f:facet>
<h:outputText value="#{user.id}" />
</h:column>
<h:column>
<f:facet name="header">
<h:outputText value="Real name" />
</f:facet>
<h:outputText value="#{user.firstnames}" />
</h:column>
<h:column>
<f:facet name="header">
<h:outputText value="Address" />
</f:facet>
<h:outputText value="#{user.address}" />
</h:column>
<h:column>
<f:facet name="header">
<h:outputText value="Town" />
</f:facet>
<h:outputText value="#{user.town}" />
</h:column>
<h:column>
<f:facet name="header">
<h:outputText value="Zip" />
</f:facet>
<h:outputText value="#{user.zip}" />
</h:column>
<h:column>
<f:facet name="header">
<h:outputText value="Phone number" />
</f:facet>
<h:outputText value="#{user.phone}" />
</h:column>
<h:column>
<f:facet name="header">
<h:outputText value="Sex" />
</f:facet>
<h:outputText value="#{user.female}" />
</h:column>
<h:column>
<f:facet name="header">
<h:outputText value="Edit" />
</f:facet>
<h:commandButton action="#{userView.edit()}" value="Edit" />
</h:column>
</h:dataTable>
</h:form>
<bortal:list />
</ui:define>
<ui:define name="footer">footer</ui:define>
</ui:composition>
......
code/LanBortalWeb/nbproject/build-impl.xml
......@@ -538,22 +538,20 @@ 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}"/>
<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">
<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"/>
<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"/>
......
code/LanBortalWeb/nbproject/genfiles.properties
build.xml.data.CRC32=df1326da
build.xml.data.CRC32=40f1e2b4
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=df1326da
nbproject/build-impl.xml.script.CRC32=837fa726
nbproject/build-impl.xml.data.CRC32=40f1e2b4
nbproject/build-impl.xml.script.CRC32=7f685a03
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}
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
......@@ -33,12 +32,11 @@ j2ee.server.type=gfv3ee6
jar.compress=false
java.source.based=true
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}
${reference.LanBortalBeans.dist}:\
${reference.LanBortalBeansClient.jar}:\
${reference.LanBortalDatabase.jar}
# Space-separated list of extra javac options
javac.compilerargs=
javac.debug=true
......
code/LanBortalWeb/nbproject/project.xml
......@@ -7,27 +7,23 @@
<minimum-ant-version>1.6.5</minimum-ant-version>
<web-module-libraries>
<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>
</library>
<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>
</library>
<library dirs="200">
<file>${file.reference.LanBortalDatabase.jar}</file>
<library dirs="100">
<file>${reference.LanBortalBeans.dist}</file>
<path-in-war>WEB-INF/lib</path-in-war>
</library>
<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>
</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>
<file>${reference.LanBortalDatabase.jar}</file>
<path-in-war>WEB-INF/lib</path-in-war>
</library>
</web-module-libraries>
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!