incubator-connectors-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kwri...@apache.org
Subject svn commit: r1211878 - in /incubator/lcf/trunk: ./ connectors/meridio/ connectors/meridio/integration/ connectors/meridio/integration/TestHarness/ connectors/meridio/integration/WebService/ connectors/meridio/webservice/
Date Thu, 08 Dec 2011 13:35:13 GMT
Author: kwright
Date: Thu Dec  8 13:35:13 2011
New Revision: 1211878

URL: http://svn.apache.org/viewvc?rev=1211878&view=rev
Log:
Fix for CONNECTORS-312.

Added:
    incubator/lcf/trunk/connectors/meridio/integration/
    incubator/lcf/trunk/connectors/meridio/integration/Installation readme.txt
      - copied unchanged from r1211860, incubator/lcf/trunk/connectors/meridio/webservice/Installation
readme.txt
    incubator/lcf/trunk/connectors/meridio/integration/TestHarness/
    incubator/lcf/trunk/connectors/meridio/integration/TestHarness/Setup.Exe   (with props)
    incubator/lcf/trunk/connectors/meridio/integration/TestHarness/Setup.Ini
    incubator/lcf/trunk/connectors/meridio/integration/TestHarness/TestHarness.msi   (with
props)
    incubator/lcf/trunk/connectors/meridio/integration/WebService/
    incubator/lcf/trunk/connectors/meridio/integration/WebService/Setup.Exe   (with props)
    incubator/lcf/trunk/connectors/meridio/integration/WebService/Setup.Ini
    incubator/lcf/trunk/connectors/meridio/integration/WebService/WebService.msi   (with props)
Removed:
    incubator/lcf/trunk/connectors/meridio/webservice/
Modified:
    incubator/lcf/trunk/build.xml
    incubator/lcf/trunk/connectors/meridio/build.xml

Modified: incubator/lcf/trunk/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/build.xml?rev=1211878&r1=1211877&r2=1211878&view=diff
==============================================================================
--- incubator/lcf/trunk/build.xml (original)
+++ incubator/lcf/trunk/build.xml Thu Dec  8 13:35:13 2011
@@ -1589,6 +1589,10 @@
         <copy todir="dist/wsdd">
             <fileset dir="connectors/meridio/dist/wsdd"/>
         </copy>
+        <mkdir dir="dist/meridio-integration"/>
+        <copy todir="dist/meridio-integration">
+            <fileset dir="connectors/meridio/dist/integration"/>
+        </copy>
     </target>
     
     <target name="deliver-meridio-connector-doc" depends="calculate-meridio-doc-condition"
if="meridio-doc.include">
@@ -3796,10 +3800,9 @@ Use Apache Forrest version forrest-0.9-d
           <exclude name="livelink/lapi/*.jar"/>
           <exclude name="meridio/wsdls/*.wsdl"/>
           <exclude name="meridio/wsdls/*.xsd"/>
+          <exclude name="meridio/integration/WebService/Setup.Ini"/>
+          <exclude name="meridio/integration/TestHarness/Setup.Ini"/>
           <exclude name="sharepoint/wsdls/*.wsdl"/>
-          <exclude name="meridio/webservice/Test Harness/source code/TestHarness.cs"/>
-          <exclude name="meridio/webservice/Test Harness/Installation files/Setup.Ini"/>
-          <exclude name="meridio/webservice/Web Service/Installation files/Setup.Ini"/>
           <exclude name="**/surefire-reports/"/>
           <exclude name="**/target/"/>
         </fileset>

Modified: incubator/lcf/trunk/connectors/meridio/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/meridio/build.xml?rev=1211878&r1=1211877&r2=1211878&view=diff
==============================================================================
--- incubator/lcf/trunk/connectors/meridio/build.xml (original)
+++ incubator/lcf/trunk/connectors/meridio/build.xml Thu Dec  8 13:35:13 2011
@@ -176,6 +176,18 @@
         <copy todir="dist/wsdd" file="meridio-client-config.wsdd"/>
     </target>
     
+    <target name="integration">
+        <mkdir dir="dist/integration"/>
+        <copy todir="dist/integration">
+          <fileset dir="integration">
+              <include name="**/*.Exe"/>
+              <include name="**/*.Ini"/>
+              <include name="**/*.msi"/>
+              <include name="*.txt"/>
+          </fileset>
+        </copy>
+    </target>
+
     <target name="lib" depends="jar-connector,jar-wsdls,jar-xsds,precompile-check" if="canBuild">
         <mkdir dir="dist/lib"/>
         <copy todir="dist/lib">
@@ -195,7 +207,7 @@
         </copy>
     </target>
 
-    <target name="build" depends="lib,wsdd"/>
+    <target name="build" depends="lib,wsdd,integration"/>
     <target name="build-tests">
       <mkdir dir="build/test-jar"/>
     </target>

Added: incubator/lcf/trunk/connectors/meridio/integration/TestHarness/Setup.Exe
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/meridio/integration/TestHarness/Setup.Exe?rev=1211878&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/lcf/trunk/connectors/meridio/integration/TestHarness/Setup.Exe
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/lcf/trunk/connectors/meridio/integration/TestHarness/Setup.Ini
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/meridio/integration/TestHarness/Setup.Ini?rev=1211878&view=auto
==============================================================================
--- incubator/lcf/trunk/connectors/meridio/integration/TestHarness/Setup.Ini (added)
+++ incubator/lcf/trunk/connectors/meridio/integration/TestHarness/Setup.Ini Thu Dec  8 13:35:13
2011
@@ -0,0 +1,7 @@
+[MSILoader]
+MSIFileName=TestHarness.msi
+[FXSection]
+SupportedRuntimes=1.1.4322
+InstallUrl=http://go.microsoft.com/fwlink/?LinkId=9832
+Message=1.1.4322
+UseDefaultMessage=1

Added: incubator/lcf/trunk/connectors/meridio/integration/TestHarness/TestHarness.msi
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/meridio/integration/TestHarness/TestHarness.msi?rev=1211878&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/lcf/trunk/connectors/meridio/integration/TestHarness/TestHarness.msi
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/lcf/trunk/connectors/meridio/integration/WebService/Setup.Exe
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/meridio/integration/WebService/Setup.Exe?rev=1211878&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/lcf/trunk/connectors/meridio/integration/WebService/Setup.Exe
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/lcf/trunk/connectors/meridio/integration/WebService/Setup.Ini
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/meridio/integration/WebService/Setup.Ini?rev=1211878&view=auto
==============================================================================
--- incubator/lcf/trunk/connectors/meridio/integration/WebService/Setup.Ini (added)
+++ incubator/lcf/trunk/connectors/meridio/integration/WebService/Setup.Ini Thu Dec  8 13:35:13
2011
@@ -0,0 +1,7 @@
+[MSILoader]
+MSIFileName=WebService.msi
+[FXSection]
+SupportedRuntimes=1.1.4322
+InstallUrl=http://go.microsoft.com/fwlink/?LinkId=9832
+Message=1.1.4322
+UseDefaultMessage=1

Added: incubator/lcf/trunk/connectors/meridio/integration/WebService/WebService.msi
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/meridio/integration/WebService/WebService.msi?rev=1211878&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/lcf/trunk/connectors/meridio/integration/WebService/WebService.msi
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream



Mime
View raw message