Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.
View | Details | Raw Unified | Return to bug 282327
Collapse All | Expand All

(-).settings/org.eclipse.jdt.core.prefs (-2 / +2 lines)
Lines 1-4 Link Here
1
#Tue May 05 09:01:06 CEST 2009
1
#Sun Aug 09 14:37:00 CEST 2009
2
eclipse.preferences.version=1
2
eclipse.preferences.version=1
3
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
3
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
4
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
4
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
Lines 37-43 Link Here
37
org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore
37
org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore
38
org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
38
org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
39
org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
39
org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
40
org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
40
org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning
41
org.eclipse.jdt.core.compiler.problem.nullReference=warning
41
org.eclipse.jdt.core.compiler.problem.nullReference=warning
42
org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
42
org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
43
org.eclipse.jdt.core.compiler.problem.parameterAssignment=warning
43
org.eclipse.jdt.core.compiler.problem.parameterAssignment=warning
(-)src/org/eclipse/rap/ui/internal/launch/RAPLaunchDelegate.java (-1 / +5 lines)
Lines 40-45 Link Here
40
    = "-Dorg.eclipse.rwt.clientLibraryVariant="; //$NON-NLS-1$
40
    = "-Dorg.eclipse.rwt.clientLibraryVariant="; //$NON-NLS-1$
41
  private static final String VMARG_AWT_HEADLESS 
41
  private static final String VMARG_AWT_HEADLESS 
42
    = "-Djava.awt.headless="; //$NON-NLS-1$
42
    = "-Djava.awt.headless="; //$NON-NLS-1$
43
  private static final String VMARG_JETTY_LOG_LEVEL
44
    = "-Dorg.eclipse.equinox.http.jetty.log.stderr.threshold="; //$NON-NLS-1$
45
  private static final String DEFAULT_JETTY_LOG_LEVEL = "info"; //$NON-NLS-1$
43
  
46
  
44
  private static final int CONNECT_TIMEOUT = 20000; // 20 Seconds
47
  private static final int CONNECT_TIMEOUT = 20000; // 20 Seconds
45
  
48
  
Lines 101-108 Link Here
101
    // ORDER IS CRUCIAL HERE:
104
    // ORDER IS CRUCIAL HERE:
102
    // Override VM arguments that are specified manually with the values
105
    // Override VM arguments that are specified manually with the values
103
    // necessary for the RAP launcher
106
    // necessary for the RAP launcher
104
    list.addAll( Arrays.asList( super.getVMArguments( config ) ) );
105
    list.addAll( Arrays.asList( getRAPVMArguments() ) );
107
    list.addAll( Arrays.asList( getRAPVMArguments() ) );
108
    list.addAll( Arrays.asList( super.getVMArguments( config ) ) );
106
    String[] result = new String[ list.size() ];
109
    String[] result = new String[ list.size() ];
107
    list.toArray( result );
110
    list.toArray( result );
108
    return result;
111
    return result;
Lines 119-124 Link Here
119
    if( Platform.OS_MACOSX.equals( Platform.getOS() ) ) {
122
    if( Platform.OS_MACOSX.equals( Platform.getOS() ) ) {
120
      list.add( VMARG_AWT_HEADLESS + Boolean.TRUE );
123
      list.add( VMARG_AWT_HEADLESS + Boolean.TRUE );
121
    }
124
    }
125
    list.add( VMARG_JETTY_LOG_LEVEL + DEFAULT_JETTY_LOG_LEVEL );
122
    String[] result = new String[ list.size() ];
126
    String[] result = new String[ list.size() ];
123
    list.toArray( result );
127
    list.toArray( result );
124
    return result;
128
    return result;
(-)src/org/eclipse/rap/ui/internal/launch/RAPLaunchDelegate_Test.java (+40 lines)
Lines 53-58 Link Here
53
    assertTrue( autoPortIndex > manualPortIndex );
53
    assertTrue( autoPortIndex > manualPortIndex );
54
  }
54
  }
55
  
55
  
56
  public void testDefaultJettyLogLevel() throws Exception {
57
    ILaunchConfigurationWorkingCopy config = Fixture.createRAPLaunchConfig();
58
    RAPLaunchDelegate launchDelegate = new RAPLaunchDelegate();
59
    // setup launch configuration
60
    try {
61
      launchDelegate.launch( config, null, null, null );
62
    } catch( Throwable thr ) {
63
      // ignore any exceptions, the only purpose of the above call is to
64
      // set the 'config' field of the RAPLaunchDelegate
65
    }
66
    String[] arguments = launchDelegate.getVMArguments( config );
67
    int logLevelIndex
68
      = indexOf( arguments,
69
      "-Dorg.eclipse.equinox.http.jetty.log.stderr.threshold=info" );
70
    assertTrue( logLevelIndex > -1 );
71
  }
72
  
73
  public void testJettyLogLevelOverride() throws Exception {
74
    ILaunchConfigurationWorkingCopy config = Fixture.createRAPLaunchConfig();
75
    RAPLaunchDelegate launchDelegate = new RAPLaunchDelegate();
76
    // prepare launch configuration
77
    config.setAttribute( IJavaLaunchConfigurationConstants.ATTR_VM_ARGUMENTS, 
78
                         "-Dorg.eclipse.equinox.http.jetty.log.stderr.threshold=debug" );
79
    // setup launch configuration
80
    try {
81
      launchDelegate.launch( config, null, null, null );
82
    } catch( Throwable thr ) {
83
      // ignore any exceptions, the only purpose of the above call is to
84
      // set the 'config' field of the RAPLaunchDelegate
85
    }
86
    String[] arguments = launchDelegate.getVMArguments( config );
87
    int defaultLogLevelIndex
88
      = indexOf( arguments,
89
      "-Dorg.eclipse.equinox.http.jetty.log.stderr.threshold=info" );
90
    int customLogLevelIndex
91
      = indexOf( arguments,
92
      "-Dorg.eclipse.equinox.http.jetty.log.stderr.threshold=debug" );
93
    assertTrue( customLogLevelIndex > defaultLogLevelIndex );
94
  }
95
  
56
  private static int indexOf( String[] strings, final String string ) {
96
  private static int indexOf( String[] strings, final String string ) {
57
    int result = -1;
97
    int result = -1;
58
    for( int i = 0; result == -1 && i < strings.length; i++ ) {
98
    for( int i = 0; result == -1 && i < strings.length; i++ ) {

Return to bug 282327