tuscany-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From robbin...@apache.org
Subject svn commit: r509963 - in /incubator/tuscany/cpp/sca: ./ VSExpress/tuscany_sca/ VSExpress/tuscany_sca/tuscany_sca_ruby/ VSExpress/tuscany_sca/tuscany_sca_ruby_lang/ runtime/extensions/ruby/ runtime/extensions/ruby/extension/ runtime/extensions/ruby/exte...
Date Wed, 21 Feb 2007 10:42:08 GMT
Author: robbinspg
Date: Wed Feb 21 02:42:07 2007
New Revision: 509963

URL: http://svn.apache.org/viewvc?view=rev&rev=509963
Log:
separate Tuscany Ruby language extension form the Ruby C extension

Added:
    incubator/tuscany/cpp/sca/VSExpress/tuscany_sca/tuscany_sca_ruby_lang/
    incubator/tuscany/cpp/sca/VSExpress/tuscany_sca/tuscany_sca_ruby_lang/tuscany_sca_ruby_lang.vcproj
    incubator/tuscany/cpp/sca/runtime/extensions/ruby/extension/
    incubator/tuscany/cpp/sca/runtime/extensions/ruby/extension/Makefile.am   (with props)
    incubator/tuscany/cpp/sca/runtime/extensions/ruby/extension/deploy.bat   (with props)
    incubator/tuscany/cpp/sca/runtime/extensions/ruby/extension/src/
    incubator/tuscany/cpp/sca/runtime/extensions/ruby/extension/src/Extension.cpp   (with props)
    incubator/tuscany/cpp/sca/runtime/extensions/ruby/extension/src/extconf.rb   (with props)
    incubator/tuscany/cpp/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyCompositeContext.h   (with props)
Modified:
    incubator/tuscany/cpp/sca/VSExpress/tuscany_sca/tuscany_sca.sln
    incubator/tuscany/cpp/sca/VSExpress/tuscany_sca/tuscany_sca_ruby/tuscany_sca_ruby.vcproj
    incubator/tuscany/cpp/sca/configure.ac
    incubator/tuscany/cpp/sca/runtime/extensions/ruby/Makefile.am
    incubator/tuscany/cpp/sca/runtime/extensions/ruby/deploy.bat
    incubator/tuscany/cpp/sca/runtime/extensions/ruby/src/Makefile.am
    incubator/tuscany/cpp/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyCompositeContext.cpp
    incubator/tuscany/cpp/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyExtension.cpp
    incubator/tuscany/cpp/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/export.h
    incubator/tuscany/cpp/sca/samples/HttpdBigBank/bigbank.wsclient/runwsclient.bat
    incubator/tuscany/cpp/sca/samples/RestCalculator/sample.calculator.restclient/runrestclient.bat
    incubator/tuscany/cpp/sca/samples/RubyBigBank/bigbank.client/runclient.bat
    incubator/tuscany/cpp/sca/samples/RubyBigBank/bigbank.client/runclient.sh
    incubator/tuscany/cpp/sca/samples/RubyBigBank/bigbank.wsclient/runwsclient.bat
    incubator/tuscany/cpp/sca/samples/RubyBigBank/bigbank.wsclient/runwsclient.sh
    incubator/tuscany/cpp/sca/samples/RubyCalculator/sample.calculator.client/runclient.bat
    incubator/tuscany/cpp/sca/samples/RubyCalculator/sample.calculator.client/runclient.sh
    incubator/tuscany/cpp/sca/samples/RubyCalculator/sample.calculator.wsclient/runwsclient.bat
    incubator/tuscany/cpp/sca/samples/RubyCalculator/sample.calculator.wsclient/runwsclient.sh

Modified: incubator/tuscany/cpp/sca/VSExpress/tuscany_sca/tuscany_sca.sln
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/VSExpress/tuscany_sca/tuscany_sca.sln?view=diff&rev=509963&r1=509962&r2=509963
==============================================================================
--- incubator/tuscany/cpp/sca/VSExpress/tuscany_sca/tuscany_sca.sln (original)
+++ incubator/tuscany/cpp/sca/VSExpress/tuscany_sca/tuscany_sca.sln Wed Feb 21 02:42:07 2007
@@ -3,6 +3,7 @@
 # Visual C++ Express 2005
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Build", "Build\Build.vcproj", "{DE6DB733-17B8-40EC-B01D-6665C84347B4}"
 	ProjectSection(ProjectDependencies) = postProject
+		{B7B0A0BD-F511-4F77-845D-B78A632FA099} = {B7B0A0BD-F511-4F77-845D-B78A632FA099}
 		{C255EE00-A218-4A7F-8767-C3B2F24E60B1} = {C255EE00-A218-4A7F-8767-C3B2F24E60B1}
 		{4E16D015-6578-4D78-8DF0-82A98DB56CC3} = {4E16D015-6578-4D78-8DF0-82A98DB56CC3}
 		{E13F6477-84B6-4F60-8E51-78848D5C339E} = {E13F6477-84B6-4F60-8E51-78848D5C339E}
@@ -33,6 +34,7 @@
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tuscany_sca_ruby", "tuscany_sca_ruby\tuscany_sca_ruby.vcproj", "{B5630E91-D747-4520-8089-0EAAB76BE600}"
 	ProjectSection(ProjectDependencies) = postProject
+		{B7B0A0BD-F511-4F77-845D-B78A632FA099} = {B7B0A0BD-F511-4F77-845D-B78A632FA099}
 		{E13F6477-84B6-4F60-8E51-78848D5C339E} = {E13F6477-84B6-4F60-8E51-78848D5C339E}
 	EndProjectSection
 EndProject
@@ -88,6 +90,8 @@
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tuscany_sca_php", "tuscany_sca_php\tuscany_sca_php.vcproj", "{28E45334-1F59-45CB-93EE-FB787D81B6D2}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tuscany_sca_ruby_lang", "tuscany_sca_ruby_lang\tuscany_sca_ruby_lang.vcproj", "{B7B0A0BD-F511-4F77-845D-B78A632FA099}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
@@ -152,6 +156,10 @@
 		{28E45334-1F59-45CB-93EE-FB787D81B6D2}.Debug|Win32.Build.0 = Debug|Win32
 		{28E45334-1F59-45CB-93EE-FB787D81B6D2}.Release|Win32.ActiveCfg = Release|Win32
 		{28E45334-1F59-45CB-93EE-FB787D81B6D2}.Release|Win32.Build.0 = Release|Win32
