Download
Getting Started
Members
Projects
Community
Marketplace
Events
Planet Eclipse
Newsletter
Videos
Participate
Report a Bug
Forums
Mailing Lists
Wiki
IRC
How to Contribute
Working Groups
Automotive
Internet of Things
LocationTech
Long-Term Support
PolarSys
Science
OpenMDM
More
Community
Marketplace
Events
Planet Eclipse
Newsletter
Videos
Participate
Report a Bug
Forums
Mailing Lists
Wiki
IRC
How to Contribute
Working Groups
Automotive
Internet of Things
LocationTech
Long-Term Support
PolarSys
Science
OpenMDM
Toggle navigation
Bugzilla – Attachment 143851 Details for
Bug 282327
[tooling] provide log level for jetty
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
Log In
[x]
|
Terms of Use
|
Copyright Agent
Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read
this important communication.
[patch]
patch+testcase
clipboard.txt (text/plain), 5.56 KB, created by
Benjamin Muskalla
on 2009-08-09 08:50:49 EDT
(
hide
)
Description:
patch+testcase
Filename:
MIME Type:
Creator:
Benjamin Muskalla
Created:
2009-08-09 08:50:49 EDT
Size:
5.56 KB
patch
obsolete
>### Eclipse Workspace Patch 1.0 >#P org.eclipse.rap.ui.launch >Index: .settings/org.eclipse.jdt.core.prefs >=================================================================== >RCS file: /cvsroot/rt/org.eclipse.rap/tooling/org.eclipse.rap.ui.launch/.settings/org.eclipse.jdt.core.prefs,v >retrieving revision 1.3 >diff -u -r1.3 org.eclipse.jdt.core.prefs >--- .settings/org.eclipse.jdt.core.prefs 5 May 2009 07:33:02 -0000 1.3 >+++ .settings/org.eclipse.jdt.core.prefs 9 Aug 2009 12:53:09 -0000 >@@ -1,4 +1,4 @@ >-#Tue May 05 09:01:06 CEST 2009 >+#Sun Aug 09 14:37:00 CEST 2009 > eclipse.preferences.version=1 > org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled > org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2 >@@ -37,7 +37,7 @@ > org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore > org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning > org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning >-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore >+org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning > org.eclipse.jdt.core.compiler.problem.nullReference=warning > org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning > org.eclipse.jdt.core.compiler.problem.parameterAssignment=warning >Index: src/org/eclipse/rap/ui/internal/launch/RAPLaunchDelegate.java >=================================================================== >RCS file: /cvsroot/rt/org.eclipse.rap/tooling/org.eclipse.rap.ui.launch/src/org/eclipse/rap/ui/internal/launch/RAPLaunchDelegate.java,v >retrieving revision 1.25 >diff -u -r1.25 RAPLaunchDelegate.java >--- src/org/eclipse/rap/ui/internal/launch/RAPLaunchDelegate.java 5 May 2009 17:23:10 -0000 1.25 >+++ src/org/eclipse/rap/ui/internal/launch/RAPLaunchDelegate.java 9 Aug 2009 12:53:09 -0000 >@@ -40,6 +40,9 @@ > = "-Dorg.eclipse.rwt.clientLibraryVariant="; //$NON-NLS-1$ > private static final String VMARG_AWT_HEADLESS > = "-Djava.awt.headless="; //$NON-NLS-1$ >+ private static final String VMARG_JETTY_LOG_LEVEL >+ = "-Dorg.eclipse.equinox.http.jetty.log.stderr.threshold="; //$NON-NLS-1$ >+ private static final String DEFAULT_JETTY_LOG_LEVEL = "info"; //$NON-NLS-1$ > > private static final int CONNECT_TIMEOUT = 20000; // 20 Seconds > >@@ -101,8 +104,8 @@ > // ORDER IS CRUCIAL HERE: > // Override VM arguments that are specified manually with the values > // necessary for the RAP launcher >- list.addAll( Arrays.asList( super.getVMArguments( config ) ) ); > list.addAll( Arrays.asList( getRAPVMArguments() ) ); >+ list.addAll( Arrays.asList( super.getVMArguments( config ) ) ); > String[] result = new String[ list.size() ]; > list.toArray( result ); > return result; >@@ -119,6 +122,7 @@ > if( Platform.OS_MACOSX.equals( Platform.getOS() ) ) { > list.add( VMARG_AWT_HEADLESS + Boolean.TRUE ); > } >+ list.add( VMARG_JETTY_LOG_LEVEL + DEFAULT_JETTY_LOG_LEVEL ); > String[] result = new String[ list.size() ]; > list.toArray( result ); > return result; >#P org.eclipse.rap.ui.tests >Index: src/org/eclipse/rap/ui/internal/launch/RAPLaunchDelegate_Test.java >=================================================================== >RCS file: /cvsroot/rt/org.eclipse.rap/tooling/org.eclipse.rap.ui.tests/src/org/eclipse/rap/ui/internal/launch/RAPLaunchDelegate_Test.java,v >retrieving revision 1.1 >diff -u -r1.1 RAPLaunchDelegate_Test.java >--- src/org/eclipse/rap/ui/internal/launch/RAPLaunchDelegate_Test.java 6 Apr 2009 13:32:50 -0000 1.1 >+++ src/org/eclipse/rap/ui/internal/launch/RAPLaunchDelegate_Test.java 9 Aug 2009 12:53:10 -0000 >@@ -53,6 +53,46 @@ > assertTrue( autoPortIndex > manualPortIndex ); > } > >+ public void testDefaultJettyLogLevel() throws Exception { >+ ILaunchConfigurationWorkingCopy config = Fixture.createRAPLaunchConfig(); >+ RAPLaunchDelegate launchDelegate = new RAPLaunchDelegate(); >+ // setup launch configuration >+ try { >+ launchDelegate.launch( config, null, null, null ); >+ } catch( Throwable thr ) { >+ // ignore any exceptions, the only purpose of the above call is to >+ // set the 'config' field of the RAPLaunchDelegate >+ } >+ String[] arguments = launchDelegate.getVMArguments( config ); >+ int logLevelIndex >+ = indexOf( arguments, >+ "-Dorg.eclipse.equinox.http.jetty.log.stderr.threshold=info" ); >+ assertTrue( logLevelIndex > -1 ); >+ } >+ >+ public void testJettyLogLevelOverride() throws Exception { >+ ILaunchConfigurationWorkingCopy config = Fixture.createRAPLaunchConfig(); >+ RAPLaunchDelegate launchDelegate = new RAPLaunchDelegate(); >+ // prepare launch configuration >+ config.setAttribute( IJavaLaunchConfigurationConstants.ATTR_VM_ARGUMENTS, >+ "-Dorg.eclipse.equinox.http.jetty.log.stderr.threshold=debug" ); >+ // setup launch configuration >+ try { >+ launchDelegate.launch( config, null, null, null ); >+ } catch( Throwable thr ) { >+ // ignore any exceptions, the only purpose of the above call is to >+ // set the 'config' field of the RAPLaunchDelegate >+ } >+ String[] arguments = launchDelegate.getVMArguments( config ); >+ int defaultLogLevelIndex >+ = indexOf( arguments, >+ "-Dorg.eclipse.equinox.http.jetty.log.stderr.threshold=info" ); >+ int customLogLevelIndex >+ = indexOf( arguments, >+ "-Dorg.eclipse.equinox.http.jetty.log.stderr.threshold=debug" ); >+ assertTrue( customLogLevelIndex > defaultLogLevelIndex ); >+ } >+ > private static int indexOf( String[] strings, final String string ) { > int result = -1; > for( int i = 0; result == -1 && i < strings.length; i++ ) {
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 282327
: 143851