Author: mrdon
Date: Sun May 14 18:01:55 2006
New Revision: 406492
URL: http://svn.apache.org/viewcvs?rev=406492&view=rev
Log:
Removing empty directories, removing cewolf tag and chart action from
portlet webapp, split showcase and extras into "extras" profile,
synchronized root pom with action 1
Removed:
struts/action2/trunk/apps/portlet/src/main/java/com/
struts/action2/trunk/apps/portlet/src/main/java/org/apache/struts/action2/portlet/example/ChartExampleAction.java
Modified:
struts/action2/trunk/apps/pom.xml
struts/action2/trunk/apps/portlet/pom.xml
struts/action2/trunk/apps/portlet/src/main/etc/exo/web.xml
struts/action2/trunk/apps/portlet/src/main/etc/gridsphere/web.xml
struts/action2/trunk/apps/portlet/src/main/etc/liferay3.6.1/web.xml
struts/action2/trunk/pom.xml
Modified: struts/action2/trunk/apps/pom.xml
URL:
http://svn.apache.org/viewcvs/struts/action2/trunk/apps/pom.xml?rev=406492&r1=406491&r2=406492&view=diff
==============================================================================
--- struts/action2/trunk/apps/pom.xml (original)
+++ struts/action2/trunk/apps/pom.xml Sun May 14 18:01:55 2006
@@ -15,7 +15,7 @@
<module>blank</module>
<module>portlet</module>
<module>shopping-cart</module>
- <module>showcase</module>
+ <!--<module>showcase</module>-->
<module>starter</module>
</modules>
@@ -27,6 +27,12 @@
</distributionManagement>
<profiles>
+ <profile>
+ <id>extras</id>
+ <modules>
+ <module>showcase</module>
+ </modules>
+ </profile>
<profile>
<id>hostedqa</id>
<dependencies>
Modified: struts/action2/trunk/apps/portlet/pom.xml
URL:
http://svn.apache.org/viewcvs/struts/action2/trunk/apps/portlet/pom.xml?rev=406492&r1=406491&r2=406492&view=diff
==============================================================================
--- struts/action2/trunk/apps/portlet/pom.xml (original)
+++ struts/action2/trunk/apps/portlet/pom.xml Sun May 14 18:01:55 2006
@@ -20,19 +20,6 @@
</dependency>
<dependency>
- <groupId>cewolf</groupId>
- <artifactId>cewolf</artifactId>
- <version>1.0</version>
- <scope>provided</scope>
- <exclusions>
- <exclusion>
- <groupId>gnujaxp</groupId>
- <artifactId>gnujaxp</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<version>2.4</version>
Modified: struts/action2/trunk/apps/portlet/src/main/etc/exo/web.xml
URL:
http://svn.apache.org/viewcvs/struts/action2/trunk/apps/portlet/src/main/etc/exo/web.xml?rev=406492&r1=406491&r2=406492&view=diff
==============================================================================
--- struts/action2/trunk/apps/portlet/src/main/etc/exo/web.xml (original)
+++ struts/action2/trunk/apps/portlet/src/main/etc/exo/web.xml Sun May 14
18:01:55 2006
@@ -50,16 +50,8 @@
org.exoplatform.services.portletcontainer.impl.servlet.ServletWrapper
</servlet-class>
</servlet>
- <servlet>
- <servlet-name>CewolfServlet</servlet-name>
- <servlet-class>de.laures.cewolf.CewolfRenderer</servlet-class>
- </servlet>
<servlet-mapping>
- <servlet-name>CewolfServlet</servlet-name>
- <url-pattern>/cewolf/*</url-pattern>
- </servlet-mapping>
- <servlet-mapping>
<servlet-name>dwr</servlet-name>
<url-pattern>/dwr/*</url-pattern>
</servlet-mapping>
@@ -67,10 +59,5 @@
<servlet-name>PortletWrapper</servlet-name>
<url-pattern>/PortletWrapper</url-pattern>
</servlet-mapping>
-
- <taglib>
- <taglib-uri>/cewolf</taglib-uri>
- <taglib-location>/WEB-INF/tld/cewolf.tld</taglib-location>
- </taglib>
</web-app>
Modified: struts/action2/trunk/apps/portlet/src/main/etc/gridsphere/web.xml
URL:
http://svn.apache.org/viewcvs/struts/action2/trunk/apps/portlet/src/main/etc/gridsphere/web.xml?rev=406492&r1=406491&r2=406492&view=diff
==============================================================================
--- struts/action2/trunk/apps/portlet/src/main/etc/gridsphere/web.xml (original)
+++ struts/action2/trunk/apps/portlet/src/main/etc/gridsphere/web.xml Sun May
14 18:01:55 2006
@@ -50,16 +50,8 @@
org.gridlab.gridsphere.provider.portlet.jsr.PortletServlet
</servlet-class>
</servlet>
- <servlet>
- <servlet-name>CewolfServlet</servlet-name>
- <servlet-class>de.laures.cewolf.CewolfRenderer</servlet-class>
- </servlet>
<servlet-mapping>
- <servlet-name>CewolfServlet</servlet-name>
- <url-pattern>/cewolf/*</url-pattern>
- </servlet-mapping>
- <servlet-mapping>
<servlet-name>dwr</servlet-name>
<url-pattern>/dwr/*</url-pattern>
</servlet-mapping>
@@ -67,10 +59,5 @@
<servlet-name>PortletServlet</servlet-name>
<url-pattern>/jsr/struts-portlet</url-pattern>
</servlet-mapping>
-
- <taglib>
- <taglib-uri>/cewolf</taglib-uri>
- <taglib-location>/WEB-INF/tld/cewolf.tld</taglib-location>
- </taglib>
</web-app>
Modified: struts/action2/trunk/apps/portlet/src/main/etc/liferay3.6.1/web.xml
URL:
http://svn.apache.org/viewcvs/struts/action2/trunk/apps/portlet/src/main/etc/liferay3.6.1/web.xml?rev=406492&r1=406491&r2=406492&view=diff
==============================================================================
--- struts/action2/trunk/apps/portlet/src/main/etc/liferay3.6.1/web.xml
(original)
+++ struts/action2/trunk/apps/portlet/src/main/etc/liferay3.6.1/web.xml Sun May
14 18:01:55 2006
@@ -62,16 +62,8 @@
<servlet-name>dwr</servlet-name>
<servlet-class>uk.ltd.getahead.dwr.DWRServlet</servlet-class>
</servlet>
- <servlet>
- <servlet-name>CewolfServlet</servlet-name>
- <servlet-class>de.laures.cewolf.CewolfRenderer</servlet-class>
- </servlet>
<servlet-mapping>
- <servlet-name>CewolfServlet</servlet-name>
- <url-pattern>/cewolf/*</url-pattern>
- </servlet-mapping>
- <servlet-mapping>
<servlet-name>dwr</servlet-name>
<url-pattern>/dwr/*</url-pattern>
</servlet-mapping>
@@ -79,9 +71,5 @@
<servlet-name>StrutsPortlet</servlet-name>
<url-pattern>/StrutsPortlet/*</url-pattern>
</servlet-mapping>
- <taglib>
- <taglib-uri>/cewolf</taglib-uri>
- <taglib-location>/WEB-INF/tld/cewolf.tld</taglib-location>
- </taglib>
</web-app>
Modified: struts/action2/trunk/pom.xml
URL:
http://svn.apache.org/viewcvs/struts/action2/trunk/pom.xml?rev=406492&r1=406491&r2=406492&view=diff
==============================================================================
--- struts/action2/trunk/pom.xml (original)
+++ struts/action2/trunk/pom.xml Sun May 14 18:01:55 2006
@@ -1,23 +1,46 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+<!--
+/*
+ * 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";>
-
- <parent>
+
+ <parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts-parent</artifactId>
<version>2</version>
</parent>
-
+
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.struts.action2</groupId>
- <version>2.0-SNAPSHOT</version>
<artifactId>project</artifactId>
+ <version>2.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Struts Action 2</name>
<url>http://struts.apache.org/struts-action2</url>
-
+ <description>Apache Struts Action Framework 2</description>
+
<inceptionYear>2006</inceptionYear>
-
+
+ <!--
<description>
Struts Action 2 is a Java web-application development framework.
It is built specifically with developer productivity and
@@ -26,19 +49,20 @@
internationalization, dynamic form parameter mapping to JavaBeans,
robust client and server side validation, and much more.
</description>
+ -->
<scm>
<connection>scm:svn:http://svn.apache.org/repos/asf/struts/action2/trunk</connection>
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/action2/trunk</developerConnection>
<url>http://svn.apache.org/viewcvs.cgi/struts/action2/trunk</url>
</scm>
-
+
<issueManagement>
<system>JIRA</system>
<url>http://issues.apache.org/struts/</url>
</issueManagement>
-
- <ciManagement/>
+
+ <ciManagement/>
<distributionManagement>
<repository>
<id>apache-maven-test-builds</id>
@@ -50,10 +74,10 @@
<url>scp://people.apache.org/www/struts.apache.org/struts-action2/</url>
</site>
</distributionManagement>
-
+
<modules>
<module>core</module>
- <module>extras</module>
+ <module>assembly</module>
<module>apps</module>
</modules>
@@ -65,62 +89,12 @@
<comments/>
</license>
</licenses>
-
- <organization>
+
+ <organization>
<name>Apache Software Foundation</name>
<url>http://www.apache.org</url>
</organization>
-
- <repositories>
- <repository>
- <id>snapshots-maven-codehaus</id>
- <name>snapshots-maven-codehaus</name>
- <snapshots>
- <enabled>true</enabled>
- <updatePolicy>always</updatePolicy>
- <checksumPolicy>ignore</checksumPolicy>
- </snapshots>
- <releases>
- <enabled>false</enabled>
- </releases>
- <url>http://snapshots.maven.codehaus.org/maven2</url>
- </repository>
- <repository>
- <id>apache</id>
- <name>apache</name>
- <layout>legacy</layout>
- <snapshots>
- <enabled>true</enabled>
- <updatePolicy>always</updatePolicy>
- <checksumPolicy>ignore</checksumPolicy>
- </snapshots>
- <releases>
- <enabled>false</enabled>
- </releases>
- <url>http://cvs.apache.org/repository</url>
- </repository>
- <repository>
- <id>apache.snapshots</id>
- <name>Apache Maven Repository (Snapshots and Test Builds)</name>
- <url>http://cvs.apache.org/maven-snapshot-repository</url>
- <releases><enabled>true</enabled></releases>
- <snapshots><enabled>true</enabled></snapshots>
- </repository>
- <repository>
- <id>opensymphony</id>
- <name>opensymphony</name>
- <layout>legacy</layout>
- <snapshots>
- <enabled>true</enabled>
- <updatePolicy>always</updatePolicy>
- <checksumPolicy>ignore</checksumPolicy>
- </snapshots>
- <releases>
- <enabled>false</enabled>
- </releases>
- <url>http://maven.opensymphony.com</url>
- </repository>
- </repositories>
+
<profiles>
<profile>
<id>extras</id>
@@ -152,51 +126,66 @@
<build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-idea-plugin</artifactId>
- <configuration>
- <jdkName>1.5</jdkName>
- <exclude>target,test-output,.clover</exclude>
- <useShortDependencyNames>true</useShortDependencyNames>
- <!--
- <libraries>
- <library>
- <name>xwork</name>
- <sources>file://$xwork$/src/java</sources>
- </library>
- <library>
- <name>xwork-tiger</name>
- <sources>file://$xwork$/tiger/src/java</sources>
- </library>
- </libraries>
- -->
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <includes>
- <include>**/*Test.java</include>
- </includes>
- <excludes>
- <exclude>**/TestBean.java</exclude>
- </excludes>
- </configuration>
- </plugin>
- </plugins>
-
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-idea-plugin</artifactId>
+ <configuration>
+ <jdkName>1.5</jdkName>
+ <exclude>target,test-output,.clover</exclude>
+ <useShortDependencyNames>true</useShortDependencyNames>
+ <!--
+ <libraries>
+ <library>
+ <name>xwork</name>
+ <sources>file://$xwork$/src/java</sources>
+ </library>
+ <library>
+ <name>xwork-tiger</name>
+
<sources>file://$xwork$/tiger/src/java</sources>
+ </library>
+ </libraries>
+ -->
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-site-plugin</artifactId>
+ <version>2.0-beta-4</version>
+ </plugin>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <includes>
+ <include>**/*Test.java</include>
+ </includes>
+ <excludes>
+ <exclude>**/TestBean.java</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+
+ <extensions>
+ <extension>
+ <groupId>org.apache.struts</groupId>
+ <artifactId>struts-build</artifactId>
+ <version>1.0.1</version>
+ </extension>
+ </extensions>
+
<defaultGoal>install</defaultGoal>
+
</build>
-
+
<reporting>
<plugins>
<plugin>
@@ -231,5 +220,56 @@
</reporting>
<dependencies/>
-
+
+ <repositories>
+ <repository>
+ <id>snapshots-maven-codehaus</id>
+ <name>snapshots-maven-codehaus</name>
+ <snapshots>
+ <enabled>true</enabled>
+ <updatePolicy>always</updatePolicy>
+ <checksumPolicy>ignore</checksumPolicy>
+ </snapshots>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ <url>http://snapshots.maven.codehaus.org/maven2</url>
+ </repository>
+ <repository>
+ <id>apache</id>
+ <name>apache</name>
+ <layout>legacy</layout>
+ <snapshots>
+ <enabled>true</enabled>
+ <updatePolicy>always</updatePolicy>
+ <checksumPolicy>ignore</checksumPolicy>
+ </snapshots>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ <url>http://cvs.apache.org/repository</url>
+ </repository>
+ <repository>
+ <id>apache.snapshots</id>
+ <name>Apache Maven Repository (Snapshots and Test Builds)</name>
+ <url>http://cvs.apache.org/maven-snapshot-repository</url>
+ <releases><enabled>true</enabled></releases>
+ <snapshots><enabled>true</enabled></snapshots>
+ </repository>
+ <repository>
+ <id>opensymphony</id>
+ <name>opensymphony</name>
+ <layout>legacy</layout>
+ <snapshots>
+ <enabled>true</enabled>
+ <updatePolicy>always</updatePolicy>
+ <checksumPolicy>ignore</checksumPolicy>
+ </snapshots>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ <url>http://maven.opensymphony.com</url>
+ </repository>
+ </repositories>
+
</project>
