[Jboss-svn-commits] JBL Code SVN: r4649 - in labs/shotoku/trunk/shotoku-tags: . src/etc src/etc/META-INF src/java src/java/dal src/java/org/jboss/shotoku/tags src/java/org/jboss/shotoku/tags/service src/java/org/jboss/shotoku/tags/test

[<jbo...@li...>]

Author: adamw
Date: 2006-06-06 17:56:17 -0400 (Tue, 06 Jun 2006)
New Revision: 4649

Added:
   labs/shotoku/trunk/shotoku-tags/src/etc/META-INF/
   labs/shotoku/trunk/shotoku-tags/src/etc/META-INF/persistence.xml
   labs/shotoku/trunk/shotoku-tags/src/java/dal/
   labs/shotoku/trunk/shotoku-tags/src/java/dal/TagEntity.java
   labs/shotoku/trunk/shotoku-tags/src/java/org/jboss/shotoku/tags/test/
   labs/shotoku/trunk/shotoku-tags/src/java/org/jboss/shotoku/tags/test/TagsTestServlet.java
Modified:
   labs/shotoku/trunk/shotoku-tags/maven.xml
   labs/shotoku/trunk/shotoku-tags/project.xml
   labs/shotoku/trunk/shotoku-tags/src/java/org/jboss/shotoku/tags/service/TagServiceImpl.java
Log:
http://jira.jboss.com/jira/browse/JBSHOTOKU-86


Modified: labs/shotoku/trunk/shotoku-tags/maven.xml
===================================================================
--- labs/shotoku/trunk/shotoku-tags/maven.xml	2006-06-06 21:27:21 UTC (rev 4648)
+++ labs/shotoku/trunk/shotoku-tags/maven.xml	2006-06-06 21:56:17 UTC (rev 4649)
@@ -6,6 +6,7 @@
     <goal name="build">
         <attainGoal name="java:compile" />
         <attainGoal name="ejb" />
+        <attainGoal name="war" />
     </goal>
 
     <goal name="deploy">
@@ -13,6 +14,9 @@
                 file="target/shotoku-tags.jar"
                 tofile="${local.deploy.dir}/shotoku-tags.ejb3"
                 overwrite="true" />
+        <ant:copy
+                file="target/shotoku-tags.war"
+                todir="${local.deploy.dir}" />
     </goal>
 
 	<goal name="all">

Modified: labs/shotoku/trunk/shotoku-tags/project.xml
===================================================================
--- labs/shotoku/trunk/shotoku-tags/project.xml	2006-06-06 21:27:21 UTC (rev 4648)
+++ labs/shotoku/trunk/shotoku-tags/project.xml	2006-06-06 21:56:17 UTC (rev 4649)
@@ -11,6 +11,31 @@
             <artifactId>shotoku-base</artifactId>
             <jar>shotoku-base.jar</jar>
         </dependency>
+        <dependency>
+            <groupId>jboss</groupId>
+            <artifactId>ejb3-persistence</artifactId>
+            <jar>ejb3-persistence.jar</jar>
+        </dependency>
+        <dependency>
+            <groupId>jboss</groupId>
+            <artifactId>jboss-ejb3x</artifactId>
+            <jar>jboss-ejb3x.jar</jar>
+        </dependency>
+        <dependency>
+            <groupId>jboss</groupId>
+            <artifactId>jboss-j2ee</artifactId>
+            <jar>jboss-j2ee.jar</jar>
+        </dependency>
+        <dependency>
+            <groupId>jboss</groupId>
+            <artifactId>jboss-annotations-ejb3</artifactId>
+            <jar>jboss-annotations-ejb3.jar</jar>
+        </dependency>
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>javax.servlet</artifactId>
+            <jar>javax.servlet.jar</jar>
+        </dependency>
     </dependencies>
 
     <build>

