Author: amarkhel Date: 2010-02-09 10:39:51 -0500 (Tue, 09 Feb 2010) New Revision: 16431 Removed: branches/community/3.3.X/examples/photoalbum/source/ear/src/main/application/META-INF/ branches/community/3.3.X/examples/photoalbum/source/ejb/src/main/resources/META-INF/MANIFEST.MF branches/community/3.3.X/examples/photoalbum/source/ejb/src/main/resources/components.properties branches/community/3.3.X/examples/photoalbum/source/web/src/main/webapp/META-INF/MANIFEST.MF Modified: branches/community/3.3.X/examples/photoalbum/source/ear/pom.xml branches/community/3.3.X/examples/photoalbum/source/ejb/pom.xml branches/community/3.3.X/examples/photoalbum/source/web/pom.xml branches/community/3.3.X/examples/photoalbum/source/web/src/main/webapp/WEB-INF/components.xml Log: Revert changes RF-8331 Modified: branches/community/3.3.X/examples/photoalbum/source/ear/pom.xml =================================================================== --- branches/community/3.3.X/examples/photoalbum/source/ear/pom.xml 2010-02-09 12:09:49 UTC (rev 16430) +++ branches/community/3.3.X/examples/photoalbum/source/ear/pom.xml 2010-02-09 15:39:51 UTC (rev 16431) @@ -8,7 +8,7 @@ </parent> <groupId>org.richfaces.examples</groupId> - <artifactId>photoalbum-ear</artifactId> + <artifactId>${projectName}-ear</artifactId> <name>${appName} EAR module</name> <packaging>ear</packaging> @@ -30,12 +30,12 @@ <version>${project.version}</version> <type>ejb</type> </dependency> - <dependency> + <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> <version>1.2.14</version> - </dependency> - <dependency> + </dependency> + <dependency> <groupId>org.jboss.seam</groupId> <artifactId>jboss-seam</artifactId> <version>${seamVersion}</version> @@ -61,7 +61,7 @@ </dependency> </dependencies> <build> - <finalName>photoalbum-ear</finalName> + <finalName>${projectName}-ear-${project.version}</finalName> <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> @@ -78,18 +78,15 @@ <generateApplicationXml>true</generateApplicationXml> <includeJar>false</includeJar> <defaultLibBundleDir>lib</defaultLibBundleDir> - <version>5</version> <modules> <webModule> <groupId>org.richfaces.examples</groupId> - <artifactId>photoalbum-web</artifactId> - <contextRoot>/photoalbum-web</contextRoot> - <bundleFileName>photoalbum-web.war</bundleFileName> + <artifactId>${projectName}-web</artifactId> + <contextRoot>/${projectName}</contextRoot> </webModule> <ejbModule> <groupId>org.richfaces.examples</groupId> - <artifactId>photoalbum-ejb</artifactId> - <bundleFileName>photoalbum-ejb.jar</bundleFileName> + <artifactId>${projectName}-ejb</artifactId> </ejbModule> <ejbModule> <groupId>org.jboss.seam</groupId> Modified: branches/community/3.3.X/examples/photoalbum/source/ejb/pom.xml =================================================================== --- branches/community/3.3.X/examples/photoalbum/source/ejb/pom.xml 2010-02-09 12:09:49 UTC (rev 16430) +++ branches/community/3.3.X/examples/photoalbum/source/ejb/pom.xml 2010-02-09 15:39:51 UTC (rev 16431) @@ -10,7 +10,7 @@ </parent> <groupId>org.richfaces.examples</groupId> - <artifactId>photoalbum-ejb</artifactId> + <artifactId>${projectName}-ejb</artifactId> <name>${appName} EJB module</name> <packaging>ejb</packaging> @@ -76,7 +76,6 @@ <profiles> <profile> <id>livedemo</id> - <properties> <imageset>full</imageset> </properties> Deleted: branches/community/3.3.X/examples/photoalbum/source/ejb/src/main/resources/META-INF/MANIFEST.MF =================================================================== --- branches/community/3.3.X/examples/photoalbum/source/ejb/src/main/resources/META-INF/MANIFEST.MF 2010-02-09 12:09:49 UTC (rev 16430) +++ branches/community/3.3.X/examples/photoalbum/source/ejb/src/main/resources/META-INF/MANIFEST.MF 2010-02-09 15:39:51 UTC (rev 16431) @@ -1,3 +0,0 @@ -Manifest-Version: 1.0 -Class-Path: - Deleted: branches/community/3.3.X/examples/photoalbum/source/ejb/src/main/resources/components.properties =================================================================== --- branches/community/3.3.X/examples/photoalbum/source/ejb/src/main/resources/components.properties 2010-02-09 12:09:49 UTC (rev 16430) +++ branches/community/3.3.X/examples/photoalbum/source/ejb/src/main/resources/components.properties 2010-02-09 15:39:51 UTC (rev 16431) @@ -1,4 +0,0 @@ -# -#Mon Sep 15 14:29:32 EEST 2008 -jndiPattern=photoalbum-ear/#{ejbName}/local -embeddedEjb=false Modified: branches/community/3.3.X/examples/photoalbum/source/web/pom.xml =================================================================== --- branches/community/3.3.X/examples/photoalbum/source/web/pom.xml 2010-02-09 12:09:49 UTC (rev 16430) +++ branches/community/3.3.X/examples/photoalbum/source/web/pom.xml 2010-02-09 15:39:51 UTC (rev 16431) @@ -10,7 +10,7 @@ </parent> <groupId>org.richfaces.examples</groupId> - <artifactId>photoalbum-web</artifactId> + <artifactId>${projectName}-web</artifactId> <name>${appName} WAR module</name> <packaging>war</packaging> @@ -264,7 +264,6 @@ <goals> <goal>export</goal> </goals> - <configuration> <connectionType>connection</connectionType> <developerConnectionUrl>scm:svn:http://anonsvn.jboss.org/repos/richface... Deleted: branches/community/3.3.X/examples/photoalbum/source/web/src/main/webapp/META-INF/MANIFEST.MF =================================================================== --- branches/community/3.3.X/examples/photoalbum/source/web/src/main/webapp/META-INF/MANIFEST.MF 2010-02-09 12:09:49 UTC (rev 16430) +++ branches/community/3.3.X/examples/photoalbum/source/web/src/main/webapp/META-INF/MANIFEST.MF 2010-02-09 15:39:51 UTC (rev 16431) @@ -1,3 +0,0 @@ -Manifest-Version: 1.0 -Class-Path: - Modified: branches/community/3.3.X/examples/photoalbum/source/web/src/main/webapp/WEB-INF/components.xml =================================================================== --- branches/community/3.3.X/examples/photoalbum/source/web/src/main/webapp/WEB-INF/components.xml 2010-02-09 12:09:49 UTC (rev 16430) +++ branches/community/3.3.X/examples/photoalbum/source/web/src/main/webapp/WEB-INF/components.xml 2010-02-09 15:39:51 UTC (rev 16431) @@ -10,17 +10,17 @@ xmlns:transaction="http://jboss.com/products/seam/transaction" xmlns:web="http://jboss.com/products/seam/web" xsi:schemaLocation= - "http://jboss.com/products/seam/core http://jboss.com/products/seam/core-2.1.xsd - http://jboss.com/products/seam/web http://jboss.com/products/seam/web-2.1.xsd - http://jboss.com/products/seam/transaction http://jboss.com/products/seam/transaction-2.1.xsd - http://jboss.com/products/seam/persistence http://jboss.com/products/seam/persistence-2.1.xsd - http://jboss.com/products/seam/drools http://jboss.com/products/seam/drools-2.1.xsd - http://jboss.com/products/seam/bpm http://jboss.com/products/seam/bpm-2.1.xsd - http://jboss.com/products/seam/security http://jboss.com/products/seam/security-2.1.xsd - http://jboss.com/products/seam/mail http://jboss.com/products/seam/mail-2.1.xsd - http://jboss.com/products/seam/components http://jboss.com/products/seam/components-2.1.xsd"> + "http://jboss.com/products/seam/core http://jboss.com/products/seam/core-2.1.0.xsd + http://jboss.com/products/seam/web http://jboss.com/products/seam/web-2.1.0.xsd + http://jboss.com/products/seam/transaction http://jboss.com/products/seam/transaction-2.1.0.xsd + http://jboss.com/products/seam/persistence http://jboss.com/products/seam/persistence-2.1.0.xsd + http://jboss.com/products/seam/drools http://jboss.com/products/seam/drools-2.1.0.xsd + http://jboss.com/products/seam/bpm http://jboss.com/products/seam/bpm-2.1.0.xsd + http://jboss.com/products/seam/security http://jboss.com/products/seam/security-2.1.0.xsd + http://jboss.com/products/seam/mail http://jboss.com/products/seam/mail-2.1.0.xsd + http://jboss.com/products/seam/components http://jboss.com/products/seam/components-2.1.0.xsd"> - <core:init transaction-management-enabled="false" debug="true" jndi-pattern="@jndiPattern@"/> + <core:init transaction-management-enabled="false" debug="${environment.debug}" jndi-pattern="@jndiPattern@"/> <core:manager concurrent-request-timeout="20000" conversation-timeout="200000" conversation-id-parameter="cid"