+		{B7B0A0BD-F511-4F77-845D-B78A632FA099}.Debug|Win32.ActiveCfg = Debug|Win32
+		{B7B0A0BD-F511-4F77-845D-B78A632FA099}.Debug|Win32.Build.0 = Debug|Win32
+		{B7B0A0BD-F511-4F77-845D-B78A632FA099}.Release|Win32.ActiveCfg = Release|Win32
+		{B7B0A0BD-F511-4F77-845D-B78A632FA099}.Release|Win32.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

Modified: incubator/tuscany/cpp/sca/VSExpress/tuscany_sca/tuscany_sca_ruby/tuscany_sca_ruby.vcproj
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/VSExpress/tuscany_sca/tuscany_sca_ruby/tuscany_sca_ruby.vcproj?view=diff&rev=509963&r1=509962&r2=509963
==============================================================================
--- incubator/tuscany/cpp/sca/VSExpress/tuscany_sca/tuscany_sca_ruby/tuscany_sca_ruby.vcproj (original)
+++ incubator/tuscany/cpp/sca/VSExpress/tuscany_sca/tuscany_sca_ruby/tuscany_sca_ruby.vcproj Wed Feb 21 02:42:07 2007
@@ -74,11 +74,11 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="tuscany_sca.lib tuscany_sdo.lib msvcrt-ruby18.lib $(NOINHERIT)"
+				AdditionalDependencies="tuscany_sca_ruby_lang.lib tuscany_sca.lib tuscany_sdo.lib msvcrt-ruby18.lib $(NOINHERIT)"
 				OutputFile=".\Release/tuscany_sca_ruby.dll"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\..\..\deploy\lib,$(TUSCANY_SDOCPP)\lib,$(RUBY_HOME)\lib"
+				AdditionalLibraryDirectories="..\..\..\deploy\extensions\ruby\lib;..\..\..\deploy\lib;&quot;$(TUSCANY_SDOCPP)\lib&quot;;&quot;$(RUBY_HOME)\lib&quot;"
 				ProgramDatabaseFile=".\Release/tuscany_sca_ruby.pdb"
 				ImportLibrary=".\Release/tuscany_sca_ruby.lib"
 				TargetMachine="1"
@@ -108,7 +108,7 @@
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
-				CommandLine="..\..\..\runtime\extensions\ruby\deploy.bat ..\..\..\ Release"
+				CommandLine="..\..\..\runtime\extensions\ruby\xtension\deploy.bat ..\..\..\ Release"
 			/>
 		</Configuration>
 		<Configuration
@@ -171,11 +171,11 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="tuscany_sca.lib tuscany_sdo.lib msvcrt-ruby18.lib $(NOINHERIT)"
+				AdditionalDependencies="tuscany_sca_ruby_lang.lib tuscany_sca.lib tuscany_sdo.lib msvcrt-ruby18.lib $(NOINHERIT)"
 				OutputFile=".\Debug/tuscany_sca_ruby.dll"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\..\..\deploy\lib,$(TUSCANY_SDOCPP)\lib,$(RUBY_HOME)\lib"
+				AdditionalLibraryDirectories="..\..\..\deploy\extensions\ruby\lib;..\..\..\deploy\lib;&quot;$(TUSCANY_SDOCPP)\lib&quot;;&quot;$(RUBY_HOME)\lib&quot;"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\Debug/tuscany_sca_ruby.pdb"
 				ImportLibrary=".\Debug/tuscany_sca_ruby.lib"
@@ -206,7 +206,7 @@
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
-				CommandLine="..\..\..\runtime\extensions\ruby\deploy.bat ..\..\..\ Debug"
+				CommandLine="..\..\..\runtime\extensions\ruby\extension\deploy.bat ..\..\..\ Debug"
 			/>
 		</Configuration>
 	</Configurations>
@@ -217,221 +217,9 @@
 			Name="tuscany/sca/ruby"
 			>
 			<File
-				RelativePath="..\..\..\runtime\extensions\ruby\src\tuscany\sca\ruby\export.h"
+				RelativePath="..\..\..\runtime\extensions\ruby\extension\src\Extension.cpp"
 				>
 			</File>
-			<File
-				RelativePath="..\..\..\runtime\extensions\ruby\src\tuscany\sca\ruby\Ruby.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\runtime\extensions\ruby\src\tuscany\sca\ruby\RubyCompositeContext.cpp"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\..\runtime\extensions\ruby\src\tuscany\sca\ruby\RubyExtension.cpp"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\..\runtime\extensions\ruby\src\tuscany\sca\ruby\rubyExtension.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\runtime\extensions\ruby\src\tuscany\sca\ruby\RubyImplementationExtension.cpp"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\..\runtime\extensions\ruby\src\tuscany\sca\ruby\rubyImplementationExtension.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\runtime\extensions\ruby\src\tuscany\sca\ruby\RubyServiceProxy.cpp"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\..\runtime\extensions\ruby\src\tuscany\sca\ruby\rubyServiceProxy.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\runtime\extensions\ruby\src\tuscany\sca\ruby\RubyServiceWrapper.cpp"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\..\runtime\extensions\ruby\src\tuscany\sca\ruby\rubyServiceWrapper.h"
-				>
-			</File>
-			<Filter
-				Name="model"
-				>
-				<File
-					RelativePath="..\..\..\runtime\extensions\ruby\src\tuscany\sca\ruby\model\RubyImplementation.cpp"
-					>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\..\..\runtime\extensions\ruby\src\tuscany\sca\ruby\model\rubyImplementation.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\..\runtime\extensions\ruby\src\tuscany\sca\ruby\model\RubyReferenceBinding.cpp"
-					>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\..\..\runtime\extensions\ruby\src\tuscany\sca\ruby\model\rubyReferenceBinding.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\..\runtime\extensions\ruby\src\tuscany\sca\ruby\model\RubyServiceBinding.cpp"
-					>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\..\..\runtime\extensions\ruby\src\tuscany\sca\ruby\model\rubyServiceBinding.h"
-					>
-				</File>
-			</Filter>
 		</Filter>
 	</Files>
 	<Globals>

