servicemix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ge...@apache.org
Subject svn commit: r1388623 - in /servicemix/website/trunk: pom.xml src/main/webapp/.htaccess src/main/webapp/developers/source/website-source.page
Date Fri, 21 Sep 2012 19:04:45 GMT
Author: gertv
Date: Fri Sep 21 19:04:45 2012
New Revision: 1388623

URL: http://svn.apache.org/viewvc?rev=1388623&view=rev
Log:
SMX4-1247: Switch to svnpubsub for publishing the website contents

Added:
    servicemix/website/trunk/src/main/webapp/.htaccess
Modified:
    servicemix/website/trunk/pom.xml
    servicemix/website/trunk/src/main/webapp/developers/source/website-source.page

Modified: servicemix/website/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/website/trunk/pom.xml?rev=1388623&r1=1388622&r2=1388623&view=diff
==============================================================================
--- servicemix/website/trunk/pom.xml (original)
+++ servicemix/website/trunk/pom.xml Fri Sep 21 19:04:45 2012
@@ -36,9 +36,6 @@
     <packaging>war</packaging>
 
     <properties>
-        <must-succeed>false</must-succeed>
-        <site.dir>${project.build.directory}/site</site.dir>
-        <manual>${site.dir}/manual-${project.version}</manual>
         <netbeans.hint.deploy.server>Tomcat60</netbeans.hint.deploy.server>
         <jetty-port>8080</jetty-port>
         <jetty-war-dir>${project.build.directory}/webapp/</jetty-war-dir>
@@ -48,8 +45,8 @@
         <scalate.mode>production</scalate.mode>
         <scalate.workdir>${project.build.directory}/scalateWorkDir</scalate.workdir>
         <scala.version>2.9.1</scala.version>
-        <karaf.version>${project.version}</karaf.version>
-        <maven.wagon.version>1.0-beta-6</maven.wagon.version>
+
+        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     </properties>
 
     <repositories>
@@ -66,20 +63,6 @@
         </repository>
     </repositories>
 
-    <pluginRepositories>
-        <pluginRepository>
-            <id>fusesource</id>
-            <name>Fusesource Maven Repository</name>
-            <url>http://repo.fusesource.com/nexus/content/repositories/snapshots/</url>
-            <releases>
-                <enabled>false</enabled>
-            </releases>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-        </pluginRepository>
-    </pluginRepositories>
-
     <dependencies>
         <dependency>
             <groupId>org.fusesource.scalate</groupId>
@@ -182,18 +165,8 @@
                         </configuration> -->
                     </execution>
                 </executions>
-                <configuration>
-                    <remoteServerId>people.apache.org</remoteServerId>
-                    <remoteServerUrl>scp://people.apache.org/www/servicemix.apache.org</remoteServerUrl>
-                    <target>${basedir}/src/main/webapp</target>
-                </configuration>
                 <dependencies>
                     <dependency>
-                        <groupId>org.apache.maven.wagon</groupId>
-                        <artifactId>wagon-ssh</artifactId>
-                        <version>${maven.wagon.version}</version>
-                    </dependency>
-                    <dependency>
                         <groupId>org.fusesource.wikitext</groupId>
                         <artifactId>confluence-core</artifactId>
                         <version>${wikitext.version}</version>
@@ -284,6 +257,19 @@
                     </instructions>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-scm-publish-plugin</artifactId>
+                <version>1.0-beta-1</version>
+                <configuration>
+                    <checkinComment>Updating main website contents</checkinComment>
+                    <pubScmUrl>scm:svn:https://svn.apache.org/repos/asf/servicemix/site/production</pubScmUrl>
+                    <content>${project.build.directory}/sitegen</content>
+                    <ignorePathsToDelete>
+                        <ignorePathToDelete>docs/**</ignorePathToDelete>
+                    </ignorePathsToDelete>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 

Added: servicemix/website/trunk/src/main/webapp/.htaccess
URL: http://svn.apache.org/viewvc/servicemix/website/trunk/src/main/webapp/.htaccess?rev=1388623&view=auto
==============================================================================
--- servicemix/website/trunk/src/main/webapp/.htaccess (added)
+++ servicemix/website/trunk/src/main/webapp/.htaccess Fri Sep 21 19:04:45 2012
@@ -0,0 +1,11 @@
+RewriteEngine On
+RewriteRule   ^runtime/(.*)$ kernel/$1 [R=301,L]
+RewriteRule   ^SM/(.*)$ $1 [L]
+RewriteRule   ^SMX3/(.*)$ smx3/$1 [L]
+RewriteRule   ^SMXCOMP/(.*)$ components/$1 [L]
+RewriteRule   ^SMX4/(.*)$ smx4/$1 [L]
+RewriteRule   ^SMX4NMR/(.*)$ nmr/$1 [L]
+RewriteRule   ^SMX4KNL/(.*)$ kernel/$1 [L]
+
+Redirect /home.html http://servicemix.apache.org/index.html
+Redirect /download.html http://servicemix.apache.org/downloads.html

Modified: servicemix/website/trunk/src/main/webapp/developers/source/website-source.page
URL: http://svn.apache.org/viewvc/servicemix/website/trunk/src/main/webapp/developers/source/website-source.page?rev=1388623&r1=1388622&r2=1388623&view=diff
==============================================================================
--- servicemix/website/trunk/src/main/webapp/developers/source/website-source.page (original)
+++ servicemix/website/trunk/src/main/webapp/developers/source/website-source.page Fri Sep
21 19:04:45 2012
@@ -5,7 +5,6 @@ title: Website Source
 h1. Website Project
 
 The website projects holds the code for our main website.
-The new website is currently work-in-progress and staged at http://servicemix.apache.org/staging
 
 --- name:building pipeline:conf
 
@@ -16,7 +15,7 @@ The project is a basic Maven WAR project
 * {{src/main/webapp}} : Contains the documentation page contents
 * {{src/main/webapp/WEB-INF/scalate/layouts}} : Scalate SSP templates for the site
 
-We don't intend to release this project, the main goal is just to upload the result of the
build to http://servicemix.apache.org/staging
+We don't intend to release this project, the main goal is just to upload the result of the
build to http://servicemix.apache.org
 
 h3. Build and browse locally
 
@@ -25,27 +24,7 @@ You can also run {{mvn jetty:run}} to ha
 
 h3. Upload a new copy
 
-If you're a committer, you can upload a new copy of the website into the staging area at
http://servicemix.apache.org/staging by running a {{mvn scalate:deploy}}.
-
-Before you run this command, ensure to configure the {{people.apache.org}} server credentials
in your {{~/.m2/settings.xml}}.
-
-{pygmentize:lang=xml}
-<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0
-                      http://maven.apache.org/xsd/settings-1.0.0.xsd">
-  <servers>
-    <server>
-      <id>people.apache.org</id>
-      <username>gertv</username>
-      <!-- either one of these authentication methods -->
-      <privateKey/>
-      <password/>
-    </server>
-  </servers>
-
-</settings>
-{pygmentize}
+If you're a committer, you can upload a new copy of the website to the Subversion repository
at {{https://svn.apache.org/repos/asf/servicemix/site/production/}} by running a {{mvn scm-publish:publish-scm}}.
 
 --- name:content pipeline:ssp
 <%@ val overview : String %>



Mime
View raw message