openwebbeans-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gerdo...@apache.org
Subject svn commit: r806988 - in /incubator/openwebbeans/trunk/samples/reservation: pom.xml src/main/webapp/WEB-INF/geronimo-web.xml
Date Sun, 23 Aug 2009 16:21:00 GMT
Author: gerdogdu
Date: Sun Aug 23 16:21:00 2009
New Revision: 806988

URL: http://svn.apache.org/viewvc?rev=806988&view=rev
Log:
update pom, addd geronimo config

Added:
    incubator/openwebbeans/trunk/samples/reservation/src/main/webapp/WEB-INF/geronimo-web.xml
  (with props)
Modified:
    incubator/openwebbeans/trunk/samples/reservation/pom.xml

Modified: incubator/openwebbeans/trunk/samples/reservation/pom.xml
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/samples/reservation/pom.xml?rev=806988&r1=806987&r2=806988&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/samples/reservation/pom.xml (original)
+++ incubator/openwebbeans/trunk/samples/reservation/pom.xml Sun Aug 23 16:21:00 2009
@@ -68,14 +68,9 @@
 		<dependency>
 			<groupId>org.apache.myfaces.core</groupId>
 			<artifactId>myfaces-api</artifactId>
+			<scope>provided</scope>
 		</dependency>
 		
-		<!-- MyFaces IMPL -->
-		<dependency>
-			<groupId>org.apache.myfaces.core</groupId>
-			<artifactId>myfaces-impl</artifactId>
-		</dependency>		
-
 		<!-- Servlet Api -->
 		<dependency>
 			<groupId>org.apache.geronimo.specs</groupId>
@@ -87,21 +82,9 @@
 		<dependency>
 			<groupId>org.apache.geronimo.specs</groupId>
 			<artifactId>geronimo-jpa_3.0_spec</artifactId>
+			<scope>provided</scope>
 		</dependency>
 		
-		<!-- Interceptor API -->		
-		<dependency>
-			<groupId>org.apache.geronimo.specs</groupId>
-			<artifactId>geronimo-interceptor_3.0_spec</artifactId>
-		</dependency>
-
-		<!-- OpenJPA -->
-		<dependency>
-			<groupId>org.apache.openjpa</groupId>
-			<artifactId>openjpa</artifactId>
-			<version>1.2.0</version>
-		</dependency>
-
 		<!-- HSQLDB -->
 		<dependency>
 			<groupId>hsqldb</groupId>
@@ -109,6 +92,13 @@
 			<version>1.8.0.7</version>
 		</dependency>
 
+		<!-- Interceptor API -->		
+		<dependency>
+			<groupId>org.apache.geronimo.specs</groupId>
+			<artifactId>geronimo-interceptor_3.0_spec</artifactId>
+			<scope>provided</scope>
+		</dependency>
+
 		<!-- EL API -->
 		<dependency>
 		    <groupId>org.apache.geronimo.specs</groupId>
@@ -122,6 +112,8 @@
         	<artifactId>commons-validator</artifactId>
         	<version>1.3.1</version>
         </dependency>
+        
+        <!-- OWB Resource for Injections -->
         <dependency>
         	<groupId>org.apache.openwebbeans</groupId>
         	<artifactId>openwebbeans-resource</artifactId>
@@ -134,12 +126,54 @@
 	<profiles>
 		<profile>
 			<id>jetty</id>
+			<activation>
+				<activeByDefault>true</activeByDefault>
+			</activation>						
 			<dependencies>
+				
+				<!-- OWB API -->
 				<dependency>
 					<groupId>org.apache.openwebbeans</groupId>
 					<artifactId>openwebbeans-api</artifactId>
 					<version>${project.version}</version>
-					<scope>compile</scope> <!-- we need this if we run in jetty! -->
+				</dependency>
+				
+				<!-- OWB API -->
+				<dependency>
+					<groupId>org.apache.openwebbeans</groupId>
+					<artifactId>openwebbeans-impl</artifactId>
+					<version>${project.version}</version>
+				</dependency>				
+				
+				<!-- My Faces API -->
+				<dependency>
+					<groupId>org.apache.myfaces.core</groupId>
+					<artifactId>myfaces-api</artifactId>
+				</dependency>
+				
+				<!-- MyFaces IMPL -->
+				<dependency>
+					<groupId>org.apache.myfaces.core</groupId>
+					<artifactId>myfaces-impl</artifactId>
+				</dependency>		
+				
+				<!-- JPA API -->
+				<dependency>
+					<groupId>org.apache.geronimo.specs</groupId>
+					<artifactId>geronimo-jpa_3.0_spec</artifactId>
+				</dependency>
+				
+				<!-- Interceptor API -->		
+				<dependency>
+					<groupId>org.apache.geronimo.specs</groupId>
+					<artifactId>geronimo-interceptor_3.0_spec</artifactId>
+				</dependency>
+
+				<!-- OpenJPA -->
+				<dependency>
+					<groupId>org.apache.openjpa</groupId>
+					<artifactId>openjpa</artifactId>
+					<version>1.2.0</version>
 				</dependency>
 
 			</dependencies>