Added: incubator/tuscany/cpp/sca/VSExpress/tuscany_sca/tuscany_sca_ruby_lang/tuscany_sca_ruby_lang.vcproj
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/VSExpress/tuscany_sca/tuscany_sca_ruby_lang/tuscany_sca_ruby_lang.vcproj?view=auto&rev=509963
==============================================================================
--- incubator/tuscany/cpp/sca/VSExpress/tuscany_sca/tuscany_sca_ruby_lang/tuscany_sca_ruby_lang.vcproj (added)
+++ incubator/tuscany/cpp/sca/VSExpress/tuscany_sca/tuscany_sca_ruby_lang/tuscany_sca_ruby_lang.vcproj Wed Feb 21 02:42:07 2007
@@ -0,0 +1,443 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="tuscany_sca_ruby_lang"
+	ProjectGUID="{B7B0A0BD-F511-4F77-845D-B78A632FA099}"
+	RootNamespace="tuscany_sca_ruby_lang"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory=".\Release"
+			IntermediateDirectory=".\Release"
+			ConfigurationType="2"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="NDEBUG"
+				MkTypLibCompatible="true"
+				SuppressStartupBanner="true"
+				TargetEnvironment="1"
+				TypeLibraryName=".\Release/tuscany_sca_ruby_lang.tlb"
+				HeaderFileName=""
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				InlineFunctionExpansion="1"
+				AdditionalIncludeDirectories="../../../runtime/extensions/ruby/src,../../../deploy/include,$(TUSCANY_SDOCPP)/include,$(RUBY_HOME)\lib\ruby\1.8\i386-mswin32"
+				PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;_USRDLL;TUSCANY_SCA_RUBY_LANG_EXPORTS;_CRT_SECURE_NO_DEPRECATE"
+				StringPooling="true"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
+				PrecompiledHeaderFile=".\Release/tuscany_sca_ruby_lang.pch"
+				AssemblerListingLocation=".\Release/"
+				ObjectFile=".\Release/"
+				ProgramDataBaseFileName=".\Release/"
+				WarningLevel="3"
+				SuppressStartupBanner="true"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="2057"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="tuscany_sca.lib tuscany_sdo.lib msvcrt-ruby18.lib $(NOINHERIT)"
+				OutputFile=".\Release/tuscany_sca_ruby_lang.dll"
+				LinkIncremental="1"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories="..\..\..\deploy\lib,$(TUSCANY_SDOCPP)\lib,$(RUBY_HOME)\lib"
+				ProgramDatabaseFile=".\Release/tuscany_sca_ruby_lang.pdb"
+				ImportLibrary=".\Release/tuscany_sca_ruby_lang.lib"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+				SuppressStartupBanner="true"
+				OutputFile=".\Release/tuscany_sca_ruby_lang.bsc"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+				CommandLine="..\..\..\runtime\extensions\ruby\deploy.bat ..\..\..\ Release"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory=".\Debug"
+			IntermediateDirectory=".\Debug"
+			ConfigurationType="2"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="_DEBUG"
+				MkTypLibCompatible="true"
+				SuppressStartupBanner="true"
+				TargetEnvironment="1"
+				TypeLibraryName=".\Debug/tuscany_sca_ruby_lang.tlb"
+				HeaderFileName=""
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="../../../runtime/extensions/ruby/src,../../../deploy/include,$(TUSCANY_SDOCPP)/include,$(RUBY_HOME)\lib\ruby\1.8\i386-mswin32"
+				PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;_USRDLL;TUSCANY_SCA_RUBY_LANG_EXPORTS;_CRT_SECURE_NO_DEPRECATE"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				PrecompiledHeaderFile=".\Debug/tuscany_sca_ruby_lang.pch"
+				AssemblerListingLocation=".\Debug/"
+				ObjectFile=".\Debug/"
+				ProgramDataBaseFileName=".\Debug/"
+				WarningLevel="3"
+				SuppressStartupBanner="true"
+				DebugInformationFormat="4"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+				Culture="2057"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="tuscany_sca.lib tuscany_sdo.lib msvcrt-ruby18.lib $(NOINHERIT)"
+				OutputFile=".\Debug/tuscany_sca_ruby_lang.dll"
+				LinkIncremental="2"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories="..\..\..\deploy\lib,$(TUSCANY_SDOCPP)\lib,$(RUBY_HOME)\lib"
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile=".\Debug/tuscany_sca_ruby_lang.pdb"
+				ImportLibrary=".\Debug/tuscany_sca_ruby_lang.lib"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+				SuppressStartupBanner="true"
+				OutputFile=".\Debug/tuscany_sca_ruby_lang.bsc"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+				CommandLine="..\..\..\runtime\extensions\ruby\deploy.bat ..\..\..\ Debug"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="tuscany/sca/ruby"
+			>
+			<File
+				RelativePath="..\..\..\runtime\extensions\ruby\src\tuscany\sca\ruby\export.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\runtime\extensions\ruby\src\tuscany\sca\ruby\Ruby.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\runtime\extensions\ruby\src\tuscany\sca\ruby\RubyCompositeContext.cpp"
+				>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\..\runtime\extensions\ruby\src\tuscany\sca\ruby\RubyCompositeContext.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\runtime\extensions\ruby\src\tuscany\sca\ruby\RubyExtension.cpp"
+				>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\..\runtime\extensions\ruby\src\tuscany\sca\ruby\rubyExtension.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\runtime\extensions\ruby\src\tuscany\sca\ruby\RubyImplementationExtension.cpp"
+				>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\..\runtime\extensions\ruby\src\tuscany\sca\ruby\rubyImplementationExtension.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\runtime\extensions\ruby\src\tuscany\sca\ruby\RubyServiceProxy.cpp"
+				>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\..\runtime\extensions\ruby\src\tuscany\sca\ruby\rubyServiceProxy.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\runtime\extensions\ruby\src\tuscany\sca\ruby\RubyServiceWrapper.cpp"
+				>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\..\runtime\extensions\ruby\src\tuscany\sca\ruby\rubyServiceWrapper.h"
+				>
+			</File>
+			<Filter
+				Name="model"
+				>
+				<File
+					RelativePath="..\..\..\runtime\extensions\ruby\src\tuscany\sca\ruby\model\RubyImplementation.cpp"
+					>
+					<FileConfiguration
+						Name="Release|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							AdditionalIncludeDirectories=""
+							PreprocessorDefinitions=""
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Debug|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							AdditionalIncludeDirectories=""
+							PreprocessorDefinitions=""
+						/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\..\..\runtime\extensions\ruby\src\tuscany\sca\ruby\model\rubyImplementation.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\runtime\extensions\ruby\src\tuscany\sca\ruby\model\RubyReferenceBinding.cpp"
+					>
+					<FileConfiguration
+						Name="Release|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							AdditionalIncludeDirectories=""
+							PreprocessorDefinitions=""
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Debug|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							AdditionalIncludeDirectories=""
+							PreprocessorDefinitions=""
+						/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\..\..\runtime\extensions\ruby\src\tuscany\sca\ruby\model\rubyReferenceBinding.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\runtime\extensions\ruby\src\tuscany\sca\ruby\model\RubyServiceBinding.cpp"
+					>
+					<FileConfiguration
+						Name="Release|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							AdditionalIncludeDirectories=""
+							PreprocessorDefinitions=""
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Debug|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							AdditionalIncludeDirectories=""
+							PreprocessorDefinitions=""
+						/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\..\..\runtime\extensions\ruby\src\tuscany\sca\ruby\model\rubyServiceBinding.h"
+					>
+				</File>
+			</Filter>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>

