Permalink
Browse files

merged from grze_eee; moved vmware-broker top-level into clc/modules/…

…vmware-broker/src/main/native
  • Loading branch information...
2 parents 18cca2f + 9000a2b commit f8b69ca6a55c544b4ee6c5467591c409b87c7c36 @dmitrii dmitrii committed Apr 16, 2012
Showing with 1,690 additions and 7,830 deletions.
  1. +0 −1 Makefile
  2. +8 −7 clc/.classpath
  3. +1 −1 clc/.project
  4. +11 −35 clc/Makefile
  5. +0 −240 clc/build-alt.xml
  6. +33 −164 clc/build.xml
  7. +4 −4 clc/modules/authentication/src/main/java/com/eucalyptus/auth/DatabaseAccessKeyProxy.java
  8. +10 −18 clc/modules/authentication/src/main/java/com/eucalyptus/auth/DatabaseAccountProxy.java
  9. +42 −50 clc/modules/authentication/src/main/java/com/eucalyptus/auth/DatabaseAuthProvider.java
  10. +70 −67 clc/modules/authentication/src/main/java/com/eucalyptus/auth/DatabaseAuthUtils.java
  11. +6 −6 clc/modules/authentication/src/main/java/com/eucalyptus/auth/DatabaseCertificateProxy.java
  12. +14 −15 clc/modules/authentication/src/main/java/com/eucalyptus/auth/DatabaseGroupProxy.java
  13. +33 −34 clc/modules/authentication/src/main/java/com/eucalyptus/auth/DatabaseUserProxy.java
  14. +14 −0 clc/modules/authentication/src/main/java/com/eucalyptus/auth/crypto/DefaultCryptoProvider.java
  15. +435 −0 clc/modules/authentication/src/main/java/com/eucalyptus/auth/crypto/MD5Crypt.java
  16. +20 −4 clc/modules/bootstrap/build.xml
  17. +0 −2 clc/modules/bootstrap/src/main/native/arguments.ggo.in
  18. +30 −68 clc/modules/bootstrap/src/main/native/eucalyptus-opts.c
  19. +2 −8 clc/modules/bootstrap/src/main/native/eucalyptus-opts.h
  20. +0 −21 clc/modules/build.order
  21. +4 −9 clc/modules/cluster-manager/src/main/java/com/eucalyptus/cloud/run/AdmissionControl.java
  22. +12 −4 clc/modules/cluster-manager/src/main/java/com/eucalyptus/cloud/run/Allocations.java
  23. +25 −18 clc/modules/cluster-manager/src/main/java/com/eucalyptus/vm/VmInstance.java
  24. +19 −10 clc/modules/cluster-manager/src/main/java/com/eucalyptus/vm/VmNetworkConfig.java
  25. +31 −5 clc/modules/module-inc.groovy
  26. +23 −0 clc/modules/module-inc.order
  27. +71 −45 clc/modules/module-inc.xml
  28. +3 −6 clc/modules/msgs/src/main/java/com/eucalyptus/auth/Privileged.java
  29. +580 −0 clc/modules/msgs/src/main/java/com/eucalyptus/broker/VMwareBroker.groovy
  30. +79 −0 clc/modules/msgs/src/main/java/com/eucalyptus/broker/vmware/VMwareBroker.java
  31. +40 −0 clc/modules/msgs/src/main/java/com/eucalyptus/crypto/Crypto.java
  32. +2 −1 clc/modules/msgs/src/main/java/com/eucalyptus/crypto/CryptoProvider.java
  33. +1 −1 clc/modules/msgs/src/main/java/com/eucalyptus/system/Threads.java
  34. +10 −1 clc/modules/storage-controller/build.xml
  35. 0 clc/modules/storage-controller/{include → native}/storage_native.h
  36. +14 −0 clc/modules/walrus/src/main/java/edu/ucsb/eucalyptus/cloud/ws/WalrusBlockStorageManager.java
  37. +12 −10 clc/modules/walrus/src/main/java/edu/ucsb/eucalyptus/cloud/ws/WalrusManager.java
  38. +23 −22 clc/modules/www/src/main/java/com/eucalyptus/webui/server/ConfigurationWebBackend.java
  39. +5 −5 clc/modules/www/src/main/java/com/eucalyptus/webui/server/EuareWebBackend.java
  40. +3 −3 clc/modules/www/src/main/java/com/eucalyptus/webui/server/EucalyptusServiceImpl.java
  41. +0 −13 clc/tools/src/euca-add-group-membership
  42. +0 −11 clc/tools/src/euca-add-user
  43. +0 −11 clc/tools/src/euca-add-user-group
  44. +0 −16 clc/tools/src/euca-clone-volume
  45. +0 −16 clc/tools/src/euca-convert-volumes
  46. +0 −11 clc/tools/src/euca-delete-user
  47. +0 −11 clc/tools/src/euca-delete-user-group
  48. +0 −11 clc/tools/src/euca-deregister-arbitrator
  49. +0 −11 clc/tools/src/euca-deregister-cluster
  50. +0 −11 clc/tools/src/euca-deregister-storage-controller
  51. +0 −11 clc/tools/src/euca-deregister-vmwarebroker
  52. +0 −11 clc/tools/src/euca-deregister-walrus
  53. +0 −11 clc/tools/src/euca-describe-arbitrators
  54. +0 −11 clc/tools/src/euca-describe-clusters
  55. +0 −11 clc/tools/src/euca-describe-components
  56. +0 −12 clc/tools/src/euca-describe-nodes
  57. +0 −11 clc/tools/src/euca-describe-properties
  58. +0 −11 clc/tools/src/euca-describe-services
  59. +0 −11 clc/tools/src/euca-describe-storage-controllers
  60. +0 −11 clc/tools/src/euca-describe-user-groups
  61. +0 −11 clc/tools/src/euca-describe-users
  62. +0 −11 clc/tools/src/euca-describe-vmwarebrokers
  63. +0 −11 clc/tools/src/euca-describe-walruses
  64. +0 −21 clc/tools/src/euca-get-credentials
  65. +0 −14 clc/tools/src/euca-grant-zone-permission
  66. +0 −11 clc/tools/src/euca-modify-cluster
  67. +0 −12 clc/tools/src/euca-modify-property
  68. +0 −11 clc/tools/src/euca-modify-storage-controller
  69. +0 −11 clc/tools/src/euca-modify-vmwarebroker
  70. +0 −11 clc/tools/src/euca-modify-walrus
  71. +0 −11 clc/tools/src/euca-register-arbitrator
  72. +0 −11 clc/tools/src/euca-register-cluster
  73. +0 −11 clc/tools/src/euca-register-storage-controller
  74. +0 −11 clc/tools/src/euca-register-vmwarebroker
  75. +0 −11 clc/tools/src/euca-register-walrus
  76. +0 −13 clc/tools/src/euca-remove-group-membership
  77. +0 −14 clc/tools/src/euca-revoke-zone-permission
  78. +0 −48 clc/tools/src/euca_admin/__init__.py
  79. +0 −156 clc/tools/src/euca_admin/arbitrator.py
  80. +0 −167 clc/tools/src/euca_admin/clusters.py
  81. +0 −71 clc/tools/src/euca_admin/component.py
  82. +0 −215 clc/tools/src/euca_admin/components.py
  83. +0 −41 clc/tools/src/euca_admin/generic.py
  84. +0 −158 clc/tools/src/euca_admin/groups.py
  85. +0 −152 clc/tools/src/euca_admin/local.py
  86. +0 −55 clc/tools/src/euca_admin/nodes.py
  87. +0 −146 clc/tools/src/euca_admin/properties.py
  88. +0 −167 clc/tools/src/euca_admin/storagecontrollers.py
  89. +0 −142 clc/tools/src/euca_admin/users.py
  90. +0 −159 clc/tools/src/euca_admin/vmwarebroker.py
  91. +0 −160 clc/tools/src/euca_admin/walruses.py
  92. 0 {clc/tools → devel}/runJUnitTest.sh
  93. 0 {clc/tools → devel}/runTest.sh
  94. +0 −27 vmware-broker/Makefile
  95. +0 −41 vmware-broker/euca_vmware
  96. +0 −69 vmware-broker/imager/Makefile
  97. +0 −881 vmware-broker/imager/cache.c
  98. +0 −91 vmware-broker/imager/cache.h
  99. +0 −42 vmware-broker/imager/cmd.h
  100. +0 −224 vmware-broker/imager/cmd_bundle.c
  101. +0 −323 vmware-broker/imager/cmd_convert.c
  102. +0 −36 vmware-broker/imager/cmd_fsck.c
  103. +0 −149 vmware-broker/imager/cmd_prepare.c
  104. +0 −260 vmware-broker/imager/cmd_upload.c
  105. +0 −434 vmware-broker/imager/diskfile.c
  106. +0 −67 vmware-broker/imager/diskfile.h
  107. +0 −41 vmware-broker/imager/euca_vmdk
  108. +0 −533 vmware-broker/imager/imager.c
  109. +0 −53 vmware-broker/imager/imager.h
  110. +0 −224 vmware-broker/imager/img.c
  111. +0 −44 vmware-broker/imager/img.h
  112. +0 −87 vmware-broker/imager/test_imager
  113. +0 −618 vmware-broker/imager/vmdk.c
  114. +0 −23 vmware-broker/imager/vmdk.h
  115. +0 −402 vmware-broker/imager/vmdk_shim.c
