You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by xi...@apache.org on 2010/06/30 17:00:10 UTC
svn commit: r959342 [12/13] - in /geronimo/samples/trunk: ./ samples/
samples/all-samples/all-samples-jetty/
samples/all-samples/all-samples-tomcat/ samples/daytrader/
samples/daytrader/assemblies/ samples/daytrader/assemblies/javaee/
samples/daytrader...
Modified: geronimo/samples/trunk/samples/javaee5/sendmail/sendmail-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee5/sendmail/sendmail-tomcat/pom.xml?rev=959342&r1=959341&r2=959342&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee5/sendmail/sendmail-tomcat/pom.xml (original)
+++ geronimo/samples/trunk/samples/javaee5/sendmail/sendmail-tomcat/pom.xml Wed Jun 30 15:00:02 2010
@@ -48,7 +48,7 @@
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
- <artifactId>tomcat6-deployer</artifactId>
+ <artifactId>${tomcat}-deployer</artifactId>
<version>${geronimoVersion}</version>
<type>car</type>
<scope>provided</scope>
@@ -70,7 +70,7 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
- <artifactId>tomcat6</artifactId>
+ <artifactId>${tomcat}</artifactId>
<version>${geronimoVersion}</version>
<type>car</type>
</dependency>
@@ -111,7 +111,6 @@
<value>true</value>
<includeVersion>true</includeVersion>
</useMavenDependencies>
- <category>Sample</category>
</configuration>
</plugin>
</plugins>
Modified: geronimo/samples/trunk/samples/javaee5/sendmail/sendmail-tomcat/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee5/sendmail/sendmail-tomcat/src/main/plan/plan.xml?rev=959342&r1=959341&r2=959342&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee5/sendmail/sendmail-tomcat/src/main/plan/plan.xml (original)
+++ geronimo/samples/trunk/samples/javaee5/sendmail/sendmail-tomcat/src/main/plan/plan.xml Wed Jun 30 15:00:02 2010
@@ -20,7 +20,7 @@
<!-- $Rev: 497879 $ $Date: 2007-01-19 12:11:01 -0500 (Fri, 19 Jan 2007) $ -->
<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-1.1">
- <context-root>/sendmail</context-root>
+ <context-root>${project.artifactId}</context-root>
<resource-ref>
<!-- Used is web.xml -->
<ref-name>mail/testMailSession</ref-name>
Propchange: geronimo/samples/trunk/samples/javaee5/servlet-examples/
('svn:mergeinfo' removed)
Modified: geronimo/samples/trunk/samples/javaee5/servlet-examples/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee5/servlet-examples/pom.xml?rev=959342&r1=959341&r2=959342&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee5/servlet-examples/pom.xml (original)
+++ geronimo/samples/trunk/samples/javaee5/servlet-examples/pom.xml Wed Jun 30 15:00:02 2010
@@ -64,5 +64,14 @@
<module>servlet-examples-war</module>
</modules>
</profile>
+ <profile>
+ <id>all-subprojects</id>
+
+ <modules>
+ <module>servlet-examples-war</module>
+ <module>servlet-examples-jetty</module>
+ <module>servlet-examples-tomcat</module>
+ </modules>
+ </profile>
</profiles>
</project>
Modified: geronimo/samples/trunk/samples/javaee5/servlet-examples/servlet-examples-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee5/servlet-examples/servlet-examples-jetty/pom.xml?rev=959342&r1=959341&r2=959342&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee5/servlet-examples/servlet-examples-jetty/pom.xml (original)
+++ geronimo/samples/trunk/samples/javaee5/servlet-examples/servlet-examples-jetty/pom.xml Wed Jun 30 15:00:02 2010
@@ -95,7 +95,6 @@
<value>true</value>
<includeVersion>true</includeVersion>
</useMavenDependencies>
- <category>Sample</category>
</configuration>
</plugin>
</plugins>
Modified: geronimo/samples/trunk/samples/javaee5/servlet-examples/servlet-examples-jetty/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee5/servlet-examples/servlet-examples-jetty/src/main/plan/plan.xml?rev=959342&r1=959341&r2=959342&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee5/servlet-examples/servlet-examples-jetty/src/main/plan/plan.xml (original)
+++ geronimo/samples/trunk/samples/javaee5/servlet-examples/servlet-examples-jetty/src/main/plan/plan.xml Wed Jun 30 15:00:02 2010
@@ -15,7 +15,7 @@
limitations under the License.-->
<!--$Rev$ $Date$-->
<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.2">
- <context-root>/servlets-examples</context-root>
+ <context-root>${project.artifactId}</context-root>
<security-realm-name>geronimo-admin</security-realm-name>
<security>
<role-mappings>
@@ -24,4 +24,4 @@
</role>
</role-mappings>
</security>
-</web-app>
\ No newline at end of file
+</web-app>
Modified: geronimo/samples/trunk/samples/javaee5/servlet-examples/servlet-examples-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee5/servlet-examples/servlet-examples-tomcat/pom.xml?rev=959342&r1=959341&r2=959342&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee5/servlet-examples/servlet-examples-tomcat/pom.xml (original)
+++ geronimo/samples/trunk/samples/javaee5/servlet-examples/servlet-examples-tomcat/pom.xml Wed Jun 30 15:00:02 2010
@@ -47,7 +47,7 @@
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
- <artifactId>tomcat6-deployer</artifactId>
+ <artifactId>${tomcat}-deployer</artifactId>
<version>${geronimoVersion}</version>
<type>car</type>
<scope>provided</scope>
@@ -55,7 +55,7 @@
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
- <artifactId>tomcat6</artifactId>
+ <artifactId>${tomcat}</artifactId>
<version>${geronimoVersion}</version>
<type>car</type>
</dependency>
@@ -90,7 +90,6 @@
<value>true</value>
<includeVersion>true</includeVersion>
</useMavenDependencies>
- <category>Sample</category>
</configuration>
</plugin>
</plugins>
Modified: geronimo/samples/trunk/samples/javaee5/servlet-examples/servlet-examples-tomcat/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee5/servlet-examples/servlet-examples-tomcat/src/main/plan/plan.xml?rev=959342&r1=959341&r2=959342&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee5/servlet-examples/servlet-examples-tomcat/src/main/plan/plan.xml (original)
+++ geronimo/samples/trunk/samples/javaee5/servlet-examples/servlet-examples-tomcat/src/main/plan/plan.xml Wed Jun 30 15:00:02 2010
@@ -15,7 +15,7 @@
limitations under the License.-->
<!--$Rev$ $Date$-->
<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.2">
- <context-root>/servlets-examples</context-root>
+ <context-root>${project.artifactId}</context-root>
<security-realm-name>geronimo-admin</security-realm-name>
<security>
<role-mappings>
@@ -24,4 +24,4 @@
</role>
</role-mappings>
</security>
-</web-app>
\ No newline at end of file
+</web-app>
Propchange: geronimo/samples/trunk/samples/javaee5/timereport/
('svn:mergeinfo' removed)
Modified: geronimo/samples/trunk/samples/javaee5/timereport/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee5/timereport/pom.xml?rev=959342&r1=959341&r2=959342&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee5/timereport/pom.xml (original)
+++ geronimo/samples/trunk/samples/javaee5/timereport/pom.xml Wed Jun 30 15:00:02 2010
@@ -64,5 +64,14 @@
<module>timereport-war</module>
</modules>
</profile>
+ <profile>
+ <id>all-subprojects</id>
+
+ <modules>
+ <module>timereport-war</module>
+ <module>timereport-jetty</module>
+ <module>timereport-tomcat</module>
+ </modules>
+ </profile>
</profiles>
</project>
Modified: geronimo/samples/trunk/samples/javaee5/timereport/timereport-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee5/timereport/timereport-jetty/pom.xml?rev=959342&r1=959341&r2=959342&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee5/timereport/timereport-jetty/pom.xml (original)
+++ geronimo/samples/trunk/samples/javaee5/timereport/timereport-jetty/pom.xml Wed Jun 30 15:00:02 2010
@@ -111,7 +111,6 @@
<value>true</value>
<includeVersion>true</includeVersion>
</useMavenDependencies>
- <category>Sample</category>
</configuration>
</plugin>
</plugins>
Modified: geronimo/samples/trunk/samples/javaee5/timereport/timereport-jetty/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee5/timereport/timereport-jetty/src/main/plan/plan.xml?rev=959342&r1=959341&r2=959342&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee5/timereport/timereport-jetty/src/main/plan/plan.xml (original)
+++ geronimo/samples/trunk/samples/javaee5/timereport/timereport-jetty/src/main/plan/plan.xml Wed Jun 30 15:00:02 2010
@@ -21,7 +21,7 @@
<!-- $Rev: 497879 $ $Date: 2007-01-19 12:11:01 -0500 (Fri, 19 Jan 2007) $ -->
<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1">
- <context-root>/timereport</context-root>
+ <context-root>${project.artifactId}</context-root>
<security-realm-name>TimeReportRealm</security-realm-name>
@@ -46,8 +46,8 @@
</role-mappings>
</security>
- <gbean name="DBInitialization" class="org.apache.geronimo.connector.DatabaseInitializationGBean">
- <attribute name="testSQL">select * from users</attribute>
+ <gbean name="DBInitialization" class="org.apache.geronimo.connector.wrapper.DatabaseInitializationGBean">
+ <!--<attribute name="testSQL">select * from users</attribute>-->
<attribute name="path">TimeReportDB.sql</attribute>
<reference name="DataSource">
<name>SampleTxDatasource</name>
Modified: geronimo/samples/trunk/samples/javaee5/timereport/timereport-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee5/timereport/timereport-tomcat/pom.xml?rev=959342&r1=959341&r2=959342&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee5/timereport/timereport-tomcat/pom.xml (original)
+++ geronimo/samples/trunk/samples/javaee5/timereport/timereport-tomcat/pom.xml Wed Jun 30 15:00:02 2010
@@ -54,7 +54,7 @@
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
- <artifactId>tomcat6-deployer</artifactId>
+ <artifactId>${tomcat}-deployer</artifactId>
<version>${geronimoVersion}</version>
<type>car</type>
<scope>provided</scope>
@@ -76,7 +76,7 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
- <artifactId>tomcat6</artifactId>
+ <artifactId>${tomcat}</artifactId>
<version>${geronimoVersion}</version>
<type>car</type>
</dependency>
@@ -111,7 +111,6 @@
<value>true</value>
<includeVersion>true</includeVersion>
</useMavenDependencies>
- <category>Sample</category>
</configuration>
</plugin>
</plugins>
Modified: geronimo/samples/trunk/samples/javaee5/timereport/timereport-tomcat/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee5/timereport/timereport-tomcat/src/main/plan/plan.xml?rev=959342&r1=959341&r2=959342&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee5/timereport/timereport-tomcat/src/main/plan/plan.xml (original)
+++ geronimo/samples/trunk/samples/javaee5/timereport/timereport-tomcat/src/main/plan/plan.xml Wed Jun 30 15:00:02 2010
@@ -21,7 +21,7 @@
<!-- $Rev: 497879 $ $Date: 2007-01-19 12:11:01 -0500 (Fri, 19 Jan 2007) $ -->
<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1">
- <context-root>/timereport</context-root>
+ <context-root>${project.artifactId}</context-root>
<security-realm-name>TimeReportRealm</security-realm-name>
@@ -46,7 +46,7 @@
</role-mappings>
</security>
- <gbean name="DBInitialization" class="org.apache.geronimo.connector.DatabaseInitializationGBean">
+ <gbean name="DBInitialization" class="org.apache.geronimo.connector.wrapper.DatabaseInitializationGBean">
<attribute name="testSQL">select * from users</attribute>
<attribute name="path">TimeReportDB.sql</attribute>
<reference name="DataSource">
Modified: geronimo/samples/trunk/samples/javaee5/timereport/timereport-war/src/main/webapp/login/login_error.jsp
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee5/timereport/timereport-war/src/main/webapp/login/login_error.jsp?rev=959342&r1=959341&r2=959342&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee5/timereport/timereport-war/src/main/webapp/login/login_error.jsp (original)
+++ geronimo/samples/trunk/samples/javaee5/timereport/timereport-war/src/main/webapp/login/login_error.jsp Wed Jun 30 15:00:02 2010
@@ -25,7 +25,7 @@ under the License.
<CENTER>
<H1>Invalid user name or password</H1>
<BR>
- <A href="/timereport/index.jsp">Home</A>
+ <A href="<%= request.getContextPath() %>/index.jsp">Home</A>
</CENTER>
</BODY>
</HTML>
\ No newline at end of file
Modified: geronimo/samples/trunk/samples/javaee5/timereport/timereport-war/src/main/webapp/login/logout.jsp
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee5/timereport/timereport-war/src/main/webapp/login/logout.jsp?rev=959342&r1=959341&r2=959342&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee5/timereport/timereport-war/src/main/webapp/login/logout.jsp (original)
+++ geronimo/samples/trunk/samples/javaee5/timereport/timereport-war/src/main/webapp/login/logout.jsp Wed Jun 30 15:00:02 2010
@@ -29,7 +29,7 @@ under the License.
<H2>You have now logged out.</H2>
- <A href="/timereport/index.jsp">Return to Main Page</A>
+ <A href="<%= request.getContextPath() %>/index.jsp">Return to Main Page</A>
<CENTER>
</BODY>
</HTML>
\ No newline at end of file
Modified: geronimo/samples/trunk/samples/javaee6/converter-javaee6/converter-javaee6-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee6/converter-javaee6/converter-javaee6-jetty/pom.xml?rev=959342&r1=959341&r2=959342&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee6/converter-javaee6/converter-javaee6-jetty/pom.xml (original)
+++ geronimo/samples/trunk/samples/javaee6/converter-javaee6/converter-javaee6-jetty/pom.xml Wed Jun 30 15:00:02 2010
@@ -39,7 +39,7 @@
<dependencies>
<dependency>
<groupId>org.apache.geronimo.samples</groupId>
- <artifactId>converter-javaee6-ear</artifactId>
+ <artifactId>converter-javaee6-war</artifactId>
<version>${version}</version>
<type>war</type>
</dependency>
@@ -59,26 +59,10 @@
<type>car</type>
<scope>provided</scope>
</dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>jasper</artifactId>
- <version>${geronimoVersion}</version>
- <type>car</type>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>openejb-deployer</artifactId>
- <version>${geronimoVersion}</version>
- <type>car</type>
- <scope>provided</scope>
- </dependency>
-
+
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
- <artifactId>persistence-jpa20-deployer</artifactId>
+ <artifactId>myfaces-deployer</artifactId>
<version>${geronimoVersion}</version>
<type>car</type>
<scope>provided</scope>
@@ -102,13 +86,12 @@
<deploymentConfig>${gbeanDeployer}</deploymentConfig>
<deploymentConfig>${j2eeDeployer}</deploymentConfig>
<deploymentConfig>${jettyDeployer}</deploymentConfig>
- <deploymentConfig>${jasperDeployer}</deploymentConfig>
- <deploymentConfig>${openejbDeployer}</deploymentConfig>
- <deploymentConfig>${jpaDeployer}</deploymentConfig>
+ <deploymentConfig>${jasperDeployer}</deploymentConfig>
+ <deploymentConfig>${myfacesDeployer}</deploymentConfig>
</deploymentConfigs>
<module>
<groupId>org.apache.geronimo.samples</groupId>
- <artifactId>converter-javaee6-ear</artifactId>
+ <artifactId>converter-javaee6-war</artifactId>
<version>${version}</version>
<type>war</type>
</module>
Modified: geronimo/samples/trunk/samples/javaee6/converter-javaee6/converter-javaee6-jetty/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee6/converter-javaee6/converter-javaee6-jetty/src/main/plan/plan.xml?rev=959342&r1=959341&r2=959342&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee6/converter-javaee6/converter-javaee6-jetty/src/main/plan/plan.xml (original)
+++ geronimo/samples/trunk/samples/javaee6/converter-javaee6/converter-javaee6-jetty/src/main/plan/plan.xml Wed Jun 30 15:00:02 2010
@@ -24,18 +24,6 @@
xmlns:sec="http://geronimo.apache.org/xml/ns/security-2.0"
xmlns:sys="http://geronimo.apache.org/xml/ns/deployment-1.2">
- <sys:environment>
- <sys:moduleId>
- <sys:groupId>${pom.groupId}</sys:groupId>
- <sys:artifactId>${pom.artifactId}</sys:artifactId>
- <sys:version>${version}</sys:version>
- <sys:type>car</sys:type>
- </sys:moduleId>
- <sys:dependencies/>
- <sys:hidden-classes/>
- <sys:non-overridable-classes/>
- </sys:environment>
-
- <context-root>/${pom.artifactId}</context-root>
+ <context-root>/${project.artifactId}</context-root>
</web-app>
Modified: geronimo/samples/trunk/samples/javaee6/converter-javaee6/converter-javaee6-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee6/converter-javaee6/converter-javaee6-tomcat/pom.xml?rev=959342&r1=959341&r2=959342&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee6/converter-javaee6/converter-javaee6-tomcat/pom.xml (original)
+++ geronimo/samples/trunk/samples/javaee6/converter-javaee6/converter-javaee6-tomcat/pom.xml Wed Jun 30 15:00:02 2010
@@ -58,31 +58,16 @@
<version>${geronimoVersion}</version>
<type>car</type>
<scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>jasper</artifactId>
- <version>${geronimoVersion}</version>
- <type>car</type>
- <scope>provided</scope>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
- <artifactId>openejb-deployer</artifactId>
+ <artifactId>myfaces-deployer</artifactId>
<version>${geronimoVersion}</version>
<type>car</type>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>persistence-jpa20-deployer</artifactId>
- <version>${geronimoVersion}</version>
- <type>car</type>
- <scope>provided</scope>
- </dependency>
</dependencies>
<build>
@@ -102,13 +87,12 @@
<deploymentConfig>${gbeanDeployer}</deploymentConfig>
<deploymentConfig>${j2eeDeployer}</deploymentConfig>
<deploymentConfig>${tomcatDeployer}</deploymentConfig>
- <deploymentConfig>${jasperDeployer}</deploymentConfig>
- <deploymentConfig>${openejbDeployer}</deploymentConfig>
- <deploymentConfig>${jpaDeployer}</deploymentConfig>
+ <deploymentConfig>${jasperDeployer}</deploymentConfig>
+ <deploymentConfig>${myfacesDeployer}</deploymentConfig>
</deploymentConfigs>
<module>
<groupId>org.apache.geronimo.samples</groupId>
- <artifactId>converter-javaee6-ear</artifactId>
+ <artifactId>converter-javaee6-war</artifactId>
<version>${version}</version>
<type>war</type>
</module>
Modified: geronimo/samples/trunk/samples/javaee6/converter-javaee6/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee6/converter-javaee6/pom.xml?rev=959342&r1=959341&r2=959342&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee6/converter-javaee6/pom.xml (original)
+++ geronimo/samples/trunk/samples/javaee6/converter-javaee6/pom.xml Wed Jun 30 15:00:02 2010
@@ -89,5 +89,14 @@
<module>converter-javaee6-war</module>
</modules>
</profile>
+ <profile>
+ <id>all-subprojects</id>
+
+ <modules>
+ <module>converter-javaee6-war</module>
+ <module>converter-javaee6-jetty</module>
+ <module>converter-javaee6-tomcat</module>
+ </modules>
+ </profile>
</profiles>
</project>
Modified: geronimo/samples/trunk/samples/javaee6/cviewer-javaee6/cviewer-javaee6-jetty/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee6/cviewer-javaee6/cviewer-javaee6-jetty/src/main/plan/plan.xml?rev=959342&r1=959341&r2=959342&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee6/cviewer-javaee6/cviewer-javaee6-jetty/src/main/plan/plan.xml (original)
+++ geronimo/samples/trunk/samples/javaee6/cviewer-javaee6/cviewer-javaee6-jetty/src/main/plan/plan.xml Wed Jun 30 15:00:02 2010
@@ -19,16 +19,11 @@
-->
<!-- $Rev$ $Date$ -->
-<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.2">
+<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1"
+ xmlns:naming="http://geronimo.apache.org/xml/ns/naming-1.2"
+ xmlns:sec="http://geronimo.apache.org/xml/ns/security-2.0"
+ xmlns:sys="http://geronimo.apache.org/xml/ns/deployment-1.2">
- <dep:environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
- <dep:moduleId>
- <dep:groupId>${pom.groupId}</dep:groupId>
- <dep:artifactId>${pom.artifactId}</dep:artifactId>
- <dep:version>${version}</dep:version>
- <dep:type>car</dep:type>
- </dep:moduleId>
+ <context-root>/${project.artifactId}</context-root>
- </dep:environment>
-
-</application>
+</web-app>
Modified: geronimo/samples/trunk/samples/javaee6/cviewer-javaee6/cviewer-javaee6-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee6/cviewer-javaee6/cviewer-javaee6-tomcat/pom.xml?rev=959342&r1=959341&r2=959342&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee6/cviewer-javaee6/cviewer-javaee6-tomcat/pom.xml (original)
+++ geronimo/samples/trunk/samples/javaee6/cviewer-javaee6/cviewer-javaee6-tomcat/pom.xml Wed Jun 30 15:00:02 2010
@@ -46,7 +46,7 @@
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
- <artifactId>tomcat6-deployer</artifactId>
+ <artifactId>tomcat7-deployer</artifactId>
<version>${geronimoVersion}</version>
<type>car</type>
<scope>provided</scope>
Modified: geronimo/samples/trunk/samples/javaee6/cviewer-javaee6/cviewer-javaee6-tomcat/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee6/cviewer-javaee6/cviewer-javaee6-tomcat/src/main/plan/plan.xml?rev=959342&r1=959341&r2=959342&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee6/cviewer-javaee6/cviewer-javaee6-tomcat/src/main/plan/plan.xml (original)
+++ geronimo/samples/trunk/samples/javaee6/cviewer-javaee6/cviewer-javaee6-tomcat/src/main/plan/plan.xml Wed Jun 30 15:00:02 2010
@@ -19,16 +19,11 @@
-->
<!-- $Rev$ $Date$ -->
-<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.2">
+<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1"
+ xmlns:naming="http://geronimo.apache.org/xml/ns/naming-1.2"
+ xmlns:sec="http://geronimo.apache.org/xml/ns/security-2.0"
+ xmlns:sys="http://geronimo.apache.org/xml/ns/deployment-1.2">
- <dep:environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
- <dep:moduleId>
- <dep:groupId>${pom.groupId}</dep:groupId>
- <dep:artifactId>${pom.artifactId}</dep:artifactId>
- <dep:version>${version}</dep:version>
- <dep:type>car</dep:type>
- </dep:moduleId>
+ <context-root>/${project.artifactId}</context-root>
- </dep:environment>
-
-</application>
+</web-app>
Modified: geronimo/samples/trunk/samples/javaee6/cviewer-javaee6/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee6/cviewer-javaee6/pom.xml?rev=959342&r1=959341&r2=959342&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee6/cviewer-javaee6/pom.xml (original)
+++ geronimo/samples/trunk/samples/javaee6/cviewer-javaee6/pom.xml Wed Jun 30 15:00:02 2010
@@ -76,5 +76,13 @@
<module>cviewer-javaee6-war</module>
</modules>
</profile>
+ <profile>
+ <id>all-subprojects</id>
+ <modules>
+ <module>cviewer-javaee6-war</module>
+ <module>cviewer-javaee6-jetty</module>
+ <module>cviewer-javaee6-tomcat</module>
+ </modules>
+ </profile>
</profiles>
</project>
Modified: geronimo/samples/trunk/samples/javaee6/ejbtimer-javaee6/ejbtimer-javaee6-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee6/ejbtimer-javaee6/ejbtimer-javaee6-jetty/pom.xml?rev=959342&r1=959341&r2=959342&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee6/ejbtimer-javaee6/ejbtimer-javaee6-jetty/pom.xml (original)
+++ geronimo/samples/trunk/samples/javaee6/ejbtimer-javaee6/ejbtimer-javaee6-jetty/pom.xml Wed Jun 30 15:00:02 2010
@@ -58,15 +58,7 @@
<version>${geronimoVersion}</version>
<type>car</type>
<scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>jasper</artifactId>
- <version>${geronimoVersion}</version>
- <type>car</type>
- <scope>provided</scope>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
Modified: geronimo/samples/trunk/samples/javaee6/ejbtimer-javaee6/ejbtimer-javaee6-jetty/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee6/ejbtimer-javaee6/ejbtimer-javaee6-jetty/src/main/plan/plan.xml?rev=959342&r1=959341&r2=959342&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee6/ejbtimer-javaee6/ejbtimer-javaee6-jetty/src/main/plan/plan.xml (original)
+++ geronimo/samples/trunk/samples/javaee6/ejbtimer-javaee6/ejbtimer-javaee6-jetty/src/main/plan/plan.xml Wed Jun 30 15:00:02 2010
@@ -24,18 +24,6 @@
xmlns:sec="http://geronimo.apache.org/xml/ns/security-2.0"
xmlns:sys="http://geronimo.apache.org/xml/ns/deployment-1.2">
- <sys:environment>
- <sys:moduleId>
- <sys:groupId>${pom.groupId}</sys:groupId>
- <sys:artifactId>${pom.artifactId}</sys:artifactId>
- <sys:version>${version}</sys:version>
- <sys:type>car</sys:type>
- </sys:moduleId>
- <sys:dependencies/>
- <sys:hidden-classes/>
- <sys:non-overridable-classes/>
- </sys:environment>
-
- <context-root>/${pom.artifactId}</context-root>
+ <context-root>/${project.artifactId}</context-root>
</web-app>
Modified: geronimo/samples/trunk/samples/javaee6/ejbtimer-javaee6/ejbtimer-javaee6-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee6/ejbtimer-javaee6/ejbtimer-javaee6-tomcat/pom.xml?rev=959342&r1=959341&r2=959342&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee6/ejbtimer-javaee6/ejbtimer-javaee6-tomcat/pom.xml (original)
+++ geronimo/samples/trunk/samples/javaee6/ejbtimer-javaee6/ejbtimer-javaee6-tomcat/pom.xml Wed Jun 30 15:00:02 2010
@@ -62,14 +62,6 @@
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
- <artifactId>jasper</artifactId>
- <version>${geronimoVersion}</version>
- <type>car</type>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.configs</groupId>
<artifactId>openejb-deployer</artifactId>
<version>${geronimoVersion}</version>
<type>car</type>
Modified: geronimo/samples/trunk/samples/javaee6/ejbtimer-javaee6/ejbtimer-javaee6-tomcat/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee6/ejbtimer-javaee6/ejbtimer-javaee6-tomcat/src/main/plan/plan.xml?rev=959342&r1=959341&r2=959342&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee6/ejbtimer-javaee6/ejbtimer-javaee6-tomcat/src/main/plan/plan.xml (original)
+++ geronimo/samples/trunk/samples/javaee6/ejbtimer-javaee6/ejbtimer-javaee6-tomcat/src/main/plan/plan.xml Wed Jun 30 15:00:02 2010
@@ -24,18 +24,6 @@
xmlns:sec="http://geronimo.apache.org/xml/ns/security-2.0"
xmlns:sys="http://geronimo.apache.org/xml/ns/deployment-1.2">
- <sys:environment>
- <sys:moduleId>
- <sys:groupId>${pom.groupId}</sys:groupId>
- <sys:artifactId>${pom.artifactId}</sys:artifactId>
- <sys:version>${version}</sys:version>
- <sys:type>car</sys:type>
- </sys:moduleId>
- <sys:dependencies/>
- <sys:hidden-classes/>
- <sys:non-overridable-classes/>
- </sys:environment>
-
- <context-root>/${pom.artifactId}</context-root>
+ <context-root>/${project.artifactId}</context-root>
</web-app>
Modified: geronimo/samples/trunk/samples/javaee6/ejbtimer-javaee6/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee6/ejbtimer-javaee6/pom.xml?rev=959342&r1=959341&r2=959342&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee6/ejbtimer-javaee6/pom.xml (original)
+++ geronimo/samples/trunk/samples/javaee6/ejbtimer-javaee6/pom.xml Wed Jun 30 15:00:02 2010
@@ -77,5 +77,14 @@
<module>ejbtimer-javaee6-war</module>
</modules>
</profile>
+ <profile>
+ <id>all-subprojects</id>
+
+ <modules>
+ <module>ejbtimer-javaee6-war</module>
+ <module>ejbtimer-javaee6-jetty</module>
+ <module>ejbtimer-javaee6-tomcat</module>
+ </modules>
+ </profile>
</profiles>
</project>
Modified: geronimo/samples/trunk/samples/javaee6/fileupload-javaee6/fileupload-javaee6-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee6/fileupload-javaee6/fileupload-javaee6-jetty/pom.xml?rev=959342&r1=959341&r2=959342&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee6/fileupload-javaee6/fileupload-javaee6-jetty/pom.xml (original)
+++ geronimo/samples/trunk/samples/javaee6/fileupload-javaee6/fileupload-javaee6-jetty/pom.xml Wed Jun 30 15:00:02 2010
@@ -59,30 +59,7 @@
<type>car</type>
<scope>provided</scope>
</dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>jasper</artifactId>
- <version>${geronimoVersion}</version>
- <type>car</type>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>openejb-deployer</artifactId>
- <version>${geronimoVersion}</version>
- <type>car</type>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>persistence-jpa20-deployer</artifactId>
- <version>${geronimoVersion}</version>
- <type>car</type>
- <scope>provided</scope>
- </dependency>
+
</dependencies>
<build>
@@ -102,9 +79,7 @@
<deploymentConfig>${gbeanDeployer}</deploymentConfig>
<deploymentConfig>${j2eeDeployer}</deploymentConfig>
<deploymentConfig>${jettyDeployer}</deploymentConfig>
- <deploymentConfig>${jasperDeployer}</deploymentConfig>
- <deploymentConfig>${openejbDeployer}</deploymentConfig>
- <deploymentConfig>${jpaDeployer}</deploymentConfig>
+ <deploymentConfig>${jasperDeployer}</deploymentConfig>
</deploymentConfigs>
<module>
<groupId>org.apache.geronimo.samples</groupId>
Modified: geronimo/samples/trunk/samples/javaee6/fileupload-javaee6/fileupload-javaee6-jetty/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee6/fileupload-javaee6/fileupload-javaee6-jetty/src/main/plan/plan.xml?rev=959342&r1=959341&r2=959342&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee6/fileupload-javaee6/fileupload-javaee6-jetty/src/main/plan/plan.xml (original)
+++ geronimo/samples/trunk/samples/javaee6/fileupload-javaee6/fileupload-javaee6-jetty/src/main/plan/plan.xml Wed Jun 30 15:00:02 2010
@@ -24,18 +24,6 @@
xmlns:sec="http://geronimo.apache.org/xml/ns/security-2.0"
xmlns:sys="http://geronimo.apache.org/xml/ns/deployment-1.2">
- <sys:environment>
- <sys:moduleId>
- <sys:groupId>${pom.groupId}</sys:groupId>
- <sys:artifactId>${pom.artifactId}</sys:artifactId>
- <sys:version>${version}</sys:version>
- <sys:type>car</sys:type>
- </sys:moduleId>
- <sys:dependencies/>
- <sys:hidden-classes/>
- <sys:non-overridable-classes/>
- </sys:environment>
-
- <context-root>/${pom.artifactId}</context-root>
+ <context-root>/${project.artifactId}</context-root>
</web-app>
Modified: geronimo/samples/trunk/samples/javaee6/fileupload-javaee6/fileupload-javaee6-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee6/fileupload-javaee6/fileupload-javaee6-tomcat/pom.xml?rev=959342&r1=959341&r2=959342&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee6/fileupload-javaee6/fileupload-javaee6-tomcat/pom.xml (original)
+++ geronimo/samples/trunk/samples/javaee6/fileupload-javaee6/fileupload-javaee6-tomcat/pom.xml Wed Jun 30 15:00:02 2010
@@ -60,30 +60,7 @@
<type>car</type>
<scope>provided</scope>
</dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>jasper</artifactId>
- <version>${geronimoVersion}</version>
- <type>car</type>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>openejb-deployer</artifactId>
- <version>${geronimoVersion}</version>
- <type>car</type>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>persistence-jpa20-deployer</artifactId>
- <version>${geronimoVersion}</version>
- <type>car</type>
- <scope>provided</scope>
- </dependency>
+
</dependencies>
<build>
@@ -103,9 +80,7 @@
<deploymentConfig>${gbeanDeployer}</deploymentConfig>
<deploymentConfig>${j2eeDeployer}</deploymentConfig>
<deploymentConfig>${tomcatDeployer}</deploymentConfig>
- <deploymentConfig>${jasperDeployer}</deploymentConfig>
- <deploymentConfig>${openejbDeployer}</deploymentConfig>
- <deploymentConfig>${jpaDeployer}</deploymentConfig>
+ <deploymentConfig>${jasperDeployer}</deploymentConfig>
</deploymentConfigs>
<module>
<groupId>org.apache.geronimo.samples</groupId>
Modified: geronimo/samples/trunk/samples/javaee6/fileupload-javaee6/fileupload-javaee6-tomcat/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee6/fileupload-javaee6/fileupload-javaee6-tomcat/src/main/plan/plan.xml?rev=959342&r1=959341&r2=959342&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee6/fileupload-javaee6/fileupload-javaee6-tomcat/src/main/plan/plan.xml (original)
+++ geronimo/samples/trunk/samples/javaee6/fileupload-javaee6/fileupload-javaee6-tomcat/src/main/plan/plan.xml Wed Jun 30 15:00:02 2010
@@ -23,19 +23,7 @@
xmlns:naming="http://geronimo.apache.org/xml/ns/naming-1.2"
xmlns:sec="http://geronimo.apache.org/xml/ns/security-2.0"
xmlns:sys="http://geronimo.apache.org/xml/ns/deployment-1.2">
-
- <sys:environment>
- <sys:moduleId>
- <sys:groupId>${pom.groupId}</sys:groupId>
- <sys:artifactId>${pom.artifactId}</sys:artifactId>
- <sys:version>${version}</sys:version>
- <sys:type>car</sys:type>
- </sys:moduleId>
- <sys:dependencies/>
- <sys:hidden-classes/>
- <sys:non-overridable-classes/>
- </sys:environment>
-
- <context-root>/${pom.artifactId}</context-root>
+
+ <context-root>/${project.artifactId}</context-root>
</web-app>
Modified: geronimo/samples/trunk/samples/javaee6/fileupload-javaee6/fileupload-javaee6-war/src/main/java/org/apache/geronimo/samples/javaee6/fileupload/MessageFilter.java
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee6/fileupload-javaee6/fileupload-javaee6-war/src/main/java/org/apache/geronimo/samples/javaee6/fileupload/MessageFilter.java?rev=959342&r1=959341&r2=959342&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee6/fileupload-javaee6/fileupload-javaee6-war/src/main/java/org/apache/geronimo/samples/javaee6/fileupload/MessageFilter.java (original)
+++ geronimo/samples/trunk/samples/javaee6/fileupload-javaee6/fileupload-javaee6-war/src/main/java/org/apache/geronimo/samples/javaee6/fileupload/MessageFilter.java Wed Jun 30 15:00:02 2010
@@ -17,6 +17,8 @@ package org.apache.geronimo.samples.java
* limitations under the License.
*/
import java.io.IOException;
+import java.util.Collection;
+
import javax.servlet.Filter;
import javax.servlet.FilterChain;
import javax.servlet.FilterConfig;
@@ -27,84 +29,112 @@ import javax.servlet.annotation.WebFilte
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.Part;
-@WebFilter(filterName = "MessageFilter", urlPatterns = {"/showServlet"})
+@WebFilter(filterName = "MessageFilter", urlPatterns = { "/showServlet" })
public class MessageFilter implements Filter {
- private FilterConfig filterConfig;
+ private FilterConfig filterConfig;
+
+ public MessageFilter() {
+ }
- public MessageFilter() {
- }
+ public void doFilter(ServletRequest request, ServletResponse response,
+ FilterChain chain) throws IOException, ServletException {
-
- public void doFilter(ServletRequest request, ServletResponse response,
- FilterChain chain)
- throws IOException, ServletException {
-
-
- Throwable problem = null;
- try {
- String message = "";
- Part p = ((HttpServletRequest) request).getPart("testFile");
- String part = p.toString();
- String pname = p.getName();
- long size = p.getSize();
- String contentType = p.getContentType();
- if (size > 10000) {
- message += "The file size is " + size + "b,it's filted because file size is limited to 10kb";
- } else {
- message += "<font color=green><b>Part:</b> </font>" + part + "<br><font color=green><b>Part Name:</b> </font>" + pname + "<br><font color=green><b>Size:</b> </font>" + size + "<br><font color=green><b>ContentType:</b> </font>" + contentType + "<br><font color=green><b>HeadNames:</b> </font>";
- for (String name : p.getHeaderNames()) {
- message += name + ";";
- }
- java.io.InputStreamReader in =
- new java.io.InputStreamReader(p.getInputStream());
- String content = "";
- int c = in.read();
- while (c != -1) {
- if (c == '\n') {
- content += "<br>";
- }
- content += (char) c;
- c = in.read();
- }
- if (content.equals("")) {
- message += "<br>Sorry,this is not a plain text,so we can not display it:(";
- } else {
- message += "<br><font color=green><b>Content is:</b></font><br>" + content;
- message += "<hr>";
- }
- }
- request.setAttribute("message", message);
- chain.doFilter(request, response);
- } catch (Throwable t) {
- problem = t;
- t.printStackTrace();
- }
-
- }
-
-
- public void destroy() {
- }
-
-
- public void init(FilterConfig filterConfig) {
- this.filterConfig = filterConfig;
- }
-
-
- @Override
- public String toString() {
- if (filterConfig == null) {
- return ("MessageFilter()");
- }
- StringBuffer sb = new StringBuffer("MessageFilter()");
- sb.append(filterConfig);
- sb.append(")");
- return (sb.toString());
- }
-
- public void log(String msg) {
- filterConfig.getServletContext().log(msg);
- }
+ String message = "";
+ HttpServletRequest httpServletRequest = null;
+ if (request instanceof HttpServletRequest) {
+ httpServletRequest = (HttpServletRequest) request;
+ message += "<p>" + "Http Servlet Request content type: "
+ + httpServletRequest.getContentType() + "</p><br>";
+ }
+
+ Collection<Part> parts = httpServletRequest.getParts();
+ if (!parts.isEmpty()) {
+ int i = 0;
+ for (Part apart : parts) {
+ message += "<p>"+ (++i) + ". Name=" + apart.getName()
+ + ";ContentType=" + apart.getContentType() + ";Size="
+ + apart.getSize() + "</p><br>";
+ }
+ } else {
+ message += "<p><b>HttpServletRequest.getParts() returns an empty collection!</b></p><br>";
+ }
+
+ Throwable problem = null;
+ try {
+ Part p = ((HttpServletRequest) request).getPart("testFile");
+ if (null != p) {
+ String part = p.toString();
+ String pname = p.getName();
+ long size = p.getSize();
+ String contentType = p.getContentType();
+ if (size > 10000) {
+ message += "The file size is "
+ + size
+ + "b, it's filterd because the file size is limited to 10 kb";
+ } else {
+ message += "<font color=green><b>Part:</b> </font>"
+ + part
+ + "<br><font color=green><b>Part Name:</b> </font>"
+ + pname
+ + "<br><font color=green><b>Size:</b> </font>"
+ + size
+ + "<br><font color=green><b>ContentType:</b> </font>"
+ + contentType
+ + "<br><font color=green><b>HeadNames:</b> </font>";
+ for (String name : p.getHeaderNames()) {
+ message += name + ";";
+ }
+ java.io.InputStreamReader in = new java.io.InputStreamReader(
+ p.getInputStream());
+ String content = "";
+ int c = in.read();
+ while (c != -1) {
+ if (c == '\n') {
+ content += "<br>";
+ }
+ content += (char) c;
+ c = in.read();
+ }
+ if (content.equals("")) {
+ message += "<br> Sorry, this is not a plain text, so we can not display it.";
+ } else {
+ message += "<br><font color=green><b>The text file content is:</b></font><br>"
+ + content;
+ message += "<hr>";
+ }
+ }
+ } else {
+ message += "<p><b>HttpServletRequest.getPart(String name) returns null!</b></p><br>";
+ }
+ request.setAttribute("message", message);
+ chain.doFilter(request, response);
+ } catch (Throwable t) {
+ problem = t;
+ t.printStackTrace();
+ }
+
+ }
+
+ public void destroy() {
+ }
+
+ public void init(FilterConfig filterConfig) {
+ this.filterConfig = filterConfig;
+ }
+
+ @Override
+ public String toString() {
+ if (filterConfig == null) {
+ return ("MessageFilter()");
+ }
+ StringBuffer sb = new StringBuffer("MessageFilter()");
+ sb.append(filterConfig);
+ sb.append(")");
+ return (sb.toString());
+ }
+
+ public void log(String msg) {
+ filterConfig.getServletContext().log(msg);
+ }
}
Modified: geronimo/samples/trunk/samples/javaee6/fileupload-javaee6/fileupload-javaee6-war/src/main/java/org/apache/geronimo/samples/javaee6/fileupload/showServlet.java
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee6/fileupload-javaee6/fileupload-javaee6-war/src/main/java/org/apache/geronimo/samples/javaee6/fileupload/showServlet.java?rev=959342&r1=959341&r2=959342&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee6/fileupload-javaee6/fileupload-javaee6-war/src/main/java/org/apache/geronimo/samples/javaee6/fileupload/showServlet.java (original)
+++ geronimo/samples/trunk/samples/javaee6/fileupload-javaee6/fileupload-javaee6-war/src/main/java/org/apache/geronimo/samples/javaee6/fileupload/showServlet.java Wed Jun 30 15:00:02 2010
@@ -40,8 +40,10 @@ public class showServlet extends HttpSer
out.println("<body>");
out.println("<h2><font color=\"green\">A listener is dectecting online person number.</font></h2>");
out.println("<h3>Currently,there are " + "<font color=\"green\">" + getServletContext().getAttribute("onLineNumber") + "</font> people visiting this file upload system!<br/><hr></h3>");
- out.println("<h2><font color=\"green\">Attributes and content of the file:</font></h2>");
String message = request.getAttribute("message").toString();
+ if (message.indexOf("returns null!") < 0) {
+ out.println("<h2><font color=\"green\">Attributes and content of the file:</font></h2>");
+ }
out.println(message + "<br/>");
out.println("</body>");
out.println("</html>");
Modified: geronimo/samples/trunk/samples/javaee6/fileupload-javaee6/fileupload-javaee6-war/src/main/webapp/selectFile.jsp
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee6/fileupload-javaee6/fileupload-javaee6-war/src/main/webapp/selectFile.jsp?rev=959342&r1=959341&r2=959342&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee6/fileupload-javaee6/fileupload-javaee6-war/src/main/webapp/selectFile.jsp (original)
+++ geronimo/samples/trunk/samples/javaee6/fileupload-javaee6/fileupload-javaee6-war/src/main/webapp/selectFile.jsp Wed Jun 30 15:00:02 2010
@@ -33,7 +33,7 @@ under the License.
<li>Use <b>@WebListener</b> to register a listener.</li>
<li>Use <b>@WebServlet</b> to register servlet.</li>
</ul>
- <h2>Try to upload a file less then <font color="green"><b>10kb</b></font>,Otherwise,it will be filted and you could not see the detail information.</h2>
+ <h2>Try to upload a file less then <font color="green"><b>10kb</b></font>,Otherwise,it will be filtered and you could not see the detail information.</h2>
<hr>
<input name="testFile" type="file"/>
<br/>
Modified: geronimo/samples/trunk/samples/javaee6/fileupload-javaee6/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee6/fileupload-javaee6/pom.xml?rev=959342&r1=959341&r2=959342&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee6/fileupload-javaee6/pom.xml (original)
+++ geronimo/samples/trunk/samples/javaee6/fileupload-javaee6/pom.xml Wed Jun 30 15:00:02 2010
@@ -62,18 +62,14 @@
<module>fileupload-javaee6-war</module>
</modules>
</profile>
+ <profile>
+ <id>all-subprojects</id>
+
+ <modules>
+ <module>fileupload-javaee6-war</module>
+ <module>fileupload-javaee6-jetty</module>
+ <module>fileupload-javaee6-tomcat</module>
+ </modules>
+ </profile>
</profiles>
-
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-site-plugin</artifactId>
- <inherited>false</inherited>
- <configuration>
- <outputDirectory>${project.basedir}/docs</outputDirectory>
- </configuration>
- </plugin>
- </plugins>
- </build>
</project>
Modified: geronimo/samples/trunk/samples/javaee6/jarresource-javaee6/jarresource-javaee6-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee6/jarresource-javaee6/jarresource-javaee6-jetty/pom.xml?rev=959342&r1=959341&r2=959342&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee6/jarresource-javaee6/jarresource-javaee6-jetty/pom.xml (original)
+++ geronimo/samples/trunk/samples/javaee6/jarresource-javaee6/jarresource-javaee6-jetty/pom.xml Wed Jun 30 15:00:02 2010
@@ -59,15 +59,7 @@
<type>car</type>
<scope>provided</scope>
</dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>jasper</artifactId>
- <version>${geronimoVersion}</version>
- <type>car</type>
- <scope>provided</scope>
- </dependency>
-
+
</dependencies>
<build>
@@ -91,7 +83,7 @@
</deploymentConfigs>
<module>
<groupId>org.apache.geronimo.samples</groupId>
- <artifactId>jarresource-javaee6-ear</artifactId>
+ <artifactId>jarresource-javaee6-war</artifactId>
<version>${version}</version>
<type>war</type>
</module>
Modified: geronimo/samples/trunk/samples/javaee6/jarresource-javaee6/jarresource-javaee6-jetty/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee6/jarresource-javaee6/jarresource-javaee6-jetty/src/main/plan/plan.xml?rev=959342&r1=959341&r2=959342&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee6/jarresource-javaee6/jarresource-javaee6-jetty/src/main/plan/plan.xml (original)
+++ geronimo/samples/trunk/samples/javaee6/jarresource-javaee6/jarresource-javaee6-jetty/src/main/plan/plan.xml Wed Jun 30 15:00:02 2010
@@ -24,18 +24,6 @@
xmlns:sec="http://geronimo.apache.org/xml/ns/security-2.0"
xmlns:sys="http://geronimo.apache.org/xml/ns/deployment-1.2">
- <sys:environment>
- <sys:moduleId>
- <sys:groupId>${pom.groupId}</sys:groupId>
- <sys:artifactId>${pom.artifactId}</sys:artifactId>
- <sys:version>${version}</sys:version>
- <sys:type>car</sys:type>
- </sys:moduleId>
- <sys:dependencies/>
- <sys:hidden-classes/>
- <sys:non-overridable-classes/>
- </sys:environment>
-
- <context-root>/${pom.artifactId}</context-root>
+ <context-root>/${project.artifactId}</context-root>
</web-app>
Modified: geronimo/samples/trunk/samples/javaee6/jarresource-javaee6/jarresource-javaee6-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee6/jarresource-javaee6/jarresource-javaee6-tomcat/pom.xml?rev=959342&r1=959341&r2=959342&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee6/jarresource-javaee6/jarresource-javaee6-tomcat/pom.xml (original)
+++ geronimo/samples/trunk/samples/javaee6/jarresource-javaee6/jarresource-javaee6-tomcat/pom.xml Wed Jun 30 15:00:02 2010
@@ -27,7 +27,7 @@
<parent>
<groupId>org.apache.geronimo.samples</groupId>
<artifactId>jarresource-javaee6</artifactId>
- <version>3.0-SNAPSHOT</version>
+ <version>3.0-M1-SNAPSHOT</version>
</parent>
<artifactId>jarresource-javaee6-tomcat</artifactId>
@@ -39,7 +39,7 @@
<dependencies>
<dependency>
<groupId>org.apache.geronimo.samples</groupId>
- <artifactId>jarresource-javaee6-ear</artifactId>
+ <artifactId>jarresource-javaee6-war</artifactId>
<version>${version}</version>
<type>war</type>
</dependency>
@@ -58,15 +58,7 @@
<version>${geronimoVersion}</version>
<type>car</type>
<scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>jasper</artifactId>
- <version>${geronimoVersion}</version>
- <type>car</type>
- <scope>provided</scope>
- </dependency>
+ </dependency>
</dependencies>
@@ -91,9 +83,9 @@
</deploymentConfigs>
<module>
<groupId>org.apache.geronimo.samples</groupId>
- <artifactId>jarresource-javaee6-ear</artifactId>
- <version>3.0-SNAPSHOT</version>
- <type>ear</type>
+ <artifactId>jarresource-javaee6-war</artifactId>
+ <version>${version}</version>
+ <type>war</type>
</module>
<useMavenDependencies>
<value>true</value>
Modified: geronimo/samples/trunk/samples/javaee6/jarresource-javaee6/jarresource-javaee6-tomcat/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee6/jarresource-javaee6/jarresource-javaee6-tomcat/src/main/plan/plan.xml?rev=959342&r1=959341&r2=959342&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee6/jarresource-javaee6/jarresource-javaee6-tomcat/src/main/plan/plan.xml (original)
+++ geronimo/samples/trunk/samples/javaee6/jarresource-javaee6/jarresource-javaee6-tomcat/src/main/plan/plan.xml Wed Jun 30 15:00:02 2010
@@ -24,18 +24,6 @@
xmlns:sec="http://geronimo.apache.org/xml/ns/security-2.0"
xmlns:sys="http://geronimo.apache.org/xml/ns/deployment-1.2">
- <sys:environment>
- <sys:moduleId>
- <sys:groupId>${pom.groupId}</sys:groupId>
- <sys:artifactId>${pom.artifactId}</sys:artifactId>
- <sys:version>${version}</sys:version>
- <sys:type>car</sys:type>
- </sys:moduleId>
- <sys:dependencies/>
- <sys:hidden-classes/>
- <sys:non-overridable-classes/>
- </sys:environment>
-
- <context-root>/${pom.artifactId}</context-root>
+ <context-root>/${project.artifactId}</context-root>
</web-app>
Modified: geronimo/samples/trunk/samples/javaee6/jarresource-javaee6/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee6/jarresource-javaee6/pom.xml?rev=959342&r1=959341&r2=959342&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee6/jarresource-javaee6/pom.xml (original)
+++ geronimo/samples/trunk/samples/javaee6/jarresource-javaee6/pom.xml Wed Jun 30 15:00:02 2010
@@ -77,5 +77,15 @@
<module>jarresource-javaee6-war</module>
</modules>
</profile>
+ <profile>
+ <id>all-subprojects</id>
+
+ <modules>
+ <module>jarresource-javaee6-jar</module>
+ <module>jarresource-javaee6-war</module>
+ <module>jarresource-javaee6-jetty</module>
+ <module>jarresource-javaee6-tomcat</module>
+ </modules>
+ </profile>
</profiles>
</project>
Modified: geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-jetty/pom.xml?rev=959342&r1=959341&r2=959342&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-jetty/pom.xml (original)
+++ geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-jetty/pom.xml Wed Jun 30 15:00:02 2010
@@ -39,10 +39,15 @@
<dependencies>
<dependency>
<groupId>org.apache.geronimo.samples</groupId>
- <artifactId>jpa20demo-javaee6-ear</artifactId>
+ <artifactId>jpa20demo-javaee6-war</artifactId>
<version>${version}</version>
<type>war</type>
</dependency>
+ <dependency>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
@@ -59,15 +64,7 @@
<type>car</type>
<scope>provided</scope>
</dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>jasper</artifactId>
- <version>${geronimoVersion}</version>
- <type>car</type>
- <scope>provided</scope>
- </dependency>
-
+
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>openejb-deployer</artifactId>
@@ -108,7 +105,7 @@
</deploymentConfigs>
<module>
<groupId>org.apache.geronimo.samples</groupId>
- <artifactId>jpa20demo-javaee6-ear</artifactId>
+ <artifactId>jpa20demo-javaee6-war</artifactId>
<version>${version}</version>
<type>war</type>
</module>
Modified: geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-jetty/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-jetty/src/main/plan/plan.xml?rev=959342&r1=959341&r2=959342&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-jetty/src/main/plan/plan.xml (original)
+++ geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-jetty/src/main/plan/plan.xml Wed Jun 30 15:00:02 2010
@@ -19,16 +19,11 @@
-->
<!-- $Rev$ $Date$ -->
-<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-2.0">
+<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1"
+ xmlns:naming="http://geronimo.apache.org/xml/ns/naming-1.2"
+ xmlns:sec="http://geronimo.apache.org/xml/ns/security-2.0"
+ xmlns:sys="http://geronimo.apache.org/xml/ns/deployment-1.2">
- <dep:environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
- <dep:moduleId>
- <dep:groupId>${pom.groupId}</dep:groupId>
- <dep:artifactId>${pom.artifactId}</dep:artifactId>
- <dep:version>3.0-SNAPSHOT</dep:version>
- <dep:type>car</dep:type>
- </dep:moduleId>
+ <context-root>/${project.artifactId}</context-root>
- </dep:environment>
-
-</application>
+</web-app>
Modified: geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-tomcat/pom.xml?rev=959342&r1=959341&r2=959342&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-tomcat/pom.xml (original)
+++ geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-tomcat/pom.xml Wed Jun 30 15:00:02 2010
@@ -62,14 +62,6 @@
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
- <artifactId>jasper</artifactId>
- <version>${geronimoVersion}</version>
- <type>car</type>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.configs</groupId>
<artifactId>openejb-deployer</artifactId>
<version>${geronimoVersion}</version>
<type>car</type>
@@ -108,7 +100,7 @@
</deploymentConfigs>
<module>
<groupId>org.apache.geronimo.samples</groupId>
- <artifactId>jpa20demo-javaee6-ear</artifactId>
+ <artifactId>jpa20demo-javaee6-war</artifactId>
<version>${version}</version>
<type>war</type>
</module>
Modified: geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-tomcat/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-tomcat/src/main/plan/plan.xml?rev=959342&r1=959341&r2=959342&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-tomcat/src/main/plan/plan.xml (original)
+++ geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-tomcat/src/main/plan/plan.xml Wed Jun 30 15:00:02 2010
@@ -24,18 +24,6 @@
xmlns:sec="http://geronimo.apache.org/xml/ns/security-2.0"
xmlns:sys="http://geronimo.apache.org/xml/ns/deployment-1.2">
- <sys:environment>
- <sys:moduleId>
- <sys:groupId>org.apache.geronimo.samples</sys:groupId>
- <sys:artifactId>jpa20demo-javaee6</sys:artifactId>
- <sys:version>${version}</sys:version>
- <sys:type>car</sys:type>
- </sys:moduleId>
- <sys:dependencies/>
- <sys:hidden-classes/>
- <sys:non-overridable-classes/>
- </sys:environment>
-
- <context-root>/jpa20demo-javaee6</context-root>
+ <context-root>/${project.artifactId}</context-root>
</web-app>
Modified: geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-war/src/main/resources/META-INF/persistence_openjpa.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-war/src/main/resources/META-INF/persistence_openjpa.xml?rev=959342&r1=959341&r2=959342&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-war/src/main/resources/META-INF/persistence_openjpa.xml (original)
+++ geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-war/src/main/resources/META-INF/persistence_openjpa.xml Wed Jun 30 15:00:02 2010
@@ -23,10 +23,10 @@
<exclude-unlisted-classes>true</exclude-unlisted-classes>
<properties>
<property name="openjpa.jdbc.DBDictionary " value="derby"/>
- <!--<property name="openjpa.ConnectionURL" value="jdbc:derby://localhost:1527/jpa20demodb"/>
- <property name="openjpa.ConnectionDriverName" value="org.apache.derby.jdbc.ClientDriver"/>-->
-<property name="openjpa.ConnectionURL" value="jdbc:derby:jpa20demodb"/>
- <property name="openjpa.ConnectionDriverName" value="org.apache.derby.jdbc.EmbeddedDriver"/>
+ <property name="openjpa.ConnectionURL" value="jdbc:derby://localhost:1527/jpa20demodb"/>
+ <property name="openjpa.ConnectionDriverName" value="org.apache.derby.jdbc.ClientDriver"/>
+ <!--<property name="openjpa.ConnectionURL" value="jdbc:derby:jpa20demodb"/>
+ <property name="openjpa.ConnectionDriverName" value="org.apache.derby.jdbc.EmbeddedDriver"/>-->
<property name="openjpa.ConnectionUserName" value="APP"/>
<property name="openjpa.ConnectionPassword" value="APP"/>
<property name="openjpa.Sequence" value="table(Table=OPENJPASEQ, Increment=1)"/>
Modified: geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/pom.xml?rev=959342&r1=959341&r2=959342&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/pom.xml (original)
+++ geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/pom.xml Wed Jun 30 15:00:02 2010
@@ -89,5 +89,14 @@
<module>jpa20demo-javaee6-war</module>
</modules>
</profile>
+ <profile>
+ <id>all-subprojects</id>
+
+ <modules>
+ <module>jpa20demo-javaee6-war</module>
+ <module>jpa20demo-javaee6-jetty</module>
+ <module>jpa20demo-javaee6-tomcat</module>
+ </modules>
+ </profile>
</profiles>
</project>
Modified: geronimo/samples/trunk/samples/javaee6/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee6/pom.xml?rev=959342&r1=959341&r2=959342&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee6/pom.xml (original)
+++ geronimo/samples/trunk/samples/javaee6/pom.xml Wed Jun 30 15:00:02 2010
@@ -30,37 +30,8 @@
Geronimo Samples - Java EE 6
</description>
- <properties>
- <gbeanDeployerBootstrap>org.apache.geronimo.framework/geronimo-gbean-deployer-bootstrap/${geronimoVersion}/car</gbeanDeployerBootstrap>
- <gbeanDeployer>org.apache.geronimo.framework/geronimo-gbean-deployer/${geronimoVersion}/car</gbeanDeployer>
- <j2eeDeployer>org.apache.geronimo.configs/j2ee-deployer/${geronimoVersion}/car</j2eeDeployer>
- <clientDeployer>org.apache.geronimo.configs/client-deployer/${geronimoVersion}/car</clientDeployer>
- <connectorDeployer>org.apache.geronimo.configs/connector-deployer/${geronimoVersion}/car</connectorDeployer>
- <openejbDeployer>org.apache.geronimo.configs/openejb-deployer/${geronimoVersion}/car</openejbDeployer>
- <openejbcorbaDeployer>org.apache.geronimo.configs/openejb-corba-deployer/${geronimoVersion}/car</openejbcorbaDeployer>
- <axisDeployer>org.apache.geronimo.configs/axis-deployer/${geronimoVersion}/car</axisDeployer>
- <cxfDeployer>org.apache.geronimo.configs/cxf-deployer/${geronimoVersion}/car</cxfDeployer>
- <axis2Deployer>org.apache.geronimo.configs/axis2-deployer/${geronimoVersion}/car</axis2Deployer>
- <tomcatDeployer>org.apache.geronimo.configs/tomcat7-deployer/${geronimoVersion}/car</tomcatDeployer>
- <jettyDeployer>org.apache.geronimo.configs/${jetty}-deployer/${geronimoVersion}/car</jettyDeployer>
- <jasperDeployer>org.apache.geronimo.configs/jasper-deployer/${geronimoVersion}/car</jasperDeployer>
- <jpaDeployer>org.apache.geronimo.configs/persistence-jpa20-deployer/${geronimoVersion}/car</jpaDeployer>
- </properties>
-
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.apache.geronimo.plugins</groupId>
- <artifactId>myfaces</artifactId>
- <version>${geronimoVersion}</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
<dependencies>
- <!-- Java EE 6 specs common for all samples -->
+ <!-- Common used Java EE 6 specs -->
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jsp_2.2_spec</artifactId>
@@ -76,8 +47,8 @@
<artifactId>geronimo-servlet_3.0_spec</artifactId>
<scope>provided</scope>
</dependency>
- <!-- Java EE 6 specs common for all samples -->
- </dependencies>
+ <!-- Common used Java EE 6 specs -->
+ </dependencies>
<build>
<pluginManagement>
@@ -166,15 +137,17 @@
<activeByDefault>true</activeByDefault>
</activation>
<modules>
+ <!--Servlet 3.0 and JSF samples-->
<module>cviewer-javaee6</module>
- <module>jpa20demo-javaee6</module>
- <module>fileupload-javaee6</module>
- <module>ejbtimer-javaee6</module>
<module>converter-javaee6</module>
<module>jarresource-javaee6</module>
- <module>webfragment-javaee6</module>
+ <module>fileupload-javaee6</module>
+ <!--<module>webfragment-javaee6</module>-->
+ <!--EJB 3.1 and JPA 2.0 samples, not work for 3.0-M1 yet-->
+ <!--<module>jpa20demo-javaee6</module>
+ <module>ejbtimer-javaee6</module>
<module>singletonejb-javaee6</module>
- <module>restfulorder-javaee6</module>
+ <module>restfulorder-javaee6</module>-->
</modules>
</profile>
<profile>
@@ -187,16 +160,19 @@
</property>
</activation>
<modules>
+ <!--Servlet 3.0 and JSF samples-->
<module>cviewer-javaee6</module>
- <module>jpa20demo-javaee6</module>
- <module>fileupload-javaee6</module>
- <module>ejbtimer-javaee6</module>
<module>converter-javaee6</module>
<module>jarresource-javaee6</module>
- <module>webfragment-javaee6</module>
+ <module>fileupload-javaee6</module>
+ <!--<module>webfragment-javaee6</module>-->
+ <!--EJB 3.1 and JPA 2.0 samples, not work for 3.0-M1 yet-->
+ <!--<module>jpa20demo-javaee6</module>
+ <module>ejbtimer-javaee6</module>
<module>singletonejb-javaee6</module>
- <module>restfulorder-javaee6</module>
+ <module>restfulorder-javaee6</module>-->
</modules>
</profile>
+
</profiles>
</project>
Modified: geronimo/samples/trunk/samples/javaee6/restfulorder-javaee6/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee6/restfulorder-javaee6/pom.xml?rev=959342&r1=959341&r2=959342&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee6/restfulorder-javaee6/pom.xml (original)
+++ geronimo/samples/trunk/samples/javaee6/restfulorder-javaee6/pom.xml Wed Jun 30 15:00:02 2010
@@ -80,5 +80,14 @@
<module>restfulorder-javaee6-war</module>
</modules>
</profile>
+ <profile>
+ <id>all-subprojects</id>
+
+ <modules>
+ <module>restfulorder-javaee6-war</module>
+ <module>restfulorder-javaee6-jetty</module>
+ <module>restfulorder-javaee6-tomcat</module>
+ </modules>
+ </profile>
</profiles>
</project>
Modified: geronimo/samples/trunk/samples/javaee6/restfulorder-javaee6/restfulorder-javaee6-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee6/restfulorder-javaee6/restfulorder-javaee6-jetty/pom.xml?rev=959342&r1=959341&r2=959342&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee6/restfulorder-javaee6/restfulorder-javaee6-jetty/pom.xml (original)
+++ geronimo/samples/trunk/samples/javaee6/restfulorder-javaee6/restfulorder-javaee6-jetty/pom.xml Wed Jun 30 15:00:02 2010
@@ -27,7 +27,7 @@
<parent>
<groupId>org.apache.geronimo.samples</groupId>
<artifactId>restfulorder-javaee6</artifactId>
- <version>3.0-SNAPSHOT</version>
+ <version>3.0-M1-SNAPSHOT</version>
</parent>
<artifactId>restfulorder-javaee6-jetty</artifactId>
@@ -60,9 +60,9 @@
<scope>provided</scope>
</dependency>
- <dependency>
+ <dependency>
<groupId>org.apache.geronimo.configs</groupId>
- <artifactId>jasper</artifactId>
+ <artifactId>openejb-deployer</artifactId>
<version>${geronimoVersion}</version>
<type>car</type>
<scope>provided</scope>
@@ -95,12 +95,13 @@
<deploymentConfig>${j2eeDeployer}</deploymentConfig>
<deploymentConfig>${jettyDeployer}</deploymentConfig>
<deploymentConfig>${jasperDeployer}</deploymentConfig>
+ <deploymentConfig>${openejbDeployer}</deploymentConfig>
<deploymentConfig>${jpaDeployer}</deploymentConfig>
</deploymentConfigs>
<module>
<groupId>org.apache.geronimo.samples</groupId>
<artifactId>restfulorder-javaee6-war</artifactId>
- <version>3.0-SNAPSHOT</version>
+ <version>${version}</version>
<type>war</type>
</module>
<useMavenDependencies>
Modified: geronimo/samples/trunk/samples/javaee6/restfulorder-javaee6/restfulorder-javaee6-jetty/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee6/restfulorder-javaee6/restfulorder-javaee6-jetty/src/main/plan/plan.xml?rev=959342&r1=959341&r2=959342&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee6/restfulorder-javaee6/restfulorder-javaee6-jetty/src/main/plan/plan.xml (original)
+++ geronimo/samples/trunk/samples/javaee6/restfulorder-javaee6/restfulorder-javaee6-jetty/src/main/plan/plan.xml Wed Jun 30 15:00:02 2010
@@ -19,16 +19,11 @@
-->
<!-- $Rev$ $Date$ -->
-<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.2">
+<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1"
+ xmlns:naming="http://geronimo.apache.org/xml/ns/naming-1.2"
+ xmlns:sec="http://geronimo.apache.org/xml/ns/security-2.0"
+ xmlns:sys="http://geronimo.apache.org/xml/ns/deployment-1.2">
- <dep:environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
- <dep:moduleId>
- <dep:groupId>${pom.groupId}</dep:groupId>
- <dep:artifactId>${pom.artifactId}</dep:artifactId>
- <dep:version>${version}</dep:version>
- <dep:type>car</dep:type>
- </dep:moduleId>
+ <context-root>/${project.artifactId}</context-root>
- </dep:environment>
-
-</application>
\ No newline at end of file
+</web-app>
Modified: geronimo/samples/trunk/samples/javaee6/restfulorder-javaee6/restfulorder-javaee6-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee6/restfulorder-javaee6/restfulorder-javaee6-tomcat/pom.xml?rev=959342&r1=959341&r2=959342&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee6/restfulorder-javaee6/restfulorder-javaee6-tomcat/pom.xml (original)
+++ geronimo/samples/trunk/samples/javaee6/restfulorder-javaee6/restfulorder-javaee6-tomcat/pom.xml Wed Jun 30 15:00:02 2010
@@ -27,7 +27,7 @@
<parent>
<groupId>org.apache.geronimo.samples</groupId>
<artifactId>restfulorder-javaee6</artifactId>
- <version>3.0-SNAPSHOT</version>
+ <version>3.0-M1-SNAPSHOT</version>
</parent>
<artifactId>restfulorder-javaee6-tomcat</artifactId>
@@ -62,7 +62,15 @@
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
- <artifactId>jasper</artifactId>
+ <artifactId>openejb-deployer</artifactId>
+ <version>${geronimoVersion}</version>
+ <type>car</type>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>persistence-jpa20-deployer</artifactId>
<version>${geronimoVersion}</version>
<type>car</type>
<scope>provided</scope>
@@ -88,11 +96,13 @@
<deploymentConfig>${j2eeDeployer}</deploymentConfig>
<deploymentConfig>${tomcatDeployer}</deploymentConfig>
<deploymentConfig>${jasperDeployer}</deploymentConfig>
+ <deploymentConfig>${openejbDeployer}</deploymentConfig>
+ <deploymentConfig>${jpaDeployer}</deploymentConfig>
</deploymentConfigs>
<module>
<groupId>org.apache.geronimo.samples</groupId>
<artifactId>restfulorder-javaee6-war</artifactId>
- <version>3.0-SNAPSHOT</version>
+ <version>${version}</version>
<type>war</type>
</module>
<useMavenDependencies>
Modified: geronimo/samples/trunk/samples/javaee6/restfulorder-javaee6/restfulorder-javaee6-tomcat/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee6/restfulorder-javaee6/restfulorder-javaee6-tomcat/src/main/plan/plan.xml?rev=959342&r1=959341&r2=959342&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee6/restfulorder-javaee6/restfulorder-javaee6-tomcat/src/main/plan/plan.xml (original)
+++ geronimo/samples/trunk/samples/javaee6/restfulorder-javaee6/restfulorder-javaee6-tomcat/src/main/plan/plan.xml Wed Jun 30 15:00:02 2010
@@ -19,16 +19,11 @@
-->
<!-- $Rev$ $Date$ -->
-<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.2">
+<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1"
+ xmlns:naming="http://geronimo.apache.org/xml/ns/naming-1.2"
+ xmlns:sec="http://geronimo.apache.org/xml/ns/security-2.0"
+ xmlns:sys="http://geronimo.apache.org/xml/ns/deployment-1.2">
- <dep:environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
- <dep:moduleId>
- <dep:groupId>${pom.groupId}</dep:groupId>
- <dep:artifactId>${pom.artifactId}</dep:artifactId>
- <dep:version>${version}</dep:version>
- <dep:type>car</dep:type>
- </dep:moduleId>
+ <context-root>/${project.artifactId}</context-root>
- </dep:environment>
-
-</application>
+</web-app>
Modified: geronimo/samples/trunk/samples/javaee6/restfulorder-javaee6/restfulorder-javaee6-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee6/restfulorder-javaee6/restfulorder-javaee6-war/pom.xml?rev=959342&r1=959341&r2=959342&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee6/restfulorder-javaee6/restfulorder-javaee6-war/pom.xml (original)
+++ geronimo/samples/trunk/samples/javaee6/restfulorder-javaee6/restfulorder-javaee6-war/pom.xml Wed Jun 30 15:00:02 2010
@@ -50,7 +50,7 @@
<dependency>
<groupId>org.apache.servicemix.specs</groupId>
<artifactId>org.apache.servicemix.specs.jsr311-api-1.1</artifactId>
- <version>1.4-SNAPSHOT</version>
+ <version>1.5.0</version>
<scope>provided</scope>
</dependency>
</dependencies>
Modified: geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/pom.xml?rev=959342&r1=959341&r2=959342&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/pom.xml (original)
+++ geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/pom.xml Wed Jun 30 15:00:02 2010
@@ -80,5 +80,14 @@
<module>singletonejb-javaee6-war</module>
</modules>
</profile>
+ <profile>
+ <id>all-subprojects</id>
+
+ <modules>
+ <module>singletonejb-javaee6-war</module>
+ <module>singletonejb-javaee6-jetty</module>
+ <module>singletonejb-javaee6-tomcat</module>
+ </modules>
+ </profile>
</profiles>
</project>
Modified: geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-jetty/pom.xml?rev=959342&r1=959341&r2=959342&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-jetty/pom.xml (original)
+++ geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-jetty/pom.xml Wed Jun 30 15:00:02 2010
@@ -62,27 +62,12 @@
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
- <artifactId>jasper</artifactId>
- <version>${geronimoVersion}</version>
- <type>car</type>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.configs</groupId>
<artifactId>openejb-deployer</artifactId>
<version>${geronimoVersion}</version>
<type>car</type>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>persistence-jpa20-deployer</artifactId>
- <version>${geronimoVersion}</version>
- <type>car</type>
- <scope>provided</scope>
- </dependency>
</dependencies>
<build>
@@ -104,7 +89,6 @@
<deploymentConfig>${jettyDeployer}</deploymentConfig>
<deploymentConfig>${jasperDeployer}</deploymentConfig>
<deploymentConfig>${openejbDeployer}</deploymentConfig>
- <deploymentConfig>${jpaDeployer}</deploymentConfig>
</deploymentConfigs>
<module>
<groupId>org.apache.geronimo.samples</groupId>
Modified: geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-jetty/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-jetty/src/main/plan/plan.xml?rev=959342&r1=959341&r2=959342&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-jetty/src/main/plan/plan.xml (original)
+++ geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-jetty/src/main/plan/plan.xml Wed Jun 30 15:00:02 2010
@@ -24,18 +24,6 @@
xmlns:sec="http://geronimo.apache.org/xml/ns/security-2.0"
xmlns:sys="http://geronimo.apache.org/xml/ns/deployment-1.2">
- <sys:environment>
- <sys:moduleId>
- <sys:groupId>${pom.groupId}</sys:groupId>
- <sys:artifactId>${pom.artifactId}</sys:artifactId>
- <sys:version>${version}</sys:version>
- <sys:type>car</sys:type>
- </sys:moduleId>
- <sys:dependencies/>
- <sys:hidden-classes/>
- <sys:non-overridable-classes/>
- </sys:environment>
-
- <context-root>/${pom.artifactId}</context-root>
+ <context-root>/${project.artifactId}</context-root>
</web-app>