incubator-connectors-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kwri...@apache.org
Subject svn commit: r1178642 - in /incubator/lcf/trunk: ./ connectors/sharepoint/ connectors/sharepoint/integration/ connectors/sharepoint/webservice/
Date Tue, 04 Oct 2011 00:01:21 GMT
Author: kwright
Date: Tue Oct  4 00:01:20 2011
New Revision: 1178642

URL: http://svn.apache.org/viewvc?rev=1178642&view=rev
Log:
Fix for CONNECTORS-268.  Prebuild MCPermissions SharePoint web service plugin, and include
it in the distribution.

Added:
    incubator/lcf/trunk/connectors/sharepoint/integration/
    incubator/lcf/trunk/connectors/sharepoint/integration/Installation Readme.txt   (with
props)
    incubator/lcf/trunk/connectors/sharepoint/integration/MetaCarta.SharePoint.MCPermissionsService.wsp
  (with props)
    incubator/lcf/trunk/connectors/sharepoint/integration/remove.bat   (with props)
    incubator/lcf/trunk/connectors/sharepoint/integration/setup.bat   (with props)
    incubator/lcf/trunk/connectors/sharepoint/integration/upgrade.bat   (with props)
Removed:
    incubator/lcf/trunk/connectors/sharepoint/webservice/
Modified:
    incubator/lcf/trunk/CHANGES.txt
    incubator/lcf/trunk/build.xml
    incubator/lcf/trunk/connectors/sharepoint/build.xml

Modified: incubator/lcf/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/CHANGES.txt?rev=1178642&r1=1178641&r2=1178642&view=diff
==============================================================================
--- incubator/lcf/trunk/CHANGES.txt (original)
+++ incubator/lcf/trunk/CHANGES.txt Tue Oct  4 00:01:20 2011
@@ -3,6 +3,10 @@ $Id$
 
 ======================= 0.4-dev =====================
 
+CONNECTORS-268: Move sources for, and prebuild, the MCPermissions
+web service plugin for the SharePoint connector.
+(Karl Wright)
+
 CONNECTORS-257: Add cache control fields to make Active Directory authority
 configuration more flexible with regards to cache.
 (Karl Wright, Shinichiro Abe)

Modified: incubator/lcf/trunk/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/build.xml?rev=1178642&r1=1178641&r2=1178642&view=diff
==============================================================================
--- incubator/lcf/trunk/build.xml (original)
+++ incubator/lcf/trunk/build.xml Tue Oct  4 00:01:20 2011
@@ -1570,6 +1570,10 @@
         <copy todir="dist/wsdd">
             <fileset dir="connectors/sharepoint/dist/wsdd"/>
         </copy>
+        <mkdir dir="dist/sharepoint-integration"/>
+        <copy todir="dist/sharepoint-integration">
+            <fileset dir="connectors/sharepoint/dist/integration"/>
+        </copy>
     </target>
     
     <target name="deliver-sharepoint-connector-doc" depends="calculate-sharepoint-doc-condition"
if="sharepoint-doc.include">

Modified: incubator/lcf/trunk/connectors/sharepoint/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/sharepoint/build.xml?rev=1178642&r1=1178641&r2=1178642&view=diff
==============================================================================
--- incubator/lcf/trunk/connectors/sharepoint/build.xml (original)
+++ incubator/lcf/trunk/connectors/sharepoint/build.xml Tue Oct  4 00:01:20 2011
@@ -46,14 +46,6 @@
         <echo message="SharePoint Connector cannot be built without DspSts.wsdl, Lists.wsdl,
Permissions.wsdl, usergroup.wsdl, versions.wsdl, and webs.wsdl"/>
     </target>
 
-    <target name="build-webservice" depends="precompile-check" if="canBuild">
-        <copy todir="webservice/Web References/SPPermissionsService" file="wsdls/Permissions.wsdl"/>
-        <exec executable="cmd" dir="webservice">
-            <arg value="/c"/>
-            <arg value="build.bat"/>
-        </exec>
-    </target>
-
     <target name="classcreate-wsdl">
         <mkdir dir="build/wsdljava"/>
         <java classname="org.apache.axis.wsdl.WSDL2Java" fork="true">
@@ -138,6 +130,17 @@
         <copy todir="dist/wsdd" file="sharepoint-client-config.wsdd"/>
     </target>
 
+    <target name="integration">
+        <mkdir dir="dist/integration"/>
+        <copy todir="dist/integration">
+          <fileset dir="integration">
+              <include name="*.bat"/>
+              <include name="*.wsp"/>
+              <include name="*.txt"/>
+          </fileset>
+        </copy>
+    </target>
+
     <target name="lib" depends="jar-connector,jar-wsdls,precompile-check" if="canBuild">
         <mkdir dir="dist/lib"/>
         <copy todir="dist/lib">
