Permalink
Browse files

refactored some stuff. added walrus/sc bootstrap config

  • Loading branch information...
Neil
Neil committed Aug 13, 2009
1 parent 62eb8e6 commit 55889896bee7e781ad11468d61d70bf78373e49c
Showing with 17 additions and 65 deletions.
  1. +1 −1 clc/Cloud.iml
  2. +3 −3 clc/build.xml
  3. +1 −1 clc/eucalyptus.ipr
  4. +0 −55 clc/modules/core/conf/walrus-mule.xml
  5. 0 clc/modules/{core/conf → dns/src/main/resources/META-INF}/dns-model.xml
  6. 0 clc/modules/{core/conf → dns/src/main/resources/META-INF}/dns-services.xml
  7. +2 −0 clc/modules/dns/src/main/resources/META-INF/eucalyptus-bootstrap.properties
  8. +1 −0 clc/modules/dns/src/main/resources/com.eucalyptus.CloudServiceProvider
  9. +1 −1 clc/modules/storage-controller/native/liblvm2control.iml
  10. +1 −1 clc/modules/storage-controller/pom.xml
  11. +2 −0 clc/modules/storage-controller/src/main/resources/META-INF/eucalyptus-bootstrap.properties
  12. 0 clc/modules/{core/conf → storage-controller/src/main/resources/META-INF}/storage-model.xml
  13. 0 clc/modules/{core/conf → storage-controller/src/main/resources/META-INF}/storage-services.xml
  14. +1 −1 clc/modules/storage-controller/storage-controller.iml
  15. 0 clc/modules/{storage-manager → walrus}/build.xml
  16. +1 −1 clc/modules/{storage-manager → walrus}/pom.xml
  17. 0 clc/modules/{storage-manager → walrus}/src/main/java/edu/ucsb/eucalyptus/cloud/ws/Bukkit.java
  18. 0 .../{storage-manager → walrus}/src/main/java/edu/ucsb/eucalyptus/cloud/ws/CompressedChunkedFile.java
  19. 0 clc/modules/{storage-manager → walrus}/src/main/java/edu/ucsb/eucalyptus/cloud/ws/ObjectReader.java
  20. 0 clc/modules/{storage-manager → walrus}/src/main/java/edu/ucsb/eucalyptus/cloud/ws/TorrentClient.java
  21. 0 ...modules/{storage-manager → walrus}/src/main/java/edu/ucsb/eucalyptus/cloud/ws/TorrentCreator.java
  22. 0 clc/modules/{storage-manager → walrus}/src/main/java/edu/ucsb/eucalyptus/cloud/ws/Torrents.java
  23. 0 clc/modules/{storage-manager → walrus}/src/main/java/edu/ucsb/eucalyptus/cloud/ws/Tracker.java
  24. 0 ...orage-manager → walrus}/src/main/java/edu/ucsb/eucalyptus/cloud/ws/WalrusBlockStorageManager.java
  25. 0 ...les/{storage-manager → walrus}/src/main/java/edu/ucsb/eucalyptus/cloud/ws/WalrusImageManager.java
  26. 0 clc/modules/{storage-manager → walrus}/src/main/java/edu/ucsb/eucalyptus/cloud/ws/WalrusManager.java
  27. 0 ...dules/{storage-manager → walrus}/src/main/java/edu/ucsb/eucalyptus/cloud/ws/WalrusStatistics.java
  28. 0 .../{storage-manager → walrus}/src/main/java/edu/ucsb/eucalyptus/cloud/ws/tests/BukkitImageTest.java
  29. 0 ...dules/{storage-manager → walrus}/src/main/java/edu/ucsb/eucalyptus/cloud/ws/tests/BukkitTest.java
  30. 0 ...s/{storage-manager → walrus}/src/main/java/edu/ucsb/eucalyptus/cloud/ws/tests/ImageCacheTest.java
  31. 0 ...dules/{storage-manager → walrus}/src/main/java/edu/ucsb/eucalyptus/cloud/ws/tests/ObjectTest.java
  32. 0 ...storage-manager → walrus}/src/main/java/edu/ucsb/eucalyptus/cloud/ws/tests/WalrusBucketTests.java
  33. 0 clc/modules/{storage-manager → walrus}/src/main/java/edu/ucsb/eucalyptus/ic/Walrus.java
  34. 0 clc/modules/{storage-manager → walrus}/src/main/java/edu/ucsb/eucalyptus/storage/StorageManager.java
  35. 0 clc/modules/{storage-manager → walrus}/src/main/java/edu/ucsb/eucalyptus/storage/fs/FileIO.java
  36. 0 clc/modules/{storage-manager → walrus}/src/main/java/edu/ucsb/eucalyptus/storage/fs/FileReader.java
  37. 0 ...rage-manager → walrus}/src/main/java/edu/ucsb/eucalyptus/storage/fs/FileSystemStorageManager.java
  38. 0 clc/modules/{storage-manager → walrus}/src/main/java/edu/ucsb/eucalyptus/storage/fs/FileWriter.java
  39. +2 −0 clc/modules/walrus/src/main/resources/META-INF/eucalyptus-bootstrap.properties
  40. 0 clc/modules/{core/conf → walrus/src/main/resources/META-INF}/walrus-model.xml
  41. 0 clc/modules/{core/conf → walrus/src/main/resources/META-INF}/walrus-services.xml
  42. 0 clc/modules/{storage-manager → walrus}/src/main/resources/com.eucalyptus.CloudServiceProvider
  43. 0 clc/modules/{storage-manager → walrus}/storage-manager.iml
  44. +1 −1 clc/pom.xml
