You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by ma...@apache.org on 2007/06/21 20:40:44 UTC
svn commit: r549583 [2/3] - in /myfaces/maven/trunk/archetypes:
maven-archetype-jsfcomponents/
maven-archetype-jsfcomponents/src/main/resources/META-INF/
maven-archetype-jsfcomponents/src/main/resources/archetype-resources/
maven-archetype-jsfcomponent...
Modified: myfaces/maven/trunk/archetypes/maven-archetype-jsfcomponents/src/main/resources/archetype-resources/core/src/test/java/org/myorganization/component/sayhello/SayHelloRendererTest.java
URL: http://svn.apache.org/viewvc/myfaces/maven/trunk/archetypes/maven-archetype-jsfcomponents/src/main/resources/archetype-resources/core/src/test/java/org/myorganization/component/sayhello/SayHelloRendererTest.java?view=diff&rev=549583&r1=549582&r2=549583
==============================================================================
--- myfaces/maven/trunk/archetypes/maven-archetype-jsfcomponents/src/main/resources/archetype-resources/core/src/test/java/org/myorganization/component/sayhello/SayHelloRendererTest.java (original)
+++ myfaces/maven/trunk/archetypes/maven-archetype-jsfcomponents/src/main/resources/archetype-resources/core/src/test/java/org/myorganization/component/sayhello/SayHelloRendererTest.java Thu Jun 21 11:40:43 2007
@@ -1,66 +1,66 @@
-package org.myorganization.component.sayhello;
-
-import junit.framework.Test;
-import org.apache.shale.test.base.AbstractJsfTestCase;
-import org.apache.shale.test.mock.MockRenderKitFactory;
-import org.apache.shale.test.mock.MockResponseWriter;
-
-import java.io.IOException;
-import java.io.StringWriter;
-
-/**
- * Class to test the behaviour of the SayHello renderer
- */
-public class SayHelloRendererTest extends AbstractJsfTestCase
-{
-
- public static Test suite()
- {
- return null;
- }
-
- private MockResponseWriter writer ;
- private SayHello sayHello;
-
- public SayHelloRendererTest(String name)
- {
- super(name);
- }
-
- public void setUp()
- {
- super.setUp();
-
- sayHello = new SayHello();
- sayHello.setFirstName("John");
- sayHello.setLastName("Smith");
-
- writer = new MockResponseWriter(new StringWriter(), null, null);
- facesContext.setResponseWriter(writer);
- // TODO remove these two lines once shale-test goes alpha, see MYFACES-1155
- facesContext.getViewRoot().setRenderKitId(MockRenderKitFactory.HTML_BASIC_RENDER_KIT);
- facesContext.getRenderKit().addRenderer(
- sayHello.getFamily(),
- sayHello.getRendererType(),
- new SayHelloRenderer());
- }
-
- public void tearDown()
- {
- super.tearDown();
- sayHello = null;
- writer = null;
- }
-
- public void testEncodeEnd() throws IOException
- {
- sayHello.encodeEnd(facesContext);
- facesContext.renderResponse();
-
- String output = writer.getWriter().toString();
-
- assertEquals("Hello John Smith!", output);
- assertNotSame("Bye John Smith!", output);
- }
-
-}
+package org.myorganization.component.sayhello;
+
+import junit.framework.Test;
+import org.apache.shale.test.base.AbstractJsfTestCase;
+import org.apache.shale.test.mock.MockRenderKitFactory;
+import org.apache.shale.test.mock.MockResponseWriter;
+
+import java.io.IOException;
+import java.io.StringWriter;
+
+/**
+ * Class to test the behaviour of the SayHello renderer
+ */
+public class SayHelloRendererTest extends AbstractJsfTestCase
+{
+
+ public static Test suite()
+ {
+ return null;
+ }
+
+ private MockResponseWriter writer ;
+ private SayHello sayHello;
+
+ public SayHelloRendererTest(String name)
+ {
+ super(name);
+ }
+
+ public void setUp()
+ {
+ super.setUp();
+
+ sayHello = new SayHello();
+ sayHello.setFirstName("John");
+ sayHello.setLastName("Smith");
+
+ writer = new MockResponseWriter(new StringWriter(), null, null);
+ facesContext.setResponseWriter(writer);
+ // TODO remove these two lines once shale-test goes alpha, see MYFACES-1155
+ facesContext.getViewRoot().setRenderKitId(MockRenderKitFactory.HTML_BASIC_RENDER_KIT);
+ facesContext.getRenderKit().addRenderer(
+ sayHello.getFamily(),
+ sayHello.getRendererType(),
+ new SayHelloRenderer());
+ }
+
+ public void tearDown()
+ {
+ super.tearDown();
+ sayHello = null;
+ writer = null;
+ }
+
+ public void testEncodeEnd() throws IOException
+ {
+ sayHello.encodeEnd(facesContext);
+ facesContext.renderResponse();
+
+ String output = writer.getWriter().toString();
+
+ assertEquals("Hello John Smith!", output);
+ assertNotSame("Bye John Smith!", output);
+ }
+
+}
Propchange: myfaces/maven/trunk/archetypes/maven-archetype-jsfcomponents/src/main/resources/archetype-resources/core/src/test/java/org/myorganization/component/sayhello/SayHelloRendererTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: myfaces/maven/trunk/archetypes/maven-archetype-jsfcomponents/src/main/resources/archetype-resources/examples/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/maven/trunk/archetypes/maven-archetype-jsfcomponents/src/main/resources/archetype-resources/examples/pom.xml?view=diff&rev=549583&r1=549582&r2=549583
==============================================================================
--- myfaces/maven/trunk/archetypes/maven-archetype-jsfcomponents/src/main/resources/archetype-resources/examples/pom.xml (original)
+++ myfaces/maven/trunk/archetypes/maven-archetype-jsfcomponents/src/main/resources/archetype-resources/examples/pom.xml Thu Jun 21 11:40:43 2007
@@ -1,177 +1,177 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- This is the project descriptor for the examples of my components -->
-
-<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">
- <modelVersion>4.0.0</modelVersion>
- <artifactId>${artifactId}-examples</artifactId>
- <packaging>war</packaging>
- <name>My Components Examples</name>
-
- <parent>
- <groupId>${groupId}</groupId>
- <artifactId>${artifactId}-project</artifactId>
- <version>${version}</version>
- </parent>
-
- <dependencies>
- <dependency>
- <groupId>${groupId}</groupId>
- <artifactId>${artifactId}-core</artifactId>
- <version>${version}</version>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>1.0.4</version>
- <scope>compile</scope>
- </dependency>
- </dependencies>
-
-
- <profiles>
- <!-- By default the war examples use myfaces! :) -->
- <profile>
- <id>myfaces</id>
- <activation>
- <property>
- <name>!jsf</name>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.myfaces.core</groupId>
- <artifactId>myfaces-api</artifactId>
- <version>1.1.4</version>
- </dependency>
- <dependency>
- <groupId>org.apache.myfaces.core</groupId>
- <artifactId>myfaces-impl</artifactId>
- <version>1.1.4</version>
- <!-- Sandbox examples must only have runtime dependency to myfaces-impl
- so that it will be automatically added to war. But there must not be
- any compile dependency on impl so that is is always possible to use
- other JSF implementations. -->
- <scope>runtime</scope>
- </dependency>
- </dependencies>
-
- <properties>
- <jsf_implementation>MyFaces</jsf_implementation>
- </properties>
- </profile>
-
- <!-- To use the examples using the Sun's JSF Reference Implementation: -Djsf=ri -->
- <profile>
- <id>jsfri</id>
- <activation>
- <property>
- <name>jsf</name>
- <value>ri</value>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>javax.faces</groupId>
- <artifactId>jsf-api</artifactId>
- <version>1.1_02</version>
- </dependency>
- <dependency>
- <groupId>javax.faces</groupId>
- <artifactId>jsf-impl</artifactId>
- <version>1.1_02</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>jstl</groupId>
- <artifactId>jstl</artifactId>
- <version>1.1.0</version>
- <scope>compile</scope>
- </dependency>
- </dependencies>
-
- <repositories>
- <repository>
- <id>java.net</id>
- <name>java.net Maven 1 Repository</name>
- <url>https://maven-repository.dev.java.net/nonav/repository</url>
- <layout>legacy</layout>
- </repository>
- </repositories>
-
- <properties>
- <jsf_implementation>JSF-RI</jsf_implementation>
- </properties>
- </profile>
-
- <!-- Profile to run jetty, so the tomcat jars are included in the bundle. They are not included by default -->
- <profile>
- <id>jettyConfig</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>maven-jetty-plugin</artifactId>
- <configuration>
- <scanIntervalSeconds>10</scanIntervalSeconds>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <dependencies>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>jsp-api</artifactId>
- <version>2.0</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>tomcat</groupId>
- <artifactId>jasper-compiler</artifactId>
- <version>5.5.9</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>tomcat</groupId>
- <artifactId>jasper-runtime</artifactId>
- <version>5.5.9</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>tomcat</groupId>
- <artifactId>jasper-compiler-jdt</artifactId>
- <version>5.5.9</version>
- <scope>compile</scope>
- </dependency>
- </dependencies>
-
- <pluginRepositories>
- <!-- Repository to get the jetty plugin -->
- <pluginRepository>
- <id>mortbay-repo</id>
- <name>mortbay-repo</name>
- <url>http://www.mortbay.org/maven2/snapshot</url>
- </pluginRepository>
- </pluginRepositories>
-
- </profile>
-
- </profiles>
-
- <build>
- <finalName>${artifactId}</finalName>
-
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- <filtering>true</filtering>
- </resource>
- </resources>
-
- </build>
-
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- This is the project descriptor for the examples of my components -->
+
+<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">
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>${artifactId}-examples</artifactId>
+ <packaging>war</packaging>
+ <name>My Components Examples</name>
+
+ <parent>
+ <groupId>${groupId}</groupId>
+ <artifactId>${artifactId}-project</artifactId>
+ <version>${version}</version>
+ </parent>
+
+ <dependencies>
+ <dependency>
+ <groupId>${groupId}</groupId>
+ <artifactId>${artifactId}-core</artifactId>
+ <version>${version}</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.0.4</version>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
+
+
+ <profiles>
+ <!-- By default the war examples use myfaces! :) -->
+ <profile>
+ <id>myfaces</id>
+ <activation>
+ <property>
+ <name>!jsf</name>
+ </property>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-api</artifactId>
+ <version>1.1.4</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-impl</artifactId>
+ <version>1.1.4</version>
+ <!-- Sandbox examples must only have runtime dependency to myfaces-impl
+ so that it will be automatically added to war. But there must not be
+ any compile dependency on impl so that is is always possible to use
+ other JSF implementations. -->
+ <scope>runtime</scope>
+ </dependency>
+ </dependencies>
+
+ <properties>
+ <jsf_implementation>MyFaces</jsf_implementation>
+ </properties>
+ </profile>
+
+ <!-- To use the examples using the Sun's JSF Reference Implementation: -Djsf=ri -->
+ <profile>
+ <id>jsfri</id>
+ <activation>
+ <property>
+ <name>jsf</name>
+ <value>ri</value>
+ </property>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-api</artifactId>
+ <version>1.1_02</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-impl</artifactId>
+ <version>1.1_02</version>
+ <scope>runtime</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>jstl</groupId>
+ <artifactId>jstl</artifactId>
+ <version>1.1.0</version>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
+
+ <repositories>
+ <repository>
+ <id>java.net</id>
+ <name>java.net Maven 1 Repository</name>
+ <url>https://maven-repository.dev.java.net/nonav/repository</url>
+ <layout>legacy</layout>
+ </repository>
+ </repositories>
+
+ <properties>
+ <jsf_implementation>JSF-RI</jsf_implementation>
+ </properties>
+ </profile>
+
+ <!-- Profile to run jetty, so the tomcat jars are included in the bundle. They are not included by default -->
+ <profile>
+ <id>jettyConfig</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>maven-jetty-plugin</artifactId>
+ <configuration>
+ <scanIntervalSeconds>10</scanIntervalSeconds>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>jsp-api</artifactId>
+ <version>2.0</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>tomcat</groupId>
+ <artifactId>jasper-compiler</artifactId>
+ <version>5.5.9</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>tomcat</groupId>
+ <artifactId>jasper-runtime</artifactId>
+ <version>5.5.9</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>tomcat</groupId>
+ <artifactId>jasper-compiler-jdt</artifactId>
+ <version>5.5.9</version>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
+
+ <pluginRepositories>
+ <!-- Repository to get the jetty plugin -->
+ <pluginRepository>
+ <id>mortbay-repo</id>
+ <name>mortbay-repo</name>
+ <url>http://www.mortbay.org/maven2/snapshot</url>
+ </pluginRepository>
+ </pluginRepositories>
+
+ </profile>
+
+ </profiles>
+
+ <build>
+ <finalName>${artifactId}</finalName>
+
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ <filtering>true</filtering>
+ </resource>
+ </resources>
+
+ </build>
+
+</project>
Propchange: myfaces/maven/trunk/archetypes/maven-archetype-jsfcomponents/src/main/resources/archetype-resources/examples/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: myfaces/maven/trunk/archetypes/maven-archetype-jsfcomponents/src/main/resources/archetype-resources/examples/src/main/java/org/myorganization/component/example/SayHelloBean.java
URL: http://svn.apache.org/viewvc/myfaces/maven/trunk/archetypes/maven-archetype-jsfcomponents/src/main/resources/archetype-resources/examples/src/main/java/org/myorganization/component/example/SayHelloBean.java?view=diff&rev=549583&r1=549582&r2=549583
==============================================================================
--- myfaces/maven/trunk/archetypes/maven-archetype-jsfcomponents/src/main/resources/archetype-resources/examples/src/main/java/org/myorganization/component/example/SayHelloBean.java (original)
+++ myfaces/maven/trunk/archetypes/maven-archetype-jsfcomponents/src/main/resources/archetype-resources/examples/src/main/java/org/myorganization/component/example/SayHelloBean.java Thu Jun 21 11:40:43 2007
@@ -1,66 +1,66 @@
-package org.myorganization.component.example;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import javax.faces.event.ActionEvent;
-
-/**
- * Managed bean for the sayHello page example
- */
-public class SayHelloBean
-{
-
- private static final Log log = LogFactory.getLog(SayHelloBean.class);
-
- private String firstName;
- private String lastName;
- private boolean renderGreeting;
-
- public SayHelloBean()
- {
- this.renderGreeting = false;
- }
-
- public void sayIt(ActionEvent evt)
- {
- renderGreeting = true;
-
- if (log.isInfoEnabled())
- {
- log.info("The name to say hello is '"+firstName+"' and the last name is '"+lastName+"'.");
- }
- }
-
-
- public String getFirstName()
- {
- return firstName;
- }
-
- public void setFirstName(String firstName)
- {
- this.firstName = firstName;
- }
-
- public String getLastName()
- {
- return lastName;
- }
-
- public void setLastName(String lastName)
- {
- this.lastName = lastName;
- }
-
-
- public boolean isRenderGreeting()
- {
- return renderGreeting;
- }
-
- public void setRenderGreeting(boolean renderGreeting)
- {
- this.renderGreeting = renderGreeting;
- }
-}
+package org.myorganization.component.example;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import javax.faces.event.ActionEvent;
+
+/**
+ * Managed bean for the sayHello page example
+ */
+public class SayHelloBean
+{
+
+ private static final Log log = LogFactory.getLog(SayHelloBean.class);
+
+ private String firstName;
+ private String lastName;
+ private boolean renderGreeting;
+
+ public SayHelloBean()
+ {
+ this.renderGreeting = false;
+ }
+
+ public void sayIt(ActionEvent evt)
+ {
+ renderGreeting = true;
+
+ if (log.isInfoEnabled())
+ {
+ log.info("The name to say hello is '"+firstName+"' and the last name is '"+lastName+"'.");
+ }
+ }
+
+
+ public String getFirstName()
+ {
+ return firstName;
+ }
+
+ public void setFirstName(String firstName)
+ {
+ this.firstName = firstName;
+ }
+
+ public String getLastName()
+ {
+ return lastName;
+ }
+
+ public void setLastName(String lastName)
+ {
+ this.lastName = lastName;
+ }
+
+
+ public boolean isRenderGreeting()
+ {
+ return renderGreeting;
+ }
+
+ public void setRenderGreeting(boolean renderGreeting)
+ {
+ this.renderGreeting = renderGreeting;
+ }
+}
Propchange: myfaces/maven/trunk/archetypes/maven-archetype-jsfcomponents/src/main/resources/archetype-resources/examples/src/main/java/org/myorganization/component/example/SayHelloBean.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: myfaces/maven/trunk/archetypes/maven-archetype-jsfcomponents/src/main/resources/archetype-resources/examples/src/main/resources/org/myorganization/component/example/build.properties
URL: http://svn.apache.org/viewvc/myfaces/maven/trunk/archetypes/maven-archetype-jsfcomponents/src/main/resources/archetype-resources/examples/src/main/resources/org/myorganization/component/example/build.properties?view=diff&rev=549583&r1=549582&r2=549583
==============================================================================
--- myfaces/maven/trunk/archetypes/maven-archetype-jsfcomponents/src/main/resources/archetype-resources/examples/src/main/resources/org/myorganization/component/example/build.properties (original)
+++ myfaces/maven/trunk/archetypes/maven-archetype-jsfcomponents/src/main/resources/archetype-resources/examples/src/main/resources/org/myorganization/component/example/build.properties Thu Jun 21 11:40:43 2007
@@ -1,4 +1,4 @@
-# Do not edit this file, as it will be completed automatically
-# by maven during the build process
-mycomponents_version=${pom.version}
+# Do not edit this file, as it will be completed automatically
+# by maven during the build process
+mycomponents_version=${pom.version}
jsf_implementation=${jsf_implementation}
Propchange: myfaces/maven/trunk/archetypes/maven-archetype-jsfcomponents/src/main/resources/archetype-resources/examples/src/main/resources/org/myorganization/component/example/build.properties
------------------------------------------------------------------------------
svn:eol-style = native
Modified: myfaces/maven/trunk/archetypes/maven-archetype-jsfcomponents/src/main/resources/archetype-resources/examples/src/main/webapp/WEB-INF/examples-config.xml
URL: http://svn.apache.org/viewvc/myfaces/maven/trunk/archetypes/maven-archetype-jsfcomponents/src/main/resources/archetype-resources/examples/src/main/webapp/WEB-INF/examples-config.xml?view=diff&rev=549583&r1=549582&r2=549583
==============================================================================
--- myfaces/maven/trunk/archetypes/maven-archetype-jsfcomponents/src/main/resources/archetype-resources/examples/src/main/webapp/WEB-INF/examples-config.xml (original)
+++ myfaces/maven/trunk/archetypes/maven-archetype-jsfcomponents/src/main/resources/archetype-resources/examples/src/main/webapp/WEB-INF/examples-config.xml Thu Jun 21 11:40:43 2007
@@ -1,31 +1,31 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE faces-config PUBLIC
- "-//Sun Microsystems, Inc.//DTD JavaServer Faces Config 1.0//EN"
- "http://java.sun.com/dtd/web-facesconfig_1_0.dtd">
-
-<!-- =========== FULL CONFIGURATION FILE ================================== -->
-
-<!-- my components examples -->
-
-<faces-config>
-
-
- <!-- Managed Beans for sayhello.jsp -->
- <managed-bean>
- <managed-bean-name>sayHelloBean</managed-bean-name>
- <managed-bean-class>org.myorganization.component.example.SayHelloBean</managed-bean-class>
- <managed-bean-scope>request</managed-bean-scope>
- </managed-bean>
-
- <!-- NAVIGATION RULES -->
-
- <navigation-rule>
- <navigation-case>
- <from-outcome>go_home</from-outcome>
- <to-view-id>/home.jsp</to-view-id>
- </navigation-case>
- </navigation-rule>
-
-
-</faces-config>
+<?xml version="1.0"?>
+
+<!DOCTYPE faces-config PUBLIC
+ "-//Sun Microsystems, Inc.//DTD JavaServer Faces Config 1.0//EN"
+ "http://java.sun.com/dtd/web-facesconfig_1_0.dtd">
+
+<!-- =========== FULL CONFIGURATION FILE ================================== -->
+
+<!-- my components examples -->
+
+<faces-config>
+
+
+ <!-- Managed Beans for sayhello.jsp -->
+ <managed-bean>
+ <managed-bean-name>sayHelloBean</managed-bean-name>
+ <managed-bean-class>org.myorganization.component.example.SayHelloBean</managed-bean-class>
+ <managed-bean-scope>request</managed-bean-scope>
+ </managed-bean>
+
+ <!-- NAVIGATION RULES -->
+
+ <navigation-rule>
+ <navigation-case>
+ <from-outcome>go_home</from-outcome>
+ <to-view-id>/home.jsp</to-view-id>
+ </navigation-case>
+ </navigation-rule>
+
+
+</faces-config>
Propchange: myfaces/maven/trunk/archetypes/maven-archetype-jsfcomponents/src/main/resources/archetype-resources/examples/src/main/webapp/WEB-INF/examples-config.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: myfaces/maven/trunk/archetypes/maven-archetype-jsfcomponents/src/main/resources/archetype-resources/examples/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/myfaces/maven/trunk/archetypes/maven-archetype-jsfcomponents/src/main/resources/archetype-resources/examples/src/main/webapp/WEB-INF/web.xml?view=diff&rev=549583&r1=549582&r2=549583
==============================================================================
--- myfaces/maven/trunk/archetypes/maven-archetype-jsfcomponents/src/main/resources/archetype-resources/examples/src/main/webapp/WEB-INF/web.xml (original)
+++ myfaces/maven/trunk/archetypes/maven-archetype-jsfcomponents/src/main/resources/archetype-resources/examples/src/main/webapp/WEB-INF/web.xml Thu Jun 21 11:40:43 2007
@@ -1,38 +1,38 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<web-app xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" version="2.4">
-
- <description>debug web.xml</description>
-
- <context-param>
- <description>Comma separated list of URIs of (additional) faces config files.
- (e.g. /WEB-INF/my-config.xml)
- See JSF 1.0 PRD2, 10.3.2
- Attention: You do not need to put /WEB-INF/faces-config.xml in here.
- </description>
- <param-name>javax.faces.CONFIG_FILES</param-name>
- <param-value>/WEB-INF/examples-config.xml</param-value>
- </context-param>
-
- <context-param>
- <description>State saving method: "client" or "server" (= default)
- See JSF Specification 2.5.3</description>
- <param-name>javax.faces.STATE_SAVING_METHOD</param-name>
- <param-value>server</param-value>
- </context-param>
-
- <servlet>
- <servlet-name>Faces Servlet</servlet-name>
- <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
- <load-on-startup>1</load-on-startup>
- </servlet>
-
- <servlet-mapping>
- <servlet-name>Faces Servlet</servlet-name>
- <url-pattern>*.jsf</url-pattern>
- </servlet-mapping>
-
- <welcome-file-list>
- <welcome-file>index.jsp</welcome-file>
- </welcome-file-list>
-
-</web-app>
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" version="2.4">
+
+ <description>debug web.xml</description>
+
+ <context-param>
+ <description>Comma separated list of URIs of (additional) faces config files.
+ (e.g. /WEB-INF/my-config.xml)
+ See JSF 1.0 PRD2, 10.3.2
+ Attention: You do not need to put /WEB-INF/faces-config.xml in here.
+ </description>
+ <param-name>javax.faces.CONFIG_FILES</param-name>
+ <param-value>/WEB-INF/examples-config.xml</param-value>
+ </context-param>
+
+ <context-param>
+ <description>State saving method: "client" or "server" (= default)
+ See JSF Specification 2.5.3</description>
+ <param-name>javax.faces.STATE_SAVING_METHOD</param-name>
+ <param-value>server</param-value>
+ </context-param>
+
+ <servlet>
+ <servlet-name>Faces Servlet</servlet-name>
+ <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
+ <load-on-startup>1</load-on-startup>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>Faces Servlet</servlet-name>
+ <url-pattern>*.jsf</url-pattern>
+ </servlet-mapping>
+
+ <welcome-file-list>
+ <welcome-file>index.jsp</welcome-file>
+ </welcome-file-list>
+
+</web-app>
Propchange: myfaces/maven/trunk/archetypes/maven-archetype-jsfcomponents/src/main/resources/archetype-resources/examples/src/main/webapp/WEB-INF/web.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: myfaces/maven/trunk/archetypes/maven-archetype-jsfcomponents/src/main/resources/archetype-resources/examples/src/main/webapp/home.jsp
URL: http://svn.apache.org/viewvc/myfaces/maven/trunk/archetypes/maven-archetype-jsfcomponents/src/main/resources/archetype-resources/examples/src/main/webapp/home.jsp?view=diff&rev=549583&r1=549582&r2=549583
==============================================================================
--- myfaces/maven/trunk/archetypes/maven-archetype-jsfcomponents/src/main/resources/archetype-resources/examples/src/main/webapp/home.jsp (original)
+++ myfaces/maven/trunk/archetypes/maven-archetype-jsfcomponents/src/main/resources/archetype-resources/examples/src/main/webapp/home.jsp Thu Jun 21 11:40:43 2007
@@ -1,38 +1,38 @@
-<%@ page session="false" contentType="text/html;charset=utf-8"%>
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
-<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
-<%@ taglib uri="http://www.myorganitzation.org/mycomponents" prefix="mycomp"%>
-
-<html>
-
-<head>
- <title>My JSF Components Examples</title>
-</head>
-
-<body>
-
-<f:view>
- <h:form>
-
- <f:loadBundle basename="org.myorganization.component.example.build" var="buildInfo"/>
-
- <h:panelGrid columns="2">
- <h:outputText style="font-weight: bold" value="My JSF Components Library"/>
- <h:outputText value=" (Version #{buildInfo['mycomponents_version']}, using #{buildInfo ['jsf_implementation']})"/>
- </h:panelGrid>
-
- <h:panelGrid>
-
- <h:outputText value="My component examples" />
- <h:panelGrid style="padding-left:25px">
- <h:outputLink value="sayhello.jsf">
- <f:verbatim>sayHello - demo component</f:verbatim>
- </h:outputLink>
- </h:panelGrid>
-
- </h:panelGrid>
-
- </h:form>
-</f:view>
-</body>
-</html>
+<%@ page session="false" contentType="text/html;charset=utf-8"%>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
+<%@ taglib uri="http://www.myorganitzation.org/mycomponents" prefix="mycomp"%>
+
+<html>
+
+<head>
+ <title>My JSF Components Examples</title>
+</head>
+
+<body>
+
+<f:view>
+ <h:form>
+
+ <f:loadBundle basename="org.myorganization.component.example.build" var="buildInfo"/>
+
+ <h:panelGrid columns="2">
+ <h:outputText style="font-weight: bold" value="My JSF Components Library"/>
+ <h:outputText value=" (Version #{buildInfo['mycomponents_version']}, using #{buildInfo ['jsf_implementation']})"/>
+ </h:panelGrid>
+
+ <h:panelGrid>
+
+ <h:outputText value="My component examples" />
+ <h:panelGrid style="padding-left:25px">
+ <h:outputLink value="sayhello.jsf">
+ <f:verbatim>sayHello - demo component</f:verbatim>
+ </h:outputLink>
+ </h:panelGrid>
+
+ </h:panelGrid>
+
+ </h:form>
+</f:view>
+</body>
+</html>
Propchange: myfaces/maven/trunk/archetypes/maven-archetype-jsfcomponents/src/main/resources/archetype-resources/examples/src/main/webapp/home.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/maven/trunk/archetypes/maven-archetype-jsfcomponents/src/main/resources/archetype-resources/examples/src/main/webapp/index.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Modified: myfaces/maven/trunk/archetypes/maven-archetype-jsfcomponents/src/main/resources/archetype-resources/examples/src/main/webapp/sayhello.jsp
URL: http://svn.apache.org/viewvc/myfaces/maven/trunk/archetypes/maven-archetype-jsfcomponents/src/main/resources/archetype-resources/examples/src/main/webapp/sayhello.jsp?view=diff&rev=549583&r1=549582&r2=549583
==============================================================================
--- myfaces/maven/trunk/archetypes/maven-archetype-jsfcomponents/src/main/resources/archetype-resources/examples/src/main/webapp/sayhello.jsp (original)
+++ myfaces/maven/trunk/archetypes/maven-archetype-jsfcomponents/src/main/resources/archetype-resources/examples/src/main/webapp/sayhello.jsp Thu Jun 21 11:40:43 2007
@@ -1,49 +1,49 @@
-<%@ page session="false" contentType="text/html;charset=utf-8"%>
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
-<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
-<%@ taglib uri="http://www.myorganitzation.org/mycomponents" prefix="mycomp"%>
-
-<html>
-<head>
- <title>My JSF Components</title>
-</head>
-
-<body>
-
-<f:view>
-
- <mycomp:sayHello firstName="John" lastName="Smith"/>
-
- <h:outputText value=" (probably not you, I know)"/>
-
- <f:verbatim><hr></f:verbatim>
-
- <h:form>
- <h:panelGrid columns="2">
- <h:outputLabel for="inputFirstName" value="First name" />
- <h:inputText id="inputFirstName" value="#{sayHelloBean.firstName}"/>
-
- <h:outputLabel for="inputLastName" value="Last name" />
- <h:inputText id="inputLastName" value="#{sayHelloBean.lastName}"/>
- </h:panelGrid>
-
- <h:panelGrid columns="1">
-
- <h:commandButton value="Say Hello!" actionListener="#{sayHelloBean.sayIt}"/>
-
- <mycomp:sayHello firstName="#{sayHelloBean.firstName}"
- lastName="#{sayHelloBean.lastName}"
- rendered="#{sayHelloBean.renderGreeting}"/>
-
- <h:commandLink value="[HOME]" action="go_home"/>
-
- </h:panelGrid>
-
- </h:form>
-
-</f:view>
-
-
-</body>
-
-</html>
+<%@ page session="false" contentType="text/html;charset=utf-8"%>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
+<%@ taglib uri="http://www.myorganitzation.org/mycomponents" prefix="mycomp"%>
+
+<html>
+<head>
+ <title>My JSF Components</title>
+</head>
+
+<body>
+
+<f:view>
+
+ <mycomp:sayHello firstName="John" lastName="Smith"/>
+
+ <h:outputText value=" (probably not you, I know)"/>
+
+ <f:verbatim><hr></f:verbatim>
+
+ <h:form>
+ <h:panelGrid columns="2">
+ <h:outputLabel for="inputFirstName" value="First name" />
+ <h:inputText id="inputFirstName" value="#{sayHelloBean.firstName}"/>
+
+ <h:outputLabel for="inputLastName" value="Last name" />
+ <h:inputText id="inputLastName" value="#{sayHelloBean.lastName}"/>
+ </h:panelGrid>
+
+ <h:panelGrid columns="1">
+
+ <h:commandButton value="Say Hello!" actionListener="#{sayHelloBean.sayIt}"/>
+
+ <mycomp:sayHello firstName="#{sayHelloBean.firstName}"
+ lastName="#{sayHelloBean.lastName}"
+ rendered="#{sayHelloBean.renderGreeting}"/>
+
+ <h:commandLink value="[HOME]" action="go_home"/>
+
+ </h:panelGrid>
+
+ </h:form>
+
+</f:view>
+
+
+</body>
+
+</html>
Propchange: myfaces/maven/trunk/archetypes/maven-archetype-jsfcomponents/src/main/resources/archetype-resources/examples/src/main/webapp/sayhello.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Modified: myfaces/maven/trunk/archetypes/maven-archetype-jsfcomponents/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/maven/trunk/archetypes/maven-archetype-jsfcomponents/src/main/resources/archetype-resources/pom.xml?view=diff&rev=549583&r1=549582&r2=549583
==============================================================================
--- myfaces/maven/trunk/archetypes/maven-archetype-jsfcomponents/src/main/resources/archetype-resources/pom.xml (original)
+++ myfaces/maven/trunk/archetypes/maven-archetype-jsfcomponents/src/main/resources/archetype-resources/pom.xml Thu Jun 21 11:40:43 2007
@@ -1,27 +1,27 @@
-<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">
- <modelVersion>4.0.0</modelVersion>
- <groupId>${groupId}</groupId>
- <artifactId>${artifactId}-project</artifactId>
- <packaging>pom</packaging>
- <name>My JSF Components Library Project</name>
- <version>${version}</version>
-
- <description>
- This is the project for my funky components. This will build both the core and the examples
- </description>
-
- <modules>
- <module>core</module>
- <module>examples</module>
- </modules>
-
- <repositories>
- <repository>
- <id>Myfaces repository</id>
- <url>http://myfaces.zones.apache.org/dist/maven-repository</url>
- </repository>
- </repositories>
-
-</project>
+<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">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>${groupId}</groupId>
+ <artifactId>${artifactId}-project</artifactId>
+ <packaging>pom</packaging>
+ <name>My JSF Components Library Project</name>
+ <version>${version}</version>
+
+ <description>
+ This is the project for my funky components. This will build both the core and the examples
+ </description>
+
+ <modules>
+ <module>core</module>
+ <module>examples</module>
+ </modules>
+
+ <repositories>
+ <repository>
+ <id>Myfaces repository</id>
+ <url>http://myfaces.zones.apache.org/dist/maven-repository</url>
+ </repository>
+ </repositories>
+
+</project>
Propchange: myfaces/maven/trunk/archetypes/maven-archetype-jsfcomponents/src/main/resources/archetype-resources/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: myfaces/maven/trunk/archetypes/maven-archetype-myfaces/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/maven/trunk/archetypes/maven-archetype-myfaces/pom.xml?view=diff&rev=549583&r1=549582&r2=549583
==============================================================================
--- myfaces/maven/trunk/archetypes/maven-archetype-myfaces/pom.xml (original)
+++ myfaces/maven/trunk/archetypes/maven-archetype-myfaces/pom.xml Thu Jun 21 11:40:43 2007
@@ -1,57 +1,57 @@
-<?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.
-
- @author Bruno Aranda (latest modification by $Author: manolito $)
- @version $Revision: 503282 $ $Date: 2007-02-03 19:46:25 +0100 (Sa, 03 Feb 2007) $
-
--->
-<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">
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.myfaces.maven</groupId>
- <artifactId>maven-archetype-myfaces</artifactId>
- <version>1.0-SNAPSHOT</version>
- <packaging>maven-plugin</packaging>
- <name>MyFaces Archetype</name>
- <description>Archetype to ease the burden of creating a new application based in myfaces</description>
-
- <scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/myfaces/maven/trunk/maven-archetype-myfaces</connection>
- <developerConnection>
- scm:svn:https://svn.apache.org/repos/asf/myfaces/maven/trunk/maven-archetype-myfaces</developerConnection>
- <url>http://svn.apache.org/viewcvs.cgi/myfaces/maven/trunk/maven-archetype-myfaces</url>
- </scm>
-
- <distributionManagement>
- <repository>
- <id>myfaces-staging</id>
- <name>Apache MyFaces Staging Repository</name>
- <url>scpexe://people.apache.org/www/people.apache.org/builds/myfaces/m2-staging-repository</url>
- </repository>
- <snapshotRepository>
- <uniqueVersion>false</uniqueVersion>
- <id>apache-maven-snapshots</id>
- <name>Apache Maven Snapshot Repository</name>
- <url>scpexe://minotaur.apache.org/www/people.apache.org/repo/m2-snapshot-repository</url>
- </snapshotRepository>
- </distributionManagement>
-
-</project>
-
+<?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.
+
+ @author Bruno Aranda (latest modification by $Author: manolito $)
+ @version $Revision: 503282 $ $Date: 2007-02-03 19:46:25 +0100 (Sa, 03 Feb 2007) $
+
+-->
+<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">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.myfaces.maven</groupId>
+ <artifactId>maven-archetype-myfaces</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <packaging>maven-plugin</packaging>
+ <name>MyFaces Archetype</name>
+ <description>Archetype to ease the burden of creating a new application based in myfaces</description>
+
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/myfaces/maven/trunk/maven-archetype-myfaces</connection>
+ <developerConnection>
+ scm:svn:https://svn.apache.org/repos/asf/myfaces/maven/trunk/maven-archetype-myfaces</developerConnection>
+ <url>http://svn.apache.org/viewcvs.cgi/myfaces/maven/trunk/maven-archetype-myfaces</url>
+ </scm>
+
+ <distributionManagement>
+ <repository>
+ <id>myfaces-staging</id>
+ <name>Apache MyFaces Staging Repository</name>
+ <url>scpexe://people.apache.org/www/people.apache.org/builds/myfaces/m2-staging-repository</url>
+ </repository>
+ <snapshotRepository>
+ <uniqueVersion>false</uniqueVersion>
+ <id>apache-maven-snapshots</id>
+ <name>Apache Maven Snapshot Repository</name>
+ <url>scpexe://minotaur.apache.org/www/people.apache.org/repo/m2-snapshot-repository</url>
+ </snapshotRepository>
+ </distributionManagement>
+
+</project>
+
Propchange: myfaces/maven/trunk/archetypes/maven-archetype-myfaces/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: myfaces/maven/trunk/archetypes/maven-archetype-myfaces/src/main/resources/META-INF/archetype.xml
URL: http://svn.apache.org/viewvc/myfaces/maven/trunk/archetypes/maven-archetype-myfaces/src/main/resources/META-INF/archetype.xml?view=diff&rev=549583&r1=549582&r2=549583
==============================================================================
--- myfaces/maven/trunk/archetypes/maven-archetype-myfaces/src/main/resources/META-INF/archetype.xml (original)
+++ myfaces/maven/trunk/archetypes/maven-archetype-myfaces/src/main/resources/META-INF/archetype.xml Thu Jun 21 11:40:43 2007
@@ -1,36 +1,36 @@
-<?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.
-
- @author Bruno Aranda (latest modification by $Author: grantsmith $)
- @version $Revision: 472560 $ $Date: 2006-11-08 18:45:25 +0100 (Mi, 08 Nov 2006) $
-
--->
-
-<archetype>
- <id>myfaces-archetype</id>
- <resources>
- <resource>src/main/java/org/apache/myfaces/blank/HelloWorldBacking.java</resource>
- <resource>src/main/webapp/index.jsp</resource>
- <resource>src/main/webapp/helloWorld.jsp</resource>
- <resource>src/main/webapp/page2.jsp</resource>
- <resource>src/main/webapp/WEB-INF/web.xml</resource>
- <resource>src/main/webapp/WEB-INF/examples-config.xml</resource>
- </resources>
+<?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.
+
+ @author Bruno Aranda (latest modification by $Author: grantsmith $)
+ @version $Revision: 472560 $ $Date: 2006-11-08 18:45:25 +0100 (Mi, 08 Nov 2006) $
+
+-->
+
+<archetype>
+ <id>myfaces-archetype</id>
+ <resources>
+ <resource>src/main/java/org/apache/myfaces/blank/HelloWorldBacking.java</resource>
+ <resource>src/main/webapp/index.jsp</resource>
+ <resource>src/main/webapp/helloWorld.jsp</resource>
+ <resource>src/main/webapp/page2.jsp</resource>
+ <resource>src/main/webapp/WEB-INF/web.xml</resource>
+ <resource>src/main/webapp/WEB-INF/examples-config.xml</resource>
+ </resources>
</archetype>
Propchange: myfaces/maven/trunk/archetypes/maven-archetype-myfaces/src/main/resources/META-INF/archetype.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: myfaces/maven/trunk/archetypes/maven-archetype-myfaces/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/maven/trunk/archetypes/maven-archetype-myfaces/src/main/resources/archetype-resources/pom.xml?view=diff&rev=549583&r1=549582&r2=549583
==============================================================================
--- myfaces/maven/trunk/archetypes/maven-archetype-myfaces/src/main/resources/archetype-resources/pom.xml (original)
+++ myfaces/maven/trunk/archetypes/maven-archetype-myfaces/src/main/resources/archetype-resources/pom.xml Thu Jun 21 11:40:43 2007
@@ -1,119 +1,119 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<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">
- <modelVersion>4.0.0</modelVersion>
- <groupId>${groupId}</groupId>
- <artifactId>${artifactId}</artifactId>
- <packaging>war</packaging>
- <version>${version}</version>
- <name>A custom project using myfaces</name>
- <url>http://www.myorganization.org</url>
-
- <build>
- <finalName>${artifactId}</finalName>
- </build>
-
- <!-- Profile to run jetty, so the tomcat jars are included in the bundle. They are not included by default -->
- <profiles>
- <profile>
- <id>jettyConfig</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>maven-jetty-plugin</artifactId>
- <configuration>
- <scanIntervalSeconds>10</scanIntervalSeconds>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <dependencies>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>jsp-api</artifactId>
- <version>2.0</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>tomcat</groupId>
- <artifactId>jasper-compiler</artifactId>
- <version>5.5.9</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>tomcat</groupId>
- <artifactId>jasper-runtime</artifactId>
- <version>5.5.9</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>tomcat</groupId>
- <artifactId>jasper-compiler-jdt</artifactId>
- <version>5.5.9</version>
- <scope>compile</scope>
- </dependency>
- </dependencies>
-
- <pluginRepositories>
- <!-- Repository to get the jetty plugin -->
- <pluginRepository>
- <id>mortbay-repo</id>
- <name>mortbay-repo</name>
- <url>http://www.mortbay.org/maven2/snapshot</url>
- </pluginRepository>
- </pluginRepositories>
-
- </profile>
- </profiles>
-
- <repositories>
- <repository>
- <releases>
- <enabled>false</enabled>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <id>apache-maven-snapshots</id>
- <url>http://people.apache.org/repo/m2-snapshot-repository</url>
- </repository>
- </repositories>
-
- <!-- Project dependencies -->
- <dependencies>
- <dependency>
- <groupId>org.apache.myfaces.core</groupId>
- <artifactId>myfaces-api</artifactId>
- <version>1.1.6-SNAPSHOT</version>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.myfaces.core</groupId>
- <artifactId>myfaces-impl</artifactId>
- <version>1.1.6-SNAPSHOT</version>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.myfaces.tomahawk</groupId>
- <artifactId>tomahawk</artifactId>
- <version>1.1.6-SNAPSHOT</version>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.0</version>
- <scope>test</scope>
- </dependency>
-
- </dependencies>
-
-
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+
+<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">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>${groupId}</groupId>
+ <artifactId>${artifactId}</artifactId>
+ <packaging>war</packaging>
+ <version>${version}</version>
+ <name>A custom project using myfaces</name>
+ <url>http://www.myorganization.org</url>
+
+ <build>
+ <finalName>${artifactId}</finalName>
+ </build>
+
+ <!-- Profile to run jetty, so the tomcat jars are included in the bundle. They are not included by default -->
+ <profiles>
+ <profile>
+ <id>jettyConfig</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>maven-jetty-plugin</artifactId>
+ <configuration>
+ <scanIntervalSeconds>10</scanIntervalSeconds>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>jsp-api</artifactId>
+ <version>2.0</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>tomcat</groupId>
+ <artifactId>jasper-compiler</artifactId>
+ <version>5.5.9</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>tomcat</groupId>
+ <artifactId>jasper-runtime</artifactId>
+ <version>5.5.9</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>tomcat</groupId>
+ <artifactId>jasper-compiler-jdt</artifactId>
+ <version>5.5.9</version>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
+
+ <pluginRepositories>
+ <!-- Repository to get the jetty plugin -->
+ <pluginRepository>
+ <id>mortbay-repo</id>
+ <name>mortbay-repo</name>
+ <url>http://www.mortbay.org/maven2/snapshot</url>
+ </pluginRepository>
+ </pluginRepositories>
+
+ </profile>
+ </profiles>
+
+ <repositories>
+ <repository>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <id>apache-maven-snapshots</id>
+ <url>http://people.apache.org/repo/m2-snapshot-repository</url>
+ </repository>
+ </repositories>
+
+ <!-- Project dependencies -->
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-api</artifactId>
+ <version>1.1.6-SNAPSHOT</version>
+ <scope>compile</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-impl</artifactId>
+ <version>1.1.6-SNAPSHOT</version>
+ <scope>compile</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.myfaces.tomahawk</groupId>
+ <artifactId>tomahawk</artifactId>
+ <version>1.1.6-SNAPSHOT</version>
+ <scope>compile</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.0</version>
+ <scope>test</scope>
+ </dependency>
+
+ </dependencies>
+
+
+</project>
Propchange: myfaces/maven/trunk/archetypes/maven-archetype-myfaces/src/main/resources/archetype-resources/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: myfaces/maven/trunk/archetypes/maven-archetype-myfaces/src/main/resources/archetype-resources/src/main/java/org/apache/myfaces/blank/HelloWorldBacking.java
URL: http://svn.apache.org/viewvc/myfaces/maven/trunk/archetypes/maven-archetype-myfaces/src/main/resources/archetype-resources/src/main/java/org/apache/myfaces/blank/HelloWorldBacking.java?view=diff&rev=549583&r1=549582&r2=549583
==============================================================================
--- myfaces/maven/trunk/archetypes/maven-archetype-myfaces/src/main/resources/archetype-resources/src/main/java/org/apache/myfaces/blank/HelloWorldBacking.java (original)
+++ myfaces/maven/trunk/archetypes/maven-archetype-myfaces/src/main/resources/archetype-resources/src/main/java/org/apache/myfaces/blank/HelloWorldBacking.java Thu Jun 21 11:40:43 2007
@@ -1,53 +1,53 @@
-/*
- * 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.
-*/
-package org.apache.myfaces.blank;
-
-/**
- * A typical simple backing bean, that is backed to <code>helloworld.jsp</code>
- *
- * @author <a href="mailto:matzew@apache.org">Matthias Weßendorf</a>
- */
-public class HelloWorldBacking {
-
-
- //properties
- private String name;
-
- /**
- * default empty constructor
- */
- public HelloWorldBacking(){
- }
-
- //-------------------getter & setter
- public String getName() {
- return name;
- }
- public void setName(String name) {
- this.name = name;
- }
-
- /**
- * Method that is backed to a submit button of a form.
- */
- public String send(){
- //do real logic
- return ("success");
- }
+/*
+ * 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.
+*/
+package org.apache.myfaces.blank;
+
+/**
+ * A typical simple backing bean, that is backed to <code>helloworld.jsp</code>
+ *
+ * @author <a href="mailto:matzew@apache.org">Matthias Weßendorf</a>
+ */
+public class HelloWorldBacking {
+
+
+ //properties
+ private String name;
+
+ /**
+ * default empty constructor
+ */
+ public HelloWorldBacking(){
+ }
+
+ //-------------------getter & setter
+ public String getName() {
+ return name;
+ }
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ /**
+ * Method that is backed to a submit button of a form.
+ */
+ public String send(){
+ //do real logic
+ return ("success");
+ }
}
Propchange: myfaces/maven/trunk/archetypes/maven-archetype-myfaces/src/main/resources/archetype-resources/src/main/java/org/apache/myfaces/blank/HelloWorldBacking.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: myfaces/maven/trunk/archetypes/maven-archetype-myfaces/src/main/resources/archetype-resources/src/main/resources/log4j.properties
URL: http://svn.apache.org/viewvc/myfaces/maven/trunk/archetypes/maven-archetype-myfaces/src/main/resources/archetype-resources/src/main/resources/log4j.properties?view=diff&rev=549583&r1=549582&r2=549583
==============================================================================
--- myfaces/maven/trunk/archetypes/maven-archetype-myfaces/src/main/resources/archetype-resources/src/main/resources/log4j.properties (original)
+++ myfaces/maven/trunk/archetypes/maven-archetype-myfaces/src/main/resources/archetype-resources/src/main/resources/log4j.properties Thu Jun 21 11:40:43 2007
@@ -1,18 +1,18 @@
-#for debugging log4j itself
-log4j.debug=false
-
-#Logger-Priorities:
-#DEBUG lowest, prints all messages
-#INFO prints all messages with FATAL, ERROR, WARN or INFO priority
-#WARN prints all messages with FATAL, ERROR or WARN priority
-#ERROR prints all messages with FATAL or ERROR priority
-#FATAL highest, prints only FATAL messages
-
-# root logger
-log4j.rootLogger=INFO, A1
-log4j.appender.A1=org.apache.log4j.ConsoleAppender
-log4j.appender.A1.layout=org.apache.log4j.PatternLayout
-log4j.appender.A1.layout.ConversionPattern=%d [%t] %-5p %c - %m%n
-
-# myfaces logger
-log4j.logger.org.apache.myfaces=INFO
+#for debugging log4j itself
+log4j.debug=false
+
+#Logger-Priorities:
+#DEBUG lowest, prints all messages
+#INFO prints all messages with FATAL, ERROR, WARN or INFO priority
+#WARN prints all messages with FATAL, ERROR or WARN priority
+#ERROR prints all messages with FATAL or ERROR priority
+#FATAL highest, prints only FATAL messages
+
+# root logger
+log4j.rootLogger=INFO, A1
+log4j.appender.A1=org.apache.log4j.ConsoleAppender
+log4j.appender.A1.layout=org.apache.log4j.PatternLayout
+log4j.appender.A1.layout.ConversionPattern=%d [%t] %-5p %c - %m%n
+
+# myfaces logger
+log4j.logger.org.apache.myfaces=INFO
Propchange: myfaces/maven/trunk/archetypes/maven-archetype-myfaces/src/main/resources/archetype-resources/src/main/resources/log4j.properties
------------------------------------------------------------------------------
svn:eol-style = native
Modified: myfaces/maven/trunk/archetypes/maven-archetype-myfaces/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/examples-config.xml
URL: http://svn.apache.org/viewvc/myfaces/maven/trunk/archetypes/maven-archetype-myfaces/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/examples-config.xml?view=diff&rev=549583&r1=549582&r2=549583
==============================================================================
--- myfaces/maven/trunk/archetypes/maven-archetype-myfaces/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/examples-config.xml (original)
+++ myfaces/maven/trunk/archetypes/maven-archetype-myfaces/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/examples-config.xml Thu Jun 21 11:40:43 2007
@@ -1,33 +1,33 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE faces-config PUBLIC
- "-//Sun Microsystems, Inc.//DTD JavaServer Faces Config 1.0//EN"
- "http://java.sun.com/dtd/web-facesconfig_1_1.dtd" >
-
-<faces-config>
-
- <!-- managed beans of the simple hello world app -->
- <managed-bean>
- <managed-bean-name>helloWorldBacking</managed-bean-name>
- <managed-bean-class>org.apache.myfaces.blank.HelloWorldBacking</managed-bean-class>
- <managed-bean-scope>request</managed-bean-scope>
- </managed-bean>
-
- <!-- navigation rules for helloWorld.jsp -->
- <navigation-rule>
- <from-view-id>/helloWorld.jsp</from-view-id>
- <navigation-case>
- <from-outcome>success</from-outcome>
- <to-view-id>/page2.jsp</to-view-id>
- </navigation-case>
- </navigation-rule>
-
- <!-- navigation rules for page2.jsp -->
- <navigation-rule>
- <from-view-id>/page2.jsp</from-view-id>
- <navigation-case>
- <from-outcome>back</from-outcome>
- <to-view-id>/helloWorld.jsp</to-view-id>
- </navigation-case>
- </navigation-rule>
+<?xml version="1.0"?>
+
+<!DOCTYPE faces-config PUBLIC
+ "-//Sun Microsystems, Inc.//DTD JavaServer Faces Config 1.0//EN"
+ "http://java.sun.com/dtd/web-facesconfig_1_1.dtd" >
+
+<faces-config>
+
+ <!-- managed beans of the simple hello world app -->
+ <managed-bean>
+ <managed-bean-name>helloWorldBacking</managed-bean-name>
+ <managed-bean-class>org.apache.myfaces.blank.HelloWorldBacking</managed-bean-class>
+ <managed-bean-scope>request</managed-bean-scope>
+ </managed-bean>
+
+ <!-- navigation rules for helloWorld.jsp -->
+ <navigation-rule>
+ <from-view-id>/helloWorld.jsp</from-view-id>
+ <navigation-case>
+ <from-outcome>success</from-outcome>
+ <to-view-id>/page2.jsp</to-view-id>
+ </navigation-case>
+ </navigation-rule>
+
+ <!-- navigation rules for page2.jsp -->
+ <navigation-rule>
+ <from-view-id>/page2.jsp</from-view-id>
+ <navigation-case>
+ <from-outcome>back</from-outcome>
+ <to-view-id>/helloWorld.jsp</to-view-id>
+ </navigation-case>
+ </navigation-rule>
</faces-config>
Propchange: myfaces/maven/trunk/archetypes/maven-archetype-myfaces/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/examples-config.xml
------------------------------------------------------------------------------
svn:eol-style = native