openwebbeans-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gerdo...@apache.org
Subject svn commit: r804758 - in /incubator/openwebbeans/trunk/samples/guess: ./ src/main/java/org/apache/webbeans/sample/bean/ src/main/java/org/apache/webbeans/sample/decorator/ src/main/java/org/apache/webbeans/sample/ejb/ src/main/java/org/apache/webbeans/...
Date Sun, 16 Aug 2009 20:12:02 GMT
Author: gerdogdu
Date: Sun Aug 16 20:12:02 2009
New Revision: 804758

URL: http://svn.apache.org/viewvc?rev=804758&view=rev
Log:
Seperating example into different parts, ejb-sample and jms-sample

Removed:
    incubator/openwebbeans/trunk/samples/guess/src/main/java/org/apache/webbeans/sample/bean/EchoManaged.java
    incubator/openwebbeans/trunk/samples/guess/src/main/java/org/apache/webbeans/sample/decorator/
    incubator/openwebbeans/trunk/samples/guess/src/main/java/org/apache/webbeans/sample/ejb/
    incubator/openwebbeans/trunk/samples/guess/src/main/java/org/apache/webbeans/sample/interceptor/
    incubator/openwebbeans/trunk/samples/guess/src/main/java/org/apache/webbeans/sample/jms/
    incubator/openwebbeans/trunk/samples/guess/src/main/webapp/echo.xhtml
    incubator/openwebbeans/trunk/samples/guess/src/main/webapp/jms.xhtml
Modified:
    incubator/openwebbeans/trunk/samples/guess/pom.xml
    incubator/openwebbeans/trunk/samples/guess/src/main/java/org/apache/webbeans/sample/bean/LoginBean.java
    incubator/openwebbeans/trunk/samples/guess/src/main/webapp/WEB-INF/beans.xml

Modified: incubator/openwebbeans/trunk/samples/guess/pom.xml
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/samples/guess/pom.xml?rev=804758&r1=804757&r2=804758&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/samples/guess/pom.xml (original)
+++ incubator/openwebbeans/trunk/samples/guess/pom.xml Sun Aug 16 20:12:02 2009
@@ -1,25 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-	
-	Licensed to the Apache Software Foundation (ASF) under one or more
-	contributor license agreements. See the NOTICE file distributed with
-	this work for additional information regarding copyright ownership.
-	The ASF licenses this file to You under the Apache License, Version
-	2.0 (the "License"); you may not use this file except in compliance
-	with the License. You may obtain a copy of the License at
-	
-	http://www.apache.org/licenses/LICENSE-2.0 Unless required by
-	applicable law or agreed to in writing, software distributed under the
-	License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
-	CONDITIONS OF ANY KIND, either express or implied. See the License for
-	the specific language governing permissions and limitations under the
-	License.
--->
-<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">
+	<!--
+
+		Licensed to the Apache Software Foundation (ASF) under one or more
+		contributor license agreements. See the NOTICE file distributed with
+		this work for additional information regarding copyright ownership.
+		The ASF licenses this file to You under the Apache License, Version
+		2.0 (the "License"); you may not use this file except in compliance
+		with the License. You may obtain a copy of the License at
+
+		http://www.apache.org/licenses/LICENSE-2.0 Unless required by
+		applicable law or agreed to in writing, software distributed under the
+		License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+		CONDITIONS OF ANY KIND, either express or implied. See the License for
+		the specific language governing permissions and limitations under the
+		License.
+	-->
+<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>samples</artifactId>
-	     <groupId>org.apache.openwebbeans</groupId>
-	     <version>1.0.0-incubating-SNAPSHOT</version>
+		<artifactId>samples</artifactId>
+		<groupId>org.apache.openwebbeans</groupId>
+		<version>1.0.0-incubating-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.apache.openwebbeans.samples</groupId>
@@ -30,179 +31,103 @@
 
 	<build>
 		<finalName>guess</finalName>
+	</build>
+
+	<dependencies>
+
+		<!-- For Junit Test -->
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<scope>test</scope>
+		</dependency>
 		
-		<plugins>
-	      <plugin>
-	        <groupId>org.codehaus.mojo</groupId>
-	        <artifactId>tomcat-maven-plugin</artifactId>
-	        <version>1.0-beta-1</version>
-	        <configuration>
-	          <url>http://localhost:8080/manager/html
-	          </url>
-	        </configuration>
-	      </plugin>
-		</plugins>
+		<!-- JSF Facelet -->
+		<dependency>
+			<groupId>com.sun.facelets</groupId>
+			<artifactId>jsf-facelets</artifactId>
+			<version>1.1.14</version>
+		</dependency>
+
+		<!-- JSR-299 API, provided, for use Jetty see profile jetty -->
+		<dependency>
+			<groupId>org.apache.openwebbeans</groupId>
+			<artifactId>openwebbeans-api</artifactId>
+			<version>1.0.0-incubating-SNAPSHOT</version>
+			<scope>provided</scope>
+		</dependency>
 		
