Skip to content

Commit 58999da

Browse files
yadvryadvr
committed
CLOUDSTACK-8433: remove awsapi rpm and debian packaging
- Removes awsapi packaging rules for debian, centos63, centos7, fedora 20/21 - Removes catalina port 7080 service configs - Fixes build replace properties for AWSAPILOG - Removes maven profile for building awsapi and deploying db in developer profile Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
1 parent bb86d03 commit 58999da

23 files changed

+31
-717
lines changed

‎build/replace.properties‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,5 @@ AGENTLOGDIR=logs
2525
AGENTLOG=logs/agent.log
2626
MSMNTDIR=/mnt
2727
COMPONENTS-SPEC=components.xml
28-
AWSAPILOG=awsapi.log
2928
REMOTEHOST=localhost
3029
COMMONLIBDIR=client/target/cloud-client-ui-4.5.0-SNAPSHOT/WEB-INF/lib/

‎client/tomcatconf/db.properties.in‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -65,13 +65,6 @@ db.usage.maxIdle=30
6565
db.usage.maxWait=10000
6666
db.usage.url.params=
6767

68-
# awsapi database settings
69-
db.awsapi.username=@DBUSER@
70-
db.awsapi.password=@DBPW@
71-
db.awsapi.host=@DBHOST@
72-
db.awsapi.port=3306
73-
db.awsapi.name=cloudbridge
74-
7568
# Simulator database settings
7669
db.simulator.username=@DBUSER@
7770
db.simulator.password=@DBPW@

‎client/tomcatconf/log4j-cloud.xml.in‎

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -51,17 +51,6 @@ under the License.
5151
</layout>
5252
</appender>
5353

54-
<appender name="AWSAPI" class="org.apache.log4j.rolling.RollingFileAppender">
55-
<param name="Append" value="true"/>
56-
<param name="Threshold" value="DEBUG"/>
57-
<rollingPolicy class="org.apache.log4j.rolling.TimeBasedRollingPolicy">
58-
<param name="FileNamePattern" value="@AWSAPILOG@.%d{yyyy-MM-dd}.gz"/>
59-
<param name="ActiveFileName" value="@AWSAPILOG@"/>
60-
</rollingPolicy>
61-
<layout class="org.apache.log4j.EnhancedPatternLayout">
62-
<param name="ConversionPattern" value="%d{ISO8601} %-5p [%c{1.}] (%t:%x) %m%n"/>
63-
</layout>
64-
</appender>
6554
<!-- ============================== -->
6655
<!-- Append warnings+ to the syslog if it is listening on UDP port FIXME make sysloghost configurable! -->
6756
<!-- ============================== -->
@@ -173,23 +162,6 @@ under the License.
173162
<appender-ref ref="APISERVER"/>
174163
</logger>
175164

176-
177-
<logger name="com.cloud.bridge" additivity="false">
178-
<level value="DEBUG"/>
179-
<appender-ref ref="AWSAPI"/>
180-
</logger>
181-
182-
<logger name="com.cloud.stack" additivity="false">
183-
<level value="DEBUG"/>
184-
<appender-ref ref="AWSAPI"/>
185-
</logger>
186-
187-
188-
<logger name="org.apache.axis2" additivity="false">
189-
<level value="INFO"/>
190-
<appender-ref ref="AWSAPI"/>
191-
</logger>
192-
193165
<!-- ============================== -->
194166
<!-- Add or remove these logger for SNMP, this logger is for SNMP alerts plugin -->
195167
<!-- ============================== -->

‎client/tomcatconf/server-nonssl.xml.in‎

