svn commit: r397633 - in /incubator/webwork2/uber: pom.xml src/assemble/main.xml
Author: plightbo Date: Thu Apr 27 14:00:52 2006 New Revision: 397633 URL: http://svn.apache.org/viewcvs?rev=397633view=rev Log: assembly stuff Modified: incubator/webwork2/uber/pom.xml incubator/webwork2/uber/src/assemble/main.xml Modified: incubator/webwork2/uber/pom.xml URL: http://svn.apache.org/viewcvs/incubator/webwork2/uber/pom.xml?rev=397633r1=397632r2=397633view=diff == --- incubator/webwork2/uber/pom.xml (original) +++ incubator/webwork2/uber/pom.xml Thu Apr 27 14:00:52 2006 @@ -12,26 +12,25 @@ packagingpom/packaging nameUber Jar/name build - plugins -plugin - groupIdorg.apache.maven.plugins/groupId - artifactIdmaven-assembly-plugin/artifactId - configuration -descriptorsrc/assemble/main.xml/descriptor - /configuration - !-- Note: We need to turn this off because of http://jira.codehaus.org/browse/MNG-1684 -- - !-- - executions -execution - phasepackage/phase - goals -goalattached/goal - /goals -/execution - /executions - -- -/plugin - /plugins +!-- +plugins +plugin +groupIdorg.apache.maven.plugins/groupId +artifactIdmaven-assembly-plugin/artifactId +configuration +descriptorsrc/assemble/main.xml/descriptor +/configuration +executions +execution +phasepackage/phase +goals +goalassembly/goal +/goals +/execution +/executions +/plugin +/plugins +-- /build dependencies dependency Modified: incubator/webwork2/uber/src/assemble/main.xml URL: http://svn.apache.org/viewcvs/incubator/webwork2/uber/src/assemble/main.xml?rev=397633r1=397632r2=397633view=diff == --- incubator/webwork2/uber/src/assemble/main.xml (original) +++ incubator/webwork2/uber/src/assemble/main.xml Thu Apr 27 14:00:52 2006 @@ -8,6 +8,7 @@ outputDirectory//outputDirectory includes includeorg.apache.struts.action2:action/include + includeorg.apache.struts.action2:action-api/include includeorg.apache.struts.action2:action-jasperreports/include includeorg.apache.struts.action2:action-jfreechart/include includeorg.apache.struts.action2:action-pell-file-upload/include - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r397636 - /incubator/webwork2/project.iws
Author: plightbo Date: Thu Apr 27 14:09:46 2006 New Revision: 397636 URL: http://svn.apache.org/viewcvs?rev=397636view=rev Log: whoops, this shouldn't have been checked in Removed: incubator/webwork2/project.iws - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r397638 - /incubator/webwork2/src/main/idea/project.xml
Author: plightbo Date: Thu Apr 27 14:11:09 2006 New Revision: 397638 URL: http://svn.apache.org/viewcvs?rev=397638view=rev Log: code style Added: incubator/webwork2/src/main/idea/project.xml Added: incubator/webwork2/src/main/idea/project.xml URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/main/idea/project.xml?rev=397638view=auto == --- incubator/webwork2/src/main/idea/project.xml (added) +++ incubator/webwork2/src/main/idea/project.xml Thu Apr 27 14:11:09 2006 @@ -0,0 +1,14 @@ +?xml version=1.0 encoding=UTF-8? +project version=4 relativePaths=false + component name=CodeStyleManager +option name=USE_DEFAULT_CODE_STYLE_SCHEME value=true / +option name=CODE_STYLE_SCHEME value= / + /component + component name=CodeStyleSettingsManager +option name=PER_PROJECT_SETTINGS + value / +/option +option name=USE_PER_PROJECT_SETTINGS value=true / + /component +/project + - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r397339 - in /incubator/webwork2: ./ action-api/ action-api/src/ action-api/src/main/ action-api/src/main/java/ action-api/src/main/resources/ action-api/src/test/ action-api/src/test/java
Author: plightbo
Date: Wed Apr 26 16:27:46 2006
New Revision: 397339
URL: http://svn.apache.org/viewcvs?rev=397339view=rev
Log:
action-api module
Added:
incubator/webwork2/action-api/
incubator/webwork2/action-api/pom.xml
incubator/webwork2/action-api/src/
incubator/webwork2/action-api/src/main/
incubator/webwork2/action-api/src/main/java/
incubator/webwork2/action-api/src/main/resources/
incubator/webwork2/action-api/src/test/
incubator/webwork2/action-api/src/test/java/
incubator/webwork2/action-api/src/test/resources/
incubator/webwork2/project.iws
Modified:
incubator/webwork2/action/pom.xml
incubator/webwork2/pom.xml
incubator/webwork2/uber/pom.xml
Added: incubator/webwork2/action-api/pom.xml
URL:
http://svn.apache.org/viewcvs/incubator/webwork2/action-api/pom.xml?rev=397339view=auto
==
--- incubator/webwork2/action-api/pom.xml (added)
+++ incubator/webwork2/action-api/pom.xml Wed Apr 26 16:27:46 2006
@@ -0,0 +1,17 @@
+?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;
+ xsi:schemaLocation=http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd;
+modelVersion4.0.0/modelVersion
+parent
+groupIdorg.apache.struts.action2/groupId
+artifactIdproject/artifactId
+version2.0-SNAPSHOT/version
+/parent
+groupIdorg.apache.struts.action2/groupId
+artifactIdaction-api/artifactId
+packagingjar/packaging
+nameStruts Action Framework 2.0 API/name
+dependencies
+
+/dependencies
+/project
Modified: incubator/webwork2/action/pom.xml
URL:
http://svn.apache.org/viewcvs/incubator/webwork2/action/pom.xml?rev=397339r1=397338r2=397339view=diff
==
--- incubator/webwork2/action/pom.xml (original)
+++ incubator/webwork2/action/pom.xml Wed Apr 26 16:27:46 2006
@@ -3,9 +3,9 @@
xsi:schemaLocation=http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd;
modelVersion4.0.0/modelVersion
parent
- groupIdorg.apache.struts.action2/groupId
- artifactIdproject/artifactId
- version2.0-SNAPSHOT/version
+groupIdorg.apache.struts.action2/groupId
+artifactIdproject/artifactId
+version2.0-SNAPSHOT/version
/parent
groupIdorg.apache.struts.action2/groupId
artifactIdaction/artifactId
@@ -25,6 +25,11 @@
dependency
groupIdopensymphony/groupId
artifactIdxwork/artifactId
+/dependency
+
+dependency
+groupIdorg.apache.struts.action2/groupId
+artifactIdaction-api/artifactId
/dependency
dependency
Modified: incubator/webwork2/pom.xml
URL:
http://svn.apache.org/viewcvs/incubator/webwork2/pom.xml?rev=397339r1=397338r2=397339view=diff
==
--- incubator/webwork2/pom.xml (original)
+++ incubator/webwork2/pom.xml Wed Apr 26 16:27:46 2006
@@ -64,6 +64,7 @@
/mailingList
/mailingLists
modules
+moduleaction-api/module
moduleaction/module
modulewebapps/module
/modules
@@ -183,6 +184,11 @@
/scm
dependencyManagement
dependencies
+dependency
+groupIdorg.apache.struts.action2/groupId
+artifactIdaction-api/artifactId
+version${project.version}/version
+/dependency
dependency
groupIdorg.apache.struts.action2/groupId
artifactIdaction/artifactId
Added: incubator/webwork2/project.iws
URL:
http://svn.apache.org/viewcvs/incubator/webwork2/project.iws?rev=397339view=auto
==
--- incubator/webwork2/project.iws (added)
+++ incubator/webwork2/project.iws Wed Apr 26 16:27:46 2006
@@ -0,0 +1,632 @@
+?xml version=1.0 encoding=UTF-8?
+project version=4 relativePaths=false
+ component name=AspectsView /
+ component name=BookmarkManager /
+ component name=ChangeBrowserSettings
+option name=MAIN_SPLITTER_PROPORTION value=0.3 /
+option name=MESSAGES_SPLITTER_PROPORTION value=0.8 /
+option name=USE_DATE_BEFORE_FILTER value=false /
+option name=USE_DATE_AFTER_FILTER value=false /
+option name=USE_CHANGE_BEFORE_FILTER value=false /
+option name=USE_CHANGE_AFTER_FILTER value=false /
+option name=DATE_BEFORE value= /
+option name=DATE_AFTER value= /
+option name=CHANGE_BEFORE value= /
+option name=CHANGE_AFTER value= /
+option name=USE_USER_FILTER value=false /
+option name=USER value= /
+ /component
+ component name=CheckinPanelState /
+ component name=Commander
+leftPanel /
+rightPanel /
+splitter proportion=0.5 /
+ /component
svn commit: r396790 - /incubator/webwork2/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/
Author: plightbo Date: Mon Apr 24 23:57:04 2006 New Revision: 396790 URL: http://svn.apache.org/viewcvs?rev=396790view=rev Log: WW-1296: applying patch that fixes tests so they pass again Modified: incubator/webwork2/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/optiontransferselect-1.txt incubator/webwork2/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/optiontransferselect-2.txt incubator/webwork2/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/optiontransferselect-3.txt incubator/webwork2/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/optiontransferselect-4.txt incubator/webwork2/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/optiontransferselect-5.txt incubator/webwork2/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/optiontransferselect-6.txt incubator/webwork2/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/optiontransferselect-7.txt Modified: incubator/webwork2/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/optiontransferselect-1.txt URL: http://svn.apache.org/viewcvs/incubator/webwork2/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/optiontransferselect-1.txt?rev=396790r1=396789r2=396790view=diff == --- incubator/webwork2/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/optiontransferselect-1.txt (original) +++ incubator/webwork2/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/optiontransferselect-1.txt Mon Apr 24 23:57:04 2006 @@ -1,7 +1,7 @@ tr td class=tdLabel/td td -script language=javascript src=/struts/optiontransferselect/optiontransferselect.js/script +script language=javascript src=/struts/optiontransferselect.js/script table border=0 tr td Modified: incubator/webwork2/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/optiontransferselect-2.txt URL: http://svn.apache.org/viewcvs/incubator/webwork2/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/optiontransferselect-2.txt?rev=396790r1=396789r2=396790view=diff == --- incubator/webwork2/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/optiontransferselect-2.txt (original) +++ incubator/webwork2/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/optiontransferselect-2.txt Mon Apr 24 23:57:04 2006 @@ -1,7 +1,7 @@ tr td class=tdLabel/td td -script language=javascript src=/struts/optiontransferselect/optiontransferselect.js/script +script language=javascript src=/struts/optiontransferselect.js/script table border=0 tr td Modified: incubator/webwork2/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/optiontransferselect-3.txt URL: http://svn.apache.org/viewcvs/incubator/webwork2/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/optiontransferselect-3.txt?rev=396790r1=396789r2=396790view=diff == --- incubator/webwork2/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/optiontransferselect-3.txt (original) +++ incubator/webwork2/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/optiontransferselect-3.txt Mon Apr 24 23:57:04 2006 @@ -1,7 +1,7 @@ tr td class=tdLabel/td td -script language=javascript src=/struts/optiontransferselect/optiontransferselect.js/script +script language=javascript src=/struts/optiontransferselect.js/script table border=0 tr td Modified: incubator/webwork2/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/optiontransferselect-4.txt URL: http://svn.apache.org/viewcvs/incubator/webwork2/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/optiontransferselect-4.txt?rev=396790r1=396789r2=396790view=diff == --- incubator/webwork2/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/optiontransferselect-4.txt (original) +++ incubator/webwork2/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/optiontransferselect-4.txt Mon Apr 24 23:57:04 2006 @@ -1,7 +1,7 @@ tr td class=tdLabel/td td -script language=javascript src=/struts/optiontransferselect/optiontransferselect.js/script +script language=javascript src=/struts/optiontransferselect.js/script table border=0 tr td Modified: incubator/webwork2/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/optiontransferselect-5.txt URL: http://svn.apache.org/viewcvs/incubator/webwork2/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/optiontransferselect-5.txt?rev=396790r1=396789r2=396790view=diff == --- incubator/webwork2/action/src
svn commit: r396750 - in /incubator/webwork2: action/src/main/java/org/apache/struts/action2/quickstart/QuickStart.java pom.xml src/main/idea/workspace.xml webapps/showcase/quickstart.xml
Author: plightbo
Date: Mon Apr 24 17:49:33 2006
New Revision: 396750
URL: http://svn.apache.org/viewcvs?rev=396750view=rev
Log:
QuickStart works under the maven build by taking advantage of the idea
configurations
Modified:
incubator/webwork2/action/src/main/java/org/apache/struts/action2/quickstart/QuickStart.java
incubator/webwork2/pom.xml
incubator/webwork2/src/main/idea/workspace.xml
incubator/webwork2/webapps/showcase/quickstart.xml
Modified:
incubator/webwork2/action/src/main/java/org/apache/struts/action2/quickstart/QuickStart.java
URL:
http://svn.apache.org/viewcvs/incubator/webwork2/action/src/main/java/org/apache/struts/action2/quickstart/QuickStart.java?rev=396750r1=396749r2=396750view=diff
==
---
incubator/webwork2/action/src/main/java/org/apache/struts/action2/quickstart/QuickStart.java
(original)
+++
incubator/webwork2/action/src/main/java/org/apache/struts/action2/quickstart/QuickStart.java
Mon Apr 24 17:49:33 2006
@@ -102,21 +102,41 @@
return;
}
+
+// ok, clean up the classpath crap
+TreeSet finalLibs = new TreeSet();
+for (Iterator iterator = c.getLibs().iterator(); iterator.hasNext();) {
+String s = (String) iterator.next();
+finalLibs.add(s);
+}
+TreeSet finalClasses = new TreeSet();
+for (Iterator iterator = c.getClassDirs().iterator();
iterator.hasNext();) {
+String s = (String) iterator.next();
+finalClasses.add(s);
+}
+TreeSet finalSources = new TreeSet();
+if (c.getSources() != null) {
+for (Iterator iterator = c.getSources().iterator();
iterator.hasNext();) {
+String s = (String) iterator.next();
+finalSources.add(s);
+}
+}
+
// explain what is being executed
System.out.println(Launching Jetty with the following
configuration:);
System.out.println(Jars/Directory of jars:);
-for (Iterator iterator = c.getLibs().iterator(); iterator.hasNext();) {
+for (Iterator iterator = finalLibs.iterator(); iterator.hasNext();) {
String s = (String) iterator.next();
System.out.println( + s);
}
System.out.println(Directories of classes:);
-for (Iterator iterator = c.getClassDirs().iterator();
iterator.hasNext();) {
+for (Iterator iterator = finalClasses.iterator(); iterator.hasNext();)
{
String s = (String) iterator.next();
System.out.println( + s);
}
-if (c.getSources() != null) {
+if (!finalSources.isEmpty()) {
System.out.println(Sources:);
-for (Iterator iterator = c.getSources().iterator();
iterator.hasNext();) {
+for (Iterator iterator = finalSources.iterator();
iterator.hasNext();) {
String s = (String) iterator.next();
System.out.println( + s);
}
@@ -130,12 +150,12 @@
// prepare the classloader
List libs = c.getLibs();
List classDirs = c.getClassDirs();
-ClassLoader parent = new MultiDirClassLoader((String[])
libs.toArray(new String[libs.size()]),
-(String[]) classDirs.toArray(new String[classDirs.size()]),
+ClassLoader parent = new MultiDirClassLoader((String[])
finalLibs.toArray(new String[finalLibs.size()]),
+(String[]) finalClasses.toArray(new
String[finalClasses.size()]),
Thread.currentThread().getContextClassLoader());
-if (c.getSources() != null) {
-for (Iterator iterator = c.getSources().iterator();
iterator.hasNext();) {
+if (!finalSources.isEmpty()) {
+for (Iterator iterator = finalSources.iterator();
iterator.hasNext();) {
String source = (String) iterator.next();
File file = new File(source);
CompilingClassLoader ccl = new CompilingClassLoader(parent,
file);
Modified: incubator/webwork2/pom.xml
URL:
http://svn.apache.org/viewcvs/incubator/webwork2/pom.xml?rev=396750r1=396749r2=396750view=diff
==
--- incubator/webwork2/pom.xml (original)
+++ incubator/webwork2/pom.xml Mon Apr 24 17:49:33 2006
@@ -142,6 +142,7 @@
jdkName1.5/jdkName
excludetarget,test-output,.clover/exclude
useShortDependencyNamestrue/useShortDependencyNames
+!--
libraries
library
namexwork/name
@@ -152,6 +153,7 @@
sourcesfile://$xwork$/tiger/src/java/sources
/library
/libraries
+--
/configuration
/plugin
svn commit: r396759 - in /incubator/webwork2: action/ webapps/showcase/ webapps/showcase/src/main/java/org/apache/struts/action2/showcase/sitemesh/ webapps/showcase/src/main/java/org/apache/struts/web
Author: plightbo
Date: Mon Apr 24 20:11:16 2006
New Revision: 396759
URL: http://svn.apache.org/viewcvs?rev=396759view=rev
Log:
more showcase cleanup
Added:
incubator/webwork2/webapps/showcase/src/main/java/org/apache/struts/action2/showcase/sitemesh/
incubator/webwork2/webapps/showcase/src/main/java/org/apache/struts/action2/showcase/sitemesh/NoneDecoratorMapper.java
Removed:
incubator/webwork2/webapps/showcase/src/main/java/org/apache/struts/webwork/
incubator/webwork2/webapps/showcase/src/main/webapp/ajax/lesson1/
incubator/webwork2/webapps/showcase/src/main/webapp/ajax/lesson2/
incubator/webwork2/webapps/showcase/src/main/webapp/ajax/lesson3/
incubator/webwork2/webapps/showcase/src/main/webapp/ajax/lesson5/
incubator/webwork2/webapps/showcase/src/main/webapp/ajax/lesson6/
Modified:
incubator/webwork2/action/pom.xml
incubator/webwork2/webapps/showcase/pom.xml
incubator/webwork2/webapps/showcase/src/main/webapp/WEB-INF/sitemesh.xml
incubator/webwork2/webapps/showcase/src/main/webapp/ajax/AjaxResult.jsp
incubator/webwork2/webapps/showcase/src/main/webapp/ajax/AjaxResult3.jsp
incubator/webwork2/webapps/showcase/src/main/webapp/ajax/testjs.jsp
Modified: incubator/webwork2/action/pom.xml
URL:
http://svn.apache.org/viewcvs/incubator/webwork2/action/pom.xml?rev=396759r1=396758r2=396759view=diff
==
--- incubator/webwork2/action/pom.xml (original)
+++ incubator/webwork2/action/pom.xml Mon Apr 24 20:11:16 2006
@@ -97,7 +97,6 @@
!-- Sitemesh --
dependency
-!-- group should be com.opensymphony --
groupIdopensymphony/groupId
artifactIdsitemesh/artifactId
optionaltrue/optional
Modified: incubator/webwork2/webapps/showcase/pom.xml
URL:
http://svn.apache.org/viewcvs/incubator/webwork2/webapps/showcase/pom.xml?rev=396759r1=396758r2=396759view=diff
==
--- incubator/webwork2/webapps/showcase/pom.xml (original)
+++ incubator/webwork2/webapps/showcase/pom.xml Mon Apr 24 20:11:16 2006
@@ -13,6 +13,16 @@
nameShowcase Webapp/name
dependencies
dependency
+groupIdopensymphony/groupId
+artifactIdsitemesh/artifactId
+/dependency
+
+dependency
+groupIduk.ltd.getahead/groupId
+artifactIddwr/artifactId
+/dependency
+
+dependency
groupIdlog4j/groupId
artifactIdlog4j/artifactId
/dependency
Added:
incubator/webwork2/webapps/showcase/src/main/java/org/apache/struts/action2/showcase/sitemesh/NoneDecoratorMapper.java
URL:
http://svn.apache.org/viewcvs/incubator/webwork2/webapps/showcase/src/main/java/org/apache/struts/action2/showcase/sitemesh/NoneDecoratorMapper.java?rev=396759view=auto
==
---
incubator/webwork2/webapps/showcase/src/main/java/org/apache/struts/action2/showcase/sitemesh/NoneDecoratorMapper.java
(added)
+++
incubator/webwork2/webapps/showcase/src/main/java/org/apache/struts/action2/showcase/sitemesh/NoneDecoratorMapper.java
Mon Apr 24 20:11:16 2006
@@ -0,0 +1,20 @@
+package org.apache.struts.action2.showcase.sitemesh;
+
+import com.opensymphony.module.sitemesh.Decorator;
+import com.opensymphony.module.sitemesh.Page;
+import com.opensymphony.module.sitemesh.mapper.AbstractDecoratorMapper;
+
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * @author Patrick Lightbody (plightbo at gmail dot com)
+ */
+public class NoneDecoratorMapper extends AbstractDecoratorMapper {
+public Decorator getDecorator(HttpServletRequest req, Page page) {
+if (none.equals(req.getAttribute(decorator))) {
+return null;
+}
+
+return super.getDecorator(req, page);
+}
+}
Modified:
incubator/webwork2/webapps/showcase/src/main/webapp/WEB-INF/sitemesh.xml
URL:
http://svn.apache.org/viewcvs/incubator/webwork2/webapps/showcase/src/main/webapp/WEB-INF/sitemesh.xml?rev=396759r1=396758r2=396759view=diff
==
--- incubator/webwork2/webapps/showcase/src/main/webapp/WEB-INF/sitemesh.xml
(original)
+++ incubator/webwork2/webapps/showcase/src/main/webapp/WEB-INF/sitemesh.xml
Mon Apr 24 20:11:16 2006
@@ -47,6 +47,9 @@
mapper
class=com.opensymphony.module.sitemesh.mapper.FileDecoratorMapper
/mapper
+mapper
class=org.apache.struts.action2.showcase.sitemesh.NoneDecoratorMapper
+/mapper
+
mapper
class=com.opensymphony.module.sitemesh.mapper.ConfigDecoratorMapper
param name=config value=${decorators-file}/
/mapper
Modified:
incubator/webwork2/webapps/showcase/src/main/webapp/ajax/AjaxResult.jsp
URL:
http://svn.apache.org/viewcvs/incubator/webwork2/webapps/showcase/src/main
svn commit: r396345 - in /incubator/webwork2: ./ action/ action/src/main/java/org/apache/struts/action2/ action/src/test/java/org/apache/struts/action2/dispatcher/ action/src/test/java/org/apache/stru
Author: plightbo
Date: Sun Apr 23 16:48:36 2006
New Revision: 396345
URL: http://svn.apache.org/viewcvs?rev=396345view=rev
Log:
more tests now extend StrutsTestCase like they should; StrutsTestCase resets
more stuff like it should; refactored maven build to reduce version number
repetition
Modified:
incubator/webwork2/action/pom.xml
incubator/webwork2/action/src/main/java/org/apache/struts/action2/StrutsTestCase.java
incubator/webwork2/action/src/test/java/org/apache/struts/action2/dispatcher/DispatcherUtilsTest.java
incubator/webwork2/action/src/test/java/org/apache/struts/action2/dispatcher/HttpHeaderResultTest.java
incubator/webwork2/action/src/test/java/org/apache/struts/action2/interceptor/TokenInterceptorTest.java
incubator/webwork2/action/src/test/java/org/apache/struts/action2/portlet/context/PreparatorServletTest.java
incubator/webwork2/action/src/test/java/org/apache/struts/action2/portlet/util/StrutsUtilTest.java
incubator/webwork2/action/src/test/java/org/apache/struts/action2/spring/StrutsSpringObjectFactoryTest.java
incubator/webwork2/action/src/test/java/org/apache/struts/action2/views/jsp/ElseTagTest.java
incubator/webwork2/action/src/test/java/org/apache/struts/action2/views/xslt/XSLTResultTest.java
incubator/webwork2/pom.xml
incubator/webwork2/thirdparty/jasperreports/pom.xml
incubator/webwork2/thirdparty/jfreechart/pom.xml
incubator/webwork2/thirdparty/pell-file-upload/pom.xml
incubator/webwork2/thirdparty/pom.xml
incubator/webwork2/uber/pom.xml
incubator/webwork2/webapps/blank/pom.xml
incubator/webwork2/webapps/pom.xml
incubator/webwork2/webapps/portlet/pom.xml
incubator/webwork2/webapps/shopping-cart/pom.xml
incubator/webwork2/webapps/showcase/pom.xml
incubator/webwork2/webapps/starter/pom.xml
Modified: incubator/webwork2/action/pom.xml
URL:
http://svn.apache.org/viewcvs/incubator/webwork2/action/pom.xml?rev=396345r1=396344r2=396345view=diff
==
--- incubator/webwork2/action/pom.xml (original)
+++ incubator/webwork2/action/pom.xml Sun Apr 23 16:48:36 2006
@@ -8,7 +8,6 @@
version2.0-SNAPSHOT/version
/parent
groupIdorg.apache.struts.action2/groupId
-version2.0-SNAPSHOT/version
artifactIdaction/artifactId
packagingjar/packaging
nameStruts Action Framework 2.0/name
Modified:
incubator/webwork2/action/src/main/java/org/apache/struts/action2/StrutsTestCase.java
URL:
http://svn.apache.org/viewcvs/incubator/webwork2/action/src/main/java/org/apache/struts/action2/StrutsTestCase.java?rev=396345r1=396344r2=396345view=diff
==
---
incubator/webwork2/action/src/main/java/org/apache/struts/action2/StrutsTestCase.java
(original)
+++
incubator/webwork2/action/src/main/java/org/apache/struts/action2/StrutsTestCase.java
Sun Apr 23 16:48:36 2006
@@ -18,7 +18,9 @@
package org.apache.struts.action2;
import org.apache.struts.action2.config.Configuration;
+import org.apache.struts.action2.dispatcher.DispatcherUtils;
import com.opensymphony.xwork.XWorkTestCase;
+import com.opensymphony.xwork.util.LocalizedTextUtil;
/**
* Base test case for unit testing WebWork.
@@ -27,7 +29,9 @@
protected void setUp() throws Exception {
super.setUp();
+DispatcherUtils.setInstance(null);
Configuration.reset();
+LocalizedTextUtil.clearDefaultResourceBundles();
}
protected void tearDown() throws Exception {
Modified:
incubator/webwork2/action/src/test/java/org/apache/struts/action2/dispatcher/DispatcherUtilsTest.java
URL:
http://svn.apache.org/viewcvs/incubator/webwork2/action/src/test/java/org/apache/struts/action2/dispatcher/DispatcherUtilsTest.java?rev=396345r1=396344r2=396345view=diff
==
---
incubator/webwork2/action/src/test/java/org/apache/struts/action2/dispatcher/DispatcherUtilsTest.java
(original)
+++
incubator/webwork2/action/src/test/java/org/apache/struts/action2/dispatcher/DispatcherUtilsTest.java
Sun Apr 23 16:48:36 2006
@@ -20,6 +20,7 @@
import java.util.Locale;
import org.springframework.mock.web.MockServletContext;
+import org.apache.struts.action2.StrutsTestCase;
import com.opensymphony.xwork.util.LocalizedTextUtil;
@@ -29,7 +30,7 @@
* Test case for DispatcherUtils.
*
*/
-public class DispatcherUtilsTest extends TestCase {
+public class DispatcherUtilsTest extends StrutsTestCase {
public void testDefaultResurceBundlePropertyLoaded() throws Exception {
Locale.setDefault(Locale.US); // force to US locale as we also have
_de and _da properties
Modified:
incubator/webwork2/action/src/test/java/org/apache/struts/action2/dispatcher/HttpHeaderResultTest.java
URL:
http://svn.apache.org/viewcvs/incubator/webwork2/action/src/test/java/org/apache
svn commit: r396354 - in /incubator/webwork2: action/pom.xml pom.xml
Author: plightbo Date: Sun Apr 23 17:21:44 2006 New Revision: 396354 URL: http://svn.apache.org/viewcvs?rev=396354view=rev Log: more pom refactoring Modified: incubator/webwork2/action/pom.xml incubator/webwork2/pom.xml Modified: incubator/webwork2/action/pom.xml URL: http://svn.apache.org/viewcvs/incubator/webwork2/action/pom.xml?rev=396354r1=396353r2=396354view=diff == --- incubator/webwork2/action/pom.xml (original) +++ incubator/webwork2/action/pom.xml Sun Apr 23 17:21:44 2006 @@ -25,39 +25,33 @@ dependency groupIdopensymphony/groupId artifactIdxwork/artifactId -version1.2-SNAPSHOT/version /dependency dependency groupIdfreemarker/groupId artifactIdfreemarker/artifactId -version2.3.4/version /dependency dependency groupIdjavax.servlet/groupId artifactIdservlet-api/artifactId -version2.4/version scopeprovided/scope /dependency dependency groupIdjavax.servlet/groupId artifactIdjsp-api/artifactId -version2.0/version scopeprovided/scope /dependency dependency groupIdcommons-logging/groupId artifactIdcommons-logging/artifactId -version1.0.4/version /dependency dependency groupIdcommons-lang/groupId artifactIdcommons-lang/artifactId -version2.0/version optionaltrue/optional /dependency @@ -65,7 +59,6 @@ dependency groupIduk.ltd.getahead/groupId artifactIddwr/artifactId -version1.1-beta-3/version optionaltrue/optional /dependency @@ -73,14 +66,12 @@ dependency groupIdvelocity/groupId artifactIdvelocity/artifactId -version1.4/version optionaltrue/optional /dependency dependency groupIdvelocity-tools/groupId artifactIdvelocity-tools/artifactId -version1.1/version optionaltrue/optional /dependency @@ -88,14 +79,12 @@ dependency groupIdcommons-fileupload/groupId artifactIdcommons-fileupload/artifactId -version1.1/version optionaltrue/optional /dependency dependency groupIdservlets.com/groupId artifactIdcos/artifactId -version05Nov2002/version optionaltrue/optional /dependency @@ -103,7 +92,6 @@ groupIdopensymphony/groupId artifactIdpell-multipart/artifactId !-- webwork's ivy dependency reports mentions v1.19 ? -- -version2.1.5/version optionaltrue/optional /dependency @@ -112,7 +100,6 @@ !-- group should be com.opensymphony -- groupIdopensymphony/groupId artifactIdsitemesh/artifactId -version2.2.1/version optionaltrue/optional /dependency @@ -120,14 +107,12 @@ dependency groupIdjetty/groupId artifactIdorg.mortbay.jetty/artifactId -version5.1.4/version optionaltrue/optional /dependency dependency groupIdeclipse/groupId artifactIdjdtcore/artifactId -version3.1.0/version optionaltrue/optional /dependency @@ -135,7 +120,6 @@ dependency groupIdjasperreports/groupId artifactIdjasperreports/artifactId -version1.1.0/version optionaltrue/optional /dependency @@ -143,7 +127,6 @@ dependency groupIdjfree/groupId artifactIdjfreechart/artifactId -version1.0.0/version optionaltrue/optional exclusions exclusion @@ -157,13 +140,11 @@ dependency groupIdorg.apache.struts.tiles/groupId artifactIdtiles-core/artifactId -version0.2-SNAPSHOT/version optionaltrue/optional /dependency dependency groupIdcommons-digester/groupId artifactIdcommons-digester/artifactId -version1.7/version optionaltrue/optional /dependency @@ -171,14 +152,12 @@ dependency groupIdportlet-api/groupId artifactIdportlet-api/artifactId -version1.0/version optionaltrue/optional /dependency dependency groupIdorg.apache.pluto/groupId artifactIdpluto/artifactId -version1.0.1-rc4/version optionaltrue/optional /dependency @@ -186,7
svn commit: r396426 - in /incubator/webwork2: ./ action/ action/src/main/java/org/apache/struts/action2/quickstart/ webapps/showcase/
Author: plightbo
Date: Sun Apr 23 22:01:09 2006
New Revision: 396426
URL: http://svn.apache.org/viewcvs?rev=396426view=rev
Log:
quick start runs from idea once again
Modified:
incubator/webwork2/action/pom.xml
incubator/webwork2/action/src/main/java/org/apache/struts/action2/quickstart/Configuration.java
incubator/webwork2/action/src/main/java/org/apache/struts/action2/quickstart/MultiWebApplicationContext.java
incubator/webwork2/pom.xml
incubator/webwork2/webapps/showcase/quickstart.xml
Modified: incubator/webwork2/action/pom.xml
URL:
http://svn.apache.org/viewcvs/incubator/webwork2/action/pom.xml?rev=396426r1=396425r2=396426view=diff
==
--- incubator/webwork2/action/pom.xml (original)
+++ incubator/webwork2/action/pom.xml Sun Apr 23 22:01:09 2006
@@ -116,6 +116,76 @@
optionaltrue/optional
/dependency
+dependency
+groupIdant/groupId
+artifactIdant/artifactId
+version1.6.5/version
+optionaltrue/optional
+/dependency
+
+dependency
+groupIdtomcat/groupId
+artifactIdjasper-compiler/artifactId
+version5.5.12/version
+optionaltrue/optional
+/dependency
+
+dependency
+groupIdtomcat/groupId
+artifactIdjasper-runtime/artifactId
+version5.5.12/version
+optionaltrue/optional
+/dependency
+
+dependency
+groupIdtomcat/groupId
+artifactIdjasper-compiler-jdt/artifactId
+version5.5.12/version
+optionaltrue/optional
+/dependency
+
+dependency
+groupIdcommons-el/groupId
+artifactIdcommons-el/artifactId
+version1.0/version
+optionaltrue/optional
+/dependency
+
+dependency
+groupIdcommons-io/groupId
+artifactIdcommons-io/artifactId
+version1.0/version
+optionaltrue/optional
+/dependency
+
+dependency
+groupIdcommons-lang/groupId
+artifactIdcommons-lang/artifactId
+version2.1/version
+optionaltrue/optional
+/dependency
+
+dependency
+groupIdjspapi/groupId
+artifactIdjsp-api/artifactId
+version2.0/version
+optionaltrue/optional
+/dependency
+
+dependency
+groupIdcommons-collections/groupId
+artifactIdcommons-collections/artifactId
+version2.1.1/version
+optionaltrue/optional
+/dependency
+
+dependency
+groupIdxstream/groupId
+artifactIdxstream/artifactId
+version1.1.2/version
+optionaltrue/optional
+/dependency
+
!-- Jasper --
dependency
groupIdjasperreports/groupId
Modified:
incubator/webwork2/action/src/main/java/org/apache/struts/action2/quickstart/Configuration.java
URL:
http://svn.apache.org/viewcvs/incubator/webwork2/action/src/main/java/org/apache/struts/action2/quickstart/Configuration.java?rev=396426r1=396425r2=396426view=diff
==
---
incubator/webwork2/action/src/main/java/org/apache/struts/action2/quickstart/Configuration.java
(original)
+++
incubator/webwork2/action/src/main/java/org/apache/struts/action2/quickstart/Configuration.java
Sun Apr 23 22:01:09 2006
@@ -35,9 +35,9 @@
* Configuration for the QuickStart program.
*/
public class Configuration implements Serializable {
-
+
private static final long serialVersionUID = 9159115401614443449L;
-
+
String ideaConfig;
String extendsConfig;
String resolver;
@@ -132,32 +132,36 @@
public void resolveDirs(String wd) {
if (ideaConfig != null) {
-String full = resolveDir(this.ideaConfig, wd);
-
-try {
-DocumentBuilder db =
DocumentBuilderFactory.newInstance().newDocumentBuilder();
-Document doc = db.parse(full);
-NodeList components = doc.getElementsByTagName(root);
-List jars = new ArrayList();
-for (int i = 0; i components.getLength(); i++) {
-Element e = (Element) components.item(i);
-String value = e.getAttribute(url);
-if (value != null value.startsWith(jar://)
value.endsWith(.jar!/)) {
-value = value.substring(6, value.length() - 2);
-if (value.startsWith($MODULE_DIR$)) {
-value = value.substring(13);
+String[] parts = ideaConfig.split(,);
+for (int i = 0; i parts.length; i++) {
+String full = resolveDir(parts[i], wd);
+
+try
svn commit: r394547 - /incubator/webwork2/action/src/main/resources/struts-default.xml
Author: plightbo Date: Sun Apr 16 12:28:52 2006 New Revision: 394547 URL: http://svn.apache.org/viewcvs?rev=394547view=rev Log: putting back where it was until xwork fixes it's problem loading results Modified: incubator/webwork2/action/src/main/resources/struts-default.xml Modified: incubator/webwork2/action/src/main/resources/struts-default.xml URL: http://svn.apache.org/viewcvs/incubator/webwork2/action/src/main/resources/struts-default.xml?rev=394547r1=394546r2=394547view=diff == --- incubator/webwork2/action/src/main/resources/struts-default.xml (original) +++ incubator/webwork2/action/src/main/resources/struts-default.xml Sun Apr 16 12:28:52 2006 @@ -2,7 +2,6 @@ xwork package name=struts-default result-types -result-type name=jasper class=org.apache.struts.action2.views.jasperreports.JasperReportsResult/ result-type name=chain class=com.opensymphony.xwork.ActionChainResult/ result-type name=dispatcher class=org.apache.struts.action2.dispatcher.ServletDispatcherResult default=true/ result-type name=freemarker class=org.apache.struts.action2.views.freemarker.FreemarkerResult/ @@ -22,7 +21,7 @@ result-type name=richtexteditorFileUpload class=org.apache.struts.action2.views.jsp.ui.RichtexteditorFileUploadResult / !-- third party integration -- - +result-type name=jasper class=org.apache.struts.action2.views.jasperreports.JasperReportsResult/ /result-types interceptors - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r393515 - /incubator/webwork2/action/pom.xml
Author: plightbo Date: Wed Apr 12 09:59:51 2006 New Revision: 393515 URL: http://svn.apache.org/viewcvs?rev=393515view=rev Log: other repos Modified: incubator/webwork2/action/pom.xml Modified: incubator/webwork2/action/pom.xml URL: http://svn.apache.org/viewcvs/incubator/webwork2/action/pom.xml?rev=393515r1=393514r2=393515view=diff == --- incubator/webwork2/action/pom.xml (original) +++ incubator/webwork2/action/pom.xml Wed Apr 12 09:59:51 2006 @@ -28,9 +28,22 @@ /profile /profiles repositories + repository +idsnapshots-maven-codehaus/id +namesnapshots-maven-codehaus/name +snapshots +enabledtrue/enabled +updatePolicyalways/updatePolicy +checksumPolicyignore/checksumPolicy +/snapshots +releases +enabledfalse/enabled +/releases +urlhttp://snapshots.maven.codehaus.org/maven2/url +/repository repository -idapache/id -nameapache/name +idopensymphony/id +nameopensymphony/name layoutlegacy/layout snapshots enabledtrue/enabled @@ -40,7 +53,7 @@ releases enabledfalse/enabled /releases -urlhttp://cvs.apache.org/repository/url +urlhttp://maven.opensymphony.com/url /repository /repositories build - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r393591 - /incubator/webwork2/action/pom.xml
Author: plightbo Date: Wed Apr 12 13:20:52 2006 New Revision: 393591 URL: http://svn.apache.org/viewcvs?rev=393591view=rev Log: proper DWR now Modified: incubator/webwork2/action/pom.xml Modified: incubator/webwork2/action/pom.xml URL: http://svn.apache.org/viewcvs/incubator/webwork2/action/pom.xml?rev=393591r1=393590r2=393591view=diff == --- incubator/webwork2/action/pom.xml (original) +++ incubator/webwork2/action/pom.xml Wed Apr 12 13:20:52 2006 @@ -71,7 +71,7 @@ !-- Ajax -- dependency -groupIddwr/groupId +groupIduk.ltd.getahead/groupId artifactIddwr/artifactId version1.1-beta-3/version optionaltrue/optional - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r393636 - /incubator/webwork2/action/src/test/resources/org/apache/struts/action2/sitegraph/out.txt
Author: plightbo Date: Wed Apr 12 15:54:06 2006 New Revision: 393636 URL: http://svn.apache.org/viewcvs?rev=393636view=rev Log: adding back in (not sure why these lines were removed in the first place) Modified: incubator/webwork2/action/src/test/resources/org/apache/struts/action2/sitegraph/out.txt Modified: incubator/webwork2/action/src/test/resources/org/apache/struts/action2/sitegraph/out.txt URL: http://svn.apache.org/viewcvs/incubator/webwork2/action/src/test/resources/org/apache/struts/action2/sitegraph/out.txt?rev=393636r1=393635r2=393636view=diff == --- incubator/webwork2/action/src/test/resources/org/apache/struts/action2/sitegraph/out.txt (original) +++ incubator/webwork2/action/src/test/resources/org/apache/struts/action2/sitegraph/out.txt Wed Apr 12 15:54:06 2006 @@ -24,6 +24,8 @@ tutorial_sitegraph_guess - tutorial_sitegraph_guess_error_ftl [label=error,color=darkseagreen2]; tutorial_sitegraph_guess - tutorial_sitegraph_guess_input_ftl [label=input,color=darkseagreen2]; tutorial_sitegraph_guess - tutorial_sitegraph_guess_success_jsp [label=redirect: success]; +tutorial_sitegraph_guess_input_ftl - tutorial_sitegraph_guess [label=form]; +tutorial_sitegraph_guess_success_jsp - tutorial_sitegraph_guess [label=href\n(!default)]; hello - hello_jsp [label=success,color=darkseagreen2]; hello - tutorial_test [label=redirect: tutorial]; tutorial_test - tutorial_sitegraph_guess_input_ftl [label=input,color=darkseagreen2]; - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r393638 - /incubator/webwork2/action/pom.xml
Author: plightbo Date: Wed Apr 12 15:55:35 2006 New Revision: 393638 URL: http://svn.apache.org/viewcvs?rev=393638view=rev Log: base action build shouldn't use xwork-tiger or anything else that requires java 5 Modified: incubator/webwork2/action/pom.xml Modified: incubator/webwork2/action/pom.xml URL: http://svn.apache.org/viewcvs/incubator/webwork2/action/pom.xml?rev=393638r1=393637r2=393638view=diff == --- incubator/webwork2/action/pom.xml (original) +++ incubator/webwork2/action/pom.xml Wed Apr 12 15:55:35 2006 @@ -30,13 +30,6 @@ /dependency dependency -groupIdopensymphony/groupId -artifactIdxwork-tiger/artifactId -version1.2-SNAPSHOT/version -optionaltrue/optional -/dependency - -dependency groupIdfreemarker/groupId artifactIdfreemarker/artifactId version2.3.4/version - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r393642 - in /incubator/webwork2: thirdparty/ thirdparty/jasperreports/ thirdparty/jfreechart/ thirdparty/pell-file-upload/ uber/
Author: plightbo Date: Wed Apr 12 16:06:42 2006 New Revision: 393642 URL: http://svn.apache.org/viewcvs?rev=393642view=rev Log: ignore the generated iml files Modified: incubator/webwork2/thirdparty/ (props changed) incubator/webwork2/thirdparty/jasperreports/ (props changed) incubator/webwork2/thirdparty/jfreechart/ (props changed) incubator/webwork2/thirdparty/pell-file-upload/ (props changed) incubator/webwork2/uber/ (props changed) Propchange: incubator/webwork2/thirdparty/ -- --- svn:ignore (added) +++ svn:ignore Wed Apr 12 16:06:42 2006 @@ -0,0 +1 @@ +thirdparty.iml Propchange: incubator/webwork2/thirdparty/jasperreports/ -- --- svn:ignore (added) +++ svn:ignore Wed Apr 12 16:06:42 2006 @@ -0,0 +1 @@ +action-jasperreports.iml Propchange: incubator/webwork2/thirdparty/jfreechart/ -- --- svn:ignore (added) +++ svn:ignore Wed Apr 12 16:06:42 2006 @@ -0,0 +1 @@ +action-jfreechart.iml Propchange: incubator/webwork2/thirdparty/pell-file-upload/ -- --- svn:ignore (added) +++ svn:ignore Wed Apr 12 16:06:42 2006 @@ -0,0 +1 @@ +action-pell-file-upload.iml Propchange: incubator/webwork2/uber/ -- --- svn:ignore (added) +++ svn:ignore Wed Apr 12 16:06:42 2006 @@ -0,0 +1 @@ +action-all.iml - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r393649 - /incubator/webwork2/action/src/main/resources/struts-default.xml
Author: plightbo Date: Wed Apr 12 16:11:19 2006 New Revision: 393649 URL: http://svn.apache.org/viewcvs?rev=393649view=rev Log: moving third party results to the end of the results list (this is a bad work around for a bug in xwork) Modified: incubator/webwork2/action/src/main/resources/struts-default.xml Modified: incubator/webwork2/action/src/main/resources/struts-default.xml URL: http://svn.apache.org/viewcvs/incubator/webwork2/action/src/main/resources/struts-default.xml?rev=393649r1=393648r2=393649view=diff == --- incubator/webwork2/action/src/main/resources/struts-default.xml (original) +++ incubator/webwork2/action/src/main/resources/struts-default.xml Wed Apr 12 16:11:19 2006 @@ -6,7 +6,6 @@ result-type name=dispatcher class=org.apache.struts.action2.dispatcher.ServletDispatcherResult default=true/ result-type name=freemarker class=org.apache.struts.action2.views.freemarker.FreemarkerResult/ result-type name=httpheader class=org.apache.struts.action2.dispatcher.HttpHeaderResult/ -result-type name=jasper class=org.apache.struts.action2.views.jasperreports.JasperReportsResult/ result-type name=redirect class=org.apache.struts.action2.dispatcher.ServletRedirectResult/ result-type name=redirect-action class=org.apache.struts.action2.dispatcher.ServletActionRedirectResult/ result-type name=stream class=org.apache.struts.action2.dispatcher.StreamResult/ @@ -20,7 +19,9 @@ result-type name=richtexteditorGetFoldersAndFiles class=org.apache.struts.action2.views.jsp.ui.RichtexteditorGetFoldersAndFilesResult / result-type name=richtexteditorCreateFolder class=org.apache.struts.action2.views.jsp.ui.RichtexteditorCreateFolderResult / result-type name=richtexteditorFileUpload class=org.apache.struts.action2.views.jsp.ui.RichtexteditorFileUploadResult / - + +!-- third party integration -- +result-type name=jasper class=org.apache.struts.action2.views.jasperreports.JasperReportsResult/ /result-types interceptors - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r392603 - /incubator/webwork2/docs/
Author: plightbo Date: Sat Apr 8 13:43:25 2006 New Revision: 392603 URL: http://svn.apache.org/viewcvs?rev=392603view=rev Log: removing all docs/website information - this will go through a major revamp by the time we release, so *poof* Removed: incubator/webwork2/docs/ - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r392647 - in /incubator/webwork2: ./ action/ action/src/ action/src/main/ action/src/main/etc/ action/src/main/java/ action/src/main/java/org/ action/src/main/java/org/apache/ action/src/m
Author: plightbo Date: Sat Apr 8 17:41:12 2006 New Revision: 392647 URL: http://svn.apache.org/viewcvs?rev=392647view=rev Log: complete maven build all tests pass now [This commit notification would consist of 58 parts, which exceeds the limit of 50 ones, so it was shortened to the summary.] - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r390851 - /incubator/webwork2/pom.xml
Author: plightbo Date: Sun Apr 2 09:39:47 2006 New Revision: 390851 URL: http://svn.apache.org/viewcvs?rev=390851view=rev Log: scm url and idea configurations Modified: incubator/webwork2/pom.xml Modified: incubator/webwork2/pom.xml URL: http://svn.apache.org/viewcvs/incubator/webwork2/pom.xml?rev=390851r1=390850r2=390851view=diff == --- incubator/webwork2/pom.xml (original) +++ incubator/webwork2/pom.xml Sun Apr 2 09:39:47 2006 @@ -53,8 +53,9 @@ /mailingList /mailingLists scm -connection:pserver:[EMAIL PROTECTED]:/cvs/webwork/connection -urlhttps://webwork.dev.java.net/source/browse/webwork//url + connectionscm:svn:http://svn.apache.org/repos/asf/incubator/webwork2/trunk//connection + developerConnectionscm:svn:http://svn.apache.org/repos/asf/incubator/webwork2/trunk//developerConnection +urlhttp://svn.apache.org/repos/asf/incubator/webwork2/trunk//url /scm licenses license @@ -134,6 +135,25 @@ /testResource /testResources plugins +plugin +groupIdorg.apache.maven.plugins/groupId +artifactIdmaven-idea-plugin/artifactId +configuration +jdkName1.5/jdkName +excludetarget,test-output,.clover/exclude +useShortDependencyNamestrue/useShortDependencyNames +libraries +library +namexwork/name +sourcesfile://$xwork$/src/java/sources +/library +library +namexwork-tiger/name +sourcesfile://$xwork$/tiger/src/java/sources +/library +/libraries +/configuration +/plugin plugin artifactIdmaven-compiler-plugin/artifactId configuration - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r390852 - /incubator/webwork2/pom.xml
Author: plightbo Date: Sun Apr 2 09:41:44 2006 New Revision: 390852 URL: http://svn.apache.org/viewcvs?rev=390852view=rev Log: scm url and idea configurations Modified: incubator/webwork2/pom.xml Modified: incubator/webwork2/pom.xml URL: http://svn.apache.org/viewcvs/incubator/webwork2/pom.xml?rev=390852r1=390851r2=390852view=diff == --- incubator/webwork2/pom.xml (original) +++ incubator/webwork2/pom.xml Sun Apr 2 09:41:44 2006 @@ -140,7 +140,7 @@ artifactIdmaven-idea-plugin/artifactId configuration jdkName1.5/jdkName -excludetarget,test-output,.clover/exclude + excludetarget,dist,docs/wikidocs,test-output,.clover/exclude useShortDependencyNamestrue/useShortDependencyNames libraries library - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r390854 - /incubator/webwork2/idea-setup.txt
Author: plightbo Date: Sun Apr 2 09:43:10 2006 New Revision: 390854 URL: http://svn.apache.org/viewcvs?rev=390854view=rev Log: idea setup instructions Added: incubator/webwork2/idea-setup.txt Added: incubator/webwork2/idea-setup.txt URL: http://svn.apache.org/viewcvs/incubator/webwork2/idea-setup.txt?rev=390854view=auto == --- incubator/webwork2/idea-setup.txt (added) +++ incubator/webwork2/idea-setup.txt Sun Apr 2 09:43:10 2006 @@ -0,0 +1,14 @@ +First, get the latest idea plugin installed: + +mvn -DconnectionUrl=scm:svn:http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-idea-plugin \ +-Dgoals=install \ +scm:bootstrap + +Then, simply run: + +mvn idea:idea + +Finally, open struts-action.ipr + +Note: Normally the project files generated by mvn idea:idea are *updated* rather than over-written. + If you wish to overwrite the files, you can do mvn -Doverwrite=true idea:idea. \ No newline at end of file - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r390773 - /incubator/webwork2/pom.xml
Author: plightbo Date: Sat Apr 1 19:13:56 2006 New Revision: 390773 URL: http://svn.apache.org/viewcvs?rev=390773view=rev Log: renamed maven. the build now sort of works, except you have to run with -Dmaven.test.skip=true because some tests broke (grr) Modified: incubator/webwork2/pom.xml Modified: incubator/webwork2/pom.xml URL: http://svn.apache.org/viewcvs/incubator/webwork2/pom.xml?rev=390773r1=390772r2=390773view=diff == --- incubator/webwork2/pom.xml (original) +++ incubator/webwork2/pom.xml Sat Apr 1 19:13:56 2006 @@ -2,10 +2,10 @@ 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; modelVersion4.0.0/modelVersion -groupIdopensymphony/groupId -artifactIdwebwork/artifactId -version2.3-SNAPSHOT/version -nameWebWork/name +groupIdorg.apache.struts.action2/groupId +artifactIdstruts-action/artifactId +version2.0-SNAPSHOT/version +nameStruts Action Framework 2.0/name description WebWork is a Java web-application development framework. It is built specifically with developer productivity and @@ -76,6 +76,36 @@ /dependencies /profile /profiles +repositories +repository +idopensymphony/id +nameopensymphony/name +layoutlegacy/layout +snapshots +enabledtrue/enabled +updatePolicyalways/updatePolicy +checksumPolicyignore/checksumPolicy +/snapshots +releases +enabledfalse/enabled +/releases +urlhttp://maven.opensymphony.com/url +/repository +repository +idapache/id +nameapache/name +layoutlegacy/layout +snapshots +enabledtrue/enabled +updatePolicyalways/updatePolicy +checksumPolicyignore/checksumPolicy +/snapshots +releases +enabledfalse/enabled +/releases +urlhttp://cvs.apache.org/repository/url +/repository +/repositories build sourceDirectorysrc/java/sourceDirectory testSourceDirectorysrc/test/testSourceDirectory @@ -343,35 +373,35 @@ dependency groupIdorg.springframework/groupId artifactIdspring-beans/artifactId -version1.2/version +version1.2.6/version optionaltrue/optional /dependency dependency groupIdorg.springframework/groupId artifactIdspring-core/artifactId -version1.2/version +version1.2.6/version optionaltrue/optional /dependency dependency groupIdorg.springframework/groupId artifactIdspring-context/artifactId -version1.2/version +version1.2.6/version optionaltrue/optional /dependency dependency groupIdorg.springframework/groupId artifactIdspring-web/artifactId -version1.2/version +version1.2.6/version optionaltrue/optional /dependency dependency groupIdorg.springframework/groupId artifactIdspring-mock/artifactId -version1.2/version +version1.2.6/version scopetest/scope /dependency - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