-	</build>
+		<!-- OWB implementation per application -->
+		<dependency>
+			<groupId>org.apache.openwebbeans</groupId>
+			<artifactId>openwebbeans-impl</artifactId>
+			<version>1.0.0-incubating-SNAPSHOT</version>
+		</dependency>
+		
+		
+		<!-- JSF Plugin -->
+		<dependency>
+			<groupId>org.apache.openwebbeans</groupId>
+			<artifactId>openwebbeans-jsf</artifactId>
+			<version>1.0.0-incubating-SNAPSHOT</version>
+		</dependency>
+		
+		<!-- MyFaces API -->
+		<dependency>
+			<groupId>org.apache.myfaces.core</groupId>
+			<artifactId>myfaces-api</artifactId>
+		</dependency>
+		
+		<!-- Servlet API -->
+		<dependency>
+			<groupId>org.apache.geronimo.specs</groupId>
+			<artifactId>geronimo-servlet_2.5_spec</artifactId>
+			<scope>provided</scope>
+		</dependency>
+		
+		<!-- MyFaces IMPL -->
+		<dependency>
+			<groupId>org.apache.myfaces.core</groupId>
+			<artifactId>myfaces-impl</artifactId>
+		</dependency>
+		
+		<!-- Interceptor API -->	
+		<dependency>
+			<groupId>org.apache.geronimo.specs</groupId>
+			<artifactId>geronimo-interceptor_3.0_spec</artifactId>
+		</dependency>
+
+	</dependencies>
 
-    <dependencies>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>com.sun.facelets</groupId>
-            <artifactId>jsf-facelets</artifactId>
-            <version>1.1.14</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.openwebbeans</groupId>
-            <artifactId>openwebbeans-api</artifactId>
-            <version>1.0.0-incubating-SNAPSHOT</version>
-            <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.openwebbeans</groupId>
-            <artifactId>openwebbeans-jsf</artifactId>
-            <version>1.0.0-incubating-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.openwebbeans</groupId>
-            <artifactId>openwebbeans-jpa</artifactId>
-            <version>1.0.0-incubating-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.myfaces.core</groupId>
-            <artifactId>myfaces-api</artifactId>
-            <optional>true</optional>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-servlet_2.5_spec</artifactId>
-            <scope>provided</scope>
-            <optional>true</optional>
-        </dependency>
-        <dependency>
-        	<groupId>org.apache.openwebbeans</groupId>
-        	<artifactId>openwebbeans-jms</artifactId>
-        	<version>1.0.0-incubating-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-        	<groupId>org.apache.openwebbeans</groupId>
-        	<artifactId>openwebbeans-ejb</artifactId>
-        	<version>1.0.0-incubating-SNAPSHOT</version>
-        	<scope>compile</scope>
-        </dependency>
-        
-                <dependency>
-                    <groupId>org.apache.myfaces.core</groupId>
-                    <artifactId>myfaces-impl</artifactId>
-                    <optional>true</optional>
-                </dependency>
-                <dependency>
-                	<groupId>org.apache.geronimo.specs</groupId>
-                	<artifactId>geronimo-ejb_3.0_spec</artifactId>
-                	<scope>provided</scope>
-                	<optional>true</optional>
-                </dependency>
-                <dependency>
-                	<groupId>org.apache.geronimo.specs</groupId>
-                	<artifactId>geronimo-interceptor_3.0_spec</artifactId>
-                	<scope>provided</scope>
-                	<optional>true</optional>
-                </dependency>
-                <dependency>
-                	<groupId>org.apache.geronimo.specs</groupId>
-                	<artifactId>geronimo-jms_1.1_spec</artifactId>
-                	<version>1.1.1</version>
-                	<optional>true</optional>
-                </dependency>
-        
-	
-      </dependencies>
-
-    <properties>
-        <envlibscope>provided</envlibscope>
-    </properties>
-    
 	<profiles>
+				
 		<profile>
 			<id>jetty</id>
