Author: wsmoak
Date: Sun Jun 4 21:23:21 2006
New Revision: 411655
URL: http://svn.apache.org/viewvc?rev=411655&view=rev
Log:
Add a pom for Shale Blank and include it in the shale-apps build.
Move the properties file to src/main/resources.
Add Cargo config and finalName to the apps pom.
Added:
struts/shale/branches/mvn_reorg/shale-apps/shale-blank/pom.xml (with
props)
struts/shale/branches/mvn_reorg/shale-apps/shale-blank/src/main/resources/
struts/shale/branches/mvn_reorg/shale-apps/shale-blank/src/main/resources/org/
struts/shale/branches/mvn_reorg/shale-apps/shale-blank/src/main/resources/org/apache/
struts/shale/branches/mvn_reorg/shale-apps/shale-blank/src/main/resources/org/apache/shale/
struts/shale/branches/mvn_reorg/shale-apps/shale-blank/src/main/resources/org/apache/shale/blank/
struts/shale/branches/mvn_reorg/shale-apps/shale-blank/src/main/resources/org/apache/shale/blank/Bundle.properties
- copied unchanged from r411653,
struts/shale/branches/mvn_reorg/shale-apps/shale-blank/src/main/java/org/apache/shale/blank/Bundle.properties
Removed:
struts/shale/branches/mvn_reorg/shale-apps/shale-blank/src/main/java/org/apache/shale/blank/Bundle.properties
Modified:
struts/shale/branches/mvn_reorg/shale-apps/pom.xml
Modified: struts/shale/branches/mvn_reorg/shale-apps/pom.xml
URL:
http://svn.apache.org/viewvc/struts/shale/branches/mvn_reorg/shale-apps/pom.xml?rev=411655&r1=411654&r2=411655&view=diff
==============================================================================
--- struts/shale/branches/mvn_reorg/shale-apps/pom.xml (original)
+++ struts/shale/branches/mvn_reorg/shale-apps/pom.xml Sun Jun 4 21:23:21 2006
@@ -44,11 +44,32 @@
</profiles>
<modules>
- <!--
<module>shale-blank</module>
+ <!--
<module>shale-mailreader</module>
<module>shale-use-cases</module>
-->
</modules>
+
+ <build>
+ <finalName>${artifactId}</finalName>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.cargo</groupId>
+ <artifactId>cargo-maven2-plugin</artifactId>
+ <configuration>
+ <container>
+ <containerId>tomcat5x</containerId>
+ <home>${cargo.tomcat5x.home}</home>
+ <log>${project.build.directory}/tomcat5x.log</log>
+
<output>${project.build.directory}/tomcat5x.out</output>
+ </container>
+ <configuration>
+ <home>${project.build.directory}/tomcat5x</home>
+ </configuration>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
Added: struts/shale/branches/mvn_reorg/shale-apps/shale-blank/pom.xml
URL:
http://svn.apache.org/viewvc/struts/shale/branches/mvn_reorg/shale-apps/shale-blank/pom.xml?rev=411655&view=auto
==============================================================================
--- struts/shale/branches/mvn_reorg/shale-apps/shale-blank/pom.xml (added)
+++ struts/shale/branches/mvn_reorg/shale-apps/shale-blank/pom.xml Sun Jun 4
21:23:21 2006
@@ -0,0 +1,75 @@
+<!--
+/*
+ * Copyright 2006 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * $Id$
+ */
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.struts.shale</groupId>
+ <artifactId>shale-apps</artifactId>
+ <version>1.0.3-SNAPSHOT</version>
+ </parent>
+ <artifactId>shale-blank</artifactId>
+ <packaging>war</packaging>
+ <name>Shale Blank Sample App</name>
+ <url>http://struts.apache.org/struts-shale</url>
+
+ <dependencies>
+
+ <dependency>
+ <groupId>org.apache.struts.shale</groupId>
+ <artifactId>shale-core</artifactId>
+ <version>${version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.struts.shale</groupId>
+ <artifactId>shale-test</artifactId>
+ <version>${version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>jstl</artifactId>
+ <version>1.1.2</version>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.4</version>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>jsp-api</artifactId>
+ <version>2.0</version>
+ </dependency>
+
+ <dependency>
+ <groupId>taglibs</groupId>
+ <artifactId>standard</artifactId>
+ <version>1.1.2</version>
+ </dependency>
+
+ </dependencies>
+
+</project>
Propchange: struts/shale/branches/mvn_reorg/shale-apps/shale-blank/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/shale/branches/mvn_reorg/shale-apps/shale-blank/pom.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
