DO NOT REPLY [Bug 52328] Massive garbage production observed when using the response writer

[bugzilla]

https://issues.apache.org/bugzilla/show_bug.cgi?id=52328

--- Comment #11 from Nikolay Diakov  2012-01-11 
09:06:26 UTC ---
Yes, Mark, we can test it pretty quick. If you would provide us with a patched
distribution package, we will test:
- Query response in our application (having removed our buffering wrapper)
deployed in the patched Tomcat.
- Memory consumption (whether we get too many transient objects of the
originally observed type).

Cheers,
  Nikolay

-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug.

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: More Caching for WebappClassLoader?

[Rainer Jung]

On 11.01.2012 02:14, Christopher Schultz wrote:

Rainer,

On 1/10/12 5:37 PM, Rainer Jung wrote:

It would matter if they take the reedom to return something new if
loadClass() is called for a class that was already loaded - and
something changed for the CL. For example a custom CL could check every
now and then whether the classes have dynamically changed and then
return the new ones. If we cache the first result of loadClass() in our
loader higher up the hierarchy, the custom CL lower down will never be
called again for the class and wouldn't be able to update it.


I'm not sure why a custom CL would be "lower" in the hierarchy than the
WebappClassLoader but then also not have first-crack at loading the
classes it had originally loaded. If the CL follows parent-first
semantics then this might be a problem, but if the CL follows me-first
semantics, then this will not be a problem.


By custom CL I didn't mean a custom WebappClassLoader, but something 
that sity between the WebappClassLoader and the JVM, so somewhere in the 
parent or in the super hierarchie to provide additional features. 
Typically not provided to improve Tomcat instead to improve class 
loading in general.


But as said, I'll keep the aggressive caching optional, default off.

Regards,

Rainer


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

DO NOT REPLY [Bug 52450] New: Add setter for entityResolver in jasper's ParserUtils

[bugzilla]

https://issues.apache.org/bugzilla/show_bug.cgi?id=52450

 Bug #: 52450
   Summary: Add setter for entityResolver in jasper's ParserUtils
   Product: Tomcat 7
   Version: 7.0.23
  Platform: PC
OS/Version: Linux
Status: NEW
  Severity: normal
  Priority: P2
 Component: Jasper
AssignedTo: dev@tomcat.apache.org
ReportedBy: akurta...@gmail.com
Classification: Unclassified


Created attachment 28138
  --> https://issues.apache.org/bugzilla/attachment.cgi?id=28138
Patch

In some cases (e.g. OSGi web modules) jasper.jar and dtds will be in different
classloaders making the need for setting up custom entity resolver so dtds can
be retrieved. A simple patch is attached.
This is already added in Glassfish's jasper fork and Jetty project is making
use of it. Applying the patch will allow using Tomcat's Jasper in Jetty instead
of Glassfish's one. See
http://git.eclipse.org/c/jetty/org.eclipse.jetty.project.git/tree/jetty-osgi/jetty-osgi-boot-jsp/src/main/java/org/eclipse/jetty/osgi/boot/jasper/WebappRegistrationCustomizerImpl.java?id=306947b1420beed76c772e546eb3120b3bf4b112#n181
for details about the change and why it was needed.

-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug.

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1229953 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/tomcat/util/buf/B2CConverter.java java/org/apache/tomcat/util/buf/LocalStrings.properties java/org/apache/tomcat/util/buf/LocalStrin

[markt]

Author: markt
Date: Wed Jan 11 10:50:50 2012
New Revision: 1229953

URL: http://svn.apache.org/viewvc?rev=1229953&view=rev
Log:
Align spelling of message key

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/buf/B2CConverter.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/buf/LocalStrings.properties

tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/buf/LocalStrings_es.properties

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 11 10:50:50 2012
@@ -1 +1 @@
-/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096
 
,1173241,1173256,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174975,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175798,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137,1186153,1186254,1186257,1186377-1186379,1186479-1186480,1186712,1186743,1186750,1186763,1186890-1186892,1186894,1186949,1187018,1187027-1187028,1187
 
381,1187753,1187755,1187775,1187801,1187806,1187809,1187827,1188301,1188303-1188305,1188399,1188822,1188930-1188931,1189116,1189129,1189183,1189240,1189256,1189386,1189413-1189414,1189477,1189685,1189805,1189857,1189864,1189882,1190034,1190185,1190279,1190339,1190371,1190388-1190389,1190474,1190481,1194915,1195222-1195223,1195531,1195899,1195905,1195943,1195949,1195953,1195955,1195965,1195968,1196175,1196212,1196223,1196304-1196305,1196735,1196825,1196827,1197158,1197261,1197263,1197299-1197300,1197305,1197339-1197340,1197343,1197382,1197386-1197387,1197480,1197578,1198497,1198528,1198552,1198602,1198604,1198607,1198622,1198640,1198696,1198707,1199418,1199432,1199436,1199513,1199529,1199980,116,1200056,1200089,1200106-1200107,1200263,1200316,1200320,1200398-1200399,1200445-1200446,1200555,1200627,1200696,1200725,1200937,1200941,1201069,1201087,1201180,1201235-1201237,1201508,1201521,1201542,1201545-1201546,1201548,1201555-1201556,1201568,1201576,1201608,1201921-1201922,1
 
201931,1202035,1202039,1202271,1202565,1202578,1202705,1202828,1202860,1203047-1203052,1203078,1203091,1203253,1203278,1204182,1204856,1204867,1204936,1204938,1204982,1205033,1205065,1205082,1205097,1205112,1206200,1207692,1208046,1208073,1208096,1208114,1208145,1208772,1209194,1209277-1209278,1209686-1209731,1210894,1212091,1212095,1212099,1212118,1213469,1213906,1214853,1214855,1214864,1215115,1215118-1215119,1215121,1220293,1220295,1221038,1221842,1222189,101,176,1222300,1222690,1222850,1222852,1222855,1224607,1224617,1224648-1224652,1224657,1224662-1224663,1224682,1224801,1224910,1225000,1225219,1225343,1225465,1225627,1225629,1225634,1226069,1226158-1226159,1226177,1226196,1226214-1226215,1226385,1226394,1226500,1226537-1226538,1226546,1226551,1226975,1228196,1228360,1228376,1228724,1228908,1228918,1228920,1228922,1228929,1228969,1229307,1229536,1229549,1229724
+/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164

svn commit: r1229955 - /tomcat/trunk/java/org/apache/jasper/xmlparser/ParserUtils.java

[mturk]

Author: mturk
Date: Wed Jan 11 10:56:26 2012
New Revision: 1229955

URL: http://svn.apache.org/viewvc?rev=1229955&view=rev
Log:
BZ52450 Add setter for EntityResolver

Modified:
tomcat/trunk/java/org/apache/jasper/xmlparser/ParserUtils.java

Modified: tomcat/trunk/java/org/apache/jasper/xmlparser/ParserUtils.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/xmlparser/ParserUtils.java?rev=1229955&r1=1229954&r2=1229955&view=diff
==
--- tomcat/trunk/java/org/apache/jasper/xmlparser/ParserUtils.java (original)
+++ tomcat/trunk/java/org/apache/jasper/xmlparser/ParserUtils.java Wed Jan 11 
10:56:26 2012
@@ -133,6 +133,17 @@ public class ParserUtils {
 return (parseXMLDocument(uri, new InputSource(is)));
 }
 
+/**
+ * Set the EntityResolver.
+ * This is needed when the dtds and Jasper itself are in different
+ * classloaders (e.g. OSGi environment).
+ *
+ * @param er EntityResolver to use.
+ */
+public static void setEntityResolver(EntityResolver er) {
+
+entityResolver = er;
+}
 
 // -- Protected Methods
 



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1229956 - in /tomcat/tc7.0.x/trunk: java/org/apache/jasper/xmlparser/ParserUtils.java webapps/docs/changelog.xml

[mturk]

Author: mturk
Date: Wed Jan 11 11:04:12 2012
New Revision: 1229956

URL: http://svn.apache.org/viewvc?rev=1229956&view=rev
Log:
BZ52450 Add setter for EntityResolver

Modified:
tomcat/tc7.0.x/trunk/java/org/apache/jasper/xmlparser/ParserUtils.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Modified: tomcat/tc7.0.x/trunk/java/org/apache/jasper/xmlparser/ParserUtils.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/jasper/xmlparser/ParserUtils.java?rev=1229956&r1=1229955&r2=1229956&view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/jasper/xmlparser/ParserUtils.java 
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/jasper/xmlparser/ParserUtils.java Wed 
Jan 11 11:04:12 2012
@@ -133,6 +133,17 @@ public class ParserUtils {
 return (parseXMLDocument(uri, new InputSource(is)));
 }
 
+/**
+ * Set the EntityResolver.
+ * This is needed when the dtds and Jasper itself are in different
+ * classloaders (e.g. OSGi environment).
+ *
+ * @param er EntityResolver to use.
+ */
+public static void setEntityResolver(EntityResolver er) {
+
+entityResolver = er;
+}
 
 // -- Protected Methods
 

Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1229956&r1=1229955&r2=1229956&view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Wed Jan 11 11:04:12 2012
@@ -151,6 +151,11 @@
   
 
   
