Skip to content

Commit

Permalink
SAK-20775
Browse files Browse the repository at this point in the history
git-svn-id: https://source.sakaiproject.org/svn/site/trunk@94226 66ffb92e-73f9-0310-93c1-f5514f145a0a
  • Loading branch information
arwhyte committed Jun 29, 2011
1 parent fc2b30b commit a4a4987
Show file tree
Hide file tree
Showing 4 changed files with 311 additions and 174 deletions.
81 changes: 39 additions & 42 deletions site/mergedlist-util/util/pom.xml
Original file line number Diff line number Diff line change
@@ -1,43 +1,40 @@
<?xml version="1.0"?>
<project xmlns="http://maven.apache.org/POM/4.0.0">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>site-base</artifactId>
<groupId>org.sakaiproject</groupId>
<version>2.9-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<name>sakai-mergedlist-util</name>
<groupId>org.sakaiproject</groupId>
<artifactId>sakai-mergedlist-util</artifactId>
<organization>
<name>University of Michigan</name>
<url>http://sakaiproject.org/</url>
</organization>
<inceptionYear>2003</inceptionYear>
<packaging>jar</packaging>
<properties>
<deploy.target/>
</properties>
<dependencies>
<dependency>
<groupId>org.sakaiproject.kernel</groupId>
<artifactId>sakai-kernel-util</artifactId>
</dependency>
<dependency>
<groupId>org.sakaiproject.kernel</groupId>
<artifactId>sakai-kernel-api</artifactId>
</dependency>
<dependency>
<groupId>org.sakaiproject.velocity</groupId>
<artifactId>sakai-velocity-tool</artifactId>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</dependency>
</dependencies>
<build>
<resources/>
</build>
</project>
<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.sakaiproject.site</groupId>
<artifactId>site-base</artifactId>
<version>2.9-SNAPSHOT</version>
</parent>

<name>sakai-mergedlist-util</name>
<groupId>org.sakaiproject.site</groupId>
<artifactId>sakai-mergedlist-util</artifactId>
<organization>
<name>University of Michigan</name>
<url>http://sakaiproject.org/</url>
</organization>
<inceptionYear>2003</inceptionYear>
<packaging>jar</packaging>

<dependencies>
<dependency>
<groupId>org.sakaiproject.kernel</groupId>
<artifactId>sakai-kernel-api</artifactId>
</dependency>
<dependency>
<groupId>org.sakaiproject.kernel</groupId>
<artifactId>sakai-kernel-util</artifactId>
</dependency>
<dependency>
<groupId>org.sakaiproject.velocity</groupId>
<artifactId>sakai-velocity-tool</artifactId>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</dependency>
</dependencies>
</project>
224 changes: 178 additions & 46 deletions site/pom.xml
Original file line number Diff line number Diff line change
@@ -1,48 +1,180 @@
<?xml version="1.0"?>
<project xmlns="http://maven.apache.org/POM/4.0.0">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>base</artifactId>
<groupId>org.sakaiproject</groupId>
<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.sakaiproject.purepoms</groupId>
<artifactId>sakai-standard-tool</artifactId>
<version>2.9-SNAPSHOT</version>
</parent>

<name>sakai-site base pom</name>
<groupId>org.sakaiproject.site</groupId>
<artifactId>site-base</artifactId>
<version>2.9-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<name>Sakai Site Project</name>
<groupId>org.sakaiproject</groupId>
<artifactId>site-base</artifactId>
<packaging>pom</packaging>
<scm>
<connection>scm:svn:https://source.sakaiproject.org/svn/site/trunk</connection>
<developerConnection>scm:svn:https://source.sakaiproject.org/svn/site/trunk</developerConnection>
<url>https://source.sakaiproject.org/svn/site/trunk</url>
</scm>
<profiles>
<profile>
<id>framework</id>
<modules>
<module>site-help</module>
<module>site-tool/tool</module>
</modules>
</profile>
<profile>
<id>full</id>
<activation>
<activeByDefault>true</activeByDefault>
</activation>
<modules>
<module>site-help</module>
<module>site-tool/tool</module>
<module>mergedlist-util/util</module>
</modules>
</profile>
</profiles>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.sakaiproject.velocity</groupId>
<artifactId>sakai-velocity-tool</artifactId>
<version>${sakai.velocity-tool.version}</version>
</dependency>
</dependencies>
</dependencyManagement>
</project>
<packaging>pom</packaging>

<profiles>
<profile>
<id>framework</id>
<modules>
<module>site-help</module>
<module>site-tool/tool</module>
</modules>
</profile>
<profile>
<id>full</id>
<activation>
<activeByDefault>true</activeByDefault>
</activation>
<modules>
<module>site-assembly</module>
<module>site-help</module>
<module>site-tool/tool</module>
<module>mergedlist-util/util</module>
</modules>
</profile>
</profiles>