Lines changed: 0 additions & 82 deletions
Original file line numberDiff line numberDiff line change
@@ -146,86 +146,4 @@
146146
</Host>
147147
</Engine>
148148
</Service>
149-
150-
<Service name="Catalina7080">
151-
152-
<!--The connectors can use a shared executor, you can define one or more named thread pools-->
153-
154-
<Executor name="tomcatThreadPool-internal" namePrefix="catalina-exec-int-"
155-
maxThreads="150" minSpareThreads="25"/>
156-
157-
<Connector executor="tomcatThreadPool-internal" URIEncoding="UTF-8"
158-
port="7080" protocol="org.apache.coyote.http11.Http11NioProtocol"
159-
connectionTimeout="20000" disableUploadTimeout="true"
160-
acceptCount="150" enableLookups="false" maxThreads="150"
161-
maxHttpHeaderSize="8192" redirectPort="8443" />
162-
163-
<!-- Define a SSL HTTP/1.1 Connector on port 8443
164-
This connector uses the JSSE configuration, when using APR, the
165-
connector should be using the OpenSSL style configuration
166-
described in the APR documentation -->
167-
<!--
168-
<Connector port="8443" protocol="HTTP/1.1" SSLEnabled="true"
169-
maxThreads="150" scheme="https" secure="true"
170-
clientAuth="false" sslProtocol="TLS"
171-
keystoreType="PKCS12"
172-
keystoreFile="conf/cloud-localhost.pk12"
173-
keystorePass="password"
174-
/>
175-
-->
176-
177-
<!-- Define an AJP 1.3 Connector on port 20400 -->
178-
179-
180-
<!-- An Engine represents the entry point (within Catalina) that processes
181-
every request. The Engine implementation for Tomcat stand alone
182-
analyzes the HTTP headers included with the request, and passes them
183-
on to the appropriate Host (virtual host).
184-
Documentation at /docs/config/engine.html -->
185-
186-
<Engine name="Catalina7080" defaultHost="localhost">
187-
188-
<!--For clustering, please take a look at documentation at:
189-
/docs/cluster-howto.html (simple how to)
190-
/docs/config/cluster.html (reference documentation) -->
191-
<!--
192-
<Cluster className="org.apache.catalina.ha.tcp.SimpleTcpCluster"/>
193-
-->
194-
195-
<!-- The request dumper valve dumps useful debugging information about
196-
the request and response data received and sent by Tomcat.
197-
Documentation at: /docs/config/valve.html -->
198-
<!--
199-
<Valve className="org.apache.catalina.valves.RequestDumperValve"/>
200-
-->
201-
202-
<!-- This Realm uses the UserDatabase configured in the global JNDI
203-
resources under the key "UserDatabase". Any edits
204-
that are performed against this UserDatabase are immediately
205-
available for use by the Realm. -->
206-
<Realm className="org.apache.catalina.realm.UserDatabaseRealm"
207-
resourceName="UserDatabase"/>
208-
209-
<!-- Define the default virtual host
210-
Note: XML Schema validation will not work with Xerces 2.2.
211-
-->
212-
<Host name="localhost" appBase="webapps7080"
213-
unpackWARs="true" autoDeploy="true"
214-
xmlValidation="false" xmlNamespaceAware="false">
215-
216-
<!-- SingleSignOn valve, share authentication between web applications
217-
Documentation at: /docs/config/valve.html -->
218-
<!--
219-
<Valve className="org.apache.catalina.authenticator.SingleSignOn" />
220-
-->
221-
222-
<!-- Access log processes all example.
223-
Documentation at: /docs/config/valve.html -->
224-
<Valve className="org.apache.catalina.valves.FastCommonAccessLogValve" directory="logs"
225-
prefix="access_log." suffix=".txt" pattern="common" resolveHosts="false"/>
226-
227-
</Host>
228-
</Engine>
229-
</Service>
230-
231149
</Server>

‎client/tomcatconf/server-ssl.xml.in‎

