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 <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/3746e3d7 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/3746e3d7 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/3746e3d7 Branch: refs/heads/nuke-awsapi Commit: 3746e3d7f218ba743ea3304eebd7656ea468e7ab Parents: c19b07e Author: Rohit Yadav <[email protected]> Authored: Thu Apr 30 16:11:05 2015 +0200 Committer: Rohit Yadav <[email protected]> Committed: Thu Apr 30 18:27:50 2015 +0200 ---------------------------------------------------------------------- build/replace.properties | 1 - client/tomcatconf/db.properties.in | 7 -- client/tomcatconf/log4j-cloud.xml.in | 28 ------- client/tomcatconf/server-nonssl.xml.in | 82 ------------------- client/tomcatconf/server-ssl.xml.in | 106 ------------------------- client/tomcatconf/server7-nonssl.xml.in | 82 ------------------- debian/cloudstack-awsapi.install | 26 ------ debian/control | 5 -- debian/rules | 24 +----- developer/pom.xml | 8 +- packaging/centos63/cloud.spec | 74 ++--------------- packaging/centos63/replace.properties | 2 - packaging/centos7/cloud.spec | 70 ++-------------- packaging/centos7/replace.properties | 2 - packaging/centos7/tomcat7/db.properties | 8 +- packaging/centos7/tomcat7/log4j-cloud.xml | 28 ------- packaging/centos7/tomcat7/server.xml | 32 -------- packaging/debian/replace.properties | 2 - packaging/fedora20/cloud.spec | 74 ++--------------- packaging/fedora20/replace.properties | 2 - packaging/fedora21/cloud.spec | 74 ++--------------- packaging/fedora21/replace.properties | 2 - pom.xml | 9 +-- 23 files changed, 31 insertions(+), 717 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3746e3d7/build/replace.properties ---------------------------------------------------------------------- diff --git a/build/replace.properties b/build/replace.properties index 0e24f68..d2dc587 100644 --- a/build/replace.properties +++ b/build/replace.properties @@ -25,6 +25,5 @@ AGENTLOGDIR=logs AGENTLOG=logs/agent.log MSMNTDIR=/mnt COMPONENTS-SPEC=components.xml -AWSAPILOG=awsapi.log REMOTEHOST=localhost COMMONLIBDIR=client/target/cloud-client-ui-4.5.0-SNAPSHOT/WEB-INF/lib/ http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3746e3d7/client/tomcatconf/db.properties.in ---------------------------------------------------------------------- diff --git a/client/tomcatconf/db.properties.in b/client/tomcatconf/db.properties.in index 8f6980b..74b9263 100644 --- a/client/tomcatconf/db.properties.in +++ b/client/tomcatconf/db.properties.in @@ -65,13 +65,6 @@ db.usage.maxIdle=30 db.usage.maxWait=10000 db.usage.url.params= -# awsapi database settings -db.awsapi.username=@DBUSER@ -db.awsapi.password=@DBPW@ -db.awsapi.host=@DBHOST@ -db.awsapi.port=3306 -db.awsapi.name=cloudbridge - # Simulator database settings db.simulator.username=@DBUSER@ db.simulator.password=@DBPW@ http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3746e3d7/client/tomcatconf/log4j-cloud.xml.in ---------------------------------------------------------------------- diff --git a/client/tomcatconf/log4j-cloud.xml.in b/client/tomcatconf/log4j-cloud.xml.in index 08021f2..587aa86 100755 --- a/client/tomcatconf/log4j-cloud.xml.in +++ b/client/tomcatconf/log4j-cloud.xml.in @@ -51,17 +51,6 @@ under the License. </layout> </appender> - <appender name="AWSAPI" class="org.apache.log4j.rolling.RollingFileAppender"> - <param name="Append" value="true"/> - <param name="Threshold" value="DEBUG"/> - <rollingPolicy class="org.apache.log4j.rolling.TimeBasedRollingPolicy"> - <param name="FileNamePattern" value="@AWSAPILOG@.%d{yyyy-MM-dd}.gz"/> - <param name="ActiveFileName" value="@AWSAPILOG@"/> - </rollingPolicy> - <layout class="org.apache.log4j.EnhancedPatternLayout"> - <param name="ConversionPattern" value="%d{ISO8601} %-5p [%c{1.}] (%t:%x) %m%n"/> - </layout> - </appender> <!-- ============================== --> <!-- Append warnings+ to the syslog if it is listening on UDP port FIXME make sysloghost configurable! --> <!-- ============================== --> @@ -173,23 +162,6 @@ under the License. <appender-ref ref="APISERVER"/> </logger> - - <logger name="com.cloud.bridge" additivity="false"> - <level value="DEBUG"/> - <appender-ref ref="AWSAPI"/> - </logger> - - <logger name="com.cloud.stack" additivity="false"> - <level value="DEBUG"/> - <appender-ref ref="AWSAPI"/> - </logger> - - - <logger name="org.apache.axis2" additivity="false"> - <level value="INFO"/> - <appender-ref ref="AWSAPI"/> - </logger> - <!-- ============================== --> <!-- Add or remove these logger for SNMP, this logger is for SNMP alerts plugin --> <!-- ============================== --> http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3746e3d7/client/tomcatconf/server-nonssl.xml.in ---------------------------------------------------------------------- diff --git a/client/tomcatconf/server-nonssl.xml.in b/client/tomcatconf/server-nonssl.xml.in index 01086fd..4272a28 100755 --- a/client/tomcatconf/server-nonssl.xml.in +++ b/client/tomcatconf/server-nonssl.xml.in @@ -146,86 +146,4 @@ </Host> </Engine> </Service> - - <Service name="Catalina7080"> - - <!--The connectors can use a shared executor, you can define one or more named thread pools--> - - <Executor name="tomcatThreadPool-internal" namePrefix="catalina-exec-int-" - maxThreads="150" minSpareThreads="25"/> - - <Connector executor="tomcatThreadPool-internal" URIEncoding="UTF-8" - port="7080" protocol="org.apache.coyote.http11.Http11NioProtocol" - connectionTimeout="20000" disableUploadTimeout="true" - acceptCount="150" enableLookups="false" maxThreads="150" - maxHttpHeaderSize="8192" redirectPort="8443" /> - - <!-- Define a SSL HTTP/1.1 Connector on port 8443 - This connector uses the JSSE configuration, when using APR, the - connector should be using the OpenSSL style configuration - described in the APR documentation --> - <!-- - <Connector port="8443" protocol="HTTP/1.1" SSLEnabled="true" - maxThreads="150" scheme="https" secure="true" - clientAuth="false" sslProtocol="TLS" - keystoreType="PKCS12" - keystoreFile="conf/cloud-localhost.pk12" - keystorePass="password" - /> - --> - - <!-- Define an AJP 1.3 Connector on port 20400 --> - - - <!-- An Engine represents the entry point (within Catalina) that processes - every request. The Engine implementation for Tomcat stand alone - analyzes the HTTP headers included with the request, and passes them - on to the appropriate Host (virtual host). - Documentation at /docs/config/engine.html --> - - <Engine name="Catalina7080" defaultHost="localhost"> - - <!--For clustering, please take a look at documentation at: - /docs/cluster-howto.html (simple how to) - /docs/config/cluster.html (reference documentation) --> - <!-- - <Cluster className="org.apache.catalina.ha.tcp.SimpleTcpCluster"/> - --> - - <!-- The request dumper valve dumps useful debugging information about - the request and response data received and sent by Tomcat. - Documentation at: /docs/config/valve.html --> - <!-- - <Valve className="org.apache.catalina.valves.RequestDumperValve"/> - --> - - <!-- This Realm uses the UserDatabase configured in the global JNDI - resources under the key "UserDatabase". Any edits - that are performed against this UserDatabase are immediately - available for use by the Realm. --> - <Realm className="org.apache.catalina.realm.UserDatabaseRealm" - resourceName="UserDatabase"/> - - <!-- Define the default virtual host - Note: XML Schema validation will not work with Xerces 2.2. - --> - <Host name="localhost" appBase="webapps7080" - unpackWARs="true" autoDeploy="true" - xmlValidation="false" xmlNamespaceAware="false"> - - <!-- SingleSignOn valve, share authentication between web applications - Documentation at: /docs/config/valve.html --> - <!-- - <Valve className="org.apache.catalina.authenticator.SingleSignOn" /> - --> - - <!-- Access log processes all example. - Documentation at: /docs/config/valve.html --> - <Valve className="org.apache.catalina.valves.FastCommonAccessLogValve" directory="logs" - prefix="access_log." suffix=".txt" pattern="common" resolveHosts="false"/> - - </Host> - </Engine> - </Service> - </Server> http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3746e3d7/client/tomcatconf/server-ssl.xml.in ---------------------------------------------------------------------- diff --git a/client/tomcatconf/server-ssl.xml.in b/client/tomcatconf/server-ssl.xml.in index 729bf1a..595879f 100755 --- a/client/tomcatconf/server-ssl.xml.in +++ b/client/tomcatconf/server-ssl.xml.in @@ -154,110 +154,4 @@ </Host> </Engine> </Service> - - <Service name="Catalina7080"> - - <!--The connectors can use a shared executor, you can define one or more named thread pools--> - <Executor name="tomcatThreadPool-internal" namePrefix="catalina-exec-int-" - maxThreads="150" minSpareThreads="25"/> - - <!-- A "Connector" represents an endpoint by which requests are received - and responses are returned. Documentation at : - Java HTTP Connector: /docs/config/http.html (blocking & non-blocking) - Java AJP Connector: /docs/config/ajp.html - APR (HTTP/AJP) Connector: /docs/apr.html - Define a non-SSL HTTP/1.1 Connector on port 8080 - --> - <!-- - <Connector port="8080" protocol="HTTP/1.1" - connectionTimeout="20000" - redirectPort="8443" /> - --> - <!-- A "Connector" using the shared thread pool--> - <!-- - <Connector executor="tomcatThreadPool" - port="8080" protocol="org.apache.coyote.http11.Http11NioProtocol" - connectionTimeout="20000" disableUploadTimeout="true" - acceptCount="150" enableLookups="false" maxThreads="150" - maxHttpHeaderSize="8192" redirectPort="8443" /> - --> - <!-- Define a SSL HTTP/1.1 Connector on port 8443 - This connector uses the JSSE configuration, when using APR, the - connector should be using the OpenSSL style configuration - described in the APR documentation --> - <!-- - <Connector port="8443" protocol="HTTP/1.1" SSLEnabled="true" - maxThreads="150" scheme="https" secure="true" - clientAuth="false" sslProtocol="TLS" - keystoreType="PKCS12" - keystoreFile="conf/cloud-localhost.pk12" - keystorePass="password" - /> - --> - - <!-- Listen on 6443 instead of 8443 because tomcat6 will change 8443 to a random one when CATALINA_HOME is not /usr/share/tomcat6 --> - <Connector executor="tomcatThreadPool-internal" port="5443" protocol="org.apache.coyote.http11.Http11NioProtocol" SSLEnabled="true" - maxThreads="150" scheme="https" secure="true" - clientAuth="false" sslProtocol="TLS" - keystoreType="JKS" - keystoreFile="/etc/cloudstack/management/cloudmanagementserver.keystore" - keystorePass="vmops.com"/> - - <!-- Define an AJP 1.3 Connector on port 20400 --> - <Connector port="20400" protocol="AJP/1.3" redirectPort="6443" /> - - - <!-- An Engine represents the entry point (within Catalina) that processes - every request. The Engine implementation for Tomcat stand alone - analyzes the HTTP headers included with the request, and passes them - on to the appropriate Host (virtual host). - Documentation at /docs/config/engine.html --> - - <!-- You should set jvmRoute to support load-balancing via AJP ie : - <Engine name="Catalina" defaultHost="localhost" jvmRoute="jvm1"> - --> - <Engine name="Catalina7080" defaultHost="localhost"> - - <!--For clustering, please take a look at documentation at: - /docs/cluster-howto.html (simple how to) - /docs/config/cluster.html (reference documentation) --> - <!-- - <Cluster className="org.apache.catalina.ha.tcp.SimpleTcpCluster"/> - --> - - <!-- The request dumper valve dumps useful debugging information about - the request and response data received and sent by Tomcat. - Documentation at: /docs/config/valve.html --> - <!-- - <Valve className="org.apache.catalina.valves.RequestDumperValve"/> - --> - - <!-- This Realm uses the UserDatabase configured in the global JNDI - resources under the key "UserDatabase". Any edits - that are performed against this UserDatabase are immediately - available for use by the Realm. --> - <Realm className="org.apache.catalina.realm.UserDatabaseRealm" - resourceName="UserDatabase"/> - - <!-- Define the default virtual host - Note: XML Schema validation will not work with Xerces 2.2. - --> - <Host name="localhost" appBase="webapps7080" - unpackWARs="true" autoDeploy="true" - xmlValidation="false" xmlNamespaceAware="false"> - - <!-- SingleSignOn valve, share authentication between web applications - Documentation at: /docs/config/valve.html --> - <!-- - <Valve className="org.apache.catalina.authenticator.SingleSignOn" /> - --> - - <!-- Access log processes all example. - Documentation at: /docs/config/valve.html --> - <Valve className="org.apache.catalina.valves.FastCommonAccessLogValve" directory="logs" - prefix="access_log." suffix=".txt" pattern="common" resolveHosts="false"/> - - </Host> - </Engine> - </Service> </Server> http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3746e3d7/client/tomcatconf/server7-nonssl.xml.in ---------------------------------------------------------------------- diff --git a/client/tomcatconf/server7-nonssl.xml.in b/client/tomcatconf/server7-nonssl.xml.in index d59f829..6e6a7b2 100755 --- a/client/tomcatconf/server7-nonssl.xml.in +++ b/client/tomcatconf/server7-nonssl.xml.in @@ -146,86 +146,4 @@ </Host> </Engine> </Service> - - <Service name="Catalina7080"> - - <!--The connectors can use a shared executor, you can define one or more named thread pools--> - - <Executor name="tomcatThreadPool-internal" namePrefix="catalina-exec-int-" - maxThreads="150" minSpareThreads="25"/> - - <Connector executor="tomcatThreadPool-internal" URIEncoding="UTF-8" - port="7080" protocol="org.apache.coyote.http11.Http11NioProtocol" - connectionTimeout="20000" disableUploadTimeout="true" - acceptCount="150" enableLookups="false" maxThreads="150" - maxHttpHeaderSize="8192" redirectPort="8443" /> - - <!-- Define a SSL HTTP/1.1 Connector on port 8443 - This connector uses the JSSE configuration, when using APR, the - connector should be using the OpenSSL style configuration - described in the APR documentation --> - <!-- - <Connector port="8443" protocol="HTTP/1.1" SSLEnabled="true" - maxThreads="150" scheme="https" secure="true" - clientAuth="false" sslProtocol="TLS" - keystoreType="PKCS12" - keystoreFile="conf/cloud-localhost.pk12" - keystorePass="password" - /> - --> - - <!-- Define an AJP 1.3 Connector on port 20400 --> - - - <!-- An Engine represents the entry point (within Catalina) that processes - every request. The Engine implementation for Tomcat stand alone - analyzes the HTTP headers included with the request, and passes them - on to the appropriate Host (virtual host). - Documentation at /docs/config/engine.html --> - - <Engine name="Catalina7080" defaultHost="localhost"> - - <!--For clustering, please take a look at documentation at: - /docs/cluster-howto.html (simple how to) - /docs/config/cluster.html (reference documentation) --> - <!-- - <Cluster className="org.apache.catalina.ha.tcp.SimpleTcpCluster"/> - --> - - <!-- The request dumper valve dumps useful debugging information about - the request and response data received and sent by Tomcat. - Documentation at: /docs/config/valve.html --> - <!-- - <Valve className="org.apache.catalina.valves.RequestDumperValve"/> - --> - - <!-- This Realm uses the UserDatabase configured in the global JNDI - resources under the key "UserDatabase". Any edits - that are performed against this UserDatabase are immediately - available for use by the Realm. --> - <Realm className="org.apache.catalina.realm.UserDatabaseRealm" - resourceName="UserDatabase"/> - - <!-- Define the default virtual host - Note: XML Schema validation will not work with Xerces 2.2. - --> - <Host name="localhost" appBase="webapps7080" - unpackWARs="true" autoDeploy="true" - xmlValidation="false" xmlNamespaceAware="false"> - - <!-- SingleSignOn valve, share authentication between web applications - Documentation at: /docs/config/valve.html --> - <!-- - <Valve className="org.apache.catalina.authenticator.SingleSignOn" /> - --> - - <!-- Access log processes all example. - Documentation at: /docs/config/valve.html --> - <Valve className="org.apache.catalina.valves.AccessLogValve" directory="logs" - prefix="access_log." suffix=".txt" pattern="common" resolveHosts="false"/> - - </Host> - </Engine> - </Service> - </Server> http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3746e3d7/debian/cloudstack-awsapi.install ---------------------------------------------------------------------- diff --git a/debian/cloudstack-awsapi.install b/debian/cloudstack-awsapi.install deleted file mode 100644 index 675b84d..0000000 --- a/debian/cloudstack-awsapi.install +++ /dev/null @@ -1,26 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. - -/etc/cloudstack/management/cloud-bridge.properties -/etc/cloudstack/management/commons-logging.properties -/etc/cloudstack/management/crypto.properties -/etc/cloudstack/management/xes.keystore -/etc/cloudstack/management/ec2-service.properties -/var/log/cloudstack/awsapi -/usr/bin/cloudstack-setup-bridge -/usr/bin/cloudstack-aws-api-register -/usr/share/cloudstack-bridge \ No newline at end of file http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3746e3d7/debian/control ---------------------------------------------------------------------- diff --git a/debian/control b/debian/control index 4ab832e..785e819 100644 --- a/debian/control +++ b/debian/control @@ -36,11 +36,6 @@ Description: CloudStack usage monitor The CloudStack usage monitor provides usage accounting across the entire cloud for cloud operators to charge based on usage parameters. -Package: cloudstack-awsapi -Architecture: all -Depends: ${misc:Depends}, ${python:Depends}, cloudstack-common (= ${source:Version}), cloudstack-management (= ${source:Version}) -Description: CloudStack Amazon EC2 API - Package: cloudstack-cli Architecture: all Depends: ${misc:Depends}, cloudstack-common (= ${source:Version}) http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3746e3d7/debian/rules ---------------------------------------------------------------------- diff --git a/debian/rules b/debian/rules index ed23d4b..a61ae37 100755 --- a/debian/rules +++ b/debian/rules @@ -17,7 +17,7 @@ override_dh_auto_configure: echo VERSION=${VERSION} >> replace.properties.tmp override_dh_auto_build: - mvn -T C1.5 clean package -Pawsapi -DskipTests -Dsystemvm \ + mvn -T C1.5 clean package -Psystemvm -DskipTests -Dsystemvm \ -Dcs.replace.properties=replace.properties.tmp \ ${ACS_BUILD_OPTS} @@ -126,28 +126,6 @@ override_dh_auto_install: cp usage/target/transformed/log4j-cloud_usage.xml $(DESTDIR)/$(SYSCONFDIR)/$(PACKAGE)/usage/log4j-cloud.xml install -D packaging/debian/init/cloud-usage $(DESTDIR)/$(SYSCONFDIR)/init.d/$(PACKAGE)-usage - # cloudstack-awsapi - mkdir $(DESTDIR)/$(SYSCONFDIR)/$(PACKAGE)/awsapi - mkdir $(DESTDIR)/var/log/$(PACKAGE)/awsapi - mkdir $(DESTDIR)/usr/share/$(PACKAGE)-bridge - mkdir -p $(DESTDIR)/usr/share/$(PACKAGE)-bridge/webapps/awsapi - mkdir $(DESTDIR)/usr/share/$(PACKAGE)-bridge/setup - ln -s /usr/share/$(PACKAGE)-bridge/webapps/awsapi $(DESTDIR)/usr/share/$(PACKAGE)-management/webapps7080/awsapi - cp -r awsapi/target/cloud-awsapi-$(VERSION)$(MVNADD)/* $(DESTDIR)/usr/share/$(PACKAGE)-bridge/webapps/awsapi - install -D awsapi-setup/setup/cloud-setup-bridge $(DESTDIR)/usr/bin/cloudstack-setup-bridge - install -D awsapi-setup/setup/cloudstack-aws-api-register $(DESTDIR)/usr/bin/cloudstack-aws-api-register - cp -r awsapi-setup/db/mysql/* $(DESTDIR)/usr/share/$(PACKAGE)-bridge/setup - for i in cloud-bridge.properties commons-logging.properties crypto.properties xes.keystore ec2-service.properties; do \ - mv $(DESTDIR)/usr/share/$(PACKAGE)-bridge/webapps/awsapi/WEB-INF/classes/$$i $(DESTDIR)/$(SYSCONFDIR)/$(PACKAGE)/management/; \ - done - rm $(DESTDIR)/usr/share/$(PACKAGE)-bridge/webapps/awsapi/WEB-INF/classes/log4j-vmops.xml - rm $(DESTDIR)/usr/share/$(PACKAGE)-bridge/webapps/awsapi/WEB-INF/classes/log4j.properties - rm $(DESTDIR)/usr/share/$(PACKAGE)-bridge/webapps/awsapi/WEB-INF/classes/db.properties - rm $(DESTDIR)/usr/share/$(PACKAGE)-bridge/webapps/awsapi/WEB-INF/classes/LICENSE.txt - rm $(DESTDIR)/usr/share/$(PACKAGE)-bridge/webapps/awsapi/WEB-INF/classes/NOTICE.txt - rm $(DESTDIR)/usr/share/$(PACKAGE)-bridge/webapps/awsapi/WEB-INF/classes/services.xml - rm -rf $(DESTDIR)/usr/share/$(PACKAGE)-bridge/webapps/awsapi/WEB-INF/classes/META-INF - override_dh_installinit: dh_installinit -pcloudstack-management -pcloudstack-agent -pcloudstack-usage --onlyscripts --no-start http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3746e3d7/developer/pom.xml ---------------------------------------------------------------------- diff --git a/developer/pom.xml b/developer/pom.xml index 45e59d7..8eddc1a 100644 --- a/developer/pom.xml +++ b/developer/pom.xml @@ -80,12 +80,6 @@ <copy todir="${basedir}/target/db" filtering="true"> <fileset dir="${basedir}/../setup/db/"/> </copy> - <copy todir="${basedir}/target/db" filtering="true"> - <fileset - dir="${basedir}/../awsapi-setup/db/mysql/"> - <include name="**/*.sql"/> - </fileset> - </copy> </target> </configuration> </execution> @@ -151,7 +145,7 @@ <argument>${basedir}/developer-prefill.sql.override</argument> <!-- Do database upgrade--> <argument>com.cloud.upgrade.DatabaseUpgradeChecker</argument> - <argument>--database=cloud,usage,awsapi</argument> + <argument>--database=cloud,usage</argument> <argument>--rootpassword=${db.root.password}</argument> <!-- Print help using -h or dash-dash-help --> <!-- Do dry run using -d or dash-dash-dry --> http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3746e3d7/packaging/centos63/cloud.spec ---------------------------------------------------------------------- diff --git a/packaging/centos63/cloud.spec b/packaging/centos63/cloud.spec index 7161398..b0ae1c7 100644 --- a/packaging/centos63/cloud.spec +++ b/packaging/centos63/cloud.spec @@ -83,7 +83,6 @@ Requires: MySQL-python Requires: python-paramiko Requires: ipmitool Requires: %{name}-common = %{_ver} -Requires: %{name}-awsapi = %{_ver} Obsoletes: cloud-client < 4.1.0 Obsoletes: cloud-client-ui < 4.1.0 Obsoletes: cloud-server < 4.1.0 @@ -169,15 +168,6 @@ Group: System Environment/Libraries %description cli Apache CloudStack command line interface -%package awsapi -Summary: Apache CloudStack AWS API compatibility wrapper -Requires: %{name}-management = %{_ver} -Obsoletes: cloud-aws-api < 4.1.0 -Provides: cloud-aws-api -Group: System Environment/Libraries -%description awsapi -Apache Cloudstack AWS API compatibility wrapper - %if "%{_ossnoss}" == "noredist" %package mysql-ha Summary: Apache CloudStack Balancing Strategy for MySQL @@ -206,18 +196,18 @@ if [ "%{_ossnoss}" == "NOREDIST" -o "%{_ossnoss}" == "noredist" ] ; then echo "Executing mvn packaging with non-redistributable libraries" if [ "%{_sim}" == "SIMULATOR" -o "%{_sim}" == "simulator" ] ; then echo "Executing mvn noredist packaging with simulator ..." - mvn -Pawsapi,systemvm -Dnoredist -Dsimulator clean package + mvn -Psystemvm -Dnoredist -Dsimulator clean package else echo "Executing mvn noredist packaging without simulator..." - mvn -Pawsapi,systemvm -Dnoredist clean package + mvn -Psystemvm -Dnoredist clean package fi else if [ "%{_sim}" == "SIMULATOR" -o "%{_sim}" == "simulator" ] ; then echo "Executing mvn default packaging simulator ..." - mvn -Pawsapi,systemvm -Dsimulator clean package + mvn -Psystemvm -Dsimulator clean package else echo "Executing mvn default packaging without simulator ..." - mvn -Pawsapi,systemvm clean package + mvn -Psystemvm clean package fi fi @@ -226,7 +216,6 @@ fi # Common directories mkdir -p ${RPM_BUILD_ROOT}%{_bindir} mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/log/%{name}/agent -mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/log/%{name}/awsapi mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/log/%{name}/ipallocator mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/cache/%{name}/management/work mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/cache/%{name}/management/temp @@ -258,7 +247,6 @@ mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/ mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/webapps/client mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/setup mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/log/%{name}/management -mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/log/%{name}/awsapi mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}/management # Specific for tomcat @@ -349,37 +337,12 @@ mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/log/%{name}/usage/ cp -r cloud-cli/cloudtool ${RPM_BUILD_ROOT}%{python_sitearch}/ install cloud-cli/cloudapis/cloud.py ${RPM_BUILD_ROOT}%{python_sitearch}/cloudapis.py -# AWS API -mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/%{name}-bridge/webapps/awsapi -mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/%{name}-bridge/setup -cp -r awsapi/target/cloud-awsapi-%{_maventag}/* ${RPM_BUILD_ROOT}%{_datadir}/%{name}-bridge/webapps/awsapi -install -D awsapi-setup/setup/cloud-setup-bridge ${RPM_BUILD_ROOT}%{_bindir}/cloudstack-setup-bridge -install -D awsapi-setup/setup/cloudstack-aws-api-register ${RPM_BUILD_ROOT}%{_bindir}/cloudstack-aws-api-register -cp -r awsapi-setup/db/mysql/* ${RPM_BUILD_ROOT}%{_datadir}/%{name}-bridge/setup -cp awsapi/resource/Axis2/axis2.xml ${RPM_BUILD_ROOT}%{_datadir}/%{name}-bridge/webapps/awsapi/WEB-INF/conf -cp awsapi/target/WEB-INF/services/cloud-ec2.aar ${RPM_BUILD_ROOT}%{_datadir}/%{name}-bridge/webapps/awsapi/WEB-INF/services - - -for name in cloud-bridge.properties commons-logging.properties ec2-service.properties ; do - mv ${RPM_BUILD_ROOT}%{_datadir}/%{name}-bridge/webapps/awsapi/WEB-INF/classes/$name \ - ${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}/management/$name -done - # MYSQL HA if [ "x%{_ossnoss}" == "xnoredist" ] ; then mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/%{name}-mysql-ha/lib cp -r plugins/database/mysql-ha/target/cloud-plugin-database-mysqlha-%{_maventag}.jar ${RPM_BUILD_ROOT}%{_datadir}/%{name}-mysql-ha/lib fi -#Don't package the below for AWS API -rm -rf ${RPM_BUILD_ROOT}%{_datadir}/%{name}-bridge/webapps/awsapi/WEB-INF/classes/db.properties -rm -rf ${RPM_BUILD_ROOT}%{_datadir}/%{name}-bridge/webapps/awsapi/WEB-INF/classes/LICENSE.txt -rm -rf ${RPM_BUILD_ROOT}%{_datadir}/%{name}-bridge/webapps/awsapi/WEB-INF/classes/log4j.properties -rm -rf ${RPM_BUILD_ROOT}%{_datadir}/%{name}-bridge/webapps/awsapi/WEB-INF/classes/log4j-vmops.xml -rm -rf ${RPM_BUILD_ROOT}%{_datadir}/%{name}-bridge/webapps/awsapi/WEB-INF/classes/META-INF -rm -rf ${RPM_BUILD_ROOT}%{_datadir}/%{name}-bridge/webapps/awsapi/WEB-INF/classes/NOTICE.txt -rm -rf ${RPM_BUILD_ROOT}%{_datadir}/%{name}-bridge/webapps/awsapi/WEB-INF/classes/services.xml - #License files from whisker install -D tools/whisker/NOTICE ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-management-%{version}/NOTICE install -D tools/whisker/LICENSE ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-management-%{version}/LICENSE @@ -389,8 +352,6 @@ install -D tools/whisker/NOTICE ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-agent install -D tools/whisker/LICENSE ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-agent-%{version}/LICENSE install -D tools/whisker/NOTICE ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-usage-%{version}/NOTICE install -D tools/whisker/LICENSE ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-usage-%{version}/LICENSE -install -D tools/whisker/NOTICE ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-awsapi-%{version}/NOTICE -install -D tools/whisker/LICENSE ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-awsapi-%{version}/LICENSE install -D tools/whisker/NOTICE ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-cli-%{version}/NOTICE install -D tools/whisker/LICENSE ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-cli-%{version}/LICENSE if [ "x%{_ossnoss}" == "xnoredist" ] ; then @@ -401,10 +362,6 @@ fi %clean [ ${RPM_BUILD_ROOT} != "/" ] && rm -rf ${RPM_BUILD_ROOT} -%pre awsapi -id cloud > /dev/null 2>&1 || /usr/sbin/useradd -M -c "CloudStack unprivileged user" \ - -r -s /bin/sh -d %{_localstatedir}/cloudstack/management cloud|| true - %preun management /sbin/service cloudstack-management stop || true if [ "$1" == "0" ] ; then @@ -562,11 +519,6 @@ if [ -f "%{_sysconfdir}/%{name}/management/key" ]; then ln -s %{_sysconfdir}/%{name}/management/key %{_sysconfdir}/%{name}/usage/key fi -#%post awsapi -#if [ -d "%{_datadir}/%{name}-management" ] ; then -# ln -s %{_datadir}/%{name}-bridge/webapps %{_datadir}/%{name}-management/webapps7080 -#fi - #No default permission as the permission setup is complex %files management %defattr(-,root,root,-) @@ -580,7 +532,6 @@ fi %dir %attr(0770,root,cloud) %{_localstatedir}/cache/%{name}/management/work %dir %attr(0770,root,cloud) %{_localstatedir}/cache/%{name}/management/temp %dir %attr(0770,root,cloud) %{_localstatedir}/log/%{name}/management -%dir %attr(0770,root,cloud) %{_localstatedir}/log/%{name}/awsapi %config(noreplace) %{_sysconfdir}/sysconfig/%{name}-management %config(noreplace) %attr(0640,root,cloud) %{_sysconfdir}/%{name}/management/db.properties %config(noreplace) %{_sysconfdir}/%{name}/management/log4j-cloud.xml @@ -596,9 +547,7 @@ fi %config(noreplace) %{_sysconfdir}/%{name}/management/web.xml %config(noreplace) %{_sysconfdir}/%{name}/management/environment.properties %config(noreplace) %{_sysconfdir}/%{name}/management/java.security.ciphers -%config(noreplace) %{_sysconfdir}/%{name}/management/cloud-bridge.properties %config(noreplace) %{_sysconfdir}/%{name}/management/commons-logging.properties -%config(noreplace) %{_sysconfdir}/%{name}/management/ec2-service.properties %attr(0755,root,root) %{_initrddir}/%{name}-management %attr(0755,root,root) %{_initrddir}/tomcat.sh @@ -673,18 +622,6 @@ fi %{_defaultdocdir}/%{name}-cli-%{version}/LICENSE %{_defaultdocdir}/%{name}-cli-%{version}/NOTICE -%files awsapi -%defattr(0644,cloud,cloud,0755) -%{_datadir}/%{name}-bridge/webapps/awsapi -%attr(0644,root,root) %{_datadir}/%{name}-bridge/setup/* -%attr(0755,root,root) %{_bindir}/cloudstack-aws-api-register -%attr(0755,root,root) %{_bindir}/cloudstack-setup-bridge -%attr(0666,cloud,cloud) %{_datadir}/%{name}-bridge/webapps/awsapi/WEB-INF/classes/crypto.properties -%attr(0666,cloud,cloud) %{_datadir}/%{name}-bridge/webapps/awsapi/WEB-INF/classes/xes.keystore - -%{_defaultdocdir}/%{name}-awsapi-%{version}/LICENSE -%{_defaultdocdir}/%{name}-awsapi-%{version}/NOTICE - %if "%{_ossnoss}" == "noredist" %files mysql-ha %defattr(0644,cloud,cloud,0755) @@ -697,6 +634,9 @@ fi %attr(0755,root,root) %{_bindir}/cloudstack-setup-baremetal %changelog +* Thu Apr 30 2015 Rohit Yadav <[email protected]> 4.6.0 +- Remove awsapi package + * Fri Jul 04 2014 Hugo Trippaers <[email protected]> 4.5.0 - Add a package for the mysql ha module http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3746e3d7/packaging/centos63/replace.properties ---------------------------------------------------------------------- diff --git a/packaging/centos63/replace.properties b/packaging/centos63/replace.properties index 8345854..6a3101f 100644 --- a/packaging/centos63/replace.properties +++ b/packaging/centos63/replace.properties @@ -22,14 +22,12 @@ MSLOG=vmops.log APISERVERLOG=api.log DBHOST=localhost COMPONENTS-SPEC=components-premium.xml -AWSAPILOG=awsapi.log REMOTEHOST=localhost AGENTCLASSPATH= AGENTLOG=/var/log/cloudstack/agent/agent.log AGENTLOGDIR=/var/log/cloudstack/agent/ AGENTSYSCONFDIR=/etc/cloudstack/agent APISERVERLOG=/var/log/cloudstack/management/apilog.log -AWSAPILOG=/var/log/cloudstack/awsapi/awsapi.log BINDIR=/usr/bin COMMONLIBDIR=/usr/share/cloudstack-common CONFIGUREVARS= http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3746e3d7/packaging/centos7/cloud.spec ---------------------------------------------------------------------- diff --git a/packaging/centos7/cloud.spec b/packaging/centos7/cloud.spec index 2037cf1..e2a6945 100644 --- a/packaging/centos7/cloud.spec +++ b/packaging/centos7/cloud.spec @@ -82,7 +82,6 @@ Requires: mkisofs Requires: MySQL-python Requires: ipmitool Requires: %{name}-common = %{_ver} -Requires: %{name}-awsapi = %{_ver} Requires: iptables-services Group: System Environment/Libraries %description management @@ -151,13 +150,6 @@ Group: System Environment/Libraries %description cli Apache CloudStack command line interface -%package awsapi -Summary: Apache CloudStack AWS API compatibility wrapper -Requires: %{name}-management = %{_ver} -Group: System Environment/Libraries -%description awsapi -Apache Cloudstack AWS API compatibility wrapper - %if "%{_ossnoss}" == "noredist" %package mysql-ha Summary: Apache CloudStack Balancing Strategy for MySQL @@ -192,14 +184,13 @@ if [ "%{_sim}" == "SIMULATOR" -o "%{_sim}" == "simulator" ] ; then FLAGS="$FLAGS -Dsimulator" fi -mvn -Pawsapi,systemvm -DskipTests $FLAGS clean package +mvn -Psystemvm -DskipTests $FLAGS clean package %install [ ${RPM_BUILD_ROOT} != "/" ] && rm -rf ${RPM_BUILD_ROOT} # Common directories mkdir -p ${RPM_BUILD_ROOT}%{_bindir} mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/log/%{name}/agent -mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/log/%{name}/awsapi mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/log/%{name}/ipallocator mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/cache/%{name}/management/work mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/cache/%{name}/management/temp @@ -231,7 +222,6 @@ mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/ mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/webapps/client mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/setup mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/log/%{name}/management -mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/log/%{name}/awsapi mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}/management mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/run @@ -263,8 +253,8 @@ cp -r client/target/cloud-client-ui-%{_maventag}/* ${RPM_BUILD_ROOT}%{_datadir}/ rm -rf ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/webapps/client/WEB-INF/classes/scripts rm -rf ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/webapps/client/WEB-INF/classes/vms -for name in catalina.properties db.properties log4j-cloud.xml web.xml cloud-bridge.properties\ - ec2-service.properties server.xml commons-logging.properties environment.properties java.security.ciphers tomcat-users.xml +for name in catalina.properties db.properties log4j-cloud.xml web.xml \ + server.xml commons-logging.properties environment.properties java.security.ciphers tomcat-users.xml do cp packaging/centos7/tomcat7/$name \ ${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}/management/$name @@ -330,37 +320,12 @@ mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/log/%{name}/usage/ cp -r cloud-cli/cloudtool ${RPM_BUILD_ROOT}%{python_sitearch}/ install cloud-cli/cloudapis/cloud.py ${RPM_BUILD_ROOT}%{python_sitearch}/cloudapis.py -# AWS API -mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/%{name}-bridge/webapps/awsapi -mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/%{name}-bridge/setup -cp -r awsapi/target/cloud-awsapi-%{_maventag}/* ${RPM_BUILD_ROOT}%{_datadir}/%{name}-bridge/webapps/awsapi -install -D awsapi-setup/setup/cloud-setup-bridge ${RPM_BUILD_ROOT}%{_bindir}/cloudstack-setup-bridge -install -D awsapi-setup/setup/cloudstack-aws-api-register ${RPM_BUILD_ROOT}%{_bindir}/cloudstack-aws-api-register -cp -r awsapi-setup/db/mysql/* ${RPM_BUILD_ROOT}%{_datadir}/%{name}-bridge/setup -cp awsapi/resource/Axis2/axis2.xml ${RPM_BUILD_ROOT}%{_datadir}/%{name}-bridge/webapps/awsapi/WEB-INF/conf -cp awsapi/target/WEB-INF/services/cloud-ec2.aar ${RPM_BUILD_ROOT}%{_datadir}/%{name}-bridge/webapps/awsapi/WEB-INF/services - - -for name in cloud-bridge.properties commons-logging.properties ec2-service.properties ; do - mv ${RPM_BUILD_ROOT}%{_datadir}/%{name}-bridge/webapps/awsapi/WEB-INF/classes/$name \ - ${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}/management/$name -done - # MYSQL HA if [ "x%{_ossnoss}" == "xnoredist" ] ; then mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/%{name}-mysql-ha/lib cp -r plugins/database/mysql-ha/target/cloud-plugin-database-mysqlha-%{_maventag}.jar ${RPM_BUILD_ROOT}%{_datadir}/%{name}-mysql-ha/lib fi -#Don't package the below for AWS API -rm -rf ${RPM_BUILD_ROOT}%{_datadir}/%{name}-bridge/webapps/awsapi/WEB-INF/classes/db.properties -rm -rf ${RPM_BUILD_ROOT}%{_datadir}/%{name}-bridge/webapps/awsapi/WEB-INF/classes/LICENSE.txt -rm -rf ${RPM_BUILD_ROOT}%{_datadir}/%{name}-bridge/webapps/awsapi/WEB-INF/classes/log4j.properties -rm -rf ${RPM_BUILD_ROOT}%{_datadir}/%{name}-bridge/webapps/awsapi/WEB-INF/classes/log4j-vmops.xml -rm -rf ${RPM_BUILD_ROOT}%{_datadir}/%{name}-bridge/webapps/awsapi/WEB-INF/classes/META-INF -rm -rf ${RPM_BUILD_ROOT}%{_datadir}/%{name}-bridge/webapps/awsapi/WEB-INF/classes/NOTICE.txt -rm -rf ${RPM_BUILD_ROOT}%{_datadir}/%{name}-bridge/webapps/awsapi/WEB-INF/classes/services.xml - #License files from whisker install -D tools/whisker/NOTICE ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-management-%{version}/NOTICE install -D tools/whisker/LICENSE ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-management-%{version}/LICENSE @@ -370,8 +335,6 @@ install -D tools/whisker/NOTICE ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-agent install -D tools/whisker/LICENSE ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-agent-%{version}/LICENSE install -D tools/whisker/NOTICE ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-usage-%{version}/NOTICE install -D tools/whisker/LICENSE ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-usage-%{version}/LICENSE -install -D tools/whisker/NOTICE ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-awsapi-%{version}/NOTICE -install -D tools/whisker/LICENSE ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-awsapi-%{version}/LICENSE install -D tools/whisker/NOTICE ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-cli-%{version}/NOTICE install -D tools/whisker/LICENSE ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-cli-%{version}/LICENSE if [ "x%{_ossnoss}" == "xnoredist" ] ; then @@ -382,10 +345,6 @@ fi %clean [ ${RPM_BUILD_ROOT} != "/" ] && rm -rf ${RPM_BUILD_ROOT} -%pre awsapi -id cloud > /dev/null 2>&1 || /usr/sbin/useradd -M -c "CloudStack unprivileged user" \ - -r -s /bin/sh -d %{_localstatedir}/cloudstack/management cloud|| true - %preun management /usr/bin/systemctl stop cloudstack-management || true /usr/bin/systemctl off cloudstack-management || true @@ -472,11 +431,6 @@ if [ -f "%{_sysconfdir}/%{name}/management/key" ]; then ln -s %{_sysconfdir}/%{name}/management/key %{_sysconfdir}/%{name}/usage/key fi -#%post awsapi -#if [ -d "%{_datadir}/%{name}-management" ] ; then -# ln -s %{_datadir}/%{name}-bridge/webapps %{_datadir}/%{name}-management/webapps7080 -#fi - #No default permission as the permission setup is complex %files management %defattr(-,root,root,-) @@ -490,7 +444,6 @@ fi %dir %attr(0770,root,cloud) %{_localstatedir}/cache/%{name}/management/work %dir %attr(0770,root,cloud) %{_localstatedir}/cache/%{name}/management/temp %dir %attr(0770,root,cloud) %{_localstatedir}/log/%{name}/management -%dir %attr(0770,root,cloud) %{_localstatedir}/log/%{name}/awsapi %config(noreplace) %{_sysconfdir}/sysconfig/%{name}-management %config(noreplace) %{_sysconfdir}/sudoers.d/%{name}-management %config(noreplace) %{_sysconfdir}/security/limits.d/cloud @@ -503,9 +456,7 @@ fi %config(noreplace) %{_sysconfdir}/%{name}/management/server.xml %config(noreplace) %{_sysconfdir}/%{name}/management/environment.properties %config(noreplace) %{_sysconfdir}/%{name}/management/java.security.ciphers -%config(noreplace) %{_sysconfdir}/%{name}/management/cloud-bridge.properties %config(noreplace) %{_sysconfdir}/%{name}/management/commons-logging.properties -%config(noreplace) %{_sysconfdir}/%{name}/management/ec2-service.properties %attr(0755,root,root) %{_unitdir}/%{name}-management.service %attr(0755,cloud,cloud) %{_localstatedir}/run/%{name}-management.pid @@ -583,18 +534,6 @@ fi %{_defaultdocdir}/%{name}-cli-%{version}/LICENSE %{_defaultdocdir}/%{name}-cli-%{version}/NOTICE -%files awsapi -%defattr(0644,cloud,cloud,0755) -%{_datadir}/%{name}-bridge/webapps/awsapi -%attr(0644,root,root) %{_datadir}/%{name}-bridge/setup/* -%attr(0755,root,root) %{_bindir}/cloudstack-aws-api-register -%attr(0755,root,root) %{_bindir}/cloudstack-setup-bridge -%attr(0666,cloud,cloud) %{_datadir}/%{name}-bridge/webapps/awsapi/WEB-INF/classes/crypto.properties -%attr(0666,cloud,cloud) %{_datadir}/%{name}-bridge/webapps/awsapi/WEB-INF/classes/xes.keystore - -%{_defaultdocdir}/%{name}-awsapi-%{version}/LICENSE -%{_defaultdocdir}/%{name}-awsapi-%{version}/NOTICE - %if "%{_ossnoss}" == "noredist" %files mysql-ha %defattr(0644,cloud,cloud,0755) @@ -607,6 +546,9 @@ fi %attr(0755,root,root) %{_bindir}/cloudstack-setup-baremetal %changelog +* Thu Apr 30 2015 Rohit Yadav <[email protected]> 4.6.0 +- Remove awsapi package + * Wed Nov 19 2014 Hugo Trippaers <[email protected]> 4.6.0 - Create a specific spec for CentOS 7 http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3746e3d7/packaging/centos7/replace.properties ---------------------------------------------------------------------- diff --git a/packaging/centos7/replace.properties b/packaging/centos7/replace.properties index f99dab8..aec359e 100644 --- a/packaging/centos7/replace.properties +++ b/packaging/centos7/replace.properties @@ -22,14 +22,12 @@ MSLOG=vmops.log APISERVERLOG=api.log DBHOST=localhost COMPONENTS-SPEC=components-premium.xml -AWSAPILOG=awsapi.log REMOTEHOST=localhost AGENTCLASSPATH= AGENTLOG=/var/log/cloudstack/agent/agent.log AGENTLOGDIR=/var/log/cloudstack/agent/ AGENTSYSCONFDIR=/etc/cloudstack/agent APISERVERLOG=/var/log/cloudstack/management/apilog.log -AWSAPILOG=/var/log/cloudstack/awsapi/awsapi.log BINDIR=/usr/bin COMMONLIBDIR=/usr/share/cloudstack-common CONFIGUREVARS= http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3746e3d7/packaging/centos7/tomcat7/db.properties ---------------------------------------------------------------------- diff --git a/packaging/centos7/tomcat7/db.properties b/packaging/centos7/tomcat7/db.properties index ad31894..e6e5775 100644 --- a/packaging/centos7/tomcat7/db.properties +++ b/packaging/centos7/tomcat7/db.properties @@ -73,11 +73,9 @@ db.cloud.encryption.type=file db.cloud.failOverReadOnly=false db.simulator.port=3306 -db.awsapi.host=localhost db.usage.password=ENC(cQEcN5aVucSYK+WUkPjDcw==) db.usage.username=cloud db.cloud.trustStorePassword= -db.awsapi.password=cloud db.simulator.username=cloud db.usage.url.params= db.usage.initialTimeout=3600 @@ -89,14 +87,10 @@ db.usage.autoReconnect=true db.simulator.maxWait=10000 # cloud stack Database db.simulator.password=cloud -db.awsapi.username=cloud db.usage.reconnectAtTxEnd=true db.simulator.autoReconnect=true -# awsapi database settings -db.awsapi.port=3306 db.ha.loadBalanceStrategy=com.cloud.utils.db.StaticStrategy -db.awsapi.name=cloudbridge db.cloud.autoReconnect=true db.simulator.host=localhost db.simulator.name=simulator @@ -104,4 +98,4 @@ db.usage.queriesBeforeRetryMaster=5000 db.usage.slaves=localhost,localhost db.usage.secondsBeforeRetryMaster=3600 db.usage.autoReconnectForPools=true -db.cloud.secondsBeforeRetryMaster=3600 \ No newline at end of file +db.cloud.secondsBeforeRetryMaster=3600 http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3746e3d7/packaging/centos7/tomcat7/log4j-cloud.xml ---------------------------------------------------------------------- diff --git a/packaging/centos7/tomcat7/log4j-cloud.xml b/packaging/centos7/tomcat7/log4j-cloud.xml index ef7904c..d03775c 100644 --- a/packaging/centos7/tomcat7/log4j-cloud.xml +++ b/packaging/centos7/tomcat7/log4j-cloud.xml @@ -51,17 +51,6 @@ under the License. </layout> </appender> - <appender name="AWSAPI" class="org.apache.log4j.rolling.RollingFileAppender"> - <param name="Append" value="true"/> - <param name="Threshold" value="DEBUG"/> - <rollingPolicy class="org.apache.log4j.rolling.TimeBasedRollingPolicy"> - <param name="FileNamePattern" value="/var/log/cloudstack/awsapi/awsapi.log.%d{yyyy-MM-dd}.gz"/> - <param name="ActiveFileName" value="/var/log/cloudstack/awsapi/awsapi.log"/> - </rollingPolicy> - <layout class="org.apache.log4j.EnhancedPatternLayout"> - <param name="ConversionPattern" value="%d{ISO8601} %-5p [%c{1.}] (%t:%x) %m%n"/> - </layout> - </appender> <!-- ============================== --> <!-- Append warnings+ to the syslog if it is listening on UDP port FIXME make sysloghost configurable! --> <!-- ============================== --> @@ -173,23 +162,6 @@ under the License. <appender-ref ref="APISERVER"/> </logger> - - <logger name="com.cloud.bridge" additivity="false"> - <level value="DEBUG"/> - <appender-ref ref="AWSAPI"/> - </logger> - - <logger name="com.cloud.stack" additivity="false"> - <level value="DEBUG"/> - <appender-ref ref="AWSAPI"/> - </logger> - - - <logger name="org.apache.axis2" additivity="false"> - <level value="INFO"/> - <appender-ref ref="AWSAPI"/> - </logger> - <!-- ============================== --> <!-- Add or remove these logger for SNMP, this logger is for SNMP alerts plugin --> <!-- ============================== --> http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3746e3d7/packaging/centos7/tomcat7/server.xml ---------------------------------------------------------------------- diff --git a/packaging/centos7/tomcat7/server.xml b/packaging/centos7/tomcat7/server.xml index 6a3c974..124ff63 100644 --- a/packaging/centos7/tomcat7/server.xml +++ b/packaging/centos7/tomcat7/server.xml @@ -77,36 +77,4 @@ </Host> </Engine> </Service> - - <Service name="CloudStackAwsApi"> - - <Executor name="tomcatThreadPool" namePrefix="catalina-exec-" - maxThreads="150" minSpareThreads="25"/> - - <Connector executor="tomcatThreadPool" - port="7080" protocol="HTTP/1.1" - connectionTimeout="20000" - acceptCount="150" - enableLookups="false" - maxThreads="150" - maxHttpHeaderSize="8192" - redirectPort="8443" /> - - <Engine name="Catalina7080" defaultHost="localhost"> - - <Realm className="org.apache.catalina.realm.LockOutRealm"> - <Realm className="org.apache.catalina.realm.UserDatabaseRealm" - resourceName="UserDatabase"/> - </Realm> - - <Host name="localhost" appBase="webapps7080" - unpackWARs="true" autoDeploy="true"> - - <Valve className="org.apache.catalina.valves.AccessLogValve" directory="logs" - prefix="localhost_7080_access_log." suffix=".txt" - pattern="%h %l %u %t "%r" %s %b" /> - - </Host> - </Engine> - </Service> </Server> http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3746e3d7/packaging/debian/replace.properties ---------------------------------------------------------------------- diff --git a/packaging/debian/replace.properties b/packaging/debian/replace.properties index 5a0bd58..2a10162 100644 --- a/packaging/debian/replace.properties +++ b/packaging/debian/replace.properties @@ -23,14 +23,12 @@ APISERVERLOG=api.log DBHOST=localhost MSMNTDIR=/mnt COMPONENTS-SPEC=components-premium.xml -AWSAPILOG=awsapi.log REMOTEHOST=localhost AGENTCLASSPATH= AGENTLOG=/var/log/cloudstack/agent/agent.log AGENTLOGDIR=/var/log/cloudstack/agent/ AGENTSYSCONFDIR=/etc/cloudstack/agent APISERVERLOG=/var/log/cloudstack/management/apilog.log -AWSAPILOG=/var/log/cloudstack/awsapi/awsapi.log BINDIR=/usr/bin COMMONLIBDIR=/usr/share/cloudstack-common CONFIGUREVARS= http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3746e3d7/packaging/fedora20/cloud.spec ---------------------------------------------------------------------- diff --git a/packaging/fedora20/cloud.spec b/packaging/fedora20/cloud.spec index 848d412..db6a813 100644 --- a/packaging/fedora20/cloud.spec +++ b/packaging/fedora20/cloud.spec @@ -83,7 +83,6 @@ Requires: MySQL-python Requires: python-paramiko Requires: ipmitool Requires: %{name}-common = %{_ver} -Requires: %{name}-awsapi = %{_ver} Obsoletes: cloud-client < 4.1.0 Obsoletes: cloud-client-ui < 4.1.0 Obsoletes: cloud-server < 4.1.0 @@ -171,15 +170,6 @@ Group: System Environment/Libraries %description cli Apache CloudStack command line interface -%package awsapi -Summary: Apache CloudStack AWS API compatibility wrapper -Requires: %{name}-management = %{_ver} -Obsoletes: cloud-aws-api < 4.1.0 -Provides: cloud-aws-api -Group: System Environment/Libraries -%description awsapi -Apache Cloudstack AWS API compatibility wrapper - %if "%{_ossnoss}" == "noredist" %package mysql-ha Summary: Apache CloudStack Balancing Strategy for MySQL @@ -208,18 +198,18 @@ if [ "%{_ossnoss}" == "NOREDIST" -o "%{_ossnoss}" == "noredist" ] ; then echo "Executing mvn packaging with non-redistributable libraries" if [ "%{_sim}" == "SIMULATOR" -o "%{_sim}" == "simulator" ] ; then echo "Executing mvn noredist packaging with simulator ..." - mvn -Pawsapi,systemvm -Dnoredist -Dsimulator clean package + mvn -Psystemvm -Dnoredist -Dsimulator clean package else echo "Executing mvn noredist packaging without simulator..." - mvn -Pawsapi,systemvm -Dnoredist clean package + mvn -Psystemvm -Dnoredist clean package fi else if [ "%{_sim}" == "SIMULATOR" -o "%{_sim}" == "simulator" ] ; then echo "Executing mvn default packaging simulator ..." - mvn -Pawsapi,systemvm -Dsimulator clean package + mvn -Psystemvm -Dsimulator clean package else echo "Executing mvn default packaging without simulator ..." - mvn -Pawsapi,systemvm clean package + mvn -Psystemvm clean package fi fi @@ -228,7 +218,6 @@ fi # Common directories mkdir -p ${RPM_BUILD_ROOT}%{_bindir} mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/log/%{name}/agent -mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/log/%{name}/awsapi mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/log/%{name}/ipallocator mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/cache/%{name}/management/work mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/cache/%{name}/management/temp @@ -260,7 +249,6 @@ mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/ mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/webapps/client mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/setup mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/log/%{name}/management -mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/log/%{name}/awsapi mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}/management # Specific for tomcat @@ -351,37 +339,12 @@ mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/log/%{name}/usage/ cp -r cloud-cli/cloudtool ${RPM_BUILD_ROOT}%{python_sitearch}/ install cloud-cli/cloudapis/cloud.py ${RPM_BUILD_ROOT}%{python_sitearch}/cloudapis.py -# AWS API -mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/%{name}-bridge/webapps/awsapi -mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/%{name}-bridge/setup -cp -r awsapi/target/cloud-awsapi-%{_maventag}/* ${RPM_BUILD_ROOT}%{_datadir}/%{name}-bridge/webapps/awsapi -install -D awsapi-setup/setup/cloud-setup-bridge ${RPM_BUILD_ROOT}%{_bindir}/cloudstack-setup-bridge -install -D awsapi-setup/setup/cloudstack-aws-api-register ${RPM_BUILD_ROOT}%{_bindir}/cloudstack-aws-api-register -cp -r awsapi-setup/db/mysql/* ${RPM_BUILD_ROOT}%{_datadir}/%{name}-bridge/setup -cp awsapi/resource/Axis2/axis2.xml ${RPM_BUILD_ROOT}%{_datadir}/%{name}-bridge/webapps/awsapi/WEB-INF/conf -cp awsapi/target/WEB-INF/services/cloud-ec2.aar ${RPM_BUILD_ROOT}%{_datadir}/%{name}-bridge/webapps/awsapi/WEB-INF/services - - -for name in cloud-bridge.properties commons-logging.properties ec2-service.properties ; do - mv ${RPM_BUILD_ROOT}%{_datadir}/%{name}-bridge/webapps/awsapi/WEB-INF/classes/$name \ - ${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}/management/$name -done - # MYSQL HA if [ "x%{_ossnoss}" == "xnoredist" ] ; then mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/%{name}-mysql-ha/lib cp -r plugins/database/mysql-ha/target/cloud-plugin-database-mysqlha-%{_maventag}.jar ${RPM_BUILD_ROOT}%{_datadir}/%{name}-mysql-ha/lib fi -#Don't package the below for AWS API -rm -rf ${RPM_BUILD_ROOT}%{_datadir}/%{name}-bridge/webapps/awsapi/WEB-INF/classes/db.properties -rm -rf ${RPM_BUILD_ROOT}%{_datadir}/%{name}-bridge/webapps/awsapi/WEB-INF/classes/LICENSE.txt -rm -rf ${RPM_BUILD_ROOT}%{_datadir}/%{name}-bridge/webapps/awsapi/WEB-INF/classes/log4j.properties -rm -rf ${RPM_BUILD_ROOT}%{_datadir}/%{name}-bridge/webapps/awsapi/WEB-INF/classes/log4j-vmops.xml -rm -rf ${RPM_BUILD_ROOT}%{_datadir}/%{name}-bridge/webapps/awsapi/WEB-INF/classes/META-INF -rm -rf ${RPM_BUILD_ROOT}%{_datadir}/%{name}-bridge/webapps/awsapi/WEB-INF/classes/NOTICE.txt -rm -rf ${RPM_BUILD_ROOT}%{_datadir}/%{name}-bridge/webapps/awsapi/WEB-INF/classes/services.xml - #License files from whisker install -D tools/whisker/NOTICE ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-management-%{version}/NOTICE install -D tools/whisker/LICENSE ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-management-%{version}/LICENSE @@ -391,8 +354,6 @@ install -D tools/whisker/NOTICE ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-agent install -D tools/whisker/LICENSE ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-agent-%{version}/LICENSE install -D tools/whisker/NOTICE ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-usage-%{version}/NOTICE install -D tools/whisker/LICENSE ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-usage-%{version}/LICENSE -install -D tools/whisker/NOTICE ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-awsapi-%{version}/NOTICE -install -D tools/whisker/LICENSE ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-awsapi-%{version}/LICENSE install -D tools/whisker/NOTICE ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-cli-%{version}/NOTICE install -D tools/whisker/LICENSE ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-cli-%{version}/LICENSE if [ "x%{_ossnoss}" == "xnoredist" ] ; then @@ -403,10 +364,6 @@ fi %clean [ ${RPM_BUILD_ROOT} != "/" ] && rm -rf ${RPM_BUILD_ROOT} -%pre awsapi -id cloud > /dev/null 2>&1 || /usr/sbin/useradd -M -c "CloudStack unprivileged user" \ - -r -s /bin/sh -d %{_localstatedir}/cloudstack/management cloud|| true - %preun management /sbin/service cloudstack-management stop || true if [ "$1" == "0" ] ; then @@ -564,11 +521,6 @@ if [ -f "%{_sysconfdir}/%{name}/management/key" ]; then ln -s %{_sysconfdir}/%{name}/management/key %{_sysconfdir}/%{name}/usage/key fi -#%post awsapi -#if [ -d "%{_datadir}/%{name}-management" ] ; then -# ln -s %{_datadir}/%{name}-bridge/webapps %{_datadir}/%{name}-management/webapps7080 -#fi - #No default permission as the permission setup is complex %files management %defattr(-,root,root,-) @@ -582,7 +534,6 @@ fi %dir %attr(0770,root,cloud) %{_localstatedir}/cache/%{name}/management/work %dir %attr(0770,root,cloud) %{_localstatedir}/cache/%{name}/management/temp %dir %attr(0770,root,cloud) %{_localstatedir}/log/%{name}/management -%dir %attr(0770,root,cloud) %{_localstatedir}/log/%{name}/awsapi %config(noreplace) %{_sysconfdir}/sysconfig/%{name}-management %config(noreplace) %attr(0640,root,cloud) %{_sysconfdir}/%{name}/management/db.properties %config(noreplace) %{_sysconfdir}/%{name}/management/log4j-cloud.xml @@ -598,9 +549,7 @@ fi %config(noreplace) %{_sysconfdir}/%{name}/management/web.xml %config(noreplace) %{_sysconfdir}/%{name}/management/environment.properties %config(noreplace) %{_sysconfdir}/%{name}/management/java.security.ciphers -%config(noreplace) %{_sysconfdir}/%{name}/management/cloud-bridge.properties %config(noreplace) %{_sysconfdir}/%{name}/management/commons-logging.properties -%config(noreplace) %{_sysconfdir}/%{name}/management/ec2-service.properties %attr(0755,root,root) %{_initrddir}/%{name}-management %attr(0755,root,root) %{_initrddir}/tomcat.sh @@ -675,18 +624,6 @@ fi %{_defaultdocdir}/%{name}-cli-%{version}/LICENSE %{_defaultdocdir}/%{name}-cli-%{version}/NOTICE -%files awsapi -%defattr(0644,cloud,cloud,0755) -%{_datadir}/%{name}-bridge/webapps/awsapi -%attr(0644,root,root) %{_datadir}/%{name}-bridge/setup/* -%attr(0755,root,root) %{_bindir}/cloudstack-aws-api-register -%attr(0755,root,root) %{_bindir}/cloudstack-setup-bridge -%attr(0666,cloud,cloud) %{_datadir}/%{name}-bridge/webapps/awsapi/WEB-INF/classes/crypto.properties -%attr(0666,cloud,cloud) %{_datadir}/%{name}-bridge/webapps/awsapi/WEB-INF/classes/xes.keystore - -%{_defaultdocdir}/%{name}-awsapi-%{version}/LICENSE -%{_defaultdocdir}/%{name}-awsapi-%{version}/NOTICE - %if "%{_ossnoss}" == "noredist" %files mysql-ha %defattr(0644,cloud,cloud,0755) @@ -699,6 +636,9 @@ fi %attr(0755,root,root) %{_bindir}/cloudstack-setup-baremetal %changelog +* Thu Apr 30 2015 Rohit Yadav <[email protected]> 4.6.0 +- Remove awsapi package + * Fri Jul 04 2014 Hugo Trippaers <[email protected]> 4.5.0 - Add a package for the mysql ha module http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3746e3d7/packaging/fedora20/replace.properties ---------------------------------------------------------------------- diff --git a/packaging/fedora20/replace.properties b/packaging/fedora20/replace.properties index 8345854..6a3101f 100644 --- a/packaging/fedora20/replace.properties +++ b/packaging/fedora20/replace.properties @@ -22,14 +22,12 @@ MSLOG=vmops.log APISERVERLOG=api.log DBHOST=localhost COMPONENTS-SPEC=components-premium.xml -AWSAPILOG=awsapi.log REMOTEHOST=localhost AGENTCLASSPATH= AGENTLOG=/var/log/cloudstack/agent/agent.log AGENTLOGDIR=/var/log/cloudstack/agent/ AGENTSYSCONFDIR=/etc/cloudstack/agent APISERVERLOG=/var/log/cloudstack/management/apilog.log -AWSAPILOG=/var/log/cloudstack/awsapi/awsapi.log BINDIR=/usr/bin COMMONLIBDIR=/usr/share/cloudstack-common CONFIGUREVARS= http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3746e3d7/packaging/fedora21/cloud.spec ---------------------------------------------------------------------- diff --git a/packaging/fedora21/cloud.spec b/packaging/fedora21/cloud.spec index ec2408f..0505664 100644 --- a/packaging/fedora21/cloud.spec +++ b/packaging/fedora21/cloud.spec @@ -83,7 +83,6 @@ Requires: MySQL-python Requires: python-paramiko Requires: ipmitool Requires: %{name}-common = %{_ver} -Requires: %{name}-awsapi = %{_ver} Obsoletes: cloud-client < 4.1.0 Obsoletes: cloud-client-ui < 4.1.0 Obsoletes: cloud-server < 4.1.0 @@ -171,15 +170,6 @@ Group: System Environment/Libraries %description cli Apache CloudStack command line interface -%package awsapi -Summary: Apache CloudStack AWS API compatibility wrapper -Requires: %{name}-management = %{_ver} -Obsoletes: cloud-aws-api < 4.1.0 -Provides: cloud-aws-api -Group: System Environment/Libraries -%description awsapi -Apache Cloudstack AWS API compatibility wrapper - %if "%{_ossnoss}" == "noredist" %package mysql-ha Summary: Apache CloudStack Balancing Strategy for MySQL @@ -208,18 +198,18 @@ if [ "%{_ossnoss}" == "NOREDIST" -o "%{_ossnoss}" == "noredist" ] ; then echo "Executing mvn packaging with non-redistributable libraries" if [ "%{_sim}" == "SIMULATOR" -o "%{_sim}" == "simulator" ] ; then echo "Executing mvn noredist packaging with simulator ..." - mvn -Pawsapi,systemvm -Dnoredist -Dsimulator clean package + mvn -Psystemvm -Dnoredist -Dsimulator clean package else echo "Executing mvn noredist packaging without simulator..." - mvn -Pawsapi,systemvm -Dnoredist clean package + mvn -Psystemvm -Dnoredist clean package fi else if [ "%{_sim}" == "SIMULATOR" -o "%{_sim}" == "simulator" ] ; then echo "Executing mvn default packaging simulator ..." - mvn -Pawsapi,systemvm -Dsimulator clean package + mvn -Psystemvm -Dsimulator clean package else echo "Executing mvn default packaging without simulator ..." - mvn -Pawsapi,systemvm clean package + mvn -Psystemvm clean package fi fi @@ -228,7 +218,6 @@ fi # Common directories mkdir -p ${RPM_BUILD_ROOT}%{_bindir} mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/log/%{name}/agent -mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/log/%{name}/awsapi mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/log/%{name}/ipallocator mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/cache/%{name}/management/work mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/cache/%{name}/management/temp @@ -260,7 +249,6 @@ mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/ mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/webapps/client mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/setup mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/log/%{name}/management -mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/log/%{name}/awsapi mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}/management # Specific for tomcat @@ -351,37 +339,12 @@ mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/log/%{name}/usage/ cp -r cloud-cli/cloudtool ${RPM_BUILD_ROOT}%{python_sitearch}/ install cloud-cli/cloudapis/cloud.py ${RPM_BUILD_ROOT}%{python_sitearch}/cloudapis.py -# AWS API -mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/%{name}-bridge/webapps/awsapi -mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/%{name}-bridge/setup -cp -r awsapi/target/cloud-awsapi-%{_maventag}/* ${RPM_BUILD_ROOT}%{_datadir}/%{name}-bridge/webapps/awsapi -install -D awsapi-setup/setup/cloud-setup-bridge ${RPM_BUILD_ROOT}%{_bindir}/cloudstack-setup-bridge -install -D awsapi-setup/setup/cloudstack-aws-api-register ${RPM_BUILD_ROOT}%{_bindir}/cloudstack-aws-api-register -cp -r awsapi-setup/db/mysql/* ${RPM_BUILD_ROOT}%{_datadir}/%{name}-bridge/setup -cp awsapi/resource/Axis2/axis2.xml ${RPM_BUILD_ROOT}%{_datadir}/%{name}-bridge/webapps/awsapi/WEB-INF/conf -cp awsapi/target/WEB-INF/services/cloud-ec2.aar ${RPM_BUILD_ROOT}%{_datadir}/%{name}-bridge/webapps/awsapi/WEB-INF/services - - -for name in cloud-bridge.properties commons-logging.properties ec2-service.properties ; do - mv ${RPM_BUILD_ROOT}%{_datadir}/%{name}-bridge/webapps/awsapi/WEB-INF/classes/$name \ - ${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}/management/$name -done - # MYSQL HA if [ "x%{_ossnoss}" == "xnoredist" ] ; then mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/%{name}-mysql-ha/lib cp -r plugins/database/mysql-ha/target/cloud-plugin-database-mysqlha-%{_maventag}.jar ${RPM_BUILD_ROOT}%{_datadir}/%{name}-mysql-ha/lib fi -#Don't package the below for AWS API -rm -rf ${RPM_BUILD_ROOT}%{_datadir}/%{name}-bridge/webapps/awsapi/WEB-INF/classes/db.properties -rm -rf ${RPM_BUILD_ROOT}%{_datadir}/%{name}-bridge/webapps/awsapi/WEB-INF/classes/LICENSE.txt -rm -rf ${RPM_BUILD_ROOT}%{_datadir}/%{name}-bridge/webapps/awsapi/WEB-INF/classes/log4j.properties -rm -rf ${RPM_BUILD_ROOT}%{_datadir}/%{name}-bridge/webapps/awsapi/WEB-INF/classes/log4j-vmops.xml -rm -rf ${RPM_BUILD_ROOT}%{_datadir}/%{name}-bridge/webapps/awsapi/WEB-INF/classes/META-INF -rm -rf ${RPM_BUILD_ROOT}%{_datadir}/%{name}-bridge/webapps/awsapi/WEB-INF/classes/NOTICE.txt -rm -rf ${RPM_BUILD_ROOT}%{_datadir}/%{name}-bridge/webapps/awsapi/WEB-INF/classes/services.xml - #License files from whisker install -D tools/whisker/NOTICE ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-management-%{version}/NOTICE install -D tools/whisker/LICENSE ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-management-%{version}/LICENSE @@ -391,8 +354,6 @@ install -D tools/whisker/NOTICE ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-agent install -D tools/whisker/LICENSE ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-agent-%{version}/LICENSE install -D tools/whisker/NOTICE ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-usage-%{version}/NOTICE install -D tools/whisker/LICENSE ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-usage-%{version}/LICENSE -install -D tools/whisker/NOTICE ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-awsapi-%{version}/NOTICE -install -D tools/whisker/LICENSE ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-awsapi-%{version}/LICENSE install -D tools/whisker/NOTICE ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-cli-%{version}/NOTICE install -D tools/whisker/LICENSE ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-cli-%{version}/LICENSE if [ "x%{_ossnoss}" == "xnoredist" ] ; then @@ -403,10 +364,6 @@ fi %clean [ ${RPM_BUILD_ROOT} != "/" ] && rm -rf ${RPM_BUILD_ROOT} -%pre awsapi -id cloud > /dev/null 2>&1 || /usr/sbin/useradd -M -c "CloudStack unprivileged user" \ - -r -s /bin/sh -d %{_localstatedir}/cloudstack/management cloud|| true - %preun management /sbin/service cloudstack-management stop || true if [ "$1" == "0" ] ; then @@ -564,11 +521,6 @@ if [ -f "%{_sysconfdir}/%{name}/management/key" ]; then ln -s %{_sysconfdir}/%{name}/management/key %{_sysconfdir}/%{name}/usage/key fi -#%post awsapi -#if [ -d "%{_datadir}/%{name}-management" ] ; then -# ln -s %{_datadir}/%{name}-bridge/webapps %{_datadir}/%{name}-management/webapps7080 -#fi - #No default permission as the permission setup is complex %files management %defattr(-,root,root,-) @@ -582,7 +534,6 @@ fi %dir %attr(0770,root,cloud) %{_localstatedir}/cache/%{name}/management/work %dir %attr(0770,root,cloud) %{_localstatedir}/cache/%{name}/management/temp %dir %attr(0770,root,cloud) %{_localstatedir}/log/%{name}/management -%dir %attr(0770,root,cloud) %{_localstatedir}/log/%{name}/awsapi %config(noreplace) %{_sysconfdir}/sysconfig/%{name}-management %config(noreplace) %attr(0640,root,cloud) %{_sysconfdir}/%{name}/management/db.properties %config(noreplace) %{_sysconfdir}/%{name}/management/log4j-cloud.xml @@ -598,9 +549,7 @@ fi %config(noreplace) %{_sysconfdir}/%{name}/management/web.xml %config(noreplace) %{_sysconfdir}/%{name}/management/environment.properties %config(noreplace) %{_sysconfdir}/%{name}/management/java.security.ciphers -%config(noreplace) %{_sysconfdir}/%{name}/management/cloud-bridge.properties %config(noreplace) %{_sysconfdir}/%{name}/management/commons-logging.properties -%config(noreplace) %{_sysconfdir}/%{name}/management/ec2-service.properties %attr(0755,root,root) %{_initrddir}/%{name}-management %attr(0755,root,root) %{_initrddir}/tomcat.sh @@ -675,18 +624,6 @@ fi %{_defaultdocdir}/%{name}-cli-%{version}/LICENSE %{_defaultdocdir}/%{name}-cli-%{version}/NOTICE -%files awsapi -%defattr(0644,cloud,cloud,0755) -%{_datadir}/%{name}-bridge/webapps/awsapi -%attr(0644,root,root) %{_datadir}/%{name}-bridge/setup/* -%attr(0755,root,root) %{_bindir}/cloudstack-aws-api-register -%attr(0755,root,root) %{_bindir}/cloudstack-setup-bridge -%attr(0666,cloud,cloud) %{_datadir}/%{name}-bridge/webapps/awsapi/WEB-INF/classes/crypto.properties -%attr(0666,cloud,cloud) %{_datadir}/%{name}-bridge/webapps/awsapi/WEB-INF/classes/xes.keystore - -%{_defaultdocdir}/%{name}-awsapi-%{version}/LICENSE -%{_defaultdocdir}/%{name}-awsapi-%{version}/NOTICE - %if "%{_ossnoss}" == "noredist" %files mysql-ha %defattr(0644,cloud,cloud,0755) @@ -699,6 +636,9 @@ fi %attr(0755,root,root) %{_bindir}/cloudstack-setup-baremetal %changelog +* Thu Apr 30 2015 Rohit Yadav <[email protected]> 4.6.0 +- Remove awsapi package + * Fri Jul 04 2014 Hugo Trippaers <[email protected]> 4.5.0 - Add a package for the mysql ha module http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3746e3d7/packaging/fedora21/replace.properties ---------------------------------------------------------------------- diff --git a/packaging/fedora21/replace.properties b/packaging/fedora21/replace.properties index 8345854..6a3101f 100644 --- a/packaging/fedora21/replace.properties +++ b/packaging/fedora21/replace.properties @@ -22,14 +22,12 @@ MSLOG=vmops.log APISERVERLOG=api.log DBHOST=localhost COMPONENTS-SPEC=components-premium.xml -AWSAPILOG=awsapi.log REMOTEHOST=localhost AGENTCLASSPATH= AGENTLOG=/var/log/cloudstack/agent/agent.log AGENTLOGDIR=/var/log/cloudstack/agent/ AGENTSYSCONFDIR=/etc/cloudstack/agent APISERVERLOG=/var/log/cloudstack/management/apilog.log -AWSAPILOG=/var/log/cloudstack/awsapi/awsapi.log BINDIR=/usr/bin COMMONLIBDIR=/usr/share/cloudstack-common CONFIGUREVARS= http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3746e3d7/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 0c55e33..3bea36f 100644 --- a/pom.xml +++ b/pom.xml @@ -551,7 +551,7 @@ <includeTestSourceDirectory>true</includeTestSourceDirectory> <sourceDirectory>${project.basedir}</sourceDirectory> <includes>**\/*.java</includes> - <excludes>**\/deps\/,**\/test\/,**\/target\/,**\/bin\/,**\/*.xml,**\/*.ini,**\/*.sh,**\/*.bat,**\/awsapi\/,**\/apidoc\/</excludes> + <excludes>**\/deps\/,**\/test\/,**\/target\/,**\/bin\/,**\/*.xml,**\/*.ini,**\/*.sh,**\/*.bat,**\/apidoc\/</excludes> </configuration> </plugin> <plugin> @@ -743,7 +743,6 @@ <exclude>**/target/**</exclude> <exclude>**/.vagrant</exclude> <exclude>**/*.json</exclude> - <exclude>awsapi/overlays/**</exclude> <exclude>build/build.number</exclude> <exclude>services/console-proxy/server/js/jquery.js</exclude> <exclude>debian/compat</exclude> @@ -1012,12 +1011,6 @@ </reporting> <profiles> <profile> - <id>awsapi</id> - <modules> - <module>awsapi</module> - </modules> - </profile> - <profile> <id>systemvm</id> <activation> <property>
