Project: Jetty

Revision: 3606

Author: dyu

Date: 04 Sep 2008 07:20:12

• /jetty/trunk/modules/extra/jetty-maven-plugin/src/main/java/org/mortbay/jetty/plugin/Jetty6PluginWebAppContext.java

  ......	@@ -59,17 +59,31 @@
  59	59	this.classpathFiles = classpathFiles;
  60	60	}
  61	61
  	62	public List getClassPathFiles()
  	63	{
  	64	return this.classpathFiles;
  	65	}
  62	66
  63	67	public void setWebXmlFile(File webXmlFile)
  64	68	{
  65	69	this.webXmlFile = webXmlFile;
  66	70	}
  67	71
  	72	public File getWebXmlFile()
  	73	{
  	74	return this.webXmlFile;
  	75	}
  	76
  68	77	public void setJettyEnvXmlFile (File jettyEnvXmlFile)
  69	78	{
  70	79	this.jettyEnvXmlFile = jettyEnvXmlFile;
  71	80	}
  72	81
  	82	public File getJettyEnvXmlFile()
  	83	{
  	84	return this.jettyEnvXmlFile;
  	85	}
  	86
  73	87	public void configure ()
  74	88	{
  75	89	setConfigurations(configs);

• /jetty/trunk/VERSION.txt

  ......	@@ -14,6 +14,7 @@
  14	14	+ JETTY-699 Optimized cometd sending of 1 message to many many clients
  15	15	+ JETTY-700 unit test for unread request data
  16	16	+ JETTY-708 allow 3 scopes for jndi resources: jvm, server or webapp
  	17	+ JETTY-709 Jetty plugin's WebAppConfig configured properties gets overridden by AbstractJettyRunMojo even when already set
  17	18
  18	19	jetty-7.0.0pre3 - 6 August 2008
  19	20	+ Upgrade jsp 2.1 to SJSAS-9_1_02-B04-11_Apr_2008

• /jetty/trunk/modules/extra/jetty-maven-plugin/src/main/java/org/mortbay/jetty/plugin/AbstractJettyRunMojo.java

  ......	@@ -366,10 +366,14 @@
  366	366	{
  367	367	super.configureWebApplication();
  368	368	setClassPathFiles(setUpClassPath());
  369		webAppConfig.setWebXmlFile(getWebXmlFile());
  370		webAppConfig.setJettyEnvXmlFile(getJettyEnvXmlFile());
  371		webAppConfig.setClassPathFiles(getClassPathFiles());
  372		webAppConfig.setWar(getWebAppSourceDirectory().getCanonicalPath());
  	369	if(webAppConfig.getWebXmlFile()==null)
  	370	webAppConfig.setWebXmlFile(getWebXmlFile());
  	371	if(webAppConfig.getJettyEnvXmlFile()==null)
  	372	webAppConfig.setJettyEnvXmlFile(getJettyEnvXmlFile());
  	373	if(webAppConfig.getClassPathFiles()==null)
  	374	webAppConfig.setClassPathFiles(getClassPathFiles());
  	375	if(webAppConfig.getWar()==null)
  	376	webAppConfig.setWar(getWebAppSourceDirectory().getCanonicalPath());
  373	377	getLog().info("Webapp directory = " + getWebAppSourceDirectory().getCanonicalPath());
  374	378
  375	379	webAppConfig.configure();