Added:
/trunk/mozzesApplication/mozzesApplicationExample/db
/trunk/mozzesApplication/mozzesApplicationExample/images
/trunk/mozzesApplication/mozzesApplicationExample/log
Modified:
/trunk/mozzesApplication/mozzesApplicationExample/mozzesApplicationExampleRestJersey/pom.xml
/trunk/mozzesApplication/mozzesApplicationExample/mozzesApplicationExampleServer/src/main/java/org/mozzes/application/example/server/ExampleServer.java
/trunk/mozzesApplication/mozzesApplicationExample/mozzesApplicationExampleVaadin/pom.xml
/trunk/mozzesApplication/mozzesApplicationExample/mozzesApplicationExampleVaadin/src/main/java/org/mozzes/application/example/vaadin/gui/TeamEditWindow.java
/trunk/mozzesApplication/mozzesApplicationRestJersey/pom.xml
/trunk/mozzesApplication/mozzesApplicationVaadin/pom.xml
=======================================
---
/trunk/mozzesApplication/mozzesApplicationExample/mozzesApplicationExampleRestJersey/pom.xml
Sat Feb 27 05:48:41 2010
+++
/trunk/mozzesApplication/mozzesApplicationExample/mozzesApplicationExampleRestJersey/pom.xml
Sat Feb 27 09:02:30 2010
@@ -9,6 +9,7 @@
<groupId>org.mozzes.application</groupId>
<artifactId>mozzesApplicationExampleRestJersey</artifactId>
+ <name>Mozzes Application REST Example</name>
<dependencies>
<dependency>
=======================================
---
/trunk/mozzesApplication/mozzesApplicationExample/mozzesApplicationExampleServer/src/main/java/org/mozzes/application/example/server/ExampleServer.java
Sat Feb 27 06:56:25 2010
+++
/trunk/mozzesApplication/mozzesApplicationExample/mozzesApplicationExampleServer/src/main/java/org/mozzes/application/example/server/ExampleServer.java
Sat Feb 27 09:02:30 2010
@@ -20,12 +20,6 @@
*/
package org.mozzes.application.example.server;
-import java.util.Date;
-
-import org.apache.log4j.Logger;
-import org.mozzes.application.example.common.domain.Match;
-import org.mozzes.application.example.common.domain.Result;
-import org.mozzes.application.example.common.domain.Team;
import org.mozzes.application.example.common.service.MatchAdministration;
import org.mozzes.application.example.common.service.TeamAdministration;
import
org.mozzes.application.example.server.service.MatchAdministrationImpl;
@@ -46,7 +40,7 @@
MozzesServerConfiguration cfg = new MozzesServerConfiguration();
cfg.addApplicationModule(new
HibernatePlugin(HibernateConfigurationType.ANNOTATION));
cfg.addApplicationModule(new RemotingPlugin(PORT));
- cfg.addApplicationModule(new
RestJerseyModule("http://localhost:8080/", "org.mozzes.application.example.rest.jersey"));
+ cfg.addApplicationModule(new
RestJerseyModule("http://localhost:8000/", "org.mozzes.application.example.rest.jersey"));
cfg.addService(MatchAdministration.class, MatchAdministrationImpl.class);
cfg.addService(TeamAdministration.class, TeamAdministrationImpl.class);
@@ -72,7 +66,7 @@
}
- private static final Logger log = Logger.getLogger(ExampleServer.class);
+// private static final Logger log = Logger.getLogger(ExampleServer.class);
public static void main(String[] args) {
new ExampleServer().start();
=======================================
---
/trunk/mozzesApplication/mozzesApplicationExample/mozzesApplicationExampleVaadin/pom.xml
Fri Feb 26 09:23:22 2010
+++
/trunk/mozzesApplication/mozzesApplicationExample/mozzesApplicationExampleVaadin/pom.xml
Sat Feb 27 09:02:30 2010
@@ -8,7 +8,7 @@
</parent>
<groupId>org.mozzes.application</groupId>
<artifactId>mozzesApplicationExampleVaadin</artifactId>
- <name>Mozzes Application Example Vaadin</name>
+ <name>Mozzes Application Vaadin Example</name>
<packaging>war</packaging>
<dependencies>
<dependency>
=======================================
---
/trunk/mozzesApplication/mozzesApplicationExample/mozzesApplicationExampleVaadin/src/main/java/org/mozzes/application/example/vaadin/gui/TeamEditWindow.java
Sat Feb 27 06:56:25 2010
+++
/trunk/mozzesApplication/mozzesApplicationExample/mozzesApplicationExampleVaadin/src/main/java/org/mozzes/application/example/vaadin/gui/TeamEditWindow.java
Sat Feb 27 09:02:30 2010
@@ -94,6 +94,7 @@
Layout layout = new VerticalLayout();
layout.setStyleName(STYLE_LIGHT);
layout.setSizeUndefined();
+ layout.setMargin(true);
layout.addComponent(form);
layout.addComponent(actions);
setContent(layout);
@@ -112,8 +113,7 @@
private void setImageUpload(Team team) {
uploadReceiver = new ImageUploadListener(team);
- imageUpload = new Upload("Upload crest image", uploadReceiver);
- imageUpload.setButtonCaption("Upload");
+ imageUpload = new Upload(null, uploadReceiver);
imageUpload.addListener((Upload.SucceededListener) uploadReceiver);
imageUpload.addListener((Upload.FailedListener) uploadReceiver);
}
@@ -121,14 +121,14 @@
private void save() {
team.setName(String.valueOf(nameField.getValue()));
team.setWebAddress(String.valueOf(webField.getValue()));
- if (uploadReceiver.file != null)
- team.setCrestImage(uploadReceiver.file.getAbsolutePath());
+ if (uploadReceiver.currentFileName != null)
+ team.setCrestImage(uploadReceiver.currentFileName);
administration.save(team);
mainWindow.removeWindow(this);
mainWindow.reloadTeams();
}
- private static final String IMAGE_PATH = "c:" + File.separatorChar
+ "images" + File.separatorChar;
+ private static final String IMAGE_PATH = ".." + File.separatorChar
+ "images" + File.separatorChar;
private class ImageUploadListener implements Upload.SucceededListener,
Upload.FailedListener, Upload.Receiver {
@@ -136,6 +136,7 @@
private final Team team;
private File file;
+ private String currentFileName;
public ImageUploadListener(Team team) {
this.team = team;
@@ -147,10 +148,13 @@
return null;
FileOutputStream fos = null; // Output stream to write to
+
if (team.getCrestImage() != null)
- file = new File(team.getCrestImage());
+ currentFileName = team.getCrestImage();
else
- file = new File(generateImageFileName() + "." +
MIMEType.substring(MIMEType.indexOf('/') + 1));
+ currentFileName = generateImageFileName() + "." +
MIMEType.substring(MIMEType.indexOf('/') + 1);
+ file = new File(currentFileName);
+
try {
// Open the file for writing.
fos = new FileOutputStream(file);
@@ -164,7 +168,8 @@
@Override
public void uploadSucceeded(SucceededEvent event) {
- showNotification("File " + event.getFilename() + " of type '" +
event.getMIMEType() + "' uploaded.");
+ showNotification("File " + event.getFilename() + " of type '" +
event.getMIMEType() + "' uploaded.",
+ Notification.TYPE_HUMANIZED_MESSAGE);
form.removeComponent(crestImage);
crestImage = new Embedded("Crest", (new FileResource(file,
application)));
crestImage.requestRepaint();
=======================================
--- /trunk/mozzesApplication/mozzesApplicationRestJersey/pom.xml Sat Feb 27
05:48:41 2010
+++ /trunk/mozzesApplication/mozzesApplicationRestJersey/pom.xml Sat Feb 27
09:02:30 2010
@@ -1,15 +1,16 @@
<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/maven-v4_0_0.xsd">
-
+
<parent>
<artifactId>mozzesApplication</artifactId>
<groupId>org.mozzes.application</groupId>
<version>trunk-SNAPSHOT</version>
</parent>
-
+
<groupId>org.mozzes.application</groupId>
<artifactId>mozzesApplicationRestJersey</artifactId>
-
+ <name>Mozzes Application REST Plugin</name>
+
<modelVersion>4.0.0</modelVersion>
<repositories>
<repository>
=======================================
--- /trunk/mozzesApplication/mozzesApplicationVaadin/pom.xml Tue Feb 23
16:09:19 2010
+++ /trunk/mozzesApplication/mozzesApplicationVaadin/pom.xml Sat Feb 27
09:02:30 2010
@@ -8,7 +8,7 @@
</parent>
<groupId>org.mozzes.application</groupId>
<artifactId>mozzesApplicationVaadin</artifactId>
- <name>Mozzes Application Vaadin</name>
+ <name>Mozzes Application Vaadin Plugin</name>
<dependencies>
<dependency>
<groupId>org.mozzes.application</groupId>