Permalink
Browse files

merge outstanding changes to WS stack and forward port of 1.5 series …

…bug fixes
  • Loading branch information...
2 parents 0c89c60 + 358ea61 commit 7b3202252f9041ef4f28c28b9cae98652728334c @grze grze committed Jun 23, 2009
Showing with 4,753 additions and 4,300 deletions.
  1. +2 −1 Makefile
  2. +5 −5 clc/build.xml
  3. +0 −1,578 clc/cloud.ipr
  4. +3 −2 clc/cloud.xml
  5. +5 −6 clc/eucalyptus.ipr
  6. +5 −5 clc/modules/axis2-transport/conf/axis2.xml
  7. +252 −199 clc/modules/axis2-transport/src/edu/ucsb/eucalyptus/transport/Axis2InOutMessageReceiver.java
  8. +74 −63 clc/modules/axis2-transport/src/edu/ucsb/eucalyptus/transport/binding/Binding.java
  9. +3 −3 clc/modules/axis2-transport/src/edu/ucsb/eucalyptus/transport/client/BasicClient.java
  10. +31 −0 clc/modules/axis2-transport/src/edu/ucsb/eucalyptus/transport/client/BindingHandler.java
  11. +42 −0 clc/modules/axis2-transport/src/edu/ucsb/eucalyptus/transport/client/MappingHttpRequest.java
  12. +33 −0 clc/modules/axis2-transport/src/edu/ucsb/eucalyptus/transport/client/MessageStackHandler.java
  13. +1 −1 clc/modules/axis2-transport/src/edu/ucsb/eucalyptus/transport/client/NioClient.java
  14. +10 −6 clc/modules/axis2-transport/src/edu/ucsb/eucalyptus/transport/client/NioClientPipeline.java
  15. +17 −18 clc/modules/axis2-transport/src/edu/ucsb/eucalyptus/transport/client/NioResponseHandler.java
  16. +32 −0 clc/modules/axis2-transport/src/edu/ucsb/eucalyptus/transport/client/SerializingHandler.java
  17. +58 −0 clc/modules/axis2-transport/src/edu/ucsb/eucalyptus/transport/client/SoapHandler.java
  18. +163 −10 clc/modules/axis2-transport/src/edu/ucsb/eucalyptus/transport/client/TestBasicHttpNioClient.java
  19. +162 −0 clc/modules/axis2-transport/src/edu/ucsb/eucalyptus/transport/client/WsSecHandler.java
  20. +179 −169 clc/modules/axis2-transport/src/edu/ucsb/eucalyptus/transport/http/Axis2HttpWorker.java
  21. +4 −1 clc/modules/axis2-transport/src/edu/ucsb/eucalyptus/transport/query/Axis2QueryDispatcher.java
  22. +20 −14 clc/modules/axis2-transport/src/edu/ucsb/eucalyptus/transport/query/DefaultQueryBinding.java
  23. +24 −6 ...dules/axis2-transport/src/edu/ucsb/eucalyptus/transport/query/EucalyptusQuerySecurityHandler.java
  24. +17 −2 clc/modules/axis2-transport/src/edu/ucsb/eucalyptus/transport/query/GenericHttpDispatcher.java
  25. +0 −2 clc/modules/axis2-transport/src/edu/ucsb/eucalyptus/transport/query/HMACQuerySecurityHandler.java
  26. +18 −1 clc/modules/axis2-transport/src/edu/ucsb/eucalyptus/transport/query/HttpRequest.java
  27. +0 −3 clc/modules/axis2-transport/src/edu/ucsb/eucalyptus/transport/query/WalrusQueryDispatcher.java
  28. +1 −0 clc/modules/cluster-manager/cluster-manager.iml
  29. +35 −8 clc/modules/cluster-manager/src/edu/ucsb/eucalyptus/cloud/cluster/ClusterAllocator.java
  30. +1 −0 clc/modules/cluster-manager/src/edu/ucsb/eucalyptus/cloud/cluster/ConfigureNetworkCallback.java
  31. +4 −1 clc/modules/cluster-manager/src/edu/ucsb/eucalyptus/cloud/cluster/StartNetworkCallback.java
  32. +12 −17 clc/modules/cluster-manager/src/edu/ucsb/eucalyptus/cloud/cluster/UnassignAddressCallback.java
  33. +56 −22 clc/modules/cluster-manager/src/edu/ucsb/eucalyptus/cloud/cluster/VmInstance.java
  34. +5 −1 clc/modules/cluster-manager/src/edu/ucsb/eucalyptus/cloud/cluster/VmRunCallback.java
  35. +8 −1 clc/modules/cluster-manager/src/edu/ucsb/eucalyptus/cloud/cluster/VmTypeVerify.java
  36. +28 −27 clc/modules/cluster-manager/src/edu/ucsb/eucalyptus/cloud/cluster/VmTypes.java
  37. +15 −2 clc/modules/cluster-manager/src/edu/ucsb/eucalyptus/cloud/cluster/VmUpdateCallback.java
  38. +7 −0 clc/modules/cluster-manager/src/edu/ucsb/eucalyptus/cloud/cluster/VolumeAttachCallback.java
  39. +243 −68 clc/modules/cluster-manager/src/edu/ucsb/eucalyptus/cloud/ws/AddressManager.java
  40. +28 −5 clc/modules/cluster-manager/src/edu/ucsb/eucalyptus/cloud/ws/SystemState.java
  41. +17 −8 clc/modules/cluster-manager/src/edu/ucsb/eucalyptus/cloud/ws/VmAdmissionControl.java
  42. +12 −6 clc/modules/core/conf/eucalyptus-runtime.xml
  43. +1 −0 clc/modules/core/conf/eucalyptus-services.xml
  44. +4 −1 clc/modules/core/src/edu/ucsb/eucalyptus/Main.java
  45. +30 −2 clc/modules/core/src/edu/ucsb/eucalyptus/StartupChecks.java
  46. +0 −129 clc/modules/core/src/edu/ucsb/eucalyptus/cloud/Configuration.java
  47. +6 −1 clc/modules/core/src/edu/ucsb/eucalyptus/cloud/entities/Address.java
  48. +7 −2 clc/modules/core/src/edu/ucsb/eucalyptus/cloud/entities/ImageInfo.java
  49. +219 −183 clc/modules/core/src/edu/ucsb/eucalyptus/cloud/entities/SystemConfiguration.java
  50. +11 −0 clc/modules/core/src/edu/ucsb/eucalyptus/util/EucalyptusProperties.java
  51. +1 −1 clc/modules/core/src/edu/ucsb/eucalyptus/util/WalrusDataMessage.java
  52. +57 −9 clc/modules/group-manager/src/edu/ucsb/eucalyptus/cloud/ws/GroupManager.java
  53. +207 −38 clc/modules/image-manager/src/edu/ucsb/eucalyptus/cloud/ws/ImageManager.java
  54. +10 −2 clc/modules/interface/src/edu/ucsb/eucalyptus/ic/Eucalyptus.java
  55. +15 −0 clc/modules/msgs/resources/2009-03-01-binding.xml
  56. +15 −0 clc/modules/msgs/resources/2009-04-04-binding.xml
  57. +1 −1 clc/modules/msgs/resources/aws-ebs.xml
  58. +18 −5 clc/modules/msgs/resources/aws-image-attr.xml
  59. +12 −0 clc/modules/msgs/resources/aws-images.xml
  60. +10 −2 clc/modules/msgs/resources/aws-instances.xml
  61. +2 −2 clc/modules/msgs/resources/aws-security.xml
  62. +50 −0 clc/modules/msgs/resources/aws-unimplemented.xml
  63. +17 −16 clc/modules/msgs/src/GenerateJibxBinding.groovy
  64. +9 −1 clc/modules/msgs/src/edu/ucsb/eucalyptus/cloud/Extra.groovy
  65. +29 −0 clc/modules/msgs/src/edu/ucsb/eucalyptus/msgs/Messages.groovy
  66. +22 −0 clc/modules/msgs/src/edu/ucsb/eucalyptus/msgs/Unimplemented.groovy
  67. +0 −17 clc/modules/msgs/src/edu/ucsb/eucalyptus/msgs/Unsupported.groovy
  68. +1 −1 clc/modules/msgs/src/edu/ucsb/eucalyptus/msgs/VmBlockDevice.groovy
  69. +11 −1 clc/modules/msgs/src/edu/ucsb/eucalyptus/msgs/VmControl.groovy
  70. +24 −15 clc/modules/msgs/src/edu/ucsb/eucalyptus/msgs/VmImages.groovy
  71. +5 −0 clc/modules/msgs/src/edu/ucsb/eucalyptus/msgs/VmNetwork.groovy
  72. +5 −5 clc/modules/msgs/src/edu/ucsb/eucalyptus/msgs/VmSecurity.groovy
  73. +2 −2 clc/modules/storage-controller/native/Makefile
  74. +1 −1 clc/modules/storage-controller/native/edu_ucsb_eucalyptus_storage_AOEManager.c
  75. +336 −2 clc/modules/storage-controller/native/edu_ucsb_eucalyptus_storage_LVM2Manager.c
  76. +1 −1 clc/modules/storage-controller/src/edu/ucsb/eucalyptus/cloud/ws/Storage.java
  77. +11 −6 clc/modules/storage-controller/src/edu/ucsb/eucalyptus/storage/LVM2Manager.java
  78. +0 −3 clc/modules/storage-manager/src/edu/ucsb/eucalyptus/cloud/ws/Bukkit.java
  79. +9 −10 clc/modules/storage-manager/src/edu/ucsb/eucalyptus/storage/fs/FileSystemStorageManager.java
  80. +3 −3 clc/modules/www/build.xml
  81. +102 −45 clc/modules/www/src/edu/ucsb/eucalyptus/admin/client/ClusterInfoTable.java
  82. +112 −0 clc/modules/www/src/edu/ucsb/eucalyptus/admin/client/DownloadsTable.java
  83. +42 −0 clc/modules/www/src/edu/ucsb/eucalyptus/admin/client/DownloadsWeb.java
  84. +26 −0 clc/modules/www/src/edu/ucsb/eucalyptus/admin/client/EucalyptusKeyboardListener.java
  85. +2 −0 clc/modules/www/src/edu/ucsb/eucalyptus/admin/client/EucalyptusWebBackend.java
  86. +41 −33 clc/modules/www/src/edu/ucsb/eucalyptus/admin/client/EucalyptusWebBackendAsync.java
  87. +332 −141 clc/modules/www/src/edu/ucsb/eucalyptus/admin/client/EucalyptusWebInterface.java
  88. +204 −199 clc/modules/www/src/edu/ucsb/eucalyptus/admin/client/GWTUtils.java
  89. +34 −1 clc/modules/www/src/edu/ucsb/eucalyptus/admin/client/SystemConfigWeb.java
  90. +2 −0 clc/modules/www/src/edu/ucsb/eucalyptus/admin/client/UserInfoWeb.java
  91. +13 −6 clc/modules/www/src/edu/ucsb/eucalyptus/admin/public/EucalyptusWebInterface.css
  92. +65 −33 clc/modules/www/src/edu/ucsb/eucalyptus/admin/server/EucalyptusManagement.java
  93. +116 −22 clc/modules/www/src/edu/ucsb/eucalyptus/admin/server/EucalyptusWebBackendImpl.java
  94. +26 −30 clc/modules/www/src/edu/ucsb/eucalyptus/admin/server/Registration.java
  95. +13 −11 clc/modules/www/src/edu/ucsb/eucalyptus/admin/server/RemoteInfoHandler.java
  96. +2 −2 cluster/Makefile
  97. +3 −21 cluster/handlers.c
  98. +0 −1 cluster/handlers.h
  99. +11 −10 configure
  100. +1 −0 configure.ac
  101. +117 −45 eucalyptus.spec.suse → eucalyptus.spec
  102. +0 −419 eucalyptus.spec.centos
  103. +56 −45 net/vnetwork.c
  104. +1 −1 node/Makefile
  105. +8 −2 node/handlers_kvm.c
  106. +46 −6 node/handlers_xen.c
  107. +2 −2 node/test_nc.c
  108. +1 −0 tools/Makefile
  109. +90 −0 tools/detach.pl
  110. +64 −0 tools/euca-axis2c-1.5.0.spec-not
  111. +0 −45 tools/euca-axis2c-1.5.spec-not
  112. +0 −44 tools/euca-httpd-1.5.spec-not
  113. +62 −0 tools/euca-rampartc-1.2.0.spec-not
  114. +178 −41 tools/{euca_conf → euca_conf.in}
  115. +26 −34 tools/eucalyptus-cc.in
  116. +16 −3 tools/eucalyptus-cloud.in
  117. +24 −31 tools/eucalyptus-nc.in
  118. +26 −35 tools/eucalyptus.conf
  119. +27 −28 tools/eucalyptus.conf.debian
  120. +28 −29 tools/{eucalyptus.conf.centos → eucalyptus.conf.rpmbased}
  121. +0 −200 tools/eucalyptus.conf.suse
  122. +2 −0 tools/httpd.conf
  123. +5 −3 tools/partition2disk
  124. +2 −2 util/Makefile
  125. +10 −7 util/eucalyptus.h
  126. +20 −0 util/misc.c
  127. +1 −0 util/misc.h