Modified: incubator/tuscany/cpp/sca/configure.ac
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/configure.ac?view=diff&rev=509963&r1=509962&r2=509963
==============================================================================
--- incubator/tuscany/cpp/sca/configure.ac (original)
+++ incubator/tuscany/cpp/sca/configure.ac Wed Feb 21 02:42:07 2007
@@ -278,6 +278,7 @@
                  runtime/extensions/python/src/Makefile
                  runtime/extensions/ruby/Makefile
                  runtime/extensions/ruby/src/Makefile
+                 runtime/extensions/ruby/extension/Makefile
                  runtime/extensions/php/Makefile
                  runtime/extensions/php/src/Makefile
                  doc/Makefile

Modified: incubator/tuscany/cpp/sca/runtime/extensions/ruby/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/extensions/ruby/Makefile.am?view=diff&rev=509963&r1=509962&r2=509963
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/extensions/ruby/Makefile.am (original)
+++ incubator/tuscany/cpp/sca/runtime/extensions/ruby/Makefile.am Wed Feb 21 02:42:07 2007
@@ -15,10 +15,10 @@
 #  specific language governing permissions and limitations
 #  under the License.
 
-SUBDIRS = src
+SUBDIRS = src extension
 
 datadir=$(prefix)/extensions/ruby
 
 nobase_data_DATA = xsd/*.xsd
 
-EXTRA_DIST = xsd
\ No newline at end of file
+EXTRA_DIST = xsd

Modified: incubator/tuscany/cpp/sca/runtime/extensions/ruby/deploy.bat
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/extensions/ruby/deploy.bat?view=diff&rev=509963&r1=509962&r2=509963
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/extensions/ruby/deploy.bat (original)
+++ incubator/tuscany/cpp/sca/runtime/extensions/ruby/deploy.bat Wed Feb 21 02:42:07 2007
@@ -45,15 +45,15 @@
 if not exist %rubyextdir%\lib mkdir %rubyextdir%\lib
 if not exist %rubyextdir%\xsd mkdir %rubyextdir%\xsd
 
-del %rubyextdir%\bin\tuscany_sca_ruby.*
-del %rubyextdir%\lib\*.lib
+del %rubyextdir%\bin\tuscany_sca_ruby_lang.*
+del %rubyextdir%\lib\tuscany_sca_ruby_lang.lib
 
 copy %srcdir%\..\xsd\*.* %rubyextdir%\xsd
 
-copy %inpath%\tuscany_sca_ruby.lib %rubyextdir%\lib
-copy %inpath%\tuscany_sca_ruby.dll %rubyextdir%\bin
+copy %inpath%\tuscany_sca_ruby_lang.lib %rubyextdir%\lib
+copy %inpath%\tuscany_sca_ruby_lang.dll %rubyextdir%\bin
 
-if exist %inpath%\tuscany_sca_ruby.pdb copy %inpath%\tuscany_sca_ruby.pdb %rubyextdir%\bin
+if exist %inpath%\tuscany_sca_ruby_lang.pdb copy %inpath%\tuscany_sca_ruby_lang.pdb %rubyextdir%\bin
 
 goto end
 :usage

Added: incubator/tuscany/cpp/sca/runtime/extensions/ruby/extension/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/extensions/ruby/extension/Makefile.am?view=auto&rev=509963
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/extensions/ruby/extension/Makefile.am (added)
+++ incubator/tuscany/cpp/sca/runtime/extensions/ruby/extension/Makefile.am Wed Feb 21 02:42:07 2007
@@ -0,0 +1,32 @@
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work for additional information
+#  regarding copyright ownership.  The ASF licenses this file
+#  to you under the Apache License, Version 2.0 (the
+#  "License"); you may not use this file except in compliance
+#  with the License.  You may obtain a copy of the License at
+#  
+#    http://www.apache.org/licenses/LICENSE-2.0
+#    
+#  Unless required by applicable law or agreed to in writing,
+#  software distributed under the License is distributed on an
+#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#  KIND, either express or implied.  See the License for the
+#  specific language governing permissions and limitations
+#  under the License.
+SUBDIRS = 
+
+libdir=$(prefix)/extensions/ruby/lib
+BUILT_SOURCES = extension_build
+
+extension_build: src/Extension.cpp src/extconf.rb
+	cd src; ruby extconf.rb; make
+	touch extension_build
+	
+clean:
+	cd src;make clean
+	rm -f extension_build
+	                    
+install-exec-hook:
+	cp src/tuscany_sca_ruby.* $(libdir)	
+	

Propchange: incubator/tuscany/cpp/sca/runtime/extensions/ruby/extension/Makefile.am
------------------------------------------------------------------------------
    svn:eol-style = native

Added: incubator/tuscany/cpp/sca/runtime/extensions/ruby/extension/deploy.bat
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/extensions/ruby/extension/deploy.bat?view=auto&rev=509963
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/extensions/ruby/extension/deploy.bat (added)
+++ incubator/tuscany/cpp/sca/runtime/extensions/ruby/extension/deploy.bat Wed Feb 21 02:42:07 2007
@@ -0,0 +1,59 @@
+@echo off
+
+@REM  Licensed to the Apache Software Foundation (ASF) under one
+@REM  or more contributor license agreements.  See the NOTICE file
+@REM  distributed with this work for additional information
+@REM  regarding copyright ownership.  The ASF licenses this file
+@REM  to you under the Apache License, Version 2.0 (the
+@REM  "License"); you may not use this file except in compliance
+@REM  with the License.  You may obtain a copy of the License at
+@REM  
+@REM    http://www.apache.org/licenses/LICENSE-2.0
+@REM    
+@REM  Unless required by applicable law or agreed to in writing,
+@REM  software distributed under the License is distributed on an
+@REM  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+@REM  KIND, either express or implied.  See the License for the
+@REM  specific language governing permissions and limitations
+@REM  under the License.
+
+
+setlocal
+
+if . == .%1 (
+echo sca root not specified
+goto usage
+)
+set rootdir=%1
+set deploydir=%rootdir%\deploy
+set extdir=%deploydir%\extensions
+set rubyextdir=%extdir%\ruby
+
+if . == .%2 (
+echo input directory not specified
+goto usage
+)
+set inpath=%2
+echo %inpath%
+
+
+if not exist %deploydir% mkdir %deploydir%
+if not exist %extdir% mkdir %extdir%
+if not exist %rubyextdir% mkdir %rubyextdir%
+if not exist %rubyextdir%\bin mkdir %rubyextdir%\bin
+if not exist %rubyextdir%\lib mkdir %rubyextdir%\lib
+
+del %rubyextdir%\bin\tuscany_sca_ruby.*
+del %rubyextdir%\lib\tuscany_sca_ruby.lib
+
+copy %inpath%\tuscany_sca_ruby.lib %rubyextdir%\lib
+copy %inpath%\tuscany_sca_ruby.dll %rubyextdir%\bin
+
+if exist %inpath%\tuscany_sca_ruby.pdb copy %inpath%\tuscany_sca_ruby.pdb %rubyextdir%\bin
+
+goto end
+:usage
+echo Usage: deploy <sca-root> <build-output>
+:end
+
+endlocal

Propchange: incubator/tuscany/cpp/sca/runtime/extensions/ruby/extension/deploy.bat
------------------------------------------------------------------------------
    svn:eol-style = native

Added: incubator/tuscany/cpp/sca/runtime/extensions/ruby/extension/src/Extension.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/extensions/ruby/extension/src/Extension.cpp?view=auto&rev=509963
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/extensions/ruby/extension/src/Extension.cpp (added)
+++ incubator/tuscany/cpp/sca/runtime/extensions/ruby/extension/src/Extension.cpp Wed Feb 21 02:42:07 2007
@@ -0,0 +1,56 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *   
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+/* $Rev$ $Date$ */
+
+#if defined(WIN32)  || defined (_WINDOWS)
+#define SCA_RUBYEXTENSION_API __declspec(dllexport)
+#else
+#define SCA_RUBYEXTENSION_API 
+#endif
+
+#include "tuscany/sca/ruby/Ruby.h"
+#include "tuscany/sca/ruby/RubyCompositeContext.h"
+
+extern "C"
+{
+
+    // Implement the Sca::locateService module function    
+    SCA_RUBYEXTENSION_API VALUE tuscany_sca_ruby_locateService(VALUE module, VALUE value)
+    {
+        // Locate the service
+        const char* serviceName = rb_string_value_cstr(&value);
+        return tuscany::sca::ruby::RubyCompositeContext::locateService(serviceName);
+    }
+   
+    // Initialize the Ruby extension
+    SCA_RUBYEXTENSION_API void Init_tuscany_sca_ruby()
+    {
+        
+        // Define the Sca::locateService() function 
+        VALUE module = rb_define_module("SCA");
+        rb_define_module_function(module, "locateService", (VALUE(*)(ANYARGS))tuscany_sca_ruby_locateService, 1);
+        
+    }
+
+    SCA_RUBYEXTENSION_API void Init_libtuscany_sca_ruby()
+    {
+        Init_tuscany_sca_ruby();
+    }
+}