<properties>
<url.localsite>scp://source.sakaiproject.org/var/www/html/release/site/${project.version}</url.localsite>
</properties>

<scm>
<connection>scm:svn:https://source.sakaiproject.org/svn/site/trunk</connection>
<developerConnection>scm:svn:https://source.sakaiproject.org/svn/site/trunk</developerConnection>
<url>https://source.sakaiproject.org/svn/site/trunk</url>
</scm>

<distributionManagement>
<downloadUrl>http://source.sakaiproject.org/maven2/</downloadUrl>
<snapshotRepository>
<uniqueVersion>false</uniqueVersion>
<id>sakai-maven-snapshots-scp</id>
<name>Sakai snapshot Repo</name>
<url>scp://source.sakaiproject.org/var/www/html/maven2-snapshots</url>
<layout>default</layout>
</snapshotRepository>
<repository>
<uniqueVersion>false</uniqueVersion>
<id>sakai-maven2-scp</id>
<name>Sakai maven2 repository</name>
<url>scp://source.sakaiproject.org/var/www/html/maven2</url>
<layout>default</layout>
</repository>
<site>
<id>sakai-site</id>
<name>Sakai release Site</name>
<url>${url.localsite}</url>
</site>
</distributionManagement>

<pluginRepositories>
<pluginRepository>
<id>maven2-central-repo</id>
<name>Maven2 Central Repo</name>
<url>http://repo1.maven.org/maven2/</url>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
</pluginRepository>
<pluginRepository>
<id>Sakai Plugin Repo</id>
<url>http://source.sakaiproject.org/maven2</url>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
</pluginRepository>
</pluginRepositories>

<repositories>
<repository>
<id>sakai-maven</id>
<name>Sakai Maven Repo</name>
<layout>default</layout>
<url>http://source.sakaiproject.org/maven2</url>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
</repository>
<repository>
<id>sakai-maven2-snapshots</id>
<name>Sakai Maven Repo</name>
<layout>default</layout>
<url>http://source.sakaiproject.org/maven2-snapshots</url>
<releases>
<enabled>false</enabled>
</releases>
<snapshots>
<enabled>true</enabled>
</snapshots>
</repository>
<repository>
<id>default</id>
<name>Maven Repository Switchboard</name>
<layout>default</layout>
<url>http://repo1.maven.org/maven2</url>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
</repository>
</repositories>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.sakaiproject.courier</groupId>
<artifactId>sakai-courier-api</artifactId>
<version>2.9-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.sakaiproject.velocity</groupId>
<artifactId>sakai-velocity-tool-api</artifactId>
<version>2.9-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.sakaiproject.velocity</groupId>
<artifactId>sakai-velocity-tool</artifactId>
<version>2.9-SNAPSHOT</version>
</dependency>
</dependencies>
</dependencyManagement>

<reporting>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.7</version>
<configuration>
<debug>true</debug>
<links>
<link>http://download.oracle.com/javase/1.5.0/docs/api/</link>
<link>http://download.oracle.com/javase/6/docs/api/</link>
</links>
<breakiterator>true</breakiterator>
<verbose>false</verbose>
<aggregate>true</aggregate>
<minmemory>168m</minmemory>
<maxmemory>1024m</maxmemory>
<additionalJOption>-J-Xms168m -J-Xmx1024m -J-XX:PermSize=128m -J-XX:NewSize=64m</additionalJOption>
</configuration>
</plugin>
</plugins>
</reporting>
</project>
51 changes: 28 additions & 23 deletions site/site-help/pom.xml
Original file line number Diff line number Diff line change
@@ -1,24 +1,29 @@
<?xml version="1.0"?>
<project xmlns="http://maven.apache.org/POM/4.0.0">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>site-base</artifactId>
<groupId>org.sakaiproject</groupId>
<version>2.9-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<name>Sakai Sites Help</name>
<artifactId>sakai-site-help</artifactId>
<packaging>jar</packaging>
<properties>
<deploy.target>shared</deploy.target>
</properties>
<build>
<resources>
<resource>
<directory>src</directory>
</resource>
</resources>
<sourceDirectory>src</sourceDirectory>
</build>
</project>
<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.sakaiproject.site</groupId>
<artifactId>site-base</artifactId>
<version>2.9-SNAPSHOT</version>
</parent>

<name>sakai-site-help</name>
<groupId>org.sakaiproject.site</groupId>
<artifactId>sakai-site-help</artifactId>
<packaging>jar</packaging>

<properties>
<deploy.target>shared</deploy.target>
</properties>

<build>
<resources>
<resource>
<directory>src</directory>
</resource>
</resources>
<sourceDirectory>src</sourceDirectory>
</build>
</project>
Loading

0 comments on commit a4a4987

Please sign in to comment.