@@ -156,7 +190,7 @@
 					</plugin>
 				</plugins>
 			</build>
-		</profile>
+		</profile>				
 	</profiles>
 
 </project>

Added: incubator/openwebbeans/trunk/samples/reservation/src/main/webapp/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/samples/reservation/src/main/webapp/WEB-INF/geronimo-web.xml?rev=806988&view=auto
==============================================================================
--- incubator/openwebbeans/trunk/samples/reservation/src/main/webapp/WEB-INF/geronimo-web.xml
(added)
+++ incubator/openwebbeans/trunk/samples/reservation/src/main/webapp/WEB-INF/geronimo-web.xml
Sun Aug 23 16:21:00 2009
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!--
+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.
+-->
+<web:web-app xmlns:app="http://geronimo.apache.org/xml/ns/j2ee/application-2.0" xmlns:client="http://geronimo.apache.org/xml/ns/j2ee/application-client-2.0"
xmlns:conn="http://geronimo.apache.org/xml/ns/j2ee/connector-1.2" xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2"
xmlns:ejb="http://openejb.apache.org/xml/ns/openejb-jar-2.2" xmlns:name="http://geronimo.apache.org/xml/ns/naming-1.2"
xmlns:pers="http://java.sun.com/xml/ns/persistence" xmlns:pkgen="http://openejb.apache.org/xml/ns/pkgen-2.1"
xmlns:sec="http://geronimo.apache.org/xml/ns/security-2.0" xmlns:web="http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1">
+    <dep:environment>
+        <dep:moduleId>
+            <dep:groupId>org.apache.webbeans.samples</dep:groupId>
+            <dep:artifactId>reservation</dep:artifactId>
+            <dep:version>1.0</dep:version>
+            <dep:type>car</dep:type>
+        </dep:moduleId>
+        <dep:dependencies>
+            <dep:dependency>
+                <dep:groupId>org.apache.geronimo.configs</dep:groupId>
+                <dep:artifactId>sharedlib</dep:artifactId>
+                <dep:type>car</dep:type>
+            </dep:dependency>
+            <dep:dependency>
+                <dep:groupId>dom4j</dep:groupId>
+                <dep:artifactId>dom4j</dep:artifactId>
+                <dep:version>1.6.1</dep:version>
+                <dep:type>jar</dep:type>
+            </dep:dependency>
+            <dep:dependency>
+                <dep:groupId>org.apache.openwebbeans</dep:groupId>
+                <dep:artifactId>openwebbeans-api</dep:artifactId>
+                <dep:version>1.0.0-incubating-SNAPSHOT</dep:version>
+                <dep:type>jar</dep:type>
+            </dep:dependency>
+            <dep:dependency>
+                <dep:groupId>org.apache.openwebbeans</dep:groupId>
+                <dep:artifactId>openwebbeans-impl</dep:artifactId>
+                <dep:version>1.0.0-incubating-SNAPSHOT</dep:version>
+                <dep:type>jar</dep:type>
+            </dep:dependency>
+            <dep:dependency>
+                <dep:groupId>javassist</dep:groupId>
+                <dep:artifactId>javassist</dep:artifactId>
+                <dep:version>3.8.0.GA</dep:version>
+                <dep:type>jar</dep:type>
+            </dep:dependency>
+            <dep:dependency>
+                <dep:groupId>net.sf.scannotation</dep:groupId>
+                <dep:artifactId>scannotation</dep:artifactId>
+                <dep:version>1.0.2</dep:version>
+                <dep:type>jar</dep:type>
+            </dep:dependency>
+            <dep:dependency>
+                <dep:groupId>log4j</dep:groupId>
+                <dep:artifactId>log4j</dep:artifactId>
+                <dep:version>1.2.15</dep:version>
+                <dep:type>jar</dep:type>
+            </dep:dependency>
+        </dep:dependencies>
+        <dep:hidden-classes>
+            <dep:filter>org.apache.log4j</dep:filter>
+        </dep:hidden-classes>
+    </dep:environment>
+    <web:context-root>reservation</web:context-root>
+    <dep:gbean class="org.apache.geronimo.system.logging.log4j.ApplicationLog4jConfigurationGBean"
name="DirectoryLog4jConfiguration"/>
+</web:web-app>
\ No newline at end of file

Propchange: incubator/openwebbeans/trunk/samples/reservation/src/main/webapp/WEB-INF/geronimo-web.xml
------------------------------------------------------------------------------
    svn:eol-style = native



Mime
View raw message