← Back to branch summary

~ubuntu-branches/ubuntu/maverick/eucalyptus/maverick

« back to all changes in this revision

Viewing changes to clc/modules/www/src/main/resources/eucalyptus-jetty.xml

  • Committer: Bazaar Package Importer
  • Author(s): Dave Walker (Daviey)
  • Date: 2010-07-21 17:27:10 UTC
  • mfrom: (1.1.38 upstream)
  • Revision ID: james.westby@ubuntu.com-20100721172710-7xv07dmdqgivc3t9
Tags: 2.0~bzr1211-0ubuntu1
https://launchpad.net/bugs/597330
https://launchpad.net/bugs/595421
* New major upstream version merge, 2.0 (r1211).
* debian/patches/:
  - 01-wsdl-stubs.patch, debian/wsdl.md5sums: wsdl stubs updated.
  - 02-Makefile.patch: Updated to reflect new code layout.
  - 07-local_support_euca_conf-in.patch: Updated to reflect new code layout.
  - 08-ubuntu-default-networking.patch: Refreshed.
  - 09-small-128-192MB.patch: Updated to point to new location.
  - 10-disable-iscsi.patch: Refreshed.
  - 11-state-cleanup-memleakfix.patch: Removed, fixed upstream.
  - 15-fix-default-ramdisk.patch: Updated to point to new location.
  - 16-kvm_libvirt_xml_default_use_kvm.patch: Updated to reflect changes.
  - 17-fix_walrus_OOM_errors.patch: Removed, fixed upstream.
  - 18-priv_security.patch: Updated to reflect upstream changes.
  - 20-brute-force-webui.patch: Updated to reflect upstream changes. 
  - 21-eucalyptus-1.7-with-gwt-1.6.4.patch: New patch, allows 
    eucalyptus-1.7 to be built against gwt 1.6.4. Based on patch courtesy 
    of Dmitrii Zagorodnov, upstream. (LP: #597330)
* debian/eucalyptus-java-common.links: 
  - Changed symlink for groovy, point to groovy.all.jar, making compatiable 
    with groovy versions >1.7. (LP: #595421)
  - Added ant.jar & jetty-rewrite-handler.jar as they are now required.
* debian/control
  - & debian/build-jars: Added libjavassist-java and libjetty-extra-java as 
    build dependencies.
  - Added libjetty-extra-java as a dependency of eucalyptus-java-common
* The binary resulting jar's have been renamed from eucalyptus-*-1.6.2.jar
  to eucalyptus-*-main.jar:    
  - debian/eucalyptus-cc.upstart
  - debian/eucalyptus-cloud.install
  - debian/eucalyptus-common.eucalyptus.upstart
  - debian/eucalyptus-java-common.install
  - debian/eucalyptus-network.upstart
  - debian/eucalyptus-sc.install
  - debian/eucalyptus-walrus.install
* debian/eucalyptus-java-common.install: New upstream jars that have been
  installed:
  - eucalyptus-db-hsqldb-ext-main.jar
  - eucalyptus-component-main.jar
* debian/control:
  - Updated Standards Version to 3.8.4 (no change)
  - Updated the upstream Homepage to: http://open.eucalyptus.com/
  - Changed Vcs-Bzr to reflect new location of Ubuntu hosted development branch.
  - Made the Build Dependency of groovy and the binary eucalyptus-java-common
    package depend on version >=1.7.

Show diffs side-by-side

added added

removed removed

Lines of Context:
clc/modules/www/src/main/resources/eucalyptus-jetty.xml
63
63
  ~ Author: chris grzegorczyk grze@eucalyptus.com
64
64
  -->
65
65
<Configure id="Server" class="org.mortbay.jetty.Server">
66
 
    <Call name="addConnector">
67
 
        <Arg>
68
 
            <New class="org.mortbay.jetty.security.SslSelectChannelConnector">
69
 
                <Set name="Port">
70
 
                    <SystemProperty name="euca.www.port" default="8443"/>
71
 
                </Set>
72
 
                <Set name="maxIdleTime">30000</Set>
73
 
                <Set name="keystoreType">pkcs12</Set>
74
 
                <Set name="truststoreType">pkcs12</Set>
75
 
                <Set name="keystore"><SystemProperty name="euca.var.dir" default="conf"/>/keys/euca.p12
76
 
                </Set>
77
 
                <Set name="truststore"><SystemProperty name="euca.var.dir" default="conf"/>/keys/euca.p12
78
 
                </Set>
79
 
                <Set name="password">eucalyptus</Set>
80
 
                <Set name="keyPassword">eucalyptus</Set>
81
 
                <Set name="trustPassword">eucalyptus</Set>
82
 
                <Set name="ThreadPool">
83
 
                    <New class="org.mortbay.thread.QueuedThreadPool">
84
 
                        <Set name="minThreads">10</Set>
85
 
                        <Set name="maxThreads">25</Set>
86
 
                        <Set name="lowThreads">5</Set>
87
 
                        <Set name="SpawnOrShrinkAt">2</Set>
88
 
                    </New>
89
 
                </Set>
90
 
            </New>
91
 
        </Arg>
92
 
    </Call>
93
 
    <Set name="handler">
 
66
  <Call name="addConnector">
 
67
    <Arg>
 
68
      <New class="org.mortbay.jetty.security.SslSelectChannelConnector">
 
69
        <Set name="Port">
 
70
          <SystemProperty name="euca.https.port" default="8443" />
 
71
        </Set>
 
72
        <Set name="maxIdleTime">30000</Set>
 
73
        <Set name="keystoreType">pkcs12</Set>
 
74
        <Set name="truststoreType">pkcs12</Set>
 
75
        <Set name="keystore"><SystemProperty name="euca.var.dir" default="conf" />/keys/euca.p12</Set>
 
76
        <Set name="truststore"><SystemProperty name="euca.var.dir" default="conf" />/keys/euca.p12</Set>
 
77
        <Set name="password">eucalyptus</Set>
 
78
        <Set name="keyPassword">eucalyptus</Set>
 
79
        <Set name="trustPassword">eucalyptus</Set>
 
80
        <Set name="ThreadPool">
 
81
          <New class="org.mortbay.thread.QueuedThreadPool">
 
82
            <Set name="minThreads">10</Set>
 
83
            <Set name="maxThreads">25</Set>
 
84
            <Set name="lowThreads">5</Set>
 
85
            <Set name="SpawnOrShrinkAt">2</Set>
 
86
          </New>
 
87
        </Set>
 
88
      </New>
 
89
    </Arg>
 
90
  </Call>
 
91
  <Call name="addConnector">
 
92
    <Arg>
 
93
      <New class="org.mortbay.jetty.nio.SelectChannelConnector">
 
94
        <Set name="Port">
 
95
          <SystemProperty name="euca.http.port" default="8080" />
 
96
        </Set>
 
97
      </New>
 
98
    </Arg>
 
99
  </Call>
 
100
  <Set name="handler">
 
101
    <New id="Handlers" class="org.mortbay.jetty.handler.rewrite.RewriteHandler">
 
102
      <Set name="rules">
 
103
        <Array type="org.mortbay.jetty.handler.rewrite.Rule">
 
104
          <Item>
 
105
            <New id="httpsRedirect" class="com.eucalyptus.www.Redirect" />
 
106
          </Item>
 
107
        </Array>
 
108
      </Set>
 
109
      <Set name="handler">
94
110
        <New id="Handlers" class="org.mortbay.jetty.handler.HandlerCollection">
95
 
            <Set name="handlers">
96
 
                <Array type="org.mortbay.jetty.Handler">
97
 
                    <Item>
98
 
                        <New id="Contexts" class="org.mortbay.jetty.handler.ContextHandlerCollection"/>
99
 
                    </Item>
100
 
                    <Item>
101
 
                        <New id="DefaultHandler" class="org.mortbay.jetty.handler.DefaultHandler">
102
 
                            <Set name="serveIcon">false</Set>
103
 
                        </New>
104
 
                    </Item>
105
 
                    <Item>
106
 
                        <New id="RequestLog" class="org.mortbay.jetty.handler.RequestLogHandler"/>
107
 
                    </Item>
108
 
                </Array>
109
 
            </Set>
 
111
          <Set name="handlers">
 
112
            <Array type="org.mortbay.jetty.Handler">
 
113
              <Item>
 
114
                <New id="Contexts" class="org.mortbay.jetty.handler.ContextHandlerCollection" />
 
115
              </Item>
 
116
              <Item>
 
117
                <New id="DefaultHandler" class="org.mortbay.jetty.handler.DefaultHandler" />
 
118
              </Item>
 
119
              <Item>
 
120
                <New id="RequestLog" class="org.mortbay.jetty.handler.RequestLogHandler" />
 
121
              </Item>
 
122
            </Array>
 
123
          </Set>
110
124
        </New>
 
125
      </Set>
 
126
    </New>
 
127
  </Set>
 
128
  <Call name="addLifeCycle">
 
129
    <Arg>
 
130
      <New class="org.mortbay.jetty.deployer.ContextDeployer">
 
131
        <Set name="contexts">
 
132
          <Ref id="Contexts" />
 
133
        </Set>
 
134
        <Set name="configurationDir">
 
135
          <SystemProperty name="euca.conf.dir" default="." />/www</Set>
 
136
        <Set name="scanInterval">1</Set>
 
137
      </New>
 
138
    </Arg>
 
139
  </Call>
 
140
  <Ref id="RequestLog">
 
141
    <Set name="requestLog">
 
142
      <New id="RequestLogImpl" class="org.mortbay.jetty.NCSARequestLog">
 
143
        <Set name="filename"><SystemProperty name="euca.log.dir" default="./log" />/jetty-request-yyyy_mm_dd.log</Set>
 
144
        <Set name="filenameDateFormat">yyyy_MM_dd</Set>
 
145
        <Set name="retainDays">90</Set>
 
146
        <Set name="append">true</Set>
 
147
        <Set name="extended">true</Set>
 
148
        <Set name="logCookies">true</Set>
 
149
        <Set name="LogTimeZone">GMT</Set>
 
150
      </New>
111
151
    </Set>
112
 
    <Call name="addLifeCycle">
113
 
        <Arg>
114
 
            <New class="org.mortbay.jetty.deployer.ContextDeployer">
115
 
                <Set name="contexts">
116
 
                    <Ref id="Contexts"/>
117
 
                </Set>
118
 
                <Set name="configurationDir"><SystemProperty name="euca.conf.dir" default="."/>/www
119
 
                </Set>
120
 
                <Set name="scanInterval">1</Set>
121
 
            </New>
122
 
        </Arg>
123
 
    </Call>
124
 
    <Ref id="RequestLog">
125
 
        <Set name="requestLog">
126
 
            <New id="RequestLogImpl" class="org.mortbay.jetty.NCSARequestLog">
127
 
                <Set name="filename"><SystemProperty name="euca.log.dir" default="./log"/>/jetty-request-yyyy_mm_dd.log
128
 
                </Set>
129
 
                <Set name="filenameDateFormat">yyyy_MM_dd</Set>
130
 
                <Set name="retainDays">90</Set>
131
 
                <Set name="append">true</Set>
132
 
                <Set name="extended">true</Set>
133
 
                <Set name="logCookies">true</Set>
134
 
                <Set name="LogTimeZone">GMT</Set>
135
 
            </New>
136
 
        </Set>
137
 
    </Ref>
138
 
    <Set name="stopAtShutdown">true</Set>
139
 
    <Set name="sendServerVersion">true</Set>
140
 
    <Set name="sendDateHeader">true</Set>
141
 
    <Set name="gracefulShutdown">1000</Set>
142
 
</Configure>
 
 
b'\\ No newline at end of file'
 
152
  </Ref>
 
153
  <Set name="stopAtShutdown">true</Set>
 
154
  <Set name="sendServerVersion">true</Set>
 
155
  <Set name="sendDateHeader">true</Set>
 
156
  <Set name="gracefulShutdown">1000</Set>
 
157
</Configure>