Propchange: incubator/tuscany/cpp/sca/runtime/extensions/ruby/extension/src/Extension.cpp
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/tuscany/cpp/sca/runtime/extensions/ruby/extension/src/Extension.cpp
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: incubator/tuscany/cpp/sca/runtime/extensions/ruby/extension/src/extconf.rb
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/extensions/ruby/extension/src/extconf.rb?view=auto&rev=509963
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/extensions/ruby/extension/src/extconf.rb (added)
+++ incubator/tuscany/cpp/sca/runtime/extensions/ruby/extension/src/extconf.rb Wed Feb 21 02:42:07 2007
@@ -0,0 +1,24 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+# 
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+	
+	require 'mkmf'
+	find_header("tuscany/sca/ruby/RubyCompositeContext.h", "../../src")
+	find_library("tuscany_sca_ruby_lang", "", "../../src/.libs")
+	CONFIG["CC"] = "g++"
+	create_makefile 'tuscany_sca_ruby'

Propchange: incubator/tuscany/cpp/sca/runtime/extensions/ruby/extension/src/extconf.rb
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/tuscany/cpp/sca/runtime/extensions/ruby/src/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/extensions/ruby/src/Makefile.am?view=diff&rev=509963&r1=509962&r2=509963
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/extensions/ruby/src/Makefile.am (original)
+++ incubator/tuscany/cpp/sca/runtime/extensions/ruby/src/Makefile.am Wed Feb 21 02:42:07 2007
@@ -16,10 +16,9 @@
 #  under the License.
 
 libdir=$(prefix)/extensions/ruby/lib
-lib_LTLIBRARIES = libtuscany_sca_ruby.la
+lib_LTLIBRARIES = libtuscany_sca_ruby_lang.la
 
 install-exec-hook:
-	cd $(libdir); ln -s -f libtuscany_sca_ruby$(libsuffix) tuscany_sca_ruby$(libsuffix) 
 
 rootdir=$(prefix)/extensions/ruby
 
