date:20060604

svn commit: r411532 - in /struts/shale/branches/mvn_reorg/shale-tiger: pom.xml src/test/java/org/apache/shale/tiger/faces/faces-config.xml src/test/resources/org/apache/shale/tiger/faces/ src/test/res

2006-06-04 Thread wsmoak

Author: wsmoak
Date: Sun Jun  4 00:01:46 2006
New Revision: 411532

URL: http://svn.apache.org/viewvc?rev=411532&view=rev
Log:
[SHALE-179] Maven 2 reorg - tiger
 * Construct the webapp for the tests
 * Pass the basedir system property.
 * Move the faces-config.xml file to resources

Added:

struts/shale/branches/mvn_reorg/shale-tiger/src/test/resources/org/apache/shale/tiger/faces/

struts/shale/branches/mvn_reorg/shale-tiger/src/test/resources/org/apache/shale/tiger/faces/faces-config.xml
  - copied unchanged from r411522, 
struts/shale/branches/mvn_reorg/shale-tiger/src/test/java/org/apache/shale/tiger/faces/faces-config.xml
Removed:

struts/shale/branches/mvn_reorg/shale-tiger/src/test/java/org/apache/shale/tiger/faces/faces-config.xml
Modified:
struts/shale/branches/mvn_reorg/shale-tiger/pom.xml

Modified: struts/shale/branches/mvn_reorg/shale-tiger/pom.xml
URL: 
http://svn.apache.org/viewvc/struts/shale/branches/mvn_reorg/shale-tiger/pom.xml?rev=411532&r1=411531&r2=411532&view=diff
==
--- struts/shale/branches/mvn_reorg/shale-tiger/pom.xml (original)
+++ struts/shale/branches/mvn_reorg/shale-tiger/pom.xml Sun Jun  4 00:01:46 2006
@@ -38,6 +38,14 @@
 
 org.apache.maven.plugins
 maven-surefire-plugin
+
+
+
+basedir
+${basedir}
+
+
+
 
 
 
@@ -48,7 +56,36 @@
 1.5
 
 
-
+
+maven-antrun-plugin
+
+
+construct-webapp
+test-compile
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+run
+
+
+
+

svn commit: r411533 - in /struts/shale/branches/mvn_reorg/shale-tiger/src/test/resources: META-INF/ META-INF/faces-config.xml org/apache/shale/tiger/faces/

2006-06-04 Thread wsmoak

Author: wsmoak
Date: Sun Jun  4 00:30:18 2006
New Revision: 411533

URL: http://svn.apache.org/viewvc?rev=411533&view=rev
Log:
[SHALE-179] Maven 2 reorg - tiger/faces 
 * Correct the location of faces-config.xml within resources.

Added:
struts/shale/branches/mvn_reorg/shale-tiger/src/test/resources/META-INF/

struts/shale/branches/mvn_reorg/shale-tiger/src/test/resources/META-INF/faces-config.xml
  - copied unchanged from r411532, 
struts/shale/branches/mvn_reorg/shale-tiger/src/test/resources/org/apache/shale/tiger/faces/faces-config.xml
Removed:

struts/shale/branches/mvn_reorg/shale-tiger/src/test/resources/org/apache/shale/tiger/faces/

svn commit: r411581 - in /struts/shale/branches/mvn_reorg/shale-clay/src/test: java/org/apache/shale/clay/config/ java/org/apache/shale/clay/parser/ java/org/apache/shale/clay/utils/ resources/org/apa

2006-06-04 Thread gvanmatre

Author: gvanmatre
Date: Sun Jun  4 09:22:01 2006
New Revision: 411581

URL: http://svn.apache.org/viewvc?rev=411581&view=rev
Log:
Moved a test resource to the correct folder.  Changed the parameter order on 
several asserted junit tests.

Added:

struts/shale/branches/mvn_reorg/shale-clay/src/test/resources/org/apache/shale/clay/utils/

struts/shale/branches/mvn_reorg/shale-clay/src/test/resources/org/apache/shale/clay/utils/hello.html
  - copied unchanged from r411579, 
struts/shale/branches/mvn_reorg/shale-clay/src/test/java/org/apache/shale/clay/utils/hello.html
Removed:

struts/shale/branches/mvn_reorg/shale-clay/src/test/java/org/apache/shale/clay/utils/hello.html
Modified:

struts/shale/branches/mvn_reorg/shale-clay/src/test/java/org/apache/shale/clay/config/CommentTestCase.java

struts/shale/branches/mvn_reorg/shale-clay/src/test/java/org/apache/shale/clay/config/SymbolsTestCase.java

struts/shale/branches/mvn_reorg/shale-clay/src/test/java/org/apache/shale/clay/parser/ParserTestCase.java

struts/shale/branches/mvn_reorg/shale-clay/src/test/java/org/apache/shale/clay/utils/ClayAmalgamTestCase.java

Modified: 
struts/shale/branches/mvn_reorg/shale-clay/src/test/java/org/apache/shale/clay/config/CommentTestCase.java
URL: 
http://svn.apache.org/viewvc/struts/shale/branches/mvn_reorg/shale-clay/src/test/java/org/apache/shale/clay/config/CommentTestCase.java?rev=411581&r1=411580&r2=411581&view=diff
==
--- 
struts/shale/branches/mvn_reorg/shale-clay/src/test/java/org/apache/shale/clay/config/CommentTestCase.java
 (original)
+++ 
struts/shale/branches/mvn_reorg/shale-clay/src/test/java/org/apache/shale/clay/config/CommentTestCase.java
 Sun Jun  4 09:22:01 2006
@@ -127,14 +127,14 @@
 
 Parser p = new Parser();
 List nodes = p.parse(writer.getBuffer());
-assertEquals("1 root node", nodes.size(), 1);
+assertEquals("1 root node", 1, nodes.size());
 
 Node comment = findComment((Node) nodes.get(0));
 assertNotNull("comment found", comment);   
 assertTrue("is a comment", comment.isComment());
 
 StringBuffer buff = concatCommentText(comment);  
-assertEquals(buff.toString(), "");
+assertEquals("", buff.toString());
 
 writer.close();
 
@@ -171,14 +171,14 @@
 
 Parser p = new Parser();
 List nodes = p.parse(writer.getBuffer());
-assertEquals("1 root node", nodes.size(), 1);
+assertEquals("1 root node", 1, nodes.size());
 
 Node comment = findComment((Node) nodes.get(0));
 assertNotNull("comment found", comment);   
 assertTrue("is a comment", comment.isComment());
 
 StringBuffer buff = concatCommentText(comment);  
-assertEquals(buff.toString(), "");
+assertEquals("", buff.toString());
   
 writer.close();
 }

Modified: 
struts/shale/branches/mvn_reorg/shale-clay/src/test/java/org/apache/shale/clay/config/SymbolsTestCase.java
URL: 
http://svn.apache.org/viewvc/struts/shale/branches/mvn_reorg/shale-clay/src/test/java/org/apache/shale/clay/config/SymbolsTestCase.java?rev=411581&r1=411580&r2=411581&view=diff
==
--- 
struts/shale/branches/mvn_reorg/shale-clay/src/test/java/org/apache/shale/clay/config/SymbolsTestCase.java
 (original)
+++ 
struts/shale/branches/mvn_reorg/shale-clay/src/test/java/org/apache/shale/clay/config/SymbolsTestCase.java
 Sun Jun  4 09:22:01 2006
@@ -77,7 +77,7 @@

Command command = new PropertyValueCommand();
boolean isFinal = command.execute(clayContext);
-   assertEquals("command finished", isFinal, true);   
+   assertEquals("command finished", true, isFinal);   
assertEquals("value = 10", child.getValue(), "10");
 

@@ -91,8 +91,8 @@
attr.setValue("#{goodYear}");
 
isFinal = command.execute(clayContext);
-   assertEquals("command finished", isFinal, true);   
-   assertEquals("value = 1969", child.getValue(), "1969");
+   assertEquals("command finished", true, isFinal);   
+   assertEquals("value = 1969", "1969", child.getValue());

child = (javax.faces.component.html.HtmlOutputText) 
  
facesContext.getApplication().createComponent("javax.faces.HtmlOutputText"); 
@@ -104,7 +104,7 @@
attr.setValue("#{ping}");
 
isFinal = command.execute(clayContext);
-   assertEquals("command finished", isFinal, true);   
+   assertEquals("command finished", true, isFinal);   
assertEquals("value = pong", child.getValue(), "pong");
 
 
@@ -117,8 +117,8 @@
attr.setValue("#{forManfred}");
 