Added: labs/shotoku/trunk/shotoku-tags/src/etc/META-INF/persistence.xml
===================================================================
--- labs/shotoku/trunk/shotoku-tags/src/etc/META-INF/persistence.xml	2006-06-06 21:27:21 UTC (rev 4648)
+++ labs/shotoku/trunk/shotoku-tags/src/etc/META-INF/persistence.xml	2006-06-06 21:56:17 UTC (rev 4649)
@@ -0,0 +1,9 @@
+<entity-manager>
+	<name>tags</name>
+	<jta-data-source>java:/JBossDS</jta-data-source>
+	<properties>
+		<property name="hibernate.connection.datasource"  value="JBossDS" />
+		<property name="hibernate.dialect" value="org.hibernate.dialect.MySQLDialect" />
+		<property name="hibernate.hbm2ddl.auto" value="update" />
+	</properties>
+</entity-manager>

Added: labs/shotoku/trunk/shotoku-tags/src/java/dal/TagEntity.java
===================================================================
--- labs/shotoku/trunk/shotoku-tags/src/java/dal/TagEntity.java	2006-06-06 21:27:21 UTC (rev 4648)
+++ labs/shotoku/trunk/shotoku-tags/src/java/dal/TagEntity.java	2006-06-06 21:56:17 UTC (rev 4649)
@@ -0,0 +1,32 @@
+package dal;
+
+import javax.persistence.*;
+
+/**
+ * @author Adam Warski (ad...@as...)
+ */
+@Entity
+@Table(name = "ShotokuTags")
+public class TagEntity {
+    private int id;
+    private String name;
+
+    @Id @GeneratedValue(strategy = GenerationType.AUTO)
+    public int getId()
+    {
+        return id;
+    }
+
+    public void setId(int id)
+    {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+}

Modified: labs/shotoku/trunk/shotoku-tags/src/java/org/jboss/shotoku/tags/service/TagServiceImpl.java
===================================================================
--- labs/shotoku/trunk/shotoku-tags/src/java/org/jboss/shotoku/tags/service/TagServiceImpl.java	2006-06-06 21:27:21 UTC (rev 4648)
+++ labs/shotoku/trunk/shotoku-tags/src/java/org/jboss/shotoku/tags/service/TagServiceImpl.java	2006-06-06 21:56:17 UTC (rev 4649)
@@ -25,6 +25,8 @@
 import java.util.List;
 
 import javax.ejb.Local;
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
 
 import org.apache.log4j.Logger;
 import org.jboss.annotation.ejb.Management;
@@ -49,7 +51,7 @@
 @Management(TagService.class)
 @Depends(Constants.SHOTOKU_SERVICE_NAME)
 public class TagServiceImpl extends AdministratedServiceImpl
-           implements TagService, TagServiceLocal {
+        implements TagService, TagServiceLocal {
     private static final Logger log = Logger.getLogger(TagService.class);
 
     /*
@@ -136,6 +138,9 @@
      * TagService implementation.
      */
 
+    @PersistenceContext
+    private EntityManager manager;
+
     public void addTag(Tag t) {
 
     }
@@ -143,11 +148,13 @@
     public void deleteTag(Tag t) {
     }
 
-    public TagList getTags(List<String> tagNames) {
+    public TagList getTags(String resourceId) {
+        manager.createQuery("from TagEntity where name = :name").setParameter(
+                "name", resourceId).getResultList();
         return null;
     }
 
-    public TagList getTags(String resourceId) {
+    public TagList getTags(List<String> tagNames) {
         return null;
     }
 

Added: labs/shotoku/trunk/shotoku-tags/src/java/org/jboss/shotoku/tags/test/TagsTestServlet.java
===================================================================
--- labs/shotoku/trunk/shotoku-tags/src/java/org/jboss/shotoku/tags/test/TagsTestServlet.java	2006-06-06 21:27:21 UTC (rev 4648)
+++ labs/shotoku/trunk/shotoku-tags/src/java/org/jboss/shotoku/tags/test/TagsTestServlet.java	2006-06-06 21:56:17 UTC (rev 4649)
@@ -0,0 +1,22 @@
+package org.jboss.shotoku.tags.test;
+
+import org.jboss.shotoku.tags.TagTools;
+
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.ServletException;
+import java.io.IOException;
+
+/**
+ * @author Adam Warski (ad...@as...)
+ */
+public class TagsTestServlet extends HttpServlet {
+
+    protected void doGet(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse) throws ServletException, IOException {
+        httpServletResponse.setContentType("text/html");
+        httpServletResponse.getWriter().println(TagTools.getService().getServiceName());
+
+        TagTools.getService().getTags("aaa");
+    }
+}