You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@struts.apache.org by ws...@apache.org on 2006/01/05 04:23:07 UTC
svn commit: r366067 - in /struts: el/trunk/pom.xml extras/trunk/pom.xml
taglib/trunk/pom.xml tiles/trunk/pom.xml
Author: wsmoak
Date: Wed Jan 4 19:23:01 2006
New Revision: 366067
URL: http://svn.apache.org/viewcvs?rev=366067&view=rev
Log:
Added experimental Maven 2 build files: struts-el, struts-extras, struts-taglib, struts-tiles
Added:
struts/el/trunk/pom.xml (with props)
struts/extras/trunk/pom.xml (with props)
struts/taglib/trunk/pom.xml (with props)
struts/tiles/trunk/pom.xml (with props)
Added: struts/el/trunk/pom.xml
URL: http://svn.apache.org/viewcvs/struts/el/trunk/pom.xml?rev=366067&view=auto
==============================================================================
--- struts/el/trunk/pom.xml (added)
+++ struts/el/trunk/pom.xml Wed Jan 4 19:23:01 2006
@@ -0,0 +1,148 @@
+<?xml version="1.0"?>
+<!--
+/*
+ * Copyright 2005 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$
+ */
+-->
+
+<!--
+ Experimental Maven 2 Build for Apache Struts
+ ============================================
+
+To build and install this module into your local repo:
+
+ $ mvn install
+
+For more information, see: http://wiki.apache.org/struts/StrutsMaven2Plan
+
+-->
+
+<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">
+
+ <parent>
+ <groupId>struts</groupId>
+ <artifactId>struts-build</artifactId>
+ <version>1.3.0-SNAPSHOT</version>
+ <relativePath>build/pom.xml</relativePath>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>struts</groupId>
+ <artifactId>struts-el</artifactId>
+ <packaging>jar</packaging>
+ <version>1.3.0-SNAPSHOT</version>
+ <name>Struts EL</name>
+ <url>http://struts.apache.org</url>
+
+ <build>
+
+ <sourceDirectory>src/java</sourceDirectory>
+ <!--<testSourceDirectory>src/test</testSourceDirectory>-->
+
+ <resources>
+ <resource>
+ <directory>src/tld</directory>
+ <includes>
+ <include>**/*.tld</include>
+ </includes>
+ <targetPath>META-INF/tlds</targetPath>
+ </resource>
+ <resource>
+ <directory>build</directory>
+ <includes>
+ <include>LICENSE.txt</include>
+ <include>NOTICE.txt</include>
+ </includes>
+ </resource>
+ </resources>
+
+ <testResources/>
+
+ <pluginManagement>
+ <plugins>
+ <!-- all tests in src/test are for Cactus, not plain JUnit -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <exclude>**/*.java</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+
+ </build>
+
+ <dependencies>
+
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>jstl</artifactId>
+ <version>1.0.2</version>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.3</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>struts</groupId>
+ <artifactId>struts-action</artifactId>
+ <version>1.3.0-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>struts</groupId>
+ <artifactId>struts-taglib</artifactId>
+ <version>1.3.0-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>struts</groupId>
+ <artifactId>struts-tiles</artifactId>
+ <version>1.3.0-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>taglibs</groupId>
+ <artifactId>standard</artifactId>
+ <version>1.0.2</version>
+ </dependency>
+
+ </dependencies>
+
+ <!--
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>net.sourceforge.maven-taglib</groupId>
+ <artifactId>maven-taglib-plugin</artifactId>
+ <configuration>
+ <taglib.src.dir>${basedir}/src/tld</taglib.src.dir>
+ </configuration>
+ </plugin>
+ </plugins>
+ </reporting>
+ -->
+
+</project>
Propchange: struts/el/trunk/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/el/trunk/pom.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Added: struts/extras/trunk/pom.xml
URL: http://svn.apache.org/viewcvs/struts/extras/trunk/pom.xml?rev=366067&view=auto
==============================================================================
--- struts/extras/trunk/pom.xml (added)
+++ struts/extras/trunk/pom.xml Wed Jan 4 19:23:01 2006
@@ -0,0 +1,107 @@
+<?xml version="1.0"?>
+<!--
+/*
+ * Copyright 2005 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$
+ */
+-->
+
+<!--
+ Experimental Maven 2 Build for Apache Struts
+ ============================================
+
+To build and install this module into your local repo:
+
+ $ mvn install
+
+For more information, see: http://wiki.apache.org/struts/StrutsMaven2Plan
+
+-->
+
+<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">
+
+ <parent>
+ <groupId>struts</groupId>
+ <artifactId>struts-build</artifactId>
+ <version>1.3.0-SNAPSHOT</version>
+ <relativePath>build/pom.xml</relativePath>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>struts</groupId>
+ <artifactId>struts-extras</artifactId>
+ <packaging>jar</packaging>
+ <version>1.3.0-SNAPSHOT</version>
+ <name>Struts Extras</name>
+ <url>http://struts.apache.org</url>
+
+ <build>
+
+ <sourceDirectory>src/java</sourceDirectory>
+ <testSourceDirectory>src/test</testSourceDirectory>
+
+ <resources>
+ <resource>
+ <directory>src/java</directory>
+ <includes>
+ <include>**/*.properties</include>
+ </includes>
+ </resource>
+ <resource>
+ <directory>build</directory>
+ <includes>
+ <include>LICENSE.txt</include>
+ <include>NOTICE.txt</include>
+ </includes>
+ </resource>
+ </resources>
+
+ <testResources/>
+
+ </build>
+
+ <dependencies>
+
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.3</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>struts</groupId>
+ <artifactId>struts-action</artifactId>
+ <version>1.3.0-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-resources</groupId>
+ <artifactId>commons-resources</artifactId>
+ <version>1.0.0-RC1</version>
+ </dependency>
+
+ </dependencies>
+
+</project>
Propchange: struts/extras/trunk/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/extras/trunk/pom.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Added: struts/taglib/trunk/pom.xml
URL: http://svn.apache.org/viewcvs/struts/taglib/trunk/pom.xml?rev=366067&view=auto
==============================================================================
--- struts/taglib/trunk/pom.xml (added)
+++ struts/taglib/trunk/pom.xml Wed Jan 4 19:23:01 2006
@@ -0,0 +1,129 @@
+<?xml version="1.0"?>
+<!--
+/*
+ * Copyright 2005 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$
+ */
+-->
+
+<!--
+ Experimental Maven 2 Build for Apache Struts
+ ============================================
+
+To build and install this module into your local repo:
+
+ $ mvn install
+
+For more information, see: http://wiki.apache.org/struts/StrutsMaven2Plan
+
+-->
+
+<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">
+
+ <parent>
+ <groupId>struts</groupId>
+ <artifactId>struts-build</artifactId>
+ <version>1.3.0-SNAPSHOT</version>
+ <relativePath>build/pom.xml</relativePath>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>struts</groupId>
+ <artifactId>struts-taglib</artifactId>
+ <packaging>jar</packaging>
+ <version>1.3.0-SNAPSHOT</version>
+ <name>Struts Taglib</name>
+ <url>http://struts.apache.org</url>
+
+ <build>
+
+ <sourceDirectory>src/java</sourceDirectory>
+ <testSourceDirectory>src/test</testSourceDirectory>
+
+ <resources>
+ <resource>
+ <directory>src/java</directory>
+ <includes>
+ <include>**/*.properties</include>
+ </includes>
+ </resource>
+ <resource>
+ <directory>src/tld</directory>
+ <includes>
+ <include>**/*.tld</include>
+ </includes>
+ <targetPath>META-INF/tlds</targetPath>
+ </resource>
+ <resource>
+ <directory>build</directory>
+ <includes>
+ <include>LICENSE.txt</include>
+ <include>NOTICE.txt</include>
+ </includes>
+ </resource>
+ </resources>
+
+ <testResources>
+ <testResource>
+ <directory>src/test</directory>
+ <excludes>
+ <exclude>**/*.java</exclude>
+ </excludes>
+ </testResource>
+ </testResources>
+
+ </build>
+
+ <dependencies>
+
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.3</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>struts</groupId>
+ <artifactId>struts-action</artifactId>
+ <version>1.3.0-SNAPSHOT</version>
+ </dependency>
+
+ </dependencies>
+
+ <!--
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>net.sourceforge.maven-taglib</groupId>
+ <artifactId>maven-taglib-plugin</artifactId>
+ <configuration>
+ <taglib.src.dir>${basedir}/src/tld</taglib.src.dir>
+ </configuration>
+ </plugin>
+ </plugins>
+ </reporting>
+ -->
+
+</project>
Propchange: struts/taglib/trunk/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/taglib/trunk/pom.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Added: struts/tiles/trunk/pom.xml
URL: http://svn.apache.org/viewcvs/struts/tiles/trunk/pom.xml?rev=366067&view=auto
==============================================================================
--- struts/tiles/trunk/pom.xml (added)
+++ struts/tiles/trunk/pom.xml Wed Jan 4 19:23:01 2006
@@ -0,0 +1,126 @@
+<?xml version="1.0"?>
+<!--
+/*
+ * Copyright 2005 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$
+ */
+-->
+
+<!--
+ Experimental Maven 2 Build for Apache Struts
+ ============================================
+
+To build and install this module into your local repo:
+
+ $ mvn install
+
+For more information, see: http://wiki.apache.org/struts/StrutsMaven2Plan
+
+-->
+
+<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">
+
+ <parent>
+ <groupId>struts</groupId>
+ <artifactId>struts-build</artifactId>
+ <version>1.3.0-SNAPSHOT</version>
+ <relativePath>build/pom.xml</relativePath>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>struts</groupId>
+ <artifactId>struts-tiles</artifactId>
+ <packaging>jar</packaging>
+ <version>1.3.0-SNAPSHOT</version>
+ <name>Struts Tiles</name>
+ <url>http://struts.apache.org</url>
+
+ <build>
+
+ <sourceDirectory>src/java</sourceDirectory>
+ <testSourceDirectory>src/test</testSourceDirectory>
+
+ <resources>
+ <resource>
+ <directory>src/resource</directory>
+ </resource>
+ <resource>
+ <directory>src/tld</directory>
+ <includes>
+ <include>**/*.tld</include>
+ </includes>
+ <targetPath>META-INF/tlds</targetPath>
+ </resource>
+ <resource>
+ <directory>build</directory>
+ <includes>
+ <include>LICENSE.txt</include>
+ <include>NOTICE.txt</include>
+ </includes>
+ </resource>
+ </resources>
+
+ <testResources>
+ <testResource>
+ <directory>src/test</directory>
+ <excludes>
+ <exclude>**/*.java</exclude>
+ </excludes>
+ </testResource>
+ </testResources>
+
+ </build>
+
+ <dependencies>
+
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.3</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>struts</groupId>
+ <artifactId>struts-action</artifactId>
+ <version>1.3.0-SNAPSHOT</version>
+ </dependency>
+
+ </dependencies>
+
+ <!--
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>net.sourceforge.maven-taglib</groupId>
+ <artifactId>maven-taglib-plugin</artifactId>
+ <configuration>
+ <taglib.src.dir>${basedir}/src/tld</taglib.src.dir>
+ </configuration>
+ </plugin>
+ </plugins>
+ </reporting>
+ -->
+
+</project>
Propchange: struts/tiles/trunk/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/tiles/trunk/pom.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@struts.apache.org
For additional commands, e-mail: dev-help@struts.apache.org
Re: svn commit: r366067 - in /struts: el/trunk/pom.xml extras/trunk/pom.xml taglib/trunk/pom.xml tiles/trunk/pom.xml
Posted by Wendy Smoak <ws...@gmail.com>.
On 1/4/06, wsmoak@apache.org <ws...@apache.org> wrote:
> Author: wsmoak
> Date: Wed Jan 4 19:23:01 2006
> New Revision: 366067
>
> URL: http://svn.apache.org/viewcvs?rev=366067&view=rev
> Log:
> Added experimental Maven 2 build files: struts-el, struts-extras, struts-taglib, struts-tiles
I missed updating build/pom.xml. I'll fix it tonight, but in case
anyone is trying to use the new build files, there's a patch below.
Index: build/pom.xml
===================================================================
--- build/pom.xml (revision 366190)
+++ build/pom.xml (working copy)
@@ -242,9 +242,10 @@
<modules>
<module>../action</module>
- <!--module>../taglib</module-->
- <!--module>../el</module-->
- <!--module>../tiles</module-->
+ <module>../taglib</module>
+ <module>../el</module>
+ <module>../tiles</module>
+ <module>../extras</module>
<!--module>../apps</module-->
</modules>
M2 is also (occasionally) unhappy about not being able to find a pom
for the Resources release candidate. If you get errors, save the
minimal pom (below) as commons-resources-1.0.0-RC1.pom in your local
repo next to the jar.
<project>
<modelVersion>4.0.0</modelVersion>
<groupId>commons-resources</groupId>
<artifactId>commons-resources</artifactId>
<version>1.0.0-RC1</version>
<packaging>jar</packaging>
<name>Commons Resources</name>
<url>http://jakarta.apache.org/commons/resources</url>
</project>
--
Wendy
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@struts.apache.org
For additional commands, e-mail: dev-help@struts.apache.org