+52450: Add setter for entityResolver in ParserUtils.
+This is mainly useful when jasper and dtds are in different
+class loaders. (mturk)
+  
+  
 52321: Ensure that the order of multiple prelude/coda values
 for JSP pages is respected. (markt)
   



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

DO NOT REPLY [Bug 52450] Add setter for entityResolver in jasper's ParserUtils

[bugzilla]

https://issues.apache.org/bugzilla/show_bug.cgi?id=52450

Mladen Turk  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED

--- Comment #1 from Mladen Turk  2012-01-11 11:05:18 UTC ---
Patch applied. Thanks!

-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug.

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

DO NOT REPLY [Bug 52328] Massive garbage production observed when using the response writer

[bugzilla]

https://issues.apache.org/bugzilla/show_bug.cgi?id=52328

--- Comment #12 from Mark Thomas  2012-01-11 13:10:07 UTC ---
Excellent. I'll put a dev build up on my people.apache.org space and provide a
link when it is available.

For reference, both the flushing changes and adding an internal buffer a[ppear
to help performance in all cases. Here are some figures from the latest version
of the test case which I'll commit shortly:

Trunk without internal buffer but with flushing patch
Write length:  1, Buffered: n, Time: 86143369ns
Write length:  1, Buffered: y, Time: 18922557ns
Write length: 10, Buffered: n, Time:  4281841ns
Write length: 10, Buffered: y, Time:  1817266ns
Write length:100, Buffered: n, Time:  1687881ns
Write length:100, Buffered: y, Time:  1185908ns
Write length:   1000, Buffered: n, Time:  1243862ns
Write length:   1000, Buffered: y, Time:  1160367ns
Write length:  1, Buffered: n, Time:  1147934ns
Write length:  1, Buffered: y, Time:  1281448ns
Write length: 10, Buffered: n, Time:  1204381ns
Write length: 10, Buffered: y, Time:  1218129ns


Trunk with internal buffer and flushing patch
Write length:  1, Buffered: n, Time: 27663008ns
Write length:  1, Buffered: y, Time: 15468331ns
Write length: 10, Buffered: n, Time:  1718582ns
Write length: 10, Buffered: y, Time:  1938994ns
Write length:100, Buffered: n, Time:  1110883ns
Write length:100, Buffered: y, Time:  1233152ns
Write length:   1000, Buffered: n, Time:   933836ns
Write length:   1000, Buffered: y, Time:  1259017ns
Write length:  1, Buffered: n, Time:  1024246ns
Write length:  1, Buffered: y, Time:  1168732ns
Write length: 10, Buffered: n, Time:  1015159ns
Write length: 10, Buffered: y, Time:  1074527ns

7.0,x with no patches
Write length:  1, Buffered: n, Time: 137147272ns
Write length:  1, Buffered: y, Time:  18676195ns
Write length: 10, Buffered: n, Time:  10390213ns
Write length: 10, Buffered: y, Time:   2038188ns
Write length:100, Buffered: n, Time:   2008351ns
Write length:100, Buffered: y, Time:   1200196ns
Write length:   1000, Buffered: n, Time:   1261317ns
Write length:   1000, Buffered: y, Time:   1217747ns
Write length:  1, Buffered: n, Time:   1117065ns
Write length:  1, Buffered: y, Time:   1081037ns
Write length: 10, Buffered: n, Time:   1471004ns
Write length: 10, Buffered: y, Time:   1134857ns

-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug.

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1229997 - /tomcat/trunk/test/org/apache/catalina/connector/TestOutputBuffer.java

[markt]

Author: markt
Date: Wed Jan 11 13:12:05 2012
New Revision: 1229997

URL: http://svn.apache.org/viewvc?rev=1229997&view=rev
Log:
Improve test case

Modified:
tomcat/trunk/test/org/apache/catalina/connector/TestOutputBuffer.java

Modified: tomcat/trunk/test/org/apache/catalina/connector/TestOutputBuffer.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/connector/TestOutputBuffer.java?rev=1229997&r1=1229996&r2=1229997&view=diff
==
--- tomcat/trunk/test/org/apache/catalina/connector/TestOutputBuffer.java 
(original)
+++ tomcat/trunk/test/org/apache/catalina/connector/TestOutputBuffer.java Wed 
Jan 11 13:12:05 2012
@@ -29,7 +29,6 @@ import static org.junit.Assert.assertEqu
 import org.junit.Test;
 
 import org.apache.catalina.Context;
-import org.apache.catalina.Wrapper;
 import org.apache.catalina.startup.Tomcat;
 import org.apache.catalina.startup.TomcatBaseTest;
 import org.apache.tomcat.util.buf.ByteChunk;
@@ -41,45 +40,53 @@ public class TestOutputBuffer extends To
 Tomcat tomcat = getTomcatInstance();
 
 Context root = tomcat.addContext("", TEMP_DIR);
-SingleCharWritingServlet servlet = new SingleCharWritingServlet();
-Wrapper w =
-Tomcat.addServlet(root, "singleCharWritingServlet", servlet);
-w.setAsyncSupported(true);
-root.addServletMapping("/", "singleCharWritingServlet");
+
+for (int i = 1; i <= WritingServlet.EXPECTED_CONTENT_LENGTH; i*=10) {
+WritingServlet servlet = new WritingServlet(i);
+Tomcat.addServlet(root, "servlet" + i, servlet);
+root.addServletMapping("/servlet" + i, "servlet" + i);
+}
 
 tomcat.start();
 
 ByteChunk bc = new ByteChunk();
-int rc = getUrl("http://localhost:"; + getPort() + "/", bc, null, null);
-
-assertEquals(200, rc);
-assertEquals(SingleCharWritingServlet.ITERATIONS, bc.getLength());
-
-long noBuffering = servlet.getLastRunNano();
-
-System.out.println(noBuffering);
-
-bc.recycle();
-
-rc = getUrl("http://localhost:"; + getPort() + "/?useBuffering=y", bc,
-null, null);
-
-assertEquals(200, rc);
-assertEquals(SingleCharWritingServlet.ITERATIONS, bc.getLength());
 
-long buffering = servlet.getLastRunNano();
+for (int i = 1; i <= WritingServlet.EXPECTED_CONTENT_LENGTH; i*=10) {
+int rc = getUrl("http://localhost:"; + getPort() +
+"/servlet" + i, bc, null, null);
+assertEquals(HttpServletResponse.SC_OK, rc);
+assertEquals(
+WritingServlet.EXPECTED_CONTENT_LENGTH, bc.getLength());
+
+bc.recycle();
+
+rc = getUrl("http://localhost:"; + getPort() +
+"/servlet" + i + "?useBuffer=y", bc, null, null);
+assertEquals(HttpServletResponse.SC_OK, rc);
+assertEquals(
+WritingServlet.EXPECTED_CONTENT_LENGTH, bc.getLength());
 
-System.out.println(buffering);
+bc.recycle();
+}
 }
 
-private static final class SingleCharWritingServlet extends HttpServlet {
+private static class WritingServlet extends HttpServlet {
 
 private static final long serialVersionUID = 1L;
 
-protected static final int ITERATIONS = 10;
+protected static final int EXPECTED_CONTENT_LENGTH = 10;
+
+private final String writeString;
+private final int writeCount;
 
-// Not thread safe but will only be used with single calls.
-private volatile long lastRunNano = 0;
+public WritingServlet(int writeLength) {
+StringBuilder sb = new StringBuilder();
+for (int i = 0; i < writeLength; i++) {
+sb.append('x');
+}
+writeString = sb.toString();
+writeCount = EXPECTED_CONTENT_LENGTH / writeLength;
+}
 
 @Override
 protected void doGet(HttpServletRequest req, HttpServletResponse resp)
@@ -97,20 +104,17 @@ public class TestOutputBuffer extends To
 }
 
 long start = System.nanoTime();
-
-for (int i = 0; i < ITERATIONS; i++) {
-w.write('x');
+for (int i = 0; i < writeCount; i++) {
+w.write(writeString);
 }
-
-lastRunNano = System.nanoTime() - start;
-
 if (useBufferStr != null) {
 w.flush();
 }
-}
+long lastRunNano = System.nanoTime() - start;
 
-public long getLastRunNano() {
-return lastRunNano;
+System.out.println("Write length: " + writeString.length() +
+", Buffered: " + (useBufferStr == null ? "n" : "y") +
+", Time: " + lastRunNano + "ns");
 }
 }
 }



-

DO NOT REPLY [Bug 52328] Massive garbage production observed when using the response writer

[bugzilla]

https://issues.apache.org/bugzilla/show_bug.cgi?id=52328

--- Comment #13 from Nikolay Diakov  2012-01-11 
13:20:41 UTC ---
Numbers look great! Can't wait to try it out. 

If all well, we would appreciate information about planning/estimation when to
expect a 7.0.x release with the patch inside.

-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug.

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1230024 [4/4] - in /tomcat/maven-plugin/trunk: ./ tomcat-maven-archetype/ tomcat-maven-archetype/src/ tomcat-maven-archetype/src/main/ tomcat-maven-archetype/src/main/resources/ tomcat-ma

[olamy]

Propchange: 
tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-webapp/src/main/webapp/js/jquery-1.7.js
--
svn:eol-style = native

Propchange: 
tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-webapp/src/main/webapp/js/jquery-1.7.js
--
svn:keywords = Author Date Id Revision

