Apache/struts
1
0
Fork 0
mirror of https://github.com/apache/struts.git synced 2026-08-05 22:56:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Removing empty directories, removing cewolf tag and chart action from

Browse Source 
portlet webapp, split showcase and extras into "extras" profile,
synchronized root pom with action 1


git-svn-id: https://svn.apache.org/repos/asf/struts/action2/trunk@406492 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Donald J. Brown
2006-05-15 01:01:55 +00:00
parent f48c0e37f3
commit 3c82a3efaa
7 changed files with 171 additions and 274 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/pom.xml
+7 -1
View File
@@ -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>
apps/portlet/pom.xml
-13
View File
@@ -19,19 +19,6 @@
<scope>provided</scope>
</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>
apps/portlet/src/main/etc/exo/web.xml
-13
View File
@@ -50,15 +50,7 @@
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>
@@ -68,9 +60,4 @@
<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>
apps/portlet/src/main/etc/gridsphere/web.xml
-13
View File
@@ -50,15 +50,7 @@
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>
@@ -68,9 +60,4 @@
<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>
apps/portlet/src/main/etc/liferay3.6.1/web.xml
-12
View File
@@ -62,15 +62,7 @@
<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>
@@ -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>
apps/portlet/src/main/java/org/apache/struts/action2/portlet/example/ChartExampleAction.java
-98
View File
@@ -1,98 +0,0 @@
/*
* $Id$
*
* 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.
*/
package org.apache.struts.action2.portlet.example;
import java.util.Date;
import java.util.Map;
import org.jfree.data.category.DefaultCategoryDataset;
import org.jfree.data.general.DefaultPieDataset;
import com.opensymphony.xwork.ActionSupport;
import de.laures.cewolf.DatasetProduceException;
import de.laures.cewolf.DatasetProducer;
/**
*/
public class ChartExampleAction extends ActionSupport {
private DatasetProducer pieChartProducer;
private DatasetProducer lineChartProducer;
private final String[] categories = { "mon", "tue", "wen", "thu", "fri",
"sat", "sun" };
private final String[] seriesNames = { "cewolfset.jsp", "tutorial.jsp",
"testpage.jsp", "performancetest.jsp" };
public ChartExampleAction() {
pieChartProducer = new DatasetProducer() {
public Object produceDataset(Map params)
throws DatasetProduceException {
DefaultPieDataset pieDataSet = new DefaultPieDataset();
pieDataSet.setValue("Series 1", 0.3);
pieDataSet.setValue("Series 2", 0.7);
return pieDataSet;
}
public boolean hasExpired(Map params, Date date) {
return true;
}
public String getProducerId() {
return "pieChartProducer";
}
};
lineChartProducer = new DatasetProducer() {
public Object produceDataset(Map params)
throws DatasetProduceException {
DefaultCategoryDataset dataSet = new DefaultCategoryDataset();
for (int series = 0; series < seriesNames.length; series++) {
int lastY = (int) (Math.random() * 1000 + 1000);
for (int i = 0; i < categories.length; i++) {
final int y = lastY + (int) (Math.random() * 200 - 100);
lastY = y;
dataSet.addValue(y, seriesNames[series], categories[i]);
}
}
return dataSet;
}
public boolean hasExpired(Map params, Date date) {
return true;
}
public String getProducerId() {
return "lineChartProducer";
}
};
}
public DatasetProducer getLineChartProducer() {
return lineChartProducer;
}
public DatasetProducer getPieChartProducer() {
return pieChartProducer;
}
}
pom.xml
+164 -124
View File
@@ -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,12 +89,138 @@
<comments/>
</license>
</licenses>
<organization>
<organization>
<name>Apache Software Foundation</name>
<url>http://www.apache.org</url>
</organization>
<profiles>
<profile>
<id>extras</id>
<modules>
<module>extras</module>
</modules>
</profile>
<profile>
<id>all</id>
<modules>
<module>uber</module>
</modules>
</profile>
<profile>
<id>xwork</id>
<modules>
<module>../xwork</module>
</modules>
</profile>
<profile>
<activation>
<jdk>1.4</jdk>
</activation>
<dependencies>
<!-- should have the org.w3c.dom dependency here -->
</dependencies>
</profile>
</profiles>
<build>
<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>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
</plugin>
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<aggregate>true</aggregate>
</configuration>
</plugin>
<plugin>
<artifactId>maven-surefire-report-plugin</artifactId>
</plugin>
<!--
<plugin>
<artifactId>maven-checkstyle-plugin</artifactId>
<configuration>
<configLocation>org/apache/struts/build/struts_checks.xml</configLocation>
</configuration>
</plugin>
-->
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>jxr-maven-plugin</artifactId>
</plugin>
<plugin>
<artifactId>maven-pmd-plugin</artifactId>
</plugin>
</plugins>
</reporting>
<dependencies/>
<repositories>
<repository>
<id>snapshots-maven-codehaus</id>
@@ -121,115 +271,5 @@
<url>http://maven.opensymphony.com</url>
</repository>
</repositories>
<profiles>
<profile>
<id>extras</id>
<modules>
<module>extras</module>
</modules>
</profile>
<profile>
<id>all</id>
<modules>
<module>uber</module>
</modules>
</profile>
<profile>
<id>xwork</id>
<modules>
<module>../xwork</module>
</modules>
</profile>
<profile>
<activation>
<jdk>1.4</jdk>
</activation>
<dependencies>
<!-- should have the org.w3c.dom dependency here -->
</dependencies>
</profile>
</profiles>
<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>
<defaultGoal>install</defaultGoal>
</build>
<reporting>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
</plugin>
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<aggregate>true</aggregate>
</configuration>
</plugin>
<plugin>
<artifactId>maven-surefire-report-plugin</artifactId>
</plugin>
<!--
<plugin>
<artifactId>maven-checkstyle-plugin</artifactId>
<configuration>
<configLocation>org/apache/struts/build/struts_checks.xml</configLocation>
</configuration>
</plugin>
-->
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>jxr-maven-plugin</artifactId>
</plugin>
<plugin>
<artifactId>maven-pmd-plugin</artifactId>
</plugin>
</plugins>
</reporting>
<dependencies/>
</project>