@@ -27,7 +26,7 @@
 tuscany/sca/ruby/*.h \
 tuscany/sca/ruby/model/*.h
 
-libtuscany_sca_ruby_la_SOURCES = \
+libtuscany_sca_ruby_lang_la_SOURCES = \
 tuscany/sca/ruby/RubyExtension.cpp \
 tuscany/sca/ruby/RubyImplementationExtension.cpp \
 tuscany/sca/ruby/RubyServiceProxy.cpp \
@@ -37,9 +36,9 @@
 tuscany/sca/ruby/model/RubyServiceBinding.cpp \
 tuscany/sca/ruby/RubyCompositeContext.cpp
 
-libtuscany_sca_ruby_la_LIBADD = -L${TUSCANY_SDOCPP}/lib -ltuscany_sdo \
+libtuscany_sca_ruby_lang_la_LIBADD = -L${TUSCANY_SDOCPP}/lib -ltuscany_sdo \
 	-L$(top_builddir)/runtime/core/src -ltuscany_sca \
-	-L${RUBY_LIB} -lruby  -lpthread
+	-L${RUBY_LIB}  -lruby -lpthread
 
 INCLUDES = -Imodel -I$(top_builddir)/runtime/core/src \
            -I${TUSCANY_SDOCPP}/include \

Modified: incubator/tuscany/cpp/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyCompositeContext.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyCompositeContext.cpp?view=diff&rev=509963&r1=509962&r2=509963
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyCompositeContext.cpp (original)
+++ incubator/tuscany/cpp/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyCompositeContext.cpp Wed Feb 21 02:42:07 2007
@@ -28,51 +28,43 @@
 #include "tuscany/sca/model/ComponentType.h"
 #include "tuscany/sca/model/Composite.h"
 #include "tuscany/sca/ruby/RubyServiceProxy.h"
+#include "tuscany/sca/ruby/RubyCompositeContext.h"
 
 using namespace std;
 using namespace tuscany::sca::model;
 
-extern "C"
-{
 
-    // Implement the Sca::locateService module function    
-    SCA_RUBY_API VALUE tuscany_sca_ruby_locateService(VALUE module, VALUE value)
+namespace tuscany
+{
+    namespace sca
     {
-        
-        // Get the default component
-        Component* defaultComponent = tuscany::sca::SCARuntime::getCurrentRuntime()->getDefaultComponent();
-        Composite* composite = (Composite*)defaultComponent->getType();
-                
-        // Locate the service
-        const char* serviceName = rb_string_value_cstr(&value);
-        Service* service = composite->findComponentService(serviceName);
-        string msg;
-        if (!service)
+        namespace ruby
         {
-            string msg = "Service not found: ";
-            msg = msg + serviceName;
-            rb_raise(rb_eRuntimeError, msg.c_str());
-        }
-
-        // Get a Proxy for this service
-        tuscany::sca::ruby::RubyServiceProxy* serviceProxy = new tuscany::sca::ruby::RubyServiceProxy(service);
-
-        // Return the Ruby proxy value object        
-        return serviceProxy->getProxyValue();
-    }
-    
-    // Initialize the Ruby extension
-    SCA_RUBY_API void Init_tuscany_sca_ruby()
-    {
-        
-        // Define the Sca::locateService() function 
-        VALUE module = rb_define_module("SCA");
-        rb_define_module_function(module, "locateService", (VALUE(*)(ANYARGS))tuscany_sca_ruby_locateService, 1);
-        
-    }
-
-    SCA_RUBY_API void Init_libtuscany_sca_ruby()
-    {
-        Init_tuscany_sca_ruby();
-    }
-}
+        	
+        	VALUE RubyCompositeContext::locateService(const char* serviceName)	        	
+		    {			        
+		        // Get the default component
+		        Component* defaultComponent = tuscany::sca::SCARuntime::getCurrentRuntime()->getDefaultComponent();
+		        Composite* composite = (Composite*)defaultComponent->getType();
+		                
+		        // Locate the service
+		        Service* service = composite->findComponentService(serviceName);
+		        string msg;
+		        if (!service)
+		        {
+		            string msg = "Service not found: ";
+		            msg = msg + serviceName;
+		            rb_raise(rb_eRuntimeError, msg.c_str());
+		        }
+		
+		        // Get a Proxy for this service
+		        tuscany::sca::ruby::RubyServiceProxy* serviceProxy = new tuscany::sca::ruby::RubyServiceProxy(service);
+		
+		        // Return the Ruby proxy value object        
+		        return serviceProxy->getProxyValue();
+		    }
+
+            
+        } // End namespace ruby        
+    } // End namespace sca
+} // End namespace tuscany

Added: incubator/tuscany/cpp/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyCompositeContext.h
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyCompositeContext.h?view=auto&rev=509963
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyCompositeContext.h (added)
+++ incubator/tuscany/cpp/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyCompositeContext.h Wed Feb 21 02:42:07 2007
@@ -0,0 +1,50 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *   
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+/* $Rev$ $Date$ */
+
+#ifndef tuscany_sca_ruby_RubyCompositeContext_h
+#define tuscany_sca_ruby_RubyCompositeContext_h
+
+#include "tuscany/sca/ruby/Ruby.h"
+#include "tuscany/sca/ruby/export.h"
+
+
+
+namespace tuscany
+{
+    namespace sca
+    {
+        namespace ruby
+        {
+            
+            class RubyCompositeContext 
+            {
+            public:
+            	SCA_RUBY_API static VALUE locateService(const char* serviceName);
+
+            };
+            
+            
+        } // End namespace ruby       
+    } // End namespace sca
+} // End namespace tuscany
+
+#endif // tuscany_sca_ruby_RubyCompositeContext_h
+

Propchange: incubator/tuscany/cpp/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyCompositeContext.h
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/tuscany/cpp/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyCompositeContext.h
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Modified: incubator/tuscany/cpp/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyExtension.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyExtension.cpp?view=diff&rev=509963&r1=509962&r2=509963
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyExtension.cpp (original)
+++ incubator/tuscany/cpp/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyExtension.cpp Wed Feb 21 02:42:07 2007
@@ -33,7 +33,7 @@
 #if defined(WIN32) || defined(_WINDOWS)
     __declspec(dllexport) 
 #endif
-        void tuscany_sca_ruby_initialize()
+        void tuscany_sca_ruby_lang_initialize()
     {
         tuscany::sca::ruby::RubyExtension::initialize();
     }

Modified: incubator/tuscany/cpp/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/export.h
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/export.h?view=diff&rev=509963&r1=509962&r2=509963
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/export.h (original)
+++ incubator/tuscany/cpp/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/export.h Wed Feb 21 02:42:07 2007
@@ -25,7 +25,7 @@
 #if defined(WIN32)  || defined (_WINDOWS)
 #pragma warning(disable: 4786)
 
-#ifdef TUSCANY_SCA_RUBY_EXPORTS
+#ifdef TUSCANY_SCA_RUBY_LANG_EXPORTS
 #define SCA_RUBY_API __declspec(dllexport)
 #else
 #define SCA_RUBY_API __declspec(dllimport)

Modified: incubator/tuscany/cpp/sca/samples/HttpdBigBank/bigbank.wsclient/runwsclient.bat
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/samples/HttpdBigBank/bigbank.wsclient/runwsclient.bat?view=diff&rev=509963&r1=509962&r2=509963
==============================================================================
--- incubator/tuscany/cpp/sca/samples/HttpdBigBank/bigbank.wsclient/runwsclient.bat (original)
+++ incubator/tuscany/cpp/sca/samples/HttpdBigBank/bigbank.wsclient/runwsclient.bat Wed Feb 21 02:42:07 2007
@@ -38,7 +38,7 @@
 echo Using Axis2C installed at %AXIS2C_HOME%
 
 rem Run the client