isFinal = command.execute(clayContext);
-   assertEquals("command finished", isFinal, tru

svn commit: r411587 - /struts/shale/branches/mvn_reorg/shale-designtime/pom.xml

2006-06-04 Thread wsmoak

Author: wsmoak
Date: Sun Jun  4 11:24:21 2006
New Revision: 411587

URL: http://svn.apache.org/viewvc?rev=411587&view=rev
Log:
Added -DgeneratePom=true to the installation instructions.

Modified:
struts/shale/branches/mvn_reorg/shale-designtime/pom.xml

Modified: struts/shale/branches/mvn_reorg/shale-designtime/pom.xml
URL: 
http://svn.apache.org/viewvc/struts/shale/branches/mvn_reorg/shale-designtime/pom.xml?rev=411587&r1=411586&r2=411587&view=diff
==
--- struts/shale/branches/mvn_reorg/shale-designtime/pom.xml (original)
+++ struts/shale/branches/mvn_reorg/shale-designtime/pom.xml Sun Jun  4 
11:24:21 2006
@@ -66,7 +66,8 @@
 -DartifactId=creator-designtime \
 -Dversion=2.1 \
 -Dpackaging=jar \
-
-Dfile=$CREATOR_HOME/rave2.0/modules/com-sun-rave-designtime.jar
+
-Dfile=$CREATOR_HOME/rave2.0/modules/com-sun-rave-designtime.jar \
+-DgeneratePom=true
 
 -->
 com.sun.rave
@@ -81,7 +82,8 @@
 -DartifactId=creator-jsfcl-designtime \
 -Dversion=2.1 \
 -Dpackaging=jar \
--Dfile=$CREATOR_HOME/rave2.0/modules/ext/jsfcl-dt.jar
+-Dfile=$CREATOR_HOME/rave2.0/modules/ext/jsfcl-dt.jar \
+-DgeneratePom=true
 
 -->
 com.sun.rave

svn commit: r411653 - in /struts/shale/branches/mvn_reorg/shale-apps/shale-blank: ext/ lib/ src/conf/ src/java/ src/main/ src/main/java/ src/main/webapp/ src/site/ src/site/xdoc/ src/test/java/ src/te

2006-06-04 Thread wsmoak

Author: wsmoak
Date: Sun Jun  4 21:03:21 2006
New Revision: 411653

URL: http://svn.apache.org/viewvc?rev=411653&view=rev
Log:
[SHALE-179] Maven 2 reorg - Shale Blank example app

Added:
struts/shale/branches/mvn_reorg/shale-apps/shale-blank/src/main/
struts/shale/branches/mvn_reorg/shale-apps/shale-blank/src/main/java/
  - copied from r411639, 
struts/shale/branches/mvn_reorg/shale-apps/shale-blank/src/java/
struts/shale/branches/mvn_reorg/shale-apps/shale-blank/src/main/webapp/
  - copied from r411639, 
struts/shale/branches/mvn_reorg/shale-apps/shale-blank/src/web/
struts/shale/branches/mvn_reorg/shale-apps/shale-blank/src/site/
struts/shale/branches/mvn_reorg/shale-apps/shale-blank/src/site/site.xml
  - copied unchanged from r411639, 
struts/shale/branches/mvn_reorg/shale-apps/shale-blank/xdocs/navigation.xml
struts/shale/branches/mvn_reorg/shale-apps/shale-blank/src/site/xdoc/
  - copied from r411639, 
struts/shale/branches/mvn_reorg/shale-apps/shale-blank/xdocs/
struts/shale/branches/mvn_reorg/shale-apps/shale-blank/src/test/java/
struts/shale/branches/mvn_reorg/shale-apps/shale-blank/src/test/java/org/
  - copied from r411639, 
struts/shale/branches/mvn_reorg/shale-apps/shale-blank/src/test/org/
Removed:
struts/shale/branches/mvn_reorg/shale-apps/shale-blank/ext/
struts/shale/branches/mvn_reorg/shale-apps/shale-blank/lib/
struts/shale/branches/mvn_reorg/shale-apps/shale-blank/src/conf/
struts/shale/branches/mvn_reorg/shale-apps/shale-blank/src/java/

struts/shale/branches/mvn_reorg/shale-apps/shale-blank/src/site/xdoc/navigation.xml
struts/shale/branches/mvn_reorg/shale-apps/shale-blank/src/test/org/
struts/shale/branches/mvn_reorg/shale-apps/shale-blank/src/web/
struts/shale/branches/mvn_reorg/shale-apps/shale-blank/xdocs/

svn commit: r411655 - in /struts/shale/branches/mvn_reorg/shale-apps: ./ shale-blank/ shale-blank/src/main/java/org/apache/shale/blank/ shale-blank/src/main/resources/ shale-blank/src/main/resources/o

2006-06-04 Thread wsmoak

Author: wsmoak
Date: Sun Jun  4 21:23:21 2006
New Revision: 411655

URL: http://svn.apache.org/viewvc?rev=411655&view=rev
Log:
Add a pom for Shale Blank and include it in the shale-apps build.
Move the properties file to src/main/resources.
Add Cargo config and finalName to the apps pom.

Added:
struts/shale/branches/mvn_reorg/shale-apps/shale-blank/pom.xml   (with 
props)
struts/shale/branches/mvn_reorg/shale-apps/shale-blank/src/main/resources/

struts/shale/branches/mvn_reorg/shale-apps/shale-blank/src/main/resources/org/

struts/shale/branches/mvn_reorg/shale-apps/shale-blank/src/main/resources/org/apache/

struts/shale/branches/mvn_reorg/shale-apps/shale-blank/src/main/resources/org/apache/shale/

struts/shale/branches/mvn_reorg/shale-apps/shale-blank/src/main/resources/org/apache/shale/blank/

struts/shale/branches/mvn_reorg/shale-apps/shale-blank/src/main/resources/org/apache/shale/blank/Bundle.properties
  - copied unchanged from r411653, 
struts/shale/branches/mvn_reorg/shale-apps/shale-blank/src/main/java/org/apache/shale/blank/Bundle.properties
Removed:

struts/shale/branches/mvn_reorg/shale-apps/shale-blank/src/main/java/org/apache/shale/blank/Bundle.properties
Modified:
struts/shale/branches/mvn_reorg/shale-apps/pom.xml

Modified: struts/shale/branches/mvn_reorg/shale-apps/pom.xml
URL: 
http://svn.apache.org/viewvc/struts/shale/branches/mvn_reorg/shale-apps/pom.xml?rev=411655&r1=411654&r2=411655&view=diff
==
--- struts/shale/branches/mvn_reorg/shale-apps/pom.xml (original)
+++ struts/shale/branches/mvn_reorg/shale-apps/pom.xml Sun Jun  4 21:23:21 2006
@@ -44,11 +44,32 @@
 
 
 
-
 
+
+
+${artifactId}
+
+
+org.codehaus.cargo
+cargo-maven2-plugin
+
+
+tomcat5x
+${cargo.tomcat5x.home}
+${project.build.directory}/tomcat5x.log
+
${project.build.directory}/tomcat5x.out
+
+
+${project.build.directory}/tomcat5x
+
+
+
+
+
 
 

Added: struts/shale/branches/mvn_reorg/shale-apps/shale-blank/pom.xml
URL: 
http://svn.apache.org/viewvc/struts/shale/branches/mvn_reorg/shale-apps/shale-blank/pom.xml?rev=411655&view=auto
==
--- struts/shale/branches/mvn_reorg/shale-apps/shale-blank/pom.xml (added)
+++ struts/shale/branches/mvn_reorg/shale-apps/shale-blank/pom.xml Sun Jun  4 
21:23:21 2006
@@ -0,0 +1,75 @@
+
+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";>
+
+4.0.0
+
+org.apache.struts.shale
+shale-apps
+1.0.3-SNAPSHOT
+
+shale-blank
+war
+Shale Blank Sample App
+http://struts.apache.org/struts-shale
+
+
+
+
+org.apache.struts.shale
+shale-core
+${version}
+
+
+
+org.apache.struts.shale
+shale-test
+${version}
+test
+
+
+
+javax.servlet
+jstl
+1.1.2
+
+
+
+javax.servlet
+servlet-api
+2.4
+
+
+
+javax.servlet
+jsp-api
+2.0
+
+
+
+taglibs
+standard
+1.1.2
+
+
+
+
+

Propchange: struts/shale/branches/mvn_reorg/shale-apps/shale-blank/pom.xml
--
svn:eol-style = native

Propchange: struts/shale/branches/mvn_reorg/shale-apps/shale-blank/pom.xml
--
svn:keywords = Date Author Id Revision HeadURL

svn commit: r411667 - /struts/shale/branches/mvn_reorg/shale-tiger/pom.xml

2006-06-04 Thread wsmoak

Author: wsmoak
Date: Sun Jun  4 22:04:21 2006
New Revision: 411667

URL: http://svn.apache.org/viewvc?rev=411667&view=rev
Log:
Exclude the failing LifecycleListenerTestCase.
Pass additional system properties for logging.

Modified:
struts/shale/branches/mvn_reorg/shale-tiger/pom.xml

Modified: struts/shale/branches/mvn_reorg/shale-tiger/pom.xml
URL: 
http://svn.apache.org/viewvc/struts/shale/branches/mvn_reorg/shale-tiger/pom.xml?rev=411667&r1=411666&r2=411667&view=diff
==
--- struts/shale/branches/mvn_reorg/shale-tiger/pom.xml (original)
+++ struts/shale/branches/mvn_reorg/shale-tiger/pom.xml Sun Jun  4 22:04:21 2006
@@ -39,10 +39,25 @@
 org.apache.maven.plugins
 maven-surefire-plugin
 
+
+**/LifecycleListenerTestCase.java
+
 
 
 basedir
 ${basedir}
+
+
+org.apache.commons.logging.LogFactory
+
org.apache.commons.logging.impl.LogFactoryImpl
+
+
+org.apache.commons.logging.Log
+
org.apache.commons.logging.impl.SimpleLog
+
+
+
org.apache.commons.logging.simplelog.log.org.apache.shale.tiger
+trace

svn commit: r411668 - /struts/shale/branches/mvn_reorg/shale-apps/shale-blank/pom.xml

2006-06-04 Thread wsmoak

Author: wsmoak
Date: Sun Jun  4 22:05:50 2006
New Revision: 411668

URL: http://svn.apache.org/viewvc?rev=411668&view=rev
Log:
Added missing JUnit dependency.

Modified:
struts/shale/branches/mvn_reorg/shale-apps/shale-blank/pom.xml

Modified: struts/shale/branches/mvn_reorg/shale-apps/shale-blank/pom.xml
URL: 
http://svn.apache.org/viewvc/struts/shale/branches/mvn_reorg/shale-apps/shale-blank/pom.xml?rev=411668&r1=411667&r2=411668&view=diff
==
--- struts/shale/branches/mvn_reorg/shale-apps/shale-blank/pom.xml (original)
+++ struts/shale/branches/mvn_reorg/shale-apps/shale-blank/pom.xml Sun Jun  4 
22:05:50 2006
@@ -70,6 +70,11 @@
 1.1.2
 
 
+
+junit
+junit
+
+

svn commit: r411532 - in /struts/shale/branches/mvn_reorg/shale-tiger: pom.xml src/test/java/org/apache/shale/tiger/faces/faces-config.xml src/test/resources/org/apache/shale/tiger/faces/ src/test/res

svn commit: r411533 - in /struts/shale/branches/mvn_reorg/shale-tiger/src/test/resources: META-INF/ META-INF/faces-config.xml org/apache/shale/tiger/faces/

svn commit: r411581 - in /struts/shale/branches/mvn_reorg/shale-clay/src/test: java/org/apache/shale/clay/config/ java/org/apache/shale/clay/parser/ java/org/apache/shale/clay/utils/ resources/org/apa

svn commit: r411587 - /struts/shale/branches/mvn_reorg/shale-designtime/pom.xml

svn commit: r411653 - in /struts/shale/branches/mvn_reorg/shale-apps/shale-blank: ext/ lib/ src/conf/ src/java/ src/main/ src/main/java/ src/main/webapp/ src/site/ src/site/xdoc/ src/test/java/ src/te

svn commit: r411655 - in /struts/shale/branches/mvn_reorg/shale-apps: ./ shale-blank/ shale-blank/src/main/java/org/apache/shale/blank/ shale-blank/src/main/resources/ shale-blank/src/main/resources/o

svn commit: r411667 - /struts/shale/branches/mvn_reorg/shale-tiger/pom.xml

svn commit: r411668 - /struts/shale/branches/mvn_reorg/shale-apps/shale-blank/pom.xml

8 matches

Site Navigation

Mail list logo

Footer information