@@ -153,7 +156,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/sharepoint/integration/Installation Readme.txt
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/sharepoint/integration/Installation%20Readme.txt?rev=1178642&view=auto
==============================================================================
--- incubator/lcf/trunk/connectors/sharepoint/integration/Installation Readme.txt (added)
+++ incubator/lcf/trunk/connectors/sharepoint/integration/Installation Readme.txt Tue Oct
 4 00:01:20 2011
@@ -0,0 +1,55 @@
+# 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.
+
+How to install and upgrade the MCPermissions SharePoint Web Service
+=================================================
+
+This web service is deployed using the SharePoint stsadm utility.  There are several included
batch files: setup.bat (for first-time installation),
+and upgrade.bat (for subsequent installations).  There is also a remove.bat, in case there
is a need to uninstall the web service.
+
+Note: This web service is only functional on SharePoint 3.0 (2007) systems.  Do not install
on SharePoint 2.0 (2003) systems.
+
+
+First-time installation
+================
+
+1) Copy the contents of the Package directory into a directory on your SharePoint server.
+2) Open a "Command" prompt, and cd to the directory in which the files were copied.
+3) If your SharePoint has been installed with its default paths, enter the command "setup.bat".
 Otherwise, you may need to
+   modify the setup.bat file first for it to be able to locate stsadm.exe.
+4) Test your installation by browsing to the following SharePoint URL:
+
+http://<your server name>:<server port>/<server location>/_vti_bin/MCPermissions.asmx
+
+If everything was properly deployed, you should see a web page that describes the "Permissions"
web service.
+
+
+Repeat or upgrade installations
+=======================
+
+1) Copy the contents of the Package directory into a directory on your SharePoint server.
+2) Open a "Command" prompt, and cd to the directory in which the files were copied.
+3) If your SharePoint has been installed with its default paths, enter the command "upgrade.bat".
 Otherwise, you may need to
+   modify the upgrade.bat file first for it to be able to locate stsadm.exe.
+   
+
+Remove an installation
+=================
+
+1) Copy the contents of the Package directory into a directory on your SharePoint server.
+2) Open a "Command" prompt, and cd to the directory in which the files were copied.
+3) If your SharePoint has been installed with its default paths, enter the command "remove.bat".
 Otherwise, you may need to
+   modify the remove.bat file first for it to be able to locate stsadm.exe.
+

Propchange: incubator/lcf/trunk/connectors/sharepoint/integration/Installation Readme.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/lcf/trunk/connectors/sharepoint/integration/Installation Readme.txt
------------------------------------------------------------------------------
    svn:keywords = Id

Added: incubator/lcf/trunk/connectors/sharepoint/integration/MetaCarta.SharePoint.MCPermissionsService.wsp
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/sharepoint/integration/MetaCarta.SharePoint.MCPermissionsService.wsp?rev=1178642&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/lcf/trunk/connectors/sharepoint/integration/MetaCarta.SharePoint.MCPermissionsService.wsp
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/lcf/trunk/connectors/sharepoint/integration/remove.bat
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/sharepoint/integration/remove.bat?rev=1178642&view=auto
==============================================================================
--- incubator/lcf/trunk/connectors/sharepoint/integration/remove.bat (added)
+++ incubator/lcf/trunk/connectors/sharepoint/integration/remove.bat Tue Oct  4 00:01:20 2011
@@ -0,0 +1,27 @@
+REM Licensed to the Apache Software Foundation (ASF) under one or more
+REM contributor license agreements. See the NOTICE file distributed with
+REM this work for additional information regarding copyright ownership.
+REM The ASF licenses this file to You under the Apache License, Version 2.0
+REM (the "License"); you may not use this file except in compliance with
+REM 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, software
+REM distributed under the License is distributed on an "AS IS" BASIS,
+REM WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+REM See the License for the specific language governing permissions and
+REM limitations under the License.
+
+set SHPADMINDIR=C:\Program Files\Common Files\Microsoft Shared\web server extensions\12\BIN
+set SHPADMINEXE=%SHPADMINDIR%\stsadm.exe
+set DEFAULTSERVICENAME=MetaCarta.SharePoint.MCPermissionsService.wsp
+
+echo Removing %DEFAULTSERVICENAME% using %SHPADMINEXE%...
+
+"%SHPADMINEXE%" -o retractsolution -name "%DEFAULTSERVICENAME%" -immediate
+"%SHPADMINEXE%" -o execadmsvcjobs
+"%SHPADMINEXE%" -o deletesolution -name "%DEFAULTSERVICENAME%" -override
+"%SHPADMINEXE%" -o execadmsvcjobs
+
+echo Removal complete

