Author: ltheussl
Date: Fri Sep 23 09:21:47 2011
New Revision: 1174605
URL: http://svn.apache.org/viewvc?rev=1174605&view=rev
Log:
[MSITE-600] add IT, disabled for now
Added:
maven/plugins/trunk/maven-site-plugin/src/it/top-parent-different-site/
maven/plugins/trunk/maven-site-plugin/src/it/top-parent-different-site/invoker.properties
maven/plugins/trunk/maven-site-plugin/src/it/top-parent-different-site/module1/
maven/plugins/trunk/maven-site-plugin/src/it/top-parent-different-site/module1/pom.xml
maven/plugins/trunk/maven-site-plugin/src/it/top-parent-different-site/pom.xml
maven/plugins/trunk/maven-site-plugin/src/it/top-parent-different-site/root/
maven/plugins/trunk/maven-site-plugin/src/it/top-parent-different-site/root/pom.xml
maven/plugins/trunk/maven-site-plugin/src/it/top-parent-different-site/verify.bsh
Modified:
maven/plugins/trunk/maven-site-plugin/pom.xml
Modified: maven/plugins/trunk/maven-site-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/pom.xml?rev=1174605&r1=1174604&r2=1174605&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-site-plugin/pom.xml Fri Sep 23 09:21:47 2011
@@ -524,6 +524,10 @@ under the License.
<pomIncludes>
<pomInclude>*/pom.xml</pomInclude>
</pomIncludes>
+ <pomExcludes>
+ <!-- FIXME! MSITE-600 -->
+ <pomExclude>top-parent-different-site/pom.xml</pomExclude>
+ </pomExcludes>
<postBuildHookScript>verify</postBuildHookScript>
<localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>
<goals>
Added:
maven/plugins/trunk/maven-site-plugin/src/it/top-parent-different-site/invoker.properties
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/top-parent-different-site/invoker.properties?rev=1174605&view=auto
==============================================================================
---
maven/plugins/trunk/maven-site-plugin/src/it/top-parent-different-site/invoker.properties
(added)
+++
maven/plugins/trunk/maven-site-plugin/src/it/top-parent-different-site/invoker.properties
Fri Sep 23 09:21:47 2011
@@ -0,0 +1,2 @@
+invoker.goals.1 = clean
+invoker.goals.2 = site:site site:deploy site:stage site:stage-deploy
Added:
maven/plugins/trunk/maven-site-plugin/src/it/top-parent-different-site/module1/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/top-parent-different-site/module1/pom.xml?rev=1174605&view=auto
==============================================================================
---
maven/plugins/trunk/maven-site-plugin/src/it/top-parent-different-site/module1/pom.xml
(added)
+++
maven/plugins/trunk/maven-site-plugin/src/it/top-parent-different-site/module1/pom.xml
Fri Sep 23 09:21:47 2011
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<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>
+
+ <parent>
+ <groupId>org.apache.maven.plugins.its.differentparentsite</groupId>
+ <artifactId>main</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <artifactId>module1</artifactId>
+
+ <name>module 1</name>
+
+</project>
Added:
maven/plugins/trunk/maven-site-plugin/src/it/top-parent-different-site/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/top-parent-different-site/pom.xml?rev=1174605&view=auto
==============================================================================
---
maven/plugins/trunk/maven-site-plugin/src/it/top-parent-different-site/pom.xml
(added)
+++
maven/plugins/trunk/maven-site-plugin/src/it/top-parent-different-site/pom.xml
Fri Sep 23 09:21:47 2011
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<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>
+
+ <parent>
+ <groupId>org.apache.maven.plugins.its.differentparentsite</groupId>
+ <artifactId>root</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <relativePath>root/pom.xml</relativePath>
+ </parent>
+
+ <groupId>org.apache.maven.plugins.its.differentparentsite</groupId>
+ <artifactId>main</artifactId>
+ <packaging>pom</packaging>
+ <name>main</name>
+ <version>1.0-SNAPSHOT</version>
+
+ <url>http://dummy.com/</url>
+
+ <distributionManagement>
+ <site>
+ <id>website</id>
+
<url>file://@project.build.directory@/it/top-parent-different-site/deploy/</url>
+ </site>
+ </distributionManagement>
+
+ <modules>
+ <module>module1</module>
+ </modules>
+
+</project>
Added:
maven/plugins/trunk/maven-site-plugin/src/it/top-parent-different-site/root/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/top-parent-different-site/root/pom.xml?rev=1174605&view=auto
==============================================================================
---
maven/plugins/trunk/maven-site-plugin/src/it/top-parent-different-site/root/pom.xml
(added)
+++
maven/plugins/trunk/maven-site-plugin/src/it/top-parent-different-site/root/pom.xml
Fri Sep 23 09:21:47 2011
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<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>org.apache.maven.plugins.its.differentparentsite</groupId>
+ <artifactId>root</artifactId>
+ <packaging>pom</packaging>
+ <name>root</name>
+ <version>1.0-SNAPSHOT</version>
+
+ <distributionManagement>
+ <site>
+ <id>website</id>
+ <url>scp://dummy.org/top-parent-different-site/deploy/root/</url>
+ </site>
+ </distributionManagement>
+
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+ <version>@project.version@</version>
+ <configuration>
+ <generateReports>false</generateReports>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+
+</project>
Added:
maven/plugins/trunk/maven-site-plugin/src/it/top-parent-different-site/verify.bsh
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/top-parent-different-site/verify.bsh?rev=1174605&view=auto
==============================================================================
---
maven/plugins/trunk/maven-site-plugin/src/it/top-parent-different-site/verify.bsh
(added)
+++
maven/plugins/trunk/maven-site-plugin/src/it/top-parent-different-site/verify.bsh
Fri Sep 23 09:21:47 2011
@@ -0,0 +1,75 @@
+
+/*
+ * 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 deployDirectory = new File( basedir, "deploy" );
+ if ( !deployDirectory.exists() || !deployDirectory.isDirectory() )
+ {
+ System.err.println( "deploy directory is missing or not a directory:"
);
+ return false;
+ }
+
+ File deployModuleDirectory = new File( deployDirectory, "module1" );
+ if ( !deployModuleDirectory.exists() ||
!deployModuleDirectory.isDirectory() )
+ {
+ System.err.println( "deploy module directory is missing or not a
directory:" );
+ return false;
+ }
+
+ File stageDeployDirectory = new File( deployDirectory, "staging" );
+ if ( !stageDeployDirectory.exists() || !stageDeployDirectory.isDirectory()
)
+ {
+ System.err.println( "stageDeployDirectory file is missing or not a
directory." );
+ return false;
+ }
+
+ File stageDeployModuleDirectory = new File( stageDeployDirectory,
"module1" );
+ if ( !stageDeployModuleDirectory.exists() ||
!stageDeployModuleDirectory.isDirectory() )
+ {
+ System.err.println( "stageDeployModuleDirectory file is missing or not
a directory." );
+ return false;
+ }
+
+ File stageDirectory = new File( basedir, "target/staging" );
+ if ( !stageDirectory.exists() || !stageDirectory.isDirectory() )
+ {
+ System.err.println( "stageDirectory file is missing or not a
directory." );
+ return false;
+ }
+
+ File stageModuleDirectory = new File( stageDirectory, "module1" );
+ if ( !stageModuleDirectory.exists() || !stageModuleDirectory.isDirectory()
)
+ {
+ System.err.println( "stageModuleDirectory file is missing or not a
directory." );
+ return false;
+ }
+}
+catch ( IOException e )
+{
+ e.printStackTrace();
+ result = false;
+}
+
+return result;