Lines changed: 0 additions & 106 deletions
Original file line numberDiff line numberDiff line change
@@ -154,110 +154,4 @@
154154
</Host>
155155
</Engine>
156156
</Service>
157-
158-
<Service name="Catalina7080">
159-
160-
<!--The connectors can use a shared executor, you can define one or more named thread pools-->
161-
<Executor name="tomcatThreadPool-internal" namePrefix="catalina-exec-int-"
162-
maxThreads="150" minSpareThreads="25"/>
163-
164-
<!-- A "Connector" represents an endpoint by which requests are received
165-
and responses are returned. Documentation at :
166-
Java HTTP Connector: /docs/config/http.html (blocking & non-blocking)
167-
Java AJP Connector: /docs/config/ajp.html
168-
APR (HTTP/AJP) Connector: /docs/apr.html
169-
Define a non-SSL HTTP/1.1 Connector on port 8080
170-
-->
171-
<!--
172-
<Connector port="8080" protocol="HTTP/1.1"
173-
connectionTimeout="20000"
174-
redirectPort="8443" />
175-
-->
176-
<!-- A "Connector" using the shared thread pool-->
177-
<!--
178-
<Connector executor="tomcatThreadPool"
179-
port="8080" protocol="org.apache.coyote.http11.Http11NioProtocol"
180-
connectionTimeout="20000" disableUploadTimeout="true"
181-
acceptCount="150" enableLookups="false" maxThreads="150"
182-
maxHttpHeaderSize="8192" redirectPort="8443" />
183-
-->
184-
<!-- Define a SSL HTTP/1.1 Connector on port 8443
185-
This connector uses the JSSE configuration, when using APR, the
186-
connector should be using the OpenSSL style configuration
187-
described in the APR documentation -->
188-
<!--
189-
<Connector port="8443" protocol="HTTP/1.1" SSLEnabled="true"
190-
maxThreads="150" scheme="https" secure="true"
191-
clientAuth="false" sslProtocol="TLS"
192-
keystoreType="PKCS12"
193-
keystoreFile="conf/cloud-localhost.pk12"
194-
keystorePass="password"
195-
/>
196-
-->
197-
198-
<!-- Listen on 6443 instead of 8443 because tomcat6 will change 8443 to a random one when CATALINA_HOME is not /usr/share/tomcat6 -->
199-
<Connector executor="tomcatThreadPool-internal" port="5443" protocol="org.apache.coyote.http11.Http11NioProtocol" SSLEnabled="true"
200-
maxThreads="150" scheme="https" secure="true"
201-
clientAuth="false" sslProtocol="TLS"
202-
keystoreType="JKS"
203-
keystoreFile="/etc/cloudstack/management/cloudmanagementserver.keystore"
204-
keystorePass="vmops.com"/>
205-
206-
<!-- Define an AJP 1.3 Connector on port 20400 -->
207-
<Connector port="20400" protocol="AJP/1.3" redirectPort="6443" />
208-
209-
210-
<!-- An Engine represents the entry point (within Catalina) that processes
211-
every request. The Engine implementation for Tomcat stand alone
212-
analyzes the HTTP headers included with the request, and passes them
213-
on to the appropriate Host (virtual host).
214-
Documentation at /docs/config/engine.html -->
215-
216-
<!-- You should set jvmRoute to support load-balancing via AJP ie :
217-
<Engine name="Catalina" defaultHost="localhost" jvmRoute="jvm1">
218-
-->
219-
<Engine name="Catalina7080" defaultHost="localhost">
220-
221-
<!--For clustering, please take a look at documentation at:
222-
/docs/cluster-howto.html (simple how to)
223-
/docs/config/cluster.html (reference documentation) -->
224-
<!--
225-
<Cluster className="org.apache.catalina.ha.tcp.SimpleTcpCluster"/>
226-
-->
227-
228-
<!-- The request dumper valve dumps useful debugging information about
229-
the request and response data received and sent by Tomcat.
230-
Documentation at: /docs/config/valve.html -->
231-
<!--
232-
<Valve className="org.apache.catalina.valves.RequestDumperValve"/>
233-
-->
234-
235-
<!-- This Realm uses the UserDatabase configured in the global JNDI
236-
resources under the key "UserDatabase". Any edits
237-
that are performed against this UserDatabase are immediately
238-
available for use by the Realm. -->
239-
<Realm className="org.apache.catalina.realm.UserDatabaseRealm"
240-
resourceName="UserDatabase"/>
241-
242-
<!-- Define the default virtual host
243-
Note: XML Schema validation will not work with Xerces 2.2.
244-
-->
245-
<Host name="localhost" appBase="webapps7080"
246-
unpackWARs="true" autoDeploy="true"
247-
xmlValidation="false" xmlNamespaceAware="false">
248-
249-
<!-- SingleSignOn valve, share authentication between web applications
250-
Documentation at: /docs/config/valve.html -->
251-
<!--
252-
<Valve className="org.apache.catalina.authenticator.SingleSignOn" />
253-
-->
254-
255-
<!-- Access log processes all example.
256-
Documentation at: /docs/config/valve.html -->
257-
<Valve className="org.apache.catalina.valves.FastCommonAccessLogValve" directory="logs"
258-
prefix="access_log." suffix=".txt" pattern="common" resolveHosts="false"/>
259-
260-
</Host>
261-
</Engine>
262-
</Service>
263157
</Server>

‎client/tomcatconf/server7-nonssl.xml.in‎

