[seam-commits] Seam SVN: r10156 - in trunk/seam-gen: src and 1 other directory.

[seam-commits at lists.jboss.org]

Author: dan.j.allen
Date: 2009-03-13 20:38:54 -0400 (Fri, 13 Mar 2009)
New Revision: 10156

Added:
   trunk/seam-gen/src/Authenticator.java
   trunk/seam-gen/src/AuthenticatorLocal.java
Removed:
   trunk/seam-gen/src/Authenticator.java
   trunk/seam-gen/src/AuthenticatorJavaBean.java
Modified:
   trunk/seam-gen/build.xml
Log:
rename Authenticator.java to AuthenticatorLocal.java and restore previous Authenticator.java
this prevents breaking JBoss Tools


Modified: trunk/seam-gen/build.xml
===================================================================
--- trunk/seam-gen/build.xml	2009-03-14 00:23:51 UTC (rev 10155)
+++ trunk/seam-gen/build.xml	2009-03-14 00:38:54 UTC (rev 10156)
@@ -793,10 +793,6 @@
         <copy todir="${project.home}/src/hot" file="${templates.dir}/resources/seam.properties"/>
         <copy todir="${project.home}/src/main" file="${templates.dir}/resources/seam.properties"/>
         -->
-        <copy tofile="${project.home}/src/${action.dir}/Authenticator.java"
-            file="${templates.dir}/src/AuthenticatorJavaBean.java">
-            <filterset refid="filters"/>
-        </copy>
     </target>
 
     <target name="file-copy-ear" unless="project.war">
@@ -1034,13 +1030,18 @@
 
         <copy todir="${project.home}/src/${action.dir}">
             <fileset dir="${templates.dir}/src/">
-                <include name="Authenticator.java" if="project.ear"/>
+                <include name="Authenticator.java" if="project.war"/>
                 <include name="AuthenticatorBean.java" if="project.ear"/>
                 <include name="Timer*.java" if="icefaces.property"/>
             </fileset>
             <filterset refid="filters"/>
         </copy>
 
+        <copy tofile="${project.home}/src/${action.dir}/Authenticator.java"
+            file="${templates.dir}/src/AuthenticatorLocal.java">
+            <filterset refid="filters"/>
+        </copy>
+
         <copy todir="${project.home}">
             <fileset dir="${templates.dir}/build-scripts">
                 <include name="build*.properties"/>

Deleted: trunk/seam-gen/src/Authenticator.java
===================================================================
--- trunk/seam-gen/src/Authenticator.java	2009-03-14 00:23:51 UTC (rev 10155)
+++ trunk/seam-gen/src/Authenticator.java	2009-03-14 00:38:54 UTC (rev 10156)
@@ -1,10 +0,0 @@
-package @actionPackage@;
-
-import javax.ejb.Local;
-
- at Local
-public interface Authenticator {
-
-    boolean authenticate();
-
-}

Copied: trunk/seam-gen/src/Authenticator.java (from rev 10154, trunk/seam-gen/src/AuthenticatorJavaBean.java)
===================================================================
--- trunk/seam-gen/src/Authenticator.java	                        (rev 0)
+++ trunk/seam-gen/src/Authenticator.java	2009-03-14 00:38:54 UTC (rev 10156)
@@ -0,0 +1,32 @@
+package @actionPackage@;
+
+import org.jboss.seam.annotations.In;
+import org.jboss.seam.annotations.Logger;
+import org.jboss.seam.annotations.Name;
+import org.jboss.seam.log.Log;
+import org.jboss.seam.security.Credentials;
+import org.jboss.seam.security.Identity;
+
+ at Name("authenticator")
+public class Authenticator
+{
+    @Logger private Log log;
+
+    @In Identity identity;
+    @In Credentials credentials;
+
+    public boolean authenticate()
+    {
+        log.info("authenticating {0}", credentials.getUsername());
+        //write your authentication logic here,
+        //return true if the authentication was
+        //successful, false otherwise
+        if ("admin".equals(credentials.getUsername()))
+        {
+            identity.addRole("admin");
+            return true;
+        }
+        return false;
+    }
+
+}

Deleted: trunk/seam-gen/src/AuthenticatorJavaBean.java
===================================================================
--- trunk/seam-gen/src/AuthenticatorJavaBean.java	2009-03-14 00:23:51 UTC (rev 10155)
+++ trunk/seam-gen/src/AuthenticatorJavaBean.java	2009-03-14 00:38:54 UTC (rev 10156)
@@ -1,32 +0,0 @@
-package @actionPackage@;
-
-import org.jboss.seam.annotations.In;
-import org.jboss.seam.annotations.Logger;
-import org.jboss.seam.annotations.Name;
-import org.jboss.seam.log.Log;
-import org.jboss.seam.security.Credentials;
-import org.jboss.seam.security.Identity;
-
- at Name("authenticator")
-public class Authenticator
-{
-    @Logger private Log log;
-
-    @In Identity identity;
-    @In Credentials credentials;
-
-    public boolean authenticate()
-    {
-        log.info("authenticating {0}", credentials.getUsername());
-        //write your authentication logic here,
-        //return true if the authentication was
-        //successful, false otherwise
-        if ("admin".equals(credentials.getUsername()))
-        {
-            identity.addRole("admin");
-            return true;
-        }
-        return false;
-    }
-
-}

Copied: trunk/seam-gen/src/AuthenticatorLocal.java (from rev 10154, trunk/seam-gen/src/Authenticator.java)
===================================================================
--- trunk/seam-gen/src/AuthenticatorLocal.java	                        (rev 0)
+++ trunk/seam-gen/src/AuthenticatorLocal.java	2009-03-14 00:38:54 UTC (rev 10156)
@@ -0,0 +1,10 @@
+package @actionPackage@;
+
+import javax.ejb.Local;
+
+ at Local
+public interface Authenticator {
+
+    boolean authenticate();
+
+}