Added: 
tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-webapp/src/test/java/webapp/test/SimpleTest.java
URL: 
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-webapp/src/test/java/webapp/test/SimpleTest.java?rev=1230024&view=auto
==
--- 
tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-webapp/src/test/java/webapp/test/SimpleTest.java
 (added)
+++ 
tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-webapp/src/test/java/webapp/test/SimpleTest.java
 Wed Jan 11 13:38:55 2012
@@ -0,0 +1,53 @@
+#set( $symbol_pound = '#' )
+#set( $symbol_dollar = '$' )
+#set( $symbol_escape = '\' )
+package ${package}.webapp.test;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.
+ */
+
+import com.thoughtworks.selenium.DefaultSelenium;
+import junit.framework.TestCase;
+
+/**
+ * @author Olivier Lamy
+ */
+public class SimpleTest
+extends TestCase
+{
+
+public void testSimple() throws Exception
+{
+
+int seleniumPort = Integer.parseInt( System.getProperty( 
"selenium.port", "" ) );
+String browser = System.getProperty( "seleniumBrowser", "*firefox" );
+String serverUrl = System.getProperty( "serverUrl", 
"http://localhost:9090/"; );
+
+DefaultSelenium s = new DefaultSelenium( "localhost", seleniumPort, 
browser, serverUrl );
+s.start(  );
+s.open( "index.html" );
+s.type( "who", "foo" );
+s.click( "send-btn" );
+// wait a bit ajax response
+Thread.sleep( 1000 );
+String text = s.getText( "response" );
+assertEquals( "Hello foo", text );
+
+}
+
+}

Propchange: 
tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-webapp/src/test/java/webapp/test/SimpleTest.java
--
svn:eol-style = native

Propchange: 
tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-webapp/src/test/java/webapp/test/SimpleTest.java
--
svn:keywords = Author Date Id Revision

Added: 
tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/test/resources/projects/basic/archetype.properties
URL: 
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/test/resources/projects/basic/archetype.properties?rev=1230024&view=auto
==
--- 
tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/test/resources/projects/basic/archetype.properties
 (added)
+++ 
tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/test/resources/projects/basic/archetype.properties
 Wed Jan 11 13:38:55 2012
@@ -0,0 +1,4 @@
+package=it.pkg
+version=0.1-SNAPSHOT
+groupId=archetype.it
+artifactId=basic

Propchange: 
tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/test/resources/projects/basic/archetype.properties
--
svn:eol-style = native

Propchange: 
tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/test/resources/projects/basic/archetype.properties
--
svn:keywords = Author Date Id Revision

Added: 
tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/test/resources/projects/basic/goal.txt
URL: 
http://svn.apache.org/view

svn commit: r1230024 [1/4] - in /tomcat/maven-plugin/trunk: ./ tomcat-maven-archetype/ tomcat-maven-archetype/src/ tomcat-maven-archetype/src/main/ tomcat-maven-archetype/src/main/resources/ tomcat-ma

[olamy]

Author: olamy
Date: Wed Jan 11 13:38:55 2012
New Revision: 1230024

URL: http://svn.apache.org/viewvc?rev=1230024&view=rev
Log:
[MTOMCAT-114] Add an archetype project sample.

Added:
tomcat/maven-plugin/trunk/tomcat-maven-archetype/
tomcat/maven-plugin/trunk/tomcat-maven-archetype/pom.xml   (with props)
tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/
tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/
tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/

tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/META-INF/

tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/META-INF/maven/

tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
   (with props)

tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/

tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/pom.xml
   (with props)

tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-api/

tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-api-impl/

tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-api-impl/pom.xml
   (with props)

tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-api-impl/src/

tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-api-impl/src/main/

tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-api-impl/src/main/java/

tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-api-impl/src/main/java/tomcat/

tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-api-impl/src/main/java/tomcat/api/

tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-api-impl/src/main/java/tomcat/api/impl/

tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-api-impl/src/main/java/tomcat/api/impl/DefaultHelloService.java
   (with props)

tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-api-impl/src/main/resources/

tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-api-impl/src/main/resources/META-INF/

tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-api-impl/src/main/resources/META-INF/spring-context.xml
   (with props)

tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-api/pom.xml
   (with props)

tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-api/src/

tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-api/src/main/

tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-api/src/main/java/

tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-api/src/main/java/tomcat/

tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-api/src/main/java/tomcat/api/

tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-api/src/main/java/tomcat/api/HelloService.java
   (with props)

tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-webapp/

tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-webapp/pom.xml
   (with props)

tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-webapp/src/

tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-webapp/src/main/

tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-webapp/src/main/webapp/

tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-webapp/src/main/webapp/META-INF/

tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-webapp/src/main/webapp/META-INF/context.xml
   (with props)

tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-webapp/src/main/webapp/WEB-INF/

tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-webapp/src/main/webapp/WEB-INF/web.xml
   (with props)

tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-webapp/src/main/webapp/css/

tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-webapp/src/main/webapp/cs

svn commit: r1230024 [2/4] - in /tomcat/maven-plugin/trunk: ./ tomcat-maven-archetype/ tomcat-maven-archetype/src/ tomcat-maven-archetype/src/main/ tomcat-maven-archetype/src/main/resources/ tomcat-ma

[olamy]

Added: 
tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-webapp/src/main/webapp/css/bootstrap.min.1.4.0.css
URL: 
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-webapp/src/main/webapp/css/bootstrap.min.1.4.0.css?rev=1230024&view=auto
==
--- 
tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-webapp/src/main/webapp/css/bootstrap.min.1.4.0.css
 (added)
+++ 
tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-webapp/src/main/webapp/css/bootstrap.min.1.4.0.css
 Wed Jan 11 13:38:55 2012
