revert to JavaEE6 only (no Seam)

mmazi · Sep 13, 2011 · f4e51d9 · f4e51d9
1 parent f6133d7
commit f4e51d9
Show file tree

Hide file tree

Showing 14 changed files with 2 additions and 303 deletions.
diff --git a/pom.xml b/pom.xml
@@ -15,105 +15,9 @@
             <type>pom</type>
             <scope>provided</scope>
         </dependency>
-
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-            <version>1.5.8</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-jdk14</artifactId>
-            <version>1.5.8</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.jboss.seam.faces</groupId>
-            <artifactId>seam-faces-api</artifactId>
-            <version>3.0.0.Final</version>
-        </dependency>
-        <dependency>
-            <groupId>org.jboss.seam.faces</groupId>
-            <artifactId>seam-faces-impl</artifactId>
-            <version>3.0.0.Final</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.jboss.seam.international</groupId>
-                    <artifactId>seam-international</artifactId>
-                </exclusion>
-            </exclusions>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.jboss.seam.international</groupId>
-            <artifactId>seam-international-api</artifactId>
-            <version>3.0.0.Final</version>
-        </dependency>
-        <dependency>
-            <groupId>org.jboss.seam.international</groupId>
-            <artifactId>seam-international-impl</artifactId>
-            <version>3.0.0.Final</version>
-            <scope>runtime</scope>
-        </dependency>
-
-
-        <dependency>
-            <groupId>org.jboss.seam.cron</groupId>
-            <artifactId>seam-cron-api</artifactId>
-            <version>3.0.0.Alpha1</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.jboss.seam.cron</groupId>
-            <artifactId>seam-cron-scheduling-quartz</artifactId>
-            <version>3.0.0.Alpha1</version>
-            <scope>runtime</scope>
-        </dependency>
-
-
-        <dependency>
-            <groupId>org.jboss.seam.mail</groupId>
-            <artifactId>seam-mail-core-api</artifactId>
-            <version>3.0.0.Beta1-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.jboss.seam.mail</groupId>
-            <artifactId>seam-mail-freemarker-impl</artifactId>
-            <version>3.0.0.Beta1-SNAPSHOT</version>
-        </dependency>
-
-
     </dependencies>
 
     <build>
         <finalName>demo</finalName>
-        <resources>
-            <resource>
-                <directory>src/main/resources</directory>
-                <filtering>true</filtering>
-            </resource>
-            <resource>
-                <directory>src/main/mail</directory>
-                <targetPath>mail</targetPath>
-                <filtering>false</filtering>
-            </resource>
-        </resources>
-        <plugins>
-            <plugin>
-                <groupId>org.jboss.as.plugins</groupId>
-                <artifactId>jboss-as-maven-plugin</artifactId>
-                <version>7.0.0.Final</version>
-                <executions>
-                    <execution>
-                        <phase>install</phase>
-                        <goals>
-                            <goal>deploy</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
     </build>
 </project>
diff --git a/src/main/java/com/parsek/test/MemberRegistration.java b/src/main/java/com/parsek/test/MemberRegistration.java
@@ -1,8 +1,6 @@
 package com.parsek.test;
 
 import com.parsek.test.model.Member;
-import com.parsek.test.seam.MailSender;
-import com.parsek.test.seam.Messages;
 
 import javax.annotation.PostConstruct;
 import javax.ejb.Stateful;
@@ -18,8 +16,6 @@
 public class MemberRegistration {
     @PersistenceContext private EntityManager em;
     @Inject private Event<Member> memberEventSrc;
-    @Inject private Messages messages;
-    @Inject private MailSender mailSender;
 
     private Member newMember;
 
@@ -36,14 +32,11 @@ public Member getNewMember() {
     public void register() throws Exception {
         em.persist(newMember);
         memberEventSrc.fire(newMember);
-        mailSender.sayWelcome(newMember);
-        messages.addInfo("member.created", newMember.getName());
         initNewMember();
     }
 
     public void delete(Member m) {
         em.remove(em.getReference(Member.class, m.getId()));
-        messages.addInfo("member.deleted", m.getName());
         memberEventSrc.fire(m);
     }
 }
diff --git a/src/main/java/com/parsek/test/seam/CronExample.java b/src/main/java/com/parsek/test/seam/CronExample.java
diff --git a/src/main/java/com/parsek/test/seam/LocaleSelector.java b/src/main/java/com/parsek/test/seam/LocaleSelector.java
diff --git a/src/main/java/com/parsek/test/seam/MailSender.java b/src/main/java/com/parsek/test/seam/MailSender.java
diff --git a/src/main/java/com/parsek/test/seam/Messages.java b/src/main/java/com/parsek/test/seam/Messages.java
diff --git a/src/main/java/com/parsek/test/seam/UnregisteredEmailValidator.java b/src/main/java/com/parsek/test/seam/UnregisteredEmailValidator.java
diff --git a/src/main/mail/welcome.ftl b/src/main/mail/welcome.ftl
diff --git a/src/main/resources/META-INF/MANIFEST.MF b/src/main/resources/META-INF/MANIFEST.MF
diff --git a/src/main/resources/messages_en.properties b/src/main/resources/messages_en.properties
diff --git a/src/main/resources/messages_sl.properties b/src/main/resources/messages_sl.properties
diff --git a/src/main/webapp/WEB-INF/faces-config.xml b/src/main/webapp/WEB-INF/faces-config.xml
@@ -1,9 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<faces-config version="2.0"/>
-<faces-config version="2.0"
-    xmlns="http://java.sun.com/xml/ns/javaee"
-    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">
-
-</faces-config>
diff --git a/src/main/webapp/index.xhtml b/src/main/webapp/index.xhtml
@@ -1,18 +1,12 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xmlns:h="http://java.sun.com/jsf/html" xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:f="http://java.sun.com/jsf/core">
-<f:view locale="#{userLocale}">
 <h:head>
     <title>CDI Demo</title>
     <h:outputStylesheet name="screen.css"/>
 </h:head>
 <h:body>
     <div id="container">
-        <h:form>
-            <h:commandLink value="sl" action="#{localeSelector.setUserLocale('sl')}"/> |
-            <h:commandLink value="en" action="#{localeSelector.setUserLocale('en')}"/>
-        </h:form>
         <div id="content">
-            <h:messages globalOnly="true" styleClass="msgs"/>
             <h:form id="reg">
                 <h2>Register</h2>
                 <h:panelGrid columns="3">
@@ -22,7 +16,7 @@
                     <h:message for="name" errorClass="invalid"/>
 
                     <h:outputLabel for="email" value="Email:"/>
-                    <h:inputText id="email" value="#{newMember.email}" validator="unregisteredEmailValidator"/>
+                    <h:inputText id="email" value="#{newMember.email}"/>
                     <h:message for="email" errorClass="invalid"/>
 
                     <h:outputLabel for="phoneNumber" value="Phone:"/>
@@ -63,5 +57,4 @@
         </div>
     </div>
 </h:body>
-</f:view>
 </html>
diff --git a/src/main/webapp/resources/screen.css b/src/main/webapp/resources/screen.css
@@ -52,6 +52,3 @@ span.invalid {
     padding: 3px 17px;
 }
 
-.msgs {
-    background-color: #ccffcc;
-}