View
@@ -9,7 +9,6 @@ SUBDIRS = tools \
util \
net \
storage \
- vmware-broker \
gatherlog \
node \
cluster \
View
@@ -16,6 +16,7 @@
<classpathentry kind="src" output="modules/euare-common/build" path="modules/euare-common/src/main/java"/>
<classpathentry kind="src" output="modules/ldap/build" path="modules/ldap/src/main/java"/>
<classpathentry kind="src" output="modules/msgs/build" path="modules/msgs/src/main/java"/>
+ <classpathentry kind="src" output="modules/msgs/build" path="modules/msgs/src/test/java"/>
<classpathentry kind="src" path="modules/msgs/conf/jmx"/>
<classpathentry kind="src" path="modules/msgs/conf/scripts"/>
<classpathentry kind="src" output="modules/mysql/build" path="modules/mysql/src/main/java"/>
@@ -37,7 +38,6 @@
<classpathentry kind="src" output="modules/www/build" path="modules/www/src/main/java"/>
<classpathentry kind="src" path="modules/www/conf/reports"/>
<classpathentry kind="src" path="modules/www/conf/www"/>
- <classpathentry kind="src" path="modules/msgs/src/test/java"/>
<classpathentry kind="con" path="GROOVY_SUPPORT"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="lib" path="lib/activemq-core-5.4.1.jar"/>
@@ -105,14 +105,14 @@
<classpathentry kind="lib" path="lib/geronimo-stax-1.0-spec-1.0.1.jar"/>
<classpathentry kind="lib" path="lib/groovy-all-1.7.2.jar"/>
<classpathentry kind="lib" path="lib/guava-r09-gwt.jar"/>
- <classpathentry kind="lib" path="lib/guava-r09.jar" sourcepath="/bzr/third-party/guava-r08"/>
+ <classpathentry kind="lib" path="lib/guava-r09.jar"/>
<classpathentry kind="lib" path="lib/gwt-api-checker-2.2.jar"/>
<classpathentry kind="lib" path="lib/gwt-dev-2.2.jar"/>
<classpathentry kind="lib" path="lib/gwt-servlet-2.2.jar"/>
<classpathentry kind="lib" path="lib/gwt-servlet-deps-2.2.jar"/>
<classpathentry kind="lib" path="lib/gwt-soyc-vis-2.2.jar"/>
<classpathentry kind="lib" path="lib/gwt-user-2.2.jar"/>
- <classpathentry kind="lib" path="lib/ha-jdbc-2.0.16-rc-1-jdk1.6.jar" sourcepath="/bzr/third-party/ha-jdbc-2.0.16-rc-1"/>
+ <classpathentry kind="lib" path="lib/ha-jdbc-2.0.16-rc-1-jdk1.6.jar"/>
<classpathentry kind="lib" path="lib/hamcrest-all-1.2.jar"/>
<classpathentry kind="lib" path="lib/hibernate-3.5.6-Final.jar"/>
<classpathentry kind="lib" path="lib/hsqldb-1.8.0.10.jar"/>
@@ -142,7 +142,7 @@
<classpathentry kind="lib" path="lib/jetty6-servlet-tester-6.1.19.jar"/>
<classpathentry kind="lib" path="lib/jetty6-sslengine-6.1.19.jar"/>
<classpathentry kind="lib" path="lib/jetty6-util-6.1.19.jar"/>
- <classpathentry kind="lib" path="lib/jgroups-2.11.1.Final.jar" sourcepath="/bzr/third-party/jgroups-sources-2.11.1.jar"/>
+ <classpathentry kind="lib" path="lib/jgroups-2.11.1.Final.jar"/>
<classpathentry kind="lib" path="lib/jibx-bind-1.2.3.jar"/>
<classpathentry kind="lib" path="lib/jibx-extras-1.2.3.jar"/>
<classpathentry kind="lib" path="lib/jibx-run-1.2.3.jar"/>
@@ -158,20 +158,20 @@
<classpathentry kind="lib" path="lib/kahadb-5.4.1.jar"/>
<classpathentry kind="lib" path="lib/log4j-1.2.15.jar"/>
<classpathentry kind="lib" path="lib/manageontap.jar"/>
- <classpathentry kind="lib" path="lib/mule-core-2.0.1.jar" sourcepath="/bzr/third-party/mule-2.0.1.orig"/>
+ <classpathentry kind="lib" path="lib/mule-core-2.0.1.jar"/>
<classpathentry kind="lib" path="lib/mule-module-builders-2.0.1.jar"/>
<classpathentry kind="lib" path="lib/mule-module-client-2.0.1.jar"/>
<classpathentry kind="lib" path="lib/mule-module-management-2.0.1.jar"/>
<classpathentry kind="lib" path="lib/mule-module-spring-config-2.0.1.jar"/>
<classpathentry kind="lib" path="lib/mule-module-xml-2.0.1.jar"/>
<classpathentry kind="lib" path="lib/mule-transport-vm-2.0.1.jar"/>
- <classpathentry kind="lib" path="lib/mysql-connector-java-commercial-5.1.18-bin.jar"/>
+ <classpathentry kind="lib" path="lib/mysql-connector-java-5.1.18-bin.jar"/>
<classpathentry kind="lib" path="lib/netty-3.1.0.CR1.jar"/>
<classpathentry kind="lib" path="lib/openjdk-crypto.jar"/>
<classpathentry kind="lib" path="lib/org.restlet-1.1.5.jar"/>
<classpathentry kind="lib" path="lib/org.restlet.ext.velocity-1.1.5.jar"/>
<classpathentry kind="lib" path="lib/org.simpleframework-3.1.3.jar"/>
- <classpathentry kind="lib" path="lib/proxool-0.9.1.jar" sourcepath="/bzr/third-party/proxool-0.9.1"/>
+ <classpathentry kind="lib" path="lib/proxool-0.9.1.jar"/>
<classpathentry kind="lib" path="lib/proxool-cglib.jar"/>
<classpathentry kind="lib" path="lib/quartz-1.6.5.jar"/>
<classpathentry kind="lib" path="lib/regexp-1.4.jar"/>
@@ -196,6 +196,7 @@
<classpathentry kind="lib" path="lib/xml-security-1.4.2.jar"/>
<classpathentry kind="lib" path="lib/xom-1.1.jar"/>
<classpathentry kind="lib" path="lib/xpp3-1.1.3.4.O.jar"/>
+ <classpathentry kind="lib" path="modules/module-inc.groovy"/>
<classpathentry exported="true" kind="con" path="GROOVY_DSL_SUPPORT"/>
<classpathentry kind="output" path="bin"/>
</classpath>
View
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>grze_eee_clc_dev:clc</name>
+ <name>grze_eee:clc</name>
<comment></comment>
<projects>
</projects>
View
@@ -11,8 +11,15 @@ web_prop_dir = ${TOP}/clc/modules/www/conf
all: deps build
test: deps build-test
-deps:
- @$(ANT) deps
+deps/cloud-lib.tar.gz:
+ @mkdir -p deps
+ cd ${TOP}/clc/deps/ && wget -q http://mirror.eucalyptus/dependencies/${VERSION}/cloud-lib.tar.gz
+
+lib/bcprov.jar:
+ @mkdir -p lib
+ tar -C ${TOP}/clc/lib -zxf ${TOP}/clc/deps/cloud-lib.tar.gz
+
+deps: deps/cloud-lib.tar.gz lib/bcprov.jar
update_properties: ${web_prop_dir}/eucalyptus-web.properties
@@ -53,9 +60,6 @@ build: deps extras
bash -c 'ulimit -n 500000;ulimit -n;ANT_OPTS="-Xmx1g -XX:MaxPermSize=512m" $(ANT) compile-bind'
#HACK!
bash -c 'ulimit -n 500000;ulimit -n;ANT_OPTS="-Xmx1g -XX:MaxPermSize=512m" $(ANT) jar'
- @make -C modules/storage-controller/native
- @make -C modules/storage-san/native
- @make -C modules/bootstrap/src/main/native
@make -C eucadmin
build-test: deps extras
@@ -69,62 +73,34 @@ build-test: deps extras
bash -c 'ulimit -n 500000;ulimit -n;ANT_OPTS="-Xmx1g -XX:MaxPermSize=512m" $(ANT) compile-bind'
#HACK!
bash -c 'ulimit -n 500000;ulimit -n;ANT_OPTS="-Xmx1g -XX:MaxPermSize=512m" $(ANT) jar'
- @make -C modules/storage-controller/native
- @make -C modules/storage-san/native
- @make -C modules/bootstrap/src/main/native
@make -C eucadmin
-clean:
+clean: deps
$(ANT) clean
- make -C modules/bootstrap/src/main/native clean
- make -C modules/storage-controller/native clean
- make -C modules/storage-san/native clean
make -C eucadmin clean
distclean: clean
+ rm -rf ${TOP}/deps ${TOP}/lib
$(ANT) distclean
- make -C modules/bootstrap/src/main/native distclean
- make -C modules/storage-controller/native distclean
- make -C modules/storage-san/native distclean
make -C eucadmin distclean
-install-test: build-test
- @ANT_OPTS="-Xmx1g -XX:MaxPermSize=512m" $(ANT) install
- @make -C modules/storage-controller/native install
- @make -C modules/bootstrap/src/main/native install
- @make -C eucadmin install
-
install: build
@ANT_OPTS="-Xmx1g -XX:MaxPermSize=512m" $(ANT) install
- @make -C modules/storage-controller/native install
- @make -C modules/storage-san/native install
- @make -C modules/bootstrap/src/main/native install
@make -C eucadmin install
install-test: build-test
@ANT_OPTS="-Xmx1g -XX:MaxPermSize=256m" $(ANT) install
- @make -C modules/storage-controller/native install
- @make -C modules/storage-san/native install
- @make -C modules/bootstrap/src/main/native install
@make -C eucadmin install
deploy: install
uninstall:
- make -C modules/storage-controller/native uninstall
- make -C modules/storage-san/native uninstall
- make -C modules/bootstrap/src/main/native uninstall
make -C eucadmin uninstall
$(RM) -rf $(DESTDIR)$(etcdir)/eucalyptus/cloud.d
$(RM) -rf $(DESTDIR)$(datarootdir)/eucalyptus/*jar
$(RM) -rf $(DESTDIR)$(vardir)/eucalyptus/webapps
# cleaning up after run-test currently requires a few iterations of:
# dmsetup table | cut -d':' -f 1 | sort | uniq | xargs -L 1 dmsetup remove ; losetup -a | cut -d':' -f 1 | xargs -L 1 losetup -d; losetup -a
-run-test:
- tools/runJUnitTest.sh com.eucalyptus.cloud.ws.EucaImagerTest
- tools/runJUnitTest.sh com.eucalyptus.cloud.ws.BrokerInterfaceTest
- tools/runJUnitTest.sh com.eucalyptus.cloud.ws.vsphere.VSphereEndpointTest -Dvsphere.url=${VSPHERE_URL} -Dvsphere.login=${VSPHERE_LOGIN} -Dvsphere.password=${VSPHERE_PASSWORD}
- tools/runJUnitTest.sh com.eucalyptus.cloud.ws.vsphere.VSphereEndpointAsyncTest -Dvsphere.url=${VSPHERE_URL} -Dvsphere.login=${VSPHERE_LOGIN} -Dvsphere.password=${VSPHERE_PASSWORD}
Oops, something went wrong.

0 comments on commit f8b69ca

Please sign in to comment.