@@ -0,0 +1,356 @@
+html,body{margin:0;padding:0;}
+h1,h2,h3,h4,h5,h6,p,blockquote,pre,a,abbr,acronym,address,cite,code,del,dfn,em,img,q,s,samp,small,strike,strong,sub,sup,tt,var,dd,dl,dt,li,ol,ul,fieldset,form,label,legend,button,table,caption,tbody,tfoot,thead,tr,th,td{margin:0;padding:0;border:0;font-weight:normal;font-style:normal;font-size:100%;line-height:1;font-family:inherit;}
+table{border-collapse:collapse;border-spacing:0;}
+ol,ul{list-style:none;}
+q:before,q:after,blockquote:before,blockquote:after{content:"";}
+html{overflow-y:scroll;font-size:100%;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;}
+a:focus{outline:thin dotted;}
+a:hover,a:active{outline:0;}
+article,aside,details,figcaption,figure,footer,header,hgroup,nav,section{display:block;}
+audio,canvas,video{display:inline-block;*display:inline;*zoom:1;}
+audio:not([controls]){display:none;}
+sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline;}
+sup{top:-0.5em;}
+sub{bottom:-0.25em;}
+img{border:0;-ms-interpolation-mode:bicubic;}
+button,input,select,textarea{font-size:100%;margin:0;vertical-align:baseline;*vertical-align:middle;}
+button,input{line-height:normal;*overflow:visible;}
+button::-moz-focus-inner,input::-moz-focus-inner{border:0;padding:0;}
+button,input[type="button"],input[type="reset"],input[type="submit"]{cursor:pointer;-webkit-appearance:button;}
+input[type="search"]{-webkit-appearance:textfield;-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;}
+input[type="search"]::-webkit-search-decoration{-webkit-appearance:none;}
+textarea{overflow:auto;vertical-align:top;}
+body{background-color:#ff;margin:0;font-family:"Helvetica 
Neue",Helvetica,Arial,sans-serif;font-size:13px;font-weight:normal;line-height:18px;color:#404040;}
+.container{width:940px;margin-left:auto;margin-right:auto;zoom:1;}.container:before,.container:after{display:table;content:"";zoom:1;}
+.container:after{clear:both;}
+.container-fluid{position:relative;min-width:940px;padding-left:20px;padding-right:20px;zoom:1;}.container-fluid:before,.container-fluid:after{display:table;content:"";zoom:1;}
+.container-fluid:after{clear:both;}
+.container-fluid>.sidebar{position:absolute;top:0;left:20px;width:220px;}
+.container-fluid>.content{margin-left:240px;}
+a{color:#0069d6;text-decoration:none;line-height:inherit;font-weight:inherit;}a:hover{color:#00438a;text-decoration:underline;}
+.pull-right{float:right;}
+.pull-left{float:left;}
+.hide{display:none;}
+.show{display:block;}
+.row{zoom:1;margin-left:-20px;}.row:before,.row:after{display:table;content:"";zoom:1;}
+.row:after{clear:both;}
+.row>[class*="span"]{display:inline;float:left;margin-left:20px;}
+.span1{width:40px;}
+.span2{width:100px;}
+.span3{width:160px;}
+.span4{width:220px;}
+.span5{width:280px;}
+.span6{width:340px;}
+.span7{width:400px;}
+.span8{width:460px;}
+.span9{width:520px;}
+.span10{width:580px;}
+.span11{width:640px;}
+.span12{width:700px;}
+.span13{width:760px;}
+.span14{width:820px;}
+.span15{width:880px;}
+.span16{width:940px;}
+.span17{width:1000px;}
+.span18{width:1060px;}
+.span19{width:1120px;}
+.span20{width:1180px;}
+.span21{width:1240px;}
+.span22{width:1300px;}
+.span23{width:1360px;}
+.span24{width:1420px;}
+.row>.offset1{margin-left:80px;}
+.row>.offset2{margin-left:140px;}
+.row>.offset3{margin-left:200px;}
+.row>.offset4{margin-left:260px;}
+.row>.offset5{margin-left:320px;}
+.row>.offset6{margin-left:380px;}
+.row>.offset7{margin-left:440px;}
+.row>.offset8{margin-left:500px;}
+.row>.offset9{margin-left:560px;}
+.row>.offset10{margin-left:620px;}
+.row>.offset11{margin-left:680px;}
+.row>.offset12{margin-left:740px;}
+.span-one-third{width:300px;}
+.span-two-thirds{width:620px;}
+.row>.offset-one-third{margin-left:340px;}
+.row>.offset-two-thirds{margin-left:660px;}
+p{font-size:13px;font-weight:normal;line-height:18px;margin-bottom:9px;}p 
small{font-size:11px;color:#bfbfbf;}
+h1,h2,h3,h4,h5,h6{font-weight:bold;color:#404040;}h1 small,h2 small,h3 
small,h4 small,h5 small,h6 small{color:#bfbfbf;}
+h1{margin-bottom:18px;font-size:30px;line-height:36px;}h1 
small{font-size:18px;}
+h2{font-size:24px;line-height:36px;}h2 small{font-size:14px;}
+h3,h4,h5

svn commit: r1230026 - in /tomcat/maven-plugin/trunk/tomcat-maven-archetype: ./ src/main/resources/META-INF/maven/ src/main/resources/archetype-resources/ src/main/resources/archetype-resources/test-a

[olamy]

Author: olamy
Date: Wed Jan 11 13:39:47 2012
New Revision: 1230026

URL: http://svn.apache.org/viewvc?rev=1230026&view=rev
Log:
fix some properties, configure archetype plugin to run it test on an archetype 
sample

Modified:
tomcat/maven-plugin/trunk/tomcat-maven-archetype/pom.xml

tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml

tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/pom.xml

tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-api-impl/pom.xml

tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-api-impl/src/main/resources/META-INF/spring-context.xml

tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-api/pom.xml

tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-webapp/pom.xml

tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-webapp/src/main/webapp/WEB-INF/web.xml

tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/test/resources/projects/basic/archetype.properties

tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/test/resources/projects/basic/goal.txt

Modified: tomcat/maven-plugin/trunk/tomcat-maven-archetype/pom.xml
URL: 
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat-maven-archetype/pom.xml?rev=1230026&r1=1230025&r2=1230026&view=diff
==
--- tomcat/maven-plugin/trunk/tomcat-maven-archetype/pom.xml (original)
+++ tomcat/maven-plugin/trunk/tomcat-maven-archetype/pom.xml Wed Jan 11 
13:39:47 2012
@@ -83,5 +83,18 @@
 
   
 
+
+
+  
+org.apache.maven.plugins
+maven-archetype-plugin
+${archetypeVersion}
+
+  ${basedir}/src/test/test-settings.xml
+  
${basedir}/target/local-repo
+
+  
+
+
   
 

Modified: 
tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
URL: 
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml?rev=1230026&r1=1230025&r2=1230026&view=diff
==
--- 
tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
 (original)
+++ 
tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
 Wed Jan 11 13:39:47 2012
@@ -20,11 +20,34 @@
 http://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.0.0
 http://maven.apache.org/xsd/archetype-descriptor-1.0.0.xsd"; 
name="tomcat-archetype"
 
xmlns="http://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.0.0";
 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
+  
+
+  org.foo
+
+
+  basic
+
+
+  1.0-SNAPSHOT
+
+
+  basic
+
+
+  basic-api
+
+
+  basic-api-impl
+
+
+  basic-webapp
+
+  
   
 
   
   
-tomcat-archetype.iml
+pom.xml
   
 
   
@@ -37,12 +60,6 @@
 **/*.java
   
 
-
-  
-  
-test-api.iml
-  
-
   
 
 
@@ -59,12 +76,6 @@
 **/*.xml
   
 
-
-  
-  
-test-api-impl.iml
-  
-
   
 
 
@@ -89,12 +100,6 @@
 **/*.java
   
 
-
-  
-  
-test-webapp.iml
-  
-
   
 
   

Modified: 
tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/pom.xml
URL: 
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/pom.xml?rev=1230026&r1=1230025&r2=1230026&view=diff
==
--- 
tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/pom.xml
 (original)
+++ 
tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/pom.xml
 Wed Jan 11 13:39:47 2012
@@ -22,7 +22,7 @@
 
   4.0.0
   ${groupId}
-  ${artifactId}
+  ${rootArtifactId}
   ${version}
   pom
 
@@ -60,13 +60,13 @@
   
 
   
-org.apache.tomcat.maven.archetype
-test-api
+${groupId}
+${artifactId-api}
 ${project.version}
   
   
-org.apache.tomcat.maven.archetype
-test-api-impl
+${groupId}
+${artifactId-api-impl}
 ${project.version}
   
   

Modified: 
tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/ar

svn commit: r1230027 - /tomcat/maven-plugin/trunk/tomcat-maven-archetype/pom.xml

[olamy]

Author: olamy
Date: Wed Jan 11 13:39:56 2012
New Revision: 1230027

URL: http://svn.apache.org/viewvc?rev=1230027&view=rev
Log:
run archetype it test only in run-its profile

Modified:
tomcat/maven-plugin/trunk/tomcat-maven-archetype/pom.xml

Modified: tomcat/maven-plugin/trunk/tomcat-maven-archetype/pom.xml
URL: 
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat-maven-archetype/pom.xml?rev=1230027&r1=1230026&r2=1230027&view=diff
==
--- tomcat/maven-plugin/trunk/tomcat-maven-archetype/pom.xml (original)
+++ tomcat/maven-plugin/trunk/tomcat-maven-archetype/pom.xml Wed Jan 11 
13:39:56 2012
@@ -83,18 +83,26 @@
 
   
 
+  
 
-
-  
-org.apache.maven.plugins
-maven-archetype-plugin
-${archetypeVersion}
-
-  ${basedir}/src/test/test-settings.xml
-  
${basedir}/target/local-repo
-
-  
-
 
-  
+  
+
+  run-its
+  
+
+  
+org.apache.maven.plugins
+maven-archetype-plugin
+${archetypeVersion}
+
+  
${basedir}/src/test/test-settings.xml
+  
${basedir}/target/local-repo
+
+  
+
+  
+
+  
+
 



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1230028 - /tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/test/test-settings.xml

[olamy]

Author: olamy
Date: Wed Jan 11 13:40:06 2012
New Revision: 1230028

URL: http://svn.apache.org/viewvc?rev=1230028&view=rev
Log:
missed to add a file

Added:
tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/test/test-settings.xml 
  (with props)

Added: 
tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/test/test-settings.xml
URL: 
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/test/test-settings.xml?rev=1230028&view=auto
==
--- tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/test/test-settings.xml 
(added)
+++ tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/test/test-settings.xml 
Wed Jan 11 13:40:06 2012
@@ -0,0 +1,55 @@
+
+
+
+
+
+  
+
+  it-repo
+  
+true
+  
+  
+
+  local-central
+  @localRepositoryUrl@
+  
+true
+  
+  
+true
+  
+
+  
+  
+
+  local-central
+  @localRepositoryUrl@
+  
+true
+  
+  
+true
+  
+
+  
+
+  
+

Propchange: 
tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/test/test-settings.xml
--
svn:eol-style = native

Propchange: 
tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/test/test-settings.xml
--
svn:keywords = Author Date Id Revision



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1230029 - in /tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources: META-INF/maven/ archetype-resources/test-api-impl/src/main/resources/META-INF/ archetype-resources/test-

[olamy]

Author: olamy
Date: Wed Jan 11 13:40:24 2012
New Revision: 1230029

URL: http://svn.apache.org/viewvc?rev=1230029&view=rev
Log:
add a simple log4j.xml

Added:

tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-webapp/src/main/resources/

tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-webapp/src/main/resources/log4j.xml
   (with props)
Modified:

tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml

tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-api-impl/src/main/resources/META-INF/spring-context.xml

Modified: 
tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
URL: 
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml?rev=1230029&r1=1230028&r2=1230029&view=diff
==
--- 
tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
 (original)
+++ 
tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
 Wed Jan 11 13:40:24 2012
@@ -80,6 +80,12 @@
 
 
   
+
+  src/main/resources
+  
+**/*.xml
+  
+
 
   src/main/webapp
   

Modified: 
tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-api-impl/src/main/resources/META-INF/spring-context.xml
URL: 
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-api-impl/src/main/resources/META-INF/spring-context.xml?rev=1230029&r1=1230028&r2=1230029&view=diff
==
--- 
tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-api-impl/src/main/resources/META-INF/spring-context.xml
 (original)
+++ 
tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-api-impl/src/main/resources/META-INF/spring-context.xml
 Wed Jan 11 13:40:24 2012
@@ -39,8 +39,7 @@
   
 
   
-  
+  
 
   
 

Added: 
tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-webapp/src/main/resources/log4j.xml
URL: 
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-webapp/src/main/resources/log4j.xml?rev=1230029&view=auto
==
--- 
tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-webapp/src/main/resources/log4j.xml
 (added)
+++ 
tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-webapp/src/main/resources/log4j.xml
 Wed Jan 11 13:40:24 2012
@@ -0,0 +1,41 @@
+
+
+
+
+
+http://jakarta.apache.org/log4j/";>
+
+  
+
+  
+
+  
+
+  
+
+  
+
+
+  
+
+
+  
+
+

Propchange: 
tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-webapp/src/main/resources/log4j.xml
--
svn:eol-style = native

Propchange: 
tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-webapp/src/main/resources/log4j.xml
--
svn:keywords = Author Date Id Revision



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1230030 - /tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-webapp/src/main/webapp/WEB-INF/web.xml

[olamy]

Author: olamy
Date: Wed Jan 11 13:40:37 2012
New Revision: 1230030

URL: http://svn.apache.org/viewvc?rev=1230030&view=rev
Log:
add an applicationContext.xml

Modified:

tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-webapp/src/main/webapp/WEB-INF/web.xml

Modified: 
tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-webapp/src/main/webapp/WEB-INF/web.xml
URL: 
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-webapp/src/main/webapp/WEB-INF/web.xml?rev=1230030&r1=1230029&r2=1230030&view=diff
==
--- 
tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-webapp/src/main/webapp/WEB-INF/web.xml
 (original)
+++ 
tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-webapp/src/main/webapp/WEB-INF/web.xml
 Wed Jan 11 13:40:37 2012
@@ -29,7 +29,8 @@
   
 contextConfigLocation
 
-  classpath*:META-INF/spring-context.xml
+  classpath*:META-INF/spring-context.xml,
+  /WEB-INF/applicationContext.xml
 
   
 



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1230031 - in /tomcat/maven-plugin/trunk: ./ tomcat-maven-archetype/src/main/resources/META-INF/maven/ tomcat-maven-archetype/src/main/resources/archetype-resources/ tomcat-maven-archetype

[olamy]

Author: olamy
Date: Wed Jan 11 13:41:16 2012
New Revision: 1230031

URL: http://svn.apache.org/viewvc?rev=1230031&view=rev
Log:
[MTOMCAT-114] add a module to run selenium tests on the produce war.

Added:

tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-webapp-it/

tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-webapp-it/pom.xml
  - copied, changed from r1230030, 
tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-webapp/pom.xml

tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-webapp-it/src/

tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-webapp-it/src/test/

tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-webapp-it/src/test/context.xml
   (contents, props changed)
  - copied, changed from r1230030, 
tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-webapp/src/main/webapp/META-INF/context.xml

tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-webapp-it/src/test/java/

tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-webapp-it/src/test/java/webapp/

tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-webapp-it/src/test/java/webapp/test/

tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-webapp-it/src/test/java/webapp/test/SimpleTest.java
   (contents, props changed)
  - copied, changed from r1230030, 
tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-webapp/src/test/java/webapp/test/SimpleTest.java

tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-webapp/src/main/webapp/WEB-INF/applicationContext.xml
  - copied, changed from r1230030, 
tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-webapp/src/main/resources/log4j.xml
Removed:

tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-webapp/src/main/webapp/META-INF/context.xml

tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-webapp/src/test/java/webapp/test/SimpleTest.java
Modified:
tomcat/maven-plugin/trunk/pom.xml

tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml

tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/pom.xml

tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-api-impl/pom.xml

tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-api/pom.xml

tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-webapp/pom.xml

tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-webapp/src/main/resources/log4j.xml

tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/test/resources/projects/basic/archetype.properties

Modified: tomcat/maven-plugin/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/pom.xml?rev=1230031&r1=1230030&r2=1230031&view=diff
==
--- tomcat/maven-plugin/trunk/pom.xml (original)
+++ tomcat/maven-plugin/trunk/pom.xml Wed Jan 11 13:41:16 2012
@@ -547,6 +547,11 @@
 
 
   org.apache.maven.plugins
+  maven-resources-plugin
+  2.5
+
+
+  org.apache.maven.plugins
   maven-site-plugin
   3.0
   

Modified: 
tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
URL: 
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml?rev=1230031&r1=1230030&r2=1230031&view=diff
==
--- 
tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
 (original)
+++ 
tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
 Wed Jan 11 13:41:16 2012
@@ -42,6 +42,9 @@
 
   basic-webapp
 
+
+  basic-webapp-it
+
   
   
 
@@ -108,5 +111,21 @@
 
   
 
+
+  
+
+  src/test/
+  
+**/*.java
+  
+
+
+  src/test/
+  
+**/*.xml
+  
+
+  
+
   
 

Modified: 
tomcat/maven-plugin/trunk/tomcat-maven-archetype/src

svn commit: r1230032 - /tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-webapp/src/main/resources/log4j.xml

[olamy]

Author: olamy
Date: Wed Jan 11 13:41:30 2012
New Revision: 1230032

URL: http://svn.apache.org/viewvc?rev=1230032&view=rev
Log:
reduce log level

Modified:

tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-webapp/src/main/resources/log4j.xml

Modified: 
tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-webapp/src/main/resources/log4j.xml
URL: 
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-webapp/src/main/resources/log4j.xml?rev=1230032&r1=1230031&r2=1230032&view=diff
==
--- 
tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-webapp/src/main/resources/log4j.xml
 (original)
+++ 
tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-webapp/src/main/resources/log4j.xml
 Wed Jan 11 13:41:30 2012
@@ -29,7 +29,7 @@
   
 
   
-
+
   
 
 



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1230033 - in /tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources: META-INF/maven/archetype-metadata.xml archetype-resources/test-webapp-it/pom.xml

[olamy]

Author: olamy
Date: Wed Jan 11 13:41:43 2012
New Revision: 1230033

URL: http://svn.apache.org/viewvc?rev=1230033&view=rev
Log:
fix selenium test execution in the webapp-it module

Modified:

tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml

tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-webapp-it/pom.xml

Modified: 
tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
URL: 
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml?rev=1230033&r1=1230032&r2=1230033&view=diff
==
--- 
tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
 (original)
+++ 
tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
 Wed Jan 11 13:41:43 2012
@@ -114,7 +114,7 @@
 
   
 
-  src/test/
+  src/test/java
   
 **/*.java
   

Modified: 
tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-webapp-it/pom.xml
URL: 
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-webapp-it/pom.xml?rev=1230033&r1=1230032&r2=1230033&view=diff
==
--- 
tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-webapp-it/pom.xml
 (original)
+++ 
tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-webapp-it/pom.xml
 Wed Jan 11 13:41:43 2012
@@ -39,6 +39,7 @@
   
 
   
+src/test/java
 
   
 
@@ -70,6 +71,18 @@
 
   
 org.apache.maven.plugins
+maven-compiler-plugin
+
+  
+test-compile
+
+  testCompile
+
+  
+
+  
+  
+org.apache.maven.plugins
 maven-dependency-plugin
 2.4
 
@@ -100,7 +113,7 @@
 2.11
 
   
-integration-tests
+selenium-integration-tests
 integration-test
 
   test
@@ -111,9 +124,6 @@
 ${serverUrl}
 ${seleniumBrowser}
   
-  
-**/**
-  
 
   
 



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[jira] [Commented] (MTOMCAT-114) Add an archetype project sample

[Hudson (Commented) (JIRA)]

[ 
https://issues.apache.org/jira/browse/MTOMCAT-114?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=13184070#comment-13184070
 ] 

Hudson commented on MTOMCAT-114:


Integrated in TomcatMavenPlugin-mvn3.x #83 (See 
[https://builds.apache.org/job/TomcatMavenPlugin-mvn3.x/83/])
[MTOMCAT-114] Add an archetype project sample.

olamy : http://svn.apache.org/viewvc/?view=rev&rev=1230024
Files : 
* /tomcat/maven-plugin/trunk/pom.xml
* /tomcat/maven-plugin/trunk/tomcat-maven-archetype
* /tomcat/maven-plugin/trunk/tomcat-maven-archetype/pom.xml
* /tomcat/maven-plugin/trunk/tomcat-maven-archetype/src
* /tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main
* /tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources
* /tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/META-INF
* 
/tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/META-INF/maven
* 
/tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
* 
/tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources
* 
/tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/pom.xml
* 
/tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-api
* 
/tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-api-impl
* 
/tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-api-impl/pom.xml
* 
/tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-api-impl/src
* 
/tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-api-impl/src/main
* 
/tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-api-impl/src/main/java
* 
/tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-api-impl/src/main/java/tomcat
* 
/tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-api-impl/src/main/java/tomcat/api
* 
/tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-api-impl/src/main/java/tomcat/api/impl
* 
/tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-api-impl/src/main/java/tomcat/api/impl/DefaultHelloService.java
* 
/tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-api-impl/src/main/resources
* 
/tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-api-impl/src/main/resources/META-INF
* 
/tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-api-impl/src/main/resources/META-INF/spring-context.xml
* 
/tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-api/pom.xml
* 
/tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-api/src
* 
/tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-api/src/main
* 
/tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-api/src/main/java
* 
/tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-api/src/main/java/tomcat
* 
/tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-api/src/main/java/tomcat/api
* 
/tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-api/src/main/java/tomcat/api/HelloService.java
* 
/tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-webapp
* 
/tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-webapp/pom.xml
* 
/tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-webapp/src
* 
/tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-webapp/src/main
* 
/tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-webapp/src/main/webapp
* 
/tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-webapp/src/main/webapp/META-INF
* 
/tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-webapp/src/main/webapp/META-INF/context.xml
* 
/tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-webapp/src/main/webapp/WEB-INF
* 
/tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-webapp/src/main/webapp/WEB-INF/web.xml
* 
/tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-webapp/src/main/webapp/css
* 
/tomcat/maven-plugin/trunk/tomcat-mav

svn commit: r1230038 - in /tomcat/maven-plugin/trunk/tomcat-maven-archetype: pom.xml src/main/resources/archetype-resources/pom.xml

[olamy]

Author: olamy
Date: Wed Jan 11 13:49:07 2012
New Revision: 1230038

URL: http://svn.apache.org/viewvc?rev=1230038&view=rev
Log:
use filtering to not having plugin version hardcoded

Modified:
tomcat/maven-plugin/trunk/tomcat-maven-archetype/pom.xml

tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/pom.xml

Modified: tomcat/maven-plugin/trunk/tomcat-maven-archetype/pom.xml
URL: 
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat-maven-archetype/pom.xml?rev=1230038&r1=1230037&r2=1230038&view=diff
==
--- tomcat/maven-plugin/trunk/tomcat-maven-archetype/pom.xml (original)
+++ tomcat/maven-plugin/trunk/tomcat-maven-archetype/pom.xml Wed Jan 11 
13:49:07 2012
@@ -37,7 +37,7 @@
 
   
 2.2
-${project.version}
+${project.version}
   
   
 

Modified: 
tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/pom.xml
URL: 
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/pom.xml?rev=1230038&r1=1230037&r2=1230038&view=diff
==
--- 
tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/pom.xml
 (original)
+++ 
tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/pom.xml
 Wed Jan 11 13:49:07 2012
@@ -46,12 +46,12 @@
 
   org.apache.tomcat.maven
   tomcat6-maven-plugin
-  2.0-SNAPSHOT
+  ${tomcatPluginVersion}
 
 
   org.apache.tomcat.maven
   tomcat7-maven-plugin
-  2.0-SNAPSHOT
+  ${tomcatPluginVersion}
 
   
 



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1230039 - /tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/pom.xml

[olamy]

Author: olamy
Date: Wed Jan 11 13:49:17 2012
New Revision: 1230039

URL: http://svn.apache.org/viewvc?rev=1230039&view=rev
Log:
add codehaus snapshot repo as we currently depend on selenium plugin snapshot 
version will fix issue on asf jenkins

Modified:

tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/pom.xml

Modified: 
tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/pom.xml
URL: 
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/pom.xml?rev=1230039&r1=1230038&r2=1230039&view=diff
==
--- 
tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/pom.xml
 (original)
+++ 
tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/pom.xml
 Wed Jan 11 13:49:17 2012
@@ -146,6 +146,17 @@
   
   
 
+
+
+  codehaus.snapshots
+  https://nexus.codehaus.org/content/repositories/snapshots/
+  
+false
+  
+  
+true
+  
+
   
 
 



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[jira] [Closed] (MTOMCAT-114) Add an archetype project sample

[Olivier Lamy (Closed) (JIRA)]

 [ 
https://issues.apache.org/jira/browse/MTOMCAT-114?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Olivier Lamy closed MTOMCAT-114.


Resolution: Fixed

fixed

> Add an archetype project sample
> ---
>
> Key: MTOMCAT-114
> URL: https://issues.apache.org/jira/browse/MTOMCAT-114
> Project: Apache Tomcat Maven Plugin
>  Issue Type: Improvement
>Reporter: Olivier Lamy
>Assignee: Olivier Lamy
> Fix For: 2.0
>
>
> the archetype will be a multi module maven project with jar and war module.
> The webapp will have a selenium test to show how to start tomcat with the 
> plugin to run selenium tests.

--
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators: 
https://issues.apache.org/jira/secure/ContactAdministrators!default.jspa
For more information on JIRA, see: http://www.atlassian.com/software/jira



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[jira] [Commented] (MTOMCAT-114) Add an archetype project sample

[Hudson (Commented) (JIRA)]

[ 
https://issues.apache.org/jira/browse/MTOMCAT-114?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=13184073#comment-13184073
 ] 

Hudson commented on MTOMCAT-114:


Integrated in TomcatMavenPlugin-mvn3.x #84 (See 
[https://builds.apache.org/job/TomcatMavenPlugin-mvn3.x/84/])
[MTOMCAT-114] add a module to run selenium tests on the produce war.

olamy : http://svn.apache.org/viewvc/?view=rev&rev=1230031
Files : 
* /tomcat/maven-plugin/trunk/pom.xml
* 
/tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
* 
/tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/pom.xml
* 
/tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-api-impl/pom.xml
* 
/tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-api/pom.xml
* 
/tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-webapp-it
* 
/tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-webapp-it/pom.xml
* 
/tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-webapp-it/src
* 
/tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-webapp-it/src/test
* 
/tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-webapp-it/src/test/context.xml
* 
/tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-webapp-it/src/test/java
* 
/tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-webapp-it/src/test/java/webapp
* 
/tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-webapp-it/src/test/java/webapp/test
* 
/tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-webapp-it/src/test/java/webapp/test/SimpleTest.java
* 
/tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-webapp/pom.xml
* 
/tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-webapp/src/main/resources/log4j.xml
* 
/tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-webapp/src/main/webapp/META-INF/context.xml
* 
/tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-webapp/src/main/webapp/WEB-INF/applicationContext.xml
* 
/tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-webapp/src/test/java/webapp/test/SimpleTest.java
* 
/tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/test/resources/projects/basic/archetype.properties


> Add an archetype project sample
> ---
>
> Key: MTOMCAT-114
> URL: https://issues.apache.org/jira/browse/MTOMCAT-114
> Project: Apache Tomcat Maven Plugin
>  Issue Type: Improvement
>Reporter: Olivier Lamy
>Assignee: Olivier Lamy
> Fix For: 2.0
>
>
> the archetype will be a multi module maven project with jar and war module.
> The webapp will have a selenium test to show how to start tomcat with the 
> plugin to run selenium tests.

--
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators: 
https://issues.apache.org/jira/secure/ContactAdministrators!default.jspa
For more information on JIRA, see: http://www.atlassian.com/software/jira



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1230067 - in /tomcat/maven-plugin/trunk/tomcat-maven-archetype: pom.xml src/main/resources/archetype-resources/test-webapp-it/pom.xml src/test/resources/projects/basic/goal.txt

[olamy]

Author: olamy
Date: Wed Jan 11 14:37:12 2012
New Revision: 1230067

URL: http://svn.apache.org/viewvc?rev=1230067&view=rev
Log:
add a headless profile to start xvfb if needed and will fix asf jenkins build

Modified:
tomcat/maven-plugin/trunk/tomcat-maven-archetype/pom.xml

tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-webapp-it/pom.xml

tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/test/resources/projects/basic/goal.txt

Modified: tomcat/maven-plugin/trunk/tomcat-maven-archetype/pom.xml
URL: 
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat-maven-archetype/pom.xml?rev=1230067&r1=1230066&r2=1230067&view=diff
==
--- tomcat/maven-plugin/trunk/tomcat-maven-archetype/pom.xml (original)
+++ tomcat/maven-plugin/trunk/tomcat-maven-archetype/pom.xml Wed Jan 11 
14:37:12 2012
@@ -38,6 +38,7 @@
   
 2.2
 ${project.version}
+clean,verify
   
   
 
@@ -47,6 +48,12 @@
 true
   
 
+
+  
+src/test/resources
+true
+  
+
 
 
   
@@ -103,6 +110,12 @@
 
   
 
+
+  headless
+  
+clean,verify,-Pheadless
+  
+
   
 
 

Modified: 
tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-webapp-it/pom.xml
URL: 
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-webapp-it/pom.xml?rev=1230067&r1=1230066&r2=1230067&view=diff
==
--- 
tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-webapp-it/pom.xml
 (original)
+++ 
tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-webapp-it/pom.xml
 Wed Jan 11 14:37:12 2012
@@ -214,6 +214,26 @@
 *iexplore
   
 
+
+  headless
+  
+
+  
+org.codehaus.mojo
+selenium-maven-plugin
+
+  
+xvfb
+validate
+
+  xvfb
+
+  
+
+  
+
+  
+
   
 
 

Modified: 
tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/test/resources/projects/basic/goal.txt
URL: 
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/test/resources/projects/basic/goal.txt?rev=1230067&r1=1230066&r2=1230067&view=diff
==
--- 
tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/test/resources/projects/basic/goal.txt
 (original)
+++ 
tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/test/resources/projects/basic/goal.txt
 Wed Jan 11 14:37:12 2012
@@ -1 +1 @@
-clean,verify
\ No newline at end of file
+${archetypeItGoals}
\ No newline at end of file



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1230090 - in /tomcat/maven-plugin/trunk: pom.xml tomcat-maven-archetype/src/main/resources/archetype-resources/pom.xml

[olamy]

Author: olamy
Date: Wed Jan 11 15:27:05 2012
New Revision: 1230090

URL: http://svn.apache.org/viewvc?rev=1230090&view=rev
Log:
add enforcer rule 1.6 required as we use tomcat7 api

Modified:
tomcat/maven-plugin/trunk/pom.xml

tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/pom.xml

Modified: tomcat/maven-plugin/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/pom.xml?rev=1230090&r1=1230089&r2=1230090&view=diff
==
--- tomcat/maven-plugin/trunk/pom.xml (original)
+++ tomcat/maven-plugin/trunk/pom.xml Wed Jan 11 15:27:05 2012
@@ -599,6 +599,26 @@
   
 
   
+  
+org.apache.maven.plugins
+maven-enforcer-plugin
+1.0.1
+
+  
+enforce-java
+
+  enforce
+
+
+  
+
+  1.6.0
+
+  
+
+  
+
+  
 
   
 

Modified: 
tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/pom.xml
URL: 
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/pom.xml?rev=1230090&r1=1230089&r2=1230090&view=diff
==
--- 
tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/pom.xml
 (original)
+++ 
tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/pom.xml
 Wed Jan 11 15:27:05 2012
@@ -55,6 +55,28 @@
 
   
 
+
+  
+org.apache.maven.plugins
+maven-enforcer-plugin
+1.0.1
+
+  
+enforce-java
+
+  enforce
+
+
+  
+
+  1.6.0
+
+  
+
+  
+
+  
+
   
 
   



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1230103 - /tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml

[olamy]

Author: olamy
Date: Wed Jan 11 15:47:54 2012
New Revision: 1230103

URL: http://svn.apache.org/viewvc?rev=1230103&view=rev
Log:
remove non need archetype property, use org.apache.tomcat for others

Modified:

tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml

Modified: 
tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
URL: 
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml?rev=1230103&r1=1230102&r2=1230103&view=diff
==
--- 
tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
 (original)
+++ 
tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
 Wed Jan 11 15:47:54 2012
@@ -22,17 +22,14 @@
 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
   
 
-  org.foo
+  org.apache.tomcat.maven
 
-
-  basic
+
+  tomcat-maven-project
 
 
   1.0-SNAPSHOT
 
-
-  basic
-
 
   basic-api
 



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: More Caching for WebappClassLoader?

[Christopher Schultz]

Konstantin,

On 1/10/12 9:16 PM, Konstantin Kolinko wrote:
> I think that instead of caching the class instance itself it would be
> safe to cache the fact that the class was loaded from the parent
> classloader. It separates responsibilities and solves the issue with
> dynamic classloading. The difference is small though.
> Actually WebappClassLoader#notFoundResources already serves similar purpose.

I like this idea: it certainly improves the situation, though it will
still reduce some flexibility because if the class (or other resource)
appears in a /different/ location at some point, that new resource won't
be found. It might make patch-style dynamic class loading difficult.

-chris



signature.asc
Description: OpenPGP digital signature

svn commit: r1230235 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/connector/OutputBuffer.java webapps/docs/changelog.xml

[markt]

Author: markt
Date: Wed Jan 11 20:33:33 2012
New Revision: 1230235

URL: http://svn.apache.org/viewvc?rev=1230235&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52328
Initial fix. Don't flush on every write.

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/OutputBuffer.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 11 20:33:33 2012
@@ -1 +1 @@
-/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096
 
,1173241,1173256,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174975,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175798,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137,1186153,1186254,1186257,1186377-1186379,1186479-1186480,1186712,1186743,1186750,1186763,1186890-1186892,1186894,1186949,1187018,1187027-1187028,1187
 
381,1187753,1187755,1187775,1187801,1187806,1187809,1187827,1188301,1188303-1188305,1188399,1188822,1188930-1188931,1189116,1189129,1189183,1189240,1189256,1189386,1189413-1189414,1189477,1189685,1189805,1189857,1189864,1189882,1190034,1190185,1190279,1190339,1190371,1190388-1190389,1190474,1190481,1194915,1195222-1195223,1195531,1195899,1195905,1195943,1195949,1195953,1195955,1195965,1195968,1196175,1196212,1196223,1196304-1196305,1196735,1196825,1196827,1197158,1197261,1197263,1197299-1197300,1197305,1197339-1197340,1197343,1197382,1197386-1197387,1197480,1197578,1198497,1198528,1198552,1198602,1198604,1198607,1198622,1198640,1198696,1198707,1199418,1199432,1199436,1199513,1199529,1199980,116,1200056,1200089,1200106-1200107,1200263,1200316,1200320,1200398-1200399,1200445-1200446,1200555,1200627,1200696,1200725,1200937,1200941,1201069,1201087,1201180,1201235-1201237,1201508,1201521,1201542,1201545-1201546,1201548,1201555-1201556,1201568,1201576,1201608,1201921-1201922,1
 
201931,1202035,1202039,1202271,1202565,1202578,1202705,1202828,1202860,1203047-1203052,1203078,1203091,1203253,1203278,1204182,1204856,1204867,1204936,1204938,1204982,1205033,1205065,1205082,1205097,1205112,1206200,1207692,1208046,1208073,1208096,1208114,1208145,1208772,1209194,1209277-1209278,1209686-1209731,1210894,1212091,1212095,1212099,1212118,1213469,1213906,1214853,1214855,1214864,1215115,1215118-1215119,1215121,1220293,1220295,1221038,1221842,1222189,101,176,1222300,1222690,1222850,1222852,1222855,1224607,1224617,1224648-1224652,1224657,1224662-1224663,1224682,1224801,1224910,1225000,1225219,1225343,1225465,1225627,1225629,1225634,1226069,1226158-1226159,1226177,1226196,1226214-1226215,1226385,1226394,1226500,1226537-1226538,1226546,1226551,1226975,1228196,1228360,1228376,1228724,1228908,1228918,1228920,1228922,1228929,1228969,1229307,1229536,1229549,1229724,1229730
+/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,116

svn commit: r1230240 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/tomcat/util/buf/C2BConverter.java java/org/apache/tomcat/util/buf/LocalStrings.properties

[markt]

Author: markt
Date: Wed Jan 11 20:43:57 2012
New Revision: 1230240

URL: http://svn.apache.org/viewvc?rev=1230240&view=rev
Log:
Further improvements for 
https://issues.apache.org/bugzilla/show_bug.cgi?id=52328
Add a buffer to the converter

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/buf/C2BConverter.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/buf/LocalStrings.properties

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 11 20:43:57 2012
@@ -1 +1 @@
-/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096
 
,1173241,1173256,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174975,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175798,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137,1186153,1186254,1186257,1186377-1186379,1186479-1186480,1186712,1186743,1186750,1186763,1186890-1186892,1186894,1186949,1187018,1187027-1187028,1187
 
381,1187753,1187755,1187775,1187801,1187806,1187809,1187827,1188301,1188303-1188305,1188399,1188822,1188930-1188931,1189116,1189129,1189183,1189240,1189256,1189386,1189413-1189414,1189477,1189685,1189805,1189857,1189864,1189882,1190034,1190185,1190279,1190339,1190371,1190388-1190389,1190474,1190481,1194915,1195222-1195223,1195531,1195899,1195905,1195943,1195949,1195953,1195955,1195965,1195968,1196175,1196212,1196223,1196304-1196305,1196735,1196825,1196827,1197158,1197261,1197263,1197299-1197300,1197305,1197339-1197340,1197343,1197382,1197386-1197387,1197480,1197578,1198497,1198528,1198552,1198602,1198604,1198607,1198622,1198640,1198696,1198707,1199418,1199432,1199436,1199513,1199529,1199980,116,1200056,1200089,1200106-1200107,1200263,1200316,1200320,1200398-1200399,1200445-1200446,1200555,1200627,1200696,1200725,1200937,1200941,1201069,1201087,1201180,1201235-1201237,1201508,1201521,1201542,1201545-1201546,1201548,1201555-1201556,1201568,1201576,1201608,1201921-1201922,1
 
201931,1202035,1202039,1202271,1202565,1202578,1202705,1202828,1202860,1203047-1203052,1203078,1203091,1203253,1203278,1204182,1204856,1204867,1204936,1204938,1204982,1205033,1205065,1205082,1205097,1205112,1206200,1207692,1208046,1208073,1208096,1208114,1208145,1208772,1209194,1209277-1209278,1209686-1209731,1210894,1212091,1212095,1212099,1212118,1213469,1213906,1214853,1214855,1214864,1215115,1215118-1215119,1215121,1220293,1220295,1221038,1221842,1222189,101,176,1222300,1222690,1222850,1222852,1222855,1224607,1224617,1224648-1224652,1224657,1224662-1224663,1224682,1224801,1224910,1225000,1225219,1225343,1225465,1225627,1225629,1225634,1226069,1226158-1226159,1226177,1226196,1226214-1226215,1226385,1226394,1226500,1226537-1226538,1226546,1226551,1226975,1228196,1228360,1228376,1228724,1228908,1228918,1228920,1228922,1228929,1228969,1229307,1229536,1229549,1229724,1229726-1229727,1229730
+/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,116293

svn commit: r1230243 - in /tomcat/tc7.0.x/trunk: ./ test/org/apache/catalina/connector/TestOutputBuffer.java

[markt]

Author: markt
Date: Wed Jan 11 20:49:34 2012
New Revision: 1230243

URL: http://svn.apache.org/viewvc?rev=1230243&view=rev
Log:
Add test case

Added:

tomcat/tc7.0.x/trunk/test/org/apache/catalina/connector/TestOutputBuffer.java
  - copied, changed from r1229731, 
tomcat/trunk/test/org/apache/catalina/connector/TestOutputBuffer.java
Modified:
tomcat/tc7.0.x/trunk/   (props changed)

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 11 20:49:34 2012
@@ -1 +1 @@
-/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096
 
,1173241,1173256,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174975,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175798,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137,1186153,1186254,1186257,1186377-1186379,1186479-1186480,1186712,1186743,1186750,1186763,1186890-1186892,1186894,1186949,1187018,1187027-1187028,1187
 
381,1187753,1187755,1187775,1187801,1187806,1187809,1187827,1188301,1188303-1188305,1188399,1188822,1188930-1188931,1189116,1189129,1189183,1189240,1189256,1189386,1189413-1189414,1189477,1189685,1189805,1189857,1189864,1189882,1190034,1190185,1190279,1190339,1190371,1190388-1190389,1190474,1190481,1194915,1195222-1195223,1195531,1195899,1195905,1195943,1195949,1195953,1195955,1195965,1195968,1196175,1196212,1196223,1196304-1196305,1196735,1196825,1196827,1197158,1197261,1197263,1197299-1197300,1197305,1197339-1197340,1197343,1197382,1197386-1197387,1197480,1197578,1198497,1198528,1198552,1198602,1198604,1198607,1198622,1198640,1198696,1198707,1199418,1199432,1199436,1199513,1199529,1199980,116,1200056,1200089,1200106-1200107,1200263,1200316,1200320,1200398-1200399,1200445-1200446,1200555,1200627,1200696,1200725,1200937,1200941,1201069,1201087,1201180,1201235-1201237,1201508,1201521,1201542,1201545-1201546,1201548,1201555-1201556,1201568,1201576,1201608,1201921-1201922,1
 
201931,1202035,1202039,1202271,1202565,1202578,1202705,1202828,1202860,1203047-1203052,1203078,1203091,1203253,1203278,1204182,1204856,1204867,1204936,1204938,1204982,1205033,1205065,1205082,1205097,1205112,1206200,1207692,1208046,1208073,1208096,1208114,1208145,1208772,1209194,1209277-1209278,1209686-1209731,1210894,1212091,1212095,1212099,1212118,1213469,1213906,1214853,1214855,1214864,1215115,1215118-1215119,1215121,1220293,1220295,1221038,1221842,1222189,101,176,1222300,1222690,1222850,1222852,1222855,1224607,1224617,1224648-1224652,1224657,1224662-1224663,1224682,1224801,1224910,1225000,1225219,1225343,1225465,1225627,1225629,1225634,1226069,1226158-1226159,1226177,1226196,1226214-1226215,1226385,1226394,1226500,1226537-1226538,1226546,1226551,1226975,1228196,1228360,1228376,1228724,1228908,1228918,1228920,1228922,1228929,1228969,1229307,1229536,1229549,1229724,1229726-1229730
+/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,11652

DO NOT REPLY [Bug 52328] Massive garbage production observed when using the response writer

[bugzilla]

https://issues.apache.org/bugzilla/show_bug.cgi?id=52328

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED

--- Comment #14 from Mark Thomas  2012-01-11 21:09:49 UTC ---
Give it 30 minutes and there should be a full Tomcat 7 distribution (src, bin,
docs) uploaded to:
http://people.apache.org/~markt/dev/tomcat-7/v7.0.24-r1230243/

Please note the usual caveats for builds such as this:
- This is *NOT* an ASF release.
- This is a development build intended solely for testing this issue
- There has been zero testing of this build

Regarding a 7.0.24 release. I intend to roll it just as soon as the open 7.0.x
bugs are all resolved . How long that takes depends on how many bugs are
raised, how hard they are to fix and how much life gets in the way.

Hint: The more help there is investigating and fixing the currently open 7.0.x
bugs (excluding enhancements) the quicker there will be a 7.0.24 release.

I am marking this as fixed as is usual once a patch has been applied to the
release branch. If any issues are discovered, we can re-open the issue.

-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug.

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[GUMP@vmgump]: Project tomcat-trunk-validate (in module tomcat-trunk) failed

[Bill Barker]

To whom it may engage...

This is an automated request, but not an unsolicited one. For 
more information please visit http://gump.apache.org/nagged.html, 
and/or contact the folk at gene...@gump.apache.org.

Project tomcat-trunk-validate has an issue affecting its community integration.
This issue affects 1 projects.
The current state of this project is 'Failed', with reason 'Build Failed'.
For reference only, the following projects are affected by this:
- tomcat-trunk-validate :  Tomcat 8.x, a web server implementing Java 
Servlet 3.1,
...


Full details are available at:

http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-validate/index.html

That said, some information snippets are provided here.

The following annotations (debug/informational/warning/error messages) were 
provided:
 -DEBUG- Dependency on checkstyle exists, no need to add for property 
checkstyle.jar.
 -INFO- Failed with reason build failed



The following work was performed:
http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-validate/gump_work/build_tomcat-trunk_tomcat-trunk-validate.html
Work Name: build_tomcat-trunk_tomcat-trunk-validate (Type: Build)
Work ended in a state of : Failed
Elapsed: 30 secs
Command Line: /usr/lib/jvm/java-6-openjdk/bin/java -Djava.awt.headless=true 
-Dbuild.sysclasspath=only org.apache.tools.ant.Main 
-Dgump.merge=/srv/gump/public/gump/work/merge.xml 
-Dcheckstyle.jar=/srv/gump/public/workspace/checkstyle/target/checkstyle-5.6-SNAPSHOT.jar
 -Dexecute.validate=true validate 
[Working Directory: /srv/gump/public/workspace/tomcat-trunk]
CLASSPATH: 
/usr/lib/jvm/java-6-openjdk/lib/tools.jar:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/checkstyle/target/checkstyle-5.6-SNAPSHOT.jar:/srv/gump/public/workspace/apache-commons/beanutils/dist/commons-beanutils-12012012.jar:/srv/gump/public/workspace/apache-commons/cli/target/commons-cli-1.3-SNAPSHOT.jar:/srv/gump/public/workspace/apache-commons/exec/target/commons-exec-1.1.1-SNAPSHOT.jar:/srv/gump/public/workspace/apache-commons/validator/dist/commons-validator-12012012.jar:/srv/gump/public/workspace/junit/dist/junit-12012012.jar:/srv/gump
 
/public/workspace/junit/dist/junit-dep-12012012.jar:/srv/gump/public/workspace/google-guava/build/dist/guava-12012012/guava-12012012.jar:/srv/gump/public/workspace/apache-commons/logging/target/commons-logging-12012012.jar:/srv/gump/public/workspace/apache-commons/logging/target/commons-logging-api-12012012.jar:/srv/gump/public/workspace/commons-collections-3.x/target/commons-collections-3.3-SNAPSHOT.jar:/srv/gump/packages/antlr/antlr-3.1.3.jar:/srv/gump/public/workspace/jdom/build/jdom.jar:/srv/gump/public/workspace/velocity-engine/bin/velocity-12012012.jar:/srv/gump/public/workspace/velocity-engine/bin/velocity-12012012-dep.jar:/srv/gump/packages/javamail-1.4/mail.jar:/srv/gump/packages/javamail-1.4/lib/mailapi.jar:/srv/gump/packages/jaf-1.1ea/activation.jar
-
Buildfile: /srv/gump/public/workspace/tomcat-trunk/build.xml

download-validate:

proxyflags:

setproxy:

testexist:
 [echo] Testing  for 
/srv/gump/public/workspace/checkstyle/target/checkstyle-5.6-SNAPSHOT.jar

downloadzip:

validate:
[mkdir] Created dir: 
/srv/gump/public/workspace/tomcat-trunk/output/res/checkstyle
[checkstyle] Running Checkstyle 5.6-SNAPSHOT on 2108 files
[checkstyle] 
/srv/gump/public/workspace/tomcat-trunk/java/org/apache/jasper/xmlparser/ParserUtils.java:146:
 Line matches the illegal pattern '\s+$'.

BUILD FAILED
/srv/gump/public/workspace/tomcat-trunk/build.xml:447: Got 1 errors and 0 
warnings.

Total time: 30 seconds
-

To subscribe to this information via syndicated feeds:
- RSS: 
http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-validate/rss.xml
- Atom: 
http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-validate/atom.xml

== Gump Tracking Only ===
Produced by Apache Gump(TM) version 2.3.
Gump Run 1212012012, vmgump.apache.org:vmgump:1212012012
Gump E-mail Identifier (unique within run) #20.

--
Apache Gump
http://gump.apache.org/ [Instance: vmgump]

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

DO NOT REPLY [Bug 50462] xalan import should not be optional in maven-bundle-plugin

[bugzilla]

https://issues.apache.org/bugzilla/show_bug.cgi?id=50462

--- Comment #5 from xiaming  2012-01-12 07:53:42 UTC ---
Hi Devs,

Can you make a maven release for taglib 1.2? We want to use this in Geronimo
release. thanks in advance!

Forrest

-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug.

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org