struts-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wsm...@apache.org
Subject svn commit: r392080 - in /struts/action/trunk: ./ apps/ apps/cookbook/ apps/cookbook/src/java/ apps/cookbook/src/main/ apps/cookbook/src/main/java/ apps/cookbook/src/main/java/examples/ apps/cookbook/src/main/webapp/ apps/cookbook/src/main/webapp/WEB-I...
Date Thu, 06 Apr 2006 21:19:23 GMT
Author: wsmoak
Date: Thu Apr  6 14:19:10 2006
New Revision: 392080

URL: http://svn.apache.org/viewcvs?rev=392080&view=rev
Log:
Un-comment the apps module, and add poms for apps and cookbook.
Restructure cookbook to src/main/java and src/main/webapp.
Switch to the Maven 2 repo on cvs.apache.org

Added:
    struts/action/trunk/apps/cookbook/pom.xml   (with props)
    struts/action/trunk/apps/cookbook/src/main/
    struts/action/trunk/apps/cookbook/src/main/java/
      - copied from r391907, struts/action/trunk/apps/cookbook/src/java/
    struts/action/trunk/apps/cookbook/src/main/java/examples/
      - copied from r392077, struts/action/trunk/apps/cookbook/src/java/examples/
    struts/action/trunk/apps/cookbook/src/main/webapp/
      - copied from r391907, struts/action/trunk/apps/cookbook/src/webapp/
    struts/action/trunk/apps/cookbook/src/main/webapp/WEB-INF/
      - copied from r392077, struts/action/trunk/apps/cookbook/src/webapp/WEB-INF/
    struts/action/trunk/apps/cookbook/src/main/webapp/css/
      - copied from r392077, struts/action/trunk/apps/cookbook/src/webapp/css/
    struts/action/trunk/apps/cookbook/src/main/webapp/images/
      - copied from r392077, struts/action/trunk/apps/cookbook/src/webapp/images/
    struts/action/trunk/apps/cookbook/src/main/webapp/index.jsp
      - copied unchanged from r392077, struts/action/trunk/apps/cookbook/src/webapp/index.jsp
    struts/action/trunk/apps/cookbook/src/main/webapp/jsp/
      - copied from r392077, struts/action/trunk/apps/cookbook/src/webapp/jsp/
    struts/action/trunk/apps/cookbook/src/main/webapp/source.jsp
      - copied unchanged from r392077, struts/action/trunk/apps/cookbook/src/webapp/source.jsp
    struts/action/trunk/apps/pom.xml   (with props)
Removed:
    struts/action/trunk/apps/cookbook/src/java/
    struts/action/trunk/apps/cookbook/src/webapp/
Modified:
    struts/action/trunk/core/pom.xml
    struts/action/trunk/pom.xml

Added: struts/action/trunk/apps/cookbook/pom.xml
URL: http://svn.apache.org/viewcvs/struts/action/trunk/apps/cookbook/pom.xml?rev=392080&view=auto
==============================================================================
--- struts/action/trunk/apps/cookbook/pom.xml (added)
+++ struts/action/trunk/apps/cookbook/pom.xml Thu Apr  6 14:19:10 2006
@@ -0,0 +1,66 @@
+<?xml version="1.0"?>
+<!--
+/* 
+ * Copyright 2005-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$
+ */
+-->
+
+<!-- 
+             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>org.apache.struts.action</groupId>
+      <artifactId>struts-apps</artifactId>
+      <version>1.3.2-SNAPSHOT</version>
+   </parent>
+
+   <modelVersion>4.0.0</modelVersion>
+   <artifactId>struts-cookbook</artifactId>
+   <packaging>war</packaging>
+   <name>Struts Action - Apps - Cookbook</name>
+   
+   <dependencies>
+      <dependency>
+         <groupId>${pom.groupId}</groupId>
+         <artifactId>struts-core</artifactId>
+         <version>${pom.version}</version>
+      </dependency>
+      <dependency>
+         <groupId>javax.servlet</groupId>
+         <artifactId>servlet-api</artifactId>
+         <version>2.3</version>
+         <scope>provided</scope>
+      </dependency>
+   </dependencies>
+   
+   <build>
+     <finalName>${pom.artifactId}</finalName>
+   </build>
+
+</project>
\ No newline at end of file

Propchange: struts/action/trunk/apps/cookbook/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: struts/action/trunk/apps/cookbook/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Added: struts/action/trunk/apps/pom.xml
URL: http://svn.apache.org/viewcvs/struts/action/trunk/apps/pom.xml?rev=392080&view=auto
==============================================================================
--- struts/action/trunk/apps/pom.xml (added)
+++ struts/action/trunk/apps/pom.xml Thu Apr  6 14:19:10 2006
@@ -0,0 +1,52 @@
+<?xml version="1.0"?>
+<!--
+/* 
+ * Copyright 2005-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$
+ */
+-->
+
+<!-- 
+             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>org.apache.struts.action</groupId>
+      <artifactId>struts-build</artifactId>
+      <version>1.3.2-SNAPSHOT</version>
+   </parent>
+
+   <modelVersion>4.0.0</modelVersion>
+   <artifactId>struts-apps</artifactId>
+   <packaging>pom</packaging>
+   <name>Struts Action - Apps</name>
+
+   <modules>
+      <module>cookbook</module>
+   </modules>
+
+</project>
\ No newline at end of file

Propchange: struts/action/trunk/apps/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: struts/action/trunk/apps/pom.xml
------------------------------------------------------------------------------
    svn:executable = *

Propchange: struts/action/trunk/apps/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Modified: struts/action/trunk/core/pom.xml
URL: http://svn.apache.org/viewcvs/struts/action/trunk/core/pom.xml?rev=392080&r1=392079&r2=392080&view=diff
==============================================================================
--- struts/action/trunk/core/pom.xml (original)
+++ struts/action/trunk/core/pom.xml Thu Apr  6 14:19:10 2006
@@ -113,7 +113,12 @@
                 </includes>
             </testResource>
         </testResources>
+     </build>
         
+     <profiles>
+       <profile>
+        <id>generate-assembly</id>
+        <build>
         <plugins>
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
@@ -136,8 +141,9 @@
             </executions>
           </plugin>
        </plugins>
-
-    </build>
+       </build>
+      </profile>
+    </profiles>
 
     <dependencies>
         <dependency>

Modified: struts/action/trunk/pom.xml
URL: http://svn.apache.org/viewcvs/struts/action/trunk/pom.xml?rev=392080&r1=392079&r2=392080&view=diff
==============================================================================
--- struts/action/trunk/pom.xml (original)
+++ struts/action/trunk/pom.xml Thu Apr  6 14:19:10 2006
@@ -275,7 +275,7 @@
         <module>taglib</module>
         <module>faces</module>
         <module>scripting</module>
-        <!--module>apps</module-->
+        <module>apps</module>
     </modules>
 
     <licenses>
@@ -314,10 +314,9 @@
 
     <repositories>
         <repository>
-            <id>apache-internal</id>
+            <id>apache-snapshot</id>
             <name>Apache Internal Repository</name>
-            <url>http://cvs.apache.org/repository</url>
-            <layout>legacy</layout>
+            <url>http://cvs.apache.org/maven-snapshot-repository</url>
         </repository>
     </repositories>
 



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@struts.apache.org
For additional commands, e-mail: dev-help@struts.apache.org


Mime
View raw message