-            <dependencies>
-                <dependency>
-                    <groupId>org.apache.openwebbeans</groupId>
-                    <artifactId>openwebbeans-api</artifactId>
-                    <version>1.0.0-incubating-SNAPSHOT</version>
-                    <scope>compile</scope> <!-- we need this if we run in
jetty! -->
-                </dependency>
-            
-                <dependency>
-                    <groupId>org.apache.openwebbeans</groupId>
-                    <artifactId>openwebbeans-impl</artifactId>
-                    <version>1.0.0-incubating-SNAPSHOT</version>
-                </dependency>
-            
-                <dependency>
-                    <groupId>org.apache.openwebbeans</groupId>
-                    <artifactId>openwebbeans-jsf</artifactId>
-                    <version>1.0.0-incubating-SNAPSHOT</version>
-                </dependency>
-            
-                <dependency>
-                    <groupId>org.apache.openwebbeans</groupId>
-                    <artifactId>openwebbeans-jpa</artifactId>
-                    <version>1.0.0-incubating-SNAPSHOT</version>
-                </dependency>
-
-                <dependency>
-                    <groupId>org.apache.openjpa</groupId>
-                    <artifactId>openjpa</artifactId>
-                    <version>1.2.0</version>
-                </dependency>
-            
-                <dependency>
-                    <groupId>hsqldb</groupId>
-                    <artifactId>hsqldb</artifactId>
-                    <version>1.8.0.7</version>
-                </dependency>
-            
-                <dependency>
-                    <groupId>org.apache.myfaces.core</groupId>
-                    <artifactId>myfaces-api</artifactId>
-                    <scope>compile</scope> <!-- we need this if we run in
jetty! -->
-                </dependency>
-
-                <dependency>
-                    <groupId>org.apache.myfaces.core</groupId>
-                    <artifactId>myfaces-impl</artifactId>
-                </dependency>
-            </dependencies>
-
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.mortbay.jetty</groupId>
-                        <artifactId>maven-jetty-plugin</artifactId>
-                        <version>6.1.18</version>
-                        <configuration>
-                            <scanIntervalSeconds>10</scanIntervalSeconds>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-
-            <properties>
-                <envlibscope>compile</envlibscope>
-            </properties>
-	
-	</profile>
-     </profiles>
+			
+			<dependencies>
+				<dependency>
+					<groupId>org.apache.openwebbeans</groupId>
+					<artifactId>openwebbeans-api</artifactId>
+					<version>1.0.0-incubating-SNAPSHOT</version>
+					<scope>compile</scope> <!-- we need this if we run in jetty! -->
+				</dependency>
+
+			</dependencies>
+
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.mortbay.jetty</groupId>
+						<artifactId>maven-jetty-plugin</artifactId>
+						<version>6.1.18</version>
+						<configuration>
+							<scanIntervalSeconds>10</scanIntervalSeconds>
+						</configuration>
+					</plugin>
+				</plugins>
+			</build>
+
+		</profile>
+	</profiles>
 
 </project>

Modified: incubator/openwebbeans/trunk/samples/guess/src/main/java/org/apache/webbeans/sample/bean/LoginBean.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/samples/guess/src/main/java/org/apache/webbeans/sample/bean/LoginBean.java?rev=804758&r1=804757&r2=804758&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/samples/guess/src/main/java/org/apache/webbeans/sample/bean/LoginBean.java
(original)
+++ incubator/openwebbeans/trunk/samples/guess/src/main/java/org/apache/webbeans/sample/bean/LoginBean.java
Sun Aug 16 20:12:02 2009
@@ -29,7 +29,6 @@
 
 import org.apache.webbeans.sample.bindings.LoggedInUser;
 import org.apache.webbeans.sample.dependent.LoginCheck;
-import org.apache.webbeans.sample.ejb.Hello;
 import org.apache.webbeans.sample.event.LoggedInEvent;
 import org.apache.webbeans.sample.model.User;
 import org.apache.webbeans.sample.util.FacesMessageUtil;
@@ -50,8 +49,6 @@
 	
 	private @Any Event<LoggedInEvent> event;
 	
-	private @Current Hello hello;
-	
 	public LoginBean()
 	{
 		
@@ -67,8 +64,6 @@
 			
 			event.fire(new LoggedInEvent(this.user));
 			
-			this.hello.sayHello();
-			
 			return "loginSuccess";
 		}
 		else

Modified: incubator/openwebbeans/trunk/samples/guess/src/main/webapp/WEB-INF/beans.xml
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/samples/guess/src/main/webapp/WEB-INF/beans.xml?rev=804758&r1=804757&r2=804758&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/samples/guess/src/main/webapp/WEB-INF/beans.xml (original)
+++ incubator/openwebbeans/trunk/samples/guess/src/main/webapp/WEB-INF/beans.xml Sun Aug 16
20:12:02 2009
@@ -26,12 +26,5 @@
 		<Standard/>
 		<Production/>
 	</Deploy>
-	
-	<Queue>
-		<Resource>
-			<name>queue/A</name>
-		</Resource>
-		<myapp:JmsBinding/>
-	</Queue>
-	
+		
 </WebBeans>
\ No newline at end of file



Mime
View raw message