merge r98600

svn path=/trunk/mcs/; revision=98601

diff --cc mcs/class/System.Web.Extensions/System.Web.Extensions.JavaEE.csproj
index 5b892779b313869afbd751976492b2ccc771e2dd,5b892779b313869afbd751976492b2ccc771e2dd..c1b8406435d9c7fb64db5e14ff409f83b1d5f9fb
--- 1/mcs/class/System.Web.Extensions/System.Web.Extensions.JavaEE.csproj
--- 2/mcs/class/System.Web.Extensions/System.Web.Extensions.JavaEE.csproj
+++ b/mcs/class/System.Web.Extensions/System.Web.Extensions.JavaEE.csproj
@@@ -18,6 -18,6 +18,8 @@@
      <RootNamespace>System.Web.Extensions</RootNamespace>\r
      <StartupObject>\r
      </StartupObject>\r
++    <jarserver>ipa</jarserver>\r
++    <RunPostBuildEvent>OnOutputUpdated</RunPostBuildEvent>\r
    </PropertyGroup>\r
    <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug_Java|AnyCPU' ">\r
      <DebugSymbols>true</DebugSymbols>\r
@@@ -28,8 -28,8 +30,8 @@@
      <ErrorReport>prompt</ErrorReport>\r
      <WarningLevel>4</WarningLevel>\r
      <BaseAddress>4194304</BaseAddress>\r
--    <SkipValidation>false</SkipValidation>\r
--    <KeepIntermediate>false</KeepIntermediate>\r
++    <SkipValidation>True</SkipValidation>\r
++    <KeepIntermediate>False</KeepIntermediate>\r
      <TargetPlatform>0</TargetPlatform>\r
      <PlatformTarget>AnyCPU</PlatformTarget>\r
    </PropertyGroup>\r
@@@ -57,29 -57,29 +59,28 @@@
    -->\r
    <ProjectExtensions>\r
      <VisualStudio>\r
--              <UserProperties REFS-RefInfo-myfaces="repository:vmw:framework:2.0" REFS-JarPath-myfaces="" REFS-RefInfo-rt="repository:jre:sun:1.6.0" REFS-JarPath-rt="" REFS-JarPath-system="" REFS-RefInfo-system="repository:vmw:framework:2.0" REFS-JarPath-system-configuration="" REFS-RefInfo-system-configuration="repository:vmw:framework:2.0" REFS-JarPath-system-data="" REFS-RefInfo-system-data="repository:vmw:framework:2.0" REFS-JarPath-system-drawing="" REFS-RefInfo-system-drawing="repository:vmw:framework:2.0" REFS-JarPath-system-web="" REFS-RefInfo-system-web="repository:vmw:framework:2.0" REFS-JarPath-system-web-services="" REFS-RefInfo-system-web-services="repository:vmw:framework:2.0" REFS-JarPath-system-xml="" REFS-RefInfo-system-xml="repository:vmw:framework:2.0" />\r
++      <UserProperties REFS-RefInfo-system-xml="repository:vmw:framework:2.0" REFS-JarPath-system-xml="" REFS-RefInfo-system-web-services="repository:vmw:framework:2.0" REFS-JarPath-system-web-services="" REFS-RefInfo-system-web="repository:vmw:framework:2.0" REFS-JarPath-system-web="" REFS-RefInfo-system-drawing="repository:vmw:framework:2.0" REFS-JarPath-system-drawing="" REFS-RefInfo-system-data="repository:vmw:framework:2.0" REFS-JarPath-system-data="" REFS-RefInfo-system-configuration="repository:vmw:framework:2.0" REFS-JarPath-system-configuration="" REFS-RefInfo-system="repository:vmw:framework:2.0" REFS-JarPath-system="" REFS-JarPath-rt="" REFS-RefInfo-rt="repository:jre:sun:1.6.0" REFS-JarPath-myfaces="" REFS-RefInfo-myfaces="repository:vmw:framework:2.0" />\r
      </VisualStudio>\r
    </ProjectExtensions>\r
    <ItemGroup>\r
      <Reference Include="J2SE.Helpers">\r
--              <Private>False</Private>\r
--              <HintPath>..\lib\J2SE.Helpers.dll</HintPath>\r
++      <Private>False</Private>\r
++      <HintPath>..\lib\J2SE.Helpers.dll</HintPath>\r
      </Reference>\r
      <Reference Include="Mainsoft.Configuration, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">\r
--              <HintPath>..\lib\Mainsoft.Configuration.dll</HintPath>\r
++      <HintPath>..\lib\Mainsoft.Configuration.dll</HintPath>\r
++      <Private>False</Private>\r
      </Reference>\r
      <Reference Include="myfaces, Version=1.6.65535.65535, Culture=neutral, processorArchitecture=MSIL" />\r
      <Reference Include="System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL" />\r
      <Reference Include="System.Configuration, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />\r
      <Reference Include="System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=x86" />\r
      <Reference Include="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />\r
--    <Reference Include="System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=x86" />\r
--    <Reference Include="System.Web.Services, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />\r
      <Reference Include="System.Xml, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL" />\r
    </ItemGroup>\r
    <ItemGroup>\r
--    <Compile Include="..\..\build\common\Consts.cs">\r
--      <Link>Assembly\Consts.cs</Link>\r
++    <Compile Include="..\..\build\common\Consts.cs.in">\r
++      <Link>Assembly\Consts.cs.in</Link>\r
      </Compile>\r
      <Compile Include="..\..\build\common\Locale.cs">\r
        <Link>Assembly\Locale.cs</Link>\r
@@@ -204,14 -204,14 +205,21 @@@
        <LogicalName>MicrosoftAjaxWebFormsExtension.js</LogicalName>\r
      </EmbeddedResource>\r
    </ItemGroup>\r
++  <PropertyGroup>\r
++    <PostBuildEvent>copy "$(TargetDir)*" "C:\Program Files\Mainsoft for Java EE\java_refs\framework\MONO"\r
++copy "$(TargetDir)$(TargetName).jar" "C:\Program Files\Mainsoft for Java EE\java_refs\framework\"</PostBuildEvent>\r
++  </PropertyGroup>\r
    <ItemGroup>\r
--    <ProjectReference Include="..\System.Web\System.Web.Phantom\System.Web.Phantom.csproj">\r
--      <Project>{FBFDAD51-74B6-4660-81C0-9C8B6C8D3B47}</Project>\r
--      <Name>System.Web.Phantom</Name>\r
--      <Private>False</Private>\r
++    <ProjectReference Include="..\System.Web.Services\System.Web.Services20.csproj">\r
++      <Project>{B37A8704-33AB-48D9-B0C2-1D919755B69A}</Project>\r
++      <Name>System.Web.Services20</Name>\r
++    </ProjectReference>\r
++    <ProjectReference Include="..\System.Web\System.Web20.csproj">\r
++      <Project>{0F744BEF-F9B1-4953-BB86-9ADBF73C3CD4}</Project>\r
++      <Name>System.Web20</Name>\r
      </ProjectReference>\r
    </ItemGroup>\r
    <ItemGroup>\r
      <Folder Include="Properties\" />\r
    </ItemGroup>\r
--</Project>\r
++</Project>