cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From h...@apache.org
Subject [2/2] git commit: add jasyth for the install scripts
Date Fri, 05 Oct 2012 20:49:17 GMT
add jasyth for the install scripts


Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/13da6c13
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/13da6c13
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/13da6c13

Branch: refs/heads/maven-to-rpm
Commit: 13da6c136e469567992bcb8045cf080f133faf4d
Parents: 3902b18
Author: Hugo Trippaers <htrippaers@schubergphilis.com>
Authored: Fri Oct 5 22:47:45 2012 +0200
Committer: Hugo Trippaers <htrippaers@schubergphilis.com>
Committed: Fri Oct 5 22:47:45 2012 +0200

----------------------------------------------------------------------
 client/pom.xml                |   33 +++++++++++++++++++++++++++++++++
 packaging/centos63/cloud.spec |    7 ++++++-
 2 files changed, 39 insertions(+), 1 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/13da6c13/client/pom.xml
----------------------------------------------------------------------
diff --git a/client/pom.xml b/client/pom.xml
index 1be36b6..803b9aa 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -210,6 +210,39 @@
           </execution>
         </executions>
       </plugin>
+      <!-- there are the jasypt libs requires by some of the python scripts -->
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-dependency-plugin</artifactId>
+        <version>2.5.1</version>
+        <executions>
+          <execution>
+            <id>copy</id>
+            <phase>package</phase>
+            <goals>
+              <goal>copy</goal>
+            </goals>
+            <configuration>
+              <artifactItems>
+                <artifactItem>
+                  <groupId>org.jasypt</groupId>
+                  <artifactId>jasypt</artifactId>
+                  <version>1.9.0</version>`
+                  <overWrite>false</overWrite>
+                  <outputDirectory>${project.build.directory}/pythonlibs</outputDirectory>
+                </artifactItem>
+                <artifactItem>
+                  <groupId>org.jasypt</groupId>
+                  <artifactId>jasypt</artifactId>
+                  <version>1.8</version>`
+                  <overWrite>false</overWrite>
+                  <outputDirectory>${project.build.directory}/pythonlibs</outputDirectory>
+                </artifactItem>
+              </artifactItems>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
     </plugins>
     <pluginManagement>
       <plugins>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/13da6c13/packaging/centos63/cloud.spec
----------------------------------------------------------------------
diff --git a/packaging/centos63/cloud.spec b/packaging/centos63/cloud.spec
index 4327140..2617930 100644
--- a/packaging/centos63/cloud.spec
+++ b/packaging/centos63/cloud.spec
@@ -78,6 +78,7 @@ Requires: mkisofs
 Requires: MySQL-python
 Requires: python-paramiko
 Requires: ipmitool
+Requires: %{name}-setup = %{_ver}
 Group:     System Environment/Libraries
 %description management-server
 The CloudStack management server is the central point of coordination,
@@ -85,10 +86,10 @@ management, and intelligence in CloudStack.
 
 %package setup
 Summary: CloudStack database setup scripts
-Requires: %{name}-management-server = %{_ver}
 Requires: java >= 1.6.0
 Requires: python
 Requires: MySQL-python
+Requires: %{name}-python = %{_ver}
 Group: System Environment/Libraries
 %description setup
 The scripts and commands used to setup and configure the database
@@ -165,6 +166,8 @@ cp -r cloud-cli/cloudtool ${RPM_BUILD_ROOT}/usr/lib/python2.6/site-packages/
 install python/lib/cloud_utils.py ${RPM_BUILD_ROOT}/usr/lib/python2.6/site-packages/cloud_utils.py
 install cloud-cli/cloudapis/cloud.py ${RPM_BUILD_ROOT}/usr/lib/python2.6/site-packages/cloudapis.py
 install python/bindir/cloud-external-ipallocator.py ${RPM_BUILD_ROOT}%{_bindir}/
+install -D client/target/pythonlibs/jasypt-1.9.0.jar ${RPM_BUILD_ROOT}%{_javadir}/jasypt-1.9.0.jar
+install -D client/target/pythonlibs/jasypt-1.8.jar ${RPM_BUILD_ROOT}%{_javadir}/jasypt-1.8.jar
 
 install -D packaging/centos63/cloud-ipallocator.rc ${RPM_BUILD_ROOT}/etc/rc.d/init.d/%{name}-ipallocator
 install -D packaging/centos63/cloud-management.rc ${RPM_BUILD_ROOT}/etc/rc.d/init.d/%{name}-management
@@ -250,6 +253,8 @@ fi
 %{_datadir}/%{name}/setup/db/*.sql
 %{_datadir}/%{name}/setup/*.sh
 %{_datadir}/%{name}/setup/server-setup.xml
+%{_javadir}/jasypt-1.9.0.jar
+%{_javadir}/jasypt-1.8.jar
 %doc LICENSE
 %doc NOTICE
 


Mime
View raw message