-set PATH=%TUSCANY_SCACPP%\bin;%TUSCANY_SCACPP%\extensions\ws\reference\bin;%TUSCANY_SCACPP%\extensions\ws\service\bin;%TUSCANY_SDOCPP%\bin;%AXIS2C_HOME%\lib;%PATH%
+set PATH=%TUSCANY_SCACPP%\extensions\ruby\bin;%TUSCANY_SCACPP%\bin;%TUSCANY_SCACPP%\extensions\ws\reference\bin;%TUSCANY_SCACPP%\extensions\ws\service\bin;%TUSCANY_SDOCPP%\bin;%AXIS2C_HOME%\lib;%PATH%
 
 set TUSCANY_SCACPP_ROOT=%~d0%~p0\..\
 set TUSCANY_SCACPP_COMPONENT=bigbank.AccountWSClientComponent

Modified: incubator/tuscany/cpp/sca/samples/RestCalculator/sample.calculator.restclient/runrestclient.bat
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/samples/RestCalculator/sample.calculator.restclient/runrestclient.bat?view=diff&rev=509963&r1=509962&r2=509963
==============================================================================
--- incubator/tuscany/cpp/sca/samples/RestCalculator/sample.calculator.restclient/runrestclient.bat (original)
+++ incubator/tuscany/cpp/sca/samples/RestCalculator/sample.calculator.restclient/runrestclient.bat Wed Feb 21 02:42:07 2007
@@ -37,7 +37,7 @@
 )
 echo using Libcurl installed at %LIBCURL_HOME%
 
-set PATH=%HTTPD_HOME%\bin;%LIBCURL_HOME%\lib;%TUSCANY_SCACPP%\extensions\rest\interface\bin;%TUSCANY_SCACPP%\extensions\rest\reference\bin;%TUSCANY_SCACPP%\extensions\rest\service\bin;%TUSCANY_SCACPP%\bin;%TUSCANY_SDOCPP%\bin;%PATH%
+set PATH=%HTTPD_HOME%\bin;%LIBCURL_HOME%\lib;%TUSCANY_SCACPP%\extensions\ruby\bin;%TUSCANY_SCACPP%\extensions\rest\interface\bin;%TUSCANY_SCACPP%\extensions\rest\reference\bin;%TUSCANY_SCACPP%\extensions\rest\service\bin;%TUSCANY_SCACPP%\bin;%TUSCANY_SDOCPP%\bin;%PATH%
 
 set TUSCANY_SCACPP_ROOT=%~d0%~p0\..\
 set TUSCANY_SCACPP_COMPONENT=sample.calculator.CalculatorRestClientComponent

Modified: incubator/tuscany/cpp/sca/samples/RubyBigBank/bigbank.client/runclient.bat
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/samples/RubyBigBank/bigbank.client/runclient.bat?view=diff&rev=509963&r1=509962&r2=509963
==============================================================================
--- incubator/tuscany/cpp/sca/samples/RubyBigBank/bigbank.client/runclient.bat (original)
+++ incubator/tuscany/cpp/sca/samples/RubyBigBank/bigbank.client/runclient.bat Wed Feb 21 02:42:07 2007
@@ -38,7 +38,7 @@
 echo Using Axis2C installed at %AXIS2C_HOME%
 
 rem Run the client
-set PATH=%TUSCANY_SCACPP%\bin;%TUSCANY_SDOCPP%\bin;%AXIS2C_HOME%\lib;%PATH%
+set PATH=%TUSCANY_SCACPP%\extensions\ruby\bin;%TUSCANY_SCACPP%\bin;%TUSCANY_SDOCPP%\bin;%AXIS2C_HOME%\lib;%PATH%
 
 set TUSCANY_SCACPP_ROOT=%~d0%~p0\..\
 set TUSCANY_SCACPP_COMPONENT=bigbank.AccountManagementComponent

Modified: incubator/tuscany/cpp/sca/samples/RubyBigBank/bigbank.client/runclient.sh
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/samples/RubyBigBank/bigbank.client/runclient.sh?view=diff&rev=509963&r1=509962&r2=509963
==============================================================================
--- incubator/tuscany/cpp/sca/samples/RubyBigBank/bigbank.client/runclient.sh (original)
+++ incubator/tuscany/cpp/sca/samples/RubyBigBank/bigbank.client/runclient.sh Wed Feb 21 02:42:07 2007
@@ -38,7 +38,7 @@
 fi
 echo "Using Axis2C installed at $AXIS2C_HOME"
 
-export LD_LIBRARY_PATH=$TUSCANY_SCACPP/lib:$TUSCANY_SDOCPP/lib:$AXIS2C_HOME/lib:$LD_LIBRARY_PATH
+export LD_LIBRARY_PATH=$TUSCANY_SCACPP/extensions/ruby/lib:$TUSCANY_SCACPP/lib:$TUSCANY_SDOCPP/lib:$AXIS2C_HOME/lib:$LD_LIBRARY_PATH
 
 export TUSCANY_SCACPP_ROOT=$APFULLDIR/../
 export TUSCANY_SCACPP_COMPONENT=bigbank.AccountManagementComponent

Modified: incubator/tuscany/cpp/sca/samples/RubyBigBank/bigbank.wsclient/runwsclient.bat
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/samples/RubyBigBank/bigbank.wsclient/runwsclient.bat?view=diff&rev=509963&r1=509962&r2=509963
==============================================================================
--- incubator/tuscany/cpp/sca/samples/RubyBigBank/bigbank.wsclient/runwsclient.bat (original)
+++ incubator/tuscany/cpp/sca/samples/RubyBigBank/bigbank.wsclient/runwsclient.bat Wed Feb 21 02:42:07 2007
@@ -38,7 +38,7 @@
 echo Using Axis2C installed at %AXIS2C_HOME%
 
 rem Run the client
-set PATH=%TUSCANY_SCACPP%\bin;%TUSCANY_SDOCPP%\bin;%AXIS2C_HOME%\lib;%PATH%
+set PATH=%TUSCANY_SCACPP%\extensions\ruby\bin;%TUSCANY_SCACPP%\bin;%TUSCANY_SDOCPP%\bin;%AXIS2C_HOME%\lib;%PATH%
 
 set TUSCANY_SCACPP_ROOT=%~d0%~p0\..\
 set TUSCANY_SCACPP_COMPONENT=bigbank.AccountWSClientComponent

