Author: dennisl
Date: Sun Sep 14 03:11:24 2008
New Revision: 695178
URL: http://svn.apache.org/viewvc?rev=695178&view=rev
Log:
[MSITE-304] site:stage-deploy creates different directory structure than
site:site
o Add an IT
Added:
maven/plugins/trunk/maven-site-plugin/src/it/MSITE-304/ (with props)
maven/plugins/trunk/maven-site-plugin/src/it/MSITE-304/child/ (with props)
maven/plugins/trunk/maven-site-plugin/src/it/MSITE-304/child/goals.txt
(with props)
maven/plugins/trunk/maven-site-plugin/src/it/MSITE-304/child/pom.xml
(with props)
maven/plugins/trunk/maven-site-plugin/src/it/MSITE-304/goals.txt (with
props)
maven/plugins/trunk/maven-site-plugin/src/it/MSITE-304/pom.xml (with
props)
maven/plugins/trunk/maven-site-plugin/src/it/MSITE-304/src/
maven/plugins/trunk/maven-site-plugin/src/it/MSITE-304/src/site/
maven/plugins/trunk/maven-site-plugin/src/it/MSITE-304/src/site/site.xml
(with props)
maven/plugins/trunk/maven-site-plugin/src/it/MSITE-304/verify.bsh (with
props)
Propchange: maven/plugins/trunk/maven-site-plugin/src/it/MSITE-304/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sun Sep 14 03:11:24 2008
@@ -0,0 +1,2 @@
+build.log
+target
Propchange: maven/plugins/trunk/maven-site-plugin/src/it/MSITE-304/child/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sun Sep 14 03:11:24 2008
@@ -0,0 +1,2 @@
+build.log
+target
Added: maven/plugins/trunk/maven-site-plugin/src/it/MSITE-304/child/goals.txt
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/MSITE-304/child/goals.txt?rev=695178&view=auto
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/it/MSITE-304/child/goals.txt
(added)
+++ maven/plugins/trunk/maven-site-plugin/src/it/MSITE-304/child/goals.txt Sun
Sep 14 03:11:24 2008
@@ -0,0 +1 @@
+site:stage-deploy
\ No newline at end of file
Propchange:
maven/plugins/trunk/maven-site-plugin/src/it/MSITE-304/child/goals.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-site-plugin/src/it/MSITE-304/child/goals.txt
------------------------------------------------------------------------------
svn:keywords = Date Revision Author Id
Added: maven/plugins/trunk/maven-site-plugin/src/it/MSITE-304/child/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/MSITE-304/child/pom.xml?rev=695178&view=auto
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/it/MSITE-304/child/pom.xml (added)
+++ maven/plugins/trunk/maven-site-plugin/src/it/MSITE-304/child/pom.xml Sun
Sep 14 03:11:24 2008
@@ -0,0 +1,31 @@
+<!--
+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.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+ <parent>
+ <groupId>test</groupId>
+ <artifactId>parent</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>child</artifactId>
+ <packaging>pom</packaging>
+ <version>1.0-SNAPSHOT</version>
+ <name>MSITE-304 IT child</name>
+ <url>http://www.example.com/parent/child/</url>
+</project>
Propchange: maven/plugins/trunk/maven-site-plugin/src/it/MSITE-304/child/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-site-plugin/src/it/MSITE-304/child/pom.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision Author Id
Added: maven/plugins/trunk/maven-site-plugin/src/it/MSITE-304/goals.txt
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/MSITE-304/goals.txt?rev=695178&view=auto
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/it/MSITE-304/goals.txt (added)
+++ maven/plugins/trunk/maven-site-plugin/src/it/MSITE-304/goals.txt Sun Sep 14
03:11:24 2008
@@ -0,0 +1 @@
+site:stage-deploy
\ No newline at end of file
Propchange: maven/plugins/trunk/maven-site-plugin/src/it/MSITE-304/goals.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-site-plugin/src/it/MSITE-304/goals.txt
------------------------------------------------------------------------------
svn:keywords = Date Revision Author Id
Added: maven/plugins/trunk/maven-site-plugin/src/it/MSITE-304/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/MSITE-304/pom.xml?rev=695178&view=auto
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/it/MSITE-304/pom.xml (added)
+++ maven/plugins/trunk/maven-site-plugin/src/it/MSITE-304/pom.xml Sun Sep 14
03:11:24 2008
@@ -0,0 +1,37 @@
+<!--
+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.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>test</groupId>
+ <artifactId>parent</artifactId>
+ <packaging>pom</packaging>
+ <version>1.0-SNAPSHOT</version>
+ <name>MSITE-304 IT parent</name>
+ <url>http://www.example.com/parent/</url>
+ <distributionManagement>
+ <site>
+ <id>msite-304</id>
+ <name>Example company web server</name>
+ <url>file:///www.example.com/parent</url>
+ </site>
+ </distributionManagement>
+ <modules>
+ <module>child</module>
+ </modules>
+</project>
Propchange: maven/plugins/trunk/maven-site-plugin/src/it/MSITE-304/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-site-plugin/src/it/MSITE-304/pom.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision Author Id
Added: maven/plugins/trunk/maven-site-plugin/src/it/MSITE-304/src/site/site.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/MSITE-304/src/site/site.xml?rev=695178&view=auto
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/it/MSITE-304/src/site/site.xml
(added)
+++ maven/plugins/trunk/maven-site-plugin/src/it/MSITE-304/src/site/site.xml
Sun Sep 14 03:11:24 2008
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<!--
+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.
+-->
+
+<project>
+ <body>
+ <menu ref="parent"/>
+ <menu ref="reports"/>
+ <menu ref="modules"/>
+ </body>
+</project>
Propchange:
maven/plugins/trunk/maven-site-plugin/src/it/MSITE-304/src/site/site.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-site-plugin/src/it/MSITE-304/src/site/site.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision Author Id
Added: maven/plugins/trunk/maven-site-plugin/src/it/MSITE-304/verify.bsh
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/MSITE-304/verify.bsh?rev=695178&view=auto
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/it/MSITE-304/verify.bsh (added)
+++ maven/plugins/trunk/maven-site-plugin/src/it/MSITE-304/verify.bsh Sun Sep
14 03:11:24 2008
@@ -0,0 +1,61 @@
+
+/*
+ * 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.
+ */
+
+import java.io.*;
+
+boolean result = true;
+
+try
+{
+ File target = new File( basedir, "target" );
+ if ( !target.exists() || !target.isDirectory() )
+ {
+ System.err.println( "Target file is missing or not a directory." );
+ return false;
+ }
+
+ File stagingDirectory = new File ( target, "staging" );
+ if ( !stagingDirectory.exists() || !stagingDirectory.isDirectory() )
+ {
+ System.err.println( "Staging directory is missing or not a directory."
);
+ return false;
+ }
+
+ File parentDirectory = new File ( stagingDirectory,
"localhost/www.example.com/parent" );
+ if ( !parentDirectory.exists() || !parentDirectory.isDirectory() )
+ {
+ System.err.println( "Staging directory for parent is missing or not a
directory." );
+ return false;
+ }
+
+ File childDirectory = new File ( stagingDirectory,
"localhost/www.example.com/parent/child" );
+ if ( !childDirectory.exists() || !childDirectory.isDirectory() )
+ {
+ System.err.println( "Staging directory for child is missing or not a
directory." );
+ return false;
+ }
+}
+catch( IOException e )
+{
+ e.printStackTrace();
+ result = false;
+}
+
+return result;
Propchange: maven/plugins/trunk/maven-site-plugin/src/it/MSITE-304/verify.bsh
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-site-plugin/src/it/MSITE-304/verify.bsh
------------------------------------------------------------------------------
svn:keywords = Date Revision Author Id