View
@@ -59,10 +59,11 @@ install: deploy
@$(INSTALL) -m 0644 VERSION $(etcdir)/eucalyptus/eucalyptus-version
@$(INSTALL) -d $(etcdir)/init.d
@$(INSTALL) -d $(vardir)/run/eucalyptus/net
- @$(INSTALL) -m 0700 -d $(vardir)/lib/eucalyptus/keys
+ @$(INSTALL) -d $(vardir)/lib/eucalyptus/keys
@$(INSTALL) -d $(vardir)/log/eucalyptus
@$(INSTALL) -d $(datarootdir)/eucalyptus
@$(INSTALL) -d $(usrdir)/sbin
+ @$(INSTALL) -d $(usrdir)/lib/eucalyptus
@for subdir in $(SUBDIRS); do \
(cd $$subdir && $(MAKE) $@) || exit $$? ; done
View
@@ -154,15 +154,15 @@
</fileset>
</copy>
<mkdir dir="${euca.conf.dir}"/>
-<!-- <chmod dir="${euca.conf.dir}" perm="0755"/> -->
+ <chmod dir="${euca.conf.dir}" perm="0755"/>
<mkdir dir="${euca.var.dir}/"/>
- <mkdir dir="${euca.var.dir}/webapps"/>
<mkdir dir="${euca.var.dir}/db"/>
- <chmod dir="${euca.var.dir}/db" perm="0700"/>
<mkdir dir="${euca.var.dir}/keys"/>
- <chmod dir="${euca.var.dir}/keys" perm="0700"/>
- <mkdir dir="${euca.var.dir}/modules"/>
+<!-- <chmod dir="${euca.var.dir}/db" perm="0700"/>
+ <chmod dir="${euca.var.dir}/keys" perm="0700"/> -->
<mkdir dir="${euca.log.dir}"/>
+ <mkdir dir="${euca.var.dir}/webapps"/>
+ <mkdir dir="${euca.var.dir}/modules"/>
<ant dir="modules/workarounds" inheritall="false" target="install"/>
<ant dir="modules/crypto" inheritall="false" target="install"/>
<ant dir="modules/msgs" inheritall="false" target="install"/>
View
Oops, something went wrong.
View
@@ -57,7 +57,7 @@
<!--================================== other vars ==================================-->
<property name="jvm.heap" value="256m"/>
<property name="security.policy" value="${euca.conf.dir}/security.policy"/>
- <property name="libpath" value="${euca.home}/usr/lib"/>
+ <property name="libpath" value="${euca.home}/usr/lib/eucalyptus"/>
<!--================================== classpaths ==================================-->
<path id="runtimeclasspath">
<fileset dir="${euca.lib.dir}">
@@ -90,7 +90,8 @@
<target name="debug" description="--> debug Eucalyptus (for debugging)." if="localenv.EUCALYPTUS">
<java classname="edu.ucsb.eucalyptus.Main" fork="true" failonerror="true" dir="${euca.home}">
<jvmarg value="-Xdebug"/>
- <jvmarg value="-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005"/>
+ <jvmarg value="-Xbootclasspath/p:${euca.lib.dir}/eucalyptus-crypto.jar:${euca.lib.dir}/eucalyptus-workarounds.jar"/>
+ <jvmarg value="-Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5005"/>
<jvmarg value="-server"/>
<jvmarg value="-Xbootclasspath/p:${euca.lib.dir}/eucalyptus-crypto.jar:${euca.lib.dir}/eucalyptus-workarounds.jar"/>
<jvmarg value="-Xmx${jvm.heap}"/>
View
@@ -85,7 +85,7 @@
<component name="CopyrightManager" default="">
<module2copyright />
</component>
- <component name="CppTools.Loader" reportImplicitCastToBool="false" warnedAboutFileOutOfSourceRoot="true" version="1" currentProject="$PROJECT_DIR$/Makefile" />
+ <component name="CppTools.Loader" reportImplicitCastToBool="false" warnedAboutFileOutOfSourceRoot="true" version="2" currentProject="$PROJECT_DIR$/Makefile" compilerSelect="AUTO" />
<component name="DependenciesAnalyzeManager">
<option name="myForwardDirection" value="false" />
</component>
@@ -367,7 +367,7 @@
</component>
<component name="ProjectFileVersion" converted="true" />
<component name="ProjectKey">
- <option name="state" value="project:///disk1/eucalyptus/src/main-backend/clc/eucalyptus.ipr" />
+ <option name="state" value="project:///bzr/grze_main/clc/eucalyptus.ipr" />
</component>
<component name="ProjectModuleManager">
<modules>
@@ -440,6 +440,7 @@
</component>
<component name="SvnBranchConfigurationManager">
<option name="myVersion" value="123" />
+ <option name="mySupportsUserInfoFilter" value="true" />
</component>
<component name="VcsDirectoryMappings">
<mapping directory="$PROJECT_DIR$" vcs="CVS" />
@@ -600,15 +601,13 @@
<component name="libraryTable">
<library name="eucalyptus-deps">
<CLASSES>
- <root url="file:///disk1/eucalyptus/build/main-backend/usr/share/eucalyptus" />
- <root url="file:///disk1/eucalyptus/build/main-backend/etc/eucalyptus/cloud.d" />
+ <root url="file:///home/decker/deps-new/cloud-lib" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="file://$PROJECT_DIR$/modules/storage-manager/src" />
</SOURCES>
- <jarDirectory url="file:///disk1/eucalyptus/build/main-backend/etc/eucalyptus/cloud.d" recursive="false" />
- <jarDirectory url="file:///disk1/eucalyptus/build/main-backend/usr/share/eucalyptus" recursive="false" />
+ <jarDirectory url="file:///home/decker/deps-new/cloud-lib" recursive="false" />
</library>
</component>
</project>
@@ -38,10 +38,10 @@
<parameter name="enableMTOM">false</parameter>
<parameter name="enableSwA">false</parameter>
<parameter name="ConfigContextTimeoutInterval">30000</parameter>
- <parameter name="sendStacktraceDetailsWithFaults">true</parameter>
- <parameter name="DrillDownToRootCauseForFaultReason">true</parameter>
- <parameter name="userName">mayhem</parameter>
- <parameter name="password">zoomzoom</parameter>
+ <parameter name="sendStacktraceDetailsWithFaults">false</parameter>
+ <parameter name="DrillDownToRootCauseForFaultReason">false</parameter>
+ <parameter name="userName"></parameter>
+ <parameter name="password"></parameter>
<parameter name="contextRoot">/</parameter>
<parameter name="servicePath">services</parameter>
<parameter name="enableREST" locked="false">false</parameter>
@@ -88,7 +88,7 @@
<handler name="SOAPMessageBodyBasedDispatcher" class="org.apache.axis2.dispatchers.SOAPMessageBodyBasedDispatcher"/>
<handler name="Axis2URIDispatcher" class="edu.ucsb.eucalyptus.transport.query.Axis2QueryDispatcher"/>
<handler name="WalrusQueryDispatcher" class="edu.ucsb.eucalyptus.transport.query.WalrusQueryDispatcher"/>
- <handler name="StorageQueryDispatcher" class="edu.ucsb.eucalyptus.transport.query.StorageQueryDispatcher"/>
+ <handler name="StorageQueryDispatcher" class="edu.ucsb.eucalyptus.transport.query.StorageQueryDispatcher"/>
</phase>
<phase name="RMPhase"/>
<phase name="OperationInPhase"/>
Oops, something went wrong.

0 comments on commit 7b32022

Please sign in to comment.