openwebbeans-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gerdo...@apache.org
Subject svn commit: r806987 - in /incubator/openwebbeans/trunk/samples/guess: pom.xml src/main/resources/log4j.properties src/main/webapp/WEB-INF/geronimo-web.xml
Date Sun, 23 Aug 2009 16:20:31 GMT
Author: gerdogdu
Date: Sun Aug 23 16:20:30 2009
New Revision: 806987

URL: http://svn.apache.org/viewvc?rev=806987&view=rev
Log:
update pom

Modified:
    incubator/openwebbeans/trunk/samples/guess/pom.xml
    incubator/openwebbeans/trunk/samples/guess/src/main/resources/log4j.properties
    incubator/openwebbeans/trunk/samples/guess/src/main/webapp/WEB-INF/geronimo-web.xml

Modified: incubator/openwebbeans/trunk/samples/guess/pom.xml
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/samples/guess/pom.xml?rev=806987&r1=806986&r2=806987&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/samples/guess/pom.xml (original)
+++ incubator/openwebbeans/trunk/samples/guess/pom.xml Sun Aug 23 16:20:30 2009
@@ -42,76 +42,77 @@
 			<scope>test</scope>
 		</dependency>
 		
-		<!-- 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 -->
+		<!-- JSR-299 API -->
 		<dependency>
 			<groupId>org.apache.openwebbeans</groupId>
 			<artifactId>openwebbeans-api</artifactId>
 			<version>${project.version}</version>
 			<scope>provided</scope>
-		</dependency>
+		</dependency>		
 		
-		<!-- OWB implementation per application -->
+		<!-- JSF Facelet -->
 		<dependency>
-			<groupId>org.apache.openwebbeans</groupId>
-			<artifactId>openwebbeans-impl</artifactId>
-			<version>${project.version}</version>
+			<groupId>com.sun.facelets</groupId>
+			<artifactId>jsf-facelets</artifactId>
+			<version>1.1.14</version>
 		</dependency>
-		
-		
+						
 		<!-- JSF Plugin -->
 		<dependency>
 			<groupId>org.apache.openwebbeans</groupId>
 			<artifactId>openwebbeans-jsf</artifactId>
 			<version>${project.version}</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>
 
 	<profiles>
 				
 		<profile>
 			<id>jetty</id>
-			
-			<dependencies>
+			<activation>
+				<activeByDefault>true</activeByDefault>
+			</activation>			
+			<dependencies>				
+				<!-- JSR-299 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 implementation per application -->
+				<dependency>
+					<groupId>org.apache.openwebbeans</groupId>
+					<artifactId>openwebbeans-impl</artifactId>
+					<version>${project.version}</version>
+				</dependency>
+				
+				<!-- MyFaces 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>
+				
+				<!-- Interceptor API -->	
+				<dependency>
+					<groupId>org.apache.geronimo.specs</groupId>
+					<artifactId>geronimo-interceptor_3.0_spec</artifactId>
+				</dependency>
+				
 			</dependencies>
 
 			<build>
@@ -126,8 +127,6 @@
 					</plugin>
 				</plugins>
 			</build>
-
-		</profile>
+		</profile>		
 	</profiles>
-
-</project>
+</project>
\ No newline at end of file

Modified: incubator/openwebbeans/trunk/samples/guess/src/main/resources/log4j.properties
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/samples/guess/src/main/resources/log4j.properties?rev=806987&r1=806986&r2=806987&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/samples/guess/src/main/resources/log4j.properties (original)
+++ incubator/openwebbeans/trunk/samples/guess/src/main/resources/log4j.properties Sun Aug
23 16:20:30 2009
@@ -13,10 +13,13 @@
 #	License.
 #
 ### direct log messages to stdout ###
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.Target=System.out
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=%d{ABSOLUTE} %5p %c{1}:%L - %m%n
+log4j.rootLogger=INFO,CONSOLE
+
+
+log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
+log4j.appender.CONSOLE.Target=System.out
+log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout
+log4j.appender.CONSOLE.layout.ConversionPattern=%d{ABSOLUTE} %5p %c{1}:%L - %m%n
 #%c category,p priority,d time,L line number,m message, n newline;
 
 
@@ -29,8 +32,5 @@
 #log4j.appender.file.layout.ConversionPattern=<%d> %-5p [%c] : %m%n
 
 
-log4j.rootLogger=info,stdout
-
-
 ### Main project logger to info
-log4j.logger.org.apache.webbeans=info
\ No newline at end of file
+log4j.logger.org.apache.webbeans=INFO
\ No newline at end of file

Modified: incubator/openwebbeans/trunk/samples/guess/src/main/webapp/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/samples/guess/src/main/webapp/WEB-INF/geronimo-web.xml?rev=806987&r1=806986&r2=806987&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/samples/guess/src/main/webapp/WEB-INF/geronimo-web.xml (original)
+++ incubator/openwebbeans/trunk/samples/guess/src/main/webapp/WEB-INF/geronimo-web.xml Sun
Aug 23 16:20:30 2009
@@ -1,25 +1,27 @@
 <?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.
+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>default</dep:groupId>
-            <dep:artifactId>remguess</dep:artifactId>
+            <dep:groupId>org.apache.webbeans.samples</dep:groupId>
+            <dep:artifactId>geronimoguess</dep:artifactId>
             <dep:version>1.0</dep:version>
             <dep:type>car</dep:type>
         </dep:moduleId>
@@ -36,13 +38,25 @@
                 <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.1.GA</dep:version>
+                <dep:version>3.8.0.GA</dep:version>
                 <dep:type>jar</dep:type>
             </dep:dependency>
             <dep:dependency>
-                <dep:groupId>scannotation</dep:groupId>
+                <dep:groupId>net.sf.scannotation</dep:groupId>
                 <dep:artifactId>scannotation</dep:artifactId>
                 <dep:version>1.0.2</dep:version>
                 <dep:type>jar</dep:type>
@@ -50,7 +64,7 @@
             <dep:dependency>
                 <dep:groupId>log4j</dep:groupId>
                 <dep:artifactId>log4j</dep:artifactId>
-                <dep:version>1.2.14</dep:version>
+                <dep:version>1.2.15</dep:version>
                 <dep:type>jar</dep:type>
             </dep:dependency>
         </dep:dependencies>
@@ -58,6 +72,6 @@
             <dep:filter>org.apache.log4j</dep:filter>
         </dep:hidden-classes>
     </dep:environment>
-    <web:context-root>remguess</web:context-root>
+    <web:context-root>guess</web:context-root>
     <dep:gbean class="org.apache.geronimo.system.logging.log4j.ApplicationLog4jConfigurationGBean"
name="DirectoryLog4jConfiguration"/>
-</web:web-app>
+</web:web-app>
\ No newline at end of file



Mime
View raw message