[jboss-svn-commits] JBL Code SVN: r17819 - in labs/jbosslabs/labs-3.0-build: project-service/src/main/java/org/jboss/labs/core/service/impl and 7 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Mon Jan 14 11:13:47 EST 2008
Author: wrzep
Date: 2008-01-14 11:13:47 -0500 (Mon, 14 Jan 2008)
New Revision: 17819
Added:
labs/jbosslabs/labs-3.0-build/views/project-test-view/
labs/jbosslabs/labs-3.0-build/views/project-test-view/src/main/java/org/jboss/labs/view/
labs/jbosslabs/labs-3.0-build/views/project-test-view/src/main/java/org/jboss/labs/view/ProjectTestServlet.java
Removed:
labs/jbosslabs/labs-3.0-build/project-service/src/main/java/org/jboss/labs/App.java
labs/jbosslabs/labs-3.0-build/project-service/src/main/resources/META-INF/persistence.xml
labs/jbosslabs/labs-3.0-build/views/project-test-view/src/main/java/org/jboss/labs/MyServlet.java
Modified:
labs/jbosslabs/labs-3.0-build/project-service/src/main/java/org/jboss/labs/core/service/impl/ProjectServiceBean.java
labs/jbosslabs/labs-3.0-build/project-service/src/test/java/org/jboss/labs/AppTest.java
labs/jbosslabs/labs-3.0-build/views/pom.xml
labs/jbosslabs/labs-3.0-build/views/project-test-view/pom.xml
labs/jbosslabs/labs-3.0-build/views/project-test-view/src/main/webapp/WEB-INF/web.xml
Log:
JBLAB-897
project service test view
Deleted: labs/jbosslabs/labs-3.0-build/project-service/src/main/java/org/jboss/labs/App.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/project-service/src/main/java/org/jboss/labs/App.java 2008-01-14 16:11:24 UTC (rev 17818)
+++ labs/jbosslabs/labs-3.0-build/project-service/src/main/java/org/jboss/labs/App.java 2008-01-14 16:13:47 UTC (rev 17819)
@@ -1,13 +0,0 @@
-package org.jboss.labs;
-
-/**
- * Hello world!
- *
- */
-public class App
-{
- public static void main( String[] args )
- {
- System.out.println( "Hello World!" );
- }
-}
Modified: labs/jbosslabs/labs-3.0-build/project-service/src/main/java/org/jboss/labs/core/service/impl/ProjectServiceBean.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/project-service/src/main/java/org/jboss/labs/core/service/impl/ProjectServiceBean.java 2008-01-14 16:11:24 UTC (rev 17818)
+++ labs/jbosslabs/labs-3.0-build/project-service/src/main/java/org/jboss/labs/core/service/impl/ProjectServiceBean.java 2008-01-14 16:13:47 UTC (rev 17819)
@@ -14,13 +14,15 @@
//@WebService(endpointInterface="org.jboss.labs.ng.service.ProjectServiceWebService")
public class ProjectServiceBean implements ProjectService {
// ProjectServiceWebService {
- @PersistenceContext
+ @PersistenceContext(unitName = "core_model")
private EntityManager em;
public ProjectServiceBean() {
}
public Project getProject(String projectId) {
- return null;
+ Project p = new Project();
+ p.setName("Labs NG");
+ return p;
}
}
Deleted: labs/jbosslabs/labs-3.0-build/project-service/src/main/resources/META-INF/persistence.xml
===================================================================
--- labs/jbosslabs/labs-3.0-build/project-service/src/main/resources/META-INF/persistence.xml 2008-01-14 16:11:24 UTC (rev 17818)
+++ labs/jbosslabs/labs-3.0-build/project-service/src/main/resources/META-INF/persistence.xml 2008-01-14 16:13:47 UTC (rev 17819)
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<persistence>
- <persistence-unit name="property_persistance">
- <jta-data-source>java:/DefaultDS</jta-data-source>
- <properties>
- <property name="hibernate.dialect" value="org.hibernate.dialect.HSQLDialect" />
- <property name="hibernate.hbm2ddl.auto" value="update" />
- </properties>
- <!-- SPECIFY ENTITY CLASSES -->
-
- <!-- <class>org.jboss.labs.foo.FooEntity</class> -->
- </persistence-unit>
-</persistence>
-
Modified: labs/jbosslabs/labs-3.0-build/project-service/src/test/java/org/jboss/labs/AppTest.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/project-service/src/test/java/org/jboss/labs/AppTest.java 2008-01-14 16:11:24 UTC (rev 17818)
+++ labs/jbosslabs/labs-3.0-build/project-service/src/test/java/org/jboss/labs/AppTest.java 2008-01-14 16:13:47 UTC (rev 17819)
@@ -28,6 +28,7 @@
return new TestSuite( AppTest.class );
}
+
/**
* Rigourous Test :-)
*/
Modified: labs/jbosslabs/labs-3.0-build/views/pom.xml
===================================================================
--- labs/jbosslabs/labs-3.0-build/views/pom.xml 2008-01-14 16:11:24 UTC (rev 17818)
+++ labs/jbosslabs/labs-3.0-build/views/pom.xml 2008-01-14 16:13:47 UTC (rev 17819)
@@ -40,5 +40,6 @@
</dependencies>
<modules>
<module>foo-view</module>
+ <module>project-test-view</module>
</modules>
</project>
Copied: labs/jbosslabs/labs-3.0-build/views/project-test-view (from rev 17810, labs/jbosslabs/labs-3.0-build/views/foo-view)
Modified: labs/jbosslabs/labs-3.0-build/views/project-test-view/pom.xml
===================================================================
--- labs/jbosslabs/labs-3.0-build/views/foo-view/pom.xml 2008-01-14 12:20:46 UTC (rev 17810)
+++ labs/jbosslabs/labs-3.0-build/views/project-test-view/pom.xml 2008-01-14 16:13:47 UTC (rev 17819)
@@ -6,13 +6,13 @@
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.labs</groupId>
- <artifactId>foo-view</artifactId>
+ <artifactId>project-test-view</artifactId>
<packaging>war</packaging>
- <name>foo-view Maven Webapp</name>
+ <name>Project Test Webapp</name>
<version>1.0-SNAPSHOT</version>
<url>http://maven.apache.org</url>
<build>
- <finalName>foo-view</finalName>
+ <finalName>project-test-view</finalName>
</build>
<dependencies>
<dependency>
@@ -21,5 +21,24 @@
<version>3.8.1</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.jboss.labs</groupId>
+ <artifactId>api</artifactId>
+ <version>1.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.labs</groupId>
+ <artifactId>core-model</artifactId>
+ <version>1.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.persistence</groupId>
+ <artifactId>persistence-api</artifactId>
+ <version>1.0</version>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
+
</project>
\ No newline at end of file
Deleted: labs/jbosslabs/labs-3.0-build/views/project-test-view/src/main/java/org/jboss/labs/MyServlet.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/views/foo-view/src/main/java/org/jboss/labs/MyServlet.java 2008-01-14 12:20:46 UTC (rev 17810)
+++ labs/jbosslabs/labs-3.0-build/views/project-test-view/src/main/java/org/jboss/labs/MyServlet.java 2008-01-14 16:13:47 UTC (rev 17819)
@@ -1,45 +0,0 @@
-package org.jboss.labs;
-
-import java.io.IOException;
-
-import javax.ejb.EJB;
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.jboss.labs.foo.FooService;
-
-public class MyServlet extends HttpServlet {
-
- /**
- *
- */
- private static final long serialVersionUID = 1L;
-
- private FooService fooService;
-
- @Override
- protected void doGet(HttpServletRequest req, HttpServletResponse resp)
- throws ServletException, IOException {
- try {
- fooService = (FooService)new InitialContext().lookup("FooServiceImpl/local");
-
- resp
- .getWriter()
- .println(
- "<html><head><title>hello world</title></head><body><h1>Hello World[changed] !</h1>Foo says: "
- + fooService.sayFoo() + "<br/></body></html>");
- } catch (NamingException e) {
- log(e.getMessage(), e);
- resp
- .getWriter()
- .println(
- "<html><head><title>hello world</title></head><body><h1>Error!</h1></body></html>");
- }
-
- resp.getWriter().close();
- }
-}
Added: labs/jbosslabs/labs-3.0-build/views/project-test-view/src/main/java/org/jboss/labs/view/ProjectTestServlet.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/views/project-test-view/src/main/java/org/jboss/labs/view/ProjectTestServlet.java (rev 0)
+++ labs/jbosslabs/labs-3.0-build/views/project-test-view/src/main/java/org/jboss/labs/view/ProjectTestServlet.java 2008-01-14 16:13:47 UTC (rev 17819)
@@ -0,0 +1,45 @@
+package org.jboss.labs.view;
+
+import java.io.IOException;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+
+import org.jboss.labs.core.service.ProjectService;
+
+public class ProjectTestServlet extends HttpServlet {
+
+ /**
+ *
+ */
+ private static final long serialVersionUID = 1L;
+
+ private ProjectService projectService;
+
+ @Override
+ protected void doGet(HttpServletRequest req, HttpServletResponse resp)
+ throws ServletException, IOException {
+
+ try {
+ projectService = (ProjectService)new InitialContext().lookup("ProjectService/local");
+
+ resp
+ .getWriter()
+ .println(
+ "<html><head><title>hello world</title></head><body><h1>Hello World !</h1>Project service says: "
+ + projectService.getProject("jbosslabs").getName() + "<br/></body></html>");
+ } catch (NamingException e) {
+ log(e.getMessage(), e);
+ resp
+ .getWriter()
+ .println(
+ "<html><head><title>hello world</title></head><body><h1>Error!</h1></body></html>");
+ }
+
+ resp.getWriter().close();
+ }
+}
Modified: labs/jbosslabs/labs-3.0-build/views/project-test-view/src/main/webapp/WEB-INF/web.xml
===================================================================
--- labs/jbosslabs/labs-3.0-build/views/foo-view/src/main/webapp/WEB-INF/web.xml 2008-01-14 12:20:46 UTC (rev 17810)
+++ labs/jbosslabs/labs-3.0-build/views/project-test-view/src/main/webapp/WEB-INF/web.xml 2008-01-14 16:13:47 UTC (rev 17819)
@@ -2,16 +2,16 @@
<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
"http://java.sun.com/dtd/web-app_2_3.dtd">
<web-app>
- <display-name>Foo Web Application</display-name>
+ <display-name>Project Test View Application</display-name>
<servlet>
- <servlet-name>FooServlet</servlet-name>
- <display-name>FooServlet</display-name>
- <description>My foo servlet</description>
- <servlet-class>org.jboss.labs.MyServlet</servlet-class>
+ <servlet-name>ProjectTestServlet</servlet-name>
+ <display-name>ProjectTestServlet</display-name>
+ <description>Project test servlet</description>
+ <servlet-class>org.jboss.labs.view.ProjectTestServlet</servlet-class>
<load-on-startup>1</load-on-startup>
</servlet>
<servlet-mapping>
- <servlet-name>FooServlet</servlet-name>
+ <servlet-name>ProjectTestServlet</servlet-name>
<url-pattern>/*</url-pattern>
</servlet-mapping>
</web-app>
More information about the jboss-svn-commits
mailing list