Author: ate
Date: Thu Jun 21 18:24:32 2007
New Revision: 549661
URL: http://svn.apache.org/viewvc?view=rev&rev=549661
Log:
JS2-736: Jetty 6.x support
See: https://issues.apache.org/jira/browse/JS2-736
- portlet application hot deployment fixes
Modified:
portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/deployment/impl/JettyDeployPortletAppEventListener.java
portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/deployment/impl/jetty/context-template.xml
Modified:
portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/deployment/impl/JettyDeployPortletAppEventListener.java
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/deployment/impl/JettyDeployPortletAppEventListener.java?view=diff&rev=549661&r1=549660&r2=549661
==============================================================================
---
portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/deployment/impl/JettyDeployPortletAppEventListener.java
(original)
+++
portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/deployment/impl/JettyDeployPortletAppEventListener.java
Thu Jun 21 18:24:32 2007
@@ -16,17 +16,14 @@
*/
package org.apache.jetspeed.deployment.impl;
-import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
-import java.io.OutputStreamWriter;
import java.util.Enumeration;
import java.util.Iterator;
-import java.util.List;
import java.util.jar.JarFile;
import java.util.zip.ZipEntry;
@@ -46,7 +43,7 @@
import org.xml.sax.SAXException;
/**
- * @author <a href="mailto:[EMAIL PROTECTED]">Scott T. Weaver </a>
+ * @author <a href="mailto:[EMAIL PROTECTED]">Ate Douma</a>
* @version $Id$
*/
public class JettyDeployPortletAppEventListener extends
DeployPortletAppEventListener
@@ -192,7 +189,7 @@
InputStream source = null;
try
{
- source = getClass().getResourceAsStream("context-template.xml");
+ source =
getClass().getResourceAsStream("jetty/context-template.xml");
return parseJettyContext(source);
}
finally
Modified:
portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/deployment/impl/jetty/context-template.xml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/deployment/impl/jetty/context-template.xml?view=diff&rev=549661&r1=549660&r2=549661
==============================================================================
---
portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/deployment/impl/jetty/context-template.xml
(original)
+++
portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/deployment/impl/jetty/context-template.xml
Thu Jun 21 18:24:32 2007
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN"
"http://jetty.mortbay.org/configure.dtd";>
<Configure class="org.mortbay.jetty.webapp.WebAppContext">
- <Set name="ConfigurationClasses">
+ <Set name="configurationClasses">
<Array type="java.lang.String">
<Item>org.mortbay.jetty.webapp.WebInfConfiguration</Item>
<Item>org.mortbay.jetty.plus.webapp.EnvConfiguration</Item>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
