From 0e285328d6862ff0f015bbb4a2c4fe06a970e093 Mon Sep 17 00:00:00 2001
From: Olivier Lamy <olamy@apache.org>
Date: Sat, 22 Jun 2013 11:47:32 +0000
Subject: [PATCH] fix site deployment

git-svn-id: https://svn.apache.org/repos/asf/directmemory/lightning/trunk@1495711 13f79535-47bb-0310-9956-ffa450edef68
---
 deploySite.sh |  4 +++-
 pom.xml       | 10 +---------
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/deploySite.sh b/deploySite.sh
index 826e984..71e896e 100644
--- a/deploySite.sh
+++ b/deploySite.sh
@@ -12,4 +12,6 @@
 # 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.
-mvn clean site site:stage-deploy scm-publish:publish-scm  $@
+
+mvn clean site site:stage $@
+mvn scm-publish:publish-scm $@
diff --git a/pom.xml b/pom.xml
index a9229b3..37571a8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -65,8 +65,6 @@
     <jgroups.version>3.0.4.Final</jgroups.version>
     <spring.version>2.5.6</spring.version>
 
-    <directmemory.lightning.siteFilePath>${user.home}/directmemory-lightning-site-deploy</directmemory.lightning.siteFilePath>
-    <directmemory.lightning.siteUrlDeployment>file://${directmemory.lightning.siteFilePath}</directmemory.lightning.siteUrlDeployment>
     <directmemory.lightning.scmPubCheckoutDirectory>${user.home}/directmemory-lightning-site-content</directmemory.lightning.scmPubCheckoutDirectory>
     <scmSkipDeletedFiles>false</scmSkipDeletedFiles>
 
@@ -84,7 +82,7 @@
   <distributionManagement>
     <site>
       <id>apache.website</id>
-      <url>${directmemory.lightning.siteUrlDeployment}</url>
+      <url>scm:svn:https://svn.apache.org/repos/asf/directmemory/site-content/lightning</url>
     </site>
   </distributionManagement>
 
@@ -307,17 +305,11 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-site-plugin</artifactId>
-          <version>${site-plugin.version}</version>
-          <configuration>
-            <stagingSiteURL>${directmemory.lightning.siteUrlDeployment}</stagingSiteURL>
-          </configuration>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-scm-publish-plugin</artifactId>
           <configuration>
-            <pubScmUrl>scm:svn:https://svn.apache.org/repos/asf/directmemory/site-content/lightning</pubScmUrl>
-            <content>${directmemory.lightning.siteFilePath}</content>
             <checkoutDirectory>${directmemory.lightning.scmPubCheckoutDirectory}</checkoutDirectory>
             <skipDeletedFiles>${scmSkipDeletedFiles}</skipDeletedFiles>
           </configuration>