Skip to content

Codecrew / Moya

Go to a project
Commit 82f5b044 by Tuomas Riihimäki
Options

Glassfish 4 ja mavenisointi.

1 parent 0069d8b1
Inline Side-by-side
Showing with 1033 additions and 348 deletions
code/MoyaAuthModule/.classpath
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<classpath> <classpath>
<classpathentry kind="src" path="src"/> <classpathentry kind="src" output="target/classes" path="src">
<classpathentry kind="con" path="org.eclipse.jst.server.core.container/com.sun.enterprise.jst.server.runtimeTarget/GlassFish 3.1.2"/> <attributes>
<classpathentry combineaccessrules="false" kind="src" path="/MoyaAuthModuleClient"/> <attribute name="optional" value="true"/>
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/auth-libs"/> <attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
<attributes> <attributes>
<attribute name="owner.project.facets" value="java"/> <attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes> </attributes>
</classpathentry> </classpathentry>
<classpathentry kind="output" path="bin"/> <classpathentry kind="output" path="target/classes"/>
</classpath> </classpath>
code/MoyaAuthModule/.project
...@@ -18,8 +18,14 @@ ...@@ -18,8 +18,14 @@
<arguments> <arguments>
</arguments> </arguments>
</buildCommand> </buildCommand>
<buildCommand>
<name>org.eclipse.m2e.core.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec> </buildSpec>
<natures> <natures>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.jdt.core.javanature</nature> <nature>org.eclipse.jdt.core.javanature</nature>
<nature>org.eclipse.wst.common.project.facet.core.nature</nature> <nature>org.eclipse.wst.common.project.facet.core.nature</nature>
</natures> </natures>
......
code/MoyaAuthModule/.settings/org.eclipse.core.resources.prefs deleted 100644 → 0
#Wed Oct 27 00:25:27 EEST 2010
eclipse.preferences.version=1
encoding/<project>=UTF-8
code/MoyaAuthModule/.settings/org.eclipse.jdt.core.prefs
...@@ -8,4 +8,5 @@ org.eclipse.jdt.core.compiler.debug.localVariable=generate ...@@ -8,4 +8,5 @@ org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
org.eclipse.jdt.core.compiler.source=1.7 org.eclipse.jdt.core.compiler.source=1.7
code/MoyaAuthModule/.settings/org.eclipse.m2e.core.prefs 0 → 100644
activeProfiles=
eclipse.preferences.version=1
resolveWorkspaceProjects=true
version=1
code/MoyaAuthModule/.settings/org.eclipse.wst.common.project.facet.core.xml
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<faceted-project> <faceted-project>
<runtime name="GlassFish 3.1.2"/> <runtime name="GlassFish 4.0"/>
<installed facet="java" version="1.7"/> <installed facet="java" version="1.7"/>
</faceted-project> </faceted-project>
code/MoyaAuthModule/pom.xml 0 → 100644
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>fi.codecrew.moya</groupId>
<artifactId>moya-authmodule</artifactId>
<version>0.2.0</version>
<build>
<sourceDirectory>src</sourceDirectory>
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.1</version>
<configuration>
<source>1.7</source>
<target>1.7</target>
</configuration>
</plugin>
</plugins>
</build>
<dependencies>
<dependency>
<groupId>org.glassfish.main.security</groupId>
<artifactId>security-ee</artifactId>
<version>4.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>fi.codecrew.moya</groupId>
<artifactId>moya-authmodule-client</artifactId>
<version>0.2.0</version>
</dependency>
</dependencies>
</project>
\ No newline at end of file
code/MoyaAuthModuleClient/.classpath
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<classpath> <classpath>
<classpathentry kind="src" path="src"/> <classpathentry including="**/*.java" kind="src" output="target/classes" path="src">
<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/> <attributes>
<classpathentry kind="con" path="org.eclipse.jst.server.core.container/com.sun.enterprise.jst.server.runtimeTarget/GlassFish 3.1.2"> <attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="oracle.eclipse.tools.glassfish.lib.system">
<attributes> <attributes>
<attribute name="owner.project.facets" value="jst.utility"/> <attribute name="owner.project.facets" value="jst.utility"/>
</attributes> </attributes>
</classpathentry> </classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
<classpathentry kind="output" path="build/classes"/> <attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="org.eclipse.jst.component.nondependency" value=""/>
</attributes>
</classpathentry>
<classpathentry kind="output" path="target/classes"/>
</classpath> </classpath>
code/MoyaAuthModuleClient/.project
...@@ -25,8 +25,14 @@ ...@@ -25,8 +25,14 @@
<arguments> <arguments>
</arguments> </arguments>
</buildCommand> </buildCommand>
<buildCommand>
<name>org.eclipse.m2e.core.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec> </buildSpec>
<natures> <natures>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.jem.workbench.JavaEMFNature</nature> <nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature> <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
<nature>org.eclipse.wst.common.project.facet.core.nature</nature> <nature>org.eclipse.wst.common.project.facet.core.nature</nature>
......
code/MoyaAuthModuleClient/.settings/org.eclipse.core.resources.prefs deleted 100644 → 0
#Wed Oct 27 00:25:33 EEST 2010
eclipse.preferences.version=1
encoding/<project>=UTF-8
code/MoyaAuthModuleClient/.settings/org.eclipse.jdt.core.prefs
...@@ -8,4 +8,5 @@ org.eclipse.jdt.core.compiler.debug.localVariable=generate ...@@ -8,4 +8,5 @@ org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
org.eclipse.jdt.core.compiler.source=1.7 org.eclipse.jdt.core.compiler.source=1.7
code/MoyaAuthModuleClient/.settings/org.eclipse.m2e.core.prefs 0 → 100644
activeProfiles=
eclipse.preferences.version=1
resolveWorkspaceProjects=true
version=1
code/MoyaAuthModuleClient/.settings/org.eclipse.wst.common.project.facet.core.xml
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<faceted-project> <faceted-project>
<runtime name="GlassFish 3.1.2"/> <runtime name="GlassFish 4.0"/>
<fixed facet="java"/> <fixed facet="java"/>
<fixed facet="jst.utility"/> <fixed facet="jst.utility"/>
<installed facet="jst.utility" version="1.0"/> <installed facet="jst.utility" version="1.0"/>
......
code/MoyaBeans/.settings/org.eclipse.core.resources.prefs → code/MoyaAuthModuleClient/.settings/org.eclipse.wst.validation.prefs
disabled=06target
eclipse.preferences.version=1 eclipse.preferences.version=1
encoding/<project>=UTF-8
code/MoyaAuthModuleClient/pom.xml 0 → 100644
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>fi.codecrew.moya</groupId>
<artifactId>moya-authmodule-client</artifactId>
<version>0.2.0</version>
<build>
<sourceDirectory>src</sourceDirectory>
<resources>
<resource>
<directory>src</directory>
<excludes>
<exclude>**/*.java</exclude>
</excludes>
</resource>
</resources>
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.1</version>
<configuration>
<source>1.7</source>
<target>1.7</target>
</configuration>
</plugin>
</plugins>
</build>
</project>
\ No newline at end of file
code/MoyaAuthModuleClient/src/META-INF/MANIFEST.MF
Manifest-Version: 1.0 Manifest-Version: 1.0
Class-Path:
code/MoyaBeans/.classpath
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<classpath> <classpath>
<classpathentry kind="src" path="ejbModule"/> <classpathentry including="**/*.java" kind="src" output="target/classes" path="ejbModule">
<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/> <attributes>
<classpathentry kind="con" path="org.eclipse.jst.server.core.container/com.sun.enterprise.jst.server.runtimeTarget/GlassFish 3.1.2"> <attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="oracle.eclipse.tools.glassfish.lib.system">
<attributes> <attributes>
<attribute name="owner.project.facets" value="jst.ejb"/> <attribute name="owner.project.facets" value="jst.ejb"/>
</attributes> </attributes>
</classpathentry> </classpathentry>
<classpathentry kind="src" output="target/test-classes" path="src/test/java">
<attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
<attributes> <attributes>
<attribute name="owner.project.facets" value="java"/> <attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="org.eclipse.jst.component.nondependency" value=""/>
</attributes> </attributes>
</classpathentry> </classpathentry>
<classpathentry combineaccessrules="false" kind="src" path="/MoyaBeansClient"/> <classpathentry kind="output" path="target/classes"/>
<classpathentry kind="output" path="build/classes"/>
</classpath> </classpath>
code/MoyaBeans/.project
...@@ -20,8 +20,14 @@ ...@@ -20,8 +20,14 @@
<arguments> <arguments>
</arguments> </arguments>
</buildCommand> </buildCommand>
<buildCommand>
<name>org.eclipse.m2e.core.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec> </buildSpec>
<natures> <natures>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.jem.workbench.JavaEMFNature</nature> <nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature> <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
<nature>org.eclipse.wst.common.project.facet.core.nature</nature> <nature>org.eclipse.wst.common.project.facet.core.nature</nature>
......
code/MoyaBeans/.settings/org.eclipse.jdt.core.prefs
...@@ -8,4 +8,5 @@ org.eclipse.jdt.core.compiler.debug.localVariable=generate ...@@ -8,4 +8,5 @@ org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
org.eclipse.jdt.core.compiler.source=1.7 org.eclipse.jdt.core.compiler.source=1.7
code/MoyaBeansClient/.settings/org.eclipse.core.resources.prefs → code/MoyaBeans/.settings/org.eclipse.ltk.core.refactoring.prefs
eclipse.preferences.version=1 eclipse.preferences.version=1
encoding/<project>=UTF-8 org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=false
code/MoyaBeans/.settings/org.eclipse.m2e.core.prefs 0 → 100644
activeProfiles=
eclipse.preferences.version=1
resolveWorkspaceProjects=true
version=1
code/MoyaBeans/.settings/org.eclipse.wst.common.component
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
<project-modules id="moduleCoreId" project-version="1.5.0">
<wb-module deploy-name="MoyaBeans"> <wb-module deploy-name="MoyaBeans">
<wb-resource deploy-path="/" source-path="/ejbModule"/> <wb-resource deploy-path="/" source-path="/ejbModule" tag="defaultRootSource"/>
<property name="ClientJARURI" value="MoyaBeansClient.jar"/> <property name="ClientJARURI" value="MoyaBeansClient.jar"/>
<property name="ClientProject" value="MoyaBeansClient"/> <property name="ClientProject" value="MoyaBeansClient"/>
<property name="java-output-path" value="/MoyaBeans/build/classes"/> <property name="java-output-path" value="/MoyaBeans/build/classes"/>
......
code/MoyaBeans/.settings/org.eclipse.wst.common.project.facet.core.xml
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<faceted-project> <faceted-project>
<runtime name="GlassFish 3.1.2"/> <runtime name="GlassFish 4.0"/>
<fixed facet="java"/> <fixed facet="java"/>
<fixed facet="jst.ejb"/> <fixed facet="jst.ejb"/>
<installed facet="jst.ejb" version="3.1"/>
<installed facet="sun.facet" version="9"/>
<installed facet="java" version="1.7"/> <installed facet="java" version="1.7"/>
<installed facet="glassfish.ejb" version="4.0"/>
<installed facet="jst.ejb" version="3.2"/>
</faceted-project> </faceted-project>
code/MoyaBeans/.settings/org.eclipse.wst.validation.prefs 0 → 100644
disabled=06target
eclipse.preferences.version=1
code/MoyaBeans/.settings/org.eclipse.wst.ws.service.policy.prefs 0 → 100644
eclipse.preferences.version=1
org.eclipse.wst.ws.service.policy.projectEnabled=false
code/MoyaBeans/ejbModule/META-INF/MANIFEST.MF
Manifest-Version: 1.0 Manifest-Version: 1.0
Class-Path: lib/commons-imaging-1.0-SNAPSHOT.jar
lib/MoyaUtilities.jar
lib/MoyaBeansClient.jar
code/MoyaBeans/ejbModule/fi/codecrew/moya/beans/CardPrintBean.java
...@@ -3,14 +3,7 @@ package fi.codecrew.moya.beans; ...@@ -3,14 +3,7 @@ package fi.codecrew.moya.beans;
import java.awt.Color; import java.awt.Color;
import java.awt.Font; import java.awt.Font;
import java.awt.Graphics2D; import java.awt.Graphics2D;
import java.awt.Paint;
import java.awt.RenderingHints;
import java.awt.geom.AffineTransform;
import java.awt.geom.Point2D;
import java.awt.geom.Rectangle2D;
import java.awt.image.BufferedImage; import java.awt.image.BufferedImage;
import java.awt.image.BufferedImageOp;
import java.awt.image.ColorModel;
import java.io.ByteArrayInputStream; import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream; import java.io.ByteArrayOutputStream;
import java.io.IOException; import java.io.IOException;
...@@ -49,7 +42,6 @@ import fi.codecrew.moya.model.CardTemplate; ...@@ -49,7 +42,6 @@ import fi.codecrew.moya.model.CardTemplate;
import fi.codecrew.moya.model.EventUser; import fi.codecrew.moya.model.EventUser;
import fi.codecrew.moya.model.PrintedCard; import fi.codecrew.moya.model.PrintedCard;
import fi.codecrew.moya.util.MassPrintResult; import fi.codecrew.moya.util.MassPrintResult;
import fi.codecrew.moya.utilities.BarcodeUtils;
/** /**
* Session Bean implementation class CardPrintBean * Session Bean implementation class CardPrintBean
...@@ -123,8 +115,8 @@ public class CardPrintBean implements CardPrintBeanLocal { ...@@ -123,8 +115,8 @@ public class CardPrintBean implements CardPrintBeanLocal {
PDF pdf = new PDF(outputStream); PDF pdf = new PDF(outputStream);
pdf.setTitle("CARD"); pdf.setTitle("CARD");
double pagex = 155.52; // 54,0 mm float pagex = 155.52f; // 54,0 mm
double pagey = 243.84; // 85,5 mm float pagey = 243.84f; // 85,5 mm
MassPrintResult mpr = new MassPrintResult(); MassPrintResult mpr = new MassPrintResult();
...@@ -165,7 +157,7 @@ public class CardPrintBean implements CardPrintBeanLocal { ...@@ -165,7 +157,7 @@ public class CardPrintBean implements CardPrintBeanLocal {
faceBufferedImage = faceBufferedImage.getSubimage(offsetx, offsety, width, height); faceBufferedImage = faceBufferedImage.getSubimage(offsetx, offsety, width, height);
Page page = new Page(pdf, new double[] { pagex, pagey }); Page page = new Page(pdf, new float[] { pagex, pagey });
// Render background image // Render background image
Image templateImage = new Image(pdf, Image templateImage = new Image(pdf,
...@@ -190,12 +182,10 @@ public class CardPrintBean implements CardPrintBeanLocal { ...@@ -190,12 +182,10 @@ public class CardPrintBean implements CardPrintBeanLocal {
// User nick text // User nick text
TextLine nickTextLine = new TextLine(nickFont); TextLine nickTextLine = new TextLine(nickFont);
nickTextLine.setText(user.getUser().getNick()); nickTextLine.setText(user.getUser().getNick());
nickTextLine.setPosition(19.0, 193.0); nickTextLine.setPosition(19.0, 193.0);
nickTextLine.setColor(new double[] { 1.0, 1.0, 1.0 }); nickTextLine.setColor(new int[] { 1, 1, 1 });
nickTextLine.drawOn(page); nickTextLine.drawOn(page);
// Smaller font // Smaller font
...@@ -208,14 +198,14 @@ public class CardPrintBean implements CardPrintBeanLocal { ...@@ -208,14 +198,14 @@ public class CardPrintBean implements CardPrintBeanLocal {
TextLine wholeNameText = new TextLine(font); TextLine wholeNameText = new TextLine(font);
wholeNameText.setText(wholeName); wholeNameText.setText(wholeName);
wholeNameText.setPosition(17.0, 212.0); wholeNameText.setPosition(17.0, 212.0);
wholeNameText.setColor(new double[] { 1.0, 1.0, 1.0 }); wholeNameText.setColor(new int[] { 1, 1, 1 });
wholeNameText.drawOn(page); wholeNameText.drawOn(page);
// Role text // Role text
TextLine roleTextLine = new TextLine(font); TextLine roleTextLine = new TextLine(font);
roleTextLine.setText(cardTemplate.getName()); roleTextLine.setText(cardTemplate.getName());
roleTextLine.setPosition(17.0, 223.0); roleTextLine.setPosition(17.0, 223.0);
roleTextLine.setColor(new double[] { 1.0, 1.0, 1.0 }); roleTextLine.setColor(new int[] { 1, 1, 1 });
roleTextLine.drawOn(page); roleTextLine.drawOn(page);
// Barcode // Barcode
...@@ -267,7 +257,7 @@ public class CardPrintBean implements CardPrintBeanLocal { ...@@ -267,7 +257,7 @@ public class CardPrintBean implements CardPrintBeanLocal {
Font font = new Font("Century gothic", Font.PLAIN, 70); Font font = new Font("Century gothic", Font.PLAIN, 70);
int nickWidth = g.getFontMetrics(font).stringWidth(user.getUser().getNick()); int nickWidth = g.getFontMetrics(font).stringWidth(user.getUser().getNick());
int nickX = (646/2) - (nickWidth/2); int nickX = (646 / 2) - (nickWidth / 2);
int nickY = 750; int nickY = 750;
//Color transparentWhite = new Color(255, 255, 255, 140); //Color transparentWhite = new Color(255, 255, 255, 140);
...@@ -298,21 +288,20 @@ public class CardPrintBean implements CardPrintBeanLocal { ...@@ -298,21 +288,20 @@ public class CardPrintBean implements CardPrintBeanLocal {
g.setFont(new Font("Century gothic", Font.PLAIN, 30)); g.setFont(new Font("Century gothic", Font.PLAIN, 30));
g.setColor(Color.white); g.setColor(Color.white);
if(printedCard != null) if (printedCard != null)
g.drawString(barcodeBean.getVrAuthCodeForCard(printedCard), 445, 905); g.drawString(barcodeBean.getVrAuthCodeForCard(printedCard), 445, 905);
BufferedImage barCodeBufferedImage = ImageIO.read(barcodeBean.getCardBarcode(printedCard)); BufferedImage barCodeBufferedImage = ImageIO.read(barcodeBean.getCardBarcode(printedCard));
//int barcodeX = (base.getWidth()/2) - (image.getWidth()/2); //int barcodeX = (base.getWidth()/2) - (image.getWidth()/2);
int barcodeX = (base.getWidth() - 400)/2; int barcodeX = (base.getWidth() - 400) / 2;
int barcodeY = base.getHeight() - 50; int barcodeY = base.getHeight() - 50;
if(printedCard != null) if (printedCard != null)
g.drawImage(barCodeBufferedImage, barcodeX, barcodeY, 400, barCodeBufferedImage.getHeight(), null); g.drawImage(barCodeBufferedImage, barcodeX, barcodeY, 400, barCodeBufferedImage.getHeight(), null);
g.setColor(Color.white); g.setColor(Color.white);
g.fillRect(0, base.getHeight() - 20, base.getWidth(), base.getHeight());
g.fillRect(0, base.getHeight()-20, base.getWidth(), base.getHeight());
g.dispose(); g.dispose();
ByteArrayOutputStream ostr = new ByteArrayOutputStream(); ByteArrayOutputStream ostr = new ByteArrayOutputStream();
......
code/MoyaBeans/ejbModule/fi/codecrew/moya/beans/MailMessageBean.java
...@@ -25,11 +25,17 @@ import fi.codecrew.moya.util.MailMessage; ...@@ -25,11 +25,17 @@ import fi.codecrew.moya.util.MailMessage;
* Message-Driven Bean implementation class for: MailMessageBean * Message-Driven Bean implementation class for: MailMessageBean
* *
*/ */
@MessageDriven(activationConfig = { @ActivationConfigProperty(propertyName = "destinationType", propertyValue = "javax.jms.Queue") }, mappedName = "jms/bortalMailQueue") @MessageDriven(activationConfig = {
@ActivationConfigProperty(
propertyName = "destinationType",
propertyValue = "javax.jms.Queue")
},
mappedName = "jms/moyaMailQueue")
public class MailMessageBean implements MessageListener { public class MailMessageBean implements MessageListener {
@Resource(name = "mail/bortal") @Resource(name = "mail/moya")
private Session mailSession; private Session mailSession;
private static final Logger logger = LoggerFactory private static final Logger logger = LoggerFactory
.getLogger(MailMessageBean.class); .getLogger(MailMessageBean.class);
......
code/MoyaBeans/ejbModule/fi/codecrew/moya/beans/PlaceBean.java
...@@ -115,12 +115,9 @@ public class PlaceBean implements PlaceBeanLocal { ...@@ -115,12 +115,9 @@ public class PlaceBean implements PlaceBeanLocal {
} }
/** /**
* Calculate the price of reserved places for the user Optional parameter * Calculate the price of reserved places for the user Optional parameter newPlace can be given when the place is added to the price calculations;
* newPlace can be given when the place is added to the price calculations;
* *
* User parameter can be used to select another user than the currently * User parameter can be used to select another user than the currently logged in user, but if user does not have enough rights an exception will be thrown
* logged in user, but if user does not have enough rights an exception will
* be thrown
* *
*/ */
...@@ -187,8 +184,7 @@ public class PlaceBean implements PlaceBeanLocal { ...@@ -187,8 +184,7 @@ public class PlaceBean implements PlaceBeanLocal {
} }
/** /**
* Reserve the place for user. This reservation will timeout after a while * Reserve the place for user. This reservation will timeout after a while buy() method should be called after this when buying place;
* buy() method should be called after this when buying place;
* *
* @param place * @param place
* place to be reserved * place to be reserved
...@@ -516,21 +512,19 @@ public class PlaceBean implements PlaceBeanLocal { ...@@ -516,21 +512,19 @@ public class PlaceBean implements PlaceBeanLocal {
return place; return place;
} }
private byte[] generatePlacesPdf(double width, double height, double font1, double font2, List<Place> places) throws Exception { private byte[] generatePlacesPdf(float width, float height, double font1, double font2, List<Place> places) throws Exception {
ByteArrayOutputStream outputStream = new ByteArrayOutputStream(); ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
PDF pdf = new PDF(outputStream); PDF pdf = new PDF(outputStream);
pdf.setTitle("Place"); pdf.setTitle("Place");
double pointInMillim = (25.4/72.0); // 1 point is 1/72 inches. 1 inch = 25.4mm float pointInMillim = (25.4f / 72.0f); // 1 point is 1/72 inches. 1 inch = 25.4mm
double pagex = width / pointInMillim; float pagex = width / pointInMillim;
double pagey = height / pointInMillim; float pagey = height / pointInMillim;
for (Place place : places) {
Page page = new Page(pdf, new float[] { pagex, pagey });
for(Place place : places) {
Page page = new Page(pdf, new double[] { pagex, pagey });
// place code // place code
com.pdfjet.Font font = new com.pdfjet.Font(pdf, CoreFont.HELVETICA); com.pdfjet.Font font = new com.pdfjet.Font(pdf, CoreFont.HELVETICA);
...@@ -539,20 +533,20 @@ public class PlaceBean implements PlaceBeanLocal { ...@@ -539,20 +533,20 @@ public class PlaceBean implements PlaceBeanLocal {
TextLine textLine = new TextLine(font); TextLine textLine = new TextLine(font);
textLine.setText(place.getName()); textLine.setText(place.getName());
textLine.setPosition(5, 15); textLine.setPosition(5, 15);
textLine.setColor(new double[] { 0, 0, 0 }); textLine.setColor(new int[] { 0, 0, 0 });
textLine.drawOn(page); textLine.drawOn(page);
double currentX = 42; double currentX = 42;
// nick // nick
if(place.getPlaceReserver() != null && place.getPlaceReserver().getUser() != null) { if (place.getPlaceReserver() != null && place.getPlaceReserver().getUser() != null) {
font = new com.pdfjet.Font(pdf, CoreFont.HELVETICA); font = new com.pdfjet.Font(pdf, CoreFont.HELVETICA);
font.setSize(font2); font.setSize(font2);
textLine = new TextLine(font); textLine = new TextLine(font);
textLine.setText(place.getPlaceReserver().getUser().getNick()); textLine.setText(place.getPlaceReserver().getUser().getNick());
textLine.setPosition(currentX, 15); textLine.setPosition(currentX, 15);
textLine.setColor(new double[] { 0, 0, 0 }); textLine.setColor(new int[] { 0, 0, 0 });
textLine.drawOn(page); textLine.drawOn(page);
} }
...@@ -561,12 +555,11 @@ public class PlaceBean implements PlaceBeanLocal { ...@@ -561,12 +555,11 @@ public class PlaceBean implements PlaceBeanLocal {
font.setSize(font2); font.setSize(font2);
textLine = new TextLine(font); textLine = new TextLine(font);
textLine.setText( barcodeBean.getPlaceHexcode(place)); textLine.setText(barcodeBean.getPlaceHexcode(place));
textLine.setPosition(currentX, (pagey / 2)+font1); textLine.setPosition(currentX, (pagey / 2) + font1);
textLine.setColor(new double[] { 0, 0, 0 }); textLine.setColor(new int[] { 0, 0, 0 });
textLine.drawOn(page); textLine.drawOn(page);
} }
pdf.flush(); pdf.flush();
...@@ -576,9 +569,9 @@ public class PlaceBean implements PlaceBeanLocal { ...@@ -576,9 +569,9 @@ public class PlaceBean implements PlaceBeanLocal {
} }
@Override @Override
public byte[] generatePlacesPdf(double width, double height, double font1, double font2) { public byte[] generatePlacesPdf(float width, float height, double font1, double font2) {
try { try {
return generatePlacesPdf(width,height,font1, font1, placeFacade.findAll()); return generatePlacesPdf(width, height, font1, font1, placeFacade.findAll());
} catch (Exception e) { } catch (Exception e) {
logger.error("Exception from place pdf generation.", e); logger.error("Exception from place pdf generation.", e);
...@@ -586,8 +579,3 @@ public class PlaceBean implements PlaceBeanLocal { ...@@ -586,8 +579,3 @@ public class PlaceBean implements PlaceBeanLocal {
} }
} }
} }
code/MoyaBeans/ejbModule/fi/codecrew/moya/beans/UtilBean.java
...@@ -26,10 +26,8 @@ import javax.jms.Session; ...@@ -26,10 +26,8 @@ import javax.jms.Session;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import fi.codecrew.moya.facade.UserFacade;
import fi.codecrew.moya.beans.EventBeanLocal;
import fi.codecrew.moya.beans.UtilBeanLocal;
import fi.codecrew.moya.enums.apps.SpecialPermission; import fi.codecrew.moya.enums.apps.SpecialPermission;
import fi.codecrew.moya.facade.UserFacade;
import fi.codecrew.moya.model.LanEventPropertyKey; import fi.codecrew.moya.model.LanEventPropertyKey;
import fi.codecrew.moya.model.User; import fi.codecrew.moya.model.User;
import fi.codecrew.moya.model.UserImage; import fi.codecrew.moya.model.UserImage;
...@@ -55,9 +53,9 @@ public class UtilBean implements UtilBeanLocal { ...@@ -55,9 +53,9 @@ public class UtilBean implements UtilBeanLocal {
public UtilBean() { public UtilBean() {
} }
@Resource(name = "jmsQueue", mappedName = "jms/bortalMailQueue") @Resource(name = "jmsQueue", mappedName = "jms/moyaMailQueue")
private Queue mailQueue; private Queue mailQueue;
@Resource(name = "connFactory", mappedName = "jms/mailConnectionFactory") @Resource(name = "connFactory", mappedName = "jms/moyaMailQueueFactory")
private QueueConnectionFactory mailQuefactory; private QueueConnectionFactory mailQuefactory;
@EJB @EJB
private UserFacade userfacade; private UserFacade userfacade;
......
code/MoyaBeans/pom.xml 0 → 100644
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>fi.codecrew.moya</groupId>
<artifactId>moya-beans</artifactId>
<version>0.2.0</version>
<packaging>ejb</packaging>
<build>
<sourceDirectory>ejbModule</sourceDirectory>
<resources>
<resource>
<directory>ejbModule</directory>
<excludes>
<exclude>**/*.java</exclude>
</excludes>
</resource>
</resources>
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.1</version>
<configuration>
<source>1.7</source>
<target>1.7</target>
</configuration>
</plugin>
<plugin>
<artifactId>maven-ejb-plugin</artifactId>
<version>2.3</version>
<configuration>
<ejbVersion>3.2</ejbVersion>
</configuration>
</plugin>
</plugins>
</build>
<repositories>
<repository>
<id>iudex</id>
<url>http://iudex.fi/maven/</url>
</repository>
</repositories>
<dependencies>
<dependency>
<groupId>fi.codecrew.moya</groupId>
<artifactId>moya-beans-client</artifactId>
<version>0.2.0</version>
</dependency>
<dependency>
<groupId>fi.iudex.pdfjet</groupId>
<artifactId>pdfjet</artifactId>
<version>0.0.0-2013-08-19</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-io</artifactId>
<version>1.3.2</version>
</dependency>
<dependency>
<groupId>fi.codecrew.moya</groupId>
<artifactId>moya-authmodule-client</artifactId>
<version>0.2.0</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<version>4.3-beta2</version>
</dependency>
</dependencies>
</project>
\ No newline at end of file
code/MoyaBeansClient/.classpath
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<classpath> <classpath>
<classpathentry kind="src" path="ejbModule"/> <classpathentry including="**/*.java" kind="src" output="target/classes" path="ejbModule">
<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/> <attributes>
<classpathentry kind="con" path="org.eclipse.jst.server.core.container/com.sun.enterprise.jst.server.runtimeTarget/GlassFish 3.1.2"> <attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="oracle.eclipse.tools.glassfish.lib.system">
<attributes> <attributes>
<attribute name="owner.project.facets" value="jst.utility"/> <attribute name="owner.project.facets" value="jst.utility"/>
</attributes> </attributes>
</classpathentry> </classpathentry>
<classpathentry kind="src" output="target/test-classes" path="src/test/java">
<attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
<attributes> <attributes>
<attribute name="owner.project.facets" value="java"/> <attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="org.eclipse.jst.component.nondependency" value=""/>
</attributes> </attributes>
</classpathentry> </classpathentry>
<classpathentry combineaccessrules="false" kind="src" path="/MoyaDatabase"/> <classpathentry kind="output" path="target/classes"/>
<classpathentry kind="output" path="build/classes"/>
</classpath> </classpath>
code/MoyaBeansClient/.project
...@@ -25,8 +25,14 @@ ...@@ -25,8 +25,14 @@
<arguments> <arguments>
</arguments> </arguments>
</buildCommand> </buildCommand>
<buildCommand>
<name>org.eclipse.m2e.core.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec> </buildSpec>
<natures> <natures>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.jem.workbench.JavaEMFNature</nature> <nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature> <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
<nature>org.eclipse.wst.common.project.facet.core.nature</nature> <nature>org.eclipse.wst.common.project.facet.core.nature</nature>
......
code/MoyaBeansClient/.settings/org.eclipse.jdt.core.prefs
...@@ -4,4 +4,5 @@ org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 ...@@ -4,4 +4,5 @@ org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
org.eclipse.jdt.core.compiler.compliance=1.7 org.eclipse.jdt.core.compiler.compliance=1.7
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
org.eclipse.jdt.core.compiler.source=1.7 org.eclipse.jdt.core.compiler.source=1.7
code/MoyaBeansClient/.settings/org.eclipse.ltk.core.refactoring.prefs 0 → 100644
eclipse.preferences.version=1
org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=false
code/MoyaBeansClient/.settings/org.eclipse.m2e.core.prefs 0 → 100644
activeProfiles=
eclipse.preferences.version=1
resolveWorkspaceProjects=true
version=1
code/MoyaBeansClient/.settings/org.eclipse.wst.common.project.facet.core.xml
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<faceted-project> <faceted-project>
<runtime name="GlassFish 3.1.2"/> <runtime name="GlassFish 4.0"/>
<fixed facet="java"/> <fixed facet="java"/>
<fixed facet="jst.utility"/> <fixed facet="jst.utility"/>
<installed facet="jst.utility" version="1.0"/> <installed facet="jst.utility" version="1.0"/>
......
code/MoyaBeansClient/.settings/org.eclipse.wst.validation.prefs 0 → 100644
disabled=06target
eclipse.preferences.version=1
code/MoyaBeansClient/ejbModule/META-INF/MANIFEST.MF
Manifest-Version: 1.0 Manifest-Version: 1.0
Class-Path: MoyaDatabase.jar
code/MoyaBeansClient/ejbModule/fi/codecrew/moya/beans/PlaceBeanLocal.java
...@@ -49,12 +49,18 @@ public interface PlaceBeanLocal { ...@@ -49,12 +49,18 @@ public interface PlaceBeanLocal {
/** /**
* *
* @param width page width in millimeters * @param width
* @param height page height in millimeters * page width in millimeters
* @param font1 font 1 size * @param height
* @param font2 font 2 size * page height in millimeters
* @param font1
* font 1 size
* @param font2
* font 2 size
* @return * @return
*/ */
public byte[] generatePlacesPdf(double width, double height, double font1, double font2);
byte[] generatePlacesPdf(float width, float height, double font1, double font2);
// public byte[] generatePlacesPdf(double width, double height, double font1, double font2);
} }
code/MoyaBeansClient/pom.xml 0 → 100644
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>fi.codecrew.moya</groupId>
<artifactId>moya-beans-client</artifactId>
<version>0.2.0</version>
<build>
<sourceDirectory>ejbModule</sourceDirectory>
<resources>
<resource>
<directory>ejbModule</directory>
<excludes>
<exclude>**/*.java</exclude>
</excludes>
</resource>
</resources>
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.1</version>
<configuration>
<source>1.7</source>
<target>1.7</target>
</configuration>
</plugin>
</plugins>
</build>
<dependencies>
<dependency>
<groupId>fi.codecrew.moya</groupId>
<artifactId>moya-database</artifactId>
<version>0.2.0</version>
</dependency>
</dependencies>
</project>
\ No newline at end of file
code/MoyaCardPrinter/.classpath
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<classpath> <classpath>
<classpathentry kind="src" path="src"/> <classpathentry kind="src" output="target/classes" path="src">
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/> <attributes>
<classpathentry kind="output" path="bin"/> <attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="output" path="target/classes"/>
</classpath> </classpath>
code/MoyaCardPrinter/.project
...@@ -6,12 +6,24 @@ ...@@ -6,12 +6,24 @@
</projects> </projects>
<buildSpec> <buildSpec>
<buildCommand> <buildCommand>
<name>org.eclipse.wst.common.project.facet.core.builder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name> <name>org.eclipse.jdt.core.javabuilder</name>
<arguments> <arguments>
</arguments> </arguments>
</buildCommand> </buildCommand>
<buildCommand>
<name>org.eclipse.m2e.core.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec> </buildSpec>
<natures> <natures>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.jdt.core.javanature</nature> <nature>org.eclipse.jdt.core.javanature</nature>
<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
</natures> </natures>
</projectDescription> </projectDescription>
code/MoyaCardPrinter/.settings/org.eclipse.jdt.core.prefs
...@@ -8,4 +8,5 @@ org.eclipse.jdt.core.compiler.debug.localVariable=generate ...@@ -8,4 +8,5 @@ org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
org.eclipse.jdt.core.compiler.source=1.7 org.eclipse.jdt.core.compiler.source=1.7
code/MoyaCardPrinter/.settings/org.eclipse.m2e.core.prefs 0 → 100644
activeProfiles=
eclipse.preferences.version=1
resolveWorkspaceProjects=true
version=1
code/MoyaCardPrinter/.settings/org.eclipse.wst.common.project.facet.core.xml 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<faceted-project>
<installed facet="java" version="1.7"/>
</faceted-project>
code/MoyaCardPrinter/pom.xml 0 → 100644
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>fi.codecrew.moya</groupId>
<artifactId>moya-cardprinter</artifactId>
<version>0.2.0</version>
<build>
<sourceDirectory>src</sourceDirectory>
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.1</version>
<configuration>
<source>1.7</source>
<target>1.7</target>
</configuration>
</plugin>
</plugins>
</build>
<dependencies>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>1.0.13</version>
</dependency>
</dependencies>
</project>
\ No newline at end of file
code/MoyaCardPrinter/src/fi/codecrew/moya/cardprinter/CardPrinter.java
...@@ -6,7 +6,6 @@ import java.io.IOException; ...@@ -6,7 +6,6 @@ import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.util.HashSet; import java.util.HashSet;
import java.util.Set; import java.util.Set;
import java.util.logging.Logger;
import javax.print.DocFlavor; import javax.print.DocFlavor;
import javax.print.DocPrintJob; import javax.print.DocPrintJob;
...@@ -15,6 +14,9 @@ import javax.print.PrintService; ...@@ -15,6 +14,9 @@ import javax.print.PrintService;
import javax.print.PrintServiceLookup; import javax.print.PrintServiceLookup;
import javax.print.SimpleDoc; import javax.print.SimpleDoc;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class CardPrinter { public class CardPrinter {
/** /**
......
code/MoyaDatabase/.classpath
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<classpath> <classpath>
<classpathentry kind="src" path="src"/> <classpathentry including="**/*.java" kind="src" output="target/classes" path="src">
<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/> <attributes>
<classpathentry kind="con" path="org.eclipse.jst.server.core.container/com.sun.enterprise.jst.server.runtimeTarget/GlassFish 3.1.2"> <attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="oracle.eclipse.tools.glassfish.lib.system">
<attributes> <attributes>
<attribute name="owner.project.facets" value="jst.utility"/> <attribute name="owner.project.facets" value="jst.utility"/>
</attributes> </attributes>
</classpathentry> </classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
<attributes> <attributes>
<attribute name="owner.project.facets" value="java"/> <attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="org.eclipse.jst.component.nondependency" value=""/>
</attributes> </attributes>
</classpathentry> </classpathentry>
<classpathentry kind="output" path="build/classes"/> <classpathentry kind="output" path="target/classes"/>
</classpath> </classpath>
code/MoyaDatabase/.project
...@@ -42,8 +42,14 @@ ...@@ -42,8 +42,14 @@
<arguments> <arguments>
</arguments> </arguments>
</buildCommand> </buildCommand>
<buildCommand>
<name>org.eclipse.m2e.core.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec> </buildSpec>
<natures> <natures>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.jem.workbench.JavaEMFNature</nature> <nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature> <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
<nature>org.eclipse.wst.common.project.facet.core.nature</nature> <nature>org.eclipse.wst.common.project.facet.core.nature</nature>
......
code/MoyaDatabase/.settings/org.eclipse.core.resources.prefs deleted 100644 → 0
#Wed Oct 27 00:25:52 EEST 2010
eclipse.preferences.version=1
encoding/<project>=UTF-8
code/MoyaDatabase/.settings/org.eclipse.jdt.core.prefs
...@@ -8,6 +8,7 @@ org.eclipse.jdt.core.compiler.debug.localVariable=generate ...@@ -8,6 +8,7 @@ org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
org.eclipse.jdt.core.compiler.source=1.7 org.eclipse.jdt.core.compiler.source=1.7
org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
......
code/MoyaDatabase/.settings/org.eclipse.jpt.core.prefs
eclipse.preferences.version=1 eclipse.preferences.version=1
org.eclipse.jpt.core.discoverAnnotatedClasses=true org.eclipse.jpt.core.discoverAnnotatedClasses=true
org.eclipse.jpt.core.platform=eclipselink2_3 org.eclipse.jpt.core.platform=eclipselink2_5
org.eclipse.jpt.jpa.core.discoverAnnotatedClasses=true org.eclipse.jpt.jpa.core.discoverAnnotatedClasses=true
org.eclipse.jpt.jpa.core.metamodelSourceFolderName=src org.eclipse.jpt.jpa.core.metamodelSourceFolderName=src
code/MoyaDatabase/.settings/org.eclipse.m2e.core.prefs 0 → 100644
activeProfiles=
eclipse.preferences.version=1
resolveWorkspaceProjects=true
version=1
code/MoyaDatabase/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml
<root> <root>
<facet id="jpt.jpa"> <facet id="jpt.jpa">
<node name="libprov"> <node name="libprov">
<attribute name="provider-id" value="jpa-no-op-library-provider"/> <attribute name="provider-id" value="GlassFish-4-SystemLibrary-JPA"/>
</node> </node>
<node name="osgi-bundles-container"/> <node name="osgi-bundles-container"/>
</facet> </facet>
......
code/MoyaDatabase/.settings/org.eclipse.wst.common.project.facet.core.xml
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<faceted-project> <faceted-project>
<runtime name="GlassFish 3.1.2"/> <runtime name="GlassFish 4.0"/>
<fixed facet="jst.utility"/> <fixed facet="jst.utility"/>
<fixed facet="jst.java"/> <fixed facet="jst.java"/>
<fixed facet="jpt.jpa"/> <fixed facet="jpt.jpa"/>
<installed facet="jst.utility" version="1.0"/> <installed facet="jst.utility" version="1.0"/>
<installed facet="jpt.jpa" version="2.0"/>
<installed facet="jst.java" version="1.7"/> <installed facet="jst.java" version="1.7"/>
<installed facet="jpt.jpa" version="2.1"/>
</faceted-project> </faceted-project>
code/MoyaDatabase/.settings/org.eclipse.wst.validation.prefs 0 → 100644
disabled=06target
eclipse.preferences.version=1
code/MoyaDatabase/pom.xml 0 → 100644
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>fi.codecrew.moya</groupId>
<artifactId>moya-database</artifactId>
<version>0.2.0</version>
<build>
<sourceDirectory>src</sourceDirectory>
<resources>
<resource>
<directory>src</directory>
<excludes>
<exclude>**/*.java</exclude>
</excludes>
</resource>
</resources>
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.1</version>
<configuration>
<source>1.7</source>
<target>1.7</target>
</configuration>
</plugin>
</plugins>
</build>
<dependencies>
<dependency>
<groupId>fi.codecrew.moya</groupId>
<artifactId>moya-utils</artifactId>
<version>0.2.0</version>
</dependency>
<dependency>
<groupId>org.ancoron.postgresql</groupId>
<artifactId>org.ancoron.postgresql.jpa</artifactId>
<version>9.1.901.jdbc4.1-rc9</version>
<exclusions>
<exclusion>
<artifactId>javax.persistence</artifactId>
<groupId>org.eclipse.persistence</groupId>
</exclusion>
<exclusion>
<artifactId>org.eclipse.persistence.osgi</artifactId>
<groupId>org.eclipse.persistence</groupId>
</exclusion>
<exclusion>
<artifactId>org.eclipse.persistence.core</artifactId>
<groupId>org.eclipse.persistence</groupId>
</exclusion>
<exclusion>
<artifactId>org.postgresql</artifactId>
<groupId>org.ancoron.postgresql</groupId>
</exclusion>
<exclusion>
<artifactId>org.postgresql.net</artifactId>
<groupId>org.ancoron.postgresql</groupId>
</exclusion>
</exclusions>
</dependency>
</dependencies>
</project>
\ No newline at end of file
code/MoyaDatabase/src/META-INF/MANIFEST.MF
Manifest-Version: 1.0 Manifest-Version: 1.0
Class-Path: bcprov-jdk16-146.jar
bcmail-jdk16-146.jar
org.ancoron.postgresql.jpa-9.1.901.jdbc4.1-rc6.jar
org.postgresql-9.1.901.jdbc4.1-rc6.jar
org.postgresql.net-9.1.901.jdbc4.1-rc6.jar
MoyaUtilities.jar
code/MoyaDatabase/src/META-INF/persistence.xml
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<persistence version="1.0" <persistence version="2.0"
xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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"> xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd">
<persistence-unit name="MoyaDb" transaction-type="JTA"> <persistence-unit name="MoyaDb">
<jta-data-source>jdbc/moyaDb</jta-data-source> <jta-data-source>jdbc/moyaDb</jta-data-source>
<properties> <properties>
<property name="eclipselink.ddl-generation" value="create-tables" /> <property name="eclipselink.ddl-generation" value="create-tables" />
......
code/MoyaEar/.project
...@@ -5,14 +5,7 @@ ...@@ -5,14 +5,7 @@
<projects> <projects>
<project>lib-AuthModule-depends</project> <project>lib-AuthModule-depends</project>
<project>MoyaAuthModule</project> <project>MoyaAuthModule</project>
<project>MoyaAuthModuleClient</project>
<project>MoyaBeans</project>
<project>MoyaBeansClient</project>
<project>MoyaCardPrinter</project> <project>MoyaCardPrinter</project>
<project>MoyaDatabase</project>
<project>MoyaTerminalWeb</project>
<project>MoyaUtilities</project>
<project>MoyaWeb</project>
</projects> </projects>
<buildSpec> <buildSpec>
<buildCommand> <buildCommand>
...@@ -25,8 +18,14 @@ ...@@ -25,8 +18,14 @@
<arguments> <arguments>
</arguments> </arguments>
</buildCommand> </buildCommand>
<buildCommand>
<name>org.eclipse.m2e.core.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec> </buildSpec>
<natures> <natures>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.wst.common.project.facet.core.nature</nature> <nature>org.eclipse.wst.common.project.facet.core.nature</nature>
<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature> <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
</natures> </natures>
......
code/MoyaEar/.settings/org.eclipse.m2e.core.prefs 0 → 100644
activeProfiles=
eclipse.preferences.version=1
resolveWorkspaceProjects=true
version=1
code/MoyaEar/.settings/org.eclipse.wst.common.component
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
<project-modules id="moduleCoreId" project-version="1.5.0"> <wb-module deploy-name="moya-ear-0.2.0">
<wb-module deploy-name="MoyaEar"> <wb-resource deploy-path="/" source-path="/target/m2e-wtp/ear-resources"/>
<wb-resource deploy-path="/" source-path="/EarContent"/> <wb-resource deploy-path="/" source-path="/EarContent" tag="defaultRootSource"/>
<dependent-module archiveName="LanBortalWeb.war" deploy-path="/" handle="module:/resource/LanBortalWeb/LanBortalWeb"> <dependent-module archiveName="moya-beans-0.2.0.jar" deploy-path="/" handle="module:/resource/MoyaBeans/MoyaBeans">
<dependent-object/>
<dependency-type>uses</dependency-type> <dependency-type>uses</dependency-type>
</dependent-module> </dependent-module>
<dependent-module archiveName="MoyaAuthModuleClient.jar" deploy-path="/lib" handle="module:/resource/MoyaAuthModuleClient/MoyaAuthModuleClient"> <dependent-module archiveName="moya-beans-client-0.2.0.jar" deploy-path="/lib" handle="module:/resource/MoyaBeansClient/MoyaBeansClient">
<dependency-type>uses</dependency-type> <dependency-type>uses</dependency-type>
</dependent-module> </dependent-module>
<dependent-module archiveName="MoyaBeans.jar" deploy-path="/" handle="module:/resource/MoyaBeans/MoyaBeans"> <dependent-module archiveName="moya-database-0.2.0.jar" deploy-path="/lib" handle="module:/resource/MoyaDatabase/MoyaDatabase">
<dependent-object/>
<dependency-type>uses</dependency-type> <dependency-type>uses</dependency-type>
</dependent-module> </dependent-module>
<dependent-module archiveName="MoyaBeansClient.jar" deploy-path="/lib" handle="module:/resource/MoyaBeansClient/MoyaBeansClient"> <dependent-module archiveName="moya-utils-0.2.0.jar" deploy-path="/lib" handle="module:/resource/MoyaUtilities/MoyaUtilities">
<dependency-type>uses</dependency-type> <dependency-type>uses</dependency-type>
</dependent-module> </dependent-module>
<dependent-module archiveName="MoyaDatabase.jar" deploy-path="/lib" handle="module:/resource/MoyaDatabase/MoyaDatabase"> <dependent-module archiveName="barcode4j-2.1.jar" deploy-path="/lib" handle="module:/classpath/var/M2_REPO/net/sf/barcode4j/barcode4j/2.1/barcode4j-2.1.jar">
<dependency-type>uses</dependency-type> <dependency-type>uses</dependency-type>
</dependent-module> </dependent-module>
<dependent-module archiveName="MoyaTerminalWeb.war" deploy-path="/" handle="module:/resource/MoyaTerminalWeb/MoyaTerminalWeb"> <dependent-module archiveName="commons-imaging-1.0-SNAPSHOT.jar" deploy-path="/lib" handle="module:/classpath/var/M2_REPO/org/apache/commons/commons-imaging/1.0-SNAPSHOT/commons-imaging-1.0-SNAPSHOT.jar">
<dependent-object/>
<dependency-type>uses</dependency-type> <dependency-type>uses</dependency-type>
</dependent-module> </dependent-module>
<dependent-module archiveName="MoyaUtilities.jar" deploy-path="/lib" handle="module:/resource/MoyaUtilities/MoyaUtilities"> <dependent-module archiveName="org.ancoron.postgresql.jpa-9.1.901.jdbc4.1-rc9.jar" deploy-path="/lib" handle="module:/classpath/var/M2_REPO/org/ancoron/postgresql/org.ancoron.postgresql.jpa/9.1.901.jdbc4.1-rc9/org.ancoron.postgresql.jpa-9.1.901.jdbc4.1-rc9.jar">
<dependency-type>uses</dependency-type> <dependency-type>uses</dependency-type>
</dependent-module> </dependent-module>
<dependent-module archiveName="MoyaWeb.war" deploy-path="/" handle="module:/resource/MoyaWeb/MoyaWeb"> <dependent-module archiveName="pdfjet-0.0.0-2013-08-19.jar" deploy-path="/lib" handle="module:/classpath/var/M2_REPO/fi/iudex/pdfjet/pdfjet/0.0.0-2013-08-19/pdfjet-0.0.0-2013-08-19.jar">
<dependent-object/> <dependency-type>uses</dependency-type>
</dependent-module>
<dependent-module archiveName="commons-io-1.3.2.jar" deploy-path="/lib" handle="module:/classpath/var/M2_REPO/commons-io/commons-io/1.3.2/commons-io-1.3.2.jar">
<dependency-type>uses</dependency-type>
</dependent-module>
<dependent-module archiveName="moya-authmodule-client-0.2.0.jar" deploy-path="/lib" handle="module:/resource/MoyaAuthModuleClient/MoyaAuthModuleClient">
<dependency-type>uses</dependency-type>
</dependent-module>
<dependent-module archiveName="httpclient-4.3-beta2.jar" deploy-path="/lib" handle="module:/classpath/var/M2_REPO/org/apache/httpcomponents/httpclient/4.3-beta2/httpclient-4.3-beta2.jar">
<dependency-type>uses</dependency-type>
</dependent-module>
<dependent-module archiveName="httpcore-4.3-beta2.jar" deploy-path="/lib" handle="module:/classpath/var/M2_REPO/org/apache/httpcomponents/httpcore/4.3-beta2/httpcore-4.3-beta2.jar">
<dependency-type>uses</dependency-type>
</dependent-module>
<dependent-module archiveName="commons-logging-1.1.1.jar" deploy-path="/lib" handle="module:/classpath/var/M2_REPO/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar">
<dependency-type>uses</dependency-type>
</dependent-module>
<dependent-module archiveName="commons-codec-1.6.jar" deploy-path="/lib" handle="module:/classpath/var/M2_REPO/commons-codec/commons-codec/1.6/commons-codec-1.6.jar">
<dependency-type>uses</dependency-type>
</dependent-module>
<dependent-module archiveName="moya-web-0.2.0.war" deploy-path="/" handle="module:/resource/MoyaWeb/MoyaWeb">
<dependency-type>uses</dependency-type>
</dependent-module>
<dependent-module archiveName="commons-fileupload-1.3.jar" deploy-path="/lib" handle="module:/classpath/var/M2_REPO/commons-fileupload/commons-fileupload/1.3/commons-fileupload-1.3.jar">
<dependency-type>uses</dependency-type>
</dependent-module>
<dependent-module archiveName="sshd-core-0.8.0.jar" deploy-path="/lib" handle="module:/classpath/var/M2_REPO/org/apache/sshd/sshd-core/0.8.0/sshd-core-0.8.0.jar">
<dependency-type>uses</dependency-type>
</dependent-module>
<dependent-module archiveName="mina-core-2.0.5.jar" deploy-path="/lib" handle="module:/classpath/var/M2_REPO/org/apache/mina/mina-core/2.0.5/mina-core-2.0.5.jar">
<dependency-type>uses</dependency-type>
</dependent-module>
<dependent-module archiveName="slf4j-jdk14-1.7.5.jar" deploy-path="/lib" handle="module:/classpath/var/M2_REPO/org/slf4j/slf4j-jdk14/1.7.5/slf4j-jdk14-1.7.5.jar">
<dependency-type>uses</dependency-type>
</dependent-module>
<dependent-module archiveName="slf4j-api-1.7.5.jar" deploy-path="/lib" handle="module:/classpath/var/M2_REPO/org/slf4j/slf4j-api/1.7.5/slf4j-api-1.7.5.jar">
<dependency-type>uses</dependency-type> <dependency-type>uses</dependency-type>
</dependent-module> </dependent-module>
</wb-module> </wb-module>
......
code/MoyaEar/.settings/org.eclipse.wst.common.project.facet.core.xml
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<faceted-project> <faceted-project>
<runtime name="GlassFish 3.1.2"/> <runtime name="GlassFish 4.0"/>
<fixed facet="jst.ear"/> <fixed facet="jst.ear"/>
<installed facet="jst.ear" version="6.0"/> <installed facet="jst.ear" version="7.0"/>
<installed facet="sun.facet" version="9"/>
</faceted-project> </faceted-project>
code/MoyaEar/.settings/org.eclipse.wst.validation.prefs 0 → 100644
disabled=06target
eclipse.preferences.version=1
code/MoyaEar/EarContent/META-INF/sun-application.xml deleted 100644 → 0
<!DOCTYPE sun-application PUBLIC "-//Sun Microsystems, Inc.//DTD
GlassFish Application Server 3.0 Java EE Application 6.0//EN"
"http://www.sun.com/software/appserver/dtds/sun-application_6_0-0.dtd">
<sun-application>
<realm>moyaRealm</realm>
</sun-application>
\ No newline at end of file
code/MoyaEar/EarContent/lib/PDFjet.jar deleted 100644 → 0
No preview for this file type
code/MoyaEar/pom.xml 0 → 100644
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>fi.codecrew.moya</groupId>
<artifactId>moya-ear</artifactId>
<version>0.2.0</version>
<packaging>ear</packaging>
<build>
<plugins>
<plugin>
<artifactId>maven-ear-plugin</artifactId>
<version>2.8</version>
<configuration>
<earSourceDirectory>EarContent</earSourceDirectory>
<generateApplicationXml>true</generateApplicationXml>
<version>7</version>
<defaultLibBundleDir>lib</defaultLibBundleDir>
</configuration>
</plugin>
</plugins>
</build>
<dependencies>
<dependency>
<groupId>fi.codecrew.moya</groupId>
<artifactId>moya-beans</artifactId>
<version>0.2.0</version>
<type>ejb</type>
</dependency>
<dependency>
<groupId>fi.codecrew.moya</groupId>
<artifactId>moya-web</artifactId>
<version>0.2.0</version>
<type>war</type>
</dependency>
<!-- Jos web-projektin antaa lisätä libinsä itse libit menevät tuplana -->
<!-- WEB-INF/lib hakemistoon. Rajoitetaan siis sinne meneviä libejä -->
<!-- web-projektin pom.xml:ssä ja lisätään tarvittavat riippuvuudet tänne -->
<!-- Riippuvuuksia ei tarvitse lisätä jos joku muu projekti lisää jo valmiiksi -->
<dependency>
<!-- Primefaces dependency -->
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
<version>1.3</version>
</dependency>
<dependency>
<groupId>org.apache.sshd</groupId>
<artifactId>sshd-core</artifactId>
<version>0.8.0</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-jdk14</artifactId>
<version>1.7.5</version>
</dependency>
</dependencies>
</project>
\ No newline at end of file
code/MoyaTerminalWeb/.classpath
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<classpath> <classpath>
<classpathentry kind="src" path="src"/> <classpathentry including="**/*.java" kind="src" output="target/classes" path="src">
<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/> <attributes>
<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/> <attribute name="optional" value="true"/>
<classpathentry kind="con" path="org.eclipse.jst.server.core.container/com.sun.enterprise.jst.server.runtimeTarget/GlassFish 3.1.2"> <attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="oracle.eclipse.tools.glassfish.lib.system">
<attributes> <attributes>
<attribute name="owner.project.facets" value="jst.web"/> <attribute name="owner.project.facets" value="jst.web"/>
</attributes> </attributes>
</classpathentry> </classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
<classpathentry kind="output" path="build/classes"/> <attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
</attributes>
</classpathentry>
<classpathentry kind="output" path="target/classes"/>
</classpath> </classpath>
code/MoyaTerminalWeb/.project
...@@ -25,8 +25,14 @@ ...@@ -25,8 +25,14 @@
<arguments> <arguments>
</arguments> </arguments>
</buildCommand> </buildCommand>
<buildCommand>
<name>org.eclipse.m2e.core.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec> </buildSpec>
<natures> <natures>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.jem.workbench.JavaEMFNature</nature> <nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature> <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
<nature>org.eclipse.wst.common.project.facet.core.nature</nature> <nature>org.eclipse.wst.common.project.facet.core.nature</nature>
......
code/MoyaTerminalWeb/.settings/org.eclipse.jdt.core.prefs
...@@ -8,4 +8,5 @@ org.eclipse.jdt.core.compiler.debug.localVariable=generate ...@@ -8,4 +8,5 @@ org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
org.eclipse.jdt.core.compiler.source=1.7 org.eclipse.jdt.core.compiler.source=1.7
code/MoyaTerminalWeb/.settings/org.eclipse.m2e.core.prefs 0 → 100644
activeProfiles=
eclipse.preferences.version=1
resolveWorkspaceProjects=true
version=1
code/MoyaTerminalWeb/.settings/org.eclipse.wst.common.component
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
<project-modules id="moduleCoreId" project-version="1.5.0">
<wb-module deploy-name="MoyaTerminalWeb"> <wb-module deploy-name="MoyaTerminalWeb">
<wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
<wb-resource deploy-path="/" source-path="/WebContent" tag="defaultRootSource"/> <wb-resource deploy-path="/" source-path="/WebContent" tag="defaultRootSource"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src"/> <wb-resource deploy-path="/WEB-INF/classes" source-path="/src"/>
<dependent-module archiveName="moya-beans-client-0.2.0.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/MoyaBeansClient/MoyaBeansClient">
<dependency-type>uses</dependency-type>
</dependent-module>
<dependent-module archiveName="moya-database-0.2.0.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/MoyaDatabase/MoyaDatabase">
<dependency-type>uses</dependency-type>
</dependent-module>
<dependent-module archiveName="moya-utils-0.2.0.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/MoyaUtilities/MoyaUtilities">
<dependency-type>uses</dependency-type>
</dependent-module>
<property name="java-output-path" value="/MoyaTerminalWeb/build/classes"/> <property name="java-output-path" value="/MoyaTerminalWeb/build/classes"/>
<property name="context-root" value="MoyaTerminalWeb"/> <property name="context-root" value="moya-terminal-web"/>
</wb-module> </wb-module>
</project-modules> </project-modules>
code/MoyaTerminalWeb/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml 0 → 100644
<root>
<facet id="jst.jsf">
<node name="libprov">
<attribute name="provider-id" value="jsf-no-op-library-provider"/>
</node>
</facet>
</root>
code/MoyaTerminalWeb/.settings/org.eclipse.wst.common.project.facet.core.xml
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<faceted-project> <faceted-project>
<runtime name="GlassFish 3.1.2"/> <runtime name="GlassFish 4.0"/>
<fixed facet="wst.jsdt.web"/> <fixed facet="wst.jsdt.web"/>
<fixed facet="jst.web"/> <fixed facet="jst.web"/>
<fixed facet="java"/> <fixed facet="java"/>
<installed facet="jst.web" version="3.0"/> <installed facet="jst.web" version="3.0"/>
<installed facet="sun.facet" version="9"/>
<installed facet="wst.jsdt.web" version="1.0"/> <installed facet="wst.jsdt.web" version="1.0"/>
<installed facet="java" version="1.7"/> <installed facet="java" version="1.7"/>
<installed facet="jst.jsf" version="2.0"/>
</faceted-project> </faceted-project>
code/MoyaTerminalWeb/.settings/org.eclipse.wst.validation.prefs 0 → 100644
disabled=06target
eclipse.preferences.version=1
code/MoyaTerminalWeb/pom.xml 0 → 100644
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>fi.codecrew.moya</groupId>
<artifactId>moya-terminal-web</artifactId>
<version>0.2.0</version>
<packaging>war</packaging>
<build>
<sourceDirectory>src</sourceDirectory>
<resources>
<resource>
<directory>src</directory>
<excludes>
<exclude>**/*.java</exclude>
</excludes>
</resource>
</resources>
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.1</version>
<configuration>
<source>1.7</source>
<target>1.7</target>
</configuration>
</plugin>
<plugin>
<artifactId>maven-war-plugin</artifactId>
<version>2.3</version>
<configuration>
<warSourceDirectory>WebContent</warSourceDirectory>
<failOnMissingWebXml>false</failOnMissingWebXml>
</configuration>
</plugin>
</plugins>
</build>
<dependencies>
<dependency>
<groupId>fi.codecrew.moya</groupId>
<artifactId>moya-beans-client</artifactId>
<version>0.2.0</version>
</dependency>
</dependencies>
</project>
\ No newline at end of file
code/MoyaUtilities/.classpath
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<classpath> <classpath>
<classpathentry kind="src" path="src"/> <classpathentry including="**/*.java" kind="src" output="target/classes" path="src">
<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/> <attributes>
<classpathentry kind="con" path="org.eclipse.jst.server.core.container/com.sun.enterprise.jst.server.runtimeTarget/GlassFish 3.1.2"> <attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="oracle.eclipse.tools.glassfish.lib.system">
<attributes> <attributes>
<attribute name="owner.project.facets" value="jst.utility"/> <attribute name="owner.project.facets" value="jst.utility"/>
</attributes> </attributes>
</classpathentry> </classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
<attributes> <attributes>
<attribute name="owner.project.facets" value="java"/> <attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="org.eclipse.jst.component.nondependency" value=""/>
</attributes> </attributes>
</classpathentry> </classpathentry>
<classpathentry kind="output" path="build/classes"/> <classpathentry kind="output" path="target/classes"/>
</classpath> </classpath>
code/MoyaUtilities/.project
...@@ -30,8 +30,14 @@ ...@@ -30,8 +30,14 @@
<arguments> <arguments>
</arguments> </arguments>
</buildCommand> </buildCommand>
<buildCommand>
<name>org.eclipse.m2e.core.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec> </buildSpec>
<natures> <natures>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.jem.workbench.JavaEMFNature</nature> <nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature> <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
<nature>org.eclipse.wst.common.project.facet.core.nature</nature> <nature>org.eclipse.wst.common.project.facet.core.nature</nature>
......
code/MoyaUtilities/.settings/org.eclipse.core.resources.prefs deleted 100644 → 0
#Wed Oct 27 00:26:05 EEST 2010
eclipse.preferences.version=1
encoding/<project>=UTF-8
code/MoyaUtilities/.settings/org.eclipse.jdt.core.prefs
...@@ -8,4 +8,5 @@ org.eclipse.jdt.core.compiler.debug.localVariable=generate ...@@ -8,4 +8,5 @@ org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
org.eclipse.jdt.core.compiler.source=1.7 org.eclipse.jdt.core.compiler.source=1.7
code/MoyaUtilities/.settings/org.eclipse.m2e.core.prefs 0 → 100644
activeProfiles=
eclipse.preferences.version=1
resolveWorkspaceProjects=true
version=1
code/MoyaUtilities/.settings/org.eclipse.wst.common.project.facet.core.xml
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<faceted-project> <faceted-project>
<runtime name="GlassFish 3.1.2"/> <runtime name="GlassFish 4.0"/>
<fixed facet="jst.java"/> <fixed facet="jst.java"/>
<fixed facet="jst.utility"/> <fixed facet="jst.utility"/>
<installed facet="jst.utility" version="1.0"/> <installed facet="jst.utility" version="1.0"/>
......
code/MoyaUtilities/.settings/org.eclipse.wst.validation.prefs 0 → 100644
disabled=06target
eclipse.preferences.version=1
code/MoyaUtilities/pom.xml 0 → 100644
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>fi.codecrew.moya</groupId>
<artifactId>moya-utils</artifactId>
<version>0.2.0</version>
<build>
<sourceDirectory>src</sourceDirectory>
<resources>
<resource>
<directory>src</directory>
<excludes>
<exclude>**/*.java</exclude>
</excludes>
</resource>
</resources>
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.1</version>
<configuration>
<source>1.7</source>
<target>1.7</target>
</configuration>
</plugin>
</plugins>
</build>
<repositories>
<repository>
<id>apache.snapshots</id>
<url>http://repository.apache.org/snapshots/</url>
</repository>
</repositories>
<dependencies>
<dependency>
<groupId>net.sf.barcode4j</groupId>
<artifactId>barcode4j</artifactId>
<version>2.1</version>
<exclusions>
<exclusion>
<artifactId>ant</artifactId>
<groupId>org.apache.ant</groupId>
</exclusion>
<exclusion>
<artifactId>commons-cli</artifactId>
<groupId>commons-cli</groupId>
</exclusion>
<exclusion>
<artifactId>avalon-framework-impl</artifactId>
<groupId>avalon-framework</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-imaging</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
<version>1.8</version>
</dependency>
</dependencies>
</project>
\ No newline at end of file
code/MoyaUtilities/src/META-INF/MANIFEST.MF
Manifest-Version: 1.0 Manifest-Version: 1.0
Class-Path: commons-codec-1.6.jar
barcode4j.jar
PDFjet.jar
commons-imaging-1.0-SNAPSHOT.jar
code/MoyaWeb/.classpath
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<classpath> <classpath>
<classpathentry kind="src" path="src"/> <classpathentry including="**/*.java" kind="src" output="target/classes" path="src">
<classpathentry kind="con" path="org.eclipse.jst.server.core.container/com.sun.enterprise.jst.server.runtimeTarget/GlassFish 3.1.2">
<attributes> <attributes>
<attribute name="owner.project.facets" value="jst.web"/> <attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
</attributes> </attributes>
</classpathentry> </classpathentry>
<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
<attributes> <attributes>
<attribute name="owner.project.facets" value="java"/> <attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="oracle.eclipse.tools.glassfish.lib.system">
<attributes>
<attribute name="owner.project.facets" value="jst.web"/>
</attributes> </attributes>
</classpathentry> </classpathentry>
<classpathentry combineaccessrules="false" kind="src" path="/MoyaBeansClient"/> <classpathentry kind="output" path="target/classes"/>
<classpathentry kind="output" path="build/classes"/>
</classpath> </classpath>
code/MoyaWeb/.project
...@@ -30,8 +30,14 @@ ...@@ -30,8 +30,14 @@
<arguments> <arguments>
</arguments> </arguments>
</buildCommand> </buildCommand>
<buildCommand>
<name>org.eclipse.m2e.core.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec> </buildSpec>
<natures> <natures>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.jem.workbench.JavaEMFNature</nature> <nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature> <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
<nature>org.eclipse.wst.common.project.facet.core.nature</nature> <nature>org.eclipse.wst.common.project.facet.core.nature</nature>
......
code/MoyaWeb/.settings/org.eclipse.jdt.core.prefs
...@@ -8,4 +8,5 @@ org.eclipse.jdt.core.compiler.debug.localVariable=generate ...@@ -8,4 +8,5 @@ org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
org.eclipse.jdt.core.compiler.source=1.7 org.eclipse.jdt.core.compiler.source=1.7
code/MoyaWeb/.settings/org.eclipse.m2e.core.prefs 0 → 100644
activeProfiles=
eclipse.preferences.version=1
resolveWorkspaceProjects=true
version=1
code/MoyaWeb/.settings/org.eclipse.wst.common.component
<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0"> <?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
<wb-module deploy-name="MoyaWeb"> <wb-module deploy-name="MoyaWeb">
<wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
<wb-resource deploy-path="/" source-path="/WebContent" tag="defaultRootSource"/> <wb-resource deploy-path="/" source-path="/WebContent" tag="defaultRootSource"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src"/> <wb-resource deploy-path="/WEB-INF/classes" source-path="/src"/>
<property name="java-output-path" value="/MoyaWeb/build/classes"/> <property name="context-root" value="moya-web"/>
<property name="context-root" value="MoyaWeb"/> <property name="java-output-path" value="/MoyaWeb/target/classes"/>
</wb-module> </wb-module>
</project-modules> </project-modules>
code/MoyaWeb/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml
<root> <root>
<facet id="jst.jsf"> <facet id="jst.jsf">
<node name="libprov"> <node name="libprov">
<attribute name="provider-id" value="jsf-no-op-library-provider"/> <attribute name="provider-id" value="GlassFish-4-SystemLibrary-JSF"/>
</node> </node>
</facet> </facet>
<facet id="jst.jaxrs"> <facet id="jst.jaxrs">
......
code/MoyaWeb/.settings/org.eclipse.wst.common.project.facet.core.xml
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<faceted-project> <faceted-project>
<runtime name="GlassFish 3.1.2"/> <runtime name="GlassFish 4.0"/>
<fixed facet="jst.web"/>
<fixed facet="java"/>
<fixed facet="wst.jsdt.web"/> <fixed facet="wst.jsdt.web"/>
<installed facet="jst.web" version="3.0"/>
<installed facet="sun.facet" version="9"/>
<installed facet="wst.jsdt.web" version="1.0"/>
<installed facet="java" version="1.7"/> <installed facet="java" version="1.7"/>
<installed facet="jst.jsf" version="2.1"/> <installed facet="jst.web" version="3.1"/>
<installed facet="jst.jaxrs" version="1.1"/> <installed facet="jst.jaxrs" version="2.0"/>
<installed facet="jst.jsf" version="2.2"/>
<installed facet="wst.jsdt.web" version="1.0"/>
</faceted-project> </faceted-project>
code/MoyaWeb/.settings/org.eclipse.wst.validation.prefs 0 → 100644
disabled=06target
eclipse.preferences.version=1
code/MoyaWeb/.settings/org.eclipse.wst.ws.service.policy.prefs 0 → 100644
eclipse.preferences.version=1
org.eclipse.wst.ws.service.policy.projectEnabled=false
code/MoyaWeb/WebContent/WEB-INF/faces-config.xml
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<faces-config xmlns="http://java.sun.com/xml/ns/javaee" <faces-config xmlns="http://xmlns.jcp.org/xml/ns/javaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_2_0.xsd" xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-facesconfig_2_2.xsd"
version="2.0"> version="2.2">
<application> <application>
<resource-bundle> <resource-bundle>
<base-name>fi.codecrew.moya.resources.i18n</base-name> <base-name>fi.codecrew.moya.resources.i18n</base-name>
...@@ -44,45 +44,35 @@ ...@@ -44,45 +44,35 @@
<!-- </navigation-case> --> <!-- </navigation-case> -->
<!-- </navigation-rule> --> <!-- </navigation-rule> -->
<navigation-rule> <!-- <navigation-rule> -->
<from-view-id>*</from-view-id> <!-- <from-view-id>*</from-view-id> -->
<navigation-case> <!-- <navigation-case> -->
<from-outcome>shopToUser</from-outcome> <!-- <from-outcome>shopToUser</from-outcome> -->
<to-view-id>/shop/shopToUser</to-view-id> <!-- <to-view-id>/shop/shopToUser</to-view-id> -->
<redirect /> <!-- <redirect /> -->
</navigation-case> <!-- </navigation-case> -->
<navigation-case> <!-- <navigation-case> -->
<from-outcome>logoutDone</from-outcome> <!-- <from-outcome>logoutDone</from-outcome> -->
<to-view-id>/auth/logoutResponse</to-view-id> <!-- <to-view-id>/auth/logoutResponse</to-view-id> -->
<redirect /> <!-- <redirect /> -->
</navigation-case> <!-- </navigation-case> -->
<navigation-case> <!-- <navigation-case> -->
<from-outcome>redirToUserimage</from-outcome> <!-- <from-outcome>redirBillList</from-outcome> -->
<to-view-id>/user/sendPicture</to-view-id> <!-- <to-view-id>/bill/list</to-view-id> -->
<redirect> <!-- <redirect /> -->
<view-param> <!-- </navigation-case> -->
<name>userid</name> <!-- </navigation-rule> -->
<value>#{userView.user.id}</value>
</view-param>
</redirect>
</navigation-case>
<navigation-case>
<from-outcome>redirBillList</from-outcome>
<to-view-id>/bill/list</to-view-id>
<redirect />
</navigation-case>
</navigation-rule>
<navigation-rule> <!-- <navigation-rule> -->
<from-view-id>/news/editNews</from-view-id> <!-- <from-view-id>/news/editNews</from-view-id> -->
<navigation-case> <!-- <navigation-case> -->
<from-outcome>news/listAll</from-outcome> <!-- <from-outcome>news/listAll</from-outcome> -->
<to-view-id>/news/listAll</to-view-id> <!-- <to-view-id>/news/listAll</to-view-id> -->
<redirect /> <!-- <redirect /> -->
</navigation-case> <!-- </navigation-case> -->
</navigation-rule> <!-- </navigation-rule> -->
<!-- </navigation-rule> --> <!-- </navigation-rule> -->
......
code/MoyaWeb/WebContent/WEB-INF/web.xml
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://xmlns.jcp.org/xml/ns/javaee" xmlns:web="http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd" id="WebApp_ID" version="3.0"> <web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="http://xmlns.jcp.org/xml/ns/javaee" xmlns:web="http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"
version="3.1">
<display-name>LanBortalWeb</display-name> <display-name>LanBortalWeb</display-name>
<context-param> <context-param>
<param-name>javax.faces.FACELETS_SKIP_COMMENTS</param-name> <param-name>javax.faces.FACELETS_SKIP_COMMENTS</param-name>
...@@ -12,7 +14,8 @@ ...@@ -12,7 +14,8 @@
<filter> <filter>
<display-name>PrimefacesFileupload</display-name> <display-name>PrimefacesFileupload</display-name>
<filter-name>PrimeFacesFileupload</filter-name> <filter-name>PrimeFacesFileupload</filter-name>
<filter-class>org.primefaces.webapp.filter.FileUploadFilter</filter-class> <filter-class>org.primefaces.webapp.filter.FileUploadFilter
</filter-class>
</filter> </filter>
<filter> <filter>
<display-name>HostnameFilter</display-name> <display-name>HostnameFilter</display-name>
...@@ -32,82 +35,14 @@ ...@@ -32,82 +35,14 @@
<servlet-class>javax.faces.webapp.FacesServlet</servlet-class> <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
<load-on-startup>1</load-on-startup> <load-on-startup>1</load-on-startup>
</servlet> </servlet>
<servlet>
<servlet-name>UploadServlet</servlet-name>
<servlet-class>fi.codecrew.moya.servlet.UploadServlet</servlet-class>
</servlet>
<servlet>
<servlet-name>UserImageServlet</servlet-name>
<servlet-class>fi.codecrew.moya.servlet.UserImageServlet</servlet-class>
</servlet>
<servlet>
<servlet-name>UserCardServlet</servlet-name>
<servlet-class>fi.codecrew.moya.servlet.UserCardServlet</servlet-class>
</servlet>
<servlet>
<servlet-name>CardTemplateServlet</servlet-name>
<servlet-class>fi.codecrew.moya.servlet.CardTemplateServlet</servlet-class>
</servlet>
<servlet>
<servlet-name>PlaceMap</servlet-name>
<servlet-class>fi.codecrew.moya.servlet.PlaceMap</servlet-class>
</servlet>
<servlet>
<display-name>PrintBill</display-name>
<servlet-name>PrintBill</servlet-name>
<servlet-class>fi.codecrew.moya.servlet.PrintBill</servlet-class>
</servlet>
<servlet>
<display-name>PlaceGroupPdf</display-name>
<servlet-name>PlaceGroupPdf</servlet-name>
<servlet-class>fi.codecrew.moya.servlet.PlaceGroupPdf</servlet-class>
</servlet>
<servlet>
<description>JAX-RS Tools Generated - Do not modify</description>
<servlet-name>JAX-RS Servlet</servlet-name>
<servlet-class>com.sun.jersey.spi.container.servlet.ServletContainer</servlet-class>
<init-param>
<param-name>com.sun.jersey.config.property.packages</param-name>
<param-value>fi.codecrew.moya.rest;org.codehaus.jackson.jaxrs</param-value>
</init-param>
<load-on-startup>1</load-on-startup>
</servlet>
<servlet-mapping>
<servlet-name>PlaceMap</servlet-name>
<url-pattern>/PlaceMap</url-pattern>
</servlet-mapping>
<servlet-mapping>
<servlet-name>UploadServlet</servlet-name>
<url-pattern>/UploadServlet</url-pattern>
</servlet-mapping>
<servlet-mapping>
<servlet-name>UserImageServlet</servlet-name>
<url-pattern>/Userimage</url-pattern>
</servlet-mapping>
<servlet-mapping>
<servlet-name>UserCardServlet</servlet-name>
<url-pattern>/UserCard</url-pattern>
</servlet-mapping>
<servlet-mapping>
<servlet-name>CardTemplateServlet</servlet-name>
<url-pattern>/CardTemplate</url-pattern>
</servlet-mapping>
<servlet-mapping> <servlet-mapping>
<servlet-name>Faces Servlet</servlet-name> <servlet-name>Faces Servlet</servlet-name>
<url-pattern>*.jsf</url-pattern> <url-pattern>*.jsf</url-pattern>
</servlet-mapping> </servlet-mapping>
<servlet-mapping>
<servlet-name>PrintBill</servlet-name>
<url-pattern>/PrintBill</url-pattern>
</servlet-mapping>
<servlet-mapping>
<servlet-name>PlaceGroupPdf</servlet-name>
<url-pattern>/PlaceGroupPdf</url-pattern>
</servlet-mapping>
<servlet-mapping>
<servlet-name>JAX-RS Servlet</servlet-name>
<url-pattern>/rest/*</url-pattern>
</servlet-mapping>
<session-config> <session-config>
<session-timeout>120</session-timeout> <session-timeout>120</session-timeout>
</session-config> </session-config>
...@@ -130,7 +65,8 @@ ...@@ -130,7 +65,8 @@
<url-pattern>/resources/tools/*</url-pattern> <url-pattern>/resources/tools/*</url-pattern>
</web-resource-collection> </web-resource-collection>
<auth-constraint> <auth-constraint>
<description>Thou shall not read the sources or use utils directly</description> <description>Thou shall not read the sources or use utils directly
</description>
</auth-constraint> </auth-constraint>
<user-data-constraint> <user-data-constraint>
<transport-guarantee>CONFIDENTIAL</transport-guarantee> <transport-guarantee>CONFIDENTIAL</transport-guarantee>
......
code/MoyaWeb/WebContent/resources/cditools/login/login.xhtml
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
<c:when test="#{not empty cc.attrs.isOneliner}"> <c:when test="#{not empty cc.attrs.isOneliner}">
<p:inputText styleClass="form" id="linelogin" value="#{authView.login}" /> <p:inputText styleClass="form" id="linelogin" value="#{authView.login}" />
<p:password styleClass="form" id="linepwd" value="#{authView.password}" /> <p:password styleClass="form" id="linepwd" value="#{authView.password}" />
<p:commandButton styleClass="button" id="onelinesubmit" action="#{authView.executeLoginAction}" value="#{i18n['login.submit']}" /> <p:commandButton styleClass="button" id="onelinesubmit" action="#{authView.executeLoginAction}" ajax="false" value="#{i18n['login.submit']}" />
</c:when> </c:when>
<c:otherwise> <c:otherwise>
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
<p:password id="gridPwd" value="#{authView.password}" /> <p:password id="gridPwd" value="#{authView.password}" />
</h:panelGrid> </h:panelGrid>
<p:commandButton id="gridsubmit" actionListener="#{authView.executeLogin(cc.attrs.onerror)}" value="#{i18n['login.submit']}" /> <p:commandButton id="gridsubmit" actionListener="#{authView.executeLogin(cc.attrs.onerror)}" ajax="false" value="#{i18n['login.submit']}" />
</c:otherwise> </c:otherwise>
</c:choose> </c:choose>
......
code/MoyaWeb/pom.xml 0 → 100644
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>fi.codecrew.moya</groupId>
<artifactId>moya-web</artifactId>
<version>0.2.0</version>
<packaging>war</packaging>
<build>
<sourceDirectory>src</sourceDirectory>
<resources>
<resource>
<directory>src</directory>
<excludes>
<exclude>**/*.java</exclude>
</excludes>
</resource>
</resources>
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.1</version>
<configuration>
<source>1.7</source>
<target>1.7</target>
</configuration>
</plugin>
<plugin>
<artifactId>maven-war-plugin</artifactId>
<version>2.3</version>
<configuration>
<warSourceDirectory>WebContent</warSourceDirectory>
<failOnMissingWebXml>false</failOnMissingWebXml>
<packagingIncludes>WEB-INF/lib/javamelody-core*,WEB-INF/lib/primefaces*,**/*.xml,**/*.xhtml,**/*.properties,**/*.class,**/*.png,**/*.css,**/*.js,resources/*</packagingIncludes>
</configuration>
</plugin>
</plugins>
</build>
<repositories>
<repository>
<id>prime-repo</id>
<name>PrimeFaces Maven Repository</name>
<url>http://repository.primefaces.org</url>
<layout>default</layout>
</repository>
<repository>
<id>iudex</id>
<url>http://iudex.fi/maven/</url>
</repository>
</repositories>
<dependencies>
<dependency>
<groupId>fi.codecrew.moya</groupId>
<artifactId>moya-beans-client</artifactId>
<version>0.2.0</version>
</dependency>
<dependency>
<groupId>org.primefaces</groupId>
<artifactId>primefaces</artifactId>
<version>3.5</version>
</dependency>
<dependency>
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
<version>1.3</version>
</dependency>
<dependency>
<groupId>org.apache.sshd</groupId>
<artifactId>sshd-core</artifactId>
<version>0.8.0</version>
</dependency>
<dependency>
<groupId>fi.iudex.pdfjet</groupId>
<artifactId>pdfjet</artifactId>
<version>0.0.0-2013-08-19</version>
</dependency>
<dependency>
<groupId>net.bull.javamelody</groupId>
<artifactId>javamelody-core</artifactId>
<version>1.44.0</version>
</dependency>
</dependencies>
</project>
\ No newline at end of file
code/MoyaWeb/src/fi/codecrew/moya/exceptions/BortalExceptionHandlerFactory.java
...@@ -7,6 +7,10 @@ public class BortalExceptionHandlerFactory extends ExceptionHandlerFactory { ...@@ -7,6 +7,10 @@ public class BortalExceptionHandlerFactory extends ExceptionHandlerFactory {
private ExceptionHandlerFactory parent; private ExceptionHandlerFactory parent;
public BortalExceptionHandlerFactory() {
super();
}
public BortalExceptionHandlerFactory(ExceptionHandlerFactory parent) { public BortalExceptionHandlerFactory(ExceptionHandlerFactory parent) {
this.parent = parent; this.parent = parent;
} }
......
code/MoyaWeb/src/fi/codecrew/moya/servlet/CardTemplateServlet.java
...@@ -3,6 +3,7 @@ package fi.codecrew.moya.servlet; ...@@ -3,6 +3,7 @@ package fi.codecrew.moya.servlet;
import java.util.regex.Pattern; import java.util.regex.Pattern;
import javax.ejb.EJB; import javax.ejb.EJB;
import javax.servlet.annotation.WebServlet;
import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
...@@ -14,6 +15,7 @@ import fi.codecrew.moya.model.CardTemplate; ...@@ -14,6 +15,7 @@ import fi.codecrew.moya.model.CardTemplate;
/** /**
* Servlet implementation class UploadServlet * Servlet implementation class UploadServlet
*/ */
@WebServlet("/CardTemplate")
public class CardTemplateServlet extends GenericImageServlet { public class CardTemplateServlet extends GenericImageServlet {
/** /**
...@@ -28,8 +30,7 @@ public class CardTemplateServlet extends GenericImageServlet { ...@@ -28,8 +30,7 @@ public class CardTemplateServlet extends GenericImageServlet {
private transient PermissionBeanLocal permbean; private transient PermissionBeanLocal permbean;
/** /**
* @see HttpServlet#doPost(HttpServletRequest request, HttpServletResponse * @see HttpServlet#doPost(HttpServletRequest request, HttpServletResponse response)
* response)
*/ */
private final Pattern lhMatcher = Pattern.compile("^127.[0-9.]*|(0:)*1%0"); private final Pattern lhMatcher = Pattern.compile("^127.[0-9.]*|(0:)*1%0");
......
code/MoyaWeb/src/fi/codecrew/moya/servlet/PlaceGroupPdf.java
...@@ -5,6 +5,7 @@ import java.io.IOException; ...@@ -5,6 +5,7 @@ import java.io.IOException;
import javax.ejb.EJB; import javax.ejb.EJB;
import javax.servlet.ServletException; import javax.servlet.ServletException;
import javax.servlet.ServletOutputStream; import javax.servlet.ServletOutputStream;
import javax.servlet.annotation.WebServlet;
import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
...@@ -12,13 +13,13 @@ import javax.servlet.http.HttpServletResponse; ...@@ -12,13 +13,13 @@ import javax.servlet.http.HttpServletResponse;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import fi.codecrew.moya.beans.EventBeanLocal;
import fi.codecrew.moya.beans.PermissionBeanLocal; import fi.codecrew.moya.beans.PermissionBeanLocal;
import fi.codecrew.moya.beans.PlaceGroupBeanLocal; import fi.codecrew.moya.beans.PlaceGroupBeanLocal;
/** /**
* Servlet implementation class PlaceGroupPdf * Servlet implementation class PlaceGroupPdf
*/ */
@WebServlet("/PlaceGroupPdf")
public class PlaceGroupPdf extends HttpServlet { public class PlaceGroupPdf extends HttpServlet {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
......
code/MoyaWeb/src/fi/codecrew/moya/servlet/PlaceMap.java
...@@ -20,6 +20,7 @@ import javax.ejb.EJBException; ...@@ -20,6 +20,7 @@ import javax.ejb.EJBException;
import javax.imageio.ImageIO; import javax.imageio.ImageIO;
import javax.servlet.ServletException; import javax.servlet.ServletException;
import javax.servlet.ServletOutputStream; import javax.servlet.ServletOutputStream;
import javax.servlet.annotation.WebServlet;
import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
...@@ -40,6 +41,7 @@ import fi.codecrew.moya.model.Place; ...@@ -40,6 +41,7 @@ import fi.codecrew.moya.model.Place;
* *
* @author tuukka * @author tuukka
*/ */
@WebServlet("/PlaceMap")
public class PlaceMap extends HttpServlet { public class PlaceMap extends HttpServlet {
private static final Logger logger = LoggerFactory private static final Logger logger = LoggerFactory
...@@ -58,8 +60,7 @@ public class PlaceMap extends HttpServlet { ...@@ -58,8 +60,7 @@ public class PlaceMap extends HttpServlet {
private static final String PARAMETER_EVENT_MAP_ID = "mapid"; private static final String PARAMETER_EVENT_MAP_ID = "mapid";
/** /**
* Processes requests for both HTTP <code>GET</code> and <code>POST</code> * Processes requests for both HTTP <code>GET</code> and <code>POST</code> methods.
* methods.
* *
* @param request * @param request
* servlet request * servlet request
......
code/MoyaWeb/src/fi/codecrew/moya/servlet/PrintBill.java
...@@ -8,6 +8,7 @@ import javax.ejb.EJBAccessException; ...@@ -8,6 +8,7 @@ import javax.ejb.EJBAccessException;
import javax.ejb.EJBException; import javax.ejb.EJBException;
import javax.servlet.ServletException; import javax.servlet.ServletException;
import javax.servlet.ServletOutputStream; import javax.servlet.ServletOutputStream;
import javax.servlet.annotation.WebServlet;
import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
...@@ -19,6 +20,7 @@ import fi.codecrew.moya.model.Bill; ...@@ -19,6 +20,7 @@ import fi.codecrew.moya.model.Bill;
/** /**
* Servlet implementation class PrintBill * Servlet implementation class PrintBill
*/ */
@WebServlet("/PrintBill")
public class PrintBill extends HttpServlet { public class PrintBill extends HttpServlet {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
...@@ -38,8 +40,7 @@ public class PrintBill extends HttpServlet { ...@@ -38,8 +40,7 @@ public class PrintBill extends HttpServlet {
} }
/** /**
* @see HttpServlet#doGet(HttpServletRequest request, HttpServletResponse * @see HttpServlet#doGet(HttpServletRequest request, HttpServletResponse response)
* response)
*/ */
@Override @Override
protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
...@@ -77,8 +78,7 @@ public class PrintBill extends HttpServlet { ...@@ -77,8 +78,7 @@ public class PrintBill extends HttpServlet {
} }
/** /**
* @see HttpServlet#doPost(HttpServletRequest request, HttpServletResponse * @see HttpServlet#doPost(HttpServletRequest request, HttpServletResponse response)
* response)
*/ */
@Override @Override
protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
......
code/MoyaWeb/src/fi/codecrew/moya/servlet/UploadServlet.java
...@@ -6,6 +6,7 @@ import java.io.PrintWriter; ...@@ -6,6 +6,7 @@ import java.io.PrintWriter;
import javax.ejb.EJB; import javax.ejb.EJB;
import javax.ejb.EJBException; import javax.ejb.EJBException;
import javax.servlet.ServletException; import javax.servlet.ServletException;
import javax.servlet.annotation.WebServlet;
import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
...@@ -26,6 +27,7 @@ import fi.codecrew.moya.model.UserImage; ...@@ -26,6 +27,7 @@ import fi.codecrew.moya.model.UserImage;
/** /**
* Servlet implementation class UploadServlet * Servlet implementation class UploadServlet
*/ */
@WebServlet(value = "/UploadServlet")
public class UploadServlet extends HttpServlet { public class UploadServlet extends HttpServlet {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
...@@ -40,8 +42,7 @@ public class UploadServlet extends HttpServlet { ...@@ -40,8 +42,7 @@ public class UploadServlet extends HttpServlet {
private static final Logger logger = LoggerFactory.getLogger(UploadServlet.class); private static final Logger logger = LoggerFactory.getLogger(UploadServlet.class);
/** /**
* @see HttpServlet#doGet(HttpServletRequest request, HttpServletResponse * @see HttpServlet#doGet(HttpServletRequest request, HttpServletResponse response)
* response)
*/ */
@Override @Override
protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
...@@ -57,8 +58,7 @@ public class UploadServlet extends HttpServlet { ...@@ -57,8 +58,7 @@ public class UploadServlet extends HttpServlet {
private transient UtilBeanLocal utilbean; private transient UtilBeanLocal utilbean;
/** /**
* @see HttpServlet#doPost(HttpServletRequest request, HttpServletResponse * @see HttpServlet#doPost(HttpServletRequest request, HttpServletResponse response)
* response)
*/ */
@Override @Override
protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
......
code/MoyaWeb/src/fi/codecrew/moya/servlet/UserCardPngServlet.java
...@@ -20,6 +20,8 @@ import fi.codecrew.moya.model.UserImage; ...@@ -20,6 +20,8 @@ import fi.codecrew.moya.model.UserImage;
/** /**
* Servlet implementation class UploadServlet * Servlet implementation class UploadServlet
*/ */
// @WebServlet(value = "/UploadServlet")
public class UserCardPngServlet extends GenericImageServlet { public class UserCardPngServlet extends GenericImageServlet {
/** /**
...@@ -34,8 +36,7 @@ public class UserCardPngServlet extends GenericImageServlet { ...@@ -34,8 +36,7 @@ public class UserCardPngServlet extends GenericImageServlet {
private transient PermissionBeanLocal permbean; private transient PermissionBeanLocal permbean;
/** /**
* @see HttpServlet#doPost(HttpServletRequest request, HttpServletResponse * @see HttpServlet#doPost(HttpServletRequest request, HttpServletResponse response)
* response)
*/ */
// private final Pattern lhMatcher = // private final Pattern lhMatcher =
......
code/MoyaWeb/src/fi/codecrew/moya/servlet/UserCardServlet.java
...@@ -8,6 +8,7 @@ import java.util.regex.Pattern; ...@@ -8,6 +8,7 @@ import java.util.regex.Pattern;
import javax.ejb.EJB; import javax.ejb.EJB;
import javax.imageio.ImageIO; import javax.imageio.ImageIO;
import javax.servlet.annotation.WebServlet;
import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
...@@ -33,6 +34,7 @@ import fi.codecrew.moya.utilities.BarcodeUtils; ...@@ -33,6 +34,7 @@ import fi.codecrew.moya.utilities.BarcodeUtils;
/** /**
* Servlet implementation class UploadServlet * Servlet implementation class UploadServlet
*/ */
@WebServlet("/UserCard")
public class UserCardServlet extends GenericImageServlet { public class UserCardServlet extends GenericImageServlet {
/** /**
...@@ -47,8 +49,7 @@ public class UserCardServlet extends GenericImageServlet { ...@@ -47,8 +49,7 @@ public class UserCardServlet extends GenericImageServlet {
private transient PermissionBeanLocal permbean; private transient PermissionBeanLocal permbean;
/** /**
* @see HttpServlet#doPost(HttpServletRequest request, HttpServletResponse * @see HttpServlet#doPost(HttpServletRequest request, HttpServletResponse response)
* response)
*/ */
private final Pattern lhMatcher = Pattern.compile("^127.[0-9.]*|(0:)*1%0"); private final Pattern lhMatcher = Pattern.compile("^127.[0-9.]*|(0:)*1%0");
...@@ -112,9 +113,9 @@ public class UserCardServlet extends GenericImageServlet { ...@@ -112,9 +113,9 @@ public class UserCardServlet extends GenericImageServlet {
PDF pdf = new PDF(outputStream); PDF pdf = new PDF(outputStream);
pdf.setTitle("CARD"); pdf.setTitle("CARD");
double pagex = 155.52; // 54,0 mm float pagex = 155.52f; // 54,0 mm
double pagey = 243.84; // 85,5 mm float pagey = 243.84f; // 85,5 mm
Page page = new Page(pdf, new double[] { pagex, pagey }); Page page = new Page(pdf, new float[] { pagex, pagey });
// Render background image // Render background image
Image templateImage = new Image(pdf, Image templateImage = new Image(pdf,
...@@ -139,7 +140,7 @@ public class UserCardServlet extends GenericImageServlet { ...@@ -139,7 +140,7 @@ public class UserCardServlet extends GenericImageServlet {
TextLine nickTextLine = new TextLine(nickFont); TextLine nickTextLine = new TextLine(nickFont);
nickTextLine.setText(user.getUser().getNick()); nickTextLine.setText(user.getUser().getNick());
nickTextLine.setPosition(19.0, 193.0); nickTextLine.setPosition(19.0, 193.0);
nickTextLine.setColor(new double[] { 1.0, 1.0, 1.0 }); nickTextLine.setColor(new int[] { 1, 1, 1 });
nickTextLine.drawOn(page); nickTextLine.drawOn(page);
// Smaller font // Smaller font
...@@ -152,14 +153,14 @@ public class UserCardServlet extends GenericImageServlet { ...@@ -152,14 +153,14 @@ public class UserCardServlet extends GenericImageServlet {
TextLine wholeNameText = new TextLine(font); TextLine wholeNameText = new TextLine(font);
wholeNameText.setText(wholeName); wholeNameText.setText(wholeName);
wholeNameText.setPosition(17.0, 212.0); wholeNameText.setPosition(17.0, 212.0);
wholeNameText.setColor(new double[] { 1.0, 1.0, 1.0 }); wholeNameText.setColor(new int[] { 1, 1, 1 });
wholeNameText.drawOn(page); wholeNameText.drawOn(page);
// Role text // Role text
TextLine roleTextLine = new TextLine(font); TextLine roleTextLine = new TextLine(font);
roleTextLine.setText(card.getTemplate().getName()); roleTextLine.setText(card.getTemplate().getName());
roleTextLine.setPosition(17.0, 223.0); roleTextLine.setPosition(17.0, 223.0);
roleTextLine.setColor(new double[] { 1.0, 1.0, 1.0 }); roleTextLine.setColor(new int[] { 1, 1, 1 });
roleTextLine.drawOn(page); roleTextLine.drawOn(page);
// Barcode // Barcode
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!