[jboss-svn-commits] JBoss PortletSwap SVN: r166 - in portlets/src/framework/SeamBookingPortlet: web/src/main/webapp and 1 other directory.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Wed Nov 14 20:14:53 EST 2007
Author: wesleyhales
Date: 2007-11-14 20:14:52 -0500 (Wed, 14 Nov 2007)
New Revision: 166
Modified:
portlets/src/framework/SeamBookingPortlet/ear/pom.xml
portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/help.xhtml
Log:
cleanup
Modified: portlets/src/framework/SeamBookingPortlet/ear/pom.xml
===================================================================
--- portlets/src/framework/SeamBookingPortlet/ear/pom.xml 2007-11-14 23:35:46 UTC (rev 165)
+++ portlets/src/framework/SeamBookingPortlet/ear/pom.xml 2007-11-15 01:14:52 UTC (rev 166)
@@ -88,233 +88,210 @@
</dependencies>
- <profiles>
- <profile>
- <id>jboss</id>
- <activation>
- <!-- <property>
- <name>!tomcat</name>
- </property>-->
- <activeByDefault>true</activeByDefault>
- </activation>
- <build>
+ <build>
- <resources>
+ <resources>
- <resource>
- <targetPath>../${project.artifactId}-${project.version}</targetPath>
- <filtering>false</filtering>
- <directory>src/main/resources</directory>
- <includes>
- <include>META-INF/*.xml</include>
- </includes>
- </resource>
+ <resource>
+ <targetPath>../${project.artifactId}-${project.version}</targetPath>
+ <filtering>false</filtering>
+ <directory>src/main/resources</directory>
+ <includes>
+ <include>META-INF/*.xml</include>
+ </includes>
+ </resource>
- <resource>
- <targetPath>../${project.artifactId}-${project.version}</targetPath>
- <filtering>false</filtering>
- <directory>../ejb/src/main/resources/pageflow</directory>
- <includes>
- <include>*.xml</include>
- </includes>
- </resource>
+ <resource>
+ <targetPath>../${project.artifactId}-${project.version}</targetPath>
+ <filtering>false</filtering>
+ <directory>../ejb/src/main/resources/pageflow</directory>
+ <includes>
+ <include>*.xml</include>
+ </includes>
+ </resource>
- <resource>
- <targetPath>../${project.artifactId}-${project.version}</targetPath>
- <filtering>false</filtering>
- <directory>../ejb/src/main/resources</directory>
- <includes>
- <include>security.drl</include>
- </includes>
- </resource>
+ <resource>
+ <targetPath>../${project.artifactId}-${project.version}</targetPath>
+ <filtering>false</filtering>
+ <directory>../ejb/src/main/resources</directory>
+ <includes>
+ <include>security.drl</include>
+ </includes>
+ </resource>
- </resources>
+ </resources>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-ear-plugin</artifactId>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-ear-plugin</artifactId>
- <configuration>
- <displayName>${artifactId}</displayName>
- <description>${name}</description>
- <version>1.4</version>
- <loader-repository>seam.jboss.org:loader=SeamBookingPortlet</loader-repository>
- <modules>
+ <configuration>
+ <displayName>${artifactId}</displayName>
+ <description>${name}</description>
+ <version>1.4</version>
+ <loader-repository>seam.jboss.org:loader=SeamBookingPortlet</loader-repository>
+ <modules>
- <webModule>
- <groupId>org.jboss.portal.example</groupId>
- <artifactId>PortletWeb</artifactId>
- <contextRoot>/SeamBookingPortletWeb-${version}</contextRoot>
- </webModule>
+ <webModule>
+ <groupId>org.jboss.portal.example</groupId>
+ <artifactId>PortletWeb</artifactId>
+ <contextRoot>/SeamBookingPortletWeb-${version}</contextRoot>
+ </webModule>
- <ejbModule>
- <groupId>org.jboss.portal.example</groupId>
- <artifactId>PortletEjb</artifactId>
- </ejbModule>
+ <ejbModule>
+ <groupId>org.jboss.portal.example</groupId>
+ <artifactId>PortletEjb</artifactId>
+ </ejbModule>
- <jarModule>
- <groupId>org.jboss.seam</groupId>
- <artifactId>jboss-seam</artifactId>
- <includeInApplicationXml>true</includeInApplicationXml>
- </jarModule>
+ <jarModule>
+ <groupId>org.jboss.seam</groupId>
+ <artifactId>jboss-seam</artifactId>
+ <includeInApplicationXml>true</includeInApplicationXml>
+ </jarModule>
- <jarModule>
- <groupId>org.jboss.seam</groupId>
- <artifactId>jboss-el</artifactId>
- <!--<includeInApplicationXml>true</includeInApplicationXml>-->
- <bundleDir>lib</bundleDir>
- </jarModule>
+ <jarModule>
+ <groupId>org.jboss.seam</groupId>
+ <artifactId>jboss-el</artifactId>
+ <!--<includeInApplicationXml>true</includeInApplicationXml>-->
+ <bundleDir>lib</bundleDir>
+ </jarModule>
- <!--The drools/jbpm jars (below) are contained in the ear for Jboss deployment-->
+ <!--The drools/jbpm jars (below) are contained in the ear for Jboss deployment-->
- <jarModule>
- <groupId>org.drools</groupId>
- <artifactId>drools-core</artifactId>
- <includeInApplicationXml>true</includeInApplicationXml>
- </jarModule>
+ <jarModule>
+ <groupId>org.drools</groupId>
+ <artifactId>drools-core</artifactId>
+ <includeInApplicationXml>true</includeInApplicationXml>
+ </jarModule>
- <jarModule>
- <groupId>org.drools</groupId>
- <artifactId>drools-compiler</artifactId>
- <includeInApplicationXml>true</includeInApplicationXml>
- </jarModule>
+ <jarModule>
+ <groupId>org.drools</groupId>
+ <artifactId>drools-compiler</artifactId>
+ <includeInApplicationXml>true</includeInApplicationXml>
+ </jarModule>
- <jarModule>
- <groupId>janino</groupId>
- <artifactId>janino</artifactId>
- <includeInApplicationXml>true</includeInApplicationXml>
- </jarModule>
+ <jarModule>
+ <groupId>janino</groupId>
+ <artifactId>janino</artifactId>
+ <includeInApplicationXml>true</includeInApplicationXml>
+ </jarModule>
- <jarModule>
- <groupId>org.mvel</groupId>
- <artifactId>mvel14</artifactId>
- <includeInApplicationXml>true</includeInApplicationXml>
- </jarModule>
+ <jarModule>
+ <groupId>org.mvel</groupId>
+ <artifactId>mvel14</artifactId>
+ <includeInApplicationXml>true</includeInApplicationXml>
+ </jarModule>
- <jarModule>
- <groupId>antlr</groupId>
- <artifactId>antlr</artifactId>
- <includeInApplicationXml>true</includeInApplicationXml>
- </jarModule>
+ <jarModule>
+ <groupId>antlr</groupId>
+ <artifactId>antlr</artifactId>
+ <includeInApplicationXml>true</includeInApplicationXml>
+ </jarModule>
- <jarModule>
- <groupId>org.mvel</groupId>
- <artifactId>mvel14</artifactId>
- <includeInApplicationXml>true</includeInApplicationXml>
- </jarModule>
+ <jarModule>
+ <groupId>org.mvel</groupId>
+ <artifactId>mvel14</artifactId>
+ <includeInApplicationXml>true</includeInApplicationXml>
+ </jarModule>
- </modules>
- <!--<jboss>
- <version>4</version>
- <unauthenticated-principal>guest</unauthenticated-principal>-->
- <!--<security-domain></security-domain>-->
- <!--<jmx-name></jmx-name>-->
- <!--</jboss>-->
- </configuration>
- </plugin>
+ </modules>
+ <!--<jboss>
+ <version>4</version>
+ <unauthenticated-principal>guest</unauthenticated-principal>-->
+ <!--<security-domain></security-domain>-->
+ <!--<jmx-name></jmx-name>-->
+ <!--</jboss>-->
+ </configuration>
+ </plugin>
+ </plugins>
- <plugin>
- <groupId>org.codehaus.cargo</groupId>
- <artifactId>cargo-maven2-plugin</artifactId>
- <version>0.3.1</version>
- <configuration>
+ </build>
- <wait>${cargo.wait}</wait>
+ <profiles>
+ <profile>
+ <id>jboss</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.cargo</groupId>
+ <artifactId>cargo-maven2-plugin</artifactId>
+ <version>0.3.1</version>
+ <configuration>
+ <wait>${cargo.wait}</wait>
+ <container>
+ <containerId>${cargo.container}</containerId>
+ <zipUrlInstaller>
+ <url>${cargo.container.url}</url>
+ <installDir>${basedir}/target/installs</installDir>
+ </zipUrlInstaller>
+ </container>
- <container>
- <containerId>${cargo.container}</containerId>
-
- <zipUrlInstaller>
- <url>${cargo.container.url}</url>
- <installDir>${basedir}/target/installs</installDir>
- </zipUrlInstaller>
- </container>
-
- <configuration>
- <type>existing</type>
- <home>${jboss.local.install}</home>
- <properties>
- <cargo.jboss.configuration>default</cargo.jboss.configuration>
- <cargo.jvmarg>${cargo.jvmarg}</cargo.jvmarg>
- <cargo.host>${cargo.host}</cargo.host>
- <cargo.servlet.port>${cargo.port}</cargo.servlet.port>
- <cargo.logging>low</cargo.logging>
- </properties>
- </configuration>
-
- <deployer>
- <type>installed</type>
- <deployables>
- <deployable>
- <groupId>org.jboss.portal.example</groupId>
- <artifactId>SeamBookingPortlet</artifactId>
- <type>ear</type>
- <pingURL>http://localhost:8080/${context.path}/</pingURL>
- </deployable>
- </deployables>
- </deployer>
+ <configuration>
+ <type>existing</type>
+ <home>${jboss.local.install}</home>
+ <properties>
+ <cargo.jboss.configuration>default</cargo.jboss.configuration>
+ <cargo.jvmarg>${cargo.jvmarg}</cargo.jvmarg>
+ <cargo.host>${cargo.host}</cargo.host>
+ <cargo.servlet.port>${cargo.port}</cargo.servlet.port>
+ <cargo.logging>low</cargo.logging>
+ </properties>
</configuration>
- </plugin>
+ <deployer>
+ <type>installed</type>
+ <deployables>
+ <deployable>
+ <groupId>org.jboss.portal.example</groupId>
+ <artifactId>SeamBookingPortlet</artifactId>
+ <type>ear</type>
+ <pingURL>http://localhost:8080/${context.path}/</pingURL>
+ </deployable>
+ </deployables>
+ </deployer>
+ </configuration>
+ <executions>
+ <!--<execution>
+ <id>start</id>
+ <phase>install</phase>
+ <goals>
+ <goal>start</goal>
+ </goals>
+ </execution>-->
+ </executions>
+ </plugin>
+
</plugins>
- </build>
- <properties>
- <containerId>jboss4x</containerId>
- <!--<url>http://internap.dl.sourceforge.net/sourceforge/jboss/jboss-4.0.4.GA.zip</url>-->
- </properties>
+ </build>
</profile>
</profiles>
- <!--<repositories>
- <repository>
- <id>m2-snapshot-repository</id>
- <name>m2-snapshot-repository</name>
- <url>http://people.apache.org/repo/m2-snapshot-repository</url>
- </repository>
- <repository>
- <id>ibiblio</id>
- <name>ibiblio-repo</name>
- <url>http://mirrors.ibiblio.org/pub/mirrors/maven2</url>
- <layout>legacy</layout>
- </repository>
- <repository>
- <releases>
- <enabled>false</enabled>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <id>maven2-snapshots.ajax4jsf.org</id>
- <name>Ajax4jsf Repository for Maven Snapshots</name>
- <url>https://ajax4jsf.dev.java.net/nonav/snapshots</url>
- <layout>default</layout>
- </repository>
- </repositories>-->
-
<pluginRepositories>
- <pluginRepository>
- <id>apache.snapshots</id>
- <url>http://cvs.apache.org/maven-snapshot-repository</url>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </pluginRepository>
- </pluginRepositories>
+ <pluginRepository>
+ <id>apache.snapshots</id>
+ <url>http://cvs.apache.org/maven-snapshot-repository</url>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </pluginRepository>
+ </pluginRepositories>
<properties>
- <jboss.local.install>${basedir}/target/installs/jboss-4.2.2.GA/jboss-4.2.2.GA/server/default</jboss.local.install>
+ <jboss.local.install>${basedir}/target/installs/jboss-4.2.2.GA-2.6.3/server/default
+ </jboss.local.install>
<cargo.container>jboss4x</cargo.container>
- <cargo.container.home>${env.CATALINA_HOME}</cargo.container.home>
-
<!--copy the zip somewhere locally so you don't waste time and bandwidth, then modify below-->
<cargo.container.url>
- file:/C:/www/jboss-4.2.2.GA.zip
+ file:/C:/dev/repository.jboss.org/maven2/org/jboss/portal/example/jboss/4.2.2.GA-2.6.3/jboss-4.2.2.GA-2.6.3.zip
</cargo.container.url>
<!--<cargo.container.url>
Modified: portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/help.xhtml
===================================================================
--- portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/help.xhtml 2007-11-14 23:35:46 UTC (rev 165)
+++ portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/help.xhtml 2007-11-15 01:14:52 UTC (rev 166)
@@ -7,3 +7,4 @@
xmlns:rich="http://richfaces.org/rich">
Help Mode
+</ui:composition>
\ No newline at end of file
More information about the jboss-svn-commits
mailing list