Lines changed: 0 additions & 82 deletions
Original file line numberDiff line numberDiff line change
@@ -146,86 +146,4 @@
146146
</Host>
147147
</Engine>
148148
</Service>
149-
150-
<Service name="Catalina7080">
151-
152-
<!--The connectors can use a shared executor, you can define one or more named thread pools-->
153-
154-
<Executor name="tomcatThreadPool-internal" namePrefix="catalina-exec-int-"
155-
maxThreads="150" minSpareThreads="25"/>
156-
157-
<Connector executor="tomcatThreadPool-internal" URIEncoding="UTF-8"
158-
port="7080" protocol="org.apache.coyote.http11.Http11NioProtocol"
159-
connectionTimeout="20000" disableUploadTimeout="true"
160-
acceptCount="150" enableLookups="false" maxThreads="150"
161-
maxHttpHeaderSize="8192" redirectPort="8443" />
162-
163-
<!-- Define a SSL HTTP/1.1 Connector on port 8443
164-
This connector uses the JSSE configuration, when using APR, the
165-
connector should be using the OpenSSL style configuration
166-
described in the APR documentation -->
167-
<!--
168-
<Connector port="8443" protocol="HTTP/1.1" SSLEnabled="true"
169-
maxThreads="150" scheme="https" secure="true"
170-
clientAuth="false" sslProtocol="TLS"
171-
keystoreType="PKCS12"
172-
keystoreFile="conf/cloud-localhost.pk12"
173-
keystorePass="password"
174-
/>
175-
-->
176-
177-
<!-- Define an AJP 1.3 Connector on port 20400 -->
178-
179-
180-
<!-- An Engine represents the entry point (within Catalina) that processes
181-
every request. The Engine implementation for Tomcat stand alone
182-
analyzes the HTTP headers included with the request, and passes them
183-
on to the appropriate Host (virtual host).
184-
Documentation at /docs/config/engine.html -->
185-
186-
<Engine name="Catalina7080" defaultHost="localhost">
187-
188-
<!--For clustering, please take a look at documentation at:
189-
/docs/cluster-howto.html (simple how to)
190-
/docs/config/cluster.html (reference documentation) -->
191-
<!--
192-
<Cluster className="org.apache.catalina.ha.tcp.SimpleTcpCluster"/>
193-
-->
194-
195-
<!-- The request dumper valve dumps useful debugging information about
196-
the request and response data received and sent by Tomcat.
197-
Documentation at: /docs/config/valve.html -->
198-
<!--
199-
<Valve className="org.apache.catalina.valves.RequestDumperValve"/>
200-
-->
201-
202-
<!-- This Realm uses the UserDatabase configured in the global JNDI
203-
resources under the key "UserDatabase". Any edits
204-
that are performed against this UserDatabase are immediately
205-
available for use by the Realm. -->
206-
<Realm className="org.apache.catalina.realm.UserDatabaseRealm"
207-
resourceName="UserDatabase"/>
208-
209-
<!-- Define the default virtual host
210-
Note: XML Schema validation will not work with Xerces 2.2.
211-
-->
212-
<Host name="localhost" appBase="webapps7080"
213-
unpackWARs="true" autoDeploy="true"
214-
xmlValidation="false" xmlNamespaceAware="false">
215-
216-
<!-- SingleSignOn valve, share authentication between web applications
217-
Documentation at: /docs/config/valve.html -->
218-
<!--
219-
<Valve className="org.apache.catalina.authenticator.SingleSignOn" />
220-
-->
221-
222-
<!-- Access log processes all example.
223-
Documentation at: /docs/config/valve.html -->
224-
<Valve className="org.apache.catalina.valves.AccessLogValve" directory="logs"
225-
prefix="access_log." suffix=".txt" pattern="common" resolveHosts="false"/>
226-
227-
</Host>
228-
</Engine>
229-
</Service>
230-
231149
</Server>

‎debian/cloudstack-awsapi.install‎

Lines changed: 0 additions & 26 deletions
This file was deleted.

‎debian/control‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,6 @@ Description: CloudStack usage monitor
3636
The CloudStack usage monitor provides usage accounting across the entire cloud for
3737
cloud operators to charge based on usage parameters.
3838

39-
Package: cloudstack-awsapi
40-
Architecture: all
41-
Depends: ${misc:Depends}, ${python:Depends}, cloudstack-common (= ${source:Version}), cloudstack-management (= ${source:Version})
42-
Description: CloudStack Amazon EC2 API
43-
4439
Package: cloudstack-cli
4540
Architecture: all
4641
Depends: ${misc:Depends}, cloudstack-common (= ${source:Version})

0 commit comments

Comments
 (0)