Modified: incubator/tuscany/cpp/sca/samples/RubyBigBank/bigbank.wsclient/runwsclient.sh
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/samples/RubyBigBank/bigbank.wsclient/runwsclient.sh?view=diff&rev=509963&r1=509962&r2=509963
==============================================================================
--- incubator/tuscany/cpp/sca/samples/RubyBigBank/bigbank.wsclient/runwsclient.sh (original)
+++ incubator/tuscany/cpp/sca/samples/RubyBigBank/bigbank.wsclient/runwsclient.sh Wed Feb 21 02:42:07 2007
@@ -38,7 +38,7 @@
 fi
 echo "Using Axis2C installed at $AXIS2C_HOME"
 
-export LD_LIBRARY_PATH=$TUSCANY_SCACPP/lib:$TUSCANY_SDOCPP/lib:$AXIS2C_HOME/lib:$LD_LIBRARY_PATH
+export LD_LIBRARY_PATH=$TUSCANY_SCACPP/extensions/ruby/lib:$TUSCANY_SCACPP/lib:$TUSCANY_SDOCPP/lib:$AXIS2C_HOME/lib:$LD_LIBRARY_PATH
 
 export TUSCANY_SCACPP_ROOT=$APFULLDIR/../
 export TUSCANY_SCACPP_COMPONENT=bigbank.AccountWSClientComponent

Modified: incubator/tuscany/cpp/sca/samples/RubyCalculator/sample.calculator.client/runclient.bat
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/samples/RubyCalculator/sample.calculator.client/runclient.bat?view=diff&rev=509963&r1=509962&r2=509963
==============================================================================
--- incubator/tuscany/cpp/sca/samples/RubyCalculator/sample.calculator.client/runclient.bat (original)
+++ incubator/tuscany/cpp/sca/samples/RubyCalculator/sample.calculator.client/runclient.bat Wed Feb 21 02:42:07 2007
@@ -37,7 +37,7 @@
 )
 echo using Axis2C installed at %AXIS2C_HOME%
 
-set PATH=%TUSCANY_SCACPP%\bin;%TUSCANY_SDOCPP%\bin;%AXIS2C_HOME%\lib;%PATH%
+set PATH=%TUSCANY_SCACPP%\extensions\ruby\bin;%TUSCANY_SCACPP%\bin;%TUSCANY_SDOCPP%\bin;%AXIS2C_HOME%\lib;%PATH%
 
 set TUSCANY_SCACPP_ROOT=%~d0%~p0\..\
 set TUSCANY_SCACPP_COMPONENT=sample.calculator.CalculatorComponent

Modified: incubator/tuscany/cpp/sca/samples/RubyCalculator/sample.calculator.client/runclient.sh
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/samples/RubyCalculator/sample.calculator.client/runclient.sh?view=diff&rev=509963&r1=509962&r2=509963
==============================================================================
--- incubator/tuscany/cpp/sca/samples/RubyCalculator/sample.calculator.client/runclient.sh (original)
+++ incubator/tuscany/cpp/sca/samples/RubyCalculator/sample.calculator.client/runclient.sh Wed Feb 21 02:42:07 2007
@@ -38,7 +38,7 @@
 fi
 echo "Using Axis2C installed at $AXIS2C_HOME"
 
-export LD_LIBRARY_PATH=$TUSCANY_SCACPP/lib:$TUSCANY_SDOCPP/lib:$AXIS2C_HOME/lib:$LD_LIBRARY_PATH
+export LD_LIBRARY_PATH=$TUSCANY_SCACPP/extensions/ruby/lib:$TUSCANY_SCACPP/lib:$TUSCANY_SDOCPP/lib:$AXIS2C_HOME/lib:$LD_LIBRARY_PATH
 
 export TUSCANY_SCACPP_ROOT=$APFULLDIR/../
 export TUSCANY_SCACPP_COMPONENT=sample.calculator.CalculatorComponent

Modified: incubator/tuscany/cpp/sca/samples/RubyCalculator/sample.calculator.wsclient/runwsclient.bat
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/samples/RubyCalculator/sample.calculator.wsclient/runwsclient.bat?view=diff&rev=509963&r1=509962&r2=509963
==============================================================================
--- incubator/tuscany/cpp/sca/samples/RubyCalculator/sample.calculator.wsclient/runwsclient.bat (original)
+++ incubator/tuscany/cpp/sca/samples/RubyCalculator/sample.calculator.wsclient/runwsclient.bat Wed Feb 21 02:42:07 2007
@@ -37,7 +37,7 @@
 )
 echo using Axis2C installed at %AXIS2C_HOME%
 
-set PATH=%TUSCANY_SCACPP%\bin;%TUSCANY_SDOCPP%\bin;%AXIS2C_HOME%\lib;%PATH%
+set PATH=%TUSCANY_SCACPP%\extensions\ruby\bin;%TUSCANY_SCACPP%\bin;%TUSCANY_SDOCPP%\bin;%AXIS2C_HOME%\lib;%PATH%
 
 set TUSCANY_SCACPP_ROOT=%~d0%~p0\..\
 set TUSCANY_SCACPP_COMPONENT=sample.calculator.CalculatorWSClientComponent

Modified: incubator/tuscany/cpp/sca/samples/RubyCalculator/sample.calculator.wsclient/runwsclient.sh
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/samples/RubyCalculator/sample.calculator.wsclient/runwsclient.sh?view=diff&rev=509963&r1=509962&r2=509963
==============================================================================
--- incubator/tuscany/cpp/sca/samples/RubyCalculator/sample.calculator.wsclient/runwsclient.sh (original)
+++ incubator/tuscany/cpp/sca/samples/RubyCalculator/sample.calculator.wsclient/runwsclient.sh Wed Feb 21 02:42:07 2007
@@ -37,7 +37,7 @@
 fi
 echo "Using Axis2C installed at $AXIS2C_HOME"
 
-export LD_LIBRARY_PATH=$TUSCANY_SCACPP/lib:$TUSCANY_SDOCPP/lib:$AXIS2C_HOME/lib:$LD_LIBRARY_PATH
+export LD_LIBRARY_PATH=$TUSCANY_SCACPP/extensions/ruby/lib:$TUSCANY_SCACPP/lib:$TUSCANY_SDOCPP/lib:$AXIS2C_HOME/lib:$LD_LIBRARY_PATH
 
 export TUSCANY_SCACPP_ROOT=$APFULLDIR/../
 export TUSCANY_SCACPP_COMPONENT=sample.calculator.CalculatorWSClientComponent



---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org


Mime
View raw message