User: starksm
Date: 02/04/11 01:57:52
Modified: jetty/src/main/org/jboss/jetty
JBossWebApplicationContext.java Jetty.java
JettyService.java
Log:
Update for changes in the AbstractWebContainer layer
Revision Changes Path
1.37 +1 -32
contrib/jetty/src/main/org/jboss/jetty/JBossWebApplicationContext.java
Index: JBossWebApplicationContext.java
===================================================================
RCS file:
/cvsroot/jboss/contrib/jetty/src/main/org/jboss/jetty/JBossWebApplicationContext.java,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- JBossWebApplicationContext.java 9 Apr 2002 20:55:52 -0000 1.36
+++ JBossWebApplicationContext.java 11 Apr 2002 08:57:51 -0000 1.37
@@ -5,7 +5,7 @@
* See terms of license at gnu.org.
*/
-// $Id: JBossWebApplicationContext.java,v 1.36 2002/04/09 20:55:52 jules_gosnell
Exp $
+// $Id: JBossWebApplicationContext.java,v 1.37 2002/04/11 08:57:51 starksm Exp $
// A Jetty HttpServer with the interface expected by JBoss'
// J2EEDeployer...
@@ -266,37 +266,6 @@
_webApp.setClassLoader(Thread.currentThread().getContextClassLoader());
_webApp.setName(getDisplayName());
_webApp.setAppData(this);
-
- try
- {
- // MANDATORY - web.xml
- Resource web=getResource("/WEB-INF/web.xml");
- _webApp.setWebApp(_parser.parse(new
InputSource(web.toString())).getDocumentElement());
- }
- catch (Exception e)
- {
- _log.error("problem locating web.xml", e);
- }
-
- try
- {
- // OPTIONAL - jboss-web.xml
- Resource jbossWeb=getResource("/WEB-INF/jboss-web.xml");
- if (jbossWeb!=null)
-
_webApp.setJbossWeb(_parser.parse(jbossWeb.getInputStream()).getDocumentElement());
- }
- catch (FileNotFoundException e)
- {
- _log.debug("no jboss-web.xml found");
- }
- catch (IOException e)
- {
- _log.debug("no jboss-web.xml found");
- }
- catch (Exception e)
- {
- _log.error("problem locating jboss-web.xml", e);
- }
try
{
1.46 +5 -6 contrib/jetty/src/main/org/jboss/jetty/Jetty.java
Index: Jetty.java
===================================================================
RCS file: /cvsroot/jboss/contrib/jetty/src/main/org/jboss/jetty/Jetty.java,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- Jetty.java 5 Apr 2002 05:40:10 -0000 1.45
+++ Jetty.java 11 Apr 2002 08:57:51 -0000 1.46
@@ -5,7 +5,7 @@
* See terms of license at gnu.org.
*/
-// $Id: Jetty.java,v 1.45 2002/04/05 05:40:10 jules_gosnell Exp $
+// $Id: Jetty.java,v 1.46 2002/04/11 08:57:51 starksm Exp $
// A Jetty HttpServer with the interface expected by JBoss'
// J2EEDeployer...
@@ -50,7 +50,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Julian Gosnell</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Andreas Schaefer</a>.
- * @version $Revision: 1.45 $
+ * @version $Revision: 1.46 $
*
* <p><b>Revisions:</b>
*
@@ -366,11 +366,10 @@
Hashtable _deployed = new Hashtable(); // use Hashtable because is is synchronised
public WebApplication
- deploy(String contextPath, String warUrl, WebDescriptorParser descriptorParser)
+ deploy(WebApplication wa, String warUrl, WebDescriptorParser descriptorParser)
throws DeploymentException
{
- WebApplication wa=new WebApplication();
-
+ String contextPath = wa.getMetaData().getContextRoot();
try
{
wa.setURL(new URL(warUrl));
@@ -397,7 +396,7 @@
app.setDefaultsDescriptor (getWebDefault());
- String virtualHost=null;
+ String virtualHost=wa.getMetaData().getVirtualHost();
addContext(virtualHost, app);
try
1.56 +5 -5 contrib/jetty/src/main/org/jboss/jetty/JettyService.java
Index: JettyService.java
===================================================================
RCS file: /cvsroot/jboss/contrib/jetty/src/main/org/jboss/jetty/JettyService.java,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- JettyService.java 3 Apr 2002 08:24:27 -0000 1.55
+++ JettyService.java 11 Apr 2002 08:57:51 -0000 1.56
@@ -5,7 +5,7 @@
* See terms of license at gnu.org.
*/
-// $Id: JettyService.java,v 1.55 2002/04/03 08:24:27 user57 Exp $
+// $Id: JettyService.java,v 1.56 2002/04/11 08:57:51 starksm Exp $
//------------------------------------------------------------------------------
@@ -35,7 +35,7 @@
* A service to launch jetty from JMX.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Julian Gosnell</a>
- * @version $Revision: 1.55 $
+ * @version $Revision: 1.56 $
*/
public class JettyService
@@ -237,11 +237,11 @@
// 'deploy' interface
//----------------------------------------------------------------------------
- public WebApplication
- performDeploy(String path, String warUrl, WebDescriptorParser parser)
+ public void
+ performDeploy(WebApplication webApp, String warUrl, WebDescriptorParser parser)
throws DeploymentException
{
- return _jetty.deploy(path, warUrl, parser);
+ _jetty.deploy(webApp, warUrl, parser);
}
public void
_______________________________________________
Jboss-development mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/jboss-development
