Skip to content

Commit

Permalink
merge outstanding changes to WS stack and forward port of 1.5 series …
Browse files Browse the repository at this point in the history 
…bug fixes
  • Loading branch information
decker committed Jun 23, 2009
2 parents 0c89c60 + 358ea61 commit 7b32022
Show file tree
Hide file tree
Showing 127 changed files with 4,753 additions and 4,300 deletions.
3 changes: 2 additions & 1 deletion Makefile
View file
Expand Up @@ -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

Expand Down
10 changes: 5 additions & 5 deletions clc/build.xml
View file
Expand Up @@ -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"/>
Expand Down
1,578 changes: 0 additions & 1,578 deletions clc/cloud.ipr
View file

This file was deleted.

5 changes: 3 additions & 2 deletions clc/cloud.xml
View file
Expand Up @@ -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}">
Expand Down Expand Up @@ -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}"/>
Expand Down
11 changes: 5 additions & 6 deletions clc/eucalyptus.ipr
View file
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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" />
Expand Down Expand Up @@ -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>
Expand Down
10 changes: 5 additions & 5 deletions clc/modules/axis2-transport/conf/axis2.xml
View file
Expand Up @@ -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>
Expand Down Expand Up @@ -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"/>
Expand Down

0 comments on commit 7b32022

Please sign in to comment.