Merge branch 'master' of H:\bortal\sync

Conflicts: code/LanBortalDatabase/src/META-INF/persistence.xml

Merge branch 'master' of H:\bortal\sync
Conflicts: code/LanBortalDatabase/src/META-INF/persistence.xml
Antti Tonkyra
Commit 5cf07a09 authored Dec 18, 2011 by Antti Tonkyra
Showing with 146 additions and 2 deletions
code/LanBortalBeans/.settings/org.eclipse.jdt.core.prefs
code/LanBortalBeans/ejbModule/fi/insomnia/bortal/beans/ActionLogBean.java
code/LanBortalBeansClient/ejbModule/fi/insomnia/bortal/beans/ActionLogBeanLocal.java
code/LanBortalWeb/WebContent/actionlog/create.xhtml
code/LanBortalWeb/src/fi/insomnia/bortal/resources/i18n_fi.properties
code/LanBortalWeb/src/fi/insomnia/bortal/web/cdiview/actionlog/ActionLogCreateView.java
code/LanBortalWeb/src/fi/insomnia/bortal/web/cdiview/actionlog/Crew.java
code/external/tuomari
--- a/code/LanBortalBeans/.settings/org.eclipse.jdt.core.prefs
+++ b/code/LanBortalBeans/.settings/org.eclipse.jdt.core.prefs
-#Sun Mar 27 01:26:01 EET 2011
+#Sat Dec 17 01:39:19 EET 2011
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
 org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.source=1.6
--- a/code/LanBortalBeans/ejbModule/fi/insomnia/bortal/beans/ActionLogBean.java
+++ b/code/LanBortalBeans/ejbModule/fi/insomnia/bortal/beans/ActionLogBean.java
+package fi.insomnia.bortal.beans;
+import javax.ejb.Stateless;
+/**
+ * Session Bean implementation class ActionLogBean
+ * eventin
+ *  - luominen
+ *  - editointi
+ *  - deletointi
+ */
+@Stateless
+public class ActionLogBean implements ActionLogBeanLocal {
+    /**
+     * Default constructor. 
+     */
+    public ActionLogBean() {
+        // TODO Auto-generated constructor stub
+    }
+    public void createActionLogEvent(String name, String crew, String message) {
+    }
+}
--- a/code/LanBortalBeansClient/ejbModule/fi/insomnia/bortal/beans/ActionLogBeanLocal.java
+++ b/code/LanBortalBeansClient/ejbModule/fi/insomnia/bortal/beans/ActionLogBeanLocal.java
+package fi.insomnia.bortal.beans;
+import javax.ejb.Local;
+@Local
+public interface ActionLogBeanLocal {
+}
--- a/code/LanBortalWeb/WebContent/actionlog/create.xhtml
+++ b/code/LanBortalWeb/WebContent/actionlog/create.xhtml
+<!DOCTYPE html 
+     PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<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:users="http://java.sun.com/jsf/composite/cditools/user"
+	xmlns:tools="http://java.sun.com/jsf/composite/cditools" xmlns:f="http://java.sun.com/jsf/core"
+>
+<h:body>
+	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+		<f:metadata>
+			<!-- f:event type="preRenderView" listener="#{newsListView.initView}" /-->
+		</f:metadata>
+		<ui:define name="content">
+		<h:form>
+			<h1>#{i18n['actionlog.create.header']}</h1>
+			<h:outputText value="#{i18n['actionlog.create.role']}" />
+			<h:selectOneMenu value="" >
+				<f:selectItems var="crew" itemLabel="#{crew.name}" value="#{actionLogCreateView.crews}"  />
+			</h:selectOneMenu>
+			<h:outputText value="#{i18n['actionlog.create.message']}" />
+			<h:inputText />
+			<h:outputText value="#{i18n['actionlog.create.taskradio']}" />
+			<h:selectBooleanCheckbox />
+			<br />
+			<h:button value="#{i18n['actionlog.create.submitbutton']}" />
+		</h:form>
+		</ui:define>
+	</ui:composition>
+</h:body>
+</html>
\ No newline at end of file
--- a/code/LanBortalWeb/src/fi/insomnia/bortal/resources/i18n_fi.properties
+++ b/code/LanBortalWeb/src/fi/insomnia/bortal/resources/i18n_fi.properties
@@ -376,3 +376,19 @@ news.expire=Lopeta julkaisu
 news.save=Tallenna
 usertitle.managingUser=Hallitaan kyttj
+actionlog.messagelist.header=Viestilista
+actionlog.tasklist.header=Taskilista
+actionlog.create.header=Luo eventti
+actionlog.create.role=Rooli
+actionlog.create.message=Viesti
+actionlog.create.taskradio=Tm on taski
+actionlog.create.submitbutton=Lhet
+actionlog.time=Aika
+actionlog.user=Tekij
+actionlog.crew=Crew
+actionlog.message=Tapahtuma
--- a/code/LanBortalWeb/src/fi/insomnia/bortal/web/cdiview/actionlog/ActionLogCreateView.java
+++ b/code/LanBortalWeb/src/fi/insomnia/bortal/web/cdiview/actionlog/ActionLogCreateView.java
+package fi.insomnia.bortal.web.cdiview.actionlog;
+import java.util.ArrayList;
+import javax.enterprise.context.RequestScoped;
+import javax.faces.model.SelectItem;
+import javax.inject.Named;
+import fi.insomnia.bortal.web.cdiview.GenericCDIView;
+@Named
+@RequestScoped
+public class ActionLogCreateView extends GenericCDIView {
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+	private ArrayList<Crew> crews = new ArrayList<Crew>();
+	public ArrayList<Crew> getCrews(){
+		crews.add(new Crew("1", "joo"));
+		crews.add(new Crew("2", "jee"));
+		return crews;
+	}
+}
--- a/code/LanBortalWeb/src/fi/insomnia/bortal/web/cdiview/actionlog/Crew.java
+++ b/code/LanBortalWeb/src/fi/insomnia/bortal/web/cdiview/actionlog/Crew.java
+package fi.insomnia.bortal.web.cdiview.actionlog;
+public class Crew {
+	private String id;
+	private String name;
+	public Crew(String id, String nimi) {
+		this.id = id;
+		this.name = nimi;
+	}
+	public String getId() {
+		return id;
+	}
+	public void setId(String id) {
+		this.id = id;
+	}
+	public String getName() {
+		return name;
+	}
+	public void setName(String name) {
+		this.name = name;
+	}
+}
--- a/tuomari @ a91e217e
+++ b/tuomari @ a91e217e
-Subproject commit a91e217e681f3baa8e73f1edd22b263a99a6828d