Propchange: incubator/lcf/trunk/connectors/sharepoint/integration/remove.bat
------------------------------------------------------------------------------
    svn:eol-style = CRLF

Propchange: incubator/lcf/trunk/connectors/sharepoint/integration/remove.bat
------------------------------------------------------------------------------
    svn:keywords = Id

Added: incubator/lcf/trunk/connectors/sharepoint/integration/setup.bat
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/sharepoint/integration/setup.bat?rev=1178642&view=auto
==============================================================================
--- incubator/lcf/trunk/connectors/sharepoint/integration/setup.bat (added)
+++ incubator/lcf/trunk/connectors/sharepoint/integration/setup.bat Tue Oct  4 00:01:20 2011
@@ -0,0 +1,27 @@
+REM Licensed to the Apache Software Foundation (ASF) under one or more
+REM contributor license agreements. See the NOTICE file distributed with
+REM this work for additional information regarding copyright ownership.
+REM The ASF licenses this file to You under the Apache License, Version 2.0
+REM (the "License"); you may not use this file except in compliance with
+REM 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, software
+REM distributed under the License is distributed on an "AS IS" BASIS,
+REM WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+REM See the License for the specific language governing permissions and
+REM limitations under the License.
+
+set SHPADMINDIR=C:\Program Files\Common Files\Microsoft Shared\web server extensions\12\BIN
+set SHPADMINEXE=%SHPADMINDIR%\stsadm.exe
+set DEFAULTSERVICENAME=MetaCarta.SharePoint.MCPermissionsService.wsp
+
+echo Installing %DEFAULTSERVICENAME% using %SHPADMINEXE%...
+
+"%SHPADMINEXE%" -o addsolution -filename "%DEFAULTSERVICENAME%"
+"%SHPADMINEXE%" -o execadmsvcjobs
+"%SHPADMINEXE%" -o deploysolution -name "%DEFAULTSERVICENAME%" -immediate -allowGacDeployment
-force
+"%SHPADMINEXE%" -o execadmsvcjobs
+
+echo Install complete

Propchange: incubator/lcf/trunk/connectors/sharepoint/integration/setup.bat
------------------------------------------------------------------------------
    svn:eol-style = CRLF

Propchange: incubator/lcf/trunk/connectors/sharepoint/integration/setup.bat
------------------------------------------------------------------------------
    svn:keywords = Id

Added: incubator/lcf/trunk/connectors/sharepoint/integration/upgrade.bat
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/sharepoint/integration/upgrade.bat?rev=1178642&view=auto
==============================================================================
--- incubator/lcf/trunk/connectors/sharepoint/integration/upgrade.bat (added)
+++ incubator/lcf/trunk/connectors/sharepoint/integration/upgrade.bat Tue Oct  4 00:01:20
2011
@@ -0,0 +1,32 @@
+REM Licensed to the Apache Software Foundation (ASF) under one or more
+REM contributor license agreements. See the NOTICE file distributed with
+REM this work for additional information regarding copyright ownership.
+REM The ASF licenses this file to You under the Apache License, Version 2.0
+REM (the "License"); you may not use this file except in compliance with
+REM 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, software
+REM distributed under the License is distributed on an "AS IS" BASIS,
+REM WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+REM See the License for the specific language governing permissions and
+REM limitations under the License.
+
+set SHPADMINDIR=C:\Program Files\Common Files\Microsoft Shared\web server extensions\12\BIN
+set SHPADMINEXE=%SHPADMINDIR%\stsadm.exe
+set DEFAULTSERVICENAME=MetaCarta.SharePoint.MCPermissionsService.wsp
+
+echo Upgrading %DEFAULTSERVICENAME% using %SHPADMINEXE%...
+
+"%SHPADMINEXE%" -o retractsolution -name "%DEFAULTSERVICENAME%" -immediate
+"%SHPADMINEXE%" -o execadmsvcjobs
+"%SHPADMINEXE%" -o deletesolution -name "%DEFAULTSERVICENAME%" -override
+"%SHPADMINEXE%" -o execadmsvcjobs
+
+"%SHPADMINEXE%" -o addsolution -filename "%DEFAULTSERVICENAME%"
+"%SHPADMINEXE%" -o execadmsvcjobs
+"%SHPADMINEXE%" -o deploysolution -name "%DEFAULTSERVICENAME%" -immediate -allowGacDeployment
-force
+"%SHPADMINEXE%" -o execadmsvcjobs
+
+echo Upgrade complete

Propchange: incubator/lcf/trunk/connectors/sharepoint/integration/upgrade.bat
------------------------------------------------------------------------------
    svn:eol-style = CRLF

Propchange: incubator/lcf/trunk/connectors/sharepoint/integration/upgrade.bat
------------------------------------------------------------------------------
    svn:keywords = Id



Mime
View raw message