View
@@ -104,7 +104,7 @@
<orderEntry type="module" module-name="group-manager" />
<orderEntry type="module" module-name="image-manager" />
<orderEntry type="module" module-name="key-manager" />
- <orderEntry type="module" module-name="storage-manager" />
+ <orderEntry type="module" module-name="walrus" />
<orderEntry type="module" module-name="storage-controller" />
<orderEntry type="module" module-name="dns" />
<orderEntry type="module" module-name="cluster-manager" />
View
@@ -68,7 +68,7 @@
<ant dir="modules/key-manager" inheritall="false"/>
</target>
<target name="build-walrus-ws" depends="build-core">
- <ant dir="modules/storage-manager" inheritall="false"/>
+ <ant dir="modules/walrus" inheritall="false"/>
</target>
<target name="build-ebs-ws" depends="build-walrus-ws">
<ant dir="modules/storage-controller" inheritall="false"/>
@@ -103,7 +103,7 @@
<ant dir="modules/key-manager" inheritall="false" target="clean"/>
</target>
<target name="clean-walrus-ws" depends="clean-core">
- <ant dir="modules/storage-manager" inheritall="false" target="clean"/>
+ <ant dir="modules/walrus" inheritall="false" target="clean"/>
</target>
<target name="clean-ebs-ws" depends="clean-core">
<ant dir="modules/storage-controller" inheritall="false" target="clean"/>
@@ -159,7 +159,7 @@
<ant dir="modules/image-manager" inheritall="false" target="install"/>
<ant dir="modules/group-manager" inheritall="false" target="install"/>
<ant dir="modules/key-manager" inheritall="false" target="install"/>
- <ant dir="modules/storage-manager" inheritall="false" target="install"/>
+ <ant dir="modules/walrus" inheritall="false" target="install"/>
<ant dir="modules/storage-controller" inheritall="false" target="install"/>
<ant dir="modules/dns" inheritall="false" target="install"/>
</target>
View
@@ -366,7 +366,7 @@
<module fileurl="file://$PROJECT_DIR$/modules/key-manager/key-manager.iml" filepath="$PROJECT_DIR$/modules/key-manager/key-manager.iml" />
<module fileurl="file://$PROJECT_DIR$/modules/msgs/msgs.iml" filepath="$PROJECT_DIR$/modules/msgs/msgs.iml" />
<module fileurl="file://$PROJECT_DIR$/modules/storage-controller/storage-controller.iml" filepath="$PROJECT_DIR$/modules/storage-controller/storage-controller.iml" />
- <module fileurl="file://$PROJECT_DIR$/modules/storage-manager/storage-manager.iml" filepath="$PROJECT_DIR$/modules/storage-manager/storage-manager.iml" />
+ <module fileurl="file://$PROJECT_DIR$/modules/walrus/walrus.iml" filepath="$PROJECT_DIR$/modules/walrus/walrus.iml" />
<module fileurl="file://$PROJECT_DIR$/modules/www/www.iml" filepath="$PROJECT_DIR$/modules/www/www.iml" />
</modules>
</component>
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!--
- ~ Software License Agreement (BSD License)
- ~
- ~ Copyright (c) 2008, Regents of the University of California
- ~ All rights reserved.
- ~
- ~ Redistribution and use of this software in source and binary forms, with or
- ~ without modification, are permitted provided that the following conditions
- ~ are met:
- ~
- ~ * Redistributions of source code must retain the above
- ~ copyright notice, this list of conditions and the
- ~ following disclaimer.
- ~
- ~ * Redistributions in binary form must reproduce the above
- ~ copyright notice, this list of conditions and the
- ~ following disclaimer in the documentation and/or other
- ~ materials provided with the distribution.
- ~
- ~ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- ~ AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- ~ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- ~ ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- ~ LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- ~ CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- ~ SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- ~ INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- ~ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- ~ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- ~ POSSIBILITY OF SUCH DAMAGE.
- ~
- ~ Author: Sunil Soman sunils@cs.ucsb.edu
- -->
-
-<mule xmlns="http://www.mulesource.org/schema/mule/core/2.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:spring="http://www.springframework.org/schema/beans"
- xmlns:vm="http://www.mulesource.org/schema/mule/vm/2.0"
- xmlns:euca="http://www.eucalyptus.com/schema/cloud/1.6"
- xsi:schemaLocation="
- http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
- http://www.mulesource.org/schema/mule/core/2.0 http://www.mulesource.org/schema/mule/core/2.0/mule.xsd
- http://www.mulesource.org/schema/mule/vm/2.0 http://www.mulesource.org/schema/mule/vm/2.0/mule-vm.xsd
- http://www.eucalyptus.com/schema/cloud/1.6 http://www.eucalyptus.com/schema/cloud/1.6/euca.xsd">
-
- <euca:connector name="axis2" default-conf="${euca.conf.dir}/axis2.xml" default-wssec-policy="${euca.conf.dir}/policy.xml"/>
-
- <!--=========== This enables walrus ===========-->
- <spring:beans>
- <spring:import resource="classpath:walrus-services.xml"/>
- <spring:import resource="classpath:walrus-model.xml"/>
- </spring:beans>
-
-</mule>
-
@@ -0,0 +1,2 @@
+euca.dns-model.xml=dns-model.xml
+euca.dns-services.xml=dns-services.xml
@@ -118,7 +118,7 @@
<orderEntry type="library" exported="" name="Maven: org.apache.rampart:rampart-trust:1.4" level="project" />
<orderEntry type="library" exported="" name="Maven: opensaml:opensaml:1.1" level="project" />
<orderEntry type="module" module-name="interface" exported="" />
- <orderEntry type="module" module-name="storage-manager" exported="" />
+ <orderEntry type="module" module-name="walrus" exported="" />
</component>
</module>
@@ -33,7 +33,7 @@
</dependency>
<dependency>
<groupId>eucalyptus</groupId>
- <artifactId>storage-manager</artifactId>
+ <artifactId>walrus</artifactId>
<version>${euca.version}</version>
</dependency>
</dependencies>
@@ -0,0 +1,2 @@
+euca.storage-model.xml=storage-model.xml
+euca.storage-services.xml=storage-services.xml
@@ -17,7 +17,7 @@
<orderEntry type="module" module-name="core" exported="" />
<orderEntry type="module" module-name="interface" exported="" />
<orderEntry type="module" module-name="axis2-transport" exported="" />
- <orderEntry type="module" module-name="storage-manager" exported="" />
+ <orderEntry type="module" module-name="walrus" exported="" />
</component>
</module>
@@ -7,7 +7,7 @@
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>eucalyptus</groupId>
- <artifactId>storage-manager</artifactId>
+ <artifactId>walrus</artifactId>
<version>${euca.version}</version>
<name>Walrus</name>
<dependencies>
@@ -0,0 +1,2 @@
+euca.walrus-model.xml=walrus-model.xml
+euca.walrus-services.xml=walrus-services.xml
View
@@ -15,7 +15,7 @@
<module>modules/www</module>
<module>modules/group-manager</module>
<module>modules/image-manager</module>
- <module>modules/storage-manager</module>
+ <module>modules/walrus</module>
<module>modules/storage-controller</module>
<module>modules/storage-controller/native</module>
<!-- <module>modules/dns</module> -

0 comments on commit 5588989

Please sign in to comment.