Copied: magnolia-bundle/tags/magnolia-bundle-3.6-rc1 (from rev 16790, magnolia-bundle/trunk)

Copied: magnolia-bundle/tags/magnolia-bundle-3.6-rc1/magnolia-bundled-webapp/pom.xml (from rev 16792, magnolia-bundle/trunk/magnolia-bundled-webapp/pom.xml) (0 => 16793)

--- magnolia-bundle/tags/magnolia-bundle-3.6-rc1/magnolia-bundled-webapp/pom.xml	                        (rev 0)
+++ magnolia-bundle/tags/magnolia-bundle-3.6-rc1/magnolia-bundled-webapp/pom.xml	2008-07-15 10:08:06 UTC (rev 16793)
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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>info.magnolia</groupId>
+    <artifactId>magnolia-bundle-parent</artifactId>
+    <version>3.6-rc1</version>
+  </parent>
+  <artifactId>magnolia-bundled-webapp</artifactId>
+  <packaging>war</packaging>
+  <name>magnolia-bundled-webapp</name>
+  <description>Magnolia pre-installed with DMS and samples.</description>
+  <dependencies>
+    <dependency>
+      <groupId>info.magnolia</groupId>
+      <artifactId>magnolia-empty-webapp</artifactId>
+      <version>${magnoliaVersion}</version>
+      <type>war</type>
+    </dependency>
+    <dependency>
+      <groupId>info.magnolia</groupId>
+      <artifactId>magnolia-module-samples</artifactId>
+      <version>${magnoliaVersion}</version>
+      <type>jar</type>
+    </dependency>
+    <dependency>
+      <groupId>info.magnolia</groupId>
+      <artifactId>magnolia-module-dms</artifactId>
+      <version>1.2.5</version>
+      <type>jar</type>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>3.8.1</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+
+  <!-- copied from magnolia-empty-webapp, in order to override its txt files : -->
+  <build>
+    <resources>
+      <resource>
+        <!-- these are the resources copied by the remote-resources-plugin -->
+        <directory>${basedir}/target/maven-shared-archive-resources</directory>
+        <excludes>
+          <exclude>**/*</exclude>
+        </excludes>
+      </resource>
+    </resources>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-war-plugin</artifactId>
+        <configuration>
+          <webResources>
+            <resource>
+              <!-- these are the resources copied by the remote-resources-plugin -->
+              <directory>${basedir}/target/maven-shared-archive-resources</directory>
+            </resource>
+          </webResources>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+
+</project>

Copied: magnolia-bundle/tags/magnolia-bundle-3.6-rc1/magnolia-integration-tests/pom.xml (from rev 16792, magnolia-bundle/trunk/magnolia-integration-tests/pom.xml) (0 => 16793)

--- magnolia-bundle/tags/magnolia-bundle-3.6-rc1/magnolia-integration-tests/pom.xml	                        (rev 0)
+++ magnolia-bundle/tags/magnolia-bundle-3.6-rc1/magnolia-integration-tests/pom.xml	2008-07-15 10:08:06 UTC (rev 16793)
@@ -0,0 +1,198 @@
+<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>info.magnolia</groupId>
+    <artifactId>magnolia-bundle-parent</artifactId>
+    <version>3.6-rc1</version>
+  </parent>
+  <groupId>info.magnolia</groupId>
+  <artifactId>magnolia-integration-tests</artifactId>
+  <name>magnolia-integration-tests</name>
+  <packaging>pom</packaging>
+
+  <dependencies>
+    <dependency>
+      <groupId>info.magnolia</groupId>
+      <artifactId>magnolia-bundled-webapp</artifactId>
+      <version>${project.version}</version>
+      <type>war</type>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.4</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+      <!-- tell the compiler to compile the tests, which it does not do by default because this project has a packaging of type pom  -->
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <executions>
+          <execution>
+            <goals>
+              <goal>testCompile</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <source>1.5</source>
+          <target>1.5</target>
+        </configuration>
+      </plugin>
+      <!-- let surefire be executed in the integration-test phase -->
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <executions>
+          <execution>
+            <phase>integration-test</phase>
+            <goals>
+              <goal>test</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+
+      <plugin>
+        <groupId>org.codehaus.cargo</groupId>
+        <artifactId>cargo-maven2-plugin</artifactId>
+        <configuration>
+          <wait>false</wait>
+          <container>
+            <containerId>${containerId}</containerId>
+            <type>${containerType}</type>
+            <output>${project.build.directory}/${containerId}.log</output>
+            <log>${project.build.directory}/cargo.log</log>
+            <zipUrlInstaller>
+              <url>${url}</url>
+              <installDir>${cargo.installDir}</installDir>
+            </zipUrlInstaller>
+          </container>
+          <configuration>
+            <properties>
+              <cargo.jvmargs>-Xmx1024M -Xdebug -Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=n ${jvmargs}</cargo.jvmargs>
+              <cargo.servlet.port>${port}</cargo.servlet.port>
+              <cargo.logging>high</cargo.logging>
+            </properties>
+
+            <deployables>
+              <deployable>
+                <groupId>info.magnolia</groupId>
+                <artifactId>magnolia-bundled-webapp</artifactId>
+                <type>war</type>
+                <properties>
+                  <context>magnoliaAuthor</context>
+                </properties>
+              </deployable>
+              <deployable>
+                <groupId>info.magnolia</groupId>
+                <artifactId>magnolia-bundled-webapp</artifactId>
+                <type>war</type>
+                <properties>
+                  <context>magnoliaPublic</context>
+                </properties>
+              </deployable>
+            </deployables>
+
+          </configuration>
+        </configuration>
+
+        <executions>
+          <execution>
+            <id>start</id>
+            <phase>pre-integration-test</phase>
+            <goals>
+              <goal>start</goal>
+            </goals>
+          </execution>
+          <execution>
+            <id>stop</id>
+            <phase>post-integration-test</phase>
+            <goals>
+              <goal>stop</goal>
+            </goals>
+          </execution>
+        </executions>
+
+      </plugin>
+    </plugins>
+  </build>
+
+  <profiles>
+    <profile>
+      <id>tomcat50</id>
+      <properties>
+        <containerId>tomcat5x</containerId>
+        <containerType>installed</containerType>
+        <port>8080</port>
+        <url>http://archive.apache.org/dist/tomcat/tomcat-5/v5.0.30/bin/jakarta-tomcat-5.0.30.zip</url>
+      </properties>
+    </profile>
+    <profile>
+      <id>tomcat55</id>
+      <properties>
+        <containerId>tomcat5x</containerId>
+        <containerType>installed</containerType>
+        <port>8080</port>
+        <url>http://www.apache.org/dist/tomcat/tomcat-5/v5.5.25/bin/apache-tomcat-5.5.25.zip</url>
+      </properties>
+    </profile>
+    <profile>
+      <id>tomcat60</id>
+      <properties>
+        <containerId>tomcat5x</containerId>
+        <containerType>installed</containerType>
+        <port>8080</port>
+        <url>http://apache.mirror.testserver.li/tomcat/tomcat-6/v6.0.14/bin/apache-tomcat-6.0.14.zip</url>
+      </properties>
+    </profile>
+    <profile>
+      <id>jetty6</id>
+      <activation>
+        <!-- TODO : if we activate another profile, will this one be disabled, or are we sure the other one's properties will override these ? -->
+        <activeByDefault>true</activeByDefault>
+      </activation>
+      <properties>
+        <containerId>jetty6x</containerId>
+        <containerType>embedded</containerType>
+        <port>8080</port>
+      </properties>
+    </profile>
+    <profile>
+      <id>jboss42</id>
+      <properties>
+        <containerId>jboss4x</containerId>
+        <containerType>installed</containerType>
+        <port>8080</port>
+        <url>http://switch.dl.sourceforge.net/sourceforge/jboss/jboss-4.2.2.GA.zip</url>
+        <jvmargs>
+          -Djava.security.auth.login.config=file:///Users/brainbug/Jobs/J2Global/magnolia-trunk/magnolia-webapp/target/magnolia-webapp-3.5-SNAPSHOT/WEB-INF/config/jaas.config
+          -Djboss.home.dir=${cargo.installDir}/jboss-4.2.2.GA/jboss-4.2.2.GA
+          -Djboss.server.home.dir=${cargo.installDir}/jboss-4.2.2.GA/jboss-4.2.2.GA/server/default
+          -Djboss.server.home.url=file:/${cargo.installDir}/jboss-4.2.2.GA/jboss-4.2.2.GA/server/default
+          -Djboss.server.name=jboss4x
+        </jvmargs>
+      </properties>
+    </profile>
+
+    <!-- unfortunately doesn't work since JBoss doesn't recognize the java.security.auth.login.config property -->
+    <!--
+    <profile>
+      <id>jboss40</id>
+      <properties>
+        <containerId>jboss4x</containerId>
+        <containerType>installed</containerType>
+        <port>8080</port>
+        <url>http://kent.dl.sourceforge.net/sourceforge/jboss/jboss-4.0.5.GA.zip</url>
+        <jvmargs>-Djava.security.auth.login.config=${project.build.directory}/${project.build.finalName}/WEB-INF/config/jaas.config</jvmargs>
+      </properties>
+    </profile>
+    -->
+  </profiles>
+
+
+</project>

Copied: magnolia-bundle/tags/magnolia-bundle-3.6-rc1/magnolia-tomcat-bundle/pom.xml (from rev 16792, magnolia-bundle/trunk/magnolia-tomcat-bundle/pom.xml) (0 => 16793)

--- magnolia-bundle/tags/magnolia-bundle-3.6-rc1/magnolia-tomcat-bundle/pom.xml	                        (rev 0)
+++ magnolia-bundle/tags/magnolia-bundle-3.6-rc1/magnolia-tomcat-bundle/pom.xml	2008-07-15 10:08:06 UTC (rev 16793)
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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>info.magnolia</groupId>
+    <artifactId>magnolia-bundle-parent</artifactId>
+    <version>3.6-rc1</version>
+  </parent>
+  <artifactId>magnolia-tomcat-bundle</artifactId>
+  <packaging>pom</packaging>
+  <name>magnolia-tomcat-bundle</name>
+  <description>Magnolia bundled with Tomcat 5.5</description>
+
+  <dependencies>
+    <dependency>
+      <groupId>info.magnolia</groupId>
+      <artifactId>magnolia-bundled-webapp</artifactId>
+      <version>${project.version}</version>
+      <type>war</type>
+    </dependency>
+    <dependency>
+      <groupId>info.magnolia</groupId>
+      <artifactId>magnolia-module-workflow</artifactId>
+      <version>${magnoliaVersion}</version>
+      <classifier>bundle</classifier>
+      <type>tar.gz</type>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>info.magnolia</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <version>1.0.2</version>
+        <executions>
+          <execution>
+            <phase>process-resources</phase>
+            <id>get-tomcat</id>
+            <goals>
+              <goal>download</goal>
+            </goals>
+            <configuration>
+              <url>http://www.apache.org/dist/tomcat/tomcat-5/v5.5.25/bin/apache-tomcat-5.5.25.tar.gz</url>
+              <destDir>${basedir}/target/extracted-tomcat</destDir>
+            </configuration>
+          </execution>
+          <execution>
+            <phase>process-resources</phase>
+            <id>get-tomcat-compat-package</id>
+            <goals>
+              <goal>download</goal>
+            </goals>
+            <configuration>
+              <url>http://www.apache.org/dist/tomcat/tomcat-5/v5.5.25/bin/apache-tomcat-5.5.25-compat.tar.gz</url>
+              <destDir>${basedir}/target/extracted-tomcat-compat</destDir>
+            </configuration>
+          </execution>
+        </executions>
+        <configuration>
+          <downloadDir>tmp</downloadDir>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <!-- Needs at least version 2.2-beta-2 of the maven-assembly-plugin, for it resolves the following issues:
+             http://jira.codehaus.org/browse/MASSEMBLY-73
+             http://jira.codehaus.org/browse/MASSEMBLY-221
+             http://jira.codehaus.org/browse/MASSEMBLY-250 -->
+        <executions>
+          <execution>
+            <!-- using the same id as the parent to override its configuration ! -->
+            <id>make-assembly</id>
+            <phase>package</phase>
+            <goals>
+              <goal>attached</goal>
+            </goals>
+            <configuration>
+              <finalName>magnolia-${project.version}</finalName>
+              <descriptors>
+                <descriptor>src/release/bundle-jdk15.xml</descriptor>
+                <descriptor>src/release/bundle-jdk14.xml</descriptor>
+                <!--<descriptor>src/release/src.xml</descriptor>-->
+                <!--<descriptor>src/release/wars.xml</descriptor>-->
+              </descriptors>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+
+</project>

Copied: magnolia-bundle/tags/magnolia-bundle-3.6-rc1/pom.xml (from rev 16792, magnolia-bundle/trunk/pom.xml) (0 => 16793)

--- magnolia-bundle/tags/magnolia-bundle-3.6-rc1/pom.xml	                        (rev 0)
+++ magnolia-bundle/tags/magnolia-bundle-3.6-rc1/pom.xml	2008-07-15 10:08:06 UTC (rev 16793)
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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>
+    <artifactId>magnolia-parent-pom</artifactId>
+    <groupId>info.magnolia</groupId>
+    <version>4</version>
+  </parent>
+  <artifactId>magnolia-bundle-parent</artifactId>
+  <packaging>pom</packaging>
+  <version>3.6-rc1</version>
+  <name>magnolia-bundle-parent</name>
+  <scm>
+    <connection>scm:svn:http://svn.magnolia.info/svn/magnolia-bundle/tags/magnolia-bundle-3.6-rc1</connection>
+    <developerConnection>scm:svn:http://svn.magnolia.info/svn/magnolia-bundle/tags/magnolia-bundle-3.6-rc1</developerConnection>
+    <url>http://svn.magnolia.info/view/magnolia-bundle/tags/magnolia-bundle-3.6-rc1</url>
+  </scm>
+  <properties>
+    <magnoliaEdition>Community Edition</magnoliaEdition>
+    <magnoliaVersion>3.6-rc1</magnoliaVersion>
+  </properties>
+
+  <modules>
+    <module>magnolia-bundled-webapp</module>
+    <module>magnolia-integration-tests</module>
+    <module>magnolia-tomcat-bundle</module>
+  </modules>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-enforcer-plugin</artifactId>
+      </plugin>
+      <plugin>
+        <artifactId>maven-release-plugin</artifactId>
+        <configuration>
+          <autoVersionSubmodules>true</autoVersionSubmodules>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>info.magnolia</groupId>
+        <artifactId>maven-setproperty-plugin</artifactId>
+        <version>1.0.1</version>
+        <executions>
+          <!-- set the current date -->
+          <execution>
+            <phase>generate-resources</phase>
+            <id>currentDate</id>
+            <goals>
+              <goal>set-property</goal>
+            </goals>
+            <configuration>
+              <properties>
+                <property implementation="info.magnolia.maven.setproperty.CurrentDateValueProvider">
+                  <name>magnoliaCurrentDate</name>
+                  <format>d. MMMM yyyy</format>
+                </property>
+                <!-- don't use magnolia.version. By some plugins it would get treated as project.version -->
+                <property implementation="info.magnolia.maven.setproperty.VersionNameValueProvider">
+                  <name>magnoliaNiceVersion</name>
+                </property>
+                <!-- set the release date (default current) -->
+                <property implementation="info.magnolia.maven.setproperty.CurrentDateValueProvider">
+                  <name>magnoliaReleaseDate</name>
+                  <format>d. MMMM yyyy</format>
+                </property>
+              </properties>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <artifactId>maven-remote-resources-plugin</artifactId>
+        <executions>
+          <execution>
+            <goals>
+              <goal>process</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <resourceBundles>
+            <resourceBundle>info.magnolia:magnolia-build-tools-dual-licensed:1.3</resourceBundle>
+          </resourceBundles>
+        </configuration>
+      </plugin>
+
+    </plugins>
+  </build>
+
+</project>