Nabble - Tomcat - Dev

"No global naming context defined for server" error msg when starting an embedded tomcat server

2009-11-26T23:57:55Z

Hi experts there,

When I use geronimo to start an embedded tomcat server, there is an error
msg like this:
ERROR [GlobalResourcesLifecycleListener] No global naming context defined
for server

Can anyone give some hints? why this happens?

Thanks!
Forrest

DO NOT REPLY [Bug 48297] New: Missing french translations and some weird sentences (patch for trunk)

2009-11-26T23:19:37Z

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

Summary: Missing french translations and some weird sentences
(patch for trunk)
Product: Tomcat 7
Version: trunk
Platform: All
OS/Version: All
Status: NEW
Severity: minor
Priority: P2
Component: Manager
AssignedTo: dev@...
ReportedBy: marcpa@...

Created an attachment (id=24628)
--> (https://issues.apache.org/bugzilla/attachment.cgi?id=24628)
i18n fixes againt dev trunk

Patch adds missing properties in french i18n for tomcat manager and reworks
some sentences.

NOTE: this patch is against a copy where the patch submitted with 48295 have
been applied.

--
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-unsubscribe@...
For additional commands, e-mail: dev-help@...

DO NOT REPLY [Bug 48296] New: Missing french translations and some weird sentences

2009-11-26T23:15:42Z

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

Summary: Missing french translations and some weird sentences
Product: Tomcat 6
Version: 6.0.20
Platform: All
OS/Version: All
Status: NEW
Severity: minor
Priority: P2
Component: Manager application
AssignedTo: dev@...
ReportedBy: marcpa@...

Created an attachment (id=24627)
--> (https://issues.apache.org/bugzilla/attachment.cgi?id=24627)
i18n fixes againt tc6.0.20

Patch adds missing properties in french i18n for tomcat manager and reworks
some sentences.

NOTE: this patch is against a copy where the patch submitted with 48295 have
been applied.

--
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-unsubscribe@...
For additional commands, e-mail: dev-help@...

DO NOT REPLY [Bug 48295] New: Some occurences of eacute instead of ecircumflex in french translations

2009-11-26T23:11:28Z

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

Summary: Some occurences of eacute instead of ecircumflex in
french translations
Product: Tomcat 6
Version: 6.0.20
Platform: All
OS/Version: All
Status: NEW
Severity: minor
Priority: P2
Component: Manager application
AssignedTo: dev@...
ReportedBy: marcpa@...

Created an attachment (id=24626)
--> (https://issues.apache.org/bugzilla/attachment.cgi?id=24626)
fixes a couple of typo where é is used instead of ê

"arrét" is incorrect, should be "arrêt"

--
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-unsubscribe@...
For additional commands, e-mail: dev-help@...

svn commit: r884676 - /tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/FileCleanerCleanup.java

2009-11-26T11:38:46Z

Author: markt
Date: Thu Nov 26 19:38:46 2009
New Revision: 884676

URL: http://svn.apache.org/viewvc?rev=884676&view=rev
Log:
Remove unused class

Removed:
tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/FileCleanerCleanup.java

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@...
For additional commands, e-mail: dev-help@...

DO NOT REPLY [Bug 47714] Reponse mixed between users

2009-11-26T07:18:53Z

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

--- Comment #4 from Pid <bugzilla@...> 2009-11-26 07:18:52 UTC ---
(In reply to comment #0)
> Hi,
>
> We are migrating our application to JBoss container version 4.2.x with Apache
> web server in the front. We are using the mod_jk connector version 1.2.28. Our
> Apache version is 2.2.6. AJP13 worker is used for communication between web
> server and Tomcat.
>
> We have picked up an issue during load testing where the response is being
> mixed between users - one user is able to see reponse of another.

Might sound like an dumb question, but what are you load testing against?

Have you eliminated the possibility that the application has an error which
might cause this?

--
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-unsubscribe@...
For additional commands, e-mail: dev-help@...

DO NOT REPLY [Bug 47714] Reponse mixed between users

2009-11-26T07:04:38Z

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

Kevin J Walters <kjw@...> changed:

What |Removed |Added
----------------------------------------------------------------------------
CC| |kjw@...

--
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-unsubscribe@...
For additional commands, e-mail: dev-help@...

DO NOT REPLY [Bug 47714] Reponse mixed between users

2009-11-26T07:03:37Z

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

--- Comment #3 from Kevin J Walters <kjw@...> 2009-11-26 07:03:34 UTC ---
1.2.21 can exhibit request/response mixing - could be the same issue? One way
this can occur is some event that triggers a bug where the http response from
tomcat ends up buffered. The next request to that apache worker process will
then pick up the previous response from the persistent tcp connection. For this
particular type of bug, evidence of an ongoing issue can be seen in a few ways:

1) buffered tcp data between tomcat and apache that stays at the same level -
easiest to observe when load is very light - run netstat -a a few times and
look for established tcp connections with non 0 data in queues.

2) the responses will be way too fast because they are instant due to previous
response already waiting

3) if your using prefork and logging worker process pids, you can look for the
pattern by comparing things like response size in logs for URLs served by each
pid

4) quiesce the server and then fire a series of requests for a known servlet
and verify responses match expected result

A workaround or preventative measure is DisableReuse

--
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-unsubscribe@...
For additional commands, e-mail: dev-help@...

DO NOT REPLY [Bug 48238] Tomcat-lite won't compile

2009-11-25T23:45:49Z

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

Costin Manolache <costin@...> changed:

What |Removed |Added
----------------------------------------------------------------------------
Status|NEW |RESOLVED
Resolution| |FIXED

--- Comment #3 from Costin Manolache <costin@...> 2009-11-25 23:45:48 UTC ---
Should be fixed now - HexDump ( and all StringManager deps ) gone, ByteChunk
fixed.

--
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-unsubscribe@...
For additional commands, e-mail: dev-help@...

DO NOT REPLY [Bug 48178] org.apache.tomcat.lite.Locale2Charset.defaultMap is not threadsafe

2009-11-25T23:43:53Z

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

Costin Manolache <costin@...> changed:

What |Removed |Added
----------------------------------------------------------------------------
Status|NEW |RESOLVED
Resolution| |WONTFIX

--- Comment #1 from Costin Manolache <costin@...> 2009-11-25 23:43:52 UTC ---
It's only updated during context init from web.xml - I think read is thread
safe. Can add a comment - many other classes fit this.

--
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-unsubscribe@...
For additional commands, e-mail: dev-help@...

svn commit: r884424 - in /tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite: TestMain.java http/LiveHttp1Test.java

2009-11-25T23:02:54Z

Author: costin
Date: Thu Nov 26 07:02:53 2009
New Revision: 884424

URL: http://svn.apache.org/viewvc?rev=884424&view=rev
Log:
Shouldn't do last-minute changes before a large commit...

Modified:
tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/TestMain.java
tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/http/LiveHttp1Test.java

Modified: tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/TestMain.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/TestMain.java?rev=884424&r1=884423&r2=884424&view=diff
==============================================================================
--- tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/TestMain.java (original)
+++ tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/TestMain.java Thu Nov 26 07:02:53 2009
@@ -192,8 +192,8 @@
proxy = new HttpProxyService()
.withHttpClient(testClient);
testProxy.setPort(port);
- testProxy.setDebugHttp(true);
- testProxy.setDebug(true);
+// testProxy.setDebugHttp(true);
+// testProxy.setDebug(true);

// dispatcher rejects 'http://'
testProxy.setHttpService(proxy);

Modified: tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/http/LiveHttp1Test.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/http/LiveHttp1Test.java?rev=884424&r1=884423&r2=884424&view=diff
==============================================================================
--- tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/http/LiveHttp1Test.java (original)
+++ tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/http/LiveHttp1Test.java Thu Nov 26 07:02:53 2009
@@ -138,12 +138,7 @@

httpClient.sendRequest();

- try {
- httpClient.readAll(bodyRecvBuffer, to);
- } catch (Throwable t) {
- t.printStackTrace();
- return;
- }
- fail("Error");
+ httpClient.readAll(bodyRecvBuffer, to);
+ assertEquals(0, bodyRecvBuffer.remaining());
}
}

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@...
For additional commands, e-mail: dev-help@...

svn commit: r884422 - in /tomcat/trunk/modules/tomcat-lite: .classpath .project coyote-nio.files

2009-11-25T22:56:33Z

Author: costin
Date: Thu Nov 26 06:56:33 2009
New Revision: 884422

URL: http://svn.apache.org/viewvc?rev=884422&view=rev
Log:
Added eclipse files, remove unused build helper file

Added:
tomcat/trunk/modules/tomcat-lite/.classpath (with props)
tomcat/trunk/modules/tomcat-lite/.project (with props)
Removed:
tomcat/trunk/modules/tomcat-lite/coyote-nio.files

Added: tomcat/trunk/modules/tomcat-lite/.classpath
URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/tomcat-lite/.classpath?rev=884422&view=auto
==============================================================================
--- tomcat/trunk/modules/tomcat-lite/.classpath (added)
+++ tomcat/trunk/modules/tomcat-lite/.classpath Thu Nov 26 06:56:33 2009
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry excluding="org/apache/tomcat/lite/servlet/ServletApi30.java|org/apache/tomcat/lite/BodyReader.java|org/apache/tomcat/lite/BodyWriter.java|org/apache/tomcat/lite/ClientAbortException.java|org/apache/tomcat/lite/Connector.java|org/apache/tomcat/lite/ContextPreinitListener.java|org/apache/tomcat/lite/FilterChainImpl.java|org/apache/tomcat/lite/FilterConfigImpl.java|org/apache/tomcat/lite/Locale2Charset.java|org/apache/tomcat/lite/ParameterMap.java|org/apache/tomcat/lite/RequestDispatcherImpl.java|org/apache/tomcat/lite/ServletConfigImpl.java|org/apache/tomcat/lite/ServletContextImpl.java|org/apache/tomcat/lite/ServletInputStreamImpl.java|org/apache/tomcat/lite/ServletOutputStreamImpl.java|org/apache/tomcat/lite/ServletReaderImpl.java|org/apache/tomcat/lite/ServletRequestImpl.java|org/apache/tomcat/lite/ServletRequestWrapperImpl.java|org/apache/tomcat/lite/ServletResponseImpl.java|org/apache/tomcat/lite/ServletResponseIncludeWrapper.java|org/apache/tomcat/lite/S
ervletWriterImpl.java|org/apache/tomcat/lite/TomcatLite.java|org/apache/tomcat/lite/WebappContextMapper.java|org/apache/tomcat/lite/WebappFilterMapper.java|org/apache/tomcat/lite/WebappServletMapper.java|org/apache/tomcat/lite/webxml/|org/apache/tomcat/lite/coyote/CoyoteConnector.java|org/apache/coyote/servlet/" kind="src" path="java"/>
+ <classpathentry excluding="org/apache/coyote/lite/TomcatLiteCoyoteTest.java|org/apache/coyote/servlet/" kind="src" path="test"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/3"/>
+ <classpathentry kind="con" path="org.apache.ivyde.eclipse.cpcontainer.IVYDE_CONTAINER/?ivyXmlPath=pom.xml&confs=compile"/>
+ <classpathentry kind="output" path="output/classes"/>
+</classpath>

Propchange: tomcat/trunk/modules/tomcat-lite/.classpath
------------------------------------------------------------------------------
svn:eol-style = native

Added: tomcat/trunk/modules/tomcat-lite/.project
URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/tomcat-lite/.project?rev=884422&view=auto
==============================================================================
--- tomcat/trunk/modules/tomcat-lite/.project (added)
+++ tomcat/trunk/modules/tomcat-lite/.project Thu Nov 26 06:56:33 2009
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>tomcat-lite</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>

Propchange: tomcat/trunk/modules/tomcat-lite/.project
------------------------------------------------------------------------------
svn:eol-style = native

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@...
For additional commands, e-mail: dev-help@...

svn commit: r884421 [2/3] - in /tomcat/trunk/modules/tomcat-lite/test/org/apache: coyote/ coyote/lite/ coyote/servlet/ tomcat/lite/ tomcat/lite/http/ tomcat/lite/http/services/ tomcat/lite/io/ tomcat/lite/load/ tomcat/lite/proxy/ tomcat/lite/servlet/ t...

2009-11-25T22:55:50Z

Added: tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/load/LiveHttpThreadedTest.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/load/LiveHttpThreadedTest.java?rev=884421&view=auto
==============================================================================
--- tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/load/LiveHttpThreadedTest.java (added)
+++ tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/load/LiveHttpThreadedTest.java Thu Nov 26 06:55:49 2009
@@ -0,0 +1,116 @@
+/*
+ * 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.
+ */
+package org.apache.tomcat.lite.load;
+
+
+import java.io.IOException;
+
+import junit.framework.TestCase;
+
+import org.apache.tomcat.lite.TestMain;
+import org.apache.tomcat.lite.http.DefaultHttpConnector;
+import org.apache.tomcat.lite.http.HttpChannel;
+import org.apache.tomcat.lite.http.HttpConnector;
+import org.apache.tomcat.lite.http.HttpChannel.HttpService;
+import org.apache.tomcat.lite.http.HttpChannel.RequestCompleted;
+
+public class LiveHttpThreadedTest extends TestCase {
+ HttpConnector staticMain = TestMain.getTestServer();
+
+
+ int tCount = 1;
+ Thread[] threads = new Thread[tCount];
+ int[] ok = new int[tCount];
+ private int rCount = 100;
+
+ public void xtestSimpleRequest() throws Exception {
+ long t0 = System.currentTimeMillis();
+ for (int i = 0; i < tCount; i++) {
+ final int j = i;
+ threads[i] = new Thread(new Runnable() {
+ public void run() {
+ makeRequests(j, true);
+ }
+ });
+ threads[i].start();
+ }
+
+ int res = 0;
+ for (int i = 0; i < tCount; i++) {
+ threads[i].join();
+ res += ok[i];
+ }
+ long t1 = System.currentTimeMillis();
+ System.err.println("Time: " + (t1 - t0) + " " + res);
+ }
+
+ public void testSimpleRequestNB() throws Exception {
+ long t0 = System.currentTimeMillis();
+ for (int i = 0; i < tCount; i++) {
+ final int j = i;
+ threads[i] = new Thread(new Runnable() {
+ public void run() {
+ makeRequests(j, false);
+ }
+ });
+ threads[i].start();
+ }
+
+ int res = 0;
+ for (int i = 0; i < tCount; i++) {
+ threads[i].join();
+ res += ok[i];
+ }
+ long t1 = System.currentTimeMillis();
+ System.err.println("TimeNB: " + (t1 - t0) + " " + res);
+ }
+
+ void makeRequests(int t, boolean b) {
+ for (int i = 0; i < rCount ; i++) {
+ try {
+ //System.err.println("MakeReq " + t + " " + i);
+ makeRequest(t, b);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+ }
+
+ static RequestCompleted reqCallback = new RequestCompleted() {
+ @Override
+ public void handle(HttpChannel data, Object extraData)
+ throws IOException {
+ //dumpHead(cstate);
+ //System.err.println("DATA\n" + cstate.output.toString() + "\n----");
+ //assertTrue(cstate.bodyRecvBuffer.toString().indexOf("AAA") >= 0);
+
+ data.release();
+ }
+
+ };
+
+ void makeRequest(int i, boolean block) throws Exception {
+ HttpChannel cstate = DefaultHttpConnector.get().get("localhost", 8802);
+
+ cstate.getRequest().requestURI().set("/hello");
+ cstate.setCompletedCallback(reqCallback);
+
+ // Send the request, wait response
+ cstate.sendRequest();
+ }
+
+}

Propchange: tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/load/LiveHttpThreadedTest.java
------------------------------------------------------------------------------
svn:eol-style = native

Added: tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/load/MicroTest.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/load/MicroTest.java?rev=884421&view=auto
==============================================================================
--- tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/load/MicroTest.java (added)
+++ tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/load/MicroTest.java Thu Nov 26 06:55:49 2009
@@ -0,0 +1,49 @@
+/*
+ */
+package org.apache.tomcat.lite.load;
+
+import org.apache.tomcat.lite.http.BaseMapper;
+import org.apache.tomcat.lite.http.MappingData;
+import org.apache.tomcat.lite.io.CBuffer;
+
+import junit.framework.TestCase;
+
+public class MicroTest extends TestCase {
+
+ public void testMapper() throws Exception {
+ BaseMapper mapper = new BaseMapper();
+
+ MappingData mappingData = new MappingData();
+ CBuffer host = CBuffer.newInstance();
+ host.set("test1.com");
+
+ CBuffer uri = CBuffer.newInstance();
+ uri.set("/foo/bar/blah/bobou/foo");
+
+ String[] welcomes = new String[2];
+ welcomes[0] = "index.html";
+ welcomes[1] = "foo.html";
+
+ for (int i = 0; i < 100; i++) {
+ String hostN = "test" + i + ".com";
+ mapper.addContext(hostN, "", "context0", new String[0], null, null);
+ mapper.addContext(hostN, "/foo", "context1", new String[0], null, null);
+ mapper.addContext(hostN, "/foo/bar", "context2", welcomes, null, null);
+ mapper.addContext(hostN, "/foo/bar/bla", "context3", new String[0], null, null);
+
+ mapper.addWrapper(hostN, "/foo/bar", "/fo/*", "wrapper0");
+ }
+ int N = 10000;
+ for (int i = 0; i < N; i++) {
+ mappingData.recycle();
+ mapper.map(host, uri, mappingData);
+ }
+
+ long time = System.currentTimeMillis();
+ for (int i = 0; i < N; i++) {
+ mappingData.recycle();
+ mapper.map(host, uri, mappingData);
+ }
+ System.out.println("Elapsed:" + (System.currentTimeMillis() - time));
+ }
+}

Propchange: tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/load/MicroTest.java
------------------------------------------------------------------------------
svn:eol-style = native

Added: tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/proxy/LiveProxyHttp1Test.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/proxy/LiveProxyHttp1Test.java?rev=884421&view=auto
==============================================================================
--- tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/proxy/LiveProxyHttp1Test.java (added)
+++ tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/proxy/LiveProxyHttp1Test.java Thu Nov 26 06:55:49 2009
@@ -0,0 +1,33 @@
+/*
+ * 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.
+ */
+package org.apache.tomcat.lite.proxy;
+
+
+import java.io.IOException;
+
+import org.apache.tomcat.lite.http.LiveHttp1Test;
+
+
+public class LiveProxyHttp1Test extends LiveHttp1Test {
+ public void setUp() throws IOException {
+ // All tests in super, but with client pointing to
+ // the proxy server, which in turn hits the real server.
+ clientPort = 8903;
+ super.setUp();
+ }
+
+}

Propchange: tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/proxy/LiveProxyHttp1Test.java
------------------------------------------------------------------------------
svn:eol-style = native

Added: tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/proxy/ProxyTest.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/proxy/ProxyTest.java?rev=884421&view=auto
==============================================================================
--- tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/proxy/ProxyTest.java (added)
+++ tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/proxy/ProxyTest.java Thu Nov 26 06:55:49 2009
@@ -0,0 +1,120 @@
+/*
+n * 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.
+ */
+package org.apache.tomcat.lite.proxy;
+
+import java.io.IOException;
+
+import org.apache.tomcat.lite.TestMain;
+
+import junit.framework.TestCase;
+
+
+public class ProxyTest extends TestCase {
+
+ String resStr;
+
+ public void setUp() throws Exception {
+ TestMain.getTestServer();
+ }
+
+ public void tearDown() throws IOException {
+ }
+
+ public void xtestRequestSlowChunked() throws Exception {
+ resStr =
+ TestMain.get("http://localhost:8903/sleep/1c").toString();
+ assertEquals("sleep 1csleep 1c", resStr);
+ }
+
+ public void testSingleRequest() throws Exception {
+ String resStr =
+ TestMain.get("http://localhost:8903/hello").toString();
+ assertEquals("Hello world", resStr);
+ }
+
+
+ public void test2Requests() throws Exception {
+ String resStr =
+ TestMain.get("http://localhost:8903/hello").toString();
+ assertEquals("Hello world", resStr);
+ resStr =
+ TestMain.get("http://localhost:8903/hello?a=b").toString();
+ assertEquals("Hello world", resStr);
+ }
+
+ public void testRequestSimple() throws Exception {
+ resStr =
+ TestMain.get("http://localhost:8903/hello").toString();
+ assertEquals("Hello world", resStr);
+ resStr =
+ TestMain.get("http://localhost:8903/hello").toString();
+ assertEquals("Hello world", resStr);
+ resStr =
+ TestMain.get("http://localhost:8903/hello").toString();
+ assertEquals(resStr, "Hello world");
+
+ }
+
+ public void testExtAdapter() throws Exception {
+ String res =
+ TestMain.get("http://www.apache.org/").toString();
+ assertTrue(res.indexOf("Apache") > 0);
+
+ Thread.currentThread().sleep(100);
+ // second time - are we reusing ?
+ res =
+ TestMain.get("http://www.apache.org/").toString();
+
+ assertTrue(res.indexOf("Apache") > 0);
+
+ }
+
+ public void testStaticAdapter() throws Exception {
+
+ assertEquals("Hello world",
+ TestMain.get("http://localhost:8802/hello").toString());
+ assertEquals("Hello world2",
+ TestMain.get("http://localhost:8802/2nd").toString());
+
+ }
+
+ public void testRequestParams() throws Exception {
+ // qry string
+ String resStr =
+ TestMain.get("http://localhost:8903/echo/foo?q=a&b")
+ .toString();
+ assertTrue(resStr, resStr.indexOf("foo?q=a&b") > 0);
+ }
+
+
+ public void testRequestChunked() throws Exception {
+ // Chunked encoding
+ String resStr =
+ TestMain.get("http://localhost:8903/chunked/test")
+ .toString();
+ assertEquals(8, resStr.length());
+ assertTrue(resStr.indexOf("AAA") >= 0);
+ }
+
+
+ public void testRequestSlow() throws Exception {
+ // Slow
+ String resStr =
+ TestMain.get("http://localhost:8903/sleep/1").toString();
+ assertEquals("sleep 1sleep 1", resStr.toString());
+ }
+}

Propchange: tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/proxy/ProxyTest.java
------------------------------------------------------------------------------
svn:eol-style = native

Added: tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/proxy/SmallProxyTest.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/proxy/SmallProxyTest.java?rev=884421&view=auto
==============================================================================
--- tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/proxy/SmallProxyTest.java (added)
+++ tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/proxy/SmallProxyTest.java Thu Nov 26 06:55:49 2009
@@ -0,0 +1,106 @@
+/*
+ */
+package org.apache.tomcat.lite.proxy;
+
+import java.io.IOException;
+
+import junit.framework.TestCase;
+
+import org.apache.tomcat.lite.http.HttpChannel;
+import org.apache.tomcat.lite.http.HttpConnector;
+import org.apache.tomcat.lite.io.MemoryIOConnector;
+import org.apache.tomcat.lite.io.MemoryIOConnector.MemoryIOChannel;
+
+public class SmallProxyTest extends TestCase {
+
+ MemoryIOConnector memoryServerConnector =
+ new MemoryIOConnector();
+
+ MemoryIOConnector memoryClientConnector =
+ new MemoryIOConnector().withServer(memoryServerConnector);
+
+
+ HttpConnector httpPool = new HttpConnector(memoryServerConnector) {
+ @Override
+ public HttpChannel get(CharSequence target) throws IOException {
+ throw new IOException();
+ }
+ public HttpChannel getServer() {
+ lastServer = new HttpChannel().serverMode(true);
+ lastServer.withBuffers(net);
+ lastServer.setConnector(this);
+ //lastServer.withIOConnector(memoryServerConnector);
+ return lastServer;
+ }
+ };
+
+ HttpConnector httpClient = new HttpConnector(memoryClientConnector) {
+ @Override
+ public HttpChannel get(CharSequence target) throws IOException {
+ lastClient = new HttpChannel();
+ lastClient.setConnector(this);
+ return lastClient;
+ }
+ public HttpChannel get(String host, int port) throws IOException {
+ lastClient = new HttpChannel();
+ lastClient.setConnector(this);
+ return lastClient;
+ }
+ public HttpChannel getServer() {
+ throw new RuntimeException();
+ }
+ };
+
+ HttpChannel lastServer;
+ HttpChannel lastClient;
+
+ boolean hasBody = false;
+ boolean bodyDone = false;
+ boolean bodySentDone = false;
+ boolean headersDone = false;
+ boolean allDone = false;
+
+
+ //MemoryIOChannel clientNet = new MemoryIOChannel();
+
+ MemoryIOConnector.MemoryIOChannel net = new MemoryIOChannel();
+ HttpChannel http;
+
+ public void setUp() throws IOException {
+ http = httpPool.getServer();
+ }
+
+ /**
+ * More complicated test..
+ * @throws IOException
+ */
+ public void testProxy() throws IOException {
+ http.setHttpService(new HttpProxyService()
+ .withSelector(memoryClientConnector)
+ .withHttpClient(httpClient));
+
+ http.getNet().getIn().append("GET http://www.cyberluca.com/ HTTP/1.0\n" +
+ "Connection: Close\n\n");
+ http.getNet().getIn().close();
+
+ // lastClient.rawSendBuffers has the request sent by proxy
+ lastClient.getNet().getIn()
+ .append("HTTP/1.0 200 OK\n\nHi\n");
+ lastClient.getNet().getIn()
+ .append("world\n");
+
+ // TODO: check what the proxy sent
+ // lastClient.getOut();
+
+ // will also trigger 'release' - both sides are closed.
+ lastClient.getNet().getIn().close();
+
+ // wait response...
+ // http.sendBody.close();
+ String res = net.out.toString();
+ assertTrue(res.indexOf("Hi\nworld\n") > 0);
+ assertTrue(res.indexOf("HTTP/1.0 200 OK") == 0);
+ assertTrue(res.indexOf("tomcatproxy") > 0);
+
+ }
+}

Propchange: tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/proxy/SmallProxyTest.java
------------------------------------------------------------------------------
svn:eol-style = native

Added: tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/servlet/AnnotationTest.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/servlet/AnnotationTest.java?rev=884421&view=auto
==============================================================================
--- tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/servlet/AnnotationTest.java (added)
+++ tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/servlet/AnnotationTest.java Thu Nov 26 06:55:49 2009
@@ -0,0 +1,54 @@
+/*
+ */
+package org.apache.tomcat.lite.servlet;
+
+import java.io.FileInputStream;
+import java.io.IOException;
+
+import junit.framework.TestCase;
+
+import org.apache.tomcat.servlets.config.ServletContextConfig;
+import org.apache.tomcat.servlets.config.deploy.AnnotationsProcessor;
+
+public class AnnotationTest extends TestCase {
+
+ // TODO: fix the build file to find the target dir
+ // you can run this manually until this happens
+ String eclipseBase = "test-webapp/WEB-INF/classes";
+
+ public void testScanClasses() throws IOException {
+ ServletContextConfig cfg = new ServletContextConfig();
+ AnnotationsProcessor scanner = new AnnotationsProcessor(cfg);
+// scanner.processDir(eclipseBase);
+//
+// dump(cfg);
+
+ }
+
+ public void testScanClass() throws IOException {
+ ServletContextConfig cfg = new ServletContextConfig();
+ AnnotationsProcessor scanner = new AnnotationsProcessor(cfg);
+
+ String path = eclipseBase + "/org/apache/tomcat/lite/Annotated2Servlet.class";
+// scanner.processClass(new FileInputStream(path), eclipseBase, path);
+//
+// dump(cfg);
+
+ }
+
+ private void dump(ServletContextConfig cfg) {
+// ObjectMapper jackson = new ObjectMapper();
+// try {
+// jackson.configure(SerializationConfig.Feature.INDENT_OUTPUT, true);
+// jackson.configure(SerializationConfig.Feature.WRITE_NULL_PROPERTIES,
+// false);
+//
+// ByteArrayOutputStream out = new ByteArrayOutputStream();
+// jackson.writeValue(out, cfg);
+// System.err.println(out.toString());
+// } catch (Throwable t) {
+// t.printStackTrace();
+// }
+ }
+
+}

Propchange: tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/servlet/AnnotationTest.java
------------------------------------------------------------------------------
svn:eol-style = native

Added: tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/servlet/JspWatchdogTests.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/servlet/JspWatchdogTests.java?rev=884421&view=auto
==============================================================================
--- tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/servlet/JspWatchdogTests.java (added)
+++ tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/servlet/JspWatchdogTests.java Thu Nov 26 06:55:49 2009
@@ -0,0 +1,57 @@
+/*
+ * 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.
+ */
+package org.apache.tomcat.lite.servlet;
+
+
+import org.apache.tomcat.lite.servlet.TomcatLite;
+
+import junit.framework.Test;
+
+public class JspWatchdogTests extends TomcatLiteWatchdog {
+
+ public JspWatchdogTests() {
+ super();
+ testMatch =
+ //"precompileNegativeTest";
+ null;
+ // Test we know are failing - need to fix at some point.
+ exclude = new String[] {
+ "negativeDuplicateExtendsFatalTranslationErrorTest",
+ "negativeDuplicateErrorPageFatalTranslationErrorTest",
+ "negativeDuplicateInfoFatalTranslationErrorTest",
+ "negativeDuplicateLanguageFatalTranslationErrorTest",
+ "negativeDuplicateSessionFatalTranslationErrorTest",
+ "positiveIncludeCtxRelativeHtmlTest",
+ "precompileNegativeTest"
+ };
+ file = getWatchdogdir() + "/src/conf/jsp-gtest.xml";
+ goldenDir =
+ getWatchdogdir() + "/src/clients/org/apache/jcheck/jsp/client/";
+ targetMatch = "jsp-test";
+
+ }
+
+ protected void addConnector(TomcatLite lite) {
+ lite.setPort(8019);
+ }
+
+ public static Test suite() {
+ return new JspWatchdogTests().getSuite(8019);
+ }
+
+}
+

Propchange: tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/servlet/JspWatchdogTests.java
------------------------------------------------------------------------------
svn:eol-style = native

Added: tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/servlet/LiteTestHelper.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/servlet/LiteTestHelper.java?rev=884421&view=auto
==============================================================================
--- tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/servlet/LiteTestHelper.java (added)
+++ tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/servlet/LiteTestHelper.java Thu Nov 26 06:55:49 2009
@@ -0,0 +1,117 @@
+/*
+ */
+package org.apache.tomcat.lite.servlet;
+
+import java.io.BufferedInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
+import java.net.URLConnection;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.tomcat.lite.io.BBuffer;
+import org.apache.tomcat.lite.servlet.ServletContextImpl;
+import org.apache.tomcat.lite.servlet.TomcatLite;
+
+public class LiteTestHelper {
+ static TomcatLite lite;
+
+ public static ServletContextImpl addContext(TomcatLite lite) throws ServletException {
+ ServletContextImpl ctx =
+ (ServletContextImpl) lite.addServletContext(null, null, "/test1");
+
+
+ ctx.add("testException", new HttpServlet() {
+ public void doGet(HttpServletRequest req, HttpServletResponse res)
+ throws IOException {
+ throw new NullPointerException();
+ }
+ });
+ ctx.addMapping("/testException", "testException");
+
+
+ ctx.add("test", new HttpServlet() {
+ public void doGet(HttpServletRequest req, HttpServletResponse res) throws IOException {
+ res.addHeader("Foo", "Bar");
+ res.getWriter().write("Hello world");
+ }
+ });
+
+ ctx.addMapping("/1stTest", "test");
+
+
+ return ctx;
+ }
+
+ public static void startLite() throws IOException, ServletException {
+ if (lite == null) {
+ lite = new TomcatLite();
+
+ LiteTestHelper.addContext(lite);
+ lite.start();
+
+ lite.startConnector();
+ }
+ }
+
+ public static void initServletsAndRun(TomcatLite lite, int port) throws ServletException, IOException {
+ addContext(lite);
+ lite.init();
+ lite.start();
+
+
+ if (port > 0) {
+ // This should be added after all local initialization to avoid
+ // the server from responding.
+ // Alternatively, you can load this early but set it to return
+ // 'unavailable' if load balancers depend on this.
+ addConnector(lite, port, true);
+
+ // At this point we can add contexts and inject requests, if we want to
+ // do it over HTTP need to start the connector as well.
+ lite.startConnector();
+ }
+ }
+
+ public static void addConnector(TomcatLite lite,
+ int port, boolean daemon) {
+ lite.setPort(port);
+ }
+
+ /**
+ * Get url using URLConnection.
+ */
+ public static BBuffer getUrl(String path) throws IOException {
+
+ BBuffer out = BBuffer.allocate(4096);
+
+ URL url = new URL(path);
+ URLConnection connection = url.openConnection();
+ connection.setReadTimeout(5000);
+ connection.connect();
+ InputStream is = connection.getInputStream();
+ out.readAll(is);
+ return out;
+ }
+
+// static class ByteChunkOutputBuffer implements OutputBuffer {
+//
+// protected ByteChunk output = null;
+//
+// public ByteChunkOutputBuffer(ByteChunk output) {
+// this.output = output;
+// }
+//
+// public int doWrite(ByteChunk chunk, Response response)
+// throws IOException {
+// output.append(chunk);
+// return chunk.getLength();
+// }
+// }
+
+
+}

Propchange: tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/servlet/LiteTestHelper.java
------------------------------------------------------------------------------
svn:eol-style = native

Added: tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/servlet/PropertiesSpiTest.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/servlet/PropertiesSpiTest.java?rev=884421&view=auto
==============================================================================
--- tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/servlet/PropertiesSpiTest.java (added)
+++ tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/servlet/PropertiesSpiTest.java Thu Nov 26 06:55:49 2009
@@ -0,0 +1,54 @@
+/*
+ */
+package org.apache.tomcat.lite.servlet;
+
+import java.io.IOException;
+import java.util.Properties;
+
+import junit.framework.TestCase;
+
+import org.apache.tomcat.integration.simple.SimpleObjectManager;
+
+
+public class PropertiesSpiTest extends TestCase {
+
+ SimpleObjectManager spi;
+
+ public void setUp() {
+ spi = new SimpleObjectManager();
+
+ spi.getProperties().put("obj1.name", "foo");
+ spi.getProperties().put("obj1.(class)", BoundObj.class.getName());
+
+ }
+
+ public void testArgs() throws IOException {
+ spi = new SimpleObjectManager(new String[] {
+ "-a=1", "-b", "2"});
+ Properties res = spi.getProperties();
+
+ assertEquals("1", res.get("a"));
+ assertEquals("2", res.get("b"));
+
+
+ }
+
+ public static class BoundObj {
+ String name;
+
+ public void setName(String n) {
+ this.name = n;
+ }
+ }
+
+ public void testBind() throws Exception {
+ BoundObj bo = new BoundObj();
+ spi.bind("obj1", bo);
+ assertEquals(bo.name, "foo");
+ }
+
+ public void testCreate() throws Exception {
+ BoundObj bo = (BoundObj) spi.get("obj1");
+ assertEquals(bo.name, "foo");
+ }
+}

Propchange: tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/servlet/PropertiesSpiTest.java
------------------------------------------------------------------------------
svn:eol-style = native

Added: tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/servlet/ServletTests.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/servlet/ServletTests.java?rev=884421&view=auto
==============================================================================
--- tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/servlet/ServletTests.java (added)
+++ tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/servlet/ServletTests.java Thu Nov 26 06:55:49 2009
@@ -0,0 +1,29 @@
+/*
+ */
+package org.apache.tomcat.lite.servlet;
+
+import org.apache.tomcat.lite.servlet.TomcatLite;
+
+import junit.framework.Test;
+
+public class ServletTests extends TomcatLiteWatchdog {
+
+ public ServletTests() {
+ super();
+ exclude = new String[] {
+ "ServletToJSPErrorPageTest",
+ "ServletToJSPError502PageTest",
+ };
+ }
+
+ protected void addConnector(TomcatLite connector) {
+ connector.setPort(7074);
+ }
+
+ /**
+ * Magic JUnit method
+ */
+ public static Test suite() {
+ return new ServletTests().getSuite(7074);
+ }
+}

Propchange: tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/servlet/ServletTests.java
------------------------------------------------------------------------------
svn:eol-style = native

Added: tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/servlet/TomcatLiteNoConnectorTest.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/servlet/TomcatLiteNoConnectorTest.java?rev=884421&view=auto
==============================================================================
--- tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/servlet/TomcatLiteNoConnectorTest.java (added)
+++ tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/servlet/TomcatLiteNoConnectorTest.java Thu Nov 26 06:55:49 2009
@@ -0,0 +1,116 @@
+/*
+ * 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.
+ */
+package org.apache.tomcat.lite.servlet;
+
+
+
+import junit.framework.TestCase;
+
+import org.apache.tomcat.lite.http.HttpChannel;
+import org.apache.tomcat.lite.http.HttpConnector;
+import org.apache.tomcat.lite.http.HttpRequest;
+import org.apache.tomcat.lite.http.HttpResponse;
+import org.apache.tomcat.lite.io.BBuffer;
+import org.apache.tomcat.lite.io.MemoryIOConnector;
+import org.apache.tomcat.lite.io.MemoryIOConnector.MemoryIOChannel;
+import org.apache.tomcat.lite.servlet.TomcatLite;
+
+/**
+ * Example of testing servlets without using sockets.
+ *
+ * @author Costin Manolache
+ */
+public class TomcatLiteNoConnectorTest extends TestCase {
+
+ TomcatLite lite;
+ MemoryIOConnector net;
+ HttpConnector con;
+
+ public void setUp() throws Exception {
+ net = new MemoryIOConnector();
+ con = new HttpConnector(net);
+
+ lite = new TomcatLite();
+ lite.setHttpConnector(con);
+
+ // Load all servlets we need to test
+ LiteTestHelper.initServletsAndRun(lite, 0);
+ }
+
+ public void tearDown() throws Exception {
+ lite.stop();
+ }
+
+
+ public void testSimpleRequest() throws Exception {
+ MemoryIOConnector.MemoryIOChannel ch = new MemoryIOChannel();
+
+ HttpChannel httpCh = con.getServer();
+ httpCh.withBuffers(ch);
+
+ HttpRequest req = httpCh.getRequest();
+ req.setURI("/test1/1stTest");
+
+ HttpResponse res = httpCh.getResponse();
+
+ lite.getHttpConnector().getDispatcher().service(req, res, true);
+ // req/res will be recycled
+
+ // parse out to a response
+ BBuffer out = ch.out;
+ MemoryIOChannel clientCh = new MemoryIOChannel();
+ clientCh.getIn().append(out);
+
+ HttpChannel client = con.get("localhost", 80);
+ client.withBuffers(clientCh);
+ clientCh.handleReceived(clientCh);
+
+
+ HttpResponse cres = client.getResponse();
+ assertEquals(res.getStatus(), 200);
+
+ BBuffer resBody = BBuffer.allocate(200);
+ cres.getBody().readAll(resBody);
+ assertEquals("Hello world", resBody.toString());
+ assertEquals(cres.getHeader("Foo"), "Bar");
+ assertEquals(cres.getStatus(), 200);
+ }
+
+//
+// public void testPostRequest() throws Exception {
+// ByteChunk out = new ByteChunk();
+// ServletRequestImpl req =
+// LiteTestHelper.createMessage(lite, "/test1/1stTest", out);
+// req.setMethod("POST");
+//
+// ServletResponseImpl res = lite.service(req);
+//
+// assertEquals("Hello post world", out.toString());
+// // Headers are still in the response
+// assertEquals(res.getHeader("Foo"), "Post");
+// assertEquals(res.getStatus(), 200);
+// }
+//
+// public void testException() throws IOException, Exception {
+// ByteChunk out = new ByteChunk();
+// ServletRequestImpl req =
+// LiteTestHelper.createMessage(lite, "/test1/testException", out);
+// ServletResponseImpl res = lite.service(req);
+// assertEquals(res.getStatus(), 500);
+// }
+
+}

Propchange: tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/servlet/TomcatLiteNoConnectorTest.java
------------------------------------------------------------------------------
svn:eol-style = native

Added: tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/servlet/TomcatLiteSimpleTest.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/servlet/TomcatLiteSimpleTest.java?rev=884421&view=auto
==============================================================================
--- tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/servlet/TomcatLiteSimpleTest.java (added)
+++ tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/servlet/TomcatLiteSimpleTest.java Thu Nov 26 06:55:49 2009
@@ -0,0 +1,52 @@
+/*
+ * 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.
+ */
+package org.apache.tomcat.lite.servlet;
+
+import java.io.InputStream;
+import java.net.URL;
+import java.net.URLConnection;
+
+import junit.framework.TestCase;
+
+import org.apache.tomcat.lite.io.IOBuffer;
+
+/**
+ * TODO: convert to new API
+ *
+ */
+public class TomcatLiteSimpleTest extends TestCase {
+
+ protected TomcatLite lite = new TomcatLite();
+
+ public void setUp() throws Exception {
+ LiteTestHelper.addContext(lite);
+
+ lite.init();
+
+ lite.setPort(8884);
+ lite.start();
+ lite.startConnector();
+ }
+
+ public void testSimpleRequest() throws Exception {
+ URL url = new URL("http://localhost:8884/test1/1stTest");
+ URLConnection connection = url.openConnection();
+ InputStream is = connection.getInputStream();
+ String res = new IOBuffer().append(is).readAll(null).toString();
+ assertEquals("Hello world", res);
+ }
+}

Propchange: tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/servlet/TomcatLiteSimpleTest.java
------------------------------------------------------------------------------
svn:eol-style = native

Added: tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/servlet/TomcatLiteWatchdog.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/servlet/TomcatLiteWatchdog.java?rev=884421&view=auto
==============================================================================
--- tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/servlet/TomcatLiteWatchdog.java (added)
+++ tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/servlet/TomcatLiteWatchdog.java Thu Nov 26 06:55:49 2009
@@ -0,0 +1,94 @@
+/*
+ * 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.
+ */
+package org.apache.tomcat.lite.servlet;
+
+import java.io.File;
+import java.io.IOException;
+
+import javax.servlet.ServletException;
+
+import junit.framework.TestResult;
+
+import org.apache.tomcat.lite.servlet.TomcatLite;
+import org.apache.tomcat.test.watchdog.WatchdogClient;
+
+
+public abstract class TomcatLiteWatchdog extends WatchdogClient {
+
+ public TomcatLiteWatchdog() {
+ goldenDir = getWatchdogdir() + "/src/clients/org/apache/jcheck/servlet/client/";
+ testMatch =
+ //"HttpServletResponseWrapperSetStatusMsgTest";
+ //"ServletContextAttributeAddedEventTest";
+ null;
+ // ex: "ServletToJSP";
+ file = getWatchdogdir() + "/src/conf/servlet-gtest.xml";
+ targetMatch = "gtestservlet-test";
+ }
+
+ protected void beforeSuite() {
+ // required for the tests
+ System.setProperty("org.apache.coyote.USE_CUSTOM_STATUS_MSG_IN_HEADER",
+ "true");
+
+ try {
+ initServerWithWatchdog(getWatchdogdir());
+ } catch (ServletException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ } catch (IOException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+ }
+
+ protected abstract void addConnector(TomcatLite liteServer);
+
+ TomcatLite tomcatForWatchdog;
+
+ public void initServerWithWatchdog(String wdDir) throws ServletException,
+ IOException {
+ File f = new File(wdDir + "/build/webapps");
+
+ tomcatForWatchdog = new TomcatLite();
+
+ addConnector(tomcatForWatchdog);
+// tomcatForWatchdog.getHttpConnector().setDebug(true);
+// tomcatForWatchdog.getHttpConnector().setDebugHttp(true);
+
+ tomcatForWatchdog.addServletContext(null, "webapps/ROOT", "/").loadConfig();
+
+ for (String s : new String[] {
+ "servlet-compat",
+ "servlet-tests",
+ "jsp-tests"} ) {
+ tomcatForWatchdog.addServletContext(null, f.getCanonicalPath() + "/" + s,
+ "/" + s).loadConfig();
+ }
+
+ tomcatForWatchdog.init();
+ tomcatForWatchdog.start();
+
+ tomcatForWatchdog.startConnector();
+ }
+
+
+
+ protected void afterSuite(TestResult res) {
+ // no need to stop it - using daemon threads.
+ }
+}

Propchange: tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/servlet/TomcatLiteWatchdog.java
------------------------------------------------------------------------------
svn:eol-style = native

Added: tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/test.properties
URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/test.properties?rev=884421&view=auto
==============================================================================
--- tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/test.properties (added)
+++ tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/test.properties Thu Nov 26 06:55:49 2009
@@ -0,0 +1,63 @@
+RUN=Log,JMXProxy,Socks,TomcatLite
+
+Log.(class)=org.apache.tomcat.lite.service.LogConfig
+Log.debug=org.apache.tomcat.lite.http.HttpConnector
+Log.debug=Proxy
+
+JMXProxy.(class)=org.apache.tomcat.lite.service.JMXProxy
+JMXProxy.port=8003
+
+Socks.(class)=org.apache.tomcat.lite.proxy.SocksServer
+Socks.port=2080
+Socks.idleTimeout=0
+
+#HttpConnector-TestServer.debug=true
+#HttpConnector-TestServer.debugHttp=true
+xHttpConnector-TestServer.clientKeepAlive=true
+xHttpConnector-TestServer.serverKeepAlive=true
+xHttpConnector-TestServer.maxHttpPoolSize=0
+
+#HttpConnector.debug=true
+#HttpConnector.debugHttp=true
+xHttpConnector.clientKeepAlive=true
+xHttpConnector.serverKeepAlive=true
+xHttpConnector.maxHttpPoolSize=0
+
+#HttpConnector-Proxy.debug=true
+#HttpConnector-Proxy.debugHttp=true
+xHttpConnector-Proxy.clientKeepAlive=true
+xHttpConnector-Proxy.serverKeepAlive=true
+xHttpConnector-Proxy.maxHttpPoolSize=0
+
+
+#IOConnector.debug=true
+
+# Tomcat-lite config
+# include:
+# config=org/apache/tomcat/lite/config.properties
+TomcatLite.(class)=org.apache.tomcat.lite.servlet.TomcatLite
+# TomcatLite.deployListener=org.apache.tomcat.servlets.config.deploy.WebXmlContextListener
+
+# Tomcat-lite plugins
+org.apache.tomcat.lite.WebappServletMapper.(class)=org.apache.tomcat.lite.WebappServletMapper
+org.apache.tomcat.lite.WebappFilterMapper.(class)=org.apache.tomcat.lite.WebappFilterMapper
+org.apache.tomcat.servlets.session.UserSessionManager.(class)=org.apache.tomcat.servlets.session.SimpleSessionManager
+org.apache.tomcat.servlets.jsp.UserTemplateClassMapper.(class)=org.apache.tomcat.servlets.jsp.JasperCompilerTemplateClassMapper
+org.apache.tomcat.servlets.file.Filesystem.(class)=org.apache.tomcat.file.LocalFilesystem
+default-servlet.(class)=org.apache.tomcat.servlets.file.WebdavServlet
+jspwildcard-servlet.(class)=org.apache.tomcat.servlets.jsp.WildcardTemplateServlet
+filetemplate-servlet.(class)=org.apache.tomcat.servlets.jsp.JspFileTemplateServlet
+
+org.apache.tomcat.lite.Connector.(class)=org.apache.tomcat.lite.AsyncConnector
+org.apache.tomcat.lite.Connector.port=8800
+
+
+
+TomcatLite.context.1=/examples:./webapps/examples
+TomcatLite.context.2=/:./webapps/ROOT
+TomcatLite.context.3=/lite:./modules/tomcat-lite/test-webapp
+// No base dir
+TomcatLite.context.4=/dynamic:
+
+
+JMXProxyServlet.(class)=org.apache.tomcat.integration.jmx.JMXProxyServlet

Propchange: tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/test.properties
------------------------------------------------------------------------------
svn:eol-style = native

Modified: tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/test/watchdog/WatchdogClient.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/test/watchdog/WatchdogClient.java?rev=884421&r1=884420&r2=884421&view=diff
==============================================================================
--- tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/test/watchdog/WatchdogClient.java (original)
+++ tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/test/watchdog/WatchdogClient.java Thu Nov 26 06:55:49 2009
@@ -16,6 +16,7 @@
*/
package org.apache.tomcat.test.watchdog;

+import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
import java.util.Properties;
@@ -26,15 +27,13 @@
import junit.framework.TestResult;
import junit.framework.TestSuite;

-import org.apache.tomcat.util.DomUtil;
+import org.apache.tomcat.servlets.config.deploy.DomUtil;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.NodeList;
import org.xml.sax.SAXException;

public class WatchdogClient {
-
- protected String base = "../watchdog";

protected String goldenDir;
protected String testMatch;
@@ -51,11 +50,13 @@
Properties props = new Properties();

protected void beforeSuite() {
-
}

protected void afterSuite(TestResult res) {
-
+ }
+
+ public Test getSuite() {
+ return getSuite(8080);
}

/**
@@ -66,11 +67,11 @@
* @param testMatch Prefix of tests to be run
* @return
*/
- public Test getSuite() {
+ public Test getSuite(int port) {
TestSuite tests = new WatchdogTests();
tests.setName(this.getClass().getSimpleName());

- props.setProperty("port", "8080");
+ props.setProperty("port", Integer.toString(port));
props.setProperty("host", "localhost");
props.setProperty("wgdir",
goldenDir);
@@ -112,22 +113,16 @@
}
}
testName = testName + ";" + this.getClass().getName();
- WatchdogTest test = new WatchdogTest(watchE, props, testName);
+ WatchdogTestCase test = new WatchdogTestCase(watchE, props, testName);
tests.addTest(test);
}
-
- // if (targetSuite.countTestCases() > 0) {
- // tests.addTest(targetSuite);
- // }
}

} catch (IOException e) {
- e.printStackTrace();
+ e.printStackTrace();
} catch (SAXException e) {
- // TODO Auto-generated catch block
e.printStackTrace();
} catch (ParserConfigurationException e) {
- // TODO Auto-generated catch block
e.printStackTrace();
}
return tests;
@@ -135,6 +130,22 @@

// --------- Inner classes -------------

+ protected String getWatchdogdir() {
+ String path = System.getProperty("watchdog.home");
+ if (path != null) {
+ return path;
+ }
+ path = "..";
+ for (int i = 0; i < 10; i++) {
+ File f = new File(path + "/watchdog");
+ if (f.exists()) {
+ return f.getAbsolutePath();
+ }
+ path = path + "/..";
+ }
+ return null;
+ }
+
public class WatchdogTests extends TestSuite {
public void run(TestResult res) {
beforeSuite();
@@ -142,5 +153,5 @@
afterSuite(res);
}
}
-
+
}

Modified: tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/test/watchdog/WatchdogHttpClient.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/test/watchdog/WatchdogHttpClient.java?rev=884421&r1=884420&r2=884421&view=diff
==============================================================================
--- tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/test/watchdog/WatchdogHttpClient.java (original)
+++ tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/test/watchdog/WatchdogHttpClient.java Thu Nov 26 06:55:49 2009
@@ -37,7 +37,7 @@

static int debug = 0;

- public static void dispatch(GTest client) throws Exception {
+ public static void dispatch(WatchdogTestImpl client) throws Exception {
HashMap requestHeaders = client.requestHeaders;
String host = client.host;
int port = client.port;
@@ -45,7 +45,14 @@
String request = client.request;

// XXX headers are ignored
- Socket socket = new Socket( host, port );
+ Socket socket;
+ try {
+ socket = new Socket( host, port );
+ } catch (IOException ex) {
+ System.out.println( " Socket Exception: " + ex );
+ return;
+ }
+ //socket.setSoTimeout(10000);

//socket obtained, rebuild the request.
rebuildRequest(client, client.request, socket);
@@ -57,7 +64,7 @@

OutputStream out = new BufferedOutputStream(
socket.getOutputStream() );
- StringBuilder reqbuf = new StringBuilder( 128 );
+ StringBuffer reqbuf = new StringBuffer( 128 );

// set the Host header
client.setHeaderDetails( "Host:" + host + ":" + port, requestHeaders, true );
@@ -92,7 +99,7 @@
Iterator iter = requestHeaders.keySet().iterator();

while ( iter.hasNext() ) {
- StringBuilder tmpBuf = new StringBuilder(32);
+ StringBuffer tmpBuf = new StringBuffer(32);
String headerKey = ( String ) iter.next();
ArrayList values = (ArrayList) requestHeaders.get( headerKey );
String[] value = (String[]) values.toArray( new String[ values.size() ] );
@@ -168,7 +175,6 @@

} catch ( SocketException ex ) {
System.out.println( " Socket Exception: " + ex );
- ex.printStackTrace();
} finally {
if ( debug > 0 ) {
System.out.println( " closing socket" );
@@ -187,7 +193,7 @@
* @return a <code>byte[]</code> representation of the response
*/
private static byte[] readBody( InputStream input ) {
- StringBuilder sb = new StringBuilder( 255 );
+ StringBuffer sb = new StringBuffer( 255 );
while ( true ) {
try {
int ch = input.read();
@@ -222,7 +228,7 @@
*/
private static String read( InputStream input ) throws IOException {
// Read the next line from the input stream
- StringBuilder sb = new StringBuilder();
+ StringBuffer sb = new StringBuffer();

while ( true ) {
try {
@@ -265,7 +271,7 @@
*
* @exception IOException if an input/output error occurs
*/
- private static HashMap parseHeaders( GTest client, InputStream is ) throws IOException {
+ private static HashMap parseHeaders( WatchdogTestImpl client, InputStream is ) throws IOException {
HashMap headers = new HashMap();
client.cookieVector = new Vector();

@@ -307,7 +313,7 @@
*
* @exception Exception if an error occurs
*/
- private static void rebuildRequest(GTest client, String req, Socket socket) throws Exception {
+ private static void rebuildRequest(WatchdogTestImpl client, String req, Socket socket) throws Exception {
client.request = client.replaceMarkers(req, socket );
String addressString = client.request.substring( client.request.indexOf( "/" ), client.request.indexOf( "HTTP" ) ).trim();

Added: tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/test/watchdog/WatchdogTestCase.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/test/watchdog/WatchdogTestCase.java?rev=884421&view=auto
==============================================================================
--- tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/test/watchdog/WatchdogTestCase.java (added)
+++ tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/test/watchdog/WatchdogTestCase.java Thu Nov 26 06:55:49 2009
@@ -0,0 +1,117 @@
+/*
+ */
+package org.apache.tomcat.test.watchdog;
+
+import java.util.Properties;
+
+import junit.framework.AssertionFailedError;
+import junit.framework.Test;
+import junit.framework.TestResult;
+import junit.framework.TestSuite;
+
+import org.apache.tomcat.integration.DynamicObject;
+import org.apache.tomcat.integration.simple.AntProperties;
+import org.w3c.dom.Element;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Node;
+
+public class WatchdogTestCase implements Test {
+ String testName;
+
+ Element watchE;
+
+ private Properties props;
+
+ private WatchdogTestCase delegate;
+ private WatchdogClient wc;
+
+ public WatchdogTestCase(String s) throws Throwable {
+ String[] comp = s.split(";");
+ if (comp.length < 2) {
+ return;
+ }
+ Class c = Class.forName(comp[1]);
+ wc = (WatchdogClient) c.newInstance();
+ TestSuite suite = (TestSuite) wc.getSuite();
+ // need to encode the base, file, etc in the test name
+
+ System.err.println(s);
+
+ for (int i = 0; i < suite.testCount(); i++) {
+ WatchdogTestCase t = (WatchdogTestCase) suite.testAt(i);
+ if (s.equals(t.getName())) {
+ delegate = t;
+ return;
+ }
+ }
+ }
+
+ public WatchdogTestCase(Element watchE, Properties props, String testName) {
+ this.testName = testName;
+ this.watchE = watchE;
+ this.props = props;
+ }
+
+ public int countTestCases() {
+ return 1;
+ }
+
+ public String getName() {
+ return testName;
+ }
+
+ public void testDummy() {
+ }
+
+ public void run(TestResult res) {
+ if (delegate != null) {
+ // Single method run
+ wc.beforeSuite();
+ delegate.run(res);
+ wc.afterSuite(res);
+ return;
+ }
+ if (watchE == null) {
+ res.endTest(this);
+ return;
+ }
+ WatchdogTestImpl test = new WatchdogTestImpl();
+ NamedNodeMap attrs = watchE.getAttributes();
+
+ for (int i = 0; i < attrs.getLength(); i++) {
+ Node n = attrs.item(i);
+ String name = n.getNodeName();
+ String value = n.getNodeValue();
+ value = AntProperties.replaceProperties(value, props, null);
+ try {
+ new DynamicObject(test.getClass()).setProperty(test,
+ name, value);
+ } catch (Exception e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+ }
+
+ try {
+ res.startTest(this);
+ new DynamicObject(test.getClass()).invoke(test, "execute");
+ } catch (Throwable e) {
+ res.addError(this, e);
+ // res.stop();
+ }
+
+ if (test.passCount == 1) {
+ res.endTest(this);
+ return;
+ } else {
+ if (test.lastError == null) {
+ res.addFailure(this, new AssertionFailedError(test.request
+ + " " + test.description + "\n" + test.resultOut));
+ } else {
+ res.addError(this, test.lastError);
+ }
+ }
+ res.endTest(this);
+ }
+
+}

Propchange: tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/test/watchdog/WatchdogTestCase.java
------------------------------------------------------------------------------
svn:eol-style = native

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@...
For additional commands, e-mail: dev-help@...

svn commit: r884421 [1/3] - in /tomcat/trunk/modules/tomcat-lite/test/org/apache: coyote/ coyote/lite/ coyote/servlet/ tomcat/lite/ tomcat/lite/http/ tomcat/lite/http/services/ tomcat/lite/io/ tomcat/lite/load/ tomcat/lite/proxy/ tomcat/lite/servlet/ t...

2009-11-25T22:55:50Z

Author: costin
Date: Thu Nov 26 06:55:49 2009
New Revision: 884421

URL: http://svn.apache.org/viewvc?rev=884421&view=rev
Log:
Tests. Note that you need to have watchdog checked out and built (if it can still be built... - probably should checkin the binaries ).
There are a bunch of useful tests in watchdog - I'm not running watchdog, but turned it into JUnit test cases, we just
need the web apps and golden files from there.

At the moment there are about 12 failures (out of ~1000 tests - there are several dups because same tests are run against
different targets )

Added:
tomcat/trunk/modules/tomcat-lite/test/org/apache/coyote/
tomcat/trunk/modules/tomcat-lite/test/org/apache/coyote/lite/
tomcat/trunk/modules/tomcat-lite/test/org/apache/coyote/lite/TomcatLiteCoyoteTest.java (with props)
tomcat/trunk/modules/tomcat-lite/test/org/apache/coyote/servlet/
tomcat/trunk/modules/tomcat-lite/test/org/apache/coyote/servlet/LiteTestHelper.java
- copied, changed from r883948, tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/LiteTestHelper.java
tomcat/trunk/modules/tomcat-lite/test/org/apache/coyote/servlet/LiteWatchdogJspTests.java
- copied, changed from r883948, tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/LiteWatchdogJspTests.java
tomcat/trunk/modules/tomcat-lite/test/org/apache/coyote/servlet/LiteWatchdogServletTests.java
- copied, changed from r883948, tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/LiteWatchdogServletTests.java
tomcat/trunk/modules/tomcat-lite/test/org/apache/coyote/servlet/TomcatLiteSimpleTest.java
- copied, changed from r883948, tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/TomcatLiteSimpleTest.java
tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/TestMain.java (with props)
tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/http/
tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/http/DispatcherTest.java (with props)
tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/http/HttpChannelInMemoryTest.java (with props)
tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/http/HttpChannelTest.java (with props)
tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/http/HttpsTest.java (with props)
tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/http/LiveHttp1Test.java (with props)
tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/http/MultiMapTest.java (with props)
tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/http/services/
tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/http/services/EchoCallback.java (with props)
tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/http/services/SleepCallback.java (with props)
tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/http/test.keystore (with props)
tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/io/
tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/io/BBufferTest.java (with props)
tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/io/CBufferTest.java (with props)
tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/io/OneTest.java (with props)
tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/io/SocksTest.java (with props)
tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/io/UEncoderTest.java (with props)
tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/io/test.properties (with props)
tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/load/
tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/load/LiveHttp5Test.java (with props)
tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/load/LiveHttpThreadedTest.java (with props)
tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/load/MicroTest.java (with props)
tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/proxy/
tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/proxy/LiveProxyHttp1Test.java (with props)
tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/proxy/ProxyTest.java (with props)
tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/proxy/SmallProxyTest.java (with props)
tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/servlet/
tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/servlet/AnnotationTest.java (with props)
tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/servlet/JspWatchdogTests.java (with props)
tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/servlet/LiteTestHelper.java (with props)
tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/servlet/PropertiesSpiTest.java (with props)
tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/servlet/ServletTests.java (with props)
tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/servlet/TomcatLiteNoConnectorTest.java (with props)
tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/servlet/TomcatLiteSimpleTest.java (with props)
tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/servlet/TomcatLiteWatchdog.java (with props)
tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/test.properties (with props)
tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/test/watchdog/WatchdogTestCase.java (with props)
tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/test/watchdog/WatchdogTestImpl.java (with props)
Removed:
tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/HexDump.java
tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/LiteTestHelper.java
tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/LiteWatchdogJspTests.java
tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/LiteWatchdogServletTests.java
tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/TomcatLiteSimpleTest.java
tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/test/watchdog/GTest.java
tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/test/watchdog/WatchdogTest.java
Modified:
tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/test/watchdog/WatchdogClient.java
tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/test/watchdog/WatchdogHttpClient.java

Added: tomcat/trunk/modules/tomcat-lite/test/org/apache/coyote/lite/TomcatLiteCoyoteTest.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/tomcat-lite/test/org/apache/coyote/lite/TomcatLiteCoyoteTest.java?rev=884421&view=auto
==============================================================================
--- tomcat/trunk/modules/tomcat-lite/test/org/apache/coyote/lite/TomcatLiteCoyoteTest.java (added)
+++ tomcat/trunk/modules/tomcat-lite/test/org/apache/coyote/lite/TomcatLiteCoyoteTest.java Thu Nov 26 06:55:49 2009
@@ -0,0 +1,74 @@
+/*
+ */
+package org.apache.coyote.lite;
+
+import java.io.IOException;
+
+import javax.servlet.ServletException;
+
+import junit.framework.TestCase;
+
+import org.apache.catalina.LifecycleException;
+import org.apache.catalina.connector.Connector;
+import org.apache.catalina.startup.Tomcat;
+import org.apache.coyote.lite.LiteProtocolHandler;
+import org.apache.tomcat.lite.http.DefaultHttpConnector;
+import org.apache.tomcat.lite.http.HttpChannel;
+import org.apache.tomcat.lite.http.HttpConnector;
+import org.apache.tomcat.lite.io.BBuffer;
+
+public class TomcatLiteCoyoteTest extends TestCase {
+
+ static Tomcat tomcat;
+ LiteProtocolHandler litePH;
+
+ public void setUp() {
+ if (tomcat == null) {
+ try {
+ tomcat = new Tomcat();
+ tomcat.setPort(8885);
+ tomcat.setBaseDir("output/build");
+
+ tomcat.addWebapp("/examples", "examples");
+ tomcat.addWebapp("/", "ROOT");
+
+
+ //tomcat.addServlet(ctx, "name", "class");
+ // ctx.addServletMapping("/foo/*", "name");
+
+ litePH = setUp(tomcat);
+
+ tomcat.start();
+ } catch (LifecycleException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ } catch (ServletException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+ }
+ }
+
+ public static LiteProtocolHandler setUp(Tomcat tomcat) {
+ Connector connector = new Connector(LiteProtocolHandler.class.getName());
+ tomcat.getService().addConnector(connector);
+ connector.setPort(8885);
+ tomcat.setConnector(connector);
+ LiteProtocolHandler ph =
+ (LiteProtocolHandler) connector.getProtocolHandler();
+ return ph;
+ }
+
+
+ public void testSimple() throws IOException {
+ HttpConnector clientCon = DefaultHttpConnector.get();
+ HttpChannel ch = clientCon.get("localhost", 8885);
+ ch.getRequest().setRequestURI("/examples/servlets/servlet/HelloWorldExample");
+ ch.sendRequest();
+ BBuffer res = ch.readAll(null, 0);
+
+ assertTrue(res.toString().indexOf("<title>Hello World!</title>") >= 0);
+ }
+
+
+}

Propchange: tomcat/trunk/modules/tomcat-lite/test/org/apache/coyote/lite/TomcatLiteCoyoteTest.java
------------------------------------------------------------------------------
svn:eol-style = native

Copied: tomcat/trunk/modules/tomcat-lite/test/org/apache/coyote/servlet/LiteTestHelper.java (from r883948, tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/LiteTestHelper.java)
URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/tomcat-lite/test/org/apache/coyote/servlet/LiteTestHelper.java?p2=tomcat/trunk/modules/tomcat-lite/test/org/apache/coyote/servlet/LiteTestHelper.java&p1=tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/LiteTestHelper.java&r1=883948&r2=884421&rev=884421&view=diff
==============================================================================
--- tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/LiteTestHelper.java (original)
+++ tomcat/trunk/modules/tomcat-lite/test/org/apache/coyote/servlet/LiteTestHelper.java Thu Nov 26 06:55:49 2009
@@ -15,7 +15,7 @@
* limitations under the License.
*/

-package org.apache.tomcat.lite;
+package org.apache.coyote.servlet;

import java.io.BufferedInputStream;
import java.io.IOException;
@@ -30,7 +30,7 @@

import org.apache.coyote.OutputBuffer;
import org.apache.coyote.Response;
-import org.apache.tomcat.lite.coyote.CoyoteConnector;
+import org.apache.tomcat.lite.SimpleServlet;
import org.apache.tomcat.util.buf.ByteChunk;

public class LiteTestHelper {

Copied: tomcat/trunk/modules/tomcat-lite/test/org/apache/coyote/servlet/LiteWatchdogJspTests.java (from r883948, tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/LiteWatchdogJspTests.java)
URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/tomcat-lite/test/org/apache/coyote/servlet/LiteWatchdogJspTests.java?p2=tomcat/trunk/modules/tomcat-lite/test/org/apache/coyote/servlet/LiteWatchdogJspTests.java&p1=tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/LiteWatchdogJspTests.java&r1=883948&r2=884421&rev=884421&view=diff
==============================================================================
--- tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/LiteWatchdogJspTests.java (original)
+++ tomcat/trunk/modules/tomcat-lite/test/org/apache/coyote/servlet/LiteWatchdogJspTests.java Thu Nov 26 06:55:49 2009
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.tomcat.lite;
+package org.apache.coyote.servlet;

import junit.framework.Test;
@@ -23,6 +23,7 @@

public LiteWatchdogJspTests() {
super();
+ port = 8017;
testMatch =
//"precompileNegativeTest";
null;
@@ -36,15 +37,15 @@
"positiveIncludeCtxRelativeHtmlTest",
"precompileNegativeTest"
};
- file = base + "/src/conf/jsp-gtest.xml";
+ file = getWatchdogdir() + "/src/conf/jsp-gtest.xml";
goldenDir =
- base + "/src/clients/org/apache/jcheck/jsp/client/";
+ getWatchdogdir() + "/src/clients/org/apache/jcheck/jsp/client/";
targetMatch = "jsp-test";

}

public static Test suite() {
- return new LiteWatchdogJspTests().getSuite();
+ return new LiteWatchdogJspTests().getSuite(8017);
}

}

Copied: tomcat/trunk/modules/tomcat-lite/test/org/apache/coyote/servlet/LiteWatchdogServletTests.java (from r883948, tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/LiteWatchdogServletTests.java)
URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/tomcat-lite/test/org/apache/coyote/servlet/LiteWatchdogServletTests.java?p2=tomcat/trunk/modules/tomcat-lite/test/org/apache/coyote/servlet/LiteWatchdogServletTests.java&p1=tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/LiteWatchdogServletTests.java&r1=883948&r2=884421&rev=884421&view=diff
==============================================================================
--- tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/LiteWatchdogServletTests.java (original)
+++ tomcat/trunk/modules/tomcat-lite/test/org/apache/coyote/servlet/LiteWatchdogServletTests.java Thu Nov 26 06:55:49 2009
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.tomcat.lite;
+package org.apache.coyote.servlet;

import java.io.File;
import java.io.IOException;
@@ -31,13 +31,14 @@

public LiteWatchdogServletTests() {
- goldenDir = base + "/src/clients/org/apache/jcheck/servlet/client/";
+ port = 8115;
+ goldenDir = getWatchdogdir() + "/src/clients/org/apache/jcheck/servlet/client/";
testMatch =
//"HttpServletResponseWrapperSetStatusMsgTest";
//"ServletContextAttributeAddedEventTest";
null;
// ex: "ServletToJSP";
- file = base + "/src/conf/servlet-gtest.xml";
+ file = getWatchdogdir() + "/src/conf/servlet-gtest.xml";
targetMatch = "gtestservlet-test";
}

@@ -45,13 +46,9 @@
// required for the tests
System.setProperty("org.apache.coyote.USE_CUSTOM_STATUS_MSG_IN_HEADER",
"true");
- String path = System.getProperty("watchdog.home");
- if (path != null) {
- base = path;
- }

try {
- initServerWithWatchdog(base);
+ initServerWithWatchdog(getWatchdogdir());
} catch (ServletException e) {
// TODO Auto-generated catch block
e.printStackTrace();
@@ -61,8 +58,10 @@
}
}

+ int port = 8115;
+
protected void addConnector(TomcatLite liteServer) {
- LiteTestHelper.addConnector(liteServer, 8080, true);
+ LiteTestHelper.addConnector(liteServer, port, true);
}

public void initServerWithWatchdog(String wdDir) throws ServletException,
@@ -106,6 +105,6 @@
public static Test suite() {
// The individual targets are dups - and bad ones,
// RequestWrapper are missing part of the URL
- return new LiteWatchdogServletTests().getSuite();
+ return new LiteWatchdogServletTests().getSuite(8115);
}
}

Copied: tomcat/trunk/modules/tomcat-lite/test/org/apache/coyote/servlet/TomcatLiteSimpleTest.java (from r883948, tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/TomcatLiteSimpleTest.java)
URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/tomcat-lite/test/org/apache/coyote/servlet/TomcatLiteSimpleTest.java?p2=tomcat/trunk/modules/tomcat-lite/test/org/apache/coyote/servlet/TomcatLiteSimpleTest.java&p1=tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/TomcatLiteSimpleTest.java&r1=883948&r2=884421&rev=884421&view=diff
==============================================================================
--- tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/TomcatLiteSimpleTest.java (original)
+++ tomcat/trunk/modules/tomcat-lite/test/org/apache/coyote/servlet/TomcatLiteSimpleTest.java Thu Nov 26 06:55:49 2009
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.tomcat.lite;
+package org.apache.coyote.servlet;

import junit.framework.TestCase;

@@ -35,7 +35,7 @@
public void testSimpleRequest() throws Exception {
ByteChunk resb =
LiteTestHelper.getUrl("http://localhost:8804/test1/1stTest");
- assertTrue(resb.length() > 0);
+ assertTrue(resb.getLength() > 0);
assertEquals("Hello world", resb.toString());
}

Added: tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/TestMain.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/TestMain.java?rev=884421&view=auto
==============================================================================
--- tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/TestMain.java (added)
+++ tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/TestMain.java Thu Nov 26 06:55:49 2009
@@ -0,0 +1,295 @@
+/*
+ */
+package org.apache.tomcat.lite;
+
+import java.io.BufferedInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.util.List;
+import java.util.Map;
+
+import javax.net.ssl.SSLContext;
+
+import org.apache.tomcat.integration.simple.Main;
+import org.apache.tomcat.integration.simple.SimpleObjectManager;
+import org.apache.tomcat.lite.http.BaseMapper;
+import org.apache.tomcat.lite.http.DefaultHttpConnector;
+import org.apache.tomcat.lite.http.Dispatcher;
+import org.apache.tomcat.lite.http.HttpChannel;
+import org.apache.tomcat.lite.http.HttpConnector;
+import org.apache.tomcat.lite.http.BaseMapper.ContextMapping;
+import org.apache.tomcat.lite.http.HttpConnector.HttpChannelEvents;
+import org.apache.tomcat.lite.http.services.EchoCallback;
+import org.apache.tomcat.lite.http.services.SleepCallback;
+import org.apache.tomcat.lite.io.BBuffer;
+import org.apache.tomcat.lite.io.SocketConnector;
+import org.apache.tomcat.lite.io.SslConnector;
+import org.apache.tomcat.lite.proxy.HttpProxyService;
+import org.apache.tomcat.lite.proxy.StaticContentService;
+import org.apache.tomcat.lite.service.IOStatus;
+import org.apache.tomcat.util.buf.ByteChunk;
+
+/**
+ * Server with lost of test servlets.
+ *
+ * Used in tests - one is running for the entire suite.
+ *
+ * @author Costin Manolache
+ */
+public class TestMain {
+ static TestMain defaultServer;
+
+ SimpleObjectManager om;
+
+ static SocketConnector serverCon = new SocketConnector();
+
+ public static HttpConnector testClient = DefaultHttpConnector.get();
+ public static HttpConnector testServer = new HttpConnector(serverCon);
+ public static HttpConnector testProxy = new HttpConnector(serverCon);
+
+ static Dispatcher mcb;
+ static HttpProxyService proxy;
+
+
+ public static HttpConnector getTestServer() {
+ if (defaultServer == null) {
+ defaultServer = new TestMain();
+ defaultServer.run();
+ }
+ return defaultServer.testServer;
+ }
+
+
+ public static void initTestCallback(Dispatcher d) {
+ BaseMapper.ContextMapping mCtx = d.addContext(null, "", null, null, null, null);
+// testServer.setDebugHttp(true);
+// testServer.setDebug(true);
+
+ d.addWrapper(mCtx, "/", new StaticContentService()
+ .setContentType("text/html")
+ .setData("<a href='/proc/cpool/client'>Client pool</a><br/>" +
+ "<a href='/proc/cpool/server'>Server pool</a><br/>" +
+ "<a href='/proc/cpool/proxy'>Proxy pool</a><br/>" +
+ ""));
+
+ d.addWrapper(mCtx, "/hello", new StaticContentService().setData("Hello world"));
+ d.addWrapper(mCtx, "/2nd", new StaticContentService().setData("Hello world2"));
+ d.addWrapper(mCtx, "/echo/*", new EchoCallback());
+
+ d.addWrapper(mCtx, "/sleep/1", new SleepCallback().setData("sleep 1"));
+ d.addWrapper(mCtx, "/sleep/10", new SleepCallback().sleep(10000).setData(
+ "sleep 1"));
+
+ d.addWrapper(mCtx, "/chunked/*", new StaticContentService().setData("AAAA")
+ .chunked());
+
+ d.addWrapper(mCtx, "/proc/cpool/client", new IOStatus(testClient.cpool));
+ d.addWrapper(mCtx, "/proc/cpool/proxy", new IOStatus(testProxy.cpool));
+ d.addWrapper(mCtx, "/proc/cpool/server", new IOStatus(testServer.cpool));
+ }
+
+ static boolean RELEASE = true;
+ /**
+ * Blocking get, returns when the body has been read.
+ */
+ public static BBuffer get(String url) throws IOException {
+
+ BBuffer out = BBuffer.allocate();
+
+ HttpChannel aclient = DefaultHttpConnector.get().get(url);
+ aclient.sendRequest();
+ aclient.readAll(out,
+ //Long.MAX_VALUE);//
+ 2000000);
+ if (RELEASE) {
+ aclient.release(); // return connection to pool
+ }
+ return out;
+ }
+
+ public void run() {
+ String cfgFile = "org/apache/tomcat/lite/test.properties";
+ try {
+ startAll(cfgFile, 8000);
+ } catch (Throwable t) {
+ t.printStackTrace();
+ }
+ }
+
+ protected void startAll(String cfgFile, int basePort) {
+ if (om == null) {
+ om = new SimpleObjectManager();
+ }
+
+ om.loadResource(cfgFile);
+
+ // // Override the port - don't want on 8080, Watchdog may run in same
+// // process
+// om.getProperties().put("org.apache.tomcat.lite.Connector.port",
+// Integer.toString(basePort + 800));
+
+ // From Main:
+ String run = (String) om.getProperty("RUN");
+ String[] runNames = run == null ? new String[] {} : run.split(",");
+
+ for (String name: runNames) {
+ Object main = om.get(name);
+
+ if (main instanceof Runnable) {
+ ((Runnable) main).run();
+ }
+ }
+
+ om.bind("HttpConnector-TestServer", testServer);
+ om.bind("HttpConnector", testClient);
+ om.bind("HttpConnector-Proxy", testProxy);
+
+ testServer.setOnCreate(new HttpChannelEvents() {
+ @Override
+ public void onCreate(HttpChannel data, HttpConnector extraData)
+ throws IOException {
+ //data.trace("BIND");
+ om.bind("AsyncHttp-" + data.getId(), data);
+ }
+ @Override
+ public void onDestroy(HttpChannel data, HttpConnector extraData)
+ throws IOException {
+ //data.trace("UNBIND");
+ om.unbind("AsyncHttp-" + data.getId());
+ }
+ });
+
+// ioConnector.setOnCreate(new IOConnector.ConnectedCallback() {
+// AtomicInteger ser = new AtomicInteger();
+// @Override
+// public void handleConnected(IOChannel data)
+// throws IOException {
+// data.setId("IOChannel-" + data.getTarget() + "-" +
+// ser.incrementAndGet());
+// om.bind(data.getId(), data);
+// }
+// });
+// ioConnector.setOnClose(new IOConnector.ClosedCallback() {
+// @Override
+// public void handleClosed(IOChannel data)
+// throws IOException {
+// System.err.println("UNBIND " + data.getId() + " " + data);
+// om.unbind(data.getId());
+// }
+// });
+// ioConnector.onNewWorker = new Callback<NioThread>() {
+// @Override
+// public void handle(NioThread data, Object extraData)
+// throws IOException {
+// om.bind((String) extraData, data);
+// }
+// };
+
+ int port = basePort + 903;
+ if (proxy == null) {
+ proxy = new HttpProxyService()
+ .withHttpClient(testClient);
+ testProxy.setPort(port);
+ testProxy.setDebugHttp(true);
+ testProxy.setDebug(true);
+
+ // dispatcher rejects 'http://'
+ testProxy.setHttpService(proxy);
+ try {
+ testProxy.start();
+ } catch (IOException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+
+ port = basePort + 802;
+ initTestCallback(testServer.getDispatcher());
+ testServer.setPort(port);
+ try {
+ testServer.start();
+ } catch (IOException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+
+ port = basePort + 443;
+
+ }
+
+ Runtime.getRuntime().addShutdownHook(new Thread() {
+ public void run() {
+ System.err.println("Done");
+ }
+ public void start() {
+ System.err.println("Done1");
+ }
+ });
+
+
+// try {
+// ServletContextImpl ctx = (ServletContextImpl) tomcat.addServletContext(null, null, "/jmx");
+// // tomcat is already started, need to call init explicitely
+// ((ServletContextImpl) ctx).loadConfig();
+//
+// Servlet servlet = new JMXProxyServlet();
+// ServletRegistration.Dynamic jmxServlet = ctx.addServlet("jmx",
+// servlet);
+// jmxServlet.addMapping("/jmx");
+// // TODO: init servlet
+// servlet.init(new ServletConfigImpl(ctx, null, null));
+//
+// ctx.start();
+//
+// } catch (ServletException e) {
+// // TODO Auto-generated catch block
+// e.printStackTrace();
+// }
+
+ }
+
+ static {
+ SslConnector.fixUrlConnection();
+ }
+
+ public static ByteChunk getUrl(String path) throws IOException {
+ ByteChunk out = new ByteChunk();
+ getUrl(path, out, null);
+ return out;
+ }
+
+ public static int getUrl(String path,
+ ByteChunk out,
+ Map<String, List<String>> resHead) throws IOException {
+ URL url = new URL(path);
+ HttpURLConnection connection =
+ (HttpURLConnection) url.openConnection();
+ // connection.setReadTimeout(100000);
+ connection.connect();
+ int rc = connection.getResponseCode();
+ if (resHead != null) {
+ Map<String, List<String>> head = connection.getHeaderFields();
+ resHead.putAll(head);
+ }
+ InputStream is = connection.getInputStream();
+ BufferedInputStream bis = new BufferedInputStream(is);
+ byte[] buf = new byte[2048];
+ int rd = 0;
+ while((rd = bis.read(buf)) > 0) {
+ out.append(buf, 0, rd);
+ }
+ return rc;
+ }
+
+
+ public static void main(String[] args) throws Exception, IOException {
+ TestMain testMain = new TestMain();
+ TestMain.defaultServer = testMain;
+ testMain.om = new SimpleObjectManager(args);
+ testMain.run();
+ Main.waitStop();
+ }
+
+
+}

Propchange: tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/TestMain.java
------------------------------------------------------------------------------
svn:eol-style = native

Added: tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/http/DispatcherTest.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/http/DispatcherTest.java?rev=884421&view=auto
==============================================================================
--- tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/http/DispatcherTest.java (added)
+++ tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/http/DispatcherTest.java Thu Nov 26 06:55:49 2009
@@ -0,0 +1,46 @@
+/*
+ */
+package org.apache.tomcat.lite.http;
+
+import org.apache.tomcat.lite.io.CBuffer;
+
+import junit.framework.TestCase;
+
+public class DispatcherTest extends TestCase {
+
+ public void testMapper() throws Exception {
+ BaseMapper mapper = new BaseMapper();
+
+ String[] welcomes = new String[2];
+ welcomes[0] = "index.html";
+ welcomes[1] = "foo.html";
+
+ mapper.addContext("test1.com", "", "context0", new String[0], null, null);
+ mapper.addContext("test1.com", "/foo", "context1", new String[0], null, null);
+ mapper.addContext("test1.com", "/foo/bar", "context2", welcomes, null, null);
+ mapper.addContext("test1.com", "/foo/bar/bla", "context3", new String[0], null, null);
+
+ mapper.addWrapper("test1.com", "/foo/bar", "/fo/*", "wrapper0");
+ mapper.addWrapper("test1.com", "/foo/bar", "/", "wrapper1");
+ mapper.addWrapper("test1.com", "/foo/bar", "/blh", "wrapper2");
+ mapper.addWrapper("test1.com", "/foo/bar", "*.jsp", "wrapper3");
+ mapper.addWrapper("test1.com", "/foo/bar", "/blah/bou/*", "wrapper4");
+ mapper.addWrapper("test1.com", "/foo/bar", "/blah/bobou/*", "wrapper5");
+ mapper.addWrapper("test1.com", "/foo/bar", "*.htm", "wrapper6");
+
+ mapper.addContext("asdf.com", "", "context0", new String[0], null, null);
+
+ MappingData mappingData = new MappingData();
+
+ CBuffer host = CBuffer.newInstance();
+ host.set("test1.com");
+
+ CBuffer uri = CBuffer.newInstance();
+ uri.set("/foo/bar/blah/bobou/foo");
+
+ mapper.map(host, uri, mappingData);
+
+ assertEquals("context2", mappingData.context.toString());
+ assertEquals("/foo/bar", mappingData.contextPath.toString());
+ }
+}

Propchange: tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/http/DispatcherTest.java
------------------------------------------------------------------------------
svn:eol-style = native

Added: tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/http/HttpChannelInMemoryTest.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/http/HttpChannelInMemoryTest.java?rev=884421&view=auto
==============================================================================
--- tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/http/HttpChannelInMemoryTest.java (added)
+++ tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/http/HttpChannelInMemoryTest.java Thu Nov 26 06:55:49 2009
@@ -0,0 +1,294 @@
+/*
+ */
+package org.apache.tomcat.lite.http;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+
+import junit.framework.TestCase;
+
+import org.apache.tomcat.lite.http.HttpChannel.HttpService;
+import org.apache.tomcat.lite.http.HttpChannel.RequestCompleted;
+import org.apache.tomcat.lite.io.BBuffer;
+import org.apache.tomcat.lite.io.CBuffer;
+import org.apache.tomcat.lite.io.IOBuffer;
+import org.apache.tomcat.lite.io.IOChannel;
+import org.apache.tomcat.lite.io.IOConnector;
+import org.apache.tomcat.lite.io.MemoryIOConnector;
+import org.apache.tomcat.lite.io.MemoryIOConnector.MemoryIOChannel;
+
+public class HttpChannelInMemoryTest extends TestCase {
+
+ MemoryIOConnector memoryServerConnector = new MemoryIOConnector();
+ MemoryIOConnector memoryClientConnector =
+ new MemoryIOConnector().withServer(memoryServerConnector);
+
+
+ // Used for pipelined requests - after the first request is
+ // processed, a new HttpChannel is used ( first may still be
+ // in use )
+ HttpChannel lastServer;
+
+ // The server channel will use this for I/O...
+ MemoryIOConnector.MemoryIOChannel net = new MemoryIOChannel();
+
+ HttpConnector serverConnector = new HttpConnector(memoryServerConnector) {
+ @Override
+ public HttpChannel get(CharSequence target) throws IOException {
+ throw new IOException();
+ }
+ public HttpChannel getServer() {
+ lastServer = new HttpChannel().serverMode(true);
+ lastServer.withBuffers(net);
+ lastServer.setConnector(this);
+ //lastServer.withIOConnector(memoryServerConnector);
+ return lastServer;
+ }
+ };
+
+ HttpConnector httpClient = new HttpConnector(memoryClientConnector);
+
+ boolean hasBody = false;
+ boolean bodyDone = false;
+ boolean bodySentDone = false;
+ boolean headersDone = false;
+ boolean allDone = false;
+
+
+ HttpChannel http = serverConnector.getServer();
+
+ public void setUp() throws IOException {
+ serverConnector.setHttpService(null);
+ }
+
+
+ public void test2Req() throws IOException {
+ String req = "GET /index.html?q=b&c=d HTTP/1.1\r\n" +
+ "Host: Foo.com \n" +
+ "H2:Bar\r\n" +
+ "H3: Foo \r\n" +
+ " Bar\r\n" +
+ "H4: Foo\n" +
+ " Bar\n" +
+ "\r\n" +
+ "HEAD /r2? HTTP/1.1\n" +
+ "Host: Foo.com\r\n" +
+ "H3: Foo \r\n" +
+ " Bar\r\n" +
+ "H4: Foo\n" +
+ " Bar\n" +
+ "\r\n";
+ net.getIn().append(req);
+
+ assertTrue(http.getRequest().method().equals("GET"));
+ assertTrue(http.getRequest().protocol().equals("HTTP/1.1"));
+ assertEquals(http.getRequest().getMimeHeaders().size(), 4);
+ assertEquals(http.getRequest().getMimeHeaders().getHeader("Host").toString(),
+ "Foo.com");
+ assertEquals(http.getRequest().getMimeHeaders().getHeader("H2").toString(),
+ "Bar");
+
+ http.getOut().append("Response1");
+ http.getOut().close();
+ http.startSending();
+ http.release();
+
+ // now second response must be in.
+ // the connector will create a new http channel
+
+ http = lastServer;
+
+ assertTrue(http.getRequest().method().equals("HEAD"));
+ assertTrue(http.getRequest().protocol().equals("HTTP/1.1"));
+ assertTrue(http.getRequest().getMimeHeaders().size() == 3);
+ assertTrue(http.getRequest().getMimeHeaders().getHeader("Host")
+ .equals("Foo.com"));
+ }
+
+ public void testMultiLineHead() throws IOException {
+ http.getNet().getIn().append("GET / HTTP/1.0\n" +
+ "Cookie: 1234\n" +
+ " 456 \n" +
+ "Connection: Close\n\n");
+ http.getNet().getIn().close();
+
+ MultiMap headers = http.getRequest().getMimeHeaders();
+ CBuffer cookie = headers.getHeader("Cookie");
+ CBuffer conn = headers.getHeader("Connection");
+ assertEquals(conn.toString(), "Close");
+ assertEquals(cookie.toString(), "1234 456");
+
+ assertEquals(http.headRecvBuf.toString(),
+ "GET / HTTP/1.0\n" +
+ "Cookie: 1234 456 \n" + // \n -> trailing space
+ "Connection: Close\n\n");
+ }
+
+ public void testCloseSocket() throws IOException {
+ http.getNet().getIn().append("GET / HTTP/1.1\n"
+ + "Host: localhost\n"
+ + "\n");
+ assertTrue(http.keepAlive());
+
+ http.getNet().getIn().close();
+ assertFalse(http.keepAlive());
+ }
+
+ public void test2ReqByte2Byte() throws IOException {
+ String req = "GET /index.html?q=b&c=d HTTP/1.1\r\n" +
+ "Host: Foo.com \n" +
+ "H2:Bar\r\n" +
+ "H3: Foo \r\n" +
+ " Bar\r\n" +
+ "H4: Foo\n" +
+ " Bar\n" +
+ "\r\n" +
+ "HEAD /r2? HTTP/1.1\n" +
+ "Host: Foo1.com\n" +
+ "H3: Foo \r\n" +
+ " Bar\r\n" +
+ "\r\n";
+ for (int i = 0; i < req.length(); i++) {
+ net.getIn().append(req.charAt(i));
+ }
+
+ assertTrue(http.getRequest().method().equals("GET"));
+ assertTrue(http.getRequest().protocol().equals("HTTP/1.1"));
+ assertTrue(http.getRequest().getMimeHeaders().size() == 4);
+ assertTrue(http.getRequest().getMimeHeaders().getHeader("Host")
+ .equals("Foo.com"));
+
+ // send a response
+ http.sendBody.append("Response1");
+ http.getOut().close();
+
+ http.startSending(); // This will trigger a pipelined request
+
+ http.release(); // now second response must be in
+
+ http = lastServer;
+ assertTrue(http.getRequest().method().equals("HEAD"));
+ assertTrue(http.getRequest().protocol().equals("HTTP/1.1"));
+ assertTrue(http.getRequest().getMimeHeaders().size() == 2);
+ assertTrue(http.getRequest().getMimeHeaders().getHeader("Host")
+ .equals("Foo1.com"));
+
+ // send a response - service method will be called
+ http.sendBody.append("Response2");
+ http.getOut().close();
+ http.release(); // now second response must be in
+
+
+ }
+
+ public void testEndWithoutFlushCallbacks() throws IOException {
+ http.setCompletedCallback(new RequestCompleted() {
+ public void handle(HttpChannel data, Object extra)
+ throws IOException {
+ allDone = true;
+ }
+ });
+ http.getNet().getIn().append(POST);
+ http.getNet().getIn().close();
+
+ http.sendBody.queue("Hi");
+ http.getOut().close();
+ http.startSending(); // will call handleEndSend
+
+ assertTrue(allDone);
+
+ }
+
+ public void testCallbacks() throws IOException {
+ http.setCompletedCallback(new RequestCompleted() {
+ public void handle(HttpChannel data, Object extra)
+ throws IOException {
+ allDone = true;
+ }
+ });
+ http.setHttpService(new HttpService() {
+ public void service(HttpRequest httpReq, HttpResponse httpRes)
+ throws IOException {
+ headersDone = true;
+ }
+ });
+ http.setDataReceivedCallback(new IOConnector.DataReceivedCallback() {
+ @Override
+ public void handleReceived(IOChannel ch) throws IOException {
+ if (ch.getIn().isAppendClosed()) {
+ bodyDone = true;
+ }
+ }
+ });
+ http.setDataFlushedCallback(new IOConnector.DataFlushedCallback() {
+ @Override
+ public void handleFlushed(IOChannel ch) throws IOException {
+ if (ch.getOut().isAppendClosed()) {
+ bodySentDone = true;
+ }
+ }
+ });
+
+ // Inject the request
+ http.getNet().getIn().append(POST);
+ assertTrue(headersDone);
+ http.getNet().getIn().append("1234");
+
+ http.getNet().getIn().close();
+ assertTrue(bodyDone);
+
+
+ http.sendBody.queue("Hi");
+ http.getOut().close();
+ http.startSending();
+ assertTrue(bodySentDone);
+
+ assertTrue(allDone);
+
+ }
+
+ public static String POST = "POST / HTTP/1.0\n" +
+ "Connection: Close\n" +
+ "Content-Length: 4\n\n" +
+ "1234";
+
+ public void testClose() throws IOException {
+ http.getNet().getIn().append(POST);
+ http.getNet().getIn().close();
+
+ HttpBody receiveBody = http.receiveBody;
+ IOBuffer appData = receiveBody;
+ BBuffer res = BBuffer.allocate(1000);
+ appData.readAll(res);
+
+ assertEquals(res.toString(), "1234");
+ assertFalse(http.keepAlive());
+ assertFalse(http.keepAlive());
+
+ http.sendBody.queue(res);
+ http.getOut().close();
+ http.startSending();
+
+ assertTrue(net.getOut().isAppendClosed());
+ assertTrue(net.out.toString().indexOf("\n1234") > 0);
+
+ }
+
+ public void testReadLine() throws Exception {
+ http.getNet().getIn().append("POST / HTTP/1.0\n" +
+ "Content-Length: 28\n\n" +
+ "Line 1\n" +
+ "Line 2\r\n" +
+ "Line 3\r" +
+ "Line 4");
+ http.getNet().getIn().close();
+
+ BufferedReader r = http.getRequest().getReader();
+ assertEquals("Line 1", r.readLine());
+ assertEquals("Line 2", r.readLine());
+ assertEquals("Line 3", r.readLine());
+ assertEquals("Line 4", r.readLine());
+ assertEquals(null, r.readLine());
+
+ }
+}

Propchange: tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/http/HttpChannelInMemoryTest.java
------------------------------------------------------------------------------
svn:eol-style = native

Added: tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/http/HttpChannelTest.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/http/HttpChannelTest.java?rev=884421&view=auto
==============================================================================
--- tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/http/HttpChannelTest.java (added)
+++ tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/http/HttpChannelTest.java Thu Nov 26 06:55:49 2009
@@ -0,0 +1,130 @@
+/*
+ */
+package org.apache.tomcat.lite.http;
+
+import java.io.IOException;
+
+import org.apache.tomcat.lite.io.BBuffer;
+import org.apache.tomcat.lite.io.CBuffer;
+
+import junit.framework.TestCase;
+
+public class HttpChannelTest extends TestCase {
+
+ HttpChannel ch = new HttpChannel().serverMode(true);
+ HttpRequest req = ch.getRequest();
+
+
+ BBuffer head = BBuffer.allocate();
+ BBuffer line = BBuffer.wrapper();
+ BBuffer name = BBuffer.wrapper();
+ BBuffer value = BBuffer.wrapper();
+
+ BBuffer statusB = BBuffer.wrapper();
+ BBuffer msgB = BBuffer.wrapper();
+ BBuffer methodB = BBuffer.wrapper();
+ BBuffer queryB = BBuffer.wrapper("");
+ BBuffer requestB = BBuffer.wrapper();
+ BBuffer protoB = BBuffer.wrapper();
+
+ BBuffer l7 = BBuffer.wrapper("GET \n");
+ BBuffer l8 = BBuffer.wrapper("GET /\n");
+ BBuffer l9 = BBuffer.wrapper("GET /a?b\n");
+ BBuffer l10 = BBuffer.wrapper("GET /a?b HTTP/1.0\n");
+ BBuffer l11 = BBuffer.wrapper("GET /a?b HTTP/1.0\na:b");
+ BBuffer l12 = BBuffer.wrapper("GET /a?b HTTP/1.0\na:b\n");
+
+ BBuffer f1 = BBuffer.wrapper("GET /a?b HTTP/1.0\na:b\n\n");
+ BBuffer f2 = BBuffer.wrapper("GET /a?b HTTP/1.0\na:b\r\n\r\n");
+ BBuffer f3 = BBuffer.wrapper("GET /a?b HTTP/1.0\na:b\r\r");
+ BBuffer f4 = BBuffer.wrapper("GET /a?b HTTP/1.0\na:b\r\n\r");
+
+
+ public void reqTest(String lineS, String method, String req,
+ String qry, String proto) throws IOException {
+ BBuffer line = BBuffer.wrapper(lineS);
+ queryB.recycle();
+ protoB.recycle();
+ requestB.recycle();
+ methodB.recycle();
+ ch.parseRequestLine(line, methodB, requestB, queryB, protoB);
+ assertEquals(proto, protoB.toString());
+ assertEquals(req, requestB.toString());
+ assertEquals(qry, queryB.toString());
+ assertEquals(method, methodB.toString());
+ }
+
+ public void testParams() throws IOException {
+ MultiMap params = processQry("a=b&c=d");
+ assertEquals("b", params.getString("a"));
+ }
+
+ private MultiMap processQry(String qry) throws IOException {
+ BBuffer head = BBuffer.wrapper("GET /a?" + qry + " HTTP/1.0\n" +
+ "Host: a\n\n");
+ ch.parseMessage(head);
+ MultiMap params = req.getParameters();
+ return params;
+ }
+
+ public void testParseReq() throws IOException {
+ reqTest("GET / HTTP/1.0", "GET", "/", "", "HTTP/1.0");
+ reqTest("GET", "GET", "", "", "");
+ reqTest("GET / HTTP/1.0", "GET", "/", "", "HTTP/1.0");
+ reqTest("GET / HTTP/1.0", "GET", "/", "", "HTTP/1.0");
+ reqTest("GET /?b HTTP/1.0", "GET", "/", "b", "HTTP/1.0");
+ reqTest("GET ?a HTTP/1.0", "GET", "", "a", "HTTP/1.0");
+ reqTest("GET a HTTP/1.0", "GET", "a", "", "HTTP/1.0");
+ reqTest("GET a? HTTP/1.0", "GET", "a", "", "HTTP/1.0");
+ }
+
+ public void headTest(String headS, String expName, String expValue,
+ String expLine, String expRest) throws IOException {
+ head = BBuffer.wrapper(headS);
+ head.readLine(line);
+ ch.parseHeader(head, line, name, value);
+
+ assertEquals(expName, name.toString());
+ assertEquals(expValue, value.toString());
+
+ assertEquals(expLine, line.toString());
+ assertEquals(expRest, head.toString());
+ }
+
+ public void testParseHeader() throws IOException {
+ headTest("a:b\n", "a", "b", "", "");
+ headTest("a :b\n", "a", "b", "", "");
+ headTest("a : b\n", "a", "b", "", "");
+ headTest("a : b\n", "a", "b", "", "");
+ headTest("a : b c \n", "a", "b c", "", "");
+ headTest("a : b c\n", "a", "b c", "", "");
+ headTest("a : b c\n", "a", "b c", "", "");
+ headTest("a : b \n c\n", "a", "b c", "", "");
+ headTest("a : b \n c\n", "a", "b c", "", "");
+ headTest("a : b \n c\nd:", "a", "b c", "", "d:");
+
+ }
+
+ public void responseTest(String lineS, String proto, String status,
+ String msg) throws IOException {
+ protoB.recycle();
+ statusB.recycle();
+ msgB.recycle();
+ BBuffer line = BBuffer.wrapper(lineS);
+ ch.parseResponseLine(line,
+ protoB, statusB, msgB);
+ assertEquals(proto, protoB.toString());
+ assertEquals(status, statusB.toString());
+ assertEquals(msg, msgB.toString());
+ }
+
+ public void testResponse() throws Exception {
+ responseTest("HTTP/1.1 200 OK", "HTTP/1.1", "200", "OK");
+ responseTest("HTTP/1.1 200 OK", "HTTP/1.1", "200", "OK");
+ responseTest("HTTP/1.1 200", "HTTP/1.1", "200", "");
+ responseTest("HTTP/1.1", "HTTP/1.1", "", "");
+ }
+
+
+
+}

Propchange: tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/http/HttpChannelTest.java
------------------------------------------------------------------------------
svn:eol-style = native

Added: tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/http/HttpsTest.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/http/HttpsTest.java?rev=884421&view=auto
==============================================================================
--- tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/http/HttpsTest.java (added)
+++ tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/http/HttpsTest.java Thu Nov 26 06:55:49 2009
@@ -0,0 +1,200 @@
+/*
+ * Copyright 1999,2004 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.tomcat.lite.http;
+
+import java.io.IOException;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import junit.framework.TestCase;
+
+import org.apache.commons.codec.binary.Base64;
+import org.apache.tomcat.lite.TestMain;
+import org.apache.tomcat.lite.http.HttpChannel.HttpService;
+import org.apache.tomcat.lite.io.BBuffer;
+import org.apache.tomcat.lite.io.SslConnector;
+import org.apache.tomcat.util.buf.ByteChunk;
+
+public class HttpsTest extends TestCase {
+
+ static int port = 8443;
+ HttpConnector con;
+ HttpConnector httpClient;
+
+ public void setUp() {
+ Logger.getLogger("SSL").setLevel(Level.FINEST);
+ }
+
+ public void tearDown() {
+ if (con != null) {
+ con.stop();
+ }
+ if (httpClient != null) {
+ httpClient.stop();
+ }
+ }
+
+ static HttpConnector initServer(int port) throws IOException {
+ SslConnector sslCon = new SslConnector()
+ .setKeysResource("org/apache/tomcat/lite/http/test.keystore", "changeit");
+
+ HttpConnector con = new HttpConnector(sslCon);
+ con.setPort(port);
+
+ addService(con);
+ return con;
+ }
+
+ private static void addService(HttpConnector con) throws IOException {
+ con.setMaxHttpPoolSize(0);
+// con.setDebug(true);
+// con.setDebugHttp(true);
+
+ con.getDispatcher().setDefaultService(new HttpService() {
+ @Override
+ public void service(HttpRequest httpReq, HttpResponse httpRes)
+ throws IOException {
+ httpRes.setHeader("Connection", "close");
+ httpRes.getBodyWriter().write("Hello");
+ }
+ });
+ con.start();
+ }
+
+ public void testSimpleClient() throws Exception {
+ SslConnector sslCon = new SslConnector();
+ httpClient = new HttpConnector(sslCon);
+// httpClient.setDebug(true);
+// httpClient.setDebugHttp(true);
+ httpClient.setMaxHttpPoolSize(0);
+ con = initServer(++port);
+ checkResponse(httpClient);
+ }
+
+
+ public void testSimpleServer() throws Exception {
+ con = initServer(++port);
+ ByteChunk res = TestMain.getUrl("https://localhost:" + port +
+ "/examples/servlets/servlet/HelloWorldExample");
+ assertTrue(res.toString().indexOf("Hello") >= 0);
+ }
+
+
+ private void checkResponse(HttpConnector httpClient) throws Exception {
+ HttpChannel ch = httpClient.get("localhost", port);
+ ch.getRequest().setRequestURI("/hello");
+ ch.getRequest().setProtocol("HTTP/1.0");
+ // problems with keep alive !!!
+ ch.sendRequest();
+ BBuffer res = ch.readAll(null, 1000000);
+
+ assertTrue(res.toString().indexOf("Hello") >= 0);
+ }
+
+ public void testSimpleClient20() throws Exception {
+ SslConnector sslCon = new SslConnector();
+ httpClient = new HttpConnector(sslCon);
+// httpClient.setDebug(true);
+// httpClient.setDebugHttp(true);
+
+ con = initServer(++port);
+ for (int i = 0; i < 20; i++) {
+ checkResponse(httpClient);
+ }
+ }
+
+ public void testSimpleRequestGoogle() throws Exception {
+ SslConnector sslCon = new SslConnector();
+ httpClient = new HttpConnector(sslCon);
+ HttpChannel client = httpClient.get("www.google.com", 443);
+ client.getRequest().setRequestURI("/accounts/ServiceLogin");
+ client.sendRequest();
+
+ BBuffer res = BBuffer.allocate(10000);
+ client.readAll(res, 1000000);
+ assertTrue(res.toString().indexOf("<title>Google Accounts</title>") > 0);
+ }
+
+
+ /**
+ * Use byte[] for cert - avoids using the store file.
+ * This may be nice for:
+ * - tests without a file
+ * - frameworks managing configs - no need to deal with files
+ * @throws Exception
+ *
+ */
+ public void testSeverWithKeys() throws Exception {
+ Base64 b64 = new Base64();
+
+
+ byte[] keyBytes = b64.decode(PRIVATE_KEY);
+
+ SslConnector sslCon = new SslConnector()
+ .setKeys(CERTIFICATE, keyBytes);
+
+ HttpConnector con = new HttpConnector(sslCon);
+ con.setPort(++port);
+ addService(con);
+
+ ByteChunk res = TestMain.getUrl("https://localhost:" + port +
+ "/examples/servlets/servlet/HelloWorldExample");
+ assertTrue(res.toString().indexOf("Hello") >= 0);
+
+ }
+
+
+ //byte[] encoded =
+ // SslConnector.getCertificateFromStore(
+ // "test/org/apache/tomcat/lite/http/test.keystore",
+ // "changeit");
+ //byte[] encoded =
+ // SslConnector.getPrivateKeyFromStore(
+ // "test/org/apache/tomcat/lite/http/test.keystore",
+ // "changeit");
+ //
+ //byte[] b64b = b64.encode(encoded);
+ //System.out.println(new String(b64b));
+ static String PRIVATE_KEY =
+ "MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBALGOFqjC4Fefz0oOcfJeS8eLV8jY" +
+ "zA3sHUnTKmASfgfhG8prWUgSEq7O/849MrBysiKpIvTN8R+ykV4QCAxauGURDsNI2ZtAv23YX2Mb" +
+ "cfYfYqD0tgHEn355HKey0ICgmRuq3norlUWAH3hRv5qiQMc0UIhNrmdTs0jyvQ8E8AlZAgMBAAEC" +
+ "gYBybr8P2Tk5gBfbBOBPcpKocpgLLB6nQmvF7sC61nA/p8d/eBw8pNlBrMuVIkAPFHzWdee/mxMy" +
+ "eKXT18U4ISgBdIKLF9LwILhIgR8CwElLucmF2OdXqFe7baBIFI6OaqLvDgOwdHSIS6uZhAWOWIAZ" +
+ "38DhJbHMzPpfeBv1bAIhAQJBAPwhjzWqSWZjAfcED4htKa/ZSbdqMa1iYtveoHdXIcLuj4Ck1DKQ" +
+ "EFpzLnUe2gwul/TDcoW3ZVp85jn7jwnrNDECQQC0R5LgkGdGNMBih4kPU87tHFHUnggSMyIOBnCE" +
+ "XuQEN6i68VOwbdm2F7Rg1XGHD8IIJmVeiTSgLtS/mJRht6WpAkEAqs9VhQbTaTDkEOPIXiWOW1q6" +
+ "rS6dbxg7XzdowNDfx3706zM/qu2clpp3u9Ll5+DdA24xtNM1L+Nz2Y5KLm8Q0QJAQqpxEx/zQNAD" +
+ "EKyEL6nTTHV7gT+LRoeoIT2aYCji8vhOKgtR4l1M8/xiFKj5mXNnUjI4rDPaxR1sSQm4XUZXOQJB" +
+ "AJaCD0AhacU+KaOtk65tBJ7N2dKTbc5gs/CAz1uGgJtoD/jPjELMQwrxdp6AZP6+L6osqy6zDI3W" +
+ "zNHXS+wWAd0=";
+
+ static String CERTIFICATE =
+ "-----BEGIN CERTIFICATE-----\n" +
+ "MIICUzCCAbygAwIBAgIESviASzANBgkqhkiG9w0BAQUFADBuMRAwDgYDVQQGEwdVbmtub3duMRAw" +
+ "DgYDVQQIEwdVbmtub3duMRAwDgYDVQQHEwdVbmtub3duMRAwDgYDVQQKEwdVbmtub3duMRAwDgYD" +
+ "VQQLEwdVbmtub3duMRIwEAYDVQQDEwlsb2NhbGhvc3QwHhcNMDkxMTA5MjA0OTE1WhcNMTAwMjA3" +
+ "MjA0OTE1WjBuMRAwDgYDVQQGEwdVbmtub3duMRAwDgYDVQQIEwdVbmtub3duMRAwDgYDVQQHEwdV" +
+ "bmtub3duMRAwDgYDVQQKEwdVbmtub3duMRAwDgYDVQQLEwdVbmtub3duMRIwEAYDVQQDEwlsb2Nh" +
+ "bGhvc3QwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBALGOFqjC4Fefz0oOcfJeS8eLV8jYzA3s" +
+ "HUnTKmASfgfhG8prWUgSEq7O/849MrBysiKpIvTN8R+ykV4QCAxauGURDsNI2ZtAv23YX2MbcfYf" +
+ "YqD0tgHEn355HKey0ICgmRuq3norlUWAH3hRv5qiQMc0UIhNrmdTs0jyvQ8E8AlZAgMBAAEwDQYJ" +
+ "KoZIhvcNAQEFBQADgYEAPHUr1BDENlV28yIQvJOWKYbcNWLd6Cp8xCltSI897xhPpKQ5tDvs+l0g" +
+ "VfdBv5+jou0F5gbCkqgclBuUnUUWsU7r4HYBLVB8FiGSy9v5yuFJWyMMLJkWAfBgzxV1nHsCPhOn" +
+ "rspSB+i6bwag0i3ENXstD/Fg1lN/7l9dRpurneI=\n" +
+ "-----END CERTIFICATE-----\n\n";
+}

Propchange: tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/http/HttpsTest.java
------------------------------------------------------------------------------
svn:eol-style = native

Added: tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/http/LiveHttp1Test.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/http/LiveHttp1Test.java?rev=884421&view=auto
==============================================================================
--- tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/http/LiveHttp1Test.java (added)
+++ tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/http/LiveHttp1Test.java Thu Nov 26 06:55:49 2009
@@ -0,0 +1,149 @@
+/*
+ * 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.
+ */
+package org.apache.tomcat.lite.http;
+
+import java.io.IOException;
+
+import junit.framework.TestCase;
+
+import org.apache.tomcat.lite.TestMain;
+import org.apache.tomcat.lite.io.BBuffer;
+import org.apache.tomcat.lite.io.CBuffer;
+import org.apache.tomcat.lite.io.SocketConnector;
+
+public class LiveHttp1Test extends TestCase {
+ // Proxy tests extend this class, run same tests via proxy on 8903
+ protected int clientPort = 8802;
+
+ HttpChannel httpClient;
+
+ BBuffer bodyRecvBuffer = BBuffer.allocate(1024);
+
+ int to = 1000;
+
+ public void setUp() throws IOException {
+ // DefaultHttpConnector.get().setDebug(true);
+ // DefaultHttpConnector.get().setDebugHttp(true);
+ TestMain.getTestServer();
+
+ httpClient = DefaultHttpConnector.get().get("localhost", clientPort);
+
+ bodyRecvBuffer.recycle();
+ }
+
+ public void tearDown() throws Exception {
+ if (httpClient != null) {
+ httpClient.release(); // async
+ httpClient = null;
+ }
+ }
+
+ public void testSimpleRequest() throws Exception {
+ httpClient.getRequest().requestURI().set("/hello");
+
+ httpClient.sendRequest();
+ httpClient.readAll(bodyRecvBuffer, to);
+ assertEquals("Hello world", bodyRecvBuffer.toString());
+ }
+
+ public void testPoolGetRelease() throws Exception {
+ HttpConnector con = new HttpConnector(new SocketConnector());
+ con.setMaxHttpPoolSize(10);
+ HttpChannel httpCh = con.get("localhost", clientPort);
+ httpCh.release();
+
+ httpCh = con.get("localhost", clientPort);
+ httpCh.release();
+
+ httpCh = con.get("localhost", clientPort);
+ httpCh.release();
+
+ }
+
+ public void testSimpleChunkedRequest() throws Exception {
+ httpClient.getRequest().requestURI().set("/chunked/foo");
+ httpClient.sendRequest();
+ httpClient.readAll(bodyRecvBuffer, to);
+ assertTrue(bodyRecvBuffer.toString().indexOf("AAA") >= 0);
+ }
+
+ // Check waitResponseHead()
+ public void testRequestHead() throws Exception {
+ httpClient.getRequest().requestURI().set("/echo/foo");
+
+ // Send the request, wait response
+ httpClient.sendRequest();
+
+ httpClient.readAll(bodyRecvBuffer, to);
+ assertTrue(bodyRecvBuffer.toString().indexOf("GET /echo/foo") > 0);
+ }
+
+ public void test10() throws Exception {
+ for (int i = 0; i < 10; i++) {
+ testSimpleRequest();
+ tearDown();
+ setUp();
+
+ notFound();
+ tearDown();
+ setUp();
+
+ testSimpleRequest();
+ tearDown();
+ setUp();
+ }
+ }
+
+ public void notFound() throws Exception {
+ httpClient.getRequest().requestURI().set("/foo");
+ httpClient.sendRequest();
+ httpClient.readAll(bodyRecvBuffer, to);
+ }
+
+ // compression not implemented
+ public void testGzipRequest() throws Exception {
+ httpClient.getRequest().requestURI().set("/hello");
+ httpClient.getRequest().setHeader("accept-encoding",
+ "gzip");
+
+ // Send the request, wait response
+ httpClient.sendRequest();
+ // cstate.waitResponseHead(10000); // headers are received
+ // ByteChunk data = new ByteChunk(1024);
+ // acstate.serializeResponse(acstate.res, data);
+
+ // System.err.println(bodyRecvBuffer.toString());
+
+ httpClient.readAll(bodyRecvBuffer, to);
+ // Done
+ }
+
+ public void testWrongPort() throws Exception {
+ httpClient = DefaultHttpConnector.get().get("localhost", 18904);
+ httpClient.getRequest().requestURI().set("/hello");
+
+ httpClient.sendRequest();
+
+ try {
+ httpClient.readAll(bodyRecvBuffer, to);
+ } catch (Throwable t) {
+ t.printStackTrace();
+ return;
+ }
+ fail("Error");
+ }
+}

Propchange: tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/http/LiveHttp1Test.java
------------------------------------------------------------------------------
svn:eol-style = native

Added: tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/http/MultiMapTest.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/http/MultiMapTest.java?rev=884421&view=auto
==============================================================================
--- tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/http/MultiMapTest.java (added)
+++ tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/http/MultiMapTest.java Thu Nov 26 06:55:49 2009
@@ -0,0 +1,54 @@
+/*
+ */
+package org.apache.tomcat.lite.http;
+
+import org.apache.tomcat.lite.http.MultiMap.Entry;
+
+import junit.framework.TestCase;
+
+public class MultiMapTest extends TestCase {
+
+ MultiMap map = new MultiMap();
+ MultiMap lmap = new MultiMap().insensitive();
+
+ public void testAdd() {
+ map.add("foo", "bar");
+ assertEquals("bar", map.get("foo").toString());
+ }
+
+ public void testRemove() {
+ map.add("foo", "bar");
+ map.add("foo", "bar");
+ map.add("foo1", "bar");
+ assertEquals(3, map.count);
+ map.remove("foo");
+ assertEquals(1, map.count);
+ }
+
+ public void testRemove1() {
+ map.add("foo", "bar");
+ map.add("foo1", "bar");
+ map.add("foo", "bar");
+ assertEquals(3, map.count);
+ map.remove("foo");
+ assertEquals(1, map.count);
+ map.remove("foo1");
+ assertEquals(0, map.count);
+ }
+
+ public void testCase() {
+ lmap.add("foo", "bar1");
+ lmap.add("Foo", "bar2");
+ lmap.add("a", "bar3");
+ lmap.add("B", "bar4");
+ assertEquals(4, lmap.count);
+ assertEquals(3, lmap.map.size());
+
+ assertEquals("bar3", lmap.getString("a"));
+ assertEquals("bar3", lmap.getString("A"));
+ assertEquals("bar1", lmap.getString("Foo"));
+ Entry entry = lmap.getEntry("FOO");
+ assertEquals(2, entry.values.size());
+ }
+
+}

Propchange: tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/http/MultiMapTest.java
------------------------------------------------------------------------------
svn:eol-style = native

Added: tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/http/services/EchoCallback.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/http/services/EchoCallback.java?rev=884421&view=auto
==============================================================================
--- tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/http/services/EchoCallback.java (added)
+++ tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/http/services/EchoCallback.java Thu Nov 26 06:55:49 2009
@@ -0,0 +1,60 @@
+/* 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.
+ */
+package org.apache.tomcat.lite.http.services;
+
+import java.io.IOException;
+import java.util.logging.Logger;
+
+import org.apache.tomcat.lite.http.HttpChannel;
+import org.apache.tomcat.lite.http.HttpRequest;
+import org.apache.tomcat.lite.http.HttpResponse;
+import org.apache.tomcat.lite.http.HttpChannel.HttpService;
+import org.apache.tomcat.lite.io.IOBuffer;
+
+/**
+ * Response is plain/text, copy of the received request
+ */
+public class EchoCallback implements HttpService {
+ Logger log = Logger.getLogger("coyote.static");
+
+ String contentType = "text/plain";
+
+
+ public EchoCallback() {
+ }
+
+ @Override
+ public void service(HttpRequest req, HttpResponse res) throws IOException {
+ HttpChannel sproc = req.getHttpChannel();
+ res.setStatus(200);
+ res.setContentType(contentType);
+
+ IOBuffer tmp = new IOBuffer(null);
+ req.serialize(tmp);
+
+ sproc.getOut().append("REQ HEAD:\n");
+ sproc.getOut().append(tmp.readAll(null));
+ IOBuffer reqBuf = sproc.getOut();
+
+ reqBuf.append("\nCONTENT_LENGTH:")
+ .append(Long.toString(req.getContentLength()))
+ .append("\n");
+//
+// sproc.release();
+ }
+
+
+}
\ No newline at end of file

Propchange: tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/http/services/EchoCallback.java
------------------------------------------------------------------------------
svn:eol-style = native

Added: tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/http/services/SleepCallback.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/http/services/SleepCallback.java?rev=884421&view=auto
==============================================================================
--- tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/http/services/SleepCallback.java (added)
+++ tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/http/services/SleepCallback.java Thu Nov 26 06:55:49 2009
@@ -0,0 +1,85 @@
+/*
+ * 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.
+ */
+package org.apache.tomcat.lite.http.services;
+
+import java.io.IOException;
+
+import org.apache.tomcat.lite.http.HttpRequest;
+import org.apache.tomcat.lite.http.HttpResponse;
+import org.apache.tomcat.lite.io.BBuffer;
+import org.apache.tomcat.lite.proxy.StaticContentService;
+
+/**
+ * Test adapters that sleeps, for load test and for encoding.
+ * REQUIRES THREAD POOL
+ */
+public class SleepCallback extends StaticContentService {
+ long t1;
+ long t2;
+ long t3;
+ long t4;
+
+ public SleepCallback() {
+ }
+
+ public SleepCallback sleep(long t1, long t2, long t3,
+ long t4) {
+ this.t1 = t1;
+ this.t2 = t2;
+ this.t3 = t3;
+ this.t4 = t4;
+ return this;
+ }
+
+ public SleepCallback sleep(long t1) {
+ return sleep(t1, t1, t1, t1);
+ }
+
+ @Override
+ public void service(HttpRequest httpReq, HttpResponse res) throws IOException {
+ // TODO: blocking ! needs thread pool !
+ try {
+
+ Thread.currentThread().sleep(t1);
+ res.setStatus(200);
+ if (!chunked) {
+ res.setContentLength(mb.remaining() * 2);
+ }
+ res.setContentType(contentType);
+
+ res.sendHead();
+
+ Thread.currentThread().sleep(t2);
+
+ res.getBody().queue(BBuffer.wrapper(mb, 0, mb.remaining()));
+ res.flush();
+
+ //res.action(ActionCode.ACTION_CLIENT_FLUSH, res);
+
+ Thread.currentThread().sleep(t3);
+
+ res.getBody().queue(BBuffer.wrapper(mb, 0, mb.remaining()));
+ res.flush();
+
+ Thread.currentThread().sleep(t4);
+ } catch (InterruptedException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+ }
+
+}
\ No newline at end of file

Propchange: tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/http/services/SleepCallback.java
------------------------------------------------------------------------------
svn:eol-style = native

Added: tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/http/test.keystore
URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/http/test.keystore?rev=884421&view=auto
==============================================================================
Binary file - no diff available.

Propchange: tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/http/test.keystore
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream

Added: tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/io/BBufferTest.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/io/BBufferTest.java?rev=884421&view=auto
==============================================================================
--- tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/io/BBufferTest.java (added)
+++ tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/io/BBufferTest.java Thu Nov 26 06:55:49 2009
@@ -0,0 +1,159 @@
+/*
+ */
+package org.apache.tomcat.lite.io;
+
+import org.apache.tomcat.lite.io.BBuffer;
+
+import junit.framework.TestCase;
+
+public class BBufferTest extends TestCase {
+ BBuffer res = BBuffer.wrapper("");
+
+ BBuffer l1 = BBuffer.wrapper("");
+ BBuffer l1a = BBuffer.wrapper("a");
+
+ BBuffer l2 = BBuffer.wrapper("\r");
+ BBuffer l3 = BBuffer.wrapper("\n");
+ BBuffer l4 = BBuffer.wrapper("\r\n");
+ BBuffer l5 = BBuffer.wrapper("\r\na");
+ BBuffer l5_a = BBuffer.wrapper("\ra");
+ BBuffer l5_b = BBuffer.wrapper("\na");
+ BBuffer l6 = BBuffer.wrapper("a\n");
+ BBuffer l7 = BBuffer.wrapper("GET \n");
+ BBuffer l8 = BBuffer.wrapper("GET /\n");
+ BBuffer l9 = BBuffer.wrapper("GET /a?b\n");
+ BBuffer l10 = BBuffer.wrapper("GET /a?b HTTP/1.0\n");
+ BBuffer l11 = BBuffer.wrapper("GET /a?b HTTP/1.0\na:b");
+ BBuffer l12 = BBuffer.wrapper("GET /a?b HTTP/1.0\na:b\n");
+
+ BBuffer f1 = BBuffer.wrapper("GET /a?b HTTP/1.0\na:b\n\n");
+ BBuffer f2 = BBuffer.wrapper("GET /a?b HTTP/1.0\na:b\r\n\r\n");
+ BBuffer f3 = BBuffer.wrapper("GET /a?b HTTP/1.0\na:b\r\r");
+ BBuffer f4 = BBuffer.wrapper("GET /a?b HTTP/1.0\na:b\r\n\r");
+
+ BBuffer s1 = BBuffer.wrapper(" \n");
+ BBuffer s2 = BBuffer.wrapper(" a");
+ BBuffer s3 = BBuffer.wrapper(" ");
+ BBuffer s4 = BBuffer.wrapper(" a");
+
+ BBuffer h1 = BBuffer.wrapper("a");
+ BBuffer h2 = BBuffer.wrapper("a?b");
+ BBuffer h3 = BBuffer.wrapper("a b");
+
+ public void hashTest(String s) {
+ assertEquals(s.hashCode(), BBuffer.wrapper(s).hashCode());
+ }
+
+ public void testHash() {
+ hashTest("");
+ hashTest("a");
+ hashTest("123abc");
+ hashTest("123abc\0");
+ // Fails for UTF chars - only ascii hashTest("123abc\u12345;");
+ }
+
+ public void testReadToSpace() {
+ assertEquals(3, l8.readToSpace(res));
+ assertEquals("GET", res.toString());
+ assertEquals(" /\n", l8.toString());
+
+ assertEquals(0, l1.readToSpace(res));
+ assertEquals("", res.toString());
+ assertEquals("", l1.toString());
+ }
+
+ public void testReadToDelim() {
+ assertEquals(1, h1.readToDelimOrSpace((byte)'?', res));
+ assertEquals("a", res.toString());
+ assertEquals("", h1.toString());
+
+ assertEquals(1, h2.readToDelimOrSpace((byte)'?', res));
+ assertEquals("a", res.toString());
+ assertEquals("?b", h2.toString());
+
+ assertEquals(1, h3.readToDelimOrSpace((byte)'?', res));
+ assertEquals("a", res.toString());
+ assertEquals(" b", h3.toString());
+ }
+
+ public void testGet() {
+ assertEquals(0x20, s1.get(0));
+ assertEquals(0x0a, s1.get(1));
+ try {
+ s1.get(2);
+ } catch(ArrayIndexOutOfBoundsException ex) {
+ return;
+ }
+ fail("Exception");
+ }
+
+ public void testSkipSpace() {
+ assertEquals(1, s1.skipSpace());
+ assertEquals("\n", s1.toString());
+
+ assertEquals(1, s2.skipSpace());
+ assertEquals("a", s2.toString());
+
+ assertEquals(2, s3.skipSpace());
+ assertEquals("", s3.toString());
+
+ assertEquals(3, s4.skipSpace());
+ assertEquals("a", s4.toString());
+
+ assertEquals(0, l1.skipSpace());
+ assertEquals("", l1.toString());
+ }
+
+ public void testLFLF() {
+ assertTrue(f1.hasLFLF());
+ assertTrue(f2.hasLFLF());
+ assertTrue(f3.hasLFLF());
+
+ assertFalse(f4.hasLFLF());
+ assertFalse(l1.hasLFLF());
+ assertFalse(l2.hasLFLF());
+ assertFalse(l3.hasLFLF());
+
+ assertFalse(l10.hasLFLF());
+ assertFalse(l11.hasLFLF());
+ assertFalse(l12.hasLFLF());
+ }
+
+ public void testReadLine() {
+ assertEquals(-1, l1.readLine(res));
+ assertEquals("", res.toString());
+ assertEquals("", l1.toString());
+
+ assertEquals(-1, l1a.readLine(res));
+ assertEquals("", res.toString());
+ assertEquals("a", l1a.toString());
+
+ assertEquals(0, l2.readLine(res));
+ assertEquals("", l2.toString());
+ assertEquals("", res.toString());
+ assertEquals(0, l3.readLine(res));
+ assertEquals("", l3.toString());
+ assertEquals("", res.toString());
+ assertEquals(0, l4.readLine(res));
+ assertEquals("", res.toString());
+
+ assertEquals(0, l5.readLine(res));
+ assertEquals("", res.toString());
+ assertEquals("a", l5.toString());
+ assertEquals(0, l5_b.readLine(res));
+ assertEquals("", res.toString());
+ assertEquals("a", l5_b.toString());
+ assertEquals(0, l5_a.readLine(res));
+ assertEquals("", res.toString());
+ assertEquals("a", l5_a.toString());
+
+ assertEquals(1, l6.readLine(res));
+ assertEquals("a", res.toString());
+
+ assertEquals(4, l7.readLine(res));
+ assertEquals("GET ", res.toString());
+ assertEquals(5, l8.readLine(res));
+ assertEquals("GET /", res.toString());
+
+ }
+}

Propchange: tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/io/BBufferTest.java
------------------------------------------------------------------------------
svn:eol-style = native

Added: tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/io/CBufferTest.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/io/CBufferTest.java?rev=884421&view=auto
==============================================================================
--- tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/io/CBufferTest.java (added)
+++ tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/io/CBufferTest.java Thu Nov 26 06:55:49 2009
@@ -0,0 +1,32 @@
+/*
+ */
+package org.apache.tomcat.lite.io;
+
+import junit.framework.TestCase;
+
+public class CBufferTest extends TestCase {
+
+ CBuffer ext = CBuffer.newInstance();
+
+ public void extTest(String path, String exp) {
+ CBuffer.newInstance().append(path).getExtension(ext, '/', '.');
+ assertEquals(exp, ext.toString());
+ }
+
+ public void testExt() {
+ extTest("foo.jsp", "jsp");
+ extTest("foo.j", "j");
+ extTest("/foo.j", "j");
+ extTest("//foo.j", "j");
+ extTest(".j", "j");
+ extTest(".", "");
+ extTest("/abc", "");
+ extTest("/abc.", "");
+ extTest("/abc/", "");
+ extTest("/abc/d", "");
+ }
+
+ public void testLastIndexOf() {
+
+ }
+}

Propchange: tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/io/CBufferTest.java
------------------------------------------------------------------------------
svn:eol-style = native

Added: tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/io/OneTest.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/io/OneTest.java?rev=884421&view=auto
==============================================================================
--- tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/io/OneTest.java (added)
+++ tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/io/OneTest.java Thu Nov 26 06:55:49 2009
@@ -0,0 +1,30 @@
+/*
+ */
+package org.apache.tomcat.lite.io;
+
+import java.io.IOException;
+
+import org.apache.tomcat.lite.TestMain;
+import org.apache.tomcat.lite.http.HttpChannel;
+import org.apache.tomcat.lite.io.MemoryIOConnector;
+import org.apache.tomcat.lite.io.MemoryIOConnector.MemoryIOChannel;
+
+import junit.framework.TestCase;
+
+public class OneTest extends TestCase {
+ MemoryIOConnector.MemoryIOChannel net = new MemoryIOChannel();
+ HttpChannel http = new HttpChannel()
+ .serverMode(true).withBuffers(net);
+
+ public void setUp() throws Exception {
+ TestMain.getTestServer();
+ }
+
+ public void tearDown() throws IOException {
+ }
+
+
+ public void testOne() throws Exception {
+
+ }
+}

Propchange: tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/io/OneTest.java
------------------------------------------------------------------------------
svn:eol-style = native

Added: tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/io/SocksTest.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/io/SocksTest.java?rev=884421&view=auto
==============================================================================
--- tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/io/SocksTest.java (added)
+++ tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/io/SocksTest.java Thu Nov 26 06:55:49 2009
@@ -0,0 +1,58 @@
+/*
+ */
+package org.apache.tomcat.lite.io;
+
+import java.io.IOException;
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.net.Proxy;
+import java.net.ProxySelector;
+import java.net.SocketAddress;
+import java.net.URI;
+import java.net.UnknownHostException;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.tomcat.lite.proxy.SocksServer;
+
+
+import junit.framework.TestCase;
+
+public class SocksTest extends TestCase {
+
+ public void setUp() {
+// SocksServer socks = new SocksServer();
+// try {
+// socks.initServer();
+// } catch (IOException e1) {
+// // TODO Auto-generated catch block
+// e1.printStackTrace();
+// }
+//
+// ProxySelector.setDefault(new ProxySelector() {
+//
+// @Override
+// public void connectFailed(URI uri, SocketAddress sa, IOException ioe) {
+// }
+//
+// @Override
+// public List<Proxy> select(URI uri) {
+//
+// List<Proxy> res = new ArrayList<Proxy>();
+// try {
+// res.add(new Proxy(Proxy.Type.SOCKS,
+// new InetSocketAddress(InetAddress.getLocalHost(), 1080)));
+// } catch (UnknownHostException e) {
+// // TODO Auto-generated catch block
+// e.printStackTrace();
+// }
+// return res;
+// }
+//
+// });
+ }
+
+ public void testSocks() {
+
+ }
+}

Propchange: tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/io/SocksTest.java
------------------------------------------------------------------------------
svn:eol-style = native

Added: tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/io/UEncoderTest.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/io/UEncoderTest.java?rev=884421&view=auto
==============================================================================
--- tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/io/UEncoderTest.java (added)
+++ tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/io/UEncoderTest.java Thu Nov 26 06:55:49 2009
@@ -0,0 +1,45 @@
+/*
+ */
+package org.apache.tomcat.lite.io;
+
+import junit.framework.TestCase;
+
+
+public class UEncoderTest extends TestCase {
+ IOWriter enc=new IOWriter(null);
+ UrlEncoding dec = new UrlEncoding();
+ CBuffer cc = CBuffer.newInstance();
+
+ /*
+ *
+ * Test method for 'org.apache.tomcat.util.buf.UEncoder.encodeURL(String)'
+ * TODO: find the relevant rfc and apache tests and add more
+ */
+ public void testEncodeURL() {
+
+ String eurl1=encodeURL("test");
+ assertEquals("test", eurl1);
+
+ eurl1=encodeURL("/test");
+ assertEquals("/test", eurl1);
+
+ // safe ranges
+ eurl1=encodeURL("test$-_.");
+ assertEquals("test$-_.", eurl1);
+
+ eurl1=encodeURL("test$-_.!*'(),");
+ assertEquals("test$-_.!*'(),", eurl1);
+
+ eurl1=encodeURL("//test");
+ assertEquals("//test", eurl1);
+ }
+
+ public String encodeURL(String uri) {
+ cc.recycle();
+ dec.urlEncode(uri, cc, enc);
+ return cc.toString();
+ }
+
+
+
+}

Propchange: tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/io/UEncoderTest.java
------------------------------------------------------------------------------
svn:eol-style = native

Added: tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/io/test.properties
URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/io/test.properties?rev=884421&view=auto
==============================================================================
--- tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/io/test.properties (added)
+++ tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/io/test.properties Thu Nov 26 06:55:49 2009
@@ -0,0 +1,33 @@
+RUN=Log,JMXProxy,Socks
+
+Log.(class)=org.apache.tomcat.integration.simple.LogConfig
+Log.debug=org.apache.tomcat.async.AsyncHttpConnector
+Log.debug=Proxy
+
+JMXProxy.(class)=org.apache.tomcat.integration.simple.JMXProxy
+JMXProxy.port=8003
+
+Socks.(class)=org.apache.tomcat.async.callbacks.SocksServer
+Socks.port=2080
+Socks.idleTimeout=0
+
+HttpConnector-TestServer.debug=true
+#HttpConnector-TestServer.debugHttp=true
+HttpConnector-TestServer.clientKeepAlive=true
+HttpConnector-TestServer.serverKeepAlive=true
+HttpConnector-TestServer.maxHttpPoolSize=10
+
+HttpConnector.debug=true
+#HttpConnector.debugHttp=true
+HttpConnector.clientKeepAlive=true
+HttpConnector.serverKeepAlive=true
+HttpConnector.maxHttpPoolSize=10
+
+HttpConnector-Proxy.debug=true
+#HttpConnector-Proxy.debugHttp=true
+HttpConnector-Proxy.clientKeepAlive=true
+HttpConnector-Proxy.serverKeepAlive=true
+HttpConnector-Proxy.maxHttpPoolSize=10
+
+
+#IOConnector.debug=true

Propchange: tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/io/test.properties
------------------------------------------------------------------------------
svn:eol-style = native

Added: tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/load/LiveHttp5Test.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/load/LiveHttp5Test.java?rev=884421&view=auto
==============================================================================
--- tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/load/LiveHttp5Test.java (added)
+++ tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/load/LiveHttp5Test.java Thu Nov 26 06:55:49 2009
@@ -0,0 +1,38 @@
+/*
+ */
+package org.apache.tomcat.lite.load;
+
+import org.apache.tomcat.lite.http.LiveHttp1Test;
+
+import junit.framework.TestSuite;
+
+public class LiveHttp5Test extends LiveHttp1Test {
+
+ /**
+ * Want to run the same tests few times.
+ */
+ public static TestSuite suite() {
+ TestSuite s = new TestSuite();
+ for (int i = 0; i < 5; i++) {
+ s.addTestSuite(LiveHttp1Test.class);
+ }
+ return s;
+ }
+
+ public void test100() throws Exception {
+ for (int i = 0; i < 100; i++) {
+ testSimpleRequest();
+ tearDown();
+ setUp();
+
+ notFound();
+ tearDown();
+ setUp();
+
+ testSimpleRequest();
+ tearDown();
+ setUp();
+ }
+ }
+
+}

Propchange: tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/load/LiveHttp5Test.java
------------------------------------------------------------------------------
svn:eol-style = native

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@...
For additional commands, e-mail: dev-help@...

svn commit: r884421 [3/3] - in /tomcat/trunk/modules/tomcat-lite/test/org/apache: coyote/ coyote/lite/ coyote/servlet/ tomcat/lite/ tomcat/lite/http/ tomcat/lite/http/services/ tomcat/lite/io/ tomcat/lite/load/ tomcat/lite/proxy/ tomcat/lite/servlet/ t...

2009-11-25T22:55:50Z

Added: tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/test/watchdog/WatchdogTestImpl.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/test/watchdog/WatchdogTestImpl.java?rev=884421&view=auto
==============================================================================
--- tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/test/watchdog/WatchdogTestImpl.java (added)
+++ tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/test/watchdog/WatchdogTestImpl.java Thu Nov 26 06:55:49 2009
@@ -0,0 +1,1172 @@
+/*
+ * 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.
+ */
+
+/**
+ * @Author Costin, Ramesh.Mandava
+ */
+
+package org.apache.tomcat.test.watchdog;
+
+import java.io.BufferedInputStream;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.InetAddress;
+import java.net.Socket;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Hashtable;
+import java.util.Iterator;
+import java.util.StringTokenizer;
+import java.util.Vector;
+
+import org.apache.tomcat.lite.io.Hex;
+
+// derived from Jsp
+
+public class WatchdogTestImpl {
+
+ int failureCount = 0;
+
+ int passCount = 0;
+
+ Throwable lastError;
+
+ boolean hasFailed = false;
+
+ String prefix = "http";
+
+ String host = "localhost";
+
+ String localHost = null;
+
+ String localIP = null;
+
+ int port = 8080;
+
+ int debug = 0;
+
+ String description = "No description";
+
+ String request;
+
+ HashMap requestHeaders = new HashMap();
+
+ String content;
+
+ // true if task is nested
+ private boolean nested = false;
+
+ // Expected response
+ boolean magnitude = true;
+
+ boolean exactMatch = false;
+
+ // expect a response body
+ boolean expectResponseBody = true;
+
+ // Match the body against a golden file
+ String goldenFile;
+
+ // Match the body against a string
+ String responseMatch;
+
+ // the response should include the following headers
+ HashMap expectHeaders = new HashMap();
+
+ // Headers that should not be found in response
+ HashMap unexpectedHeaders = new HashMap();
+
+ // Match request line
+ String returnCode = "";
+
+ String returnCodeMsg = "";
+
+ // Actual response
+ String responseLine;
+
+ byte[] responseBody;
+
+ HashMap headers;
+
+ // For Report generation
+ StringBuffer resultOut = new StringBuffer();
+
+ boolean firstTask = false;
+
+ boolean lastTask = false;
+
+ String expectedString;
+
+ String actualString;
+
+ String testName;
+
+ String assertion;
+
+ String testStrategy;
+
+ // For Session Tracking
+ static Hashtable sessionHash;
+
+ static Hashtable cookieHash;
+
+ String testSession;
+
+ Vector cookieVector;
+
+ URL requestURL;
+
+ CookieController cookieController;
+
+ /**
+ * Creates a new <code>GTest</code> instance.
+ *
+ */
+ public WatchdogTestImpl() {
+ }
+
+ /**
+ * <code>setTestSession</code> adds a CookieController for the value of
+ * sessionName
+ *
+ * @param sessionName
+ * a <code>String</code> value
+ */
+ public void setTestSession(String sessionName) {
+ testSession = sessionName;
+
+ if (sessionHash == null) {
+ sessionHash = new Hashtable();
+ } else if (sessionHash.get(sessionName) == null) {
+ sessionHash.put(sessionName, new CookieController());
+ }
+ }
+
+ /**
+ * <code>setTestName</code> sets the current test name.
+ *
+ * @param tn
+ * current testname.
+ */
+ public void setTestName(String tn) {
+ testName = tn;
+ }
+
+ /**
+ * <code>setAssertion</code> sets the assertion text for the current test.
+ *
+ * @param assertion
+ * assertion text
+ */
+ public void setAssertion(String assertion) {
+ this.assertion = assertion;
+ }
+
+ /**
+ * <code>setTestStrategy</code> sets the test strategy for the current test.
+ *
+ * @param strategy
+ * test strategy text
+ */
+ public void setTestStrategy(String strategy) {
+ testStrategy = strategy;
+ }
+
+ /**
+ * <code>getTestName</code> returns the current test name.
+ *
+ * @return a <code>String</code> value
+ */
+ public String getTestName() {
+ return testName;
+ }
+
+ /**
+ * <code>getAssertion</code> returns the current assertion text.
+ *
+ * @return a <code>String</code> value
+ */
+ public String getAssertion() {
+ return assertion;
+ }
+
+ /**
+ * <code>getTestStrategy</code> returns the current test strategy test.
+ *
+ * @return a <code>String</code> value
+ */
+ public String getTestStrategy() {
+ return testStrategy;
+ }
+
+ /**
+ * <code>setFirstTask</code> denotes that current task being executed is the
+ * first task within the list.
+ *
+ * @param a
+ * <code>boolean</code> value
+ */
+ public void setFirstTask(boolean val) {
+ firstTask = val;
+ }
+
+ /**
+ * <code>setLastTask</code> denotes that the current task being executed is
+ * the last task within the list.
+ *
+ * @param a
+ * <code>boolean</code> value
+ */
+ public void setLastTask(boolean val) {
+ lastTask = val;
+ }
+
+ /**
+ * <code>setPrefix</code> sets the protocol prefix. Defaults to "http"
+ *
+ * @param prefix
+ * Either http or https
+ */
+ public void setPrefix(String prefix) {
+ this.prefix = prefix;
+ }
+
+ /**
+ * <code>setHost</code> sets hostname where the target server is running.
+ * Defaults to "localhost"
+ *
+ * @param h
+ * a <code>String</code> value
+ */
+ public void setHost(String h) {
+ this.host = h;
+ }
+
+ /**
+ * <code>setPort</code> sets the port that the target server is listening
+ * on. Defaults to "8080"
+ *
+ * @param portS
+ * a <code>String</code> value
+ */
+ public void setPort(String portS) {
+ this.port = Integer.valueOf(portS).intValue();
+ }
+
+ /**
+ * <code>setExactMatch</code> determines if a byte-by-byte comparsion is
+ * made of the server's response and the test's goldenFile, or if a token
+ * comparison is made. By default, only a token comparison is made
+ * ("false").
+ *
+ * @param exact
+ * a <code>String</code> value
+ */
+ public void setExactMatch(String exact) {
+ exactMatch = Boolean.valueOf(exact).booleanValue();
+ }
+
+ /**
+ * <code>setContent</code> String value upon which the request header
+ * Content-Length is based upon.
+ *
+ * @param s
+ * a <code>String</code> value
+ */
+ public void setContent(String s) {
+ this.content = s;
+ }
+
+ /**
+ * <code>setDebug</code> enables debug output. By default, this is disabled
+ * ( value of "0" ).
+ *
+ * @param debugS
+ * a <code>String</code> value
+ */
+ public void setDebug(String debugS) {
+ debug = Integer.valueOf(debugS).intValue();
+ }
+
+ /**
+ * <code>setMagnitude</code> Expected return value of the test execution.
+ * Defaults to "true"
+ *
+ * @param magnitudeS
+ * a <code>String</code> value
+ */
+ public void setMagnitude(String magnitudeS) {
+ magnitude = Boolean.valueOf(magnitudeS).booleanValue();
+ }
+
+ /**
+ * <code>setGoldenFile</code> Sets the goldenfile that will be used to
+ * validate the server's response.
+ *
+ * @param s
+ * fully qualified path and filename
+ */
+ public void setGoldenFile(String s) {
+ this.goldenFile = s;
+ }
+
+ /**
+ * <code>setExpectResponseBody</code> sets a flag to indicate if a response
+ * body is expected from the server or not
+ *
+ * @param b
+ * a <code>boolean</code> value
+ */
+ public void setExpectResponseBody(boolean b) {
+ this.expectResponseBody = b;
+ }
+
+ /**
+ * <code>setExpectHeaders</code> Configures GTest to look for the header
+ * passed in the server's response.
+ *
+ * @param s
+ * a <code>String</code> value in the format of
+ * <header-field>:<header-value>
+ */
+ public void setExpectHeaders(String s) {
+ this.expectHeaders = new HashMap();
+ StringTokenizer tok = new StringTokenizer(s, "|");
+ while (tok.hasMoreElements()) {
+ String header = (String) tok.nextElement();
+ setHeaderDetails(header, expectHeaders, false);
+ }
+ }
+
+ /**
+ * <code>setUnexpectedHeaders</code> Configures GTest to look for the header
+ * passed to validate that it doesn't exist in the server's response.
+ *
+ * @param s
+ * a <code>String</code> value in the format of
+ * <header-field>:<header-value>
+ */
+ public void setUnexpectedHeaders(String s) {
+ this.unexpectedHeaders = new HashMap();
+ setHeaderDetails(s, unexpectedHeaders, false);
+ }
+
+ public void setNested(String s) {
+ nested = Boolean.valueOf(s).booleanValue();
+ }
+
+ /**
+ * <code>setResponseMatch</code> Match the passed value in the server's
+ * response.
+ *
+ * @param s
+ * a <code>String</code> value
+ */
+ public void setResponseMatch(String s) {
+ this.responseMatch = s;
+ }
+
+ /**
+ * <code>setRequest</code> Sets the HTTP/HTTPS request to be sent to the
+ * target server Ex. GET /servlet_path/val HTTP/1.0
+ *
+ * @param s
+ * a <code>String</code> value in the form of METHOD PATH
+ * HTTP_VERSION
+ */
+ public void setRequest(String s) {
+ this.request = s;
+ }
+
+ /**
+ * <code>setReturnCode</code> Sets the expected return code from the
+ * server's response.
+ *
+ * @param code
+ * a valid HTTP response status code
+ */
+ public void setReturnCode(String code) {
+ this.returnCode = code;
+ }
+
+ /**
+ * Describe <code>setReturnCodeMsg</code> Sets the expected return message
+ * to be found in the server's response.
+ *
+ * @param code
+ * a valid HTTP resonse status code
+ * @param message
+ * a <code>String</code> value
+ */
+ public void setReturnCodeMsg(String message) {
+ this.returnCodeMsg = message;
+ }
+
+ /**
+ * <code>setRequestHeaders</code> Configures the request headers GTest
+ * should send to the target server.
+ *
+ * @param s
+ * a <code>String</code> value in for format of
+ * <field-name>:<field-value>
+ */
+ public void setRequestHeaders(String s) {
+ requestHeaders = new HashMap();
+ StringTokenizer tok = new StringTokenizer(s, "|");
+ while (tok.hasMoreElements()) {
+ String header = (String) tok.nextElement();
+ setHeaderDetails(header, requestHeaders, true);
+ }
+ }
+
+ // Inner tests are not used currently, can be reworked
+
+ // /**
+ // * Add a Task to this container
+ // *
+ // * @param Task to add
+ // */
+ // public void addTask(Task task) {
+ // children.add(task);
+ // }
+
+ /**
+ * <code>execute</code> Executes the test.
+ *
+ * @exception BuildException
+ * if an error occurs
+ */
+ public void execute() {
+
+ try {
+
+ if (resultOut != null && !nested) {
+ resultOut.append("\ntestName: " + testName);
+ resultOut.append("\nreq: " + request);
+ resultOut.append("\nassertion: " + assertion);
+ resultOut.append("\ntestStrategy: " + testStrategy);
+ }
+
+ WatchdogHttpClient.dispatch(this);
+
+ hasFailed = !checkResponse(magnitude);
+
+ // if ( !children.isEmpty() ) {
+ // Iterator iter = children.iterator();
+ // while (iter.hasNext()) {
+ // Task task = (Task) iter.next();
+ // task.perform();
+ // }
+ // }
+
+ if (!hasFailed && !nested) {
+ passCount++;
+ if (resultOut != null) {
+ resultOut.append("<result>PASS</result>\n");
+ }
+// System.out.println(" PASSED " + testName + " ("
+// + request + ")");
+ } else if (hasFailed && !nested) {
+ failureCount++;
+ if (resultOut != null) {
+ resultOut.append("<result>FAIL</result>\n");
+ }
+ System.out.println(" FAILED " + testName + "\n ("
+ + request + ")\n" + resultOut.toString());
+ }
+
+ } catch (Exception ex) {
+ failureCount++;
+ System.out.println(" FAIL " + description + " (" + request + ")");
+ lastError = ex;
+ ex.printStackTrace();
+ } finally {
+ if (!nested) {
+ hasFailed = false;
+ }
+ }
+ }
+
+ /**
+ * <code>checkResponse</code> Executes various response checking mechanisms
+ * against the server's response. Checks include:
+ * <ul>
+ * <li>expected headers
+ * <li>unexpected headers
+ * <li>return codes and messages in the Status-Line
+ * <li>response body comparison againt a goldenfile
+ * </ul>
+ *
+ * @param testCondition
+ * a <code>boolean</code> value
+ * @return a <code>boolean</code> value
+ * @exception Exception
+ * if an error occurs
+ */
+ private boolean checkResponse(boolean testCondition) throws Exception {
+ boolean match = false;
+
+ if (responseLine != null) {
+ // If returnCode doesn't match
+ if (responseLine.indexOf("HTTP/1.") > -1) {
+
+ if (!returnCode.equals("")) {
+ boolean resCode = (responseLine.indexOf(returnCode) > -1);
+ boolean resMsg = (responseLine.indexOf(returnCodeMsg) > -1);
+
+ if (returnCodeMsg.equals("")) {
+ match = resCode;
+ } else {
+ match = (resCode && resMsg);
+ }
+
+ if (match != testCondition) {
+
+ if (resultOut != null) {
+ String expectedStatusCode = "<expectedStatusCode>"
+ + returnCode + "</expectedReturnCode>\n";
+ String expectedReasonPhrase = "<expectedReasonPhrase>"
+ + returnCodeMsg + "</expectedReasonPhrase>";
+ actualString = "<actualStatusLine>" + responseLine
+ + "</actualStatusLine>\n";
+ resultOut.append(expectedStatusCode);
+ resultOut.append(expectedReasonPhrase);
+ resultOut.append(actualString);
+ }
+
+ return false;
+ }
+ }
+ } else {
+ resultOut.append("\n<failure>Wrong Http version: "
+ + responseLine + "</failure>");
+ return false;
+ }
+ } else {
+ resultOut.append("\n<failure>No response from server</failure>");
+ return false;
+ }
+
+ /*
+ * Check for headers the test expects to be in the server's response
+ */
+
+ // Duplicate set of response headers
+ HashMap copiedHeaders = cloneHeaders(headers);
+
+ // used for error reporting
+ String currentHeaderField = null;
+ String currentHeaderValue = null;
+
+ if (!expectHeaders.isEmpty()) {
+ boolean found = false;
+ String expHeader = null;
+
+ if (!headers.isEmpty()) {
+ Iterator expectIterator = expectHeaders.keySet().iterator();
+ while (expectIterator.hasNext()) {
+ found = false;
+ String expFieldName = (String) expectIterator.next();
+ currentHeaderField = expFieldName;
+ ArrayList expectValues = (ArrayList) expectHeaders
+ .get(expFieldName);
+ Iterator headersIterator = copiedHeaders.keySet()
+ .iterator();
+
+ while (headersIterator.hasNext()) {
+ String headerFieldName = (String) headersIterator
+ .next();
+ ArrayList headerValues = (ArrayList) copiedHeaders
+ .get(headerFieldName);
+
+ // compare field names and values in an HTTP 1.x
+ // compliant fashion
+ if ((headerFieldName.equalsIgnoreCase(expFieldName))) {
+ int hSize = headerValues.size();
+ int eSize = expectValues.size();
+
+ // number of expected headers found in server
+ // response
+ int numberFound = 0;
+
+ for (int i = 0; i < eSize; i++) {
+ currentHeaderValue = (String) expectValues
+ .get(i);
+
+ /*
+ * Handle the Content-Type header appropriately
+ * based on the the test is configured to look
+ * for.
+ */
+ if (currentHeaderField
+ .equalsIgnoreCase("content-type")) {
+ String resVal = (String) headerValues
+ .get(0);
+ if (currentHeaderValue.indexOf(';') > -1) {
+ if (currentHeaderValue.equals(resVal)) {
+ numberFound++;
+ headerValues.remove(0);
+ }
+ } else if (resVal
+ .indexOf(currentHeaderValue) > -1) {
+ numberFound++;
+ headerValues.remove(0);
+ }
+ } else if (currentHeaderField
+ .equalsIgnoreCase("location")) {
+ String resVal = (String) headerValues
+ .get(0);
+ int idx = currentHeaderValue
+ .indexOf(":80/");
+ if (idx > -1) {
+ String tempValue = currentHeaderValue
+ .substring(0, idx)
+ + currentHeaderValue
+ .substring(idx + 3);
+ if (currentHeaderValue.equals(resVal)
+ || tempValue.equals(resVal)) {
+ numberFound++;
+ headerValues.remove(0);
+ }
+ } else {
+ if (currentHeaderValue.equals(resVal)) {
+ numberFound++;
+ headerValues.remove(0);
+ }
+ }
+ } else if (headerValues
+ .contains(currentHeaderValue)) {
+ numberFound++;
+ headerValues.remove(headerValues
+ .indexOf(currentHeaderValue));
+ }
+ }
+ if (numberFound == eSize) {
+ found = true;
+ }
+ }
+ }
+ if (!found) {
+ /*
+ * Expected headers not found in server response. Break
+ * the processing loop.
+ */
+ break;
+ }
+ }
+ }
+
+ if (!found) {
+ StringBuffer actualBuffer = new StringBuffer(128);
+ if (resultOut != null) {
+ expectedString = "<expectedHeaderNotFound>"
+ + currentHeaderField + ": " + currentHeaderValue
+ + "</expectedHeader>\n";
+ }
+ if (!headers.isEmpty()) {
+ Iterator iter = headers.keySet().iterator();
+ while (iter.hasNext()) {
+ String headerName = (String) iter.next();
+ ArrayList vals = (ArrayList) headers.get(headerName);
+ String[] val = (String[]) vals.toArray(new String[vals
+ .size()]);
+ for (int i = 0; i < val.length; i++) {
+ if (resultOut != null) {
+ actualBuffer.append("<actualHeader>"
+ + headerName + ": " + val[i]
+ + "</actualHeader>\n");
+ }
+ }
+ }
+ if (resultOut != null) {
+ resultOut.append(expectedString);
+ resultOut.append(actualBuffer.toString());
+ }
+ }
+ return false;
+ }
+ }
+
+ /*
+ * Check to see if we're looking for unexpected headers. If we are,
+ * compare the values in the unexectedHeaders ArrayList against the
+ * headers from the server response. if the unexpected header is found,
+ * then return false.
+ */
+
+ if (!unexpectedHeaders.isEmpty()) {
+ boolean found = false;
+ String unExpHeader = null;
+ // Check if we got any unexpected headers
+
+ if (!copiedHeaders.isEmpty()) {
+ Iterator unexpectedIterator = unexpectedHeaders.keySet()
+ .iterator();
+ while (unexpectedIterator.hasNext()) {
+ found = false;
+ String unexpectedFieldName = (String) unexpectedIterator
+ .next();
+ ArrayList unexpectedValues = (ArrayList) unexpectedHeaders
+ .get(unexpectedFieldName);
+ Iterator headersIterator = copiedHeaders.keySet()
+ .iterator();
+
+ while (headersIterator.hasNext()) {
+ String headerFieldName = (String) headersIterator
+ .next();
+ ArrayList headerValues = (ArrayList) copiedHeaders
+ .get(headerFieldName);
+
+ // compare field names and values in an HTTP 1.x
+ // compliant fashion
+ if ((headerFieldName
+ .equalsIgnoreCase(unexpectedFieldName))) {
+ int hSize = headerValues.size();
+ int eSize = unexpectedValues.size();
+ int numberFound = 0;
+ for (int i = 0; i < eSize; i++) {
+ if (headerValues.contains(unexpectedValues
+ .get(i))) {
+ numberFound++;
+ if (headerValues.indexOf(headerFieldName) >= 0) {
+ headerValues.remove(headerValues
+ .indexOf(headerFieldName));
+ }
+ }
+ }
+ if (numberFound == eSize) {
+ found = true;
+ }
+ }
+ }
+ if (!found) {
+ /*
+ * Expected headers not found in server response. Break
+ * the processing loop.
+ */
+ break;
+ }
+ }
+ }
+
+ if (found) {
+ resultOut.append("\n Unexpected header received from server: "
+ + unExpHeader);
+ return false;
+ }
+ }
+
+ if (responseMatch != null) {
+ // check if we got the string we wanted
+ if (expectResponseBody && responseBody == null) {
+ resultOut.append("\n ERROR: got no response, expecting "
+ + responseMatch);
+ return false;
+ }
+ String responseBodyString = new String(responseBody);
+ if (responseBodyString.indexOf(responseMatch) < 0) {
+ resultOut.append("\n ERROR: expecting match on "
+ + responseMatch);
+ resultOut.append("\n Received: \n" + responseBodyString);
+ }
+ }
+
+ if (!expectResponseBody && responseBody != null) {
+ resultOut
+ .append("Received a response body from the server where none was expected");
+ return false;
+ }
+
+ // compare the body
+ if (goldenFile == null)
+ return true;
+
+ // Get the expected result from the "golden" file.
+ byte[] expResult = getExpectedResult();
+ String expResultS = (expResult == null) ? "" : new String(expResult);
+ // Compare the results and set the status
+ boolean cmp = true;
+
+ if (exactMatch) {
+ cmp = compare(responseBody, expResult);
+ } else {
+ cmp = compareWeak(responseBody, expResult);
+ }
+
+ if (cmp != testCondition) {
+
+ if (resultOut != null) {
+ expectedString = "<expectedBody>" + new String(expResult)
+ + "</expectedBody>\n";
+ actualString = "<actualBody>"
+ + (responseBody != null ? new String(responseBody)
+ : "null") + "</actualBody>\n";
+ resultOut.append(expectedString);
+ resultOut.append(actualString);
+ }
+
+ return false;
+ }
+
+ return true;
+ }
+
+ /**
+ * Replaces any |client.ip| and |client.host| parameter marks with the host
+ * and IP values of the host upon which Watchdog is running.
+ *
+ * @param request
+ * An HTTP request.
+ */
+ String replaceMarkers(String req, Socket socket) {
+
+ final String CLIENT_IP = "client.ip";
+ final String CLIENT_HOME = "client.host";
+
+ if (localIP == null || localHost == null) {
+ InetAddress addr = socket.getLocalAddress();
+ localHost = addr.getHostName();
+ localIP = addr.getHostAddress();
+ }
+
+ if (req.indexOf('|') > -1) {
+ StringTokenizer tok = new StringTokenizer(request, "|");
+ StringBuffer sb = new StringBuffer(50);
+
+ while (tok.hasMoreElements()) {
+ String token = tok.nextToken();
+ if (token.equals(CLIENT_IP)) {
+ sb.append(localIP);
+ } else if (token.equals(CLIENT_HOME)) {
+ sb.append(localHost);
+ } else {
+ sb.append(token);
+ }
+ }
+ return sb.toString();
+ } else {
+ return req;
+ }
+ }
+
+ /**
+ * <code>getExpectedResult</code> returns a byte array containing the
+ * content of the configured goldenfile
+ *
+ * @return goldenfile as a byte[]
+ * @exception IOException
+ * if an error occurs
+ */
+ private byte[] getExpectedResult() throws IOException {
+ byte[] expResult = { 'N', 'O', ' ', 'G', 'O', 'L', 'D', 'E', 'N', 'F',
+ 'I', 'L', 'E', ' ', 'F', 'O', 'U', 'N', 'D' };
+
+ try {
+ InputStream in = new BufferedInputStream(new FileInputStream(
+ goldenFile));
+ return readBody(in);
+ } catch (Exception ex) {
+ System.out.println("Golden file not found: " + goldenFile);
+ return expResult;
+ }
+ }
+
+ /**
+ * <code>compare</code> compares the two byte arrays passed in to verify
+ * that the lengths of the arrays are equal, and that the content of the two
+ * arrays, byte for byte are equal.
+ *
+ * @param fromServer
+ * a <code>byte[]</code> value
+ * @param fromGoldenFile
+ * a <code>byte[]</code> value
+ * @return <code>boolean</code> true if equal, otherwise false
+ */
+ private boolean compare(byte[] fromServer, byte[] fromGoldenFile) {
+ if (fromServer == null || fromGoldenFile == null) {
+ return false;
+ }
+
+ /*
+ * Check to see that the respose and golden file lengths are equal. If
+ * they are not, dump the hex and don't bother comparing the bytes. If
+ * they are equal, iterate through the byte arrays and compare each
+ * byte. If the bytes don't match, dump the hex representation of the
+ * server response and the goldenfile and return false.
+ */
+ if (fromServer.length != fromGoldenFile.length) {
+ StringBuffer sb = new StringBuffer(50);
+ sb.append(" Response and golden files lengths do not match!\n");
+ sb.append(" Server response length: ");
+ sb.append(fromServer.length);
+ sb.append("\n Goldenfile length: ");
+ sb.append(fromGoldenFile.length);
+ resultOut.append(sb.toString());
+ sb = null;
+ // dump the hex representation of the byte arrays
+ dumpHex(fromServer, fromGoldenFile);
+
+ return false;
+ } else {
+
+ int i = 0;
+ int j = 0;
+
+ while ((i < fromServer.length) && (j < fromGoldenFile.length)) {
+ if (fromServer[i] != fromGoldenFile[j]) {
+ resultOut.append("\n Error at position " + (i + 1));
+ // dump the hex representation of the byte arrays
+ dumpHex(fromServer, fromGoldenFile);
+
+ return false;
+ }
+
+ i++;
+ j++;
+ }
+ }
+
+ return true;
+ }
+
+ /**
+ * <code>compareWeak</code> creates new Strings from the passed arrays and
+ * then uses a StringTokenizer to compare non-whitespace tokens.
+ *
+ * @param fromServer
+ * a <code>byte[]</code> value
+ * @param fromGoldenFile
+ * a <code>byte[]</code> value
+ * @return a <code>boolean</code> value
+ */
+ private boolean compareWeak(byte[] fromServer, byte[] fromGoldenFile) {
+ if (fromServer == null || fromGoldenFile == null) {
+ return false;
+ }
+
+ boolean status = true;
+
+ String server = new String(fromServer);
+ String golden = new String(fromGoldenFile);
+
+ StringTokenizer st1 = new StringTokenizer(server);
+
+ StringTokenizer st2 = new StringTokenizer(golden);
+
+ while (st1.hasMoreTokens() && st2.hasMoreTokens()) {
+ String tok1 = st1.nextToken();
+ String tok2 = st2.nextToken();
+
+ if (!tok1.equals(tok2)) {
+ resultOut.append("\t FAIL*** : Rtok1 = " + tok1 + ", Etok2 = "
+ + tok2);
+ status = false;
+ }
+ }
+
+ if (st1.hasMoreTokens() || st2.hasMoreTokens()) {
+ status = false;
+ }
+
+ if (!status) {
+ StringBuffer sb = new StringBuffer(255);
+ sb
+ .append("ERROR: Server's response and configured goldenfile do not match!\n");
+ sb.append("Response received from server:\n");
+ sb
+ .append("---------------------------------------------------------\n");
+ sb.append(server);
+ sb.append("\nContent of Goldenfile:\n");
+ sb
+ .append("---------------------------------------------------------\n");
+ sb.append(golden);
+ sb.append("\n");
+ resultOut.append(sb.toString());
+ }
+ return status;
+ }
+
+ /**
+ * <code>readBody</code> reads the body of the response from the
+ * InputStream.
+ *
+ * @param input
+ * an <code>InputStream</code>
+ * @return a <code>byte[]</code> representation of the response
+ */
+ private byte[] readBody(InputStream input) {
+ StringBuffer sb = new StringBuffer(255);
+ while (true) {
+ try {
+ int ch = input.read();
+
+ if (ch < 0) {
+ if (sb.length() == 0) {
+ return (null);
+ } else {
+ break;
+ }
+ }
+ sb.append((char) ch);
+
+ } catch (IOException ex) {
+ return null;
+ }
+ }
+ return sb.toString().getBytes();
+ }
+
+ /**
+ * <code>setHeaderDetails</code> Wrapper method for parseHeader. Allows easy
+ * addition of headers to the specified HashMap
+ *
+ * @param line
+ * a <code>String</code> value
+ * @param headerMap
+ * a <code>HashMap</code> value
+ * @param isRequest
+ * a <code>boolean</code> indicating if the passed Header HashMap
+ * is for request headers
+ */
+ void setHeaderDetails(String line, HashMap headerHash, boolean isRequest) {
+ StringTokenizer stk = new StringTokenizer(line, "##");
+
+ while (stk.hasMoreElements()) {
+ String presentHeader = stk.nextToken();
+ parseHeader(presentHeader, headerHash, isRequest);
+ }
+ }
+
+ /**
+ * <code>parseHeader</code> parses input headers in format of "key:value"
+ * The parsed header field-name will be used as a key in the passed HashMap
+ * object, and the values found will be stored in an ArrayList associated
+ * with the field-name key.
+ *
+ * @param line
+ * String representation of an HTTP header line.
+ * @param headers
+ * a<code>HashMap</code> to store key/value header objects.
+ * @param isRequest
+ * set to true if the headers being processed are requestHeaders.
+ */
+ void parseHeader(String line, HashMap headerMap, boolean isRequest) {
+ // Parse the header name and value
+ int colon = line.indexOf(":");
+
+ if (colon < 0) {
+ resultOut
+ .append("\n ERROR: Header is in incorrect format: " + line);
+ return;
+ }
+
+ String name = line.substring(0, colon).trim();
+ String value = line.substring(colon + 1).trim();
+
+ if ((cookieVector != null) && (name.equalsIgnoreCase("Set-Cookie"))) {
+ cookieVector.addElement(value);
+ /*
+ * if ( ( value.indexOf("JSESSIONID") > -1 ) ||
+ * (value.indexOf("jsessionid") > -1 ) ) { String sessionId=
+ * value.substring( value.indexOf("=")+1); if ( testSession != null
+ * ) { sessionHash.put( testSession, sessionId ); }
+ * System.out.println("Got Session-ID : " + sessionId ); }
+ */
+ }
+
+ // System.out.println("HEADER: " +name + " " + value);
+
+ ArrayList values = (ArrayList) headerMap.get(name);
+ if (values == null) {
+ values = new ArrayList();
+ }
+ // HACK
+ if (value.indexOf(',') > -1 && !isRequest
+ && !name.equalsIgnoreCase("Date")) {
+ StringTokenizer st = new StringTokenizer(value, ",");
+ while (st.hasMoreElements()) {
+ values.add(st.nextToken());
+ }
+ } else {
+ values.add(value);
+ }
+
+ headerMap.put(name, values);
+ }
+
+ /**
+ * <code>dumpHex</code> helper method to dump formatted hex output of the
+ * server response and the goldenfile.
+ *
+ * @param serverResponse
+ * a <code>byte[]</code> value
+ * @param goldenFile
+ * a <code>byte[]</code> value
+ */
+ private void dumpHex(byte[] serverResponse, byte[] goldenFile) {
+ StringBuffer outBuf = new StringBuffer(
+ (serverResponse.length + goldenFile.length) * 2);
+
+ String fromServerString = Hex.getHexDump(serverResponse, 0,
+ serverResponse.length, true);
+ String fromGoldenFileString = Hex.getHexDump(goldenFile, 0,
+ goldenFile.length, true);
+
+ outBuf
+ .append(" Hex dump of server response and goldenfile below.\n\n### RESPONSE FROM SERVER ###\n");
+ outBuf.append("----------------------------\n");
+ outBuf.append(fromServerString);
+ outBuf.append("\n\n### GOLDEN FILE ###\n");
+ outBuf.append("-------------------\n");
+ outBuf.append(fromGoldenFileString);
+ outBuf.append("\n\n### END OF DUMP ###\n");
+
+ resultOut.append(outBuf.toString());
+
+ }
+
+ /**
+ * <code>cloneHeaders</code> returns a "cloned" HashMap of the map passed
+ * in.
+ *
+ * @param map
+ * a <code>HashMap</code> value
+ * @return a <code>HashMap</code> value
+ */
+ private HashMap cloneHeaders(HashMap map) {
+ HashMap dupMap = new HashMap();
+ Iterator iter = map.keySet().iterator();
+
+ while (iter.hasNext()) {
+ String key = new String((String) iter.next());
+ ArrayList origValues = (ArrayList) map.get(key);
+ ArrayList dupValues = new ArrayList();
+
+ String[] dupVal = (String[]) origValues
+ .toArray(new String[origValues.size()]);
+ for (int i = 0; i < dupVal.length; i++) {
+ dupValues.add(new String(dupVal[i]));
+ }
+
+ dupMap.put(key, dupValues);
+ }
+ return dupMap;
+ }
+
+}

Propchange: tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/test/watchdog/WatchdogTestImpl.java
------------------------------------------------------------------------------
svn:eol-style = native

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@...
For additional commands, e-mail: dev-help@...

svn commit: r884420 - in /tomcat/trunk/modules/tomcat-lite: build.xml ivy.xml pom.xml

2009-11-25T22:52:29Z

Author: costin
Date: Thu Nov 26 06:52:28 2009
New Revision: 884420

URL: http://svn.apache.org/viewvc?rev=884420&view=rev
Log:
For downloading deps - used Ant Ivy. The actual deps are declared in a maven pom.xml ( Ivy is supporting it just fine ).

The maven file can be used to compile and test tomcat-lite in servlet-2.5 mode - I wouldn't recomend to anyone to
use it, but if you have to and can't use build.xml - it does the basic thing.

Added:
tomcat/trunk/modules/tomcat-lite/ivy.xml (with props)
tomcat/trunk/modules/tomcat-lite/pom.xml (with props)
Modified:
tomcat/trunk/modules/tomcat-lite/build.xml

Modified: tomcat/trunk/modules/tomcat-lite/build.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/tomcat-lite/build.xml?rev=884420&r1=884419&r2=884420&view=diff
==============================================================================
--- tomcat/trunk/modules/tomcat-lite/build.xml (original)
+++ tomcat/trunk/modules/tomcat-lite/build.xml Thu Nov 26 06:52:28 2009
@@ -1,60 +1,161 @@
<?xml version="1.0"?>
-<project name="Tomcat Lite" default="tomcat-lite.jar" basedir="../..">
+<project name="Tomcat Lite" default="tomcat-lite.jar"
+ xmlns:ivy="antlib:org.apache.ivy.ant"
+ basedir=".">

<property file="${user.home}/build.properties" />
<property file="${basedir}/build.properties" />
<property file="${basedir}/build.properties.default" />

- <property name="tomcat.build" value="${basedir}/output/build" />
- <property name="tomcat.src" value="${basedir}/java" />
- <property name="tomcat.lite.src" value="${basedir}/modules/tomcat-lite" />
-
- <property name="classes" value="${basedir}/output/tomcat-lite/classes" />
- <property name="jar.dir" value="${basedir}/output/tomcat-lite/" />
+ <property name="tomcat.base" value="${basedir}/../.." />
+ <property name="tomcat.src" value="${tomcat.base}/java" />
+ <property name="tomcat.build" value="${tomcat.base}/output/build" />
+
+ <property name="tomcat.lite.src" value="${basedir}/" />
+ <property name="classes" value="${basedir}/target/tomcat-lite/classes" />
+ <property name="test-classes" value="${basedir}/target/tomcat-lite/test-classes" />
+ <property name="jar.dir" value="${basedir}/target/tomcat-lite/" />
<property name="MAIN" value="org.apache.tomcat.integration.simple.Main"/>
-
- <target name="compile">
+ <property name="compile.source" value="1.6"/>
+
+ 
+ <path id='lite-classpath'>
+ <fileset dir='target/lib' includes="*.jar" />
+ </path>
+
+ <path id='head-classpath'>
+ <pathelement location="${tomcat.build}/../classes" />
+ <pathelement location="target/lib/asm.jar" />
+ <pathelement location="target/lib/asm-tree.jar" />
+ <pathelement location="target/lib/junit.jar"/>
+ <pathelement location="target/lib/commons-codec.jar"/>
+ </path>
+
+
+ <target name="compile"
+ description="Build against tomcat head">
+ <javac destdir="${classes}"
+ debug="${compile.debug}"
+ deprecation="${compile.deprecation}"
+ source="${compile.source}"
+ optimize="${compile.optimize}"
+ encoding="ISO-8859-1">
+ <src path="${tomcat.lite.src}/java" />
+ <classpath refid="head-classpath" />
+ <exclude name="**/ServletApi25.java"/>
+ </javac>
+ <copy todir="${classes}">
+ <fileset dir="${tomcat.lite.src}/java"
+ includes="**/*.properties **/*.xml" />
+ </copy>
+ </target>
+
+ <target name="compile25"
+ description="Build against 2.5 servlet API, similar with the maven">
<mkdir dir="${classes}" />
- 
<javac destdir="${classes}"
debug="${compile.debug}"
deprecation="${compile.deprecation}"
source="${compile.source}"
optimize="${compile.optimize}"
- srcdir="${tomcat.src}"
encoding="ISO-8859-1"
>
- <include name="javax/servlet/**" />
- <include name="javax/annotation/**" />
- 
- <includesfile name="${tomcat.lite.src}/coyote-nio.files"/>
- <include name="org/apache/jasper/**" />
+ <classpath refid="lite-classpath" />
+ <src path="${tomcat.lite.src}/java" />
+ <exclude name="**/ServletApi30.java"/>
+ <exclude name="org/apache/tomcat/coyote/servlet/*.java"/>
</javac>

- <javac destdir="${classes}"
+ <copy todir="${classes}">
+ <fileset dir="${tomcat.lite.src}/java"
+ includes="**/*.properties **/*.xml" />
+ </copy>
+ </target>
+
+ <target name="test" depends="test30,test25"/>
+
+ <target name="test30" depends="compile">
+ <mkdir dir="${test-classes}"/>
+ <javac destdir="${test-classes}"
debug="${compile.debug}"
deprecation="${compile.deprecation}"
source="${compile.source}"
optimize="${compile.optimize}"
encoding="ISO-8859-1"
>
- <src path="${tomcat.lite.src}/java" />
+ <classpath refid="head-classpath" />
+ <classpath path="${classes}" />
+ <src path="${tomcat.lite.src}/test" />
</javac>
+ <copy todir="${test-classes}">
+ <fileset dir="${tomcat.lite.src}/test"
+ includes="**/*.properties **/*.xml **/*.keystore" />
+ </copy>

- <copy todir="${classes}">
- <fileset dir="${tomcat.lite.src}/java" includes="**/*.properties **/*.xml" />
- <fileset dir="${tomcat.src}"
- includes="org/apache/tomcat/util/**/*.properties org/apache/tomcat/util/**/*.xml"
- />
- <fileset dir="${tomcat.src}"
- includes="javax/servlet/**/*.properties"
- />
- <fileset dir="${tomcat.src}"
- includes="org/apache/coyote/**/*.properties org/apache/coyote/**/*.xml"
- />
+ 
+ <junit printsummary="yes" fork="yes" dir="${tomcat.base}"
+ >
+ <classpath refid="head-classpath" />
+ <classpath path="${test-classes}" />
+ <classpath path="${classes}" />
+
+ <formatter type="plain" usefile="false" />
+
+ <batchtest>
+ <fileset dir="test" >
+ 
+ <include name="**/*Test.java" />
+ <include name="**/*Tests.java" />
+ 
+ <exclude name="**/TestAll.java" />
+ 
+ <exclude name="**/Tester*.java" />
+ </fileset>
+ </batchtest>
+ </junit>
+ </target>
+
+ <target name="test25" depends="compile25">
+ <mkdir dir="${test-classes}"/>
+ <javac destdir="${test-classes}"
+ debug="${compile.debug}"
+ deprecation="${compile.deprecation}"
+ source="${compile.source}"
+ optimize="${compile.optimize}"
+ encoding="ISO-8859-1"
+ >
+ <classpath refid="lite-classpath" />
+ <classpath path="${classes}" />
+ <classpath path="target/lib/junit.jar"/>
+ <classpath path="target/lib/commons-codec.jar"/>
+ <src path="${tomcat.lite.src}/test" />
+ <exclude name="org/apache/coyote/**"/>
+ </javac>
+ <copy todir="${test-classes}">
+ <fileset dir="${tomcat.lite.src}/test"
+ includes="**/*.properties **/*.xml **/*.keystore" />
</copy>

+ <junit printsummary="yes" fork="yes">
+ <classpath refid="lite-classpath" />
+ <classpath path="${test-classes}" />
+ <classpath path="${classes}" />
+
+ <formatter type="plain" usefile="false" />
+
+ <batchtest>
+ <fileset dir="test" >
+ <exclude name="org/apache/coyote/**" />
+ 
+ <include name="**/*Test.java" />
+ <include name="**/*Tests.java" />
+ 
+ <exclude name="**/TestAll.java" />
+ 
+ <exclude name="**/Tester*.java" />
+ </fileset>
+ </batchtest>
+ </junit>
</target>

<target name="clean">
@@ -66,54 +167,56 @@
<target name="tomcat-lite.jar" depends="compile,pack_tomcat-lite.jar" />

<target name="pack_tomcat-lite.jar">
- 
<mkdir dir="${jar.dir}/jar" />
<jar destfile="${jar.dir}/jar/tomcat-lite.jar">
<manifest>
- <attribute name="Main-Class" value="${MAIN}"/>
- </manifest>
+ <attribute name="Main-Class" value="${MAIN}"/>
+ </manifest>
<fileset dir="${classes}">
<include name ="org/apache/tomcat/lite/**" />
<include name ="org/apache/tomcat/servlets/**" />
</fileset>
</jar>
- <copy file="${tomcat.build}/lib/annotations-api.jar" todir="${jar.dir}/jar"/>
- <copy file="${tomcat.build}/lib/servlet-api.jar" todir="${jar.dir}/jar"/>
- <copy file="${tomcat.build}/lib/tomcat-coyote.jar" todir="${jar.dir}/jar"/>
-
- 
- <mkdir dir="${jar.dir}/jasper" />
- <copy file="${tomcat.build}/lib/el-api.jar" todir="${jar.dir}/jasper"/>
- <copy file="${tomcat.build}/lib/jsp-api.jar" todir="${jar.dir}/jasper"/>
- <copy file="${tomcat.build}/lib/jasper.jar" todir="${jar.dir}/jasper"/>
- <copy file="${tomcat.build}/lib/jasper-el.jar" todir="${jar.dir}/jasper"/>
-
- 
- 
- <jar destfile="${jar.dir}/tomcat-lite-all.jar">
- <manifest>
- <attribute name="Main-Class" value="${MAIN}"/>
- </manifest>
- <fileset dir="${classes}">
- </fileset>
- </jar>
-
- 
- <jar destfile="${jar.dir}/tomcat-lite+javax+coyote.jar">
- <manifest>
- <attribute name="Main-Class" value="${MAIN}"/>
- </manifest>
- <fileset dir="${classes}">
- <exclude name ="org/apache/jasper/**" />
- <exclude name ="org/apache/el/**" />
- </fileset>
- </jar>
-
-
</target>

<target name="run">
- <java jar="${jar.dir}/tomcat-lite-ALL.jar"/>
+ <java jar="${jar.dir}/tomcat-lite.jar"/>
</target>
-
+
+ 
+
+ <property name="ivy.install.version" value="2.1.0" />
+ <condition property="ivy.home" value="${env.IVY_HOME}">
+ <isset property="env.IVY_HOME" />
+ </condition>
+ <property name="ivy.home" value="${basedir}/target/ivy" />
+ <property name="ivy.jar.dir" value="${ivy.home}/lib" />
+ <property name="ivy.jar.file" value="${ivy.jar.dir}/ivy.jar" />
+ <available file="${ivy.jar.file}" property="ivy.exist"/>
+
+ <target name="download-ivy" unless="ivy.exist">
+ <mkdir dir="${ivy.jar.dir}"/>
+ <get src="http://repo2.maven.org/maven2/org/apache/ivy/ivy/${ivy.install.version}/ivy-${ivy.install.version}.jar"
+ dest="${ivy.jar.file}" usetimestamp="true"/>
+ </target>
+
+ <target name="init-ivy" depends="download-ivy">
+ 
+ <path id="ivy.lib.path">
+ <fileset dir="${ivy.jar.dir}" includes="*.jar"/>
+
+ </path>
+ <taskdef resource="org/apache/ivy/ant/antlib.xml"
+ uri="antlib:org.apache.ivy.ant" classpathref="ivy.lib.path"/>
+ </target>
+
+ <target name="download" depends="init-ivy">
+ <mkdir dir="target/lib"/>
+ <ivy:resolve file="pom.xml" conf="compile" />
+ <ivy:retrieve pattern="target/lib/[artifact].[ext]"/>
+ </target>
+
</project>

Added: tomcat/trunk/modules/tomcat-lite/ivy.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/tomcat-lite/ivy.xml?rev=884420&view=auto
==============================================================================
--- tomcat/trunk/modules/tomcat-lite/ivy.xml (added)
+++ tomcat/trunk/modules/tomcat-lite/ivy.xml Thu Nov 26 06:52:28 2009
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<ivy-module version="2.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd">
+ <info
+ organisation="org.apache.tomcat.lite"
+ module="tomcat-lite"
+ status="integration">
+ </info>
+
+ <dependencies>
+
+ </dependencies>
+</ivy-module>

Propchange: tomcat/trunk/modules/tomcat-lite/ivy.xml
------------------------------------------------------------------------------
svn:eol-style = native

Added: tomcat/trunk/modules/tomcat-lite/pom.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/tomcat-lite/pom.xml?rev=884420&view=auto
==============================================================================
--- tomcat/trunk/modules/tomcat-lite/pom.xml (added)
+++ tomcat/trunk/modules/tomcat-lite/pom.xml Thu Nov 26 06:52:28 2009
@@ -0,0 +1,119 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.apache.tomcat.lite</groupId>
+ <artifactId>lite</artifactId>
+
+ <version>0.0.1-SNAPSHOT</version>
+
+ <dependencies>
+ <dependency>
+ <groupId>com.jcraft</groupId>
+ <artifactId>jzlib</artifactId>
+ <version>1.0.7</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.5</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.2</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ <version>1.4</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>jasper</artifactId>
+ <version>6.0.20</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>jasper-jdt</artifactId>
+ <version>6.0.20</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>jasper-el</artifactId>
+ <version>6.0.20</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>asm</groupId>
+ <artifactId>asm</artifactId>
+ <version>3.1</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>asm</groupId>
+ <artifactId>asm-tree</artifactId>
+ <version>3.1</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>coyote</artifactId>
+ <version>6.0.20</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant</artifactId>
+ <version>1.7.1</version>
+ </dependency>
+ </dependencies>
+
+ <build>
+
+ <sourceDirectory>java</sourceDirectory>
+
+ <testSourceDirectory>test</testSourceDirectory>
+
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.6</source>
+ <target>1.6</target>
+ <excludes>
+ <exclude>org/apache/coyote/servlet/**</exclude>
+ <exclude>**/ServletApi30.java</exclude>
+ </excludes>
+ <testExcludes>
+ <exclude>org/apache/coyote/servlet/**</exclude>
+ <exclude>org/apache/coyote/lite/**</exclude>
+ <exclude>**/ServletApi30.java</exclude>
+ </testExcludes>
+ </configuration>
+ </plugin>
+ </plugins>
+
+ <testResources>
+ <testResource>
+ <directory>test</directory>
+ <excludes>
+ <exclude>**/*.java</exclude>
+ </excludes>
+ </testResource>
+ </testResources>
+
+ </build>
+</project>

Propchange: tomcat/trunk/modules/tomcat-lite/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@...
For additional commands, e-mail: dev-help@...

svn commit: r884419 - in /tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/integration: DynamicObject.java ObjectManager.java simple/AntProperties.java simple/LocalFilesystem.java simple/Main.java simple/SimpleObjectManager.java

2009-11-25T22:50:11Z

Author: costin
Date: Thu Nov 26 06:50:10 2009
New Revision: 884419

URL: http://svn.apache.org/viewvc?rev=884419&view=rev
Log:
Few change to the ObjectManager ( intended for integration with existing frameworks ).
The 'sample/if no other framework around' SimpleObject manager no longer depends on IntrospectionUtils, refactored it ( and parts of modeler )
to DynamicObject.

Added:
tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/integration/DynamicObject.java (with props)
tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/integration/simple/AntProperties.java (with props)
Removed:
tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/integration/simple/LocalFilesystem.java
Modified:
tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/integration/ObjectManager.java
tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/integration/simple/Main.java
tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/integration/simple/SimpleObjectManager.java

Added: tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/integration/DynamicObject.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/integration/DynamicObject.java?rev=884419&view=auto
==============================================================================
--- tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/integration/DynamicObject.java (added)
+++ tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/integration/DynamicObject.java Thu Nov 26 06:50:10 2009
@@ -0,0 +1,393 @@
+/*
+ */
+package org.apache.tomcat.integration;
+
+import java.lang.reflect.Field;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicLong;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+/**
+ * Refactoring of IntrospectionUtils and modeler dynamic bean.
+ *
+ * Unlike IntrospectionUtils, the method informations can be cached.
+ * Also I hope this class will be simpler to use.
+ * There is no static cache.
+ *
+ * @author Costin Manolache
+ */
+public class DynamicObject {
+ // Based on MbeansDescriptorsIntrospectionSource
+
+ static Logger log = Logger.getLogger(DynamicObject.class.getName());
+
+ static Class<?> NO_PARAMS[] = new Class[0];
+
+
+ private static String strArray[] = new String[0];
+
+ private static Class<?>[] supportedTypes = new Class[] { Boolean.class,
+ Boolean.TYPE, Byte.class, Byte.TYPE, Character.class,
+ Character.TYPE, Short.class, Short.TYPE, Integer.class,
+ Integer.TYPE, Long.class, Long.TYPE, Float.class, Float.TYPE,
+ Double.class, Double.TYPE, String.class, strArray.getClass(),
+ BigDecimal.class, BigInteger.class, AtomicInteger.class,
+ AtomicLong.class, java.io.File.class, };
+
+
+ private Class realClass;
+
+ private Map<String, Method> getAttMap;
+
+ public DynamicObject(Class beanClass) {
+ this.realClass = beanClass;
+ initCache();
+ }
+
+ public DynamicObject(Class beanClass, boolean noCache) {
+ this.realClass = beanClass;
+ }
+
+ private void initCache() {
+ Method methods[] = null;
+
+ getAttMap = new HashMap<String, Method>();
+
+ methods = realClass.getMethods();
+ for (int j = 0; j < methods.length; ++j) {
+ if (ignorable(methods[j])) {
+ continue;
+ }
+ String name = methods[j].getName();
+
+ Class<?> params[] = methods[j].getParameterTypes();
+
+ if (name.startsWith("get") && params.length == 0) {
+ Class<?> ret = methods[j].getReturnType();
+ if (!supportedType(ret)) {
+ if (log.isLoggable(Level.FINE))
+ log.fine("Unsupported type " + methods[j]);
+ continue;
+ }
+ name = unCapitalize(name.substring(3));
+
+ getAttMap.put(name, methods[j]);
+ } else if (name.startsWith("is") && params.length == 0) {
+ Class<?> ret = methods[j].getReturnType();
+ if (Boolean.TYPE != ret) {
+ if (log.isLoggable(Level.FINE))
+ log.fine("Unsupported type " + methods[j] + " " + ret);
+ continue;
+ }
+ name = unCapitalize(name.substring(2));
+
+ getAttMap.put(name, methods[j]);
+ }
+ }
+ }
+
+ private boolean ignorable(Method method) {
+ if (Modifier.isStatic(method.getModifiers()))
+ return true;
+ if (!Modifier.isPublic(method.getModifiers())) {
+ return true;
+ }
+ if (method.getDeclaringClass() == Object.class)
+ return true;
+ return false;
+ }
+
+ public List<String> attributeNames() {
+ List<String> attributes = new ArrayList<String>();
+ Method methods[] = realClass.getMethods();
+ for (int j = 0; j < methods.length; ++j) {
+ String name = methods[j].getName();
+ if (ignorable(methods[j])) {
+ continue;
+ }
+ Class<?> params[] = methods[j].getParameterTypes();
+ if (name.startsWith("get") && params.length == 0) {
+ Class<?> ret = methods[j].getReturnType();
+ if (!supportedType(ret)) {
+ continue;
+ }
+ name = unCapitalize(name.substring(3));
+ attributes.add(name);
+ } else if (name.startsWith("is") && params.length == 0) {
+ Class<?> ret = methods[j].getReturnType();
+ if (Boolean.TYPE != ret) {
+ continue;
+ }
+ name = unCapitalize(name.substring(2));
+ attributes.add(name);
+ } else if (name.startsWith("set") && params.length == 1) {
+ if (!supportedType(params[0])) {
+ continue;
+ }
+ name = unCapitalize(name.substring(3));
+ attributes.add(name);
+ }
+ }
+
+ return attributes;
+ }
+
+
+ public Object invoke(Object proxy, String method) throws Exception {
+ Method executeM = null;
+ Class<?> c = proxy.getClass();
+ executeM = c.getMethod(method, NO_PARAMS);
+ if (executeM == null) {
+ throw new RuntimeException("No execute in " + proxy.getClass());
+ }
+ return executeM.invoke(proxy, (Object[]) null);
+ }
+
+ // TODO
+ public Object invoke(String method, Object[] params) {
+ return null;
+ }
+
+ public boolean hasHook(String method) {
+ return false;
+ }
+
+ public Object getAttribute(Object o, String att) {
+ Method m = getAttMap.get(att);
+ if (m == null)
+ return null;
+ try {
+ return m.invoke(o);
+ } catch (Throwable e) {
+ log.log(Level.INFO, "Error getting attribute " + realClass + " "
+ + att, e);
+ return null;
+ }
+ }
+
+ public boolean setAttribute(Object proxy, String name, Object value) {
+ String methodName = "set" + capitalize(name);
+ Method[] methods = proxy.getClass().getMethods();
+ for (Method m : methods) {
+ Class<?>[] paramT = m.getParameterTypes();
+ if (methodName.equals(m.getName())
+ && paramT.length == 1
+ && (value == null || paramT[0].isAssignableFrom(value
+ .getClass()))) {
+ try {
+ m.invoke(proxy, value);
+ return true;
+ } catch (IllegalArgumentException e) {
+ log.severe("Error setting: " + name + " "
+ + proxy.getClass().getName() + " " + e);
+ } catch (IllegalAccessException e) {
+ log.severe("Error setting: " + name + " "
+ + proxy.getClass().getName() + " " + e);
+ } catch (InvocationTargetException e) {
+ log.severe("Error setting: " + name + " "
+ + proxy.getClass().getName() + " " + e);
+ }
+ }
+ }
+ return false;
+ }
+
+ public boolean setProperty(Object proxy, String name, String value) {
+ String setter = "set" + capitalize(name);
+
+ try {
+ Method methods[] = proxy.getClass().getMethods();
+
+ Method setPropertyMethod = null;
+
+ // First, the ideal case - a setFoo( String ) method
+ for (int i = 0; i < methods.length; i++) {
+ if (ignorable(methods[i])) {
+ continue;
+ }
+ Class<?> paramT[] = methods[i].getParameterTypes();
+ if (setter.equals(methods[i].getName()) && paramT.length == 1) {
+ if ("java.lang.String".equals(paramT[0].getName())) {
+ methods[i].invoke(proxy, new Object[] { value });
+ return true;
+ } else {
+ // match - find the type and invoke it
+ Class<?> paramType = methods[i].getParameterTypes()[0];
+ Object params[] = new Object[1];
+ params[0] = convert(value, paramType);
+ if (params[0] != null) {
+ methods[i].invoke(proxy, params);
+ return true;
+ }
+ }
+ }
+ // save "setProperty" for later
+ if ("setProperty".equals(methods[i].getName()) &&
+ paramT.length == 2 &&
+ paramT[0] == String.class &&
+ paramT[1] == String.class) {
+ setPropertyMethod = methods[i];
+ }
+ }
+
+ try {
+ Field field = proxy.getClass().getField(name);
+ if (field != null) {
+ Object conv = convert(value, field.getType());
+ if (conv != null) {
+ field.set(proxy, conv);
+ return true;
+ }
+ }
+ } catch (NoSuchFieldException e) {
+ // ignore
+ }
+
+ // Ok, no setXXX found, try a setProperty("name", "value")
+ if (setPropertyMethod != null) {
+ Object params[] = new Object[2];
+ params[0] = name;
+ params[1] = value;
+ setPropertyMethod.invoke(proxy, params);
+ return true;
+ }
+
+ } catch (Throwable ex2) {
+ log.log(Level.WARNING, "IAE " + proxy + " " + name + " " + value,
+ ex2);
+ }
+ return false;
+ }
+
+ // ----------- Helpers ------------------
+
+ static Object convert(String object, Class<?> paramType) {
+ Object result = null;
+ if ("java.lang.String".equals(paramType.getName())) {
+ result = object;
+ } else if ("java.lang.Long".equals(paramType.getName())
+ || "long".equals(paramType.getName())) {
+ try {
+ result = Long.parseLong(object);
+ } catch (NumberFormatException ex) {
+ }
+ // Try a setFoo ( boolean )
+ } else if ("java.lang.Integer".equals(paramType.getName())
+ || "int".equals(paramType.getName())) {
+ try {
+ result = new Integer(object);
+ } catch (NumberFormatException ex) {
+ }
+ // Try a setFoo ( boolean )
+ } else if ("java.lang.Boolean".equals(paramType.getName())
+ || "boolean".equals(paramType.getName())) {
+ result = new Boolean(object);
+ } else {
+ log.info("Unknown type " + paramType.getName());
+ }
+ if (result == null) {
+ throw new IllegalArgumentException("Can't convert argument: "
+ + object + " to " + paramType );
+ }
+ return result;
+ }
+
+ /**
+ * Converts the first character of the given String into lower-case.
+ *
+ * @param name
+ * The string to convert
+ * @return String
+ */
+ static String unCapitalize(String name) {
+ if (name == null || name.length() == 0) {
+ return name;
+ }
+ char chars[] = name.toCharArray();
+ chars[0] = Character.toLowerCase(chars[0]);
+ return new String(chars);
+ }
+
+ /**
+ * Check if this class is one of the supported types. If the class is
+ * supported, returns true. Otherwise, returns false.
+ *
+ * @param ret
+ * The class to check
+ * @return boolean True if class is supported
+ */
+ static boolean supportedType(Class<?> ret) {
+ for (int i = 0; i < supportedTypes.length; i++) {
+ if (ret == supportedTypes[i]) {
+ return true;
+ }
+ }
+ if (isBeanCompatible(ret)) {
+ return true;
+ }
+ return false;
+ }
+
+ /**
+ * Check if this class conforms to JavaBeans specifications. If the class is
+ * conformant, returns true.
+ *
+ * @param javaType
+ * The class to check
+ * @return boolean True if the class is compatible.
+ */
+ static boolean isBeanCompatible(Class<?> javaType) {
+ // Must be a non-primitive and non array
+ if (javaType.isArray() || javaType.isPrimitive()) {
+ return false;
+ }
+
+ // Anything in the java or javax package that
+ // does not have a defined mapping is excluded.
+ if (javaType.getName().startsWith("java.")
+ || javaType.getName().startsWith("javax.")) {
+ return false;
+ }
+
+ try {
+ javaType.getConstructor(new Class[] {});
+ } catch (java.lang.NoSuchMethodException e) {
+ return false;
+ }
+
+ // Make sure superclass is compatible
+ Class<?> superClass = javaType.getSuperclass();
+ if (superClass != null && superClass != java.lang.Object.class
+ && superClass != java.lang.Exception.class
+ && superClass != java.lang.Throwable.class) {
+ if (!isBeanCompatible(superClass)) {
+ return false;
+ }
+ }
+ return true;
+ }
+
+ /**
+ * Reverse of Introspector.decapitalize
+ */
+ static String capitalize(String name) {
+ if (name == null || name.length() == 0) {
+ return name;
+ }
+ char chars[] = name.toCharArray();
+ chars[0] = Character.toUpperCase(chars[0]);
+ return new String(chars);
+ }
+
+
+}

Propchange: tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/integration/DynamicObject.java
------------------------------------------------------------------------------
svn:eol-style = native

Modified: tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/integration/ObjectManager.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/integration/ObjectManager.java?rev=884419&r1=884418&r2=884419&view=diff
==============================================================================
--- tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/integration/ObjectManager.java (original)
+++ tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/integration/ObjectManager.java Thu Nov 26 06:50:10 2009
@@ -79,6 +79,19 @@
}

/**
+ * Create or get a new object with the given name.
+ */
+ public String getProperty(String key) {
+ for (ObjectManager p : children) {
+ String o = p.getProperty(key);
+ if (o != null) {
+ return o;
+ }
+ }
+ return null;
+ }
+
+ /**
* Helper for typed get.
*/
public Object get(Class c) {
@@ -93,6 +106,6 @@
new ArrayList<ObjectManager>();

public void register(ObjectManager om) {
- om.children.add(this);
+ children.add(om);
}
}

Added: tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/integration/simple/AntProperties.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/integration/simple/AntProperties.java?rev=884419&view=auto
==============================================================================
--- tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/integration/simple/AntProperties.java (added)
+++ tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/integration/simple/AntProperties.java Thu Nov 26 06:50:10 2009
@@ -0,0 +1,75 @@
+/*
+ */
+package org.apache.tomcat.integration.simple;
+
+import java.util.Hashtable;
+
+/**
+ * Extracted from IntrospectionHelper - a simple utility class to
+ * do ant style ${property} replacements on a string, using a map
+ * holding properties. Also allows a hook for dynamic, on-demand
+ * properties.
+ *
+ * @author Costin Manolache
+ */
+public class AntProperties {
+ public static interface PropertySource {
+ public String getProperty(String key);
+ }
+
+ /**
+ * Replace ${NAME} with the property value
+ */
+ public static String replaceProperties(String value,
+ Hashtable<Object,Object> staticProp, PropertySource dynamicProp[]) {
+ if (value.indexOf("$") < 0) {
+ return value;
+ }
+ StringBuffer sb = new StringBuffer();
+ int prev = 0;
+ // assert value!=nil
+ int pos;
+ while ((pos = value.indexOf("$", prev)) >= 0) {
+ if (pos > 0) {
+ sb.append(value.substring(prev, pos));
+ }
+ if (pos == (value.length() - 1)) {
+ sb.append('$');
+ prev = pos + 1;
+ } else if (value.charAt(pos + 1) != '{') {
+ sb.append('$');
+ prev = pos + 1; // XXX
+ } else {
+ int endName = value.indexOf('}', pos);
+ if (endName < 0) {
+ sb.append(value.substring(pos));
+ prev = value.length();
+ continue;
+ }
+ String n = value.substring(pos + 2, endName);
+ String v = null;
+ if (staticProp != null) {
+ v = (String) staticProp.get(n);
+ }
+ if (v == null && dynamicProp != null) {
+ for (int i = 0; i < dynamicProp.length; i++) {
+ v = dynamicProp[i].getProperty(n);
+ if (v != null) {
+ break;
+ }
+ }
+ }
+ if (v == null)
+ v = "${" + n + "}";
+
+ sb.append(v);
+ prev = endName + 1;
+ }
+ }
+ if (prev < value.length())
+ sb.append(value.substring(prev));
+ return sb.toString();
+ }
+
+
+}

Propchange: tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/integration/simple/AntProperties.java
------------------------------------------------------------------------------
svn:eol-style = native

Modified: tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/integration/simple/Main.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/integration/simple/Main.java?rev=884419&r1=884418&r2=884419&view=diff
==============================================================================
--- tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/integration/simple/Main.java (original)
+++ tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/integration/simple/Main.java Thu Nov 26 06:50:10 2009
@@ -17,7 +17,6 @@

package org.apache.tomcat.integration.simple;

-import org.apache.tomcat.integration.ObjectManager;

/**
* Replacement for tomcat-lite specific Main, using the simple
@@ -28,17 +27,34 @@
* @author Costin Manolache
*/
public class Main {
+ static boolean running = true;
+ static Object lock = new Object();
+
+ public static void stop() {
+ running = false;
+ synchronized (lock) {
+ lock.notify();
+ }
+ }
+
+ public static void waitStop() {
+ while (running) {
+ try {
+ synchronized (lock) {
+ lock.wait();
+ }
+ } catch (InterruptedException e) {
+ }
+ }
+ }

public static void main(String args[])
- throws Exception {
- SimpleObjectManager om = new SimpleObjectManager();
-
- // Will process CLI.
- // 'config' will load a config file.
- om.bind("Main.args", args);
+ throws Exception {
+ // '--config' will load a config file.
+ SimpleObjectManager om = new SimpleObjectManager(args);

- Runnable main = (Runnable) om.get("Main");
- if (main == null) {
+ String run = (String) om.getProperty("RUN");
+ if (run == null) {
// TODO: look for a pre-defined name in local dir, resource,
// manifest
System.err.println("Using default tomcat-lite configuration");
@@ -50,16 +66,16 @@

String cfgFile = "org/apache/tomcat/lite/config.properties";
om.loadResource(cfgFile);
- main = (Runnable) om.get("Main");
+ run = (String) om.getProperty("RUN");
}

- // add JMX support
- ObjectManager jmx = (ObjectManager) om.get("JMX");
- if (jmx != null) {
- jmx.register(om);
+ String[] runNames = run.split(",");
+ for (String name: runNames) {
+ Object main = om.get(name);
+ if (main instanceof Runnable) {
+ ((Runnable) main).run();
+ }
}
-
- main.run();
-
+
}
}

Modified: tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/integration/simple/SimpleObjectManager.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/integration/simple/SimpleObjectManager.java?rev=884419&r1=884418&r2=884419&view=diff
==============================================================================
--- tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/integration/simple/SimpleObjectManager.java (original)
+++ tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/integration/simple/SimpleObjectManager.java Thu Nov 26 06:50:10 2009
@@ -24,111 +24,162 @@
import java.util.HashMap;
import java.util.Map;
import java.util.Properties;
+import java.util.logging.Level;
import java.util.logging.Logger;

+import org.apache.tomcat.integration.DynamicObject;
import org.apache.tomcat.integration.ObjectManager;
-import org.apache.tomcat.util.IntrospectionUtils;

/**
- * This is a very small 'dependency injection'/registry poor-man substitute,
+ * This is a very small 'dependency injection'/registry poor-man substitute,
* based on old tomcat IntrospectionUtils ( which is based on ant ).
* Alternative would be to just pick one of spring/guice/etc and use it.
* This class is a bit smaller and should be enough for simple use.
- *
- * How it works:
+ *
+ * How it works:
* - when bound, simple properties are injected in the objects using
* the old IntrospectionUtils, same as in original Tomcat server.xml
- *
+ *
* - object creation using class name - properties injected as well.
* Similar with how server.xml or ant works.
- *
- * - it is based on a big Properties file, with command line arguments
+ *
+ * - it is based on a big Properties file, with command line arguments
* merged in.
- *
+ *
* Tomcat doesn't require any of the features - they are just used to
- * allow configuration in 'default' mode, when no other framework is
- * used.
- *
+ * allow configuration in 'default' mode, when no other framework is
+ * used.
+ *
* See the Spring example for an alternative. I believe most POJO frameworks
- * can be supported.
- *
+ * can be supported.
+ *
* @author Costin Manolache
*/
public class SimpleObjectManager extends ObjectManager {
- static Logger log = Logger.getLogger(SimpleObjectManager.class.getName());
+ public static final String ARGS = "Main.args";

+ static Logger log = Logger.getLogger(SimpleObjectManager.class.getName());
+
protected Properties props = new Properties();
protected Map<String, Object> objects = new HashMap();
- ObjectManager om;
-
+
public SimpleObjectManager() {
// Register PropertiesSpi
}

public SimpleObjectManager(String[] args) {
this();
- bind("Main.args", args);
+ bind(ARGS, args);
}
-
+
public void loadResource(String res) {
InputStream in = this.getClass().getClassLoader()
.getResourceAsStream(res);
- load(in);
+ if (in != null) {
+ load(in);
+ }
}
-
+
public void register(ObjectManager om) {
- this.om = om;
super.register(om);
}
-
+
public ObjectManager getObjectManager() {
- return om;
+ return this;
}

public void load(InputStream is) {
try {
props.load(is);
+ processIncludes();
} catch (IOException e) {
throw new RuntimeException("Error loading default config");
}
}
-
+
+ // resolve included "config". Very basic, just one, etc.
+ private void processIncludes() throws IOException {
+ String value = props.getProperty("config");
+ if (value == null) {
+ value = props.getProperty("include");
+ if (value != null) {
+ props.remove("include");
+ }
+ } else {
+ // avoid loop
+ props.remove("config");
+ }
+ if (value == null) {
+ return;
+ }
+ if (new File(value).exists()) {
+ load(new FileInputStream(value));
+ } else {
+ loadResource(value);
+ }
+ }
+
public Properties getProperties() {
return props;
}
-
+
@Override
public void unbind(String name) {
+ // Children
+ // TODO: call @destroy
+ super.unbind(name);
}

@Override
public void bind(String name, Object o) {
//log.info("Bound: " + name + " " + o);

- if ("Main.args".equals(name)) {
+ if (ARGS.equals(name)) {
try {
processArgs((String[]) o, props);
} catch (IOException e) {
throw new RuntimeException(e);
}
}
-
- // TODO: can I make 'inject' public - Guice seems to
+
+ // TODO: can I make 'inject' public - Guice seems to
// support this.
inject(name, o);
+
+ // Children
+ super.bind(name, o);
}

@Override
public Object get(String key) {
// Use same syntax as Spring props.
+ Object res = null;
String prop = props.getProperty(key + ".(class)");
if (prop != null) {
- Object res = loadClass(prop);
- inject(key, res);
- return res;
+ res = loadClass(prop);
}

- return null;
+ if (res == null) {
+ res = super.get(key);
+ }
+
+ if (res == null) {
+ // Maybe it's just a class name
+ res = loadClass(key);
+ }
+
+ if (res != null) {
+ inject(key, res);
+ }
+ return res;
+ }
+
+ public String getProperty(String key) {
+ String prop = props.getProperty(key);
+ if (prop != null) {
+ return prop;
+ }
+ return super.getProperty(key);
}

private void inject(String name, Object o) {
@@ -136,13 +187,18 @@
String pref = name + ".";
int prefLen = pref.length();

- for (String k: props.stringPropertyNames()) {
+ DynamicObject dyno = new DynamicObject(o.getClass());
+ dyno.setAttribute(o, "ObjectManager", this);
+
+ for (Object kObj: props.keySet()) {
+ if (!(kObj instanceof String)) {continue;}
+ String k = (String) kObj;
if (k.startsWith(pref)) {
if (k.endsWith(")")) {
- continue; // special
+ continue; // special
}
String value = props.getProperty(k);
- value = IntrospectionUtils.replaceProperties(value,
+ value = AntProperties.replaceProperties(value,
props, null);
String p = k.substring(prefLen);
int idx = p.indexOf(".");
@@ -150,38 +206,45 @@
// ignore suffix - indexed properties
p = p.substring(0, idx);
}
- IntrospectionUtils.setProperty(o, p, value);
- log.info("Setting: " + name + " " + k + " " + value);
+ dyno.setProperty(o, p, value);
+ if (log.isLoggable(Level.FINE)) {
+ log.info("Setting: " + name + " " + k + " " + value);
+ }
}
}
+
+
// We could do cooler things - inject objects, etc.
}
-
+
+
private Object loadClass(String className) {
try {
Class c = Class.forName(className);
+ if (c.isInterface()) {
+ return null;
+ }
Object ext = c.newInstance();
return ext;
} catch (Throwable e) {
- e.printStackTrace();
return null;
- }
+ }
}
-
+
/**
* Populate properties based on CLI:
* -key value
* --key=value
- *
+ *
* --config=FILE - load a properties file
- *
+ *
* @param args
* @param p
* @param meta
* @return everything after the first non arg not starting with '-'
- * @throws IOException
+ * @throws IOException
*/
- public String[] processArgs(String[] args, Properties props)
+ public String[] processArgs(String[] args, Properties props)
throws IOException {

for (int i = 0; i < args.length; i++) {
@@ -193,10 +256,11 @@
} else {
String [] res = new String[args.length - i];
System.arraycopy(args, i, res, 0, res.length);
+ processIncludes();
return res;
}
-
- String name = arg;
+
+ String name = arg;
int eq = arg.indexOf("=");
String value = null;
if (eq > 0) {
@@ -210,16 +274,11 @@
value = args[i];
}

- if ("config".equals(arg)) {
- if (new File(value).exists()) {
- load(new FileInputStream(value));
- } else {
- loadResource(value);
- }
- } else {
- props.put(name, value);
- }
+ props.put(name, value);
+
}
+
+ processIncludes();
return new String[] {};
- }
+ }
}

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@...
For additional commands, e-mail: dev-help@...

svn commit: r884418 - in /tomcat/trunk/modules/tomcat-lite/java/org/apache: coyote/ coyote/lite/ coyote/servlet/ tomcat/lite/ tomcat/lite/coyote/ tomcat/lite/service/ tomcat/lite/webxml/

2009-11-25T22:48:44Z

Author: costin
Date: Thu Nov 26 06:48:42 2009
New Revision: 884418

URL: http://svn.apache.org/viewvc?rev=884418&view=rev
Log:
Moved the old coyote-specific servlet api impl to coyote/servlet
Added (10% working) coyote connector that uses the new http impl

Added:
tomcat/trunk/modules/tomcat-lite/java/org/apache/coyote/
tomcat/trunk/modules/tomcat-lite/java/org/apache/coyote/lite/
tomcat/trunk/modules/tomcat-lite/java/org/apache/coyote/lite/LiteProtocolHandler.java (with props)
tomcat/trunk/modules/tomcat-lite/java/org/apache/coyote/servlet/
tomcat/trunk/modules/tomcat-lite/java/org/apache/coyote/servlet/BodyReader.java
- copied, changed from r883948, tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/BodyReader.java
tomcat/trunk/modules/tomcat-lite/java/org/apache/coyote/servlet/BodyWriter.java
- copied, changed from r883948, tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/BodyWriter.java
tomcat/trunk/modules/tomcat-lite/java/org/apache/coyote/servlet/CharsetMapperDefault.properties
- copied unchanged from r883948, tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/CharsetMapperDefault.properties
tomcat/trunk/modules/tomcat-lite/java/org/apache/coyote/servlet/ClientAbortException.java
- copied, changed from r883948, tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/ClientAbortException.java
tomcat/trunk/modules/tomcat-lite/java/org/apache/coyote/servlet/Connector.java
- copied, changed from r883948, tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/Connector.java
tomcat/trunk/modules/tomcat-lite/java/org/apache/coyote/servlet/CoyoteConnector.java
- copied, changed from r883948, tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/coyote/CoyoteConnector.java
tomcat/trunk/modules/tomcat-lite/java/org/apache/coyote/servlet/FilterChainImpl.java
- copied, changed from r883948, tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/FilterChainImpl.java
tomcat/trunk/modules/tomcat-lite/java/org/apache/coyote/servlet/FilterConfigImpl.java
- copied, changed from r883948, tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/FilterConfigImpl.java
tomcat/trunk/modules/tomcat-lite/java/org/apache/coyote/servlet/JspLoader.java (with props)
tomcat/trunk/modules/tomcat-lite/java/org/apache/coyote/servlet/Locale2Charset.java
- copied, changed from r883948, tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/Locale2Charset.java
tomcat/trunk/modules/tomcat-lite/java/org/apache/coyote/servlet/ParameterMap.java
- copied, changed from r883948, tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/ParameterMap.java
tomcat/trunk/modules/tomcat-lite/java/org/apache/coyote/servlet/RequestDispatcherImpl.java
- copied, changed from r883948, tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/RequestDispatcherImpl.java
tomcat/trunk/modules/tomcat-lite/java/org/apache/coyote/servlet/ServletConfigImpl.java
- copied, changed from r883948, tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/ServletConfigImpl.java
tomcat/trunk/modules/tomcat-lite/java/org/apache/coyote/servlet/ServletContextImpl.java
- copied, changed from r883948, tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/ServletContextImpl.java
tomcat/trunk/modules/tomcat-lite/java/org/apache/coyote/servlet/ServletInputStreamImpl.java
- copied, changed from r883948, tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/ServletInputStreamImpl.java
tomcat/trunk/modules/tomcat-lite/java/org/apache/coyote/servlet/ServletOutputStreamImpl.java
- copied, changed from r883948, tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/ServletOutputStreamImpl.java
tomcat/trunk/modules/tomcat-lite/java/org/apache/coyote/servlet/ServletReaderImpl.java
- copied, changed from r883948, tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/ServletReaderImpl.java
tomcat/trunk/modules/tomcat-lite/java/org/apache/coyote/servlet/ServletRequestImpl.java
- copied, changed from r883948, tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/ServletRequestImpl.java
tomcat/trunk/modules/tomcat-lite/java/org/apache/coyote/servlet/ServletRequestWrapperImpl.java
- copied, changed from r883948, tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/ServletRequestWrapperImpl.java
tomcat/trunk/modules/tomcat-lite/java/org/apache/coyote/servlet/ServletResponseImpl.java
- copied, changed from r883948, tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/ServletResponseImpl.java
tomcat/trunk/modules/tomcat-lite/java/org/apache/coyote/servlet/ServletResponseIncludeWrapper.java
- copied, changed from r883948, tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/ServletResponseIncludeWrapper.java
tomcat/trunk/modules/tomcat-lite/java/org/apache/coyote/servlet/ServletWriterImpl.java
- copied, changed from r883948, tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/ServletWriterImpl.java
tomcat/trunk/modules/tomcat-lite/java/org/apache/coyote/servlet/TomcatLite.java
- copied, changed from r883948, tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/TomcatLite.java
tomcat/trunk/modules/tomcat-lite/java/org/apache/coyote/servlet/WebappContextMapper.java
- copied, changed from r883948, tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/WebappContextMapper.java
tomcat/trunk/modules/tomcat-lite/java/org/apache/coyote/servlet/WebappFilterMapper.java
- copied, changed from r883948, tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/WebappFilterMapper.java
tomcat/trunk/modules/tomcat-lite/java/org/apache/coyote/servlet/WebappServletMapper.java
- copied, changed from r883948, tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/WebappServletMapper.java
tomcat/trunk/modules/tomcat-lite/java/org/apache/coyote/servlet/config.properties
- copied, changed from r883948, tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/config.properties
tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/service/
tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/service/IOStatus.java (with props)
tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/service/JMXProxy.java (with props)
tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/service/LogConfig.java (with props)
Removed:
tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/BodyReader.java
tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/BodyWriter.java
tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/CharsetMapperDefault.properties
tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/ClientAbortException.java
tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/Connector.java
tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/ContextPreinitListener.java
tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/FilterChainImpl.java
tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/FilterConfigImpl.java
tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/Locale2Charset.java
tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/ParameterMap.java
tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/RequestDispatcherImpl.java
tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/ServletConfigImpl.java
tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/ServletContextImpl.java
tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/ServletInputStreamImpl.java
tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/ServletOutputStreamImpl.java
tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/ServletReaderImpl.java
tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/ServletRequestImpl.java
tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/ServletRequestWrapperImpl.java
tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/ServletResponseImpl.java
tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/ServletResponseIncludeWrapper.java
tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/ServletWriterImpl.java
tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/TomcatLite.java
tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/WebappContextMapper.java
tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/WebappFilterMapper.java
tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/WebappServletMapper.java
tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/config.properties
tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/coyote/CoyoteConnector.java
tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/webxml/

Added: tomcat/trunk/modules/tomcat-lite/java/org/apache/coyote/lite/LiteProtocolHandler.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/tomcat-lite/java/org/apache/coyote/lite/LiteProtocolHandler.java?rev=884418&view=auto
==============================================================================
--- tomcat/trunk/modules/tomcat-lite/java/org/apache/coyote/lite/LiteProtocolHandler.java (added)
+++ tomcat/trunk/modules/tomcat-lite/java/org/apache/coyote/lite/LiteProtocolHandler.java Thu Nov 26 06:48:42 2009
@@ -0,0 +1,151 @@
+package org.apache.coyote.lite;
+
+
+
+import java.io.IOException;
+import java.util.Iterator;
+
+import org.apache.coyote.Adapter;
+import org.apache.coyote.InputBuffer;
+import org.apache.coyote.OutputBuffer;
+import org.apache.coyote.ProtocolHandler;
+import org.apache.coyote.Request;
+import org.apache.coyote.Response;
+import org.apache.tomcat.lite.http.HttpConnector;
+import org.apache.tomcat.lite.http.HttpRequest;
+import org.apache.tomcat.lite.http.HttpResponse;
+import org.apache.tomcat.lite.http.HttpChannel.HttpService;
+import org.apache.tomcat.lite.io.CBuffer;
+import org.apache.tomcat.lite.io.SocketConnector;
+import org.apache.tomcat.util.buf.ByteChunk;
+import org.apache.tomcat.util.buf.MessageBytes;
+
+/**
+ * Work in progress - use the refactored http as a coyote connector.
+ * Just basic requests work right now - need to implement all the
+ * methods of coyote.
+ *
+ *
+ * @author Costin Manolache
+ */
+public class LiteProtocolHandler implements ProtocolHandler {
+
+ Adapter adapter;
+
+ @Override
+ public void destroy() throws Exception {
+ }
+
+ @Override
+ public Adapter getAdapter() {
+ return adapter;
+ }
+
+ @Override
+ public Object getAttribute(String name) {
+ return null;
+ }
+
+ @Override
+ public Iterator<String> getAttributeNames() {
+ return null;
+ }
+
+ @Override
+ public void init() throws Exception {
+ }
+
+ @Override
+ public void pause() throws Exception {
+ }
+
+ @Override
+ public void resume() throws Exception {
+ }
+
+ @Override
+ public void setAdapter(Adapter adapter) {
+ this.adapter = adapter;
+
+ }
+
+ int port = 8999;
+
+ public void setPort(int port) {
+ this.port = port;
+ }
+
+ @Override
+ public void setAttribute(String name, Object value) {
+ System.err.println("setAttribute " + name + " " + value);
+ }
+
+ @Override
+ public void start() throws Exception {
+ HttpConnector c = new HttpConnector(new SocketConnector());
+ c.setPort(port);
+
+// c.setDebug(true);
+// c.setDebugHttp(true);
+
+ c.getDispatcher().setDefaultService(new HttpService() {
+ @Override
+ public void service(HttpRequest httpReq, HttpResponse httpRes)
+ throws IOException {
+ coyoteService(httpReq, httpRes);
+ }
+
+ });
+ c.start();
+ }
+
+ private void wrap(MessageBytes dest, CBuffer buffer) {
+ dest.setChars(buffer.array(), buffer.position(),
+ buffer.length());
+ }
+
+ private void coyoteService(HttpRequest httpReq, final HttpResponse httpRes) {
+ Request req = new Request();
+ req.setInputBuffer(new InputBuffer() {
+ @Override
+ public int doRead(ByteChunk chunk, Request request)
+ throws IOException {
+ // TODO
+ return 0;
+ }
+ });
+ Response res = new Response();
+ res.setOutputBuffer(new OutputBuffer() {
+
+ @Override
+ public int doWrite(org.apache.tomcat.util.buf.ByteChunk chunk,
+ Response response) throws IOException {
+ httpRes.getBody().append(chunk.getBuffer(), chunk.getStart(),
+ chunk.getLength());
+ return chunk.getLength();
+ }
+
+ });
+
+ // TODO: turn http request into a coyote request - copy all fields,
+ // add hooks where needed.
+
+ wrap(req.decodedURI(), httpReq.decodedURI());
+ wrap(req.method(), httpReq.method());
+ wrap(req.protocol(), httpReq.protocol());
+ wrap(req.requestURI(), httpReq.requestURI());
+ // Same for response.
+
+ try {
+
+ adapter.service(req, res);
+
+ } catch (Exception e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+ }
+
+
+
+}

Propchange: tomcat/trunk/modules/tomcat-lite/java/org/apache/coyote/lite/LiteProtocolHandler.java
------------------------------------------------------------------------------
svn:eol-style = native

Copied: tomcat/trunk/modules/tomcat-lite/java/org/apache/coyote/servlet/BodyReader.java (from r883948, tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/BodyReader.java)
URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/tomcat-lite/java/org/apache/coyote/servlet/BodyReader.java?p2=tomcat/trunk/modules/tomcat-lite/java/org/apache/coyote/servlet/BodyReader.java&p1=tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/BodyReader.java&r1=883948&r2=884418&rev=884418&view=diff
==============================================================================
--- tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/BodyReader.java (original)
+++ tomcat/trunk/modules/tomcat-lite/java/org/apache/coyote/servlet/BodyReader.java Thu Nov 26 06:48:42 2009
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.tomcat.lite;
+package org.apache.coyote.servlet;

import java.io.IOException;
import java.io.InputStream;

Copied: tomcat/trunk/modules/tomcat-lite/java/org/apache/coyote/servlet/BodyWriter.java (from r883948, tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/BodyWriter.java)
URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/tomcat-lite/java/org/apache/coyote/servlet/BodyWriter.java?p2=tomcat/trunk/modules/tomcat-lite/java/org/apache/coyote/servlet/BodyWriter.java&p1=tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/BodyWriter.java&r1=883948&r2=884418&rev=884418&view=diff
==============================================================================
--- tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/BodyWriter.java (original)
+++ tomcat/trunk/modules/tomcat-lite/java/org/apache/coyote/servlet/BodyWriter.java Thu Nov 26 06:48:42 2009
@@ -15,7 +15,7 @@
* limitations under the License.
*/

-package org.apache.tomcat.lite;
+package org.apache.coyote.servlet;

import java.io.IOException;
import java.io.Writer;
@@ -457,7 +457,7 @@

int len = sb.length();
charsWritten += len;
- cb.append(sb);
+ cb.append(sb.toString());

}

Copied: tomcat/trunk/modules/tomcat-lite/java/org/apache/coyote/servlet/ClientAbortException.java (from r883948, tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/ClientAbortException.java)
URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/tomcat-lite/java/org/apache/coyote/servlet/ClientAbortException.java?p2=tomcat/trunk/modules/tomcat-lite/java/org/apache/coyote/servlet/ClientAbortException.java&p1=tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/ClientAbortException.java&r1=883948&r2=884418&rev=884418&view=diff
==============================================================================
--- tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/ClientAbortException.java (original)
+++ tomcat/trunk/modules/tomcat-lite/java/org/apache/coyote/servlet/ClientAbortException.java Thu Nov 26 06:48:42 2009
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.tomcat.lite;
+package org.apache.coyote.servlet;

import java.io.IOException;

Copied: tomcat/trunk/modules/tomcat-lite/java/org/apache/coyote/servlet/Connector.java (from r883948, tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/Connector.java)
URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/tomcat-lite/java/org/apache/coyote/servlet/Connector.java?p2=tomcat/trunk/modules/tomcat-lite/java/org/apache/coyote/servlet/Connector.java&p1=tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/Connector.java&r1=883948&r2=884418&rev=884418&view=diff
==============================================================================
--- tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/Connector.java (original)
+++ tomcat/trunk/modules/tomcat-lite/java/org/apache/coyote/servlet/Connector.java Thu Nov 26 06:48:42 2009
@@ -15,7 +15,7 @@
* limitations under the License.
*/

-package org.apache.tomcat.lite;
+package org.apache.coyote.servlet;

import java.io.IOException;

Copied: tomcat/trunk/modules/tomcat-lite/java/org/apache/coyote/servlet/CoyoteConnector.java (from r883948, tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/coyote/CoyoteConnector.java)
URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/tomcat-lite/java/org/apache/coyote/servlet/CoyoteConnector.java?p2=tomcat/trunk/modules/tomcat-lite/java/org/apache/coyote/servlet/CoyoteConnector.java&p1=tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/coyote/CoyoteConnector.java&r1=883948&r2=884418&rev=884418&view=diff
==============================================================================
--- tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/coyote/CoyoteConnector.java (original)
+++ tomcat/trunk/modules/tomcat-lite/java/org/apache/coyote/servlet/CoyoteConnector.java Thu Nov 26 06:48:42 2009
@@ -15,7 +15,7 @@
* limitations under the License.
*/

-package org.apache.tomcat.lite.coyote;
+package org.apache.coyote.servlet;

import java.io.IOException;

@@ -30,13 +30,6 @@
import org.apache.coyote.Response;
import org.apache.coyote.http11.Http11NioProtocol;
import org.apache.tomcat.integration.ObjectManager;
-import org.apache.tomcat.lite.BodyReader;
-import org.apache.tomcat.lite.BodyWriter;
-import org.apache.tomcat.lite.ClientAbortException;
-import org.apache.tomcat.lite.Connector;
-import org.apache.tomcat.lite.ServletRequestImpl;
-import org.apache.tomcat.lite.ServletResponseImpl;
-import org.apache.tomcat.lite.TomcatLite;
import org.apache.tomcat.util.buf.ByteChunk;
import org.apache.tomcat.util.buf.UriNormalizer;
import org.apache.tomcat.util.http.HttpRequest;
@@ -422,7 +415,7 @@
proto.setCompression("on");
proto.setCompressionMinSize(32);
proto.setPort(port);
- proto.getEndpoint().setDaemon(daemon);
+ //proto.getEndpoint().setDaemon(daemon);
setConnector(proto);
setPort(port);
setDaemon(daemon);

Copied: tomcat/trunk/modules/tomcat-lite/java/org/apache/coyote/servlet/FilterChainImpl.java (from r883948, tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/FilterChainImpl.java)
URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/tomcat-lite/java/org/apache/coyote/servlet/FilterChainImpl.java?p2=tomcat/trunk/modules/tomcat-lite/java/org/apache/coyote/servlet/FilterChainImpl.java&p1=tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/FilterChainImpl.java&r1=883948&r2=884418&rev=884418&view=diff
==============================================================================
--- tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/FilterChainImpl.java (original)
+++ tomcat/trunk/modules/tomcat-lite/java/org/apache/coyote/servlet/FilterChainImpl.java Thu Nov 26 06:48:42 2009
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.tomcat.lite;
+package org.apache.coyote.servlet;

import java.io.IOException;

Copied: tomcat/trunk/modules/tomcat-lite/java/org/apache/coyote/servlet/FilterConfigImpl.java (from r883948, tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/FilterConfigImpl.java)
URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/tomcat-lite/java/org/apache/coyote/servlet/FilterConfigImpl.java?p2=tomcat/trunk/modules/tomcat-lite/java/org/apache/coyote/servlet/FilterConfigImpl.java&p1=tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/FilterConfigImpl.java&r1=883948&r2=884418&rev=884418&view=diff
==============================================================================
--- tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/FilterConfigImpl.java (original)
+++ tomcat/trunk/modules/tomcat-lite/java/org/apache/coyote/servlet/FilterConfigImpl.java Thu Nov 26 06:48:42 2009
@@ -15,7 +15,7 @@
*/

-package org.apache.tomcat.lite;
+package org.apache.coyote.servlet;

import java.util.ArrayList;

Added: tomcat/trunk/modules/tomcat-lite/java/org/apache/coyote/servlet/JspLoader.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/tomcat-lite/java/org/apache/coyote/servlet/JspLoader.java?rev=884418&view=auto
==============================================================================
--- tomcat/trunk/modules/tomcat-lite/java/org/apache/coyote/servlet/JspLoader.java (added)
+++ tomcat/trunk/modules/tomcat-lite/java/org/apache/coyote/servlet/JspLoader.java Thu Nov 26 06:48:42 2009
@@ -0,0 +1,31 @@
+/*
+ * Copyright 1999,2004 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.coyote.servlet;
+
+import javax.servlet.ServletContext;
+
+import org.apache.tomcat.servlets.jsp.BaseJspLoader;
+
+public class JspLoader extends BaseJspLoader {
+
+ public ClassLoader getClassLoader(ServletContext ctx) {
+ return ((ServletContextImpl) ctx).getClassLoader();
+ }
+
+ public String getClassPath(ServletContext ctx) {
+ return ((ServletContextImpl) ctx).getClassPath();
+ }
+}

Propchange: tomcat/trunk/modules/tomcat-lite/java/org/apache/coyote/servlet/JspLoader.java
------------------------------------------------------------------------------
svn:eol-style = native

Copied: tomcat/trunk/modules/tomcat-lite/java/org/apache/coyote/servlet/Locale2Charset.java (from r883948, tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/Locale2Charset.java)
URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/tomcat-lite/java/org/apache/coyote/servlet/Locale2Charset.java?p2=tomcat/trunk/modules/tomcat-lite/java/org/apache/coyote/servlet/Locale2Charset.java&p1=tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/Locale2Charset.java&r1=883948&r2=884418&rev=884418&view=diff
==============================================================================
--- tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/Locale2Charset.java (original)
+++ tomcat/trunk/modules/tomcat-lite/java/org/apache/coyote/servlet/Locale2Charset.java Thu Nov 26 06:48:42 2009
@@ -14,7 +14,7 @@
* limitations under the License.
*/

-package org.apache.tomcat.lite;
+package org.apache.coyote.servlet;

import java.io.InputStream;
@@ -45,7 +45,7 @@
* Default properties resource name.
*/
public static final String DEFAULT_RESOURCE =
- "/org/apache/tomcat/lite/CharsetMapperDefault.properties";
+ "/org/apache/coyote/servlet/CharsetMapperDefault.properties";

Copied: tomcat/trunk/modules/tomcat-lite/java/org/apache/coyote/servlet/ParameterMap.java (from r883948, tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/ParameterMap.java)
URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/tomcat-lite/java/org/apache/coyote/servlet/ParameterMap.java?p2=tomcat/trunk/modules/tomcat-lite/java/org/apache/coyote/servlet/ParameterMap.java&p1=tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/ParameterMap.java&r1=883948&r2=884418&rev=884418&view=diff
==============================================================================
--- tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/ParameterMap.java (original)
+++ tomcat/trunk/modules/tomcat-lite/java/org/apache/coyote/servlet/ParameterMap.java Thu Nov 26 06:48:42 2009
@@ -15,7 +15,7 @@
*/

-package org.apache.tomcat.lite;
+package org.apache.coyote.servlet;

import java.util.HashMap;

Copied: tomcat/trunk/modules/tomcat-lite/java/org/apache/coyote/servlet/RequestDispatcherImpl.java (from r883948, tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/RequestDispatcherImpl.java)
URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/tomcat-lite/java/org/apache/coyote/servlet/RequestDispatcherImpl.java?p2=tomcat/trunk/modules/tomcat-lite/java/org/apache/coyote/servlet/RequestDispatcherImpl.java&p1=tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/RequestDispatcherImpl.java&r1=883948&r2=884418&rev=884418&view=diff
==============================================================================
--- tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/RequestDispatcherImpl.java (original)
+++ tomcat/trunk/modules/tomcat-lite/java/org/apache/coyote/servlet/RequestDispatcherImpl.java Thu Nov 26 06:48:42 2009
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.tomcat.lite;
+package org.apache.coyote.servlet;

import java.io.IOException;
import java.io.PrintWriter;

Copied: tomcat/trunk/modules/tomcat-lite/java/org/apache/coyote/servlet/ServletConfigImpl.java (from r883948, tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/ServletConfigImpl.java)
URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/tomcat-lite/java/org/apache/coyote/servlet/ServletConfigImpl.java?p2=tomcat/trunk/modules/tomcat-lite/java/org/apache/coyote/servlet/ServletConfigImpl.java&p1=tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/ServletConfigImpl.java&r1=883948&r2=884418&rev=884418&view=diff
==============================================================================
--- tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/ServletConfigImpl.java (original)
+++ tomcat/trunk/modules/tomcat-lite/java/org/apache/coyote/servlet/ServletConfigImpl.java Thu Nov 26 06:48:42 2009
@@ -15,8 +15,9 @@
*/

-package org.apache.tomcat.lite;
+package org.apache.coyote.servlet;

+import java.io.IOException;
import java.io.PrintStream;
import java.lang.reflect.Method;
import java.util.Collection;
@@ -29,7 +30,6 @@
import java.util.logging.Level;
import java.util.logging.Logger;

-
import javax.servlet.MultipartConfigElement;
import javax.servlet.Servlet;
import javax.servlet.ServletConfig;
@@ -40,7 +40,7 @@
import javax.servlet.SingleThreadModel;
import javax.servlet.UnavailableException;

-import org.apache.tomcat.addons.UserTemplateClassMapper;
+import org.apache.tomcat.servlets.jsp.BaseJspLoader;
import org.apache.tomcat.servlets.util.Enumerator;
import org.apache.tomcat.util.IntrospectionUtils;

@@ -390,20 +390,12 @@
if (jspFile != null) {

// Named JSPs can be handled by a servlet or by the mapper.
- Servlet res = (Servlet) ctx.getObjectManager().get("filetemplate-servlet");
- if (res != null) {
- servletClass = res.getClass();
- actualClass = servletClass.getName();
- initParams.put("jsp-file", jspFile);
- return res;
- } else {
- UserTemplateClassMapper mapper =
- (UserTemplateClassMapper) ctx.getObjectManager().get(
- UserTemplateClassMapper.class);
- if (mapper != null) {
+ BaseJspLoader mapper = new JspLoader();
+ try {
return mapper.loadProxy(jspFile, ctx, this);
+ } catch (IOException e) {
+ throw new ServletException(e);
}
- }
}
if (actualClass == null) {
// Covers 'default-" and "jspwildcard-" servlets as well

Copied: tomcat/trunk/modules/tomcat-lite/java/org/apache/coyote/servlet/ServletContextImpl.java (from r883948, tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/ServletContextImpl.java)
URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/tomcat-lite/java/org/apache/coyote/servlet/ServletContextImpl.java?p2=tomcat/trunk/modules/tomcat-lite/java/org/apache/coyote/servlet/ServletContextImpl.java&p1=tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/ServletContextImpl.java&r1=883948&r2=884418&rev=884418&view=diff
==============================================================================
--- tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/ServletContextImpl.java (original)
+++ tomcat/trunk/modules/tomcat-lite/java/org/apache/coyote/servlet/ServletContextImpl.java Thu Nov 26 06:48:42 2009
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.tomcat.lite;
+package org.apache.coyote.servlet;

import java.io.File;
@@ -23,6 +23,7 @@
import java.io.FilenameFilter;
import java.io.IOException;
import java.io.InputStream;
+import java.lang.reflect.InvocationTargetException;
import java.net.MalformedURLException;
import java.net.URL;
import java.net.URLClassLoader;
@@ -42,6 +43,7 @@
import java.util.logging.Level;
import java.util.logging.Logger;

+import javax.naming.NamingException;
import javax.servlet.DispatcherType;
import javax.servlet.Filter;
import javax.servlet.FilterRegistration;
@@ -60,12 +62,15 @@
import javax.servlet.FilterRegistration.Dynamic;
import javax.servlet.descriptor.JspConfigDescriptor;

-import org.apache.tomcat.addons.UserSessionManager;
+import org.apache.tomcat.InstanceManager;
+import org.apache.tomcat.servlets.session.UserSessionManager;
import org.apache.tomcat.integration.ObjectManager;
-import org.apache.tomcat.lite.webxml.ServletContextConfig;
-import org.apache.tomcat.lite.webxml.ServletContextConfig.FilterData;
-import org.apache.tomcat.lite.webxml.ServletContextConfig.FilterMappingData;
-import org.apache.tomcat.lite.webxml.ServletContextConfig.ServletData;
+import org.apache.tomcat.servlets.config.ConfigLoader;
+import org.apache.tomcat.servlets.config.ServletContextConfig;
+import org.apache.tomcat.servlets.config.ServletContextConfig.FilterData;
+import org.apache.tomcat.servlets.config.ServletContextConfig.FilterMappingData;
+import org.apache.tomcat.servlets.config.ServletContextConfig.ServletData;
+import org.apache.tomcat.servlets.config.deploy.WarDeploy;
import org.apache.tomcat.servlets.util.Enumerator;
import org.apache.tomcat.servlets.util.RequestUtil;
import org.apache.tomcat.servlets.util.UrlUtils;
@@ -153,6 +158,9 @@
boolean initDone = false;

boolean startDone = false;
+
+ String jspcServlet = "org.apache.tomcat.servlets.jspc.JspcServlet";
+

// ------------------------------------------------- ServletContext Methods
public ServletContextImpl() {
@@ -439,7 +447,7 @@
* Return the major version of the Java Servlet API that we implement.
*/
public int getMajorVersion() {
- return 2;
+ return 3;
}

@@ -447,7 +455,7 @@
* Return the minor version of the Java Servlet API that we implement.
*/
public int getMinorVersion() {
- return 4;
+ return 0;
}

@@ -522,6 +530,8 @@

ThreadLocal requestDispatcherStack = new ThreadLocal();

+ private String classPath;
+
protected ClassLoader classLoader;

// protected RequestDispatcherImpl getRequestDispatcher() {
@@ -966,22 +976,22 @@
Iterator i2 = d.filters.values().iterator();
while (i2.hasNext()) {
FilterData fd = (FilterData)i2.next();
- addFilter(fd.filterName, fd.filterClass, fd.initParams);
+ addFilter(fd.name, fd.className, fd.initParams);
}

Iterator i3 = d.servlets.values().iterator();
while (i3.hasNext()) {
ServletData sd = (ServletData) i3.next();
// jsp-file
- if (sd.servletClass == null) {
+ if (sd.className == null) {
if (sd.jspFile == null) {
- log.log(Level.WARNING, "Missing servlet class for " + sd.servletName);
+ log.log(Level.WARNING, "Missing servlet class for " + sd.name);
continue;
}
}

ServletConfigImpl sw =
- new ServletConfigImpl(this, sd.servletName, sd.servletClass);
+ new ServletConfigImpl(this, sd.name, sd.className);
sw.setConfig(sd.initParams);
sw.setJspFile(sd.jspFile);
sw.setLoadOnStartup(sd.loadOnStartup);
@@ -1076,13 +1086,9 @@

// Merge in web.xml - or other config source ( programmatic, etc )
- ContextPreinitListener cfg =
- (ContextPreinitListener) getObjectManager().get(
- ContextPreinitListener.class);
- if (cfg != null) {
- cfg.preInit(this);
- }
-
+ ConfigLoader cfg = new WarDeploy();
+ contextConfig = cfg.loadConfig(getBasePath());
+
processWebAppData(contextConfig);

// if not defined yet:
@@ -1120,9 +1126,14 @@
if (servlets.get("jspwildcard") == null) {
ServletConfigImpl fileS = new ServletConfigImpl(this,
"jspwildcard", null);
+ fileS.initParams.put("mapper", JspLoader.class.getName());
addServletConfig(fileS);
addMapping("*.jsp", fileS);
}
+
+ ServletConfigImpl jspcS = new ServletConfigImpl(this,
+ "jspc", jspcServlet);
+ addServletConfig(jspcS);
}

protected void initEngineDefaults() throws ServletException {
@@ -1145,30 +1156,26 @@
ServletConfigImpl servletConfig = getServletConfig(sname);
addMapping(path, servletConfig);
}
- }

+ // JSP support
+ setAttribute(InstanceManager.class.getName(),
+ new LiteInstanceManager(getObjectManager()));
+
+ }

- public ArrayList getClasspath(File directory, File classesDir) {
- ArrayList res = new ArrayList();
- if (classesDir.isDirectory() && classesDir.exists() &&
- classesDir.canRead()) {
- try {
- URL url = classesDir.toURL();
- res.add(url);
- } catch (MalformedURLException e) {
- }
- }
+ private void addClasspathLib(ArrayList res, File directory) {
+
if (!directory.isDirectory() || !directory.exists()
|| !directory.canRead()) {
- return res;
+ return;
}
-
+
File[] jars = directory.listFiles(new FilenameFilter() {
public boolean accept(File dir, String name) {
return name.endsWith(".jar");
}
});
-
+
for (int j = 0; j < jars.length; j++) {
try {
URL url = jars[j].toURL();
@@ -1176,9 +1183,22 @@
} catch (MalformedURLException e) {
}
}
- return res;
}
-
+
+ private void addClasspathDir(ArrayList res, File classesDir) {
+
+ if (classesDir.isDirectory() && classesDir.exists() &&
+ classesDir.canRead()) {
+ try {
+ URL url = classesDir.toURL();
+ res.add(url);
+ } catch (MalformedURLException e) {
+ }
+ }
+ }
+ public String getClassPath() {
+ return classPath;
+ }

public void start() throws ServletException {
if (startDone) {
@@ -1186,8 +1206,12 @@
}
String base = getBasePath();

- ArrayList urls = getClasspath(new File(base + "/WEB-INF/lib"),
- new File(base + "/WEB-INF/classes"));
+ ArrayList urls = new ArrayList();
+
+ addClasspathDir(urls, new File(base + "/WEB-INF/classes"));
+ addClasspathDir(urls, new File(base + "/WEB-INF/tmp"));
+ addClasspathLib(urls, new File(base + "/WEB-INF/lib"));
+
URL[] urlsA = new URL[urls.size()];
urls.toArray(urlsA);

@@ -1204,6 +1228,13 @@
repository = ctxRepo;
*/

+ StringBuilder cp = new StringBuilder();
+
+ for (URL cpUrl : urlsA) {
+ cp.append(":").append(cpUrl.getFile());
+ }
+ classPath = cp.toString();
+
classLoader = new URLClassLoader(urlsA, parentLoader);

// JMX should know about us ( TODO: is it too early ? )
@@ -1624,5 +1655,45 @@
return -1;
}

+ private final class LiteInstanceManager implements InstanceManager {
+ private ObjectManager om;
+
+ public LiteInstanceManager(ObjectManager objectManager) {
+ this.om = objectManager;
+ }
+
+ @Override
+ public void destroyInstance(Object o)
+ throws IllegalAccessException,
+ InvocationTargetException {
+ }
+
+ @Override
+ public Object newInstance(String className)
+ throws IllegalAccessException,
+ InvocationTargetException, NamingException,
+ InstantiationException,
+ ClassNotFoundException {
+ return om.get(className);
+ }
+
+ @Override
+ public Object newInstance(String fqcn,
+ ClassLoader classLoader)
+ throws IllegalAccessException,
+ InvocationTargetException, NamingException,
+ InstantiationException,
+ ClassNotFoundException {
+ return om.get(fqcn);
+ }
+
+ @Override
+ public void newInstance(Object o)
+ throws IllegalAccessException,
+ InvocationTargetException, NamingException {
+ om.bind(o.getClass().getName(), o);
+ }
+ }
+
}

Copied: tomcat/trunk/modules/tomcat-lite/java/org/apache/coyote/servlet/ServletInputStreamImpl.java (from r883948, tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/ServletInputStreamImpl.java)
URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/tomcat-lite/java/org/apache/coyote/servlet/ServletInputStreamImpl.java?p2=tomcat/trunk/modules/tomcat-lite/java/org/apache/coyote/servlet/ServletInputStreamImpl.java&p1=tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/ServletInputStreamImpl.java&r1=883948&r2=884418&rev=884418&view=diff
==============================================================================
--- tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/ServletInputStreamImpl.java (original)
+++ tomcat/trunk/modules/tomcat-lite/java/org/apache/coyote/servlet/ServletInputStreamImpl.java Thu Nov 26 06:48:42 2009
@@ -15,7 +15,7 @@
*/

-package org.apache.tomcat.lite;
+package org.apache.coyote.servlet;

import java.io.IOException;
import java.io.InputStream;

Copied: tomcat/trunk/modules/tomcat-lite/java/org/apache/coyote/servlet/ServletOutputStreamImpl.java (from r883948, tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/ServletOutputStreamImpl.java)
URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/tomcat-lite/java/org/apache/coyote/servlet/ServletOutputStreamImpl.java?p2=tomcat/trunk/modules/tomcat-lite/java/org/apache/coyote/servlet/ServletOutputStreamImpl.java&p1=tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/ServletOutputStreamImpl.java&r1=883948&r2=884418&rev=884418&view=diff
==============================================================================
--- tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/ServletOutputStreamImpl.java (original)
+++ tomcat/trunk/modules/tomcat-lite/java/org/apache/coyote/servlet/ServletOutputStreamImpl.java Thu Nov 26 06:48:42 2009
@@ -15,7 +15,7 @@
*/

-package org.apache.tomcat.lite;
+package org.apache.coyote.servlet;

import java.io.IOException;

Copied: tomcat/trunk/modules/tomcat-lite/java/org/apache/coyote/servlet/ServletReaderImpl.java (from r883948, tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/ServletReaderImpl.java)
URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/tomcat-lite/java/org/apache/coyote/servlet/ServletReaderImpl.java?p2=tomcat/trunk/modules/tomcat-lite/java/org/apache/coyote/servlet/ServletReaderImpl.java&p1=tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/ServletReaderImpl.java&r1=883948&r2=884418&rev=884418&view=diff
==============================================================================
--- tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/ServletReaderImpl.java (original)
+++ tomcat/trunk/modules/tomcat-lite/java/org/apache/coyote/servlet/ServletReaderImpl.java Thu Nov 26 06:48:42 2009
@@ -15,7 +15,7 @@
*/

-package org.apache.tomcat.lite;
+package org.apache.coyote.servlet;

import java.io.BufferedReader;
import java.io.IOException;

Copied: tomcat/trunk/modules/tomcat-lite/java/org/apache/coyote/servlet/ServletRequestImpl.java (from r883948, tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/ServletRequestImpl.java)
URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/tomcat-lite/java/org/apache/coyote/servlet/ServletRequestImpl.java?p2=tomcat/trunk/modules/tomcat-lite/java/org/apache/coyote/servlet/ServletRequestImpl.java&p1=tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/ServletRequestImpl.java&r1=883948&r2=884418&rev=884418&view=diff
==============================================================================
--- tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/ServletRequestImpl.java (original)
+++ tomcat/trunk/modules/tomcat-lite/java/org/apache/coyote/servlet/ServletRequestImpl.java Thu Nov 26 06:48:42 2009
@@ -14,7 +14,7 @@
* limitations under the License.
*/

-package org.apache.tomcat.lite;
+package org.apache.coyote.servlet;

import java.io.BufferedReader;
import java.io.IOException;
@@ -52,7 +52,7 @@
import javax.servlet.http.HttpSession;
import javax.servlet.http.Part;

-import org.apache.tomcat.addons.UserSessionManager;
+import org.apache.tomcat.servlets.session.UserSessionManager;
import org.apache.tomcat.servlets.util.Enumerator;
import org.apache.tomcat.servlets.util.LocaleParser;
import org.apache.tomcat.servlets.util.RequestUtil;

Copied: tomcat/trunk/modules/tomcat-lite/java/org/apache/coyote/servlet/ServletRequestWrapperImpl.java (from r883948, tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/ServletRequestWrapperImpl.java)
URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/tomcat-lite/java/org/apache/coyote/servlet/ServletRequestWrapperImpl.java?p2=tomcat/trunk/modules/tomcat-lite/java/org/apache/coyote/servlet/ServletRequestWrapperImpl.java&p1=tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/ServletRequestWrapperImpl.java&r1=883948&r2=884418&rev=884418&view=diff
==============================================================================
--- tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/ServletRequestWrapperImpl.java (original)
+++ tomcat/trunk/modules/tomcat-lite/java/org/apache/coyote/servlet/ServletRequestWrapperImpl.java Thu Nov 26 06:48:42 2009
@@ -15,7 +15,7 @@
*/

-package org.apache.tomcat.lite;
+package org.apache.coyote.servlet;

import java.io.IOException;
@@ -31,7 +31,7 @@
import javax.servlet.http.HttpServletRequestWrapper;
import javax.servlet.http.HttpSession;

-import org.apache.tomcat.addons.UserSessionManager;
+import org.apache.tomcat.servlets.session.UserSessionManager;
import org.apache.tomcat.servlets.util.Enumerator;
import org.apache.tomcat.servlets.util.RequestUtil;

Copied: tomcat/trunk/modules/tomcat-lite/java/org/apache/coyote/servlet/ServletResponseImpl.java (from r883948, tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/ServletResponseImpl.java)
URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/tomcat-lite/java/org/apache/coyote/servlet/ServletResponseImpl.java?p2=tomcat/trunk/modules/tomcat-lite/java/org/apache/coyote/servlet/ServletResponseImpl.java&p1=tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/ServletResponseImpl.java&r1=883948&r2=884418&rev=884418&view=diff
==============================================================================
--- tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/ServletResponseImpl.java (original)
+++ tomcat/trunk/modules/tomcat-lite/java/org/apache/coyote/servlet/ServletResponseImpl.java Thu Nov 26 06:48:42 2009
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.tomcat.lite;
+package org.apache.coyote.servlet;

import java.io.IOException;

Copied: tomcat/trunk/modules/tomcat-lite/java/org/apache/coyote/servlet/ServletResponseIncludeWrapper.java (from r883948, tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/ServletResponseIncludeWrapper.java)
URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/tomcat-lite/java/org/apache/coyote/servlet/ServletResponseIncludeWrapper.java?p2=tomcat/trunk/modules/tomcat-lite/java/org/apache/coyote/servlet/ServletResponseIncludeWrapper.java&p1=tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/ServletResponseIncludeWrapper.java&r1=883948&r2=884418&rev=884418&view=diff
==============================================================================
--- tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/ServletResponseIncludeWrapper.java (original)
+++ tomcat/trunk/modules/tomcat-lite/java/org/apache/coyote/servlet/ServletResponseIncludeWrapper.java Thu Nov 26 06:48:42 2009
@@ -15,7 +15,7 @@
*/

-package org.apache.tomcat.lite;
+package org.apache.coyote.servlet;

import java.io.IOException;

Copied: tomcat/trunk/modules/tomcat-lite/java/org/apache/coyote/servlet/ServletWriterImpl.java (from r883948, tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/ServletWriterImpl.java)
URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/tomcat-lite/java/org/apache/coyote/servlet/ServletWriterImpl.java?p2=tomcat/trunk/modules/tomcat-lite/java/org/apache/coyote/servlet/ServletWriterImpl.java&p1=tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/ServletWriterImpl.java&r1=883948&r2=884418&rev=884418&view=diff
==============================================================================
--- tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/ServletWriterImpl.java (original)
+++ tomcat/trunk/modules/tomcat-lite/java/org/apache/coyote/servlet/ServletWriterImpl.java Thu Nov 26 06:48:42 2009
@@ -15,7 +15,7 @@
*/

-package org.apache.tomcat.lite;
+package org.apache.coyote.servlet;

import java.io.IOException;
import java.io.PrintWriter;

Copied: tomcat/trunk/modules/tomcat-lite/java/org/apache/coyote/servlet/TomcatLite.java (from r883948, tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/TomcatLite.java)
URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/tomcat-lite/java/org/apache/coyote/servlet/TomcatLite.java?p2=tomcat/trunk/modules/tomcat-lite/java/org/apache/coyote/servlet/TomcatLite.java&p1=tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/TomcatLite.java&r1=883948&r2=884418&rev=884418&view=diff
==============================================================================
--- tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/TomcatLite.java (original)
+++ tomcat/trunk/modules/tomcat-lite/java/org/apache/coyote/servlet/TomcatLite.java Thu Nov 26 06:48:42 2009
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.tomcat.lite;
+package org.apache.coyote.servlet;

import java.io.File;
import java.io.IOException;
@@ -109,7 +109,7 @@

public static ObjectManager defaultObjectManager() {
SimpleObjectManager cfg = new SimpleObjectManager();
- cfg.loadResource("org/apache/tomcat/lite/config.properties");
+ cfg.loadResource("org/apache/coyote/servlet/config.properties");
return cfg;
}
/**

Copied: tomcat/trunk/modules/tomcat-lite/java/org/apache/coyote/servlet/WebappContextMapper.java (from r883948, tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/WebappContextMapper.java)
URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/tomcat-lite/java/org/apache/coyote/servlet/WebappContextMapper.java?p2=tomcat/trunk/modules/tomcat-lite/java/org/apache/coyote/servlet/WebappContextMapper.java&p1=tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/WebappContextMapper.java&r1=883948&r2=884418&rev=884418&view=diff
==============================================================================
--- tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/WebappContextMapper.java (original)
+++ tomcat/trunk/modules/tomcat-lite/java/org/apache/coyote/servlet/WebappContextMapper.java Thu Nov 26 06:48:42 2009
@@ -15,7 +15,7 @@
* limitations under the License.
*/

-package org.apache.tomcat.lite;
+package org.apache.coyote.servlet;

import java.io.IOException;
import java.util.HashMap;
@@ -49,7 +49,7 @@
public class WebappContextMapper implements Filter {

ServletContext rootContext;
- Map<MessageBytes, ServletContext> contexts = new HashMap();
+ Map<String, ServletContext> contexts = new HashMap();

public WebappContextMapper() {
}
@@ -79,7 +79,7 @@
}
MessageBytes mb = MessageBytes.newInstance();
mb.setChars(path.toCharArray(), 0, path.length());
- contexts.put(mb, context);
+ contexts.put(mb.toString(), context);
}

@@ -121,7 +121,7 @@
nextSlash = uri.length();
}
mappingData.contextPath.setChars(uri.getChars(), 0, nextSlash);
- ServletContext servletContext = contexts.get(mappingData.contextPath);
+ ServletContext servletContext = contexts.get(mappingData.contextPath.toString());

if (servletContext != null) {
mappingData.context = servletContext;

Copied: tomcat/trunk/modules/tomcat-lite/java/org/apache/coyote/servlet/WebappFilterMapper.java (from r883948, tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/WebappFilterMapper.java)
URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/tomcat-lite/java/org/apache/coyote/servlet/WebappFilterMapper.java?p2=tomcat/trunk/modules/tomcat-lite/java/org/apache/coyote/servlet/WebappFilterMapper.java&p1=tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/WebappFilterMapper.java&r1=883948&r2=884418&rev=884418&view=diff
==============================================================================
--- tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/WebappFilterMapper.java (original)
+++ tomcat/trunk/modules/tomcat-lite/java/org/apache/coyote/servlet/WebappFilterMapper.java Thu Nov 26 06:48:42 2009
@@ -15,7 +15,7 @@
*/

-package org.apache.tomcat.lite;
+package org.apache.coyote.servlet;

import java.io.IOException;

Copied: tomcat/trunk/modules/tomcat-lite/java/org/apache/coyote/servlet/WebappServletMapper.java (from r883948, tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/WebappServletMapper.java)
URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/tomcat-lite/java/org/apache/coyote/servlet/WebappServletMapper.java?p2=tomcat/trunk/modules/tomcat-lite/java/org/apache/coyote/servlet/WebappServletMapper.java&p1=tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/WebappServletMapper.java&r1=883948&r2=884418&rev=884418&view=diff
==============================================================================
--- tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/WebappServletMapper.java (original)
+++ tomcat/trunk/modules/tomcat-lite/java/org/apache/coyote/servlet/WebappServletMapper.java Thu Nov 26 06:48:42 2009
@@ -14,7 +14,7 @@
* limitations under the License.
*/

-package org.apache.tomcat.lite;
+package org.apache.coyote.servlet;

import java.io.File;
import java.io.IOException;

Copied: tomcat/trunk/modules/tomcat-lite/java/org/apache/coyote/servlet/config.properties (from r883948, tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/config.properties)
URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/tomcat-lite/java/org/apache/coyote/servlet/config.properties?p2=tomcat/trunk/modules/tomcat-lite/java/org/apache/coyote/servlet/config.properties&p1=tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/config.properties&r1=883948&r2=884418&rev=884418&view=diff
==============================================================================
--- tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/config.properties (original)
+++ tomcat/trunk/modules/tomcat-lite/java/org/apache/coyote/servlet/config.properties Thu Nov 26 06:48:42 2009
@@ -2,29 +2,24 @@
# If tomcat is used with a proper framework, you need to bind and configure
# those objects in the framework.

-Main.(class)=org.apache.tomcat.lite.TomcatLite
+Main.(class)=org.apache.coyote.servlet.TomcatLite

Jmx.(class)=org.apache.tomcat.integration.jmx.JmxObjectManagerSpi

# --- Class names for required plugin interfaces ---

-org.apache.tomcat.lite.WebappServletMapper.(class)=org.apache.tomcat.lite.WebappServletMapper
-org.apache.tomcat.lite.WebappFilterMapper.(class)=org.apache.tomcat.lite.WebappFilterMapper
+org.apache.coyote.servlet.WebappServletMapper.(class)=org.apache.coyote.servlet.WebappServletMapper
+org.apache.coyote.servlet.WebappFilterMapper.(class)=org.apache.coyote.servlet.WebappFilterMapper

# Sessions
-org.apache.tomcat.addons.UserSessionManager.(class)=org.apache.tomcat.servlets.session.SimpleSessionManager
-
-# *.jsp support
-org.apache.tomcat.addons.UserTemplateClassMapper.(class)=org.apache.tomcat.servlets.jsp.JasperCompilerTemplateClassMapper
-
-org.apache.tomcat.addons.Filesystem.(class)=org.apache.tomcat.integration.simple.LocalFilesystem
+org.apache.tomcat.servlets.session.UserSessionManager.(class)=org.apache.tomcat.servlets.session.SimpleSessionManager

# Loader for web.xml - you can have your own custom class using a more efficient
# or hardcoded.
-org.apache.tomcat.lite.ContextPreinitListener.(class)=org.apache.tomcat.lite.webxml.TomcatLiteWebXmlConfig
+org.apache.coyote.servlet.ContextPreinitListener.(class)=org.apache.coyote.servlet.webxml.TomcatLiteWebXmlConfig

# Connector class
-org.apache.tomcat.lite.Connector.(class)=org.apache.tomcat.lite.coyote.CoyoteConnector
+org.apache.coyote.servlet.Connector.(class)=org.apache.coyote.servlet.CoyoteConnector

# JMX
jmx-connector.(class)=org.apache.tomcat.integration.jmx.JmxObjectManagerSpi

Added: tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/service/IOStatus.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/service/IOStatus.java?rev=884418&view=auto
==============================================================================
--- tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/service/IOStatus.java (added)
+++ tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/service/IOStatus.java Thu Nov 26 06:48:42 2009
@@ -0,0 +1,59 @@
+/*
+ */
+package org.apache.tomcat.lite.service;
+
+import java.io.IOException;
+import java.util.Map;
+
+import org.apache.tomcat.lite.http.HttpRequest;
+import org.apache.tomcat.lite.http.HttpResponse;
+import org.apache.tomcat.lite.http.HttpWriter;
+import org.apache.tomcat.lite.http.HttpChannel.HttpService;
+import org.apache.tomcat.lite.http.HttpConnector.ConnectionPool;
+import org.apache.tomcat.lite.http.HttpConnector.RemoteServer;
+import org.apache.tomcat.lite.io.IOChannel;
+
+/**
+ * Dump status of a connection pool.
+ */
+public class IOStatus implements HttpService {
+
+ private ConnectionPool pool;
+
+ public IOStatus() {
+
+ }
+
+ public IOStatus(ConnectionPool pool) {
+ this.pool = pool;
+ }
+
+ @Override
+ public void service(HttpRequest httpReq, HttpResponse httpRes)
+ throws IOException {
+ ConnectionPool sc = pool == null ?
+ httpReq.getHttpChannel().getConnector().cpool :
+ pool;
+ HttpWriter out = httpRes.getBodyWriter();
+
+ httpRes.setContentType("text/plain");
+ out.println("hosts=" + sc.getTargetCount());
+ out.println("waiting=" + sc.getSocketCount());
+ out.println("closed=" + sc.getClosedSockets());
+ out.println();
+
+ for (Map.Entry<CharSequence, RemoteServer> e: sc.hosts.entrySet()) {
+ out.append(e.getKey());
+ out.append("=");
+ out.println(Integer.toString(e.getValue().connections.size()));
+
+ for (IOChannel ch: e.getValue().connections) {
+ out.println(ch.getId() +
+ " " + ch.toString());
+ }
+ out.println();
+ }
+
+ }
+
+}

Propchange: tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/service/IOStatus.java
------------------------------------------------------------------------------
svn:eol-style = native

Added: tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/service/JMXProxy.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/service/JMXProxy.java?rev=884418&view=auto
==============================================================================
--- tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/service/JMXProxy.java (added)
+++ tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/service/JMXProxy.java Thu Nov 26 06:48:42 2009
@@ -0,0 +1,240 @@
+/*
+ * 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.
+ */
+
+
+package org.apache.tomcat.lite.service;
+
+
+import java.io.PrintWriter;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Set;
+import java.util.logging.Logger;
+
+import org.apache.tomcat.integration.DynamicObject;
+import org.apache.tomcat.integration.ObjectManager;
+
+/**
+ * Send all registered JMX objects and properties as JSON.
+ *
+ * Based on JMXProxy servlet, but:
+ * - Async handler instead of servlet - so it works with 'raw' connector
+ * - doesn't use JMX - integrates with the ObjectManager ( assuming OM
+ * provies a list of managed objects )
+ * - all the reflection magic from modeler is implemented here.
+ *
+ * @author Costin Manolache
+ */
+public class JMXProxy extends ObjectManager implements Runnable {
+
+ static Logger log = Logger.getLogger(JMXProxy.class.getName());
+
+ protected ObjectManager om;
+
+ Map<Class, DynamicObject> types = new HashMap<Class, DynamicObject>();
+
+ Map<String, Object> objects = new HashMap();
+
+
+ public void bind(String name, Object o) {
+ objects.put(name, o);
+ }
+
+ public void unbind(String name) {
+ objects.remove(name);
+ }
+
+
+ public void setObjectManager(ObjectManager om) {
+ this.om = om;
+ }
+
+
+ private DynamicObject getClassInfo(Class beanClass) {
+ if (types.get(beanClass) != null) {
+ return types.get(beanClass);
+ }
+ DynamicObject res = new DynamicObject(beanClass);
+ types.put(beanClass, res);
+ return res;
+ }
+
+
+ // --------------------------------------------------------- Public Methods
+
+ public void getAttribute(PrintWriter writer, String onameStr, String att) {
+ try {
+
+ Object bean = objects.get(onameStr);
+ Class beanClass = bean.getClass();
+ DynamicObject ci = getClassInfo(beanClass);
+
+ Object value = ci.getAttribute(bean, att);
+ writer.println("OK - Attribute get '" + onameStr + "' - " + att
+ + "= " + escape(value.toString()));
+ } catch (Exception ex) {
+ writer.println("Error - " + ex.toString());
+ }
+ }
+
+
+ public void setAttribute( PrintWriter writer,
+ String onameStr, String att, String val )
+ {
+ try {
+ Object bean = objects.get(onameStr);
+ Class beanClass = bean.getClass();
+ DynamicObject ci = getClassInfo(beanClass);
+
+ ci.setProperty(bean, att, val);
+ writer.println("OK - Attribute set");
+ } catch( Exception ex ) {
+ writer.println("Error - " + ex.toString());
+ }
+ }
+
+ public void listBeans( PrintWriter writer, String qry, boolean json )
+ {
+ if (json) {
+ listBeansJson(writer, qry);
+ return;
+ }
+ Set<String> names = objects.keySet();
+ writer.println("OK - Number of results: " + names.size());
+ writer.println();
+
+ Iterator<String> it=names.iterator();
+ while( it.hasNext()) {
+ String oname=it.next();
+ writer.println( "Name: " + oname);
+
+ try {
+ Object bean = objects.get(oname);
+ Class beanClass = bean.getClass();
+ DynamicObject ci = getClassInfo(beanClass);
+ writer.println("modelerType: " + beanClass.getName());
+
+ Object value=null;
+ for (String attName: ci.attributeNames()) {
+ try {
+ value = ci.getAttribute(bean, attName);
+ } catch( Throwable t) {
+ System.err.println("Error getting attribute " + oname +
+ " " + attName + " " + t.toString());
+ continue;
+ }
+ if( value==null ) continue;
+ String valueString=value.toString();
+ writer.println( attName + ": " + escape(valueString));
+ }
+ } catch (Exception e) {
+ // Ignore
+ }
+ writer.println();
+ }
+
+ }
+
+ private static void json(PrintWriter writer, String name, String value) {
+ writer.write("\"" + name +"\":" + "\"" + escapeJson(value) + "\",");
+ }
+
+ private void listBeansJson(PrintWriter writer, String qry) {
+ Set<String> names = objects.keySet();
+ writer.println("[");
+
+ Iterator<String> it=names.iterator();
+ while( it.hasNext()) {
+ writer.print("{");
+ String oname=it.next();
+ json(writer, "name", oname);
+
+ try {
+ Object bean = objects.get(oname);
+ Class beanClass = bean.getClass();
+ DynamicObject ci = getClassInfo(beanClass);
+ json(writer, "modelerType", beanClass.getName());
+
+ Object value=null;
+ for (String attName: ci.attributeNames()) {
+ try {
+ value = ci.getAttribute(bean, attName);
+ } catch( Throwable t) {
+ System.err.println("Error getting attribute " + oname +
+ " " + attName + " " + t.toString());
+ continue;
+ }
+ if( value==null ) continue;
+ String valueString=value.toString();
+ json(writer, attName, valueString);
+ }
+ writer.println("}");
+ } catch (Exception e) {
+ // Ignore
+ }
+ }
+ writer.println("]");
+ }
+
+ public static String escapeJson(String value) {
+ return value;
+ }
+
+ public static String escape(String value) {
+ // The only invalid char is \n
+ // We also need to keep the string short and split it with \nSPACE
+ // XXX TODO
+ int idx=value.indexOf( "\n" );
+ if( idx < 0 ) return value;
+
+ int prev=0;
+ StringBuffer sb=new StringBuffer();
+ while( idx >= 0 ) {
+ appendHead(sb, value, prev, idx);
+
+ sb.append( "\\n\n ");
+ prev=idx+1;
+ if( idx==value.length() -1 ) break;
+ idx=value.indexOf('\n', idx+1);
+ }
+ if( prev < value.length() )
+ appendHead( sb, value, prev, value.length());
+ return sb.toString();
+ }
+
+ private static void appendHead( StringBuffer sb, String value, int start, int end) {
+ if (end < 1) return;
+
+ int pos=start;
+ while( end-pos > 78 ) {
+ sb.append( value.substring(pos, pos+78));
+ sb.append( "\n ");
+ pos=pos+78;
+ }
+ sb.append( value.substring(pos,end));
+ }
+
+ public boolean isSupported( String type ) {
+ return true;
+ }
+
+ @Override
+ public void run() {
+
+ }
+}

Propchange: tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/service/JMXProxy.java
------------------------------------------------------------------------------
svn:eol-style = native

Added: tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/service/LogConfig.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/service/LogConfig.java?rev=884418&view=auto
==============================================================================
--- tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/service/LogConfig.java (added)
+++ tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/service/LogConfig.java Thu Nov 26 06:48:42 2009
@@ -0,0 +1,64 @@
+/*
+ * Copyright 2001-2004 The Apache Software Foundation.
+ * Copyright 2004 Costin Manolache
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.tomcat.lite.service;
+
+import java.io.IOException;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import org.apache.tomcat.lite.http.HttpRequest;
+import org.apache.tomcat.lite.http.HttpResponse;
+import org.apache.tomcat.lite.http.HttpChannel.HttpService;
+
+/**
+ * Log configuration
+ *
+ */
+public class LogConfig implements HttpService {
+
+ /**
+ * Framework can set this attribute with comma separated
+ * list of loggers to set to debug level.
+ * This is used at startup.
+ */
+ public void setDebug(String debug) {
+ for (String log : debug.split(",")) {
+ Logger logger = Logger.getLogger(log);
+ logger.setLevel(Level.INFO);
+ }
+ }
+
+ /**
+ *
+ */
+ public void setWarn(String nodebug) {
+ for (String log : nodebug.split(",")) {
+ Logger logger = Logger.getLogger(log);
+ logger.setLevel(Level.WARNING);
+ }
+ }
+
+ @Override
+ public void service(HttpRequest httpReq, HttpResponse httpRes)
+ throws IOException {
+ String debug = httpReq.getParameter("debug");
+ setDebug(debug);
+ String warn = httpReq.getParameter("warn");
+ setWarn(warn);
+ }
+}

Propchange: tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/service/LogConfig.java
------------------------------------------------------------------------------
svn:eol-style = native

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@...
For additional commands, e-mail: dev-help@...

svn commit: r884416 [2/2] - in /tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat: addons/ servlets/config/ servlets/config/deploy/ servlets/file/ servlets/jmx/ servlets/jsp/ servlets/jspc/ servlets/sec/ servlets/session/ servlets/util/

2009-11-25T22:47:04Z

Added: tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/jsp/BaseJspLoader.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/jsp/BaseJspLoader.java?rev=884416&view=auto
==============================================================================
--- tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/jsp/BaseJspLoader.java (added)
+++ tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/jsp/BaseJspLoader.java Thu Nov 26 06:47:03 2009
@@ -0,0 +1,298 @@
+/*
+ * 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.
+ */
+package org.apache.tomcat.servlets.jsp;
+
+import java.io.IOException;
+import java.util.Vector;
+
+import javax.servlet.Servlet;
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletContext;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+
+
+/**
+ * Load a JSP generated by jasper.
+ *
+ * Requires a 'jspc' servlet.
+ *
+ * This class has no dependencies on Jasper, it uses 2 servlets to integrate.
+ */
+public abstract class BaseJspLoader {
+ boolean usePrecompiled = false;
+
+ public static interface JspRuntime {
+ public void init(ServletContext ctx);
+ }
+
+ public static interface JspCompiler {
+ public void compileAndInit(ServletContext ctx, String jspUri,
+ ServletConfig cfg,
+ String classPath, String pkg);
+ }
+
+ /**
+ * Load the proxied jsp, if any.
+ * @param config
+ * @throws ServletException
+ * @throws IOException
+ */
+ public Servlet loadProxy(String jspFile,
+ ServletContext ctx,
+ ServletConfig config) throws ServletException, IOException {
+ synchronized(this.getClass()) {
+ // So we don't have a direct dep on jasper...
+ Object attribute = ctx.getAttribute("jasper.jspRuntimeContext");
+ if (attribute == null) {
+ try {
+ Class jsprt = Class.forName("org.apache.tomcat.servlets.jspc.JasperRuntime");
+ JspRuntime rt = (JspRuntime)jsprt.newInstance();
+ rt.init(ctx);
+ } catch (Throwable t) {
+ t.printStackTrace();
+ return null;
+ }
+ }
+ }
+ String mangledClass = getClassName(ctx, jspFile );
+
+ // TODO: reloading filter: get the class file,
+ // compare with jsp file, use dependants
+
+
+ HttpServlet jsp = null;
+ Class jspC = null;
+
+ String cp = getClassPath(ctx);
+ ClassLoader cl = getClassLoader(ctx);
+
+ // Already created
+ if (usePrecompiled) {
+ try {
+ jspC = cl.loadClass(mangledClass);
+ } catch( Throwable t ) {
+ //t.printStackTrace();
+ // Not found - first try
+ }
+ }
+
+ if (jspC == null) {
+ System.err.println("Recompile " + jspFile);
+ // Class not found - needs to be compiled
+ compileAndInitPage(ctx, jspFile, config, cp);
+ } else {
+ System.err.println("Pre-compiled " + jspFile);
+ }
+
+ if( jspC == null ) {
+ try {
+ jspC = cl.loadClass(mangledClass);
+ } catch( Throwable t ) {
+ //t.printStackTrace();
+ }
+ }
+ if (jspC == null) {
+ throw new ServletException("Class not found " + mangledClass);
+ }
+
+ try {
+ jsp=(HttpServlet)jspC.newInstance();
+ } catch( Throwable t ) {
+ t.printStackTrace();
+ }
+ jsp.init(config);
+ return jsp;
+ }
+
+ public ClassLoader getClassLoader(ServletContext ctx) {
+ return null;
+ }
+
+ public String getClassPath(ServletContext ctx) {
+ return null;
+ }
+
+ protected void compileAndInitPage(ServletContext ctx,
+ String jspUri,
+ ServletConfig cfg,
+ String classPath)
+ throws ServletException, IOException {
+ try {
+ Class jsprt = Class.forName("org.apache.tomcat.servlets.jspc.JspcServlet");
+ JspCompiler rt = (JspCompiler) jsprt.newInstance();
+ rt.compileAndInit(ctx, jspUri, cfg, classPath, getPackage(ctx, jspUri));
+ } catch (Throwable t) {
+ t.printStackTrace();
+ }
+ }
+
+ public boolean needsReload(String jspFile, Servlet s) {
+ return false;
+ }
+
+ public String getPackage(ServletContext ctx, String jspUri) {
+ String ver = "v" + ctx.getMajorVersion() +
+ ctx.getMinorVersion();
+
+ int iSep = jspUri.lastIndexOf('/') + 1;
+ String className = makeJavaIdentifier(jspUri.substring(iSep));
+ String basePackageName = JSP_PACKAGE_NAME;
+
+ iSep--;
+ String derivedPackageName = (iSep > 0) ?
+ makeJavaPackage(jspUri.substring(1,iSep)) : "";
+
+ return ver + "." + basePackageName;
+
+ }
+
+ /** Convert an identifier to a class name, using jasper conventions
+ * @param ctx
+ *
+ * @param jspUri a relative JSP file
+ * @return class name that would be generated by jasper
+ */
+ public String getClassName( ServletContext ctx, String jspUri ) {
+ // Generated code is different for different servlet API versions
+ // We could have a context running in both 2.5 and 3.0 with precompiled
+ // jsps
+ String ver = "v" + ctx.getMajorVersion() +
+ ctx.getMinorVersion();
+
+ int iSep = jspUri.lastIndexOf('/') + 1;
+ String className = makeJavaIdentifier(jspUri.substring(iSep));
+ String basePackageName = JSP_PACKAGE_NAME;
+
+ iSep--;
+ String derivedPackageName = (iSep > 0) ?
+ makeJavaPackage(jspUri.substring(1,iSep)) : "";
+ if (derivedPackageName.length() == 0) {
+ return basePackageName + "." + className;
+ }
+
+ return ver + "." + basePackageName + '.' + derivedPackageName + "." +
+ className;
+ }
+
+ // ------------- Copied from jasper ---------------------------
+
+ private static final String JSP_PACKAGE_NAME = "org.apache.jsp";
+
+ private static final String makeJavaIdentifier(String identifier) {
+ StringBuffer modifiedIdentifier =
+ new StringBuffer(identifier.length());
+ if (!Character.isJavaIdentifierStart(identifier.charAt(0))) {
+ modifiedIdentifier.append('_');
+ }
+ for (int i = 0; i < identifier.length(); i++) {
+ char ch = identifier.charAt(i);
+ if (Character.isJavaIdentifierPart(ch) && ch != '_') {
+ modifiedIdentifier.append(ch);
+ } else if (ch == '.') {
+ modifiedIdentifier.append('_');
+ } else {
+ modifiedIdentifier.append(mangleChar(ch));
+ }
+ }
+ if (isJavaKeyword(modifiedIdentifier.toString())) {
+ modifiedIdentifier.append('_');
+ }
+ return modifiedIdentifier.toString();
+ }
+
+ private static final String javaKeywords[] = {
+ "abstract", "assert", "boolean", "break", "byte", "case",
+ "catch", "char", "class", "const", "continue",
+ "default", "do", "double", "else", "enum", "extends",
+ "final", "finally", "float", "for", "goto",
+ "if", "implements", "import", "instanceof", "int",
+ "interface", "long", "native", "new", "package",
+ "private", "protected", "public", "return", "short",
+ "static", "strictfp", "super", "switch", "synchronized",
+ "this", "throws", "transient", "try", "void",
+ "volatile", "while" };
+
+ private static final String makeJavaPackage(String path) {
+ String classNameComponents[] = split(path,"/");
+ StringBuffer legalClassNames = new StringBuffer();
+ for (int i = 0; i < classNameComponents.length; i++) {
+ legalClassNames.append(makeJavaIdentifier(classNameComponents[i]));
+ if (i < classNameComponents.length - 1) {
+ legalClassNames.append('.');
+ }
+ }
+ return legalClassNames.toString();
+ }
+
+ private static final String [] split(String path, String pat) {
+ Vector comps = new Vector();
+ int pos = path.indexOf(pat);
+ int start = 0;
+ while( pos >= 0 ) {
+ if(pos > start ) {
+ String comp = path.substring(start,pos);
+ comps.add(comp);
+ }
+ start = pos + pat.length();
+ pos = path.indexOf(pat,start);
+ }
+ if( start < path.length()) {
+ comps.add(path.substring(start));
+ }
+ String [] result = new String[comps.size()];
+ for(int i=0; i < comps.size(); i++) {
+ result[i] = (String)comps.elementAt(i);
+ }
+ return result;
+ }
+
+
+ /**
+ * Test whether the argument is a Java keyword
+ */
+ private static boolean isJavaKeyword(String key) {
+ int i = 0;
+ int j = javaKeywords.length;
+ while (i < j) {
+ int k = (i+j)/2;
+ int result = javaKeywords[k].compareTo(key);
+ if (result == 0) {
+ return true;
+ }
+ if (result < 0) {
+ i = k+1;
+ } else {
+ j = k;
+ }
+ }
+ return false;
+ }
+
+ /**
+ * Mangle the specified character to create a legal Java class name.
+ */
+ private static final String mangleChar(char ch) {
+ char[] result = new char[5];
+ result[0] = '_';
+ result[1] = Character.forDigit((ch >> 12) & 0xf, 16);
+ result[2] = Character.forDigit((ch >> 8) & 0xf, 16);
+ result[3] = Character.forDigit((ch >> 4) & 0xf, 16);
+ result[4] = Character.forDigit(ch & 0xf, 16);
+ return new String(result);
+ }
+}

Propchange: tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/jsp/BaseJspLoader.java
------------------------------------------------------------------------------
svn:eol-style = native

Modified: tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/jsp/WildcardTemplateServlet.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/jsp/WildcardTemplateServlet.java?rev=884416&r1=884415&r2=884416&view=diff
==============================================================================
--- tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/jsp/WildcardTemplateServlet.java (original)
+++ tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/jsp/WildcardTemplateServlet.java Thu Nov 26 06:47:03 2009
@@ -22,13 +22,11 @@
import javax.servlet.Servlet;
import javax.servlet.ServletConfig;
import javax.servlet.ServletException;
+import javax.servlet.UnavailableException;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

-import org.apache.tomcat.addons.UserTemplateClassMapper;
-import org.apache.tomcat.integration.ObjectManager;
-

/**
*
@@ -39,20 +37,22 @@
// for the '*.jsp' case - need to keep track of the jsps
HashMap<String, Servlet> jsps=new HashMap<String, Servlet>();

- UserTemplateClassMapper mapper;
+ BaseJspLoader mapper;

/**
* If called from a <jsp-file> servlet, compile the servlet and init it.
*/
public void init(ServletConfig config) throws ServletException {
super.init(config);
- ObjectManager om =
- (ObjectManager) config.getServletContext().getAttribute(ObjectManager.ATTRIBUTE);
- mapper =
- (UserTemplateClassMapper) om.get(
- UserTemplateClassMapper.class);
- if (mapper == null) {
- mapper = new SimpleTemplateClassMapper();
+ String mapperCN = config.getInitParameter("mapper");
+ if (mapperCN == null) {
+ throw new UnavailableException("can't create mapper");
+ }
+ try {
+ Class c = Class.forName(mapperCN);
+ mapper = (BaseJspLoader) c.newInstance();
+ } catch (Throwable t) {
+ throw new UnavailableException("can't create mapper");
}
}

Added: tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/jspc/JasperRuntime.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/jspc/JasperRuntime.java?rev=884416&view=auto
==============================================================================
--- tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/jspc/JasperRuntime.java (added)
+++ tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/jspc/JasperRuntime.java Thu Nov 26 06:47:03 2009
@@ -0,0 +1,188 @@
+/*
+ */
+package org.apache.tomcat.servlets.jspc;
+
+import java.io.File;
+import java.util.Map;
+
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletContext;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.jasper.Options;
+import org.apache.jasper.compiler.JspConfig;
+import org.apache.jasper.compiler.JspRuntimeContext;
+import org.apache.jasper.compiler.TagPluginManager;
+import org.apache.jasper.compiler.TldLocationsCache;
+import org.apache.tomcat.servlets.jsp.BaseJspLoader;
+
+public class JasperRuntime extends HttpServlet implements BaseJspLoader.JspRuntime {
+
+ // TODO: add DefaultAnnotationProcessor
+ // TODO: implement the options
+ private JspRuntimeContext jspRuntimeContext;
+
+ public void init(ServletConfig cfg) throws ServletException {
+ super.init(cfg);
+ ServletContext ctx = cfg.getServletContext();
+ init(ctx);
+ }
+
+ public void doGet(HttpServletRequest req, HttpServletResponse res) {
+
+ }
+
+ @Override
+ public void init(ServletContext ctx) {
+ jspRuntimeContext = new JspRuntimeContext(ctx, new Options() {
+ @Override
+ public boolean genStringAsCharArray() {
+ return false;
+ }
+
+ @Override
+ public Map getCache() {
+ return null;
+ }
+
+ @Override
+ public int getCheckInterval() {
+ return 0;
+ }
+
+ @Override
+ public boolean getClassDebugInfo() {
+ return false;
+ }
+
+ @Override
+ public String getClassPath() {
+ return null;
+ }
+
+ @Override
+ public String getCompiler() {
+ return null;
+ }
+
+ @Override
+ public String getCompilerClassName() {
+ return null;
+ }
+
+ @Override
+ public String getCompilerSourceVM() {
+ return null;
+ }
+
+ @Override
+ public String getCompilerTargetVM() {
+ return null;
+ }
+
+ @Override
+ public boolean getDevelopment() {
+ return false;
+ }
+
+ @Override
+ public boolean getDisplaySourceFragment() {
+ return false;
+ }
+
+ @Override
+ public boolean getErrorOnUseBeanInvalidClassAttribute() {
+ return false;
+ }
+
+ @Override
+ public boolean getFork() {
+ return false;
+ }
+
+ @Override
+ public String getIeClassId() {
+ return null;
+ }
+
+ @Override
+ public String getJavaEncoding() {
+ return null;
+ }
+
+ @Override
+ public JspConfig getJspConfig() {
+ return null;
+ }
+
+ @Override
+ public boolean getKeepGenerated() {
+ return false;
+ }
+
+ @Override
+ public boolean getMappedFile() {
+ return false;
+ }
+
+ @Override
+ public int getModificationTestInterval() {
+ return 0;
+ }
+
+ @Override
+ public File getScratchDir() {
+ return null;
+ }
+
+ public boolean getSendErrorToClient() {
+ return false;
+ }
+
+ @Override
+ public TagPluginManager getTagPluginManager() {
+ return null;
+ }
+
+ @Override
+ public TldLocationsCache getTldLocationsCache() {
+ return null;
+ }
+
+ @Override
+ public boolean getTrimSpaces() {
+ return false;
+ }
+
+ @Override
+ public boolean isCaching() {
+ return false;
+ }
+
+ @Override
+ public boolean isPoolingEnabled() {
+ return false;
+ }
+
+ @Override
+ public boolean isSmapDumped() {
+ return false;
+ }
+
+ @Override
+ public boolean isSmapSuppressed() {
+ return false;
+ }
+
+ @Override
+ public boolean isXpoweredBy() {
+ return false;
+ }
+ });
+
+ ctx.setAttribute("jasper.jspRuntimeContext", jspRuntimeContext);
+ }
+}

Propchange: tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/jspc/JasperRuntime.java
------------------------------------------------------------------------------
svn:eol-style = native

Added: tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/jspc/JspcServlet.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/jspc/JspcServlet.java?rev=884416&view=auto
==============================================================================
--- tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/jspc/JspcServlet.java (added)
+++ tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/jspc/JspcServlet.java Thu Nov 26 06:47:03 2009
@@ -0,0 +1,87 @@
+/*
+ * 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.
+ */
+package org.apache.tomcat.servlets.jspc;
+
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletContext;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.jasper.JasperException;
+import org.apache.jasper.JspC;
+import org.apache.tomcat.servlets.jsp.BaseJspLoader;
+
+/**
+ * The actual compiler. Maps and compile a jsp-file to a class.
+ */
+public class JspcServlet extends HttpServlet implements BaseJspLoader.JspCompiler {
+
+ public void doGet(HttpServletRequest req, HttpServletResponse res)
+ throws ServletException {
+
+ // TODO: allow only local calls ?
+
+ // relative to context
+ String jspFiles = req.getParameter("jspFiles");
+ String classPath = req.getParameter("classPath");
+ String pkg = req.getParameter("pkg");
+
+ compileAndInit(getServletContext(),
+ jspFiles, getServletConfig(), classPath, pkg);
+ }
+
+ @Override
+ public void compileAndInit(ServletContext ctx, String jspFiles,
+ ServletConfig cfg, String classPath, String pkg) {
+
+ if (jspFiles.startsWith("/")) {
+ jspFiles = jspFiles.substring(1);
+ }
+ String baseDir = ctx.getRealPath("/");
+
+ JspC jspc = new JspC();
+
+ jspc.setUriroot(baseDir);
+ jspc.setTrimSpaces(false);
+ jspc.setPoolingEnabled(true);
+ jspc.setErrorOnUseBeanInvalidClassAttribute(false);
+ jspc.setClassDebugInfo(true);
+ jspc.setCaching(true);
+ jspc.setSmapDumped(true);
+ jspc.setGenStringAsCharArray(true);
+
+ jspc.setJspFiles(jspFiles);
+
+ jspc.setVerbose(10);
+
+ jspc.setPackage(pkg);
+
+ jspc.setOutputDir(baseDir + "WEB-INF/tmp");
+ jspc.setCompile(true);
+ //jspc.setCompiler("jdt");
+ jspc.setClassPath(classPath);
+
+ try {
+ jspc.execute();
+ } catch (JasperException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+ }
+}
\ No newline at end of file

Propchange: tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/jspc/JspcServlet.java
------------------------------------------------------------------------------
svn:eol-style = native

Modified: tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/sec/AccessFilter.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/sec/AccessFilter.java?rev=884416&r1=884415&r2=884416&view=diff
==============================================================================
--- tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/sec/AccessFilter.java (original)
+++ tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/sec/AccessFilter.java Thu Nov 26 06:47:03 2009
@@ -32,7 +32,6 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

-import org.apache.tomcat.addons.UserAuthentication;

/**

Modified: tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/sec/BasicAuthentication.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/sec/BasicAuthentication.java?rev=884416&r1=884415&r2=884416&view=diff
==============================================================================
--- tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/sec/BasicAuthentication.java (original)
+++ tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/sec/BasicAuthentication.java Thu Nov 26 06:47:03 2009
@@ -23,7 +23,6 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

-import org.apache.tomcat.addons.UserAuthentication;

/**

Modified: tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/sec/FormAuthentication.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/sec/FormAuthentication.java?rev=884416&r1=884415&r2=884416&view=diff
==============================================================================
--- tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/sec/FormAuthentication.java (original)
+++ tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/sec/FormAuthentication.java Thu Nov 26 06:47:03 2009
@@ -23,7 +23,6 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

-import org.apache.tomcat.addons.UserAuthentication;

/**

Added: tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/sec/UserAuthentication.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/sec/UserAuthentication.java?rev=884416&view=auto
==============================================================================
--- tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/sec/UserAuthentication.java (added)
+++ tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/sec/UserAuthentication.java Thu Nov 26 06:47:03 2009
@@ -0,0 +1,47 @@
+/*
+ */
+package org.apache.tomcat.servlets.sec;
+
+import java.io.IOException;
+import java.security.Principal;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ * Plugin for user auth.
+ *
+ * This interface should support all common forms of auth,
+ * including Basic, Digest, Form and various other auth
+ * standards - the plugin has full control over request and
+ * response.
+ *
+ * Container will verify the security constraints on URLs and
+ * call this for all URLs that have constraints. The plugin can
+ * either authenticate and return the principal, or change
+ * the response - redirect, add headers, send content.
+ *
+ * Alternative: a simple Filter can do the same, with some conventions
+ * to support it ( attributes ).
+ *
+ * @author Costin Manolache
+ */
+public interface UserAuthentication {
+
+ /**
+ * If req has all the info - return the principal.
+ * Otherwise set the challenge in response.
+ *
+ * @param requestedMethod auth method from web.xml. Spec
+ * complain plugins must support it.
+ * @throws IOException
+ */
+ public Principal authenticate(HttpServletRequest req,
+ HttpServletResponse res,
+ String requestedMethod) throws IOException;
+
+
+ public boolean isUserInRole(HttpServletRequest req,
+ Principal p,
+ String role);
+}

Propchange: tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/sec/UserAuthentication.java
------------------------------------------------------------------------------
svn:eol-style = native

Modified: tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/session/RandomGenerator.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/session/RandomGenerator.java?rev=884416&r1=884415&r2=884416&view=diff
==============================================================================
--- tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/session/RandomGenerator.java (original)
+++ tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/session/RandomGenerator.java Thu Nov 26 06:47:03 2009
@@ -363,4 +363,4 @@
public void setSessionIdLength(int idLength) {
this.sessionIdLength = idLength;
}
-}
\ No newline at end of file
+}

Modified: tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/session/SimpleSessionManager.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/session/SimpleSessionManager.java?rev=884416&r1=884415&r2=884416&view=diff
==============================================================================
--- tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/session/SimpleSessionManager.java (original)
+++ tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/session/SimpleSessionManager.java Thu Nov 26 06:47:03 2009
@@ -33,7 +33,6 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;

-import org.apache.tomcat.addons.UserSessionManager;

// TODO: move 'expiring objects' to a separate utility class
// TODO: hook the background thread

Added: tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/session/UserSessionManager.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/session/UserSessionManager.java?rev=884416&view=auto
==============================================================================
--- tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/session/UserSessionManager.java (added)
+++ tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/session/UserSessionManager.java Thu Nov 26 06:47:03 2009
@@ -0,0 +1,45 @@
+/*
+ */
+package org.apache.tomcat.servlets.session;
+
+import java.io.IOException;
+
+import javax.servlet.ServletContext;
+import javax.servlet.http.HttpSession;
+
+/**
+ * Session management plugin. No dependency on tomcat-lite, should
+ * be possible to add this to tomcat-trunk or other containers.
+ *
+ * The container will:
+ * - extract the session id from request ( via a filter or built-ins )
+ * - call this interface when the user makes the related calls in the
+ * servlet API.
+ * - provide a context attribute 'context-listeners' with the
+ * List<EventListener> from web.xml
+ *
+ * Implementation of this class must provide HttpSession object
+ * and implement the spec.
+ *
+ */
+public interface UserSessionManager {
+
+
+
+ HttpSession findSession(String requestedSessionId) throws IOException;
+
+ HttpSession createSession(String requestedSessionId);
+
+ boolean isValid(HttpSession session);
+
+ void access(HttpSession session);
+
+ void endAccess(HttpSession session);
+
+
+ void setSessionTimeout(int to);
+
+ void setContext(ServletContext ctx);
+
+
+}

Propchange: tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/session/UserSessionManager.java
------------------------------------------------------------------------------
svn:eol-style = native

Added: tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/util/Base64.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/util/Base64.java?rev=884416&view=auto
==============================================================================
--- tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/util/Base64.java (added)
+++ tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/util/Base64.java Thu Nov 26 06:47:03 2009
@@ -0,0 +1,269 @@
+/*
+ * 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.
+ */
+
+
+package org.apache.tomcat.servlets.util;
+
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+
+/**
+ * This class provides encode/decode for RFC 2045 Base64 as
+ * defined by RFC 2045, N. Freed and N. Borenstein.
+ * RFC 2045: Multipurpose Internet Mail Extensions (MIME)
+ * Part One: Format of Internet Message Bodies. Reference
+ * 1996 Available at: http://www.ietf.org/rfc/rfc2045.txt
+ * This class is used by XML Schema binary format validation
+ *
+ * @author Jeffrey Rodriguez
+ * @version $Revision: 467222 $ $Date: 2006-10-23 20:17:11 -0700 (Mon, 23 Oct 2006) $
+ */
+
+public final class Base64 {
+
+
+ private static Logger log=
+ Logger.getLogger( Base64.class.getName() );
+
+ static private final int BASELENGTH = 255;
+ static private final int LOOKUPLENGTH = 63;
+ static private final int TWENTYFOURBITGROUP = 24;
+ static private final int EIGHTBIT = 8;
+ static private final int SIXTEENBIT = 16;
+ static private final int SIXBIT = 6;
+ static private final int FOURBYTE = 4;
+
+
+ static private final byte PAD = ( byte ) '=';
+ static private byte [] base64Alphabet = new byte[BASELENGTH];
+ static private byte [] lookUpBase64Alphabet = new byte[LOOKUPLENGTH + 1];
+
+ static {
+
+ for (int i = 0; i<BASELENGTH; i++ ) {
+ base64Alphabet[i] = -1;
+ }
+ for ( int i = 'Z'; i >= 'A'; i-- ) {
+ base64Alphabet[i] = (byte) (i-'A');
+ }
+ for ( int i = 'z'; i>= 'a'; i--) {
+ base64Alphabet[i] = (byte) ( i-'a' + 26);
+ }
+
+ for ( int i = '9'; i >= '0'; i--) {
+ base64Alphabet[i] = (byte) (i-'0' + 52);
+ }
+
+ base64Alphabet['+'] = 62;
+ base64Alphabet['/'] = 63;
+ String lookupString =
+ "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz" +
+ "0123456789+/";
+
+ for (int i = 0; i < lookupString.length(); i++ ) {
+ lookUpBase64Alphabet[i] = (byte) lookupString.charAt(i);
+ }
+ }
+
+
+ static boolean isBase64( byte octect ) {
+ //shall we ignore white space? JEFF??
+ return(octect == PAD || base64Alphabet[octect] != -1 );
+ }
+
+
+ static boolean isArrayByteBase64( byte[] arrayOctect ) {
+ int length = arrayOctect.length;
+ if ( length == 0 )
+ return false;
+ for ( int i=0; i < length; i++ ) {
+ if ( Base64.isBase64( arrayOctect[i] ) == false)
+ return false;
+ }
+ return true;
+ }
+
+ /**
+ * Encodes hex octects into Base64
+ *
+ * @param binaryData Array containing binaryData
+ * @return Encoded Base64 array
+ */
+ public static byte[] encode( byte[] binaryData ) {
+ int lengthDataBits = binaryData.length*EIGHTBIT;
+ int fewerThan24bits = lengthDataBits%TWENTYFOURBITGROUP;
+ int numberTriplets = lengthDataBits/TWENTYFOURBITGROUP;
+ byte encodedData[] = null;
+
+
+ if ( fewerThan24bits != 0 ) //data not divisible by 24 bit
+ encodedData = new byte[ (numberTriplets + 1 )*4 ];
+ else // 16 or 8 bit
+ encodedData = new byte[ numberTriplets*4 ];
+
+ int k=0, l=0, b1=0,b2=0,b3=0;
+
+ int encodedIndex = 0;
+ int dataIndex = 0;
+ int i = 0;
+ for ( i = 0; i<numberTriplets; i++ ) {
+
+ dataIndex = i*3;
+ b1 = binaryData[dataIndex] & 0xFF;
+ b2 = binaryData[dataIndex + 1] & 0xFF;
+ b3 = binaryData[dataIndex + 2] & 0xFF;
+
+ l = (byte)(b2 & 0x0f);
+ k = (byte)(b1 & 0x03);
+
+ encodedIndex = i*4;
+ encodedData[encodedIndex] = lookUpBase64Alphabet[ b1 >>2 ];
+ encodedData[encodedIndex+1] = lookUpBase64Alphabet[(b2 >>4 ) |
+( k<<4 )];
+ encodedData[encodedIndex+2] = lookUpBase64Alphabet[ (l <<2 ) |
+( b3>>6)];
+ encodedData[encodedIndex+3] = lookUpBase64Alphabet[ b3 & 0x3f ];
+ }
+
+ // form integral number of 6-bit groups
+ dataIndex = i*3;
+ encodedIndex = i*4;
+ if (fewerThan24bits == EIGHTBIT ) {
+ b1 = binaryData[dataIndex];
+ k = (byte) ( b1 &0x03 );
+ encodedData[encodedIndex] = lookUpBase64Alphabet[ b1 >>2 ];
+ encodedData[encodedIndex + 1] = lookUpBase64Alphabet[ k<<4 ];
+ encodedData[encodedIndex + 2] = PAD;
+ encodedData[encodedIndex + 3] = PAD;
+ } else if ( fewerThan24bits == SIXTEENBIT ) {
+
+ b1 = binaryData[dataIndex];
+ b2 = binaryData[dataIndex +1 ];
+ l = ( byte ) ( b2 &0x0f );
+ k = ( byte ) ( b1 &0x03 );
+ encodedData[encodedIndex] = lookUpBase64Alphabet[ b1 >>2 ];
+ encodedData[encodedIndex + 1] = lookUpBase64Alphabet[ (b2 >>4 )
+| ( k<<4 )];
+ encodedData[encodedIndex + 2] = lookUpBase64Alphabet[ l<<2 ];
+ encodedData[encodedIndex + 3] = PAD;
+ }
+ return encodedData;
+ }
+
+
+ /**
+ * Decodes Base64 data into octects
+ *
+ * @param base64Data Byte array containing Base64 data
+ * @return Array containind decoded data.
+ */
+ public static byte[] decode( byte[] base64Data ) {
+ int numberQuadruple = base64Data.length/FOURBYTE;
+ byte decodedData[] = null;
+ byte b1=0,b2=0,b3=0, b4=0, marker0=0, marker1=0;
+
+ // Throw away anything not in base64Data
+ // Adjust size
+
+ int encodedIndex = 0;
+ int dataIndex = 0;
+ decodedData = new byte[ numberQuadruple*3 + 1 ];
+
+ for (int i = 0; i<numberQuadruple; i++ ) {
+ dataIndex = i*4;
+ marker0 = base64Data[dataIndex +2];
+ marker1 = base64Data[dataIndex +3];
+
+ b1 = base64Alphabet[base64Data[dataIndex]];
+ b2 = base64Alphabet[base64Data[dataIndex +1]];
+
+ if ( marker0 != PAD && marker1 != PAD ) { //No PAD e.g 3cQl
+ b3 = base64Alphabet[ marker0 ];
+ b4 = base64Alphabet[ marker1 ];
+
+ decodedData[encodedIndex] = (byte)( b1 <<2 | b2>>4 ) ;
+ decodedData[encodedIndex+1] = (byte)(((b2 & 0xf)<<4 ) |(
+(b3>>2) & 0xf) );
+ decodedData[encodedIndex+2] = (byte)( b3<<6 | b4 );
+ } else if ( marker0 == PAD ) { //Two PAD e.g. 3c[Pad][Pad]
+ decodedData[encodedIndex] = (byte)( b1 <<2 | b2>>4 ) ;
+ decodedData[encodedIndex+1] = (byte)((b2 & 0xf)<<4 );
+ decodedData[encodedIndex+2] = (byte) 0;
+ } else if ( marker1 == PAD ) { //One PAD e.g. 3cQ[Pad]
+ b3 = base64Alphabet[ marker0 ];
+
+ decodedData[encodedIndex] = (byte)( b1 <<2 | b2>>4 );
+ decodedData[encodedIndex+1] = (byte)(((b2 & 0xf)<<4 ) |(
+(b3>>2) & 0xf) );
+ decodedData[encodedIndex+2] = (byte)( b3<<6);
+ }
+ encodedIndex += 3;
+ }
+ return decodedData;
+
+ }
+
+ static final int base64[]= {
+ 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
+ 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
+ 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 62, 64, 64, 64, 63,
+ 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 64, 64, 64, 64, 64, 64,
+ 64, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14,
+ 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 64, 64, 64, 64, 64,
+ 64, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40,
+ 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 64, 64, 64, 64, 64,
+ 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
+ 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
+ 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
+ 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
+ 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
+ 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
+ 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
+ 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64
+ };
+
+ public static String base64Decode( String orig ) {
+ char chars[]=orig.toCharArray();
+ StringBuffer sb=new StringBuffer();
+ int i=0;
+
+ int shift = 0; // # of excess bits stored in accum
+ int acc = 0;
+
+ for (i=0; i<chars.length; i++) {
+ int v = base64[ chars[i] & 0xFF ];
+
+ if ( v >= 64 ) {
+ if( chars[i] != '=' )
+ if (log.isLoggable(Level.INFO))
+ log.info("Wrong char in base64: " + chars[i]);
+ } else {
+ acc= ( acc << 6 ) | v;
+ shift += 6;
+ if ( shift >= 8 ) {
+ shift -= 8;
+ sb.append( (char) ((acc >> shift) & 0xff));
+ }
+ }
+ }
+ return sb.toString();
+ }
+
+
+}
+

Propchange: tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/util/Base64.java
------------------------------------------------------------------------------
svn:eol-style = native

Added: tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/util/FastHttpDateFormat.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/util/FastHttpDateFormat.java?rev=884416&view=auto
==============================================================================
--- tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/util/FastHttpDateFormat.java (added)
+++ tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/util/FastHttpDateFormat.java Thu Nov 26 06:47:03 2009
@@ -0,0 +1,231 @@
+/*
+ * 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.
+ */
+
+package org.apache.tomcat.servlets.util;
+
+import java.text.DateFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.Locale;
+import java.util.TimeZone;
+import java.util.concurrent.ConcurrentHashMap;
+
+/**
+ * Utility class to generate HTTP dates.
+ *
+ * @author Remy Maucherat
+ */
+public final class FastHttpDateFormat {
+
+
+ // -------------------------------------------------------------- Variables
+
+
+ protected static final int CACHE_SIZE =
+ Integer.parseInt(System.getProperty("org.apache.tomcat.util.http.FastHttpDateFormat.CACHE_SIZE", "1000"));
+
+
+ /**
+ * HTTP date format.
+ */
+ protected static final SimpleDateFormat format =
+ new SimpleDateFormat("EEE, dd MMM yyyy HH:mm:ss zzz", Locale.US);
+
+
+ /**
+ * The set of SimpleDateFormat formats to use in getDateHeader().
+ */
+ protected static final SimpleDateFormat formats[] = {
+ new SimpleDateFormat("EEE, dd MMM yyyy HH:mm:ss zzz", Locale.US),
+ new SimpleDateFormat("EEEEEE, dd-MMM-yy HH:mm:ss zzz", Locale.US),
+ new SimpleDateFormat("EEE MMMM d HH:mm:ss yyyy", Locale.US)
+ };
+
+
+ protected final static TimeZone gmtZone = TimeZone.getTimeZone("GMT");
+
+
+ /**
+ * GMT timezone - all HTTP dates are on GMT
+ */
+ static {
+
+ format.setTimeZone(gmtZone);
+
+ formats[0].setTimeZone(gmtZone);
+ formats[1].setTimeZone(gmtZone);
+ formats[2].setTimeZone(gmtZone);
+
+ }
+
+
+ /**
+ * Instant on which the currentDate object was generated.
+ */
+ protected static long currentDateGenerated = 0L;
+
+
+ /**
+ * Current formatted date.
+ */
+ protected static String currentDate = null;
+
+
+ /**
+ * Formatter cache.
+ */
+ protected static final ConcurrentHashMap<Long, String> formatCache =
+ new ConcurrentHashMap<Long, String>(CACHE_SIZE);
+
+
+ /**
+ * Parser cache.
+ */
+ protected static final ConcurrentHashMap<String, Long> parseCache =
+ new ConcurrentHashMap<String, Long>(CACHE_SIZE);
+
+
+ // --------------------------------------------------------- Public Methods
+
+
+ /**
+ * Get the current date in HTTP format.
+ */
+ public static final String getCurrentDate() {
+
+ long now = System.currentTimeMillis();
+ if ((now - currentDateGenerated) > 1000) {
+ synchronized (format) {
+ if ((now - currentDateGenerated) > 1000) {
+ currentDateGenerated = now;
+ currentDate = format.format(new Date(now));
+ }
+ }
+ }
+ return currentDate;
+
+ }
+
+
+ /**
+ * Get the HTTP format of the specified date.
+ */
+ public static final String formatDate
+ (long value, DateFormat threadLocalformat) {
+
+ Long longValue = new Long(value);
+ String cachedDate = formatCache.get(longValue);
+ if (cachedDate != null)
+ return cachedDate;
+
+ String newDate = null;
+ Date dateValue = new Date(value);
+ if (threadLocalformat != null) {
+ newDate = threadLocalformat.format(dateValue);
+ updateFormatCache(longValue, newDate);
+ } else {
+ synchronized (formatCache) {
+ synchronized (format) {
+ newDate = format.format(dateValue);
+ }
+ updateFormatCache(longValue, newDate);
+ }
+ }
+ return newDate;
+
+ }
+
+
+ /**
+ * Try to parse the given date as a HTTP date.
+ */
+ public static final long parseDate(String value,
+ DateFormat[] threadLocalformats) {
+
+ Long cachedDate = parseCache.get(value);
+ if (cachedDate != null)
+ return cachedDate.longValue();
+
+ Long date = null;
+ if (threadLocalformats != null) {
+ date = internalParseDate(value, threadLocalformats);
+ updateParseCache(value, date);
+ } else {
+ synchronized (parseCache) {
+ date = internalParseDate(value, formats);
+ updateParseCache(value, date);
+ }
+ }
+ if (date == null) {
+ return (-1L);
+ } else {
+ return date.longValue();
+ }
+
+ }
+
+
+ /**
+ * Parse date with given formatters.
+ */
+ private static final Long internalParseDate
+ (String value, DateFormat[] formats) {
+ Date date = null;
+ for (int i = 0; (date == null) && (i < formats.length); i++) {
+ try {
+ date = formats[i].parse(value);
+ } catch (ParseException e) {
+ ;
+ }
+ }
+ if (date == null) {
+ return null;
+ }
+ return new Long(date.getTime());
+ }
+
+
+ /**
+ * Update cache.
+ */
+ private static void updateFormatCache(Long key, String value) {
+ if (value == null) {
+ return;
+ }
+ if (formatCache.size() > CACHE_SIZE) {
+ formatCache.clear();
+ }
+ formatCache.put(key, value);
+ }
+
+
+ /**
+ * Update cache.
+ */
+ private static void updateParseCache(String key, Long value) {
+ if (value == null) {
+ return;
+ }
+ if (parseCache.size() > CACHE_SIZE) {
+ parseCache.clear();
+ }
+ parseCache.put(key, value);
+ }
+
+
+}

Propchange: tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/util/FastHttpDateFormat.java
------------------------------------------------------------------------------
svn:eol-style = native

Added: tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/util/MimeMap.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/util/MimeMap.java?rev=884416&view=auto
==============================================================================
--- tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/util/MimeMap.java (added)
+++ tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/util/MimeMap.java Thu Nov 26 06:47:03 2009
@@ -0,0 +1,195 @@
+/*
+ * 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.
+ */
+
+package org.apache.tomcat.servlets.util;
+
+import java.net.FileNameMap;
+import java.util.Enumeration;
+import java.util.Hashtable;
+
+
+/**
+ * A mime type map that implements the java.net.FileNameMap interface.
+ *
+ * @author James Duncan Davidson [duncan@...]
+ * @author Jason Hunter [jch@...]
+ */
+public class MimeMap implements FileNameMap {
+
+ // Defaults - all of them are "well-known" types,
+ // you can add using normal web.xml.
+
+ public static Hashtable<String,String> defaultMap =
+ new Hashtable<String,String>(101);
+ static {
+ defaultMap.put("txt", "text/plain");
+ defaultMap.put("css", "text/css");
+ defaultMap.put("html","text/html");
+ defaultMap.put("htm", "text/html");
+ defaultMap.put("gif", "image/gif");
+ defaultMap.put("jpg", "image/jpeg");
+ defaultMap.put("jpe", "image/jpeg");
+ defaultMap.put("jpeg", "image/jpeg");
+ defaultMap.put("png", "image/png");
+ defaultMap.put("java", "text/plain");
+ defaultMap.put("body", "text/html");
+ defaultMap.put("rtx", "text/richtext");
+ defaultMap.put("tsv", "text/tab-separated-values");
+ defaultMap.put("etx", "text/x-setext");
+ defaultMap.put("ps", "application/x-postscript");
+ defaultMap.put("class", "application/java");
+ defaultMap.put("csh", "application/x-csh");
+ defaultMap.put("sh", "application/x-sh");
+ defaultMap.put("tcl", "application/x-tcl");
+ defaultMap.put("tex", "application/x-tex");
+ defaultMap.put("texinfo", "application/x-texinfo");
+ defaultMap.put("texi", "application/x-texinfo");
+ defaultMap.put("t", "application/x-troff");
+ defaultMap.put("tr", "application/x-troff");
+ defaultMap.put("roff", "application/x-troff");
+ defaultMap.put("man", "application/x-troff-man");
+ defaultMap.put("me", "application/x-troff-me");
+ defaultMap.put("ms", "application/x-wais-source");
+ defaultMap.put("src", "application/x-wais-source");
+ defaultMap.put("zip", "application/zip");
+ defaultMap.put("bcpio", "application/x-bcpio");
+ defaultMap.put("cpio", "application/x-cpio");
+ defaultMap.put("gtar", "application/x-gtar");
+ defaultMap.put("shar", "application/x-shar");
+ defaultMap.put("sv4cpio", "application/x-sv4cpio");
+ defaultMap.put("sv4crc", "application/x-sv4crc");
+ defaultMap.put("tar", "application/x-tar");
+ defaultMap.put("ustar", "application/x-ustar");
+ defaultMap.put("dvi", "application/x-dvi");
+ defaultMap.put("hdf", "application/x-hdf");
+ defaultMap.put("latex", "application/x-latex");
+ defaultMap.put("bin", "application/octet-stream");
+ defaultMap.put("oda", "application/oda");
+ defaultMap.put("pdf", "application/pdf");
+ defaultMap.put("ps", "application/postscript");
+ defaultMap.put("eps", "application/postscript");
+ defaultMap.put("ai", "application/postscript");
+ defaultMap.put("rtf", "application/rtf");
+ defaultMap.put("nc", "application/x-netcdf");
+ defaultMap.put("cdf", "application/x-netcdf");
+ defaultMap.put("cer", "application/x-x509-ca-cert");
+ defaultMap.put("exe", "application/octet-stream");
+ defaultMap.put("gz", "application/x-gzip");
+ defaultMap.put("Z", "application/x-compress");
+ defaultMap.put("z", "application/x-compress");
+ defaultMap.put("hqx", "application/mac-binhex40");
+ defaultMap.put("mif", "application/x-mif");
+ defaultMap.put("ief", "image/ief");
+ defaultMap.put("tiff", "image/tiff");
+ defaultMap.put("tif", "image/tiff");
+ defaultMap.put("ras", "image/x-cmu-raster");
+ defaultMap.put("pnm", "image/x-portable-anymap");
+ defaultMap.put("pbm", "image/x-portable-bitmap");
+ defaultMap.put("pgm", "image/x-portable-graymap");
+ defaultMap.put("ppm", "image/x-portable-pixmap");
+ defaultMap.put("rgb", "image/x-rgb");
+ defaultMap.put("xbm", "image/x-xbitmap");
+ defaultMap.put("xpm", "image/x-xpixmap");
+ defaultMap.put("xwd", "image/x-xwindowdump");
+ defaultMap.put("au", "audio/basic");
+ defaultMap.put("snd", "audio/basic");
+ defaultMap.put("aif", "audio/x-aiff");
+ defaultMap.put("aiff", "audio/x-aiff");
+ defaultMap.put("aifc", "audio/x-aiff");
+ defaultMap.put("wav", "audio/x-wav");
+ defaultMap.put("mpeg", "video/mpeg");
+ defaultMap.put("mpg", "video/mpeg");
+ defaultMap.put("mpe", "video/mpeg");
+ defaultMap.put("qt", "video/quicktime");
+ defaultMap.put("mov", "video/quicktime");
+ defaultMap.put("avi", "video/x-msvideo");
+ defaultMap.put("movie", "video/x-sgi-movie");
+ defaultMap.put("avx", "video/x-rad-screenplay");
+ defaultMap.put("wrl", "x-world/x-vrml");
+ defaultMap.put("mpv2", "video/mpeg2");
+
+ /* Add XML related MIMEs */
+
+ defaultMap.put("xml", "text/xml");
+ defaultMap.put("xsl", "text/xml");
+ defaultMap.put("svg", "image/svg+xml");
+ defaultMap.put("svgz", "image/svg+xml");
+ defaultMap.put("wbmp", "image/vnd.wap.wbmp");
+ defaultMap.put("wml", "text/vnd.wap.wml");
+ defaultMap.put("wmlc", "application/vnd.wap.wmlc");
+ defaultMap.put("wmls", "text/vnd.wap.wmlscript");
+ defaultMap.put("wmlscriptc", "application/vnd.wap.wmlscriptc");
+ }
+
+
+ private Hashtable<String,String> map = new Hashtable<String,String>();
+
+ public void addContentType(String extn, String type) {
+ map.put(extn, type.toLowerCase());
+ }
+
+ public Enumeration getExtensions() {
+ return map.keys();
+ }
+
+ public String getMimeType(String ext) {
+ return getContentTypeFor(ext);
+ }
+
+ public String getContentType(String extn) {
+ String type = (String)map.get(extn.toLowerCase());
+ if( type == null ) type=(String)defaultMap.get( extn );
+ return type;
+ }
+
+ public void removeContentType(String extn) {
+ map.remove(extn.toLowerCase());
+ }
+
+ /** Get extension of file, without fragment id
+ */
+ public static String getExtension( String fileName ) {
+ // play it safe and get rid of any fragment id
+ // that might be there
+ int length=fileName.length();
+
+ int newEnd = fileName.lastIndexOf('#');
+ if( newEnd== -1 ) newEnd=length;
+ // Instead of creating a new string.
+ // if (i != -1) {
+ // fileName = fileName.substring(0, i);
+ // }
+ int i = fileName.lastIndexOf('.', newEnd );
+ if (i != -1) {
+ return fileName.substring(i + 1, newEnd );
+ } else {
+ // no extension, no content type
+ return null;
+ }
+ }
+
+ public String getContentTypeFor(String fileName) {
+ String extn=getExtension( fileName );
+ if (extn!=null) {
+ return getContentType(extn);
+ } else {
+ // no extension, no content type
+ return null;
+ }
+ }
+
+}

Propchange: tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/util/MimeMap.java
------------------------------------------------------------------------------
svn:eol-style = native

Modified: tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/util/RequestUtil.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/util/RequestUtil.java?rev=884416&r1=884415&r2=884416&view=diff
==============================================================================
--- tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/util/RequestUtil.java (original)
+++ tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/util/RequestUtil.java Thu Nov 26 06:47:03 2009
@@ -57,7 +57,7 @@
*/
public static String encodeCookie(Cookie cookie) {

- StringBuilder buf = new StringBuilder( cookie.getName() );
+ StringBuffer buf = new StringBuffer( cookie.getName() );
buf.append("=");
buf.append(cookie.getValue());

Added: tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/util/URLEncoder.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/util/URLEncoder.java?rev=884416&view=auto
==============================================================================
--- tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/util/URLEncoder.java (added)
+++ tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/util/URLEncoder.java Thu Nov 26 06:47:03 2009
@@ -0,0 +1,100 @@
+/*
+ * Copyright 1999,2004 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.tomcat.servlets.util;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.OutputStreamWriter;
+import java.util.BitSet;
+
+/**
+ *
+ * This class is very similar to the java.net.URLEncoder class.
+ *
+ * Unfortunately, with java.net.URLEncoder there is no way to specify to the
+ * java.net.URLEncoder which characters should NOT be encoded.
+ *
+ * This code was moved from DefaultServlet.java
+ *
+ * @author Craig R. McClanahan
+ * @author Remy Maucherat
+ */
+public class URLEncoder {
+ protected static final char[] hexadecimal =
+ {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9',
+ 'A', 'B', 'C', 'D', 'E', 'F'};
+
+ //Array containing the safe characters set.
+ protected BitSet safeCharacters = new BitSet(256);
+
+ public URLEncoder() {
+ for (char i = 'a'; i <= 'z'; i++) {
+ addSafeCharacter(i);
+ }
+ for (char i = 'A'; i <= 'Z'; i++) {
+ addSafeCharacter(i);
+ }
+ for (char i = '0'; i <= '9'; i++) {
+ addSafeCharacter(i);
+ }
+ }
+
+ public void addSafeCharacter( char c ) {
+ safeCharacters.set( c );
+ }
+
+ public String encode( String path ) {
+ int maxBytesPerChar = 10;
+ int caseDiff = ('a' - 'A');
+ StringBuffer rewrittenPath = new StringBuffer(path.length());
+ ByteArrayOutputStream buf = new ByteArrayOutputStream(maxBytesPerChar);
+ OutputStreamWriter writer = null;
+ try {
+ writer = new OutputStreamWriter(buf, "UTF8");
+ } catch (Exception e) {
+ e.printStackTrace();
+ writer = new OutputStreamWriter(buf);
+ }
+
+ for (int i = 0; i < path.length(); i++) {
+ int c = (int) path.charAt(i);
+ if (safeCharacters.get(c)) {
+ rewrittenPath.append((char)c);
+ } else {
+ // convert to external encoding before hex conversion
+ try {
+ writer.write((char)c);
+ writer.flush();
+ } catch(IOException e) {
+ buf.reset();
+ continue;
+ }
+ byte[] ba = buf.toByteArray();
+ for (int j = 0; j < ba.length; j++) {
+ // Converting each byte in the buffer
+ byte toEncode = ba[j];
+ rewrittenPath.append('%');
+ int low = (int) (toEncode & 0x0f);
+ int high = (int) ((toEncode & 0xf0) >> 4);
+ rewrittenPath.append(hexadecimal[high]);
+ rewrittenPath.append(hexadecimal[low]);
+ }
+ buf.reset();
+ }
+ }
+ return rewrittenPath.toString();
+ }
+}

Propchange: tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/util/URLEncoder.java
------------------------------------------------------------------------------
svn:eol-style = native

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@...
For additional commands, e-mail: dev-help@...

svn commit: r884416 [1/2] - in /tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat: addons/ servlets/config/ servlets/config/deploy/ servlets/file/ servlets/jmx/ servlets/jsp/ servlets/jspc/ servlets/sec/ servlets/session/ servlets/util/

2009-11-25T22:47:04Z

Author: costin
Date: Thu Nov 26 06:47:03 2009
New Revision: 884416

URL: http://svn.apache.org/viewvc?rev=884416&view=rev
Log:
Removed the 'addons' package, moved the interfaces close to the packages that define them, also
some code move around.

The web.xml parsing ( and some incipient 3.0 annotation processing ) is independent of tomcat, indended as
a user-library.

Added:
tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/config/
tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/config/ConfigLoader.java (with props)
tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/config/ServletContextConfig.java (with props)
tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/config/deploy/
tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/config/deploy/AnnotationsProcessor.java (with props)
tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/config/deploy/DomUtil.java (with props)
tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/config/deploy/WarDeploy.java (with props)
tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/config/deploy/WebXml.java (with props)
tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/file/Filesystem.java (with props)
tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/file/LocalFilesystem.java (with props)
tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/jmx/
tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/jmx/JMXProxyServlet.java (with props)
tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/jmx/JmxObjectManagerSpi.java (with props)
tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/jsp/BaseJspLoader.java (with props)
tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/jspc/
tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/jspc/JasperRuntime.java (with props)
tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/jspc/JspcServlet.java (with props)
tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/sec/UserAuthentication.java (with props)
tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/session/UserSessionManager.java (with props)
tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/util/Base64.java (with props)
tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/util/FastHttpDateFormat.java (with props)
tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/util/MimeMap.java (with props)
tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/util/URLEncoder.java (with props)
Removed:
tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/addons/Filesystem.java
tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/addons/UserAuthentication.java
tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/addons/UserSessionManager.java
tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/addons/UserTemplateClassMapper.java
tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/jsp/JasperCompilerTemplateClassMapper.java
tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/jsp/JspFileTemplateServlet.java
tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/jsp/SimpleTemplateClassMapper.java
Modified:
tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/file/DefaultServlet.java
tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/file/Dir2Html.java
tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/file/WebdavServlet.java
tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/jsp/WildcardTemplateServlet.java
tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/sec/AccessFilter.java
tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/sec/BasicAuthentication.java
tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/sec/FormAuthentication.java
tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/session/RandomGenerator.java
tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/session/SimpleSessionManager.java
tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/util/RequestUtil.java

Added: tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/config/ConfigLoader.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/config/ConfigLoader.java?rev=884416&view=auto
==============================================================================
--- tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/config/ConfigLoader.java (added)
+++ tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/config/ConfigLoader.java Thu Nov 26 06:47:03 2009
@@ -0,0 +1,32 @@
+/*
+ */
+package org.apache.tomcat.servlets.config;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+
+public class ConfigLoader {
+
+ public ServletContextConfig loadConfig(String basePath) {
+
+
+ String fileName = basePath + ServletContextConfig.SERIALIZED_PATH;
+ File f = new File(fileName);
+ if (f.exists()) {
+ ServletContextConfig contextConfig = new ServletContextConfig();
+ try {
+ ObjectInputStream ois = new ObjectInputStream(new FileInputStream(f));
+ contextConfig = (ServletContextConfig) ois.readObject();
+ return contextConfig;
+ } catch (Throwable e) {
+ System.err.println("Ignoring invalid .ser config " + e);
+ // ignore
+ }
+ }
+
+ return null;
+ }
+
+}

Propchange: tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/config/ConfigLoader.java
------------------------------------------------------------------------------
svn:eol-style = native

Added: tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/config/ServletContextConfig.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/config/ServletContextConfig.java?rev=884416&view=auto
==============================================================================
--- tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/config/ServletContextConfig.java (added)
+++ tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/config/ServletContextConfig.java Thu Nov 26 06:47:03 2009
@@ -0,0 +1,164 @@
+/**
+ *
+ */
+package org.apache.tomcat.servlets.config;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Struct representation of webapp configuration.
+ *
+ * All the data in web.xml, annotations, etc should be represented
+ * here. This class is serializable - but can be saved/loaded as
+ * json or any 'pojo' persistence.
+ *
+ *
+ * Public fields to make it easy to access it, we can add accessors.
+ * Naming should match the web.xml element name.
+ *
+ * @author Costin Manolache
+ */
+public class ServletContextConfig implements Serializable {
+
+ public static final String SERIALIZED_PATH = "/WEB-INF/deploy_web.ser";
+ private static final long serialVersionUID = 1728492145981883124L;
+
+ public static final int CURRENT_VERSION = 1;
+
+ public int version = CURRENT_VERSION;
+
+ /**
+ * Main config ( web.xml ) path and timestamp - touch it to reload.
+ */
+ public List<String> fileName = new ArrayList<String>();
+ public long timestamp;
+
+ public boolean full;
+
+ public String displayName;
+
+ public HashMap<String, String> contextParam = new HashMap<String, String>();
+
+ public HashMap<String, String> mimeMapping = new HashMap<String, String>(); // extension -> mime-type
+
+ public ArrayList<String> listenerClass = new ArrayList<String>();
+
+ public ArrayList<String> welcomeFileList = new ArrayList<String>();
+
+ // code -> location
+ public HashMap<String, String> errorPageCode= new HashMap<String, String>();
+
+ // exception -> location
+ public HashMap<String, String> errorPageException= new HashMap<String, String>();
+
+ public HashMap<String, String> localeEncodingMapping= new HashMap<String, String>(); // locale -> encoding
+
+ // public HashMap tagLibs; // uri->location
+ // jsp-property-group
+
+ // securityConstraint
+ public ArrayList<SecurityConstraintData> securityConstraint = new ArrayList<SecurityConstraintData>();
+
+ // loginConfig
+ public String authMethod;
+ public String realmName;
+ public String formLoginPage;
+ public String formErrorPage;
+
+ public ArrayList<String> securityRole = new ArrayList<String>();
+
+ // envEntry
+ public ArrayList<EnvEntryData> envEntry = new ArrayList<EnvEntryData>();
+
+ // ejbRef
+ // ejbLocalRef
+ // serviceRef
+ // resourceRef
+ // resourceEnvRef
+ // message-destination
+ // message-destinationRef
+ public HashMap<String, FilterData> filters = new HashMap<String, FilterData>();
+ public HashMap<String, ServletData> servlets = new HashMap<String, ServletData>();
+
+ public int sessionTimeout;
+ public boolean distributable;
+
+ public HashMap<String, String> servletMapping = new HashMap<String, String>(); // url -> servlet
+ public ArrayList<FilterMappingData> filterMappings = new ArrayList<FilterMappingData>();
+ public boolean metadataComplete = false;
+
+
+ // Normalized
+ public static class FilterMappingData implements Serializable {
+ private static final long serialVersionUID = -4533568066713041994L;
+ public String filterName;
+
+ // Only one of the 2
+ public String urlPattern;
+ public String servletName;
+
+ // REQUEST, FORWARD, INCLUDE, ERROR, ASYNC
+ public List<String> dispatcher = new ArrayList<String>();
+ }
+
+ public static class EnvEntryData implements Serializable {
+ private static final long serialVersionUID = 7023847615343715257L;
+ public String envEntryName;
+ public String envEntryType;
+ public String envEntryValue;
+ }
+
+ public static class ServiceData implements Serializable {
+ public String name;
+ public String className;
+
+ public Map<String, String> initParams = new HashMap<String, String>();
+
+ public boolean asyncSupported = false;
+ }
+
+ public static class FilterData extends ServiceData implements Serializable {
+ private static final long serialVersionUID = -535820271746973166L;
+ }
+
+ public static class ServletData extends ServiceData implements Serializable {
+ private static final long serialVersionUID = -3216904178501185930L;
+
+ public ServletData() {
+ }
+ public ServletData(String servletName, String servletClass) {
+ this.className = servletClass;
+ this.name = servletName;
+ }
+
+ public String jspFile;
+ public int loadOnStartup = -1;
+ public String runAs;
+ public Map<String, String> securityRoleRef = new HashMap<String, String>(); // roleName -> [roleLink]
+ public boolean multipartConfig = false;
+
+ public List<String> declaresRoles = new ArrayList<String>();
+
+ }
+
+ public static class WebResourceCollectionData implements Serializable {
+ public String webResourceName;
+ public ArrayList<String> urlPattern = new ArrayList<String>();
+ public ArrayList<String> httpMethod = new ArrayList<String>();
+ }
+
+ public static class SecurityConstraintData implements Serializable {
+ private static final long serialVersionUID = -4780214921810871769L;
+
+ public ArrayList<String> roleName = new ArrayList<String>(); // auth-constraint/role
+
+ public ArrayList<WebResourceCollectionData> webResourceCollection =
+ new ArrayList<WebResourceCollectionData>();
+ public String transportGuarantee;
+
+ }
+}
\ No newline at end of file

Propchange: tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/config/ServletContextConfig.java
------------------------------------------------------------------------------
svn:eol-style = native

Added: tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/config/deploy/AnnotationsProcessor.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/config/deploy/AnnotationsProcessor.java?rev=884416&view=auto
==============================================================================
--- tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/config/deploy/AnnotationsProcessor.java (added)
+++ tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/config/deploy/AnnotationsProcessor.java Thu Nov 26 06:47:03 2009
@@ -0,0 +1,339 @@
+/*
+ */
+package org.apache.tomcat.servlets.config.deploy;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.jar.JarEntry;
+import java.util.jar.JarFile;
+
+import org.apache.tomcat.servlets.config.ServletContextConfig;
+import org.apache.tomcat.servlets.config.ServletContextConfig.FilterData;
+import org.apache.tomcat.servlets.config.ServletContextConfig.FilterMappingData;
+import org.apache.tomcat.servlets.config.ServletContextConfig.ServiceData;
+import org.apache.tomcat.servlets.config.ServletContextConfig.ServletData;
+import org.objectweb.asm.ClassReader;
+import org.objectweb.asm.Type;
+import org.objectweb.asm.tree.AnnotationNode;
+import org.objectweb.asm.tree.ClassNode;
+import org.objectweb.asm.tree.MethodNode;
+
+
+// TODO: move to 'tools' dir, don't include in runtime
+// ( same for xml processor ) - use binary
+//
+
+// TODO: stupid ordering rules - probably will require merging configs
+// and other ugliness.
+
+// TODO: the even more brain-damaged ServletContextInitializer and
+// HandlesTypes - which requires recording all annotations for all classes,
+// and worse - all the hierarchy to detect annotations on super.
+
+/**
+ * Post-compile or deploy tool: will scan classes and jars and
+ * generate an annotation file.
+ *
+ * Will process:
+ * - annotations - for each class
+ * - find tld descriptors
+ * - web.xml and fragments
+ *
+ * Output: a .ser file, for faster tomcat startup and a 'compete'
+ * web.xml file.
+ *
+ * Tomcat should not read all classes each time it starts, or
+ * depend on bcel at runtime.
+ *
+ * Servlet spec makes the worst use of annotations by requiring
+ * scanning all classes. This should be a compile-time tool only !
+ *
+ * @author Costin Manolache
+ */
+public class AnnotationsProcessor {
+
+ String baseDir;
+ ServletContextConfig cfg;
+
+
+
+ public AnnotationsProcessor(ServletContextConfig cfg2) {
+ this.cfg = cfg2;
+ }
+
+ public void processWebapp(String baseN) throws IOException {
+ if (!baseN.endsWith("/")) {
+ baseN = baseN + "/";
+ }
+ processDir(baseN + "classes");
+
+ File lib = new File(baseN + "lib");
+ if (!lib.isDirectory()) {
+ return;
+ }
+ File[] files = lib.listFiles();
+ if (files == null) {
+ return;
+ }
+
+ for (File f: files) {
+ if (!f.isDirectory() && f.getName().endsWith(".jar")) {
+ processJar(f.getCanonicalPath());
+ }
+ }
+ }
+
+ public void processJar(String path) throws IOException {
+ JarFile jar = new JarFile(path);
+ Enumeration<JarEntry> entries = jar.entries();
+ while (entries.hasMoreElements()) {
+ JarEntry entry = entries.nextElement();
+ String name = entry.getName();
+ if (name.endsWith(".class")) {
+ processClass(jar.getInputStream(entry),
+ "", name);
+ } else if (name.equals("META-INF/services/javax.servlet.ServletContainerInitializer")) {
+
+ }
+
+ }
+ }
+
+ public void processDir(String base) throws IOException {
+ // TODO: keep track of files to avoid loops
+ processDir(new File(base));
+ }
+
+ public void processDir(File base) throws IOException {
+ if (!base.isDirectory()) {
+ return;
+ }
+ String baseN = base.getCanonicalPath();
+ if (!baseN.endsWith("/")) {
+ baseN = baseN + "/";
+ }
+
+ File[] files = base.listFiles();
+ if (files != null) {
+ for (File f: files) {
+ if (f.isDirectory()) {
+ System.err.println(f);
+ processDir(f);
+ } else if (f.getName().endsWith(".class")) {
+ try {
+ processClass(new FileInputStream(f), base.getCanonicalPath(),
+ f.getCanonicalPath());
+ } catch (IOException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+ }
+ }
+ }
+
+ }
+
+ private static Map<String, Object> asmList2Map(List list) {
+ Map<String, Object> values = new HashMap();
+ for (int i = 0; i < list.size(); i+= 2) {
+ String name = (String) list.get(i);
+ Object val = list.get(i + 1);
+ values.put(name, val);
+ }
+ return values;
+ }
+
+ private static Map<String, AnnotationNode> annotationMap(List annL) {
+ Map<String, AnnotationNode> values = new HashMap();
+ if (annL != null) {
+ for (Object annO: annL) {
+ AnnotationNode ann = (AnnotationNode) annO;
+ String name = Type.getType(ann.desc).toString();
+ values.put(name, ann);
+ }
+ }
+ return values;
+ }
+
+
+
+ public void processClass(InputStream classStream,
+ String base,
+ String classFile) throws IOException {
+ String classPath = classFile.substring(base.length() + 1);
+ classPath = classPath.substring(0, classPath.length() - ".class".length());
+ classPath = classPath.replace("/", ".");
+
+ ClassReader classReader = new ClassReader(classStream);
+ ClassNode cN = new ClassNode();
+ classReader.accept(cN,
+ ClassReader.SKIP_CODE + ClassReader.SKIP_DEBUG + ClassReader.SKIP_FRAMES);
+
+ String className = cN.name;
+
+ Map<String, AnnotationNode> annotations = annotationMap(cN.visibleAnnotations);
+
+ processServlets(className, annotations, cN);
+ processWebFilter(className, annotations);
+
+ AnnotationNode listenerA = annotations.get("javax.servlet.annotation.WebListener");
+ if (listenerA != null) {
+ // TODO: checks
+ cfg.listenerClass.add(className);
+ }
+
+
+// for (AnnotationNode mN : annotations.values()) {
+// String ann = Type.getType(mN.desc).toString();
+// Map<String, Object> values = asmList2Map(mN.values);
+//
+// if ("javax.servlet.annotation.HandlesTypes".equals(ann)) {
+// } else if ("javax.servlet.annotation.MultipartConfig".equals(ann)) {
+// } else if ("javax.annotation.security.RunAs".equals(ann)) {
+// } else if ("javax.annotation.security.DeclareRoles".equals(ann)) {
+// } else if ("javax.annotation.security.RolesAllowed".equals(ann)) {
+// } else if ("javax.annotation.security.DenyAll".equals(ann)) {
+// } else if ("javax.annotation.security.PermitAll".equals(ann)) {
+// } else if ("javax.servlet.annotation.WebFilter".equals(ann)) {
+// } else if ("javax.servlet.annotation.WebServlet".equals(ann)) {
+// // in WebServlet
+// } else if ("javax.servlet.annotation.WebListener".equals(ann)) {
+// } else if ("javax.servlet.annotation.WebInitParam".equals(ann)) {
+// // In WebServlet, (WebFilter)
+// } else {
+// System.err.println("\n" + className + " " + Type.getType(mN.desc));
+// }
+// }
+
+ }
+
+ private void processServlets(String className,
+ Map<String, AnnotationNode> annotations, ClassNode cn) {
+
+ AnnotationNode webServletA =
+ annotations.get("javax.servlet.annotation.WebServlet");
+ if (webServletA != null) {
+ ServletData sd = new ServletData();
+ // TODO: validity checks (implements servlet, etc)
+ Map<String, Object> params = asmList2Map(webServletA.values);
+
+ processService(className, webServletA,
+ sd, params);
+
+ if (params.containsKey("loadOnStartup")) {
+ sd.loadOnStartup = (Integer)params.get("loadOnStartup");
+ }
+ if (annotations.get("javax.servlet.annotation.MultipartConfig") != null) {
+ sd.multipartConfig = true;
+ }
+
+ AnnotationNode declareA = annotations.get("javax.annotation.security.DeclareRoles");
+ if (declareA != null) {
+ Map<String, Object> runAsParams = asmList2Map(declareA.values);
+ ArrayList roles = (ArrayList) runAsParams.get("value");
+ for (Object r: roles) {
+ sd.declaresRoles.add((String) r);
+ }
+ }
+
+ AnnotationNode runAsA = annotations.get("javax.annotation.security.RunAs");
+ if (runAsA != null) {
+ Map<String, Object> runAsParams = asmList2Map(runAsA.values);
+
+ sd.runAs = (String) runAsParams.get("value");
+ }
+
+ cfg.servlets.put(sd.name, sd);
+
+ ArrayList urls = (ArrayList) params.get("urlPatterns");
+ if (urls == null) {
+ urls = (ArrayList) params.get("value");
+ }
+
+ for (Object urlO: urls) {
+ cfg.servletMapping.put((String) urlO,
+ sd.name);
+ }
+
+ // TODO: collect them, add on each of the URLs
+ // TODO: also on methods
+ AnnotationNode rolesA = annotations.get("javax.annotation.security.RolesAllowed");
+ if (rolesA != null) {
+
+ }
+ for (Object o: cn.methods) {
+ MethodNode methodNode = (MethodNode) o;
+ System.err.println(methodNode.desc);
+ }
+
+
+
+ }
+ }
+
+ private void processWebFilter(String className,
+ Map<String, AnnotationNode> annotations) {
+ AnnotationNode webFilterA = annotations.get("javax.servlet.annotation.WebServlet");
+ if (webFilterA != null) {
+ // TODO: validity checks (implements servlet, etc)
+
+ FilterData sd = new FilterData();
+ Map<String, Object> params = asmList2Map(webFilterA.values);
+
+ processService(className, webFilterA, sd, params);
+
+ if (params.containsKey("asyncSupported")) {
+ sd.asyncSupported = (Boolean) params.get("asyncSupported");
+ }
+
+ cfg.filters.put(sd.name, sd);
+
+ ArrayList urls = (ArrayList) params.get("urlPatterns");
+ if (urls == null) {
+ urls = (ArrayList) params.get("value");
+ }
+ for (Object urlO: urls) {
+ FilterMappingData fmap = new FilterMappingData();
+ fmap.filterName = sd.name;
+ fmap.urlPattern = (String) urlO;
+
+ cfg.filterMappings.add(fmap);
+ }
+ }
+ }
+
+ private ServiceData processService(String className,
+ AnnotationNode webServletA, ServiceData sd, Map<String, Object> params) {
+
+ sd.name = (String) params.get("name");
+ if (sd.name == null) {
+ sd.name = className;
+ }
+ sd.className = className;
+
+ if (params.containsKey("initParams")) {
+ ArrayList initParamL = (ArrayList) params.get("initParams");
+ for (Object initParamO: initParamL) {
+ AnnotationNode initParamA = (AnnotationNode) initParamO;
+
+ Map<String, Object> initParams = asmList2Map(initParamA.values);
+ sd.initParams.put((String) initParams.get("name"),
+ (String) initParams.get("value"));
+ }
+ }
+
+ if (params.containsKey("asyncSupported")) {
+ sd.asyncSupported = (Boolean) params.get("asyncSupported");
+ }
+ return sd;
+ }
+
+
+}

Propchange: tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/config/deploy/AnnotationsProcessor.java
------------------------------------------------------------------------------
svn:eol-style = native

Added: tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/config/deploy/DomUtil.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/config/deploy/DomUtil.java?rev=884416&view=auto
==============================================================================
--- tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/config/deploy/DomUtil.java (added)
+++ tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/config/deploy/DomUtil.java Thu Nov 26 06:47:03 2009
@@ -0,0 +1,240 @@
+package org.apache.tomcat.servlets.config.deploy;
+
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.StringReader;
+import java.util.logging.Logger;
+
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+
+import org.w3c.dom.Document;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Node;
+import org.xml.sax.EntityResolver;
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
+
+
+/**
+ * Few simple utils to read DOM
+ *
+ * @author Costin Manolache
+ */
+public class DomUtil {
+ private static Logger log=
+ Logger.getLogger( DomUtil.class.getName() );
+
+ // -------------------- DOM utils --------------------
+
+ /** Get the trimed text content of a node or null if there is no text
+ */
+ public static String getContent(Node n ) {
+ if( n==null ) return null;
+ Node n1=DomUtil.getChild(n, Node.TEXT_NODE);
+
+ if( n1==null ) return null;
+
+ String s1=n1.getNodeValue();
+ return s1.trim();
+ }
+
+ /** Get the first element child.
+ * @param parent lookup direct childs
+ * @param name name of the element. If null return the first element.
+ */
+ public static Node getChild( Node parent, String name ) {
+ if( parent==null ) return null;
+ Node first=parent.getFirstChild();
+ if( first==null ) return null;
+
+ for (Node node = first; node != null;
+ node = node.getNextSibling()) {
+ //System.out.println("getNode: " + name + " " + node.getNodeName());
+ if( node.getNodeType()!=Node.ELEMENT_NODE)
+ continue;
+ if( name != null &&
+ name.equals( node.getNodeName() ) ) {
+ return node;
+ }
+ if( name == null ) {
+ return node;
+ }
+ }
+ return null;
+ }
+
+ public static String getAttribute(Node element, String attName ) {
+ NamedNodeMap attrs=element.getAttributes();
+ if( attrs==null ) return null;
+ Node attN=attrs.getNamedItem(attName);
+ if( attN==null ) return null;
+ return attN.getNodeValue();
+ }
+
+ public static void setAttribute(Node node, String attName, String val) {
+ NamedNodeMap attributes=node.getAttributes();
+ Node attNode=node.getOwnerDocument().createAttribute(attName);
+ attNode.setNodeValue( val );
+ attributes.setNamedItem(attNode);
+ }
+
+ public static void removeAttribute( Node node, String attName ) {
+ NamedNodeMap attributes=node.getAttributes();
+ attributes.removeNamedItem(attName);
+ }
+
+
+ /** Set or replace the text value
+ */
+ public static void setText(Node node, String val) {
+ Node chld=DomUtil.getChild(node, Node.TEXT_NODE);
+ if( chld == null ) {
+ Node textN=node.getOwnerDocument().createTextNode(val);
+ node.appendChild(textN);
+ return;
+ }
+ // change the value
+ chld.setNodeValue(val);
+ }
+
+ /** Find the first direct child with a given attribute.
+ * @param parent
+ * @param elemName name of the element, or null for any
+ * @param attName attribute we're looking for
+ * @param attVal attribute value or null if we just want any
+ */
+ public static Node findChildWithAtt(Node parent, String elemName,
+ String attName, String attVal) {
+
+ Node child=DomUtil.getChild(parent, Node.ELEMENT_NODE);
+ if( attVal== null ) {
+ while( child!= null &&
+ ( elemName==null || elemName.equals( child.getNodeName())) &&
+ DomUtil.getAttribute(child, attName) != null ) {
+ child=getNext(child, elemName, Node.ELEMENT_NODE );
+ }
+ } else {
+ while( child!= null &&
+ ( elemName==null || elemName.equals( child.getNodeName())) &&
+ ! attVal.equals( DomUtil.getAttribute(child, attName)) ) {
+ child=getNext(child, elemName, Node.ELEMENT_NODE );
+ }
+ }
+ return child;
+ }
+
+
+ /** Get the first child's content ( ie it's included TEXT node ).
+ */
+ public static String getChildContent( Node parent, String name ) {
+ Node first=parent.getFirstChild();
+ if( first==null ) return null;
+ for (Node node = first; node != null;
+ node = node.getNextSibling()) {
+ //System.out.println("getNode: " + name + " " + node.getNodeName());
+ if( name.equals( node.getNodeName() ) ) {
+ return getContent( node );
+ }
+ }
+ return null;
+ }
+
+ /** Get the first direct child with a given type
+ */
+ public static Node getChild( Node parent, int type ) {
+ Node n=parent.getFirstChild();
+ while( n!=null && type != n.getNodeType() ) {
+ n=n.getNextSibling();
+ }
+ if( n==null ) return null;
+ return n;
+ }
+
+ /** Get the next sibling with the same name and type
+ */
+ public static Node getNext( Node current ) {
+ String name=current.getNodeName();
+ int type=current.getNodeType();
+ return getNext( current, name, type);
+ }
+
+ /** Return the next sibling with a given name and type
+ */
+ public static Node getNext( Node current, String name, int type) {
+ Node first=current.getNextSibling();
+ if( first==null ) return null;
+
+ for (Node node = first; node != null;
+ node = node.getNextSibling()) {
+
+ if( type >= 0 && node.getNodeType() != type ) continue;
+ //System.out.println("getNode: " + name + " " + node.getNodeName());
+ if( name==null )
+ return node;
+ if( name.equals( node.getNodeName() ) ) {
+ return node;
+ }
+ }
+ return null;
+ }
+
+ public static class NullResolver implements EntityResolver {
+ public InputSource resolveEntity (String publicId,
+ String systemId)
+ throws SAXException, IOException
+ {
+// if( log.isTraceEnabled())
+// log.trace("ResolveEntity: " + publicId + " " + systemId);
+ return new InputSource(new StringReader(""));
+ }
+ }
+
+// public static void setAttributes( Object o, Node parent)
+// {
+// NamedNodeMap attrs=parent.getAttributes();
+// if( attrs==null ) return;
+//
+// for (int i=0; i<attrs.getLength(); i++ ) {
+// Node n=attrs.item(i);
+// String name=n.getNodeName();
+// String value=n.getNodeValue();
+//
+//// if( log.isTraceEnabled() )
+//// log.trace("Attribute " + parent.getNodeName() + " " +
+//// name + "=" + value);
+// try {
+// IntrospectionUtils.setProperty(o, name, value);
+// } catch( Exception ex ) {
+// ex.printStackTrace();
+// }
+// }
+// }
+
+ /** Read XML as DOM.
+ */
+ public static Document readXml(InputStream is)
+ throws SAXException, IOException, ParserConfigurationException
+ {
+ DocumentBuilderFactory dbf =
+ DocumentBuilderFactory.newInstance();
+
+ dbf.setValidating(false);
+ dbf.setIgnoringComments(false);
+ dbf.setIgnoringElementContentWhitespace(true);
+ //dbf.setCoalescing(true);
+ //dbf.setExpandEntityReferences(true);
+
+ DocumentBuilder db = null;
+ db = dbf.newDocumentBuilder();
+ db.setEntityResolver( new NullResolver() );
+
+ // db.setErrorHandler( new MyErrorHandler());
+
+ Document doc = db.parse(is);
+ return doc;
+ }
+
+}

Propchange: tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/config/deploy/DomUtil.java
------------------------------------------------------------------------------
svn:eol-style = native

Added: tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/config/deploy/WarDeploy.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/config/deploy/WarDeploy.java?rev=884416&view=auto
==============================================================================
--- tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/config/deploy/WarDeploy.java (added)
+++ tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/config/deploy/WarDeploy.java Thu Nov 26 06:47:03 2009
@@ -0,0 +1,116 @@
+/*
+ */
+package org.apache.tomcat.servlets.config.deploy;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.ObjectOutputStream;
+
+import org.apache.tomcat.servlets.config.ConfigLoader;
+import org.apache.tomcat.servlets.config.ServletContextConfig;
+
+/**
+ * Independent of tomcat-lite - will read the current context config,
+ * parse classes/jars for annotations - and generate a .ser file
+ * containing all info.
+ *
+ * This can be used to display informations about the config ( in a
+ * container-independent servlet ), or by the container for faster
+ * load times.
+ *
+ * @author Costin Manolache
+ */
+public class WarDeploy extends ConfigLoader implements Runnable {
+
+ public ServletContextConfig loadConfig(String basePath) {
+ ServletContextConfig contextConfig = super.loadConfig(basePath);
+
+ boolean needsDeploy = contextConfig == null;
+
+ if (contextConfig != null) {
+ if (contextConfig.version != ServletContextConfig.CURRENT_VERSION) {
+ needsDeploy = true;
+ } else {
+ // Check web.xml and other dep file timestamp(s)
+ for (String fn : contextConfig.fileName) {
+ File f = new File(fn);
+ if (f.lastModified() > contextConfig.timestamp) {
+ needsDeploy = true;
+ break;
+ }
+ }
+ }
+ }
+
+ if (needsDeploy) {
+ setBase(basePath);
+ run();
+ contextConfig = super.loadConfig(basePath);
+ }
+
+ return contextConfig;
+ }
+
+ @Override
+ public void run() {
+ if (base == null) {
+ return; // nothing we can do
+ }
+
+ ServletContextConfig contextConfig = new ServletContextConfig();
+ contextConfig.timestamp = System.currentTimeMillis();
+
+ File webXmlF = new File(base + "/WEB-INF/web.xml");
+ boolean needsAnnotations = true;
+
+ if (webXmlF.exists()) {
+ WebXml webXml = new WebXml(contextConfig);
+ try {
+ webXml.readWebXml(base + "/WEB-INF/web.xml");
+ if (contextConfig.metadataComplete) {
+ needsAnnotations = false;
+ }
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+ try {
+ if (needsAnnotations) {
+ AnnotationsProcessor ap = new AnnotationsProcessor(contextConfig);
+ ap.processWebapp(base);
+ }
+ } catch (IOException ex) {
+ ex.printStackTrace();
+ }
+
+
+ // Save
+ try {
+ ObjectOutputStream ois =
+ new ObjectOutputStream(new FileOutputStream(base +
+ ServletContextConfig.SERIALIZED_PATH));
+ ois.writeObject(contextConfig);
+ ois.close();
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+
+ }
+
+ String base;
+
+
+ public static void main(String[] args) {
+ String base = args[0];
+ WarDeploy wd = new WarDeploy();
+ wd.setBase(base);
+ wd.run();
+ }
+
+ private void setBase(String base) {
+ this.base = base;
+ }
+
+}

Propchange: tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/config/deploy/WarDeploy.java
------------------------------------------------------------------------------
svn:eol-style = native

Added: tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/config/deploy/WebXml.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/config/deploy/WebXml.java?rev=884416&view=auto
==============================================================================
--- tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/config/deploy/WebXml.java (added)
+++ tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/config/deploy/WebXml.java Thu Nov 26 06:47:03 2009
@@ -0,0 +1,397 @@
+/*
+ */
+package org.apache.tomcat.servlets.config.deploy;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.Enumeration;
+import java.util.Map;
+import java.util.jar.JarEntry;
+import java.util.jar.JarFile;
+
+import javax.servlet.ServletException;
+
+import org.apache.tomcat.servlets.config.ServletContextConfig;
+import org.apache.tomcat.servlets.config.ServletContextConfig.EnvEntryData;
+import org.apache.tomcat.servlets.config.ServletContextConfig.FilterData;
+import org.apache.tomcat.servlets.config.ServletContextConfig.FilterMappingData;
+import org.apache.tomcat.servlets.config.ServletContextConfig.SecurityConstraintData;
+import org.apache.tomcat.servlets.config.ServletContextConfig.ServletData;
+import org.apache.tomcat.servlets.config.ServletContextConfig.WebResourceCollectionData;
+import org.w3c.dom.Document;
+import org.w3c.dom.Node;
+
+/**
+ * General-purpose utility to process an web.xml file. Result
+ * is a tree of objects starting with WebAppData.
+ *
+ * TODO: allow writting of web.xml, allow modification ( preserving
+ * comments )
+ *
+ * @author costin
+ */
+public class WebXml {
+ ServletContextConfig d;
+
+ public WebXml(ServletContextConfig cfg) {
+ d = cfg;
+ }
+
+ public void processJar(String path) throws IOException {
+ JarFile jar = new JarFile(path);
+ Enumeration<JarEntry> entries = jar.entries();
+ while (entries.hasMoreElements()) {
+ JarEntry entry = entries.nextElement();
+ String name = entry.getName();
+ if (name.equals("META-INF/web-fragment.xml")) {
+ processFragment(jar.getInputStream(entry));
+ }
+ }
+ }
+
+ private void processFragment(InputStream inputStream) throws IOException {
+ readWebXml(inputStream, "web-fragment");
+
+ }
+
+ public void readWebXml(String baseDir) throws IOException {
+ readWebXml(baseDir, "web-app");
+ }
+
+ public void readWebXml(String baseDir, String topName) throws IOException {
+ try {
+ File webXmlFile = new File(baseDir);
+ if (!webXmlFile.exists()) {
+ return;
+ }
+ d.fileName.add(webXmlFile.getCanonicalPath());
+
+ FileInputStream fileInputStream = new FileInputStream(webXmlFile);
+ readWebXml(fileInputStream, topName);
+ } catch (Exception e) {
+ e.printStackTrace();
+ throw new IOException(e.getMessage());
+ }
+ }
+
+ public void readWebXml(InputStream fileInputStream, String topName)
+ throws IOException {
+ try {
+
+ Document document = DomUtil.readXml(fileInputStream);
+ Node webappNode = DomUtil.getChild(document, topName);
+
+ String fullS = DomUtil.getAttribute(webappNode, "full");
+ if (fullS != null && fullS.equalsIgnoreCase("true")) {
+ d.full = true;
+ }
+ String metaCompleteS = DomUtil.getAttribute(webappNode, "full");
+ if ("true".equalsIgnoreCase(metaCompleteS)) {
+ d.metadataComplete = true;
+ }
+
+ d.displayName = DomUtil.getAttribute(webappNode, "display-name");
+
+ // Process each child of web-app
+ Node confNode = DomUtil.getChild(webappNode, "filter");
+ while (confNode != null ) {
+ processFilter(confNode);
+ confNode = DomUtil.getNext(confNode);
+ }
+
+ confNode = DomUtil.getChild(webappNode, "filter-mapping");
+ while (confNode != null ) {
+ processFilterMapping(confNode);
+ confNode = DomUtil.getNext(confNode);
+ }
+
+ confNode = DomUtil.getChild(webappNode, "context-param");
+ while (confNode != null ) {
+ String n = DomUtil.getChildContent(confNode, "param-name").trim();
+ String v = DomUtil.getChildContent(confNode, "param-value").trim();
+ d.contextParam.put(n, v);
+ confNode = DomUtil.getNext(confNode);
+ }
+
+ confNode = DomUtil.getChild(webappNode, "mime-mapping");
+ while (confNode != null ) {
+ String n = DomUtil.getChildContent(confNode, "extension");
+ String t = DomUtil.getChildContent(confNode, "mime-type");
+ d.mimeMapping.put(n, t);
+ confNode = DomUtil.getNext(confNode);
+ }
+
+ confNode = DomUtil.getChild(webappNode, "error-page");
+ while (confNode != null ) {
+ processErrorPage(confNode);
+ confNode = DomUtil.getNext(confNode);
+ }
+
+ confNode = DomUtil.getChild(webappNode, "jsp-config");
+ while (confNode != null ) {
+ processJspConfig(confNode);
+ confNode = DomUtil.getNext(confNode);
+ }
+
+ confNode = DomUtil.getChild(webappNode, "servlet");
+ while (confNode != null ) {
+ processServlet(confNode);
+ confNode = DomUtil.getNext(confNode);
+ }
+
+ confNode = DomUtil.getChild(webappNode, "servlet-mapping");
+ while (confNode != null ) {
+ processServletMapping(confNode);
+ confNode = DomUtil.getNext(confNode);
+ }
+
+ confNode = DomUtil.getChild(webappNode, "listener");
+ while (confNode != null ) {
+ String lClass = DomUtil.getChildContent(confNode, "listener-class");
+ d.listenerClass.add(lClass);
+ confNode = DomUtil.getNext(confNode);
+ }
+
+ confNode = DomUtil.getChild(webappNode, "security-constraint");
+ while (confNode != null ) {
+ processSecurityConstraint(confNode);
+ confNode = DomUtil.getNext(confNode);
+ }
+
+ confNode = DomUtil.getChild(webappNode, "login-config");
+ while (confNode != null ) {
+ processLoginConfig(confNode);
+ confNode = DomUtil.getNext(confNode);
+ if (confNode != null)
+ throw new ServletException("Multiple login-config");
+ }
+
+ confNode = DomUtil.getChild(webappNode, "session-config");
+ while (confNode != null ) {
+ String n = DomUtil.getChildContent(confNode, "session-timeout");
+ int stout = Integer.parseInt(n);
+ d.sessionTimeout = stout;
+ confNode = DomUtil.getNext(confNode);
+ if (confNode != null)
+ throw new ServletException("Multiple session-config");
+ }
+
+ confNode = DomUtil.getChild(webappNode, "welcome-file-list");
+ while (confNode != null ) {
+ Node wf = DomUtil.getChild(confNode, "welcome-file");
+ while (wf != null) {
+ String file = DomUtil.getContent(wf);
+ d.welcomeFileList.add(file);
+ wf = DomUtil.getNext(wf);
+ }
+ // more sections ?
+ confNode = DomUtil.getNext(confNode);
+ }
+
+ // Not supported right now - TODO: collect, have jndi plugin
+ confNode = DomUtil.getChild(webappNode, "env-entry");
+ while (confNode != null ) {
+ processEnvEntry(confNode);
+ confNode = DomUtil.getNext(confNode);
+ }
+
+ confNode = DomUtil.getChild(webappNode, "locale-encoding-mapping-list");
+ while (confNode != null ) {
+ confNode = DomUtil.getNext(confNode);
+ String n = DomUtil.getChildContent(confNode, "locale");
+ String t = DomUtil.getChildContent(confNode, "encoding");
+ d.localeEncodingMapping.put(n, t);
+ }
+
+ confNode = DomUtil.getChild(webappNode, "distributable");
+ while (confNode != null ) {
+ d.distributable = true;
+ confNode = DomUtil.getNext(confNode);
+ }
+
+ confNode = DomUtil.getChild(confNode, "security-role");
+ while (confNode != null ) {
+ String n = DomUtil.getChildContent(confNode, "role-name");
+ d.securityRole.add(n);
+ confNode = DomUtil.getNext(confNode);
+ }
+
+ } catch (Exception e) {
+ e.printStackTrace();
+ throw new IOException(e.getMessage());
+ }
+ }
+
+ private void processJspConfig(Node confNode) {
+ Node tagLib = DomUtil.getChild(confNode, "taglib");
+ while (tagLib != null) {
+ String uri = DomUtil.getChildContent(tagLib, "taglib-uri");
+ String l = DomUtil.getChildContent(tagLib, "taglib-location");
+ //d.tagLibs.put(uri, l);
+ tagLib = DomUtil.getNext(tagLib);
+ }
+
+ tagLib = DomUtil.getChild(confNode, "jsp-property-group");
+ while (tagLib != null) {
+ // That would be the job of the JSP servlet to process.
+ tagLib = DomUtil.getNext(tagLib);
+ }
+ }
+
+ private void processEnvEntry(Node confNode) {
+ EnvEntryData ed = new EnvEntryData();
+ ed.envEntryName = DomUtil.getChildContent(confNode,"env-entry-name");
+ ed.envEntryType = DomUtil.getChildContent(confNode,"env-entry-type");
+ ed.envEntryValue = DomUtil.getChildContent(confNode,"env-entry-value");
+ d.envEntry.add(ed);
+ }
+
+ private void processLoginConfig(Node confNode) {
+ d.authMethod = DomUtil.getChildContent(confNode,"auth-method");
+ d.realmName = DomUtil.getChildContent(confNode,"auth-method");
+ Node formNode = DomUtil.getChild(confNode, "form-login-config");
+ if (formNode != null) {
+ d.formLoginPage = DomUtil.getChildContent(formNode,"form-login-page");
+ d.formErrorPage = DomUtil.getChildContent(formNode,"form-error-page");
+ }
+ }
+
+ private void processSecurityConstraint(Node confNode) {
+ SecurityConstraintData sd = new SecurityConstraintData();
+ Node cn = DomUtil.getChild(confNode, "web-resource-collection");
+ while (cn != null) {
+ WebResourceCollectionData wrd = new WebResourceCollectionData();
+ wrd.webResourceName = DomUtil.getChildContent(cn, "web-resource-name");
+ Node scn = DomUtil.getChild(cn,"url-pattern");
+ while (scn != null) {
+ wrd.urlPattern.add(DomUtil.getContent(scn));
+ scn = DomUtil.getNext(scn);
+ }
+ scn = DomUtil.getChild(cn,"http-method");
+ while (scn != null) {
+ wrd.httpMethod.add(DomUtil.getContent(scn));
+ scn = DomUtil.getNext(scn);
+ }
+ cn = DomUtil.getNext(cn);
+ sd.webResourceCollection.add(wrd);
+ }
+
+ d.securityConstraint.add(sd);
+ }
+
+ private void processErrorPage(Node confNode) {
+ String name = DomUtil.getChildContent(confNode,"location");
+ String c = DomUtil.getChildContent(confNode,"error-code");
+ String t = DomUtil.getChildContent(confNode,"exception-type");
+ if (c != null) {
+ d.errorPageCode.put(c, name);
+ }
+ if (t != null) {
+ d.errorPageException.put(t, name);
+ }
+ }
+
+ private void processServlet(Node confNode) throws ServletException {
+ ServletData sd = new ServletData();
+
+ sd.name = DomUtil.getChildContent(confNode,"servlet-name");
+ sd.className = DomUtil.getChildContent(confNode,"servlet-class");
+ sd.jspFile = DomUtil.getChildContent(confNode,"jsp-file");
+
+ processInitParams(confNode, sd.initParams);
+
+ d.servlets.put( sd.name, sd );
+
+ String los = DomUtil.getChildContent(confNode, "load-on-startup");
+ if (los != null ) {
+ sd.loadOnStartup = Integer.parseInt(los);
+ }
+
+ Node sn = DomUtil.getChild(confNode, "security-role-ref");
+ while (sn != null ) {
+ String roleName = DomUtil.getChildContent(sn, "role-name");
+ String roleLink = DomUtil.getChildContent(sn, "role-link");
+ if (roleLink == null) {
+ sd.securityRoleRef.put(roleName, "");
+ } else {
+ sd.securityRoleRef.put(roleName, roleLink);
+ }
+ sn = DomUtil.getNext(sn);
+ }
+ }
+
+ private void processInitParams(Node confNode, Map initParams) {
+ Node initN = DomUtil.getChild(confNode, "init-param");
+ while (initN != null ) {
+ String n = DomUtil.getChildContent(initN, "param-name");
+ String v = DomUtil.getChildContent(initN, "param-value");
+ initParams.put(n, v);
+ initN = DomUtil.getNext(initN);
+ }
+ }
+
+ private void processServletMapping(Node confNode) {
+ String name = DomUtil.getChildContent(confNode,"servlet-name");
+ Node dataN = DomUtil.getChild(confNode, "url-pattern");
+ while (dataN != null) {
+ String path = DomUtil.getContent(dataN).trim();
+ dataN = DomUtil.getNext(dataN);
+
+ if (! (path.startsWith("/") || path.startsWith("*"))) {
+ // backward compat
+ path = "/" + path;
+ }
+ d.servletMapping.put(path, name);
+ }
+ }
+
+ private void processFilterMapping(Node confNode) {
+ String filterName = DomUtil.getChildContent(confNode,"filter-name");
+ // multiple
+ ArrayList dispatchers = new ArrayList();
+ Node dataN = DomUtil.getChild(confNode, "dispatcher");
+ while (dataN != null ) {
+ String d = DomUtil.getContent(dataN);
+ dispatchers.add(d);
+ dataN = DomUtil.getNext(dataN);
+ }
+
+ // Multiple url-pattern and servlet-name in one
+ // mapping rule. Need to be applied in order.
+ dataN = DomUtil.getChild(confNode, "url-pattern");
+ while (dataN != null ) {
+ FilterMappingData fm = new FilterMappingData();
+ fm.filterName = filterName;
+ fm.dispatcher = dispatchers;
+ String path = DomUtil.getContent(dataN);
+ dataN = DomUtil.getNext(dataN);
+ fm.urlPattern = path;
+ d.filterMappings.add(fm);
+ }
+ dataN = DomUtil.getChild(confNode, "servlet-name");
+ while (dataN != null ) {
+ FilterMappingData fm = new FilterMappingData();
+ fm.filterName = filterName;
+ fm.dispatcher = dispatchers;
+ String sn = DomUtil.getContent(dataN);
+ dataN = DomUtil.getNext(dataN);
+ fm.servletName = sn;
+ d.filterMappings.add(fm);
+ }
+ }
+
+ private void processFilter(Node confNode) {
+ String name = DomUtil.getChildContent(confNode,"filter-name");
+ String sclass = DomUtil.getChildContent(confNode,"filter-class");
+
+ FilterData fd = new FilterData();
+ processInitParams(confNode, fd.initParams);
+ fd.name = name;
+ fd.className = sclass;
+ d.filters.put(name, fd);
+ }
+
+}

Propchange: tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/config/deploy/WebXml.java
------------------------------------------------------------------------------
svn:eol-style = native

Modified: tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/file/DefaultServlet.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/file/DefaultServlet.java?rev=884416&r1=884415&r2=884416&view=diff
==============================================================================
--- tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/file/DefaultServlet.java (original)
+++ tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/file/DefaultServlet.java Thu Nov 26 06:47:03 2009
@@ -40,11 +40,8 @@
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-
-import org.apache.tomcat.addons.Filesystem;
-import org.apache.tomcat.integration.ObjectManager;
-import org.apache.tomcat.integration.simple.ServletHelper;
import org.apache.tomcat.servlets.util.Range;
+import org.apache.tomcat.servlets.util.URLEncoder;

/**
* The default resource-serving servlet for most web applications,
@@ -126,8 +123,6 @@

// --------------------------------------------------------- Public Methods
-
- protected ObjectManager om;
protected Filesystem fs;

/**
@@ -135,14 +130,15 @@
*/
public void destroy() {
}
-
-
+
/**
* Initialize this servlet.
*/
public void init() throws ServletException {
- om = ServletHelper.getObjectManager(getServletContext());
- fs = (Filesystem) om.get(Filesystem.class.getName());
+ if (fs == null) {
+ // R/O - no write
+ fs = new Filesystem();
+ }

String realPath = getServletContext().getRealPath("/");
basePath = new File(realPath);
@@ -517,9 +513,8 @@
&& (request.getHeader("Range") == null) )
|| (ranges == FULL) ) {

- processFullFile(response, content, resFile, contentType,
- contentLength, ostream, writer);
-
+ processSingleRange(response, content, resFile, contentType,
+ ostream, writer, ranges, contentLength);
} else {

if ((ranges == null) || (ranges.isEmpty()))
@@ -531,7 +526,7 @@
if (ranges.size() == 1) {

processSingleRange(response, content, resFile, contentType,
- ostream, writer, ranges);
+ ostream, writer, ranges, contentLength);

} else {

@@ -572,13 +567,19 @@
}

- private void processSingleRange(HttpServletResponse response, boolean content, File resFile, String contentType, ServletOutputStream ostream, PrintWriter writer, ArrayList ranges) throws IOException {
- Range range = (Range) ranges.get(0);
- response.addHeader("Content-Range", "bytes "
- + range.start
- + "-" + range.end + "/"
- + range.length);
- long length = range.end - range.start + 1;
+ private void processSingleRange(HttpServletResponse response, boolean content, File resFile, String contentType, ServletOutputStream ostream, PrintWriter writer, ArrayList ranges,
+ long contentLength) throws IOException {
+ Range range = null;
+ long length = contentLength;
+
+ if (ranges != null && ranges.size() > 0) {
+ range = (Range) ranges.get(0);
+ response.addHeader("Content-Range", "bytes "
+ + range.start
+ + "-" + range.end + "/"
+ + range.length);
+ length = range.end - range.start + 1;
+ }
if (length < Integer.MAX_VALUE) {
response.setContentLength((int) length);
} else {
@@ -596,44 +597,35 @@
} catch (IllegalStateException e) {
// Silent catch
}
- if (ostream != null) {
- FileCopyUtils.copy(resFile, ostream, range);
- } else {
- FileCopyUtils.copy(resFile, writer, range, fileEncoding);
- }
- }
- }
-
-
- private void processFullFile(HttpServletResponse response, boolean content, File resFile, String contentType, long contentLength, ServletOutputStream ostream, PrintWriter writer) throws IOException {
- // Set the appropriate output headers
- if (contentType != null) {
- response.setContentType(contentType);
- }
- if ((contentLength >= 0)) {
- if (contentLength < Integer.MAX_VALUE) {
- response.setContentLength((int) contentLength);
- } else {
- // Set the content-length as String to be able to use a long
- response.setHeader("content-length", "" + contentLength);
- }
- }
-
- // Copy the input stream to our output stream (if requested)
- if (content) {
+ InputStream is = null;
try {
- response.setBufferSize(output);
- } catch (IllegalStateException e) {
- // Silent catch
- }
- if (ostream != null) {
- FileCopyUtils.copy(resFile, ostream);
- } else {
- FileCopyUtils.copy(resFile, writer, fileEncoding);
+ is = new FileInputStream(resFile);
+ if (ostream != null) {
+ if (range == null) {
+ CopyUtils.copy(is, ostream);
+ } else {
+ CopyUtils.copyRange(is, ostream, range.start, range.end);
+ }
+ } else {Reader reader;
+ if (fileEncoding == null) {
+ reader = new InputStreamReader(is);
+ } else {
+ reader = new InputStreamReader(is,
+ fileEncoding);
+ }
+ if (range == null) {
+ CopyUtils.copyRange(reader, writer);
+ } else {
+ CopyUtils.copyRange(reader, writer, range.start, range.end);
+ }
+ }
+ } finally {
+ is.close();
}
}
}

+
public static String lastModifiedHttp(File resFile) {
String lastModifiedHttp = null;
SimpleDateFormat format = (SimpleDateFormat)formatTL.get();

Modified: tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/file/Dir2Html.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/file/Dir2Html.java?rev=884416&r1=884415&r2=884416&view=diff
==============================================================================
--- tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/file/Dir2Html.java (original)
+++ tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/file/Dir2Html.java Thu Nov 26 06:47:03 2009
@@ -31,14 +31,15 @@

import javax.servlet.ServletException;
import javax.servlet.ServletOutputStream;
-import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

+import org.apache.tomcat.servlets.util.URLEncoder;
+
/**
* Handles directory listing
*/
-public class Dir2Html extends HttpServlet {
+public class Dir2Html {

/**
* Array containing the safe characters set.
@@ -113,50 +114,6 @@

// --------------------------------------------------------- Public Methods

-
- /**
- * Finalize this servlet.
- */
- public void destroy() {
- }
-
-
- /**
- * Initialize this servlet.
- */
- public void init() throws ServletException {
- }
-
- protected void doGet(HttpServletRequest request,
- HttpServletResponse response)
- throws IOException, ServletException {
-
- // Serve the requested resource, including the data content
- //serveResource(request, response, true);
-
- }
-
-
- protected void doHead(HttpServletRequest request,
- HttpServletResponse response)
- throws IOException, ServletException {
-
- // Serve the requested resource, without the data content
- //serveResource(request, response, false);
-
- }
-
-
- protected void doPost(HttpServletRequest request,
- HttpServletResponse response)
- throws IOException, ServletException {
- doGet(request, response);
- }
-
-
-
-
-
/**
* Serve the specified resource, optionally including the data content.
*

Added: tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/file/Filesystem.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/file/Filesystem.java?rev=884416&view=auto
==============================================================================
--- tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/file/Filesystem.java (added)
+++ tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/file/Filesystem.java Thu Nov 26 06:47:03 2009
@@ -0,0 +1,29 @@
+/*
+ */
+package org.apache.tomcat.servlets.file;
+
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+
+/**
+ * Abstract the filesystem - lighter than the JNDI used in catalina.
+ *
+ * This can be used to port the File/Dav servlets to environments that
+ * don't have a file system access, or in servlet engines with class-based
+ * sandboxing.
+ */
+public class Filesystem {
+
+
+ public OutputStream getOutputStream(String name) throws IOException {
+ return null;
+ }
+
+ public InputStream getInputStream(String name) throws IOException {
+ return new FileInputStream(name);
+ }
+
+
+}

Propchange: tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/file/Filesystem.java
------------------------------------------------------------------------------
svn:eol-style = native

Added: tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/file/LocalFilesystem.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/file/LocalFilesystem.java?rev=884416&view=auto
==============================================================================
--- tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/file/LocalFilesystem.java (added)
+++ tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/file/LocalFilesystem.java Thu Nov 26 06:47:03 2009
@@ -0,0 +1,15 @@
+/*
+ */
+package org.apache.tomcat.servlets.file;
+
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+
+
+public class LocalFilesystem extends Filesystem {
+
+ public OutputStream getOutputStream(String name) throws IOException {
+ return new FileOutputStream(name);
+ }
+}

Propchange: tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/file/LocalFilesystem.java
------------------------------------------------------------------------------
svn:eol-style = native

Modified: tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/file/WebdavServlet.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/file/WebdavServlet.java?rev=884416&r1=884415&r2=884416&view=diff
==============================================================================
--- tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/file/WebdavServlet.java (original)
+++ tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/file/WebdavServlet.java Thu Nov 26 06:47:03 2009
@@ -37,10 +37,11 @@
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException;

+import org.apache.tomcat.servlets.util.FastHttpDateFormat;
import org.apache.tomcat.servlets.util.Range;
import org.apache.tomcat.servlets.util.RequestUtil;
import org.apache.tomcat.servlets.util.UrlUtils;
-import org.apache.tomcat.util.http.FastHttpDateFormat;
+
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;

Added: tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/jmx/JMXProxyServlet.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/jmx/JMXProxyServlet.java?rev=884416&view=auto
==============================================================================
--- tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/jmx/JMXProxyServlet.java (added)
+++ tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/jmx/JMXProxyServlet.java Thu Nov 26 06:47:03 2009
@@ -0,0 +1,281 @@
+/*
+ * 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.
+ */
+
+
+package org.apache.tomcat.servlets.jmx;
+
+
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.lang.management.ManagementFactory;
+import java.util.Iterator;
+import java.util.Set;
+import javax.management.MBeanServer;
+import javax.management.MBeanServerFactory;
+import javax.management.MalformedObjectNameException;
+import javax.management.ObjectName;
+import javax.management.MBeanInfo;
+import javax.management.MBeanAttributeInfo;
+import javax.management.Attribute;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ * This servlet will dump JMX attributes in a simple format
+ * and implement proxy services for modeler.
+ *
+ * @author Costin Manolache
+ */
+public class JMXProxyServlet extends HttpServlet {
+ protected MBeanServer server = null;
+
+ /**
+ * Initialize this servlet.
+ */
+ public void init() throws ServletException {
+ // Retrieve the MBean serverif (server == null) {
+ if( MBeanServerFactory.findMBeanServer(null).size() > 0 ) {
+ server = MBeanServerFactory.findMBeanServer(null).get(0);
+ } else {
+ server = ManagementFactory.getPlatformMBeanServer();
+ }
+ }
+
+
+ /**
+ * Process a GET request for the specified resource.
+ *
+ * @param request The servlet request we are processing
+ * @param response The servlet response we are creating
+ *
+ * @exception IOException if an input/output error occurs
+ * @exception ServletException if a servlet-specified error occurs
+ */
+ public void doGet(HttpServletRequest request,
+ HttpServletResponse response)
+ throws IOException, ServletException
+ {
+
+ response.setContentType("text/plain");
+
+ PrintWriter writer = response.getWriter();
+
+ if( server==null ) {
+ writer.println("Error - No mbean server");
+ return;
+ }
+
+ String qry=request.getParameter("set");
+ if( qry!= null ) {
+ String name=request.getParameter("att");
+ String val=request.getParameter("val");
+
+ setAttribute( writer, qry, name, val );
+ return;
+ }
+ qry=request.getParameter("get");
+ if( qry!= null ) {
+ String name=request.getParameter("att");
+ getAttribute( writer, qry, name );
+ return;
+ }
+ qry=request.getParameter("qry");
+ if( qry == null ) {
+ qry = "*:*";
+ }
+
+ listBeans( writer, qry );
+
+ }
+
+ public void getAttribute(PrintWriter writer, String onameStr, String att) {
+ try {
+ ObjectName oname = new ObjectName(onameStr);
+ Object value = server.getAttribute(oname, att);
+ writer.println("OK - Attribute get '" + onameStr + "' - " + att
+ + "= " + escape(value.toString()));
+ } catch (Exception ex) {
+ writer.println("Error - " + ex.toString());
+ }
+ }
+
+ public void setAttribute( PrintWriter writer,
+ String onameStr, String att, String val )
+ {
+ try {
+ ObjectName oname=new ObjectName( onameStr );
+ String type = getType(oname, att);
+ if (type == null) {
+ writer.println("Not found");
+ return;
+ }
+ Object valueObj = convertValue(type, val );
+ server.setAttribute( oname, new Attribute(att, valueObj));
+ writer.println("OK - Attribute set");
+ } catch( Exception ex ) {
+ writer.println("Error - " + ex.toString());
+ }
+ }
+
+ public String getType( ObjectName oname, String attName )
+ {
+ String type=null;
+ MBeanInfo info=null;
+ try {
+ info=server.getMBeanInfo(oname);
+ } catch (Exception e) {
+ return null;
+ }
+
+ MBeanAttributeInfo attInfo[]=info.getAttributes();
+ for( int i=0; i<attInfo.length; i++ ) {
+ if( attName.equals(attInfo[i].getName())) {
+ type=attInfo[i].getType();
+ return type;
+ }
+ }
+ return null;
+ }
+
+ public Object convertValue(String type, String value)
+ {
+ Object objValue=value;
+
+ if( type==null || "java.lang.String".equals( type )) {
+ // string is default
+ objValue=value;
+ } else if( "javax.management.ObjectName".equals( type ) ||
+ "ObjectName".equals( type )) {
+ try {
+ objValue=new ObjectName( value );
+ } catch (MalformedObjectNameException e) {
+ return null;
+ }
+ } else if( "java.lang.Integer".equals( type ) ||
+ "int".equals( type )) {
+ objValue=new Integer( value );
+ } else if( "java.lang.Long".equals( type ) ||
+ "long".equals( type )) {
+ objValue=new Long( value );
+ } else if( "java.lang.Boolean".equals( type ) ||
+ "boolean".equals( type )) {
+ objValue=new Boolean( value );
+ }
+ return objValue;
+ }
+
+
+ public void listBeans( PrintWriter writer, String qry )
+ {
+
+ Set<ObjectName> names = null;
+ try {
+ names=server.queryNames(new ObjectName(qry), null);
+ writer.println("OK - Number of results: " + names.size());
+ writer.println();
+ } catch (Exception e) {
+ writer.println("Error - " + e.toString());
+ return;
+ }
+
+ Iterator<ObjectName> it=names.iterator();
+ while( it.hasNext()) {
+ ObjectName oname=it.next();
+ writer.println( "Name: " + oname.toString());
+
+ try {
+ MBeanInfo minfo=server.getMBeanInfo(oname);
+ // can't be null - I thinl
+ String code=minfo.getClassName();
+ if ("org.apache.commons.modeler.BaseModelMBean".equals(code)) {
+ code=(String)server.getAttribute(oname, "modelerType");
+ }
+ writer.println("modelerType: " + code);
+
+ MBeanAttributeInfo attrs[]=minfo.getAttributes();
+ Object value=null;
+
+ for( int i=0; i< attrs.length; i++ ) {
+ if( ! attrs[i].isReadable() ) continue;
+ if( ! isSupported( attrs[i].getType() )) continue;
+ String attName=attrs[i].getName();
+ if( attName.indexOf( "=") >=0 ||
+ attName.indexOf( ":") >=0 ||
+ attName.indexOf( " ") >=0 ) {
+ continue;
+ }
+
+ try {
+ value=server.getAttribute(oname, attName);
+ } catch( Throwable t) {
+ log("Error getting attribute " + oname +
+ " " + attName + " " + t.toString());
+ continue;
+ }
+ if( value==null ) continue;
+ if( "modelerType".equals( attName)) continue;
+ String valueString=value.toString();
+ writer.println( attName + ": " + escape(valueString));
+ }
+ } catch (Exception e) {
+ // Ignore
+ }
+ writer.println();
+ }
+
+ }
+
+ public String escape(String value) {
+ // The only invalid char is \n
+ // We also need to keep the string short and split it with \nSPACE
+ // XXX TODO
+ int idx=value.indexOf( "\n" );
+ if( idx < 0 ) return value;
+
+ int prev=0;
+ StringBuffer sb=new StringBuffer();
+ while( idx >= 0 ) {
+ appendHead(sb, value, prev, idx);
+
+ sb.append( "\\n\n ");
+ prev=idx+1;
+ if( idx==value.length() -1 ) break;
+ idx=value.indexOf('\n', idx+1);
+ }
+ if( prev < value.length() )
+ appendHead( sb, value, prev, value.length());
+ return sb.toString();
+ }
+
+ private void appendHead( StringBuffer sb, String value, int start, int end) {
+ if (end < 1) return;
+
+ int pos=start;
+ while( end-pos > 78 ) {
+ sb.append( value.substring(pos, pos+78));
+ sb.append( "\n ");
+ pos=pos+78;
+ }
+ sb.append( value.substring(pos,end));
+ }
+
+ public boolean isSupported( String type ) {
+ return true;
+ }
+}

Propchange: tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/jmx/JMXProxyServlet.java
------------------------------------------------------------------------------
svn:eol-style = native

Added: tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/jmx/JmxObjectManagerSpi.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/jmx/JmxObjectManagerSpi.java?rev=884416&view=auto
==============================================================================
--- tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/jmx/JmxObjectManagerSpi.java (added)
+++ tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/jmx/JmxObjectManagerSpi.java Thu Nov 26 06:47:03 2009
@@ -0,0 +1,41 @@
+/*
+ */
+package org.apache.tomcat.servlets.jmx;
+
+import java.util.logging.Logger;
+
+import org.apache.tomcat.integration.ObjectManager;
+import org.apache.tomcat.util.modeler.Registry;
+
+/**
+ * Plugin for integration with JMX.
+ *
+ * All objects of interest are registered automatically.
+ */
+public class JmxObjectManagerSpi extends ObjectManager {
+ Registry registry;
+ Logger log = Logger.getLogger("JmxObjectManager");
+
+ public JmxObjectManagerSpi() {
+ registry = Registry.getRegistry(null, null);
+ }
+
+ public void bind(String name, Object o) {
+ try {
+ registry.registerComponent(o,
+ ":name=\"" + name + "\"", null);
+ } catch (Exception e) {
+ log.severe("Error registering" + e);
+ }
+ }
+
+ public void unbind(String name) {
+ registry.unregisterComponent(":name=\"" + name + "\"");
+ }
+
+ @Override
+ public Object get(String key) {
+ return null;
+ }
+
+}

Propchange: tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/jmx/JmxObjectManagerSpi.java
------------------------------------------------------------------------------
svn:eol-style = native

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@...
For additional commands, e-mail: dev-help@...