[jboss-svn-commits] JBL Code SVN: r19305 - in labs/jbosslabs/qa/portal-extensions: configuration/to-copy/server/default/deploy/jboss-web.deployer and 1 other directories.

[jboss-svn-commits at lists.jboss.org]

Author: adamw
Date: 2008-03-29 07:31:26 -0400 (Sat, 29 Mar 2008)
New Revision: 19305

Modified:
   labs/jbosslabs/qa/portal-extensions/configuration/to-copy/server/default/conf/log4j.xml.sample
   labs/jbosslabs/qa/portal-extensions/configuration/to-copy/server/default/deploy/jboss-web.deployer/server.xml
   labs/jbosslabs/qa/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/command/MainCF.java
Log:
MERGE 18806:19304 from trunk to qa

Modified: labs/jbosslabs/qa/portal-extensions/configuration/to-copy/server/default/conf/log4j.xml.sample
===================================================================
--- labs/jbosslabs/qa/portal-extensions/configuration/to-copy/server/default/conf/log4j.xml.sample	2008-03-29 11:28:33 UTC (rev 19304)
+++ labs/jbosslabs/qa/portal-extensions/configuration/to-copy/server/default/conf/log4j.xml.sample	2008-03-29 11:31:26 UTC (rev 19305)
@@ -203,6 +203,10 @@
       <priority value="WARN"/>
    </category>
 
+   <category name="net.htmlparser.jericho">
+        <priority value="WARN" />
+   </category>
+
    <!-- Hibernate got a bit too verbose in JBoss AS 4.2.1.GA -->
    <category name="org.hibernate.engine.loading.LoadContexts">
       <priority value="ERROR"/>

Modified: labs/jbosslabs/qa/portal-extensions/configuration/to-copy/server/default/deploy/jboss-web.deployer/server.xml
===================================================================
--- labs/jbosslabs/qa/portal-extensions/configuration/to-copy/server/default/deploy/jboss-web.deployer/server.xml	2008-03-29 11:28:33 UTC (rev 19304)
+++ labs/jbosslabs/qa/portal-extensions/configuration/to-copy/server/default/deploy/jboss-web.deployer/server.xml	2008-03-29 11:31:26 UTC (rev 19305)
@@ -30,12 +30,13 @@
          connector should be using the OpenSSL style configuration
          described in the APR documentation -->
     
-    <Connector port="8443" protocol="HTTP/1.1" SSLEnabled="true"
-               maxThreads="150" scheme="https" secure="true" address="${jboss.bind.address}"
+    <Connector port="8443" protocol="HTTP/1.1" SSLEnabled="true" URIEncoding="UTF-8"
+               maxThreads="250" scheme="https" secure="true" address="${jboss.bind.address}"
                clientAuth="false" sslProtocol="TLS" keystoreFile="${jboss.server.home.dir}/conf/server.keystore"
-               keystorePass="123456" />
+     	       strategy="ms" maxHttpHeaderSize="8192"
+               emptySessionPath="true"
+               keystorePass="labs-ssl" />
     
-
     <!-- Define an AJP 1.3 Connector on port 8009 -->
     <Connector port="8009" address="${jboss.bind.address}" protocol="AJP/1.3"
          emptySessionPath="true" enableLookups="false" redirectPort="8443" />

Modified: labs/jbosslabs/qa/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/command/MainCF.java
===================================================================
--- labs/jbosslabs/qa/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/command/MainCF.java	2008-03-29 11:28:33 UTC (rev 19304)
+++ labs/jbosslabs/qa/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/command/MainCF.java	2008-03-29 11:31:26 UTC (rev 19305)
@@ -122,7 +122,7 @@
 			return null;
 		} else if ("feeds".equals(parser.getFirstToken()) && parser.hasMoreTokens()) {
 			parser.proceed();
-			sendRedirect(invocation, "/blogs/feed/" + parser.getFirstToken() + "?type=atom");
+			sendRedirect(invocation, "/feeds/xml/" + parser.getFirstToken() + "?type=atom");
 			return null;
 		}
 		// End of redirects.